From 2ecf388c0465c0f92a08c93aa6de0f57aac22b9d Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Fri, 4 Jan 2013 23:09:20 -0800
Subject: [PATCH 0001/1140] Initial commit

---
 .gitignore | 14 ++++++++++++++
 README.md  |  4 ++++
 2 files changed, 18 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 README.md

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..f356293eee
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..b63850f76a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+meteor-roles
+============
+
+Roles-based authorization package for Meteor
\ No newline at end of file

From e916c6e82c606c6955c42254549ad29383a9b736 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 02:20:39 -0500
Subject: [PATCH 0002/1140] initial commit

---
 LICENSE                                      |    9 +
 README.md                                    |   32 +-
 docs/api.js                                  |   17 +
 docs/assets/css/external-small.png           |  Bin 0 -> 491 bytes
 docs/assets/css/logo.png                     |  Bin 0 -> 6308 bytes
 docs/assets/css/main.css                     |  782 +++++++++++++
 docs/assets/favicon.png                      |  Bin 0 -> 740 bytes
 docs/assets/img/spinner.gif                  |  Bin 0 -> 2685 bytes
 docs/assets/index.html                       |   10 +
 docs/assets/js/api-filter.js                 |   52 +
 docs/assets/js/api-list.js                   |  251 ++++
 docs/assets/js/api-search.js                 |   98 ++
 docs/assets/js/apidocs.js                    |  363 ++++++
 docs/assets/js/yui-prettify.js               |   17 +
 docs/assets/vendor/prettify/CHANGES.html     |  130 +++
 docs/assets/vendor/prettify/COPYING          |  202 ++++
 docs/assets/vendor/prettify/README.html      |  203 ++++
 docs/assets/vendor/prettify/prettify-min.css |    1 +
 docs/assets/vendor/prettify/prettify-min.js  |    1 +
 docs/classes/Roles.html                      | 1075 ++++++++++++++++++
 docs/classes/index.html                      |   10 +
 docs/data.json                               |  215 ++++
 docs/files/index.html                        |   10 +
 docs/files/roles_roles.js.html               |  287 +++++
 docs/index.html                              |  124 ++
 docs/modules/Roles.html                      |  147 +++
 docs/modules/index.html                      |   10 +
 roles/.meteor/.gitignore                     |    2 +
 roles/package.js                             |   14 +
 roles/roles.js                               |  177 +++
 roles/smart.json                             |    9 +
 roles/smart.lock                             |   19 +
 roles/tests/server.js                        |  194 ++++
 yuidoc.json                                  |   10 +
 34 files changed, 4470 insertions(+), 1 deletion(-)
 create mode 100644 LICENSE
 create mode 100644 docs/api.js
 create mode 100644 docs/assets/css/external-small.png
 create mode 100644 docs/assets/css/logo.png
 create mode 100644 docs/assets/css/main.css
 create mode 100644 docs/assets/favicon.png
 create mode 100644 docs/assets/img/spinner.gif
 create mode 100644 docs/assets/index.html
 create mode 100644 docs/assets/js/api-filter.js
 create mode 100644 docs/assets/js/api-list.js
 create mode 100644 docs/assets/js/api-search.js
 create mode 100644 docs/assets/js/apidocs.js
 create mode 100644 docs/assets/js/yui-prettify.js
 create mode 100644 docs/assets/vendor/prettify/CHANGES.html
 create mode 100644 docs/assets/vendor/prettify/COPYING
 create mode 100644 docs/assets/vendor/prettify/README.html
 create mode 100644 docs/assets/vendor/prettify/prettify-min.css
 create mode 100644 docs/assets/vendor/prettify/prettify-min.js
 create mode 100644 docs/classes/Roles.html
 create mode 100644 docs/classes/index.html
 create mode 100644 docs/data.json
 create mode 100644 docs/files/index.html
 create mode 100644 docs/files/roles_roles.js.html
 create mode 100644 docs/index.html
 create mode 100644 docs/modules/Roles.html
 create mode 100644 docs/modules/index.html
 create mode 100644 roles/.meteor/.gitignore
 create mode 100644 roles/package.js
 create mode 100644 roles/roles.js
 create mode 100644 roles/smart.json
 create mode 100644 roles/smart.lock
 create mode 100644 roles/tests/server.js
 create mode 100644 yuidoc.json

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..06ed2e36b5
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Adrian Lanning <alanning@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index b63850f76a..cc37984117 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,34 @@
 meteor-roles
 ============
 
-Roles-based authorization package for Meteor
\ No newline at end of file
+Roles-based authorization package for Meteor
+
+-- Tests -- 
+
+To run tests: 
+1. install Meteorite [1]
+2. cd 'roles' directory
+3. mrt
+4. point browser at http://localhost:3000/
+
+NOTE: If you see an error message regarding 'roles package does not exist' that means you are trying to run 'mrt' in the wrong directory.  See step 2.
+
+
+-- Documentation -- 
+
+Generated using YUIDoc [2]
+
+To re-generate documentation:
+1. install YUIDoc
+2. cd 'meteor-roles' directory (root)
+3. yuidoc
+
+To serve documentation locally:
+1. install YUIDoc
+2. cd 'meteor-roles' directory (root)
+3. yuidoc --server
+4. point browser at http://localhost:3000/
+
+
+[1] Meteorite - https://github.com/oortcloud/meteorite
+[2] YUIDoc - http://yui.github.com/yuidoc/
diff --git a/docs/api.js b/docs/api.js
new file mode 100644
index 0000000000..93b955b210
--- /dev/null
+++ b/docs/api.js
@@ -0,0 +1,17 @@
+YUI.add("yuidoc-meta", function(Y) {
+   Y.YUIDoc = { meta: {
+    "classes": [
+        "Roles"
+    ],
+    "modules": [
+        "Roles"
+    ],
+    "allModules": [
+        {
+            "displayName": "Roles",
+            "name": "Roles",
+            "description": "Provides functions related to user authorization."
+        }
+    ]
+} };
+});
\ No newline at end of file
diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..759a1cdcb5b1697e5be290d98b830e279cd71f3c
GIT binary patch
literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzjY&j7RCwBA{Qv(y10{fofkHsB0W2_v
zUBVFtR#sLp=H=xBVFzYr=KaWuf!;khr%J>Ds{zR1^XE?tfB*h@ASKHAa7wwn{MEbP
z7_^nS7{V*>+A}bS;P%45fB%Ai|Neasi2rl3{=EO;!w318%8Ovl7jArHc=P5Brfr~D
z0AYimtss2w$hlYlfd>7*aO3TNzw875LBK0xAD9Np|A(oEVYnB*eE9~V6wP%78SXuL
z&#-X)Er#`zY#Ce<cQE|@_n*NrZu>)^8hM<t@c%yx7=Qlqo#E+=&kU8xDhyfmhZ%Ci
zB^dtyV`g~#;=9AYe+-T|4Pa;I2jl<${xZmkvoM^x_?{uwM}|RLMTp_`2UZ3)Hogb%
z@2x(7(}2e(%NV%1Med)x^p}B+U4TJPLyAFJUXtPFBQCJ`lT(!p@9(X`oen;~J|q6|
z@wSPb3!@4d7=I%C`v334k56{?0OcisymvtS3)uihSYBXcWaI%-d^i%^A0P&W@^_&6
hzgP_zx|s<ezyP)2!%xqD#*+X5002ovPDHLkV1nUx>>B_8

literal 0
HcmV?d00001

diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..609b336c7cc5ef0c787a0068d221d9b8d69b1241
GIT binary patch
literal 6308
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
a0R{k+kX}`<%LV)Z0000<MNUMnLSTX_={r~e

literal 0
HcmV?d00001

diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
new file mode 100644
index 0000000000..f8f7ee7116
--- /dev/null
+++ b/docs/assets/css/main.css
@@ -0,0 +1,782 @@
+/*
+Font sizes for all selectors other than the body are given in percentages,
+with 100% equal to 13px. To calculate a font size percentage, multiply the
+desired size in pixels by 7.6923076923.
+
+Here's a quick lookup table:
+
+10px - 76.923%
+11px - 84.615%
+12px - 92.308%
+13px - 100%
+14px - 107.692%
+15px - 115.385%
+16px - 123.077%
+17px - 130.769%
+18px - 138.462%
+19px - 146.154%
+20px - 153.846%
+*/
+
+html {
+    background: #fff;
+    color: #333;
+    overflow-y: scroll;
+}
+
+body {
+    font: 13px/1.4 'Lucida Grande', 'Lucida Sans Unicode', 'DejaVu Sans', 'Bitstream Vera Sans', 'Helvetica', 'Arial', sans-serif;
+    margin: 0;
+    padding: 0;
+}
+
+/* -- Links ----------------------------------------------------------------- */
+a {
+    color: #356de4;
+    text-decoration: none;
+}
+
+.hidden {
+    display: none;
+}
+
+a:hover { text-decoration: underline; }
+
+/* "Jump to Table of Contents" link is shown to assistive tools, but hidden from
+   sight until it's focused. */
+.jump {
+    position: absolute;
+    padding: 3px 6px;
+    left: -99999px;
+    top: 0;
+}
+
+.jump:focus { left: 40%; }
+
+/* -- Paragraphs ------------------------------------------------------------ */
+p { margin: 1.3em 0; }
+dd p, td p { margin-bottom: 0; }
+dd p:first-child, td p:first-child { margin-top: 0; }
+
+/* -- Headings -------------------------------------------------------------- */
+h1, h2, h3, h4, h5, h6 {
+    color: #D98527;/*was #f80*/
+    font-family: 'Trebuchet MS', sans-serif;
+    font-weight: bold;
+    line-height: 1.1;
+    margin: 1.1em 0 0.5em;
+}
+
+h1 {
+    font-size: 184.6%;
+    color: #30418C;
+    margin: 0.75em 0 0.5em;
+}
+
+h2 {
+    font-size: 153.846%;
+    color: #E48A2B;
+}
+
+h3 { font-size: 138.462%; }
+
+h4 {
+    border-bottom: 1px solid #DBDFEA;
+    color: #E48A2B;
+    font-size: 115.385%;
+    font-weight: normal;
+    padding-bottom: 2px;
+}
+
+h5, h6 { font-size: 107.692%; }
+
+/* -- Code and examples ----------------------------------------------------- */
+code, kbd, pre, samp {
+    font-family: Menlo, Monaco, 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+    font-size: 92.308%;
+    line-height: 1.35;
+}
+
+p code, p kbd, p samp {
+    background: #FCFBFA;
+    border: 1px solid #EFEEED;
+    padding: 0 3px;
+}
+
+a code, a kbd, a samp,
+pre code, pre kbd, pre samp,
+table code, table kbd, table samp,
+.intro code, .intro kbd, .intro samp,
+.toc code, .toc kbd, .toc samp {
+    background: none;
+    border: none;
+    padding: 0;
+}
+
+pre.code, pre.terminal, pre.cmd {
+    overflow-x: auto;
+    *overflow-x: scroll;
+    padding: 0.3em 0.6em;
+}
+
+pre.code {
+    background: #FCFBFA;
+    border: 1px solid #EFEEED;
+    border-left-width: 5px;
+}
+
+pre.terminal, pre.cmd {
+    background: #F0EFFC;
+    border: 1px solid #D0CBFB;
+    border-left: 5px solid #D0CBFB;
+}
+
+/* Don't reduce the font size of <code>/<kbd>/<samp> elements inside <pre>
+   blocks. */
+pre code, pre kbd, pre samp { font-size: 100%; }
+
+/* Used to denote text that shouldn't be selectable, such as line numbers or
+   shell prompts. Guess which browser this doesn't work in. */
+.noselect {
+    -moz-user-select: -moz-none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
+    -o-user-select: none;
+    user-select: none;
+}
+
+/* -- Lists ----------------------------------------------------------------- */
+dd { margin: 0.2em 0 0.7em 1em; }
+dl { margin: 1em 0; }
+dt { font-weight: bold; }
+
+/* -- Tables ---------------------------------------------------------------- */
+caption, th { text-align: left; }
+
+table {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+td, th {
+    border: 1px solid #fff;
+    padding: 5px 12px;
+    vertical-align: top;
+}
+
+td { background: #E6E9F5; }
+td dl { margin: 0; }
+td dl dl { margin: 1em 0; }
+td pre:first-child { margin-top: 0; }
+
+th {
+    background: #D2D7E6;/*#97A0BF*/
+    border-bottom: none;
+    border-top: none;
+    color: #000;/*#FFF1D5*/
+    font-family: 'Trebuchet MS', sans-serif;
+    font-weight: bold;
+    line-height: 1.3;
+    white-space: nowrap;
+}
+
+
+/* -- Layout and Content ---------------------------------------------------- */
+#doc {
+    margin: auto;
+    min-width: 1024px;
+}
+
+.content { padding: 0 20px 0 25px; }
+
+.sidebar {
+    padding: 0 15px 0 10px;
+}
+#bd {
+    padding: 7px 0 130px;
+    position: relative;
+    width: 99%;
+}
+
+/* -- Table of Contents ----------------------------------------------------- */
+
+/* The #toc id refers to the single global table of contents, while the .toc
+   class refers to generic TOC lists that could be used throughout the page. */
+
+.toc code, .toc kbd, .toc samp { font-size: 100%; }
+.toc li { font-weight: bold; }
+.toc li li { font-weight: normal; }
+
+/* -- Intro and Example Boxes ----------------------------------------------- */
+/*
+.intro, .example { margin-bottom: 2em; }
+.example {
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: 0 0 5px #bfbfbf;
+    -webkit-box-shadow: 0 0 5px #bfbfbf;
+    box-shadow: 0 0 5px #bfbfbf;
+    padding: 1em;
+}
+.intro {
+    background: none repeat scroll 0 0 #F0F1F8; border: 1px solid #D4D8EB; padding: 0 1em;
+}
+*/
+
+/* -- Other Styles ---------------------------------------------------------- */
+
+/* These are probably YUI-specific, and should be moved out of Selleck's default
+   theme. */
+
+.button {
+    border: 1px solid #dadada;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    color: #444;
+    display: inline-block;
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 92.308%;
+    font-weight: bold;
+    padding: 4px 13px 3px;
+    -moz-text-shadow: 1px 1px 0 #fff;
+    -webkit-text-shadow: 1px 1px 0 #fff;
+    text-shadow: 1px 1px 0 #fff;
+    white-space: nowrap;
+
+    background: #EFEFEF; /* old browsers */
+    background: -moz-linear-gradient(top, #f5f5f5 0%, #efefef 50%, #e5e5e5 51%, #dfdfdf 100%); /* firefox */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(50%,#efefef), color-stop(51%,#e5e5e5), color-stop(100%,#dfdfdf)); /* webkit */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#dfdfdf',GradientType=0 ); /* ie */
+}
+
+.button:hover {
+    border-color: #466899;
+    color: #fff;
+    text-decoration: none;
+    -moz-text-shadow: 1px 1px 0 #222;
+    -webkit-text-shadow: 1px 1px 0 #222;
+    text-shadow: 1px 1px 0 #222;
+
+    background: #6396D8; /* old browsers */
+    background: -moz-linear-gradient(top, #6396D8 0%, #5A83BC 50%, #547AB7 51%, #466899 100%); /* firefox */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#6396D8), color-stop(50%,#5A83BC), color-stop(51%,#547AB7), color-stop(100%,#466899)); /* webkit */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6396D8', endColorstr='#466899',GradientType=0 ); /* ie */
+}
+
+.newwindow { text-align: center; }
+
+.header .version em {
+    display: block;
+    text-align: right;
+}
+
+
+#classdocs .item {
+    border-bottom: 1px solid #466899;
+    margin: 1em 0;
+    padding: 1.5em;
+}
+
+#classdocs .item .params p,
+    #classdocs .item .returns p,{
+    display: inline;
+}
+
+#classdocs .item em code, #classdocs .item em.comment {
+    color: green;
+}
+
+#classdocs .item em.comment a {
+    color: green;
+    text-decoration: underline;
+}
+
+#classdocs .foundat {
+    font-size: 11px;
+    font-style: normal;
+}
+
+.attrs .emits {
+    margin-left: 2em;
+    padding: .5em;
+    border-left: 1px dashed #ccc;
+}
+
+abbr {
+    border-bottom: 1px dashed #ccc;
+    font-size: 80%;
+    cursor: help;
+}
+
+.prettyprint li.L0, 
+.prettyprint li.L1, 
+.prettyprint li.L2, 
+.prettyprint li.L3, 
+.prettyprint li.L5, 
+.prettyprint li.L6, 
+.prettyprint li.L7, 
+.prettyprint li.L8 {
+    list-style: decimal;
+}
+
+ul li p {
+    margin-top: 0;
+}
+
+.method .name {
+    font-size: 110%;
+}
+
+.apidocs .methods .extends .method,
+.apidocs .properties .extends .property,
+.apidocs .attrs .extends .attr,
+.apidocs .events .extends .event {
+    font-weight: bold;
+}
+
+.apidocs .methods .extends .inherited,
+.apidocs .properties .extends .inherited,
+.apidocs .attrs .extends .inherited,
+.apidocs .events .extends .inherited {
+    font-weight: normal;
+}
+
+#hd {
+    background: whiteSmoke;
+    background: -moz-linear-gradient(top,#DCDBD9 0,#F6F5F3 100%);
+    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#DCDBD9),color-stop(100%,#F6F5F3));
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dcdbd9',endColorstr='#F6F5F3',GradientType=0);
+    border-bottom: 1px solid #DFDFDF;
+    padding: 0 15px 1px 20px;
+    margin-bottom: 15px;
+}
+
+#hd img {
+    margin-right: 10px;
+    vertical-align: middle;
+}
+
+
+/* -- API Docs CSS ---------------------------------------------------------- */
+
+/*
+This file is organized so that more generic styles are nearer the top, and more
+specific styles are nearer the bottom of the file. This allows us to take full
+advantage of the cascade to avoid redundant style rules. Please respect this
+convention when making changes.
+*/
+
+/* -- Generic TabView styles ------------------------------------------------ */
+
+/*
+These styles apply to all API doc tabviews. To change styles only for a
+specific tabview, see the other sections below.
+*/
+
+.yui3-js-enabled .apidocs .tabview {
+    visibility: hidden; /* Hide until the TabView finishes rendering. */
+    _visibility: visible;
+}
+
+.apidocs .tabview.yui3-tabview-content { visibility: visible; }
+.apidocs .tabview .yui3-tabview-panel { background: #fff; }
+
+/* -- Generic Content Styles ------------------------------------------------ */
+
+/* Headings */
+h2, h3, h4, h5, h6 {
+    border: none;
+    color: #30418C;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+.link-docs {
+    float: right;
+    font-size: 15px;
+    margin: 4px 4px 6px;
+    padding: 6px 30px 5px;
+}
+
+.apidocs { zoom: 1; }
+
+/* Generic box styles. */
+.apidocs .box {
+    border: 1px solid;
+    border-radius: 3px;
+    margin: 1em 0;
+    padding: 0 1em;
+}
+
+/* A flag is a compact, capsule-like indicator of some kind. It's used to
+   indicate private and protected items, item return types, etc. in an
+   attractive and unobtrusive way. */
+.apidocs .flag {
+    background: #bababa;
+    border-radius: 3px;
+    color: #fff;
+    font-size: 11px;
+    margin: 0 0.5em;
+    padding: 2px 4px 1px;
+}
+
+/* Class/module metadata such as "Uses", "Extends", "Defined in", etc. */
+.apidocs .meta {
+    background: #f9f9f9;
+    border-color: #efefef;
+    color: #555;
+    font-size: 11px;
+    padding: 3px 6px;
+}
+
+.apidocs .meta p { margin: 0; }
+
+/* Deprecation warning. */
+.apidocs .box.deprecated,
+.apidocs .flag.deprecated {
+    background: #fdac9f;
+    border: 1px solid #fd7775;
+}
+
+.apidocs .box.deprecated p { margin: 0.5em 0; }
+.apidocs .flag.deprecated { color: #333; }
+
+/* Module/Class intro description. */
+.apidocs .intro {
+    background: #f0f1f8;
+    border-color: #d4d8eb;
+}
+
+/* Loading spinners. */
+#bd.loading .apidocs,
+#api-list.loading .yui3-tabview-panel {
+    background: #fff url(../img/spinner.gif) no-repeat center 70px;
+    min-height: 150px;
+}
+
+#bd.loading .apidocs .content,
+#api-list.loading .yui3-tabview-panel .apis {
+    display: none;
+}
+
+.apidocs .no-visible-items { color: #666; }
+
+/* Generic inline list. */
+.apidocs ul.inline {
+    display: inline;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+.apidocs ul.inline li { display: inline; }
+
+/* Comma-separated list. */
+.apidocs ul.commas li:after { content: ','; }
+.apidocs ul.commas li:last-child:after { content: ''; }
+
+/* Keyboard shortcuts. */
+kbd .cmd { font-family: Monaco, Helvetica; }
+
+/* -- Generic Access Level styles ------------------------------------------- */
+.apidocs .item.protected,
+.apidocs .item.private,
+.apidocs .index-item.protected,
+.apidocs .index-item.deprecated,
+.apidocs .index-item.private {
+    display: none;
+}
+
+.show-deprecated .item.deprecated,
+.show-deprecated .index-item.deprecated,
+.show-protected .item.protected,
+.show-protected .index-item.protected,
+.show-private .item.private,
+.show-private .index-item.private {
+    display: block;
+}
+
+.hide-inherited .item.inherited,
+.hide-inherited .index-item.inherited {
+    display: none;
+}
+
+/* -- Generic Item Index styles --------------------------------------------- */
+.apidocs .index { margin: 1.5em 0 3em; }
+
+.apidocs .index h3 {
+    border-bottom: 1px solid #efefef;
+    color: #333;
+    font-size: 13px;
+    margin: 2em 0 0.6em;
+    padding-bottom: 2px;
+}
+
+.apidocs .index .no-visible-items { margin-top: 2em; }
+
+.apidocs .index-list {
+    border-color: #efefef;
+    font-size: 12px;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    -moz-column-count: 4;
+    -moz-column-gap: 10px;
+    -moz-column-width: 170px;
+    -ms-column-count: 4;
+    -ms-column-gap: 10px;
+    -ms-column-width: 170px;
+    -o-column-count: 4;
+    -o-column-gap: 10px;
+    -o-column-width: 170px;
+    -webkit-column-count: 4;
+    -webkit-column-gap: 10px;
+    -webkit-column-width: 170px;
+    column-count: 4;
+    column-gap: 10px;
+    column-width: 170px;
+}
+
+.apidocs .no-columns .index-list {
+    -moz-column-count: 1;
+    -ms-column-count: 1;
+    -o-column-count: 1;
+    -webkit-column-count: 1;
+    column-count: 1;
+}
+
+.apidocs .index-item { white-space: nowrap; }
+
+.apidocs .index-item .flag {
+    background: none;
+    border: none;
+    color: #afafaf;
+    display: inline;
+    margin: 0 0 0 0.2em;
+    padding: 0;
+}
+
+/* -- Generic API item styles ----------------------------------------------- */
+.apidocs .args {
+    display: inline;
+    margin: 0 0.5em;
+}
+
+.apidocs .flag.chainable { background: #46ca3b; }
+.apidocs .flag.protected { background: #9b86fc; }
+.apidocs .flag.private { background: #fd6b1b; }
+.apidocs .flag.async { background: #356de4; }
+.apidocs .flag.required { background: #e60923; }
+
+.apidocs .item {
+    border-bottom: 1px solid #efefef;
+    margin: 1.5em 0 2em;
+    padding-bottom: 2em;
+}
+
+.apidocs .item h4,
+.apidocs .item h5,
+.apidocs .item h6 {
+    color: #333;
+    font-family: inherit;
+    font-size: 100%;
+}
+
+.apidocs .item .description p,
+.apidocs .item pre.code {
+    margin: 1em 0 0;
+}
+
+.apidocs .item .meta {
+    background: none;
+    border: none;
+    padding: 0;
+}
+
+.apidocs .item .name {
+    display: inline;
+    font-size: 14px;
+}
+
+.apidocs .item .type,
+.apidocs .item .type a,
+.apidocs .returns-inline {
+    color: #555;
+}
+
+.apidocs .item .type,
+.apidocs .returns-inline {
+    font-size: 11px;
+    margin: 0 0 0 0;
+}
+
+.apidocs .item .type a { border-bottom: 1px dotted #afafaf; }
+.apidocs .item .type a:hover { border: none; }
+
+/* -- Item Parameter List --------------------------------------------------- */
+.apidocs .params-list {
+    list-style: square;
+    margin: 1em 0 0 2em;
+    padding: 0;
+}
+
+.apidocs .param { margin-bottom: 1em; }
+
+.apidocs .param .type,
+.apidocs .param .type a {
+    color: #666;
+}
+
+.apidocs .param .type {
+    margin: 0 0 0 0.5em;
+    *margin-left: 0.5em;
+}
+
+.apidocs .param-name { font-weight: bold; }
+
+/* -- Item "Emits" block ---------------------------------------------------- */
+.apidocs .item .emits {
+    background: #f9f9f9;
+    border-color: #eaeaea;
+}
+
+/* -- Item "Returns" block -------------------------------------------------- */
+.apidocs .item .returns .type,
+.apidocs .item .returns .type a {
+    font-size: 100%;
+    margin: 0;
+}
+
+/* -- Class Constructor block ----------------------------------------------- */
+.apidocs .constructor .item {
+    border: none;
+    padding-bottom: 0;
+}
+
+/* -- File Source View ------------------------------------------------------ */
+.apidocs .file pre.code,
+#doc .apidocs .file pre.prettyprint {
+    background: inherit;
+    border: none;
+    overflow: visible;
+    padding: 0;
+}
+
+.apidocs .L0,
+.apidocs .L1,
+.apidocs .L2,
+.apidocs .L3,
+.apidocs .L4,
+.apidocs .L5,
+.apidocs .L6,
+.apidocs .L7,
+.apidocs .L8,
+.apidocs .L9 {
+    background: inherit;
+}
+
+/* -- Submodule List -------------------------------------------------------- */
+.apidocs .module-submodule-description {
+    font-size: 12px;
+    margin: 0.3em 0 1em;
+}
+
+.apidocs .module-submodule-description p:first-child { margin-top: 0; }
+
+/* -- Sidebar TabView ------------------------------------------------------- */
+#api-tabview { margin-top: 0.6em; }
+
+#api-tabview-filter,
+#api-tabview-panel {
+    border: 1px solid #dfdfdf;
+}
+
+#api-tabview-filter {
+    border-bottom: none;
+    border-top: none;
+    padding: 0.6em 10px 0 10px;
+}
+
+#api-tabview-panel { border-top: none; }
+#api-filter { width: 97%; }
+
+/* -- Content TabView ------------------------------------------------------- */
+#classdocs .yui3-tabview-panel { border: none; }
+
+/* -- Source File Contents -------------------------------------------------- */
+.prettyprint li.L0,
+.prettyprint li.L1,
+.prettyprint li.L2,
+.prettyprint li.L3,
+.prettyprint li.L5,
+.prettyprint li.L6,
+.prettyprint li.L7,
+.prettyprint li.L8 {
+    list-style: decimal;
+}
+
+/* -- API options ----------------------------------------------------------- */
+#api-options {
+    font-size: 11px;
+    margin-top: 2.2em;
+    position: absolute;
+    right: 1.5em;
+}
+
+/*#api-options label { margin-right: 0.6em; }*/
+
+/* -- API list -------------------------------------------------------------- */
+#api-list {
+    margin-top: 1.5em;
+    *zoom: 1;
+}
+
+.apis {
+    font-size: 12px;
+    line-height: 1.4;
+    list-style: none;
+    margin: 0;
+    padding: 0.5em 0 0.5em 0.4em;
+}
+
+.apis a {
+    border: 1px solid transparent;
+    display: block;
+    margin: 0 0 0 -4px;
+    padding: 1px 4px 0;
+    text-decoration: none;
+    _border: none;
+    _display: inline;
+}
+
+.apis a:hover,
+.apis a:focus {
+    background: #E8EDFC;
+    background: -moz-linear-gradient(top, #e8edfc 0%, #becef7 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E8EDFC), color-stop(100%,#BECEF7));
+    border-color: #AAC0FA;
+    border-radius: 3px;
+    color: #333;
+    outline: none;
+}
+
+.api-list-item a:hover,
+.api-list-item a:focus {
+    font-weight: bold;
+    text-shadow: 1px 1px 1px #fff;
+}
+
+.apis .message { color: #888; }
+.apis .result a { padding: 3px 5px 2px; }
+
+.apis .result .type {
+    right: 4px;
+    top: 7px;
+}
+
+.api-list-item .yui3-highlight {
+    font-weight: bold;
+}
+
diff --git a/docs/assets/favicon.png b/docs/assets/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a95ddab6ff6735b52596ecea54f2b68298cae91
GIT binary patch
literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0004@P)t-s0000{
zX|Ygfu`xl0C^>~sYqK3Gcus4xPHVF@NRlx_jU+UHO>DGCVWd%Mvj6}8PiwO?MUOK>
zh#e_-OJS-kK8Z|Xt0XgkGe(eqj=e%xpEO30J581!Eqg~?q%T2?Ek21)YqKpribYwO
zO>DFvE_`l(vNA-DP-?S5PK0`q!bDh@Mq8vgOqNb&rhJXTL|2zvaI{oyv}%RBafiZK
zXPjk$xItE*Ls+3FH-t7xlT2l%b%(okjlX(}z(iM=T5+{UVWUxLu~2HVQ*5(wfwpIY
zx^suTO<$u_Wt}fTi)DPfVSTqxX0Jh2pF>!pWqY$FG=V!yh%`o#I!lpBUZ_i9sy$Mh
zbd0`wjKM-wmsoDGM_{8+Xt7mktWRsRQE9SmezIwQzG;8GYk{~+U!725o-93xU~{x&
zdA3hxu0U0uNL!j<bFv{XeKA9hF++_rMvyyCnMhrwNM5H-Vx>G$nRJA=b%wh=O^H2C
zi#SY{S8At7V4_fHuux~PPinJicdKW6vS@y|OI(^NI)+?xw@qZNU~r`!DtSIqoCqvd
zm;e9(D|Av$Qve|DfN(%S$B)~`AYc$64eo$|fIvW?+sFBE5P*O{KtQ1G#~^@FK%hjn
zkdomz0002TNkl<Z7?opSfCEMmDH$PV7>`w>G^{kLDnt;%<*|0o$}R6`^xy<@RoEM1
zqurZYT;p`r!P4>0S(y=fId&Oc5+FWDLu^>Hac!Eup}&<pkgw>RRh(iLlN#v|TEqoX
z5F2J5;1i==(bn!4tN;>_E30vHG)PRY)6s2(SgB^~Xzyu~5Z0B?0uj)%)~>X1@wKpO
z<%S6GDhHV+Ih7Q7iNigiX=l`)U1%u_7vT4<*Qrj=V?+3pPb|D3u#*89NQ<fpLs$T#
WD=i+B1us|t0000<MNUMnLSTZr5j8&m

literal 0
HcmV?d00001

diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..44f96ba68c8910d19f49e8365bf589ee4e6991e4
GIT binary patch
literal 2685
zcmeH{YfzJC8iv0w0RzSmAjy&hC;`H$F$shaAO<od`S>6#w1ZBuqOP1eV&xzQwK$cK
zkb?<_1QC!z6+{~vj><7mpp+3&q{5Dt1$U9<3{C|V26e`6+}0U?@ONkSN8g|C`^+=f
zec#XX!r`F-fpJ8D2y6j>udlD4pC5<AiH(gtdh}>oT3UK~dPYWuR4SFpWW~kBI-Ty)
zrAvCf-e52^Ha2#4cJ}o23=R&CjEszqjy`(yXliO|W@ct?Ztm&Rr_Y~1-`w1M{ra`P
zzkftTL}X-Se0+RDLPBO{W_EUVPEL+SqbVvXDlILot*vcoY3b|h8y+6Md-v|chYzQx
zr)Otp7Z(>-R#u)pd$zv5zO}Wry}hkaD7w13`uqDQCnp;k8k(A#mX?;**48#QHr~8>
zlai8BUtizc+}zvSJ3l}F;>C+2M~>XPckkuPmqw%U)vH&B4<82pkB{?j=qTvGeqqR`
z5R2iB1Wl->t8k$(8WzAl-af1_0N4}u*W}bRgf#%9q-JH99w-MtKSV)|0SLen*ai3i
zKwLs*dgT7l1Mh@}LqbZXsptdIrmkC${_G3<>BH|s@jv$AEj=<WF^LlY6(u4gE;BhL
zIU|k|m2@KEc+%-OiszX#XBa2b;u4cnzer=GCS`d6&aceC-GC#o_Z{84e+e+JIOb85
znEdS*?htuZec8qg-YSW`ovrgm>AulRJ-t~vQzbstTBdj1f9x+OI}c{HEGJTIo)-S3
zvXu@V5Ze5s?o^rjP2oAJZBgJ43EeZab1q+7T3AZ*>`$M~Ip=VyAkWdBfV0!N;IWlu
zD(gxt-qC?f-Y0OdwW^d52?XMe&uMsja#IsM*&(x|vpcV`xxBXSr!40`V8IVychwC@
z(!=(Wi*J)OEFo9!i_1H9B3S81`;tp(L9|zFZVRfT#e-Mxsdc=o%{qm6GUnDq8#@+w
z>zp9;^*C*b0a>)OpldGR<O6#t@SzyTT&f@J`!N<@1+g(M?%tt(-rlt_^?R|{y^T#m
zpVn4=yQs6v*dy?3x!E@GeZv6k$6~TZMBelXX^$Ucg3kO|z?>YLW-}Rgrhi;mT3&%e
zb^^cg9z2rK8N!u+qrAU$JXq=Q<ycwRWCj=&IyV}YijR`7H6{|}qP06Z-mjM;6Q&+u
z-&%eqviCoO#ew#OuRwGz5=DaX3cFB$v)nxnust1TR|PrvqcJ6+<ir?|6cC_~BWj4X
zVI&j)pbTUJU1JFIHyQ&3eHy|bJY;kn7Th8bV@T#ko#^|HB>$F%*?-T?FD#nCSJ%RJ
zM8EzX-KiKhdEPdX+W9(2!>6Tj7tGHG(@GXIHcI#ZvuG)z`cvk-VdBK*c|$UxeEHgt
zh|eHoo#Hc@pK-so^azG|S%hK;SFlf#7sO=2{OEwvn5bYJuJ)RU<z{B)uCE7aW=NzN
zzEwnPZ^U&A4IRz>!t37+vAHhjqeCDD7^hxtbsYzs?)RgAac-&SQ9q*ejs5N9;>zmK
zPUNUo2`H82%N0r`1gQ%0iFCS%U#Nn#S`7$YER~j(tMN9rtZI;7tOElDR#vuErF^v%
z*JNdL`G(A{(F)h2u*1<?f6Rvh1C7H_2!~@e+C%49Sa9ryr4J`Lfzy>gkN>^r%0ek*
zgATbqYlGa_bGv|KZA}7qZy-^>7P2IOH6RK_p0{{FP*Z?`0Sgup2zfAw7b+2os*;)q
z+5#lPY#aSu@*Qn1b)Pw6htWZ`zgMBUpw<*<ObYlS1~W`6529Bx%kxE*bVhMC$hs=3
zld+gV_3{$twK_fxi-m8Ni#o7g`Z{JWw!fMWcXTzCh`OaBcNa`qGamafS;?mYfFnkM
z=U7^L-3LWZj{#RcnMPxQ*f|b*Qck9<Zn=db-N*;1*2?%pHLet%cKOuM4B!g0>kdk!
zI2X()g6*)r9wu>OjUHjg4XG}it7AJ{SYC~${GkN#!S<pI62$L${8vd~QL$E6a<NoJ
z5{8os#1NEELV=)prCMalNoH&MIl*u>q}P9oXlOJoAHCyhZJk<7)Dy2%T-Q`9NtoT?
zY$ef_KCTe&F^x^D+|KF=eiSu@+>KzjBXCcw!o>=<#ex+Z!{Kbw1y5|(6?AL-F>Q@`
zuo>r&XN^`QxOtZJWT7R`yM{vkjX0hzY5o_L9GG#?(B^5qQxb*`lhBZP;sO;+aia2c
zCaZudbVWYTsS0qtA`?@uVQ$EHXcr9BK!#y*gOuzZfplYa;d_x0w1J4;p)O;uTj$;O
zv99g_E?%o3GlPCna4l!>3Kn6$TmgB^SaLxzk9U(vpJzOlL7uAtVwlUNiF4YB+lX<^
pE|2Kr%d?-r>ImN9F0EXz^8E;tU2&^Zb%igPc${)^%gY+r_aA#xUsC`8

literal 0
HcmV?d00001

diff --git a/docs/assets/index.html b/docs/assets/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/assets/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
new file mode 100644
index 0000000000..37aefbab98
--- /dev/null
+++ b/docs/assets/js/api-filter.js
@@ -0,0 +1,52 @@
+YUI.add('api-filter', function (Y) {
+
+Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {
+    // -- Initializer ----------------------------------------------------------
+    initializer: function () {
+        this._bindUIACBase();
+        this._syncUIACBase();
+    },
+    getDisplayName: function(name) {
+
+        Y.each(Y.YUIDoc.meta.allModules, function(i) {
+            if (i.name === name && i.displayName) {
+                name = i.displayName;
+            }
+        });
+
+        return name;
+    }
+
+}, {
+    // -- Attributes -----------------------------------------------------------
+    ATTRS: {
+        resultHighlighter: {
+            value: 'phraseMatch'
+        },
+
+        // May be set to "classes" or "modules".
+        queryType: {
+            value: 'classes'
+        },
+
+        source: {
+            valueFn: function() {
+                var self = this;
+                return function(q) {
+                    var data = Y.YUIDoc.meta[self.get('queryType')],
+                        out = [];
+                    Y.each(data, function(v) {
+                        if (v.toLowerCase().indexOf(q.toLowerCase()) > -1) {
+                            out.push(v);
+                        }
+                    });
+                    return out;
+                };
+            }
+        }
+    }
+});
+
+}, '3.4.0', {requires: [
+    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources'
+]});
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
new file mode 100644
index 0000000000..88905b52ea
--- /dev/null
+++ b/docs/assets/js/api-list.js
@@ -0,0 +1,251 @@
+YUI.add('api-list', function (Y) {
+
+var Lang   = Y.Lang,
+    YArray = Y.Array,
+
+    APIList = Y.namespace('APIList'),
+
+    classesNode    = Y.one('#api-classes'),
+    inputNode      = Y.one('#api-filter'),
+    modulesNode    = Y.one('#api-modules'),
+    tabviewNode    = Y.one('#api-tabview'),
+
+    tabs = APIList.tabs = {},
+
+    filter = APIList.filter = new Y.APIFilter({
+        inputNode : inputNode,
+        maxResults: 1000,
+
+        on: {
+            results: onFilterResults
+        }
+    }),
+
+    search = APIList.search = new Y.APISearch({
+        inputNode : inputNode,
+        maxResults: 100,
+
+        on: {
+            clear  : onSearchClear,
+            results: onSearchResults
+        }
+    }),
+
+    tabview = APIList.tabview = new Y.TabView({
+        srcNode  : tabviewNode,
+        panelNode: '#api-tabview-panel',
+        render   : true,
+
+        on: {
+            selectionChange: onTabSelectionChange
+        }
+    }),
+
+    focusManager = APIList.focusManager = tabviewNode.plug(Y.Plugin.NodeFocusManager, {
+        circular   : true,
+        descendants: '#api-filter, .yui3-tab-panel-selected .api-list-item a, .yui3-tab-panel-selected .result a',
+        keys       : {next: 'down:40', previous: 'down:38'}
+    }).focusManager,
+
+    LIST_ITEM_TEMPLATE =
+        '<li class="api-list-item {typeSingular}">' +
+            '<a href="{rootPath}{typePlural}/{name}.html">{displayName}</a>' +
+        '</li>';
+
+// -- Init ---------------------------------------------------------------------
+
+// Duckpunch FocusManager's key event handling to prevent it from handling key
+// events when a modifier is pressed.
+Y.before(function (e, activeDescendant) {
+    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
+        return new Y.Do.Prevent();
+    }
+}, focusManager, '_focusPrevious', focusManager);
+
+Y.before(function (e, activeDescendant) {
+    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
+        return new Y.Do.Prevent();
+    }
+}, focusManager, '_focusNext', focusManager);
+
+// Create a mapping of tabs in the tabview so we can refer to them easily later.
+tabview.each(function (tab, index) {
+    var name = tab.get('label').toLowerCase();
+
+    tabs[name] = {
+        index: index,
+        name : name,
+        tab  : tab
+    };
+});
+
+// Switch tabs on Ctrl/Cmd-Left/Right arrows.
+tabviewNode.on('key', onTabSwitchKey, 'down:37,39');
+
+// Focus the filter input when the `/` key is pressed.
+Y.one(Y.config.doc).on('key', onSearchKey, 'down:83');
+
+// Keep the Focus Manager up to date.
+inputNode.on('focus', function () {
+    focusManager.set('activeDescendant', inputNode);
+});
+
+// Update all tabview links to resolved URLs.
+tabview.get('panelNode').all('a').each(function (link) {
+    link.setAttribute('href', link.get('href'));
+});
+
+// -- Private Functions --------------------------------------------------------
+function getFilterResultNode() {
+    return filter.get('queryType') === 'classes' ? classesNode : modulesNode;
+}
+
+// -- Event Handlers -----------------------------------------------------------
+function onFilterResults(e) {
+    var frag         = Y.one(Y.config.doc.createDocumentFragment()),
+        resultNode   = getFilterResultNode(),
+        typePlural   = filter.get('queryType'),
+        typeSingular = typePlural === 'classes' ? 'class' : 'module';
+
+    if (e.results.length) {
+        YArray.each(e.results, function (result) {
+            frag.append(Lang.sub(LIST_ITEM_TEMPLATE, {
+                rootPath    : APIList.rootPath,
+                displayName : filter.getDisplayName(result.highlighted),
+                name        : result.text,
+                typePlural  : typePlural,
+                typeSingular: typeSingular
+            }));
+        });
+    } else {
+        frag.append(
+            '<li class="message">' +
+                'No ' + typePlural + ' found.' +
+            '</li>'
+        );
+    }
+
+    resultNode.empty(true);
+    resultNode.append(frag);
+
+    focusManager.refresh();
+}
+
+function onSearchClear(e) {
+
+    focusManager.refresh();
+}
+
+function onSearchKey(e) {
+    var target = e.target;
+
+    if (target.test('input,select,textarea')
+            || target.get('isContentEditable')) {
+        return;
+    }
+
+    e.preventDefault();
+
+    inputNode.focus();
+    focusManager.refresh();
+}
+
+function onSearchResults(e) {
+    var frag = Y.one(Y.config.doc.createDocumentFragment());
+
+    if (e.results.length) {
+        YArray.each(e.results, function (result) {
+            frag.append(result.display);
+        });
+    } else {
+        frag.append(
+            '<li class="message">' +
+                'No results found. Maybe you\'ll have better luck with a ' +
+                'different query?' +
+            '</li>'
+        );
+    }
+
+
+    focusManager.refresh();
+}
+
+function onTabSelectionChange(e) {
+    var tab  = e.newVal,
+        name = tab.get('label').toLowerCase();
+
+    tabs.selected = {
+        index: tab.get('index'),
+        name : name,
+        tab  : tab
+    };
+
+    switch (name) {
+    case 'classes': // fallthru
+    case 'modules':
+        filter.setAttrs({
+            minQueryLength: 0,
+            queryType     : name
+        });
+
+        search.set('minQueryLength', -1);
+
+        // Only send a request if this isn't the initially-selected tab.
+        if (e.prevVal) {
+            filter.sendRequest(filter.get('value'));
+        }
+        break;
+
+    case 'everything':
+        filter.set('minQueryLength', -1);
+        search.set('minQueryLength', 1);
+
+        if (search.get('value')) {
+            search.sendRequest(search.get('value'));
+        } else {
+            inputNode.focus();
+        }
+        break;
+
+    default:
+        // WTF? We shouldn't be here!
+        filter.set('minQueryLength', -1);
+        search.set('minQueryLength', -1);
+    }
+
+    if (focusManager) {
+        setTimeout(function () {
+            focusManager.refresh();
+        }, 1);
+    }
+}
+
+function onTabSwitchKey(e) {
+    var currentTabIndex = tabs.selected.index;
+
+    if (!(e.ctrlKey || e.metaKey)) {
+        return;
+    }
+
+    e.preventDefault();
+
+    switch (e.keyCode) {
+    case 37: // left arrow
+        if (currentTabIndex > 0) {
+            tabview.selectChild(currentTabIndex - 1);
+            inputNode.focus();
+        }
+        break;
+
+    case 39: // right arrow
+        if (currentTabIndex < (Y.Object.size(tabs) - 2)) {
+            tabview.selectChild(currentTabIndex + 1);
+            inputNode.focus();
+        }
+        break;
+    }
+}
+
+}, '3.4.0', {requires: [
+    'api-filter', 'api-search', 'event-key', 'node-focusmanager', 'tabview'
+]});
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
new file mode 100644
index 0000000000..175f6a6179
--- /dev/null
+++ b/docs/assets/js/api-search.js
@@ -0,0 +1,98 @@
+YUI.add('api-search', function (Y) {
+
+var Lang   = Y.Lang,
+    Node   = Y.Node,
+    YArray = Y.Array;
+
+Y.APISearch = Y.Base.create('apiSearch', Y.Base, [Y.AutoCompleteBase], {
+    // -- Public Properties ----------------------------------------------------
+    RESULT_TEMPLATE:
+        '<li class="result {resultType}">' +
+            '<a href="{url}">' +
+                '<h3 class="title">{name}</h3>' +
+                '<span class="type">{resultType}</span>' +
+                '<div class="description">{description}</div>' +
+                '<span class="className">{class}</span>' +
+            '</a>' +
+        '</li>',
+
+    // -- Initializer ----------------------------------------------------------
+    initializer: function () {
+        this._bindUIACBase();
+        this._syncUIACBase();
+    },
+
+    // -- Protected Methods ----------------------------------------------------
+    _apiResultFilter: function (query, results) {
+        // Filter components out of the results.
+        return YArray.filter(results, function (result) {
+            return result.raw.resultType === 'component' ? false : result;
+        });
+    },
+
+    _apiResultFormatter: function (query, results) {
+        return YArray.map(results, function (result) {
+            var raw  = Y.merge(result.raw), // create a copy
+                desc = raw.description || '';
+
+            // Convert description to text and truncate it if necessary.
+            desc = Node.create('<div>' + desc + '</div>').get('text');
+
+            if (desc.length > 65) {
+                desc = Y.Escape.html(desc.substr(0, 65)) + ' &hellip;';
+            } else {
+                desc = Y.Escape.html(desc);
+            }
+
+            raw['class'] || (raw['class'] = '');
+            raw.description = desc;
+
+            // Use the highlighted result name.
+            raw.name = result.highlighted;
+
+            return Lang.sub(this.RESULT_TEMPLATE, raw);
+        }, this);
+    },
+
+    _apiTextLocator: function (result) {
+        return result.displayName || result.name;
+    }
+}, {
+    // -- Attributes -----------------------------------------------------------
+    ATTRS: {
+        resultFormatter: {
+            valueFn: function () {
+                return this._apiResultFormatter;
+            }
+        },
+
+        resultFilters: {
+            valueFn: function () {
+                return this._apiResultFilter;
+            }
+        },
+
+        resultHighlighter: {
+            value: 'phraseMatch'
+        },
+
+        resultListLocator: {
+            value: 'data.results'
+        },
+
+        resultTextLocator: {
+            valueFn: function () {
+                return this._apiTextLocator;
+            }
+        },
+
+        source: {
+            value: '/api/v1/search?q={query}&count={maxResults}'
+        }
+    }
+});
+
+}, '3.4.0', {requires: [
+    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources',
+    'escape'
+]});
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
new file mode 100644
index 0000000000..aad7e3d1f1
--- /dev/null
+++ b/docs/assets/js/apidocs.js
@@ -0,0 +1,363 @@
+YUI().use(
+    'yuidoc-meta',
+    'api-list', 'history-hash', 'node-screen', 'node-style', 'pjax',
+function (Y) {
+
+var win          = Y.config.win,
+    localStorage = win.localStorage,
+
+    bdNode = Y.one('#bd'),
+
+    pjax,
+    defaultRoute,
+
+    classTabView,
+    selectedTab;
+
+// Kill pjax functionality unless serving over HTTP.
+if (!Y.getLocation().protocol.match(/^https?\:/)) {
+    Y.Router.html5 = false;
+}
+
+// Create the default route with middleware which enables syntax highlighting
+// on the loaded content.
+defaultRoute = Y.Pjax.defaultRoute.concat(function (req, res, next) {
+    prettyPrint();
+    bdNode.removeClass('loading');
+
+    next();
+});
+
+pjax = new Y.Pjax({
+    container      : '#docs-main',
+    contentSelector: '#docs-main > .content',
+    linkSelector   : '#bd a',
+    titleSelector  : '#xhr-title',
+
+    navigateOnHash: true,
+    root          : '/',
+    routes        : [
+        // -- / ----------------------------------------------------------------
+        {
+            path     : '/(index.html)?',
+            callbacks: defaultRoute
+        },
+
+        // -- /classes/* -------------------------------------------------------
+        {
+            path     : '/classes/:class.html*',
+            callbacks: [defaultRoute, 'handleClasses']
+        },
+
+        // -- /files/* ---------------------------------------------------------
+        {
+            path     : '/files/*file',
+            callbacks: [defaultRoute, 'handleFiles']
+        },
+
+        // -- /modules/* -------------------------------------------------------
+        {
+            path     : '/modules/:module.html*',
+            callbacks: defaultRoute
+        }
+    ]
+});
+
+// -- Utility Functions --------------------------------------------------------
+
+pjax.checkVisibility = function (tab) {
+    tab || (tab = selectedTab);
+
+    if (!tab) { return; }
+
+    var panelNode = tab.get('panelNode'),
+        visibleItems;
+
+    // If no items are visible in the tab panel due to the current visibility
+    // settings, display a message to that effect.
+    visibleItems = panelNode.all('.item,.index-item').some(function (itemNode) {
+        if (itemNode.getComputedStyle('display') !== 'none') {
+            return true;
+        }
+    });
+
+    panelNode.all('.no-visible-items').remove();
+
+    if (!visibleItems) {
+        if (Y.one('#index .index-item')) {
+            panelNode.append(
+                '<div class="no-visible-items">' +
+                    '<p>' +
+                    'Some items are not shown due to the current visibility ' +
+                    'settings. Use the checkboxes at the upper right of this ' +
+                    'page to change the visibility settings.' +
+                    '</p>' +
+                '</div>'
+            );
+        } else {
+            panelNode.append(
+                '<div class="no-visible-items">' +
+                    '<p>' +
+                    'This class doesn\'t provide any methods, properties, ' +
+                    'attributes, or events.' +
+                    '</p>' +
+                '</div>'
+            );
+        }
+    }
+
+    // Hide index sections without any visible items.
+    Y.all('.index-section').each(function (section) {
+        var items        = 0,
+            visibleItems = 0;
+
+        section.all('.index-item').each(function (itemNode) {
+            items += 1;
+
+            if (itemNode.getComputedStyle('display') !== 'none') {
+                visibleItems += 1;
+            }
+        });
+
+        section.toggleClass('hidden', !visibleItems);
+        section.toggleClass('no-columns', visibleItems < 4);
+    });
+};
+
+pjax.initClassTabView = function () {
+    if (!Y.all('#classdocs .api-class-tab').size()) {
+        return;
+    }
+
+    if (classTabView) {
+        classTabView.destroy();
+        selectedTab = null;
+    }
+
+    classTabView = new Y.TabView({
+        srcNode: '#classdocs',
+
+        on: {
+            selectionChange: pjax.onTabSelectionChange
+        }
+    });
+
+    pjax.updateTabState();
+    classTabView.render();
+};
+
+pjax.initLineNumbers = function () {
+    var hash      = win.location.hash.substring(1),
+        container = pjax.get('container'),
+        hasLines, node;
+
+    // Add ids for each line number in the file source view.
+    container.all('.linenums>li').each(function (lineNode, index) {
+        lineNode.set('id', 'l' + (index + 1));
+        lineNode.addClass('file-line');
+        hasLines = true;
+    });
+
+    // Scroll to the desired line.
+    if (hasLines && /^l\d+$/.test(hash)) {
+        if ((node = container.getById(hash))) {
+            win.scroll(0, node.getY());
+        }
+    }
+};
+
+pjax.initRoot = function () {
+    var terminators = /^(?:classes|files|modules)$/,
+        parts       = pjax._getPathRoot().split('/'),
+        root        = [],
+        i, len, part;
+
+    for (i = 0, len = parts.length; i < len; i += 1) {
+        part = parts[i];
+
+        if (part.match(terminators)) {
+            // Makes sure the path will end with a "/".
+            root.push('');
+            break;
+        }
+
+        root.push(part);
+    }
+
+    pjax.set('root', root.join('/'));
+};
+
+pjax.updateTabState = function (src) {
+    var hash = win.location.hash.substring(1),
+        defaultTab, node, tab, tabPanel;
+
+    function scrollToNode() {
+        if (node.hasClass('protected')) {
+            Y.one('#api-show-protected').set('checked', true);
+            pjax.updateVisibility();
+        }
+
+        if (node.hasClass('private')) {
+            Y.one('#api-show-private').set('checked', true);
+            pjax.updateVisibility();
+        }
+
+        setTimeout(function () {
+            // For some reason, unless we re-get the node instance here,
+            // getY() always returns 0.
+            var node = Y.one('#classdocs').getById(hash);
+            win.scrollTo(0, node.getY() - 70);
+        }, 1);
+    }
+
+    if (!classTabView) {
+        return;
+    }
+
+    if (src === 'hashchange' && !hash) {
+        defaultTab = 'index';
+    } else {
+        if (localStorage) {
+            defaultTab = localStorage.getItem('tab_' + pjax.getPath()) ||
+                'index';
+        } else {
+            defaultTab = 'index';
+        }
+    }
+
+    if (hash && (node = Y.one('#classdocs').getById(hash))) {
+        if ((tabPanel = node.ancestor('.api-class-tabpanel', true))) {
+            if ((tab = Y.one('#classdocs .api-class-tab.' + tabPanel.get('id')))) {
+                if (classTabView.get('rendered')) {
+                    Y.Widget.getByNode(tab).set('selected', 1);
+                } else {
+                    tab.addClass('yui3-tab-selected');
+                }
+            }
+        }
+
+        // Scroll to the desired element if this is a hash URL.
+        if (node) {
+            if (classTabView.get('rendered')) {
+                scrollToNode();
+            } else {
+                classTabView.once('renderedChange', scrollToNode);
+            }
+        }
+    } else {
+        tab = Y.one('#classdocs .api-class-tab.' + defaultTab);
+
+        if (classTabView.get('rendered')) {
+            Y.Widget.getByNode(tab).set('selected', 1);
+        } else {
+            tab.addClass('yui3-tab-selected');
+        }
+    }
+};
+
+pjax.updateVisibility = function () {
+    var container = pjax.get('container');
+
+    container.toggleClass('hide-inherited',
+            !Y.one('#api-show-inherited').get('checked'));
+
+    container.toggleClass('show-deprecated',
+            Y.one('#api-show-deprecated').get('checked'));
+
+    container.toggleClass('show-protected',
+            Y.one('#api-show-protected').get('checked'));
+
+    container.toggleClass('show-private',
+            Y.one('#api-show-private').get('checked'));
+
+    pjax.checkVisibility();
+};
+
+// -- Route Handlers -----------------------------------------------------------
+
+pjax.handleClasses = function (req, res, next) {
+    var status = res.ioResponse.status;
+
+    if (status >= 200 && status < 300) {
+        pjax.initClassTabView();
+    }
+
+    next();
+};
+
+pjax.handleFiles = function (req, res, next) {
+    var status = res.ioResponse.status;
+
+    if (status >= 200 && status < 300) {
+        pjax.initLineNumbers();
+    }
+
+    next();
+};
+
+// -- Event Handlers -----------------------------------------------------------
+
+pjax.onNavigate = function (e) {
+    var hash         = e.hash,
+        originTarget = e.originEvent && e.originEvent.target,
+        tab;
+
+    if (hash) {
+        tab = originTarget && originTarget.ancestor('.yui3-tab', true);
+
+        if (hash === win.location.hash) {
+            pjax.updateTabState('hashchange');
+        } else if (!tab) {
+            win.location.hash = hash;
+        }
+
+        e.preventDefault();
+        return;
+    }
+
+    // Only scroll to the top of the page when the URL doesn't have a hash.
+    this.set('scrollToTop', !e.url.match(/#.+$/));
+
+    bdNode.addClass('loading');
+};
+
+pjax.onOptionClick = function (e) {
+    pjax.updateVisibility();
+};
+
+pjax.onTabSelectionChange = function (e) {
+    var tab   = e.newVal,
+        tabId = tab.get('contentBox').getAttribute('href').substring(1);
+
+    selectedTab = tab;
+
+    // If switching from a previous tab (i.e., this is not the default tab),
+    // replace the history entry with a hash URL that will cause this tab to
+    // be selected if the user navigates away and then returns using the back
+    // or forward buttons.
+    if (e.prevVal && localStorage) {
+        localStorage.setItem('tab_' + pjax.getPath(), tabId);
+    }
+
+    pjax.checkVisibility(tab);
+};
+
+// -- Init ---------------------------------------------------------------------
+
+pjax.on('navigate', pjax.onNavigate);
+
+pjax.initRoot();
+pjax.upgrade();
+pjax.initClassTabView();
+pjax.initLineNumbers();
+pjax.updateVisibility();
+
+Y.APIList.rootPath = pjax.get('root');
+
+Y.one('#api-options').delegate('click', pjax.onOptionClick, 'input');
+
+Y.on('hashchange', function (e) {
+    pjax.updateTabState('hashchange');
+}, win);
+
+});
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
new file mode 100644
index 0000000000..18de864953
--- /dev/null
+++ b/docs/assets/js/yui-prettify.js
@@ -0,0 +1,17 @@
+YUI().use('node', function(Y) {
+    var code = Y.all('.prettyprint.linenums');
+    if (code.size()) {
+        code.each(function(c) {
+            var lis = c.all('ol li'),
+                l = 1;
+            lis.each(function(n) {
+                n.prepend('<a name="LINENUM_' + l + '"></a>');
+                l++;
+            });
+        });
+        var h = location.hash;
+        location.hash = '';
+        h = h.replace('LINE_', 'LINENUM_');
+        location.hash = h;
+    }
+});
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
new file mode 100644
index 0000000000..b50b841499
--- /dev/null
+++ b/docs/assets/vendor/prettify/CHANGES.html
@@ -0,0 +1,130 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Change Log</title>
+  </head>
+  <body bgcolor="white">
+    <a style="float:right" href="README.html">README</a>
+
+    <h1>Known Issues</h1>
+    <ul>
+      <li>Perl formatting is really crappy.  Partly because the author is lazy and
+      partly because Perl is
+      <a href="http://www.perlmonks.org/?node_id=663393">hard</a> to parse.
+      <li>On some browsers, <code>&lt;code&gt;</code> elements with newlines in the text
+      which use CSS to specify <code>white-space:pre</code> will have the newlines
+      improperly stripped if the element is not attached to the document at the time
+      the stripping is done.  Also, on IE 6, all newlines will be stripped from
+      <code>&lt;code&gt;</code> elements because of the way IE6 produces
+      <code>innerHTML</code>.  Workaround: use <code>&lt;pre&gt;</code> for code with
+      newlines.
+    </ul>
+
+    <h1>Change Log</h1>
+    <h2>29 March 2007</h2>
+    <ul>
+      <li>Added <a href="tests/prettify_test.html#PHP">tests</a> for PHP support
+        to address 
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=3"
+       >issue 3</a>.
+      <li>Fixed
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=6"
+       >bug</a>: <code>prettyPrintOne</code> was not halting.  This was not
+        reachable through the normal entry point.
+      <li>Fixed
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=4"
+       >bug</a>: recursing into a script block or PHP tag that was not properly
+        closed would not silently drop the content.
+        (<a href="tests/prettify_test.html#issue4">test</a>)
+      <li>Fixed
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=8"
+       >bug</a>: was eating tabs
+        (<a href="tests/prettify_test.html#issue8">test</a>)
+      <li>Fixed entity handling so that the caveat
+        <blockquote>
+          <p>Caveats: please properly escape less-thans.  <tt>x&amp;lt;y</tt>
+          instead of <tt>x&lt;y</tt>, and use <tt>&quot;</tt> instead of 
+          <tt>&amp;quot;</tt> for string delimiters.</p>
+        </blockquote>
+        is no longer applicable.
+      <li>Added noisefree's C#
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=4"
+       >patch</a>
+      <li>Added a <a href="http://google-code-prettify.googlecode.com/files/prettify-small.zip">distribution</a> that has comments and
+        whitespace removed to reduce download size from 45.5kB to 12.8kB.
+    </ul>
+    <h2>4 Jul 2008</h2>
+    <ul>
+      <li>Added <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=17">language specific formatters</a> that are triggered by the presence
+      of a <code>lang-&lt;language-file-extension&gt;</code></li>
+      <li>Fixed <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=29">bug</a>: python handling of <code>'''string'''</code>
+      <li>Fixed bug: <code>/</code> in regex <code>[charsets] should not end regex</code>
+    </ul>
+    <h2>5 Jul 2008</h2>
+    <ul>
+      <li>Defined language extensions for Lisp and Lua</code>
+    </ul>
+    <h2>14 Jul 2008</h2>
+    <ul>
+      <li>Language handlers for F#, OCAML, SQL</code>
+      <li>Support for <code>nocode</code> spans to allow embedding of line
+      numbers and code annotations which should not be styled or otherwise
+      affect the tokenization of prettified code.
+      See the issue 22
+      <a href="tests/prettify_test.html#issue22">testcase</a>.</code>
+    </ul>
+    <h2>6 Jan 2009</h2>
+    <ul>
+      <li>Language handlers for Visual Basic, Haskell, CSS, and WikiText</li>
+      <li>Added <tt>.mxml</tt> extension to the markup style handler for
+        Flex <a href="http://en.wikipedia.org/wiki/MXML">MXML files</a>.  See
+        <a
+        href="http://code.google.com/p/google-code-prettify/issues/detail?id=37"
+        >issue 37</a>.
+      <li>Added <tt>.m</tt> extension to the C style handler so that Objective
+        C source files properly highlight.  See
+        <a
+        href="http://code.google.com/p/google-code-prettify/issues/detail?id=58"
+       >issue 58</a>.
+      <li>Changed HTML lexer to use the same embedded source mechanism as the
+        wiki language handler, and changed to use the registered
+        CSS handler for STYLE element content.
+    </ul>
+    <h2>21 May 2009</h2>
+    <ul>
+      <li>Rewrote to improve performance on large files.
+        See <a href="http://mikesamuel.blogspot.com/2009/05/efficient-parsing-in-javascript.html">benchmarks</a>.</li>
+      <li>Fixed bugs with highlighting of Haskell line comments, Lisp
+        number literals, Lua strings, C preprocessor directives,
+        newlines in Wiki code on Windows, and newlines in IE6.</li>
+    </ul>
+    <h2>14 August 2009</h2>
+    <ul>
+      <li>Fixed prettifying of <code>&lt;code&gt;</code> blocks with embedded newlines.
+    </ul>
+    <h2>3 October 2009</h2>
+    <ul>
+      <li>Fixed prettifying of XML/HTML tags that contain uppercase letters.
+    </ul>
+    <h2>19 July 2010</h2>
+    <ul>
+      <li>Added support for line numbers.  Bug
+        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=22"
+         >22</a></li>
+      <li>Added YAML support.  Bug
+        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=123"
+         >123</a></li>
+      <li>Added VHDL support courtesy Le Poussin.</li>
+      <li>IE performance improvements.  Bug
+        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=102"
+         >102</a> courtesy jacobly.</li>
+      <li>A variety of markup formatting fixes courtesy smain and thezbyg.</li>
+      <li>Fixed copy and paste in IE[678].
+      <li>Changed output to use <code>&amp;#160;</code> instead of
+        <code>&amp;nbsp;</code> so that the output works when embedded in XML.
+        Bug
+        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=108"
+         >108</a>.</li>
+    </ul>
+  </body>
+</html>
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/docs/assets/vendor/prettify/COPYING
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
new file mode 100644
index 0000000000..c6fe1a32c3
--- /dev/null
+++ b/docs/assets/vendor/prettify/README.html
@@ -0,0 +1,203 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+  <head>
+    <title>Javascript code prettifier</title>
+
+    <link href="src/prettify.css" type="text/css" rel="stylesheet" />
+
+    <script src="src/prettify.js" type="text/javascript"></script>
+
+    <style type="text/css">
+      body { margin-left: .5in }
+      h1, h2, h3, h4, .footer { margin-left: -.4in; }
+    </style>
+  </head>
+
+  <body onload="prettyPrint()" bgcolor="white">
+    <small style="float: right">Languages : <a href="README-zh-Hans.html">CH</a></small>
+    <h1>Javascript code prettifier</h1>
+
+    <h2>Setup</h2>
+    <ol>
+      <li><a href="http://code.google.com/p/google-code-prettify/downloads/list">Download</a> a distribution
+      <li>Include the script and stylesheets in your document
+        (you will need to make sure the css and js file are on your server, and
+         adjust the paths in the <tt>script</tt> and <tt>link</tt> tag)
+        <pre class="prettyprint">
+&lt;link href="prettify.css" type="text/css" rel="stylesheet" />
+&lt;script type="text/javascript" src="prettify.js">&lt;/script></pre>
+      <li>Add <code class="prettyprint lang-html">onload="prettyPrint()"</code> to your
+      document's body tag.
+      <li>Modify the stylesheet to get the coloring you prefer</li>
+    </ol>
+
+    <h2>Usage</h2>
+    <p>Put code snippets in
+    <tt>&lt;pre class="prettyprint"&gt;...&lt;/pre&gt;</tt>
+    or <tt>&lt;code class="prettyprint"&gt;...&lt;/code&gt;</tt>
+    and it will automatically be pretty printed.
+
+    <table summary="code examples">
+      <tr>
+        <th>The original
+        <th>Prettier
+      <tr>
+        <td><pre style="border: 1px solid #888;padding: 2px"
+             ><a name="voila1"></a>class Voila {
+public:
+  // Voila
+  static const string VOILA = "Voila";
+
+  // will not interfere with embedded <a href="#voila1">tags</a>.
+}</pre>
+
+        <td><pre class="prettyprint"><a name="voila2"></a>class Voila {
+public:
+  // Voila
+  static const string VOILA = "Voila";
+
+  // will not interfere with embedded <a href="#voila2">tags</a>.
+}</pre>
+    </table>
+
+    <h2>FAQ</h2>
+    <h3 id="langs">Which languages does it work for?</h3>
+    <p>The comments in <tt>prettify.js</tt> are authoritative but the lexer
+    should work on a number of languages including C and friends,
+    Java, Python, Bash, SQL, HTML, XML, CSS, Javascript, and Makefiles.
+    It works passably on Ruby, PHP, VB, and Awk and a decent subset of Perl
+    and Ruby, but, because of commenting conventions, doesn't work on
+    Smalltalk, or CAML-like languages.</p>
+
+    <p>LISPy languages are supported via an extension:
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lisp.js"
+     ><code>lang-lisp.js</code></a>.</p>
+    <p>And similarly for
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-css.js"
+     ><code>CSS</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-hs.js"
+     ><code>Haskell</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lua.js"
+     ><code>Lua</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-ml.js"
+     ><code>OCAML, SML, F#</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-vb.js"
+     ><code>Visual Basic</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-sql.js"
+     ><code>SQL</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-proto.js"
+     ><code>Protocol Buffers</code></a>, and
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-wiki.js"
+     ><code>WikiText</code></a>..
+
+    <p>If you'd like to add an extension for your favorite language, please
+    look at <tt>src/lang-lisp.js</tt> and file an
+    <a href="http://code.google.com/p/google-code-prettify/issues/list"
+     >issue</a> including your language extension, and a testcase.</p>
+
+    <h3>How do I specify which language my code is in?</h3>
+    <p>You don't need to specify the language since <code>prettyprint()</code>
+    will guess.  You can specify a language by specifying the language extension
+    along with the <code>prettyprint</code> class like so:</p>
+    <pre class="prettyprint lang-html"
+>&lt;pre class=&quot;prettyprint <b>lang-html</b>&quot;&gt;
+  The lang-* class specifies the language file extensions.
+  File extensions supported by default include
+    "bsh", "c", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html",
+    "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh",
+    "xhtml", "xml", "xsl".
+&lt;/pre&gt;</pre>
+
+    <h3>It doesn't work on <tt>&lt;obfuscated code sample&gt;</tt>?</h3>
+    <p>Yes.  Prettifying obfuscated code is like putting lipstick on a pig
+    &mdash; i.e. outside the scope of this tool.</p>
+
+    <h3>Which browsers does it work with?</h3>
+    <p>It's been tested with IE 6, Firefox 1.5 &amp; 2, and Safari 2.0.4.
+    Look at <a href="tests/prettify_test.html">the test page</a> to see if it
+    works in your browser.</p>
+
+    <h3>What's changed?</h3>
+    <p>See the <a href="CHANGES.html">change log</a></p>
+
+    <h3>Why doesn't Prettyprinting of strings work on WordPress?</h3>
+    <p>Apparently wordpress does "smart quoting" which changes close quotes.
+    This causes end quotes to not match up with open quotes.
+    <p>This breaks prettifying as well as copying and pasting of code samples.
+    See
+    <a href="http://wordpress.org/support/topic/125038"
+    >WordPress's help center</a> for info on how to stop smart quoting of code
+    snippets.</p>
+
+    <h3 id="linenums">How do I put line numbers in my code?</h3>
+    <p>You can use the <code>linenums</code> class to turn on line
+    numbering.  If your code doesn't start at line number 1, you can
+    add a colon and a line number to the end of that class as in
+    <code>linenums:52</code>.
+
+    <p>For example
+<pre class="prettyprint">&lt;pre class="prettyprint linenums:<b>4</b>"
+&gt;// This is line 4.
+foo();
+bar();
+baz();
+boo();
+far();
+faz();
+&lt;pre&gt;</pre>
+    produces
+<pre class="prettyprint linenums:4"
+>// This is line 4.
+foo();
+bar();
+baz();
+boo();
+far();
+faz();
+</pre>
+
+    <h3>How do I prevent a portion of markup from being marked as code?</h3>
+    <p>You can use the <code>nocode</code> class to identify a span of markup
+    that is not code.
+<pre class="prettyprint">&lt;pre class=prettyprint&gt;
+int x = foo();  /* This is a comment  &lt;span class="nocode"&gt;This is not code&lt;/span&gt;
+  Continuation of comment */
+int y = bar();
+&lt;/pre&gt;</pre>
+produces
+<pre class="prettyprint">
+int x = foo();  /* This is a comment  <span class="nocode">This is not code</span>
+  Continuation of comment */
+int y = bar();
+</pre>
+
+    <p>For a more complete example see the issue22
+    <a href="tests/prettify_test.html#issue22">testcase</a>.</p>
+
+    <h3>I get an error message "a is not a function" or "opt_whenDone is not a function"</h3>
+    <p>If you are calling <code>prettyPrint</code> via an event handler, wrap it in a function.
+    Instead of doing
+    <blockquote>
+      <code class="prettyprint lang-js"
+       >addEventListener('load', prettyPrint, false);</code>
+    </blockquote>
+    wrap it in a closure like
+    <blockquote>
+      <code class="prettyprint lang-js"
+       >addEventListener('load', function (event) { prettyPrint() }, false);</code>
+    </blockquote>
+    so that the browser does not pass an event object to <code>prettyPrint</code> which
+    will confuse it.
+
+    <br><br><br>
+
+    <div class="footer">
+<!-- Created: Tue Oct  3 17:51:56 PDT 2006 -->
+<!-- hhmts start -->
+Last modified: Wed Jul 19 13:56:00 PST 2010
+<!-- hhmts end -->
+    </div>
+  </body>
+</html>
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
new file mode 100644
index 0000000000..d44b3a2282
--- /dev/null
+++ b/docs/assets/vendor/prettify/prettify-min.css
@@ -0,0 +1 @@
+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
\ No newline at end of file
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
new file mode 100644
index 0000000000..4845d05d4b
--- /dev/null
+++ b/docs/assets/vendor/prettify/prettify-min.js
@@ -0,0 +1 @@
+window.PR_SHOULD_USE_CONTINUATION=true;var prettyPrintOne;var prettyPrint;(function(){var O=window;var j=["break,continue,do,else,for,if,return,while"];var v=[j,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var q=[v,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var m=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var y=[q,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var T=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"];var s="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes";var x=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var t="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var J=[j,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var g=[j,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var I=[j,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var B=[m,T,x,t+J,g,I];var f=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var D="str";var A="kwd";var k="com";var Q="typ";var H="lit";var M="pun";var G="pln";var n="tag";var F="dec";var K="src";var R="atn";var o="atv";var P="nocode";var N="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function l(ab){var af=0;var U=false;var ae=false;for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.ignoreCase){ae=true}else{if(/[a-z]/i.test(ag.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,""))){U=true;ae=false;break}}}var aa={b:8,t:9,n:10,v:11,f:12,r:13};function ad(aj){var ai=aj.charCodeAt(0);if(ai!==92){return ai}var ah=aj.charAt(1);ai=aa[ah];if(ai){return ai}else{if("0"<=ah&&ah<="7"){return parseInt(aj.substring(1),8)}else{if(ah==="u"||ah==="x"){return parseInt(aj.substring(2),16)}else{return aj.charCodeAt(1)}}}}function V(ah){if(ah<32){return(ah<16?"\\x0":"\\x")+ah.toString(16)}var ai=String.fromCharCode(ah);return(ai==="\\"||ai==="-"||ai==="]"||ai==="^")?"\\"+ai:ai}function Z(an){var ar=an.substring(1,an.length-1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}|\\\\x[0-9A-Fa-f]{2}|\\\\[0-3][0-7]{0,2}|\\\\[0-7]{1,2}|\\\\[\\s\\S]|-|[^-\\\\]","g"));var ah=[];var ap=ar[0]==="^";var ao=["["];if(ap){ao.push("^")}for(var at=ap?1:0,al=ar.length;at<al;++at){var aj=ar[at];if(/\\[bdsw]/i.test(aj)){ao.push(aj)}else{var ai=ad(aj);var am;if(at+2<al&&"-"===ar[at+1]){am=ad(ar[at+2]);at+=2}else{am=ai}ah.push([ai,am]);if(!(am<65||ai>122)){if(!(am<65||ai>90)){ah.push([Math.max(65,ai)|32,Math.min(am,90)|32])}if(!(am<97||ai>122)){ah.push([Math.max(97,ai)&~32,Math.min(am,122)&~32])}}}}ah.sort(function(aw,av){return(aw[0]-av[0])||(av[1]-aw[1])});var ak=[];var aq=[];for(var at=0;at<ah.length;++at){var au=ah[at];if(au[0]<=aq[1]+1){aq[1]=Math.max(aq[1],au[1])}else{ak.push(aq=au)}}for(var at=0;at<ak.length;++at){var au=ak[at];ao.push(V(au[0]));if(au[1]>au[0]){if(au[1]+1>au[0]){ao.push("-")}ao.push(V(au[1]))}}ao.push("]");return ao.join("")}function Y(an){var al=an.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var aj=al.length;var ap=[];for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah){if(ah<=ao){ap[ah]=-1}else{al[am]=V(ah)}}}}}for(var am=1;am<ap.length;++am){if(-1===ap[am]){ap[am]=++af}}for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao;if(!ap[ao]){al[am]="(?:"}}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah&&ah<=ao){al[am]="\\"+ap[ah]}}}}for(var am=0;am<aj;++am){if("^"===al[am]&&"^"!==al[am+1]){al[am]=""}}if(an.ignoreCase&&U){for(var am=0;am<aj;++am){var ai=al[am];var ak=ai.charAt(0);if(ai.length>=2&&ak==="["){al[am]=Z(ai)}else{if(ak!=="\\"){al[am]=ai.replace(/[a-zA-Z]/g,function(aq){var ar=aq.charCodeAt(0);return"["+String.fromCharCode(ar&~32,ar|32)+"]"})}}}}return al.join("")}var ac=[];for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.global||ag.multiline){throw new Error(""+ag)}ac.push("(?:"+Y(ag)+")")}return new RegExp(ac.join("|"),ae?"gi":"g")}function b(aa,Y){var W=/(?:^|\s)nocode(?:\s|$)/;var ab=[];var Z=0;var X=[];var V=0;function U(ac){switch(ac.nodeType){case 1:if(W.test(ac.className)){return}for(var af=ac.firstChild;af;af=af.nextSibling){U(af)}var ae=ac.nodeName.toLowerCase();if("br"===ae||"li"===ae){ab[V]="\n";X[V<<1]=Z++;X[(V++<<1)|1]=ac}break;case 3:case 4:var ad=ac.nodeValue;if(ad.length){if(!Y){ad=ad.replace(/[ \t\r\n]+/g," ")}else{ad=ad.replace(/\r\n?/g,"\n")}ab[V]=ad;X[V<<1]=Z;Z+=ad.length;X[(V++<<1)|1]=ac}break}}U(aa);return{sourceCode:ab.join("").replace(/\n$/,""),spans:X}}function C(U,W,Y,V){if(!W){return}var X={sourceCode:W,basePos:U};Y(X);V.push.apply(V,X.decorations)}var w=/\S/;function p(U){var X=undefined;for(var W=U.firstChild;W;W=W.nextSibling){var V=W.nodeType;X=(V===1)?(X?U:W):(V===3)?(w.test(W.nodeValue)?U:X):X}return X===U?undefined:X}function h(W,V){var U={};var X;(function(){var af=W.concat(V);var aj=[];var ai={};for(var ad=0,ab=af.length;ad<ab;++ad){var aa=af[ad];var ae=aa[3];if(ae){for(var ag=ae.length;--ag>=0;){U[ae.charAt(ag)]=aa}}var ah=aa[1];var ac=""+ah;if(!ai.hasOwnProperty(ac)){aj.push(ah);ai[ac]=null}}aj.push(/[\0-\uffff]/);X=l(aj)})();var Z=V.length;var Y=function(aj){var ab=aj.sourceCode,aa=aj.basePos;var af=[aa,G];var ah=0;var ap=ab.match(X)||[];var al={};for(var ag=0,at=ap.length;ag<at;++ag){var ai=ap[ag];var ar=al[ai];var ak=void 0;var ao;if(typeof ar==="string"){ao=false}else{var ac=U[ai.charAt(0)];if(ac){ak=ai.match(ac[1]);ar=ac[0]}else{for(var aq=0;aq<Z;++aq){ac=V[aq];ak=ai.match(ac[1]);if(ak){ar=ac[0];break}}if(!ak){ar=G}}ao=ar.length>=5&&"lang-"===ar.substring(0,5);if(ao&&!(ak&&typeof ak[1]==="string")){ao=false;ar=K}if(!ao){al[ai]=ar}}var ad=ah;ah+=ai.length;if(!ao){af.push(aa+ad,ar)}else{var an=ak[1];var am=ai.indexOf(an);var ae=am+an.length;if(ak[2]){ae=ai.length-ak[2].length;am=ae-an.length}var au=ar.substring(5);C(aa+ad,ai.substring(0,am),Y,af);C(aa+ad+am,an,r(au,an),af);C(aa+ad+ae,ai.substring(ae),Y,af)}}aj.decorations=af};return Y}function i(V){var Y=[],U=[];if(V.tripleQuotedStrings){Y.push([D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(V.multiLineStrings){Y.push([D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{Y.push([D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(V.verbatimStrings){U.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ab=V.hashComments;if(ab){if(V.cStyleComments){if(ab>1){Y.push([k,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{Y.push([k,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}U.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{Y.push([k,/^#[^\r\n]*/,null,"#"])}}if(V.cStyleComments){U.push([k,/^\/\/[^\r\n]*/,null]);U.push([k,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(V.regexLiterals){var aa=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");U.push(["lang-regex",new RegExp("^"+N+"("+aa+")")])}var X=V.types;if(X){U.push([Q,X])}var W=(""+V.keywords).replace(/^ | $/g,"");if(W.length){U.push([A,new RegExp("^(?:"+W.replace(/[\s,]+/g,"|")+")\\b"),null])}Y.push([G,/^\s+/,null," \r\n\t\xA0"]);var Z=/^.[^\s\w\.$@\'\"\`\/\\]*/;U.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[Q,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[G,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[G,/^\\[\s\S]?/,null],[M,Z,null]);return h(Y,U)}var L=i({keywords:B,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function S(W,ah,aa){var V=/(?:^|\s)nocode(?:\s|$)/;var ac=/\r\n?|\n/;var ad=W.ownerDocument;var ag=ad.createElement("li");while(W.firstChild){ag.appendChild(W.firstChild)}var X=[ag];function af(am){switch(am.nodeType){case 1:if(V.test(am.className)){break}if("br"===am.nodeName){ae(am);if(am.parentNode){am.parentNode.removeChild(am)}}else{for(var ao=am.firstChild;ao;ao=ao.nextSibling){af(ao)}}break;case 3:case 4:if(aa){var an=am.nodeValue;var ak=an.match(ac);if(ak){var aj=an.substring(0,ak.index);am.nodeValue=aj;var ai=an.substring(ak.index+ak[0].length);if(ai){var al=am.parentNode;al.insertBefore(ad.createTextNode(ai),am.nextSibling)}ae(am);if(!aj){am.parentNode.removeChild(am)}}}break}}function ae(al){while(!al.nextSibling){al=al.parentNode;if(!al){return}}function aj(am,at){var ar=at?am.cloneNode(false):am;var ap=am.parentNode;if(ap){var aq=aj(ap,1);var ao=am.nextSibling;aq.appendChild(ar);for(var an=ao;an;an=ao){ao=an.nextSibling;aq.appendChild(an)}}return ar}var ai=aj(al.nextSibling,0);for(var ak;(ak=ai.parentNode)&&ak.nodeType===1;){ai=ak}X.push(ai)}for(var Z=0;Z<X.length;++Z){af(X[Z])}if(ah===(ah|0)){X[0].setAttribute("value",ah)}var ab=ad.createElement("ol");ab.className="linenums";var Y=Math.max(0,((ah-1))|0)||0;for(var Z=0,U=X.length;Z<U;++Z){ag=X[Z];ag.className="L"+((Z+Y)%10);if(!ag.firstChild){ag.appendChild(ad.createTextNode("\xA0"))}ab.appendChild(ag)}W.appendChild(ab)}function E(af){var X=/\bMSIE\s(\d+)/.exec(navigator.userAgent);X=X&&+X[1]<=8;var ao=/\n/g;var an=af.sourceCode;var ap=an.length;var Y=0;var ad=af.spans;var V=ad.length;var aj=0;var aa=af.decorations;var ab=aa.length;var ac=0;aa[ab]=ap;var av,at;for(at=av=0;at<ab;){if(aa[at]!==aa[at+2]){aa[av++]=aa[at++];aa[av++]=aa[at++]}else{at+=2}}ab=av;for(at=av=0;at<ab;){var aw=aa[at];var ae=aa[at+1];var Z=at+2;while(Z+2<=ab&&aa[Z+1]===ae){Z+=2}aa[av++]=aw;aa[av++]=ae;at=Z}ab=aa.length=av;var au=af.sourceNode;var ak;if(au){ak=au.style.display;au.style.display="none"}try{var ah=null;while(aj<V){var ai=ad[aj];var U=ad[aj+2]||ap;var ar=aa[ac+2]||ap;var Z=Math.min(U,ar);var am=ad[aj+1];var W;if(am.nodeType!==1&&(W=an.substring(Y,Z))){if(X){W=W.replace(ao,"\r")}am.nodeValue=W;var al=am.ownerDocument;var aq=al.createElement("span");aq.className=aa[ac+1];var ag=am.parentNode;ag.replaceChild(aq,am);aq.appendChild(am);if(Y<U){ad[aj+1]=am=al.createTextNode(an.substring(Z,U));ag.insertBefore(am,aq.nextSibling)}}Y=Z;if(Y>=U){aj+=2}if(Y>=ar){ac+=2}}}finally{if(au){au.style.display=ak}}}var u={};function d(W,X){for(var U=X.length;--U>=0;){var V=X[U];if(!u.hasOwnProperty(V)){u[V]=W}else{if(O.console){console.warn("cannot override language handler %s",V)}}}}function r(V,U){if(!(V&&u.hasOwnProperty(V))){V=/^\s*</.test(U)?"default-markup":"default-code"}return u[V]}d(L,["default-code"]);d(h([],[[G,/^[^<?]+/],[F,/^<!\w[^>]*(?:>|$)/],[k,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[M,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);d(h([[G,/^[\s]+/,null," \t\r\n"],[o,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[n,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[R,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[M,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);d(h([],[[o,/^[\s\S]+/]]),["uq.val"]);d(i({keywords:m,hashComments:true,cStyleComments:true,types:f}),["c","cc","cpp","cxx","cyc","m"]);d(i({keywords:"null,true,false"}),["json"]);d(i({keywords:T,hashComments:true,cStyleComments:true,verbatimStrings:true,types:f}),["cs"]);d(i({keywords:y,cStyleComments:true}),["java"]);d(i({keywords:I,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);d(i({keywords:J,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);d(i({keywords:t,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);d(i({keywords:g,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);d(i({keywords:x,cStyleComments:true,regexLiterals:true}),["js"]);d(i({keywords:s,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);d(h([],[[D,/^[\s\S]+/]]),["regex"]);function e(X){var W=X.langExtension;try{var U=b(X.sourceNode,X.pre);var V=U.sourceCode;X.sourceCode=V;X.spans=U.spans;X.basePos=0;r(W,V)(X);E(X)}catch(Y){if(O.console){console.log(Y&&Y.stack?Y.stack:Y)}}}function z(Y,X,W){var U=document.createElement("pre");U.innerHTML=Y;if(W){S(U,W,true)}var V={langExtension:X,numberLines:W,sourceNode:U,pre:1};e(V);return U.innerHTML}function c(aj){function ab(al){return document.getElementsByTagName(al)}var ah=[ab("pre"),ab("code"),ab("xmp")];var V=[];for(var ae=0;ae<ah.length;++ae){for(var ac=0,Y=ah[ae].length;ac<Y;++ac){V.push(ah[ae][ac])}}ah=null;var Z=Date;if(!Z.now){Z={now:function(){return +(new Date)}}}var aa=0;var U;var af=/\blang(?:uage)?-([\w.]+)(?!\S)/;var ak=/\bprettyprint\b/;var W=/\bprettyprinted\b/;var ag=/pre|xmp/i;var ai=/^code$/i;var ad=/^(?:pre|code|xmp)$/i;function X(){var ar=(O.PR_SHOULD_USE_CONTINUATION?Z.now()+250:Infinity);for(;aa<V.length&&Z.now()<ar;aa++){var at=V[aa];var au=at.className;if(ak.test(au)&&!W.test(au)){var aw=false;for(var ao=at.parentNode;ao;ao=ao.parentNode){var ax=ao.tagName;if(ad.test(ax)&&ao.className&&ak.test(ao.className)){aw=true;break}}if(!aw){at.className+=" prettyprinted";var aq=au.match(af);var am;if(!aq&&(am=p(at))&&ai.test(am.tagName)){aq=am.className.match(af)}if(aq){aq=aq[1]}var ap;if(ag.test(at.tagName)){ap=1}else{var an=at.currentStyle;var al=(an?an.whiteSpace:(document.defaultView&&document.defaultView.getComputedStyle)?document.defaultView.getComputedStyle(at,null).getPropertyValue("white-space"):0);ap=al&&"pre"===al.substring(0,3)}var av=at.className.match(/\blinenums\b(?::(\d+))?/);av=av?av[1]&&av[1].length?+av[1]:true:false;if(av){S(at,av,ap)}U={langExtension:aq,sourceNode:at,numberLines:av,pre:ap};e(U)}}}if(aa<V.length){setTimeout(X,250)}else{if(aj){aj()}}}X()}var a=O.PR={createSimpleLexer:h,registerLangHandler:d,sourceDecorator:i,PR_ATTRIB_NAME:R,PR_ATTRIB_VALUE:o,PR_COMMENT:k,PR_DECLARATION:F,PR_KEYWORD:A,PR_LITERAL:H,PR_NOCODE:P,PR_PLAIN:G,PR_PUNCTUATION:M,PR_SOURCE:K,PR_STRING:D,PR_TAG:n,PR_TYPE:Q,prettyPrintOne:O.prettyPrintOne=z,prettyPrint:O.prettyPrint=c};if(typeof define==="function"&&define.amd){define("google-code-prettify",[],function(){return a})}})();PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_DECLARATION,/^<!\w[^>]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^<script\b[^>]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:<!--|-->)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]);
\ No newline at end of file
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
new file mode 100644
index 0000000000..8192bf255c
--- /dev/null
+++ b/docs/classes/Roles.html
@@ -0,0 +1,1075 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Roles - The meteor-roles API</title>
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: 1.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1>Roles Class</h1>
+<div class="box meta">
+    
+
+    
+
+    
+        <div class="foundat">
+            Defined in: <a href="..&#x2F;files&#x2F;roles_roles.js.html#l16"><code>roles&#x2F;roles.js:16</code></a>
+        </div>
+    
+
+    
+        
+            Module: <a href="../modules/Roles.html">Roles</a>
+        
+    
+
+    
+</div>
+
+
+
+<div class="box intro">
+    <p>Role-based authorization.  Uses 'roles' collection to store existing roles.  Adds a 'roles' field to user objects when they are added to a given role.</p>
+</div>
+
+
+    <div class="constructor">
+        <h2>Constructor</h2>
+        <div id="method_Roles" class="method item">
+    <h3 class="name"><code>Roles</code></h3>
+
+    
+        <span class="paren">()</span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l16"><code>roles&#x2F;roles.js:16</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+    
+
+    
+
+    
+</div>
+
+    </div>
+
+
+<div id="classdocs" class="tabview">
+    <ul class="api-class-tabs">
+        <li class="api-class-tab index"><a href="#index">Index</a></li>
+
+        
+            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
+        
+        
+        
+        
+    </ul>
+
+    <div>
+        <div id="index" class="api-class-tabpanel index">
+            <h2 class="off-left">Item Index</h2>
+
+            
+                <div class="index-section methods">
+                    <h3>Methods</h3>
+
+                    <ul class="index-list methods">
+                        
+                            <li class="index-item method">
+                                <a href="#method_addUsersToRoles">addUsersToRoles</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_createRole">createRole</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_deleteRole">deleteRole</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_getAllRoles">getAllRoles</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_getRolesForUser">getRolesForUser</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_getUsersInRole">getUsersInRole</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_removeUsersFromRoles">removeUsersFromRoles</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_userIsInRole">userIsInRole</a>
+
+                                
+                                
+                            </li>
+                        
+                    </ul>
+                </div>
+            
+
+            
+
+            
+
+            
+        </div>
+
+        
+            <div id="methods" class="api-class-tabpanel">
+                <h2 class="off-left">Methods</h2>
+
+                
+                    <div id="method_addUsersToRoles" class="method item">
+    <h3 class="name"><code>addUsersToRoles</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>users</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code>roles</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l66"><code>roles&#x2F;roles.js:66</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Add users to roles. Will create roles as needed.</p>
+
+<p>Makes 2 calls to database:
+ 1. retrieve list of all existing roles
+ 2. update users' roles</p>
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>id(s) of users to add to roles</p>
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>name(s) of roles to add users to</p>
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+
+    
+</div>
+
+                
+                    <div id="method_createRole" class="method item">
+    <h3 class="name"><code>createRole</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>role</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l26"><code>roles&#x2F;roles.js:26</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Create a new role</p>
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">role</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Name of role</p>
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+
+    
+</div>
+
+                
+                    <div id="method_deleteRole" class="method item">
+    <h3 class="name"><code>deleteRole</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>role</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l42"><code>roles&#x2F;roles.js:42</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Delete an existing role.  Will throw "Role in use" error if any users 
+are currently assigned to the target role.</p>
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">role</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Name of role</p>
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+
+    
+</div>
+
+                
+                    <div id="method_getAllRoles" class="method item">
+    <h3 class="name"><code>getAllRoles</code></h3>
+
+    
+        <span class="paren">()</span>
+    
+
+    
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l154"><code>roles&#x2F;roles.js:154</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Retrieve all existing roles</p>
+    </div>
+
+    
+
+    
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Cursor</span>:
+                    
+                    cursor of existing roles
+                
+            </div>
+        </div>
+    
+
+    
+</div>
+
+                
+                    <div id="method_getRolesForUser" class="method item">
+    <h3 class="name"><code>getRolesForUser</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>user</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l140"><code>roles&#x2F;roles.js:140</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Retrieve users roles</p>
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">user</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Id of user</p>
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Array</span>:
+                    
+                    array of roles for user
+                
+            </div>
+        </div>
+    
+
+    
+</div>
+
+                
+                    <div id="method_getUsersInRole" class="method item">
+    <h3 class="name"><code>getUsersInRole</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>role</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l164"><code>roles&#x2F;roles.js:164</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Retrieve all users who are in target role</p>
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">role</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Name of role</p>
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Cursor</span>:
+                    
+                    cursor of users in role
+                
+            </div>
+        </div>
+    
+
+    
+</div>
+
+                
+                    <div id="method_removeUsersFromRoles" class="method item">
+    <h3 class="name"><code>removeUsersFromRoles</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>users</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code>roles</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l101"><code>roles&#x2F;roles.js:101</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Remove users from roles</p>
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>id(s) of users to add to roles</p>
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>name(s) of roles to add users to</p>
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+
+    
+</div>
+
+                
+                    <div id="method_userIsInRole" class="method item">
+    <h3 class="name"><code>userIsInRole</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>user</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code>role</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l124"><code>roles&#x2F;roles.js:124</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Check if user is in role</p>
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">user</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Id of user</p>
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name">role</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Name of role</p>
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+
+    
+</div>
+
+                
+            </div>
+        
+
+        
+
+        
+
+        
+    </div>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="..&#x2F;assets/js/yui-prettify.js"></script>
+<script src="..&#x2F;assets/../api.js"></script>
+<script src="..&#x2F;assets/js/api-filter.js"></script>
+<script src="..&#x2F;assets/js/api-list.js"></script>
+<script src="..&#x2F;assets/js/api-search.js"></script>
+<script src="..&#x2F;assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/classes/index.html b/docs/classes/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/classes/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/docs/data.json b/docs/data.json
new file mode 100644
index 0000000000..826606ddeb
--- /dev/null
+++ b/docs/data.json
@@ -0,0 +1,215 @@
+{
+    "project": {
+        "name": "The meteor-roles API",
+        "description": "The meteor-roles API: a role-based authorization package for Meteor",
+        "version": "1.0"
+    },
+    "files": {
+        "roles/roles.js": {
+            "name": "roles/roles.js",
+            "modules": {
+                "Roles": 1
+            },
+            "classes": {
+                "Roles": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        }
+    },
+    "modules": {
+        "Roles": {
+            "name": "Roles",
+            "submodules": {},
+            "classes": {
+                "Roles": 1
+            },
+            "fors": {},
+            "namespaces": {},
+            "tag": "module",
+            "file": "roles/roles.js",
+            "line": 16,
+            "description": "Provides functions related to user authorization."
+        }
+    },
+    "classes": {
+        "Roles": {
+            "name": "Roles",
+            "shortname": "Roles",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "Roles",
+            "namespace": "",
+            "file": "roles/roles.js",
+            "line": 16,
+            "description": "Role-based authorization.  Uses 'roles' collection to store existing roles.  Adds a 'roles' field to user objects when they are added to a given role.",
+            "is_constructor": 1
+        }
+    },
+    "classitems": [
+        {
+            "file": "roles/roles.js",
+            "line": 9,
+            "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles.js",
+            "line": 26,
+            "description": "Create a new role",
+            "itemtype": "method",
+            "name": "createRole",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "Name of role",
+                    "type": "String"
+                }
+            ],
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles.js",
+            "line": 42,
+            "description": "Delete an existing role.  Will throw \"Role in use\" error if any users \nare currently assigned to the target role.",
+            "itemtype": "method",
+            "name": "deleteRole",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "Name of role",
+                    "type": "String"
+                }
+            ],
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles.js",
+            "line": 66,
+            "description": "Add users to roles. Will create roles as needed.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
+            "itemtype": "method",
+            "name": "addUsersToRoles",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "id(s) of users to add to roles",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "name(s) of roles to add users to",
+                    "type": "Array|String"
+                }
+            ],
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles.js",
+            "line": 101,
+            "description": "Remove users from roles",
+            "itemtype": "method",
+            "name": "removeUsersFromRoles",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "id(s) of users to add to roles",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "name(s) of roles to add users to",
+                    "type": "Array|String"
+                }
+            ],
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles.js",
+            "line": 124,
+            "description": "Check if user is in role",
+            "itemtype": "method",
+            "name": "userIsInRole",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "Id of user",
+                    "type": "String"
+                },
+                {
+                    "name": "role",
+                    "description": "Name of role",
+                    "type": "String"
+                }
+            ],
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles.js",
+            "line": 140,
+            "description": "Retrieve users roles",
+            "itemtype": "method",
+            "name": "getRolesForUser",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "Id of user",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "array of roles for user",
+                "type": "Array"
+            },
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles.js",
+            "line": 154,
+            "description": "Retrieve all existing roles",
+            "itemtype": "method",
+            "name": "getAllRoles",
+            "return": {
+                "description": "cursor of existing roles",
+                "type": "Cursor"
+            },
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles.js",
+            "line": 164,
+            "description": "Retrieve all users who are in target role",
+            "itemtype": "method",
+            "name": "getUsersInRole",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "Name of role",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "cursor of users in role",
+                "type": "Cursor"
+            },
+            "class": "Roles",
+            "module": "Roles"
+        }
+    ],
+    "warnings": [
+        {
+            "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
+            "line": " roles/roles.js:9"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/docs/files/index.html b/docs/files/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/files/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/docs/files/roles_roles.js.html b/docs/files/roles_roles.js.html
new file mode 100644
index 0000000000..00215b10a4
--- /dev/null
+++ b/docs/files/roles_roles.js.html
@@ -0,0 +1,287 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>roles&#x2F;roles.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: 1.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1 class="file-heading">File: roles&#x2F;roles.js</h1>
+
+<div class="file">
+    <pre class="code prettyprint linenums">
+;(function () {
+
+&#x2F;**
+ * Provides functions related to user authorization.
+ *
+ * @module Roles
+ *&#x2F;
+
+&#x2F;**
+ * Roles collection documents consist only of an id and a role name.
+ *   ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }
+ *&#x2F;
+Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
+
+
+&#x2F;**
+ * Role-based authorization.  Uses &#x27;roles&#x27; collection to store existing roles.  Adds a &#x27;roles&#x27; field to user objects when they are added to a given role.
+ *
+ * @class Roles
+ * @constructor
+ *&#x2F;
+if (&#x27;undefined&#x27; === typeof Roles) {
+  Roles = {}
+}
+
+&#x2F;**
+ * Create a new role
+ *
+ * @method createRole
+ * @param {String} role Name of role
+ *&#x2F;
+Roles.createRole = function (role) {
+  if (!role 
+      || &#x27;string&#x27; !== typeof role 
+      || role.trim().length === 0) {
+    return
+  }
+
+  Meteor.roles.insert({&#x27;name&#x27;:role})
+}
+
+&#x2F;** 
+ * Delete an existing role.  Will throw &quot;Role in use&quot; error if any users 
+ * are currently assigned to the target role.
+ * 
+ * @method deleteRole
+ * @param {String} role Name of role
+ *&#x2F;
+Roles.deleteRole = function (role) {
+  if (!role) {
+    return
+  }
+
+  var foundExistingUser = Meteor.users.findOne(
+        { roles: { $in: [role] } },
+        {   _id: 1 }
+      )
+
+  if (foundExistingUser) {
+    throw new Error(&#x27;Role in use&#x27;)
+  }
+
+  Meteor.roles.remove({ name: role })
+}
+
+&#x2F;**
+ * Add users to roles. Will create roles as needed.
+ *
+ * Makes 2 calls to database:
+ *  1. retrieve list of all existing roles
+ *  2. update users&#x27; roles
+ *
+ * @method addUsersToRoles
+ * @param {Array|String} users id(s) of users to add to roles
+ * @param {Array|String} roles name(s) of roles to add users to
+ *&#x2F;
+Roles.addUsersToRoles = function (users, roles) {
+  if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
+  if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
+
+  var temp
+
+  &#x2F;&#x2F; ensure arrays
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  &#x2F;&#x2F; ensure all roles exist in &#x27;roles&#x27; collection
+  temp = _.difference(roles, Meteor.roles.find())
+  _.each(temp, function (role) {
+    Roles.createRole(role)
+  })
+
+  &#x2F;&#x2F; update all users, adding to roles set
+  Meteor.users.update(
+    {       _id: { $in: users } },
+    { $addToSet: { roles: { $each: roles } } },
+    {     multi: true }
+  )
+}
+
+&#x2F;**
+ * Remove users from roles
+ *
+ * @method removeUsersFromRoles
+ * @param {Array|String} users id(s) of users to add to roles
+ * @param {Array|String} roles name(s) of roles to add users to
+ *&#x2F;
+Roles.removeUsersFromRoles = function (users, roles) {
+  if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
+  if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
+
+  &#x2F;&#x2F; ensure arrays
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  &#x2F;&#x2F; update all users, remove from roles set
+  Meteor.users.update(
+    {      _id: {   $in: users } },
+    { $pullAll: { roles: roles } },
+    {    multi: true}
+  )
+}
+
+&#x2F;**
+ * Check if user is in role
+ *
+ * @method userIsInRole
+ * @param {String} user Id of user
+ * @param {String} role Name of role
+ *&#x2F;
+Roles.isUserInRole = function (user, role) {
+  var found = Meteor.users.findOne(
+      { _id: user, roles: { $in: [role] } },
+      { _id: 1 }
+    )
+
+  return found
+}
+
+&#x2F;**
+ * Retrieve users roles
+ *
+ * @method getRolesForUser
+ * @param {String} user Id of user
+ * @return {Array} array of roles for user
+ *&#x2F;
+Roles.getRolesForUser = function (user) {
+  return Meteor.users.findOne(
+    { _id: user},
+    { _id: 0, roles: 1}
+  ).roles
+}
+
+&#x2F;**
+ * Retrieve all existing roles
+ *
+ * @method getAllRoles
+ * @return {Cursor} cursor of existing roles
+ *&#x2F;
+Roles.getAllRoles = function () {
+  return Meteor.roles.find({}, { sort: { name: 1 } })
+}
+
+&#x2F;**
+ * Retrieve all users who are in target role
+ *
+ * @method getUsersInRole
+ * @param {String} role Name of role
+ * @return {Cursor} cursor of users in role
+ *&#x2F;
+Roles.getUsersInRole = function (role) {
+  return Meteor.users.find(
+    { roles: { $in: [role] } }
+  )
+}
+
+}());
+
+    </pre>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="..&#x2F;assets/js/yui-prettify.js"></script>
+<script src="..&#x2F;assets/../api.js"></script>
+<script src="..&#x2F;assets/js/api-filter.js"></script>
+<script src="..&#x2F;assets/js/api-list.js"></script>
+<script src="..&#x2F;assets/js/api-search.js"></script>
+<script src="..&#x2F;assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/index.html b/docs/index.html
new file mode 100644
index 0000000000..59ea8716d2
--- /dev/null
+++ b/docs/index.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>The meteor-roles API</title>
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href=".&#x2F;assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href=".&#x2F;assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href=".&#x2F;assets/favicon.png">
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src=".&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: 1.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href=".&#x2F;classes/Roles.html">Roles</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href=".&#x2F;modules/Roles.html">Roles</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                            <div class="apidocs">
+        <div id="docs-main" class="content">
+            <p>
+            Browse to a module or class using the sidebar to view its API documentation.
+            </p>
+
+            <h2>Keyboard Shortcuts</h2>
+
+            <ul>
+                <li><p>Press <kbd>s</kbd> to focus the API search box.</p></li>
+
+                <li><p>Use <kbd>Up</kbd> and <kbd>Down</kbd> to select classes, modules, and search results.</p></li>
+
+                <li class="mac-only"><p>With the API search box or sidebar focused, use <kbd><span class="cmd">&#x2318;</span>-Left</kbd> or <kbd><span class="cmd">&#x2318;</span>-Right</kbd> to switch sidebar tabs.</p></li>
+
+                <li class="pc-only"><p>With the API search box or sidebar focused, use <kbd>Ctrl+Left</kbd> and <kbd>Ctrl+Right</kbd> to switch sidebar tabs.</p></li>
+            </ul>
+        </div>
+    </div>
+
+
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src=".&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src=".&#x2F;assets/js/yui-prettify.js"></script>
+<script src=".&#x2F;assets/../api.js"></script>
+<script src=".&#x2F;assets/js/api-filter.js"></script>
+<script src=".&#x2F;assets/js/api-list.js"></script>
+<script src=".&#x2F;assets/js/api-search.js"></script>
+<script src=".&#x2F;assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
new file mode 100644
index 0000000000..1f58b66d82
--- /dev/null
+++ b/docs/modules/Roles.html
@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Roles - The meteor-roles API</title>
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: 1.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1>Roles Module</h1>
+<div class="box clearfix meta">
+    
+
+    
+
+    
+        <div class="foundat">
+            Defined in: <a href="..&#x2F;files&#x2F;roles_roles.js.html#l16"><code>roles&#x2F;roles.js:16</code></a>
+        </div>
+    
+
+    
+</div>
+
+
+
+<div class="box intro">
+    <p>Provides functions related to user authorization.</p>
+</div>
+
+
+
+<div class="yui3-g">
+    <div class="yui3-u-1-2">
+        
+            <p>This module provides the following classes:</p>
+
+            <ul class="module-classes">
+            
+                <li class="module-class">
+                    <a href="..&#x2F;classes/Roles.html">
+                        Roles
+                    </a>
+                </li>
+            
+            </ul>
+        
+    </div>
+
+    <div class="yui3-u-1-2">
+        
+    </div>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="..&#x2F;assets/js/yui-prettify.js"></script>
+<script src="..&#x2F;assets/../api.js"></script>
+<script src="..&#x2F;assets/js/api-filter.js"></script>
+<script src="..&#x2F;assets/js/api-list.js"></script>
+<script src="..&#x2F;assets/js/api-search.js"></script>
+<script src="..&#x2F;assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/modules/index.html b/docs/modules/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/modules/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/roles/.meteor/.gitignore b/roles/.meteor/.gitignore
new file mode 100644
index 0000000000..08150d000c
--- /dev/null
+++ b/roles/.meteor/.gitignore
@@ -0,0 +1,2 @@
+local
+meteorite
diff --git a/roles/package.js b/roles/package.js
new file mode 100644
index 0000000000..d03fd7644a
--- /dev/null
+++ b/roles/package.js
@@ -0,0 +1,14 @@
+Package.describe({
+  summary: "Role-based authorization"
+});
+
+Package.on_use(function (api, where) {
+  where = where || ['client', 'server'];
+  api.use(['underscore', 'accounts-base'], where);
+  api.add_files('roles.js', where);
+});
+
+Package.on_test(function (api) {
+  api.use(['roles', 'accounts-password', 'tinytest'], 'server');
+  api.add_files('tests/server.js', 'server');
+});
diff --git a/roles/roles.js b/roles/roles.js
new file mode 100644
index 0000000000..7e502516d9
--- /dev/null
+++ b/roles/roles.js
@@ -0,0 +1,177 @@
+;(function () {
+
+/**
+ * Provides functions related to user authorization.
+ *
+ * @module Roles
+ */
+
+/**
+ * Roles collection documents consist only of an id and a role name.
+ *   ex: { _id:<uuid>, name: "admin" }
+ */
+Meteor.roles = new Meteor.Collection("roles")
+
+
+/**
+ * Role-based authorization.  Uses 'roles' collection to store existing roles.  Adds a 'roles' field to user objects when they are added to a given role.
+ *
+ * @class Roles
+ * @constructor
+ */
+if ('undefined' === typeof Roles) {
+  Roles = {}
+}
+
+/**
+ * Create a new role
+ *
+ * @method createRole
+ * @param {String} role Name of role
+ */
+Roles.createRole = function (role) {
+  if (!role 
+      || 'string' !== typeof role 
+      || role.trim().length === 0) {
+    return
+  }
+
+  Meteor.roles.insert({'name':role})
+}
+
+/** 
+ * Delete an existing role.  Will throw "Role in use" error if any users 
+ * are currently assigned to the target role.
+ * 
+ * @method deleteRole
+ * @param {String} role Name of role
+ */
+Roles.deleteRole = function (role) {
+  if (!role) {
+    return
+  }
+
+  var foundExistingUser = Meteor.users.findOne(
+        { roles: { $in: [role] } },
+        {   _id: 1 }
+      )
+
+  if (foundExistingUser) {
+    throw new Error('Role in use')
+  }
+
+  Meteor.roles.remove({ name: role })
+}
+
+/**
+ * Add users to roles. Will create roles as needed.
+ *
+ * Makes 2 calls to database:
+ *  1. retrieve list of all existing roles
+ *  2. update users' roles
+ *
+ * @method addUsersToRoles
+ * @param {Array|String} users id(s) of users to add to roles
+ * @param {Array|String} roles name(s) of roles to add users to
+ */
+Roles.addUsersToRoles = function (users, roles) {
+  if (!users) throw new Error ("Missing 'users' param")
+  if (!roles) throw new Error ("Missing 'roles' param")
+
+  var temp
+
+  // ensure arrays
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  // ensure all roles exist in 'roles' collection
+  temp = _.difference(roles, Meteor.roles.find())
+  _.each(temp, function (role) {
+    Roles.createRole(role)
+  })
+
+  // update all users, adding to roles set
+  Meteor.users.update(
+    {       _id: { $in: users } },
+    { $addToSet: { roles: { $each: roles } } },
+    {     multi: true }
+  )
+}
+
+/**
+ * Remove users from roles
+ *
+ * @method removeUsersFromRoles
+ * @param {Array|String} users id(s) of users to add to roles
+ * @param {Array|String} roles name(s) of roles to add users to
+ */
+Roles.removeUsersFromRoles = function (users, roles) {
+  if (!users) throw new Error ("Missing 'users' param")
+  if (!roles) throw new Error ("Missing 'roles' param")
+
+  // ensure arrays
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  // update all users, remove from roles set
+  Meteor.users.update(
+    {      _id: {   $in: users } },
+    { $pullAll: { roles: roles } },
+    {    multi: true}
+  )
+}
+
+/**
+ * Check if user is in role
+ *
+ * @method userIsInRole
+ * @param {String} user Id of user
+ * @param {String} role Name of role
+ */
+Roles.isUserInRole = function (user, role) {
+  var found = Meteor.users.findOne(
+      { _id: user, roles: { $in: [role] } },
+      { _id: 1 }
+    )
+
+  return found
+}
+
+/**
+ * Retrieve users roles
+ *
+ * @method getRolesForUser
+ * @param {String} user Id of user
+ * @return {Array} array of roles for user
+ */
+Roles.getRolesForUser = function (user) {
+  return Meteor.users.findOne(
+    { _id: user},
+    { _id: 0, roles: 1}
+  ).roles
+}
+
+/**
+ * Retrieve all existing roles
+ *
+ * @method getAllRoles
+ * @return {Cursor} cursor of existing roles
+ */
+Roles.getAllRoles = function () {
+  return Meteor.roles.find({}, { sort: { name: 1 } })
+}
+
+/**
+ * Retrieve all users who are in target role
+ *
+ * @method getUsersInRole
+ * @param {String} role Name of role
+ * @return {Cursor} cursor of users in role
+ */
+Roles.getUsersInRole = function (role) {
+  return Meteor.users.find(
+    { roles: { $in: [role] } }
+  )
+}
+
+}());
diff --git a/roles/smart.json b/roles/smart.json
new file mode 100644
index 0000000000..0ed382a757
--- /dev/null
+++ b/roles/smart.json
@@ -0,0 +1,9 @@
+{
+  "name": "roles",
+  "description": "Role-based authorization, compatible with Meteor's built-in Accounts package",
+  "homepage": "",
+  "author": "Adrian Lanning <alanning@gmail.com>",
+  "version": "1.0",
+  "git": "",
+  "packages": {}
+}
diff --git a/roles/smart.lock b/roles/smart.lock
new file mode 100644
index 0000000000..0b1238b050
--- /dev/null
+++ b/roles/smart.lock
@@ -0,0 +1,19 @@
+{
+  "meteor": {
+    "git": "https://github.com/meteor/meteor.git",
+    "branch": "master",
+    "commit": "067113a37dd4e7824db1a16d5f7a90c3739eed9c"
+  },
+  "dependencies": {
+    "basePackages": {
+      "roles": {
+        "path": "."
+      }
+    },
+    "packages": {
+      "roles": {
+        "path": "."
+      }
+    }
+  }
+}
diff --git a/roles/tests/server.js b/roles/tests/server.js
new file mode 100644
index 0000000000..dbb14a92b3
--- /dev/null
+++ b/roles/tests/server.js
@@ -0,0 +1,194 @@
+// NOTE: This file is incomplete.  I can't figure out how to test
+// the server-side code using Tinytest.
+//
+// Problem is we need users
+
+;(function () {
+
+
+  var users = {},
+      roles = ['admin','editor','user']
+
+
+  function addUser (name) {
+    return Accounts.createUser({'username': name})
+  }
+
+  function reset () {
+    Meteor.roles.remove({})
+    Meteor.users.remove({})
+
+    users = {
+      'eve': addUser('eve'),
+      'bob': addUser('bob'),
+      'joe': addUser('joe')
+    }
+  }
+
+
+  function testUser (test, user, expectedRoles) {
+    var userId = users[user]
+
+    _.each(roles, function (role) {
+      var expected = expectedRoles.indexOf(role) !== -1,
+          msg = user + ' is not in expected role ' + role,
+          nmsg = user + ' is in un-expected role ' + role
+
+      if (expected) {
+        test.isTrue(Roles.isUserInRole(userId, role), msg)
+      } else {
+        test.isFalse(Roles.isUserInRole(userId, role), nmsg)
+      }
+    })
+  }
+
+  Tinytest.add('create and delete roles', function (test) {
+    reset()
+
+    Roles.createRole('test1')
+    test.equal(Meteor.roles.findOne().name, 'test1')
+
+    Roles.createRole('test2')
+    test.equal(Meteor.roles.findOne({'name':'test2'}).name, 'test2')
+
+    test.equal(Meteor.roles.find().count(), 2)
+
+    Roles.deleteRole('test1')
+    test.equal(typeof Meteor.roles.findOne({'name':'test1'}), 'undefined')
+
+    Roles.deleteRole('test2')
+    test.equal(typeof Meteor.roles.findOne(), 'undefined')
+  })
+
+  Tinytest.add('is user in role', function (test) {
+    reset()
+
+    Meteor.users.update(
+      {"_id":users.eve}, 
+      {$addToSet: { roles: { $each: ['admin', 'user'] } } }
+    )
+    testUser(test, 'eve', ['admin', 'user'])
+  })
+
+  Tinytest.add('add users to roles', function (test) {
+    reset() 
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
+
+    testUser(test, 'eve', ['admin', 'user'])
+    testUser(test, 'bob', ['admin', 'user'])
+    testUser(test, 'joe', [], roles)
+
+    Roles.addUsersToRoles([users.joe], ['editor', 'user'])
+
+    testUser(test, 'eve', ['admin', 'user'])
+    testUser(test, 'bob', ['admin', 'user'])
+    testUser(test, 'joe', ['editor', 'user'])
+  })
+
+  Tinytest.add('remove users from roles', function (test) {
+    reset() 
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser(test, 'eve', ['editor', 'user'])
+    testUser(test, 'bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles([users.eve], ['user'])
+    testUser(test, 'eve', ['editor'])
+    testUser(test, 'bob', ['editor', 'user'])
+
+    // try remove again
+    Roles.removeUsersFromRoles([users.eve], ['user'])
+    testUser(test, 'eve', ['editor'])
+
+    // remove user role - two users
+    test.isFalse(Roles.isUserInRole(users.joe, 'admin'))
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
+    testUser(test, 'bob', ['admin', 'user', 'editor'])
+    testUser(test, 'joe', ['admin', 'user'])
+    Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
+    testUser(test, 'bob', ['user', 'editor'])
+    testUser(test, 'joe', ['user'])
+  })
+
+  Tinytest.add('add non-existing user to role', function (test) {
+    reset()
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    Roles.addUsersToRoles(['1'], ['admin'])
+    test.equal(Meteor.users.findOne({_id:'1'}), undefined)
+  })
+
+  Tinytest.add('empty role names are not allowed', function (test) {
+    reset() 
+
+    Roles.createRole('')
+    Roles.createRole(null)
+
+    test.equal(Meteor.roles.find().count(), 0)
+
+    Roles.createRole(' ')
+    test.equal(Meteor.roles.find().count(), 0)
+  })
+
+  Tinytest.add('get roles for user', function (test) {
+    reset()
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'])
+    test.equal(Roles.getRolesForUser(users.eve), ['admin', 'user'])
+  })
+
+  Tinytest.add('get all roles', function (test) {
+    reset()
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    // compare roles, sorted alphabetically
+    var expected = roles,
+        actual = _.pluck(Roles.getAllRoles().fetch(), 'name')
+
+    test.equal(actual, expected)
+  })
+
+
+  Tinytest.add('is user in roles for non-existing user returns false', function (test) {
+    reset()
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    test.isFalse(Roles.isUserInRole('1', 'admin'))
+  })
+
+  Tinytest.add('get users in role', function (test) {
+    reset()
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
+
+    var expected = [users.eve, users.joe],
+        actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
+
+    // order may be different so check difference instead of equality
+    test.equal(_.difference(actual, expected), [])
+  })
+
+}());
diff --git a/yuidoc.json b/yuidoc.json
new file mode 100644
index 0000000000..40493da48d
--- /dev/null
+++ b/yuidoc.json
@@ -0,0 +1,10 @@
+{
+  "name": "The meteor-roles API",
+  "description": "The meteor-roles API: a role-based authorization package for Meteor",
+  "version": "1.0",
+  "options": {
+    "outdir": "./docs",
+    "exclude": ".meteor",
+    "paths": ["roles/"]
+  }
+}

From 099c2530355e323fd71d5b0c26e407b7e23ff0c9 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 02:34:34 -0500
Subject: [PATCH 0003/1140] Update README.md

---
 README.md | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index cc37984117..0f850e9ea4 100644
--- a/README.md
+++ b/README.md
@@ -3,32 +3,35 @@ meteor-roles
 
 Roles-based authorization package for Meteor
 
--- Tests -- 
+### Tests
+
 
 To run tests: 
-1. install Meteorite [1]
-2. cd 'roles' directory
-3. mrt
-4. point browser at http://localhost:3000/
+  1. install [Meteorite][1]
+  2. cd 'roles' directory
+  3. mrt
+  4. point browser at http://localhost:3000/
 
-NOTE: If you see an error message regarding 'roles package does not exist' that means you are trying to run 'mrt' in the wrong directory.  See step 2.
+_NOTE_: If you see an error message regarding **'roles package does not exist'** that means you are trying to run 'mrt' in the wrong directory.  See step 2.
 
 
--- Documentation -- 
+### Documentation
 
-Generated using YUIDoc [2]
+
+Generated using [YUIDoc][2]
 
 To re-generate documentation:
-1. install YUIDoc
-2. cd 'meteor-roles' directory (root)
-3. yuidoc
+  1. install YUIDoc
+  2. cd 'meteor-roles' directory (root)
+  3. yuidoc
 
 To serve documentation locally:
-1. install YUIDoc
-2. cd 'meteor-roles' directory (root)
-3. yuidoc --server
-4. point browser at http://localhost:3000/
+  1. install YUIDoc
+  2. cd 'meteor-roles' directory (root)
+  3. yuidoc --server
+  4. point browser at http://localhost:3000/
 
 
-[1] Meteorite - https://github.com/oortcloud/meteorite
-[2] YUIDoc - http://yui.github.com/yuidoc/
+[1]: https://github.com/oortcloud/meteorite "Meteorite"
+
+[2]: http://yui.github.com/yuidoc/ "YUIDoc"

From 1e53903d17e60a68464aa77aba5912203dc900d3 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 18:12:04 -0500
Subject: [PATCH 0004/1140] emphasize compatibility with built-in Meteor
 accounts packages

---
 README.md      | 2 +-
 roles/roles.js | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0f850e9ea4..b44e150098 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 meteor-roles
 ============
 
-Roles-based authorization package for Meteor
+Roles-based authorization package for Meteor - compatible with built-in accounts package.
 
 ### Tests
 
diff --git a/roles/roles.js b/roles/roles.js
index 7e502516d9..c7c769675e 100644
--- a/roles/roles.js
+++ b/roles/roles.js
@@ -1,7 +1,7 @@
 ;(function () {
 
 /**
- * Provides functions related to user authorization.
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
  * @module Roles
  */
@@ -14,7 +14,10 @@ Meteor.roles = new Meteor.Collection("roles")
 
 
 /**
- * Role-based authorization.  Uses 'roles' collection to store existing roles.  Adds a 'roles' field to user objects when they are added to a given role.
+ * <p>Role-based authorization compatible with built-in Meteor accounts package.</p>
+ * <br />
+ * <p>Uses 'roles' collection to store existing roles.</p>
+ * <p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>
  *
  * @class Roles
  * @constructor

From 70a0ed8885c94dd85039345d0fc3374cf4a5b7be Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 18:12:54 -0500
Subject: [PATCH 0005/1140] update api docs

---
 docs/api.js                    |  2 +-
 docs/classes/Roles.html        | 24 +++++++++++++++---------
 docs/data.json                 | 20 ++++++++++----------
 docs/files/roles_roles.js.html |  7 +++++--
 docs/modules/Roles.html        |  2 +-
 5 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/docs/api.js b/docs/api.js
index 93b955b210..05ffcad925 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -10,7 +10,7 @@ YUI.add("yuidoc-meta", function(Y) {
         {
             "displayName": "Roles",
             "name": "Roles",
-            "description": "Provides functions related to user authorization."
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
         }
     ]
 } };
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 8192bf255c..1dc545f9df 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -108,7 +108,13 @@
 
 
 <div class="box intro">
-    <p>Role-based authorization.  Uses 'roles' collection to store existing roles.  Adds a 'roles' field to user objects when they are added to a given role.</p>
+    <p>Role-based authorization compatible with built-in Meteor accounts package.</p>
+
+<p><br /></p>
+
+<p>Uses 'roles' collection to store existing roles.</p>
+
+<p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>
 </div>
 
 
@@ -312,7 +318,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l66"><code>roles&#x2F;roles.js:66</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l69"><code>roles&#x2F;roles.js:69</code></a>
         
         </p>
 
@@ -418,7 +424,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l26"><code>roles&#x2F;roles.js:26</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l29"><code>roles&#x2F;roles.js:29</code></a>
         
         </p>
 
@@ -505,7 +511,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l42"><code>roles&#x2F;roles.js:42</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l45"><code>roles&#x2F;roles.js:45</code></a>
         
         </p>
 
@@ -587,7 +593,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l154"><code>roles&#x2F;roles.js:154</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l157"><code>roles&#x2F;roles.js:157</code></a>
         
         </p>
 
@@ -668,7 +674,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l140"><code>roles&#x2F;roles.js:140</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l143"><code>roles&#x2F;roles.js:143</code></a>
         
         </p>
 
@@ -772,7 +778,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l164"><code>roles&#x2F;roles.js:164</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l167"><code>roles&#x2F;roles.js:167</code></a>
         
         </p>
 
@@ -878,7 +884,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l101"><code>roles&#x2F;roles.js:101</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l104"><code>roles&#x2F;roles.js:104</code></a>
         
         </p>
 
@@ -986,7 +992,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l124"><code>roles&#x2F;roles.js:124</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l127"><code>roles&#x2F;roles.js:127</code></a>
         
         </p>
 
diff --git a/docs/data.json b/docs/data.json
index 826606ddeb..817430d55c 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -29,7 +29,7 @@
             "tag": "module",
             "file": "roles/roles.js",
             "line": 16,
-            "description": "Provides functions related to user authorization."
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
         }
     },
     "classes": {
@@ -45,7 +45,7 @@
             "namespace": "",
             "file": "roles/roles.js",
             "line": 16,
-            "description": "Role-based authorization.  Uses 'roles' collection to store existing roles.  Adds a 'roles' field to user objects when they are added to a given role.",
+            "description": "<p>Role-based authorization compatible with built-in Meteor accounts package.</p>\n<br />\n<p>Uses 'roles' collection to store existing roles.</p>\n<p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>",
             "is_constructor": 1
         }
     },
@@ -59,7 +59,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 26,
+            "line": 29,
             "description": "Create a new role",
             "itemtype": "method",
             "name": "createRole",
@@ -75,7 +75,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 42,
+            "line": 45,
             "description": "Delete an existing role.  Will throw \"Role in use\" error if any users \nare currently assigned to the target role.",
             "itemtype": "method",
             "name": "deleteRole",
@@ -91,7 +91,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 66,
+            "line": 69,
             "description": "Add users to roles. Will create roles as needed.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
             "itemtype": "method",
             "name": "addUsersToRoles",
@@ -112,7 +112,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 101,
+            "line": 104,
             "description": "Remove users from roles",
             "itemtype": "method",
             "name": "removeUsersFromRoles",
@@ -133,7 +133,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 124,
+            "line": 127,
             "description": "Check if user is in role",
             "itemtype": "method",
             "name": "userIsInRole",
@@ -154,7 +154,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 140,
+            "line": 143,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -174,7 +174,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 154,
+            "line": 157,
             "description": "Retrieve all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -187,7 +187,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 164,
+            "line": 167,
             "description": "Retrieve all users who are in target role",
             "itemtype": "method",
             "name": "getUsersInRole",
diff --git a/docs/files/roles_roles.js.html b/docs/files/roles_roles.js.html
index 00215b10a4..6189e41c15 100644
--- a/docs/files/roles_roles.js.html
+++ b/docs/files/roles_roles.js.html
@@ -91,7 +91,7 @@
 ;(function () {
 
 &#x2F;**
- * Provides functions related to user authorization.
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
  * @module Roles
  *&#x2F;
@@ -104,7 +104,10 @@ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
 
 
 &#x2F;**
- * Role-based authorization.  Uses &#x27;roles&#x27; collection to store existing roles.  Adds a &#x27;roles&#x27; field to user objects when they are added to a given role.
+ * &lt;p&gt;Role-based authorization compatible with built-in Meteor accounts package.&lt;&#x2F;p&gt;
+ * &lt;br &#x2F;&gt;
+ * &lt;p&gt;Uses &#x27;roles&#x27; collection to store existing roles.&lt;&#x2F;p&gt;
+ * &lt;p&gt;Adds a &#x27;roles&#x27; field to user objects in &#x27;users&#x27; collection when they are added to a given role.&lt;&#x2F;p&gt;
  *
  * @class Roles
  * @constructor
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 1f58b66d82..d0e4e49ac0 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -102,7 +102,7 @@
 
 
 <div class="box intro">
-    <p>Provides functions related to user authorization.</p>
+    <p>Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.</p>
 </div>
 
 

From d3559b08d6b46b01db4d4a446526716014f40b1b Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 18:21:28 -0500
Subject: [PATCH 0006/1140] point to online docs

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b44e150098..aa60751fea 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ _NOTE_: If you see an error message regarding **'roles package does not exist'**
 
 ### Documentation
 
+Online API docs found here: http://alanning.github.com/meteor-roles/
 
 Generated using [YUIDoc][2]
 

From a1b17b55fe864c2900a2d832916e29deffb406bd Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 18:21:50 -0500
Subject: [PATCH 0007/1140] add github links

---
 roles/smart.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/smart.json b/roles/smart.json
index 0ed382a757..7127154653 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -1,9 +1,9 @@
 {
   "name": "roles",
-  "description": "Role-based authorization, compatible with Meteor's built-in Accounts package",
-  "homepage": "",
+  "description": "Role-based authorization, compatible with Meteor's built-in accounts packages",
+  "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
   "version": "1.0",
-  "git": "",
+  "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From 98f78e0e53657fc4820f0047ade565ff34edd5d7 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 18:23:55 -0500
Subject: [PATCH 0008/1140] mention unit tests and api docs

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index 7127154653..79903f83d4 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -1,6 +1,6 @@
 {
   "name": "roles",
-  "description": "Role-based authorization, compatible with Meteor's built-in accounts packages",
+  "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
   "version": "1.0",

From 648bac8d9a50bdce3a5d1bb984929c2523e831fe Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 21:07:11 -0500
Subject: [PATCH 0009/1140] add roles index with unique name field

---
 .gitignore            |   1 +
 roles/roles.js        |  41 +++++++---
 roles/tests/server.js | 184 +++++++++++++++++++++++++++++-------------
 3 files changed, 159 insertions(+), 67 deletions(-)

diff --git a/.gitignore b/.gitignore
index f356293eee..936a7d9896 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ lib-cov
 *.out
 *.pid
 *.gz
+*.swp
 
 pids
 logs
diff --git a/roles/roles.js b/roles/roles.js
index c7c769675e..e0979908b9 100644
--- a/roles/roles.js
+++ b/roles/roles.js
@@ -33,13 +33,28 @@ if ('undefined' === typeof Roles) {
  * @param {String} role Name of role
  */
 Roles.createRole = function (role) {
+  var id,
+      match
+
   if (!role 
       || 'string' !== typeof role 
       || role.trim().length === 0) {
     return
   }
 
-  Meteor.roles.insert({'name':role})
+  try {
+    id = Meteor.roles.insert({'name':role})
+  } catch (e) {
+    // (from Meteor accounts-base package, insertUserDoc func)
+    // XXX string parsing sucks, maybe
+    // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
+    if (e.name !== 'MongoError') throw e
+    match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/);
+    if (!match) throw e
+    if (match[1].indexOf('$name') !== -1)
+      throw new Meteor.Error(403, "Role already exists.")
+    throw e
+  }
 }
 
 /** 
@@ -54,10 +69,7 @@ Roles.deleteRole = function (role) {
     return
   }
 
-  var foundExistingUser = Meteor.users.findOne(
-        { roles: { $in: [role] } },
-        {   _id: 1 }
-      )
+  var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
 
   if (foundExistingUser) {
     throw new Error('Role in use')
@@ -81,15 +93,17 @@ Roles.addUsersToRoles = function (users, roles) {
   if (!users) throw new Error ("Missing 'users' param")
   if (!roles) throw new Error ("Missing 'roles' param")
 
-  var temp
+  var existingRoles,
+      missing 
 
   // ensure arrays
   if (!_.isArray(users)) users = [users]
   if (!_.isArray(roles)) roles = [roles]
 
   // ensure all roles exist in 'roles' collection
-  temp = _.difference(roles, Meteor.roles.find())
-  _.each(temp, function (role) {
+  existingRoles = _.pluck(Meteor.roles.find({}).fetch(), 'name')
+  missing = _.difference(roles, existingRoles)
+  _.each(missing, function (role) {
     Roles.createRole(role)
   })
 
@@ -145,13 +159,15 @@ Roles.isUserInRole = function (user, role) {
  *
  * @method getRolesForUser
  * @param {String} user Id of user
- * @return {Array} array of roles for user
+ * @return {Array} Array of user's roles, unsorted
  */
 Roles.getRolesForUser = function (user) {
-  return Meteor.users.findOne(
+  var user = Meteor.users.findOne(
     { _id: user},
     { _id: 0, roles: 1}
-  ).roles
+  )
+  
+  return user ? user.roles : undefined
 }
 
 /**
@@ -177,4 +193,7 @@ Roles.getUsersInRole = function (role) {
   )
 }
 
+/// DEFAULT INDEXES ON ROLES
+Meteor.roles._ensureIndex('name', {unique: 1});
+
 }());
diff --git a/roles/tests/server.js b/roles/tests/server.js
index dbb14a92b3..cfdc2b8804 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1,11 +1,5 @@
-// NOTE: This file is incomplete.  I can't figure out how to test
-// the server-side code using Tinytest.
-//
-// Problem is we need users
-
 ;(function () {
 
-
   var users = {},
       roles = ['admin','editor','user']
 
@@ -42,7 +36,7 @@
     })
   }
 
-  Tinytest.add('create and delete roles', function (test) {
+  Tinytest.add('can create and delete roles', function (test) {
     reset()
 
     Roles.createRole('test1')
@@ -60,7 +54,14 @@
     test.equal(typeof Meteor.roles.findOne(), 'undefined')
   })
 
-  Tinytest.add('is user in role', function (test) {
+  Tinytest.add('can\'t create duplicate roles', function (test) {
+    reset()
+
+    Roles.createRole('test1')
+    test.throws(function () {Roles.createRole('test1')})
+  })
+
+  Tinytest.add('can check if user is in role', function (test) {
     reset()
 
     Meteor.users.update(
@@ -70,7 +71,51 @@
     testUser(test, 'eve', ['admin', 'user'])
   })
 
-  Tinytest.add('add users to roles', function (test) {
+  Tinytest.add('can check if non-existant user is in role', function (test) {
+    reset()
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    test.isFalse(Roles.isUserInRole('1', 'admin'))
+  })
+
+  Tinytest.add('can add individual users to roles', function (test) {
+    reset() 
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+    testUser(test, 'eve', ['admin', 'user'])
+    testUser(test, 'bob', [])
+    testUser(test, 'joe', [])
+
+    Roles.addUsersToRoles(users.joe, ['editor', 'user'])
+
+    testUser(test, 'eve', ['admin', 'user'])
+    testUser(test, 'bob', [])
+    testUser(test, 'joe', ['editor', 'user'])
+  })
+  Tinytest.add('can add user to roles multiple times', function (test) {
+    reset() 
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+    testUser(test, 'eve', ['admin', 'user'])
+    testUser(test, 'bob', [])
+    testUser(test, 'joe', [])
+  })
+
+  Tinytest.add('can add multiple users to roles', function (test) {
     reset() 
 
     _.each(roles, function (role) {
@@ -81,45 +126,16 @@
 
     testUser(test, 'eve', ['admin', 'user'])
     testUser(test, 'bob', ['admin', 'user'])
-    testUser(test, 'joe', [], roles)
+    testUser(test, 'joe', [])
 
-    Roles.addUsersToRoles([users.joe], ['editor', 'user'])
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
 
     testUser(test, 'eve', ['admin', 'user'])
-    testUser(test, 'bob', ['admin', 'user'])
+    testUser(test, 'bob', ['admin', 'editor', 'user'])
     testUser(test, 'joe', ['editor', 'user'])
   })
 
-  Tinytest.add('remove users from roles', function (test) {
-    reset() 
-
-    _.each(roles, function (role) {
-      Roles.createRole(role)
-    })
-
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser(test, 'eve', ['editor', 'user'])
-    testUser(test, 'bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles([users.eve], ['user'])
-    testUser(test, 'eve', ['editor'])
-    testUser(test, 'bob', ['editor', 'user'])
-
-    // try remove again
-    Roles.removeUsersFromRoles([users.eve], ['user'])
-    testUser(test, 'eve', ['editor'])
-
-    // remove user role - two users
-    test.isFalse(Roles.isUserInRole(users.joe, 'admin'))
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
-    testUser(test, 'bob', ['admin', 'user', 'editor'])
-    testUser(test, 'joe', ['admin', 'user'])
-    Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
-    testUser(test, 'bob', ['user', 'editor'])
-    testUser(test, 'joe', ['user'])
-  })
-
-  Tinytest.add('add non-existing user to role', function (test) {
+  Tinytest.add('can\'t add non-exist user to role', function (test) {
     reset()
 
     _.each(roles, function (role) {
@@ -130,7 +146,63 @@
     test.equal(Meteor.users.findOne({_id:'1'}), undefined)
   })
 
-  Tinytest.add('empty role names are not allowed', function (test) {
+  Tinytest.add('can remove individual users from roles', function (test) {
+    reset() 
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser(test, 'eve', ['editor', 'user'])
+    testUser(test, 'bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser(test, 'eve', ['editor'])
+    testUser(test, 'bob', ['editor', 'user'])
+  })
+  Tinytest.add('can remove user from roles multiple times', function (test) {
+    reset() 
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser(test, 'eve', ['editor', 'user'])
+    testUser(test, 'bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser(test, 'eve', ['editor'])
+    testUser(test, 'bob', ['editor', 'user'])
+
+    // try remove again
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser(test, 'eve', ['editor'])
+  })
+
+  Tinytest.add('can remove multiple users from roles', function (test) {
+    reset() 
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    // remove user role - two users
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser(test, 'eve', ['editor', 'user'])
+    testUser(test, 'bob', ['editor', 'user'])
+
+    test.isFalse(Roles.isUserInRole(users.joe, 'admin'))
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
+    testUser(test, 'bob', ['admin', 'user', 'editor'])
+    testUser(test, 'joe', ['admin', 'user'])
+    Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
+    testUser(test, 'bob', ['user', 'editor'])
+    testUser(test, 'joe', ['user'])
+  })
+
+  Tinytest.add('can\'t create role with empty names', function (test) {
     reset() 
 
     Roles.createRole('')
@@ -142,7 +214,7 @@
     test.equal(Meteor.roles.find().count(), 0)
   })
 
-  Tinytest.add('get roles for user', function (test) {
+  Tinytest.add('can get all roles for user', function (test) {
     reset()
     _.each(roles, function (role) {
       Roles.createRole(role)
@@ -152,7 +224,16 @@
     test.equal(Roles.getRolesForUser(users.eve), ['admin', 'user'])
   })
 
-  Tinytest.add('get all roles', function (test) {
+  Tinytest.add('can\'t get roles for non-existant user', function (test) {
+    reset()
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    test.equal(Roles.getRolesForUser('1'), undefined)
+  })
+
+  Tinytest.add('can get all roles', function (test) {
     reset()
     _.each(roles, function (role) {
       Roles.createRole(role)
@@ -166,23 +247,14 @@
   })
 
 
-  Tinytest.add('is user in roles for non-existing user returns false', function (test) {
-    reset()
-
-    _.each(roles, function (role) {
-      Roles.createRole(role)
-    })
-
-    test.isFalse(Roles.isUserInRole('1', 'admin'))
-  })
-
-  Tinytest.add('get users in role', function (test) {
+  Tinytest.add('can get all users in role', function (test) {
     reset()
     _.each(roles, function (role) {
       Roles.createRole(role)
     })
 
     Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
 
     var expected = [users.eve, users.joe],
         actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')

From ca0f110c1eab19c6ecec399518a129a9dc69ade1 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 21:08:01 -0500
Subject: [PATCH 0010/1140] update documentation

---
 docs/classes/Roles.html        | 16 ++++++-------
 docs/data.json                 | 16 ++++++-------
 docs/files/roles_roles.js.html | 41 +++++++++++++++++++++++++---------
 3 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 1dc545f9df..ee0120eed2 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -318,7 +318,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l69"><code>roles&#x2F;roles.js:69</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l81"><code>roles&#x2F;roles.js:81</code></a>
         
         </p>
 
@@ -511,7 +511,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l45"><code>roles&#x2F;roles.js:45</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l60"><code>roles&#x2F;roles.js:60</code></a>
         
         </p>
 
@@ -593,7 +593,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l157"><code>roles&#x2F;roles.js:157</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l173"><code>roles&#x2F;roles.js:173</code></a>
         
         </p>
 
@@ -674,7 +674,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l143"><code>roles&#x2F;roles.js:143</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l157"><code>roles&#x2F;roles.js:157</code></a>
         
         </p>
 
@@ -722,7 +722,7 @@ are currently assigned to the target role.</p>
                     
                         <span class="type">Array</span>:
                     
-                    array of roles for user
+                    Array of user's roles, unsorted
                 
             </div>
         </div>
@@ -778,7 +778,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l167"><code>roles&#x2F;roles.js:167</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l183"><code>roles&#x2F;roles.js:183</code></a>
         
         </p>
 
@@ -884,7 +884,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l104"><code>roles&#x2F;roles.js:104</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l118"><code>roles&#x2F;roles.js:118</code></a>
         
         </p>
 
@@ -992,7 +992,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l127"><code>roles&#x2F;roles.js:127</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l141"><code>roles&#x2F;roles.js:141</code></a>
         
         </p>
 
diff --git a/docs/data.json b/docs/data.json
index 817430d55c..26a2490fb6 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -75,7 +75,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 45,
+            "line": 60,
             "description": "Delete an existing role.  Will throw \"Role in use\" error if any users \nare currently assigned to the target role.",
             "itemtype": "method",
             "name": "deleteRole",
@@ -91,7 +91,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 69,
+            "line": 81,
             "description": "Add users to roles. Will create roles as needed.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
             "itemtype": "method",
             "name": "addUsersToRoles",
@@ -112,7 +112,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 104,
+            "line": 118,
             "description": "Remove users from roles",
             "itemtype": "method",
             "name": "removeUsersFromRoles",
@@ -133,7 +133,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 127,
+            "line": 141,
             "description": "Check if user is in role",
             "itemtype": "method",
             "name": "userIsInRole",
@@ -154,7 +154,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 143,
+            "line": 157,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -166,7 +166,7 @@
                 }
             ],
             "return": {
-                "description": "array of roles for user",
+                "description": "Array of user's roles, unsorted",
                 "type": "Array"
             },
             "class": "Roles",
@@ -174,7 +174,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 157,
+            "line": 173,
             "description": "Retrieve all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -187,7 +187,7 @@
         },
         {
             "file": "roles/roles.js",
-            "line": 167,
+            "line": 183,
             "description": "Retrieve all users who are in target role",
             "itemtype": "method",
             "name": "getUsersInRole",
diff --git a/docs/files/roles_roles.js.html b/docs/files/roles_roles.js.html
index 6189e41c15..3e287201ce 100644
--- a/docs/files/roles_roles.js.html
+++ b/docs/files/roles_roles.js.html
@@ -123,13 +123,28 @@ if (&#x27;undefined&#x27; === typeof Roles) {
  * @param {String} role Name of role
  *&#x2F;
 Roles.createRole = function (role) {
+  var id,
+      match
+
   if (!role 
       || &#x27;string&#x27; !== typeof role 
       || role.trim().length === 0) {
     return
   }
 
-  Meteor.roles.insert({&#x27;name&#x27;:role})
+  try {
+    id = Meteor.roles.insert({&#x27;name&#x27;:role})
+  } catch (e) {
+    &#x2F;&#x2F; (from Meteor accounts-base package, insertUserDoc func)
+    &#x2F;&#x2F; XXX string parsing sucks, maybe
+    &#x2F;&#x2F; https:&#x2F;&#x2F;jira.mongodb.org&#x2F;browse&#x2F;SERVER-3069 will get fixed one day
+    if (e.name !== &#x27;MongoError&#x27;) throw e
+    match = e.err.match(&#x2F;^E11000 duplicate key error index: ([^ ]+)&#x2F;);
+    if (!match) throw e
+    if (match[1].indexOf(&#x27;$name&#x27;) !== -1)
+      throw new Meteor.Error(403, &quot;Role already exists.&quot;)
+    throw e
+  }
 }
 
 &#x2F;** 
@@ -144,10 +159,7 @@ Roles.deleteRole = function (role) {
     return
   }
 
-  var foundExistingUser = Meteor.users.findOne(
-        { roles: { $in: [role] } },
-        {   _id: 1 }
-      )
+  var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
 
   if (foundExistingUser) {
     throw new Error(&#x27;Role in use&#x27;)
@@ -171,15 +183,17 @@ Roles.addUsersToRoles = function (users, roles) {
   if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
   if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
 
-  var temp
+  var existingRoles,
+      missing 
 
   &#x2F;&#x2F; ensure arrays
   if (!_.isArray(users)) users = [users]
   if (!_.isArray(roles)) roles = [roles]
 
   &#x2F;&#x2F; ensure all roles exist in &#x27;roles&#x27; collection
-  temp = _.difference(roles, Meteor.roles.find())
-  _.each(temp, function (role) {
+  existingRoles = _.pluck(Meteor.roles.find({}).fetch(), &#x27;name&#x27;)
+  missing = _.difference(roles, existingRoles)
+  _.each(missing, function (role) {
     Roles.createRole(role)
   })
 
@@ -235,13 +249,15 @@ Roles.isUserInRole = function (user, role) {
  *
  * @method getRolesForUser
  * @param {String} user Id of user
- * @return {Array} array of roles for user
+ * @return {Array} Array of user&#x27;s roles, unsorted
  *&#x2F;
 Roles.getRolesForUser = function (user) {
-  return Meteor.users.findOne(
+  var user = Meteor.users.findOne(
     { _id: user},
     { _id: 0, roles: 1}
-  ).roles
+  )
+  
+  return user ? user.roles : undefined
 }
 
 &#x2F;**
@@ -267,6 +283,9 @@ Roles.getUsersInRole = function (role) {
   )
 }
 
+&#x2F;&#x2F;&#x2F; DEFAULT INDEXES ON ROLES
+Meteor.roles._ensureIndex(&#x27;name&#x27;, {unique: 1});
+
 }());
 
     </pre>

From 70364badd7816a77bae910fbbe9b8342e6a799d1 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Jan 2013 21:11:30 -0500
Subject: [PATCH 0011/1140] mention index in documentation

---
 docs/classes/Roles.html        | 2 +-
 docs/data.json                 | 2 +-
 docs/files/roles_roles.js.html | 2 +-
 roles/roles.js                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index ee0120eed2..45450ff3a8 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -112,7 +112,7 @@
 
 <p><br /></p>
 
-<p>Uses 'roles' collection to store existing roles.</p>
+<p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>
 
 <p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>
 </div>
diff --git a/docs/data.json b/docs/data.json
index 26a2490fb6..20cc37d91b 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -45,7 +45,7 @@
             "namespace": "",
             "file": "roles/roles.js",
             "line": 16,
-            "description": "<p>Role-based authorization compatible with built-in Meteor accounts package.</p>\n<br />\n<p>Uses 'roles' collection to store existing roles.</p>\n<p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>",
+            "description": "<p>Role-based authorization compatible with built-in Meteor accounts package.</p>\n<br />\n<p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>\n<p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>",
             "is_constructor": 1
         }
     },
diff --git a/docs/files/roles_roles.js.html b/docs/files/roles_roles.js.html
index 3e287201ce..a3a2e4b133 100644
--- a/docs/files/roles_roles.js.html
+++ b/docs/files/roles_roles.js.html
@@ -106,7 +106,7 @@ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
 &#x2F;**
  * &lt;p&gt;Role-based authorization compatible with built-in Meteor accounts package.&lt;&#x2F;p&gt;
  * &lt;br &#x2F;&gt;
- * &lt;p&gt;Uses &#x27;roles&#x27; collection to store existing roles.&lt;&#x2F;p&gt;
+ * &lt;p&gt;Uses &#x27;roles&#x27; collection to store existing roles with unique index on &#x27;name&#x27; field.&lt;&#x2F;p&gt;
  * &lt;p&gt;Adds a &#x27;roles&#x27; field to user objects in &#x27;users&#x27; collection when they are added to a given role.&lt;&#x2F;p&gt;
  *
  * @class Roles
diff --git a/roles/roles.js b/roles/roles.js
index e0979908b9..666d975f00 100644
--- a/roles/roles.js
+++ b/roles/roles.js
@@ -16,7 +16,7 @@ Meteor.roles = new Meteor.Collection("roles")
 /**
  * <p>Role-based authorization compatible with built-in Meteor accounts package.</p>
  * <br />
- * <p>Uses 'roles' collection to store existing roles.</p>
+ * <p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>
  * <p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>
  *
  * @class Roles

From 50d103cf54a464824c8812b9df3f768e738d426a Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 6 Jan 2013 03:24:38 -0500
Subject: [PATCH 0012/1140] isolate server-side role code

---
 docs/classes/Roles.html                       | 20 ++++++-------
 docs/data.json                                | 28 +++++++++----------
 ...les.js.html => roles_roles_server.js.html} |  4 +--
 docs/modules/Roles.html                       |  2 +-
 roles/package.js                              |  2 +-
 roles/{roles.js => roles_server.js}           |  0
 6 files changed, 28 insertions(+), 28 deletions(-)
 rename docs/files/{roles_roles.js.html => roles_roles_server.js.html} (98%)
 rename roles/{roles.js => roles_server.js} (100%)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 45450ff3a8..db1b55ccf5 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -92,7 +92,7 @@
 
     
         <div class="foundat">
-            Defined in: <a href="..&#x2F;files&#x2F;roles_roles.js.html#l16"><code>roles&#x2F;roles.js:16</code></a>
+            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l16"><code>roles&#x2F;roles_server.js:16</code></a>
         </div>
     
 
@@ -152,7 +152,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l16"><code>roles&#x2F;roles.js:16</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l16"><code>roles&#x2F;roles_server.js:16</code></a>
         
         </p>
 
@@ -318,7 +318,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l81"><code>roles&#x2F;roles.js:81</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l81"><code>roles&#x2F;roles_server.js:81</code></a>
         
         </p>
 
@@ -424,7 +424,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l29"><code>roles&#x2F;roles.js:29</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l29"><code>roles&#x2F;roles_server.js:29</code></a>
         
         </p>
 
@@ -511,7 +511,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l60"><code>roles&#x2F;roles.js:60</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l60"><code>roles&#x2F;roles_server.js:60</code></a>
         
         </p>
 
@@ -593,7 +593,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l173"><code>roles&#x2F;roles.js:173</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l173"><code>roles&#x2F;roles_server.js:173</code></a>
         
         </p>
 
@@ -674,7 +674,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l157"><code>roles&#x2F;roles.js:157</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l157"><code>roles&#x2F;roles_server.js:157</code></a>
         
         </p>
 
@@ -778,7 +778,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l183"><code>roles&#x2F;roles.js:183</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l183"><code>roles&#x2F;roles_server.js:183</code></a>
         
         </p>
 
@@ -884,7 +884,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l118"><code>roles&#x2F;roles.js:118</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l118"><code>roles&#x2F;roles_server.js:118</code></a>
         
         </p>
 
@@ -992,7 +992,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles.js.html#l141"><code>roles&#x2F;roles.js:141</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l141"><code>roles&#x2F;roles_server.js:141</code></a>
         
         </p>
 
diff --git a/docs/data.json b/docs/data.json
index 20cc37d91b..5748273e5f 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -5,8 +5,8 @@
         "version": "1.0"
     },
     "files": {
-        "roles/roles.js": {
-            "name": "roles/roles.js",
+        "roles/roles_server.js": {
+            "name": "roles/roles_server.js",
             "modules": {
                 "Roles": 1
             },
@@ -27,7 +27,7 @@
             "fors": {},
             "namespaces": {},
             "tag": "module",
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 16,
             "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
         }
@@ -43,7 +43,7 @@
             "extension_for": [],
             "module": "Roles",
             "namespace": "",
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 16,
             "description": "<p>Role-based authorization compatible with built-in Meteor accounts package.</p>\n<br />\n<p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>\n<p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>",
             "is_constructor": 1
@@ -51,14 +51,14 @@
     },
     "classitems": [
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 9,
             "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
             "class": "Roles",
             "module": "Roles"
         },
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 29,
             "description": "Create a new role",
             "itemtype": "method",
@@ -74,7 +74,7 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 60,
             "description": "Delete an existing role.  Will throw \"Role in use\" error if any users \nare currently assigned to the target role.",
             "itemtype": "method",
@@ -90,7 +90,7 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 81,
             "description": "Add users to roles. Will create roles as needed.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
             "itemtype": "method",
@@ -111,7 +111,7 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 118,
             "description": "Remove users from roles",
             "itemtype": "method",
@@ -132,7 +132,7 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 141,
             "description": "Check if user is in role",
             "itemtype": "method",
@@ -153,7 +153,7 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 157,
             "description": "Retrieve users roles",
             "itemtype": "method",
@@ -173,7 +173,7 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 173,
             "description": "Retrieve all existing roles",
             "itemtype": "method",
@@ -186,7 +186,7 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles.js",
+            "file": "roles/roles_server.js",
             "line": 183,
             "description": "Retrieve all users who are in target role",
             "itemtype": "method",
@@ -209,7 +209,7 @@
     "warnings": [
         {
             "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
-            "line": " roles/roles.js:9"
+            "line": " roles/roles_server.js:9"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles.js.html b/docs/files/roles_roles_server.js.html
similarity index 98%
rename from docs/files/roles_roles.js.html
rename to docs/files/roles_roles_server.js.html
index a3a2e4b133..bdff0828e8 100644
--- a/docs/files/roles_roles.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>roles&#x2F;roles.js - The meteor-roles API</title>
+    <title>roles&#x2F;roles_server.js - The meteor-roles API</title>
     <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
@@ -84,7 +84,7 @@
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1 class="file-heading">File: roles&#x2F;roles.js</h1>
+                        <h1 class="file-heading">File: roles&#x2F;roles_server.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index d0e4e49ac0..b4b414dd1d 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -92,7 +92,7 @@
 
     
         <div class="foundat">
-            Defined in: <a href="..&#x2F;files&#x2F;roles_roles.js.html#l16"><code>roles&#x2F;roles.js:16</code></a>
+            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l16"><code>roles&#x2F;roles_server.js:16</code></a>
         </div>
     
 
diff --git a/roles/package.js b/roles/package.js
index d03fd7644a..242bb1fb85 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -5,7 +5,7 @@ Package.describe({
 Package.on_use(function (api, where) {
   where = where || ['client', 'server'];
   api.use(['underscore', 'accounts-base'], where);
-  api.add_files('roles.js', where);
+  api.add_files('roles_server.js', 'server');
 });
 
 Package.on_test(function (api) {
diff --git a/roles/roles.js b/roles/roles_server.js
similarity index 100%
rename from roles/roles.js
rename to roles/roles_server.js

From cd84d844b862eb4e001531d4b54e110cfec42d2a Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 6 Jan 2013 03:27:39 -0500
Subject: [PATCH 0013/1140] change function name to userIsInRole

---
 roles/roles_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 666d975f00..53bff70048 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -145,7 +145,7 @@ Roles.removeUsersFromRoles = function (users, roles) {
  * @param {String} user Id of user
  * @param {String} role Name of role
  */
-Roles.isUserInRole = function (user, role) {
+Roles.userIsInRole = function (user, role) {
   var found = Meteor.users.findOne(
       { _id: user, roles: { $in: [role] } },
       { _id: 1 }

From 1feaa832899f466c1630e15fe389176490ab2b7a Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 6 Jan 2013 03:50:02 -0500
Subject: [PATCH 0014/1140] let userIsInRole check objects and arrays

---
 docs/classes/Roles.html               | 18 ++++++------
 docs/data.json                        | 16 +++++------
 docs/files/roles_roles_server.js.html | 39 ++++++++++++++++++++------
 roles/roles_server.js                 | 39 ++++++++++++++++++++------
 roles/tests/server.js                 | 40 +++++++++++++++++++++++----
 5 files changed, 114 insertions(+), 38 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index db1b55ccf5..1dfde6655e 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -593,7 +593,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l173"><code>roles&#x2F;roles_server.js:173</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l196"><code>roles&#x2F;roles_server.js:196</code></a>
         
         </p>
 
@@ -674,7 +674,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l157"><code>roles&#x2F;roles_server.js:157</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l180"><code>roles&#x2F;roles_server.js:180</code></a>
         
         </p>
 
@@ -778,7 +778,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l183"><code>roles&#x2F;roles_server.js:183</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l206"><code>roles&#x2F;roles_server.js:206</code></a>
         
         </p>
 
@@ -959,7 +959,7 @@ are currently assigned to the target role.</p>
             
                 <li class="arg">
                     
-                        <code>role</code>
+                        <code>roles</code>
                     
                 </li>
             
@@ -1015,13 +1015,13 @@ are currently assigned to the target role.</p>
                 <li class="param">
                     
                         <code class="param-name">user</code>
-                        <span class="type">String</span>
+                        <span class="type">String | Object</span>
                     
 
                     
 
                     <div class="param-description">
-                        <p>Id of user</p>
+                        <p>Id of user or actual user object</p>
                     </div>
 
                     
@@ -1029,14 +1029,14 @@ are currently assigned to the target role.</p>
             
                 <li class="param">
                     
-                        <code class="param-name">role</code>
-                        <span class="type">String</span>
+                        <code class="param-name">roles</code>
+                        <span class="type">String | Array</span>
                     
 
                     
 
                     <div class="param-description">
-                        <p>Name of role</p>
+                        <p>Name of role or Array of roles to check against.  If array, will return true if user is in <em>any</em> role.</p>
                     </div>
 
                     
diff --git a/docs/data.json b/docs/data.json
index 5748273e5f..f6db7d00eb 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -140,13 +140,13 @@
             "params": [
                 {
                     "name": "user",
-                    "description": "Id of user",
-                    "type": "String"
+                    "description": "Id of user or actual user object",
+                    "type": "String|Object"
                 },
                 {
-                    "name": "role",
-                    "description": "Name of role",
-                    "type": "String"
+                    "name": "roles",
+                    "description": "Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.",
+                    "type": "String|Array"
                 }
             ],
             "class": "Roles",
@@ -154,7 +154,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 157,
+            "line": 180,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -174,7 +174,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 173,
+            "line": 196,
             "description": "Retrieve all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -187,7 +187,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 183,
+            "line": 206,
             "description": "Retrieve all users who are in target role",
             "itemtype": "method",
             "name": "getUsersInRole",
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index bdff0828e8..a4baa656d4 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -232,16 +232,39 @@ Roles.removeUsersFromRoles = function (users, roles) {
  * Check if user is in role
  *
  * @method userIsInRole
- * @param {String} user Id of user
- * @param {String} role Name of role
+ * @param {String|Object} user Id of user or actual user object
+ * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
  *&#x2F;
-Roles.isUserInRole = function (user, role) {
-  var found = Meteor.users.findOne(
-      { _id: user, roles: { $in: [role] } },
-      { _id: 1 }
-    )
+Roles.userIsInRole = function (user, roles) {
+  var id,
+      userRoles
+    
+  if (&#x27;string&#x27; === typeof user) {
+    id = user
+  } 
 
-  return found
+  &#x2F;&#x2F; ensure array to simplify code
+  if (!_.isArray(roles)) {
+    roles = [roles]
+  }
+  
+  if (&#x27;object&#x27; === typeof user) {
+    userRoles = user.roles
+    if (_.isArray(userRoles)) {
+      return _.some(roles, function (role) {
+        return _.contains(userRoles, role)
+      })
+    }
+    &#x2F;&#x2F; missing roles, try id
+    id = user._id
+  }
+
+  if (!id) return false
+
+  return Meteor.users.findOne(
+    { _id: id, roles: { $in: roles } },
+    { _id: 1 }
+  )
 }
 
 &#x2F;**
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 53bff70048..476d84ed30 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -142,16 +142,39 @@ Roles.removeUsersFromRoles = function (users, roles) {
  * Check if user is in role
  *
  * @method userIsInRole
- * @param {String} user Id of user
- * @param {String} role Name of role
+ * @param {String|Object} user Id of user or actual user object
+ * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
  */
-Roles.userIsInRole = function (user, role) {
-  var found = Meteor.users.findOne(
-      { _id: user, roles: { $in: [role] } },
-      { _id: 1 }
-    )
+Roles.userIsInRole = function (user, roles) {
+  var id,
+      userRoles
+    
+  if ('string' === typeof user) {
+    id = user
+  } 
 
-  return found
+  // ensure array to simplify code
+  if (!_.isArray(roles)) {
+    roles = [roles]
+  }
+  
+  if ('object' === typeof user) {
+    userRoles = user.roles
+    if (_.isArray(userRoles)) {
+      return _.some(roles, function (role) {
+        return _.contains(userRoles, role)
+      })
+    }
+    // missing roles, try id
+    id = user._id
+  }
+
+  if (!id) return false
+
+  return Meteor.users.findOne(
+    { _id: id, roles: { $in: roles } },
+    { _id: 1 }
+  )
 }
 
 /**
diff --git a/roles/tests/server.js b/roles/tests/server.js
index cfdc2b8804..361cf9a1e0 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -24,14 +24,14 @@
     var userId = users[user]
 
     _.each(roles, function (role) {
-      var expected = expectedRoles.indexOf(role) !== -1,
+      var expected = _.contains(expectedRoles, role),
           msg = user + ' is not in expected role ' + role,
           nmsg = user + ' is in un-expected role ' + role
 
       if (expected) {
-        test.isTrue(Roles.isUserInRole(userId, role), msg)
+        test.isTrue(Roles.userIsInRole(userId, role), msg)
       } else {
-        test.isFalse(Roles.isUserInRole(userId, role), nmsg)
+        test.isFalse(Roles.userIsInRole(userId, role), nmsg)
       }
     })
   }
@@ -78,7 +78,37 @@
       Roles.createRole(role)
     })
 
-    test.isFalse(Roles.isUserInRole('1', 'admin'))
+    test.isFalse(Roles.userIsInRole('1', 'admin'))
+  })
+
+  Tinytest.add('can check user in role via object', function (test) {
+    var user 
+
+    reset()
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    user = Meteor.users.findOne({_id:users.eve})
+
+    test.isTrue(Roles.userIsInRole(user, 'admin'))
+  })
+
+  Tinytest.add('can check user against several roles at once', function (test) {
+    var user 
+
+    reset()
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    user = Meteor.users.findOne({_id:users.eve})
+
+    test.isTrue(Roles.userIsInRole(user, ['editor','admin']))
   })
 
   Tinytest.add('can add individual users to roles', function (test) {
@@ -193,7 +223,7 @@
     testUser(test, 'eve', ['editor', 'user'])
     testUser(test, 'bob', ['editor', 'user'])
 
-    test.isFalse(Roles.isUserInRole(users.joe, 'admin'))
+    test.isFalse(Roles.userIsInRole(users.joe, 'admin'))
     Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
     testUser(test, 'bob', ['admin', 'user', 'editor'])
     testUser(test, 'joe', ['admin', 'user'])

From 6c23652dfa178efdd4ed9374ffe2b28765dc6a70 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Mon, 7 Jan 2013 19:11:51 -0500
Subject: [PATCH 0015/1140] Add usage section

---
 README.md | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aa60751fea..b0e91d5cad 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,51 @@ To run tests:
 _NOTE_: If you see an error message regarding **'roles package does not exist'** that means you are trying to run 'mrt' in the wrong directory.  See step 2.
 
 
+### Usage
+
+User objects now have an extra 'roles' field which contains the user's roles.
+
+**Server:**
+
+Add checks to publish and other sensitive functions to restrict data available to client.
+
+Publish the logged-in user's roles like so:
+```js
+// Give Users access to their own roles
+Meteor.publish('ownUserData', function () {
+  var user = Meteor.users.findOne(this.userId),
+      fields = {roles:1}
+
+  return Meteor.users.find({_id:this.userId}, {fields: fields})
+})
+```
+
+**Client:**
+
+```js
+Meteor.subscribe('ownUserData')
+
+Template.header.isInRole = function (role) {
+  var user = Meteor.user()
+
+  if (!user) return false
+
+  return _.contains(user.roles, role)
+}
+```
+```handlebars
+// HTML template
+{{#if isInRole 'admin'}}
+  ... stuff only admins care about.  
+  ... note: anything published will be sent to the client, so lock it down server-side first
+{{/if}}
+```
+
 ### Documentation
 
 Online API docs found here: http://alanning.github.com/meteor-roles/
 
-Generated using [YUIDoc][2]
+API docs generated using [YUIDoc][2]
 
 To re-generate documentation:
   1. install YUIDoc
@@ -33,6 +73,9 @@ To serve documentation locally:
   4. point browser at http://localhost:3000/
 
 
+
+
+
 [1]: https://github.com/oortcloud/meteorite "Meteorite"
 
 [2]: http://yui.github.com/yuidoc/ "YUIDoc"

From 4a198893102222fc500da5871a8d215594e7b5e4 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 7 Jan 2013 19:19:48 -0500
Subject: [PATCH 0016/1140] Add tag

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index 79903f83d4..da6621619d 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.0",
+  "version": "v1.0.0",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From b675e8bcc0489875756e18d981fcc766ce926dd2 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 7 Jan 2013 19:25:44 -0500
Subject: [PATCH 0017/1140] fix tag syntax - remove 'v'

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index da6621619d..3c1176a732 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "v1.0.0",
+  "version": "1.0.0",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From e0c6301f7b5c0a7e065fbcdc111b6dd807e7fdf8 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Thu, 24 Jan 2013 12:49:45 -0500
Subject: [PATCH 0018/1140] Improve client-side permission notes re: Dror

---
 README.md | 91 ++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index b0e91d5cad..cbd6305624 100644
--- a/README.md
+++ b/README.md
@@ -3,56 +3,79 @@ meteor-roles
 
 Roles-based authorization package for Meteor - compatible with built-in accounts package.
 
-### Tests
-
-
-To run tests: 
-  1. install [Meteorite][1]
-  2. cd 'roles' directory
-  3. mrt
-  4. point browser at http://localhost:3000/
-
-_NOTE_: If you see an error message regarding **'roles package does not exist'** that means you are trying to run 'mrt' in the wrong directory.  See step 2.
-
-
 ### Usage
 
 User objects now have an extra 'roles' field which contains the user's roles.
 
-**Server:**
+-- **Server** --
 
-Add checks to publish and other sensitive functions to restrict data available to client.
+NOTE: Add checks to publish methods and other sensitive functions to restrict data available to client.
 
-Publish the logged-in user's roles like so:
+Check user roles before publishing sensitive data:
 ```js
+// server/publish.js
+
+// Give authorized users access to sensitive data
+Meteor.publish('secrets', function () {
+  if (Roles.userIsInRole(this.userId, ['view-secrets','admin'])) {
+    
+    return Meteor.secrets.find();
+    
+  } else {
+    
+    // user not authorized. do not publish secrets
+    this.complete();
+    return;
+  
+  }
+});
+```
+
+Publish the logged-in user's roles for convenience checks client-side, like so:
+```js
+// server/publish.js
+
 // Give Users access to their own roles
 Meteor.publish('ownUserData', function () {
   var user = Meteor.users.findOne(this.userId),
-      fields = {roles:1}
+      fields = {roles:1};
 
-  return Meteor.users.find({_id:this.userId}, {fields: fields})
-})
+  return Meteor.users.find({_id:this.userId}, {fields: fields});
+});
 ```
 
-**Client:**
+
+-- **Client** --
+
+NOTE: Like all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
+since Meteor bundles the same client-side code to all users.  Any sensitive data needs to be controlled server-side to prevent unwanted disclosure.
+
+To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the the 'admin' template in the example below will still be able to with a little work but this is not a problem as long as the actual data is restricted server-side.
 
 ```js
-Meteor.subscribe('ownUserData')
+// client/myApp.js
+
+Meteor.subscribe('ownUserData');
 
 Template.header.isInRole = function (role) {
-  var user = Meteor.user()
+  var user = Meteor.user();
 
-  if (!user) return false
+  if (!user) {
+    return false;
+  }
 
-  return _.contains(user.roles, role)
+  return _.contains(user.roles, role);
 }
 ```
 ```handlebars
-// HTML template
-{{#if isInRole 'admin'}}
-  ... stuff only admins care about.  
-  ... note: anything published will be sent to the client, so lock it down server-side first
-{{/if}}
+<!-- client/myApp.html -->
+
+<template name="header">
+  {{#if isInRole 'admin'}}
+    ... stuff only admins care about.  
+    ... note: anything published by server will be sent to the client, so lock it down server-side first
+  {{/if}}
+</template>
 ```
 
 ### Documentation
@@ -73,6 +96,18 @@ To serve documentation locally:
   4. point browser at http://localhost:3000/
 
 
+### Tests
+
+
+To run tests: 
+  1. install [Meteorite][1]
+  2. cd 'roles' directory
+  3. mrt
+  4. point browser at http://localhost:3000/
+
+_NOTE_: If you see an error message regarding **'roles package does not exist'** that means you are trying to run 'mrt' in the wrong directory.  See step 2.
+
+
 
 
 

From d3c55b7a70dd79f9fb09613504f355a28f108c3a Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 25 Jan 2013 22:19:07 -0500
Subject: [PATCH 0019/1140] include Roles functions client-side for latency
 compensation

---
 roles/package.js      |  10 +-
 roles/roles_client.js |  61 ++++++++++++
 roles/roles_common.js | 219 ++++++++++++++++++++++++++++++++++++++++++
 roles/roles_server.js | 212 +---------------------------------------
 roles/smart.json      |   2 +-
 roles/tests/client.js |  32 ++++++
 6 files changed, 325 insertions(+), 211 deletions(-)
 create mode 100644 roles/roles_client.js
 create mode 100644 roles/roles_common.js
 create mode 100644 roles/tests/client.js

diff --git a/roles/package.js b/roles/package.js
index 242bb1fb85..8d5ebe0cae 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -6,9 +6,17 @@ Package.on_use(function (api, where) {
   where = where || ['client', 'server'];
   api.use(['underscore', 'accounts-base'], where);
   api.add_files('roles_server.js', 'server');
+  api.add_files('roles_common.js', where);
+  api.add_files('roles_client.js', 'client');
 });
 
 Package.on_test(function (api) {
-  api.use(['roles', 'accounts-password', 'tinytest'], 'server');
+  // include accounts-password so Meteor.users exists
+  api.use('accounts-password', 'server');
+
+  api.use('tinytest', 'server');
   api.add_files('tests/server.js', 'server');
+
+  api.use(['accounts-base', 'tinytest'], 'client');
+  api.add_files('tests/client.js', 'client');
 });
diff --git a/roles/roles_client.js b/roles/roles_client.js
new file mode 100644
index 0000000000..c19645f14e
--- /dev/null
+++ b/roles/roles_client.js
@@ -0,0 +1,61 @@
+;(function () {
+  
+/**
+ * Convenience functions for use on client.
+ *
+ * NOTE: You must restrict user actions on the server-side; anything
+ * done client-side is strictly for convenience and must not be
+ * trusted.
+ *
+ * @module Helpers
+ */
+
+////////////////////////////////////////////////////////////
+// Handlebars helpers
+//
+// Use a semi-private variable rather than declaring Handlebars
+// helpers directly so that we can unit test the helpers.
+// For some reason, the Handlebars helpers are not registered 
+// before the tests run.
+//
+Roles._handlebarsHelpers = {
+
+  /**
+   * Handlebars helper to check if current user is in at least one
+   * of the target roles.  For use in client-side templates.
+   *
+   * @method isInRole
+   * @param {String} role name of role or comma-seperated list of roles
+   * @return {Boolean} true if current user is in at least one of the target roles
+   */
+  isInRole: function (role) {
+    var user = Meteor.user(),
+      comma = role && role.indexOf(','),
+      roles
+
+    if (!user) return false
+
+    if (comma !== -1) {
+      roles = _.reduce(role.split(','), function (memo, r) {
+        if (!r || !r.trim()) {
+          return memo
+        }
+        memo.push(r.trim())
+        return memo
+      }, [])
+    } else {
+      roles = [role]
+    }
+
+    return Roles.userIsInRole(user, roles)
+  }
+}
+
+
+if ('undefined' !== typeof Handlebars) {
+  _.each(Roles._handlebarsHelpers, function (name, func) {
+    Handlebars.registerHelper(name, func)
+  })
+}
+
+}());
diff --git a/roles/roles_common.js b/roles/roles_common.js
new file mode 100644
index 0000000000..9ff8660d37
--- /dev/null
+++ b/roles/roles_common.js
@@ -0,0 +1,219 @@
+;(function () {
+
+/**
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
+ *
+ * @module Roles
+ */
+
+/**
+ * Roles collection documents consist only of an id and a role name.
+ *   ex: { _id:<uuid>, name: "admin" }
+ */
+if (!Meteor.roles) {
+  Meteor.roles = new Meteor.Collection("roles")
+}
+
+
+/**
+ * <p>Role-based authorization compatible with built-in Meteor accounts package.</p>
+ * <br />
+ * <p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>
+ * <p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>
+ *
+ * @class Roles
+ * @constructor
+ */
+if ('undefined' === typeof Roles) {
+  Roles = {}
+}
+
+/**
+ * Create a new role
+ *
+ * @method createRole
+ * @param {String} role Name of role
+ */
+Roles.createRole = function (role) {
+  var id,
+      match
+
+  if (!role 
+      || 'string' !== typeof role 
+      || role.trim().length === 0) {
+    return
+  }
+
+  try {
+    id = Meteor.roles.insert({'name':role})
+  } catch (e) {
+    // (from Meteor accounts-base package, insertUserDoc func)
+    // XXX string parsing sucks, maybe
+    // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
+    if (e.name !== 'MongoError') throw e
+    match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/);
+    if (!match) throw e
+    if (match[1].indexOf('$name') !== -1)
+      throw new Meteor.Error(403, "Role already exists.")
+    throw e
+  }
+}
+
+/** 
+ * Delete an existing role.  Will throw "Role in use" error if any users 
+ * are currently assigned to the target role.
+ * 
+ * @method deleteRole
+ * @param {String} role Name of role
+ */
+Roles.deleteRole = function (role) {
+  if (!role) {
+    return
+  }
+
+  var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
+
+  if (foundExistingUser) {
+    throw new Error('Role in use')
+  }
+
+  Meteor.roles.remove({ name: role })
+}
+
+/**
+ * Add users to roles. Will create roles as needed.
+ *
+ * Makes 2 calls to database:
+ *  1. retrieve list of all existing roles
+ *  2. update users' roles
+ *
+ * @method addUsersToRoles
+ * @param {Array|String} users id(s) of users to add to roles
+ * @param {Array|String} roles name(s) of roles to add users to
+ */
+Roles.addUsersToRoles = function (users, roles) {
+  if (!users) throw new Error ("Missing 'users' param")
+  if (!roles) throw new Error ("Missing 'roles' param")
+
+  var existingRoles,
+      missing 
+
+  // ensure arrays
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  // ensure all roles exist in 'roles' collection
+  existingRoles = _.pluck(Meteor.roles.find({}).fetch(), 'name')
+  missing = _.difference(roles, existingRoles)
+  _.each(missing, function (role) {
+    Roles.createRole(role)
+  })
+
+  // update all users, adding to roles set
+  Meteor.users.update(
+    {       _id: { $in: users } },
+    { $addToSet: { roles: { $each: roles } } },
+    {     multi: true }
+  )
+}
+
+/**
+ * Remove users from roles
+ *
+ * @method removeUsersFromRoles
+ * @param {Array|String} users id(s) of users to add to roles
+ * @param {Array|String} roles name(s) of roles to add users to
+ */
+Roles.removeUsersFromRoles = function (users, roles) {
+  if (!users) throw new Error ("Missing 'users' param")
+  if (!roles) throw new Error ("Missing 'roles' param")
+
+  // ensure arrays
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  // update all users, remove from roles set
+  Meteor.users.update(
+    {      _id: {   $in: users } },
+    { $pullAll: { roles: roles } },
+    {    multi: true}
+  )
+}
+
+/**
+ * Check if user is in role
+ *
+ * @method userIsInRole
+ * @param {String|Object} user Id of user or actual user object
+ * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
+ */
+Roles.userIsInRole = function (user, roles) {
+  var id,
+      userRoles
+    
+  // ensure array to simplify code
+  if (!_.isArray(roles)) {
+    roles = [roles]
+  }
+  
+  if ('object' === typeof user) {
+    userRoles = user.roles
+    if (_.isArray(userRoles)) {
+      return _.some(roles, function (role) {
+        return _.contains(userRoles, role)
+      })
+    }
+    // missing roles, try id
+    id = user._id
+  } else if ('string' === typeof user) {
+    id = user
+  } 
+
+  if (!id) return false
+
+  return Meteor.users.findOne(
+    { _id: id, roles: { $in: roles } },
+    { _id: 1 }
+  )
+}
+
+/**
+ * Retrieve users roles
+ *
+ * @method getRolesForUser
+ * @param {String} user Id of user
+ * @return {Array} Array of user's roles, unsorted
+ */
+Roles.getRolesForUser = function (user) {
+  var user = Meteor.users.findOne(
+    { _id: user},
+    { _id: 0, roles: 1}
+  )
+  
+  return user ? user.roles : undefined
+}
+
+/**
+ * Retrieve all existing roles
+ *
+ * @method getAllRoles
+ * @return {Cursor} cursor of existing roles
+ */
+Roles.getAllRoles = function () {
+  return Meteor.roles.find({}, { sort: { name: 1 } })
+}
+
+/**
+ * Retrieve all users who are in target role
+ *
+ * @method getUsersInRole
+ * @param {String} role Name of role
+ * @return {Cursor} cursor of users in role
+ */
+Roles.getUsersInRole = function (role) {
+  return Meteor.users.find(
+    { roles: { $in: [role] } }
+  )
+}
+
+}());
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 476d84ed30..36168ab348 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,222 +1,16 @@
 ;(function () {
 
-/**
- * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
- *
- * @module Roles
- */
 
 /**
  * Roles collection documents consist only of an id and a role name.
  *   ex: { _id:<uuid>, name: "admin" }
  */
-Meteor.roles = new Meteor.Collection("roles")
-
-
-/**
- * <p>Role-based authorization compatible with built-in Meteor accounts package.</p>
- * <br />
- * <p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>
- * <p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>
- *
- * @class Roles
- * @constructor
- */
-if ('undefined' === typeof Roles) {
-  Roles = {}
+if (!Meteor.roles) {
+  Meteor.roles = new Meteor.Collection("roles")
 }
 
-/**
- * Create a new role
- *
- * @method createRole
- * @param {String} role Name of role
- */
-Roles.createRole = function (role) {
-  var id,
-      match
 
-  if (!role 
-      || 'string' !== typeof role 
-      || role.trim().length === 0) {
-    return
-  }
-
-  try {
-    id = Meteor.roles.insert({'name':role})
-  } catch (e) {
-    // (from Meteor accounts-base package, insertUserDoc func)
-    // XXX string parsing sucks, maybe
-    // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-    if (e.name !== 'MongoError') throw e
-    match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/);
-    if (!match) throw e
-    if (match[1].indexOf('$name') !== -1)
-      throw new Meteor.Error(403, "Role already exists.")
-    throw e
-  }
-}
-
-/** 
- * Delete an existing role.  Will throw "Role in use" error if any users 
- * are currently assigned to the target role.
- * 
- * @method deleteRole
- * @param {String} role Name of role
- */
-Roles.deleteRole = function (role) {
-  if (!role) {
-    return
-  }
-
-  var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
-
-  if (foundExistingUser) {
-    throw new Error('Role in use')
-  }
-
-  Meteor.roles.remove({ name: role })
-}
-
-/**
- * Add users to roles. Will create roles as needed.
- *
- * Makes 2 calls to database:
- *  1. retrieve list of all existing roles
- *  2. update users' roles
- *
- * @method addUsersToRoles
- * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles to add users to
- */
-Roles.addUsersToRoles = function (users, roles) {
-  if (!users) throw new Error ("Missing 'users' param")
-  if (!roles) throw new Error ("Missing 'roles' param")
-
-  var existingRoles,
-      missing 
-
-  // ensure arrays
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  // ensure all roles exist in 'roles' collection
-  existingRoles = _.pluck(Meteor.roles.find({}).fetch(), 'name')
-  missing = _.difference(roles, existingRoles)
-  _.each(missing, function (role) {
-    Roles.createRole(role)
-  })
-
-  // update all users, adding to roles set
-  Meteor.users.update(
-    {       _id: { $in: users } },
-    { $addToSet: { roles: { $each: roles } } },
-    {     multi: true }
-  )
-}
-
-/**
- * Remove users from roles
- *
- * @method removeUsersFromRoles
- * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles to add users to
- */
-Roles.removeUsersFromRoles = function (users, roles) {
-  if (!users) throw new Error ("Missing 'users' param")
-  if (!roles) throw new Error ("Missing 'roles' param")
-
-  // ensure arrays
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  // update all users, remove from roles set
-  Meteor.users.update(
-    {      _id: {   $in: users } },
-    { $pullAll: { roles: roles } },
-    {    multi: true}
-  )
-}
-
-/**
- * Check if user is in role
- *
- * @method userIsInRole
- * @param {String|Object} user Id of user or actual user object
- * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
- */
-Roles.userIsInRole = function (user, roles) {
-  var id,
-      userRoles
-    
-  if ('string' === typeof user) {
-    id = user
-  } 
-
-  // ensure array to simplify code
-  if (!_.isArray(roles)) {
-    roles = [roles]
-  }
-  
-  if ('object' === typeof user) {
-    userRoles = user.roles
-    if (_.isArray(userRoles)) {
-      return _.some(roles, function (role) {
-        return _.contains(userRoles, role)
-      })
-    }
-    // missing roles, try id
-    id = user._id
-  }
-
-  if (!id) return false
-
-  return Meteor.users.findOne(
-    { _id: id, roles: { $in: roles } },
-    { _id: 1 }
-  )
-}
-
-/**
- * Retrieve users roles
- *
- * @method getRolesForUser
- * @param {String} user Id of user
- * @return {Array} Array of user's roles, unsorted
- */
-Roles.getRolesForUser = function (user) {
-  var user = Meteor.users.findOne(
-    { _id: user},
-    { _id: 0, roles: 1}
-  )
-  
-  return user ? user.roles : undefined
-}
-
-/**
- * Retrieve all existing roles
- *
- * @method getAllRoles
- * @return {Cursor} cursor of existing roles
- */
-Roles.getAllRoles = function () {
-  return Meteor.roles.find({}, { sort: { name: 1 } })
-}
-
-/**
- * Retrieve all users who are in target role
- *
- * @method getUsersInRole
- * @param {String} role Name of role
- * @return {Cursor} cursor of users in role
- */
-Roles.getUsersInRole = function (role) {
-  return Meteor.users.find(
-    { roles: { $in: [role] } }
-  )
-}
-
-/// DEFAULT INDEXES ON ROLES
+// Create default indexes for roles collection
 Meteor.roles._ensureIndex('name', {unique: 1});
 
 }());
diff --git a/roles/smart.json b/roles/smart.json
index 3c1176a732..f3ecb7cdb5 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/client.js b/roles/tests/client.js
new file mode 100644
index 0000000000..f3b5561292
--- /dev/null
+++ b/roles/tests/client.js
@@ -0,0 +1,32 @@
+;(function () {
+
+  "use strict";
+
+  // Mock Meteor.user() for role testing
+  Meteor.user = function () {
+    return {
+      _id: 'testId',
+      roles: ['user','manage-users']
+    }
+  }
+
+
+  Tinytest.add('can check current users roles via template helper', function (test) {
+    var isInRole = Roles._handlebarsHelpers.isInRole,
+        expected,
+        actual
+
+    test.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
+
+    expected = true
+    actual = isInRole('admin, manage-users')
+    test.equal(actual, expected)
+    
+    expected = false
+    actual = isInRole('admin')
+    test.equal(actual, expected)
+    
+  })
+
+
+}());

From ff024e47ab6ebd31191ab56a28201b0e7acab1d0 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 26 Jan 2013 13:40:35 -0500
Subject: [PATCH 0020/1140] fix userIsInRole check when user is null and add
 test

---
 roles/roles_common.js |  6 ++++--
 roles/tests/server.js | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 9ff8660d37..df0337ea80 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -156,14 +156,16 @@ Roles.userIsInRole = function (user, roles) {
     roles = [roles]
   }
   
-  if ('object' === typeof user) {
+  if (!user) {
+    return false
+  } else if ('object' === typeof user) {
     userRoles = user.roles
     if (_.isArray(userRoles)) {
       return _.some(roles, function (role) {
         return _.contains(userRoles, role)
       })
     }
-    // missing roles, try id
+    // missing roles field, try going direct via id
     id = user._id
   } else if ('string' === typeof user) {
     id = user
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 361cf9a1e0..5527a29b61 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -96,6 +96,20 @@
     test.isTrue(Roles.userIsInRole(user, 'admin'))
   })
 
+  Tinytest.add('userIsInRole returns false when user is null', function (test) {
+    var user 
+
+    reset()
+
+    _.each(roles, function (role) {
+      Roles.createRole(role)
+    })
+
+    user = null
+
+    test.isFalse(Roles.userIsInRole(user, 'admin'))
+  })
+
   Tinytest.add('can check user against several roles at once', function (test) {
     var user 
 

From 956ac0b06cbf7a50ebe8fcf35a6311e4136c89df Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 26 Jan 2013 16:16:37 -0500
Subject: [PATCH 0021/1140] Add warning message if Handlebars not defined

---
 roles/roles_client.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index c19645f14e..0ad68f0ae7 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -52,10 +52,12 @@ Roles._handlebarsHelpers = {
 }
 
 
-if ('undefined' !== typeof Handlebars) {
-  _.each(Roles._handlebarsHelpers, function (name, func) {
+if (Handlebars) {
+  _.each(Roles._handlebarsHelpers, function (func, name) {
     Handlebars.registerHelper(name, func)
   })
+} else {
+  console.log('WARNING: Roles Handlebars helpers not registered. Handlebars not defined')
 }
 
 }());

From d7acdaec3212d038ecb2950bb7f1fd7ee572363c Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 26 Jan 2013 16:16:53 -0500
Subject: [PATCH 0022/1140] Add example app

---
 example-app/.meteor/.gitignore      |   2 +
 example-app/.meteor/packages        |  11 ++
 example-app/client/client.js        | 239 ++++++++++++++++++++++++++++
 example-app/client/example-app.css  |  67 ++++++++
 example-app/client/example-app.html | 152 ++++++++++++++++++
 example-app/model.js                |   9 ++
 example-app/server/server.js        | 131 +++++++++++++++
 example-app/smart.json              |  12 ++
 example-app/smart.lock              |  30 ++++
 9 files changed, 653 insertions(+)
 create mode 100644 example-app/.meteor/.gitignore
 create mode 100644 example-app/.meteor/packages
 create mode 100644 example-app/client/client.js
 create mode 100644 example-app/client/example-app.css
 create mode 100644 example-app/client/example-app.html
 create mode 100644 example-app/model.js
 create mode 100644 example-app/server/server.js
 create mode 100644 example-app/smart.json
 create mode 100644 example-app/smart.lock

diff --git a/example-app/.meteor/.gitignore b/example-app/.meteor/.gitignore
new file mode 100644
index 0000000000..08150d000c
--- /dev/null
+++ b/example-app/.meteor/.gitignore
@@ -0,0 +1,2 @@
+local
+meteorite
diff --git a/example-app/.meteor/packages b/example-app/.meteor/packages
new file mode 100644
index 0000000000..430d2fedaa
--- /dev/null
+++ b/example-app/.meteor/packages
@@ -0,0 +1,11 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+preserve-inputs
+router
+accounts-password
+accounts-ui
+bootstrap
+roles
diff --git a/example-app/client/client.js b/example-app/client/client.js
new file mode 100644
index 0000000000..529e59242b
--- /dev/null
+++ b/example-app/client/client.js
@@ -0,0 +1,239 @@
+;(function () {
+
+  "use strict";
+
+
+
+////////////////////////////////////////////////////////////////////
+// Patches
+//
+
+if (!console || !console.log) {
+  // stub for IE
+  console = { log: function () {} };
+}
+
+// fix bootstrap dropdown unclickable issue on iOS
+// https://github.com/twitter/bootstrap/issues/4550
+$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
+    e.stopPropagation();
+})
+
+
+
+////////////////////////////////////////////////////////////////////
+// Subscriptions
+//
+
+// user's 'roles' field
+Meteor.subscribe('ownUserData');
+
+// secrets
+Meteor.subscribe('secrets');
+
+// users, for manage-users page
+Meteor.subscribe('users');
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Routing
+//
+
+Meteor.Router.add({
+  '/': function () {
+    var user;
+
+    if (Meteor.loggingIn()) {
+      console.log('home: loading');
+      return 'loading';
+    }
+
+    user = Meteor.user();
+    if (!user) {
+      console.log('home: signin');
+      return 'signin';
+    }
+
+    console.log('home: user found');
+    console.log(user.roles);
+
+    // start on 'start' page
+    console.log('home: start')
+    return 'start'
+  },
+  '/signin': 'signin',
+  '/start': 'start',
+  '/secrets': 'secrets',
+  '/manage': 'manage',
+  '*': 'not_found'
+})
+
+Meteor.Router.filters({
+  checkLoggedIn: function (page) {
+    var user;
+
+    if (Meteor.loggingIn()) {
+
+      console.log('filter: loading');
+      return 'loading';
+
+    } else {
+
+      user = Meteor.user();
+
+      if (user) {
+
+        console.log('filter: done');
+        return page;
+
+      } else {
+
+        console.log('filter: signin');
+        return 'signin';
+
+      }
+    }
+  }
+});
+
+// make sure user has logged in for all appropriate routes
+Meteor.Router.filter('checkLoggedIn', {
+  except:['signin','loading','not-found']
+})
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Templates
+//
+
+Template.signin.rendered = function () {
+  // auto-trigger accounts-ui login form dropdown
+  Accounts._loginButtonsSession.set('dropdownVisible', true);
+}
+
+Template.header.events({
+  // template data, if any, is available in 'this'
+  'click a.nav-start' : handleNavClick,
+  'click a.nav-secrets' : handleNavClick,
+  'click a.nav-manage' : handleNavClick,
+  'click #err .close' : clearError,
+  'click .btn-navbar' : openCloseNav,
+  'click .signout': signout
+})
+Template.header.helpers({
+  displayName: function () {
+    return displayName();
+  },
+  errorMsg: function () {
+    return Session.get('error');
+  }
+})
+
+Template.secrets.helpers({
+  secrets: function () {
+    return Meteor.secrets.find();
+  }
+});
+
+Template.noteOfTheDay.helpers({
+  note: function () {
+    return "Greetings " + displayName() + "!";
+  }
+});
+
+Template.manage.helpers({
+  users: function () {
+    return Meteor.users.find();
+  },
+  email: function () {
+    return this.emails[0].address;
+  },
+  roles: function () {
+    if (!this.roles) return '<none>';
+    return this.roles.join(',');
+  }
+});
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Misc helper functions
+//
+
+function displayName (user) {
+  if (!user) {
+    user = Meteor.user();
+  }
+  
+  if (!user) return "<missing user>";
+
+  if (user.profile) {
+    name = user.profile.name;
+  }
+
+  name = name.trim();
+
+  if (!name && user.emails && user.emails.length > 0) {
+    name = user.emails[0].address;
+  }
+
+  return name || "<missing name>";
+}
+
+
+function handleNavClick (e) {
+  var user = Meteor.user(),
+      template;
+
+  e.preventDefault();
+
+  if (!user) return;
+
+  try {
+    // ex. ...class="nav-secrets"
+    template = e.target.className.substring(4);
+    console.log("You pressed the " + template + " button");
+    Meteor.Router.to('/' + template);
+  } 
+  catch (err) {
+    console.log(err);
+  }
+}
+
+function clearError () {
+  Session.set('error', '');
+}
+
+function signout (e) {
+  e.preventDefault();
+  console.log('logging out...');
+  clearError();
+  Meteor.logout();
+  Meteor.Router.to('/');
+}
+
+// insta-open/close nav rather than animate collapse.
+// this improves UX on mobile devices
+function openCloseNav (e) {
+  // Select .nav-collapse within same .navbar as current button
+  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
+
+  if (nav.height() != 0) {
+    // If it has a height, hide it
+    nav.height(0);
+  } else {
+    // If it's collapsed, show it
+    nav.height('auto');
+  }
+}
+
+
+}());
diff --git a/example-app/client/example-app.css b/example-app/client/example-app.css
new file mode 100644
index 0000000000..a7674b04dd
--- /dev/null
+++ b/example-app/client/example-app.css
@@ -0,0 +1,67 @@
+@media (min-width: 980px) {
+  /* wide devices - full navbar */ 
+
+  /* push down content under fixed navbar */
+  body {
+    padding-top:60px;
+    padding-bottom:40px;
+    }
+
+}
+
+
+/**
+ * front-and-center signin form
+ */
+.signin {
+  width:100%;
+  text-align:center;
+}
+.signin .login-form {
+  width:200px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+}
+.signin .login-form {
+}
+.signin .login-close-text {
+  display:none;
+}
+.signin #login-buttons {
+}
+.signin .additional-link-container {
+  display:none;
+}
+.signin .example-users {
+  width:350px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+  top:15em;
+  left:3em;
+}
+
+/**
+ * header
+ */
+#err .close {
+  float:none;
+  margin-left:1em;
+}
+
+/**
+ * note of the day
+ */
+.note {
+  margin:1em 0em;
+  padding:1em;
+  border:1px solid #ccc;
+}
+
+/**
+ * security-note
+ */
+.security-note {
+  margin-top:10em;
+}
diff --git a/example-app/client/example-app.html b/example-app/client/example-app.html
new file mode 100644
index 0000000000..bec0bc22c5
--- /dev/null
+++ b/example-app/client/example-app.html
@@ -0,0 +1,152 @@
+<head>
+  <title>example-app</title>
+</head>
+
+<body>
+  {{renderPage}}
+</body>
+
+<template name="signin">
+  <div class="signin">
+    <div class="login-form">
+      <h1>Sign In</h1>
+      {{loginButtons}}
+    </div>
+
+    <div class="example-users">
+      <p>Normal User: normal@example.com | apple1</p>
+      <p>View Secrets: view@example.com | apple1</p>
+      <p>Manage Users: manage@example.com | apple1</p>
+      <p>Admin User: admin@example.com | apple1</p>
+    </div>
+  </div>
+</template>
+
+<template name="loading">
+  <h1>Loading...</h1>
+</template>
+
+<template name="awaiting-verification">
+  {{> header}}
+  <h1>Awaiting email verification...</h1>
+</template>
+
+<template name="not_found">
+  {{> header}}
+  <h3>404 - Not found<h3>
+</template>
+
+<template name="invalid-access">
+  {{> header}}
+  <h3>403 Forbidden - Invalid Access<h3>
+</template>
+
+<template name="header">
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container">
+        <a class="btn btn-navbar">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+        <a class="brand" href="/">Roles Example App</a>
+        <div class="nav-collapse collapse">
+          <ul class="nav">
+
+            <li><a class='nav-start' href="/start">Start Page</a></li>
+
+            {{#if isInRole 'admin,view-secrets'}}
+            <li><a class='nav-secrets' href="/secrets">Secrets</a></li>
+            {{/if}}
+
+            <li class="dropdown pull-right">
+              <a href="#account" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                {{#if isInRole 'admin,manage-users'}}
+                <li><a class='nav-manage' href="/manage">Manage Users</a></li>
+                {{/if}}
+                <li><a href="#" disabled class="disabled">Update my Profile</a></li>
+                <li><a class="signout" href="#signout">Sign out</a></li>
+              </ul>
+            </li>
+
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<template name="noteOfTheDay">
+<p>Note of the day: {{note}}</p>
+</template>
+
+<template name="start">
+  {{> header}}
+
+  <div class="page row">
+    <div class="offset4 span8">
+
+      <p class="note">All logged-in users will see this page in their header nav.</p>
+
+      <h2>Start Page</h2>
+      
+      {{> noteOfTheDay}}
+
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="secrets">
+  {{> header}}
+  <div class="secrets row">
+    <div class="offset4 span8">
+
+      <p class="note">Only Admins and those with the 'view-secrets' role will see this page in their header nav.</p>
+
+      <h2>Secrets!</h2>
+
+      <ul>
+      {{#each secrets}}
+        <li><p>{{secret}}</p></li>
+      {{/each}}
+      </ul>
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="manage">
+  {{> header}}
+  <div class="manage-users row">
+    <div class="offset4 span8">
+
+      <p class="note">Only Admins and those with the 'manage-users' role will see this page in their nav menu.</p>
+
+      <h2>Manage Users</h2>
+
+      <h3>Users</h3>
+      <ul>
+      {{#each users}}
+      <li>{{email}} - Roles: {{roles}}</li>
+      {{/each}}
+      </ul>
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="securityNote">
+  <div class="security-note">
+    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
+    <p>This is how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So don't put sensitive information in templates!</p>
+    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to the Router definition of the 'secrets' route but even then the raw template data is still sent to the user's browser (by design).</p>
+    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
+    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
+  </div>
+</template>
diff --git a/example-app/model.js b/example-app/model.js
new file mode 100644
index 0000000000..0dbd0d4358
--- /dev/null
+++ b/example-app/model.js
@@ -0,0 +1,9 @@
+;(function () {
+
+  "use strict";
+
+// run on both the server and the client
+
+Meteor.secrets = new Meteor.Collection('secrets')
+
+}());
diff --git a/example-app/server/server.js b/example-app/server/server.js
new file mode 100644
index 0000000000..7ed32e091a
--- /dev/null
+++ b/example-app/server/server.js
@@ -0,0 +1,131 @@
+;(function () {
+
+  "use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Patches
+//
+
+if (!console || !console.log) {
+  // stub for IE
+  console = { log: function () {} };
+}
+
+
+////////////////////////////////////////////////////////////////////
+// Startup
+//
+
+Meteor.startup(function () {
+
+  ////////////////////////////////////////////////////////////////////
+  // Create Test Secrets
+  //
+    
+  if (Meteor.secrets.find().fetch().length === 0) {
+    Meteor.secrets.insert({secret:"ec2 password: apple2"});
+    Meteor.secrets.insert({secret:"domain registration pw: apple3"});
+  }
+
+
+  ////////////////////////////////////////////////////////////////////
+  // Create Test Users
+  //
+
+  if (Meteor.users.find().fetch().length === 0) {
+
+    console.log('Creating users: ');
+
+    var users = [
+        {name:"Normal User",email:"normal@example.com",roles:[]},
+        {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
+        {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
+        {name:"Admin User",email:"admin@example.com",roles:['admin']}
+      ];
+
+    _.each(users, function (user) {
+      var userConfig,
+          id;
+      
+      console.log(user);
+
+      userConfig = {
+        email: user.email,
+        password: "apple1",
+        profile: { name: user.name }
+      };
+
+      id = Accounts.createUser({
+        email: user.email,
+        password: "apple1",
+        profile: { name: user.name }
+      });
+
+      if (user.roles.length > 0) {
+        Roles.addUsersToRoles(id, user.roles);
+      }
+    
+    });
+  }
+
+
+
+  ////////////////////////////////////////////////////////////////////
+  // Prevent non-authorized users from creating new users
+  //
+
+  Accounts.validateNewUser(function (user) {
+    var loggedInUser = Meteor.user();
+
+    console.log('validateNewUser');
+    console.log(loggedInUser);
+
+    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
+      return true;
+    }
+
+    throw new Meteor.Error(403, "Not authorized to create new users");
+  });
+
+})
+
+
+////////////////////////////////////////////////////////////////////
+// Publish
+//
+
+
+// Users can access their own roles fields
+Meteor.publish('ownUserData', function () {
+  var user = Meteor.users.findOne(this.userId),
+      fields = {roles:1};
+
+  return Meteor.users.find({_id:this.userId}, {fields: fields});
+});
+
+// Authorized users can manage user accounts
+Meteor.publish("users", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
+
+  if (Roles.userIsInRole(user, ["admin","manage-users"])) {
+    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
+  } else {
+    this.complete();
+    return;
+  }
+});
+
+// Authorized users can view secrets
+Meteor.publish("secrets", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
+
+  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
+    return Meteor.secrets.find();
+  } else {
+    this.complete();
+    return;
+  }
+});
+
+}());
diff --git a/example-app/smart.json b/example-app/smart.json
new file mode 100644
index 0000000000..c32544aca9
--- /dev/null
+++ b/example-app/smart.json
@@ -0,0 +1,12 @@
+{
+  "meteor": {
+    "git": "https://github.com/meteor/meteor.git",
+    "branch": "master"
+  },
+  "packages": {
+    "roles": {
+      "path": "../roles"
+    },
+    "router": {}
+  }
+}
diff --git a/example-app/smart.lock b/example-app/smart.lock
new file mode 100644
index 0000000000..0b39ccdb18
--- /dev/null
+++ b/example-app/smart.lock
@@ -0,0 +1,30 @@
+{
+  "meteor": {
+    "git": "https://github.com/meteor/meteor.git",
+    "branch": "master",
+    "commit": "4d98d8cb4e5a95e9e98953f44c872c9332a042a3"
+  },
+  "dependencies": {
+    "basePackages": {
+      "roles": {
+        "path": "../roles"
+      },
+      "router": {}
+    },
+    "packages": {
+      "roles": {
+        "path": "../roles"
+      },
+      "router": {
+        "git": "https://github.com/tmeasday/meteor-router.git",
+        "tag": "v0.3.4",
+        "commit": "8f0d5303de5b93771e91f21f818be27358c2fb30"
+      },
+      "page-js": {
+        "git": "https://github.com/tmeasday/meteor-page-js.git",
+        "tag": "v1.3.3",
+        "commit": "c1e9832af3fc2b2f5139a16d93a82ca6fa0655da"
+      }
+    }
+  }
+}

From 2d578011bcb3df531e0ce41a63c6bdba69677136 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sat, 26 Jan 2013 22:52:40 -0500
Subject: [PATCH 0023/1140] Include example-app description and instructions

---
 README.md | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index cbd6305624..902c989d13 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,26 @@ meteor-roles
 
 Roles-based authorization package for Meteor - compatible with built-in accounts package.
 
+### Example App
+
+The ```example-app``` directory contains a Meteor app which shows off the following features:
+* Server-side publishing with authorization to secure sensitive data
+* Client-side navigation with link visibility based on user permissions
+* Page-based app with initial sign-in page using ```accounts-ui```
+* Client-side routing via ```meteor-router``` smart package
+
+See this app in action by:
+  1. ```git clone https://github.com/alanning/meteor-roles.git```
+  2. ```cd meteor-roles/example-app```
+  3. ```mrt```
+  4. point browser to ```http://localhost:3000```
+
 ### Usage
 
-User objects now have an extra 'roles' field which contains the user's roles.
+User entries in the ```Meteor.users``` collection gain a new field named ```roles``` which is an array of strings corresponding to the user's roles.
 
 -- **Server** --
 
-NOTE: Add checks to publish methods and other sensitive functions to restrict data available to client.
-
 Check user roles before publishing sensitive data:
 ```js
 // server/publish.js
@@ -47,25 +59,18 @@ Meteor.publish('ownUserData', function () {
 
 -- **Client** --
 
-NOTE: Like all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
-since Meteor bundles the same client-side code to all users.  Any sensitive data needs to be controlled server-side to prevent unwanted disclosure.
+Client javascript has access to all the same Roles functions as the server with the addition of a ```isInRole``` handlebars helper which is automatically registered by the Roles package.  But you will only be able to take advantage of these if you publish user's 'roles' field.  It is _not_ published by default.
 
-To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the the 'admin' template in the example below will still be able to with a little work but this is not a problem as long as the actual data is restricted server-side.
+Like all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
+since Meteor bundles the same client-side code to all users.  Providing the Roles functions client-side also allows for latency compensation during Meteor method calls.
+
+NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the the 'admin' template in the example below will still be able to do so by manually reviewing the bundled client.js file but this is not a problem as long as the actual data is restricted server-side.
 
 ```js
 // client/myApp.js
 
 Meteor.subscribe('ownUserData');
 
-Template.header.isInRole = function (role) {
-  var user = Meteor.user();
-
-  if (!user) {
-    return false;
-  }
-
-  return _.contains(user.roles, role);
-}
 ```
 ```handlebars
 <!-- client/myApp.html -->

From 4be320160f331f68b35908c9d20fed4a9560c4ac Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 26 Jan 2013 23:11:30 -0500
Subject: [PATCH 0024/1140] Send Meteor.error to client if try to delete in-use
 role

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index df0337ea80..2942b25a1f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -74,7 +74,7 @@ Roles.deleteRole = function (role) {
   var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
 
   if (foundExistingUser) {
-    throw new Error('Role in use')
+    throw new Meteor.Error(403, 'Role in use')
   }
 
   Meteor.roles.remove({ name: role })

From b8eca580f00fba96e0d387dbb794948eca9fe1d7 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 26 Jan 2013 23:36:02 -0500
Subject: [PATCH 0025/1140] Auto-publish and subscribe logged-in user's roles

---
 example-app/client/client.js        | 28 ++++++++------------------
 example-app/client/example-app.html |  4 +++-
 example-app/model.js                |  2 +-
 example-app/server/server.js        | 31 ++++++++++-------------------
 roles/roles_client.js               | 10 ++++++----
 roles/roles_server.js               | 15 ++++++++++++--
 6 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/example-app/client/client.js b/example-app/client/client.js
index 529e59242b..4c6bfb8f82 100644
--- a/example-app/client/client.js
+++ b/example-app/client/client.js
@@ -17,7 +17,7 @@ if (!console || !console.log) {
 // https://github.com/twitter/bootstrap/issues/4550
 $(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
     e.stopPropagation();
-})
+});
 
 
 
@@ -25,9 +25,6 @@ $(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
 // Subscriptions
 //
 
-// user's 'roles' field
-Meteor.subscribe('ownUserData');
-
 // secrets
 Meteor.subscribe('secrets');
 
@@ -61,15 +58,15 @@ Meteor.Router.add({
     console.log(user.roles);
 
     // start on 'start' page
-    console.log('home: start')
-    return 'start'
+    console.log('home: start');
+    return 'start';
   },
   '/signin': 'signin',
   '/start': 'start',
   '/secrets': 'secrets',
   '/manage': 'manage',
   '*': 'not_found'
-})
+});
 
 Meteor.Router.filters({
   checkLoggedIn: function (page) {
@@ -102,7 +99,7 @@ Meteor.Router.filters({
 // make sure user has logged in for all appropriate routes
 Meteor.Router.filter('checkLoggedIn', {
   except:['signin','loading','not-found']
-})
+});
 
 
 
@@ -115,25 +112,21 @@ Meteor.Router.filter('checkLoggedIn', {
 Template.signin.rendered = function () {
   // auto-trigger accounts-ui login form dropdown
   Accounts._loginButtonsSession.set('dropdownVisible', true);
-}
+};
 
 Template.header.events({
   // template data, if any, is available in 'this'
   'click a.nav-start' : handleNavClick,
   'click a.nav-secrets' : handleNavClick,
   'click a.nav-manage' : handleNavClick,
-  'click #err .close' : clearError,
   'click .btn-navbar' : openCloseNav,
   'click .signout': signout
-})
+});
 Template.header.helpers({
   displayName: function () {
     return displayName();
-  },
-  errorMsg: function () {
-    return Session.get('error');
   }
-})
+});
 
 Template.secrets.helpers({
   secrets: function () {
@@ -208,14 +201,9 @@ function handleNavClick (e) {
   }
 }
 
-function clearError () {
-  Session.set('error', '');
-}
-
 function signout (e) {
   e.preventDefault();
   console.log('logging out...');
-  clearError();
   Meteor.logout();
   Meteor.Router.to('/');
 }
diff --git a/example-app/client/example-app.html b/example-app/client/example-app.html
index bec0bc22c5..83065881df 100644
--- a/example-app/client/example-app.html
+++ b/example-app/client/example-app.html
@@ -129,7 +129,9 @@
 
       <h2>Manage Users</h2>
 
-      <h3>Users</h3>
+      <br />
+
+      <h3>Current Users</h3>
       <ul>
       {{#each users}}
       <li>{{email}} - Roles: {{roles}}</li>
diff --git a/example-app/model.js b/example-app/model.js
index 0dbd0d4358..be8a6c57f7 100644
--- a/example-app/model.js
+++ b/example-app/model.js
@@ -4,6 +4,6 @@
 
 // run on both the server and the client
 
-Meteor.secrets = new Meteor.Collection('secrets')
+Meteor.secrets = new Meteor.Collection('secrets');
 
 }());
diff --git a/example-app/server/server.js b/example-app/server/server.js
index 7ed32e091a..b0ef4b3d19 100644
--- a/example-app/server/server.js
+++ b/example-app/server/server.js
@@ -78,9 +78,6 @@ Meteor.startup(function () {
   Accounts.validateNewUser(function (user) {
     var loggedInUser = Meteor.user();
 
-    console.log('validateNewUser');
-    console.log(loggedInUser);
-
     if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
       return true;
     }
@@ -88,7 +85,7 @@ Meteor.startup(function () {
     throw new Meteor.Error(403, "Not authorized to create new users");
   });
 
-})
+});
 
 
 ////////////////////////////////////////////////////////////////////
@@ -96,12 +93,16 @@ Meteor.startup(function () {
 //
 
 
-// Users can access their own roles fields
-Meteor.publish('ownUserData', function () {
-  var user = Meteor.users.findOne(this.userId),
-      fields = {roles:1};
+// Authorized users can view secrets
+Meteor.publish("secrets", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
 
-  return Meteor.users.find({_id:this.userId}, {fields: fields});
+  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
+    return Meteor.secrets.find();
+  } else {
+    this.complete();
+    return;
+  }
 });
 
 // Authorized users can manage user accounts
@@ -116,16 +117,4 @@ Meteor.publish("users", function () {
   }
 });
 
-// Authorized users can view secrets
-Meteor.publish("secrets", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
-    return Meteor.secrets.find();
-  } else {
-    this.complete();
-    return;
-  }
-});
-
 }());
diff --git a/roles/roles_client.js b/roles/roles_client.js
index 0ad68f0ae7..a2506a122f 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -1,10 +1,12 @@
 ;(function () {
-  
+
+Meteor.subscribe('_roles_own_user_roles')
+
 /**
  * Convenience functions for use on client.
  *
- * NOTE: You must restrict user actions on the server-side; anything
- * done client-side is strictly for convenience and must not be
+ * NOTE: You must restrict user actions on the server-side; any
+ * client-side checks are strictly for convenience and must not be
  * trusted.
  *
  * @module Helpers
@@ -15,7 +17,7 @@
 //
 // Use a semi-private variable rather than declaring Handlebars
 // helpers directly so that we can unit test the helpers.
-// For some reason, the Handlebars helpers are not registered 
+// XXX For some reason, the Handlebars helpers are not registered 
 // before the tests run.
 //
 Roles._handlebarsHelpers = {
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 36168ab348..4f05c35dd9 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -7,10 +7,21 @@
  */
 if (!Meteor.roles) {
   Meteor.roles = new Meteor.Collection("roles")
+
+  // Create default indexes for roles collection
+  Meteor.roles._ensureIndex('name', {unique: 1})
 }
 
+Meteor.publish('_roles_own_user_roles', function () {
+  var userId = this.userId,
+      fields = {roles:1}
 
-// Create default indexes for roles collection
-Meteor.roles._ensureIndex('name', {unique: 1});
+  if (!userId) {
+    this.complete()
+    return
+  }
+
+  return Meteor.users.find({_id:userId}, {fields: fields})
+})
 
 }());

From b07828418654dfa1b610c9348dcc7d79c8e8ef52 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 00:12:27 -0500
Subject: [PATCH 0026/1140] Update with more examples

---
 README.md | 68 +++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 902c989d13..1742fb8f17 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Roles-based authorization package for Meteor - compatible with built-in accounts
 The ```example-app``` directory contains a Meteor app which shows off the following features:
 * Server-side publishing with authorization to secure sensitive data
 * Client-side navigation with link visibility based on user permissions
-* Page-based app with initial sign-in page using ```accounts-ui```
+* 'Sign-in required' app with up-front login page using ```accounts-ui```
 * Client-side routing via ```meteor-router``` smart package
 
 See this app in action by:
@@ -17,12 +17,45 @@ See this app in action by:
   3. ```mrt```
   4. point browser to ```http://localhost:3000```
 
+
+### Changes to default Meteor behavior
+
+  1. User entries in the ```Meteor.users``` collection gain a new field named ```roles``` which is an array of strings corresponding to the user's roles.
+  2. A new collection ```Meteor.roles``` contains a global list of defined role names.
+  3. The currently logged-in user's ```roles``` field is automatically published under ```_roles_own_user_roles```.
+  4. Client javascript automatically subscribes to ```_roles_own_user_roles```.
+
+
 ### Usage
 
-User entries in the ```Meteor.users``` collection gain a new field named ```roles``` which is an array of strings corresponding to the user's roles.
 
 -- **Server** --
 
+Add users to roles:
+```js
+  var users = [
+      {name:"Normal User",email:"normal@example.com",roles:[]},
+      {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
+      {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
+      {name:"Admin User",email:"admin@example.com",roles:['admin']}
+    ];
+
+  _.each(users, function (user) {
+    var id;
+    
+    id = Accounts.createUser({
+      email: user.email,
+      password: "apple1",
+      profile: { name: user.name }
+    });
+
+    if (user.roles.length > 0) {
+      Roles.addUsersToRoles(id, user.roles);
+    }
+  
+  });
+```
+
 Check user roles before publishing sensitive data:
 ```js
 // server/publish.js
@@ -43,42 +76,37 @@ Meteor.publish('secrets', function () {
 });
 ```
 
-Publish the logged-in user's roles for convenience checks client-side, like so:
+Prevent non-authorized users from creating new users:
 ```js
-// server/publish.js
+  Accounts.validateNewUser(function (user) {
+    var loggedInUser = Meteor.user();
 
-// Give Users access to their own roles
-Meteor.publish('ownUserData', function () {
-  var user = Meteor.users.findOne(this.userId),
-      fields = {roles:1};
+    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
+      return true;
+    }
 
-  return Meteor.users.find({_id:this.userId}, {fields: fields});
-});
+    throw new Meteor.Error(403, "Not authorized to create new users");
+  });
 ```
 
+<br />
 
 -- **Client** --
 
-Client javascript has access to all the same Roles functions as the server with the addition of a ```isInRole``` handlebars helper which is automatically registered by the Roles package.  But you will only be able to take advantage of these if you publish user's 'roles' field.  It is _not_ published by default.
+Client javascript has access to all the same Roles functions as the server with the addition of a ```isInRole``` handlebars helper which is automatically registered by the Roles package.
 
 Like all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
 since Meteor bundles the same client-side code to all users.  Providing the Roles functions client-side also allows for latency compensation during Meteor method calls.
 
-NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the the 'admin' template in the example below will still be able to do so by manually reviewing the bundled client.js file but this is not a problem as long as the actual data is restricted server-side.
+NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled ```client.js``` file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
 
-```js
-// client/myApp.js
-
-Meteor.subscribe('ownUserData');
-
-```
 ```handlebars
 <!-- client/myApp.html -->
 
 <template name="header">
+  ... regular header stuff
   {{#if isInRole 'admin'}}
-    ... stuff only admins care about.  
-    ... note: anything published by server will be sent to the client, so lock it down server-side first
+    {{> admin_nav}}  
   {{/if}}
 </template>
 ```

From 139487d6482f2b1b9f0b17cdd24fdb9f98dc0855 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 00:48:39 -0500
Subject: [PATCH 0027/1140] Dis-allow empty or all-whitespace role names

---
 example-app/server/server.js | 13 ++-----------
 roles/roles_client.js        |  2 +-
 roles/roles_common.js        | 35 +++++++++++++++++++++++++++--------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/example-app/server/server.js b/example-app/server/server.js
index b0ef4b3d19..14fdcfdb02 100644
--- a/example-app/server/server.js
+++ b/example-app/server/server.js
@@ -45,26 +45,17 @@ Meteor.startup(function () {
       ];
 
     _.each(users, function (user) {
-      var userConfig,
-          id;
+      var id;
       
       console.log(user);
 
-      userConfig = {
-        email: user.email,
-        password: "apple1",
-        profile: { name: user.name }
-      };
-
       id = Accounts.createUser({
         email: user.email,
         password: "apple1",
         profile: { name: user.name }
       });
 
-      if (user.roles.length > 0) {
-        Roles.addUsersToRoles(id, user.roles);
-      }
+      Roles.addUsersToRoles(id, user.roles);
     
     });
   }
diff --git a/roles/roles_client.js b/roles/roles_client.js
index a2506a122f..35185d02ec 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -54,7 +54,7 @@ Roles._handlebarsHelpers = {
 }
 
 
-if (Handlebars) {
+if ('undefined' !== typeof Handlebars) {
   _.each(Roles._handlebarsHelpers, function (func, name) {
     Handlebars.registerHelper(name, func)
   })
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 2942b25a1f..60c7d212a0 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -29,10 +29,11 @@ if ('undefined' === typeof Roles) {
 }
 
 /**
- * Create a new role
+ * Create a new role. Whitespace will be trimmed.
  *
  * @method createRole
  * @param {String} role Name of role
+ * @param {String} id of new role
  */
 Roles.createRole = function (role) {
   var id,
@@ -45,7 +46,8 @@ Roles.createRole = function (role) {
   }
 
   try {
-    id = Meteor.roles.insert({'name':role})
+    id = Meteor.roles.insert({'name':role.trim()})
+    return id
   } catch (e) {
     // (from Meteor accounts-base package, insertUserDoc func)
     // XXX string parsing sucks, maybe
@@ -95,18 +97,35 @@ Roles.addUsersToRoles = function (users, roles) {
   if (!users) throw new Error ("Missing 'users' param")
   if (!roles) throw new Error ("Missing 'roles' param")
 
-  var existingRoles,
-      missing 
+  var existingRoles
 
   // ensure arrays
   if (!_.isArray(users)) users = [users]
   if (!_.isArray(roles)) roles = [roles]
 
+  // remove invalid roles
+  roles = _.reduce(roles, function (memo, role) {
+    if (role &&
+        'string' === typeof role &&
+        role.trim().length > 0) {
+      memo.push(role.trim())
+    }
+    return memo
+  }, [])
+
+  if (roles.length === 0) {
+    return
+  }
+
   // ensure all roles exist in 'roles' collection
-  existingRoles = _.pluck(Meteor.roles.find({}).fetch(), 'name')
-  missing = _.difference(roles, existingRoles)
-  _.each(missing, function (role) {
-    Roles.createRole(role)
+  existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
+    memo[role.name] = true
+    return memo
+  }, {})
+  _.each(roles, function (role) {
+    if (!existingRoles[role]) {
+      Roles.createRole(role)
+    }
   })
 
   // update all users, adding to roles set

From 2673d86a228c106ab67901fd579a7d534fe51b89 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 00:59:47 -0500
Subject: [PATCH 0028/1140] update documentation

---
 docs/api.js                           |   6 +
 docs/classes/Roles.html               | 172 ++++++++++++-
 docs/data.json                        | 116 +++++++--
 docs/files/roles_roles_client.js.html | 177 +++++++++++++
 docs/files/roles_roles_common.js.html | 353 ++++++++++++++++++++++++++
 docs/files/roles_roles_server.js.html | 219 +---------------
 docs/index.html                       |   2 +
 docs/modules/Helpers.html             | 141 ++++++++++
 docs/modules/Roles.html               |   4 +-
 roles/roles_common.js                 |   3 +-
 10 files changed, 949 insertions(+), 244 deletions(-)
 create mode 100644 docs/files/roles_roles_client.js.html
 create mode 100644 docs/files/roles_roles_common.js.html
 create mode 100644 docs/modules/Helpers.html

diff --git a/docs/api.js b/docs/api.js
index 05ffcad925..32258526fc 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -4,9 +4,15 @@ YUI.add("yuidoc-meta", function(Y) {
         "Roles"
     ],
     "modules": [
+        "Helpers",
         "Roles"
     ],
     "allModules": [
+        {
+            "displayName": "Helpers",
+            "name": "Helpers",
+            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
+        },
         {
             "displayName": "Roles",
             "name": "Roles",
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 1dfde6655e..323f0f4966 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -47,6 +47,8 @@
 
             <ul id="api-modules" class="apis modules">
             
+                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+            
                 <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
             
             </ul>
@@ -92,7 +94,7 @@
 
     
         <div class="foundat">
-            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l16"><code>roles&#x2F;roles_server.js:16</code></a>
+            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l18"><code>roles&#x2F;roles_common.js:18</code></a>
         </div>
     
 
@@ -152,7 +154,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l16"><code>roles&#x2F;roles_server.js:16</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l18"><code>roles&#x2F;roles_common.js:18</code></a>
         
         </p>
 
@@ -238,6 +240,13 @@
 
                                 
                                 
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_isInRole">isInRole</a>
+
+                                
+                                
                             </li>
                         
                             <li class="index-item method">
@@ -318,7 +327,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l81"><code>roles&#x2F;roles_server.js:81</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l85"><code>roles&#x2F;roles_common.js:85</code></a>
         
         </p>
 
@@ -400,6 +409,10 @@
     
 
     
+        <span class="returns-inline">
+            <span class="type">String</span>
+        </span>
+    
 
     
 
@@ -424,7 +437,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l29"><code>roles&#x2F;roles_server.js:29</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l31"><code>roles&#x2F;roles_common.js:31</code></a>
         
         </p>
 
@@ -435,7 +448,7 @@
     </div>
 
     <div class="description">
-        <p>Create a new role</p>
+        <p>Create a new role. Whitespace will be trimmed.</p>
     </div>
 
     
@@ -464,6 +477,19 @@
     
 
     
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">String</span>:
+                    
+                    id of new role
+                
+            </div>
+        </div>
+    
 
     
 </div>
@@ -511,7 +537,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l60"><code>roles&#x2F;roles_server.js:60</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l64"><code>roles&#x2F;roles_common.js:64</code></a>
         
         </p>
 
@@ -593,7 +619,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l196"><code>roles&#x2F;roles_server.js:196</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l218"><code>roles&#x2F;roles_common.js:218</code></a>
         
         </p>
 
@@ -674,7 +700,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l180"><code>roles&#x2F;roles_server.js:180</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l202"><code>roles&#x2F;roles_common.js:202</code></a>
         
         </p>
 
@@ -778,7 +804,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l206"><code>roles&#x2F;roles_server.js:206</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l228"><code>roles&#x2F;roles_common.js:228</code></a>
         
         </p>
 
@@ -833,6 +859,113 @@ are currently assigned to the target role.</p>
     
 
     
+</div>
+
+                
+                    <div id="method_isInRole" class="method item">
+    <h3 class="name"><code>isInRole</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>role</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                    <p>Provided by the <a href="../modules/Helpers.html">Helpers</a> module.</p>
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="..&#x2F;files&#x2F;roles_roles_client.js.html#l25"><code>roles&#x2F;roles_client.js:25</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Handlebars helper to check if current user is in at least one
+of the target roles.  For use in client-side templates.</p>
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">role</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>name of role or comma-seperated list of roles</p>
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Boolean</span>:
+                    
+                    true if current user is in at least one of the target roles
+                
+            </div>
+        </div>
+    
+
+    
 </div>
 
                 
@@ -884,7 +1017,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l118"><code>roles&#x2F;roles_server.js:118</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l139"><code>roles&#x2F;roles_common.js:139</code></a>
         
         </p>
 
@@ -968,6 +1101,10 @@ are currently assigned to the target role.</p>
     
 
     
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+    
 
     
 
@@ -992,7 +1129,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l141"><code>roles&#x2F;roles_server.js:141</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l162"><code>roles&#x2F;roles_common.js:162</code></a>
         
         </p>
 
@@ -1047,6 +1184,19 @@ are currently assigned to the target role.</p>
     
 
     
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Boolean</span>:
+                    
+                    true if user is in <em>any</em> of the target roles
+                
+            </div>
+        </div>
+    
 
     
 </div>
diff --git a/docs/data.json b/docs/data.json
index f6db7d00eb..e787b5bd69 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -5,8 +5,17 @@
         "version": "1.0"
     },
     "files": {
-        "roles/roles_server.js": {
-            "name": "roles/roles_server.js",
+        "roles/roles_client.js": {
+            "name": "roles/roles_client.js",
+            "modules": {
+                "Helpers": 1
+            },
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
+        "roles/roles_common.js": {
+            "name": "roles/roles_common.js",
             "modules": {
                 "Roles": 1
             },
@@ -15,9 +24,27 @@
             },
             "fors": {},
             "namespaces": {}
+        },
+        "roles/roles_server.js": {
+            "name": "roles/roles_server.js",
+            "modules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
         }
     },
     "modules": {
+        "Helpers": {
+            "name": "Helpers",
+            "submodules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {},
+            "tag": "module",
+            "file": "roles/roles_client.js",
+            "line": 5,
+            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
+        },
         "Roles": {
             "name": "Roles",
             "submodules": {},
@@ -27,8 +54,8 @@
             "fors": {},
             "namespaces": {},
             "tag": "module",
-            "file": "roles/roles_server.js",
-            "line": 16,
+            "file": "roles/roles_common.js",
+            "line": 18,
             "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
         }
     },
@@ -43,24 +70,44 @@
             "extension_for": [],
             "module": "Roles",
             "namespace": "",
-            "file": "roles/roles_server.js",
-            "line": 16,
+            "file": "roles/roles_common.js",
+            "line": 18,
             "description": "<p>Role-based authorization compatible with built-in Meteor accounts package.</p>\n<br />\n<p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>\n<p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>",
             "is_constructor": 1
         }
     },
     "classitems": [
         {
-            "file": "roles/roles_server.js",
+            "file": "roles/roles_client.js",
+            "line": 25,
+            "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
+            "itemtype": "method",
+            "name": "isInRole",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "name of role or comma-seperated list of roles",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "true if current user is in at least one of the target roles",
+                "type": "Boolean"
+            },
+            "class": "Roles",
+            "module": "Helpers"
+        },
+        {
+            "file": "roles/roles_common.js",
             "line": 9,
             "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
             "class": "Roles",
             "module": "Roles"
         },
         {
-            "file": "roles/roles_server.js",
-            "line": 29,
-            "description": "Create a new role",
+            "file": "roles/roles_common.js",
+            "line": 31,
+            "description": "Create a new role. Whitespace will be trimmed.",
             "itemtype": "method",
             "name": "createRole",
             "params": [
@@ -70,12 +117,16 @@
                     "type": "String"
                 }
             ],
+            "return": {
+                "description": "id of new role",
+                "type": "String"
+            },
             "class": "Roles",
             "module": "Roles"
         },
         {
-            "file": "roles/roles_server.js",
-            "line": 60,
+            "file": "roles/roles_common.js",
+            "line": 64,
             "description": "Delete an existing role.  Will throw \"Role in use\" error if any users \nare currently assigned to the target role.",
             "itemtype": "method",
             "name": "deleteRole",
@@ -90,8 +141,8 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles_server.js",
-            "line": 81,
+            "file": "roles/roles_common.js",
+            "line": 85,
             "description": "Add users to roles. Will create roles as needed.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
             "itemtype": "method",
             "name": "addUsersToRoles",
@@ -111,8 +162,8 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles_server.js",
-            "line": 118,
+            "file": "roles/roles_common.js",
+            "line": 139,
             "description": "Remove users from roles",
             "itemtype": "method",
             "name": "removeUsersFromRoles",
@@ -132,8 +183,8 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles_server.js",
-            "line": 141,
+            "file": "roles/roles_common.js",
+            "line": 162,
             "description": "Check if user is in role",
             "itemtype": "method",
             "name": "userIsInRole",
@@ -149,12 +200,16 @@
                     "type": "String|Array"
                 }
             ],
+            "return": {
+                "description": "true if user is in _any_ of the target roles",
+                "type": "Boolean"
+            },
             "class": "Roles",
             "module": "Roles"
         },
         {
-            "file": "roles/roles_server.js",
-            "line": 180,
+            "file": "roles/roles_common.js",
+            "line": 202,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -173,8 +228,8 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles_server.js",
-            "line": 196,
+            "file": "roles/roles_common.js",
+            "line": 218,
             "description": "Retrieve all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -186,8 +241,8 @@
             "module": "Roles"
         },
         {
-            "file": "roles/roles_server.js",
-            "line": 206,
+            "file": "roles/roles_common.js",
+            "line": 228,
             "description": "Retrieve all users who are in target role",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -204,12 +259,23 @@
             },
             "class": "Roles",
             "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 4,
+            "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
+            "class": "",
+            "module": "Roles"
         }
     ],
     "warnings": [
         {
             "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
-            "line": " roles/roles_server.js:9"
+            "line": " roles/roles_common.js:9"
+        },
+        {
+            "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
+            "line": " roles/roles_server.js:4"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
new file mode 100644
index 0000000000..1541e9a3f1
--- /dev/null
+++ b/docs/files/roles_roles_client.js.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>roles&#x2F;roles_client.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: 1.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+            
+                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1 class="file-heading">File: roles&#x2F;roles_client.js</h1>
+
+<div class="file">
+    <pre class="code prettyprint linenums">
+;(function () {
+
+Meteor.subscribe(&#x27;_roles_own_user_roles&#x27;)
+
+&#x2F;**
+ * Convenience functions for use on client.
+ *
+ * NOTE: You must restrict user actions on the server-side; any
+ * client-side checks are strictly for convenience and must not be
+ * trusted.
+ *
+ * @module Helpers
+ *&#x2F;
+
+&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;
+&#x2F;&#x2F; Handlebars helpers
+&#x2F;&#x2F;
+&#x2F;&#x2F; Use a semi-private variable rather than declaring Handlebars
+&#x2F;&#x2F; helpers directly so that we can unit test the helpers.
+&#x2F;&#x2F; XXX For some reason, the Handlebars helpers are not registered 
+&#x2F;&#x2F; before the tests run.
+&#x2F;&#x2F;
+Roles._handlebarsHelpers = {
+
+  &#x2F;**
+   * Handlebars helper to check if current user is in at least one
+   * of the target roles.  For use in client-side templates.
+   *
+   * @method isInRole
+   * @param {String} role name of role or comma-seperated list of roles
+   * @return {Boolean} true if current user is in at least one of the target roles
+   *&#x2F;
+  isInRole: function (role) {
+    var user = Meteor.user(),
+      comma = role &amp;&amp; role.indexOf(&#x27;,&#x27;),
+      roles
+
+    if (!user) return false
+
+    if (comma !== -1) {
+      roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {
+        if (!r || !r.trim()) {
+          return memo
+        }
+        memo.push(r.trim())
+        return memo
+      }, [])
+    } else {
+      roles = [role]
+    }
+
+    return Roles.userIsInRole(user, roles)
+  }
+}
+
+
+if (&#x27;undefined&#x27; !== typeof Handlebars) {
+  _.each(Roles._handlebarsHelpers, function (func, name) {
+    Handlebars.registerHelper(name, func)
+  })
+} else {
+  console.log(&#x27;WARNING: Roles Handlebars helpers not registered. Handlebars not defined&#x27;)
+}
+
+}());
+
+    </pre>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="..&#x2F;assets/js/yui-prettify.js"></script>
+<script src="..&#x2F;assets/../api.js"></script>
+<script src="..&#x2F;assets/js/api-filter.js"></script>
+<script src="..&#x2F;assets/js/api-list.js"></script>
+<script src="..&#x2F;assets/js/api-search.js"></script>
+<script src="..&#x2F;assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
new file mode 100644
index 0000000000..c179b4c86b
--- /dev/null
+++ b/docs/files/roles_roles_common.js.html
@@ -0,0 +1,353 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>roles&#x2F;roles_common.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: 1.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+            
+                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1 class="file-heading">File: roles&#x2F;roles_common.js</h1>
+
+<div class="file">
+    <pre class="code prettyprint linenums">
+;(function () {
+
+&#x2F;**
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
+ *
+ * @module Roles
+ *&#x2F;
+
+&#x2F;**
+ * Roles collection documents consist only of an id and a role name.
+ *   ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }
+ *&#x2F;
+if (!Meteor.roles) {
+  Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
+}
+
+
+&#x2F;**
+ * &lt;p&gt;Role-based authorization compatible with built-in Meteor accounts package.&lt;&#x2F;p&gt;
+ * &lt;br &#x2F;&gt;
+ * &lt;p&gt;Uses &#x27;roles&#x27; collection to store existing roles with unique index on &#x27;name&#x27; field.&lt;&#x2F;p&gt;
+ * &lt;p&gt;Adds a &#x27;roles&#x27; field to user objects in &#x27;users&#x27; collection when they are added to a given role.&lt;&#x2F;p&gt;
+ *
+ * @class Roles
+ * @constructor
+ *&#x2F;
+if (&#x27;undefined&#x27; === typeof Roles) {
+  Roles = {}
+}
+
+&#x2F;**
+ * Create a new role. Whitespace will be trimmed.
+ *
+ * @method createRole
+ * @param {String} role Name of role
+ * @return {String} id of new role
+ *&#x2F;
+Roles.createRole = function (role) {
+  var id,
+      match
+
+  if (!role 
+      || &#x27;string&#x27; !== typeof role 
+      || role.trim().length === 0) {
+    return
+  }
+
+  try {
+    id = Meteor.roles.insert({&#x27;name&#x27;:role.trim()})
+    return id
+  } catch (e) {
+    &#x2F;&#x2F; (from Meteor accounts-base package, insertUserDoc func)
+    &#x2F;&#x2F; XXX string parsing sucks, maybe
+    &#x2F;&#x2F; https:&#x2F;&#x2F;jira.mongodb.org&#x2F;browse&#x2F;SERVER-3069 will get fixed one day
+    if (e.name !== &#x27;MongoError&#x27;) throw e
+    match = e.err.match(&#x2F;^E11000 duplicate key error index: ([^ ]+)&#x2F;);
+    if (!match) throw e
+    if (match[1].indexOf(&#x27;$name&#x27;) !== -1)
+      throw new Meteor.Error(403, &quot;Role already exists.&quot;)
+    throw e
+  }
+}
+
+&#x2F;** 
+ * Delete an existing role.  Will throw &quot;Role in use&quot; error if any users 
+ * are currently assigned to the target role.
+ * 
+ * @method deleteRole
+ * @param {String} role Name of role
+ *&#x2F;
+Roles.deleteRole = function (role) {
+  if (!role) {
+    return
+  }
+
+  var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
+
+  if (foundExistingUser) {
+    throw new Meteor.Error(403, &#x27;Role in use&#x27;)
+  }
+
+  Meteor.roles.remove({ name: role })
+}
+
+&#x2F;**
+ * Add users to roles. Will create roles as needed.
+ *
+ * Makes 2 calls to database:
+ *  1. retrieve list of all existing roles
+ *  2. update users&#x27; roles
+ *
+ * @method addUsersToRoles
+ * @param {Array|String} users id(s) of users to add to roles
+ * @param {Array|String} roles name(s) of roles to add users to
+ *&#x2F;
+Roles.addUsersToRoles = function (users, roles) {
+  if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
+  if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
+
+  var existingRoles
+
+  &#x2F;&#x2F; ensure arrays
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  &#x2F;&#x2F; remove invalid roles
+  roles = _.reduce(roles, function (memo, role) {
+    if (role &amp;&amp;
+        &#x27;string&#x27; === typeof role &amp;&amp;
+        role.trim().length &gt; 0) {
+      memo.push(role.trim())
+    }
+    return memo
+  }, [])
+
+  if (roles.length === 0) {
+    return
+  }
+
+  &#x2F;&#x2F; ensure all roles exist in &#x27;roles&#x27; collection
+  existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
+    memo[role.name] = true
+    return memo
+  }, {})
+  _.each(roles, function (role) {
+    if (!existingRoles[role]) {
+      Roles.createRole(role)
+    }
+  })
+
+  &#x2F;&#x2F; update all users, adding to roles set
+  Meteor.users.update(
+    {       _id: { $in: users } },
+    { $addToSet: { roles: { $each: roles } } },
+    {     multi: true }
+  )
+}
+
+&#x2F;**
+ * Remove users from roles
+ *
+ * @method removeUsersFromRoles
+ * @param {Array|String} users id(s) of users to add to roles
+ * @param {Array|String} roles name(s) of roles to add users to
+ *&#x2F;
+Roles.removeUsersFromRoles = function (users, roles) {
+  if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
+  if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
+
+  &#x2F;&#x2F; ensure arrays
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  &#x2F;&#x2F; update all users, remove from roles set
+  Meteor.users.update(
+    {      _id: {   $in: users } },
+    { $pullAll: { roles: roles } },
+    {    multi: true}
+  )
+}
+
+&#x2F;**
+ * Check if user is in role
+ *
+ * @method userIsInRole
+ * @param {String|Object} user Id of user or actual user object
+ * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
+ * @return {Boolean} true if user is in _any_ of the target roles
+ *&#x2F;
+Roles.userIsInRole = function (user, roles) {
+  var id,
+      userRoles
+    
+  &#x2F;&#x2F; ensure array to simplify code
+  if (!_.isArray(roles)) {
+    roles = [roles]
+  }
+  
+  if (!user) {
+    return false
+  } else if (&#x27;object&#x27; === typeof user) {
+    userRoles = user.roles
+    if (_.isArray(userRoles)) {
+      return _.some(roles, function (role) {
+        return _.contains(userRoles, role)
+      })
+    }
+    &#x2F;&#x2F; missing roles field, try going direct via id
+    id = user._id
+  } else if (&#x27;string&#x27; === typeof user) {
+    id = user
+  } 
+
+  if (!id) return false
+
+  return Meteor.users.findOne(
+    { _id: id, roles: { $in: roles } },
+    { _id: 1 }
+  )
+}
+
+&#x2F;**
+ * Retrieve users roles
+ *
+ * @method getRolesForUser
+ * @param {String} user Id of user
+ * @return {Array} Array of user&#x27;s roles, unsorted
+ *&#x2F;
+Roles.getRolesForUser = function (user) {
+  var user = Meteor.users.findOne(
+    { _id: user},
+    { _id: 0, roles: 1}
+  )
+  
+  return user ? user.roles : undefined
+}
+
+&#x2F;**
+ * Retrieve all existing roles
+ *
+ * @method getAllRoles
+ * @return {Cursor} cursor of existing roles
+ *&#x2F;
+Roles.getAllRoles = function () {
+  return Meteor.roles.find({}, { sort: { name: 1 } })
+}
+
+&#x2F;**
+ * Retrieve all users who are in target role
+ *
+ * @method getUsersInRole
+ * @param {String} role Name of role
+ * @return {Cursor} cursor of users in role
+ *&#x2F;
+Roles.getUsersInRole = function (role) {
+  return Meteor.users.find(
+    { roles: { $in: [role] } }
+  )
+}
+
+}());
+
+    </pre>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="..&#x2F;assets/js/yui-prettify.js"></script>
+<script src="..&#x2F;assets/../api.js"></script>
+<script src="..&#x2F;assets/js/api-filter.js"></script>
+<script src="..&#x2F;assets/js/api-list.js"></script>
+<script src="..&#x2F;assets/js/api-search.js"></script>
+<script src="..&#x2F;assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index a4baa656d4..ca7d4e16b3 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -47,6 +47,8 @@
 
             <ul id="api-modules" class="apis modules">
             
+                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+            
                 <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
             
             </ul>
@@ -90,224 +92,29 @@
     <pre class="code prettyprint linenums">
 ;(function () {
 
-&#x2F;**
- * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
- *
- * @module Roles
- *&#x2F;
 
 &#x2F;**
  * Roles collection documents consist only of an id and a role name.
  *   ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }
  *&#x2F;
-Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
+if (!Meteor.roles) {
+  Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
 
-
-&#x2F;**
- * &lt;p&gt;Role-based authorization compatible with built-in Meteor accounts package.&lt;&#x2F;p&gt;
- * &lt;br &#x2F;&gt;
- * &lt;p&gt;Uses &#x27;roles&#x27; collection to store existing roles with unique index on &#x27;name&#x27; field.&lt;&#x2F;p&gt;
- * &lt;p&gt;Adds a &#x27;roles&#x27; field to user objects in &#x27;users&#x27; collection when they are added to a given role.&lt;&#x2F;p&gt;
- *
- * @class Roles
- * @constructor
- *&#x2F;
-if (&#x27;undefined&#x27; === typeof Roles) {
-  Roles = {}
+  &#x2F;&#x2F; Create default indexes for roles collection
+  Meteor.roles._ensureIndex(&#x27;name&#x27;, {unique: 1})
 }
 
-&#x2F;**
- * Create a new role
- *
- * @method createRole
- * @param {String} role Name of role
- *&#x2F;
-Roles.createRole = function (role) {
-  var id,
-      match
+Meteor.publish(&#x27;_roles_own_user_roles&#x27;, function () {
+  var userId = this.userId,
+      fields = {roles:1}
 
-  if (!role 
-      || &#x27;string&#x27; !== typeof role 
-      || role.trim().length === 0) {
+  if (!userId) {
+    this.complete()
     return
   }
 
-  try {
-    id = Meteor.roles.insert({&#x27;name&#x27;:role})
-  } catch (e) {
-    &#x2F;&#x2F; (from Meteor accounts-base package, insertUserDoc func)
-    &#x2F;&#x2F; XXX string parsing sucks, maybe
-    &#x2F;&#x2F; https:&#x2F;&#x2F;jira.mongodb.org&#x2F;browse&#x2F;SERVER-3069 will get fixed one day
-    if (e.name !== &#x27;MongoError&#x27;) throw e
-    match = e.err.match(&#x2F;^E11000 duplicate key error index: ([^ ]+)&#x2F;);
-    if (!match) throw e
-    if (match[1].indexOf(&#x27;$name&#x27;) !== -1)
-      throw new Meteor.Error(403, &quot;Role already exists.&quot;)
-    throw e
-  }
-}
-
-&#x2F;** 
- * Delete an existing role.  Will throw &quot;Role in use&quot; error if any users 
- * are currently assigned to the target role.
- * 
- * @method deleteRole
- * @param {String} role Name of role
- *&#x2F;
-Roles.deleteRole = function (role) {
-  if (!role) {
-    return
-  }
-
-  var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
-
-  if (foundExistingUser) {
-    throw new Error(&#x27;Role in use&#x27;)
-  }
-
-  Meteor.roles.remove({ name: role })
-}
-
-&#x2F;**
- * Add users to roles. Will create roles as needed.
- *
- * Makes 2 calls to database:
- *  1. retrieve list of all existing roles
- *  2. update users&#x27; roles
- *
- * @method addUsersToRoles
- * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles to add users to
- *&#x2F;
-Roles.addUsersToRoles = function (users, roles) {
-  if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
-  if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
-
-  var existingRoles,
-      missing 
-
-  &#x2F;&#x2F; ensure arrays
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  &#x2F;&#x2F; ensure all roles exist in &#x27;roles&#x27; collection
-  existingRoles = _.pluck(Meteor.roles.find({}).fetch(), &#x27;name&#x27;)
-  missing = _.difference(roles, existingRoles)
-  _.each(missing, function (role) {
-    Roles.createRole(role)
-  })
-
-  &#x2F;&#x2F; update all users, adding to roles set
-  Meteor.users.update(
-    {       _id: { $in: users } },
-    { $addToSet: { roles: { $each: roles } } },
-    {     multi: true }
-  )
-}
-
-&#x2F;**
- * Remove users from roles
- *
- * @method removeUsersFromRoles
- * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles to add users to
- *&#x2F;
-Roles.removeUsersFromRoles = function (users, roles) {
-  if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
-  if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
-
-  &#x2F;&#x2F; ensure arrays
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  &#x2F;&#x2F; update all users, remove from roles set
-  Meteor.users.update(
-    {      _id: {   $in: users } },
-    { $pullAll: { roles: roles } },
-    {    multi: true}
-  )
-}
-
-&#x2F;**
- * Check if user is in role
- *
- * @method userIsInRole
- * @param {String|Object} user Id of user or actual user object
- * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
- *&#x2F;
-Roles.userIsInRole = function (user, roles) {
-  var id,
-      userRoles
-    
-  if (&#x27;string&#x27; === typeof user) {
-    id = user
-  } 
-
-  &#x2F;&#x2F; ensure array to simplify code
-  if (!_.isArray(roles)) {
-    roles = [roles]
-  }
-  
-  if (&#x27;object&#x27; === typeof user) {
-    userRoles = user.roles
-    if (_.isArray(userRoles)) {
-      return _.some(roles, function (role) {
-        return _.contains(userRoles, role)
-      })
-    }
-    &#x2F;&#x2F; missing roles, try id
-    id = user._id
-  }
-
-  if (!id) return false
-
-  return Meteor.users.findOne(
-    { _id: id, roles: { $in: roles } },
-    { _id: 1 }
-  )
-}
-
-&#x2F;**
- * Retrieve users roles
- *
- * @method getRolesForUser
- * @param {String} user Id of user
- * @return {Array} Array of user&#x27;s roles, unsorted
- *&#x2F;
-Roles.getRolesForUser = function (user) {
-  var user = Meteor.users.findOne(
-    { _id: user},
-    { _id: 0, roles: 1}
-  )
-  
-  return user ? user.roles : undefined
-}
-
-&#x2F;**
- * Retrieve all existing roles
- *
- * @method getAllRoles
- * @return {Cursor} cursor of existing roles
- *&#x2F;
-Roles.getAllRoles = function () {
-  return Meteor.roles.find({}, { sort: { name: 1 } })
-}
-
-&#x2F;**
- * Retrieve all users who are in target role
- *
- * @method getUsersInRole
- * @param {String} role Name of role
- * @return {Cursor} cursor of users in role
- *&#x2F;
-Roles.getUsersInRole = function (role) {
-  return Meteor.users.find(
-    { roles: { $in: [role] } }
-  )
-}
-
-&#x2F;&#x2F;&#x2F; DEFAULT INDEXES ON ROLES
-Meteor.roles._ensureIndex(&#x27;name&#x27;, {unique: 1});
+  return Meteor.users.find({_id:userId}, {fields: fields})
+})
 
 }());
 
diff --git a/docs/index.html b/docs/index.html
index 59ea8716d2..38cfc7b42c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -47,6 +47,8 @@
 
             <ul id="api-modules" class="apis modules">
             
+                <li><a href=".&#x2F;modules/Helpers.html">Helpers</a></li>
+            
                 <li><a href=".&#x2F;modules/Roles.html">Roles</a></li>
             
             </ul>
diff --git a/docs/modules/Helpers.html b/docs/modules/Helpers.html
new file mode 100644
index 0000000000..be47360d22
--- /dev/null
+++ b/docs/modules/Helpers.html
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Helpers - The meteor-roles API</title>
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: 1.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+            
+                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1>Helpers Module</h1>
+<div class="box clearfix meta">
+    
+
+    
+
+    
+        <div class="foundat">
+            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_client.js.html#l5"><code>roles&#x2F;roles_client.js:5</code></a>
+        </div>
+    
+
+    
+</div>
+
+
+
+<div class="box intro">
+    <p>Convenience functions for use on client.</p>
+
+<p>NOTE: You must restrict user actions on the server-side; any
+client-side checks are strictly for convenience and must not be
+trusted.</p>
+</div>
+
+
+
+<div class="yui3-g">
+    <div class="yui3-u-1-2">
+        
+    </div>
+
+    <div class="yui3-u-1-2">
+        
+    </div>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="..&#x2F;assets/js/yui-prettify.js"></script>
+<script src="..&#x2F;assets/../api.js"></script>
+<script src="..&#x2F;assets/js/api-filter.js"></script>
+<script src="..&#x2F;assets/js/api-list.js"></script>
+<script src="..&#x2F;assets/js/api-search.js"></script>
+<script src="..&#x2F;assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index b4b414dd1d..6c40328b57 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -47,6 +47,8 @@
 
             <ul id="api-modules" class="apis modules">
             
+                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+            
                 <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
             
             </ul>
@@ -92,7 +94,7 @@
 
     
         <div class="foundat">
-            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_server.js.html#l16"><code>roles&#x2F;roles_server.js:16</code></a>
+            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l18"><code>roles&#x2F;roles_common.js:18</code></a>
         </div>
     
 
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 60c7d212a0..20e639953f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -33,7 +33,7 @@ if ('undefined' === typeof Roles) {
  *
  * @method createRole
  * @param {String} role Name of role
- * @param {String} id of new role
+ * @return {String} id of new role
  */
 Roles.createRole = function (role) {
   var id,
@@ -165,6 +165,7 @@ Roles.removeUsersFromRoles = function (users, roles) {
  * @method userIsInRole
  * @param {String|Object} user Id of user or actual user object
  * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
+ * @return {Boolean} true if user is in _any_ of the target roles
  */
 Roles.userIsInRole = function (user, roles) {
   var id,

From 2867836fc017b6e138b1dbb15cc4c3a49d043b52 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 01:09:30 -0500
Subject: [PATCH 0029/1140] Remove smart.lock to try to workaround tag exists
 error

---
 roles/smart.lock | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 roles/smart.lock

diff --git a/roles/smart.lock b/roles/smart.lock
deleted file mode 100644
index 0b1238b050..0000000000
--- a/roles/smart.lock
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "meteor": {
-    "git": "https://github.com/meteor/meteor.git",
-    "branch": "master",
-    "commit": "067113a37dd4e7824db1a16d5f7a90c3739eed9c"
-  },
-  "dependencies": {
-    "basePackages": {
-      "roles": {
-        "path": "."
-      }
-    },
-    "packages": {
-      "roles": {
-        "path": "."
-      }
-    }
-  }
-}

From 4cf3c790c8f273f53a41aa8d8ad85c59e8696abb Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 14:35:56 -0500
Subject: [PATCH 0030/1140] include example app in description

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index f3ecb7cdb5..34dfc3ceef 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -1,6 +1,6 @@
 {
   "name": "roles",
-  "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes unit tests and online API docs.",
+  "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
   "version": "1.0.1",

From 729a97dd0f45163afe0215bd412e2745f5edcf80 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 15:00:45 -0500
Subject: [PATCH 0031/1140] Add spacing

---
 README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/README.md b/README.md
index 1742fb8f17..f2a768bcb4 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ meteor-roles
 
 Roles-based authorization package for Meteor - compatible with built-in accounts package.
 
+<br />
+
 ### Example App
 
 The ```example-app``` directory contains a Meteor app which shows off the following features:
@@ -17,6 +19,7 @@ See this app in action by:
   3. ```mrt```
   4. point browser to ```http://localhost:3000```
 
+<br />
 
 ### Changes to default Meteor behavior
 
@@ -25,12 +28,24 @@ See this app in action by:
   3. The currently logged-in user's ```roles``` field is automatically published under ```_roles_own_user_roles```.
   4. Client javascript automatically subscribes to ```_roles_own_user_roles```.
 
+<br />
 
 ### Usage
 
+Add this smart package to your project:
+```
+mrt add roles
+```
+
+<br />
+
+Here are some potential use cases:
+
+<br />
 
 -- **Server** --
 
+
 Add users to roles:
 ```js
   var users = [
@@ -56,6 +71,8 @@ Add users to roles:
   });
 ```
 
+<br />
+
 Check user roles before publishing sensitive data:
 ```js
 // server/publish.js
@@ -76,6 +93,8 @@ Meteor.publish('secrets', function () {
 });
 ```
 
+<br />
+
 Prevent non-authorized users from creating new users:
 ```js
   Accounts.validateNewUser(function (user) {
@@ -111,6 +130,8 @@ NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted
 </template>
 ```
 
+<br />
+
 ### Documentation
 
 Online API docs found here: http://alanning.github.com/meteor-roles/
@@ -129,6 +150,8 @@ To serve documentation locally:
   4. point browser at http://localhost:3000/
 
 
+<br />
+
 ### Tests
 
 

From d27bad500e431ce165b6c1d9dfdd9d8d0fd59640 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 22:47:14 -0500
Subject: [PATCH 0032/1140] add link to github repo on start page

---
 example-app/client/example-app.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/example-app/client/example-app.html b/example-app/client/example-app.html
index 83065881df..8e5dd5def8 100644
--- a/example-app/client/example-app.html
+++ b/example-app/client/example-app.html
@@ -66,7 +66,6 @@
                 {{#if isInRole 'admin,manage-users'}}
                 <li><a class='nav-manage' href="/manage">Manage Users</a></li>
                 {{/if}}
-                <li><a href="#" disabled class="disabled">Update my Profile</a></li>
                 <li><a class="signout" href="#signout">Sign out</a></li>
               </ul>
             </li>
@@ -94,7 +93,10 @@
       
       {{> noteOfTheDay}}
 
-
+      <div>
+        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
+      </div>
+          
       {{> securityNote}}
     </div>
   </div>

From 25b0a46158e0f931ca3a621a2681cf7f29cf6094 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 22:57:10 -0500
Subject: [PATCH 0033/1140] Add link to online example-app

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f2a768bcb4..e3f45ae9a0 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,9 @@ The ```example-app``` directory contains a Meteor app which shows off the follow
 * 'Sign-in required' app with up-front login page using ```accounts-ui```
 * Client-side routing via ```meteor-router``` smart package
 
-See this app in action by:
+View online @  <a href="http://roles-example.meteor.com/" target="_blank">http://roles-example.meteor.com/</a>
+  
+Run locally:
   1. ```git clone https://github.com/alanning/meteor-roles.git```
   2. ```cd meteor-roles/example-app```
   3. ```mrt```

From ac912dab71e73d52814fe2628c26fda46099b6ed Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 23:13:21 -0500
Subject: [PATCH 0034/1140] Include 'install Meteorite' in instructions

---
 README.md | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index e3f45ae9a0..826d6afb81 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,11 @@ The ```example-app``` directory contains a Meteor app which shows off the follow
 View online @  <a href="http://roles-example.meteor.com/" target="_blank">http://roles-example.meteor.com/</a>
   
 Run locally:
-  1. ```git clone https://github.com/alanning/meteor-roles.git```
-  2. ```cd meteor-roles/example-app```
-  3. ```mrt```
-  4. point browser to ```http://localhost:3000```
+  1. install [Meteorite][1]
+  2. ```git clone https://github.com/alanning/meteor-roles.git```
+  3. ```cd meteor-roles/example-app```
+  4. ```mrt```
+  5. point browser to ```http://localhost:3000```
 
 <br />
 
@@ -35,9 +36,10 @@ Run locally:
 ### Usage
 
 Add this smart package to your project:
-```
-mrt add roles
-```
+
+  1. install [Meteorite][1]
+  2. ```mrt add roles```
+
 
 <br />
 
@@ -142,13 +144,13 @@ API docs generated using [YUIDoc][2]
 
 To re-generate documentation:
   1. install YUIDoc
-  2. cd 'meteor-roles' directory (root)
-  3. yuidoc
+  2. ```cd meteor-roles```
+  3. ```yuidoc```
 
 To serve documentation locally:
   1. install YUIDoc
-  2. cd 'meteor-roles' directory (root)
-  3. yuidoc --server
+  2. ```cd meteor-roles```
+  3. ```yuidoc --server```
   4. point browser at http://localhost:3000/
 
 
@@ -159,8 +161,8 @@ To serve documentation locally:
 
 To run tests: 
   1. install [Meteorite][1]
-  2. cd 'roles' directory
-  3. mrt
+  2. ```cd meteor-roles/roles```
+  3. ```mrt```
   4. point browser at http://localhost:3000/
 
 _NOTE_: If you see an error message regarding **'roles package does not exist'** that means you are trying to run 'mrt' in the wrong directory.  See step 2.

From 2380c65468c2a903ea9fb60525b248388fd219bf Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 27 Jan 2013 23:46:05 -0500
Subject: [PATCH 0035/1140] add link to meteor road map regarding on-demand
 sending of templates

---
 example-app/client/example-app.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/example-app/client/example-app.html b/example-app/client/example-app.html
index 8e5dd5def8..415e1f1025 100644
--- a/example-app/client/example-app.html
+++ b/example-app/client/example-app.html
@@ -148,8 +148,9 @@
 <template name="securityNote">
   <div class="security-note">
     <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
-    <p>This is how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So don't put sensitive information in templates!</p>
-    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to the Router definition of the 'secrets' route but even then the raw template data is still sent to the user's browser (by design).</p>
+    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
+    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
+    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
     <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
     <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
   </div>

From 34082db000c25cfb4edf57d260b132e4ef581f13 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 7 Feb 2013 17:20:42 -0500
Subject: [PATCH 0036/1140] use routers ie-support branch

---
 example-app/smart.json |  5 ++++-
 example-app/smart.lock | 20 ++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/example-app/smart.json b/example-app/smart.json
index c32544aca9..252347c144 100644
--- a/example-app/smart.json
+++ b/example-app/smart.json
@@ -7,6 +7,9 @@
     "roles": {
       "path": "../roles"
     },
-    "router": {}
+    "router": {
+      "git": "https://github.com/tmeasday/meteor-router.git",
+      "branch": "ie-support"
+    }
   }
 }
diff --git a/example-app/smart.lock b/example-app/smart.lock
index 0b39ccdb18..4b9a1e5b18 100644
--- a/example-app/smart.lock
+++ b/example-app/smart.lock
@@ -9,7 +9,10 @@
       "roles": {
         "path": "../roles"
       },
-      "router": {}
+      "router": {
+        "git": "https://github.com/tmeasday/meteor-router.git",
+        "branch": "ie-support"
+      }
     },
     "packages": {
       "roles": {
@@ -17,13 +20,18 @@
       },
       "router": {
         "git": "https://github.com/tmeasday/meteor-router.git",
-        "tag": "v0.3.4",
-        "commit": "8f0d5303de5b93771e91f21f818be27358c2fb30"
+        "branch": "ie-support",
+        "commit": "aeadbafea4746c53cd2e9a8ab242f528e6ad0d0d"
       },
       "page-js": {
-        "git": "https://github.com/tmeasday/meteor-page-js.git",
-        "tag": "v1.3.3",
-        "commit": "c1e9832af3fc2b2f5139a16d93a82ca6fa0655da"
+        "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",
+        "branch": "master",
+        "commit": "10946edeefb8b40c351bd5ce6c3a18665a05c623"
+      },
+      "HTML5-History-API": {
+        "git": "https://github.com/tmeasday/meteor-HTML5-History-API.git",
+        "branch": "master",
+        "commit": "0d250d8f8852ba2042f1b8ed39693e9cc89b8f58"
       }
     }
   }

From 387ddbf1cd9294c2c65c8b23203b68506003b7a4 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 7 Feb 2013 17:21:08 -0500
Subject: [PATCH 0037/1140] Include smart.lock

---
 roles/smart.lock | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 roles/smart.lock

diff --git a/roles/smart.lock b/roles/smart.lock
new file mode 100644
index 0000000000..2385c175c3
--- /dev/null
+++ b/roles/smart.lock
@@ -0,0 +1,19 @@
+{
+  "meteor": {
+    "git": "https://github.com/meteor/meteor.git",
+    "branch": "master",
+    "commit": "4d98d8cb4e5a95e9e98953f44c872c9332a042a3"
+  },
+  "dependencies": {
+    "basePackages": {
+      "roles": {
+        "path": "."
+      }
+    },
+    "packages": {
+      "roles": {
+        "path": "."
+      }
+    }
+  }
+}

From 6604c6fb2f8a7137a390491db2373c292cbec1e2 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 7 Feb 2013 22:45:58 -0500
Subject: [PATCH 0038/1140] support IE8

---
 example-app/client/client.js        | 62 +++++++++++++----------------
 example-app/client/example-app.html | 14 ++++---
 example-app/polyfills.js            | 11 +++++
 example-app/server/server.js        |  6 ++-
 4 files changed, 51 insertions(+), 42 deletions(-)
 create mode 100644 example-app/polyfills.js

diff --git a/example-app/client/client.js b/example-app/client/client.js
index 4c6bfb8f82..95114b39b8 100644
--- a/example-app/client/client.js
+++ b/example-app/client/client.js
@@ -3,15 +3,22 @@
   "use strict";
 
 
-
 ////////////////////////////////////////////////////////////////////
 // Patches
 //
 
-if (!console || !console.log) {
-  // stub for IE
-  console = { log: function () {} };
+// stubs for IE
+if (!window.console) {
+  window.console = {}
 }
+if (!window.console.log) {
+  window.console.log = function (msg) {
+    $('#log').append('<br /><p>' + msg + '</p>')
+  };
+}
+
+
+
 
 // fix bootstrap dropdown unclickable issue on iOS
 // https://github.com/twitter/bootstrap/issues/4550
@@ -34,7 +41,6 @@ Meteor.subscribe('users');
 
 
 
-
 ////////////////////////////////////////////////////////////////////
 // Routing
 //
@@ -65,6 +71,7 @@ Meteor.Router.add({
   '/start': 'start',
   '/secrets': 'secrets',
   '/manage': 'manage',
+  '/signout': signout,
   '*': 'not_found'
 });
 
@@ -116,11 +123,7 @@ Template.signin.rendered = function () {
 
 Template.header.events({
   // template data, if any, is available in 'this'
-  'click a.nav-start' : handleNavClick,
-  'click a.nav-secrets' : handleNavClick,
-  'click a.nav-manage' : handleNavClick,
-  'click .btn-navbar' : openCloseNav,
-  'click .signout': signout
+  'click .btn-navbar' : openCloseNav
 });
 Template.header.helpers({
   displayName: function () {
@@ -162,17 +165,23 @@ Template.manage.helpers({
 //
 
 function displayName (user) {
+  var name;
+
   if (!user) {
     user = Meteor.user();
   }
-  
+
   if (!user) return "<missing user>";
 
   if (user.profile) {
     name = user.profile.name;
   }
 
-  name = name.trim();
+  if ('string' === typeof name) {
+    name = name.trim();
+  } else {
+    name = null;
+  }
 
   if (!name && user.emails && user.emails.length > 0) {
     name = user.emails[0].address;
@@ -182,30 +191,13 @@ function displayName (user) {
 }
 
 
-function handleNavClick (e) {
-  var user = Meteor.user(),
-      template;
-
-  e.preventDefault();
-
-  if (!user) return;
-
-  try {
-    // ex. ...class="nav-secrets"
-    template = e.target.className.substring(4);
-    console.log("You pressed the " + template + " button");
-    Meteor.Router.to('/' + template);
-  } 
-  catch (err) {
-    console.log(err);
-  }
-}
-
-function signout (e) {
-  e.preventDefault();
+function signout () {
   console.log('logging out...');
-  Meteor.logout();
-  Meteor.Router.to('/');
+  Meteor.logout(function () {
+    console.log('...done');
+    Meteor.Router.to('/');
+  });
+  
 }
 
 // insta-open/close nav rather than animate collapse.
diff --git a/example-app/client/example-app.html b/example-app/client/example-app.html
index 415e1f1025..917ee5a28d 100644
--- a/example-app/client/example-app.html
+++ b/example-app/client/example-app.html
@@ -4,6 +4,8 @@
 
 <body>
   {{renderPage}}
+
+  <div id="log"></div>
 </body>
 
 <template name="signin">
@@ -54,19 +56,19 @@
         <div class="nav-collapse collapse">
           <ul class="nav">
 
-            <li><a class='nav-start' href="/start">Start Page</a></li>
+            <li><a href="/start">Start Page</a></li>
 
             {{#if isInRole 'admin,view-secrets'}}
-            <li><a class='nav-secrets' href="/secrets">Secrets</a></li>
+            <li><a href="/secrets">Secrets</a></li>
             {{/if}}
 
             <li class="dropdown pull-right">
-              <a href="#account" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
               <ul class="dropdown-menu">
                 {{#if isInRole 'admin,manage-users'}}
-                <li><a class='nav-manage' href="/manage">Manage Users</a></li>
+                <li><a href="/manage">Manage Users</a></li>
                 {{/if}}
-                <li><a class="signout" href="#signout">Sign out</a></li>
+                <li><a class="signout" href="/signout">Sign out</a></li>
               </ul>
             </li>
 
@@ -90,7 +92,7 @@
       <p class="note">All logged-in users will see this page in their header nav.</p>
 
       <h2>Start Page</h2>
-      
+
       {{> noteOfTheDay}}
 
       <div>
diff --git a/example-app/polyfills.js b/example-app/polyfills.js
new file mode 100644
index 0000000000..ad286f3645
--- /dev/null
+++ b/example-app/polyfills.js
@@ -0,0 +1,11 @@
+;(function () {
+
+  "use strict";
+
+  if(typeof String.prototype.trim !== 'function') {
+    String.prototype.trim = function() {
+      return this.replace(/^\s+|\s+$/g, ''); 
+    }
+  }
+
+}());
diff --git a/example-app/server/server.js b/example-app/server/server.js
index 14fdcfdb02..34fd355f83 100644
--- a/example-app/server/server.js
+++ b/example-app/server/server.js
@@ -9,7 +9,11 @@
 
 if (!console || !console.log) {
   // stub for IE
-  console = { log: function () {} };
+  console = { 
+    log: function (msg) {
+      $('#log').append(msg)
+    } 
+  };
 }
 
 

From 8753095e3c17c9c55961a8c549f40b16edd9b43c Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 22 Feb 2013 18:51:58 -0500
Subject: [PATCH 0039/1140] make compatible with Meteor 0.5.7 publish api

---
 example-app/smart.lock | 11 +++--------
 roles/roles_server.js  |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/example-app/smart.lock b/example-app/smart.lock
index 4b9a1e5b18..3140452f3a 100644
--- a/example-app/smart.lock
+++ b/example-app/smart.lock
@@ -2,7 +2,7 @@
   "meteor": {
     "git": "https://github.com/meteor/meteor.git",
     "branch": "master",
-    "commit": "4d98d8cb4e5a95e9e98953f44c872c9332a042a3"
+    "commit": "2d8b41a87cec884489ead138b5dfea31487363f3"
   },
   "dependencies": {
     "basePackages": {
@@ -21,17 +21,12 @@
       "router": {
         "git": "https://github.com/tmeasday/meteor-router.git",
         "branch": "ie-support",
-        "commit": "aeadbafea4746c53cd2e9a8ab242f528e6ad0d0d"
+        "commit": "50a5b5457b513879ea05f8c337aa437d6ad8e753"
       },
       "page-js": {
         "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",
         "branch": "master",
-        "commit": "10946edeefb8b40c351bd5ce6c3a18665a05c623"
-      },
-      "HTML5-History-API": {
-        "git": "https://github.com/tmeasday/meteor-HTML5-History-API.git",
-        "branch": "master",
-        "commit": "0d250d8f8852ba2042f1b8ed39693e9cc89b8f58"
+        "commit": "5031de09f0cee401f4caffbfc4a9c9ed6f86fb46"
       }
     }
   }
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 4f05c35dd9..7f1264216d 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -17,7 +17,6 @@ Meteor.publish('_roles_own_user_roles', function () {
       fields = {roles:1}
 
   if (!userId) {
-    this.complete()
     return
   }
 

From f1047cf367c63ba7d4c91fb74782ff669f5b1623 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 22 Feb 2013 19:09:16 -0500
Subject: [PATCH 0040/1140] make compatible with Meteor 0.5.7 publish api

---
 example-app/server/server.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/example-app/server/server.js b/example-app/server/server.js
index 34fd355f83..8899184b69 100644
--- a/example-app/server/server.js
+++ b/example-app/server/server.js
@@ -94,10 +94,9 @@ Meteor.publish("secrets", function () {
 
   if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
     return Meteor.secrets.find();
-  } else {
-    this.complete();
-    return;
   }
+
+  return;
 });
 
 // Authorized users can manage user accounts
@@ -106,10 +105,9 @@ Meteor.publish("users", function () {
 
   if (Roles.userIsInRole(user, ["admin","manage-users"])) {
     return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
-  } else {
-    this.complete();
-    return;
-  }
+  } 
+
+  return;
 });
 
 }());

From 897068c6bf70b9bbeffabfd88df024ff4d5f496e Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 22 Feb 2013 19:09:33 -0500
Subject: [PATCH 0041/1140] bump version number

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index 34dfc3ceef..fbc615f7aa 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From 957a0881e6b08bfddfcfe649aa220b37db6218a6 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Wed, 6 Mar 2013 13:53:52 -0500
Subject: [PATCH 0042/1140] remove this.complete() call from publish snippet

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 826d6afb81..437a4d512a 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,6 @@ Meteor.publish('secrets', function () {
   } else {
     
     // user not authorized. do not publish secrets
-    this.complete();
     return;
   
   }

From 9a366f7fba1d86fe8020efdf43824d8368c5954d Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 13 Mar 2013 11:20:33 -0400
Subject: [PATCH 0043/1140] point back to regular meteor-router now that
 ie-support merged in

---
 example-app/smart.json |  5 +----
 example-app/smart.lock | 15 ++++++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/example-app/smart.json b/example-app/smart.json
index 252347c144..c32544aca9 100644
--- a/example-app/smart.json
+++ b/example-app/smart.json
@@ -7,9 +7,6 @@
     "roles": {
       "path": "../roles"
     },
-    "router": {
-      "git": "https://github.com/tmeasday/meteor-router.git",
-      "branch": "ie-support"
-    }
+    "router": {}
   }
 }
diff --git a/example-app/smart.lock b/example-app/smart.lock
index 3140452f3a..9655bd1f86 100644
--- a/example-app/smart.lock
+++ b/example-app/smart.lock
@@ -9,10 +9,7 @@
       "roles": {
         "path": "../roles"
       },
-      "router": {
-        "git": "https://github.com/tmeasday/meteor-router.git",
-        "branch": "ie-support"
-      }
+      "router": {}
     },
     "packages": {
       "roles": {
@@ -20,13 +17,13 @@
       },
       "router": {
         "git": "https://github.com/tmeasday/meteor-router.git",
-        "branch": "ie-support",
-        "commit": "50a5b5457b513879ea05f8c337aa437d6ad8e753"
+        "tag": "v0.4.2",
+        "commit": "82d2895847502b4025370523dba60d597cff4772"
       },
-      "page-js": {
+      "page-js-ie-support": {
         "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",
-        "branch": "master",
-        "commit": "5031de09f0cee401f4caffbfc4a9c9ed6f86fb46"
+        "tag": "v1.3.5",
+        "commit": "b99ed8380aefd10b2afc8f18d9eed4dd0d8ea9cb"
       }
     }
   }

From 7eba306bf3f20331c12d31dfc1e7c6137de14c5b Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 15 Mar 2013 17:23:29 -0400
Subject: [PATCH 0044/1140] Fix conflict with spiderable package

---
 example-app/.meteor/packages | 1 +
 example-app/server/server.js | 2 ++
 roles/roles_server.js        | 1 +
 3 files changed, 4 insertions(+)

diff --git a/example-app/.meteor/packages b/example-app/.meteor/packages
index 430d2fedaa..8af4c51a11 100644
--- a/example-app/.meteor/packages
+++ b/example-app/.meteor/packages
@@ -9,3 +9,4 @@ accounts-password
 accounts-ui
 bootstrap
 roles
+spiderable
diff --git a/example-app/server/server.js b/example-app/server/server.js
index 8899184b69..b781cb2ae3 100644
--- a/example-app/server/server.js
+++ b/example-app/server/server.js
@@ -96,6 +96,7 @@ Meteor.publish("secrets", function () {
     return Meteor.secrets.find();
   }
 
+  this.stop();
   return;
 });
 
@@ -107,6 +108,7 @@ Meteor.publish("users", function () {
     return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
   } 
 
+  this.stop();
   return;
 });
 
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 7f1264216d..5c39272f66 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -17,6 +17,7 @@ Meteor.publish('_roles_own_user_roles', function () {
       fields = {roles:1}
 
   if (!userId) {
+    this.stop()
     return
   }
 

From 1de73e6e43e3205472172ef24a3a01cf72482d38 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 15 Mar 2013 17:25:11 -0400
Subject: [PATCH 0045/1140] Bump version number

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index fbc615f7aa..40eafa14fd 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From e758f082f42f361e5efb56677f4ddd0ce6e80487 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Fri, 15 Mar 2013 19:04:52 -0300
Subject: [PATCH 0046/1140] add this.stop() to publish snippet

This allows the spiderable package to work as it is no longer waiting forever for the subscription to be 'ready'.

More details here:
https://github.com/alanning/meteor-roles/issues/3
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 437a4d512a..9400246fd5 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,7 @@ Meteor.publish('secrets', function () {
   } else {
     
     // user not authorized. do not publish secrets
+    this.stop();
     return;
   
   }

From 22deeecc57d68fc8c0a3342a6dfebc93d1548f39 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 19 Mar 2013 20:49:37 -0400
Subject: [PATCH 0047/1140] remove need for client subscribe by using 'null'
 publish

---
 roles/roles_client.js |  2 --
 roles/roles_server.js | 12 ++++++------
 roles/smart.json      |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index 35185d02ec..7f9a6f0b9b 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -1,7 +1,5 @@
 ;(function () {
 
-Meteor.subscribe('_roles_own_user_roles')
-
 /**
  * Convenience functions for use on client.
  *
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 5c39272f66..dc9c37beae 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -12,15 +12,15 @@ if (!Meteor.roles) {
   Meteor.roles._ensureIndex('name', {unique: 1})
 }
 
-Meteor.publish('_roles_own_user_roles', function () {
+
+/**
+ * Always publish logged-in user's roles so client-side
+ * checks can work.
+ */
+Meteor.publish(null, function () {
   var userId = this.userId,
       fields = {roles:1}
 
-  if (!userId) {
-    this.stop()
-    return
-  }
-
   return Meteor.users.find({_id:userId}, {fields: fields})
 })
 
diff --git a/roles/smart.json b/roles/smart.json
index 40eafa14fd..8060c9ce64 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From c83e673e9f47e943c5465b6ffbad4f6b0bfea6e8 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Tue, 19 Mar 2013 21:55:55 -0300
Subject: [PATCH 0048/1140] remove need for client subscribe by using 'null'
 publish

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9400246fd5..9755f2e4dc 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,7 @@ Run locally:
 
   1. User entries in the ```Meteor.users``` collection gain a new field named ```roles``` which is an array of strings corresponding to the user's roles.
   2. A new collection ```Meteor.roles``` contains a global list of defined role names.
-  3. The currently logged-in user's ```roles``` field is automatically published under ```_roles_own_user_roles```.
-  4. Client javascript automatically subscribes to ```_roles_own_user_roles```.
+  3. The currently logged-in user's ```roles``` field is automatically published to the client.
 
 <br />
 

From de32c342c41b578809f0f2f40923ca6c2e0219c7 Mon Sep 17 00:00:00 2001
From: Matt Crider <mattcrider@gmail.com>
Date: Sun, 7 Apr 2013 14:03:16 -1000
Subject: [PATCH 0049/1140] Fix for Issue #5: Error adding role for single user

---
 roles/roles_common.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 20e639953f..97e976054c 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -129,11 +129,13 @@ Roles.addUsersToRoles = function (users, roles) {
   })
 
   // update all users, adding to roles set
-  Meteor.users.update(
-    {       _id: { $in: users } },
-    { $addToSet: { roles: { $each: roles } } },
-    {     multi: true }
-  )
+  _.each(users, function (user) {
+    Meteor.users.update(
+      {       _id: user },
+      { $addToSet: { roles: { $each: roles } } },
+      {     multi: true }
+    )
+  })
 }
 
 /**
@@ -152,11 +154,13 @@ Roles.removeUsersFromRoles = function (users, roles) {
   if (!_.isArray(roles)) roles = [roles]
 
   // update all users, remove from roles set
-  Meteor.users.update(
-    {      _id: {   $in: users } },
-    { $pullAll: { roles: roles } },
-    {    multi: true}
-  )
+  _.each(users, function (user) {
+    Meteor.users.update(
+      {       _id: user },
+      { $addToSet: { roles: { $each: roles } } },
+      {     multi: true }
+    )
+  })
 }
 
 /**

From 29e77740a1f969592fe5ac1511a5f0fadf35a780 Mon Sep 17 00:00:00 2001
From: Matt Crider <mattcrider@gmail.com>
Date: Sun, 7 Apr 2013 14:03:45 -1000
Subject: [PATCH 0050/1140] Updated YUIDocs

---
 docs/assets/js/apidocs.js             | 11 +++++++++--
 docs/classes/Roles.html               | 16 +++++++--------
 docs/data.json                        | 25 +++++++++++++++++-------
 docs/files/roles_roles_client.js.html |  6 ++----
 docs/files/roles_roles_common.js.html | 28 +++++++++++++++------------
 docs/files/roles_roles_server.js.html | 16 +++++++--------
 docs/index.html                       |  4 ++--
 docs/modules/Helpers.html             |  6 +++---
 docs/modules/Roles.html               |  4 ++--
 9 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
index aad7e3d1f1..c64bb46326 100644
--- a/docs/assets/js/apidocs.js
+++ b/docs/assets/js/apidocs.js
@@ -247,6 +247,11 @@ pjax.updateTabState = function (src) {
     } else {
         tab = Y.one('#classdocs .api-class-tab.' + defaultTab);
 
+        // When the `defaultTab` node isn't found, `localStorage` is stale.
+        if (!tab && defaultTab !== 'index') {
+            tab = Y.one('#classdocs .api-class-tab.index');
+        }
+
         if (classTabView.get('rendered')) {
             Y.Widget.getByNode(tab).set('selected', 1);
         } else {
@@ -278,7 +283,8 @@ pjax.updateVisibility = function () {
 pjax.handleClasses = function (req, res, next) {
     var status = res.ioResponse.status;
 
-    if (status >= 200 && status < 300) {
+    // Handles success and local filesystem XHRs.
+    if (!status || (status >= 200 && status < 300)) {
         pjax.initClassTabView();
     }
 
@@ -288,7 +294,8 @@ pjax.handleClasses = function (req, res, next) {
 pjax.handleFiles = function (req, res, next) {
     var status = res.ioResponse.status;
 
-    if (status >= 200 && status < 300) {
+    // Handles success and local filesystem XHRs.
+    if (!status || (status >= 200 && status < 300)) {
         pjax.initLineNumbers();
     }
 
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 323f0f4966..378132b073 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>Roles - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
     <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -619,7 +619,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l218"><code>roles&#x2F;roles_common.js:218</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l222"><code>roles&#x2F;roles_common.js:222</code></a>
         
         </p>
 
@@ -700,7 +700,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l202"><code>roles&#x2F;roles_common.js:202</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l206"><code>roles&#x2F;roles_common.js:206</code></a>
         
         </p>
 
@@ -804,7 +804,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l228"><code>roles&#x2F;roles_common.js:228</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l232"><code>roles&#x2F;roles_common.js:232</code></a>
         
         </p>
 
@@ -910,7 +910,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_client.js.html#l25"><code>roles&#x2F;roles_client.js:25</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_client.js.html#l23"><code>roles&#x2F;roles_client.js:23</code></a>
         
         </p>
 
@@ -1017,7 +1017,7 @@ of the target roles.  For use in client-side templates.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l139"><code>roles&#x2F;roles_common.js:139</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l141"><code>roles&#x2F;roles_common.js:141</code></a>
         
         </p>
 
@@ -1129,7 +1129,7 @@ of the target roles.  For use in client-side templates.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l162"><code>roles&#x2F;roles_common.js:162</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l166"><code>roles&#x2F;roles_common.js:166</code></a>
         
         </p>
 
diff --git a/docs/data.json b/docs/data.json
index e787b5bd69..3929fabd1a 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -42,7 +42,7 @@
             "namespaces": {},
             "tag": "module",
             "file": "roles/roles_client.js",
-            "line": 5,
+            "line": 3,
             "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
         },
         "Roles": {
@@ -79,7 +79,7 @@
     "classitems": [
         {
             "file": "roles/roles_client.js",
-            "line": 25,
+            "line": 23,
             "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
             "itemtype": "method",
             "name": "isInRole",
@@ -163,7 +163,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 139,
+            "line": 141,
             "description": "Remove users from roles",
             "itemtype": "method",
             "name": "removeUsersFromRoles",
@@ -184,7 +184,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 162,
+            "line": 166,
             "description": "Check if user is in role",
             "itemtype": "method",
             "name": "userIsInRole",
@@ -209,7 +209,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 202,
+            "line": 206,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -229,7 +229,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 218,
+            "line": 222,
             "description": "Retrieve all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -242,7 +242,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 228,
+            "line": 232,
             "description": "Retrieve all users who are in target role",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -266,6 +266,13 @@
             "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
             "class": "",
             "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 16,
+            "description": "Always publish logged-in user's roles so client-side\nchecks can work.",
+            "class": "",
+            "module": "Roles"
         }
     ],
     "warnings": [
@@ -276,6 +283,10 @@
         {
             "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
             "line": " roles/roles_server.js:4"
+        },
+        {
+            "message": "Missing item type\nAlways publish logged-in user's roles so client-side\nchecks can work.",
+            "line": " roles/roles_server.js:16"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index 1541e9a3f1..a0751ff849 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>roles&#x2F;roles_client.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
     <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -92,8 +92,6 @@
     <pre class="code prettyprint linenums">
 ;(function () {
 
-Meteor.subscribe(&#x27;_roles_own_user_roles&#x27;)
-
 &#x2F;**
  * Convenience functions for use on client.
  *
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index c179b4c86b..f9b49a03a1 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>roles&#x2F;roles_common.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
     <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -221,11 +221,13 @@ Roles.addUsersToRoles = function (users, roles) {
   })
 
   &#x2F;&#x2F; update all users, adding to roles set
-  Meteor.users.update(
-    {       _id: { $in: users } },
-    { $addToSet: { roles: { $each: roles } } },
-    {     multi: true }
-  )
+  _.each(users, function (user) {
+    Meteor.users.update(
+      {       _id: user },
+      { $addToSet: { roles: { $each: roles } } },
+      {     multi: true }
+    )
+  })
 }
 
 &#x2F;**
@@ -244,11 +246,13 @@ Roles.removeUsersFromRoles = function (users, roles) {
   if (!_.isArray(roles)) roles = [roles]
 
   &#x2F;&#x2F; update all users, remove from roles set
-  Meteor.users.update(
-    {      _id: {   $in: users } },
-    { $pullAll: { roles: roles } },
-    {    multi: true}
-  )
+  _.each(users, function (user) {
+    Meteor.users.update(
+      {       _id: user },
+      { $addToSet: { roles: { $each: roles } } },
+      {     multi: true }
+    )
+  })
 }
 
 &#x2F;**
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index ca7d4e16b3..43a5bb7c79 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>roles&#x2F;roles_server.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
     <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -104,15 +104,15 @@ if (!Meteor.roles) {
   Meteor.roles._ensureIndex(&#x27;name&#x27;, {unique: 1})
 }
 
-Meteor.publish(&#x27;_roles_own_user_roles&#x27;, function () {
+
+&#x2F;**
+ * Always publish logged-in user&#x27;s roles so client-side
+ * checks can work.
+ *&#x2F;
+Meteor.publish(null, function () {
   var userId = this.userId,
       fields = {roles:1}
 
-  if (!userId) {
-    this.complete()
-    return
-  }
-
   return Meteor.users.find({_id:userId}, {fields: fields})
 })
 
diff --git a/docs/index.html b/docs/index.html
index 38cfc7b42c..f81c35a4cc 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
     <link rel="stylesheet" href=".&#x2F;assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href=".&#x2F;assets/css/main.css" id="site_styles">
     <link rel="shortcut icon" type="image/png" href=".&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
diff --git a/docs/modules/Helpers.html b/docs/modules/Helpers.html
index be47360d22..29b6813113 100644
--- a/docs/modules/Helpers.html
+++ b/docs/modules/Helpers.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>Helpers - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
     <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -94,7 +94,7 @@
 
     
         <div class="foundat">
-            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_client.js.html#l5"><code>roles&#x2F;roles_client.js:5</code></a>
+            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_client.js.html#l3"><code>roles&#x2F;roles_client.js:3</code></a>
         </div>
     
 
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 6c40328b57..2968ed3e42 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>Roles - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.7.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
+    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
     <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.7.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 

From e176ab140af48cca17ae2370cd0bbec55624c1c3 Mon Sep 17 00:00:00 2001
From: Matt Crider <mattcrider@gmail.com>
Date: Sun, 7 Apr 2013 14:55:26 -1000
Subject: [PATCH 0051/1140] Use MongoDB's $in operator on the server side for
 performance reasons

---
 roles/roles_common.js | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 97e976054c..2910aae83d 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -129,13 +129,23 @@ Roles.addUsersToRoles = function (users, roles) {
   })
 
   // update all users, adding to roles set
-  _.each(users, function (user) {
+  if (Meteor.isClient) {
+    _.each(users, function (user) {
+      // Iterate over each user to fulfill Meteor's 'one update per ID' policy
+      Meteor.users.update(
+        {       _id: user },
+        { $addToSet: { roles: { $each: roles } } },
+        {     multi: true }
+      )
+    })
+  } else {
+    // On the server we can leverage MongoDB's $in operator for performance
     Meteor.users.update(
-      {       _id: user },
+      {       _id: { $in: users } },
       { $addToSet: { roles: { $each: roles } } },
       {     multi: true }
     )
-  })
+  }
 }
 
 /**
@@ -154,13 +164,23 @@ Roles.removeUsersFromRoles = function (users, roles) {
   if (!_.isArray(roles)) roles = [roles]
 
   // update all users, remove from roles set
-  _.each(users, function (user) {
+  if (Meteor.isClient) {
+    // Iterate over each user to fulfill Meteor's 'one update per ID' policy
+    _.each(users, function (user) {
+      Meteor.users.update(
+        {      _id: user },
+        { $pullAll: { roles: roles } },
+        {    multi: true}
+      )
+    })
+  } else {
+    // On the server we can leverage MongoDB's $in operator for performance
     Meteor.users.update(
-      {       _id: user },
-      { $addToSet: { roles: { $each: roles } } },
-      {     multi: true }
+      {      _id: {   $in: users } },
+      { $pullAll: { roles: roles } },
+      {    multi: true}
     )
-  })
+  }
 }
 
 /**

From b33c19c7dc214d1c1576a4501d8c1b344b4a1a4c Mon Sep 17 00:00:00 2001
From: Matt Crider <mattcrider@gmail.com>
Date: Sun, 7 Apr 2013 14:55:43 -1000
Subject: [PATCH 0052/1140] Updated YUIDocs

---
 docs/classes/Roles.html               | 10 ++++----
 docs/data.json                        | 10 ++++----
 docs/files/roles_roles_common.js.html | 36 +++++++++++++++++++++------
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 378132b073..71ea434046 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -619,7 +619,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l222"><code>roles&#x2F;roles_common.js:222</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l242"><code>roles&#x2F;roles_common.js:242</code></a>
         
         </p>
 
@@ -700,7 +700,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l206"><code>roles&#x2F;roles_common.js:206</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l226"><code>roles&#x2F;roles_common.js:226</code></a>
         
         </p>
 
@@ -804,7 +804,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l232"><code>roles&#x2F;roles_common.js:232</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l252"><code>roles&#x2F;roles_common.js:252</code></a>
         
         </p>
 
@@ -1017,7 +1017,7 @@ of the target roles.  For use in client-side templates.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l141"><code>roles&#x2F;roles_common.js:141</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l151"><code>roles&#x2F;roles_common.js:151</code></a>
         
         </p>
 
@@ -1129,7 +1129,7 @@ of the target roles.  For use in client-side templates.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l166"><code>roles&#x2F;roles_common.js:166</code></a>
+        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l186"><code>roles&#x2F;roles_common.js:186</code></a>
         
         </p>
 
diff --git a/docs/data.json b/docs/data.json
index 3929fabd1a..594d804237 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -163,7 +163,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 141,
+            "line": 151,
             "description": "Remove users from roles",
             "itemtype": "method",
             "name": "removeUsersFromRoles",
@@ -184,7 +184,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 166,
+            "line": 186,
             "description": "Check if user is in role",
             "itemtype": "method",
             "name": "userIsInRole",
@@ -209,7 +209,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 206,
+            "line": 226,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -229,7 +229,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 222,
+            "line": 242,
             "description": "Retrieve all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -242,7 +242,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 232,
+            "line": 252,
             "description": "Retrieve all users who are in target role",
             "itemtype": "method",
             "name": "getUsersInRole",
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index f9b49a03a1..381a4ab3e4 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -221,13 +221,23 @@ Roles.addUsersToRoles = function (users, roles) {
   })
 
   &#x2F;&#x2F; update all users, adding to roles set
-  _.each(users, function (user) {
+  if (Meteor.isClient) {
+    _.each(users, function (user) {
+      &#x2F;&#x2F; Iterate over each user to fulfill Meteor&#x27;s &#x27;one update per ID&#x27; policy
+      Meteor.users.update(
+        {       _id: user },
+        { $addToSet: { roles: { $each: roles } } },
+        {     multi: true }
+      )
+    })
+  } else {
+    &#x2F;&#x2F; On the server we can leverage MongoDB&#x27;s $in operator for performance
     Meteor.users.update(
-      {       _id: user },
+      {       _id: { $in: users } },
       { $addToSet: { roles: { $each: roles } } },
       {     multi: true }
     )
-  })
+  }
 }
 
 &#x2F;**
@@ -246,13 +256,23 @@ Roles.removeUsersFromRoles = function (users, roles) {
   if (!_.isArray(roles)) roles = [roles]
 
   &#x2F;&#x2F; update all users, remove from roles set
-  _.each(users, function (user) {
+  if (Meteor.isClient) {
+    &#x2F;&#x2F; Iterate over each user to fulfill Meteor&#x27;s &#x27;one update per ID&#x27; policy
+    _.each(users, function (user) {
+      Meteor.users.update(
+        {      _id: user },
+        { $pullAll: { roles: roles } },
+        {    multi: true}
+      )
+    })
+  } else {
+    &#x2F;&#x2F; On the server we can leverage MongoDB&#x27;s $in operator for performance
     Meteor.users.update(
-      {       _id: user },
-      { $addToSet: { roles: { $each: roles } } },
-      {     multi: true }
+      {      _id: {   $in: users } },
+      { $pullAll: { roles: roles } },
+      {    multi: true}
     )
-  })
+  }
 }
 
 &#x2F;**

From ff97f80f8e1bf381efa58ff3ef72f1bd5b9c812d Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 7 Apr 2013 23:22:57 -0400
Subject: [PATCH 0053/1140] get tests working under meteor 0.6.0

---
 README.md                |  14 +-
 roles/.meteor/.gitignore |   2 -
 roles/package.js         |  14 +-
 roles/smart.lock         |   6 +-
 roles/tests/client.js    |  29 +--
 roles/tests/server.js    | 441 +++++++++++++++++++++------------------
 6 files changed, 273 insertions(+), 233 deletions(-)
 delete mode 100644 roles/.meteor/.gitignore

diff --git a/README.md b/README.md
index 9755f2e4dc..c806ca985d 100644
--- a/README.md
+++ b/README.md
@@ -159,12 +159,16 @@ To serve documentation locally:
 
 
 To run tests: 
-  1. install [Meteorite][1]
-  2. ```cd meteor-roles/roles```
-  3. ```mrt```
-  4. point browser at http://localhost:3000/
+  1. ```cd meteor-roles```
+  2. ```meteor test-packages ./roles```
+  3. point browser at http://localhost:3000/
+
+_NOTE_: If you see an error message regarding **"The package named roles does not exist"** that means you are either:
+  a) in the wrong directory or 
+  b) left off the './' in front of 'roles' in step 2.  
+  
+Step 2 needs to be run in the main 'meteor-roles' directory and the './' is needed because otherwise Meteor only looks in directories named 'packages'.
 
-_NOTE_: If you see an error message regarding **'roles package does not exist'** that means you are trying to run 'mrt' in the wrong directory.  See step 2.
 
 
 
diff --git a/roles/.meteor/.gitignore b/roles/.meteor/.gitignore
deleted file mode 100644
index 08150d000c..0000000000
--- a/roles/.meteor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-local
-meteorite
diff --git a/roles/package.js b/roles/package.js
index 8d5ebe0cae..48d1f2cfd5 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -2,21 +2,19 @@ Package.describe({
   summary: "Role-based authorization"
 });
 
-Package.on_use(function (api, where) {
-  where = where || ['client', 'server'];
-  api.use(['underscore', 'accounts-base'], where);
+Package.on_use(function (api) {
+  var both = ['client', 'server'];
+  api.use(['underscore', 'accounts-base'], both);
+
   api.add_files('roles_server.js', 'server');
-  api.add_files('roles_common.js', where);
+  api.add_files('roles_common.js', both);
   api.add_files('roles_client.js', 'client');
 });
 
 Package.on_test(function (api) {
   // include accounts-password so Meteor.users exists
-  api.use('accounts-password', 'server');
+  api.use(['roles','accounts-password','tinytest'], 'server');
 
-  api.use('tinytest', 'server');
   api.add_files('tests/server.js', 'server');
-
-  api.use(['accounts-base', 'tinytest'], 'client');
   api.add_files('tests/client.js', 'client');
 });
diff --git a/roles/smart.lock b/roles/smart.lock
index 2385c175c3..f9937203f0 100644
--- a/roles/smart.lock
+++ b/roles/smart.lock
@@ -2,17 +2,17 @@
   "meteor": {
     "git": "https://github.com/meteor/meteor.git",
     "branch": "master",
-    "commit": "4d98d8cb4e5a95e9e98953f44c872c9332a042a3"
+    "commit": "cab491f3650fffc85661bca6b3cecf583410e05d"
   },
   "dependencies": {
     "basePackages": {
       "roles": {
-        "path": "."
+        "path": ""
       }
     },
     "packages": {
       "roles": {
-        "path": "."
+        "path": ""
       }
     }
   }
diff --git a/roles/tests/client.js b/roles/tests/client.js
index f3b5561292..cafadd26ab 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -11,22 +11,23 @@
   }
 
 
-  Tinytest.add('can check current users roles via template helper', function (test) {
-    var isInRole = Roles._handlebarsHelpers.isInRole,
-        expected,
-        actual
+  Tinytest.add(
+    'roles - can check current users roles via template helper', 
+    function (test) {
+      var isInRole = Roles._handlebarsHelpers.isInRole,
+          expected,
+          actual
 
-    test.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
+      test.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
 
-    expected = true
-    actual = isInRole('admin, manage-users')
-    test.equal(actual, expected)
-    
-    expected = false
-    actual = isInRole('admin')
-    test.equal(actual, expected)
-    
-  })
+      expected = true
+      actual = isInRole('admin, manage-users')
+      test.equal(actual, expected)
+      
+      expected = false
+      actual = isInRole('admin')
+      test.equal(actual, expected)
+    })
 
 
 }());
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 5527a29b61..d7f669ebeb 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -36,275 +36,314 @@
     })
   }
 
-  Tinytest.add('can create and delete roles', function (test) {
-    reset()
+  Tinytest.add(
+    'roles - can create and delete roles', 
+    function (test) {
+      reset()
 
-    Roles.createRole('test1')
-    test.equal(Meteor.roles.findOne().name, 'test1')
+      Roles.createRole('test1')
+      test.equal(Meteor.roles.findOne().name, 'test1')
 
-    Roles.createRole('test2')
-    test.equal(Meteor.roles.findOne({'name':'test2'}).name, 'test2')
+      Roles.createRole('test2')
+      test.equal(Meteor.roles.findOne({'name':'test2'}).name, 'test2')
 
-    test.equal(Meteor.roles.find().count(), 2)
+      test.equal(Meteor.roles.find().count(), 2)
 
-    Roles.deleteRole('test1')
-    test.equal(typeof Meteor.roles.findOne({'name':'test1'}), 'undefined')
+      Roles.deleteRole('test1')
+      test.equal(typeof Meteor.roles.findOne({'name':'test1'}), 'undefined')
 
-    Roles.deleteRole('test2')
-    test.equal(typeof Meteor.roles.findOne(), 'undefined')
-  })
-
-  Tinytest.add('can\'t create duplicate roles', function (test) {
-    reset()
-
-    Roles.createRole('test1')
-    test.throws(function () {Roles.createRole('test1')})
-  })
-
-  Tinytest.add('can check if user is in role', function (test) {
-    reset()
-
-    Meteor.users.update(
-      {"_id":users.eve}, 
-      {$addToSet: { roles: { $each: ['admin', 'user'] } } }
-    )
-    testUser(test, 'eve', ['admin', 'user'])
-  })
-
-  Tinytest.add('can check if non-existant user is in role', function (test) {
-    reset()
-
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Roles.deleteRole('test2')
+      test.equal(typeof Meteor.roles.findOne(), 'undefined')
     })
 
-    test.isFalse(Roles.userIsInRole('1', 'admin'))
-  })
+  Tinytest.add(
+    'roles - can\'t create duplicate roles', 
+    function (test) {
+      reset()
 
-  Tinytest.add('can check user in role via object', function (test) {
-    var user 
-
-    reset()
-
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Roles.createRole('test1')
+      test.throws(function () {Roles.createRole('test1')})
     })
 
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    user = Meteor.users.findOne({_id:users.eve})
+  Tinytest.add(
+    'roles - can check if user is in role', 
+    function (test) {
+      reset()
 
-    test.isTrue(Roles.userIsInRole(user, 'admin'))
-  })
-
-  Tinytest.add('userIsInRole returns false when user is null', function (test) {
-    var user 
-
-    reset()
-
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Meteor.users.update(
+        {"_id":users.eve}, 
+        {$addToSet: { roles: { $each: ['admin', 'user'] } } }
+      )
+      testUser(test, 'eve', ['admin', 'user'])
     })
 
-    user = null
+  Tinytest.add(
+    'roles - can check if non-existant user is in role', 
+    function (test) {
+      reset()
 
-    test.isFalse(Roles.userIsInRole(user, 'admin'))
-  })
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-  Tinytest.add('can check user against several roles at once', function (test) {
-    var user 
-
-    reset()
-
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      test.isFalse(Roles.userIsInRole('1', 'admin'))
     })
 
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    user = Meteor.users.findOne({_id:users.eve})
+  Tinytest.add(
+    'roles - can check user in role via object', 
+    function (test) {
+      var user 
 
-    test.isTrue(Roles.userIsInRole(user, ['editor','admin']))
-  })
+      reset()
 
-  Tinytest.add('can add individual users to roles', function (test) {
-    reset() 
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      user = Meteor.users.findOne({_id:users.eve})
+
+      test.isTrue(Roles.userIsInRole(user, 'admin'))
     })
 
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+  Tinytest.add(
+    'roles - userIsInRole returns false when user is null', 
+    function (test) {
+      var user 
 
-    testUser(test, 'eve', ['admin', 'user'])
-    testUser(test, 'bob', [])
-    testUser(test, 'joe', [])
+      reset()
 
-    Roles.addUsersToRoles(users.joe, ['editor', 'user'])
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-    testUser(test, 'eve', ['admin', 'user'])
-    testUser(test, 'bob', [])
-    testUser(test, 'joe', ['editor', 'user'])
-  })
-  Tinytest.add('can add user to roles multiple times', function (test) {
-    reset() 
+      user = null
 
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      test.isFalse(Roles.userIsInRole(user, 'admin'))
     })
 
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+  Tinytest.add(
+    'roles - can check user against several roles at once', 
+    function (test) {
+      var user 
 
-    testUser(test, 'eve', ['admin', 'user'])
-    testUser(test, 'bob', [])
-    testUser(test, 'joe', [])
-  })
+      reset()
 
-  Tinytest.add('can add multiple users to roles', function (test) {
-    reset() 
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      user = Meteor.users.findOne({_id:users.eve})
+
+      test.isTrue(Roles.userIsInRole(user, ['editor','admin']))
     })
 
-    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
+  Tinytest.add(
+    'roles - can add individual users to roles', 
+    function (test) {
+      reset() 
 
-    testUser(test, 'eve', ['admin', 'user'])
-    testUser(test, 'bob', ['admin', 'user'])
-    testUser(test, 'joe', [])
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
 
-    testUser(test, 'eve', ['admin', 'user'])
-    testUser(test, 'bob', ['admin', 'editor', 'user'])
-    testUser(test, 'joe', ['editor', 'user'])
-  })
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
 
-  Tinytest.add('can\'t add non-exist user to role', function (test) {
-    reset()
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'])
 
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', ['editor', 'user'])
     })
 
-    Roles.addUsersToRoles(['1'], ['admin'])
-    test.equal(Meteor.users.findOne({_id:'1'}), undefined)
-  })
+  Tinytest.add(
+    'roles - can add user to roles multiple times', 
+    function (test) {
+      reset() 
 
-  Tinytest.add('can remove individual users from roles', function (test) {
-    reset() 
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
     })
 
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser(test, 'eve', ['editor', 'user'])
-    testUser(test, 'bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser(test, 'eve', ['editor'])
-    testUser(test, 'bob', ['editor', 'user'])
-  })
-  Tinytest.add('can remove user from roles multiple times', function (test) {
-    reset() 
+  Tinytest.add(
+    'roles - can add multiple users to roles', 
+    function (test) {
+      reset() 
 
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
+
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'user'])
+      testUser(test, 'joe', [])
+
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'editor', 'user'])
+      testUser(test, 'joe', ['editor', 'user'])
     })
 
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser(test, 'eve', ['editor', 'user'])
-    testUser(test, 'bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser(test, 'eve', ['editor'])
-    testUser(test, 'bob', ['editor', 'user'])
+  Tinytest.add(
+    'roles - can\'t add non-exist user to role', 
+    function (test) {
+      reset()
 
-    // try remove again
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser(test, 'eve', ['editor'])
-  })
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-  Tinytest.add('can remove multiple users from roles', function (test) {
-    reset() 
-
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Roles.addUsersToRoles(['1'], ['admin'])
+      test.equal(Meteor.users.findOne({_id:'1'}), undefined)
     })
 
-    // remove user role - two users
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser(test, 'eve', ['editor', 'user'])
-    testUser(test, 'bob', ['editor', 'user'])
+  Tinytest.add(
+    'roles - can remove individual users from roles', 
+    function (test) {
+      reset() 
 
-    test.isFalse(Roles.userIsInRole(users.joe, 'admin'))
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
-    testUser(test, 'bob', ['admin', 'user', 'editor'])
-    testUser(test, 'joe', ['admin', 'user'])
-    Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
-    testUser(test, 'bob', ['user', 'editor'])
-    testUser(test, 'joe', ['user'])
-  })
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-  Tinytest.add('can\'t create role with empty names', function (test) {
-    reset() 
+      // remove user role - one user
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+      testUser(test, 'bob', ['editor', 'user'])
+    })
+  Tinytest.add(
+    'roles - can remove user from roles multiple times',
+    function (test) {
+      reset() 
 
-    Roles.createRole('')
-    Roles.createRole(null)
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-    test.equal(Meteor.roles.find().count(), 0)
+      // remove user role - one user
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+      testUser(test, 'bob', ['editor', 'user'])
 
-    Roles.createRole(' ')
-    test.equal(Meteor.roles.find().count(), 0)
-  })
-
-  Tinytest.add('can get all roles for user', function (test) {
-    reset()
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      // try remove again
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
     })
 
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'])
-    test.equal(Roles.getRolesForUser(users.eve), ['admin', 'user'])
-  })
+  Tinytest.add(
+    'roles - can remove multiple users from roles', 
+    function (test) {
+      reset() 
 
-  Tinytest.add('can\'t get roles for non-existant user', function (test) {
-    reset()
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
+
+      // remove user role - two users
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin'))
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'user', 'editor'])
+      testUser(test, 'joe', ['admin', 'user'])
+      Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
+      testUser(test, 'bob', ['user', 'editor'])
+      testUser(test, 'joe', ['user'])
     })
 
-    test.equal(Roles.getRolesForUser('1'), undefined)
-  })
+  Tinytest.add(
+    'roles - can\'t create role with empty names', 
+    function (test) {
+      reset() 
 
-  Tinytest.add('can get all roles', function (test) {
-    reset()
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Roles.createRole('')
+      Roles.createRole(null)
+
+      test.equal(Meteor.roles.find().count(), 0)
+
+      Roles.createRole(' ')
+      test.equal(Meteor.roles.find().count(), 0)
     })
 
-    // compare roles, sorted alphabetically
-    var expected = roles,
-        actual = _.pluck(Roles.getAllRoles().fetch(), 'name')
+  Tinytest.add(
+    'roles - can get all roles for user', 
+    function (test) {
+      reset()
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-    test.equal(actual, expected)
-  })
-
-
-  Tinytest.add('can get all users in role', function (test) {
-    reset()
-    _.each(roles, function (role) {
-      Roles.createRole(role)
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'])
+      test.equal(Roles.getRolesForUser(users.eve), ['admin', 'user'])
     })
 
-    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
+  Tinytest.add(
+    'roles - can\'t get roles for non-existant user', 
+    function (test) {
+      reset()
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
 
-    var expected = [users.eve, users.joe],
-        actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
+      test.equal(Roles.getRolesForUser('1'), undefined)
+    })
 
-    // order may be different so check difference instead of equality
-    test.equal(_.difference(actual, expected), [])
-  })
+  Tinytest.add(
+    'roles - can get all roles', 
+    function (test) {
+      reset()
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
+
+      // compare roles, sorted alphabetically
+      var expected = roles,
+          actual = _.pluck(Roles.getAllRoles().fetch(), 'name')
+
+      test.equal(actual, expected)
+    })
+
+
+  Tinytest.add(
+    'roles - can get all users in role', 
+    function (test) {
+      reset()
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
+
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
+
+      var expected = [users.eve, users.joe],
+          actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      test.equal(_.difference(actual, expected), [])
+    })
 
 }());

From a6e0ce33f8dc69a816165c458b138c2acb30ad0e Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 7 Apr 2013 23:26:11 -0400
Subject: [PATCH 0054/1140] bump to v1.0.5 - fix for Issue #5 and tests working
 under 0.6.0

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index 8060c9ce64..1983571cd8 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From 1ebb2043d5d0e311ca4252805ca254e259b0aaa2 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Mon, 8 Apr 2013 00:39:51 -0300
Subject: [PATCH 0055/1140] added contributors section

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index c806ca985d..77eebc7b90 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,11 @@ meteor-roles
 
 Roles-based authorization package for Meteor - compatible with built-in accounts package.
 
+<br />
+### Contributors
+
+Thanks to [@mcrider](https://github.com/mcrider)!
+
 <br />
 
 ### Example App

From a4ea56ea4fb1a4286f38724706dcee6912d8fbe4 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 16 Apr 2013 10:16:00 -0400
Subject: [PATCH 0056/1140] re-subscribe on login so permissions are rechecked

---
 example-app/client/client.js | 14 ++++++++++----
 example-app/smart.lock       |  6 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/example-app/client/client.js b/example-app/client/client.js
index 95114b39b8..d2297b11eb 100644
--- a/example-app/client/client.js
+++ b/example-app/client/client.js
@@ -32,11 +32,17 @@ $(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
 // Subscriptions
 //
 
-// secrets
-Meteor.subscribe('secrets');
+Deps.autorun(function () {
+  // register dependency on user so subscriptions
+  // will update once user has logged in
+  var user = Meteor.user();
 
-// users, for manage-users page
-Meteor.subscribe('users');
+  // secrets
+  Meteor.subscribe('secrets');
+
+  // users, for manage-users page
+  Meteor.subscribe('users');
+});
 
 
 
diff --git a/example-app/smart.lock b/example-app/smart.lock
index 9655bd1f86..3989ede973 100644
--- a/example-app/smart.lock
+++ b/example-app/smart.lock
@@ -2,7 +2,7 @@
   "meteor": {
     "git": "https://github.com/meteor/meteor.git",
     "branch": "master",
-    "commit": "2d8b41a87cec884489ead138b5dfea31487363f3"
+    "commit": "cab491f3650fffc85661bca6b3cecf583410e05d"
   },
   "dependencies": {
     "basePackages": {
@@ -17,8 +17,8 @@
       },
       "router": {
         "git": "https://github.com/tmeasday/meteor-router.git",
-        "tag": "v0.4.2",
-        "commit": "82d2895847502b4025370523dba60d597cff4772"
+        "tag": "v0.5.0",
+        "commit": "b1ee74c816d1fc63b713139158075feb8a0c6d26"
       },
       "page-js-ie-support": {
         "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",

From 18f2ea55fbdfbac1212de99e8f095b1aef29444d Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 4 May 2013 18:00:17 -0400
Subject: [PATCH 0057/1140] add version of example app which uses mini-pages

---
 README.md                                     |  13 +-
 .../mini-pages}/.meteor/.gitignore            |   0
 examples/mini-pages/.meteor/packages          |  12 ++
 .../mini-pages}/client/client.js              | 109 +++---------
 .../mini-pages/client/example.css             |   0
 examples/mini-pages/client/example.html       | 163 +++++++++++++++++
 examples/mini-pages/client/lib/globals.js     |   2 +
 examples/mini-pages/client/routing.js         |  64 +++++++
 {example-app => examples/mini-pages}/model.js |   0
 .../mini-pages}/polyfills.js                  |   0
 .../mini-pages}/server/server.js              |   0
 examples/mini-pages/smart.json                |  12 ++
 examples/mini-pages/smart.lock                |  35 ++++
 examples/router/.meteor/.gitignore            |   2 +
 .../router}/.meteor/packages                  |   0
 examples/router/client/client.js              | 166 ++++++++++++++++++
 examples/router/client/example.css            |  67 +++++++
 .../router/client/example.html                |   0
 examples/router/client/lib/globals.js         |   2 +
 examples/router/client/routing.js             |  79 +++++++++
 examples/router/model.js                      |   9 +
 examples/router/polyfills.js                  |  11 ++
 examples/router/server/server.js              | 115 ++++++++++++
 {example-app => examples/router}/smart.json   |   2 +-
 {example-app => examples/router}/smart.lock   |  10 +-
 25 files changed, 779 insertions(+), 94 deletions(-)
 rename {example-app => examples/mini-pages}/.meteor/.gitignore (100%)
 create mode 100644 examples/mini-pages/.meteor/packages
 rename {example-app => examples/mini-pages}/client/client.js (71%)
 rename example-app/client/example-app.css => examples/mini-pages/client/example.css (100%)
 create mode 100644 examples/mini-pages/client/example.html
 create mode 100644 examples/mini-pages/client/lib/globals.js
 create mode 100644 examples/mini-pages/client/routing.js
 rename {example-app => examples/mini-pages}/model.js (100%)
 rename {example-app => examples/mini-pages}/polyfills.js (100%)
 rename {example-app => examples/mini-pages}/server/server.js (100%)
 create mode 100644 examples/mini-pages/smart.json
 create mode 100644 examples/mini-pages/smart.lock
 create mode 100644 examples/router/.meteor/.gitignore
 rename {example-app => examples/router}/.meteor/packages (100%)
 create mode 100644 examples/router/client/client.js
 create mode 100644 examples/router/client/example.css
 rename example-app/client/example-app.html => examples/router/client/example.html (100%)
 create mode 100644 examples/router/client/lib/globals.js
 create mode 100644 examples/router/client/routing.js
 create mode 100644 examples/router/model.js
 create mode 100644 examples/router/polyfills.js
 create mode 100644 examples/router/server/server.js
 rename {example-app => examples/router}/smart.json (84%)
 rename {example-app => examples/router}/smart.lock (72%)

diff --git a/README.md b/README.md
index 77eebc7b90..30cfa3d8f4 100644
--- a/README.md
+++ b/README.md
@@ -10,20 +10,23 @@ Thanks to [@mcrider](https://github.com/mcrider)!
 
 <br />
 
-### Example App
+### Example Apps
 
-The ```example-app``` directory contains a Meteor app which shows off the following features:
+The ```examples``` directory contains Meteor apps which show off the following features:
 * Server-side publishing with authorization to secure sensitive data
 * Client-side navigation with link visibility based on user permissions
 * 'Sign-in required' app with up-front login page using ```accounts-ui```
-* Client-side routing via ```meteor-router``` smart package
+* Client-side routing
 
-View online @  <a href="http://roles-example.meteor.com/" target="_blank">http://roles-example.meteor.com/</a>
+The only difference between the two example apps is the routing packages used: one uses ```meteor-router``` and the other uses ```meteor-mini-pages```.
+
+View the ```meteor-router``` example app online @  <a href="http://roles-example.meteor.com/" target="_blank">http://roles-example.meteor.com/</a>
   
 Run locally:
   1. install [Meteorite][1]
   2. ```git clone https://github.com/alanning/meteor-roles.git```
-  3. ```cd meteor-roles/example-app```
+  3a. ```cd meteor-roles/examples/router``` or
+  3b. ```cd meteor-roles/examples/mini-pages```
   4. ```mrt```
   5. point browser to ```http://localhost:3000```
 
diff --git a/example-app/.meteor/.gitignore b/examples/mini-pages/.meteor/.gitignore
similarity index 100%
rename from example-app/.meteor/.gitignore
rename to examples/mini-pages/.meteor/.gitignore
diff --git a/examples/mini-pages/.meteor/packages b/examples/mini-pages/.meteor/packages
new file mode 100644
index 0000000000..8a604b86b9
--- /dev/null
+++ b/examples/mini-pages/.meteor/packages
@@ -0,0 +1,12 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+preserve-inputs
+accounts-password
+accounts-ui
+bootstrap
+roles
+mini-pages
+spiderable
diff --git a/example-app/client/client.js b/examples/mini-pages/client/client.js
similarity index 71%
rename from example-app/client/client.js
rename to examples/mini-pages/client/client.js
index d2297b11eb..2ecee3cb25 100644
--- a/example-app/client/client.js
+++ b/examples/mini-pages/client/client.js
@@ -3,6 +3,31 @@
   "use strict";
 
 
+////////////////////////////////////////////////////////////////////
+// Routing stub
+//
+// Separate routing package details from general app code.
+Meteor.navigateTo = function (path) {
+  // ...over-ridden in routing.js
+};
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// App.signout
+//
+App.signout = function () {
+  console.log('logging out...');
+  Meteor.logout(function () {
+    console.log('...done');
+    Meteor.navigateTo('/');
+  });
+};
+
+
+
+
 ////////////////////////////////////////////////////////////////////
 // Patches
 //
@@ -17,9 +42,6 @@ if (!window.console.log) {
   };
 }
 
-
-
-
 // fix bootstrap dropdown unclickable issue on iOS
 // https://github.com/twitter/bootstrap/issues/4550
 $(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
@@ -28,6 +50,7 @@ $(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
 
 
 
+
 ////////////////////////////////////////////////////////////////////
 // Subscriptions
 //
@@ -47,77 +70,6 @@ Deps.autorun(function () {
 
 
 
-////////////////////////////////////////////////////////////////////
-// Routing
-//
-
-Meteor.Router.add({
-  '/': function () {
-    var user;
-
-    if (Meteor.loggingIn()) {
-      console.log('home: loading');
-      return 'loading';
-    }
-
-    user = Meteor.user();
-    if (!user) {
-      console.log('home: signin');
-      return 'signin';
-    }
-
-    console.log('home: user found');
-    console.log(user.roles);
-
-    // start on 'start' page
-    console.log('home: start');
-    return 'start';
-  },
-  '/signin': 'signin',
-  '/start': 'start',
-  '/secrets': 'secrets',
-  '/manage': 'manage',
-  '/signout': signout,
-  '*': 'not_found'
-});
-
-Meteor.Router.filters({
-  checkLoggedIn: function (page) {
-    var user;
-
-    if (Meteor.loggingIn()) {
-
-      console.log('filter: loading');
-      return 'loading';
-
-    } else {
-
-      user = Meteor.user();
-
-      if (user) {
-
-        console.log('filter: done');
-        return page;
-
-      } else {
-
-        console.log('filter: signin');
-        return 'signin';
-
-      }
-    }
-  }
-});
-
-// make sure user has logged in for all appropriate routes
-Meteor.Router.filter('checkLoggedIn', {
-  except:['signin','loading','not-found']
-});
-
-
-
-
-
 ////////////////////////////////////////////////////////////////////
 // Templates
 //
@@ -197,15 +149,6 @@ function displayName (user) {
 }
 
 
-function signout () {
-  console.log('logging out...');
-  Meteor.logout(function () {
-    console.log('...done');
-    Meteor.Router.to('/');
-  });
-  
-}
-
 // insta-open/close nav rather than animate collapse.
 // this improves UX on mobile devices
 function openCloseNav (e) {
diff --git a/example-app/client/example-app.css b/examples/mini-pages/client/example.css
similarity index 100%
rename from example-app/client/example-app.css
rename to examples/mini-pages/client/example.css
diff --git a/examples/mini-pages/client/example.html b/examples/mini-pages/client/example.html
new file mode 100644
index 0000000000..27100d0114
--- /dev/null
+++ b/examples/mini-pages/client/example.html
@@ -0,0 +1,163 @@
+<head>
+  <title>example-app</title>
+</head>
+
+<body>
+</body>
+
+<template name="layout">
+  {{> header}}
+
+  {{{yield}}}
+
+  <div id="log"></div>
+</template>
+
+<template name="layout_no_header">
+  {{{yield}}}
+
+  <div id="log"></div>
+</template>
+
+<template name="signin">
+  <div class="signin">
+    <div class="login-form">
+      <h1>Sign In</h1>
+      {{loginButtons}}
+    </div>
+
+    <div class="example-users">
+      <p>Normal User: normal@example.com | apple1</p>
+      <p>View Secrets: view@example.com | apple1</p>
+      <p>Manage Users: manage@example.com | apple1</p>
+      <p>Admin User: admin@example.com | apple1</p>
+    </div>
+  </div>
+</template>
+
+<template name="loading">
+  <h1>Loading...</h1>
+</template>
+
+<template name="awaiting-verification">
+  <h1>Awaiting email verification...</h1>
+</template>
+
+<template name="not_found">
+  <h3>404 - Not found<h3>
+</template>
+
+<template name="invalid-access">
+  <h3>403 Forbidden - Invalid Access<h3>
+</template>
+
+<template name="header">
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container">
+        <a class="btn btn-navbar">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+        <a class="brand" href="/">Roles Example App</a>
+        <div class="nav-collapse collapse">
+          <ul class="nav">
+
+            <li><a href="/start">Start Page</a></li>
+
+            {{#if isInRole 'admin,view-secrets'}}
+            <li><a href="/secrets">Secrets</a></li>
+            {{/if}}
+
+            <li class="dropdown pull-right">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                {{#if isInRole 'admin,manage-users'}}
+                <li><a href="/manage">Manage Users</a></li>
+                {{/if}}
+                <li><a class="signout" href="/signout">Sign out</a></li>
+              </ul>
+            </li>
+
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<template name="noteOfTheDay">
+<p>Note of the day: {{note}}</p>
+</template>
+
+<template name="start">
+  <div class="page row">
+    <div class="offset4 span8">
+
+      <p class="note">All logged-in users will see this page in their header nav.</p>
+
+      <h2>Start Page</h2>
+
+      {{> noteOfTheDay}}
+
+      <div>
+        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
+      </div>
+          
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="secrets">
+  <div class="secrets row">
+    <div class="offset4 span8">
+
+      <p class="note">Only Admins and those with the 'view-secrets' role will see this page in their header nav.</p>
+
+      <h2>Secrets!</h2>
+
+      <ul>
+      {{#each secrets}}
+        <li><p>{{secret}}</p></li>
+      {{/each}}
+      </ul>
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="manage">
+  <div class="manage-users row">
+    <div class="offset4 span8">
+
+      <p class="note">Only Admins and those with the 'manage-users' role will see this page in their nav menu.</p>
+
+      <h2>Manage Users</h2>
+
+      <br />
+
+      <h3>Current Users</h3>
+      <ul>
+      {{#each users}}
+      <li>{{email}} - Roles: {{roles}}</li>
+      {{/each}}
+      </ul>
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="securityNote">
+  <div class="security-note">
+    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
+    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
+    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
+    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
+    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
+    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
+  </div>
+</template>
diff --git a/examples/mini-pages/client/lib/globals.js b/examples/mini-pages/client/lib/globals.js
new file mode 100644
index 0000000000..443d048ba8
--- /dev/null
+++ b/examples/mini-pages/client/lib/globals.js
@@ -0,0 +1,2 @@
+// The application
+App = {};
diff --git a/examples/mini-pages/client/routing.js b/examples/mini-pages/client/routing.js
new file mode 100644
index 0000000000..73bd2d0b29
--- /dev/null
+++ b/examples/mini-pages/client/routing.js
@@ -0,0 +1,64 @@
+;(function () {
+
+  "use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Routing
+//
+
+// override with mini-pages navigate method
+Meteor.navigateTo = function (path) {
+  Meteor.go(path);
+};
+
+var authenticate = function () {
+  var user;
+
+  if (Meteor.loggingIn()) {
+
+    console.log('filter: loading');
+    this.template('loading');
+    this.layout('layout_no_header');
+    this.done();
+
+  } else {
+
+    user = Meteor.user();
+
+    if (user) {
+
+      console.log('filter: done');
+      this.layout('layout');
+
+    } else {
+
+      console.log('filter: signin');
+      this.template('signin');
+      this.layout('layout_no_header');
+      this.done();
+
+    }
+  }
+};
+
+Meteor.pages({
+  '/': { to: 'start', as: 'root', nav: 'start', 
+         before: [authenticate] },
+  '/signin': 'signin',
+  '/start': { to: 'start', nav: 'start', 
+         before: [authenticate] },
+  '/secrets': { to: 'secrets', nav: 'secrets', 
+         before: [authenticate] },
+  '/manage': { to: 'manage', nav: 'manage', 
+         before: [authenticate] },
+  '/signout': App.signout,
+  '*': 'not_found'
+}, {
+  defaults: {
+    layout: 'layout_no_header'
+  }
+});
+
+
+}());
diff --git a/example-app/model.js b/examples/mini-pages/model.js
similarity index 100%
rename from example-app/model.js
rename to examples/mini-pages/model.js
diff --git a/example-app/polyfills.js b/examples/mini-pages/polyfills.js
similarity index 100%
rename from example-app/polyfills.js
rename to examples/mini-pages/polyfills.js
diff --git a/example-app/server/server.js b/examples/mini-pages/server/server.js
similarity index 100%
rename from example-app/server/server.js
rename to examples/mini-pages/server/server.js
diff --git a/examples/mini-pages/smart.json b/examples/mini-pages/smart.json
new file mode 100644
index 0000000000..64a2ab926a
--- /dev/null
+++ b/examples/mini-pages/smart.json
@@ -0,0 +1,12 @@
+{
+  "meteor": {
+    "git": "https://github.com/meteor/meteor.git",
+    "branch": "master"
+  },
+  "packages": {
+    "roles": {
+      "path": "../../roles"
+    },
+    "mini-pages": {}
+  }
+}
diff --git a/examples/mini-pages/smart.lock b/examples/mini-pages/smart.lock
new file mode 100644
index 0000000000..ca90cf07e7
--- /dev/null
+++ b/examples/mini-pages/smart.lock
@@ -0,0 +1,35 @@
+{
+  "meteor": {
+    "git": "https://github.com/meteor/meteor.git",
+    "branch": "master",
+    "commit": "bfe4b72ebec4367eaddcdf0887fcf5e649d9dcb8"
+  },
+  "dependencies": {
+    "basePackages": {
+      "roles": {
+        "path": "../../roles"
+      },
+      "mini-pages": {}
+    },
+    "packages": {
+      "roles": {
+        "path": "../../roles"
+      },
+      "mini-pages": {
+        "git": "https://github.com/cmather/meteor-mini-pages.git",
+        "tag": "v0.3.1",
+        "commit": "d218140d37b0dbec975880755c2035ae9e022936"
+      },
+      "HTML5-History-API": {
+        "git": "https://github.com/tmeasday/meteor-HTML5-History-API.git",
+        "tag": "v0.1.2",
+        "commit": "72333bfa71ae1ca75243085e83200eef40818088"
+      },
+      "page-js-ie-support": {
+        "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",
+        "tag": "v1.3.5",
+        "commit": "b99ed8380aefd10b2afc8f18d9eed4dd0d8ea9cb"
+      }
+    }
+  }
+}
diff --git a/examples/router/.meteor/.gitignore b/examples/router/.meteor/.gitignore
new file mode 100644
index 0000000000..08150d000c
--- /dev/null
+++ b/examples/router/.meteor/.gitignore
@@ -0,0 +1,2 @@
+local
+meteorite
diff --git a/example-app/.meteor/packages b/examples/router/.meteor/packages
similarity index 100%
rename from example-app/.meteor/packages
rename to examples/router/.meteor/packages
diff --git a/examples/router/client/client.js b/examples/router/client/client.js
new file mode 100644
index 0000000000..d3a8296d14
--- /dev/null
+++ b/examples/router/client/client.js
@@ -0,0 +1,166 @@
+;(function () {
+
+  "use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Routing stub
+//
+// Separate routing package details from general app code.
+Meteor.navigateTo = function (path) {
+  // ...over-ridden in routing.js
+};
+
+
+
+////////////////////////////////////////////////////////////////////
+// App.signout
+//
+App.signout = function () {
+  console.log('logging out...');
+  Meteor.logout(function () {
+    console.log('...done');
+    Meteor.navigateTo('/');
+  });
+};
+
+
+////////////////////////////////////////////////////////////////////
+// Patches
+//
+
+// stubs for IE
+if (!window.console) {
+  window.console = {}
+}
+if (!window.console.log) {
+  window.console.log = function (msg) {
+    $('#log').append('<br /><p>' + msg + '</p>')
+  };
+}
+
+// fix bootstrap dropdown unclickable issue on iOS
+// https://github.com/twitter/bootstrap/issues/4550
+$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
+    e.stopPropagation();
+});
+
+
+
+////////////////////////////////////////////////////////////////////
+// Subscriptions
+//
+
+Deps.autorun(function () {
+  // register dependency on user so subscriptions
+  // will update once user has logged in
+  var user = Meteor.user();
+
+  // secrets
+  Meteor.subscribe('secrets');
+
+  // users, for manage-users page
+  Meteor.subscribe('users');
+});
+
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Templates
+//
+
+Template.signin.rendered = function () {
+  // auto-trigger accounts-ui login form dropdown
+  Accounts._loginButtonsSession.set('dropdownVisible', true);
+};
+
+Template.header.events({
+  // template data, if any, is available in 'this'
+  'click .btn-navbar' : openCloseNav
+});
+Template.header.helpers({
+  displayName: function () {
+    return displayName();
+  }
+});
+
+Template.secrets.helpers({
+  secrets: function () {
+    return Meteor.secrets.find();
+  }
+});
+
+Template.noteOfTheDay.helpers({
+  note: function () {
+    return "Greetings " + displayName() + "!";
+  }
+});
+
+Template.manage.helpers({
+  users: function () {
+    return Meteor.users.find();
+  },
+  email: function () {
+    return this.emails[0].address;
+  },
+  roles: function () {
+    if (!this.roles) return '<none>';
+    return this.roles.join(',');
+  }
+});
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Misc helper functions
+//
+
+function displayName (user) {
+  var name;
+
+  if (!user) {
+    user = Meteor.user();
+  }
+
+  if (!user) return "<missing user>";
+
+  if (user.profile) {
+    name = user.profile.name;
+  }
+
+  if ('string' === typeof name) {
+    name = name.trim();
+  } else {
+    name = null;
+  }
+
+  if (!name && user.emails && user.emails.length > 0) {
+    name = user.emails[0].address;
+  }
+
+  return name || "<missing name>";
+}
+
+
+// insta-open/close nav rather than animate collapse.
+// this improves UX on mobile devices
+function openCloseNav (e) {
+  // Select .nav-collapse within same .navbar as current button
+  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
+
+  if (nav.height() != 0) {
+    // If it has a height, hide it
+    nav.height(0);
+  } else {
+    // If it's collapsed, show it
+    nav.height('auto');
+  }
+}
+
+
+}());
diff --git a/examples/router/client/example.css b/examples/router/client/example.css
new file mode 100644
index 0000000000..a7674b04dd
--- /dev/null
+++ b/examples/router/client/example.css
@@ -0,0 +1,67 @@
+@media (min-width: 980px) {
+  /* wide devices - full navbar */ 
+
+  /* push down content under fixed navbar */
+  body {
+    padding-top:60px;
+    padding-bottom:40px;
+    }
+
+}
+
+
+/**
+ * front-and-center signin form
+ */
+.signin {
+  width:100%;
+  text-align:center;
+}
+.signin .login-form {
+  width:200px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+}
+.signin .login-form {
+}
+.signin .login-close-text {
+  display:none;
+}
+.signin #login-buttons {
+}
+.signin .additional-link-container {
+  display:none;
+}
+.signin .example-users {
+  width:350px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+  top:15em;
+  left:3em;
+}
+
+/**
+ * header
+ */
+#err .close {
+  float:none;
+  margin-left:1em;
+}
+
+/**
+ * note of the day
+ */
+.note {
+  margin:1em 0em;
+  padding:1em;
+  border:1px solid #ccc;
+}
+
+/**
+ * security-note
+ */
+.security-note {
+  margin-top:10em;
+}
diff --git a/example-app/client/example-app.html b/examples/router/client/example.html
similarity index 100%
rename from example-app/client/example-app.html
rename to examples/router/client/example.html
diff --git a/examples/router/client/lib/globals.js b/examples/router/client/lib/globals.js
new file mode 100644
index 0000000000..443d048ba8
--- /dev/null
+++ b/examples/router/client/lib/globals.js
@@ -0,0 +1,2 @@
+// The application
+App = {};
diff --git a/examples/router/client/routing.js b/examples/router/client/routing.js
new file mode 100644
index 0000000000..fa48ba3a49
--- /dev/null
+++ b/examples/router/client/routing.js
@@ -0,0 +1,79 @@
+;(function () {
+
+  "use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Routing
+//
+
+// override with meteor-router navigate method
+Meteor.navigateTo = function (path) {
+  Meteor.Router.to(path);
+};
+
+
+Meteor.Router.add({
+  '/': function () {
+    var user;
+
+    if (Meteor.loggingIn()) {
+      console.log('home: loading');
+      return 'loading';
+    }
+
+    user = Meteor.user();
+    if (!user) {
+      console.log('home: signin');
+      return 'signin';
+    }
+
+    console.log('home: user found');
+    console.log(user.roles);
+
+    // start on 'start' page
+    console.log('home: start');
+    return 'start';
+  },
+  '/signin': 'signin',
+  '/start': 'start',
+  '/secrets': 'secrets',
+  '/manage': 'manage',
+  '/signout': App.signout,
+  '*': 'not_found'
+});
+
+Meteor.Router.filters({
+  checkLoggedIn: function (page) {
+    var user;
+
+    if (Meteor.loggingIn()) {
+
+      console.log('filter: loading');
+      return 'loading';
+
+    } else {
+
+      user = Meteor.user();
+
+      if (user) {
+
+        console.log('filter: done');
+        return page;
+
+      } else {
+
+        console.log('filter: signin');
+        return 'signin';
+
+      }
+    }
+  }
+});
+
+// make sure user has logged in for all appropriate routes
+Meteor.Router.filter('checkLoggedIn', {
+  except:['signin','loading','not-found']
+});
+
+}());
diff --git a/examples/router/model.js b/examples/router/model.js
new file mode 100644
index 0000000000..be8a6c57f7
--- /dev/null
+++ b/examples/router/model.js
@@ -0,0 +1,9 @@
+;(function () {
+
+  "use strict";
+
+// run on both the server and the client
+
+Meteor.secrets = new Meteor.Collection('secrets');
+
+}());
diff --git a/examples/router/polyfills.js b/examples/router/polyfills.js
new file mode 100644
index 0000000000..ad286f3645
--- /dev/null
+++ b/examples/router/polyfills.js
@@ -0,0 +1,11 @@
+;(function () {
+
+  "use strict";
+
+  if(typeof String.prototype.trim !== 'function') {
+    String.prototype.trim = function() {
+      return this.replace(/^\s+|\s+$/g, ''); 
+    }
+  }
+
+}());
diff --git a/examples/router/server/server.js b/examples/router/server/server.js
new file mode 100644
index 0000000000..b781cb2ae3
--- /dev/null
+++ b/examples/router/server/server.js
@@ -0,0 +1,115 @@
+;(function () {
+
+  "use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Patches
+//
+
+if (!console || !console.log) {
+  // stub for IE
+  console = { 
+    log: function (msg) {
+      $('#log').append(msg)
+    } 
+  };
+}
+
+
+////////////////////////////////////////////////////////////////////
+// Startup
+//
+
+Meteor.startup(function () {
+
+  ////////////////////////////////////////////////////////////////////
+  // Create Test Secrets
+  //
+    
+  if (Meteor.secrets.find().fetch().length === 0) {
+    Meteor.secrets.insert({secret:"ec2 password: apple2"});
+    Meteor.secrets.insert({secret:"domain registration pw: apple3"});
+  }
+
+
+  ////////////////////////////////////////////////////////////////////
+  // Create Test Users
+  //
+
+  if (Meteor.users.find().fetch().length === 0) {
+
+    console.log('Creating users: ');
+
+    var users = [
+        {name:"Normal User",email:"normal@example.com",roles:[]},
+        {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
+        {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
+        {name:"Admin User",email:"admin@example.com",roles:['admin']}
+      ];
+
+    _.each(users, function (user) {
+      var id;
+      
+      console.log(user);
+
+      id = Accounts.createUser({
+        email: user.email,
+        password: "apple1",
+        profile: { name: user.name }
+      });
+
+      Roles.addUsersToRoles(id, user.roles);
+    
+    });
+  }
+
+
+
+  ////////////////////////////////////////////////////////////////////
+  // Prevent non-authorized users from creating new users
+  //
+
+  Accounts.validateNewUser(function (user) {
+    var loggedInUser = Meteor.user();
+
+    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
+      return true;
+    }
+
+    throw new Meteor.Error(403, "Not authorized to create new users");
+  });
+
+});
+
+
+////////////////////////////////////////////////////////////////////
+// Publish
+//
+
+
+// Authorized users can view secrets
+Meteor.publish("secrets", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
+
+  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
+    return Meteor.secrets.find();
+  }
+
+  this.stop();
+  return;
+});
+
+// Authorized users can manage user accounts
+Meteor.publish("users", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
+
+  if (Roles.userIsInRole(user, ["admin","manage-users"])) {
+    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
+  } 
+
+  this.stop();
+  return;
+});
+
+}());
diff --git a/example-app/smart.json b/examples/router/smart.json
similarity index 84%
rename from example-app/smart.json
rename to examples/router/smart.json
index c32544aca9..6d157f221f 100644
--- a/example-app/smart.json
+++ b/examples/router/smart.json
@@ -5,7 +5,7 @@
   },
   "packages": {
     "roles": {
-      "path": "../roles"
+      "path": "../../roles"
     },
     "router": {}
   }
diff --git a/example-app/smart.lock b/examples/router/smart.lock
similarity index 72%
rename from example-app/smart.lock
rename to examples/router/smart.lock
index 3989ede973..7df2296052 100644
--- a/example-app/smart.lock
+++ b/examples/router/smart.lock
@@ -2,23 +2,23 @@
   "meteor": {
     "git": "https://github.com/meteor/meteor.git",
     "branch": "master",
-    "commit": "cab491f3650fffc85661bca6b3cecf583410e05d"
+    "commit": "bfe4b72ebec4367eaddcdf0887fcf5e649d9dcb8"
   },
   "dependencies": {
     "basePackages": {
       "roles": {
-        "path": "../roles"
+        "path": "../../roles"
       },
       "router": {}
     },
     "packages": {
       "roles": {
-        "path": "../roles"
+        "path": "../../roles"
       },
       "router": {
         "git": "https://github.com/tmeasday/meteor-router.git",
-        "tag": "v0.5.0",
-        "commit": "b1ee74c816d1fc63b713139158075feb8a0c6d26"
+        "tag": "v0.5.1",
+        "commit": "32e377c7703bb119acccc859fc7296882903cbe7"
       },
       "page-js-ie-support": {
         "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",

From 3a0a18891c63dc86b0f746b4b7e6addbbae77b35 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sat, 4 May 2013 19:08:48 -0300
Subject: [PATCH 0058/1140] update formatting

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 30cfa3d8f4..212472c3c0 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,9 @@ View the ```meteor-router``` example app online @  <a href="http://roles-example
 Run locally:
   1. install [Meteorite][1]
   2. ```git clone https://github.com/alanning/meteor-roles.git```
-  3a. ```cd meteor-roles/examples/router``` or
-  3b. ```cd meteor-roles/examples/mini-pages```
+  3. either
+    * ```cd meteor-roles/examples/router``` or
+    * ```cd meteor-roles/examples/mini-pages```
   4. ```mrt```
   5. point browser to ```http://localhost:3000```
 

From f025539dc42f3b626fa475939208614db95ff9f8 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 30 May 2013 22:35:23 -0400
Subject: [PATCH 0059/1140] ignore smart.lock

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 936a7d9896..b2aea70c81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ logs
 results
 
 npm-debug.log
+smart.lock

From 68677eadaf849a6484a60d41542689851b04a836 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 30 May 2013 23:25:05 -0400
Subject: [PATCH 0060/1140] add email verified check to authentication filters

---
 .gitignore                            |  1 -
 examples/mini-pages/.meteor/release   |  1 +
 examples/mini-pages/client/routing.js | 28 +++++++++++++++++++++------
 examples/mini-pages/server/server.js  | 16 +++++++++------
 examples/mini-pages/smart.json        |  4 +---
 examples/mini-pages/smart.lock        | 14 +++++++-------
 examples/router/.meteor/release       |  1 +
 examples/router/client/routing.js     | 23 ++++++++++++++++------
 examples/router/server/server.js      | 16 +++++++++------
 examples/router/smart.json            |  4 +---
 examples/router/smart.lock            | 10 +++++-----
 11 files changed, 75 insertions(+), 43 deletions(-)
 create mode 100644 examples/mini-pages/.meteor/release
 create mode 100644 examples/router/.meteor/release

diff --git a/.gitignore b/.gitignore
index b2aea70c81..936a7d9896 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,3 @@ logs
 results
 
 npm-debug.log
-smart.lock
diff --git a/examples/mini-pages/.meteor/release b/examples/mini-pages/.meteor/release
new file mode 100644
index 0000000000..a50a1dcf8c
--- /dev/null
+++ b/examples/mini-pages/.meteor/release
@@ -0,0 +1 @@
+0.6.3.1
diff --git a/examples/mini-pages/client/routing.js b/examples/mini-pages/client/routing.js
index 73bd2d0b29..7c061d0afb 100644
--- a/examples/mini-pages/client/routing.js
+++ b/examples/mini-pages/client/routing.js
@@ -12,6 +12,12 @@ Meteor.navigateTo = function (path) {
   Meteor.go(path);
 };
 
+function emailVerified (user) {
+  return _.some(user.emails, function (email) {
+    return email.verified;
+  });
+}
+
 var authenticate = function () {
   var user;
 
@@ -26,17 +32,27 @@ var authenticate = function () {
 
     user = Meteor.user();
 
-    if (user) {
-
-      console.log('filter: done');
-      this.layout('layout');
-
-    } else {
+    if (!user) {
 
       console.log('filter: signin');
       this.template('signin');
       this.layout('layout_no_header');
       this.done();
+      return;
+
+    }
+
+    if (!emailVerified(user)) {
+
+      console.log('filter: awaiting-verification');
+      this.template('awaiting-verification');
+      this.layout('layout');
+      this.done();
+
+    } else {
+
+      console.log('filter: done');
+      this.layout('layout');
 
     }
   }
diff --git a/examples/mini-pages/server/server.js b/examples/mini-pages/server/server.js
index b781cb2ae3..7cb5d4713f 100644
--- a/examples/mini-pages/server/server.js
+++ b/examples/mini-pages/server/server.js
@@ -48,18 +48,22 @@ Meteor.startup(function () {
         {name:"Admin User",email:"admin@example.com",roles:['admin']}
       ];
 
-    _.each(users, function (user) {
-      var id;
+    _.each(users, function (userData) {
+      var id,
+          user;
       
-      console.log(user);
+      console.log(userData);
 
       id = Accounts.createUser({
-        email: user.email,
+        email: userData.email,
         password: "apple1",
-        profile: { name: user.name }
+        profile: { name: userData.name }
       });
 
-      Roles.addUsersToRoles(id, user.roles);
+      // email verification
+      Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
+
+      Roles.addUsersToRoles(id, userData.roles);
     
     });
   }
diff --git a/examples/mini-pages/smart.json b/examples/mini-pages/smart.json
index 64a2ab926a..96cae7507c 100644
--- a/examples/mini-pages/smart.json
+++ b/examples/mini-pages/smart.json
@@ -4,9 +4,7 @@
     "branch": "master"
   },
   "packages": {
-    "roles": {
-      "path": "../../roles"
-    },
+    "roles": {},
     "mini-pages": {}
   }
 }
diff --git a/examples/mini-pages/smart.lock b/examples/mini-pages/smart.lock
index ca90cf07e7..0aced6831f 100644
--- a/examples/mini-pages/smart.lock
+++ b/examples/mini-pages/smart.lock
@@ -2,18 +2,18 @@
   "meteor": {
     "git": "https://github.com/meteor/meteor.git",
     "branch": "master",
-    "commit": "bfe4b72ebec4367eaddcdf0887fcf5e649d9dcb8"
+    "commit": "a33fcf6d8cef8486ffd4bce549645624fb23a0e3"
   },
   "dependencies": {
     "basePackages": {
-      "roles": {
-        "path": "../../roles"
-      },
+      "roles": {},
       "mini-pages": {}
     },
     "packages": {
       "roles": {
-        "path": "../../roles"
+        "git": "https://github.com/alanning/meteor-roles.git",
+        "tag": "v1.0.5",
+        "commit": "a6e0ce33f8dc69a816165c458b138c2acb30ad0e"
       },
       "mini-pages": {
         "git": "https://github.com/cmather/meteor-mini-pages.git",
@@ -22,8 +22,8 @@
       },
       "HTML5-History-API": {
         "git": "https://github.com/tmeasday/meteor-HTML5-History-API.git",
-        "tag": "v0.1.2",
-        "commit": "72333bfa71ae1ca75243085e83200eef40818088"
+        "tag": "v4.0.0",
+        "commit": "dc4965f1424cfca625ec3fbea17eace03f8e32c5"
       },
       "page-js-ie-support": {
         "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",
diff --git a/examples/router/.meteor/release b/examples/router/.meteor/release
new file mode 100644
index 0000000000..a50a1dcf8c
--- /dev/null
+++ b/examples/router/.meteor/release
@@ -0,0 +1 @@
+0.6.3.1
diff --git a/examples/router/client/routing.js b/examples/router/client/routing.js
index fa48ba3a49..19f80c919c 100644
--- a/examples/router/client/routing.js
+++ b/examples/router/client/routing.js
@@ -28,6 +28,11 @@ Meteor.Router.add({
       return 'signin';
     }
 
+    if (!emailVerified(user)) {
+      console.log('home: awaiting-verification');
+      return 'awaiting-verification';
+    }
+
     console.log('home: user found');
     console.log(user.roles);
 
@@ -56,17 +61,23 @@ Meteor.Router.filters({
 
       user = Meteor.user();
 
-      if (user) {
-
-        console.log('filter: done');
-        return page;
-
-      } else {
+      if (!user) {
 
         console.log('filter: signin');
         return 'signin';
 
       }
+
+      if (!emailVerified(user)) {
+
+        console.log('filter: awaiting-verification');
+        return 'awaiting-verification';
+
+      } 
+
+      console.log('filter: done');
+      return page;
+
     }
   }
 });
diff --git a/examples/router/server/server.js b/examples/router/server/server.js
index b781cb2ae3..7cb5d4713f 100644
--- a/examples/router/server/server.js
+++ b/examples/router/server/server.js
@@ -48,18 +48,22 @@ Meteor.startup(function () {
         {name:"Admin User",email:"admin@example.com",roles:['admin']}
       ];
 
-    _.each(users, function (user) {
-      var id;
+    _.each(users, function (userData) {
+      var id,
+          user;
       
-      console.log(user);
+      console.log(userData);
 
       id = Accounts.createUser({
-        email: user.email,
+        email: userData.email,
         password: "apple1",
-        profile: { name: user.name }
+        profile: { name: userData.name }
       });
 
-      Roles.addUsersToRoles(id, user.roles);
+      // email verification
+      Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
+
+      Roles.addUsersToRoles(id, userData.roles);
     
     });
   }
diff --git a/examples/router/smart.json b/examples/router/smart.json
index 6d157f221f..681f1d8232 100644
--- a/examples/router/smart.json
+++ b/examples/router/smart.json
@@ -4,9 +4,7 @@
     "branch": "master"
   },
   "packages": {
-    "roles": {
-      "path": "../../roles"
-    },
+    "roles": {},
     "router": {}
   }
 }
diff --git a/examples/router/smart.lock b/examples/router/smart.lock
index 7df2296052..b53be1aef4 100644
--- a/examples/router/smart.lock
+++ b/examples/router/smart.lock
@@ -2,18 +2,18 @@
   "meteor": {
     "git": "https://github.com/meteor/meteor.git",
     "branch": "master",
-    "commit": "bfe4b72ebec4367eaddcdf0887fcf5e649d9dcb8"
+    "commit": "5d736d4bf0448c7db1f9b47124dfafc34a9631bb"
   },
   "dependencies": {
     "basePackages": {
-      "roles": {
-        "path": "../../roles"
-      },
+      "roles": {},
       "router": {}
     },
     "packages": {
       "roles": {
-        "path": "../../roles"
+        "git": "https://github.com/alanning/meteor-roles.git",
+        "tag": "v1.0.5",
+        "commit": "a6e0ce33f8dc69a816165c458b138c2acb30ad0e"
       },
       "router": {
         "git": "https://github.com/tmeasday/meteor-router.git",

From 822d1e4ff1c3dbc0c9749638236ea50a4eeaa902 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 30 May 2013 23:29:28 -0400
Subject: [PATCH 0061/1140] add email verified check

---
 examples/router/client/routing.js | 5 +++++
 examples/router/smart.lock        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/router/client/routing.js b/examples/router/client/routing.js
index 19f80c919c..64d267dbe7 100644
--- a/examples/router/client/routing.js
+++ b/examples/router/client/routing.js
@@ -12,6 +12,11 @@ Meteor.navigateTo = function (path) {
   Meteor.Router.to(path);
 };
 
+function emailVerified (user) {
+  return _.some(user.emails, function (email) {
+    return email.verified;
+  });
+}
 
 Meteor.Router.add({
   '/': function () {
diff --git a/examples/router/smart.lock b/examples/router/smart.lock
index b53be1aef4..9ceccdcf50 100644
--- a/examples/router/smart.lock
+++ b/examples/router/smart.lock
@@ -2,7 +2,7 @@
   "meteor": {
     "git": "https://github.com/meteor/meteor.git",
     "branch": "master",
-    "commit": "5d736d4bf0448c7db1f9b47124dfafc34a9631bb"
+    "commit": "a33fcf6d8cef8486ffd4bce549645624fb23a0e3"
   },
   "dependencies": {
     "basePackages": {

From cf52ae501e6f31fa037beb5fbfeb332ea740e2d5 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Thu, 27 Jun 2013 19:39:51 -0400
Subject: [PATCH 0062/1140] update example URL

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 212472c3c0..0ec4b006a5 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ The ```examples``` directory contains Meteor apps which show off the following f
 
 The only difference between the two example apps is the routing packages used: one uses ```meteor-router``` and the other uses ```meteor-mini-pages```.
 
-View the ```meteor-router``` example app online @  <a href="http://roles-example.meteor.com/" target="_blank">http://roles-example.meteor.com/</a>
+View the ```meteor-router``` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
   
 Run locally:
   1. install [Meteorite][1]

From 9ff258060c859a6bd6986ffe5d399d49e8f99f67 Mon Sep 17 00:00:00 2001
From: Nick Moylan <nick@nickmoylan.com>
Date: Tue, 16 Jul 2013 12:36:12 +1200
Subject: [PATCH 0063/1140] Fixed deleteRole to work correctly client side

---
 roles/roles_common.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 2910aae83d..e618074a99 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -39,8 +39,8 @@ Roles.createRole = function (role) {
   var id,
       match
 
-  if (!role 
-      || 'string' !== typeof role 
+  if (!role
+      || 'string' !== typeof role
       || role.trim().length === 0) {
     return
   }
@@ -61,15 +61,15 @@ Roles.createRole = function (role) {
   }
 }
 
-/** 
- * Delete an existing role.  Will throw "Role in use" error if any users 
+/**
+ * Delete an existing role.  Will throw "Role in use" error if any users
  * are currently assigned to the target role.
- * 
+ *
  * @method deleteRole
  * @param {String} role Name of role
  */
 Roles.deleteRole = function (role) {
-  if (!role) {
+  if (! role) {
     return
   }
 
@@ -79,8 +79,11 @@ Roles.deleteRole = function (role) {
     throw new Meteor.Error(403, 'Role in use')
   }
 
-  Meteor.roles.remove({ name: role })
-}
+  var thisRole = Meteor.roles.findOne({ name: role })
+  if (thisRole) {
+    Meteor.roles.remove({ _id: thisRole._id })
+  }
+};
 
 /**
  * Add users to roles. Will create roles as needed.
@@ -194,12 +197,12 @@ Roles.removeUsersFromRoles = function (users, roles) {
 Roles.userIsInRole = function (user, roles) {
   var id,
       userRoles
-    
+
   // ensure array to simplify code
   if (!_.isArray(roles)) {
     roles = [roles]
   }
-  
+
   if (!user) {
     return false
   } else if ('object' === typeof user) {
@@ -213,7 +216,7 @@ Roles.userIsInRole = function (user, roles) {
     id = user._id
   } else if ('string' === typeof user) {
     id = user
-  } 
+  }
 
   if (!id) return false
 
@@ -235,7 +238,7 @@ Roles.getRolesForUser = function (user) {
     { _id: user},
     { _id: 0, roles: 1}
   )
-  
+
   return user ? user.roles : undefined
 }
 

From 3d2b282de96273b4fdb34cfe54ce2def46f8d735 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 3 Aug 2013 16:56:55 +0800
Subject: [PATCH 0064/1140] Pre-emptive support for package changes in 0.6.5

---
 roles/package.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/package.js b/roles/package.js
index 48d1f2cfd5..2bf59b6287 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -6,6 +6,8 @@ Package.on_use(function (api) {
   var both = ['client', 'server'];
   api.use(['underscore', 'accounts-base'], both);
 
+  api.export && api.export('Roles'); 
+
   api.add_files('roles_server.js', 'server');
   api.add_files('roles_common.js', both);
   api.add_files('roles_client.js', 'client');

From 4bcbff159d415d4bf765e9b0b55ec2cf473496d7 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Thu, 15 Aug 2013 07:31:06 +0800
Subject: [PATCH 0065/1140] update contributors

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0ec4b006a5..98afc6bc0d 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Roles-based authorization package for Meteor - compatible with built-in accounts
 <br />
 ### Contributors
 
-Thanks to [@mcrider](https://github.com/mcrider)!
+Thanks to [@nickmoylan](https://github.com/nickmoylan) and [@mcrider](https://github.com/mcrider)!
 
 <br />
 

From f81cbf7c765a4ed7e16a580c288db6f10a90856b Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 16 Aug 2013 02:27:19 +0800
Subject: [PATCH 0066/1140] v1.0.6 - Meteor 0.6.5 compatibility; fix for Issue
 #10

---
 .gitignore                           |  1 +
 History.md                           | 25 ++++++++++++++++++++
 examples/mini-pages/.meteor/packages |  1 +
 examples/mini-pages/.meteor/release  |  2 +-
 examples/mini-pages/smart.lock       | 35 ----------------------------
 examples/router/.meteor/packages     |  1 +
 examples/router/.meteor/release      |  2 +-
 examples/router/smart.lock           | 30 ------------------------
 roles/.gitignore                     |  1 +
 roles/package.js                     |  2 +-
 roles/smart.json                     |  2 +-
 11 files changed, 33 insertions(+), 69 deletions(-)
 create mode 100644 History.md
 delete mode 100644 examples/mini-pages/smart.lock
 delete mode 100644 examples/router/smart.lock
 create mode 100644 roles/.gitignore

diff --git a/.gitignore b/.gitignore
index 936a7d9896..b2aea70c81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ logs
 results
 
 npm-debug.log
+smart.lock
diff --git a/History.md b/History.md
new file mode 100644
index 0000000000..358f225659
--- /dev/null
+++ b/History.md
@@ -0,0 +1,25 @@
+## v1.0.6
+
+* Add compatibility with Meteor 0.6.5 package system
+* Bug fix for Issue #11 - deleteRole by _id, not name for untrusted code. Contributed by [@nickmoylan](https://github.com/nickmoylan)
+
+
+## v1.0.5
+
+* Fix for Issue #5 - error adding role for single user. Contributed by [@mcrider](https://github.com/mcrider)
+* Get tests working under Meteor 0.6.0
+
+
+## v1.0.4
+
+* remove need for client subscribe by using 'null' publish
+
+
+## v1.0.3
+
+* Fix for Issue #3 - conflict with spiderable package
+
+
+## v1.0.2
+
+* Murky, ancient history
diff --git a/examples/mini-pages/.meteor/packages b/examples/mini-pages/.meteor/packages
index 8a604b86b9..c992b72c0c 100644
--- a/examples/mini-pages/.meteor/packages
+++ b/examples/mini-pages/.meteor/packages
@@ -10,3 +10,4 @@ bootstrap
 roles
 mini-pages
 spiderable
+standard-app-packages
diff --git a/examples/mini-pages/.meteor/release b/examples/mini-pages/.meteor/release
index a50a1dcf8c..ef5e445445 100644
--- a/examples/mini-pages/.meteor/release
+++ b/examples/mini-pages/.meteor/release
@@ -1 +1 @@
-0.6.3.1
+0.6.5
diff --git a/examples/mini-pages/smart.lock b/examples/mini-pages/smart.lock
deleted file mode 100644
index 0aced6831f..0000000000
--- a/examples/mini-pages/smart.lock
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "meteor": {
-    "git": "https://github.com/meteor/meteor.git",
-    "branch": "master",
-    "commit": "a33fcf6d8cef8486ffd4bce549645624fb23a0e3"
-  },
-  "dependencies": {
-    "basePackages": {
-      "roles": {},
-      "mini-pages": {}
-    },
-    "packages": {
-      "roles": {
-        "git": "https://github.com/alanning/meteor-roles.git",
-        "tag": "v1.0.5",
-        "commit": "a6e0ce33f8dc69a816165c458b138c2acb30ad0e"
-      },
-      "mini-pages": {
-        "git": "https://github.com/cmather/meteor-mini-pages.git",
-        "tag": "v0.3.1",
-        "commit": "d218140d37b0dbec975880755c2035ae9e022936"
-      },
-      "HTML5-History-API": {
-        "git": "https://github.com/tmeasday/meteor-HTML5-History-API.git",
-        "tag": "v4.0.0",
-        "commit": "dc4965f1424cfca625ec3fbea17eace03f8e32c5"
-      },
-      "page-js-ie-support": {
-        "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",
-        "tag": "v1.3.5",
-        "commit": "b99ed8380aefd10b2afc8f18d9eed4dd0d8ea9cb"
-      }
-    }
-  }
-}
diff --git a/examples/router/.meteor/packages b/examples/router/.meteor/packages
index 8af4c51a11..8afbba39fa 100644
--- a/examples/router/.meteor/packages
+++ b/examples/router/.meteor/packages
@@ -10,3 +10,4 @@ accounts-ui
 bootstrap
 roles
 spiderable
+standard-app-packages
diff --git a/examples/router/.meteor/release b/examples/router/.meteor/release
index a50a1dcf8c..ef5e445445 100644
--- a/examples/router/.meteor/release
+++ b/examples/router/.meteor/release
@@ -1 +1 @@
-0.6.3.1
+0.6.5
diff --git a/examples/router/smart.lock b/examples/router/smart.lock
deleted file mode 100644
index 9ceccdcf50..0000000000
--- a/examples/router/smart.lock
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "meteor": {
-    "git": "https://github.com/meteor/meteor.git",
-    "branch": "master",
-    "commit": "a33fcf6d8cef8486ffd4bce549645624fb23a0e3"
-  },
-  "dependencies": {
-    "basePackages": {
-      "roles": {},
-      "router": {}
-    },
-    "packages": {
-      "roles": {
-        "git": "https://github.com/alanning/meteor-roles.git",
-        "tag": "v1.0.5",
-        "commit": "a6e0ce33f8dc69a816165c458b138c2acb30ad0e"
-      },
-      "router": {
-        "git": "https://github.com/tmeasday/meteor-router.git",
-        "tag": "v0.5.1",
-        "commit": "32e377c7703bb119acccc859fc7296882903cbe7"
-      },
-      "page-js-ie-support": {
-        "git": "https://github.com/tmeasday/meteor-page-js-ie-support.git",
-        "tag": "v1.3.5",
-        "commit": "b99ed8380aefd10b2afc8f18d9eed4dd0d8ea9cb"
-      }
-    }
-  }
-}
diff --git a/roles/.gitignore b/roles/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/roles/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/roles/package.js b/roles/package.js
index 2bf59b6287..87cdc865c6 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -4,7 +4,7 @@ Package.describe({
 
 Package.on_use(function (api) {
   var both = ['client', 'server'];
-  api.use(['underscore', 'accounts-base'], both);
+  api.use(['underscore', 'handlebars', 'accounts-base'], both);
 
   api.export && api.export('Roles'); 
 
diff --git a/roles/smart.json b/roles/smart.json
index 1983571cd8..627997fd3f 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From 79b6e1bc22842d05fa5f4896dd213110ec33c15c Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Mon, 30 Sep 2013 17:03:52 -0400
Subject: [PATCH 0067/1140] improve usage instructions

---
 README.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 98afc6bc0d..56485a1bae 100644
--- a/README.md
+++ b/README.md
@@ -43,10 +43,22 @@ Run locally:
 
 ### Usage
 
-Add this smart package to your project:
+1. Add one of the built-in accounts packages so the Meteor.users collection exists.  From a command prompt:
+```bash
+meteor add accounts-password
+```
 
-  1. install [Meteorite][1]
-  2. ```mrt add roles```
+2. Install [Meteorite][1]
+  
+3. Add this smart package to your project.  From a command prompt:
+```bash
+mrt add roles
+```
+
+4. Run your application using Meteorite (rather than the normal meteor):
+```bash
+mrt
+```
 
 
 <br />

From 3db9d38064458f1dc6e5ea6ce0a0dcfc005f4805 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 4 Oct 2013 22:27:22 -0400
Subject: [PATCH 0068/1140] beginnings of an iron-router example

---
 examples/iron-router/.meteor/.gitignore    |   2 +
 examples/iron-router/.meteor/packages      |  13 ++
 examples/iron-router/.meteor/release       |   1 +
 examples/iron-router/client/client.js      | 168 +++++++++++++++++++++
 examples/iron-router/client/example.css    |  67 ++++++++
 examples/iron-router/client/example.html   | 163 ++++++++++++++++++++
 examples/iron-router/client/lib/globals.js |   2 +
 examples/iron-router/client/routing.js     | 107 +++++++++++++
 examples/iron-router/model.js              |   9 ++
 examples/iron-router/polyfills.js          |  11 ++
 examples/iron-router/server/server.js      | 119 +++++++++++++++
 examples/iron-router/smart.json            |  10 ++
 12 files changed, 672 insertions(+)
 create mode 100644 examples/iron-router/.meteor/.gitignore
 create mode 100644 examples/iron-router/.meteor/packages
 create mode 100644 examples/iron-router/.meteor/release
 create mode 100644 examples/iron-router/client/client.js
 create mode 100644 examples/iron-router/client/example.css
 create mode 100644 examples/iron-router/client/example.html
 create mode 100644 examples/iron-router/client/lib/globals.js
 create mode 100644 examples/iron-router/client/routing.js
 create mode 100644 examples/iron-router/model.js
 create mode 100644 examples/iron-router/polyfills.js
 create mode 100644 examples/iron-router/server/server.js
 create mode 100644 examples/iron-router/smart.json

diff --git a/examples/iron-router/.meteor/.gitignore b/examples/iron-router/.meteor/.gitignore
new file mode 100644
index 0000000000..08150d000c
--- /dev/null
+++ b/examples/iron-router/.meteor/.gitignore
@@ -0,0 +1,2 @@
+local
+meteorite
diff --git a/examples/iron-router/.meteor/packages b/examples/iron-router/.meteor/packages
new file mode 100644
index 0000000000..5c0c99862b
--- /dev/null
+++ b/examples/iron-router/.meteor/packages
@@ -0,0 +1,13 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+preserve-inputs
+accounts-password
+accounts-ui
+bootstrap
+roles
+spiderable
+standard-app-packages
+iron-router
diff --git a/examples/iron-router/.meteor/release b/examples/iron-router/.meteor/release
new file mode 100644
index 0000000000..ef5e445445
--- /dev/null
+++ b/examples/iron-router/.meteor/release
@@ -0,0 +1 @@
+0.6.5
diff --git a/examples/iron-router/client/client.js b/examples/iron-router/client/client.js
new file mode 100644
index 0000000000..2ecee3cb25
--- /dev/null
+++ b/examples/iron-router/client/client.js
@@ -0,0 +1,168 @@
+;(function () {
+
+  "use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Routing stub
+//
+// Separate routing package details from general app code.
+Meteor.navigateTo = function (path) {
+  // ...over-ridden in routing.js
+};
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// App.signout
+//
+App.signout = function () {
+  console.log('logging out...');
+  Meteor.logout(function () {
+    console.log('...done');
+    Meteor.navigateTo('/');
+  });
+};
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Patches
+//
+
+// stubs for IE
+if (!window.console) {
+  window.console = {}
+}
+if (!window.console.log) {
+  window.console.log = function (msg) {
+    $('#log').append('<br /><p>' + msg + '</p>')
+  };
+}
+
+// fix bootstrap dropdown unclickable issue on iOS
+// https://github.com/twitter/bootstrap/issues/4550
+$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
+    e.stopPropagation();
+});
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Subscriptions
+//
+
+Deps.autorun(function () {
+  // register dependency on user so subscriptions
+  // will update once user has logged in
+  var user = Meteor.user();
+
+  // secrets
+  Meteor.subscribe('secrets');
+
+  // users, for manage-users page
+  Meteor.subscribe('users');
+});
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Templates
+//
+
+Template.signin.rendered = function () {
+  // auto-trigger accounts-ui login form dropdown
+  Accounts._loginButtonsSession.set('dropdownVisible', true);
+};
+
+Template.header.events({
+  // template data, if any, is available in 'this'
+  'click .btn-navbar' : openCloseNav
+});
+Template.header.helpers({
+  displayName: function () {
+    return displayName();
+  }
+});
+
+Template.secrets.helpers({
+  secrets: function () {
+    return Meteor.secrets.find();
+  }
+});
+
+Template.noteOfTheDay.helpers({
+  note: function () {
+    return "Greetings " + displayName() + "!";
+  }
+});
+
+Template.manage.helpers({
+  users: function () {
+    return Meteor.users.find();
+  },
+  email: function () {
+    return this.emails[0].address;
+  },
+  roles: function () {
+    if (!this.roles) return '<none>';
+    return this.roles.join(',');
+  }
+});
+
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Misc helper functions
+//
+
+function displayName (user) {
+  var name;
+
+  if (!user) {
+    user = Meteor.user();
+  }
+
+  if (!user) return "<missing user>";
+
+  if (user.profile) {
+    name = user.profile.name;
+  }
+
+  if ('string' === typeof name) {
+    name = name.trim();
+  } else {
+    name = null;
+  }
+
+  if (!name && user.emails && user.emails.length > 0) {
+    name = user.emails[0].address;
+  }
+
+  return name || "<missing name>";
+}
+
+
+// insta-open/close nav rather than animate collapse.
+// this improves UX on mobile devices
+function openCloseNav (e) {
+  // Select .nav-collapse within same .navbar as current button
+  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
+
+  if (nav.height() != 0) {
+    // If it has a height, hide it
+    nav.height(0);
+  } else {
+    // If it's collapsed, show it
+    nav.height('auto');
+  }
+}
+
+
+}());
diff --git a/examples/iron-router/client/example.css b/examples/iron-router/client/example.css
new file mode 100644
index 0000000000..a7674b04dd
--- /dev/null
+++ b/examples/iron-router/client/example.css
@@ -0,0 +1,67 @@
+@media (min-width: 980px) {
+  /* wide devices - full navbar */ 
+
+  /* push down content under fixed navbar */
+  body {
+    padding-top:60px;
+    padding-bottom:40px;
+    }
+
+}
+
+
+/**
+ * front-and-center signin form
+ */
+.signin {
+  width:100%;
+  text-align:center;
+}
+.signin .login-form {
+  width:200px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+}
+.signin .login-form {
+}
+.signin .login-close-text {
+  display:none;
+}
+.signin #login-buttons {
+}
+.signin .additional-link-container {
+  display:none;
+}
+.signin .example-users {
+  width:350px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+  top:15em;
+  left:3em;
+}
+
+/**
+ * header
+ */
+#err .close {
+  float:none;
+  margin-left:1em;
+}
+
+/**
+ * note of the day
+ */
+.note {
+  margin:1em 0em;
+  padding:1em;
+  border:1px solid #ccc;
+}
+
+/**
+ * security-note
+ */
+.security-note {
+  margin-top:10em;
+}
diff --git a/examples/iron-router/client/example.html b/examples/iron-router/client/example.html
new file mode 100644
index 0000000000..27100d0114
--- /dev/null
+++ b/examples/iron-router/client/example.html
@@ -0,0 +1,163 @@
+<head>
+  <title>example-app</title>
+</head>
+
+<body>
+</body>
+
+<template name="layout">
+  {{> header}}
+
+  {{{yield}}}
+
+  <div id="log"></div>
+</template>
+
+<template name="layout_no_header">
+  {{{yield}}}
+
+  <div id="log"></div>
+</template>
+
+<template name="signin">
+  <div class="signin">
+    <div class="login-form">
+      <h1>Sign In</h1>
+      {{loginButtons}}
+    </div>
+
+    <div class="example-users">
+      <p>Normal User: normal@example.com | apple1</p>
+      <p>View Secrets: view@example.com | apple1</p>
+      <p>Manage Users: manage@example.com | apple1</p>
+      <p>Admin User: admin@example.com | apple1</p>
+    </div>
+  </div>
+</template>
+
+<template name="loading">
+  <h1>Loading...</h1>
+</template>
+
+<template name="awaiting-verification">
+  <h1>Awaiting email verification...</h1>
+</template>
+
+<template name="not_found">
+  <h3>404 - Not found<h3>
+</template>
+
+<template name="invalid-access">
+  <h3>403 Forbidden - Invalid Access<h3>
+</template>
+
+<template name="header">
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container">
+        <a class="btn btn-navbar">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+        <a class="brand" href="/">Roles Example App</a>
+        <div class="nav-collapse collapse">
+          <ul class="nav">
+
+            <li><a href="/start">Start Page</a></li>
+
+            {{#if isInRole 'admin,view-secrets'}}
+            <li><a href="/secrets">Secrets</a></li>
+            {{/if}}
+
+            <li class="dropdown pull-right">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                {{#if isInRole 'admin,manage-users'}}
+                <li><a href="/manage">Manage Users</a></li>
+                {{/if}}
+                <li><a class="signout" href="/signout">Sign out</a></li>
+              </ul>
+            </li>
+
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<template name="noteOfTheDay">
+<p>Note of the day: {{note}}</p>
+</template>
+
+<template name="start">
+  <div class="page row">
+    <div class="offset4 span8">
+
+      <p class="note">All logged-in users will see this page in their header nav.</p>
+
+      <h2>Start Page</h2>
+
+      {{> noteOfTheDay}}
+
+      <div>
+        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
+      </div>
+          
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="secrets">
+  <div class="secrets row">
+    <div class="offset4 span8">
+
+      <p class="note">Only Admins and those with the 'view-secrets' role will see this page in their header nav.</p>
+
+      <h2>Secrets!</h2>
+
+      <ul>
+      {{#each secrets}}
+        <li><p>{{secret}}</p></li>
+      {{/each}}
+      </ul>
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="manage">
+  <div class="manage-users row">
+    <div class="offset4 span8">
+
+      <p class="note">Only Admins and those with the 'manage-users' role will see this page in their nav menu.</p>
+
+      <h2>Manage Users</h2>
+
+      <br />
+
+      <h3>Current Users</h3>
+      <ul>
+      {{#each users}}
+      <li>{{email}} - Roles: {{roles}}</li>
+      {{/each}}
+      </ul>
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="securityNote">
+  <div class="security-note">
+    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
+    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
+    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
+    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
+    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
+    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
+  </div>
+</template>
diff --git a/examples/iron-router/client/lib/globals.js b/examples/iron-router/client/lib/globals.js
new file mode 100644
index 0000000000..443d048ba8
--- /dev/null
+++ b/examples/iron-router/client/lib/globals.js
@@ -0,0 +1,2 @@
+// The application
+App = {};
diff --git a/examples/iron-router/client/routing.js b/examples/iron-router/client/routing.js
new file mode 100644
index 0000000000..0c7abf3dcc
--- /dev/null
+++ b/examples/iron-router/client/routing.js
@@ -0,0 +1,107 @@
+;(function () {
+
+  AuthenticateController = {};
+
+  "use strict";
+
+
+
+////////////////////////////////////////////////////////////////////
+// Routing
+//
+
+// override with mini-pages navigate method
+Meteor.navigateTo = function (path) {
+  Router.go(path);
+};
+
+function emailVerified (user) {
+  return _.some(user.emails, function (email) {
+    return email.verified;
+  });
+}
+
+var authenticate = function () {
+  var user;
+
+  if (Meteor.loggingIn()) {
+
+    console.log('filter: loading');
+    this.render('loading');
+    this.layout = 'layout_no_header';
+
+  } else {
+
+    user = Meteor.user();
+
+    if (!user) {
+
+      console.log('filter: signin');
+      this.render('signin');
+      this.layout = 'layout_no_header';
+      return;
+
+    }
+
+    if (!emailVerified(user)) {
+
+      console.log('filter: awaiting-verification');
+      this.render('awaiting-verification');
+      this.layout = 'layout';
+
+    } else {
+
+      console.log('filter: done');
+      this.layout = 'layout';
+
+    }
+  }
+};
+
+AuthenticateController = RouteController.extend({
+  before: authenticate
+});
+
+Router.configure({
+  layout: 'layout',
+  loadingTemplate: 'loading'
+});
+
+Router.map(function () {
+  this.route('start', {
+    path: '/',
+    onBeforeRun: function () {
+      console.log('start run')
+    },
+    onBeforeReRun: function () {
+      console.log('start re-run')
+    },
+    controller: 'AuthenticateController'
+  });
+
+  this.route('signin');
+});
+
+
+/*
+Meteor.pages({
+  '/': { to: 'start', as: 'root', nav: 'start', 
+         before: [authenticate] },
+  '/signin': 'signin',
+  '/start': { to: 'start', nav: 'start', 
+         before: [authenticate] },
+  '/secrets': { to: 'secrets', nav: 'secrets', 
+         before: [authenticate] },
+  '/manage': { to: 'manage', nav: 'manage', 
+         before: [authenticate] },
+  '/signout': App.signout,
+  '*': 'not_found'
+}, {
+  defaults: {
+    layout: 'layout_no_header'
+  }
+});
+*/
+
+
+}());
diff --git a/examples/iron-router/model.js b/examples/iron-router/model.js
new file mode 100644
index 0000000000..be8a6c57f7
--- /dev/null
+++ b/examples/iron-router/model.js
@@ -0,0 +1,9 @@
+;(function () {
+
+  "use strict";
+
+// run on both the server and the client
+
+Meteor.secrets = new Meteor.Collection('secrets');
+
+}());
diff --git a/examples/iron-router/polyfills.js b/examples/iron-router/polyfills.js
new file mode 100644
index 0000000000..ad286f3645
--- /dev/null
+++ b/examples/iron-router/polyfills.js
@@ -0,0 +1,11 @@
+;(function () {
+
+  "use strict";
+
+  if(typeof String.prototype.trim !== 'function') {
+    String.prototype.trim = function() {
+      return this.replace(/^\s+|\s+$/g, ''); 
+    }
+  }
+
+}());
diff --git a/examples/iron-router/server/server.js b/examples/iron-router/server/server.js
new file mode 100644
index 0000000000..7cb5d4713f
--- /dev/null
+++ b/examples/iron-router/server/server.js
@@ -0,0 +1,119 @@
+;(function () {
+
+  "use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Patches
+//
+
+if (!console || !console.log) {
+  // stub for IE
+  console = { 
+    log: function (msg) {
+      $('#log').append(msg)
+    } 
+  };
+}
+
+
+////////////////////////////////////////////////////////////////////
+// Startup
+//
+
+Meteor.startup(function () {
+
+  ////////////////////////////////////////////////////////////////////
+  // Create Test Secrets
+  //
+    
+  if (Meteor.secrets.find().fetch().length === 0) {
+    Meteor.secrets.insert({secret:"ec2 password: apple2"});
+    Meteor.secrets.insert({secret:"domain registration pw: apple3"});
+  }
+
+
+  ////////////////////////////////////////////////////////////////////
+  // Create Test Users
+  //
+
+  if (Meteor.users.find().fetch().length === 0) {
+
+    console.log('Creating users: ');
+
+    var users = [
+        {name:"Normal User",email:"normal@example.com",roles:[]},
+        {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
+        {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
+        {name:"Admin User",email:"admin@example.com",roles:['admin']}
+      ];
+
+    _.each(users, function (userData) {
+      var id,
+          user;
+      
+      console.log(userData);
+
+      id = Accounts.createUser({
+        email: userData.email,
+        password: "apple1",
+        profile: { name: userData.name }
+      });
+
+      // email verification
+      Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
+
+      Roles.addUsersToRoles(id, userData.roles);
+    
+    });
+  }
+
+
+
+  ////////////////////////////////////////////////////////////////////
+  // Prevent non-authorized users from creating new users
+  //
+
+  Accounts.validateNewUser(function (user) {
+    var loggedInUser = Meteor.user();
+
+    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
+      return true;
+    }
+
+    throw new Meteor.Error(403, "Not authorized to create new users");
+  });
+
+});
+
+
+////////////////////////////////////////////////////////////////////
+// Publish
+//
+
+
+// Authorized users can view secrets
+Meteor.publish("secrets", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
+
+  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
+    return Meteor.secrets.find();
+  }
+
+  this.stop();
+  return;
+});
+
+// Authorized users can manage user accounts
+Meteor.publish("users", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
+
+  if (Roles.userIsInRole(user, ["admin","manage-users"])) {
+    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
+  } 
+
+  this.stop();
+  return;
+});
+
+}());
diff --git a/examples/iron-router/smart.json b/examples/iron-router/smart.json
new file mode 100644
index 0000000000..6a5e6c48ab
--- /dev/null
+++ b/examples/iron-router/smart.json
@@ -0,0 +1,10 @@
+{
+  "meteor": {
+    "git": "https://github.com/meteor/meteor.git",
+    "branch": "master"
+  },
+  "packages": {
+    "roles": {},
+    "iron-router": {}
+  }
+}

From 93f4cae5a0a24a8752a9321a73059566184a8279 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 4 Oct 2013 22:45:26 -0400
Subject: [PATCH 0069/1140] get template switching working in authenticate
 filter

---
 examples/iron-router/client/routing.js | 59 ++++++++++++--------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/examples/iron-router/client/routing.js b/examples/iron-router/client/routing.js
index 0c7abf3dcc..be3235f7dd 100644
--- a/examples/iron-router/client/routing.js
+++ b/examples/iron-router/client/routing.js
@@ -27,7 +27,7 @@ var authenticate = function () {
   if (Meteor.loggingIn()) {
 
     console.log('filter: loading');
-    this.render('loading');
+    this.template = 'loading';
     this.layout = 'layout_no_header';
 
   } else {
@@ -37,7 +37,7 @@ var authenticate = function () {
     if (!user) {
 
       console.log('filter: signin');
-      this.render('signin');
+      this.template = 'signin';
       this.layout = 'layout_no_header';
       return;
 
@@ -46,7 +46,7 @@ var authenticate = function () {
     if (!emailVerified(user)) {
 
       console.log('filter: awaiting-verification');
-      this.render('awaiting-verification');
+      this.template = 'awaiting-verification';
       this.layout = 'layout';
 
     } else {
@@ -64,44 +64,39 @@ AuthenticateController = RouteController.extend({
 
 Router.configure({
   layout: 'layout',
-  loadingTemplate: 'loading'
+  loadingTemplate: 'loading',
+  notFoundTemplate: 'not_found'
 });
 
 Router.map(function () {
   this.route('start', {
     path: '/',
-    onBeforeRun: function () {
-      console.log('start run')
-    },
-    onBeforeReRun: function () {
-      console.log('start re-run')
-    },
+    controller: 'AuthenticateController'
+  });
+  this.route('start', {
+    path: '/start',
     controller: 'AuthenticateController'
   });
 
   this.route('signin');
+
+  this.route('secrets', {
+    path: '/secrets',
+    controller: 'AuthenticateController'
+  });
+
+  this.route('manage', {
+    path: '/manage',
+    controller: 'AuthenticateController'
+  });
+
+  this.route('signout', App.signout);
+
+  // why is this necessary when notFoundTemplate is
+  // set in Router.configure?
+  this.route('*', {
+    template: 'not_found'
+  });
 });
 
-
-/*
-Meteor.pages({
-  '/': { to: 'start', as: 'root', nav: 'start', 
-         before: [authenticate] },
-  '/signin': 'signin',
-  '/start': { to: 'start', nav: 'start', 
-         before: [authenticate] },
-  '/secrets': { to: 'secrets', nav: 'secrets', 
-         before: [authenticate] },
-  '/manage': { to: 'manage', nav: 'manage', 
-         before: [authenticate] },
-  '/signout': App.signout,
-  '*': 'not_found'
-}, {
-  defaults: {
-    layout: 'layout_no_header'
-  }
-});
-*/
-
-
 }());

From 7f928d7c292a9164c75f3082caeb82617d2b0866 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 4 Oct 2013 23:05:09 -0400
Subject: [PATCH 0070/1140] use straight before filter rather than controller

---
 .../.meteor/meteorite/packages/iron-router    |  1 +
 .../client/.meteor/meteorite/packages/roles   |  1 +
 examples/iron-router/client/routing.js        | 24 +++++++++----------
 examples/iron-router/client/smart.json        |  6 +++++
 4 files changed, 20 insertions(+), 12 deletions(-)
 create mode 120000 examples/iron-router/client/.meteor/meteorite/packages/iron-router
 create mode 120000 examples/iron-router/client/.meteor/meteorite/packages/roles
 create mode 100644 examples/iron-router/client/smart.json

diff --git a/examples/iron-router/client/.meteor/meteorite/packages/iron-router b/examples/iron-router/client/.meteor/meteorite/packages/iron-router
new file mode 120000
index 0000000000..59186f3741
--- /dev/null
+++ b/examples/iron-router/client/.meteor/meteorite/packages/iron-router
@@ -0,0 +1 @@
+/Users/alanning/.meteorite/packages/iron-router/EventedMind/iron-router/3e0e22ff85630b7503d0daa1538c6d90abb84020
\ No newline at end of file
diff --git a/examples/iron-router/client/.meteor/meteorite/packages/roles b/examples/iron-router/client/.meteor/meteorite/packages/roles
new file mode 120000
index 0000000000..c234078def
--- /dev/null
+++ b/examples/iron-router/client/.meteor/meteorite/packages/roles
@@ -0,0 +1 @@
+/Users/alanning/.meteorite/packages/roles/alanning/meteor-roles/f81cbf7c765a4ed7e16a580c288db6f10a90856b/roles
\ No newline at end of file
diff --git a/examples/iron-router/client/routing.js b/examples/iron-router/client/routing.js
index be3235f7dd..73671f4fff 100644
--- a/examples/iron-router/client/routing.js
+++ b/examples/iron-router/client/routing.js
@@ -27,8 +27,9 @@ var authenticate = function () {
   if (Meteor.loggingIn()) {
 
     console.log('filter: loading');
-    this.template = 'loading';
+    this.render('loading');
     this.layout = 'layout_no_header';
+    this.stop();
 
   } else {
 
@@ -37,17 +38,18 @@ var authenticate = function () {
     if (!user) {
 
       console.log('filter: signin');
-      this.template = 'signin';
+      this.render('signin');
       this.layout = 'layout_no_header';
-      return;
-
+      this.stop();
+      return
     }
 
     if (!emailVerified(user)) {
 
       console.log('filter: awaiting-verification');
-      this.template = 'awaiting-verification';
+      this.render('awaiting-verification');
       this.layout = 'layout';
+      this.stop();
 
     } else {
 
@@ -71,23 +73,21 @@ Router.configure({
 Router.map(function () {
   this.route('start', {
     path: '/',
-    controller: 'AuthenticateController'
+    before: authenticate
   });
   this.route('start', {
-    path: '/start',
-    controller: 'AuthenticateController'
+    before: authenticate
   });
 
   this.route('signin');
 
   this.route('secrets', {
-    path: '/secrets',
-    controller: 'AuthenticateController'
+    //controller: 'AuthenticateController'
+    before: authenticate
   });
 
   this.route('manage', {
-    path: '/manage',
-    controller: 'AuthenticateController'
+    before: authenticate
   });
 
   this.route('signout', App.signout);
diff --git a/examples/iron-router/client/smart.json b/examples/iron-router/client/smart.json
new file mode 100644
index 0000000000..76f09b94b6
--- /dev/null
+++ b/examples/iron-router/client/smart.json
@@ -0,0 +1,6 @@
+{
+  "packages": {
+    "roles": {},
+    "iron-router": {}
+  }
+}

From 75f06578795f84319dd099ab63d3805667cbead9 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 5 Oct 2013 00:20:50 -0400
Subject: [PATCH 0071/1140] add example multi-filter usage

---
 examples/iron-router/client/routing.js | 89 +++++++++++++++-----------
 1 file changed, 53 insertions(+), 36 deletions(-)

diff --git a/examples/iron-router/client/routing.js b/examples/iron-router/client/routing.js
index 73671f4fff..6e41ca3f0c 100644
--- a/examples/iron-router/client/routing.js
+++ b/examples/iron-router/client/routing.js
@@ -1,6 +1,6 @@
 ;(function () {
 
-  AuthenticateController = {};
+  //AuthenticateController = {};
 
   "use strict";
 
@@ -21,48 +21,65 @@ function emailVerified (user) {
   });
 }
 
-var authenticate = function () {
-  var user;
+var filters = {
 
-  if (Meteor.loggingIn()) {
+  /**
+   * ensure user is logged in and 
+   * email verified
+   */
+  authenticate: function () {
+    var user;
 
-    console.log('filter: loading');
-    this.render('loading');
-    this.layout = 'layout_no_header';
-    this.stop();
+    if (Meteor.loggingIn()) {
 
-  } else {
-
-    user = Meteor.user();
-
-    if (!user) {
-
-      console.log('filter: signin');
-      this.render('signin');
+      console.log('filter: loading');
+      this.render('loading');
       this.layout = 'layout_no_header';
       this.stop();
-      return
-    }
-
-    if (!emailVerified(user)) {
-
-      console.log('filter: awaiting-verification');
-      this.render('awaiting-verification');
-      this.layout = 'layout';
-      this.stop();
 
     } else {
 
-      console.log('filter: done');
-      this.layout = 'layout';
+      user = Meteor.user();
 
+      if (!user) {
+
+        console.log('filter: signin');
+        this.render('signin');
+        this.layout = 'layout_no_header';
+        this.stop();
+        return
+      }
+
+      if (!emailVerified(user)) {
+
+        console.log('filter: awaiting-verification');
+        this.render('awaiting-verification');
+        this.layout = 'layout';
+        this.stop();
+
+      } else {
+
+        console.log('filter: done');
+        this.layout = 'layout';
+
+      }
     }
-  }
-};
+  },  // end authenticate
+
+  /**
+   * nop used to illustrate multiple filters
+   * use-case
+   */
+  testFilter: function () {
+    console.log('test filter')
+  }
+
+};  // end filters
+
+//AuthenticateController = RouteController.extend({
+//  before: authenticate
+//});
 
-AuthenticateController = RouteController.extend({
-  before: authenticate
-});
 
 Router.configure({
   layout: 'layout',
@@ -73,21 +90,21 @@ Router.configure({
 Router.map(function () {
   this.route('start', {
     path: '/',
-    before: authenticate
+    before: [filters.authenticate, filters.testFilter]
   });
   this.route('start', {
-    before: authenticate
+    before: [filters.authenticate, filters.testFilter]
   });
 
   this.route('signin');
 
   this.route('secrets', {
     //controller: 'AuthenticateController'
-    before: authenticate
+    before: filters.authenticate
   });
 
   this.route('manage', {
-    before: authenticate
+    before: filters.authenticate
   });
 
   this.route('signout', App.signout);

From 588c95420e2e8af7b546cd8fc825c8acb50b01f8 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Tue, 8 Oct 2013 15:32:01 -0400
Subject: [PATCH 0072/1140] Include example of how to autopublish Meteor.roles
 data

---
 README.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 56485a1bae..813ed7b059 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,19 @@ Run locally:
 ### Changes to default Meteor behavior
 
   1. User entries in the ```Meteor.users``` collection gain a new field named ```roles``` which is an array of strings corresponding to the user's roles.
-  2. A new collection ```Meteor.roles``` contains a global list of defined role names.
+  2. A new collection ```Meteor.roles``` ** contains a global list of defined role names.
   3. The currently logged-in user's ```roles``` field is automatically published to the client.
 
+<br />
+** ```Meteor.roles``` is not published by default.  Here's how you would publish it to every client without needing a subscription:
+
+```js
+// in server/publish.js
+Meteor.publish(null, function (){ 
+  return Meteor.roles.find({})
+})
+```
+
 <br />
 
 ### Usage

From 4517be95b8ce9ee6bdd895e1ae75209119e6cf4c Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sat, 26 Oct 2013 23:29:25 -0400
Subject: [PATCH 0073/1140] log publish instances for debugging

---
 examples/iron-router/server/server.js | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/examples/iron-router/server/server.js b/examples/iron-router/server/server.js
index 7cb5d4713f..3629a214ef 100644
--- a/examples/iron-router/server/server.js
+++ b/examples/iron-router/server/server.js
@@ -3,20 +3,6 @@
   "use strict";
 
 
-////////////////////////////////////////////////////////////////////
-// Patches
-//
-
-if (!console || !console.log) {
-  // stub for IE
-  console = { 
-    log: function (msg) {
-      $('#log').append(msg)
-    } 
-  };
-}
-
-
 ////////////////////////////////////////////////////////////////////
 // Startup
 //
@@ -97,6 +83,7 @@ Meteor.publish("secrets", function () {
   var user = Meteor.users.findOne({_id:this.userId});
 
   if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
+    console.log('publishing secrets', this.userId)
     return Meteor.secrets.find();
   }
 
@@ -109,6 +96,7 @@ Meteor.publish("users", function () {
   var user = Meteor.users.findOne({_id:this.userId});
 
   if (Roles.userIsInRole(user, ["admin","manage-users"])) {
+    console.log('publishing users', this.userId)
     return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
   } 
 

From 77b5ea98e1cf60181600113fd6883d744c243bb9 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 8 Dec 2013 01:15:37 -0500
Subject: [PATCH 0074/1140] use meteor instead of mrt to run example apps

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 813ed7b059..3e5b391af1 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Run locally:
   3. either
     * ```cd meteor-roles/examples/router``` or
     * ```cd meteor-roles/examples/mini-pages```
-  4. ```mrt```
+  4. ```meteor```
   5. point browser to ```http://localhost:3000```
 
 <br />
@@ -67,7 +67,7 @@ mrt add roles
 
 4. Run your application using Meteorite (rather than the normal meteor):
 ```bash
-mrt
+meteor
 ```
 
 

From 1e7803da634f37870623794fb5b86cbf41f68fd4 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 8 Dec 2013 01:17:54 -0500
Subject: [PATCH 0075/1140] tidy up

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3e5b391af1..330ac9e052 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ meteor add accounts-password
 mrt add roles
 ```
 
-4. Run your application using Meteorite (rather than the normal meteor):
+4. Run your application:
 ```bash
 meteor
 ```

From cc6cd80d503c0afc66eaa97e54ee2b7b4a84d68b Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 8 Dec 2013 01:30:49 -0500
Subject: [PATCH 0076/1140] highlight using granular permissions such as
 'view-secrets' vs traditional roles such as 'admin'

---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 330ac9e052..c6f642abeb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 meteor-roles
 ============
 
-Roles-based authorization package for Meteor - compatible with built-in accounts package.
+Authorization package for Meteor - compatible with built-in accounts package.
 
 <br />
 ### Contributors
@@ -10,6 +10,18 @@ Thanks to [@nickmoylan](https://github.com/nickmoylan) and [@mcrider](https://gi
 
 <br />
 
+### Authorization
+
+This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
+
+<br />
+
+### What's in a name...
+
+Although the name of this package is 'roles', you can define your permissions however you like.  You can have traditional roles like, "admin" or "webmaster".  But you can also assign more granular permissions such as, "view-secrets" or "manage-users".  Often times this is actually better because you are able to handle all those pesky edge cases that come up in real life usage without creating a ton of higher-level 'roles'.  To the roles package, its all strings.
+
+<br />
+
 ### Example Apps
 
 The ```examples``` directory contains Meteor apps which show off the following features:

From 8f0c4b025ceb92fd7e2705d6edd7f847f2ea82d1 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 8 Dec 2013 01:39:48 -0500
Subject: [PATCH 0077/1140] add Meteor.methods usage example

---
 README.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/README.md b/README.md
index c6f642abeb..8c75b21631 100644
--- a/README.md
+++ b/README.md
@@ -156,6 +156,31 @@ Prevent non-authorized users from creating new users:
 
 <br />
 
+Prevent access to certain functionality:
+```js
+// server/userMethods.js
+
+Meteor.methods({
+  /**
+   * delete a user
+   * 
+   * @method deleteUser
+   * @param {String} userId _id of user to delete
+   */
+  deleteUser: function (userId) {
+    var loggedInUser = Meteor.user()
+
+    if (!loggedInUser ||
+        !Roles.userIsInRole(loggedInUser, ['manage-users','admin']))
+      throw new Meteor.Error(403, "Access denied")
+
+    // perform user deletion...
+  }
+})
+```
+
+<br />
+
 -- **Client** --
 
 Client javascript has access to all the same Roles functions as the server with the addition of a ```isInRole``` handlebars helper which is automatically registered by the Roles package.

From fcdd7962190d590d493dde70a1203b50ecd79347 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 10 Dec 2013 03:29:12 -0500
Subject: [PATCH 0078/1140] Add support for per-group roles

---
 History.md            |   9 +-
 README.md             |  22 ++--
 roles/package.js      |   8 +-
 roles/roles_client.js |   6 +-
 roles/roles_common.js | 253 +++++++++++++++++++++++++++++-------------
 roles/smart.json      |   2 +-
 roles/tests/client.js |   1 +
 roles/tests/server.js | 151 +++++++++++++++++++++++--
 yuidoc.json           |   2 +-
 9 files changed, 348 insertions(+), 106 deletions(-)

diff --git a/History.md b/History.md
index 358f225659..90dd6f8d40 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,10 @@
+## v1.1.0
+
+* Add support for per-group roles
+* Fix for Issue #12 - Roles.userIsInRole returns whole user record
+  This is a breaking change for code that relied on the undocumented (and incorrect) behavior!
+
+
 ## v1.0.6
 
 * Add compatibility with Meteor 0.6.5 package system
@@ -12,7 +19,7 @@
 
 ## v1.0.4
 
-* remove need for client subscribe by using 'null' publish
+* Remove need for client subscribe by using 'null' publish
 
 
 ## v1.0.3
diff --git a/README.md b/README.md
index 8c75b21631..5e292ac5ce 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ Thanks to [@nickmoylan](https://github.com/nickmoylan) and [@mcrider](https://gi
 
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
 
+As of v1.1.0, also supports per-group roles.
+
 <br />
 
 ### What's in a name...
@@ -47,7 +49,7 @@ Run locally:
 
 ### Changes to default Meteor behavior
 
-  1. User entries in the ```Meteor.users``` collection gain a new field named ```roles``` which is an array of strings corresponding to the user's roles.
+  1. User entries in the ```Meteor.users``` collection gain a new field named ```roles``` corresponding to the user's roles.  The type of the ```roles``` field will be an array of strings when groups are not used.  When groups are used, the type will be an object which is a key/value hash of group names to string arrays.
   2. A new collection ```Meteor.roles``` ** contains a global list of defined role names.
   3. The currently logged-in user's ```roles``` field is automatically published to the client.
 
@@ -123,11 +125,11 @@ Check user roles before publishing sensitive data:
 ```js
 // server/publish.js
 
-// Give authorized users access to sensitive data
-Meteor.publish('secrets', function () {
-  if (Roles.userIsInRole(this.userId, ['view-secrets','admin'])) {
+// Give authorized users access to sensitive data by group
+Meteor.publish('secrets', function (group) {
+  if (Roles.userIsInRole(this.userId, ['view-secrets','admin'], group)) {
     
-    return Meteor.secrets.find();
+    return Meteor.secrets.find({group: group});
     
   } else {
     
@@ -162,19 +164,19 @@ Prevent access to certain functionality:
 
 Meteor.methods({
   /**
-   * delete a user
+   * delete a user from a specific group
    * 
    * @method deleteUser
    * @param {String} userId _id of user to delete
    */
-  deleteUser: function (userId) {
+  deleteUser: function (userId, group) {
     var loggedInUser = Meteor.user()
 
-    if (!loggedInUser ||
-        !Roles.userIsInRole(loggedInUser, ['manage-users','admin']))
+    if (!loggedInUser
+        || !Roles.userIsInRole(loggedInUser, ['manage-users','admin'], group))
       throw new Meteor.Error(403, "Access denied")
 
-    // perform user deletion...
+    // remove user from group...
   }
 })
 ```
diff --git a/roles/package.js b/roles/package.js
index 87cdc865c6..8e660beafd 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -14,9 +14,11 @@ Package.on_use(function (api) {
 });
 
 Package.on_test(function (api) {
-  // include accounts-password so Meteor.users exists
-  api.use(['roles','accounts-password','tinytest'], 'server');
+  var both = ['client', 'server'];
+
+  // include accounts-password so Meteor.users exists
+  api.use(['roles','accounts-password','tinytest'], both);
 
-  api.add_files('tests/server.js', 'server');
   api.add_files('tests/client.js', 'client');
+  api.add_files('tests/server.js', 'server');
 });
diff --git a/roles/roles_client.js b/roles/roles_client.js
index 7f9a6f0b9b..2568e16ed0 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -24,14 +24,16 @@ Roles._handlebarsHelpers = {
    * Handlebars helper to check if current user is in at least one
    * of the target roles.  For use in client-side templates.
    *
+   * NOTE: This helper does not currently support groups.
+   *
    * @method isInRole
    * @param {String} role name of role or comma-seperated list of roles
    * @return {Boolean} true if current user is in at least one of the target roles
    */
   isInRole: function (role) {
     var user = Meteor.user(),
-      comma = role && role.indexOf(','),
-      roles
+        comma = role && role.indexOf(','),
+        roles
 
     if (!user) return false
 
diff --git a/roles/roles_common.js b/roles/roles_common.js
index e618074a99..33491ceb74 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -15,11 +15,22 @@ if (!Meteor.roles) {
 }
 
 
+
+
+
+
+
+
+
+
+
+
+
 /**
- * <p>Role-based authorization compatible with built-in Meteor accounts package.</p>
- * <br />
- * <p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>
- * <p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>
+ * Role-based authorization compatible with built-in Meteor accounts package.
+ *
+ * Uses 'roles' collection to store existing roles with unique index on 'name' field.
+ * Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.
  *
  * @class Roles
  * @constructor
@@ -28,6 +39,11 @@ if ('undefined' === typeof Roles) {
   Roles = {}
 }
 
+"use strict";
+
+var mixingGroupAndNonGroupErrorMsg = "Roles error: Can't mix grouped and non-grouped roles for same user";
+
+
 /**
  * Create a new role. Whitespace will be trimmed.
  *
@@ -46,14 +62,14 @@ Roles.createRole = function (role) {
   }
 
   try {
-    id = Meteor.roles.insert({'name':role.trim()})
+    id = Meteor.roles.insert({'name': role.trim()})
     return id
   } catch (e) {
     // (from Meteor accounts-base package, insertUserDoc func)
     // XXX string parsing sucks, maybe
     // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
     if (e.name !== 'MongoError') throw e
-    match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/);
+    match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/)
     if (!match) throw e
     if (match[1].indexOf('$name') !== -1)
       throw new Meteor.Error(403, "Role already exists.")
@@ -69,38 +85,53 @@ Roles.createRole = function (role) {
  * @param {String} role Name of role
  */
 Roles.deleteRole = function (role) {
-  if (! role) {
-    return
-  }
+  if (!role) return
 
-  var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
+  var foundExistingUser = Meteor.users.findOne(
+                            {roles: {$in: [role]}},
+                            {fields: {_id: 1}})
 
   if (foundExistingUser) {
     throw new Meteor.Error(403, 'Role in use')
   }
 
-  var thisRole = Meteor.roles.findOne({ name: role })
+  var thisRole = Meteor.roles.findOne({name: role})
   if (thisRole) {
-    Meteor.roles.remove({ _id: thisRole._id })
+    Meteor.roles.remove({_id: thisRole._id})
   }
-};
+}
 
 /**
  * Add users to roles. Will create roles as needed.
  *
+ * NOTE: Mixing grouped and non-grouped roles for the same user
+ *       is not supported and will throw an error.
+ *
  * Makes 2 calls to database:
  *  1. retrieve list of all existing roles
  *  2. update users' roles
  *
+ * @example
+ *     Roles.addUsersToRoles(userId, 'admin')
+ *     Roles.addUsersToRoles(userId, ['user','editor'])
+ *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+ *     Roles.addUsersToRoles(userId, ['perform-action'], 'example.org')
+ *
  * @method addUsersToRoles
  * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles to add users to
+ * @param {Array|String} roles name(s) of roles/permissions to add users to
+ * @param {String} [group] Optional. Group name. If supplied, roles will
+ *                         be specific to that group.
  */
-Roles.addUsersToRoles = function (users, roles) {
+Roles.addUsersToRoles = function (users, roles, group) {
   if (!users) throw new Error ("Missing 'users' param")
   if (!roles) throw new Error ("Missing 'roles' param")
+  if (group && 'string' !== typeof group)
+    throw new Error ("Invalid parameter 'group'. Expected 'string' type")
 
-  var existingRoles
+  var existingRoles,
+      query,
+      update
 
   // ensure arrays
   if (!_.isArray(users)) users = [users]
@@ -108,17 +139,16 @@ Roles.addUsersToRoles = function (users, roles) {
 
   // remove invalid roles
   roles = _.reduce(roles, function (memo, role) {
-    if (role &&
-        'string' === typeof role &&
-        role.trim().length > 0) {
+    if (role
+        && 'string' === typeof role
+        && role.trim().length > 0) {
       memo.push(role.trim())
     }
     return memo
   }, [])
 
-  if (roles.length === 0) {
+  if (roles.length === 0)
     return
-  }
 
   // ensure all roles exist in 'roles' collection
   existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
@@ -132,22 +162,43 @@ Roles.addUsersToRoles = function (users, roles) {
   })
 
   // update all users, adding to roles set
-  if (Meteor.isClient) {
-    _.each(users, function (user) {
-      // Iterate over each user to fulfill Meteor's 'one update per ID' policy
-      Meteor.users.update(
-        {       _id: user },
-        { $addToSet: { roles: { $each: roles } } },
-        {     multi: true }
-      )
-    })
+  
+  if (group) {
+    // roles is a key/value dict object
+    update = {$addToSet: {}}
+    update.$addToSet['roles.' + group] = {$each: roles}
   } else {
-    // On the server we can leverage MongoDB's $in operator for performance
-    Meteor.users.update(
-      {       _id: { $in: users } },
-      { $addToSet: { roles: { $each: roles } } },
-      {     multi: true }
-    )
+    // assume roles is an array of strings
+    update = {$addToSet: {roles: {$each: roles}}}
+  }
+
+  try {
+    if (Meteor.isClient) {
+      // On client, iterate over each user to fulfill Meteor's 
+      // 'one update per ID' policy
+      _.each(users, function (user) {
+        Meteor.users.update({_id: user}, update)
+      })
+    } else {
+      // On the server we can use MongoDB's $in operator for 
+      // better performance
+      Meteor.users.update(
+        {_id: {$in: users}},
+        update,
+        {multi: true})
+    }
+  }
+  catch (ex) {
+    var addNonGroupToGroupedRolesMsg = 'Cannot apply $addToSet modifier to non-array',
+        addGrouped2NonGroupedMsg = "can't append to array using string field name"
+
+    if (ex.name === 'MongoError' &&
+        (ex.err === addNonGroupToGroupedRolesMsg ||
+         ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {
+      throw new Error (mixingGroupAndNonGroupErrorMsg)
+    }
+
+    throw ex
   }
 }
 
@@ -157,61 +208,90 @@ Roles.addUsersToRoles = function (users, roles) {
  * @method removeUsersFromRoles
  * @param {Array|String} users id(s) of users to add to roles
  * @param {Array|String} roles name(s) of roles to add users to
+ * @param {String} [group] Optional. Group name. If supplied, roles will
+ *                         be specific to that group.
  */
-Roles.removeUsersFromRoles = function (users, roles) {
+Roles.removeUsersFromRoles = function (users, roles, group) {
+  var update
+
   if (!users) throw new Error ("Missing 'users' param")
   if (!roles) throw new Error ("Missing 'roles' param")
+  if (group && 'string' !== typeof group) 
+    throw new Error ("Invalid 'group' param")
 
   // ensure arrays
   if (!_.isArray(users)) users = [users]
   if (!_.isArray(roles)) roles = [roles]
 
-  // update all users, remove from roles set
-  if (Meteor.isClient) {
-    // Iterate over each user to fulfill Meteor's 'one update per ID' policy
-    _.each(users, function (user) {
-      Meteor.users.update(
-        {      _id: user },
-        { $pullAll: { roles: roles } },
-        {    multi: true}
-      )
-    })
+  if (group) {
+    update = {$pullAll: {}}
+    update.$pullAll['roles.'+group] = roles
   } else {
-    // On the server we can leverage MongoDB's $in operator for performance
-    Meteor.users.update(
-      {      _id: {   $in: users } },
-      { $pullAll: { roles: roles } },
-      {    multi: true}
-    )
+    update = {$pullAll: {roles: roles}}
+  }
+
+  // update all users, remove from roles set
+  
+  try {
+    if (Meteor.isClient) {
+      // Iterate over each user to fulfill Meteor's 'one update per ID' policy
+      _.each(users, function (user) {
+        Meteor.users.update({_id:user}, update)
+      })
+    } else {
+      // On the server we can leverage MongoDB's $in operator for performance
+      Meteor.users.update({_id:{$in:users}}, update, {multi: true})
+    }
+  }
+  catch (ex) {
+    var removeNonGroupedRoleFromGroupMsg = 'Cannot apply $pull/$pullAll modifier to non-array' 
+
+    if (ex.name === 'MongoError' &&
+        ex.err === removeNonGroupedRoleFromGroupMsg) {
+      throw new Error (mixingGroupAndNonGroupErrorMsg)
+    }
+
+    throw ex
   }
 }
 
 /**
- * Check if user is in role
+ * Check if user has specified permissions/roles
  *
  * @method userIsInRole
  * @param {String|Object} user Id of user or actual user object
- * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
+ * @param {String|Array} roles Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in _any_ role.
+ * @param {String} [group] Optional. Name of group.  If supplied, limits check
+ *                         to just that group.
  * @return {Boolean} true if user is in _any_ of the target roles
  */
-Roles.userIsInRole = function (user, roles) {
+Roles.userIsInRole = function (user, roles, group) {
   var id,
-      userRoles
+      userRoles,
+      query,
+      found
 
   // ensure array to simplify code
   if (!_.isArray(roles)) {
     roles = [roles]
   }
 
-  if (!user) {
-    return false
-  } else if ('object' === typeof user) {
+  if (!user) return false
+  if (group && 'string' !== typeof group) return false
+  
+  if ('object' === typeof user) {
     userRoles = user.roles
     if (_.isArray(userRoles)) {
       return _.some(roles, function (role) {
         return _.contains(userRoles, role)
       })
+    } else if ('object' === typeof userRoles) {
+      // roles field is dictionary of groups
+      return _.isArray(userRoles[group]) && _.some(roles, function (role) {
+               return _.contains(userRoles[group], role)
+             })
     }
+
     // missing roles field, try going direct via id
     id = user._id
   } else if ('string' === typeof user) {
@@ -220,10 +300,15 @@ Roles.userIsInRole = function (user, roles) {
 
   if (!id) return false
 
-  return Meteor.users.findOne(
-    { _id: id, roles: { $in: roles } },
-    { _id: 1 }
-  )
+  if (group) {
+    query = {_id: id}
+    query['roles.'+group] = {$in: roles}
+  } else {
+    query = {_id: id, roles: {$in: roles}}
+  }
+
+  found = Meteor.users.findOne(query, {fields: {_id: 1}})
+  return found ? true : false
 }
 
 /**
@@ -231,15 +316,23 @@ Roles.userIsInRole = function (user, roles) {
  *
  * @method getRolesForUser
  * @param {String} user Id of user
- * @return {Array} Array of user's roles, unsorted
+ * @param {String} [group] Optional name of group to restrict roles to
+ * @return {Array} Array of user's roles, unsorted. undefined if user not found
  */
-Roles.getRolesForUser = function (user) {
-  var user = Meteor.users.findOne(
-    { _id: user},
-    { _id: 0, roles: 1}
-  )
+Roles.getRolesForUser = function (user, group) {
+  if (!user) return
+  if (group && 'string' !== typeof group) return
 
-  return user ? user.roles : undefined
+  var user = Meteor.users.findOne(
+               {_id: user},
+               {fields: {roles: 1}})
+
+  if (!user) return
+
+  if (group) 
+    return user.roles[group]
+
+  return user.roles
 }
 
 /**
@@ -249,7 +342,7 @@ Roles.getRolesForUser = function (user) {
  * @return {Cursor} cursor of existing roles
  */
 Roles.getAllRoles = function () {
-  return Meteor.roles.find({}, { sort: { name: 1 } })
+  return Meteor.roles.find({}, {sort: {name: 1}})
 }
 
 /**
@@ -257,12 +350,20 @@ Roles.getAllRoles = function () {
  *
  * @method getUsersInRole
  * @param {String} role Name of role
+ * @param {String} [group] Optional name of group to restrict roles to
  * @return {Cursor} cursor of users in role
  */
-Roles.getUsersInRole = function (role) {
-  return Meteor.users.find(
-    { roles: { $in: [role] } }
-  )
+Roles.getUsersInRole = function (role, group) {
+  var query 
+
+  if (group) {
+    query = { }
+    query['roles.'+group] = { $in: [role] }
+  } else {
+    query = { roles: { $in: [role] } }
+  }
+
+  return Meteor.users.find(query)
 }
 
 }());
diff --git a/roles/smart.json b/roles/smart.json
index 627997fd3f..ae3d21a927 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/client.js b/roles/tests/client.js
index cafadd26ab..d88f9458ba 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -10,6 +10,7 @@
     }
   }
 
+  console.log('loaded')
 
   Tinytest.add(
     'roles - can check current users roles via template helper', 
diff --git a/roles/tests/server.js b/roles/tests/server.js
index d7f669ebeb..2d6bc23b9a 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -20,22 +20,23 @@
   }
 
 
-  function testUser (test, user, expectedRoles) {
+  function testUser (test, user, expectedRoles, group) {
     var userId = users[user]
-
+        
     _.each(roles, function (role) {
       var expected = _.contains(expectedRoles, role),
           msg = user + ' is not in expected role ' + role,
           nmsg = user + ' is in un-expected role ' + role
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(userId, role), msg)
+        test.isTrue(Roles.userIsInRole(userId, role, group), msg)
       } else {
-        test.isFalse(Roles.userIsInRole(userId, role), nmsg)
+        test.isFalse(Roles.userIsInRole(userId, role, group), nmsg)
       }
     })
   }
 
+
   Tinytest.add(
     'roles - can create and delete roles', 
     function (test) {
@@ -293,23 +294,20 @@
     'roles - can get all roles for user', 
     function (test) {
       reset()
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
       Roles.addUsersToRoles([users.eve], ['admin', 'user'])
       test.equal(Roles.getRolesForUser(users.eve), ['admin', 'user'])
+
+      reset()
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
+      test.equal(Roles.getRolesForUser(users.eve, 'group1'), ['admin', 'user'])
     })
 
   Tinytest.add(
     'roles - can\'t get roles for non-existant user', 
     function (test) {
       reset()
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
       test.equal(Roles.getRolesForUser('1'), undefined)
+      test.equal(Roles.getRolesForUser('1', 'group1'), undefined)
     })
 
   Tinytest.add(
@@ -346,4 +344,133 @@
       test.equal(_.difference(actual, expected), [])
     })
 
+
+  Tinytest.add(
+    'roles - can add individual users to roles by group', 
+    function (test) {
+      reset() 
+
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1')
+
+      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'bob', [], 'group1')
+      testUser(test, 'joe', [], 'group1')
+
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', [], 'group2')
+      testUser(test, 'joe', [], 'group2')
+
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1')
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group2')
+
+      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'bob', [], 'group1')
+      testUser(test, 'joe', ['editor', 'user'], 'group1')
+
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', ['editor', 'user'], 'group2')
+      testUser(test, 'joe', [], 'group2')
+    })
+
+  Tinytest.add(
+    'roles - can remove individual users from roles by group', 
+    function (test) {
+      reset() 
+
+      // remove user role - one user
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'group1')
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group2')
+      testUser(test, 'eve', ['editor', 'user'], 'group1')
+      testUser(test, 'bob', ['editor', 'user'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'joe', ['admin'], 'group2')
+      Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
+      testUser(test, 'eve', ['editor'], 'group1')
+      testUser(test, 'bob', ['editor', 'user'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'joe', ['admin'], 'group2')
+    })
+
+  Tinytest.add(
+    'roles - can check if user is in role by group', 
+    function (test) {
+      reset()
+
+      Meteor.users.update(
+        {"_id":users.eve}, 
+        {$addToSet: { 'roles.group1': { $each: ['admin', 'user'] } } })
+      Meteor.users.update(
+        {"_id":users.eve}, 
+        {$addToSet: { 'roles.group2': { $each: ['editor'] } } })
+
+      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'eve', ['editor'], 'group2')
+    })
+
+  Tinytest.add(
+    'roles - mixing group with non-group throws descriptive error', 
+    function (test) {
+      var expectedErrorMsg = "Roles error: Can't mix grouped and non-grouped roles for same user"
+
+      reset() 
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1')
+      try {
+        Roles.addUsersToRoles(users.joe, ['admin'])
+      } 
+      catch (ex) {
+        test.isTrue(ex.message == expectedErrorMsg)
+      }
+
+      reset() 
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'])
+      try {
+        Roles.addUsersToRoles(users.bob, ['admin'], 'group2')
+      }
+      catch (ex) {
+        test.isTrue(ex.message == expectedErrorMsg)
+      }
+
+      reset() 
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1')
+      try {
+        Roles.removeUsersFromRoles(users.bob, ['user'])
+      }
+      catch (ex) {
+        test.isTrue(ex.message == expectedErrorMsg)
+      }
+
+      reset() 
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'])
+      // don't expect this to throw error
+      Roles.removeUsersFromRoles(users.bob, ['user'], 'group1')
+    })
+
+  Tinytest.add(
+    'roles - can get all users in role by group', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
+
+      var expected = [users.eve, users.joe],
+          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      test.equal(_.difference(actual, expected), [])
+    })
+
+  function printException (ex) {
+    var tmp = {}
+    for (var key in ex) {
+      if (key != 'stack') {
+        tmp[key] = ex[key]
+      }
+    }
+    console.log(JSON.stringify(tmp));
+  }
+
 }());
diff --git a/yuidoc.json b/yuidoc.json
index 40493da48d..00bf2a7640 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "1.0",
+  "version": "1.1.0",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor",

From b5106f61940e1752c292a6aca61259e7028c897f Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Tue, 10 Dec 2013 10:47:35 -0500
Subject: [PATCH 0079/1140] show how type of user.roles field depends on
 whether groups are used or not

---
 README.md | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5e292ac5ce..d8218cc744 100644
--- a/README.md
+++ b/README.md
@@ -49,12 +49,28 @@ Run locally:
 
 ### Changes to default Meteor behavior
 
-  1. User entries in the ```Meteor.users``` collection gain a new field named ```roles``` corresponding to the user's roles.  The type of the ```roles``` field will be an array of strings when groups are not used.  When groups are used, the type will be an object which is a key/value hash of group names to string arrays.
-  2. A new collection ```Meteor.roles``` ** contains a global list of defined role names.
-  3. The currently logged-in user's ```roles``` field is automatically published to the client.
+  1. User entries in the `Meteor.users` collection gain a new field named `roles` corresponding to the user's roles. †
+  2. A new collection `Meteor.roles` contains a global list of defined role names. ††
+  3. The currently logged-in user's `roles` field is automatically published to the client.
 
 <br />
-** ```Meteor.roles``` is not published by default.  Here's how you would publish it to every client without needing a subscription:
+
+† The type of the `roles` field depends on whether groups are used or not:
+```js
+    Roles.addUsersToRoles(bobsUserId, ['manage-team','schedule-game'])
+    // internal representation - no groups 
+    // user.roles = ['manage-team','schedule-game']
+    
+    Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester_united')
+    Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real_madrid')
+    // internal representation - groups
+    // user.roles = { 
+    //   'manchester_united': ['manage-team','schedule-game'],
+    //   'real_madrid': ['player','goalie']
+    // }
+```
+
+†† `Meteor.roles` is not published by default.  Here's how you would publish it to every client without needing a subscription:
 
 ```js
 // in server/publish.js

From 3c0533c67a7920783a9257783a58203a58b18b2b Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 10 Dec 2013 17:35:16 -0500
Subject: [PATCH 0080/1140] v1.1.1 - add support for special '_global' group

---
 History.md            |   6 +++
 roles/roles_common.js | 104 ++++++++++++++++++++++++++++--------------
 roles/tests/server.js |  85 ++++++++++++++++++++++++++++++++++
 3 files changed, 160 insertions(+), 35 deletions(-)

diff --git a/History.md b/History.md
index 90dd6f8d40..82002779a8 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,9 @@
+## v1.1.1
+
+* Add support for '_global' group which provides blanket roles/permissions across all groups for that user
+* Update Roles.getUsersInRole to accept an array of roles.
+
+
 ## v1.1.0
 
 * Add support for per-group roles
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 33491ceb74..347ebffc12 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -14,18 +14,6 @@ if (!Meteor.roles) {
   Meteor.roles = new Meteor.Collection("roles")
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 /**
  * Role-based authorization compatible with built-in Meteor accounts package.
  *
@@ -116,12 +104,18 @@ Roles.deleteRole = function (role) {
  *     Roles.addUsersToRoles(userId, ['user','editor'])
  *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
  *     Roles.addUsersToRoles(userId, ['perform-action'], 'example.org')
+ *     Roles.addUsersToRoles(userId, 'admin', '_global')
  *
  * @method addUsersToRoles
  * @param {Array|String} users id(s) of users to add to roles
  * @param {Array|String} roles name(s) of roles/permissions to add users to
- * @param {String} [group] Optional. Group name. If supplied, roles will
- *                         be specific to that group.
+ * @param {String} [group] Optional group name. If supplied, roles will be
+ *                         specific to that group.  
+ *                         The group name '_global' is special and provides a 
+ *                         convenient way to assign blanket roles/permissions
+ *                         across all groups.  The roles/permissions in the 
+ *                         '_global' group will be automatically included in 
+ *                         checks for any group.
  */
 Roles.addUsersToRoles = function (users, roles, group) {
   if (!users) throw new Error ("Missing 'users' param")
@@ -208,8 +202,8 @@ Roles.addUsersToRoles = function (users, roles, group) {
  * @method removeUsersFromRoles
  * @param {Array|String} users id(s) of users to add to roles
  * @param {Array|String} roles name(s) of roles to add users to
- * @param {String} [group] Optional. Group name. If supplied, roles will
- *                         be specific to that group.
+ * @param {String} [group] Optional. Group name. If supplied, only that
+ *                         group will have roles removed.
  */
 Roles.removeUsersFromRoles = function (users, roles, group) {
   var update
@@ -262,14 +256,16 @@ Roles.removeUsersFromRoles = function (users, roles, group) {
  * @param {String|Object} user Id of user or actual user object
  * @param {String|Array} roles Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in _any_ role.
  * @param {String} [group] Optional. Name of group.  If supplied, limits check
- *                         to just that group.
+ *                         to just that group & the user's '_global' group, if 
+ *                         any.
  * @return {Boolean} true if user is in _any_ of the target roles
  */
 Roles.userIsInRole = function (user, roles, group) {
   var id,
       userRoles,
       query,
-      found
+      groupQuery,
+      found = false
 
   // ensure array to simplify code
   if (!_.isArray(roles)) {
@@ -287,9 +283,16 @@ Roles.userIsInRole = function (user, roles, group) {
       })
     } else if ('object' === typeof userRoles) {
       // roles field is dictionary of groups
-      return _.isArray(userRoles[group]) && _.some(roles, function (role) {
-               return _.contains(userRoles[group], role)
-             })
+      found = _.isArray(userRoles[group]) && _.some(roles, function (role) {
+        return _.contains(userRoles[group], role)
+      })
+      if (!found) {
+        // not found in regular group.  check '_global' group, if it exists
+        found = _.isArray(userRoles._global) && _.some(roles, function (role) {
+          return _.contains(userRoles[group], role)
+        })
+      }
+      return found
     }
 
     // missing roles field, try going direct via id
@@ -301,8 +304,19 @@ Roles.userIsInRole = function (user, roles, group) {
   if (!id) return false
 
   if (group) {
-    query = {_id: id}
-    query['roles.'+group] = {$in: roles}
+    // structure of group query, including _global
+    //   {_id: id, 
+    //    $or: [
+    //      {'roles.group1':{$in: ['admin']}},
+    //      {'roles._global':{$in: ['admin']}}
+    //    ]}
+    
+    groupQuery = {}
+    groupQuery['roles.'+group] = {$in: roles}
+
+    query = {_id: id, $or: []}
+    query.$or.push(groupQuery)
+    query.$or.push({'roles._global': {$in: roles}})
   } else {
     query = {_id: id, roles: {$in: roles}}
   }
@@ -316,21 +330,24 @@ Roles.userIsInRole = function (user, roles, group) {
  *
  * @method getRolesForUser
  * @param {String} user Id of user
- * @param {String} [group] Optional name of group to restrict roles to
+ * @param {String} [group] Optional name of group to restrict roles to.
+ *                         '_global' group will also be checked.
  * @return {Array} Array of user's roles, unsorted. undefined if user not found
  */
 Roles.getRolesForUser = function (user, group) {
+  var user
+
   if (!user) return
   if (group && 'string' !== typeof group) return
 
-  var user = Meteor.users.findOne(
-               {_id: user},
-               {fields: {roles: 1}})
+  user = Meteor.users.findOne(
+           {_id: user},
+           {fields: {roles: 1}})
 
-  if (!user) return
+  if (!user || !user.roles) return
 
-  if (group) 
-    return user.roles[group]
+  if (group)
+    return _.union(user.roles[group], user.roles._global || [])
 
   return user.roles
 }
@@ -349,18 +366,35 @@ Roles.getAllRoles = function () {
  * Retrieve all users who are in target role
  *
  * @method getUsersInRole
- * @param {String} role Name of role
+ * @param {Array|String} role Name of role/permission.  If array, users 
+ *                            returned will have at least one of the roles
+ *                            specified but need not have _all_ roles.
  * @param {String} [group] Optional name of group to restrict roles to
+ *                         '_global' group will also be checked.
  * @return {Cursor} cursor of users in role
  */
 Roles.getUsersInRole = function (role, group) {
-  var query 
+  var query,
+      roles = role,
+      groupQuery
 
+  // ensure array to simplify query logic
+  if (!_.isArray(roles)) roles = [roles]
+  
   if (group) {
-    query = { }
-    query['roles.'+group] = { $in: [role] }
+    // structure of group query, including _global
+    //   {$or: [
+    //      {'roles.group1':{$in: ['admin']}},
+    //      {'roles._global':{$in: ['admin']}}
+    //    ]}
+    groupQuery = {}
+    groupQuery['roles.'+group] = {$in: roles}
+
+    query = {$or: []}
+    query.$or.push(groupQuery)
+    query.$or.push({'roles._global': {$in: roles}})
   } else {
-    query = { roles: { $in: [role] } }
+    query = { roles: { $in: roles } }
   }
 
   return Meteor.users.find(query)
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 2d6bc23b9a..99ffd92639 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -341,7 +341,9 @@
           actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
 
       // order may be different so check difference instead of equality
+      // difference uses first array as base so have to check both ways
       test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
     })
 
 
@@ -411,6 +413,55 @@
       testUser(test, 'eve', ['editor'], 'group2')
     })
 
+  Tinytest.add(
+    'roles - can use \'_global\' group to assign blanket permissions',
+    function (test) {
+      reset()
+
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], '_global')
+
+      testUser(test, 'eve', [], 'group1')
+      testUser(test, 'joe', ['admin'], 'group2')
+      testUser(test, 'joe', ['admin'], 'group1')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'bob', ['admin'], 'group1')
+
+      Roles.removeUsersFromRoles(users.joe, ['admin'], '_global')
+
+      testUser(test, 'eve', [], 'group1')
+      testUser(test, 'joe', [], 'group2')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'bob', ['admin'], 'group1')
+    })
+
+  Tinytest.add(
+    'roles - \'_global\' group is independent of other groups',
+    function (test) {
+      reset()
+
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group5')
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], '_global')
+
+      testUser(test, 'eve', [], 'group1')
+      testUser(test, 'joe', ['admin'], 'group5')
+      testUser(test, 'joe', ['admin'], 'group2')
+      testUser(test, 'joe', ['admin'], 'group1')
+      testUser(test, 'bob', ['admin'], 'group5')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'bob', ['admin'], 'group1')
+
+      Roles.removeUsersFromRoles(users.joe, ['admin'], '_global')
+
+      testUser(test, 'eve', [], 'group1')
+      testUser(test, 'joe', ['admin'], 'group5')
+      testUser(test, 'joe', [], 'group2')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'bob', ['admin'], 'group5')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'bob', ['admin'], 'group1')
+    })
+  
   Tinytest.add(
     'roles - mixing group with non-group throws descriptive error', 
     function (test) {
@@ -449,6 +500,15 @@
       Roles.removeUsersFromRoles(users.bob, ['user'], 'group1')
     })
 
+  Tinytest.add(
+    'roles - can get all roles for user by group including \'_global\'', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve], ['editor'], '_global')
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
+      test.equal(Roles.getRolesForUser(users.eve, 'group1'), ['admin', 'user', 'editor'])
+    })
+
   Tinytest.add(
     'roles - can get all users in role by group', 
     function (test) {
@@ -460,7 +520,32 @@
           actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
 
       // order may be different so check difference instead of equality
+      // difference uses first array as base so have to check both ways
       test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
+    })
+  
+  Tinytest.add(
+    'roles - can get all users in role by group including \'_global\' group', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], '_global')
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
+
+      var expected = [users.eve],
+          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      // difference uses first array as base so have to check both ways
+      test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
+
+      expected = [users.eve, users.bob, users.joe],
+      actual = _.pluck(Roles.getUsersInRole('admin','group2').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
     })
 
   function printException (ex) {

From d3ca09c36b0550691aa786f77c59a0880bd3f5e8 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 10 Dec 2013 17:36:54 -0500
Subject: [PATCH 0081/1140] v1.1.1 - add support for special '_global' group

---
 roles/smart.json | 2 +-
 yuidoc.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/smart.json b/roles/smart.json
index ae3d21a927..e3273a6eda 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/yuidoc.json b/yuidoc.json
index 00bf2a7640..7a65b274f9 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor",

From b6080b89885c02af228c62576f5ba48b95f715c6 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 10 Dec 2013 20:56:24 -0500
Subject: [PATCH 0082/1140] v1.1.1 - update documentation

---
 README.md                             |   2 +-
 docs/assets/css/main.css              |   3 +-
 docs/classes/Roles.html               | 262 ++++++++++++++---
 docs/data.json                        |  75 +++--
 docs/files/roles_roles_client.js.html |  68 ++---
 docs/files/roles_roles_common.js.html | 405 +++++++++++++++++---------
 docs/files/roles_roles_server.js.html |  48 +--
 docs/index.html                       |  34 +--
 docs/modules/Helpers.html             |  38 +--
 docs/modules/Roles.html               |  39 +--
 roles/roles_common.js                 |   3 +-
 yuidoc.json                           |   4 +-
 12 files changed, 660 insertions(+), 321 deletions(-)

diff --git a/README.md b/README.md
index d8218cc744..01d4c5400a 100644
--- a/README.md
+++ b/README.md
@@ -223,7 +223,7 @@ NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted
 
 ### Documentation
 
-Online API docs found here: http://alanning.github.com/meteor-roles/
+Online API docs found here: http://alanning.github.io/meteor-roles/classes/Roles.html
 
 API docs generated using [YUIDoc][2]
 
diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
index f8f7ee7116..d745d44384 100644
--- a/docs/assets/css/main.css
+++ b/docs/assets/css/main.css
@@ -25,7 +25,8 @@ html {
 }
 
 body {
-    font: 13px/1.4 'Lucida Grande', 'Lucida Sans Unicode', 'DejaVu Sans', 'Bitstream Vera Sans', 'Helvetica', 'Arial', sans-serif;
+    /*font: 13px/1.4 'Lucida Grande', 'Lucida Sans Unicode', 'DejaVu Sans', 'Bitstream Vera Sans', 'Helvetica', 'Arial', sans-serif;*/
+    font: 13px/1.4 'Helvetica', 'Arial', sans-serif;
     margin: 0;
     padding: 0;
 }
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 71ea434046..c165dcde4b 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>Roles - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -15,11 +15,11 @@
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
             
-                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 1.0</em>
+            <em>API Docs for: v1.1.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,15 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+                <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/Helpers.html">Helpers</a></li>
             
-                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+                <li><a href="../modules/Roles.html">Roles</a></li>
             
             </ul>
         </div>
@@ -94,7 +94,7 @@
 
     
         <div class="foundat">
-            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l18"><code>roles&#x2F;roles_common.js:18</code></a>
+            Defined in: <a href="../files/roles_roles_common.js.html#l17"><code>roles&#x2F;roles_common.js:17</code></a>
         </div>
     
 
@@ -111,12 +111,8 @@
 
 <div class="box intro">
     <p>Role-based authorization compatible with built-in Meteor accounts package.</p>
+<p>Stores user&#39;s current roles in a &#39;roles&#39; field on the user object.</p>
 
-<p><br /></p>
-
-<p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>
-
-<p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>
 </div>
 
 
@@ -154,7 +150,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l18"><code>roles&#x2F;roles_common.js:18</code></a>
+        <a href="../files/roles_roles_common.js.html#l17"><code>roles&#x2F;roles_common.js:17</code></a>
         
         </p>
 
@@ -298,6 +294,12 @@
                     
                 </li>
             
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
             </ul><span class="paren">)</span>
         </div>
     
@@ -327,7 +329,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l85"><code>roles&#x2F;roles_common.js:85</code></a>
+        <a href="../files/roles_roles_common.js.html#l91"><code>roles&#x2F;roles_common.js:91</code></a>
         
         </p>
 
@@ -339,10 +341,14 @@
 
     <div class="description">
         <p>Add users to roles. Will create roles as needed.</p>
+<p>NOTE: Mixing grouped and non-grouped roles for the same user
+      is not supported and will throw an error.</p>
+<p>Makes 2 calls to database:</p>
+<ol>
+<li>retrieve list of all existing roles</li>
+<li>update users&#39; roles</li>
+</ol>
 
-<p>Makes 2 calls to database:
- 1. retrieve list of all existing roles
- 2. update users' roles</p>
     </div>
 
     
@@ -361,6 +367,7 @@
 
                     <div class="param-description">
                         <p>id(s) of users to add to roles</p>
+
                     </div>
 
                     
@@ -375,7 +382,30 @@
                     
 
                     <div class="param-description">
-                        <p>name(s) of roles to add users to</p>
+                        <p>name(s) of roles/permissions to add users to</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional group name. If supplied, roles will be
+                        specific to that group.<br>                        The group name &#39;_global&#39; is special and provides a 
+                        convenient way to assign blanket roles/permissions
+                        across all groups.  The roles/permissions in the 
+                        &#39;_global&#39; group will be automatically included in 
+                        checks for any group.</p>
+
                     </div>
 
                     
@@ -388,6 +418,19 @@
     
 
     
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.addUsersToRoles(userId, &#39;admin&#39;)
+Roles.addUsersToRoles(userId, [&#39;user&#39;,&#39;editor&#39;])
+Roles.addUsersToRoles(userId, [&#39;view-secrets&#39;], &#39;example.com&#39;)
+Roles.addUsersToRoles(userId, [&#39;perform-action&#39;], &#39;example.org&#39;)
+Roles.addUsersToRoles(userId, &#39;admin&#39;, &#39;_global&#39;)</code></pre>
+
+            </div>
+        </div>
+    
 </div>
 
                 
@@ -437,7 +480,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l31"><code>roles&#x2F;roles_common.js:31</code></a>
+        <a href="../files/roles_roles_common.js.html#l34"><code>roles&#x2F;roles_common.js:34</code></a>
         
         </p>
 
@@ -449,6 +492,7 @@
 
     <div class="description">
         <p>Create a new role. Whitespace will be trimmed.</p>
+
     </div>
 
     
@@ -467,6 +511,7 @@
 
                     <div class="param-description">
                         <p>Name of role</p>
+
                     </div>
 
                     
@@ -485,7 +530,8 @@
                     
                         <span class="type">String</span>:
                     
-                    id of new role
+                    <p>id of new role</p>
+
                 
             </div>
         </div>
@@ -537,7 +583,7 @@
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l64"><code>roles&#x2F;roles_common.js:64</code></a>
+        <a href="../files/roles_roles_common.js.html#l67"><code>roles&#x2F;roles_common.js:67</code></a>
         
         </p>
 
@@ -548,8 +594,9 @@
     </div>
 
     <div class="description">
-        <p>Delete an existing role.  Will throw "Role in use" error if any users 
+        <p>Delete an existing role.  Will throw &quot;Role in use&quot; error if any users
 are currently assigned to the target role.</p>
+
     </div>
 
     
@@ -568,6 +615,7 @@ are currently assigned to the target role.</p>
 
                     <div class="param-description">
                         <p>Name of role</p>
+
                     </div>
 
                     
@@ -619,7 +667,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l242"><code>roles&#x2F;roles_common.js:242</code></a>
+        <a href="../files/roles_roles_common.js.html#l354"><code>roles&#x2F;roles_common.js:354</code></a>
         
         </p>
 
@@ -631,6 +679,7 @@ are currently assigned to the target role.</p>
 
     <div class="description">
         <p>Retrieve all existing roles</p>
+
     </div>
 
     
@@ -644,7 +693,8 @@ are currently assigned to the target role.</p>
                     
                         <span class="type">Cursor</span>:
                     
-                    cursor of existing roles
+                    <p>cursor of existing roles</p>
+
                 
             </div>
         </div>
@@ -667,6 +717,12 @@ are currently assigned to the target role.</p>
                     
                 </li>
             
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
             </ul><span class="paren">)</span>
         </div>
     
@@ -700,7 +756,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l226"><code>roles&#x2F;roles_common.js:226</code></a>
+        <a href="../files/roles_roles_common.js.html#l327"><code>roles&#x2F;roles_common.js:327</code></a>
         
         </p>
 
@@ -712,6 +768,7 @@ are currently assigned to the target role.</p>
 
     <div class="description">
         <p>Retrieve users roles</p>
+
     </div>
 
     
@@ -730,6 +787,25 @@ are currently assigned to the target role.</p>
 
                     <div class="param-description">
                         <p>Id of user</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional name of group to restrict roles to.
+                        &#39;_global&#39; group will also be checked.</p>
+
                     </div>
 
                     
@@ -748,7 +824,8 @@ are currently assigned to the target role.</p>
                     
                         <span class="type">Array</span>:
                     
-                    Array of user's roles, unsorted
+                    <p>Array of user&#39;s roles, unsorted. undefined if user not found</p>
+
                 
             </div>
         </div>
@@ -771,6 +848,12 @@ are currently assigned to the target role.</p>
                     
                 </li>
             
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
             </ul><span class="paren">)</span>
         </div>
     
@@ -804,7 +887,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l252"><code>roles&#x2F;roles_common.js:252</code></a>
+        <a href="../files/roles_roles_common.js.html#l364"><code>roles&#x2F;roles_common.js:364</code></a>
         
         </p>
 
@@ -816,6 +899,7 @@ are currently assigned to the target role.</p>
 
     <div class="description">
         <p>Retrieve all users who are in target role</p>
+
     </div>
 
     
@@ -827,13 +911,34 @@ are currently assigned to the target role.</p>
                 <li class="param">
                     
                         <code class="param-name">role</code>
-                        <span class="type">String</span>
+                        <span class="type">Array | String</span>
                     
 
                     
 
                     <div class="param-description">
-                        <p>Name of role</p>
+                        <p>Name of role/permission.  If array, users 
+                           returned will have at least one of the roles
+                           specified but need not have <em>all</em> roles.</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional name of group to restrict roles to
+                        &#39;_global&#39; group will also be checked.</p>
+
                     </div>
 
                     
@@ -852,7 +957,8 @@ are currently assigned to the target role.</p>
                     
                         <span class="type">Cursor</span>:
                     
-                    cursor of users in role
+                    <p>cursor of users in role</p>
+
                 
             </div>
         </div>
@@ -910,7 +1016,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_client.js.html#l23"><code>roles&#x2F;roles_client.js:23</code></a>
+        <a href="../files/roles_roles_client.js.html#l23"><code>roles&#x2F;roles_client.js:23</code></a>
         
         </p>
 
@@ -923,6 +1029,8 @@ are currently assigned to the target role.</p>
     <div class="description">
         <p>Handlebars helper to check if current user is in at least one
 of the target roles.  For use in client-side templates.</p>
+<p>NOTE: This helper does not currently support groups.</p>
+
     </div>
 
     
@@ -941,6 +1049,7 @@ of the target roles.  For use in client-side templates.</p>
 
                     <div class="param-description">
                         <p>name of role or comma-seperated list of roles</p>
+
                     </div>
 
                     
@@ -959,7 +1068,8 @@ of the target roles.  For use in client-side templates.</p>
                     
                         <span class="type">Boolean</span>:
                     
-                    true if current user is in at least one of the target roles
+                    <p>true if current user is in at least one of the target roles</p>
+
                 
             </div>
         </div>
@@ -988,6 +1098,12 @@ of the target roles.  For use in client-side templates.</p>
                     
                 </li>
             
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
             </ul><span class="paren">)</span>
         </div>
     
@@ -1017,7 +1133,7 @@ of the target roles.  For use in client-side templates.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l151"><code>roles&#x2F;roles_common.js:151</code></a>
+        <a href="../files/roles_roles_common.js.html#l198"><code>roles&#x2F;roles_common.js:198</code></a>
         
         </p>
 
@@ -1029,6 +1145,7 @@ of the target roles.  For use in client-side templates.</p>
 
     <div class="description">
         <p>Remove users from roles</p>
+
     </div>
 
     
@@ -1047,6 +1164,7 @@ of the target roles.  For use in client-side templates.</p>
 
                     <div class="param-description">
                         <p>id(s) of users to add to roles</p>
+
                     </div>
 
                     
@@ -1062,6 +1180,25 @@ of the target roles.  For use in client-side templates.</p>
 
                     <div class="param-description">
                         <p>name(s) of roles to add users to</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional. Group name. If supplied, only that
+                        group will have roles removed.</p>
+
                     </div>
 
                     
@@ -1096,6 +1233,12 @@ of the target roles.  For use in client-side templates.</p>
                     
                 </li>
             
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
             </ul><span class="paren">)</span>
         </div>
     
@@ -1129,7 +1272,7 @@ of the target roles.  For use in client-side templates.</p>
             
         
         
-        <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l186"><code>roles&#x2F;roles_common.js:186</code></a>
+        <a href="../files/roles_roles_common.js.html#l251"><code>roles&#x2F;roles_common.js:251</code></a>
         
         </p>
 
@@ -1140,7 +1283,8 @@ of the target roles.  For use in client-side templates.</p>
     </div>
 
     <div class="description">
-        <p>Check if user is in role</p>
+        <p>Check if user has specified permissions/roles</p>
+
     </div>
 
     
@@ -1159,6 +1303,7 @@ of the target roles.  For use in client-side templates.</p>
 
                     <div class="param-description">
                         <p>Id of user or actual user object</p>
+
                     </div>
 
                     
@@ -1173,7 +1318,27 @@ of the target roles.  For use in client-side templates.</p>
                     
 
                     <div class="param-description">
-                        <p>Name of role or Array of roles to check against.  If array, will return true if user is in <em>any</em> role.</p>
+                        <p>Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in <em>any</em> role.</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional. Name of group.  If supplied, limits check
+                        to just that group &amp; the user&#39;s &#39;_global&#39; group, if 
+                        any.</p>
+
                     </div>
 
                     
@@ -1192,7 +1357,8 @@ of the target roles.  For use in client-side templates.</p>
                     
                         <span class="type">Boolean</span>:
                     
-                    true if user is in <em>any</em> of the target roles
+                    <p>true if user is in <em>any</em> of the target roles</p>
+
                 
             </div>
         </div>
@@ -1219,13 +1385,13 @@ of the target roles.  For use in client-side templates.</p>
         </div>
     </div>
 </div>
-<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
 <script>prettyPrint();</script>
-<script src="..&#x2F;assets/js/yui-prettify.js"></script>
-<script src="..&#x2F;assets/../api.js"></script>
-<script src="..&#x2F;assets/js/api-filter.js"></script>
-<script src="..&#x2F;assets/js/api-list.js"></script>
-<script src="..&#x2F;assets/js/api-search.js"></script>
-<script src="..&#x2F;assets/js/apidocs.js"></script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
 </body>
 </html>
diff --git a/docs/data.json b/docs/data.json
index 594d804237..c11b701d84 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "1.0"
+        "version": "v1.1.1"
     },
     "files": {
         "roles/roles_client.js": {
@@ -55,7 +55,7 @@
             "namespaces": {},
             "tag": "module",
             "file": "roles/roles_common.js",
-            "line": 18,
+            "line": 17,
             "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
         }
     },
@@ -71,8 +71,8 @@
             "module": "Roles",
             "namespace": "",
             "file": "roles/roles_common.js",
-            "line": 18,
-            "description": "<p>Role-based authorization compatible with built-in Meteor accounts package.</p>\n<br />\n<p>Uses 'roles' collection to store existing roles with unique index on 'name' field.</p>\n<p>Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.</p>",
+            "line": 17,
+            "description": "Role-based authorization compatible with built-in Meteor accounts package.\n\nStores user's current roles in a 'roles' field on the user object.",
             "is_constructor": 1
         }
     },
@@ -80,7 +80,7 @@
         {
             "file": "roles/roles_client.js",
             "line": 23,
-            "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
+            "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.\n\nNOTE: This helper does not currently support groups.",
             "itemtype": "method",
             "name": "isInRole",
             "params": [
@@ -106,7 +106,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 31,
+            "line": 34,
             "description": "Create a new role. Whitespace will be trimmed.",
             "itemtype": "method",
             "name": "createRole",
@@ -126,8 +126,8 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 64,
-            "description": "Delete an existing role.  Will throw \"Role in use\" error if any users \nare currently assigned to the target role.",
+            "line": 67,
+            "description": "Delete an existing role.  Will throw \"Role in use\" error if any users\nare currently assigned to the target role.",
             "itemtype": "method",
             "name": "deleteRole",
             "params": [
@@ -142,8 +142,11 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 85,
-            "description": "Add users to roles. Will create roles as needed.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
+            "line": 91,
+            "description": "Add users to roles. Will create roles as needed.\n\nNOTE: Mixing grouped and non-grouped roles for the same user\n      is not supported and will throw an error.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
+            "example": [
+                "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['user','editor'])\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles(userId, ['perform-action'], 'example.org')\n    Roles.addUsersToRoles(userId, 'admin', '_global')"
+            ],
             "itemtype": "method",
             "name": "addUsersToRoles",
             "params": [
@@ -154,8 +157,14 @@
                 },
                 {
                     "name": "roles",
-                    "description": "name(s) of roles to add users to",
+                    "description": "name(s) of roles/permissions to add users to",
                     "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        The group name '_global' is special and provides a \n                        convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        '_global' group will be automatically included in \n                        checks for any group.",
+                    "type": "String",
+                    "optional": true
                 }
             ],
             "class": "Roles",
@@ -163,7 +172,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 151,
+            "line": 198,
             "description": "Remove users from roles",
             "itemtype": "method",
             "name": "removeUsersFromRoles",
@@ -177,6 +186,12 @@
                     "name": "roles",
                     "description": "name(s) of roles to add users to",
                     "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional. Group name. If supplied, only that\n                        group will have roles removed.",
+                    "type": "String",
+                    "optional": true
                 }
             ],
             "class": "Roles",
@@ -184,8 +199,8 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 186,
-            "description": "Check if user is in role",
+            "line": 251,
+            "description": "Check if user has specified permissions/roles",
             "itemtype": "method",
             "name": "userIsInRole",
             "params": [
@@ -196,8 +211,14 @@
                 },
                 {
                     "name": "roles",
-                    "description": "Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.",
+                    "description": "Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in _any_ role.",
                     "type": "String|Array"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional. Name of group.  If supplied, limits check\n                        to just that group & the user's '_global' group, if \n                        any.",
+                    "type": "String",
+                    "optional": true
                 }
             ],
             "return": {
@@ -209,7 +230,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 226,
+            "line": 327,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -218,10 +239,16 @@
                     "name": "user",
                     "description": "Id of user",
                     "type": "String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional name of group to restrict roles to.\n                        '_global' group will also be checked.",
+                    "type": "String",
+                    "optional": true
                 }
             ],
             "return": {
-                "description": "Array of user's roles, unsorted",
+                "description": "Array of user's roles, unsorted. undefined if user not found",
                 "type": "Array"
             },
             "class": "Roles",
@@ -229,7 +256,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 242,
+            "line": 354,
             "description": "Retrieve all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -242,15 +269,21 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 252,
+            "line": 364,
             "description": "Retrieve all users who are in target role",
             "itemtype": "method",
             "name": "getUsersInRole",
             "params": [
                 {
                     "name": "role",
-                    "description": "Name of role",
-                    "type": "String"
+                    "description": "Name of role/permission.  If array, users \n                           returned will have at least one of the roles\n                           specified but need not have _all_ roles.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional name of group to restrict roles to\n                        '_global' group will also be checked.",
+                    "type": "String",
+                    "optional": true
                 }
             ],
             "return": {
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index a0751ff849..25be23167d 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -2,12 +2,12 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>roles&#x2F;roles_client.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <title>roles/roles_client.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -15,11 +15,11 @@
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
             
-                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 1.0</em>
+            <em>API Docs for: v1.1.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,15 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+                <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/Helpers.html">Helpers</a></li>
             
-                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+                <li><a href="../modules/Roles.html">Roles</a></li>
             
             </ul>
         </div>
@@ -86,13 +86,13 @@
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1 class="file-heading">File: roles&#x2F;roles_client.js</h1>
+                        <h1 class="file-heading">File: roles/roles_client.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
 ;(function () {
 
-&#x2F;**
+/**
  * Convenience functions for use on client.
  *
  * NOTE: You must restrict user actions on the server-side; any
@@ -100,30 +100,32 @@
  * trusted.
  *
  * @module Helpers
- *&#x2F;
+ */
 
-&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;&#x2F;
-&#x2F;&#x2F; Handlebars helpers
-&#x2F;&#x2F;
-&#x2F;&#x2F; Use a semi-private variable rather than declaring Handlebars
-&#x2F;&#x2F; helpers directly so that we can unit test the helpers.
-&#x2F;&#x2F; XXX For some reason, the Handlebars helpers are not registered 
-&#x2F;&#x2F; before the tests run.
-&#x2F;&#x2F;
+////////////////////////////////////////////////////////////
+// Handlebars helpers
+//
+// Use a semi-private variable rather than declaring Handlebars
+// helpers directly so that we can unit test the helpers.
+// XXX For some reason, the Handlebars helpers are not registered 
+// before the tests run.
+//
 Roles._handlebarsHelpers = {
 
-  &#x2F;**
+  /**
    * Handlebars helper to check if current user is in at least one
    * of the target roles.  For use in client-side templates.
    *
+   * NOTE: This helper does not currently support groups.
+   *
    * @method isInRole
    * @param {String} role name of role or comma-seperated list of roles
    * @return {Boolean} true if current user is in at least one of the target roles
-   *&#x2F;
+   */
   isInRole: function (role) {
     var user = Meteor.user(),
-      comma = role &amp;&amp; role.indexOf(&#x27;,&#x27;),
-      roles
+        comma = role &amp;&amp; role.indexOf(&#x27;,&#x27;),
+        roles
 
     if (!user) return false
 
@@ -163,13 +165,13 @@ if (&#x27;undefined&#x27; !== typeof Handlebars) {
         </div>
     </div>
 </div>
-<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
 <script>prettyPrint();</script>
-<script src="..&#x2F;assets/js/yui-prettify.js"></script>
-<script src="..&#x2F;assets/../api.js"></script>
-<script src="..&#x2F;assets/js/api-filter.js"></script>
-<script src="..&#x2F;assets/js/api-list.js"></script>
-<script src="..&#x2F;assets/js/api-search.js"></script>
-<script src="..&#x2F;assets/js/apidocs.js"></script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
 </body>
 </html>
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 381a4ab3e4..a421d4cc32 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -2,12 +2,12 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>roles&#x2F;roles_common.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <title>roles/roles_common.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -15,11 +15,11 @@
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
             
-                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 1.0</em>
+            <em>API Docs for: v1.1.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,15 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+                <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/Helpers.html">Helpers</a></li>
             
-                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+                <li><a href="../modules/Roles.html">Roles</a></li>
             
             </ul>
         </div>
@@ -86,66 +86,69 @@
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1 class="file-heading">File: roles&#x2F;roles_common.js</h1>
+                        <h1 class="file-heading">File: roles/roles_common.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
 ;(function () {
 
-&#x2F;**
+/**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
  * @module Roles
- *&#x2F;
+ */
 
-&#x2F;**
+/**
  * Roles collection documents consist only of an id and a role name.
  *   ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }
- *&#x2F;
+ */
 if (!Meteor.roles) {
   Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
 }
 
-
-&#x2F;**
- * &lt;p&gt;Role-based authorization compatible with built-in Meteor accounts package.&lt;&#x2F;p&gt;
- * &lt;br &#x2F;&gt;
- * &lt;p&gt;Uses &#x27;roles&#x27; collection to store existing roles with unique index on &#x27;name&#x27; field.&lt;&#x2F;p&gt;
- * &lt;p&gt;Adds a &#x27;roles&#x27; field to user objects in &#x27;users&#x27; collection when they are added to a given role.&lt;&#x2F;p&gt;
+/**
+ * Role-based authorization compatible with built-in Meteor accounts package.
+ *
+ * Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.
  *
  * @class Roles
  * @constructor
- *&#x2F;
+ */
 if (&#x27;undefined&#x27; === typeof Roles) {
   Roles = {}
 }
 
-&#x2F;**
+&quot;use strict&quot;;
+
+var mixingGroupAndNonGroupErrorMsg = &quot;Roles error: Can&#x27;t mix grouped and non-grouped roles for same user&quot;;
+
+
+/**
  * Create a new role. Whitespace will be trimmed.
  *
  * @method createRole
  * @param {String} role Name of role
  * @return {String} id of new role
- *&#x2F;
+ */
 Roles.createRole = function (role) {
   var id,
       match
 
-  if (!role 
-      || &#x27;string&#x27; !== typeof role 
+  if (!role
+      || &#x27;string&#x27; !== typeof role
       || role.trim().length === 0) {
     return
   }
 
   try {
-    id = Meteor.roles.insert({&#x27;name&#x27;:role.trim()})
+    id = Meteor.roles.insert({&#x27;name&#x27;: role.trim()})
     return id
   } catch (e) {
-    &#x2F;&#x2F; (from Meteor accounts-base package, insertUserDoc func)
-    &#x2F;&#x2F; XXX string parsing sucks, maybe
-    &#x2F;&#x2F; https:&#x2F;&#x2F;jira.mongodb.org&#x2F;browse&#x2F;SERVER-3069 will get fixed one day
+    // (from Meteor accounts-base package, insertUserDoc func)
+    // XXX string parsing sucks, maybe
+    // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
     if (e.name !== &#x27;MongoError&#x27;) throw e
-    match = e.err.match(&#x2F;^E11000 duplicate key error index: ([^ ]+)&#x2F;);
+    match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/)
     if (!match) throw e
     if (match[1].indexOf(&#x27;$name&#x27;) !== -1)
       throw new Meteor.Error(403, &quot;Role already exists.&quot;)
@@ -153,63 +156,86 @@ Roles.createRole = function (role) {
   }
 }
 
-&#x2F;** 
- * Delete an existing role.  Will throw &quot;Role in use&quot; error if any users 
+/**
+ * Delete an existing role.  Will throw &quot;Role in use&quot; error if any users
  * are currently assigned to the target role.
- * 
+ *
  * @method deleteRole
  * @param {String} role Name of role
- *&#x2F;
+ */
 Roles.deleteRole = function (role) {
-  if (!role) {
-    return
-  }
+  if (!role) return
 
-  var foundExistingUser = Meteor.users.findOne({roles: {$in: [role]}}, {_id: 1})
+  var foundExistingUser = Meteor.users.findOne(
+                            {roles: {$in: [role]}},
+                            {fields: {_id: 1}})
 
   if (foundExistingUser) {
     throw new Meteor.Error(403, &#x27;Role in use&#x27;)
   }
 
-  Meteor.roles.remove({ name: role })
+  var thisRole = Meteor.roles.findOne({name: role})
+  if (thisRole) {
+    Meteor.roles.remove({_id: thisRole._id})
+  }
 }
 
-&#x2F;**
+/**
  * Add users to roles. Will create roles as needed.
  *
+ * NOTE: Mixing grouped and non-grouped roles for the same user
+ *       is not supported and will throw an error.
+ *
  * Makes 2 calls to database:
  *  1. retrieve list of all existing roles
  *  2. update users&#x27; roles
  *
+ * @example
+ *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;)
+ *     Roles.addUsersToRoles(userId, [&#x27;user&#x27;,&#x27;editor&#x27;])
+ *     Roles.addUsersToRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
+ *     Roles.addUsersToRoles(userId, [&#x27;perform-action&#x27;], &#x27;example.org&#x27;)
+ *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;, &#x27;_global&#x27;)
+ *
  * @method addUsersToRoles
  * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles to add users to
- *&#x2F;
-Roles.addUsersToRoles = function (users, roles) {
+ * @param {Array|String} roles name(s) of roles/permissions to add users to
+ * @param {String} [group] Optional group name. If supplied, roles will be
+ *                         specific to that group.  
+ *                         The group name &#x27;_global&#x27; is special and provides a 
+ *                         convenient way to assign blanket roles/permissions
+ *                         across all groups.  The roles/permissions in the 
+ *                         &#x27;_global&#x27; group will be automatically included in 
+ *                         checks for any group.
+ */
+Roles.addUsersToRoles = function (users, roles, group) {
   if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
   if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
+  if (group &amp;&amp; &#x27;string&#x27; !== typeof group)
+    throw new Error (&quot;Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
 
-  var existingRoles
+  var existingRoles,
+      query,
+      update
 
-  &#x2F;&#x2F; ensure arrays
+  // ensure arrays
   if (!_.isArray(users)) users = [users]
   if (!_.isArray(roles)) roles = [roles]
 
-  &#x2F;&#x2F; remove invalid roles
+  // remove invalid roles
   roles = _.reduce(roles, function (memo, role) {
-    if (role &amp;&amp;
-        &#x27;string&#x27; === typeof role &amp;&amp;
-        role.trim().length &gt; 0) {
+    if (role
+        &amp;&amp; &#x27;string&#x27; === typeof role
+        &amp;&amp; role.trim().length &gt; 0) {
       memo.push(role.trim())
     }
     return memo
   }, [])
 
-  if (roles.length === 0) {
+  if (roles.length === 0)
     return
-  }
 
-  &#x2F;&#x2F; ensure all roles exist in &#x27;roles&#x27; collection
+  // ensure all roles exist in &#x27;roles&#x27; collection
   existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
     memo[role.name] = true
     return memo
@@ -220,138 +246,249 @@ Roles.addUsersToRoles = function (users, roles) {
     }
   })
 
-  &#x2F;&#x2F; update all users, adding to roles set
-  if (Meteor.isClient) {
-    _.each(users, function (user) {
-      &#x2F;&#x2F; Iterate over each user to fulfill Meteor&#x27;s &#x27;one update per ID&#x27; policy
-      Meteor.users.update(
-        {       _id: user },
-        { $addToSet: { roles: { $each: roles } } },
-        {     multi: true }
-      )
-    })
+  // update all users, adding to roles set
+  
+  if (group) {
+    // roles is a key/value dict object
+    update = {$addToSet: {}}
+    update.$addToSet[&#x27;roles.&#x27; + group] = {$each: roles}
   } else {
-    &#x2F;&#x2F; On the server we can leverage MongoDB&#x27;s $in operator for performance
-    Meteor.users.update(
-      {       _id: { $in: users } },
-      { $addToSet: { roles: { $each: roles } } },
-      {     multi: true }
-    )
+    // assume roles is an array of strings
+    update = {$addToSet: {roles: {$each: roles}}}
+  }
+
+  try {
+    if (Meteor.isClient) {
+      // On client, iterate over each user to fulfill Meteor&#x27;s 
+      // &#x27;one update per ID&#x27; policy
+      _.each(users, function (user) {
+        Meteor.users.update({_id: user}, update)
+      })
+    } else {
+      // On the server we can use MongoDB&#x27;s $in operator for 
+      // better performance
+      Meteor.users.update(
+        {_id: {$in: users}},
+        update,
+        {multi: true})
+    }
+  }
+  catch (ex) {
+    var addNonGroupToGroupedRolesMsg = &#x27;Cannot apply $addToSet modifier to non-array&#x27;,
+        addGrouped2NonGroupedMsg = &quot;can&#x27;t append to array using string field name&quot;
+
+    if (ex.name === &#x27;MongoError&#x27; &amp;&amp;
+        (ex.err === addNonGroupToGroupedRolesMsg ||
+         ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {
+      throw new Error (mixingGroupAndNonGroupErrorMsg)
+    }
+
+    throw ex
   }
 }
 
-&#x2F;**
+/**
  * Remove users from roles
  *
  * @method removeUsersFromRoles
  * @param {Array|String} users id(s) of users to add to roles
  * @param {Array|String} roles name(s) of roles to add users to
- *&#x2F;
-Roles.removeUsersFromRoles = function (users, roles) {
+ * @param {String} [group] Optional. Group name. If supplied, only that
+ *                         group will have roles removed.
+ */
+Roles.removeUsersFromRoles = function (users, roles, group) {
+  var update
+
   if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
   if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
+  if (group &amp;&amp; &#x27;string&#x27; !== typeof group) 
+    throw new Error (&quot;Invalid &#x27;group&#x27; param&quot;)
 
-  &#x2F;&#x2F; ensure arrays
+  // ensure arrays
   if (!_.isArray(users)) users = [users]
   if (!_.isArray(roles)) roles = [roles]
 
-  &#x2F;&#x2F; update all users, remove from roles set
-  if (Meteor.isClient) {
-    &#x2F;&#x2F; Iterate over each user to fulfill Meteor&#x27;s &#x27;one update per ID&#x27; policy
-    _.each(users, function (user) {
-      Meteor.users.update(
-        {      _id: user },
-        { $pullAll: { roles: roles } },
-        {    multi: true}
-      )
-    })
+  if (group) {
+    update = {$pullAll: {}}
+    update.$pullAll[&#x27;roles.&#x27;+group] = roles
   } else {
-    &#x2F;&#x2F; On the server we can leverage MongoDB&#x27;s $in operator for performance
-    Meteor.users.update(
-      {      _id: {   $in: users } },
-      { $pullAll: { roles: roles } },
-      {    multi: true}
-    )
+    update = {$pullAll: {roles: roles}}
+  }
+
+  // update all users, remove from roles set
+  
+  try {
+    if (Meteor.isClient) {
+      // Iterate over each user to fulfill Meteor&#x27;s &#x27;one update per ID&#x27; policy
+      _.each(users, function (user) {
+        Meteor.users.update({_id:user}, update)
+      })
+    } else {
+      // On the server we can leverage MongoDB&#x27;s $in operator for performance
+      Meteor.users.update({_id:{$in:users}}, update, {multi: true})
+    }
+  }
+  catch (ex) {
+    var removeNonGroupedRoleFromGroupMsg = &#x27;Cannot apply $pull/$pullAll modifier to non-array&#x27; 
+
+    if (ex.name === &#x27;MongoError&#x27; &amp;&amp;
+        ex.err === removeNonGroupedRoleFromGroupMsg) {
+      throw new Error (mixingGroupAndNonGroupErrorMsg)
+    }
+
+    throw ex
   }
 }
 
-&#x2F;**
- * Check if user is in role
+/**
+ * Check if user has specified permissions/roles
  *
  * @method userIsInRole
  * @param {String|Object} user Id of user or actual user object
- * @param {String|Array} roles Name of role or Array of roles to check against.  If array, will return true if user is in _any_ role.
+ * @param {String|Array} roles Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in _any_ role.
+ * @param {String} [group] Optional. Name of group.  If supplied, limits check
+ *                         to just that group &amp; the user&#x27;s &#x27;_global&#x27; group, if 
+ *                         any.
  * @return {Boolean} true if user is in _any_ of the target roles
- *&#x2F;
-Roles.userIsInRole = function (user, roles) {
+ */
+Roles.userIsInRole = function (user, roles, group) {
   var id,
-      userRoles
-    
-  &#x2F;&#x2F; ensure array to simplify code
+      userRoles,
+      query,
+      groupQuery,
+      found = false
+
+  // ensure array to simplify code
   if (!_.isArray(roles)) {
     roles = [roles]
   }
+
+  if (!user) return false
+  if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return false
   
-  if (!user) {
-    return false
-  } else if (&#x27;object&#x27; === typeof user) {
+  if (&#x27;object&#x27; === typeof user) {
     userRoles = user.roles
     if (_.isArray(userRoles)) {
       return _.some(roles, function (role) {
         return _.contains(userRoles, role)
       })
+    } else if (&#x27;object&#x27; === typeof userRoles) {
+      // roles field is dictionary of groups
+      found = _.isArray(userRoles[group]) &amp;&amp; _.some(roles, function (role) {
+        return _.contains(userRoles[group], role)
+      })
+      if (!found) {
+        // not found in regular group.  check &#x27;_global&#x27; group, if it exists
+        found = _.isArray(userRoles._global) &amp;&amp; _.some(roles, function (role) {
+          return _.contains(userRoles[group], role)
+        })
+      }
+      return found
     }
-    &#x2F;&#x2F; missing roles field, try going direct via id
+
+    // missing roles field, try going direct via id
     id = user._id
   } else if (&#x27;string&#x27; === typeof user) {
     id = user
-  } 
+  }
 
   if (!id) return false
 
-  return Meteor.users.findOne(
-    { _id: id, roles: { $in: roles } },
-    { _id: 1 }
-  )
+  if (group) {
+    // structure of group query, including _global
+    //   {_id: id, 
+    //    $or: [
+    //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
+    //      {&#x27;roles._global&#x27;:{$in: [&#x27;admin&#x27;]}}
+    //    ]}
+    
+    groupQuery = {}
+    groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
+
+    query = {_id: id, $or: []}
+    query.$or.push(groupQuery)
+    query.$or.push({&#x27;roles._global&#x27;: {$in: roles}})
+  } else {
+    query = {_id: id, roles: {$in: roles}}
+  }
+
+  found = Meteor.users.findOne(query, {fields: {_id: 1}})
+  return found ? true : false
 }
 
-&#x2F;**
+/**
  * Retrieve users roles
  *
  * @method getRolesForUser
  * @param {String} user Id of user
- * @return {Array} Array of user&#x27;s roles, unsorted
- *&#x2F;
-Roles.getRolesForUser = function (user) {
-  var user = Meteor.users.findOne(
-    { _id: user},
-    { _id: 0, roles: 1}
-  )
-  
-  return user ? user.roles : undefined
+ * @param {String} [group] Optional name of group to restrict roles to.
+ *                         &#x27;_global&#x27; group will also be checked.
+ * @return {Array} Array of user&#x27;s roles, unsorted. undefined if user not found
+ */
+Roles.getRolesForUser = function (user, group) {
+  var user
+
+  if (!user) return
+  if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return
+
+  user = Meteor.users.findOne(
+           {_id: user},
+           {fields: {roles: 1}})
+
+  if (!user || !user.roles) return
+
+  if (group)
+    return _.union(user.roles[group], user.roles._global || [])
+
+  return user.roles
 }
 
-&#x2F;**
+/**
  * Retrieve all existing roles
  *
  * @method getAllRoles
  * @return {Cursor} cursor of existing roles
- *&#x2F;
+ */
 Roles.getAllRoles = function () {
-  return Meteor.roles.find({}, { sort: { name: 1 } })
+  return Meteor.roles.find({}, {sort: {name: 1}})
 }
 
-&#x2F;**
+/**
  * Retrieve all users who are in target role
  *
  * @method getUsersInRole
- * @param {String} role Name of role
+ * @param {Array|String} role Name of role/permission.  If array, users 
+ *                            returned will have at least one of the roles
+ *                            specified but need not have _all_ roles.
+ * @param {String} [group] Optional name of group to restrict roles to
+ *                         &#x27;_global&#x27; group will also be checked.
  * @return {Cursor} cursor of users in role
- *&#x2F;
-Roles.getUsersInRole = function (role) {
-  return Meteor.users.find(
-    { roles: { $in: [role] } }
-  )
+ */
+Roles.getUsersInRole = function (role, group) {
+  var query,
+      roles = role,
+      groupQuery
+
+  // ensure array to simplify query logic
+  if (!_.isArray(roles)) roles = [roles]
+  
+  if (group) {
+    // structure of group query, including _global
+    //   {$or: [
+    //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
+    //      {&#x27;roles._global&#x27;:{$in: [&#x27;admin&#x27;]}}
+    //    ]}
+    groupQuery = {}
+    groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
+
+    query = {$or: []}
+    query.$or.push(groupQuery)
+    query.$or.push({&#x27;roles._global&#x27;: {$in: roles}})
+  } else {
+    query = { roles: { $in: roles } }
+  }
+
+  return Meteor.users.find(query)
 }
 
 }());
@@ -365,13 +502,13 @@ Roles.getUsersInRole = function (role) {
         </div>
     </div>
 </div>
-<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
 <script>prettyPrint();</script>
-<script src="..&#x2F;assets/js/yui-prettify.js"></script>
-<script src="..&#x2F;assets/../api.js"></script>
-<script src="..&#x2F;assets/js/api-filter.js"></script>
-<script src="..&#x2F;assets/js/api-list.js"></script>
-<script src="..&#x2F;assets/js/api-search.js"></script>
-<script src="..&#x2F;assets/js/apidocs.js"></script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
 </body>
 </html>
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 43a5bb7c79..49f25594c2 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -2,12 +2,12 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>roles&#x2F;roles_server.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <title>roles/roles_server.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -15,11 +15,11 @@
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
             
-                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 1.0</em>
+            <em>API Docs for: v1.1.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,15 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+                <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/Helpers.html">Helpers</a></li>
             
-                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+                <li><a href="../modules/Roles.html">Roles</a></li>
             
             </ul>
         </div>
@@ -86,29 +86,29 @@
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1 class="file-heading">File: roles&#x2F;roles_server.js</h1>
+                        <h1 class="file-heading">File: roles/roles_server.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
 ;(function () {
 
 
-&#x2F;**
+/**
  * Roles collection documents consist only of an id and a role name.
  *   ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }
- *&#x2F;
+ */
 if (!Meteor.roles) {
   Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
 
-  &#x2F;&#x2F; Create default indexes for roles collection
+  // Create default indexes for roles collection
   Meteor.roles._ensureIndex(&#x27;name&#x27;, {unique: 1})
 }
 
 
-&#x2F;**
+/**
  * Always publish logged-in user&#x27;s roles so client-side
  * checks can work.
- *&#x2F;
+ */
 Meteor.publish(null, function () {
   var userId = this.userId,
       fields = {roles:1}
@@ -127,13 +127,13 @@ Meteor.publish(null, function () {
         </div>
     </div>
 </div>
-<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
 <script>prettyPrint();</script>
-<script src="..&#x2F;assets/js/yui-prettify.js"></script>
-<script src="..&#x2F;assets/../api.js"></script>
-<script src="..&#x2F;assets/js/api-filter.js"></script>
-<script src="..&#x2F;assets/js/api-list.js"></script>
-<script src="..&#x2F;assets/js/api-search.js"></script>
-<script src="..&#x2F;assets/js/apidocs.js"></script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
 </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index f81c35a4cc..207f507a85 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
-    <link rel="stylesheet" href=".&#x2F;assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href=".&#x2F;assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href=".&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="./assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="./assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="./assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -15,11 +15,11 @@
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
             
-                <h1><img src=".&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+                <h1><img src="./assets/css/logo.png" title="The meteor-roles API"></h1>
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 1.0</em>
+            <em>API Docs for: v1.1.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,15 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href=".&#x2F;classes/Roles.html">Roles</a></li>
+                <li><a href="./classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href=".&#x2F;modules/Helpers.html">Helpers</a></li>
+                <li><a href="./modules/Helpers.html">Helpers</a></li>
             
-                <li><a href=".&#x2F;modules/Roles.html">Roles</a></li>
+                <li><a href="./modules/Roles.html">Roles</a></li>
             
             </ul>
         </div>
@@ -114,13 +114,13 @@
         </div>
     </div>
 </div>
-<script src=".&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script src="./assets/vendor/prettify/prettify-min.js"></script>
 <script>prettyPrint();</script>
-<script src=".&#x2F;assets/js/yui-prettify.js"></script>
-<script src=".&#x2F;assets/../api.js"></script>
-<script src=".&#x2F;assets/js/api-filter.js"></script>
-<script src=".&#x2F;assets/js/api-list.js"></script>
-<script src=".&#x2F;assets/js/api-search.js"></script>
-<script src=".&#x2F;assets/js/apidocs.js"></script>
+<script src="./assets/js/yui-prettify.js"></script>
+<script src="./assets/../api.js"></script>
+<script src="./assets/js/api-filter.js"></script>
+<script src="./assets/js/api-list.js"></script>
+<script src="./assets/js/api-search.js"></script>
+<script src="./assets/js/apidocs.js"></script>
 </body>
 </html>
diff --git a/docs/modules/Helpers.html b/docs/modules/Helpers.html
index 29b6813113..330c0e35a0 100644
--- a/docs/modules/Helpers.html
+++ b/docs/modules/Helpers.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>Helpers - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -15,11 +15,11 @@
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
             
-                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 1.0</em>
+            <em>API Docs for: v1.1.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,15 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+                <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/Helpers.html">Helpers</a></li>
             
-                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+                <li><a href="../modules/Roles.html">Roles</a></li>
             
             </ul>
         </div>
@@ -94,7 +94,7 @@
 
     
         <div class="foundat">
-            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_client.js.html#l3"><code>roles&#x2F;roles_client.js:3</code></a>
+            Defined in: <a href="../files/roles_roles_client.js.html#l3"><code>roles&#x2F;roles_client.js:3</code></a>
         </div>
     
 
@@ -105,10 +105,10 @@
 
 <div class="box intro">
     <p>Convenience functions for use on client.</p>
-
 <p>NOTE: You must restrict user actions on the server-side; any
 client-side checks are strictly for convenience and must not be
 trusted.</p>
+
 </div>
 
 
@@ -129,13 +129,13 @@ trusted.</p>
         </div>
     </div>
 </div>
-<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
 <script>prettyPrint();</script>
-<script src="..&#x2F;assets/js/yui-prettify.js"></script>
-<script src="..&#x2F;assets/../api.js"></script>
-<script src="..&#x2F;assets/js/api-filter.js"></script>
-<script src="..&#x2F;assets/js/api-list.js"></script>
-<script src="..&#x2F;assets/js/api-search.js"></script>
-<script src="..&#x2F;assets/js/apidocs.js"></script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
 </body>
 </html>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 2968ed3e42..624d969a5f 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8">
     <title>Roles - The meteor-roles API</title>
-    <link rel="stylesheet" href="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;3.8.0&#x2F;build&#x2F;cssgrids&#x2F;cssgrids-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="..&#x2F;assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="..&#x2F;assets/favicon.png">
-    <script src="http:&#x2F;&#x2F;yui.yahooapis.com&#x2F;combo?3.8.0&#x2F;build&#x2F;yui&#x2F;yui-min.js"></script>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
 
@@ -15,11 +15,11 @@
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
             
-                <h1><img src="..&#x2F;assets/css/logo.png" title="The meteor-roles API"></h1>
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 1.0</em>
+            <em>API Docs for: v1.1.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,15 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="..&#x2F;classes/Roles.html">Roles</a></li>
+                <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="..&#x2F;modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/Helpers.html">Helpers</a></li>
             
-                <li><a href="..&#x2F;modules/Roles.html">Roles</a></li>
+                <li><a href="../modules/Roles.html">Roles</a></li>
             
             </ul>
         </div>
@@ -94,7 +94,7 @@
 
     
         <div class="foundat">
-            Defined in: <a href="..&#x2F;files&#x2F;roles_roles_common.js.html#l18"><code>roles&#x2F;roles_common.js:18</code></a>
+            Defined in: <a href="../files/roles_roles_common.js.html#l17"><code>roles&#x2F;roles_common.js:17</code></a>
         </div>
     
 
@@ -105,6 +105,7 @@
 
 <div class="box intro">
     <p>Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.</p>
+
 </div>
 
 
@@ -117,7 +118,7 @@
             <ul class="module-classes">
             
                 <li class="module-class">
-                    <a href="..&#x2F;classes/Roles.html">
+                    <a href="../classes/Roles.html">
                         Roles
                     </a>
                 </li>
@@ -137,13 +138,13 @@
         </div>
     </div>
 </div>
-<script src="..&#x2F;assets/vendor/prettify/prettify-min.js"></script>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
 <script>prettyPrint();</script>
-<script src="..&#x2F;assets/js/yui-prettify.js"></script>
-<script src="..&#x2F;assets/../api.js"></script>
-<script src="..&#x2F;assets/js/api-filter.js"></script>
-<script src="..&#x2F;assets/js/api-list.js"></script>
-<script src="..&#x2F;assets/js/api-search.js"></script>
-<script src="..&#x2F;assets/js/apidocs.js"></script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
 </body>
 </html>
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 347ebffc12..eef47687dc 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -17,8 +17,7 @@ if (!Meteor.roles) {
 /**
  * Role-based authorization compatible with built-in Meteor accounts package.
  *
- * Uses 'roles' collection to store existing roles with unique index on 'name' field.
- * Adds a 'roles' field to user objects in 'users' collection when they are added to a given role.
+ * Stores user's current roles in a 'roles' field on the user object.
  *
  * @class Roles
  * @constructor
diff --git a/yuidoc.json b/yuidoc.json
index 7a65b274f9..8ff612bc6c 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,10 +1,10 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "1.1.1",
+  "version": "v1.1.1",
   "options": {
     "outdir": "./docs",
-    "exclude": ".meteor",
+    "exclude": ".meteor,.build,tests",
     "paths": ["roles/"]
   }
 }

From 565ed93b9a532dd7171651f23cfb5d7c81b57498 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 11 Dec 2013 23:11:49 -0500
Subject: [PATCH 0083/1140] v1.2.0 - add Roles.GLOBAL_GROUP and improve
 convenience of use

---
 History.md                            |  15 +-
 README.md                             |   6 +-
 docs/classes/Roles.html               | 189 ++++++-
 docs/data.json                        |  58 ++-
 docs/files/roles_roles_client.js.html |   9 +-
 docs/files/roles_roles_common.js.html | 133 +++--
 docs/files/roles_roles_server.js.html |   2 +-
 docs/index.html                       |   2 +-
 docs/modules/Helpers.html             |   2 +-
 docs/modules/Roles.html               |   2 +-
 roles/roles_client.js                 |   7 +
 roles/roles_common.js                 | 131 +++--
 roles/smart.json                      |   2 +-
 roles/tests/client.js                 |  65 ++-
 roles/tests/server.js                 | 682 ++++++++++++++------------
 yuidoc.json                           |   2 +-
 16 files changed, 866 insertions(+), 441 deletions(-)

diff --git a/History.md b/History.md
index 82002779a8..ec43b419ff 100644
--- a/History.md
+++ b/History.md
@@ -1,7 +1,18 @@
+## v1.2.0
+
+* Use constant property Roles.GLOBAL_GROUP instead of hard-coded string to 
+  assign blanket roles/permissions for a user
+* Check Roles.GLOBAL_GROUP even if no group specified.  This does not affect 
+  normal usage but provides a convenient short-hand for group users:
+    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
+    Roles.userIsInRole(user, 'admin') => true
+* Expand test coverage
+
+
 ## v1.1.1
 
-* Add support for '_global' group which provides blanket roles/permissions across all groups for that user
-* Update Roles.getUsersInRole to accept an array of roles.
+* Add support for global group which provides blanket roles/permissions across all groups for that user
+* Update Roles.getUsersInRole to accept an array of roles
 
 
 ## v1.1.0
diff --git a/README.md b/README.md
index 01d4c5400a..c81c456a6f 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,11 @@ Thanks to [@nickmoylan](https://github.com/nickmoylan) and [@mcrider](https://gi
 
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
 
-As of v1.1.0, also supports per-group roles.
+
+- per-group support -
+
+v1.1.0 - supports per-group usage.
+v1.2.0 - adds the special Roles.GLOBAL_GROUP which can be used to provide blanket permissions for a user across all groups
 
 <br />
 
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index c165dcde4b..ab7622852e 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.1.1</em>
+            <em>API Docs for: v1.2.0</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -182,6 +182,8 @@
             <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
         
         
+            <li class="api-class-tab properties"><a href="#properties">Properties</a></li>
+        
         
         
     </ul>
@@ -264,6 +266,23 @@
             
 
             
+                <div class="index-section properties">
+                    <h3>Properties</h3>
+
+                    <ul class="index-list properties">
+                        
+                            <li class="index-item property">
+                                <a href="#property_GLOBAL_GROUP">GLOBAL_GROUP</a>
+
+                                
+                                    <span class="flag static">static</span>
+                                
+                                
+                            </li>
+                        
+                    </ul>
+                </div>
+            
 
             
 
@@ -329,7 +348,7 @@
             
         
         
-        <a href="../files/roles_roles_common.js.html#l91"><code>roles&#x2F;roles_common.js:91</code></a>
+        <a href="../files/roles_roles_common.js.html#l107"><code>roles&#x2F;roles_common.js:107</code></a>
         
         </p>
 
@@ -400,11 +419,11 @@
 
                     <div class="param-description">
                         <p>Optional group name. If supplied, roles will be
-                        specific to that group.<br>                        The group name &#39;_global&#39; is special and provides a 
-                        convenient way to assign blanket roles/permissions
+                        specific to that group.<br>                        The group Roles.GLOBAL_GROUP is special and provides 
+                        a convenient way to assign blanket roles/permissions
                         across all groups.  The roles/permissions in the 
-                        &#39;_global&#39; group will be automatically included in 
-                        checks for any group.</p>
+                        Roles.GLOBAL_GROUP group will be automatically 
+                        included in checks for any group.</p>
 
                     </div>
 
@@ -423,10 +442,10 @@
 
             <div class="example-content">
                 <pre class="code prettyprint"><code>Roles.addUsersToRoles(userId, &#39;admin&#39;)
-Roles.addUsersToRoles(userId, [&#39;user&#39;,&#39;editor&#39;])
 Roles.addUsersToRoles(userId, [&#39;view-secrets&#39;], &#39;example.com&#39;)
-Roles.addUsersToRoles(userId, [&#39;perform-action&#39;], &#39;example.org&#39;)
-Roles.addUsersToRoles(userId, &#39;admin&#39;, &#39;_global&#39;)</code></pre>
+Roles.addUsersToRoles([user1, user2], [&#39;user&#39;,&#39;editor&#39;])
+Roles.addUsersToRoles([user1, user2], [&#39;glorious-admin&#39;, &#39;perform-action&#39;], &#39;example.org&#39;)
+Roles.addUsersToRoles(userId, &#39;admin&#39;, Roles.GLOBAL_GROUP)</code></pre>
 
             </div>
         </div>
@@ -480,7 +499,7 @@ Roles.addUsersToRoles(userId, &#39;admin&#39;, &#39;_global&#39;)</code></pre>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l34"><code>roles&#x2F;roles_common.js:34</code></a>
+        <a href="../files/roles_roles_common.js.html#l50"><code>roles&#x2F;roles_common.js:50</code></a>
         
         </p>
 
@@ -583,7 +602,7 @@ Roles.addUsersToRoles(userId, &#39;admin&#39;, &#39;_global&#39;)</code></pre>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l67"><code>roles&#x2F;roles_common.js:67</code></a>
+        <a href="../files/roles_roles_common.js.html#l83"><code>roles&#x2F;roles_common.js:83</code></a>
         
         </p>
 
@@ -667,7 +686,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l354"><code>roles&#x2F;roles_common.js:354</code></a>
+        <a href="../files/roles_roles_common.js.html#l407"><code>roles&#x2F;roles_common.js:407</code></a>
         
         </p>
 
@@ -678,7 +697,7 @@ are currently assigned to the target role.</p>
     </div>
 
     <div class="description">
-        <p>Retrieve all existing roles</p>
+        <p>Retrieve set of all existing roles</p>
 
     </div>
 
@@ -713,7 +732,7 @@ are currently assigned to the target role.</p>
             
                 <li class="arg">
                     
-                        <code>user</code>
+                        <code>userId</code>
                     
                 </li>
             
@@ -756,7 +775,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l327"><code>roles&#x2F;roles_common.js:327</code></a>
+        <a href="../files/roles_roles_common.js.html#l380"><code>roles&#x2F;roles_common.js:380</code></a>
         
         </p>
 
@@ -779,7 +798,7 @@ are currently assigned to the target role.</p>
             
                 <li class="param">
                     
-                        <code class="param-name">user</code>
+                        <code class="param-name">userId</code>
                         <span class="type">String</span>
                     
 
@@ -804,7 +823,7 @@ are currently assigned to the target role.</p>
 
                     <div class="param-description">
                         <p>Optional name of group to restrict roles to.
-                        &#39;_global&#39; group will also be checked.</p>
+                        User&#39;s Roles.GLOBAL_GROUP will also be checked.</p>
 
                     </div>
 
@@ -887,7 +906,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l364"><code>roles&#x2F;roles_common.js:364</code></a>
+        <a href="../files/roles_roles_common.js.html#l417"><code>roles&#x2F;roles_common.js:417</code></a>
         
         </p>
 
@@ -898,7 +917,10 @@ are currently assigned to the target role.</p>
     </div>
 
     <div class="description">
-        <p>Retrieve all users who are in target role</p>
+        <p>Retrieve all users who are in target role.  </p>
+<p>NOTE: This is an expensive query; it performs a full collection scan
+on the users collection since there is no index set on the &#39;roles&#39; field.<br>This is by design as most queries will specify an _id so the _id index is 
+used automatically.</p>
 
     </div>
 
@@ -936,8 +958,8 @@ are currently assigned to the target role.</p>
                     
 
                     <div class="param-description">
-                        <p>Optional name of group to restrict roles to
-                        &#39;_global&#39; group will also be checked.</p>
+                        <p>Optional name of group to restrict roles to.
+                        User&#39;s Roles.GLOBAL_GROUP will also be checked.</p>
 
                     </div>
 
@@ -1076,6 +1098,19 @@ of the target roles.  For use in client-side templates.</p>
     
 
     
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>{{#if isInRole &#39;admin&#39;}}
+{{/if}}
+
+{{#if isInRole &#39;editor,user&#39;}}
+{{/if}}</code></pre>
+
+            </div>
+        </div>
+    
 </div>
 
                 
@@ -1133,7 +1168,7 @@ of the target roles.  For use in client-side templates.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l198"><code>roles&#x2F;roles_common.js:198</code></a>
+        <a href="../files/roles_roles_common.js.html#l214"><code>roles&#x2F;roles_common.js:214</code></a>
         
         </p>
 
@@ -1211,6 +1246,18 @@ of the target roles.  For use in client-side templates.</p>
     
 
     
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.removeUsersFromRoles(users.bob, &#39;admin&#39;)
+Roles.removeUsersFromRoles([users.bob, users.joe], [&#39;editor&#39;])
+Roles.removeUsersFromRoles([users.bob, users.joe], [&#39;editor&#39;, &#39;user&#39;])
+Roles.removeUsersFromRoles(users.eve, [&#39;user&#39;], &#39;group1&#39;)</code></pre>
+
+            </div>
+        </div>
+    
 </div>
 
                 
@@ -1272,7 +1319,7 @@ of the target roles.  For use in client-side templates.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l251"><code>roles&#x2F;roles_common.js:251</code></a>
+        <a href="../files/roles_roles_common.js.html#l273"><code>roles&#x2F;roles_common.js:273</code></a>
         
         </p>
 
@@ -1318,7 +1365,9 @@ of the target roles.  For use in client-side templates.</p>
                     
 
                     <div class="param-description">
-                        <p>Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in <em>any</em> role.</p>
+                        <p>Name of role/permission or Array of 
+                           roles/permissions to check against.  If array, 
+                           will return true if user is in <em>any</em> role.</p>
 
                     </div>
 
@@ -1336,8 +1385,9 @@ of the target roles.  For use in client-side templates.</p>
 
                     <div class="param-description">
                         <p>Optional. Name of group.  If supplied, limits check
-                        to just that group &amp; the user&#39;s &#39;_global&#39; group, if 
-                        any.</p>
+                        to just that group.
+                        The user&#39;s Roles.GLOBAL_GROUP will always be checked
+                        whether group is specified or not.</p>
 
                     </div>
 
@@ -1365,6 +1415,27 @@ of the target roles.  For use in client-side templates.</p>
     
 
     
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>// non-group usage
+Roles.userIsInRole(user, &#39;admin&#39;)
+Roles.userIsInRole(user, [&#39;admin&#39;,&#39;editor&#39;])
+Roles.userIsInRole(userId, &#39;admin&#39;)
+Roles.userIsInRole(userId, [&#39;admin&#39;,&#39;editor&#39;])
+
+// per-group usage
+Roles.userIsInRole(user,   [&#39;admin&#39;,&#39;editor&#39;], &#39;group1&#39;)
+Roles.userIsInRole(userId, [&#39;admin&#39;,&#39;editor&#39;], &#39;group1&#39;)
+Roles.userIsInRole(userId, [&#39;admin&#39;,&#39;editor&#39;], Roles.GLOBAL_GROUP)
+
+// this format can also be used as short-hand for Roles.GLOBAL_GROUP
+Roles.userIsInRole(user, &#39;admin&#39;)</code></pre>
+
+            </div>
+        </div>
+    
 </div>
 
                 
@@ -1372,6 +1443,72 @@ of the target roles.  For use in client-side templates.</p>
         
 
         
+            <div id="properties" class="api-class-tabpanel">
+                <h2 class="off-left">Properties</h2>
+
+                
+                    <div id="property_GLOBAL_GROUP" class="property item">
+    <h3 class="name"><code>GLOBAL_GROUP</code></h3>
+    <span class="type">String</span>
+
+    
+
+    
+
+    
+        <span class="flag final">final</span>
+    
+
+    
+        <span class="flag static">static</span>
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="../files/roles_roles_common.js.html#l34"><code>roles&#x2F;roles_common.js:34</code></a>
+        
+        </p>
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Constant used to reference the special &#39;global&#39; group that 
+can be used to apply blanket permissions across all groups.</p>
+
+    </div>
+
+    
+
+    
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.addUsersToRoles(user, &#39;admin&#39;, Roles.GLOBAL_GROUP)
+Roles.userIsInRole(user, &#39;admin&#39;) =&gt; true</code></pre>
+
+            </div>
+        </div>
+    
+
+    
+</div>
+
+                
+            </div>
+        
 
         
 
diff --git a/docs/data.json b/docs/data.json
index c11b701d84..5faac0e0f4 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.1.1"
+        "version": "v1.2.0"
     },
     "files": {
         "roles/roles_client.js": {
@@ -81,6 +81,9 @@
             "file": "roles/roles_client.js",
             "line": 23,
             "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.\n\nNOTE: This helper does not currently support groups.",
+            "example": [
+                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}"
+            ],
             "itemtype": "method",
             "name": "isInRole",
             "params": [
@@ -107,6 +110,21 @@
         {
             "file": "roles/roles_common.js",
             "line": 34,
+            "description": "Constant used to reference the special 'global' group that \ncan be used to apply blanket permissions across all groups.",
+            "example": [
+                "\n    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)\n    Roles.userIsInRole(user, 'admin') => true"
+            ],
+            "itemtype": "property",
+            "name": "GLOBAL_GROUP",
+            "type": "String",
+            "static": 1,
+            "final": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 50,
             "description": "Create a new role. Whitespace will be trimmed.",
             "itemtype": "method",
             "name": "createRole",
@@ -126,7 +144,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 67,
+            "line": 83,
             "description": "Delete an existing role.  Will throw \"Role in use\" error if any users\nare currently assigned to the target role.",
             "itemtype": "method",
             "name": "deleteRole",
@@ -142,10 +160,10 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 91,
+            "line": 107,
             "description": "Add users to roles. Will create roles as needed.\n\nNOTE: Mixing grouped and non-grouped roles for the same user\n      is not supported and will throw an error.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
             "example": [
-                "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['user','editor'])\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles(userId, ['perform-action'], 'example.org')\n    Roles.addUsersToRoles(userId, 'admin', '_global')"
+                "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')\n    Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)"
             ],
             "itemtype": "method",
             "name": "addUsersToRoles",
@@ -162,7 +180,7 @@
                 },
                 {
                     "name": "group",
-                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        The group name '_global' is special and provides a \n                        convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        '_global' group will be automatically included in \n                        checks for any group.",
+                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        The group Roles.GLOBAL_GROUP is special and provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
                     "type": "String",
                     "optional": true
                 }
@@ -172,8 +190,11 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 198,
+            "line": 214,
             "description": "Remove users from roles",
+            "example": [
+                "\n    Roles.removeUsersFromRoles(users.bob, 'admin')\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])\n    Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')"
+            ],
             "itemtype": "method",
             "name": "removeUsersFromRoles",
             "params": [
@@ -199,8 +220,11 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 251,
+            "line": 273,
             "description": "Check if user has specified permissions/roles",
+            "example": [
+                "\n    // non-group usage\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // per-group usage\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)\n\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP\n    Roles.userIsInRole(user, 'admin')"
+            ],
             "itemtype": "method",
             "name": "userIsInRole",
             "params": [
@@ -211,12 +235,12 @@
                 },
                 {
                     "name": "roles",
-                    "description": "Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in _any_ role.",
+                    "description": "Name of role/permission or Array of \n                           roles/permissions to check against.  If array, \n                           will return true if user is in _any_ role.",
                     "type": "String|Array"
                 },
                 {
                     "name": "group",
-                    "description": "Optional. Name of group.  If supplied, limits check\n                        to just that group & the user's '_global' group, if \n                        any.",
+                    "description": "Optional. Name of group.  If supplied, limits check\n                        to just that group.\n                        The user's Roles.GLOBAL_GROUP will always be checked\n                        whether group is specified or not.",
                     "type": "String",
                     "optional": true
                 }
@@ -230,19 +254,19 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 327,
+            "line": 380,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
             "params": [
                 {
-                    "name": "user",
+                    "name": "userId",
                     "description": "Id of user",
                     "type": "String"
                 },
                 {
                     "name": "group",
-                    "description": "Optional name of group to restrict roles to.\n                        '_global' group will also be checked.",
+                    "description": "Optional name of group to restrict roles to.\n                        User's Roles.GLOBAL_GROUP will also be checked.",
                     "type": "String",
                     "optional": true
                 }
@@ -256,8 +280,8 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 354,
-            "description": "Retrieve all existing roles",
+            "line": 407,
+            "description": "Retrieve set of all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
             "return": {
@@ -269,8 +293,8 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 364,
-            "description": "Retrieve all users who are in target role",
+            "line": 417,
+            "description": "Retrieve all users who are in target role.  \n\nNOTE: This is an expensive query; it performs a full collection scan\non the users collection since there is no index set on the 'roles' field.  \nThis is by design as most queries will specify an _id so the _id index is \nused automatically.",
             "itemtype": "method",
             "name": "getUsersInRole",
             "params": [
@@ -281,7 +305,7 @@
                 },
                 {
                     "name": "group",
-                    "description": "Optional name of group to restrict roles to\n                        '_global' group will also be checked.",
+                    "description": "Optional name of group to restrict roles to.\n                        User's Roles.GLOBAL_GROUP will also be checked.",
                     "type": "String",
                     "optional": true
                 }
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index 25be23167d..b85d3532a7 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.1.1</em>
+            <em>API Docs for: v1.2.0</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -118,6 +118,13 @@ Roles._handlebarsHelpers = {
    *
    * NOTE: This helper does not currently support groups.
    *
+   * @example
+   *     {{#if isInRole &#x27;admin&#x27;}}
+   *     {{/if}}
+   *
+   *     {{#if isInRole &#x27;editor,user&#x27;}}
+   *     {{/if}}
+   *
    * @method isInRole
    * @param {String} role name of role or comma-seperated list of roles
    * @return {Boolean} true if current user is in at least one of the target roles
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index a421d4cc32..a376e92043 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.1.1</em>
+            <em>API Docs for: v1.2.0</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -123,6 +123,22 @@ if (&#x27;undefined&#x27; === typeof Roles) {
 var mixingGroupAndNonGroupErrorMsg = &quot;Roles error: Can&#x27;t mix grouped and non-grouped roles for same user&quot;;
 
 
+/**
+ * Constant used to reference the special &#x27;global&#x27; group that 
+ * can be used to apply blanket permissions across all groups.
+ *
+ * @example
+ *     Roles.addUsersToRoles(user, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
+ *     Roles.userIsInRole(user, &#x27;admin&#x27;) =&gt; true
+ *
+ * @property GLOBAL_GROUP
+ * @type String
+ * @static
+ * @final
+ */
+Roles.GLOBAL_GROUP = &#x27;__roles_global__&#x27;
+
+
 /**
  * Create a new role. Whitespace will be trimmed.
  *
@@ -192,21 +208,21 @@ Roles.deleteRole = function (role) {
  *
  * @example
  *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;)
- *     Roles.addUsersToRoles(userId, [&#x27;user&#x27;,&#x27;editor&#x27;])
  *     Roles.addUsersToRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
- *     Roles.addUsersToRoles(userId, [&#x27;perform-action&#x27;], &#x27;example.org&#x27;)
- *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;, &#x27;_global&#x27;)
+ *     Roles.addUsersToRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
+ *     Roles.addUsersToRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
+ *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
  *
  * @method addUsersToRoles
  * @param {Array|String} users id(s) of users to add to roles
  * @param {Array|String} roles name(s) of roles/permissions to add users to
  * @param {String} [group] Optional group name. If supplied, roles will be
  *                         specific to that group.  
- *                         The group name &#x27;_global&#x27; is special and provides a 
- *                         convenient way to assign blanket roles/permissions
+ *                         The group Roles.GLOBAL_GROUP is special and provides 
+ *                         a convenient way to assign blanket roles/permissions
  *                         across all groups.  The roles/permissions in the 
- *                         &#x27;_global&#x27; group will be automatically included in 
- *                         checks for any group.
+ *                         Roles.GLOBAL_GROUP group will be automatically 
+ *                         included in checks for any group.
  */
 Roles.addUsersToRoles = function (users, roles, group) {
   if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
@@ -290,6 +306,12 @@ Roles.addUsersToRoles = function (users, roles, group) {
 /**
  * Remove users from roles
  *
+ * @example
+ *     Roles.removeUsersFromRoles(users.bob, &#x27;admin&#x27;)
+ *     Roles.removeUsersFromRoles([users.bob, users.joe], [&#x27;editor&#x27;])
+ *     Roles.removeUsersFromRoles([users.bob, users.joe], [&#x27;editor&#x27;, &#x27;user&#x27;])
+ *     Roles.removeUsersFromRoles(users.eve, [&#x27;user&#x27;], &#x27;group1&#x27;)
+ *
  * @method removeUsersFromRoles
  * @param {Array|String} users id(s) of users to add to roles
  * @param {Array|String} roles name(s) of roles to add users to
@@ -343,12 +365,31 @@ Roles.removeUsersFromRoles = function (users, roles, group) {
 /**
  * Check if user has specified permissions/roles
  *
+ * @example
+ *     // non-group usage
+ *     Roles.userIsInRole(user, &#x27;admin&#x27;)
+ *     Roles.userIsInRole(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
+ *     Roles.userIsInRole(userId, &#x27;admin&#x27;)
+ *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
+ *
+ *     // per-group usage
+ *     Roles.userIsInRole(user,   [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
+ *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
+ *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], Roles.GLOBAL_GROUP)
+ *
+ *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
+ *     Roles.userIsInRole(user, &#x27;admin&#x27;)
+ *
+ *    
  * @method userIsInRole
  * @param {String|Object} user Id of user or actual user object
- * @param {String|Array} roles Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in _any_ role.
+ * @param {String|Array} roles Name of role/permission or Array of 
+ *                            roles/permissions to check against.  If array, 
+ *                            will return true if user is in _any_ role.
  * @param {String} [group] Optional. Name of group.  If supplied, limits check
- *                         to just that group &amp; the user&#x27;s &#x27;_global&#x27; group, if 
- *                         any.
+ *                         to just that group.
+ *                         The user&#x27;s Roles.GLOBAL_GROUP will always be checked
+ *                         whether group is specified or not.  
  * @return {Boolean} true if user is in _any_ of the target roles
  */
 Roles.userIsInRole = function (user, roles, group) {
@@ -378,9 +419,10 @@ Roles.userIsInRole = function (user, roles, group) {
         return _.contains(userRoles[group], role)
       })
       if (!found) {
-        // not found in regular group.  check &#x27;_global&#x27; group, if it exists
-        found = _.isArray(userRoles._global) &amp;&amp; _.some(roles, function (role) {
-          return _.contains(userRoles[group], role)
+        // not found in regular group or group not specified.  
+        // check Roles.GLOBAL_GROUP, if it exists
+        found = _.isArray(userRoles[Roles.GLOBAL_GROUP]) &amp;&amp; _.some(roles, function (role) {
+          return _.contains(userRoles[Roles.GLOBAL_GROUP], role)
         })
       }
       return found
@@ -394,22 +436,33 @@ Roles.userIsInRole = function (user, roles, group) {
 
   if (!id) return false
 
+
+  query = {_id: id, $or: []}
+
+  // always check Roles.GLOBAL_GROUP
+  groupQuery = {}
+  groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
+  query.$or.push(groupQuery)
+
   if (group) {
-    // structure of group query, including _global
+    // structure of query, when group specified including Roles.GLOBAL_GROUP 
     //   {_id: id, 
     //    $or: [
     //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
-    //      {&#x27;roles._global&#x27;:{$in: [&#x27;admin&#x27;]}}
+    //      {&#x27;roles.__roles_global__&#x27;:{$in: [&#x27;admin&#x27;]}}
     //    ]}
-    
     groupQuery = {}
     groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
-
-    query = {_id: id, $or: []}
     query.$or.push(groupQuery)
-    query.$or.push({&#x27;roles._global&#x27;: {$in: roles}})
   } else {
-    query = {_id: id, roles: {$in: roles}}
+    // structure of query, where group not specified. includes 
+    // Roles.GLOBAL_GROUP 
+    //   {_id: id, 
+    //    $or: [
+    //      {roles: {$in: [&#x27;admin&#x27;]}},
+    //      {&#x27;roles.__roles_global__&#x27;: {$in: [&#x27;admin&#x27;]}}
+    //    ]}
+    query.$or.push({roles: {$in: roles}})
   }
 
   found = Meteor.users.findOne(query, {fields: {_id: 1}})
@@ -420,31 +473,31 @@ Roles.userIsInRole = function (user, roles, group) {
  * Retrieve users roles
  *
  * @method getRolesForUser
- * @param {String} user Id of user
+ * @param {String} userId Id of user
  * @param {String} [group] Optional name of group to restrict roles to.
- *                         &#x27;_global&#x27; group will also be checked.
+ *                         User&#x27;s Roles.GLOBAL_GROUP will also be checked.
  * @return {Array} Array of user&#x27;s roles, unsorted. undefined if user not found
  */
-Roles.getRolesForUser = function (user, group) {
+Roles.getRolesForUser = function (userId, group) {
   var user
 
-  if (!user) return
+  if (!userId) return
   if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return
 
   user = Meteor.users.findOne(
-           {_id: user},
+           {_id: userId},
            {fields: {roles: 1}})
 
   if (!user || !user.roles) return
 
   if (group)
-    return _.union(user.roles[group], user.roles._global || [])
+    return _.union(user.roles[group], user.roles[Roles.GLOBAL_GROUP] || [])
 
   return user.roles
 }
 
 /**
- * Retrieve all existing roles
+ * Retrieve set of all existing roles
  *
  * @method getAllRoles
  * @return {Cursor} cursor of existing roles
@@ -454,14 +507,19 @@ Roles.getAllRoles = function () {
 }
 
 /**
- * Retrieve all users who are in target role
+ * Retrieve all users who are in target role.  
+ *
+ * NOTE: This is an expensive query; it performs a full collection scan
+ * on the users collection since there is no index set on the &#x27;roles&#x27; field.  
+ * This is by design as most queries will specify an _id so the _id index is 
+ * used automatically.
  *
  * @method getUsersInRole
  * @param {Array|String} role Name of role/permission.  If array, users 
  *                            returned will have at least one of the roles
  *                            specified but need not have _all_ roles.
- * @param {String} [group] Optional name of group to restrict roles to
- *                         &#x27;_global&#x27; group will also be checked.
+ * @param {String} [group] Optional name of group to restrict roles to.
+ *                         User&#x27;s Roles.GLOBAL_GROUP will also be checked.
  * @return {Cursor} cursor of users in role
  */
 Roles.getUsersInRole = function (role, group) {
@@ -473,17 +531,20 @@ Roles.getUsersInRole = function (role, group) {
   if (!_.isArray(roles)) roles = [roles]
   
   if (group) {
-    // structure of group query, including _global
+    // structure of group query, including Roles.GLOBAL_GROUP
     //   {$or: [
     //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
-    //      {&#x27;roles._global&#x27;:{$in: [&#x27;admin&#x27;]}}
+    //      {&#x27;roles.__roles_global__&#x27;:{$in: [&#x27;admin&#x27;]}}
     //    ]}
+    query = {$or: []}
+
     groupQuery = {}
     groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
-
-    query = {$or: []}
     query.$or.push(groupQuery)
-    query.$or.push({&#x27;roles._global&#x27;: {$in: roles}})
+
+    groupQuery = {}
+    groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
+    query.$or.push(groupQuery)
   } else {
     query = { roles: { $in: roles } }
   }
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 49f25594c2..2d73ff267c 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.1.1</em>
+            <em>API Docs for: v1.2.0</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/index.html b/docs/index.html
index 207f507a85..b600658716 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.1.1</em>
+            <em>API Docs for: v1.2.0</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Helpers.html b/docs/modules/Helpers.html
index 330c0e35a0..45ec0b9e18 100644
--- a/docs/modules/Helpers.html
+++ b/docs/modules/Helpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.1.1</em>
+            <em>API Docs for: v1.2.0</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 624d969a5f..09187e8f0e 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.1.1</em>
+            <em>API Docs for: v1.2.0</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/roles/roles_client.js b/roles/roles_client.js
index 2568e16ed0..6bbfad063b 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -26,6 +26,13 @@ Roles._handlebarsHelpers = {
    *
    * NOTE: This helper does not currently support groups.
    *
+   * @example
+   *     {{#if isInRole 'admin'}}
+   *     {{/if}}
+   *
+   *     {{#if isInRole 'editor,user'}}
+   *     {{/if}}
+   *
    * @method isInRole
    * @param {String} role name of role or comma-seperated list of roles
    * @return {Boolean} true if current user is in at least one of the target roles
diff --git a/roles/roles_common.js b/roles/roles_common.js
index eef47687dc..4b8dc0c853 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -31,6 +31,22 @@ if ('undefined' === typeof Roles) {
 var mixingGroupAndNonGroupErrorMsg = "Roles error: Can't mix grouped and non-grouped roles for same user";
 
 
+/**
+ * Constant used to reference the special 'global' group that 
+ * can be used to apply blanket permissions across all groups.
+ *
+ * @example
+ *     Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
+ *     Roles.userIsInRole(user, 'admin') => true
+ *
+ * @property GLOBAL_GROUP
+ * @type String
+ * @static
+ * @final
+ */
+Roles.GLOBAL_GROUP = '__roles_global__'
+
+
 /**
  * Create a new role. Whitespace will be trimmed.
  *
@@ -100,21 +116,21 @@ Roles.deleteRole = function (role) {
  *
  * @example
  *     Roles.addUsersToRoles(userId, 'admin')
- *     Roles.addUsersToRoles(userId, ['user','editor'])
  *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
- *     Roles.addUsersToRoles(userId, ['perform-action'], 'example.org')
- *     Roles.addUsersToRoles(userId, 'admin', '_global')
+ *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
+ *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+ *     Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)
  *
  * @method addUsersToRoles
  * @param {Array|String} users id(s) of users to add to roles
  * @param {Array|String} roles name(s) of roles/permissions to add users to
  * @param {String} [group] Optional group name. If supplied, roles will be
  *                         specific to that group.  
- *                         The group name '_global' is special and provides a 
- *                         convenient way to assign blanket roles/permissions
+ *                         The group Roles.GLOBAL_GROUP is special and provides 
+ *                         a convenient way to assign blanket roles/permissions
  *                         across all groups.  The roles/permissions in the 
- *                         '_global' group will be automatically included in 
- *                         checks for any group.
+ *                         Roles.GLOBAL_GROUP group will be automatically 
+ *                         included in checks for any group.
  */
 Roles.addUsersToRoles = function (users, roles, group) {
   if (!users) throw new Error ("Missing 'users' param")
@@ -198,6 +214,12 @@ Roles.addUsersToRoles = function (users, roles, group) {
 /**
  * Remove users from roles
  *
+ * @example
+ *     Roles.removeUsersFromRoles(users.bob, 'admin')
+ *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])
+ *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])
+ *     Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
+ *
  * @method removeUsersFromRoles
  * @param {Array|String} users id(s) of users to add to roles
  * @param {Array|String} roles name(s) of roles to add users to
@@ -251,12 +273,31 @@ Roles.removeUsersFromRoles = function (users, roles, group) {
 /**
  * Check if user has specified permissions/roles
  *
+ * @example
+ *     // non-group usage
+ *     Roles.userIsInRole(user, 'admin')
+ *     Roles.userIsInRole(user, ['admin','editor'])
+ *     Roles.userIsInRole(userId, 'admin')
+ *     Roles.userIsInRole(userId, ['admin','editor'])
+ *
+ *     // per-group usage
+ *     Roles.userIsInRole(user,   ['admin','editor'], 'group1')
+ *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
+ *     Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)
+ *
+ *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
+ *     Roles.userIsInRole(user, 'admin')
+ *
+ *    
  * @method userIsInRole
  * @param {String|Object} user Id of user or actual user object
- * @param {String|Array} roles Name of role/permission or Array of roles/permissions to check against.  If array, will return true if user is in _any_ role.
+ * @param {String|Array} roles Name of role/permission or Array of 
+ *                            roles/permissions to check against.  If array, 
+ *                            will return true if user is in _any_ role.
  * @param {String} [group] Optional. Name of group.  If supplied, limits check
- *                         to just that group & the user's '_global' group, if 
- *                         any.
+ *                         to just that group.
+ *                         The user's Roles.GLOBAL_GROUP will always be checked
+ *                         whether group is specified or not.  
  * @return {Boolean} true if user is in _any_ of the target roles
  */
 Roles.userIsInRole = function (user, roles, group) {
@@ -286,9 +327,10 @@ Roles.userIsInRole = function (user, roles, group) {
         return _.contains(userRoles[group], role)
       })
       if (!found) {
-        // not found in regular group.  check '_global' group, if it exists
-        found = _.isArray(userRoles._global) && _.some(roles, function (role) {
-          return _.contains(userRoles[group], role)
+        // not found in regular group or group not specified.  
+        // check Roles.GLOBAL_GROUP, if it exists
+        found = _.isArray(userRoles[Roles.GLOBAL_GROUP]) && _.some(roles, function (role) {
+          return _.contains(userRoles[Roles.GLOBAL_GROUP], role)
         })
       }
       return found
@@ -302,22 +344,33 @@ Roles.userIsInRole = function (user, roles, group) {
 
   if (!id) return false
 
+
+  query = {_id: id, $or: []}
+
+  // always check Roles.GLOBAL_GROUP
+  groupQuery = {}
+  groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
+  query.$or.push(groupQuery)
+
   if (group) {
-    // structure of group query, including _global
+    // structure of query, when group specified including Roles.GLOBAL_GROUP 
     //   {_id: id, 
     //    $or: [
     //      {'roles.group1':{$in: ['admin']}},
-    //      {'roles._global':{$in: ['admin']}}
+    //      {'roles.__roles_global__':{$in: ['admin']}}
     //    ]}
-    
     groupQuery = {}
     groupQuery['roles.'+group] = {$in: roles}
-
-    query = {_id: id, $or: []}
     query.$or.push(groupQuery)
-    query.$or.push({'roles._global': {$in: roles}})
   } else {
-    query = {_id: id, roles: {$in: roles}}
+    // structure of query, where group not specified. includes 
+    // Roles.GLOBAL_GROUP 
+    //   {_id: id, 
+    //    $or: [
+    //      {roles: {$in: ['admin']}},
+    //      {'roles.__roles_global__': {$in: ['admin']}}
+    //    ]}
+    query.$or.push({roles: {$in: roles}})
   }
 
   found = Meteor.users.findOne(query, {fields: {_id: 1}})
@@ -328,31 +381,31 @@ Roles.userIsInRole = function (user, roles, group) {
  * Retrieve users roles
  *
  * @method getRolesForUser
- * @param {String} user Id of user
+ * @param {String} userId Id of user
  * @param {String} [group] Optional name of group to restrict roles to.
- *                         '_global' group will also be checked.
+ *                         User's Roles.GLOBAL_GROUP will also be checked.
  * @return {Array} Array of user's roles, unsorted. undefined if user not found
  */
-Roles.getRolesForUser = function (user, group) {
+Roles.getRolesForUser = function (userId, group) {
   var user
 
-  if (!user) return
+  if (!userId) return
   if (group && 'string' !== typeof group) return
 
   user = Meteor.users.findOne(
-           {_id: user},
+           {_id: userId},
            {fields: {roles: 1}})
 
   if (!user || !user.roles) return
 
   if (group)
-    return _.union(user.roles[group], user.roles._global || [])
+    return _.union(user.roles[group], user.roles[Roles.GLOBAL_GROUP] || [])
 
   return user.roles
 }
 
 /**
- * Retrieve all existing roles
+ * Retrieve set of all existing roles
  *
  * @method getAllRoles
  * @return {Cursor} cursor of existing roles
@@ -362,14 +415,19 @@ Roles.getAllRoles = function () {
 }
 
 /**
- * Retrieve all users who are in target role
+ * Retrieve all users who are in target role.  
+ *
+ * NOTE: This is an expensive query; it performs a full collection scan
+ * on the users collection since there is no index set on the 'roles' field.  
+ * This is by design as most queries will specify an _id so the _id index is 
+ * used automatically.
  *
  * @method getUsersInRole
  * @param {Array|String} role Name of role/permission.  If array, users 
  *                            returned will have at least one of the roles
  *                            specified but need not have _all_ roles.
- * @param {String} [group] Optional name of group to restrict roles to
- *                         '_global' group will also be checked.
+ * @param {String} [group] Optional name of group to restrict roles to.
+ *                         User's Roles.GLOBAL_GROUP will also be checked.
  * @return {Cursor} cursor of users in role
  */
 Roles.getUsersInRole = function (role, group) {
@@ -381,17 +439,20 @@ Roles.getUsersInRole = function (role, group) {
   if (!_.isArray(roles)) roles = [roles]
   
   if (group) {
-    // structure of group query, including _global
+    // structure of group query, including Roles.GLOBAL_GROUP
     //   {$or: [
     //      {'roles.group1':{$in: ['admin']}},
-    //      {'roles._global':{$in: ['admin']}}
+    //      {'roles.__roles_global__':{$in: ['admin']}}
     //    ]}
+    query = {$or: []}
+
     groupQuery = {}
     groupQuery['roles.'+group] = {$in: roles}
-
-    query = {$or: []}
     query.$or.push(groupQuery)
-    query.$or.push({'roles._global': {$in: roles}})
+
+    groupQuery = {}
+    groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
+    query.$or.push(groupQuery)
   } else {
     query = { roles: { $in: roles } }
   }
diff --git a/roles/smart.json b/roles/smart.json
index e3273a6eda..4d5bf61ea7 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/client.js b/roles/tests/client.js
index d88f9458ba..6ada02a9ba 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -2,7 +2,49 @@
 
   "use strict";
 
-  // Mock Meteor.user() for role testing
+  var users,
+      roles = ['admin','editor','user']
+
+  users = {
+    'eve': {
+      _id: 'eve',
+      roles: ['admin', 'editor']
+    },
+    'bob': {
+      _id: 'bob',
+      roles: {
+        'group1': ['user'],
+        'group2': ['editor']
+      }
+    },
+    'joe': {
+      _id: 'joe',
+      roles: {
+        '__roles_global__': ['admin'],
+        'group1': ['editor']
+      }
+    }
+  }
+
+  function testUser (test, username, expectedRoles, group) {
+    var user = users[username]
+
+    // test using user object rather than userId to avoid mocking
+    _.each(roles, function (role) {
+      var expected = _.contains(expectedRoles, role),
+          msg = username + ' expected to have \'' + role + '\' permission but does not',
+          nmsg = username + ' had un-expected permission ' + role
+
+      if (expected) {
+        test.isTrue(Roles.userIsInRole(user, role, group), msg)
+      } else {
+        test.isFalse(Roles.userIsInRole(user, role, group), nmsg)
+      }
+    })
+  }
+
+
+  // Mock Meteor.user() for isInRole handlebars helper testing
   Meteor.user = function () {
     return {
       _id: 'testId',
@@ -10,8 +52,6 @@
     }
   }
 
-  console.log('loaded')
-
   Tinytest.add(
     'roles - can check current users roles via template helper', 
     function (test) {
@@ -30,5 +70,24 @@
       test.equal(actual, expected)
     })
 
+  Tinytest.add(
+    'roles - can check if user is in role', 
+    function (test) {
+      testUser(test, 'eve', ['admin', 'editor'])
+    })
 
+  Tinytest.add(
+    'roles - can check if user is in role by group', 
+    function (test) {
+      testUser(test, 'bob', ['user'], 'group1')
+      testUser(test, 'bob', ['editor'], 'group2')
+    })
+
+  Tinytest.add(
+    'roles - can check if user is in role with Roles.GLOBAL_GROUP', 
+    function (test) {
+      testUser(test, 'joe', ['admin'])
+      testUser(test, 'joe', ['admin'], Roles.GLOBAL_GROUP)
+      testUser(test, 'joe', ['admin', 'editor'], 'group1')
+    })
 }());
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 99ffd92639..c8d7d5010b 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -3,6 +3,9 @@
   var users = {},
       roles = ['admin','editor','user']
 
+  // use to run individual tests
+  //Tinytest.oadd = Tinytest.add
+  //Tinytest.add = function () {}
 
   function addUser (name) {
     return Accounts.createUser({'username': name})
@@ -20,18 +23,28 @@
   }
 
 
-  function testUser (test, user, expectedRoles, group) {
-    var userId = users[user]
+  function testUser (test, username, expectedRoles, group) {
+    var userId = users[username],
+        userObj = Meteor.users.findOne({_id: userId})
         
+    // check using user ids (makes db calls)
+    _innerTest(test, userId, username, expectedRoles, group)
+
+    // check using passed-in user object
+    _innerTest(test, userObj, username, expectedRoles, group)
+  }
+
+  function _innerTest (test, userParam, username, expectedRoles, group) {
+    // test that user has only the roles expected and no others
     _.each(roles, function (role) {
       var expected = _.contains(expectedRoles, role),
-          msg = user + ' is not in expected role ' + role,
-          nmsg = user + ' is in un-expected role ' + role
+          msg = username + ' expected to have \'' + role + '\' permission but does not',
+          nmsg = username + ' had un-expected permission ' + role
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(userId, role, group), msg)
+        test.isTrue(Roles.userIsInRole(userParam, role, group), msg)
       } else {
-        test.isFalse(Roles.userIsInRole(userId, role, group), nmsg)
+        test.isFalse(Roles.userIsInRole(userParam, role, group), nmsg)
       }
     })
   }
@@ -66,216 +79,6 @@
       test.throws(function () {Roles.createRole('test1')})
     })
 
-  Tinytest.add(
-    'roles - can check if user is in role', 
-    function (test) {
-      reset()
-
-      Meteor.users.update(
-        {"_id":users.eve}, 
-        {$addToSet: { roles: { $each: ['admin', 'user'] } } }
-      )
-      testUser(test, 'eve', ['admin', 'user'])
-    })
-
-  Tinytest.add(
-    'roles - can check if non-existant user is in role', 
-    function (test) {
-      reset()
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      test.isFalse(Roles.userIsInRole('1', 'admin'))
-    })
-
-  Tinytest.add(
-    'roles - can check user in role via object', 
-    function (test) {
-      var user 
-
-      reset()
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-      user = Meteor.users.findOne({_id:users.eve})
-
-      test.isTrue(Roles.userIsInRole(user, 'admin'))
-    })
-
-  Tinytest.add(
-    'roles - userIsInRole returns false when user is null', 
-    function (test) {
-      var user 
-
-      reset()
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      user = null
-
-      test.isFalse(Roles.userIsInRole(user, 'admin'))
-    })
-
-  Tinytest.add(
-    'roles - can check user against several roles at once', 
-    function (test) {
-      var user 
-
-      reset()
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-      user = Meteor.users.findOne({_id:users.eve})
-
-      test.isTrue(Roles.userIsInRole(user, ['editor','admin']))
-    })
-
-  Tinytest.add(
-    'roles - can add individual users to roles', 
-    function (test) {
-      reset() 
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
-
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'])
-
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', ['editor', 'user'])
-    })
-
-  Tinytest.add(
-    'roles - can add user to roles multiple times', 
-    function (test) {
-      reset() 
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
-    })
-
-  Tinytest.add(
-    'roles - can add multiple users to roles', 
-    function (test) {
-      reset() 
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
-
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'user'])
-      testUser(test, 'joe', [])
-
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
-
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'editor', 'user'])
-      testUser(test, 'joe', ['editor', 'user'])
-    })
-
-  Tinytest.add(
-    'roles - can\'t add non-exist user to role', 
-    function (test) {
-      reset()
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      Roles.addUsersToRoles(['1'], ['admin'])
-      test.equal(Meteor.users.findOne({_id:'1'}), undefined)
-    })
-
-  Tinytest.add(
-    'roles - can remove individual users from roles', 
-    function (test) {
-      reset() 
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-      testUser(test, 'bob', ['editor', 'user'])
-    })
-  Tinytest.add(
-    'roles - can remove user from roles multiple times',
-    function (test) {
-      reset() 
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-      testUser(test, 'bob', ['editor', 'user'])
-
-      // try remove again
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-    })
-
-  Tinytest.add(
-    'roles - can remove multiple users from roles', 
-    function (test) {
-      reset() 
-
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      // remove user role - two users
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin'))
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'user', 'editor'])
-      testUser(test, 'joe', ['admin', 'user'])
-      Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
-      testUser(test, 'bob', ['user', 'editor'])
-      testUser(test, 'joe', ['user'])
-    })
-
   Tinytest.add(
     'roles - can\'t create role with empty names', 
     function (test) {
@@ -291,61 +94,88 @@
     })
 
   Tinytest.add(
-    'roles - can get all roles for user', 
+    'roles - can check if user is in role', 
     function (test) {
       reset()
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'])
-      test.equal(Roles.getRolesForUser(users.eve), ['admin', 'user'])
 
-      reset()
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
-      test.equal(Roles.getRolesForUser(users.eve, 'group1'), ['admin', 'user'])
+      Meteor.users.update(
+        {"_id":users.eve}, 
+        {$addToSet: { roles: { $each: ['admin', 'user'] } } }
+      )
+      testUser(test, 'eve', ['admin', 'user'])
     })
 
   Tinytest.add(
-    'roles - can\'t get roles for non-existant user', 
+    'roles - can check if user is in role by group', 
     function (test) {
       reset()
-      test.equal(Roles.getRolesForUser('1'), undefined)
-      test.equal(Roles.getRolesForUser('1', 'group1'), undefined)
+
+      Meteor.users.update(
+        {"_id":users.eve}, 
+        {$addToSet: { 'roles.group1': { $each: ['admin', 'user'] } } })
+      Meteor.users.update(
+        {"_id":users.eve}, 
+        {$addToSet: { 'roles.group2': { $each: ['editor'] } } })
+
+      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'eve', ['editor'], 'group2')
     })
 
   Tinytest.add(
-    'roles - can get all roles', 
+    'roles - can check if non-existant user is in role', 
     function (test) {
       reset()
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
 
-      // compare roles, sorted alphabetically
-      var expected = roles,
-          actual = _.pluck(Roles.getAllRoles().fetch(), 'name')
-
-      test.equal(actual, expected)
+      test.isFalse(Roles.userIsInRole('1', 'admin'))
     })
 
-
   Tinytest.add(
-    'roles - can get all users in role', 
+    'roles - can check if null user is in role', 
     function (test) {
+      var user = null
       reset()
-      _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
-
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
-
-      var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
-
-      // order may be different so check difference instead of equality
-      // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
+      
+      test.isFalse(Roles.userIsInRole(user, 'admin'))
     })
 
+  Tinytest.add(
+    'roles - can check user against several roles at once', 
+    function (test) {
+      var user 
+      reset()
+
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      user = Meteor.users.findOne({_id:users.eve})
+
+      test.isTrue(Roles.userIsInRole(user, ['editor','admin']))
+    })
+
+  Tinytest.add(
+    'roles - can\'t add non-existent user to role', 
+    function (test) {
+      reset()
+
+      Roles.addUsersToRoles(['1'], ['admin'])
+      test.equal(Meteor.users.findOne({_id:'1'}), undefined)
+    })
+
+  Tinytest.add(
+    'roles - can add individual users to roles', 
+    function (test) {
+      reset() 
+
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
+
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', ['editor', 'user'])
+    })
 
   Tinytest.add(
     'roles - can add individual users to roles by group', 
@@ -374,6 +204,122 @@
       testUser(test, 'joe', [], 'group2')
     })
 
+  Tinytest.add(
+    'roles - can add user to roles multiple times', 
+    function (test) {
+      reset() 
+
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
+
+      Roles.addUsersToRoles(users.bob, ['admin'])
+      Roles.addUsersToRoles(users.bob, ['editor'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'editor'])
+      testUser(test, 'joe', [])
+    })
+
+  Tinytest.add(
+    'roles - can add user to roles multiple times by group', 
+    function (test) {
+      reset() 
+
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1')
+
+      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'bob', [], 'group1')
+      testUser(test, 'joe', [], 'group1')
+
+      Roles.addUsersToRoles(users.bob, ['admin'], 'group1')
+      Roles.addUsersToRoles(users.bob, ['editor'], 'group1')
+
+      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'bob', ['admin', 'editor'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+    })
+
+  Tinytest.add(
+    'roles - can add multiple users to roles', 
+    function (test) {
+      reset() 
+
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'user'])
+      testUser(test, 'joe', [])
+
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'editor', 'user'])
+      testUser(test, 'joe', ['editor', 'user'])
+    })
+
+  Tinytest.add(
+    'roles - can add multiple users to roles by group', 
+    function (test) {
+      reset() 
+
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'group1')
+
+      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'bob', ['admin', 'user'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', [], 'group2')
+      testUser(test, 'joe', [], 'group2')
+
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'group1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'group2')
+
+      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'group1')
+      testUser(test, 'joe', ['editor', 'user'], 'group1')
+
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', ['editor', 'user'], 'group2')
+      testUser(test, 'joe', ['editor', 'user'], 'group2')
+    })
+
+  Tinytest.add(
+    'roles - can remove individual users from roles', 
+    function (test) {
+      reset() 
+
+      // remove user role - one user
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+      testUser(test, 'bob', ['editor', 'user'])
+    })
+  Tinytest.add(
+    'roles - can remove user from roles multiple times',
+    function (test) {
+      reset() 
+
+      // remove user role - one user
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+      testUser(test, 'bob', ['editor', 'user'])
+
+      // try remove again
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+    })
+
   Tinytest.add(
     'roles - can remove individual users from roles by group', 
     function (test) {
@@ -388,6 +334,7 @@
       testUser(test, 'eve', [], 'group2')
       testUser(test, 'bob', ['admin'], 'group2')
       testUser(test, 'joe', ['admin'], 'group2')
+
       Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
       testUser(test, 'eve', ['editor'], 'group1')
       testUser(test, 'bob', ['editor', 'user'], 'group1')
@@ -398,27 +345,168 @@
     })
 
   Tinytest.add(
-    'roles - can check if user is in role by group', 
+    'roles - can remove multiple users from roles', 
     function (test) {
-      reset()
+      reset() 
 
-      Meteor.users.update(
-        {"_id":users.eve}, 
-        {$addToSet: { 'roles.group1': { $each: ['admin', 'user'] } } })
-      Meteor.users.update(
-        {"_id":users.eve}, 
-        {$addToSet: { 'roles.group2': { $each: ['editor'] } } })
+      // remove user role - two users
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1')
-      testUser(test, 'eve', ['editor'], 'group2')
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin'))
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'user', 'editor'])
+      testUser(test, 'joe', ['admin', 'user'])
+      Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
+      testUser(test, 'bob', ['user', 'editor'])
+      testUser(test, 'joe', ['user'])
     })
 
   Tinytest.add(
-    'roles - can use \'_global\' group to assign blanket permissions',
+    'roles - can remove multiple users from roles by group', 
+    function (test) {
+      reset() 
+
+      // remove user role - one user
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'group1')
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group2')
+      testUser(test, 'eve', ['editor', 'user'], 'group1')
+      testUser(test, 'bob', ['editor', 'user'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'joe', ['admin'], 'group2')
+
+      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'group1')
+      testUser(test, 'eve', ['editor'], 'group1')
+      testUser(test, 'bob', ['editor'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'joe', ['admin'], 'group2')
+
+      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'group2')
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', [], 'group2')
+      testUser(test, 'joe', [], 'group2')
+    })
+
+  Tinytest.add(
+    'roles - can get all roles', 
+    function (test) {
+      reset()
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
+
+      // compare roles, sorted alphabetically
+      var expected = roles,
+          actual = _.pluck(Roles.getAllRoles().fetch(), 'name')
+
+      test.equal(actual, expected)
+    })
+
+  Tinytest.add(
+    'roles - can\'t get roles for non-existant user', 
+    function (test) {
+      reset()
+      test.equal(Roles.getRolesForUser('1'), undefined)
+      test.equal(Roles.getRolesForUser('1', 'group1'), undefined)
+    })
+
+  Tinytest.add(
+    'roles - can get all roles for user', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'])
+      test.equal(Roles.getRolesForUser(users.eve), ['admin', 'user'])
+    })
+
+  Tinytest.add(
+    'roles - can get all roles for user by group', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
+      test.equal(Roles.getRolesForUser(users.eve, 'group1'), ['admin', 'user'])
+    })
+
+  Tinytest.add(
+    'roles - can get all roles for user by group including Roles.GLOBAL_GROUP', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP)
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
+      test.equal(Roles.getRolesForUser(users.eve, 'group1'), ['admin', 'user', 'editor'])
+    })
+
+
+  Tinytest.add(
+    'roles - can get all users in role', 
+    function (test) {
+      reset()
+      _.each(roles, function (role) {
+        Roles.createRole(role)
+      })
+
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
+
+      var expected = [users.eve, users.joe],
+          actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      // difference uses first array as base so have to check both ways
+      test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
+    })
+
+  Tinytest.add(
+    'roles - can get all users in role by group', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
+
+      var expected = [users.eve, users.joe],
+          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      // difference uses first array as base so have to check both ways
+      test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
+    })
+  
+  Tinytest.add(
+    'roles - can get all users in role by group including Roles.GLOBAL_GROUP', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_GROUP)
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
+
+      var expected = [users.eve],
+          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      // difference uses first array as base so have to check both ways
+      test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
+
+      expected = [users.eve, users.bob, users.joe],
+      actual = _.pluck(Roles.getUsersInRole('admin','group2').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
+    })
+
+
+  Tinytest.add(
+    'roles - can use Roles.GLOBAL_GROUP to assign blanket permissions',
     function (test) {
       reset()
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], '_global')
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_GROUP)
 
       testUser(test, 'eve', [], 'group1')
       testUser(test, 'joe', ['admin'], 'group2')
@@ -426,7 +514,7 @@
       testUser(test, 'bob', ['admin'], 'group2')
       testUser(test, 'bob', ['admin'], 'group1')
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], '_global')
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_GROUP)
 
       testUser(test, 'eve', [], 'group1')
       testUser(test, 'joe', [], 'group2')
@@ -436,12 +524,12 @@
     })
 
   Tinytest.add(
-    'roles - \'_global\' group is independent of other groups',
+    'roles - Roles.GLOBAL_GROUP is independent of other groups',
     function (test) {
       reset()
 
       Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group5')
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], '_global')
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_GROUP)
 
       testUser(test, 'eve', [], 'group1')
       testUser(test, 'joe', ['admin'], 'group5')
@@ -451,7 +539,7 @@
       testUser(test, 'bob', ['admin'], 'group2')
       testUser(test, 'bob', ['admin'], 'group1')
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], '_global')
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_GROUP)
 
       testUser(test, 'eve', [], 'group1')
       testUser(test, 'joe', ['admin'], 'group5')
@@ -462,6 +550,20 @@
       testUser(test, 'bob', ['admin'], 'group1')
     })
   
+  Tinytest.add(
+    'roles - Roles.GLOBAL_GROUP also checked when group not specified',
+    function (test) {
+      reset()
+
+      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_GROUP)
+
+      testUser(test, 'joe', ['admin'])
+
+      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_GROUP)
+
+      testUser(test, 'joe', [])
+    })
+
   Tinytest.add(
     'roles - mixing group with non-group throws descriptive error', 
     function (test) {
@@ -500,54 +602,6 @@
       Roles.removeUsersFromRoles(users.bob, ['user'], 'group1')
     })
 
-  Tinytest.add(
-    'roles - can get all roles for user by group including \'_global\'', 
-    function (test) {
-      reset()
-      Roles.addUsersToRoles([users.eve], ['editor'], '_global')
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
-      test.equal(Roles.getRolesForUser(users.eve, 'group1'), ['admin', 'user', 'editor'])
-    })
-
-  Tinytest.add(
-    'roles - can get all users in role by group', 
-    function (test) {
-      reset()
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
-
-      var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
-
-      // order may be different so check difference instead of equality
-      // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
-    })
-  
-  Tinytest.add(
-    'roles - can get all users in role by group including \'_global\' group', 
-    function (test) {
-      reset()
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], '_global')
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
-
-      var expected = [users.eve],
-          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
-
-      // order may be different so check difference instead of equality
-      // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
-
-      expected = [users.eve, users.bob, users.joe],
-      actual = _.pluck(Roles.getUsersInRole('admin','group2').fetch(), '_id')
-
-      // order may be different so check difference instead of equality
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
-    })
-
   function printException (ex) {
     var tmp = {}
     for (var key in ex) {
diff --git a/yuidoc.json b/yuidoc.json
index 8ff612bc6c..d911aa7c81 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.1.1",
+  "version": "v1.2.0",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From 4db8e68595c5e31d29676168b9f2924a947294ca Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Wed, 11 Dec 2013 23:38:11 -0500
Subject: [PATCH 0084/1140] v1.2.0 - fix formatting issues

---
 README.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c81c456a6f..c43b423f97 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,11 @@ Thanks to [@nickmoylan](https://github.com/nickmoylan) and [@mcrider](https://gi
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
 
 
-- per-group support -
+    Now with per-group support!
 
-v1.1.0 - supports per-group usage.
-v1.2.0 - adds the special Roles.GLOBAL_GROUP which can be used to provide blanket permissions for a user across all groups
+    v1.1.0 - adds support for per-group assignment of roles/permissions
+
+    v1.2.0 - adds the special Roles.GLOBAL_GROUP, used to provide blanket permissions across all groups
 
 <br />
 
@@ -61,17 +62,17 @@ Run locally:
 
 † The type of the `roles` field depends on whether groups are used or not:
 ```js
-    Roles.addUsersToRoles(bobsUserId, ['manage-team','schedule-game'])
-    // internal representation - no groups 
-    // user.roles = ['manage-team','schedule-game']
-    
-    Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester_united')
-    Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real_madrid')
-    // internal representation - groups
-    // user.roles = { 
-    //   'manchester_united': ['manage-team','schedule-game'],
-    //   'real_madrid': ['player','goalie']
-    // }
+Roles.addUsersToRoles(bobsUserId, ['manage-team','schedule-game'])
+// internal representation - no groups 
+// user.roles = ['manage-team','schedule-game']
+
+Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester_united')
+Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real_madrid')
+// internal representation - groups
+// user.roles = { 
+//   'manchester_united': ['manage-team','schedule-game'],
+//   'real_madrid': ['player','goalie']
+// }
 ```
 
 †† `Meteor.roles` is not published by default.  Here's how you would publish it to every client without needing a subscription:

From ce1965d0642a1b2f6d88fc4eaab9cd6abc20e831 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 11 Dec 2013 23:58:57 -0500
Subject: [PATCH 0085/1140] Improve internal value of Roles.GLOBAL_GROUP
 constant

---
 History.md                            |  5 +++++
 docs/classes/Roles.html               |  2 +-
 docs/data.json                        |  2 +-
 docs/files/roles_roles_client.js.html |  2 +-
 docs/files/roles_roles_common.js.html | 10 +++++-----
 docs/files/roles_roles_server.js.html |  2 +-
 docs/index.html                       |  2 +-
 docs/modules/Helpers.html             |  2 +-
 docs/modules/Roles.html               |  2 +-
 roles/roles_common.js                 |  8 ++++----
 roles/smart.json                      |  2 +-
 roles/tests/client.js                 |  2 +-
 yuidoc.json                           |  2 +-
 13 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/History.md b/History.md
index ec43b419ff..41913ea3f6 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v1.2.1
+
+* Improve internal string value of Roles.GLOBAL_GROUP constant
+
+
 ## v1.2.0
 
 * Use constant property Roles.GLOBAL_GROUP instead of hard-coded string to 
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index ab7622852e..6829b277af 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.0</em>
+            <em>API Docs for: v1.2.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/data.json b/docs/data.json
index 5faac0e0f4..9bb006f6d4 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.0"
+        "version": "v1.2.1"
     },
     "files": {
         "roles/roles_client.js": {
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index b85d3532a7..7a7b6d672e 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.0</em>
+            <em>API Docs for: v1.2.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index a376e92043..938f826ee2 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.0</em>
+            <em>API Docs for: v1.2.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -136,7 +136,7 @@ var mixingGroupAndNonGroupErrorMsg = &quot;Roles error: Can&#x27;t mix grouped a
  * @static
  * @final
  */
-Roles.GLOBAL_GROUP = &#x27;__roles_global__&#x27;
+Roles.GLOBAL_GROUP = &#x27;__global_roles__&#x27;
 
 
 /**
@@ -449,7 +449,7 @@ Roles.userIsInRole = function (user, roles, group) {
     //   {_id: id, 
     //    $or: [
     //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
-    //      {&#x27;roles.__roles_global__&#x27;:{$in: [&#x27;admin&#x27;]}}
+    //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
     //    ]}
     groupQuery = {}
     groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
@@ -460,7 +460,7 @@ Roles.userIsInRole = function (user, roles, group) {
     //   {_id: id, 
     //    $or: [
     //      {roles: {$in: [&#x27;admin&#x27;]}},
-    //      {&#x27;roles.__roles_global__&#x27;: {$in: [&#x27;admin&#x27;]}}
+    //      {&#x27;roles.__global_roles__&#x27;: {$in: [&#x27;admin&#x27;]}}
     //    ]}
     query.$or.push({roles: {$in: roles}})
   }
@@ -534,7 +534,7 @@ Roles.getUsersInRole = function (role, group) {
     // structure of group query, including Roles.GLOBAL_GROUP
     //   {$or: [
     //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
-    //      {&#x27;roles.__roles_global__&#x27;:{$in: [&#x27;admin&#x27;]}}
+    //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
     //    ]}
     query = {$or: []}
 
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 2d73ff267c..054a811bda 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.0</em>
+            <em>API Docs for: v1.2.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/index.html b/docs/index.html
index b600658716..7a208c2473 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.0</em>
+            <em>API Docs for: v1.2.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Helpers.html b/docs/modules/Helpers.html
index 45ec0b9e18..59193ac997 100644
--- a/docs/modules/Helpers.html
+++ b/docs/modules/Helpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.0</em>
+            <em>API Docs for: v1.2.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 09187e8f0e..6569aef493 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.0</em>
+            <em>API Docs for: v1.2.1</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 4b8dc0c853..2e076e2d91 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -44,7 +44,7 @@ var mixingGroupAndNonGroupErrorMsg = "Roles error: Can't mix grouped and non-gro
  * @static
  * @final
  */
-Roles.GLOBAL_GROUP = '__roles_global__'
+Roles.GLOBAL_GROUP = '__global_roles__'
 
 
 /**
@@ -357,7 +357,7 @@ Roles.userIsInRole = function (user, roles, group) {
     //   {_id: id, 
     //    $or: [
     //      {'roles.group1':{$in: ['admin']}},
-    //      {'roles.__roles_global__':{$in: ['admin']}}
+    //      {'roles.__global_roles__':{$in: ['admin']}}
     //    ]}
     groupQuery = {}
     groupQuery['roles.'+group] = {$in: roles}
@@ -368,7 +368,7 @@ Roles.userIsInRole = function (user, roles, group) {
     //   {_id: id, 
     //    $or: [
     //      {roles: {$in: ['admin']}},
-    //      {'roles.__roles_global__': {$in: ['admin']}}
+    //      {'roles.__global_roles__': {$in: ['admin']}}
     //    ]}
     query.$or.push({roles: {$in: roles}})
   }
@@ -442,7 +442,7 @@ Roles.getUsersInRole = function (role, group) {
     // structure of group query, including Roles.GLOBAL_GROUP
     //   {$or: [
     //      {'roles.group1':{$in: ['admin']}},
-    //      {'roles.__roles_global__':{$in: ['admin']}}
+    //      {'roles.__global_roles__':{$in: ['admin']}}
     //    ]}
     query = {$or: []}
 
diff --git a/roles/smart.json b/roles/smart.json
index 4d5bf61ea7..decf6ac08b 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 6ada02a9ba..20d3bed1c6 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -20,7 +20,7 @@
     'joe': {
       _id: 'joe',
       roles: {
-        '__roles_global__': ['admin'],
+        '__global_roles__': ['admin'],
         'group1': ['editor']
       }
     }
diff --git a/yuidoc.json b/yuidoc.json
index d911aa7c81..30c1192255 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.0",
+  "version": "v1.2.1",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From 3b2becad35c50aa2ace476663af65681243056fa Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 12 Dec 2013 14:17:47 -0500
Subject: [PATCH 0086/1140] v1.2.2 - Support passing user object to
 Roles.getRolesForUser

---
 History.md                            |  5 +++
 docs/classes/Roles.html               | 19 ++++----
 docs/data.json                        | 14 +++---
 docs/files/roles_roles_client.js.html |  8 +++-
 docs/files/roles_roles_common.js.html | 33 +++++++++-----
 docs/files/roles_roles_server.js.html |  2 +-
 docs/index.html                       |  2 +-
 docs/modules/Helpers.html             |  2 +-
 docs/modules/Roles.html               |  2 +-
 roles/roles_client.js                 |  6 ++-
 roles/roles_common.js                 | 31 ++++++++-----
 roles/smart.json                      |  2 +-
 roles/tests/client.js                 | 13 +++---
 roles/tests/server.js                 | 65 ++++++++++++++++++++++++---
 yuidoc.json                           |  2 +-
 15 files changed, 146 insertions(+), 60 deletions(-)

diff --git a/History.md b/History.md
index 41913ea3f6..c04b6b312a 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v1.2.2
+
+* Support passing user object in addition to _id for Roles.getRolesForUser
+
+
 ## v1.2.1
 
 * Improve internal string value of Roles.GLOBAL_GROUP constant
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 6829b277af..1883671cd4 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.1</em>
+            <em>API Docs for: v1.2.2</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -686,7 +686,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l407"><code>roles&#x2F;roles_common.js:407</code></a>
+        <a href="../files/roles_roles_common.js.html#l416"><code>roles&#x2F;roles_common.js:416</code></a>
         
         </p>
 
@@ -732,7 +732,7 @@ are currently assigned to the target role.</p>
             
                 <li class="arg">
                     
-                        <code>userId</code>
+                        <code>user</code>
                     
                 </li>
             
@@ -798,14 +798,14 @@ are currently assigned to the target role.</p>
             
                 <li class="param">
                     
-                        <code class="param-name">userId</code>
-                        <span class="type">String</span>
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
                     
 
                     
 
                     <div class="param-description">
-                        <p>Id of user</p>
+                        <p>Id of user or actual user object</p>
 
                     </div>
 
@@ -906,7 +906,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l417"><code>roles&#x2F;roles_common.js:417</code></a>
+        <a href="../files/roles_roles_common.js.html#l426"><code>roles&#x2F;roles_common.js:426</code></a>
         
         </p>
 
@@ -1051,7 +1051,10 @@ used automatically.</p>
     <div class="description">
         <p>Handlebars helper to check if current user is in at least one
 of the target roles.  For use in client-side templates.</p>
-<p>NOTE: This helper does not currently support groups.</p>
+<p>NOTE: This helper does not currently support specifying a group.<br>      If Meteor.user() has per-group roles, you can use this helper
+      to check for permissions in the Roles.GLOBAL_GROUP but to 
+      check for permissions in a specific group you will need to 
+      use Roles.userIsInRole() from your own template helper.</p>
 
     </div>
 
diff --git a/docs/data.json b/docs/data.json
index 9bb006f6d4..e51118ebe9 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.1"
+        "version": "v1.2.2"
     },
     "files": {
         "roles/roles_client.js": {
@@ -80,7 +80,7 @@
         {
             "file": "roles/roles_client.js",
             "line": 23,
-            "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.\n\nNOTE: This helper does not currently support groups.",
+            "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.\n\nNOTE: This helper does not currently support specifying a group.  \n      If Meteor.user() has per-group roles, you can use this helper\n      to check for permissions in the Roles.GLOBAL_GROUP but to \n      check for permissions in a specific group you will need to \n      use Roles.userIsInRole() from your own template helper.",
             "example": [
                 "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}"
             ],
@@ -260,9 +260,9 @@
             "name": "getRolesForUser",
             "params": [
                 {
-                    "name": "userId",
-                    "description": "Id of user",
-                    "type": "String"
+                    "name": "user",
+                    "description": "Id of user or actual user object",
+                    "type": "String|Object"
                 },
                 {
                     "name": "group",
@@ -280,7 +280,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 407,
+            "line": 416,
             "description": "Retrieve set of all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -293,7 +293,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 417,
+            "line": 426,
             "description": "Retrieve all users who are in target role.  \n\nNOTE: This is an expensive query; it performs a full collection scan\non the users collection since there is no index set on the 'roles' field.  \nThis is by design as most queries will specify an _id so the _id index is \nused automatically.",
             "itemtype": "method",
             "name": "getUsersInRole",
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index 7a7b6d672e..841a5c9734 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.1</em>
+            <em>API Docs for: v1.2.2</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -116,7 +116,11 @@ Roles._handlebarsHelpers = {
    * Handlebars helper to check if current user is in at least one
    * of the target roles.  For use in client-side templates.
    *
-   * NOTE: This helper does not currently support groups.
+   * NOTE: This helper does not currently support specifying a group.  
+   *       If Meteor.user() has per-group roles, you can use this helper
+   *       to check for permissions in the Roles.GLOBAL_GROUP but to 
+   *       check for permissions in a specific group you will need to 
+   *       use Roles.userIsInRole() from your own template helper.
    *
    * @example
    *     {{#if isInRole &#x27;admin&#x27;}}
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 938f826ee2..2554f62ad9 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.1</em>
+            <em>API Docs for: v1.2.2</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -473,27 +473,36 @@ Roles.userIsInRole = function (user, roles, group) {
  * Retrieve users roles
  *
  * @method getRolesForUser
- * @param {String} userId Id of user
+ * @param {String|Object} user Id of user or actual user object
  * @param {String} [group] Optional name of group to restrict roles to.
  *                         User&#x27;s Roles.GLOBAL_GROUP will also be checked.
  * @return {Array} Array of user&#x27;s roles, unsorted. undefined if user not found
  */
-Roles.getRolesForUser = function (userId, group) {
-  var user
+Roles.getRolesForUser = function (user, group) {
+  if (!user) return []
+  if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return []
 
-  if (!userId) return
-  if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return
+  if (&#x27;string&#x27; === typeof user) {
+    user = Meteor.users.findOne(
+             {_id: user},
+             {fields: {roles: 1}})
 
-  user = Meteor.users.findOne(
-           {_id: userId},
-           {fields: {roles: 1}})
+  } else if (&#x27;object&#x27; !== typeof user) {
+    // invalid user object
+    return []
+  }
 
-  if (!user || !user.roles) return
+  if (!user || !user.roles) return []
 
-  if (group)
+  if (group) {
     return _.union(user.roles[group], user.roles[Roles.GLOBAL_GROUP] || [])
+  }
 
-  return user.roles
+  if (_.isArray(user.roles))
+    return user.roles
+
+  // using groups but group not specified. return global group, if exists
+  return user.roles[Roles.GLOBAL_GROUP] || []
 }
 
 /**
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 054a811bda..d6f6332ed0 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.1</em>
+            <em>API Docs for: v1.2.2</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/index.html b/docs/index.html
index 7a208c2473..dc79b3c7a8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.1</em>
+            <em>API Docs for: v1.2.2</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Helpers.html b/docs/modules/Helpers.html
index 59193ac997..2387f620bd 100644
--- a/docs/modules/Helpers.html
+++ b/docs/modules/Helpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.1</em>
+            <em>API Docs for: v1.2.2</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 6569aef493..1e0832b8e0 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.1</em>
+            <em>API Docs for: v1.2.2</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/roles/roles_client.js b/roles/roles_client.js
index 6bbfad063b..aa5c45ab4a 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -24,7 +24,11 @@ Roles._handlebarsHelpers = {
    * Handlebars helper to check if current user is in at least one
    * of the target roles.  For use in client-side templates.
    *
-   * NOTE: This helper does not currently support groups.
+   * NOTE: This helper does not currently support specifying a group.  
+   *       If Meteor.user() has per-group roles, you can use this helper
+   *       to check for permissions in the Roles.GLOBAL_GROUP but to 
+   *       check for permissions in a specific group you will need to 
+   *       use Roles.userIsInRole() from your own template helper.
    *
    * @example
    *     {{#if isInRole 'admin'}}
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 2e076e2d91..10d648ee8d 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -381,27 +381,36 @@ Roles.userIsInRole = function (user, roles, group) {
  * Retrieve users roles
  *
  * @method getRolesForUser
- * @param {String} userId Id of user
+ * @param {String|Object} user Id of user or actual user object
  * @param {String} [group] Optional name of group to restrict roles to.
  *                         User's Roles.GLOBAL_GROUP will also be checked.
  * @return {Array} Array of user's roles, unsorted. undefined if user not found
  */
-Roles.getRolesForUser = function (userId, group) {
-  var user
+Roles.getRolesForUser = function (user, group) {
+  if (!user) return []
+  if (group && 'string' !== typeof group) return []
 
-  if (!userId) return
-  if (group && 'string' !== typeof group) return
+  if ('string' === typeof user) {
+    user = Meteor.users.findOne(
+             {_id: user},
+             {fields: {roles: 1}})
 
-  user = Meteor.users.findOne(
-           {_id: userId},
-           {fields: {roles: 1}})
+  } else if ('object' !== typeof user) {
+    // invalid user object
+    return []
+  }
 
-  if (!user || !user.roles) return
+  if (!user || !user.roles) return []
 
-  if (group)
+  if (group) {
     return _.union(user.roles[group], user.roles[Roles.GLOBAL_GROUP] || [])
+  }
 
-  return user.roles
+  if (_.isArray(user.roles))
+    return user.roles
+
+  // using groups but group not specified. return global group, if exists
+  return user.roles[Roles.GLOBAL_GROUP] || []
 }
 
 /**
diff --git a/roles/smart.json b/roles/smart.json
index decf6ac08b..7269bad2aa 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 20d3bed1c6..b98da4a8c4 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -46,10 +46,7 @@
 
   // Mock Meteor.user() for isInRole handlebars helper testing
   Meteor.user = function () {
-    return {
-      _id: 'testId',
-      roles: ['user','manage-users']
-    }
+    return users.eve
   }
 
   Tinytest.add(
@@ -62,12 +59,16 @@
       test.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
 
       expected = true
-      actual = isInRole('admin, manage-users')
+      actual = isInRole('admin, editor')
       test.equal(actual, expected)
       
-      expected = false
+      expected = true
       actual = isInRole('admin')
       test.equal(actual, expected)
+
+      expected = false
+      actual = isInRole('unknown')
+      test.equal(actual, expected)
     })
 
   Tinytest.add(
diff --git a/roles/tests/server.js b/roles/tests/server.js
index c8d7d5010b..36abb18ad6 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -411,33 +411,84 @@
     'roles - can\'t get roles for non-existant user', 
     function (test) {
       reset()
-      test.equal(Roles.getRolesForUser('1'), undefined)
-      test.equal(Roles.getRolesForUser('1', 'group1'), undefined)
+      test.equal(Roles.getRolesForUser('1'), [])
+      test.equal(Roles.getRolesForUser('1', 'group1'), [])
     })
 
   Tinytest.add(
     'roles - can get all roles for user', 
     function (test) {
       reset()
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'])
-      test.equal(Roles.getRolesForUser(users.eve), ['admin', 'user'])
+
+      var userId = users.eve,
+          userObj
+
+      // by userId
+      test.equal(Roles.getRolesForUser(userId), [])
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId})
+      test.equal(Roles.getRolesForUser(userObj), [])
+
+
+      Roles.addUsersToRoles(userId, ['admin', 'user'])
+
+      // by userId
+      test.equal(Roles.getRolesForUser(userId), ['admin', 'user'])
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId})
+      test.equal(Roles.getRolesForUser(userObj), ['admin', 'user'])
     })
 
   Tinytest.add(
     'roles - can get all roles for user by group', 
     function (test) {
       reset()
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
-      test.equal(Roles.getRolesForUser(users.eve, 'group1'), ['admin', 'user'])
+
+      var userId = users.eve,
+          userObj
+
+      // by userId
+      test.equal(Roles.getRolesForUser(userId, 'group1'), [])
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId})
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), [])
+
+
+      // add roles
+      Roles.addUsersToRoles(userId, ['admin', 'user'], 'group1')
+
+      // by userId
+      test.equal(Roles.getRolesForUser(userId, 'group1'), ['admin', 'user'])
+      test.equal(Roles.getRolesForUser(userId), [])
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId})
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['admin', 'user'])
+      test.equal(Roles.getRolesForUser(userObj), [])
     })
 
   Tinytest.add(
     'roles - can get all roles for user by group including Roles.GLOBAL_GROUP', 
     function (test) {
       reset()
+
+      var userId = users.eve,
+          userObj
+
       Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP)
       Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
-      test.equal(Roles.getRolesForUser(users.eve, 'group1'), ['admin', 'user', 'editor'])
+
+      // by userId
+      test.equal(Roles.getRolesForUser(userId, 'group1'), ['admin', 'user', 'editor'])
+      test.equal(Roles.getRolesForUser(userId), ['editor'])
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId})
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['admin', 'user', 'editor'])
+      test.equal(Roles.getRolesForUser(userObj), ['editor'])
     })
 
 
diff --git a/yuidoc.json b/yuidoc.json
index 30c1192255..a888cb2b31 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.1",
+  "version": "v1.2.2",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From 6de1a4c9581c986c084927462aee153777710dcc Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 12 Dec 2013 14:25:18 -0500
Subject: [PATCH 0087/1140] fix comments for getRolesForUser

---
 docs/classes/Roles.html               | 6 +++---
 docs/data.json                        | 6 +++---
 docs/files/roles_roles_common.js.html | 6 +++---
 roles/roles_common.js                 | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 1883671cd4..6c6eb5fcfc 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -805,7 +805,7 @@ are currently assigned to the target role.</p>
                     
 
                     <div class="param-description">
-                        <p>Id of user or actual user object</p>
+                        <p>UserId or actual user object</p>
 
                     </div>
 
@@ -823,7 +823,7 @@ are currently assigned to the target role.</p>
 
                     <div class="param-description">
                         <p>Optional name of group to restrict roles to.
-                        User&#39;s Roles.GLOBAL_GROUP will also be checked.</p>
+                        User&#39;s Roles.GLOBAL_GROUP will also be included.</p>
 
                     </div>
 
@@ -843,7 +843,7 @@ are currently assigned to the target role.</p>
                     
                         <span class="type">Array</span>:
                     
-                    <p>Array of user&#39;s roles, unsorted. undefined if user not found</p>
+                    <p>Array of user&#39;s roles, unsorted.</p>
 
                 
             </div>
diff --git a/docs/data.json b/docs/data.json
index e51118ebe9..a53a1bc58b 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -261,18 +261,18 @@
             "params": [
                 {
                     "name": "user",
-                    "description": "Id of user or actual user object",
+                    "description": "UserId or actual user object",
                     "type": "String|Object"
                 },
                 {
                     "name": "group",
-                    "description": "Optional name of group to restrict roles to.\n                        User's Roles.GLOBAL_GROUP will also be checked.",
+                    "description": "Optional name of group to restrict roles to.\n                        User's Roles.GLOBAL_GROUP will also be included.",
                     "type": "String",
                     "optional": true
                 }
             ],
             "return": {
-                "description": "Array of user's roles, unsorted. undefined if user not found",
+                "description": "Array of user's roles, unsorted.",
                 "type": "Array"
             },
             "class": "Roles",
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 2554f62ad9..6c1e96a136 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -473,10 +473,10 @@ Roles.userIsInRole = function (user, roles, group) {
  * Retrieve users roles
  *
  * @method getRolesForUser
- * @param {String|Object} user Id of user or actual user object
+ * @param {String|Object} user UserId or actual user object
  * @param {String} [group] Optional name of group to restrict roles to.
- *                         User&#x27;s Roles.GLOBAL_GROUP will also be checked.
- * @return {Array} Array of user&#x27;s roles, unsorted. undefined if user not found
+ *                         User&#x27;s Roles.GLOBAL_GROUP will also be included.
+ * @return {Array} Array of user&#x27;s roles, unsorted.
  */
 Roles.getRolesForUser = function (user, group) {
   if (!user) return []
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 10d648ee8d..075ae459ea 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -381,10 +381,10 @@ Roles.userIsInRole = function (user, roles, group) {
  * Retrieve users roles
  *
  * @method getRolesForUser
- * @param {String|Object} user Id of user or actual user object
+ * @param {String|Object} user UserId or actual user object
  * @param {String} [group] Optional name of group to restrict roles to.
- *                         User's Roles.GLOBAL_GROUP will also be checked.
- * @return {Array} Array of user's roles, unsorted. undefined if user not found
+ *                         User's Roles.GLOBAL_GROUP will also be included.
+ * @return {Array} Array of user's roles, unsorted.
  */
 Roles.getRolesForUser = function (user, group) {
   if (!user) return []

From a00b5680c4dcee35e9fd7375e0c36a781c947e13 Mon Sep 17 00:00:00 2001
From: Pascoual <pascoualito@gmail.com>
Date: Sat, 14 Dec 2013 01:19:05 +0100
Subject: [PATCH 0088/1140] Client : add group in helper

---
 roles/roles_client.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index aa5c45ab4a..4bb3ba0ea8 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -41,7 +41,7 @@ Roles._handlebarsHelpers = {
    * @param {String} role name of role or comma-seperated list of roles
    * @return {Boolean} true if current user is in at least one of the target roles
    */
-  isInRole: function (role) {
+  isInRole: function (role, group) {
     var user = Meteor.user(),
         comma = role && role.indexOf(','),
         roles
@@ -60,7 +60,10 @@ Roles._handlebarsHelpers = {
       roles = [role]
     }
 
-    return Roles.userIsInRole(user, roles)
+    if (Match.test(group, String))
+      return Roles.userIsInRole(user, roles, group)
+    else
+      return Roles.userIsInRole(user, roles)
   }
 }
 

From f11b8ff499a59fb9b2c97ef0fb460ac58f0dc301 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 13 Dec 2013 23:33:20 -0500
Subject: [PATCH 0089/1140] v1.2.3 - support using group in 'isInRole' client
 handlebars helper

---
 History.md                                    |   6 +
 docs/api.js                                   |   7 +-
 docs/classes/HandlebarsHelpers.html           | 338 ++++++++++++++++++
 docs/classes/Roles.html                       | 140 +-------
 docs/data.json                                |  48 ++-
 docs/files/roles_roles_client.js.html         |  31 +-
 docs/files/roles_roles_common.js.html         |   6 +-
 docs/files/roles_roles_server.js.html         |   6 +-
 docs/index.html                               |   6 +-
 .../{Helpers.html => HandlebarsHelpers.html}  |  22 +-
 docs/modules/Roles.html                       |   6 +-
 roles/roles_client.js                         |  26 +-
 yuidoc.json                                   |   2 +-
 13 files changed, 456 insertions(+), 188 deletions(-)
 create mode 100644 docs/classes/HandlebarsHelpers.html
 rename docs/modules/{Helpers.html => HandlebarsHelpers.html} (83%)

diff --git a/History.md b/History.md
index c04b6b312a..04bed44604 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,9 @@
+## v1.2.3
+
+* Support using group in 'isInRole' client handlebars helper. 
+  Contributed by [@pascoual](https://github.com/pascoual)
+
+
 ## v1.2.2
 
 * Support passing user object in addition to _id for Roles.getRolesForUser
diff --git a/docs/api.js b/docs/api.js
index 32258526fc..c6f48990fe 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -1,16 +1,17 @@
 YUI.add("yuidoc-meta", function(Y) {
    Y.YUIDoc = { meta: {
     "classes": [
+        "HandlebarsHelpers",
         "Roles"
     ],
     "modules": [
-        "Helpers",
+        "HandlebarsHelpers",
         "Roles"
     ],
     "allModules": [
         {
-            "displayName": "Helpers",
-            "name": "Helpers",
+            "displayName": "HandlebarsHelpers",
+            "name": "HandlebarsHelpers",
             "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
         },
         {
diff --git a/docs/classes/HandlebarsHelpers.html b/docs/classes/HandlebarsHelpers.html
new file mode 100644
index 0000000000..04bac68b8a
--- /dev/null
+++ b/docs/classes/HandlebarsHelpers.html
@@ -0,0 +1,338 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>HandlebarsHelpers - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v1.2.3</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
+                <li><a href="../classes/Roles.html">Roles</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
+                <li><a href="../modules/Roles.html">Roles</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1>HandlebarsHelpers Class</h1>
+<div class="box meta">
+    
+
+    
+
+    
+
+    
+        
+            Module: <a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a>
+        
+    
+
+    
+</div>
+
+
+
+<div class="box intro">
+    
+</div>
+
+
+
+<div id="classdocs" class="tabview">
+    <ul class="api-class-tabs">
+        <li class="api-class-tab index"><a href="#index">Index</a></li>
+
+        
+            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
+        
+        
+        
+        
+    </ul>
+
+    <div>
+        <div id="index" class="api-class-tabpanel index">
+            <h2 class="off-left">Item Index</h2>
+
+            
+                <div class="index-section methods">
+                    <h3>Methods</h3>
+
+                    <ul class="index-list methods">
+                        
+                            <li class="index-item method">
+                                <a href="#method_isInRole">isInRole</a>
+
+                                
+                                    <span class="flag static">static</span>
+                                
+                                
+                            </li>
+                        
+                    </ul>
+                </div>
+            
+
+            
+
+            
+
+            
+        </div>
+
+        
+            <div id="methods" class="api-class-tabpanel">
+                <h2 class="off-left">Methods</h2>
+
+                
+                    <div id="method_isInRole" class="method item">
+    <h3 class="name"><code>isInRole</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>role</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+    
+
+    
+
+    
+
+    
+
+    
+        <span class="flag static">static</span>
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="../files/roles_roles_client.js.html#l23"><code>roles&#x2F;roles_client.js:23</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Handlebars helper to check if current user is in at least one
+of the target roles.  For use in client-side templates.</p>
+
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">role</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Name of role or comma-seperated list of roles</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional, name of group to check</p>
+
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Boolean</span>:
+                    
+                    <p>true if current user is in at least one of the target roles</p>
+
+                
+            </div>
+        </div>
+    
+
+    
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>{{#if isInRole &#39;admin&#39;}}
+{{/if}}
+
+{{#if isInRole &#39;editor,user&#39;}}
+{{/if}}
+
+{{#if isInRole &#39;editor,user&#39; &#39;group1&#39;}}
+{{/if}}</code></pre>
+
+            </div>
+        </div>
+    
+</div>
+
+                
+            </div>
+        
+
+        
+
+        
+
+        
+    </div>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 6c6eb5fcfc..d80fbb9489 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.2</em>
+            <em>API Docs for: v1.2.3</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,13 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
+                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
@@ -238,13 +240,6 @@
 
                                 
                                 
-                            </li>
-                        
-                            <li class="index-item method">
-                                <a href="#method_isInRole">isInRole</a>
-
-                                
-                                
                             </li>
                         
                             <li class="index-item method">
@@ -987,133 +982,6 @@ used automatically.</p>
     
 
     
-</div>
-
-                
-                    <div id="method_isInRole" class="method item">
-    <h3 class="name"><code>isInRole</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>role</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                    <p>Provided by the <a href="../modules/Helpers.html">Helpers</a> module.</p>
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_client.js.html#l23"><code>roles&#x2F;roles_client.js:23</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Handlebars helper to check if current user is in at least one
-of the target roles.  For use in client-side templates.</p>
-<p>NOTE: This helper does not currently support specifying a group.<br>      If Meteor.user() has per-group roles, you can use this helper
-      to check for permissions in the Roles.GLOBAL_GROUP but to 
-      check for permissions in a specific group you will need to 
-      use Roles.userIsInRole() from your own template helper.</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">role</code>
-                        <span class="type">String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>name of role or comma-seperated list of roles</p>
-
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                
-                    
-                        <span class="type">Boolean</span>:
-                    
-                    <p>true if current user is in at least one of the target roles</p>
-
-                
-            </div>
-        </div>
-    
-
-    
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>{{#if isInRole &#39;admin&#39;}}
-{{/if}}
-
-{{#if isInRole &#39;editor,user&#39;}}
-{{/if}}</code></pre>
-
-            </div>
-        </div>
-    
 </div>
 
                 
diff --git a/docs/data.json b/docs/data.json
index a53a1bc58b..3c24cc4867 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,16 +2,18 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.2"
+        "version": "v1.2.3"
     },
     "files": {
         "roles/roles_client.js": {
             "name": "roles/roles_client.js",
             "modules": {
-                "Helpers": 1
+                "HandlebarsHelpers": 1
             },
             "classes": {},
-            "fors": {},
+            "fors": {
+                "HandlebarsHelpers": 1
+            },
             "namespaces": {}
         },
         "roles/roles_common.js": {
@@ -34,11 +36,15 @@
         }
     },
     "modules": {
-        "Helpers": {
-            "name": "Helpers",
+        "HandlebarsHelpers": {
+            "name": "HandlebarsHelpers",
             "submodules": {},
-            "classes": {},
-            "fors": {},
+            "classes": {
+                "HandlebarsHelpers": 1
+            },
+            "fors": {
+                "HandlebarsHelpers": 1
+            },
             "namespaces": {},
             "tag": "module",
             "file": "roles/roles_client.js",
@@ -60,6 +66,17 @@
         }
     },
     "classes": {
+        "HandlebarsHelpers": {
+            "name": "HandlebarsHelpers",
+            "shortname": "HandlebarsHelpers",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "HandlebarsHelpers",
+            "namespace": ""
+        },
         "Roles": {
             "name": "Roles",
             "shortname": "Roles",
@@ -80,25 +97,32 @@
         {
             "file": "roles/roles_client.js",
             "line": 23,
-            "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.\n\nNOTE: This helper does not currently support specifying a group.  \n      If Meteor.user() has per-group roles, you can use this helper\n      to check for permissions in the Roles.GLOBAL_GROUP but to \n      check for permissions in a specific group you will need to \n      use Roles.userIsInRole() from your own template helper.",
+            "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
             "example": [
-                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}"
+                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'group1'}}\n    {{/if}}"
             ],
             "itemtype": "method",
             "name": "isInRole",
             "params": [
                 {
                     "name": "role",
-                    "description": "name of role or comma-seperated list of roles",
+                    "description": "Name of role or comma-seperated list of roles",
                     "type": "String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional, name of group to check",
+                    "type": "String",
+                    "optional": true
                 }
             ],
             "return": {
                 "description": "true if current user is in at least one of the target roles",
                 "type": "Boolean"
             },
-            "class": "Roles",
-            "module": "Helpers"
+            "static": 1,
+            "class": "HandlebarsHelpers",
+            "module": "HandlebarsHelpers"
         },
         {
             "file": "roles/roles_common.js",
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index 841a5c9734..c10a7868da 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.2</em>
+            <em>API Docs for: v1.2.3</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,13 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
+                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
@@ -99,7 +101,7 @@
  * client-side checks are strictly for convenience and must not be
  * trusted.
  *
- * @module Helpers
+ * @module HandlebarsHelpers
  */
 
 ////////////////////////////////////////////////////////////
@@ -116,12 +118,6 @@ Roles._handlebarsHelpers = {
    * Handlebars helper to check if current user is in at least one
    * of the target roles.  For use in client-side templates.
    *
-   * NOTE: This helper does not currently support specifying a group.  
-   *       If Meteor.user() has per-group roles, you can use this helper
-   *       to check for permissions in the Roles.GLOBAL_GROUP but to 
-   *       check for permissions in a specific group you will need to 
-   *       use Roles.userIsInRole() from your own template helper.
-   *
    * @example
    *     {{#if isInRole &#x27;admin&#x27;}}
    *     {{/if}}
@@ -129,16 +125,23 @@ Roles._handlebarsHelpers = {
    *     {{#if isInRole &#x27;editor,user&#x27;}}
    *     {{/if}}
    *
+   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;group1&#x27;}}
+   *     {{/if}}
+   *
    * @method isInRole
-   * @param {String} role name of role or comma-seperated list of roles
+   * @param {String} role Name of role or comma-seperated list of roles
+   * @param {String} [group] Optional, name of group to check
    * @return {Boolean} true if current user is in at least one of the target roles
+   * @static
+   * @for HandlebarsHelpers 
    */
-  isInRole: function (role) {
+  isInRole: function (role, group) {
     var user = Meteor.user(),
-        comma = role &amp;&amp; role.indexOf(&#x27;,&#x27;),
+        comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),
         roles
 
     if (!user) return false
+    if (!Match.test(role, String)) return false
 
     if (comma !== -1) {
       roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {
@@ -152,6 +155,10 @@ Roles._handlebarsHelpers = {
       roles = [role]
     }
 
+    if (Match.test(group, String)) {
+      return Roles.userIsInRole(user, roles, group)
+    }
+
     return Roles.userIsInRole(user, roles)
   }
 }
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 6c1e96a136..f4f3c0283a 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.2</em>
+            <em>API Docs for: v1.2.3</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,13 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
+                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index d6f6332ed0..9741b713d4 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.2</em>
+            <em>API Docs for: v1.2.3</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,13 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
+                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
diff --git a/docs/index.html b/docs/index.html
index dc79b3c7a8..d23ae0f7b0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.2</em>
+            <em>API Docs for: v1.2.3</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,13 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
+                <li><a href="./classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
                 <li><a href="./classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="./modules/Helpers.html">Helpers</a></li>
+                <li><a href="./modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
             
                 <li><a href="./modules/Roles.html">Roles</a></li>
             
diff --git a/docs/modules/Helpers.html b/docs/modules/HandlebarsHelpers.html
similarity index 83%
rename from docs/modules/Helpers.html
rename to docs/modules/HandlebarsHelpers.html
index 2387f620bd..c21a6d390c 100644
--- a/docs/modules/Helpers.html
+++ b/docs/modules/HandlebarsHelpers.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>Helpers - The meteor-roles API</title>
+    <title>HandlebarsHelpers - The meteor-roles API</title>
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.2</em>
+            <em>API Docs for: v1.2.3</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,13 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
+                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
@@ -86,7 +88,7 @@
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1>Helpers Module</h1>
+                        <h1>HandlebarsHelpers Module</h1>
 <div class="box clearfix meta">
     
 
@@ -116,6 +118,18 @@ trusted.</p>
 <div class="yui3-g">
     <div class="yui3-u-1-2">
         
+            <p>This module provides the following classes:</p>
+
+            <ul class="module-classes">
+            
+                <li class="module-class">
+                    <a href="../classes/HandlebarsHelpers.html">
+                        HandlebarsHelpers
+                    </a>
+                </li>
+            
+            </ul>
+        
     </div>
 
     <div class="yui3-u-1-2">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 1e0832b8e0..0f04bbed80 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.2</em>
+            <em>API Docs for: v1.2.3</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -41,13 +41,15 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
+                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
+            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/Helpers.html">Helpers</a></li>
+                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
diff --git a/roles/roles_client.js b/roles/roles_client.js
index 4bb3ba0ea8..486b00ed8e 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -7,7 +7,7 @@
  * client-side checks are strictly for convenience and must not be
  * trusted.
  *
- * @module Helpers
+ * @module HandlebarsHelpers
  */
 
 ////////////////////////////////////////////////////////////
@@ -24,12 +24,6 @@ Roles._handlebarsHelpers = {
    * Handlebars helper to check if current user is in at least one
    * of the target roles.  For use in client-side templates.
    *
-   * NOTE: This helper does not currently support specifying a group.  
-   *       If Meteor.user() has per-group roles, you can use this helper
-   *       to check for permissions in the Roles.GLOBAL_GROUP but to 
-   *       check for permissions in a specific group you will need to 
-   *       use Roles.userIsInRole() from your own template helper.
-   *
    * @example
    *     {{#if isInRole 'admin'}}
    *     {{/if}}
@@ -37,16 +31,23 @@ Roles._handlebarsHelpers = {
    *     {{#if isInRole 'editor,user'}}
    *     {{/if}}
    *
+   *     {{#if isInRole 'editor,user' 'group1'}}
+   *     {{/if}}
+   *
    * @method isInRole
-   * @param {String} role name of role or comma-seperated list of roles
+   * @param {String} role Name of role or comma-seperated list of roles
+   * @param {String} [group] Optional, name of group to check
    * @return {Boolean} true if current user is in at least one of the target roles
+   * @static
+   * @for HandlebarsHelpers 
    */
   isInRole: function (role, group) {
     var user = Meteor.user(),
-        comma = role && role.indexOf(','),
+        comma = (role || '').indexOf(','),
         roles
 
     if (!user) return false
+    if (!Match.test(role, String)) return false
 
     if (comma !== -1) {
       roles = _.reduce(role.split(','), function (memo, r) {
@@ -60,10 +61,11 @@ Roles._handlebarsHelpers = {
       roles = [role]
     }
 
-    if (Match.test(group, String))
+    if (Match.test(group, String)) {
       return Roles.userIsInRole(user, roles, group)
-    else
-      return Roles.userIsInRole(user, roles)
+    }
+
+    return Roles.userIsInRole(user, roles)
   }
 }
 
diff --git a/yuidoc.json b/yuidoc.json
index a888cb2b31..5e333cfef9 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.2",
+  "version": "v1.2.3",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From a00c24117f53334f4a1b324ecfe26fce4483fee2 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 13 Dec 2013 23:39:30 -0500
Subject: [PATCH 0090/1140] v1.2.3 - support using group in 'isInRole' client
 handlebars helper

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c43b423f97..3d193030c2 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,15 @@ meteor-roles
 Authorization package for Meteor - compatible with built-in accounts package.
 
 <br />
+
 ### Contributors
 
-Thanks to [@nickmoylan](https://github.com/nickmoylan) and [@mcrider](https://github.com/mcrider)!
+Thanks to:
+
+  * [@pascoual](https://github.com/pascoual)
+  * [@nickmoylan](https://github.com/nickmoylan)
+  * [@mcrider](https://github.com/mcrider)
+  * [@alanning](https://github.com/alanning)
 
 <br />
 

From b84405f225c3325931808796d26b9a2cc5d22e0e Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 13 Dec 2013 23:40:37 -0500
Subject: [PATCH 0091/1140] v1.2.3 - support using group in 'isInRole' client
 handlebars helper

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index 7269bad2aa..c1495cbbce 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From abd98cde64327e91b549ef88fea0ed6fc390632f Mon Sep 17 00:00:00 2001
From: Pascoual <pascoual@users.noreply.github.com>
Date: Sat, 14 Dec 2013 23:15:50 +0100
Subject: [PATCH 0092/1140] Update README.md: add informations about per-group
 support in Handlebar Helper

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index c43b423f97..29913a59e9 100644
--- a/README.md
+++ b/README.md
@@ -224,6 +224,18 @@ NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted
 </template>
 ```
 
+The same with group:
+```handlebars
+<!-- client/myApp.html -->
+
+<template name="header">
+  ... regular header stuff
+  {{#if isInRole 'admin' 'researchAndDevelopment'}}
+    {{> admin_rad_nav}}  
+  {{/if}}
+</template>
+```
+
 <br />
 
 ### Documentation

From ca41ca5775f1dd954258da141ab92be22b991829 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 15 Dec 2013 16:58:31 -0500
Subject: [PATCH 0093/1140] v1.2.4 - Update getRolesForUser to not return null
 when group is specified but user has no permissions

---
 History.md                            |  5 +++++
 docs/classes/HandlebarsHelpers.html   |  2 +-
 docs/classes/Roles.html               |  2 +-
 docs/data.json                        |  2 +-
 docs/files/roles_roles_client.js.html |  2 +-
 docs/files/roles_roles_common.js.html |  4 ++--
 docs/files/roles_roles_server.js.html |  2 +-
 docs/index.html                       |  2 +-
 docs/modules/HandlebarsHelpers.html   |  2 +-
 docs/modules/Roles.html               |  2 +-
 roles/roles_common.js                 |  2 +-
 roles/smart.json                      |  2 +-
 roles/tests/server.js                 | 31 +++++++++++++++++++++++++++
 yuidoc.json                           |  2 +-
 14 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/History.md b/History.md
index 04bed44604..14b2357a20 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v1.2.4
+
+* Update getRolesForUser to not return null when group is specified but user has no permissions
+
+
 ## v1.2.3
 
 * Support using group in 'isInRole' client handlebars helper. 
diff --git a/docs/classes/HandlebarsHelpers.html b/docs/classes/HandlebarsHelpers.html
index 04bac68b8a..29bb4c986c 100644
--- a/docs/classes/HandlebarsHelpers.html
+++ b/docs/classes/HandlebarsHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.3</em>
+            <em>API Docs for: v1.2.4</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index d80fbb9489..bf08dbecd3 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.3</em>
+            <em>API Docs for: v1.2.4</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/data.json b/docs/data.json
index 3c24cc4867..cf5eebe38d 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.3"
+        "version": "v1.2.4"
     },
     "files": {
         "roles/roles_client.js": {
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index c10a7868da..b83b0bb47f 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.3</em>
+            <em>API Docs for: v1.2.4</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index f4f3c0283a..b57ff0a148 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.3</em>
+            <em>API Docs for: v1.2.4</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -497,7 +497,7 @@ Roles.getRolesForUser = function (user, group) {
   if (!user || !user.roles) return []
 
   if (group) {
-    return _.union(user.roles[group], user.roles[Roles.GLOBAL_GROUP] || [])
+    return _.union(user.roles[group] || [], user.roles[Roles.GLOBAL_GROUP] || [])
   }
 
   if (_.isArray(user.roles))
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 9741b713d4..22e709297a 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.3</em>
+            <em>API Docs for: v1.2.4</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/index.html b/docs/index.html
index d23ae0f7b0..eb5a0d6d5f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.3</em>
+            <em>API Docs for: v1.2.4</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/HandlebarsHelpers.html b/docs/modules/HandlebarsHelpers.html
index c21a6d390c..069a502c59 100644
--- a/docs/modules/HandlebarsHelpers.html
+++ b/docs/modules/HandlebarsHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.3</em>
+            <em>API Docs for: v1.2.4</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 0f04bbed80..8c40a69b5a 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.3</em>
+            <em>API Docs for: v1.2.4</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 075ae459ea..52a89ecf35 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -403,7 +403,7 @@ Roles.getRolesForUser = function (user, group) {
   if (!user || !user.roles) return []
 
   if (group) {
-    return _.union(user.roles[group], user.roles[Roles.GLOBAL_GROUP] || [])
+    return _.union(user.roles[group] || [], user.roles[Roles.GLOBAL_GROUP] || [])
   }
 
   if (_.isArray(user.roles))
diff --git a/roles/smart.json b/roles/smart.json
index c1495cbbce..659b17b903 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 36abb18ad6..bb08d6587a 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -492,6 +492,37 @@
     })
 
 
+  Tinytest.add(
+    'roles - getRolesForUser should not return null entries if user has no roles for group', 
+    function (test) {
+      reset()
+
+      var userId = users.eve,
+          userObj
+
+      // by userId
+      test.equal(Roles.getRolesForUser(userId, 'group1'), [])
+      test.equal(Roles.getRolesForUser(userId), [])
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId})
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), [])
+      test.equal(Roles.getRolesForUser(userObj), [])
+
+
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP)
+
+      // by userId
+      test.equal(Roles.getRolesForUser(userId, 'group1'), ['editor'])
+      test.equal(Roles.getRolesForUser(userId), ['editor'])
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId})
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['editor'])
+      test.equal(Roles.getRolesForUser(userObj), ['editor'])
+    })
+
+
   Tinytest.add(
     'roles - can get all users in role', 
     function (test) {
diff --git a/yuidoc.json b/yuidoc.json
index 5e333cfef9..8120fbec9d 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.3",
+  "version": "v1.2.4",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From aa9cec63c49e313ddb78a179c292f23d9f4ef906 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 15 Dec 2013 21:40:56 -0500
Subject: [PATCH 0094/1140] v1.2.5 - add setUserRoles; support both user objs
 and user ids for all functions

---
 History.md                            |   7 +
 README.md                             |  46 +-
 docs/classes/HandlebarsHelpers.html   |   2 +-
 docs/classes/Roles.html               | 689 +++++++++++++++++-
 docs/data.json                        | 166 ++++-
 docs/files/roles_roles_client.js.html |   2 +-
 docs/files/roles_roles_common.js.html | 959 +++++++++++++++-----------
 docs/files/roles_roles_server.js.html |   2 +-
 docs/index.html                       |   2 +-
 docs/modules/HandlebarsHelpers.html   |   2 +-
 docs/modules/Roles.html               |   2 +-
 roles/roles_common.js                 | 957 ++++++++++++++-----------
 roles/smart.json                      |   2 +-
 roles/tests/server.js                 | 168 ++++-
 yuidoc.json                           |   2 +-
 15 files changed, 2128 insertions(+), 880 deletions(-)

diff --git a/History.md b/History.md
index 14b2357a20..277183d74b 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,10 @@
+## v1.2.5
+
+* Add setUserRoles function
+* Support passing user object for Roles.addUsersToRoles
+* Support passing user object for Roles.removeUsersFromRoles
+
+
 ## v1.2.4
 
 * Update getRolesForUser to not return null when group is specified but user has no permissions
diff --git a/README.md b/README.md
index 3d193030c2..981d2cb14b 100644
--- a/README.md
+++ b/README.md
@@ -185,7 +185,7 @@ Prevent non-authorized users from creating new users:
 
 <br />
 
-Prevent access to certain functionality:
+Prevent access to certain functionality, such as deleting a user:
 ```js
 // server/userMethods.js
 
@@ -194,16 +194,50 @@ Meteor.methods({
    * delete a user from a specific group
    * 
    * @method deleteUser
-   * @param {String} userId _id of user to delete
+   * @param {String} targetUserId _id of user to delete
+   * @param {String} group Company to update permissions for
    */
-  deleteUser: function (userId, group) {
+  deleteUser: function (targetUserId, group) {
     var loggedInUser = Meteor.user()
 
-    if (!loggedInUser
-        || !Roles.userIsInRole(loggedInUser, ['manage-users','admin'], group))
+    if (!loggedInUser ||
+        !Roles.userIsInRole(loggedInUser, 
+                            ['manage-users','support-staff'], group)) {
       throw new Meteor.Error(403, "Access denied")
+    }
 
-    // remove user from group...
+    // remove permissions for target group
+    Roles.setUserRoles(targetUserId, [], group)
+
+    // do other actions required when a user is removed...
+  }
+})
+```
+
+<br />
+
+Manage a user's permissions:
+```js
+// server/userMethods.js
+
+Meteor.methods({
+  /**
+   * update a user's permissions
+   *
+   * @param {Object} targetUserId Id of user to update
+   * @param {Array} roles User's new permissions
+   * @param {String} group Company to update permissions for
+   */
+  updateRoles: function (targetUserId, roles, group) {
+    var loggedInUser = Meteor.user()
+
+    if (!loggedInUser ||
+        !Roles.userIsInRole(loggedInUser, 
+                            ['manage-users','support-staff'], group)) {
+      throw new Meteor.Error(403, "Access denied")
+    }
+
+    Roles.setUserRoles(targetUser, roles, group)
   }
 })
 ```
diff --git a/docs/classes/HandlebarsHelpers.html b/docs/classes/HandlebarsHelpers.html
index 29bb4c986c..2e4a1e9176 100644
--- a/docs/classes/HandlebarsHelpers.html
+++ b/docs/classes/HandlebarsHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.4</em>
+            <em>API Docs for: v1.2.5</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index bf08dbecd3..e8a2a2291d 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.4</em>
+            <em>API Docs for: v1.2.5</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -200,6 +200,27 @@
 
                     <ul class="index-list methods">
                         
+                            <li class="index-item method protected">
+                                <a href="#method__update_$addToSet_fn">_update_$addToSet_fn</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method protected">
+                                <a href="#method__update_$set_fn">_update_$set_fn</a>
+
+                                
+                                
+                            </li>
+                        
+                            <li class="index-item method protected">
+                                <a href="#method__updateUserRoles">_updateUserRoles</a>
+
+                                
+                                
+                            </li>
+                        
                             <li class="index-item method">
                                 <a href="#method_addUsersToRoles">addUsersToRoles</a>
 
@@ -247,6 +268,13 @@
 
                                 
                                 
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_setUserRoles">setUserRoles</a>
+
+                                
+                                
                             </li>
                         
                             <li class="index-item method">
@@ -289,6 +317,475 @@
                 <h2 class="off-left">Methods</h2>
 
                 
+                    <div id="method__update_$addToSet_fn" class="method item protected">
+    <h3 class="name"><code>_update_$addToSet_fn</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>roles</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+    
+
+    
+
+    
+        <span class="flag protected">protected</span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="../files/roles_roles_common.js.html#l468"><code>roles&#x2F;roles_common.js:468</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Private function &#39;template&#39; that uses $addToSet to construct an update 
+object for MongoDB.  Passed to _updateUserRoles</p>
+
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">roles</code>
+                        <span class="type">Array</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                         
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                         
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Object</span>:
+                    
+                    <p>update object for use in MongoDB update command</p>
+
+                
+            </div>
+        </div>
+    
+
+    
+</div>
+
+                
+                    <div id="method__update_$set_fn" class="method item protected">
+    <h3 class="name"><code>_update_$set_fn</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>roles</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+    
+
+    
+
+    
+        <span class="flag protected">protected</span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="../files/roles_roles_common.js.html#l443"><code>roles&#x2F;roles_common.js:443</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Private function &#39;template&#39; that uses $set to construct an update object
+for MongoDB.  Passed to _updateUserRoles</p>
+
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">roles</code>
+                        <span class="type">Array</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                         
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                         
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Object</span>:
+                    
+                    <p>update object for use in MongoDB update command</p>
+
+                
+            </div>
+        </div>
+    
+
+    
+</div>
+
+                
+                    <div id="method__updateUserRoles" class="method item protected">
+    <h3 class="name"><code>_updateUserRoles</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>users</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code>roles</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code>group</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code>updateFactory</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code>roles</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+
+    
+
+    
+        <span class="flag protected">protected</span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="../files/roles_roles_common.js.html#l494"><code>roles&#x2F;roles_common.js:494</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Internal function that users the Template pattern to adds or sets roles 
+for users.</p>
+
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>user id(s) or object(s) with an _id field</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>name(s) of roles/permissions to add users to</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name">group</code>
+                        <span class="type">String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Group name. If not null or undefined, roles will be
+                        specific to that group.<br>                        The special group Roles.GLOBAL_GROUP provides 
+                        a convenient way to assign blanket roles/permissions
+                        across all groups.  The roles/permissions in the 
+                        Roles.GLOBAL_GROUP group will be automatically 
+                        included in checks for any group.</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name">updateFactory</code>
+                        <span class="type">Function</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Func which returns an update object that
+                        will be passed to Mongo.</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name">roles</code>
+                        <span class="type">Array</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                         
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                         
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+
+    
+</div>
+
+                
                     <div id="method_addUsersToRoles" class="method item">
     <h3 class="name"><code>addUsersToRoles</code></h3>
 
@@ -343,7 +840,7 @@
             
         
         
-        <a href="../files/roles_roles_common.js.html#l107"><code>roles&#x2F;roles_common.js:107</code></a>
+        <a href="../files/roles_roles_common.js.html#l112"><code>roles&#x2F;roles_common.js:112</code></a>
         
         </p>
 
@@ -380,7 +877,7 @@
                     
 
                     <div class="param-description">
-                        <p>id(s) of users to add to roles</p>
+                        <p>User id(s) or object(s) with an _id field</p>
 
                     </div>
 
@@ -396,7 +893,7 @@
                     
 
                     <div class="param-description">
-                        <p>name(s) of roles/permissions to add users to</p>
+                        <p>Name(s) of roles/permissions to add users to</p>
 
                     </div>
 
@@ -414,7 +911,7 @@
 
                     <div class="param-description">
                         <p>Optional group name. If supplied, roles will be
-                        specific to that group.<br>                        The group Roles.GLOBAL_GROUP is special and provides 
+                        specific to that group.<br>                        The special group Roles.GLOBAL_GROUP provides 
                         a convenient way to assign blanket roles/permissions
                         across all groups.  The roles/permissions in the 
                         Roles.GLOBAL_GROUP group will be automatically 
@@ -494,7 +991,7 @@ Roles.addUsersToRoles(userId, &#39;admin&#39;, Roles.GLOBAL_GROUP)</code></pre>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l50"><code>roles&#x2F;roles_common.js:50</code></a>
+        <a href="../files/roles_roles_common.js.html#l55"><code>roles&#x2F;roles_common.js:55</code></a>
         
         </p>
 
@@ -597,7 +1094,7 @@ Roles.addUsersToRoles(userId, &#39;admin&#39;, Roles.GLOBAL_GROUP)</code></pre>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l83"><code>roles&#x2F;roles_common.js:83</code></a>
+        <a href="../files/roles_roles_common.js.html#l88"><code>roles&#x2F;roles_common.js:88</code></a>
         
         </p>
 
@@ -681,7 +1178,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l416"><code>roles&#x2F;roles_common.js:416</code></a>
+        <a href="../files/roles_roles_common.js.html#l386"><code>roles&#x2F;roles_common.js:386</code></a>
         
         </p>
 
@@ -770,7 +1267,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l380"><code>roles&#x2F;roles_common.js:380</code></a>
+        <a href="../files/roles_roles_common.js.html#l350"><code>roles&#x2F;roles_common.js:350</code></a>
         
         </p>
 
@@ -800,7 +1297,7 @@ are currently assigned to the target role.</p>
                     
 
                     <div class="param-description">
-                        <p>UserId or actual user object</p>
+                        <p>User Id or actual user object</p>
 
                     </div>
 
@@ -901,7 +1398,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l426"><code>roles&#x2F;roles_common.js:426</code></a>
+        <a href="../files/roles_roles_common.js.html#l396"><code>roles&#x2F;roles_common.js:396</code></a>
         
         </p>
 
@@ -1039,7 +1536,7 @@ used automatically.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l214"><code>roles&#x2F;roles_common.js:214</code></a>
+        <a href="../files/roles_roles_common.js.html#l171"><code>roles&#x2F;roles_common.js:171</code></a>
         
         </p>
 
@@ -1069,7 +1566,7 @@ used automatically.</p>
                     
 
                     <div class="param-description">
-                        <p>id(s) of users to add to roles</p>
+                        <p>User id(s) or object(s) with an _id field</p>
 
                     </div>
 
@@ -1085,7 +1582,7 @@ used automatically.</p>
                     
 
                     <div class="param-description">
-                        <p>name(s) of roles to add users to</p>
+                        <p>Name(s) of roles to add users to</p>
 
                     </div>
 
@@ -1132,6 +1629,158 @@ Roles.removeUsersFromRoles(users.eve, [&#39;user&#39;], &#39;group1&#39;)</code>
 </div>
 
                 
+                    <div id="method_setUserRoles" class="method item">
+    <h3 class="name"><code>setUserRoles</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>users</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code>roles</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code class="optional">[group]</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="../files/roles_roles_common.js.html#l145"><code>roles&#x2F;roles_common.js:145</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Set a users roles/permissions.</p>
+
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>User id(s) or object(s) with an _id field</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Name(s) of roles/permissions to add users to</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[group]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional group name. If supplied, roles will be
+                        specific to that group.<br>                        The special group Roles.GLOBAL_GROUP provides 
+                        a convenient way to assign blanket roles/permissions
+                        across all groups.  The roles/permissions in the 
+                        Roles.GLOBAL_GROUP group will be automatically 
+                        included in checks for any group.</p>
+
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+
+    
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.setUserRoles(userId, &#39;admin&#39;)
+Roles.setUserRoles(userId, [&#39;view-secrets&#39;], &#39;example.com&#39;)
+Roles.setUserRoles([user1, user2], [&#39;user&#39;,&#39;editor&#39;])
+Roles.setUserRoles([user1, user2], [&#39;glorious-admin&#39;, &#39;perform-action&#39;], &#39;example.org&#39;)
+Roles.setUserRoles(userId, &#39;admin&#39;, Roles.GLOBAL_GROUP)</code></pre>
+
+            </div>
+        </div>
+    
+</div>
+
+                
                     <div id="method_userIsInRole" class="method item">
     <h3 class="name"><code>userIsInRole</code></h3>
 
@@ -1190,7 +1839,7 @@ Roles.removeUsersFromRoles(users.eve, [&#39;user&#39;], &#39;group1&#39;)</code>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l273"><code>roles&#x2F;roles_common.js:273</code></a>
+        <a href="../files/roles_roles_common.js.html#l244"><code>roles&#x2F;roles_common.js:244</code></a>
         
         </p>
 
@@ -1220,7 +1869,7 @@ Roles.removeUsersFromRoles(users.eve, [&#39;user&#39;], &#39;group1&#39;)</code>
                     
 
                     <div class="param-description">
-                        <p>Id of user or actual user object</p>
+                        <p>User Id or actual user object</p>
 
                     </div>
 
@@ -1345,7 +1994,7 @@ Roles.userIsInRole(user, &#39;admin&#39;)</code></pre>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l34"><code>roles&#x2F;roles_common.js:34</code></a>
+        <a href="../files/roles_roles_common.js.html#l35"><code>roles&#x2F;roles_common.js:35</code></a>
         
         </p>
 
@@ -1368,7 +2017,11 @@ can be used to apply blanket permissions across all groups.</p>
 
             <div class="example-content">
                 <pre class="code prettyprint"><code>Roles.addUsersToRoles(user, &#39;admin&#39;, Roles.GLOBAL_GROUP)
-Roles.userIsInRole(user, &#39;admin&#39;) =&gt; true</code></pre>
+Roles.userIsInRole(user, &#39;admin&#39;) // =&gt; true
+
+Roles.setUserRoles(user, &#39;support-staff&#39;, Roles.GLOBAL_GROUP)
+Roles.userIsInRole(user, &#39;support-staff&#39;) // =&gt; true
+Roles.userIsInRole(user, &#39;admin&#39;) // =&gt; false</code></pre>
 
             </div>
         </div>
diff --git a/docs/data.json b/docs/data.json
index cf5eebe38d..d6bd7072ae 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.4"
+        "version": "v1.2.5"
     },
     "files": {
         "roles/roles_client.js": {
@@ -133,10 +133,10 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 34,
+            "line": 35,
             "description": "Constant used to reference the special 'global' group that \ncan be used to apply blanket permissions across all groups.",
             "example": [
-                "\n    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)\n    Roles.userIsInRole(user, 'admin') => true"
+                "\n    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)\n    Roles.userIsInRole(user, 'admin') // => true\n\n    Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)\n    Roles.userIsInRole(user, 'support-staff') // => true\n    Roles.userIsInRole(user, 'admin') // => false"
             ],
             "itemtype": "property",
             "name": "GLOBAL_GROUP",
@@ -148,7 +148,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 50,
+            "line": 55,
             "description": "Create a new role. Whitespace will be trimmed.",
             "itemtype": "method",
             "name": "createRole",
@@ -168,7 +168,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 83,
+            "line": 88,
             "description": "Delete an existing role.  Will throw \"Role in use\" error if any users\nare currently assigned to the target role.",
             "itemtype": "method",
             "name": "deleteRole",
@@ -184,7 +184,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 107,
+            "line": 112,
             "description": "Add users to roles. Will create roles as needed.\n\nNOTE: Mixing grouped and non-grouped roles for the same user\n      is not supported and will throw an error.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
             "example": [
                 "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')\n    Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)"
@@ -194,17 +194,17 @@
             "params": [
                 {
                     "name": "users",
-                    "description": "id(s) of users to add to roles",
+                    "description": "User id(s) or object(s) with an _id field",
                     "type": "Array|String"
                 },
                 {
                     "name": "roles",
-                    "description": "name(s) of roles/permissions to add users to",
+                    "description": "Name(s) of roles/permissions to add users to",
                     "type": "Array|String"
                 },
                 {
                     "name": "group",
-                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        The group Roles.GLOBAL_GROUP is special and provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
                     "type": "String",
                     "optional": true
                 }
@@ -214,7 +214,37 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 214,
+            "line": 145,
+            "description": "Set a users roles/permissions.",
+            "example": [
+                "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')\n    Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)"
+            ],
+            "itemtype": "method",
+            "name": "setUserRoles",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "User id(s) or object(s) with an _id field",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles/permissions to add users to",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "type": "String",
+                    "optional": true
+                }
+            ],
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 171,
             "description": "Remove users from roles",
             "example": [
                 "\n    Roles.removeUsersFromRoles(users.bob, 'admin')\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])\n    Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')"
@@ -224,12 +254,12 @@
             "params": [
                 {
                     "name": "users",
-                    "description": "id(s) of users to add to roles",
+                    "description": "User id(s) or object(s) with an _id field",
                     "type": "Array|String"
                 },
                 {
                     "name": "roles",
-                    "description": "name(s) of roles to add users to",
+                    "description": "Name(s) of roles to add users to",
                     "type": "Array|String"
                 },
                 {
@@ -244,7 +274,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 273,
+            "line": 244,
             "description": "Check if user has specified permissions/roles",
             "example": [
                 "\n    // non-group usage\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // per-group usage\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)\n\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP\n    Roles.userIsInRole(user, 'admin')"
@@ -254,7 +284,7 @@
             "params": [
                 {
                     "name": "user",
-                    "description": "Id of user or actual user object",
+                    "description": "User Id or actual user object",
                     "type": "String|Object"
                 },
                 {
@@ -278,14 +308,14 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 380,
+            "line": 350,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
             "params": [
                 {
                     "name": "user",
-                    "description": "UserId or actual user object",
+                    "description": "User Id or actual user object",
                     "type": "String|Object"
                 },
                 {
@@ -304,7 +334,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 416,
+            "line": 386,
             "description": "Retrieve set of all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -317,7 +347,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 426,
+            "line": 396,
             "description": "Retrieve all users who are in target role.  \n\nNOTE: This is an expensive query; it performs a full collection scan\non the users collection since there is no index set on the 'roles' field.  \nThis is by design as most queries will specify an _id so the _id index is \nused automatically.",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -341,6 +371,106 @@
             "class": "Roles",
             "module": "Roles"
         },
+        {
+            "file": "roles/roles_common.js",
+            "line": 443,
+            "description": "Private function 'template' that uses $set to construct an update object\nfor MongoDB.  Passed to _updateUserRoles",
+            "itemtype": "method",
+            "name": "_update_$set_fn",
+            "access": "protected",
+            "tagname": "",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "",
+                    "type": "String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "update object for use in MongoDB update command",
+                "type": "Object"
+            },
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 468,
+            "description": "Private function 'template' that uses $addToSet to construct an update \nobject for MongoDB.  Passed to _updateUserRoles",
+            "itemtype": "method",
+            "name": "_update_$addToSet_fn",
+            "access": "protected",
+            "tagname": "",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "",
+                    "type": "String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "update object for use in MongoDB update command",
+                "type": "Object"
+            },
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 494,
+            "description": "Internal function that users the Template pattern to adds or sets roles \nfor users.",
+            "itemtype": "method",
+            "name": "_updateUserRoles",
+            "access": "protected",
+            "tagname": "",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "user id(s) or object(s) with an _id field",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "name(s) of roles/permissions to add users to",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Group name. If not null or undefined, roles will be\n                        specific to that group.  \n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "type": "String"
+                },
+                {
+                    "name": "updateFactory",
+                    "description": "Func which returns an update object that\n                        will be passed to Mongo.",
+                    "type": "Function"
+                },
+                {
+                    "name": "roles",
+                    "description": "",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "",
+                    "type": "String",
+                    "optional": true
+                }
+            ],
+            "class": "Roles",
+            "module": "Roles"
+        },
         {
             "file": "roles/roles_server.js",
             "line": 4,
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index b83b0bb47f..64b03fc73a 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.4</em>
+            <em>API Docs for: v1.2.5</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index b57ff0a148..8be4d6cb92 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.4</em>
+            <em>API Docs for: v1.2.5</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -124,444 +124,573 @@ if (&#x27;undefined&#x27; === typeof Roles) {
 
 var mixingGroupAndNonGroupErrorMsg = &quot;Roles error: Can&#x27;t mix grouped and non-grouped roles for same user&quot;;
 
+_.extend(Roles, {
 
-/**
- * Constant used to reference the special &#x27;global&#x27; group that 
- * can be used to apply blanket permissions across all groups.
- *
- * @example
- *     Roles.addUsersToRoles(user, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
- *     Roles.userIsInRole(user, &#x27;admin&#x27;) =&gt; true
- *
- * @property GLOBAL_GROUP
- * @type String
- * @static
- * @final
- */
-Roles.GLOBAL_GROUP = &#x27;__global_roles__&#x27;
+  /**
+   * Constant used to reference the special &#x27;global&#x27; group that 
+   * can be used to apply blanket permissions across all groups.
+   *
+   * @example
+   *     Roles.addUsersToRoles(user, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
+   *     Roles.userIsInRole(user, &#x27;admin&#x27;) // =&gt; true
+   *
+   *     Roles.setUserRoles(user, &#x27;support-staff&#x27;, Roles.GLOBAL_GROUP)
+   *     Roles.userIsInRole(user, &#x27;support-staff&#x27;) // =&gt; true
+   *     Roles.userIsInRole(user, &#x27;admin&#x27;) // =&gt; false
+   *
+   * @property GLOBAL_GROUP
+   * @type String
+   * @static
+   * @final
+   */
+  GLOBAL_GROUP: &#x27;__global_roles__&#x27;,
 
 
-/**
- * Create a new role. Whitespace will be trimmed.
- *
- * @method createRole
- * @param {String} role Name of role
- * @return {String} id of new role
- */
-Roles.createRole = function (role) {
-  var id,
-      match
+  /**
+   * Create a new role. Whitespace will be trimmed.
+   *
+   * @method createRole
+   * @param {String} role Name of role
+   * @return {String} id of new role
+   */
+  createRole: function (role) {
+    var id,
+        match
 
-  if (!role
-      || &#x27;string&#x27; !== typeof role
-      || role.trim().length === 0) {
-    return
-  }
-
-  try {
-    id = Meteor.roles.insert({&#x27;name&#x27;: role.trim()})
-    return id
-  } catch (e) {
-    // (from Meteor accounts-base package, insertUserDoc func)
-    // XXX string parsing sucks, maybe
-    // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-    if (e.name !== &#x27;MongoError&#x27;) throw e
-    match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/)
-    if (!match) throw e
-    if (match[1].indexOf(&#x27;$name&#x27;) !== -1)
-      throw new Meteor.Error(403, &quot;Role already exists.&quot;)
-    throw e
-  }
-}
-
-/**
- * Delete an existing role.  Will throw &quot;Role in use&quot; error if any users
- * are currently assigned to the target role.
- *
- * @method deleteRole
- * @param {String} role Name of role
- */
-Roles.deleteRole = function (role) {
-  if (!role) return
-
-  var foundExistingUser = Meteor.users.findOne(
-                            {roles: {$in: [role]}},
-                            {fields: {_id: 1}})
-
-  if (foundExistingUser) {
-    throw new Meteor.Error(403, &#x27;Role in use&#x27;)
-  }
-
-  var thisRole = Meteor.roles.findOne({name: role})
-  if (thisRole) {
-    Meteor.roles.remove({_id: thisRole._id})
-  }
-}
-
-/**
- * Add users to roles. Will create roles as needed.
- *
- * NOTE: Mixing grouped and non-grouped roles for the same user
- *       is not supported and will throw an error.
- *
- * Makes 2 calls to database:
- *  1. retrieve list of all existing roles
- *  2. update users&#x27; roles
- *
- * @example
- *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;)
- *     Roles.addUsersToRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
- *     Roles.addUsersToRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
- *     Roles.addUsersToRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
- *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
- *
- * @method addUsersToRoles
- * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles/permissions to add users to
- * @param {String} [group] Optional group name. If supplied, roles will be
- *                         specific to that group.  
- *                         The group Roles.GLOBAL_GROUP is special and provides 
- *                         a convenient way to assign blanket roles/permissions
- *                         across all groups.  The roles/permissions in the 
- *                         Roles.GLOBAL_GROUP group will be automatically 
- *                         included in checks for any group.
- */
-Roles.addUsersToRoles = function (users, roles, group) {
-  if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
-  if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
-  if (group &amp;&amp; &#x27;string&#x27; !== typeof group)
-    throw new Error (&quot;Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
-
-  var existingRoles,
-      query,
-      update
-
-  // ensure arrays
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  // remove invalid roles
-  roles = _.reduce(roles, function (memo, role) {
-    if (role
-        &amp;&amp; &#x27;string&#x27; === typeof role
-        &amp;&amp; role.trim().length &gt; 0) {
-      memo.push(role.trim())
-    }
-    return memo
-  }, [])
-
-  if (roles.length === 0)
-    return
-
-  // ensure all roles exist in &#x27;roles&#x27; collection
-  existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
-    memo[role.name] = true
-    return memo
-  }, {})
-  _.each(roles, function (role) {
-    if (!existingRoles[role]) {
-      Roles.createRole(role)
-    }
-  })
-
-  // update all users, adding to roles set
-  
-  if (group) {
-    // roles is a key/value dict object
-    update = {$addToSet: {}}
-    update.$addToSet[&#x27;roles.&#x27; + group] = {$each: roles}
-  } else {
-    // assume roles is an array of strings
-    update = {$addToSet: {roles: {$each: roles}}}
-  }
-
-  try {
-    if (Meteor.isClient) {
-      // On client, iterate over each user to fulfill Meteor&#x27;s 
-      // &#x27;one update per ID&#x27; policy
-      _.each(users, function (user) {
-        Meteor.users.update({_id: user}, update)
-      })
-    } else {
-      // On the server we can use MongoDB&#x27;s $in operator for 
-      // better performance
-      Meteor.users.update(
-        {_id: {$in: users}},
-        update,
-        {multi: true})
-    }
-  }
-  catch (ex) {
-    var addNonGroupToGroupedRolesMsg = &#x27;Cannot apply $addToSet modifier to non-array&#x27;,
-        addGrouped2NonGroupedMsg = &quot;can&#x27;t append to array using string field name&quot;
-
-    if (ex.name === &#x27;MongoError&#x27; &amp;&amp;
-        (ex.err === addNonGroupToGroupedRolesMsg ||
-         ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {
-      throw new Error (mixingGroupAndNonGroupErrorMsg)
+    if (!role
+        || &#x27;string&#x27; !== typeof role
+        || role.trim().length === 0) {
+      return
     }
 
-    throw ex
-  }
-}
-
-/**
- * Remove users from roles
- *
- * @example
- *     Roles.removeUsersFromRoles(users.bob, &#x27;admin&#x27;)
- *     Roles.removeUsersFromRoles([users.bob, users.joe], [&#x27;editor&#x27;])
- *     Roles.removeUsersFromRoles([users.bob, users.joe], [&#x27;editor&#x27;, &#x27;user&#x27;])
- *     Roles.removeUsersFromRoles(users.eve, [&#x27;user&#x27;], &#x27;group1&#x27;)
- *
- * @method removeUsersFromRoles
- * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles to add users to
- * @param {String} [group] Optional. Group name. If supplied, only that
- *                         group will have roles removed.
- */
-Roles.removeUsersFromRoles = function (users, roles, group) {
-  var update
-
-  if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
-  if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
-  if (group &amp;&amp; &#x27;string&#x27; !== typeof group) 
-    throw new Error (&quot;Invalid &#x27;group&#x27; param&quot;)
-
-  // ensure arrays
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  if (group) {
-    update = {$pullAll: {}}
-    update.$pullAll[&#x27;roles.&#x27;+group] = roles
-  } else {
-    update = {$pullAll: {roles: roles}}
-  }
-
-  // update all users, remove from roles set
-  
-  try {
-    if (Meteor.isClient) {
-      // Iterate over each user to fulfill Meteor&#x27;s &#x27;one update per ID&#x27; policy
-      _.each(users, function (user) {
-        Meteor.users.update({_id:user}, update)
-      })
-    } else {
-      // On the server we can leverage MongoDB&#x27;s $in operator for performance
-      Meteor.users.update({_id:{$in:users}}, update, {multi: true})
+    try {
+      id = Meteor.roles.insert({&#x27;name&#x27;: role.trim()})
+      return id
+    } catch (e) {
+      // (from Meteor accounts-base package, insertUserDoc func)
+      // XXX string parsing sucks, maybe
+      // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
+      if (e.name !== &#x27;MongoError&#x27;) throw e
+      match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/)
+      if (!match) throw e
+      if (match[1].indexOf(&#x27;$name&#x27;) !== -1)
+        throw new Meteor.Error(403, &quot;Role already exists.&quot;)
+      throw e
     }
-  }
-  catch (ex) {
-    var removeNonGroupedRoleFromGroupMsg = &#x27;Cannot apply $pull/$pullAll modifier to non-array&#x27; 
+  },
 
-    if (ex.name === &#x27;MongoError&#x27; &amp;&amp;
-        ex.err === removeNonGroupedRoleFromGroupMsg) {
-      throw new Error (mixingGroupAndNonGroupErrorMsg)
+  /**
+   * Delete an existing role.  Will throw &quot;Role in use&quot; error if any users
+   * are currently assigned to the target role.
+   *
+   * @method deleteRole
+   * @param {String} role Name of role
+   */
+  deleteRole: function (role) {
+    if (!role) return
+
+    var foundExistingUser = Meteor.users.findOne(
+                              {roles: {$in: [role]}},
+                              {fields: {_id: 1}})
+
+    if (foundExistingUser) {
+      throw new Meteor.Error(403, &#x27;Role in use&#x27;)
     }
 
-    throw ex
-  }
-}
+    var thisRole = Meteor.roles.findOne({name: role})
+    if (thisRole) {
+      Meteor.roles.remove({_id: thisRole._id})
+    }
+  },
 
-/**
- * Check if user has specified permissions/roles
- *
- * @example
- *     // non-group usage
- *     Roles.userIsInRole(user, &#x27;admin&#x27;)
- *     Roles.userIsInRole(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
- *     Roles.userIsInRole(userId, &#x27;admin&#x27;)
- *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
- *
- *     // per-group usage
- *     Roles.userIsInRole(user,   [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
- *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
- *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], Roles.GLOBAL_GROUP)
- *
- *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
- *     Roles.userIsInRole(user, &#x27;admin&#x27;)
- *
- *    
- * @method userIsInRole
- * @param {String|Object} user Id of user or actual user object
- * @param {String|Array} roles Name of role/permission or Array of 
- *                            roles/permissions to check against.  If array, 
- *                            will return true if user is in _any_ role.
- * @param {String} [group] Optional. Name of group.  If supplied, limits check
- *                         to just that group.
- *                         The user&#x27;s Roles.GLOBAL_GROUP will always be checked
- *                         whether group is specified or not.  
- * @return {Boolean} true if user is in _any_ of the target roles
- */
-Roles.userIsInRole = function (user, roles, group) {
-  var id,
-      userRoles,
-      query,
-      groupQuery,
-      found = false
+  /**
+   * Add users to roles. Will create roles as needed.
+   *
+   * NOTE: Mixing grouped and non-grouped roles for the same user
+   *       is not supported and will throw an error.
+   *
+   * Makes 2 calls to database:
+   *  1. retrieve list of all existing roles
+   *  2. update users&#x27; roles
+   *
+   * @example
+   *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;)
+   *     Roles.addUsersToRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
+   *     Roles.addUsersToRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
+   *     Roles.addUsersToRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
+   *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
+   *
+   * @method addUsersToRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field
+   * @param {Array|String} roles Name(s) of roles/permissions to add users to
+   * @param {String} [group] Optional group name. If supplied, roles will be
+   *                         specific to that group.  
+   *                         The special group Roles.GLOBAL_GROUP provides 
+   *                         a convenient way to assign blanket roles/permissions
+   *                         across all groups.  The roles/permissions in the 
+   *                         Roles.GLOBAL_GROUP group will be automatically 
+   *                         included in checks for any group.
+   */
+  addUsersToRoles: function (users, roles, group) {
+    // use Template pattern to update user roles
+    Roles._updateUserRoles(users, roles, group, Roles._update_$addToSet_fn)
+  },
 
-  // ensure array to simplify code
-  if (!_.isArray(roles)) {
-    roles = [roles]
-  }
+  /**
+   * Set a users roles/permissions.
+   *
+   * @example
+   *     Roles.setUserRoles(userId, &#x27;admin&#x27;)
+   *     Roles.setUserRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
+   *     Roles.setUserRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
+   *     Roles.setUserRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
+   *     Roles.setUserRoles(userId, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
+   *
+   * @method setUserRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field
+   * @param {Array|String} roles Name(s) of roles/permissions to add users to
+   * @param {String} [group] Optional group name. If supplied, roles will be
+   *                         specific to that group.  
+   *                         The special group Roles.GLOBAL_GROUP provides 
+   *                         a convenient way to assign blanket roles/permissions
+   *                         across all groups.  The roles/permissions in the 
+   *                         Roles.GLOBAL_GROUP group will be automatically 
+   *                         included in checks for any group.
+   */
+  setUserRoles: function (users, roles, group) {
+    // use Template pattern to update user roles
+    Roles._updateUserRoles(users, roles, group, Roles._update_$set_fn)
+  },
 
-  if (!user) return false
-  if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return false
-  
-  if (&#x27;object&#x27; === typeof user) {
-    userRoles = user.roles
-    if (_.isArray(userRoles)) {
-      return _.some(roles, function (role) {
-        return _.contains(userRoles, role)
-      })
-    } else if (&#x27;object&#x27; === typeof userRoles) {
-      // roles field is dictionary of groups
-      found = _.isArray(userRoles[group]) &amp;&amp; _.some(roles, function (role) {
-        return _.contains(userRoles[group], role)
-      })
-      if (!found) {
-        // not found in regular group or group not specified.  
-        // check Roles.GLOBAL_GROUP, if it exists
-        found = _.isArray(userRoles[Roles.GLOBAL_GROUP]) &amp;&amp; _.some(roles, function (role) {
-          return _.contains(userRoles[Roles.GLOBAL_GROUP], role)
-        })
+  /**
+   * Remove users from roles
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(users.bob, &#x27;admin&#x27;)
+   *     Roles.removeUsersFromRoles([users.bob, users.joe], [&#x27;editor&#x27;])
+   *     Roles.removeUsersFromRoles([users.bob, users.joe], [&#x27;editor&#x27;, &#x27;user&#x27;])
+   *     Roles.removeUsersFromRoles(users.eve, [&#x27;user&#x27;], &#x27;group1&#x27;)
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field
+   * @param {Array|String} roles Name(s) of roles to add users to
+   * @param {String} [group] Optional. Group name. If supplied, only that
+   *                         group will have roles removed.
+   */
+  removeUsersFromRoles: function (users, roles, group) {
+    var update
+
+    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
+    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
+    if (group &amp;&amp; &#x27;string&#x27; !== typeof group) 
+      throw new Error (&quot;Invalid &#x27;group&#x27; param&quot;)
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users]
+    if (!_.isArray(roles)) roles = [roles]
+
+    // ensure users is an array of user ids
+    users = _.reduce(users, function (memo, user) {
+      var _id
+      if (&#x27;string&#x27; === typeof user) {
+        memo.push(user)
+      } else if (&#x27;object&#x27; === typeof user) {
+        _id = user._id
+        if (&#x27;string&#x27; === typeof _id) {
+          memo.push(_id)
+        }
       }
-      return found
+      return memo
+    }, [])
+
+    // update all users, remove from roles set
+    
+    if (group) {
+      update = {$pullAll: {}}
+      update.$pullAll[&#x27;roles.&#x27;+group] = roles
+    } else {
+      update = {$pullAll: {roles: roles}}
     }
 
-    // missing roles field, try going direct via id
-    id = user._id
-  } else if (&#x27;string&#x27; === typeof user) {
-    id = user
-  }
+    try {
+      if (Meteor.isClient) {
+        // Iterate over each user to fulfill Meteor&#x27;s &#x27;one update per ID&#x27; policy
+        _.each(users, function (user) {
+          Meteor.users.update({_id:user}, update)
+        })
+      } else {
+        // On the server we can leverage MongoDB&#x27;s $in operator for performance
+        Meteor.users.update({_id:{$in:users}}, update, {multi: true})
+      }
+    }
+    catch (ex) {
+      var removeNonGroupedRoleFromGroupMsg = &#x27;Cannot apply $pull/$pullAll modifier to non-array&#x27; 
 
-  if (!id) return false
+      if (ex.name === &#x27;MongoError&#x27; &amp;&amp;
+          ex.err === removeNonGroupedRoleFromGroupMsg) {
+        throw new Error (mixingGroupAndNonGroupErrorMsg)
+      }
+
+      throw ex
+    }
+  },
+
+  /**
+   * Check if user has specified permissions/roles
+   *
+   * @example
+   *     // non-group usage
+   *     Roles.userIsInRole(user, &#x27;admin&#x27;)
+   *     Roles.userIsInRole(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
+   *     Roles.userIsInRole(userId, &#x27;admin&#x27;)
+   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
+   *
+   *     // per-group usage
+   *     Roles.userIsInRole(user,   [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
+   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
+   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], Roles.GLOBAL_GROUP)
+   *
+   *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
+   *     Roles.userIsInRole(user, &#x27;admin&#x27;)
+   *    
+   * @method userIsInRole
+   * @param {String|Object} user User Id or actual user object
+   * @param {String|Array} roles Name of role/permission or Array of 
+   *                            roles/permissions to check against.  If array, 
+   *                            will return true if user is in _any_ role.
+   * @param {String} [group] Optional. Name of group.  If supplied, limits check
+   *                         to just that group.
+   *                         The user&#x27;s Roles.GLOBAL_GROUP will always be checked
+   *                         whether group is specified or not.  
+   * @return {Boolean} true if user is in _any_ of the target roles
+   */
+  userIsInRole: function (user, roles, group) {
+    var id,
+        userRoles,
+        query,
+        groupQuery,
+        found = false
+
+    // ensure array to simplify code
+    if (!_.isArray(roles)) {
+      roles = [roles]
+    }
+
+    if (!user) return false
+    if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return false
+    
+    if (&#x27;object&#x27; === typeof user) {
+      userRoles = user.roles
+      if (_.isArray(userRoles)) {
+        return _.some(roles, function (role) {
+          return _.contains(userRoles, role)
+        })
+      } else if (&#x27;object&#x27; === typeof userRoles) {
+        // roles field is dictionary of groups
+        found = _.isArray(userRoles[group]) &amp;&amp; _.some(roles, function (role) {
+          return _.contains(userRoles[group], role)
+        })
+        if (!found) {
+          // not found in regular group or group not specified.  
+          // check Roles.GLOBAL_GROUP, if it exists
+          found = _.isArray(userRoles[Roles.GLOBAL_GROUP]) &amp;&amp; _.some(roles, function (role) {
+            return _.contains(userRoles[Roles.GLOBAL_GROUP], role)
+          })
+        }
+        return found
+      }
+
+      // missing roles field, try going direct via id
+      id = user._id
+    } else if (&#x27;string&#x27; === typeof user) {
+      id = user
+    }
+
+    if (!id) return false
 
 
-  query = {_id: id, $or: []}
-
-  // always check Roles.GLOBAL_GROUP
-  groupQuery = {}
-  groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
-  query.$or.push(groupQuery)
-
-  if (group) {
-    // structure of query, when group specified including Roles.GLOBAL_GROUP 
-    //   {_id: id, 
-    //    $or: [
-    //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
-    //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
-    //    ]}
-    groupQuery = {}
-    groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
-    query.$or.push(groupQuery)
-  } else {
-    // structure of query, where group not specified. includes 
-    // Roles.GLOBAL_GROUP 
-    //   {_id: id, 
-    //    $or: [
-    //      {roles: {$in: [&#x27;admin&#x27;]}},
-    //      {&#x27;roles.__global_roles__&#x27;: {$in: [&#x27;admin&#x27;]}}
-    //    ]}
-    query.$or.push({roles: {$in: roles}})
-  }
-
-  found = Meteor.users.findOne(query, {fields: {_id: 1}})
-  return found ? true : false
-}
-
-/**
- * Retrieve users roles
- *
- * @method getRolesForUser
- * @param {String|Object} user UserId or actual user object
- * @param {String} [group] Optional name of group to restrict roles to.
- *                         User&#x27;s Roles.GLOBAL_GROUP will also be included.
- * @return {Array} Array of user&#x27;s roles, unsorted.
- */
-Roles.getRolesForUser = function (user, group) {
-  if (!user) return []
-  if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return []
-
-  if (&#x27;string&#x27; === typeof user) {
-    user = Meteor.users.findOne(
-             {_id: user},
-             {fields: {roles: 1}})
-
-  } else if (&#x27;object&#x27; !== typeof user) {
-    // invalid user object
-    return []
-  }
-
-  if (!user || !user.roles) return []
-
-  if (group) {
-    return _.union(user.roles[group] || [], user.roles[Roles.GLOBAL_GROUP] || [])
-  }
-
-  if (_.isArray(user.roles))
-    return user.roles
-
-  // using groups but group not specified. return global group, if exists
-  return user.roles[Roles.GLOBAL_GROUP] || []
-}
-
-/**
- * Retrieve set of all existing roles
- *
- * @method getAllRoles
- * @return {Cursor} cursor of existing roles
- */
-Roles.getAllRoles = function () {
-  return Meteor.roles.find({}, {sort: {name: 1}})
-}
-
-/**
- * Retrieve all users who are in target role.  
- *
- * NOTE: This is an expensive query; it performs a full collection scan
- * on the users collection since there is no index set on the &#x27;roles&#x27; field.  
- * This is by design as most queries will specify an _id so the _id index is 
- * used automatically.
- *
- * @method getUsersInRole
- * @param {Array|String} role Name of role/permission.  If array, users 
- *                            returned will have at least one of the roles
- *                            specified but need not have _all_ roles.
- * @param {String} [group] Optional name of group to restrict roles to.
- *                         User&#x27;s Roles.GLOBAL_GROUP will also be checked.
- * @return {Cursor} cursor of users in role
- */
-Roles.getUsersInRole = function (role, group) {
-  var query,
-      roles = role,
-      groupQuery
-
-  // ensure array to simplify query logic
-  if (!_.isArray(roles)) roles = [roles]
-  
-  if (group) {
-    // structure of group query, including Roles.GLOBAL_GROUP
-    //   {$or: [
-    //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
-    //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
-    //    ]}
-    query = {$or: []}
-
-    groupQuery = {}
-    groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
-    query.$or.push(groupQuery)
+    query = {_id: id, $or: []}
 
+    // always check Roles.GLOBAL_GROUP
     groupQuery = {}
     groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
     query.$or.push(groupQuery)
-  } else {
-    query = { roles: { $in: roles } }
-  }
 
-  return Meteor.users.find(query)
-}
+    if (group) {
+      // structure of query, when group specified including Roles.GLOBAL_GROUP 
+      //   {_id: id, 
+      //    $or: [
+      //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
+      //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
+      //    ]}
+      groupQuery = {}
+      groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
+      query.$or.push(groupQuery)
+    } else {
+      // structure of query, where group not specified. includes 
+      // Roles.GLOBAL_GROUP 
+      //   {_id: id, 
+      //    $or: [
+      //      {roles: {$in: [&#x27;admin&#x27;]}},
+      //      {&#x27;roles.__global_roles__&#x27;: {$in: [&#x27;admin&#x27;]}}
+      //    ]}
+      query.$or.push({roles: {$in: roles}})
+    }
+
+    found = Meteor.users.findOne(query, {fields: {_id: 1}})
+    return found ? true : false
+  },
+
+  /**
+   * Retrieve users roles
+   *
+   * @method getRolesForUser
+   * @param {String|Object} user User Id or actual user object
+   * @param {String} [group] Optional name of group to restrict roles to.
+   *                         User&#x27;s Roles.GLOBAL_GROUP will also be included.
+   * @return {Array} Array of user&#x27;s roles, unsorted.
+   */
+  getRolesForUser: function (user, group) {
+    if (!user) return []
+    if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return []
+
+    if (&#x27;string&#x27; === typeof user) {
+      user = Meteor.users.findOne(
+               {_id: user},
+               {fields: {roles: 1}})
+
+    } else if (&#x27;object&#x27; !== typeof user) {
+      // invalid user object
+      return []
+    }
+
+    if (!user || !user.roles) return []
+
+    if (group) {
+      return _.union(user.roles[group] || [], user.roles[Roles.GLOBAL_GROUP] || [])
+    }
+
+    if (_.isArray(user.roles))
+      return user.roles
+
+    // using groups but group not specified. return global group, if exists
+    return user.roles[Roles.GLOBAL_GROUP] || []
+  },
+
+  /**
+   * Retrieve set of all existing roles
+   *
+   * @method getAllRoles
+   * @return {Cursor} cursor of existing roles
+   */
+  getAllRoles: function () {
+    return Meteor.roles.find({}, {sort: {name: 1}})
+  },
+
+  /**
+   * Retrieve all users who are in target role.  
+   *
+   * NOTE: This is an expensive query; it performs a full collection scan
+   * on the users collection since there is no index set on the &#x27;roles&#x27; field.  
+   * This is by design as most queries will specify an _id so the _id index is 
+   * used automatically.
+   *
+   * @method getUsersInRole
+   * @param {Array|String} role Name of role/permission.  If array, users 
+   *                            returned will have at least one of the roles
+   *                            specified but need not have _all_ roles.
+   * @param {String} [group] Optional name of group to restrict roles to.
+   *                         User&#x27;s Roles.GLOBAL_GROUP will also be checked.
+   * @return {Cursor} cursor of users in role
+   */
+  getUsersInRole: function (role, group) {
+    var query,
+        roles = role,
+        groupQuery
+
+    // ensure array to simplify query logic
+    if (!_.isArray(roles)) roles = [roles]
+    
+    if (group) {
+      // structure of group query, including Roles.GLOBAL_GROUP
+      //   {$or: [
+      //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
+      //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
+      //    ]}
+      query = {$or: []}
+
+      groupQuery = {}
+      groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
+      query.$or.push(groupQuery)
+
+      groupQuery = {}
+      groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
+      query.$or.push(groupQuery)
+    } else {
+      query = { roles: { $in: roles } }
+    }
+
+    return Meteor.users.find(query)
+  },  // end getUsersInRole 
+
+
+  /**
+   * Private function &#x27;template&#x27; that uses $set to construct an update object
+   * for MongoDB.  Passed to _updateUserRoles
+   *
+   * @method _update_$set_fn 
+   * @protected
+   * @param {Array} roles
+   * @param {String} [group]
+   * @return {Object} update object for use in MongoDB update command
+   */
+  _update_$set_fn: function  (roles, group) {
+    var update = {}
+
+    if (group) {
+      // roles is a key/value dict object
+      update.$set = {}
+      update.$set[&#x27;roles.&#x27; + group] = roles
+    } else {
+      // roles is an array of strings
+      update.$set = {roles: roles}
+    }
+
+    return update
+  },  // end _update_$set_fn 
+
+  /**
+   * Private function &#x27;template&#x27; that uses $addToSet to construct an update 
+   * object for MongoDB.  Passed to _updateUserRoles
+   *
+   * @method _update_$addToSet_fn  
+   * @protected
+   * @param {Array} roles
+   * @param {String} [group]
+   * @return {Object} update object for use in MongoDB update command
+   */
+  _update_$addToSet_fn: function (roles, group) {
+    var update = {}
+
+    if (group) {
+      // roles is a key/value dict object
+      update.$addToSet = {}
+      update.$addToSet[&#x27;roles.&#x27; + group] = {$each: roles}
+    } else {
+      // roles is an array of strings
+      update.$addToSet = {roles: {$each: roles}}
+    }
+
+    return update
+  },  // end _update_$addToSet_fn 
+
+
+  /**
+   * Internal function that users the Template pattern to adds or sets roles 
+   * for users.
+   *
+   * @method _updateUserRoles
+   * @protected
+   * @param {Array|String} users user id(s) or object(s) with an _id field
+   * @param {Array|String} roles name(s) of roles/permissions to add users to
+   * @param {String} group Group name. If not null or undefined, roles will be
+   *                         specific to that group.  
+   *                         The special group Roles.GLOBAL_GROUP provides 
+   *                         a convenient way to assign blanket roles/permissions
+   *                         across all groups.  The roles/permissions in the 
+   *                         Roles.GLOBAL_GROUP group will be automatically 
+   *                         included in checks for any group.
+   * @param {Function} updateFactory Func which returns an update object that
+   *                         will be passed to Mongo.
+   *   @param {Array} roles
+   *   @param {String} [group]
+   */
+  _updateUserRoles: function (users, roles, group, updateFactory) {
+    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
+    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
+    if (group &amp;&amp; &#x27;string&#x27; !== typeof group)
+      throw new Error (&quot;Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
+
+    var existingRoles,
+        query,
+        update
+
+    // ensure arrays to simplify code
+    if (!_.isArray(users)) users = [users]
+    if (!_.isArray(roles)) roles = [roles]
+
+    // remove invalid roles
+    roles = _.reduce(roles, function (memo, role) {
+      if (role
+          &amp;&amp; &#x27;string&#x27; === typeof role
+          &amp;&amp; role.trim().length &gt; 0) {
+        memo.push(role.trim())
+      }
+      return memo
+    }, [])
+
+    // empty roles array is ok, since it might be a $set operation to clear roles
+    //if (roles.length === 0) return
+
+    // ensure all roles exist in &#x27;roles&#x27; collection
+    existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
+      memo[role.name] = true
+      return memo
+    }, {})
+    _.each(roles, function (role) {
+      if (!existingRoles[role]) {
+        Roles.createRole(role)
+      }
+    })
+
+    // ensure users is an array of user ids
+    users = _.reduce(users, function (memo, user) {
+      var _id
+      if (&#x27;string&#x27; === typeof user) {
+        memo.push(user)
+      } else if (&#x27;object&#x27; === typeof user) {
+        _id = user._id
+        if (&#x27;string&#x27; === typeof _id) {
+          memo.push(_id)
+        }
+      }
+      return memo
+    }, [])
+    
+    // update all users
+    update = updateFactory(roles, group)
+    
+    try {
+      if (Meteor.isClient) {
+        // On client, iterate over each user to fulfill Meteor&#x27;s 
+        // &#x27;one update per ID&#x27; policy
+        _.each(users, function (user) {
+          Meteor.users.update({_id: user}, update)
+        })
+      } else {
+        // On the server we can use MongoDB&#x27;s $in operator for 
+        // better performance
+        Meteor.users.update(
+          {_id: {$in: users}},
+          update,
+          {multi: true})
+      }
+    }
+    catch (ex) {
+      var addNonGroupToGroupedRolesMsg = &#x27;Cannot apply $addToSet modifier to non-array&#x27;,
+          addGrouped2NonGroupedMsg = &quot;can&#x27;t append to array using string field name&quot;
+
+      if (ex.name === &#x27;MongoError&#x27; &amp;&amp;
+          (ex.err === addNonGroupToGroupedRolesMsg ||
+           ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {
+        throw new Error (mixingGroupAndNonGroupErrorMsg)
+      }
+
+      throw ex
+    }
+  }  // end _updateUserRoles
+
+})  // end _.extend(Roles ...)
 
 }());
 
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 22e709297a..550396df41 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.4</em>
+            <em>API Docs for: v1.2.5</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/index.html b/docs/index.html
index eb5a0d6d5f..632d842d6f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.4</em>
+            <em>API Docs for: v1.2.5</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/HandlebarsHelpers.html b/docs/modules/HandlebarsHelpers.html
index 069a502c59..7241a64a76 100644
--- a/docs/modules/HandlebarsHelpers.html
+++ b/docs/modules/HandlebarsHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.4</em>
+            <em>API Docs for: v1.2.5</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 8c40a69b5a..dfd0bc5503 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.4</em>
+            <em>API Docs for: v1.2.5</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 52a89ecf35..02af8ab691 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -30,443 +30,572 @@ if ('undefined' === typeof Roles) {
 
 var mixingGroupAndNonGroupErrorMsg = "Roles error: Can't mix grouped and non-grouped roles for same user";
 
+_.extend(Roles, {
 
-/**
- * Constant used to reference the special 'global' group that 
- * can be used to apply blanket permissions across all groups.
- *
- * @example
- *     Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
- *     Roles.userIsInRole(user, 'admin') => true
- *
- * @property GLOBAL_GROUP
- * @type String
- * @static
- * @final
- */
-Roles.GLOBAL_GROUP = '__global_roles__'
+  /**
+   * Constant used to reference the special 'global' group that 
+   * can be used to apply blanket permissions across all groups.
+   *
+   * @example
+   *     Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
+   *     Roles.userIsInRole(user, 'admin') // => true
+   *
+   *     Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)
+   *     Roles.userIsInRole(user, 'support-staff') // => true
+   *     Roles.userIsInRole(user, 'admin') // => false
+   *
+   * @property GLOBAL_GROUP
+   * @type String
+   * @static
+   * @final
+   */
+  GLOBAL_GROUP: '__global_roles__',
 
 
-/**
- * Create a new role. Whitespace will be trimmed.
- *
- * @method createRole
- * @param {String} role Name of role
- * @return {String} id of new role
- */
-Roles.createRole = function (role) {
-  var id,
-      match
+  /**
+   * Create a new role. Whitespace will be trimmed.
+   *
+   * @method createRole
+   * @param {String} role Name of role
+   * @return {String} id of new role
+   */
+  createRole: function (role) {
+    var id,
+        match
 
-  if (!role
-      || 'string' !== typeof role
-      || role.trim().length === 0) {
-    return
-  }
-
-  try {
-    id = Meteor.roles.insert({'name': role.trim()})
-    return id
-  } catch (e) {
-    // (from Meteor accounts-base package, insertUserDoc func)
-    // XXX string parsing sucks, maybe
-    // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-    if (e.name !== 'MongoError') throw e
-    match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/)
-    if (!match) throw e
-    if (match[1].indexOf('$name') !== -1)
-      throw new Meteor.Error(403, "Role already exists.")
-    throw e
-  }
-}
-
-/**
- * Delete an existing role.  Will throw "Role in use" error if any users
- * are currently assigned to the target role.
- *
- * @method deleteRole
- * @param {String} role Name of role
- */
-Roles.deleteRole = function (role) {
-  if (!role) return
-
-  var foundExistingUser = Meteor.users.findOne(
-                            {roles: {$in: [role]}},
-                            {fields: {_id: 1}})
-
-  if (foundExistingUser) {
-    throw new Meteor.Error(403, 'Role in use')
-  }
-
-  var thisRole = Meteor.roles.findOne({name: role})
-  if (thisRole) {
-    Meteor.roles.remove({_id: thisRole._id})
-  }
-}
-
-/**
- * Add users to roles. Will create roles as needed.
- *
- * NOTE: Mixing grouped and non-grouped roles for the same user
- *       is not supported and will throw an error.
- *
- * Makes 2 calls to database:
- *  1. retrieve list of all existing roles
- *  2. update users' roles
- *
- * @example
- *     Roles.addUsersToRoles(userId, 'admin')
- *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
- *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
- *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
- *     Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)
- *
- * @method addUsersToRoles
- * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles/permissions to add users to
- * @param {String} [group] Optional group name. If supplied, roles will be
- *                         specific to that group.  
- *                         The group Roles.GLOBAL_GROUP is special and provides 
- *                         a convenient way to assign blanket roles/permissions
- *                         across all groups.  The roles/permissions in the 
- *                         Roles.GLOBAL_GROUP group will be automatically 
- *                         included in checks for any group.
- */
-Roles.addUsersToRoles = function (users, roles, group) {
-  if (!users) throw new Error ("Missing 'users' param")
-  if (!roles) throw new Error ("Missing 'roles' param")
-  if (group && 'string' !== typeof group)
-    throw new Error ("Invalid parameter 'group'. Expected 'string' type")
-
-  var existingRoles,
-      query,
-      update
-
-  // ensure arrays
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  // remove invalid roles
-  roles = _.reduce(roles, function (memo, role) {
-    if (role
-        && 'string' === typeof role
-        && role.trim().length > 0) {
-      memo.push(role.trim())
-    }
-    return memo
-  }, [])
-
-  if (roles.length === 0)
-    return
-
-  // ensure all roles exist in 'roles' collection
-  existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
-    memo[role.name] = true
-    return memo
-  }, {})
-  _.each(roles, function (role) {
-    if (!existingRoles[role]) {
-      Roles.createRole(role)
-    }
-  })
-
-  // update all users, adding to roles set
-  
-  if (group) {
-    // roles is a key/value dict object
-    update = {$addToSet: {}}
-    update.$addToSet['roles.' + group] = {$each: roles}
-  } else {
-    // assume roles is an array of strings
-    update = {$addToSet: {roles: {$each: roles}}}
-  }
-
-  try {
-    if (Meteor.isClient) {
-      // On client, iterate over each user to fulfill Meteor's 
-      // 'one update per ID' policy
-      _.each(users, function (user) {
-        Meteor.users.update({_id: user}, update)
-      })
-    } else {
-      // On the server we can use MongoDB's $in operator for 
-      // better performance
-      Meteor.users.update(
-        {_id: {$in: users}},
-        update,
-        {multi: true})
-    }
-  }
-  catch (ex) {
-    var addNonGroupToGroupedRolesMsg = 'Cannot apply $addToSet modifier to non-array',
-        addGrouped2NonGroupedMsg = "can't append to array using string field name"
-
-    if (ex.name === 'MongoError' &&
-        (ex.err === addNonGroupToGroupedRolesMsg ||
-         ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {
-      throw new Error (mixingGroupAndNonGroupErrorMsg)
+    if (!role
+        || 'string' !== typeof role
+        || role.trim().length === 0) {
+      return
     }
 
-    throw ex
-  }
-}
-
-/**
- * Remove users from roles
- *
- * @example
- *     Roles.removeUsersFromRoles(users.bob, 'admin')
- *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])
- *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])
- *     Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
- *
- * @method removeUsersFromRoles
- * @param {Array|String} users id(s) of users to add to roles
- * @param {Array|String} roles name(s) of roles to add users to
- * @param {String} [group] Optional. Group name. If supplied, only that
- *                         group will have roles removed.
- */
-Roles.removeUsersFromRoles = function (users, roles, group) {
-  var update
-
-  if (!users) throw new Error ("Missing 'users' param")
-  if (!roles) throw new Error ("Missing 'roles' param")
-  if (group && 'string' !== typeof group) 
-    throw new Error ("Invalid 'group' param")
-
-  // ensure arrays
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  if (group) {
-    update = {$pullAll: {}}
-    update.$pullAll['roles.'+group] = roles
-  } else {
-    update = {$pullAll: {roles: roles}}
-  }
-
-  // update all users, remove from roles set
-  
-  try {
-    if (Meteor.isClient) {
-      // Iterate over each user to fulfill Meteor's 'one update per ID' policy
-      _.each(users, function (user) {
-        Meteor.users.update({_id:user}, update)
-      })
-    } else {
-      // On the server we can leverage MongoDB's $in operator for performance
-      Meteor.users.update({_id:{$in:users}}, update, {multi: true})
+    try {
+      id = Meteor.roles.insert({'name': role.trim()})
+      return id
+    } catch (e) {
+      // (from Meteor accounts-base package, insertUserDoc func)
+      // XXX string parsing sucks, maybe
+      // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
+      if (e.name !== 'MongoError') throw e
+      match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/)
+      if (!match) throw e
+      if (match[1].indexOf('$name') !== -1)
+        throw new Meteor.Error(403, "Role already exists.")
+      throw e
     }
-  }
-  catch (ex) {
-    var removeNonGroupedRoleFromGroupMsg = 'Cannot apply $pull/$pullAll modifier to non-array' 
+  },
 
-    if (ex.name === 'MongoError' &&
-        ex.err === removeNonGroupedRoleFromGroupMsg) {
-      throw new Error (mixingGroupAndNonGroupErrorMsg)
+  /**
+   * Delete an existing role.  Will throw "Role in use" error if any users
+   * are currently assigned to the target role.
+   *
+   * @method deleteRole
+   * @param {String} role Name of role
+   */
+  deleteRole: function (role) {
+    if (!role) return
+
+    var foundExistingUser = Meteor.users.findOne(
+                              {roles: {$in: [role]}},
+                              {fields: {_id: 1}})
+
+    if (foundExistingUser) {
+      throw new Meteor.Error(403, 'Role in use')
     }
 
-    throw ex
-  }
-}
+    var thisRole = Meteor.roles.findOne({name: role})
+    if (thisRole) {
+      Meteor.roles.remove({_id: thisRole._id})
+    }
+  },
 
-/**
- * Check if user has specified permissions/roles
- *
- * @example
- *     // non-group usage
- *     Roles.userIsInRole(user, 'admin')
- *     Roles.userIsInRole(user, ['admin','editor'])
- *     Roles.userIsInRole(userId, 'admin')
- *     Roles.userIsInRole(userId, ['admin','editor'])
- *
- *     // per-group usage
- *     Roles.userIsInRole(user,   ['admin','editor'], 'group1')
- *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
- *     Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)
- *
- *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
- *     Roles.userIsInRole(user, 'admin')
- *
- *    
- * @method userIsInRole
- * @param {String|Object} user Id of user or actual user object
- * @param {String|Array} roles Name of role/permission or Array of 
- *                            roles/permissions to check against.  If array, 
- *                            will return true if user is in _any_ role.
- * @param {String} [group] Optional. Name of group.  If supplied, limits check
- *                         to just that group.
- *                         The user's Roles.GLOBAL_GROUP will always be checked
- *                         whether group is specified or not.  
- * @return {Boolean} true if user is in _any_ of the target roles
- */
-Roles.userIsInRole = function (user, roles, group) {
-  var id,
-      userRoles,
-      query,
-      groupQuery,
-      found = false
+  /**
+   * Add users to roles. Will create roles as needed.
+   *
+   * NOTE: Mixing grouped and non-grouped roles for the same user
+   *       is not supported and will throw an error.
+   *
+   * Makes 2 calls to database:
+   *  1. retrieve list of all existing roles
+   *  2. update users' roles
+   *
+   * @example
+   *     Roles.addUsersToRoles(userId, 'admin')
+   *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
+   *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *     Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)
+   *
+   * @method addUsersToRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field
+   * @param {Array|String} roles Name(s) of roles/permissions to add users to
+   * @param {String} [group] Optional group name. If supplied, roles will be
+   *                         specific to that group.  
+   *                         The special group Roles.GLOBAL_GROUP provides 
+   *                         a convenient way to assign blanket roles/permissions
+   *                         across all groups.  The roles/permissions in the 
+   *                         Roles.GLOBAL_GROUP group will be automatically 
+   *                         included in checks for any group.
+   */
+  addUsersToRoles: function (users, roles, group) {
+    // use Template pattern to update user roles
+    Roles._updateUserRoles(users, roles, group, Roles._update_$addToSet_fn)
+  },
 
-  // ensure array to simplify code
-  if (!_.isArray(roles)) {
-    roles = [roles]
-  }
+  /**
+   * Set a users roles/permissions.
+   *
+   * @example
+   *     Roles.setUserRoles(userId, 'admin')
+   *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.setUserRoles([user1, user2], ['user','editor'])
+   *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *     Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)
+   *
+   * @method setUserRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field
+   * @param {Array|String} roles Name(s) of roles/permissions to add users to
+   * @param {String} [group] Optional group name. If supplied, roles will be
+   *                         specific to that group.  
+   *                         The special group Roles.GLOBAL_GROUP provides 
+   *                         a convenient way to assign blanket roles/permissions
+   *                         across all groups.  The roles/permissions in the 
+   *                         Roles.GLOBAL_GROUP group will be automatically 
+   *                         included in checks for any group.
+   */
+  setUserRoles: function (users, roles, group) {
+    // use Template pattern to update user roles
+    Roles._updateUserRoles(users, roles, group, Roles._update_$set_fn)
+  },
 
-  if (!user) return false
-  if (group && 'string' !== typeof group) return false
-  
-  if ('object' === typeof user) {
-    userRoles = user.roles
-    if (_.isArray(userRoles)) {
-      return _.some(roles, function (role) {
-        return _.contains(userRoles, role)
-      })
-    } else if ('object' === typeof userRoles) {
-      // roles field is dictionary of groups
-      found = _.isArray(userRoles[group]) && _.some(roles, function (role) {
-        return _.contains(userRoles[group], role)
-      })
-      if (!found) {
-        // not found in regular group or group not specified.  
-        // check Roles.GLOBAL_GROUP, if it exists
-        found = _.isArray(userRoles[Roles.GLOBAL_GROUP]) && _.some(roles, function (role) {
-          return _.contains(userRoles[Roles.GLOBAL_GROUP], role)
-        })
+  /**
+   * Remove users from roles
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(users.bob, 'admin')
+   *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])
+   *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])
+   *     Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field
+   * @param {Array|String} roles Name(s) of roles to add users to
+   * @param {String} [group] Optional. Group name. If supplied, only that
+   *                         group will have roles removed.
+   */
+  removeUsersFromRoles: function (users, roles, group) {
+    var update
+
+    if (!users) throw new Error ("Missing 'users' param")
+    if (!roles) throw new Error ("Missing 'roles' param")
+    if (group && 'string' !== typeof group) 
+      throw new Error ("Invalid 'group' param")
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users]
+    if (!_.isArray(roles)) roles = [roles]
+
+    // ensure users is an array of user ids
+    users = _.reduce(users, function (memo, user) {
+      var _id
+      if ('string' === typeof user) {
+        memo.push(user)
+      } else if ('object' === typeof user) {
+        _id = user._id
+        if ('string' === typeof _id) {
+          memo.push(_id)
+        }
       }
-      return found
+      return memo
+    }, [])
+
+    // update all users, remove from roles set
+    
+    if (group) {
+      update = {$pullAll: {}}
+      update.$pullAll['roles.'+group] = roles
+    } else {
+      update = {$pullAll: {roles: roles}}
     }
 
-    // missing roles field, try going direct via id
-    id = user._id
-  } else if ('string' === typeof user) {
-    id = user
-  }
+    try {
+      if (Meteor.isClient) {
+        // Iterate over each user to fulfill Meteor's 'one update per ID' policy
+        _.each(users, function (user) {
+          Meteor.users.update({_id:user}, update)
+        })
+      } else {
+        // On the server we can leverage MongoDB's $in operator for performance
+        Meteor.users.update({_id:{$in:users}}, update, {multi: true})
+      }
+    }
+    catch (ex) {
+      var removeNonGroupedRoleFromGroupMsg = 'Cannot apply $pull/$pullAll modifier to non-array' 
 
-  if (!id) return false
+      if (ex.name === 'MongoError' &&
+          ex.err === removeNonGroupedRoleFromGroupMsg) {
+        throw new Error (mixingGroupAndNonGroupErrorMsg)
+      }
+
+      throw ex
+    }
+  },
+
+  /**
+   * Check if user has specified permissions/roles
+   *
+   * @example
+   *     // non-group usage
+   *     Roles.userIsInRole(user, 'admin')
+   *     Roles.userIsInRole(user, ['admin','editor'])
+   *     Roles.userIsInRole(userId, 'admin')
+   *     Roles.userIsInRole(userId, ['admin','editor'])
+   *
+   *     // per-group usage
+   *     Roles.userIsInRole(user,   ['admin','editor'], 'group1')
+   *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
+   *     Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)
+   *
+   *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
+   *     Roles.userIsInRole(user, 'admin')
+   *    
+   * @method userIsInRole
+   * @param {String|Object} user User Id or actual user object
+   * @param {String|Array} roles Name of role/permission or Array of 
+   *                            roles/permissions to check against.  If array, 
+   *                            will return true if user is in _any_ role.
+   * @param {String} [group] Optional. Name of group.  If supplied, limits check
+   *                         to just that group.
+   *                         The user's Roles.GLOBAL_GROUP will always be checked
+   *                         whether group is specified or not.  
+   * @return {Boolean} true if user is in _any_ of the target roles
+   */
+  userIsInRole: function (user, roles, group) {
+    var id,
+        userRoles,
+        query,
+        groupQuery,
+        found = false
+
+    // ensure array to simplify code
+    if (!_.isArray(roles)) {
+      roles = [roles]
+    }
+
+    if (!user) return false
+    if (group && 'string' !== typeof group) return false
+    
+    if ('object' === typeof user) {
+      userRoles = user.roles
+      if (_.isArray(userRoles)) {
+        return _.some(roles, function (role) {
+          return _.contains(userRoles, role)
+        })
+      } else if ('object' === typeof userRoles) {
+        // roles field is dictionary of groups
+        found = _.isArray(userRoles[group]) && _.some(roles, function (role) {
+          return _.contains(userRoles[group], role)
+        })
+        if (!found) {
+          // not found in regular group or group not specified.  
+          // check Roles.GLOBAL_GROUP, if it exists
+          found = _.isArray(userRoles[Roles.GLOBAL_GROUP]) && _.some(roles, function (role) {
+            return _.contains(userRoles[Roles.GLOBAL_GROUP], role)
+          })
+        }
+        return found
+      }
+
+      // missing roles field, try going direct via id
+      id = user._id
+    } else if ('string' === typeof user) {
+      id = user
+    }
+
+    if (!id) return false
 
 
-  query = {_id: id, $or: []}
-
-  // always check Roles.GLOBAL_GROUP
-  groupQuery = {}
-  groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
-  query.$or.push(groupQuery)
-
-  if (group) {
-    // structure of query, when group specified including Roles.GLOBAL_GROUP 
-    //   {_id: id, 
-    //    $or: [
-    //      {'roles.group1':{$in: ['admin']}},
-    //      {'roles.__global_roles__':{$in: ['admin']}}
-    //    ]}
-    groupQuery = {}
-    groupQuery['roles.'+group] = {$in: roles}
-    query.$or.push(groupQuery)
-  } else {
-    // structure of query, where group not specified. includes 
-    // Roles.GLOBAL_GROUP 
-    //   {_id: id, 
-    //    $or: [
-    //      {roles: {$in: ['admin']}},
-    //      {'roles.__global_roles__': {$in: ['admin']}}
-    //    ]}
-    query.$or.push({roles: {$in: roles}})
-  }
-
-  found = Meteor.users.findOne(query, {fields: {_id: 1}})
-  return found ? true : false
-}
-
-/**
- * Retrieve users roles
- *
- * @method getRolesForUser
- * @param {String|Object} user UserId or actual user object
- * @param {String} [group] Optional name of group to restrict roles to.
- *                         User's Roles.GLOBAL_GROUP will also be included.
- * @return {Array} Array of user's roles, unsorted.
- */
-Roles.getRolesForUser = function (user, group) {
-  if (!user) return []
-  if (group && 'string' !== typeof group) return []
-
-  if ('string' === typeof user) {
-    user = Meteor.users.findOne(
-             {_id: user},
-             {fields: {roles: 1}})
-
-  } else if ('object' !== typeof user) {
-    // invalid user object
-    return []
-  }
-
-  if (!user || !user.roles) return []
-
-  if (group) {
-    return _.union(user.roles[group] || [], user.roles[Roles.GLOBAL_GROUP] || [])
-  }
-
-  if (_.isArray(user.roles))
-    return user.roles
-
-  // using groups but group not specified. return global group, if exists
-  return user.roles[Roles.GLOBAL_GROUP] || []
-}
-
-/**
- * Retrieve set of all existing roles
- *
- * @method getAllRoles
- * @return {Cursor} cursor of existing roles
- */
-Roles.getAllRoles = function () {
-  return Meteor.roles.find({}, {sort: {name: 1}})
-}
-
-/**
- * Retrieve all users who are in target role.  
- *
- * NOTE: This is an expensive query; it performs a full collection scan
- * on the users collection since there is no index set on the 'roles' field.  
- * This is by design as most queries will specify an _id so the _id index is 
- * used automatically.
- *
- * @method getUsersInRole
- * @param {Array|String} role Name of role/permission.  If array, users 
- *                            returned will have at least one of the roles
- *                            specified but need not have _all_ roles.
- * @param {String} [group] Optional name of group to restrict roles to.
- *                         User's Roles.GLOBAL_GROUP will also be checked.
- * @return {Cursor} cursor of users in role
- */
-Roles.getUsersInRole = function (role, group) {
-  var query,
-      roles = role,
-      groupQuery
-
-  // ensure array to simplify query logic
-  if (!_.isArray(roles)) roles = [roles]
-  
-  if (group) {
-    // structure of group query, including Roles.GLOBAL_GROUP
-    //   {$or: [
-    //      {'roles.group1':{$in: ['admin']}},
-    //      {'roles.__global_roles__':{$in: ['admin']}}
-    //    ]}
-    query = {$or: []}
-
-    groupQuery = {}
-    groupQuery['roles.'+group] = {$in: roles}
-    query.$or.push(groupQuery)
+    query = {_id: id, $or: []}
 
+    // always check Roles.GLOBAL_GROUP
     groupQuery = {}
     groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
     query.$or.push(groupQuery)
-  } else {
-    query = { roles: { $in: roles } }
-  }
 
-  return Meteor.users.find(query)
-}
+    if (group) {
+      // structure of query, when group specified including Roles.GLOBAL_GROUP 
+      //   {_id: id, 
+      //    $or: [
+      //      {'roles.group1':{$in: ['admin']}},
+      //      {'roles.__global_roles__':{$in: ['admin']}}
+      //    ]}
+      groupQuery = {}
+      groupQuery['roles.'+group] = {$in: roles}
+      query.$or.push(groupQuery)
+    } else {
+      // structure of query, where group not specified. includes 
+      // Roles.GLOBAL_GROUP 
+      //   {_id: id, 
+      //    $or: [
+      //      {roles: {$in: ['admin']}},
+      //      {'roles.__global_roles__': {$in: ['admin']}}
+      //    ]}
+      query.$or.push({roles: {$in: roles}})
+    }
+
+    found = Meteor.users.findOne(query, {fields: {_id: 1}})
+    return found ? true : false
+  },
+
+  /**
+   * Retrieve users roles
+   *
+   * @method getRolesForUser
+   * @param {String|Object} user User Id or actual user object
+   * @param {String} [group] Optional name of group to restrict roles to.
+   *                         User's Roles.GLOBAL_GROUP will also be included.
+   * @return {Array} Array of user's roles, unsorted.
+   */
+  getRolesForUser: function (user, group) {
+    if (!user) return []
+    if (group && 'string' !== typeof group) return []
+
+    if ('string' === typeof user) {
+      user = Meteor.users.findOne(
+               {_id: user},
+               {fields: {roles: 1}})
+
+    } else if ('object' !== typeof user) {
+      // invalid user object
+      return []
+    }
+
+    if (!user || !user.roles) return []
+
+    if (group) {
+      return _.union(user.roles[group] || [], user.roles[Roles.GLOBAL_GROUP] || [])
+    }
+
+    if (_.isArray(user.roles))
+      return user.roles
+
+    // using groups but group not specified. return global group, if exists
+    return user.roles[Roles.GLOBAL_GROUP] || []
+  },
+
+  /**
+   * Retrieve set of all existing roles
+   *
+   * @method getAllRoles
+   * @return {Cursor} cursor of existing roles
+   */
+  getAllRoles: function () {
+    return Meteor.roles.find({}, {sort: {name: 1}})
+  },
+
+  /**
+   * Retrieve all users who are in target role.  
+   *
+   * NOTE: This is an expensive query; it performs a full collection scan
+   * on the users collection since there is no index set on the 'roles' field.  
+   * This is by design as most queries will specify an _id so the _id index is 
+   * used automatically.
+   *
+   * @method getUsersInRole
+   * @param {Array|String} role Name of role/permission.  If array, users 
+   *                            returned will have at least one of the roles
+   *                            specified but need not have _all_ roles.
+   * @param {String} [group] Optional name of group to restrict roles to.
+   *                         User's Roles.GLOBAL_GROUP will also be checked.
+   * @return {Cursor} cursor of users in role
+   */
+  getUsersInRole: function (role, group) {
+    var query,
+        roles = role,
+        groupQuery
+
+    // ensure array to simplify query logic
+    if (!_.isArray(roles)) roles = [roles]
+    
+    if (group) {
+      // structure of group query, including Roles.GLOBAL_GROUP
+      //   {$or: [
+      //      {'roles.group1':{$in: ['admin']}},
+      //      {'roles.__global_roles__':{$in: ['admin']}}
+      //    ]}
+      query = {$or: []}
+
+      groupQuery = {}
+      groupQuery['roles.'+group] = {$in: roles}
+      query.$or.push(groupQuery)
+
+      groupQuery = {}
+      groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
+      query.$or.push(groupQuery)
+    } else {
+      query = { roles: { $in: roles } }
+    }
+
+    return Meteor.users.find(query)
+  },  // end getUsersInRole 
+
+
+  /**
+   * Private function 'template' that uses $set to construct an update object
+   * for MongoDB.  Passed to _updateUserRoles
+   *
+   * @method _update_$set_fn 
+   * @protected
+   * @param {Array} roles
+   * @param {String} [group]
+   * @return {Object} update object for use in MongoDB update command
+   */
+  _update_$set_fn: function  (roles, group) {
+    var update = {}
+
+    if (group) {
+      // roles is a key/value dict object
+      update.$set = {}
+      update.$set['roles.' + group] = roles
+    } else {
+      // roles is an array of strings
+      update.$set = {roles: roles}
+    }
+
+    return update
+  },  // end _update_$set_fn 
+
+  /**
+   * Private function 'template' that uses $addToSet to construct an update 
+   * object for MongoDB.  Passed to _updateUserRoles
+   *
+   * @method _update_$addToSet_fn  
+   * @protected
+   * @param {Array} roles
+   * @param {String} [group]
+   * @return {Object} update object for use in MongoDB update command
+   */
+  _update_$addToSet_fn: function (roles, group) {
+    var update = {}
+
+    if (group) {
+      // roles is a key/value dict object
+      update.$addToSet = {}
+      update.$addToSet['roles.' + group] = {$each: roles}
+    } else {
+      // roles is an array of strings
+      update.$addToSet = {roles: {$each: roles}}
+    }
+
+    return update
+  },  // end _update_$addToSet_fn 
+
+
+  /**
+   * Internal function that users the Template pattern to adds or sets roles 
+   * for users.
+   *
+   * @method _updateUserRoles
+   * @protected
+   * @param {Array|String} users user id(s) or object(s) with an _id field
+   * @param {Array|String} roles name(s) of roles/permissions to add users to
+   * @param {String} group Group name. If not null or undefined, roles will be
+   *                         specific to that group.  
+   *                         The special group Roles.GLOBAL_GROUP provides 
+   *                         a convenient way to assign blanket roles/permissions
+   *                         across all groups.  The roles/permissions in the 
+   *                         Roles.GLOBAL_GROUP group will be automatically 
+   *                         included in checks for any group.
+   * @param {Function} updateFactory Func which returns an update object that
+   *                         will be passed to Mongo.
+   *   @param {Array} roles
+   *   @param {String} [group]
+   */
+  _updateUserRoles: function (users, roles, group, updateFactory) {
+    if (!users) throw new Error ("Missing 'users' param")
+    if (!roles) throw new Error ("Missing 'roles' param")
+    if (group && 'string' !== typeof group)
+      throw new Error ("Invalid parameter 'group'. Expected 'string' type")
+
+    var existingRoles,
+        query,
+        update
+
+    // ensure arrays to simplify code
+    if (!_.isArray(users)) users = [users]
+    if (!_.isArray(roles)) roles = [roles]
+
+    // remove invalid roles
+    roles = _.reduce(roles, function (memo, role) {
+      if (role
+          && 'string' === typeof role
+          && role.trim().length > 0) {
+        memo.push(role.trim())
+      }
+      return memo
+    }, [])
+
+    // empty roles array is ok, since it might be a $set operation to clear roles
+    //if (roles.length === 0) return
+
+    // ensure all roles exist in 'roles' collection
+    existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
+      memo[role.name] = true
+      return memo
+    }, {})
+    _.each(roles, function (role) {
+      if (!existingRoles[role]) {
+        Roles.createRole(role)
+      }
+    })
+
+    // ensure users is an array of user ids
+    users = _.reduce(users, function (memo, user) {
+      var _id
+      if ('string' === typeof user) {
+        memo.push(user)
+      } else if ('object' === typeof user) {
+        _id = user._id
+        if ('string' === typeof _id) {
+          memo.push(_id)
+        }
+      }
+      return memo
+    }, [])
+    
+    // update all users
+    update = updateFactory(roles, group)
+    
+    try {
+      if (Meteor.isClient) {
+        // On client, iterate over each user to fulfill Meteor's 
+        // 'one update per ID' policy
+        _.each(users, function (user) {
+          Meteor.users.update({_id: user}, update)
+        })
+      } else {
+        // On the server we can use MongoDB's $in operator for 
+        // better performance
+        Meteor.users.update(
+          {_id: {$in: users}},
+          update,
+          {multi: true})
+      }
+    }
+    catch (ex) {
+      var addNonGroupToGroupedRolesMsg = 'Cannot apply $addToSet modifier to non-array',
+          addGrouped2NonGroupedMsg = "can't append to array using string field name"
+
+      if (ex.name === 'MongoError' &&
+          (ex.err === addNonGroupToGroupedRolesMsg ||
+           ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {
+        throw new Error (mixingGroupAndNonGroupErrorMsg)
+      }
+
+      throw ex
+    }
+  }  // end _updateUserRoles
+
+})  // end _.extend(Roles ...)
 
 }());
diff --git a/roles/smart.json b/roles/smart.json
index 659b17b903..e49ceb09c0 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/server.js b/roles/tests/server.js
index bb08d6587a..6a7dcf9c7a 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -39,7 +39,7 @@
     _.each(roles, function (role) {
       var expected = _.contains(expectedRoles, role),
           msg = username + ' expected to have \'' + role + '\' permission but does not',
-          nmsg = username + ' had un-expected permission ' + role
+          nmsg = username + ' had the following un-expected permission: ' + role
 
       if (expected) {
         test.isTrue(Roles.userIsInRole(userParam, role, group), msg)
@@ -204,6 +204,27 @@
       testUser(test, 'joe', [], 'group2')
     })
 
+  Tinytest.add(
+    'roles - can add user to roles via user object', 
+    function (test) {
+      reset() 
+
+      var eve = Meteor.users.findOne({_id: users.eve}),
+          bob = Meteor.users.findOne({_id: users.bob})
+
+      Roles.addUsersToRoles(eve, ['admin', 'user'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
+
+      Roles.addUsersToRoles(bob, ['editor'])
+
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['editor'])
+      testUser(test, 'joe', [])
+    })
+
   Tinytest.add(
     'roles - can add user to roles multiple times', 
     function (test) {
@@ -320,6 +341,24 @@
       testUser(test, 'eve', ['editor'])
     })
 
+  Tinytest.add(
+    'roles - can remove users from roles via user object', 
+    function (test) {
+      reset() 
+
+      var eve = Meteor.users.findOne({_id: users.eve}),
+          bob = Meteor.users.findOne({_id: users.bob})
+    
+      // remove user role - one user
+      Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      Roles.removeUsersFromRoles(eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+      testUser(test, 'bob', ['editor', 'user'])
+    })
+
+
   Tinytest.add(
     'roles - can remove individual users from roles by group', 
     function (test) {
@@ -392,6 +431,115 @@
       testUser(test, 'joe', [], 'group2')
     })
 
+  Tinytest.add(
+    'roles - can set user roles', 
+    function (test) {
+      reset() 
+
+      var eve = Meteor.users.findOne({_id: users.eve}),
+          bob = Meteor.users.findOne({_id: users.bob}),
+          joe = Meteor.users.findOne({_id: users.joe})
+    
+      Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      testUser(test, 'joe', [])
+
+      // use addUsersToRoles add some roles
+      Roles.addUsersToRoles([bob, users.joe], ['admin'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['admin', 'editor', 'user'])
+      testUser(test, 'joe', ['admin'])
+
+      Roles.setUserRoles([eve, bob], ['user'])
+      testUser(test, 'eve', ['user'])
+      testUser(test, 'bob', ['user'])
+      testUser(test, 'joe', ['admin'])
+
+      Roles.setUserRoles(bob, 'editor')
+      testUser(test, 'eve', ['user'])
+      testUser(test, 'bob', ['editor'])
+      testUser(test, 'joe', ['admin'])
+
+      Roles.setUserRoles([users.joe, users.bob], [])
+      testUser(test, 'eve', ['user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
+    })
+
+  Tinytest.add(
+    'roles - can set user roles by group', 
+    function (test) {
+      reset() 
+
+      var eve = Meteor.users.findOne({_id: users.eve}),
+          bob = Meteor.users.findOne({_id: users.bob}),
+          joe = Meteor.users.findOne({_id: users.joe})
+    
+      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'group1')
+      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'group2')
+      testUser(test, 'eve', ['editor', 'user'], 'group1')
+      testUser(test, 'bob', ['editor', 'user'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', ['admin'], 'group2')
+      testUser(test, 'joe', ['admin'], 'group2')
+
+      // use addUsersToRoles add some roles
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'group1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'group2')
+      testUser(test, 'eve', ['admin', 'editor', 'user'], 'group1')
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', [], 'group2')
+      testUser(test, 'bob', ['admin','editor'], 'group2')
+      testUser(test, 'joe', ['admin','editor'], 'group2')
+
+      Roles.setUserRoles([eve, bob], ['user'], 'group1')
+      Roles.setUserRoles([eve, joe], ['editor'], 'group2')
+      testUser(test, 'eve', ['user'], 'group1')
+      testUser(test, 'bob', ['user'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', ['editor'], 'group2')
+      testUser(test, 'bob', ['admin','editor'], 'group2')
+      testUser(test, 'joe', ['editor'], 'group2')
+
+      Roles.setUserRoles(bob, 'editor', 'group1')
+      testUser(test, 'eve', ['user'], 'group1')
+      testUser(test, 'bob', ['editor'], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', ['editor'], 'group2')
+      testUser(test, 'bob', ['admin','editor'], 'group2')
+      testUser(test, 'joe', ['editor'], 'group2')
+
+      Roles.setUserRoles([bob, users.joe], [], 'group1')
+      testUser(test, 'eve', ['user'], 'group1')
+      testUser(test, 'bob', [], 'group1')
+      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', ['editor'], 'group2')
+      testUser(test, 'bob', ['admin','editor'], 'group2')
+      testUser(test, 'joe', ['editor'], 'group2')
+    })
+
+  Tinytest.add(
+    'roles - can set user roles by group including GLOBAL_GROUP', 
+    function (test) {
+      reset() 
+
+      var eve = Meteor.users.findOne({_id: users.eve}),
+          bob = Meteor.users.findOne({_id: users.bob}),
+          joe = Meteor.users.findOne({_id: users.joe})
+    
+      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_GROUP)
+      testUser(test, 'eve', ['admin'], 'group1')
+      testUser(test, 'eve', ['admin'])
+
+      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_GROUP)
+      testUser(test, 'eve', ['editor'], 'group2')
+      testUser(test, 'eve', ['editor'])
+    })
+
+
   Tinytest.add(
     'roles - can get all roles', 
     function (test) {
@@ -655,6 +803,7 @@
       Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1')
       try {
         Roles.addUsersToRoles(users.joe, ['admin'])
+        throw new Error("expected exception but didn't get one")
       } 
       catch (ex) {
         test.isTrue(ex.message == expectedErrorMsg)
@@ -664,6 +813,7 @@
       Roles.addUsersToRoles(users.bob, ['editor', 'user'])
       try {
         Roles.addUsersToRoles(users.bob, ['admin'], 'group2')
+        throw new Error("expected exception but didn't get one")
       }
       catch (ex) {
         test.isTrue(ex.message == expectedErrorMsg)
@@ -673,6 +823,17 @@
       Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1')
       try {
         Roles.removeUsersFromRoles(users.bob, ['user'])
+        throw new Error("expected exception but didn't get one")
+      }
+      catch (ex) {
+        test.isTrue(ex.message == expectedErrorMsg)
+      }
+
+      reset() 
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'])
+      try {
+        Roles.setUserRoles(users.bob, ['user'], 'group1')
+        throw new Error("expected exception but didn't get one")
       }
       catch (ex) {
         test.isTrue(ex.message == expectedErrorMsg)
@@ -682,6 +843,11 @@
       Roles.addUsersToRoles(users.bob, ['editor', 'user'])
       // don't expect this to throw error
       Roles.removeUsersFromRoles(users.bob, ['user'], 'group1')
+
+      reset() 
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1')
+      // this is probably not a good idea but shouldn't throw...
+      Roles.setUserRoles(users.bob, ['user'])
     })
 
   function printException (ex) {
diff --git a/yuidoc.json b/yuidoc.json
index 8120fbec9d..4fe40f6d4d 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.4",
+  "version": "v1.2.5",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From f2a9058281f8f2fe028767841d7445aadd6893cf Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 17 Dec 2013 00:16:04 -0500
Subject: [PATCH 0095/1140] Add descriptive error msg when group name starts
 with $ Auto-convert periods in group names to underscores

---
 History.md                            |  6 ++
 docs/classes/HandlebarsHelpers.html   |  2 +-
 docs/classes/Roles.html               | 35 +++++++----
 docs/data.json                        | 26 ++++----
 docs/files/roles_roles_client.js.html |  2 +-
 docs/files/roles_roles_common.js.html | 86 ++++++++++++++++++++++-----
 docs/files/roles_roles_server.js.html |  2 +-
 docs/index.html                       |  2 +-
 docs/modules/HandlebarsHelpers.html   |  2 +-
 docs/modules/Roles.html               |  2 +-
 roles/roles_common.js                 | 84 +++++++++++++++++++++-----
 roles/smart.json                      |  2 +-
 roles/tests/server.js                 | 46 ++++++++++++--
 yuidoc.json                           |  2 +-
 14 files changed, 229 insertions(+), 70 deletions(-)

diff --git a/History.md b/History.md
index 277183d74b..8f581389f3 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,9 @@
+## v1.2.6
+
+* Add descriptive error msg when group name starts with $
+* Auto-convert periods in group names to underscores
+
+
 ## v1.2.5
 
 * Add setUserRoles function
diff --git a/docs/classes/HandlebarsHelpers.html b/docs/classes/HandlebarsHelpers.html
index 2e4a1e9176..1e971e1c68 100644
--- a/docs/classes/HandlebarsHelpers.html
+++ b/docs/classes/HandlebarsHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.5</em>
+            <em>API Docs for: v1.2.6</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index e8a2a2291d..534b9bfd0d 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.5</em>
+            <em>API Docs for: v1.2.6</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -371,7 +371,7 @@
             
         
         
-        <a href="../files/roles_roles_common.js.html#l468"><code>roles&#x2F;roles_common.js:468</code></a>
+        <a href="../files/roles_roles_common.js.html#l512"><code>roles&#x2F;roles_common.js:512</code></a>
         
         </p>
 
@@ -502,7 +502,7 @@ object for MongoDB.  Passed to _updateUserRoles</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l443"><code>roles&#x2F;roles_common.js:443</code></a>
+        <a href="../files/roles_roles_common.js.html#l487"><code>roles&#x2F;roles_common.js:487</code></a>
         
         </p>
 
@@ -653,7 +653,7 @@ for MongoDB.  Passed to _updateUserRoles</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l494"><code>roles&#x2F;roles_common.js:494</code></a>
+        <a href="../files/roles_roles_common.js.html#l538"><code>roles&#x2F;roles_common.js:538</code></a>
         
         </p>
 
@@ -717,7 +717,10 @@ for users.</p>
 
                     <div class="param-description">
                         <p>Group name. If not null or undefined, roles will be
-                        specific to that group.<br>                        The special group Roles.GLOBAL_GROUP provides 
+                        specific to that group.<br>                        Group names can not start with &#39;$&#39;.
+                        Periods in names &#39;.&#39; are automatically converted
+                        to underscores.
+                        The special group Roles.GLOBAL_GROUP provides 
                         a convenient way to assign blanket roles/permissions
                         across all groups.  The roles/permissions in the 
                         Roles.GLOBAL_GROUP group will be automatically 
@@ -911,7 +914,10 @@ for users.</p>
 
                     <div class="param-description">
                         <p>Optional group name. If supplied, roles will be
-                        specific to that group.<br>                        The special group Roles.GLOBAL_GROUP provides 
+                        specific to that group.<br>                        Group names can not start with &#39;$&#39;.
+                        Periods in names &#39;.&#39; are automatically converted
+                        to underscores.
+                        The special group Roles.GLOBAL_GROUP provides 
                         a convenient way to assign blanket roles/permissions
                         across all groups.  The roles/permissions in the 
                         Roles.GLOBAL_GROUP group will be automatically 
@@ -1178,7 +1184,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l386"><code>roles&#x2F;roles_common.js:386</code></a>
+        <a href="../files/roles_roles_common.js.html#l411"><code>roles&#x2F;roles_common.js:411</code></a>
         
         </p>
 
@@ -1267,7 +1273,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l350"><code>roles&#x2F;roles_common.js:350</code></a>
+        <a href="../files/roles_roles_common.js.html#l369"><code>roles&#x2F;roles_common.js:369</code></a>
         
         </p>
 
@@ -1398,7 +1404,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l396"><code>roles&#x2F;roles_common.js:396</code></a>
+        <a href="../files/roles_roles_common.js.html#l421"><code>roles&#x2F;roles_common.js:421</code></a>
         
         </p>
 
@@ -1536,7 +1542,7 @@ used automatically.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l171"><code>roles&#x2F;roles_common.js:171</code></a>
+        <a href="../files/roles_roles_common.js.html#l177"><code>roles&#x2F;roles_common.js:177</code></a>
         
         </p>
 
@@ -1683,7 +1689,7 @@ Roles.removeUsersFromRoles(users.eve, [&#39;user&#39;], &#39;group1&#39;)</code>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l145"><code>roles&#x2F;roles_common.js:145</code></a>
+        <a href="../files/roles_roles_common.js.html#l148"><code>roles&#x2F;roles_common.js:148</code></a>
         
         </p>
 
@@ -1747,7 +1753,10 @@ Roles.removeUsersFromRoles(users.eve, [&#39;user&#39;], &#39;group1&#39;)</code>
 
                     <div class="param-description">
                         <p>Optional group name. If supplied, roles will be
-                        specific to that group.<br>                        The special group Roles.GLOBAL_GROUP provides 
+                        specific to that group.<br>                        Group names can not start with &#39;$&#39;.
+                        Periods in names &#39;.&#39; are automatically converted
+                        to underscores.
+                        The special group Roles.GLOBAL_GROUP provides 
                         a convenient way to assign blanket roles/permissions
                         across all groups.  The roles/permissions in the 
                         Roles.GLOBAL_GROUP group will be automatically 
@@ -1839,7 +1848,7 @@ Roles.setUserRoles(userId, &#39;admin&#39;, Roles.GLOBAL_GROUP)</code></pre>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l244"><code>roles&#x2F;roles_common.js:244</code></a>
+        <a href="../files/roles_roles_common.js.html#l257"><code>roles&#x2F;roles_common.js:257</code></a>
         
         </p>
 
diff --git a/docs/data.json b/docs/data.json
index d6bd7072ae..07d85de9e5 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.5"
+        "version": "v1.2.6"
     },
     "files": {
         "roles/roles_client.js": {
@@ -204,7 +204,7 @@
                 },
                 {
                     "name": "group",
-                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        Group names can not start with '$'.\n                        Periods in names '.' are automatically converted\n                        to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
                     "type": "String",
                     "optional": true
                 }
@@ -214,7 +214,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 145,
+            "line": 148,
             "description": "Set a users roles/permissions.",
             "example": [
                 "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')\n    Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)"
@@ -234,7 +234,7 @@
                 },
                 {
                     "name": "group",
-                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        Group names can not start with '$'.\n                        Periods in names '.' are automatically converted\n                        to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
                     "type": "String",
                     "optional": true
                 }
@@ -244,7 +244,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 171,
+            "line": 177,
             "description": "Remove users from roles",
             "example": [
                 "\n    Roles.removeUsersFromRoles(users.bob, 'admin')\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])\n    Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')"
@@ -274,7 +274,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 244,
+            "line": 257,
             "description": "Check if user has specified permissions/roles",
             "example": [
                 "\n    // non-group usage\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // per-group usage\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)\n\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP\n    Roles.userIsInRole(user, 'admin')"
@@ -308,7 +308,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 350,
+            "line": 369,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -334,7 +334,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 386,
+            "line": 411,
             "description": "Retrieve set of all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -347,7 +347,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 396,
+            "line": 421,
             "description": "Retrieve all users who are in target role.  \n\nNOTE: This is an expensive query; it performs a full collection scan\non the users collection since there is no index set on the 'roles' field.  \nThis is by design as most queries will specify an _id so the _id index is \nused automatically.",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -373,7 +373,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 443,
+            "line": 487,
             "description": "Private function 'template' that uses $set to construct an update object\nfor MongoDB.  Passed to _updateUserRoles",
             "itemtype": "method",
             "name": "_update_$set_fn",
@@ -401,7 +401,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 468,
+            "line": 512,
             "description": "Private function 'template' that uses $addToSet to construct an update \nobject for MongoDB.  Passed to _updateUserRoles",
             "itemtype": "method",
             "name": "_update_$addToSet_fn",
@@ -429,7 +429,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 494,
+            "line": 538,
             "description": "Internal function that users the Template pattern to adds or sets roles \nfor users.",
             "itemtype": "method",
             "name": "_updateUserRoles",
@@ -448,7 +448,7 @@
                 },
                 {
                     "name": "group",
-                    "description": "Group name. If not null or undefined, roles will be\n                        specific to that group.  \n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "description": "Group name. If not null or undefined, roles will be\n                        specific to that group.  \n                        Group names can not start with '$'.\n                        Periods in names '.' are automatically converted\n                        to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
                     "type": "String"
                 },
                 {
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index 64b03fc73a..f8687ffe8d 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.5</em>
+            <em>API Docs for: v1.2.6</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 8be4d6cb92..905f35e769 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.5</em>
+            <em>API Docs for: v1.2.6</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -225,6 +225,9 @@ _.extend(Roles, {
    * @param {Array|String} roles Name(s) of roles/permissions to add users to
    * @param {String} [group] Optional group name. If supplied, roles will be
    *                         specific to that group.  
+   *                         Group names can not start with &#x27;$&#x27;.
+   *                         Periods in names &#x27;.&#x27; are automatically converted
+   *                         to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
    *                         a convenient way to assign blanket roles/permissions
    *                         across all groups.  The roles/permissions in the 
@@ -251,6 +254,9 @@ _.extend(Roles, {
    * @param {Array|String} roles Name(s) of roles/permissions to add users to
    * @param {String} [group] Optional group name. If supplied, roles will be
    *                         specific to that group.  
+   *                         Group names can not start with &#x27;$&#x27;.
+   *                         Periods in names &#x27;.&#x27; are automatically converted
+   *                         to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
    *                         a convenient way to assign blanket roles/permissions
    *                         across all groups.  The roles/permissions in the 
@@ -282,8 +288,15 @@ _.extend(Roles, {
 
     if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
     if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
-    if (group &amp;&amp; &#x27;string&#x27; !== typeof group) 
-      throw new Error (&quot;Invalid &#x27;group&#x27; param&quot;)
+    if (group) {
+      if (&#x27;string&#x27; !== typeof group)
+        throw new Error (&quot;Roles error: Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
+      if (&#x27;$&#x27; === group[0])
+        throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
+
+      // convert any periods to underscores
+      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+    }
 
     // ensure arrays
     if (!_.isArray(users)) users = [users]
@@ -377,7 +390,13 @@ _.extend(Roles, {
     }
 
     if (!user) return false
-    if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return false
+    if (group) {
+      if (&#x27;string&#x27; !== typeof group) return false
+      if (&#x27;$&#x27; === group[0]) return false
+
+      // convert any periods to underscores
+      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+    }
     
     if (&#x27;object&#x27; === typeof user) {
       userRoles = user.roles
@@ -452,7 +471,13 @@ _.extend(Roles, {
    */
   getRolesForUser: function (user, group) {
     if (!user) return []
-    if (group &amp;&amp; &#x27;string&#x27; !== typeof group) return []
+    if (group) {
+      if (&#x27;string&#x27; !== typeof group) return []
+      if (&#x27;$&#x27; === group[0]) return []
+
+      // convert any periods to underscores
+      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+    }
 
     if (&#x27;string&#x27; === typeof user) {
       user = Meteor.users.findOne(
@@ -512,22 +537,41 @@ _.extend(Roles, {
     if (!_.isArray(roles)) roles = [roles]
     
     if (group) {
-      // structure of group query, including Roles.GLOBAL_GROUP
-      //   {$or: [
+      if (&#x27;string&#x27; !== typeof group)
+        throw new Error (&quot;Roles error: Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
+      if (&#x27;$&#x27; === group[0])
+        throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
+
+      // convert any periods to underscores
+      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+    }
+
+    query = {$or: []}
+
+    // always check Roles.GLOBAL_GROUP
+    groupQuery = {}
+    groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
+    query.$or.push(groupQuery)
+
+    if (group) {
+      // structure of query, when group specified including Roles.GLOBAL_GROUP 
+      //   {
+      //    $or: [
       //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
       //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
       //    ]}
-      query = {$or: []}
-
       groupQuery = {}
       groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
       query.$or.push(groupQuery)
-
-      groupQuery = {}
-      groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
-      query.$or.push(groupQuery)
     } else {
-      query = { roles: { $in: roles } }
+      // structure of query, where group not specified. includes 
+      // Roles.GLOBAL_GROUP 
+      //   {
+      //    $or: [
+      //      {roles: {$in: [&#x27;admin&#x27;]}},
+      //      {&#x27;roles.__global_roles__&#x27;: {$in: [&#x27;admin&#x27;]}}
+      //    ]}
+      query.$or.push({roles: {$in: roles}})
     }
 
     return Meteor.users.find(query)
@@ -595,6 +639,9 @@ _.extend(Roles, {
    * @param {Array|String} roles name(s) of roles/permissions to add users to
    * @param {String} group Group name. If not null or undefined, roles will be
    *                         specific to that group.  
+   *                         Group names can not start with &#x27;$&#x27;.
+   *                         Periods in names &#x27;.&#x27; are automatically converted
+   *                         to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
    *                         a convenient way to assign blanket roles/permissions
    *                         across all groups.  The roles/permissions in the 
@@ -608,8 +655,15 @@ _.extend(Roles, {
   _updateUserRoles: function (users, roles, group, updateFactory) {
     if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
     if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
-    if (group &amp;&amp; &#x27;string&#x27; !== typeof group)
-      throw new Error (&quot;Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
+    if (group) {
+      if (&#x27;string&#x27; !== typeof group)
+        throw new Error (&quot;Roles error: Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
+      if (&#x27;$&#x27; === group[0])
+        throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
+
+      // convert any periods to underscores
+      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+    }
 
     var existingRoles,
         query,
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 550396df41..43aef15ab3 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.5</em>
+            <em>API Docs for: v1.2.6</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/index.html b/docs/index.html
index 632d842d6f..be06393428 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.5</em>
+            <em>API Docs for: v1.2.6</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/HandlebarsHelpers.html b/docs/modules/HandlebarsHelpers.html
index 7241a64a76..e3e4c520a2 100644
--- a/docs/modules/HandlebarsHelpers.html
+++ b/docs/modules/HandlebarsHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.5</em>
+            <em>API Docs for: v1.2.6</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index dfd0bc5503..3c44a6da94 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.5</em>
+            <em>API Docs for: v1.2.6</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 02af8ab691..ecc0926804 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -131,6 +131,9 @@ _.extend(Roles, {
    * @param {Array|String} roles Name(s) of roles/permissions to add users to
    * @param {String} [group] Optional group name. If supplied, roles will be
    *                         specific to that group.  
+   *                         Group names can not start with '$'.
+   *                         Periods in names '.' are automatically converted
+   *                         to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
    *                         a convenient way to assign blanket roles/permissions
    *                         across all groups.  The roles/permissions in the 
@@ -157,6 +160,9 @@ _.extend(Roles, {
    * @param {Array|String} roles Name(s) of roles/permissions to add users to
    * @param {String} [group] Optional group name. If supplied, roles will be
    *                         specific to that group.  
+   *                         Group names can not start with '$'.
+   *                         Periods in names '.' are automatically converted
+   *                         to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
    *                         a convenient way to assign blanket roles/permissions
    *                         across all groups.  The roles/permissions in the 
@@ -188,8 +194,15 @@ _.extend(Roles, {
 
     if (!users) throw new Error ("Missing 'users' param")
     if (!roles) throw new Error ("Missing 'roles' param")
-    if (group && 'string' !== typeof group) 
-      throw new Error ("Invalid 'group' param")
+    if (group) {
+      if ('string' !== typeof group)
+        throw new Error ("Roles error: Invalid parameter 'group'. Expected 'string' type")
+      if ('$' === group[0])
+        throw new Error ("Roles error: groups can not start with '$'")
+
+      // convert any periods to underscores
+      group = group.replace('.', '_')
+    }
 
     // ensure arrays
     if (!_.isArray(users)) users = [users]
@@ -283,7 +296,13 @@ _.extend(Roles, {
     }
 
     if (!user) return false
-    if (group && 'string' !== typeof group) return false
+    if (group) {
+      if ('string' !== typeof group) return false
+      if ('$' === group[0]) return false
+
+      // convert any periods to underscores
+      group = group.replace('.', '_')
+    }
     
     if ('object' === typeof user) {
       userRoles = user.roles
@@ -358,7 +377,13 @@ _.extend(Roles, {
    */
   getRolesForUser: function (user, group) {
     if (!user) return []
-    if (group && 'string' !== typeof group) return []
+    if (group) {
+      if ('string' !== typeof group) return []
+      if ('$' === group[0]) return []
+
+      // convert any periods to underscores
+      group = group.replace('.', '_')
+    }
 
     if ('string' === typeof user) {
       user = Meteor.users.findOne(
@@ -418,22 +443,41 @@ _.extend(Roles, {
     if (!_.isArray(roles)) roles = [roles]
     
     if (group) {
-      // structure of group query, including Roles.GLOBAL_GROUP
-      //   {$or: [
+      if ('string' !== typeof group)
+        throw new Error ("Roles error: Invalid parameter 'group'. Expected 'string' type")
+      if ('$' === group[0])
+        throw new Error ("Roles error: groups can not start with '$'")
+
+      // convert any periods to underscores
+      group = group.replace('.', '_')
+    }
+
+    query = {$or: []}
+
+    // always check Roles.GLOBAL_GROUP
+    groupQuery = {}
+    groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
+    query.$or.push(groupQuery)
+
+    if (group) {
+      // structure of query, when group specified including Roles.GLOBAL_GROUP 
+      //   {
+      //    $or: [
       //      {'roles.group1':{$in: ['admin']}},
       //      {'roles.__global_roles__':{$in: ['admin']}}
       //    ]}
-      query = {$or: []}
-
       groupQuery = {}
       groupQuery['roles.'+group] = {$in: roles}
       query.$or.push(groupQuery)
-
-      groupQuery = {}
-      groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
-      query.$or.push(groupQuery)
     } else {
-      query = { roles: { $in: roles } }
+      // structure of query, where group not specified. includes 
+      // Roles.GLOBAL_GROUP 
+      //   {
+      //    $or: [
+      //      {roles: {$in: ['admin']}},
+      //      {'roles.__global_roles__': {$in: ['admin']}}
+      //    ]}
+      query.$or.push({roles: {$in: roles}})
     }
 
     return Meteor.users.find(query)
@@ -501,6 +545,9 @@ _.extend(Roles, {
    * @param {Array|String} roles name(s) of roles/permissions to add users to
    * @param {String} group Group name. If not null or undefined, roles will be
    *                         specific to that group.  
+   *                         Group names can not start with '$'.
+   *                         Periods in names '.' are automatically converted
+   *                         to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
    *                         a convenient way to assign blanket roles/permissions
    *                         across all groups.  The roles/permissions in the 
@@ -514,8 +561,15 @@ _.extend(Roles, {
   _updateUserRoles: function (users, roles, group, updateFactory) {
     if (!users) throw new Error ("Missing 'users' param")
     if (!roles) throw new Error ("Missing 'roles' param")
-    if (group && 'string' !== typeof group)
-      throw new Error ("Invalid parameter 'group'. Expected 'string' type")
+    if (group) {
+      if ('string' !== typeof group)
+        throw new Error ("Roles error: Invalid parameter 'group'. Expected 'string' type")
+      if ('$' === group[0])
+        throw new Error ("Roles error: groups can not start with '$'")
+
+      // convert any periods to underscores
+      group = group.replace('.', '_')
+    }
 
     var existingRoles,
         query,
diff --git a/roles/smart.json b/roles/smart.json
index e49ceb09c0..fc746757ed 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 6a7dcf9c7a..601be56ae3 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -722,12 +722,20 @@
       test.equal(_.difference(actual, expected), [])
       test.equal(_.difference(expected, actual), [])
 
-      expected = [users.eve, users.bob, users.joe],
+      expected = [users.eve, users.bob, users.joe]
       actual = _.pluck(Roles.getUsersInRole('admin','group2').fetch(), '_id')
 
       // order may be different so check difference instead of equality
       test.equal(_.difference(actual, expected), [])
       test.equal(_.difference(expected, actual), [])
+
+
+      expected = [users.eve]
+      actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
+
+      // order may be different so check difference instead of equality
+      test.equal(_.difference(actual, expected), [])
+      test.equal(_.difference(expected, actual), [])
     })
 
 
@@ -806,7 +814,7 @@
         throw new Error("expected exception but didn't get one")
       } 
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message)
       }
 
       reset() 
@@ -816,7 +824,7 @@
         throw new Error("expected exception but didn't get one")
       }
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message)
       }
 
       reset() 
@@ -826,7 +834,7 @@
         throw new Error("expected exception but didn't get one")
       }
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message)
       }
 
       reset() 
@@ -836,7 +844,7 @@
         throw new Error("expected exception but didn't get one")
       }
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message)
       }
 
       reset() 
@@ -850,6 +858,34 @@
       Roles.setUserRoles(users.bob, ['user'])
     })
 
+  Tinytest.add(
+    "roles - can use '.' in group name",
+    function (test) {
+      reset() 
+
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
+      testUser(test, 'joe', ['admin'], 'example.com')
+    })
+
+  Tinytest.add(
+    'roles - invalid group name throws descriptive error', 
+    function (test) {
+      var expectedErrorMsg = "Roles error: groups can not start with '$'"
+
+      reset() 
+      try {
+        Roles.addUsersToRoles(users.joe, ['admin'], '$group1')
+        throw new Error("expected exception but didn't get one")
+      } 
+      catch (ex) {
+        test.isTrue(ex.message == expectedErrorMsg, ex.message)
+      }
+
+      reset() 
+      // should not throw error
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'g$roup1')
+    })
+
   function printException (ex) {
     var tmp = {}
     for (var key in ex) {
diff --git a/yuidoc.json b/yuidoc.json
index 4fe40f6d4d..aaf002eb79 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.5",
+  "version": "v1.2.6",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From 8c470b802cff97cc42cb3e93eb1b8c92ba2492bd Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 17 Dec 2013 00:22:27 -0500
Subject: [PATCH 0096/1140] v1.2.6 - Auto-convert '.' in group names to '_'

---
 README.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 981d2cb14b..c0107dbc66 100644
--- a/README.md
+++ b/README.md
@@ -72,12 +72,15 @@ Roles.addUsersToRoles(bobsUserId, ['manage-team','schedule-game'])
 // internal representation - no groups 
 // user.roles = ['manage-team','schedule-game']
 
-Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester_united')
-Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real_madrid')
+Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com')
+Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
 // internal representation - groups
+// NOTE: MongoDB uses periods to represent hierarchy so periods in group names
+//   are converted to underscores
+//
 // user.roles = { 
-//   'manchester_united': ['manage-team','schedule-game'],
-//   'real_madrid': ['player','goalie']
+//   'manchester-united_com': ['manage-team','schedule-game'],
+//   'real-madrid_com': ['player','goalie']
 // }
 ```
 

From b95f880805d3aee32409521b74ebf49ecf8e41b0 Mon Sep 17 00:00:00 2001
From: Simon Fridlund <zimme@users.noreply.github.com>
Date: Mon, 10 Mar 2014 12:53:15 +0100
Subject: [PATCH 0097/1140] Add ui package to support blaze

---
 roles/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/package.js b/roles/package.js
index 8e660beafd..ada690aec2 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -4,7 +4,7 @@ Package.describe({
 
 Package.on_use(function (api) {
   var both = ['client', 'server'];
-  api.use(['underscore', 'handlebars', 'accounts-base'], both);
+  api.use(['underscore', 'handlebars', 'ui', 'accounts-base'], both);
 
   api.export && api.export('Roles'); 
 

From 426ba1f19b4fd5e444371753887d786f49ef5e7f Mon Sep 17 00:00:00 2001
From: zimme <zimme@users.noreply.github.com>
Date: Sun, 23 Mar 2014 01:25:30 +0100
Subject: [PATCH 0098/1140] Make use of UI.registerHelpers whenever possible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use Handlebars.registerHelpers if UI isn’t defined

Update some variable names in preparation for Handlebars deprecation
---
 roles/roles_client.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index 486b00ed8e..f844ba8ed7 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -7,21 +7,21 @@
  * client-side checks are strictly for convenience and must not be
  * trusted.
  *
- * @module HandlebarsHelpers
+ * @module UIHelpers
  */
 
 ////////////////////////////////////////////////////////////
-// Handlebars helpers
+// UI helpers
 //
-// Use a semi-private variable rather than declaring Handlebars
+// Use a semi-private variable rather than declaring UI
 // helpers directly so that we can unit test the helpers.
-// XXX For some reason, the Handlebars helpers are not registered 
+// XXX For some reason, the UI helpers are not registered 
 // before the tests run.
 //
-Roles._handlebarsHelpers = {
+Roles._uiHelpers = {
 
   /**
-   * Handlebars helper to check if current user is in at least one
+   * UI helper to check if current user is in at least one
    * of the target roles.  For use in client-side templates.
    *
    * @example
@@ -39,7 +39,7 @@ Roles._handlebarsHelpers = {
    * @param {String} [group] Optional, name of group to check
    * @return {Boolean} true if current user is in at least one of the target roles
    * @static
-   * @for HandlebarsHelpers 
+   * @for UIHelpers 
    */
   isInRole: function (role, group) {
     var user = Meteor.user(),
@@ -70,12 +70,16 @@ Roles._handlebarsHelpers = {
 }
 
 
-if ('undefined' !== typeof Handlebars) {
-  _.each(Roles._handlebarsHelpers, function (func, name) {
+if ('undefined' !== typeof UI) {
+  _.each(Roles._uiHelpers, function (func, name) {
+    UI.registerHelper(name, func) 
+  })
+} else if ('undefined' !== typeof Handlebars) {
+  _.each(Roles._uiHelpers, function (func, name) {
     Handlebars.registerHelper(name, func)
   })
 } else {
-  console.log('WARNING: Roles Handlebars helpers not registered. Handlebars not defined')
+  console.log('WARNING: Roles template helpers not registered. Handlebars or UI not defined')
 }
 
 }());

From da71ed9e685ec5306e7236bf127fa61f5d03507f Mon Sep 17 00:00:00 2001
From: zimme <zimme@users.noreply.github.com>
Date: Sun, 23 Mar 2014 18:42:17 +0100
Subject: [PATCH 0099/1140] Update logging to support IE

---
 roles/roles_client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index f844ba8ed7..e16328a073 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -79,7 +79,7 @@ if ('undefined' !== typeof UI) {
     Handlebars.registerHelper(name, func)
   })
 } else {
-  console.log('WARNING: Roles template helpers not registered. Handlebars or UI not defined')
+  console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI not defined')
 }
 
 }());

From b4dd4df21c9560b3aab91c5f9797931da53bd86c Mon Sep 17 00:00:00 2001
From: zimme <zimme@users.noreply.github.com>
Date: Sun, 23 Mar 2014 18:43:19 +0100
Subject: [PATCH 0100/1140] Set handlebars and ui as weak references

---
 roles/package.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/package.js b/roles/package.js
index ada690aec2..7221e5b6d5 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -4,7 +4,8 @@ Package.describe({
 
 Package.on_use(function (api) {
   var both = ['client', 'server'];
-  api.use(['underscore', 'handlebars', 'ui', 'accounts-base'], both);
+  api.use(['underscore', 'accounts-base'], both);
+  api.use(['handlebars', 'ui'], 'client', {weak: true});
 
   api.export && api.export('Roles'); 
 

From 6c689c40a9f52c7b48e36ec83af6430ab8ab7752 Mon Sep 17 00:00:00 2001
From: zimme <zimme@users.noreply.github.com>
Date: Mon, 24 Mar 2014 11:59:07 +0100
Subject: [PATCH 0101/1140] Use Package to get to package exports

---
 roles/roles_client.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index e16328a073..e29558c4ae 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -69,14 +69,13 @@ Roles._uiHelpers = {
   }
 }
 
-
-if ('undefined' !== typeof UI) {
+if ('undefined' !== typeof Package.ui) {
   _.each(Roles._uiHelpers, function (func, name) {
-    UI.registerHelper(name, func) 
+    Package.ui.UI.registerHelper(name, func) 
   })
-} else if ('undefined' !== typeof Handlebars) {
+} else if ('undefined' !== typeof Package.handlebars) {
   _.each(Roles._uiHelpers, function (func, name) {
-    Handlebars.registerHelper(name, func)
+    Package.handlebars.Handlebars.registerHelper(name, func)
   })
 } else {
   console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI not defined')

From 81ec4d6b93150e8e1253868cc87091b73e309d75 Mon Sep 17 00:00:00 2001
From: zimme <zimme@users.noreply.github.com>
Date: Wed, 26 Mar 2014 19:23:57 +0100
Subject: [PATCH 0102/1140] Fix for meteor weak reference issue #1358

---
 roles/package.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/roles/package.js b/roles/package.js
index 7221e5b6d5..0cd3026372 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -5,9 +5,12 @@ Package.describe({
 Package.on_use(function (api) {
   var both = ['client', 'server'];
   api.use(['underscore', 'accounts-base'], both);
-  api.use(['handlebars', 'ui'], 'client', {weak: true});
+  api.use(['handlebars'], 'client', {weak: true});
+  if(uiExists()) {
+    api.use(['ui'], 'client');
+  }
 
-  api.export && api.export('Roles'); 
+  api.export && api.export('Roles');
 
   api.add_files('roles_server.js', 'server');
   api.add_files('roles_common.js', both);
@@ -23,3 +26,12 @@ Package.on_test(function (api) {
   api.add_files('tests/client.js', 'client');
   api.add_files('tests/server.js', 'server');
 });
+
+// workaround for meter issue #1358
+// https://github.com/meteor/meteor/issues/1358
+function uiExists() {
+  var fs = Npm.require('fs');
+  var path = Npm.require('path');
+  var meteorPackages = fs.readFileSync(path.resolve('.meteor/packages'), 'utf8');
+  return !!meteorPackages.match(/ui\n/);
+}

From bc1ba65ff998cea6c4bb19c8510c117a2aaf1063 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Thu, 27 Mar 2014 09:19:49 -0400
Subject: [PATCH 0103/1140] callout that addUsersToRoles needs to come after
 Accounts.onCreate completes

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 62958379bc..89d2768edd 100644
--- a/README.md
+++ b/README.md
@@ -143,12 +143,17 @@ Add users to roles:
     });
 
     if (user.roles.length > 0) {
+      // Need _id of existing user record so this call must come 
+      // after `Accounts.createUser` or `Accounts.onCreate`
       Roles.addUsersToRoles(id, user.roles);
     }
   
   });
 ```
 
+<br />
+Note that the `Roles.addUsersToRoles` call needs to come _after_ `Accounts.createUser` or `Accounts.onCreate` or else the roles package won't be able to find the user record (since it hasn't been created yet).  This SO answer gives more detail: http://stackoverflow.com/a/22650399/219238
+
 <br />
 
 Check user roles before publishing sensitive data:
@@ -281,6 +286,8 @@ The same with group:
 
 <br />
 
+Note that 
+
 ### Documentation
 
 Online API docs found here: http://alanning.github.io/meteor-roles/classes/Roles.html

From 1b2b79bb2d8c06de2303123d0ec30e33f670c6a1 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 28 Mar 2014 15:28:28 -0400
Subject: [PATCH 0104/1140] initial work on supporting blaze & spark

---
 examples/iron-router/client/example.html |  4 +--
 examples/mini-pages/.meteor/packages     |  1 -
 examples/mini-pages/.meteor/release      |  2 +-
 examples/mini-pages/client/example.html  |  4 +--
 examples/mini-pages/smart.json           |  8 ++---
 examples/router/client/example.html      |  4 +--
 roles/package.js                         | 42 +++++++++++++++++++++---
 roles/roles_client.js                    |  6 ++--
 8 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/examples/iron-router/client/example.html b/examples/iron-router/client/example.html
index 27100d0114..b7ffb7a465 100644
--- a/examples/iron-router/client/example.html
+++ b/examples/iron-router/client/example.html
@@ -44,11 +44,11 @@
 </template>
 
 <template name="not_found">
-  <h3>404 - Not found<h3>
+  <h3>404 - Not found</h3>
 </template>
 
 <template name="invalid-access">
-  <h3>403 Forbidden - Invalid Access<h3>
+  <h3>403 Forbidden - Invalid Access</h3>
 </template>
 
 <template name="header">
diff --git a/examples/mini-pages/.meteor/packages b/examples/mini-pages/.meteor/packages
index c992b72c0c..cb2274fbc3 100644
--- a/examples/mini-pages/.meteor/packages
+++ b/examples/mini-pages/.meteor/packages
@@ -3,7 +3,6 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-preserve-inputs
 accounts-password
 accounts-ui
 bootstrap
diff --git a/examples/mini-pages/.meteor/release b/examples/mini-pages/.meteor/release
index ef5e445445..a3df0a6959 100644
--- a/examples/mini-pages/.meteor/release
+++ b/examples/mini-pages/.meteor/release
@@ -1 +1 @@
-0.6.5
+0.8.0
diff --git a/examples/mini-pages/client/example.html b/examples/mini-pages/client/example.html
index 27100d0114..b7ffb7a465 100644
--- a/examples/mini-pages/client/example.html
+++ b/examples/mini-pages/client/example.html
@@ -44,11 +44,11 @@
 </template>
 
 <template name="not_found">
-  <h3>404 - Not found<h3>
+  <h3>404 - Not found</h3>
 </template>
 
 <template name="invalid-access">
-  <h3>403 Forbidden - Invalid Access<h3>
+  <h3>403 Forbidden - Invalid Access</h3>
 </template>
 
 <template name="header">
diff --git a/examples/mini-pages/smart.json b/examples/mini-pages/smart.json
index 96cae7507c..6b3cfea0cb 100644
--- a/examples/mini-pages/smart.json
+++ b/examples/mini-pages/smart.json
@@ -1,10 +1,8 @@
 {
-  "meteor": {
-    "git": "https://github.com/meteor/meteor.git",
-    "branch": "master"
-  },
   "packages": {
-    "roles": {},
+    "roles": {
+      "path": "../../roles"
+    },
     "mini-pages": {}
   }
 }
diff --git a/examples/router/client/example.html b/examples/router/client/example.html
index 917ee5a28d..52f52b4875 100644
--- a/examples/router/client/example.html
+++ b/examples/router/client/example.html
@@ -35,12 +35,12 @@
 
 <template name="not_found">
   {{> header}}
-  <h3>404 - Not found<h3>
+  <h3>404 - Not found</h3>
 </template>
 
 <template name="invalid-access">
   {{> header}}
-  <h3>403 Forbidden - Invalid Access<h3>
+  <h3>403 Forbidden - Invalid Access</h3>
 </template>
 
 <template name="header">
diff --git a/roles/package.js b/roles/package.js
index 0cd3026372..dccd4d8175 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -6,8 +6,17 @@ Package.on_use(function (api) {
   var both = ['client', 'server'];
   api.use(['underscore', 'accounts-base'], both);
   api.use(['handlebars'], 'client', {weak: true});
+
+  console.log('roles package loaded')
+  // This is needed due to Meteor Issue #1358
+  //   https://github.com/meteor/meteor/issues/1358
+  // The 'weak' flag doesn't work with packages that aren't 
+  // in meteor's internal cache (ie. non-core packages)
   if(uiExists()) {
-    api.use(['ui'], 'client');
+    console.log('ui exists')
+    api.use(['ui'], 'client', {weak: true});
+  } else {
+    console.log('ui does not exist')
   }
 
   api.export && api.export('Roles');
@@ -30,8 +39,31 @@ Package.on_test(function (api) {
 // workaround for meter issue #1358
 // https://github.com/meteor/meteor/issues/1358
 function uiExists() {
-  var fs = Npm.require('fs');
-  var path = Npm.require('path');
-  var meteorPackages = fs.readFileSync(path.resolve('.meteor/packages'), 'utf8');
-  return !!meteorPackages.match(/ui\n/);
+  var fs = Npm.require('fs'),
+      path = Npm.require('path'),
+      meteorPackages = fs.readFileSync(path.resolve('.meteor/packages'), 'utf8');
+
+  if (!meteorPackages) {
+    return false;
+  }
+
+  console.log(meteorPackages);
+
+  if (/^\s*ui\s*$/m.test(meteorPackages)) {
+    // definitely there
+    return true;
+  }
+
+  if (/^\s*standard-app-packages\s*$/m.test(meteorPackages)) {
+    // _may_ be there.  have to check for actual package since
+    // releases before 0.8.0 had standard-app-packages but not
+    // ui
+    // 
+    // local dev package location:
+    //   ".meteor/local/build/programs/client/packages"
+    // bundled package location:
+    //   ??
+  }
+
+  return false;
 }
diff --git a/roles/roles_client.js b/roles/roles_client.js
index e29558c4ae..aec296b98e 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -69,16 +69,16 @@ Roles._uiHelpers = {
   }
 }
 
-if ('undefined' !== typeof Package.ui) {
+if (Package.ui) {
   _.each(Roles._uiHelpers, function (func, name) {
     Package.ui.UI.registerHelper(name, func) 
   })
-} else if ('undefined' !== typeof Package.handlebars) {
+} else if (Package.handlebars) {
   _.each(Roles._uiHelpers, function (func, name) {
     Package.handlebars.Handlebars.registerHelper(name, func)
   })
 } else {
-  console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI not defined')
+  console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not included')
 }
 
 }());

From dad244f011d09518a3830d986567a490bb160ec8 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 28 Mar 2014 20:33:55 -0400
Subject: [PATCH 0105/1140] only declare api.use('ui') if it is explicitly in
 .meteor/packages

---
 examples/mini-pages/.meteor/packages |  2 +-
 examples/mini-pages/smart.json       |  4 +---
 roles/package.js                     | 20 +++++++-------------
 roles/roles_client.js                |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/examples/mini-pages/.meteor/packages b/examples/mini-pages/.meteor/packages
index cb2274fbc3..21186b033a 100644
--- a/examples/mini-pages/.meteor/packages
+++ b/examples/mini-pages/.meteor/packages
@@ -3,10 +3,10 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
+standard-app-packages
 accounts-password
 accounts-ui
 bootstrap
 roles
 mini-pages
 spiderable
-standard-app-packages
diff --git a/examples/mini-pages/smart.json b/examples/mini-pages/smart.json
index 6b3cfea0cb..9b3bb1dc43 100644
--- a/examples/mini-pages/smart.json
+++ b/examples/mini-pages/smart.json
@@ -1,8 +1,6 @@
 {
   "packages": {
-    "roles": {
-      "path": "../../roles"
-    },
+    "roles": {},
     "mini-pages": {}
   }
 }
diff --git a/roles/package.js b/roles/package.js
index dccd4d8175..95ada13084 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -7,7 +7,6 @@ Package.on_use(function (api) {
   api.use(['underscore', 'accounts-base'], both);
   api.use(['handlebars'], 'client', {weak: true});
 
-  console.log('roles package loaded')
   // This is needed due to Meteor Issue #1358
   //   https://github.com/meteor/meteor/issues/1358
   // The 'weak' flag doesn't work with packages that aren't 
@@ -47,23 +46,18 @@ function uiExists() {
     return false;
   }
 
-  console.log(meteorPackages);
-
   if (/^\s*ui\s*$/m.test(meteorPackages)) {
     // definitely there
     return true;
   }
 
-  if (/^\s*standard-app-packages\s*$/m.test(meteorPackages)) {
-    // _may_ be there.  have to check for actual package since
-    // releases before 0.8.0 had standard-app-packages but not
-    // ui
-    // 
-    // local dev package location:
-    //   ".meteor/local/build/programs/client/packages"
-    // bundled package location:
-    //   ??
-  }
+  //if (/^\s*standard-app-packages\s*$/m.test(meteorPackages)) {
+    // The ui package may or may _not_ be there...
+    // Releases before 0.8.0 had standard-app-packages but not
+    // ui.  Without weak references working properly, there is 
+    // no good way to detect the inclusion of the ui package in
+    // bundled apps.
+  //}
 
   return false;
 }
diff --git a/roles/roles_client.js b/roles/roles_client.js
index aec296b98e..127179c6ad 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -78,7 +78,7 @@ if (Package.ui) {
     Package.handlebars.Handlebars.registerHelper(name, func)
   })
 } else {
-  console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not included')
+  console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found')
 }
 
 }());

From 08f4ee7870a3aa027f65ca6d3a140c3f4219870c Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 28 Mar 2014 20:43:55 -0400
Subject: [PATCH 0106/1140] update documentation for v1.2.7

---
 History.md                                    |  7 ++++
 README.md                                     | 12 +++++++
 docs/api.js                                   | 18 +++++-----
 docs/classes/Roles.html                       |  8 ++---
 ...{HandlebarsHelpers.html => UIHelpers.html} | 16 ++++-----
 docs/data.json                                | 26 +++++++-------
 docs/files/roles_roles_client.js.html         | 35 ++++++++++---------
 docs/files/roles_roles_common.js.html         |  8 ++---
 docs/files/roles_roles_server.js.html         |  8 ++---
 docs/index.html                               |  8 ++---
 docs/modules/Roles.html                       |  8 ++---
 ...{HandlebarsHelpers.html => UIHelpers.html} | 16 ++++-----
 12 files changed, 96 insertions(+), 74 deletions(-)
 rename docs/classes/{HandlebarsHelpers.html => UIHelpers.html} (94%)
 rename docs/modules/{HandlebarsHelpers.html => UIHelpers.html} (90%)

diff --git a/History.md b/History.md
index 8f581389f3..ba33d5290b 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,10 @@
+## v1.2.7
+
+* Add support for Blaze UI (Meteor 0.8.0+)!  The 'roles' package must
+  come after 'ui' or 'standard-app-packages' in '.meteor/packages' 
+  for the 'isInRole' helper to be registered.
+
+
 ## v1.2.6
 
 * Add descriptive error msg when group name starts with $
diff --git a/README.md b/README.md
index 89d2768edd..a42891f62b 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 Thanks to:
 
+  * [@zimme](https://github.com/zimme)
+  * [@danieljonce](https://github.com/danieljonce)
   * [@pascoual](https://github.com/pascoual)
   * [@nickmoylan](https://github.com/nickmoylan)
   * [@mcrider](https://github.com/mcrider)
@@ -16,6 +18,16 @@ Thanks to:
 
 <br />
 
+### Blaze Support
+
+v1.2.7 adds support for Blaze UI (Meteor 0.8.0+)!  Older versions of
+Meteor are still supported as are ui-less apps.
+
+NOTE: The 'roles' package must come after 'ui' or 'standard-app-packages' 
+in '.meteor/packages' for the 'isInRole' helper to be registered.
+
+<br />
+
 ### Authorization
 
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
diff --git a/docs/api.js b/docs/api.js
index c6f48990fe..30c6855ade 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -1,23 +1,23 @@
 YUI.add("yuidoc-meta", function(Y) {
    Y.YUIDoc = { meta: {
     "classes": [
-        "HandlebarsHelpers",
-        "Roles"
+        "Roles",
+        "UIHelpers"
     ],
     "modules": [
-        "HandlebarsHelpers",
-        "Roles"
+        "Roles",
+        "UIHelpers"
     ],
     "allModules": [
-        {
-            "displayName": "HandlebarsHelpers",
-            "name": "HandlebarsHelpers",
-            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
-        },
         {
             "displayName": "Roles",
             "name": "Roles",
             "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
+        },
+        {
+            "displayName": "UIHelpers",
+            "name": "UIHelpers",
+            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
         }
     ]
 } };
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 534b9bfd0d..a841537e48 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -41,18 +41,18 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/classes/HandlebarsHelpers.html b/docs/classes/UIHelpers.html
similarity index 94%
rename from docs/classes/HandlebarsHelpers.html
rename to docs/classes/UIHelpers.html
index 1e971e1c68..83756c749a 100644
--- a/docs/classes/HandlebarsHelpers.html
+++ b/docs/classes/UIHelpers.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>HandlebarsHelpers - The meteor-roles API</title>
+    <title>UIHelpers - The meteor-roles API</title>
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
@@ -41,18 +41,18 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
         </div>
     </div>
@@ -88,7 +88,7 @@
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1>HandlebarsHelpers Class</h1>
+                        <h1>UIHelpers Class</h1>
 <div class="box meta">
     
 
@@ -98,7 +98,7 @@
 
     
         
-            Module: <a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a>
+            Module: <a href="../modules/UIHelpers.html">UIHelpers</a>
         
     
 
@@ -225,7 +225,7 @@
     </div>
 
     <div class="description">
-        <p>Handlebars helper to check if current user is in at least one
+        <p>UI helper to check if current user is in at least one
 of the target roles.  For use in client-side templates.</p>
 
     </div>
diff --git a/docs/data.json b/docs/data.json
index 07d85de9e5..b7e03e39d5 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -8,11 +8,11 @@
         "roles/roles_client.js": {
             "name": "roles/roles_client.js",
             "modules": {
-                "HandlebarsHelpers": 1
+                "UIHelpers": 1
             },
             "classes": {},
             "fors": {
-                "HandlebarsHelpers": 1
+                "UIHelpers": 1
             },
             "namespaces": {}
         },
@@ -36,14 +36,14 @@
         }
     },
     "modules": {
-        "HandlebarsHelpers": {
-            "name": "HandlebarsHelpers",
+        "UIHelpers": {
+            "name": "UIHelpers",
             "submodules": {},
             "classes": {
-                "HandlebarsHelpers": 1
+                "UIHelpers": 1
             },
             "fors": {
-                "HandlebarsHelpers": 1
+                "UIHelpers": 1
             },
             "namespaces": {},
             "tag": "module",
@@ -66,15 +66,15 @@
         }
     },
     "classes": {
-        "HandlebarsHelpers": {
-            "name": "HandlebarsHelpers",
-            "shortname": "HandlebarsHelpers",
+        "UIHelpers": {
+            "name": "UIHelpers",
+            "shortname": "UIHelpers",
             "classitems": [],
             "plugins": [],
             "extensions": [],
             "plugin_for": [],
             "extension_for": [],
-            "module": "HandlebarsHelpers",
+            "module": "UIHelpers",
             "namespace": ""
         },
         "Roles": {
@@ -97,7 +97,7 @@
         {
             "file": "roles/roles_client.js",
             "line": 23,
-            "description": "Handlebars helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
+            "description": "UI helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
             "example": [
                 "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'group1'}}\n    {{/if}}"
             ],
@@ -121,8 +121,8 @@
                 "type": "Boolean"
             },
             "static": 1,
-            "class": "HandlebarsHelpers",
-            "module": "HandlebarsHelpers"
+            "class": "UIHelpers",
+            "module": "UIHelpers"
         },
         {
             "file": "roles/roles_common.js",
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index f8687ffe8d..182c84cb2d 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -41,18 +41,18 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
         </div>
     </div>
@@ -101,21 +101,21 @@
  * client-side checks are strictly for convenience and must not be
  * trusted.
  *
- * @module HandlebarsHelpers
+ * @module UIHelpers
  */
 
 ////////////////////////////////////////////////////////////
-// Handlebars helpers
+// UI helpers
 //
-// Use a semi-private variable rather than declaring Handlebars
+// Use a semi-private variable rather than declaring UI
 // helpers directly so that we can unit test the helpers.
-// XXX For some reason, the Handlebars helpers are not registered 
+// XXX For some reason, the UI helpers are not registered 
 // before the tests run.
 //
-Roles._handlebarsHelpers = {
+Roles._uiHelpers = {
 
   /**
-   * Handlebars helper to check if current user is in at least one
+   * UI helper to check if current user is in at least one
    * of the target roles.  For use in client-side templates.
    *
    * @example
@@ -133,7 +133,7 @@ Roles._handlebarsHelpers = {
    * @param {String} [group] Optional, name of group to check
    * @return {Boolean} true if current user is in at least one of the target roles
    * @static
-   * @for HandlebarsHelpers 
+   * @for UIHelpers 
    */
   isInRole: function (role, group) {
     var user = Meteor.user(),
@@ -163,13 +163,16 @@ Roles._handlebarsHelpers = {
   }
 }
 
-
-if (&#x27;undefined&#x27; !== typeof Handlebars) {
-  _.each(Roles._handlebarsHelpers, function (func, name) {
-    Handlebars.registerHelper(name, func)
+if (Package.ui) {
+  _.each(Roles._uiHelpers, function (func, name) {
+    Package.ui.UI.registerHelper(name, func) 
+  })
+} else if (Package.handlebars) {
+  _.each(Roles._uiHelpers, function (func, name) {
+    Package.handlebars.Handlebars.registerHelper(name, func)
   })
 } else {
-  console.log(&#x27;WARNING: Roles Handlebars helpers not registered. Handlebars not defined&#x27;)
+  console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;)
 }
 
 }());
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 905f35e769..1b88114852 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -41,18 +41,18 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 43aef15ab3..e30b0ea3d9 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -41,18 +41,18 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/index.html b/docs/index.html
index be06393428..9094100758 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -41,18 +41,18 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="./classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="./classes/Roles.html">Roles</a></li>
             
+                <li><a href="./classes/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="./modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="./modules/Roles.html">Roles</a></li>
             
+                <li><a href="./modules/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 3c44a6da94..9c628ff5da 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -41,18 +41,18 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/modules/HandlebarsHelpers.html b/docs/modules/UIHelpers.html
similarity index 90%
rename from docs/modules/HandlebarsHelpers.html
rename to docs/modules/UIHelpers.html
index e3e4c520a2..2ce5d22b8d 100644
--- a/docs/modules/HandlebarsHelpers.html
+++ b/docs/modules/UIHelpers.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>HandlebarsHelpers - The meteor-roles API</title>
+    <title>UIHelpers - The meteor-roles API</title>
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
@@ -41,18 +41,18 @@
         <div id="api-tabview-panel">
             <ul id="api-classes" class="apis classes">
             
-                <li><a href="../classes/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
-                <li><a href="../modules/HandlebarsHelpers.html">HandlebarsHelpers</a></li>
-            
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
             </ul>
         </div>
     </div>
@@ -88,7 +88,7 @@
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1>HandlebarsHelpers Module</h1>
+                        <h1>UIHelpers Module</h1>
 <div class="box clearfix meta">
     
 
@@ -123,8 +123,8 @@ trusted.</p>
             <ul class="module-classes">
             
                 <li class="module-class">
-                    <a href="../classes/HandlebarsHelpers.html">
-                        HandlebarsHelpers
+                    <a href="../classes/UIHelpers.html">
+                        UIHelpers
                     </a>
                 </li>
             

From afd9f598e58eb653ecb9fe497438729983932dbd Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 28 Mar 2014 20:47:17 -0400
Subject: [PATCH 0107/1140] v1.2.7 - blaze support

---
 roles/smart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/smart.json b/roles/smart.json
index fc746757ed..715403fd36 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From d20c39b1453c3ce70434d59a2e7bed5b7d574160 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 28 Mar 2014 20:53:34 -0400
Subject: [PATCH 0108/1140] v1.2.7.1 remove debug logging related to Blaze
 support

---
 History.md       | 6 ++++++
 roles/package.js | 3 ---
 roles/smart.json | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index ba33d5290b..14105b4142 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,11 @@
+## v1.2.7.1
+
+* Remove debug logging related to Blaze support
+
+
 ## v1.2.7
 
+
 * Add support for Blaze UI (Meteor 0.8.0+)!  The 'roles' package must
   come after 'ui' or 'standard-app-packages' in '.meteor/packages' 
   for the 'isInRole' helper to be registered.
diff --git a/roles/package.js b/roles/package.js
index 95ada13084..100d030abb 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -12,10 +12,7 @@ Package.on_use(function (api) {
   // The 'weak' flag doesn't work with packages that aren't 
   // in meteor's internal cache (ie. non-core packages)
   if(uiExists()) {
-    console.log('ui exists')
     api.use(['ui'], 'client', {weak: true});
-  } else {
-    console.log('ui does not exist')
   }
 
   api.export && api.export('Roles');
diff --git a/roles/smart.json b/roles/smart.json
index 715403fd36..539090f64b 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.7",
+  "version": "1.2.7.1",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From 68844ba216c348d332bdb840825850f497f515bb Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 28 Mar 2014 20:56:08 -0400
Subject: [PATCH 0109/1140] v1.2.8 - bump minor version number since atmosphere
 only supports 3 levels

---
 History.md       | 5 +++++
 roles/smart.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 14105b4142..90f13980b4 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v1.2.8
+
+* Bump version number since Atmosphere only supports 3 levels
+
+
 ## v1.2.7.1
 
 * Remove debug logging related to Blaze support
diff --git a/roles/smart.json b/roles/smart.json
index 539090f64b..6c3a0430bd 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.7.1",
+  "version": "1.2.8",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }

From eba731619331f282568ac50b8521042419fd72fc Mon Sep 17 00:00:00 2001
From: Kevin Bennett <kevbuk@gmail.com>
Date: Sat, 26 Apr 2014 13:27:38 +0800
Subject: [PATCH 0110/1140] added Roles.getGroupsForUser with tests

---
 roles/roles_common.js | 47 +++++++++++++++++++++++
 roles/tests/server.js | 87 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index ecc0926804..546bbc6087 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -482,6 +482,53 @@ _.extend(Roles, {
 
     return Meteor.users.find(query)
   },  // end getUsersInRole 
+  
+  /**
+   * Retrieve users groups, if any
+   *
+   * @method getGroupsForUser
+   * @param {String|Object} user User Id or actual user object
+   * @param {String} [role] Optional name of roles to restrict groups to.
+   *                         User's Roles.GLOBAL_GROUP will also be included.
+   * @return {Array} Array of user's groups, unsorted.
+   */
+  getGroupsForUser: function (user, role) {
+    var userGroups = [];
+    
+    if (!user) return []
+    if (role) {
+      if ('string' !== typeof role) return []
+      if ('$' === role[0]) return []
+
+      // convert any periods to underscores
+      role = role.replace('.', '_')
+    }
+
+    if ('string' === typeof user) {
+      user = Meteor.users.findOne(
+               {_id: user},
+               {fields: {roles: 1}})
+    
+    }else if ('object' !== typeof user) {
+      // invalid user object
+      return []
+    }
+
+    //User has no roles or is not using groups
+    if (!user || !user.roles || _.isArray(user.roles)) return []
+
+    if (role) {
+      _.each(user.roles, function(groupRoles, groupName) {
+        if (_.contains(groupRoles, role) && groupName !== Roles.GLOBAL_GROUP) {
+          userGroups.push(groupName);
+        }
+      });
+      return userGroups;
+    }else {
+      return _.without(_.keys(user.roles), Roles.GLOBAL_GROUP);
+    }
+
+  }, //End getGroupsForUser
 
 
   /**
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 601be56ae3..2e98c55681 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -669,6 +669,93 @@
       test.equal(Roles.getRolesForUser(userObj, 'group1'), ['editor'])
       test.equal(Roles.getRolesForUser(userObj), ['editor'])
     })
+    
+  Tinytest.add(
+    'roles - can get all groups for user', 
+    function (test) {
+      reset()
+
+    var userId = users.eve,
+        userObj
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group2')
+
+    // by userId
+    test.equal(Roles.getGroupsForUser(userId), ['group1', 'group2'])
+
+    // by user object
+    userObj = Meteor.users.findOne({_id: userId})
+    test.equal(Roles.getGroupsForUser(userObj), ['group1', 'group2'])
+  })
+  
+  Tinytest.add(
+    'roles - can get all groups for user by role', 
+    function (test) {
+      reset()
+
+    var userId = users.eve,
+        userObj
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
+
+    // by userId
+    test.equal(Roles.getGroupsForUser(userId, 'user'), ['group2'])
+    test.equal(Roles.getGroupsForUser(userId, 'editor'), ['group1', 'group2'])
+    test.equal(Roles.getGroupsForUser(userId, 'admin'), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({_id: userId})
+    test.equal(Roles.getGroupsForUser(userObj, 'user'), ['group2'])
+    test.equal(Roles.getGroupsForUser(userObj, 'editor'), ['group1', 'group2'])
+    test.equal(Roles.getGroupsForUser(userObj, 'admin'), [])
+  })
+  
+  Tinytest.add(
+    'roles - getGroupsForUser returns [] when not using groups', 
+    function (test) {
+      reset()
+
+    var userId = users.eve,
+        userObj
+
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'])
+
+    // by userId
+    test.equal(Roles.getGroupsForUser(userId), [])
+    test.equal(Roles.getGroupsForUser(userId, 'editor'), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({_id: userId})
+    test.equal(Roles.getGroupsForUser(userObj), [])
+    test.equal(Roles.getGroupsForUser(userObj, 'editor'), [])
+  })
+  
+  
+  Tinytest.add(
+    'roles - getting all groups for user does not include GLOBAL_GROUP', 
+    function (test) {
+      reset()
+
+    var userId = users.eve,
+        userObj
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_GROUP)
+
+    // by userId
+    test.equal(Roles.getGroupsForUser(userId, 'user'), ['group2'])
+    test.equal(Roles.getGroupsForUser(userId, 'editor'), ['group1', 'group2'])
+    test.equal(Roles.getGroupsForUser(userId, 'admin'), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({_id: userId})
+    test.equal(Roles.getGroupsForUser(userObj, 'user'), ['group2'])
+    test.equal(Roles.getGroupsForUser(userObj, 'editor'), ['group1', 'group2'])
+    test.equal(Roles.getGroupsForUser(userObj, 'admin'), [])
+  })
 
 
   Tinytest.add(

From 19c92ee9f76a50a1837dec51194ce555880b5b0c Mon Sep 17 00:00:00 2001
From: Kevin Bennett <kevbuk@gmail.com>
Date: Sat, 26 Apr 2014 13:30:50 +0800
Subject: [PATCH 0111/1140] changed wording of comment

---
 roles/roles_common.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 546bbc6087..b16b6bb56b 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -489,8 +489,8 @@ _.extend(Roles, {
    * @method getGroupsForUser
    * @param {String|Object} user User Id or actual user object
    * @param {String} [role] Optional name of roles to restrict groups to.
-   *                         User's Roles.GLOBAL_GROUP will also be included.
-   * @return {Array} Array of user's groups, unsorted.
+   *
+   * @return {Array} Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted
    */
   getGroupsForUser: function (user, role) {
     var userGroups = [];

From 969b17fac5dfec66b6b12bfce4e37471d1a241d4 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 20 May 2014 00:51:21 -0400
Subject: [PATCH 0112/1140] Fix Issue #43 - run tests independent of meteor app

---
 History.md            | 5 +++++
 roles/package.js      | 8 +++++++-
 roles/smart.json      | 2 +-
 roles/tests/client.js | 9 ++++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 90f13980b4..0c35edddfe 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v1.2.9
+
+* Let `meteor test-packages ./roles` work outside of an actual meteor app. #43
+
+
 ## v1.2.8
 
 * Bump version number since Atmosphere only supports 3 levels
diff --git a/roles/package.js b/roles/package.js
index 100d030abb..a359604f46 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -37,7 +37,13 @@ Package.on_test(function (api) {
 function uiExists() {
   var fs = Npm.require('fs'),
       path = Npm.require('path'),
-      meteorPackages = fs.readFileSync(path.resolve('.meteor/packages'), 'utf8');
+      meteorPackages;
+
+  try {
+    meteorPackages = fs.readFileSync(path.resolve('.meteor/packages'), 'utf8');
+  } catch (ex) {
+    return false;
+  }
 
   if (!meteorPackages) {
     return false;
diff --git a/roles/smart.json b/roles/smart.json
index 6c3a0430bd..a85b3f069f 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/client.js b/roles/tests/client.js
index b98da4a8c4..715989c179 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -52,10 +52,17 @@
   Tinytest.add(
     'roles - can check current users roles via template helper', 
     function (test) {
-      var isInRole = Roles._handlebarsHelpers.isInRole,
+      var isInRole,
           expected,
           actual
 
+      if (!Roles._handlebarsHelpers) {
+        // probably running package tests outside of a Meteor app.
+        // skip this test.
+        return
+      }
+
+      isInRole = Roles._handlebarsHelpers.isInRole
       test.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
 
       expected = true

From 7ccb35de0a6cb0c9a0c3666badd04757e39c09a6 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 25 Jun 2014 11:48:01 -0400
Subject: [PATCH 0113/1140] 44 - fix behavior for groups with more than one '.'
 in name

---
 History.md                            |  5 +++++
 docs/classes/Roles.html               |  2 +-
 docs/classes/UIHelpers.html           |  2 +-
 docs/data.json                        |  2 +-
 docs/files/roles_roles_client.js.html |  2 +-
 docs/files/roles_roles_common.js.html | 12 ++++++------
 docs/files/roles_roles_server.js.html |  2 +-
 docs/index.html                       |  2 +-
 docs/modules/Roles.html               |  2 +-
 docs/modules/UIHelpers.html           |  2 +-
 roles/roles_common.js                 | 10 +++++-----
 roles/smart.json                      |  2 +-
 roles/tests/server.js                 |  9 +++++++++
 yuidoc.json                           |  2 +-
 14 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/History.md b/History.md
index 0c35edddfe..ced9999691 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v1.2.10
+
+* Fix behavior for groups with more than one period in their name. #44
+
+
 ## v1.2.9
 
 * Let `meteor test-packages ./roles` work outside of an actual meteor app. #43
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index a841537e48..e016388de7 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.6</em>
+            <em>API Docs for: v1.2.10</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
index 83756c749a..76120a1e43 100644
--- a/docs/classes/UIHelpers.html
+++ b/docs/classes/UIHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.6</em>
+            <em>API Docs for: v1.2.10</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/data.json b/docs/data.json
index b7e03e39d5..9a9f09cafa 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.6"
+        "version": "v1.2.10"
     },
     "files": {
         "roles/roles_client.js": {
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index 182c84cb2d..65a592231d 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.6</em>
+            <em>API Docs for: v1.2.10</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 1b88114852..6a2c525bbd 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.6</em>
+            <em>API Docs for: v1.2.10</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -295,7 +295,7 @@ _.extend(Roles, {
         throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
 
       // convert any periods to underscores
-      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+      group = group.replace(/\./g, &#x27;_&#x27;)
     }
 
     // ensure arrays
@@ -395,7 +395,7 @@ _.extend(Roles, {
       if (&#x27;$&#x27; === group[0]) return false
 
       // convert any periods to underscores
-      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+      group = group.replace(/\./g, &#x27;_&#x27;)
     }
     
     if (&#x27;object&#x27; === typeof user) {
@@ -476,7 +476,7 @@ _.extend(Roles, {
       if (&#x27;$&#x27; === group[0]) return []
 
       // convert any periods to underscores
-      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+      group = group.replace(/\./g, &#x27;_&#x27;)
     }
 
     if (&#x27;string&#x27; === typeof user) {
@@ -543,7 +543,7 @@ _.extend(Roles, {
         throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
 
       // convert any periods to underscores
-      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+      group = group.replace(/\./g, &#x27;_&#x27;)
     }
 
     query = {$or: []}
@@ -662,7 +662,7 @@ _.extend(Roles, {
         throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
 
       // convert any periods to underscores
-      group = group.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+      group = group.replace(/\./g, &#x27;_&#x27;)
     }
 
     var existingRoles,
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index e30b0ea3d9..7980ba0a1f 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.6</em>
+            <em>API Docs for: v1.2.10</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/index.html b/docs/index.html
index 9094100758..06b916a053 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.6</em>
+            <em>API Docs for: v1.2.10</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 9c628ff5da..20c9d1737f 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.6</em>
+            <em>API Docs for: v1.2.10</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/UIHelpers.html b/docs/modules/UIHelpers.html
index 2ce5d22b8d..4c865646be 100644
--- a/docs/modules/UIHelpers.html
+++ b/docs/modules/UIHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.6</em>
+            <em>API Docs for: v1.2.10</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/roles/roles_common.js b/roles/roles_common.js
index ecc0926804..8451ddbb8a 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -201,7 +201,7 @@ _.extend(Roles, {
         throw new Error ("Roles error: groups can not start with '$'")
 
       // convert any periods to underscores
-      group = group.replace('.', '_')
+      group = group.replace(/\./g, '_')
     }
 
     // ensure arrays
@@ -301,7 +301,7 @@ _.extend(Roles, {
       if ('$' === group[0]) return false
 
       // convert any periods to underscores
-      group = group.replace('.', '_')
+      group = group.replace(/\./g, '_')
     }
     
     if ('object' === typeof user) {
@@ -382,7 +382,7 @@ _.extend(Roles, {
       if ('$' === group[0]) return []
 
       // convert any periods to underscores
-      group = group.replace('.', '_')
+      group = group.replace(/\./g, '_')
     }
 
     if ('string' === typeof user) {
@@ -449,7 +449,7 @@ _.extend(Roles, {
         throw new Error ("Roles error: groups can not start with '$'")
 
       // convert any periods to underscores
-      group = group.replace('.', '_')
+      group = group.replace(/\./g, '_')
     }
 
     query = {$or: []}
@@ -568,7 +568,7 @@ _.extend(Roles, {
         throw new Error ("Roles error: groups can not start with '$'")
 
       // convert any periods to underscores
-      group = group.replace('.', '_')
+      group = group.replace(/\./g, '_')
     }
 
     var existingRoles,
diff --git a/roles/smart.json b/roles/smart.json
index a85b3f069f..714b70ece2 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 601be56ae3..93d2c3c158 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -867,6 +867,15 @@
       testUser(test, 'joe', ['admin'], 'example.com')
     })
 
+  Tinytest.add(
+    "roles - can use multiple periods in group name",
+    function (test) {
+      reset() 
+
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+      testUser(test, 'joe', ['admin'], 'example.k12.va.us')
+    })
+
   Tinytest.add(
     'roles - invalid group name throws descriptive error', 
     function (test) {
diff --git a/yuidoc.json b/yuidoc.json
index aaf002eb79..1aa0c78ac3 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.6",
+  "version": "v1.2.10",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From 4f3ba7191a922ee09276238ca05707618aea35a6 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 26 Jun 2014 01:41:24 -0400
Subject: [PATCH 0114/1140] pin meteor to release 0.7.2 so examples will run
 properly

---
 examples/mini-pages/.meteor/release | 2 +-
 examples/router/.meteor/release     | 2 +-
 examples/router/smart.json          | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/examples/mini-pages/.meteor/release b/examples/mini-pages/.meteor/release
index a3df0a6959..7486fdbc50 100644
--- a/examples/mini-pages/.meteor/release
+++ b/examples/mini-pages/.meteor/release
@@ -1 +1 @@
-0.8.0
+0.7.2
diff --git a/examples/router/.meteor/release b/examples/router/.meteor/release
index ef5e445445..7486fdbc50 100644
--- a/examples/router/.meteor/release
+++ b/examples/router/.meteor/release
@@ -1 +1 @@
-0.6.5
+0.7.2
diff --git a/examples/router/smart.json b/examples/router/smart.json
index 681f1d8232..607f05bd1c 100644
--- a/examples/router/smart.json
+++ b/examples/router/smart.json
@@ -1,10 +1,8 @@
 {
-  "meteor": {
-    "git": "https://github.com/meteor/meteor.git",
-    "branch": "master"
-  },
   "packages": {
     "roles": {},
-    "router": {}
+    "router": {
+      "version": "0.5.4"
+    }
   }
 }

From 2a18da9b6b384ef2895b4deb45e11ab81b239b71 Mon Sep 17 00:00:00 2001
From: Felix Rabe <felix@rabe.io>
Date: Fri, 27 Jun 2014 16:15:09 +0200
Subject: [PATCH 0115/1140] Update README.md

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index a42891f62b..f717c192bc 100644
--- a/README.md
+++ b/README.md
@@ -110,21 +110,21 @@ Meteor.publish(null, function (){
 ### Usage
 
 1. Add one of the built-in accounts packages so the Meteor.users collection exists.  From a command prompt:
-```bash
-meteor add accounts-password
-```
+    ```bash
+    meteor add accounts-password
+    ```
 
 2. Install [Meteorite][1]
   
 3. Add this smart package to your project.  From a command prompt:
-```bash
-mrt add roles
-```
+    ```bash
+    mrt add roles
+    ```
 
 4. Run your application:
-```bash
-meteor
-```
+    ```bash
+    meteor
+    ```
 
 
 <br />

From 4f490e78244f5dce8c13bfcc59fca86ac08ede70 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 4 Jul 2014 19:34:56 -0400
Subject: [PATCH 0116/1140] ignore example packages dirs

---
 examples/mini-pages/.gitignore | 1 +
 examples/router/.gitignore     | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 examples/mini-pages/.gitignore
 create mode 100644 examples/router/.gitignore

diff --git a/examples/mini-pages/.gitignore b/examples/mini-pages/.gitignore
new file mode 100644
index 0000000000..a049b6f89c
--- /dev/null
+++ b/examples/mini-pages/.gitignore
@@ -0,0 +1 @@
+packages/*
diff --git a/examples/router/.gitignore b/examples/router/.gitignore
new file mode 100644
index 0000000000..a049b6f89c
--- /dev/null
+++ b/examples/router/.gitignore
@@ -0,0 +1 @@
+packages/*

From ea7f7914f90b2448b1869d3965d20a2e4508e41d Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 4 Jul 2014 19:35:23 -0400
Subject: [PATCH 0117/1140] test getRolesForUser with multiple periods in group
 name

---
 roles/tests/client.js |  8 ++++++++
 roles/tests/server.js | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/roles/tests/client.js b/roles/tests/client.js
index 715989c179..bfdeed8514 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -98,4 +98,12 @@
       testUser(test, 'joe', ['admin'], Roles.GLOBAL_GROUP)
       testUser(test, 'joe', ['admin', 'editor'], 'group1')
     })
+
+  Tinytest.add(
+    'roles - can get all roles for user by group with periods in name', 
+    function (test) {
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
+    })
+
 }());
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 93d2c3c158..619f0b8ec3 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -618,6 +618,16 @@
       test.equal(Roles.getRolesForUser(userObj), [])
     })
 
+  Tinytest.add(
+    'roles - can get all roles for user by group with periods in name', 
+    function (test) {
+      reset()
+
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+
+      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
+    })
+
   Tinytest.add(
     'roles - can get all roles for user by group including Roles.GLOBAL_GROUP', 
     function (test) {

From dc961cfdcb02368f036978a067d5ef67bb96699d Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Wed, 16 Jul 2014 13:59:39 -0400
Subject: [PATCH 0118/1140] include missing `mrt update` step when trying to
 run examples

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f717c192bc..7ad28490f0 100644
--- a/README.md
+++ b/README.md
@@ -61,12 +61,13 @@ View the ```meteor-router``` example app online @  <a href="http://roles.meteor.
   
 Run locally:
   1. install [Meteorite][1]
-  2. ```git clone https://github.com/alanning/meteor-roles.git```
+  2. `git clone https://github.com/alanning/meteor-roles.git`
   3. either
-    * ```cd meteor-roles/examples/router``` or
-    * ```cd meteor-roles/examples/mini-pages```
-  4. ```meteor```
-  5. point browser to ```http://localhost:3000```
+    * `cd meteor-roles/examples/router` or
+    * `cd meteor-roles/examples/mini-pages`
+  4. `mrt update`
+  5. `meteor`
+  6. point browser to `http://localhost:3000`
 
 <br />
 

From 23d37bfdb93b149bda1d197d4218a7fd1d10b767 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 10 Aug 2014 18:17:59 -0400
Subject: [PATCH 0119/1140] include kevb as contributor

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7ad28490f0..d3660a86bd 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 Thanks to:
 
+  * [@kevb](https://github.com/kevb)
   * [@zimme](https://github.com/zimme)
   * [@danieljonce](https://github.com/danieljonce)
   * [@pascoual](https://github.com/pascoual)

From f1ff95823b79ec82f0d4dd0bf2a0e3177fbd3623 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 10 Aug 2014 18:21:09 -0400
Subject: [PATCH 0120/1140] include request for updated iron-router example

---
 README.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d3660a86bd..6cc63aa847 100644
--- a/README.md
+++ b/README.md
@@ -50,15 +50,16 @@ Although the name of this package is 'roles', you can define your permissions ho
 
 ### Example Apps
 
-The ```examples``` directory contains Meteor apps which show off the following features:
+The `examples` directory contains Meteor apps which show off the following features:
 * Server-side publishing with authorization to secure sensitive data
 * Client-side navigation with link visibility based on user permissions
-* 'Sign-in required' app with up-front login page using ```accounts-ui```
+* 'Sign-in required' app with up-front login page using `accounts-ui`
 * Client-side routing
 
-The only difference between the two example apps is the routing packages used: one uses ```meteor-router``` and the other uses ```meteor-mini-pages```.
+The only difference between the two example apps is the routing packages used: one uses `meteor-router` and the other uses `meteor-mini-pages`.
+(If anyone wants to update the iron-router example, that would be a big help!)
 
-View the ```meteor-router``` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
+View the `meteor-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
   
 Run locally:
   1. install [Meteorite][1]
@@ -268,12 +269,12 @@ Meteor.methods({
 
 -- **Client** --
 
-Client javascript has access to all the same Roles functions as the server with the addition of a ```isInRole``` handlebars helper which is automatically registered by the Roles package.
+Client javascript has access to all the same Roles functions as the server with the addition of a `isInRole` handlebars helper which is automatically registered by the Roles package.
 
 Like all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
 since Meteor bundles the same client-side code to all users.  Providing the Roles functions client-side also allows for latency compensation during Meteor method calls.
 
-NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled ```client.js``` file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
+NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js` file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
 
 ```handlebars
 <!-- client/myApp.html -->
@@ -310,13 +311,13 @@ API docs generated using [YUIDoc][2]
 
 To re-generate documentation:
   1. install YUIDoc
-  2. ```cd meteor-roles```
-  3. ```yuidoc```
+  2. `cd meteor-roles`
+  3. `yuidoc`
 
 To serve documentation locally:
   1. install YUIDoc
-  2. ```cd meteor-roles```
-  3. ```yuidoc --server```
+  2. `cd meteor-roles`
+  3. `yuidoc --server`
   4. point browser at http://localhost:3000/
 
 
@@ -326,8 +327,8 @@ To serve documentation locally:
 
 
 To run tests: 
-  1. ```cd meteor-roles```
-  2. ```meteor test-packages ./roles```
+  1. `cd meteor-roles`
+  2. `meteor test-packages ./roles`
   3. point browser at http://localhost:3000/
 
 _NOTE_: If you see an error message regarding **"The package named roles does not exist"** that means you are either:

From 712bfa2824ec539fbd6f52c542c32edf5994dfba Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 10 Aug 2014 18:31:44 -0400
Subject: [PATCH 0121/1140] point out that group names can not start with a
 number

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 445b696c27..3f3e234de6 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -131,7 +131,7 @@ _.extend(Roles, {
    * @param {Array|String} roles Name(s) of roles/permissions to add users to
    * @param {String} [group] Optional group name. If supplied, roles will be
    *                         specific to that group.  
-   *                         Group names can not start with '$'.
+   *                         Group names can not start with '$' or numbers.
    *                         Periods in names '.' are automatically converted
    *                         to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 

From 5d80d73e8295b47c81cd6d2b69445a3f541abd79 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 10 Aug 2014 18:32:50 -0400
Subject: [PATCH 0122/1140] Link to docs regarding restrictions on group names

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6cc63aa847..b1fbc49f38 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ Run locally:
 
 <br />
 
-† The type of the `roles` field depends on whether groups are used or not:
+† The type of the `roles` field depends on whether or not groups are used:
 ```js
 Roles.addUsersToRoles(bobsUserId, ['manage-team','schedule-game'])
 // internal representation - no groups 
@@ -91,7 +91,7 @@ Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-u
 Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
 // internal representation - groups
 // NOTE: MongoDB uses periods to represent hierarchy so periods in group names
-//   are converted to underscores
+//   are converted to underscores.
 //
 // user.roles = { 
 //   'manchester-united_com': ['manage-team','schedule-game'],
@@ -99,6 +99,9 @@ Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
 // }
 ```
 
+<em>Note: See the `addUsersToRoles` [documentation](http://alanning.github.io/meteor-roles/classes/Roles.html) for restrictions on group names.</em>
+
+
 †† `Meteor.roles` is not published by default.  Here's how you would publish it to every client without needing a subscription:
 
 ```js

From 2d7dc91848ec874d3a0852c77f462d0fae749de5 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 10 Aug 2014 18:36:10 -0400
Subject: [PATCH 0123/1140] v1.2.11 - add `getGroupsForUser` function

---
 History.md                            |   5 +
 docs/classes/Roles.html               | 147 +++++++++++++++++++++++++-
 docs/classes/UIHelpers.html           |   2 +-
 docs/data.json                        |  36 ++++++-
 docs/files/roles_roles_client.js.html |   2 +-
 docs/files/roles_roles_common.js.html |  51 ++++++++-
 docs/files/roles_roles_server.js.html |   2 +-
 docs/index.html                       |   2 +-
 docs/modules/Roles.html               |   2 +-
 docs/modules/UIHelpers.html           |   2 +-
 roles/smart.json                      |   2 +-
 yuidoc.json                           |   2 +-
 12 files changed, 235 insertions(+), 20 deletions(-)

diff --git a/History.md b/History.md
index ced9999691..42dd0e6f96 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v1.2.11
+
+* Add `getGroupsForUser` function. #39
+
+
 ## v1.2.10
 
 * Fix behavior for groups with more than one period in their name. #44
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index e016388de7..5bf6c2c6d4 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.10</em>
+            <em>API Docs for: v1.2.11</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -247,6 +247,13 @@
 
                                 
                                 
+                            </li>
+                        
+                            <li class="index-item method">
+                                <a href="#method_getGroupsForUser">getGroupsForUser</a>
+
+                                
+                                
                             </li>
                         
                             <li class="index-item method">
@@ -371,7 +378,7 @@
             
         
         
-        <a href="../files/roles_roles_common.js.html#l512"><code>roles&#x2F;roles_common.js:512</code></a>
+        <a href="../files/roles_roles_common.js.html#l559"><code>roles&#x2F;roles_common.js:559</code></a>
         
         </p>
 
@@ -502,7 +509,7 @@ object for MongoDB.  Passed to _updateUserRoles</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l487"><code>roles&#x2F;roles_common.js:487</code></a>
+        <a href="../files/roles_roles_common.js.html#l534"><code>roles&#x2F;roles_common.js:534</code></a>
         
         </p>
 
@@ -653,7 +660,7 @@ for MongoDB.  Passed to _updateUserRoles</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l538"><code>roles&#x2F;roles_common.js:538</code></a>
+        <a href="../files/roles_roles_common.js.html#l585"><code>roles&#x2F;roles_common.js:585</code></a>
         
         </p>
 
@@ -914,7 +921,7 @@ for users.</p>
 
                     <div class="param-description">
                         <p>Optional group name. If supplied, roles will be
-                        specific to that group.<br>                        Group names can not start with &#39;$&#39;.
+                        specific to that group.<br>                        Group names can not start with &#39;$&#39; or numbers.
                         Periods in names &#39;.&#39; are automatically converted
                         to underscores.
                         The special group Roles.GLOBAL_GROUP provides 
@@ -1218,6 +1225,136 @@ are currently assigned to the target role.</p>
     
 
     
+</div>
+
+                
+                    <div id="method_getGroupsForUser" class="method item">
+    <h3 class="name"><code>getGroupsForUser</code></h3>
+
+    
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+            
+                <li class="arg">
+                    
+                        <code>user</code>
+                    
+                </li>
+            
+                <li class="arg">
+                    
+                        <code class="optional">[role]</code>
+                    
+                </li>
+            
+            </ul><span class="paren">)</span>
+        </div>
+    
+
+    
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="../files/roles_roles_common.js.html#l486"><code>roles&#x2F;roles_common.js:486</code></a>
+        
+        </p>
+
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Retrieve users groups, if any</p>
+
+    </div>
+
+    
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+            
+                <li class="param">
+                    
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>User Id or actual user object</p>
+
+                    </div>
+
+                    
+                </li>
+            
+                <li class="param">
+                    
+                        <code class="param-name optional">[role]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional name of roles to restrict groups to.</p>
+
+                    </div>
+
+                    
+                </li>
+            
+            </ul>
+        </div>
+    
+
+    
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                
+                    
+                        <span class="type">Array</span>:
+                    
+                    <p>Array of user&#39;s groups, unsorted. Roles.GLOBAL_GROUP will be omitted</p>
+
+                
+            </div>
+        </div>
+    
+
+    
 </div>
 
                 
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
index 76120a1e43..c75c116709 100644
--- a/docs/classes/UIHelpers.html
+++ b/docs/classes/UIHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.10</em>
+            <em>API Docs for: v1.2.11</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/data.json b/docs/data.json
index 9a9f09cafa..6e79342efd 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.10"
+        "version": "v1.2.11"
     },
     "files": {
         "roles/roles_client.js": {
@@ -204,7 +204,7 @@
                 },
                 {
                     "name": "group",
-                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        Group names can not start with '$'.\n                        Periods in names '.' are automatically converted\n                        to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        Group names can not start with '$' or numbers.\n                        Periods in names '.' are automatically converted\n                        to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
                     "type": "String",
                     "optional": true
                 }
@@ -373,7 +373,33 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 487,
+            "line": 486,
+            "description": "Retrieve users groups, if any",
+            "itemtype": "method",
+            "name": "getGroupsForUser",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User Id or actual user object",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "role",
+                    "description": "Optional name of roles to restrict groups to.",
+                    "type": "String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted",
+                "type": "Array"
+            },
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 534,
             "description": "Private function 'template' that uses $set to construct an update object\nfor MongoDB.  Passed to _updateUserRoles",
             "itemtype": "method",
             "name": "_update_$set_fn",
@@ -401,7 +427,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 512,
+            "line": 559,
             "description": "Private function 'template' that uses $addToSet to construct an update \nobject for MongoDB.  Passed to _updateUserRoles",
             "itemtype": "method",
             "name": "_update_$addToSet_fn",
@@ -429,7 +455,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 538,
+            "line": 585,
             "description": "Internal function that users the Template pattern to adds or sets roles \nfor users.",
             "itemtype": "method",
             "name": "_updateUserRoles",
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index 65a592231d..b8e35bbad8 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.10</em>
+            <em>API Docs for: v1.2.11</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 6a2c525bbd..10d971a537 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.10</em>
+            <em>API Docs for: v1.2.11</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -225,7 +225,7 @@ _.extend(Roles, {
    * @param {Array|String} roles Name(s) of roles/permissions to add users to
    * @param {String} [group] Optional group name. If supplied, roles will be
    *                         specific to that group.  
-   *                         Group names can not start with &#x27;$&#x27;.
+   *                         Group names can not start with &#x27;$&#x27; or numbers.
    *                         Periods in names &#x27;.&#x27; are automatically converted
    *                         to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
@@ -576,6 +576,53 @@ _.extend(Roles, {
 
     return Meteor.users.find(query)
   },  // end getUsersInRole 
+  
+  /**
+   * Retrieve users groups, if any
+   *
+   * @method getGroupsForUser
+   * @param {String|Object} user User Id or actual user object
+   * @param {String} [role] Optional name of roles to restrict groups to.
+   *
+   * @return {Array} Array of user&#x27;s groups, unsorted. Roles.GLOBAL_GROUP will be omitted
+   */
+  getGroupsForUser: function (user, role) {
+    var userGroups = [];
+    
+    if (!user) return []
+    if (role) {
+      if (&#x27;string&#x27; !== typeof role) return []
+      if (&#x27;$&#x27; === role[0]) return []
+
+      // convert any periods to underscores
+      role = role.replace(&#x27;.&#x27;, &#x27;_&#x27;)
+    }
+
+    if (&#x27;string&#x27; === typeof user) {
+      user = Meteor.users.findOne(
+               {_id: user},
+               {fields: {roles: 1}})
+    
+    }else if (&#x27;object&#x27; !== typeof user) {
+      // invalid user object
+      return []
+    }
+
+    //User has no roles or is not using groups
+    if (!user || !user.roles || _.isArray(user.roles)) return []
+
+    if (role) {
+      _.each(user.roles, function(groupRoles, groupName) {
+        if (_.contains(groupRoles, role) &amp;&amp; groupName !== Roles.GLOBAL_GROUP) {
+          userGroups.push(groupName);
+        }
+      });
+      return userGroups;
+    }else {
+      return _.without(_.keys(user.roles), Roles.GLOBAL_GROUP);
+    }
+
+  }, //End getGroupsForUser
 
 
   /**
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 7980ba0a1f..bd19f891e7 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.10</em>
+            <em>API Docs for: v1.2.11</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/index.html b/docs/index.html
index 06b916a053..19a864521e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.10</em>
+            <em>API Docs for: v1.2.11</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 20c9d1737f..74e97eec40 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.10</em>
+            <em>API Docs for: v1.2.11</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/docs/modules/UIHelpers.html b/docs/modules/UIHelpers.html
index 4c865646be..cbc92903c3 100644
--- a/docs/modules/UIHelpers.html
+++ b/docs/modules/UIHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.10</em>
+            <em>API Docs for: v1.2.11</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
diff --git a/roles/smart.json b/roles/smart.json
index 714b70ece2..fc7849f1c0 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/yuidoc.json b/yuidoc.json
index 1aa0c78ac3..57e6a1eca7 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.10",
+  "version": "v1.2.11",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From 1c83c752ef04de48529ceb2fe67ccb2d63f177a0 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 27 Aug 2014 02:01:32 -0400
Subject: [PATCH 0124/1140] v1.2.12 - support Meteor 0.9.0 package system
 (hopefully)

---
 History.md                            |   5 +
 docs/api.js                           |  25 +-
 docs/classes/Roles.html               | 198 ++++++++++-
 docs/classes/UIHelpers.html           | 198 ++++++++++-
 docs/data.json                        | 489 +++++++++++++++++++++++++-
 docs/files/roles_roles_client.js.html | 198 ++++++++++-
 docs/files/roles_roles_common.js.html | 198 ++++++++++-
 docs/files/roles_roles_server.js.html | 198 ++++++++++-
 docs/index.html                       | 198 ++++++++++-
 docs/modules/Roles.html               | 198 ++++++++++-
 docs/modules/UIHelpers.html           | 198 ++++++++++-
 roles/package.js                      |  15 +-
 roles/smart.json                      |   2 +-
 roles/versions.json                   |  95 +++++
 yuidoc.json                           |   2 +-
 15 files changed, 2201 insertions(+), 16 deletions(-)
 create mode 100644 roles/versions.json

diff --git a/History.md b/History.md
index 42dd0e6f96..e11f9bc78e 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v1.2.12
+
+* Support Meteor 0.9.0 - new packaging system (hopefully). #52
+
+
 ## v1.2.11
 
 * Add `getGroupsForUser` function. #39
diff --git a/docs/api.js b/docs/api.js
index 30c6855ade..48701a4d90 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -2,11 +2,17 @@ YUI.add("yuidoc-meta", function(Y) {
    Y.YUIDoc = { meta: {
     "classes": [
         "Roles",
-        "UIHelpers"
+        "Roles                                                                                                    // 22",
+        "Roles                                                                                            // 22",
+        "UIHelpers",
+        "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);"
     ],
     "modules": [
         "Roles",
-        "UIHelpers"
+        "Roles                                                                                                   __ 6\n_                                                                                                                __ 7\n                                                                                                                  __ 8\n_**                                                                                                                __ 9\nRoles collection documents consist only of an id and a role name.                                               __ 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             __ 11\n_                                                                                                                __ 12\nif (!Meteor.roles) {                                                                                               __ 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    __ 14\n}                                                                                                                  __ 15\n                                                                                                                  __ 16\n_**                                                                                                                __ 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      __ 18\n                                                                                                                __ 19\nStores user's current roles in a 'roles' field on the user object.                                              __ 20\n                                                                                                                __ 21",
+        "Roles                                                                                           __ 6\n_                                                                                                        __ 7\n                                                                                                          __ 8\n_**                                                                                                        __ 9\nRoles collection documents consist only of an id and a role name.                                       __ 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     __ 11\n_                                                                                                        __ 12\nif (!Meteor.roles) {                                                                                       __ 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            __ 14\n}                                                                                                          __ 15\n                                                                                                          __ 16\n_**                                                                                                        __ 17\nRole-based authorization compatible with built-in Meteor accounts package.                              __ 18\n                                                                                                        __ 19\nStores user's current roles in a 'roles' field on the user object.                                      __ 20\n                                                                                                        __ 21",
+        "UIHelpers",
+        "UIHelpers                                                                                               __ 10\n_                                                                                                                __ 11\n                                                                                                                  __ 12\n____________________________________________________________                                                       __ 13\n__ UI helpers                                                                                                      __ 14\n__                                                                                                                 __ 15\n__ Use a semi-private variable rather than declaring UI                                                            __ 16\n__ helpers directly so that we can unit test the helpers.                                                          __ 17\n__ XXX For some reason, the UI helpers are not registered                                                          __ 18\n__ before the tests run.                                                                                           __ 19\n__                                                                                                                 __ 20\nRoles._uiHelpers = {                                                                                               __ 21\n                                                                                                                  __ 22\n _**                                                                                                              __ 23\nUI helper to check if current user is in at least one                                                         __ 24\nof the target roles.  For use in client-side templates.                                                       __ 25\n                                                                                                              __ 26"
     ],
     "allModules": [
         {
@@ -14,10 +20,25 @@ YUI.add("yuidoc-meta", function(Y) {
             "name": "Roles",
             "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
         },
+        {
+            "displayName": "Roles                                                                                                   // 6\n/                                                                                                                // 7\n                                                                                                                  // 8\n/**                                                                                                                // 9\nRoles collection documents consist only of an id and a role name.                                               // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             // 11\n/                                                                                                                // 12\nif (!Meteor.roles) {                                                                                               // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    // 14\n}                                                                                                                  // 15\n                                                                                                                  // 16\n/**                                                                                                                // 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      // 18\n                                                                                                                // 19\nStores user's current roles in a 'roles' field on the user object.                                              // 20\n                                                                                                                // 21",
+            "name": "Roles                                                                                                   __ 6\n_                                                                                                                __ 7\n                                                                                                                  __ 8\n_**                                                                                                                __ 9\nRoles collection documents consist only of an id and a role name.                                               __ 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             __ 11\n_                                                                                                                __ 12\nif (!Meteor.roles) {                                                                                               __ 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    __ 14\n}                                                                                                                  __ 15\n                                                                                                                  __ 16\n_**                                                                                                                __ 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      __ 18\n                                                                                                                __ 19\nStores user's current roles in a 'roles' field on the user object.                                              __ 20\n                                                                                                                __ 21",
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5"
+        },
+        {
+            "displayName": "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21",
+            "name": "Roles                                                                                           __ 6\n_                                                                                                        __ 7\n                                                                                                          __ 8\n_**                                                                                                        __ 9\nRoles collection documents consist only of an id and a role name.                                       __ 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     __ 11\n_                                                                                                        __ 12\nif (!Meteor.roles) {                                                                                       __ 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            __ 14\n}                                                                                                          __ 15\n                                                                                                          __ 16\n_**                                                                                                        __ 17\nRole-based authorization compatible with built-in Meteor accounts package.                              __ 18\n                                                                                                        __ 19\nStores user's current roles in a 'roles' field on the user object.                                      __ 20\n                                                                                                        __ 21",
+            "description": "Roles collection documents consist only of an id and a role name.                                       // 5\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 6\n/                                                                                                        // 7\nif (!Meteor.roles) {                                                                                       // 8\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 9\n                                                                                                          // 10\n // Create default indexes for roles collection                                                           // 11\n Meteor.roles._ensureIndex('name', {unique: 1})                                                           // 12\n}                                                                                                          // 13\n                                                                                                          // 14\n                                                                                                          // 15\n/**                                                                                                        // 16\nAlways publish logged-in user's roles so client-side                                                    // 17\nchecks can work.                                                                                        // 18\n/                                                                                                        // 19\nMeteor.publish(null, function () {                                                                         // 20\n var userId = this.userId,                                                                                // 21\n     fields = {roles:1}                                                                                   // 22\n                                                                                                          // 23\n return Meteor.users.find({_id:userId}, {fields: fields})                                                 // 24\n})                                                                                                         // 25\n                                                                                                          // 26\n}());                                                                                                      // 27\n                                                                                                          // 28\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);\n\n\n\n\n\n\n(function () {\n\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n//                                                                                                         //\n// packages/alanning:roles/roles_common.js                                                                 //\n//                                                                                                         //\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n                                                                                                          //\n;(function () {                                                                                            // 1\n                                                                                                          // 2\n/**                                                                                                        // 3\nProvides functions related to user authorization. Compatible with built-in Meteor accounts packages.    // 4\n                                                                                                        // 5"
+        },
         {
             "displayName": "UIHelpers",
             "name": "UIHelpers",
             "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
+        },
+        {
+            "displayName": "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26",
+            "name": "UIHelpers                                                                                               __ 10\n_                                                                                                                __ 11\n                                                                                                                  __ 12\n____________________________________________________________                                                       __ 13\n__ UI helpers                                                                                                      __ 14\n__                                                                                                                 __ 15\n__ Use a semi-private variable rather than declaring UI                                                            __ 16\n__ helpers directly so that we can unit test the helpers.                                                          __ 17\n__ XXX For some reason, the UI helpers are not registered                                                          __ 18\n__ before the tests run.                                                                                           __ 19\n__                                                                                                                 __ 20\nRoles._uiHelpers = {                                                                                               __ 21\n                                                                                                                  __ 22\n _**                                                                                                              __ 23\nUI helper to check if current user is in at least one                                                         __ 24\nof the target roles.  For use in client-side templates.                                                       __ 25\n                                                                                                              __ 26",
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5"
         }
     ]
 } };
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 5bf6c2c6d4..b5d7ad490c 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.11</em>
+            <em>API Docs for: v1.2.12</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,16 +43,212 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
+            
+                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
+            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../classes/UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);.html">UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/Roles                                                                                                   __ 6
+_                                                                                                                __ 7
+                                                                                                                  __ 8
+_**                                                                                                                __ 9
+Roles collection documents consist only of an id and a role name.                                               __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
+_                                                                                                                __ 12
+if (!Meteor.roles) {                                                                                               __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
+}                                                                                                                  __ 15
+                                                                                                                  __ 16
+_**                                                                                                                __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
+                                                                                                                __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
+                                                                                                                __ 21.html">Roles                                                                                                   // 6
+/                                                                                                                // 7
+                                                                                                                  // 8
+/**                                                                                                                // 9
+Roles collection documents consist only of an id and a role name.                                               // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
+/                                                                                                                // 12
+if (!Meteor.roles) {                                                                                               // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
+}                                                                                                                  // 15
+                                                                                                                  // 16
+/**                                                                                                                // 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
+                                                                                                                // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
+                                                                                                                // 21</a></li>
+            
+                <li><a href="../modules/Roles                                                                                           __ 6
+_                                                                                                        __ 7
+                                                                                                          __ 8
+_**                                                                                                        __ 9
+Roles collection documents consist only of an id and a role name.                                       __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
+_                                                                                                        __ 12
+if (!Meteor.roles) {                                                                                       __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
+}                                                                                                          __ 15
+                                                                                                          __ 16
+_**                                                                                                        __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
+                                                                                                        __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
+                                                                                                        __ 21.html">Roles                                                                                           // 6
+/                                                                                                        // 7
+                                                                                                          // 8
+/**                                                                                                        // 9
+Roles collection documents consist only of an id and a role name.                                       // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
+/                                                                                                        // 12
+if (!Meteor.roles) {                                                                                       // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
+}                                                                                                          // 15
+                                                                                                          // 16
+/**                                                                                                        // 17
+Role-based authorization compatible with built-in Meteor accounts package.                              // 18
+                                                                                                        // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
+                                                                                                        // 21</a></li>
+            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../modules/UIHelpers                                                                                               __ 10
+_                                                                                                                __ 11
+                                                                                                                  __ 12
+____________________________________________________________                                                       __ 13
+__ UI helpers                                                                                                      __ 14
+__                                                                                                                 __ 15
+__ Use a semi-private variable rather than declaring UI                                                            __ 16
+__ helpers directly so that we can unit test the helpers.                                                          __ 17
+__ XXX For some reason, the UI helpers are not registered                                                          __ 18
+__ before the tests run.                                                                                           __ 19
+__                                                                                                                 __ 20
+Roles._uiHelpers = {                                                                                               __ 21
+                                                                                                                  __ 22
+ _**                                                                                                              __ 23
+UI helper to check if current user is in at least one                                                         __ 24
+of the target roles.  For use in client-side templates.                                                       __ 25
+                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
+/                                                                                                                // 11
+                                                                                                                  // 12
+////////////////////////////////////////////////////////////                                                       // 13
+// UI helpers                                                                                                      // 14
+//                                                                                                                 // 15
+// Use a semi-private variable rather than declaring UI                                                            // 16
+// helpers directly so that we can unit test the helpers.                                                          // 17
+// XXX For some reason, the UI helpers are not registered                                                          // 18
+// before the tests run.                                                                                           // 19
+//                                                                                                                 // 20
+Roles._uiHelpers = {                                                                                               // 21
+                                                                                                                  // 22
+ /**                                                                                                              // 23
+UI helper to check if current user is in at least one                                                         // 24
+of the target roles.  For use in client-side templates.                                                       // 25
+                                                                                                              // 26</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
index c75c116709..159ae10e2f 100644
--- a/docs/classes/UIHelpers.html
+++ b/docs/classes/UIHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.11</em>
+            <em>API Docs for: v1.2.12</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,16 +43,212 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
+            
+                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
+            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../classes/UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);.html">UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/Roles                                                                                                   __ 6
+_                                                                                                                __ 7
+                                                                                                                  __ 8
+_**                                                                                                                __ 9
+Roles collection documents consist only of an id and a role name.                                               __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
+_                                                                                                                __ 12
+if (!Meteor.roles) {                                                                                               __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
+}                                                                                                                  __ 15
+                                                                                                                  __ 16
+_**                                                                                                                __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
+                                                                                                                __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
+                                                                                                                __ 21.html">Roles                                                                                                   // 6
+/                                                                                                                // 7
+                                                                                                                  // 8
+/**                                                                                                                // 9
+Roles collection documents consist only of an id and a role name.                                               // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
+/                                                                                                                // 12
+if (!Meteor.roles) {                                                                                               // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
+}                                                                                                                  // 15
+                                                                                                                  // 16
+/**                                                                                                                // 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
+                                                                                                                // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
+                                                                                                                // 21</a></li>
+            
+                <li><a href="../modules/Roles                                                                                           __ 6
+_                                                                                                        __ 7
+                                                                                                          __ 8
+_**                                                                                                        __ 9
+Roles collection documents consist only of an id and a role name.                                       __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
+_                                                                                                        __ 12
+if (!Meteor.roles) {                                                                                       __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
+}                                                                                                          __ 15
+                                                                                                          __ 16
+_**                                                                                                        __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
+                                                                                                        __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
+                                                                                                        __ 21.html">Roles                                                                                           // 6
+/                                                                                                        // 7
+                                                                                                          // 8
+/**                                                                                                        // 9
+Roles collection documents consist only of an id and a role name.                                       // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
+/                                                                                                        // 12
+if (!Meteor.roles) {                                                                                       // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
+}                                                                                                          // 15
+                                                                                                          // 16
+/**                                                                                                        // 17
+Role-based authorization compatible with built-in Meteor accounts package.                              // 18
+                                                                                                        // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
+                                                                                                        // 21</a></li>
+            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../modules/UIHelpers                                                                                               __ 10
+_                                                                                                                __ 11
+                                                                                                                  __ 12
+____________________________________________________________                                                       __ 13
+__ UI helpers                                                                                                      __ 14
+__                                                                                                                 __ 15
+__ Use a semi-private variable rather than declaring UI                                                            __ 16
+__ helpers directly so that we can unit test the helpers.                                                          __ 17
+__ XXX For some reason, the UI helpers are not registered                                                          __ 18
+__ before the tests run.                                                                                           __ 19
+__                                                                                                                 __ 20
+Roles._uiHelpers = {                                                                                               __ 21
+                                                                                                                  __ 22
+ _**                                                                                                              __ 23
+UI helper to check if current user is in at least one                                                         __ 24
+of the target roles.  For use in client-side templates.                                                       __ 25
+                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
+/                                                                                                                // 11
+                                                                                                                  // 12
+////////////////////////////////////////////////////////////                                                       // 13
+// UI helpers                                                                                                      // 14
+//                                                                                                                 // 15
+// Use a semi-private variable rather than declaring UI                                                            // 16
+// helpers directly so that we can unit test the helpers.                                                          // 17
+// XXX For some reason, the UI helpers are not registered                                                          // 18
+// before the tests run.                                                                                           // 19
+//                                                                                                                 // 20
+Roles._uiHelpers = {                                                                                               // 21
+                                                                                                                  // 22
+ /**                                                                                                              // 23
+UI helper to check if current user is in at least one                                                         // 24
+of the target roles.  For use in client-side templates.                                                       // 25
+                                                                                                              // 26</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/data.json b/docs/data.json
index 6e79342efd..9660e7f534 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -2,9 +2,43 @@
     "project": {
         "name": "The meteor-roles API",
         "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.11"
+        "version": "v1.2.12"
     },
     "files": {
+        "roles/.build.alanning:roles/os/packages/alanning:roles.js": {
+            "name": "roles/.build.alanning:roles/os/packages/alanning:roles.js",
+            "modules": {
+                "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21": 1
+            },
+            "classes": {
+                "Roles                                                                                            // 22": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        },
+        "roles/.build.alanning:roles/web.browser/packages/alanning:roles.js": {
+            "name": "roles/.build.alanning:roles/web.browser/packages/alanning:roles.js",
+            "modules": {},
+            "classes": {},
+            "fors": {
+                "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": 1
+            },
+            "namespaces": {}
+        },
+        "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js": {
+            "name": "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js",
+            "modules": {
+                "Roles                                                                                                   // 6\n/                                                                                                                // 7\n                                                                                                                  // 8\n/**                                                                                                                // 9\nRoles collection documents consist only of an id and a role name.                                               // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             // 11\n/                                                                                                                // 12\nif (!Meteor.roles) {                                                                                               // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    // 14\n}                                                                                                                  // 15\n                                                                                                                  // 16\n/**                                                                                                                // 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      // 18\n                                                                                                                // 19\nStores user's current roles in a 'roles' field on the user object.                                              // 20\n                                                                                                                // 21": 1,
+                "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26": 1
+            },
+            "classes": {
+                "Roles                                                                                                    // 22": 1
+            },
+            "fors": {
+                "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": 1
+            },
+            "namespaces": {}
+        },
         "roles/roles_client.js": {
             "name": "roles/roles_client.js",
             "modules": {
@@ -36,6 +70,420 @@
         }
     },
     "modules": {
+        "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21": {
+            "name": "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21",
+            "submodules": {},
+            "classes": {
+                "Roles                                                                                            // 22": 1
+            },
+            "fors": {},
+            "namespaces": {},
+            "tag": "module",
+            "file": "roles/.build.alanning:roles/os/packages/alanning:roles.js",
+            "line": 12,
+            "description": "Roles collection documents consist only of an id and a role name.                                       // 5\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 6\n/                                                                                                        // 7\nif (!Meteor.roles) {                                                                                       // 8\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 9\n                                                                                                          // 10\n // Create default indexes for roles collection                                                           // 11\n Meteor.roles._ensureIndex('name', {unique: 1})                                                           // 12\n}                                                                                                          // 13\n                                                                                                          // 14\n                                                                                                          // 15\n/**                                                                                                        // 16\nAlways publish logged-in user's roles so client-side                                                    // 17\nchecks can work.                                                                                        // 18\n/                                                                                                        // 19\nMeteor.publish(null, function () {                                                                         // 20\n var userId = this.userId,                                                                                // 21\n     fields = {roles:1}                                                                                   // 22\n                                                                                                          // 23\n return Meteor.users.find({_id:userId}, {fields: fields})                                                 // 24\n})                                                                                                         // 25\n                                                                                                          // 26\n}());                                                                                                      // 27\n                                                                                                          // 28\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);\n\n\n\n\n\n\n(function () {\n\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n//                                                                                                         //\n// packages/alanning:roles/roles_common.js                                                                 //\n//                                                                                                         //\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n                                                                                                          //\n;(function () {                                                                                            // 1\n                                                                                                          // 2\n/**                                                                                                        // 3\nProvides functions related to user authorization. Compatible with built-in Meteor accounts packages.    // 4\n                                                                                                        // 5",
+            "is_constructor": 1,
+            "example": [
+                "                                                                                              // 39\n    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)                                          // 40\n    Roles.userIsInRole(user, 'admin') // => true                                                      // 41\n                                                                                                      // 42\n    Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)                                     // 43\n    Roles.userIsInRole(user, 'support-staff') // => true                                              // 44\n    Roles.userIsInRole(user, 'admin') // => false                                                     // 45\n                                                                                                      // 46",
+                "                                                                                              // 122\n    Roles.addUsersToRoles(userId, 'admin')                                                            // 123\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')                                    // 124\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])                                          // 125\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')        // 126\n    Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)                                        // 127\n                                                                                                      // 128",
+                "                                                                                              // 151\n    Roles.setUserRoles(userId, 'admin')                                                               // 152\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')                                       // 153\n    Roles.setUserRoles([user1, user2], ['user','editor'])                                             // 154\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')           // 155\n    Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)                                           // 156\n                                                                                                      // 157",
+                "                                                                                              // 180\n    Roles.removeUsersFromRoles(users.bob, 'admin')                                                    // 181\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])                                    // 182\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])                            // 183\n    Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')                                         // 184\n                                                                                                      // 185",
+                "                                                                                              // 260\n    // non-group usage                                                                                // 261\n    Roles.userIsInRole(user, 'admin')                                                                 // 262\n    Roles.userIsInRole(user, ['admin','editor'])                                                      // 263\n    Roles.userIsInRole(userId, 'admin')                                                               // 264\n    Roles.userIsInRole(userId, ['admin','editor'])                                                    // 265\n                                                                                                      // 266\n    // per-group usage                                                                                // 267\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')                                          // 268\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')                                          // 269\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)                                // 270\n                                                                                                      // 271\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP                              // 272\n    Roles.userIsInRole(user, 'admin')                                                                 // 273\n                                                                                                      // 274"
+            ],
+            "itemtype": "method",
+            "type": "String                                                                                          // 48",
+            "static": "// 49",
+            "final": "// 50\n/                                                                                                      // 51\n GLOBAL_GROUP: '__global_roles__',                                                                        // 52\n                                                                                                          // 53\n                                                                                                          // 54\n /**                                                                                                      // 55\nCreate a new role. Whitespace will be trimmed.                                                        // 56\n                                                                                                      // 57",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "Name of role                                                                     // 59",
+                    "type": "String"
+                },
+                {
+                    "name": "role",
+                    "description": "Name of role                                                                     // 93\n/                                                                                                      // 94\n deleteRole: function (role) {                                                                            // 95\n   if (!role) return                                                                                      // 96\n                                                                                                          // 97\n   var foundExistingUser = Meteor.users.findOne(                                                          // 98\n                             {roles: {$in: [role]}},                                                      // 99\n                             {fields: {_id: 1}})                                                          // 100\n                                                                                                          // 101\n   if (foundExistingUser) {                                                                               // 102\n     throw new Meteor.Error(403, 'Role in use')                                                           // 103\n   }                                                                                                      // 104\n                                                                                                          // 105\n   var thisRole = Meteor.roles.findOne({name: role})                                                      // 106\n   if (thisRole) {                                                                                        // 107\n     Meteor.roles.remove({_id: thisRole._id})                                                             // 108\n   }                                                                                                      // 109\n },                                                                                                       // 110\n                                                                                                          // 111\n /**                                                                                                      // 112\nAdd users to roles. Will create roles as needed.                                                      // 113\n                                                                                                      // 114\nNOTE: Mixing grouped and non-grouped roles for the same user                                          // 115\n      is not supported and will throw an error.                                                       // 116\n                                                                                                      // 117\nMakes 2 calls to database:                                                                            // 118\n 1. retrieve list of all existing roles                                                               // 119\n 2. update users' roles                                                                               // 120\n                                                                                                      // 121",
+                    "type": "String"
+                },
+                {
+                    "name": "users",
+                    "description": "User id(s) or object(s) with an _id field                                 // 130",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles/permissions to add users to                              // 131",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional group name. If supplied, roles will be                               // 132\n                        specific to that group.                                                       // 133\n                        Group names can not start with '$' or numbers.                                // 134\n                        Periods in names '.' are automatically converted                              // 135\n                        to underscores.                                                               // 136\n                        The special group Roles.GLOBAL_GROUP provides                                 // 137\n                        a convenient way to assign blanket roles/permissions                          // 138\n                        across all groups.  The roles/permissions in the                              // 139\n                        Roles.GLOBAL_GROUP group will be automatically                                // 140\n                        included in checks for any group.                                             // 141\n/                                                                                                      // 142\n addUsersToRoles: function (users, roles, group) {                                                        // 143\n   // use Template pattern to update user roles                                                           // 144\n   Roles._updateUserRoles(users, roles, group, Roles._update_$addToSet_fn)                                // 145\n },                                                                                                       // 146\n                                                                                                          // 147\n /**                                                                                                      // 148\nSet a users roles/permissions.                                                                        // 149\n                                                                                                      // 150",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "users",
+                    "description": "User id(s) or object(s) with an _id field                                 // 159",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles/permissions to add users to                              // 160",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional group name. If supplied, roles will be                               // 161\n                        specific to that group.                                                       // 162\n                        Group names can not start with '$'.                                           // 163\n                        Periods in names '.' are automatically converted                              // 164\n                        to underscores.                                                               // 165\n                        The special group Roles.GLOBAL_GROUP provides                                 // 166\n                        a convenient way to assign blanket roles/permissions                          // 167\n                        across all groups.  The roles/permissions in the                              // 168\n                        Roles.GLOBAL_GROUP group will be automatically                                // 169\n                        included in checks for any group.                                             // 170\n/                                                                                                      // 171\n setUserRoles: function (users, roles, group) {                                                           // 172\n   // use Template pattern to update user roles                                                           // 173\n   Roles._updateUserRoles(users, roles, group, Roles._update_$set_fn)                                     // 174\n },                                                                                                       // 175\n                                                                                                          // 176\n /**                                                                                                      // 177\nRemove users from roles                                                                               // 178\n                                                                                                      // 179",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "users",
+                    "description": "User id(s) or object(s) with an _id field                                 // 187",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles to add users to                                          // 188",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional. Group name. If supplied, only that                                  // 189\n                        group will have roles removed.                                                // 190\n/                                                                                                      // 191\n removeUsersFromRoles: function (users, roles, group) {                                                   // 192\n   var update                                                                                             // 193\n                                                                                                          // 194\n   if (!users) throw new Error (\"Missing 'users' param\")                                                  // 195\n   if (!roles) throw new Error (\"Missing 'roles' param\")                                                  // 196\n   if (group) {                                                                                           // 197\n     if ('string' !== typeof group)                                                                       // 198\n       throw new Error (\"Roles error: Invalid parameter 'group'. Expected 'string' type\")                 // 199\n     if ('$' === group[0])                                                                                // 200\n       throw new Error (\"Roles error: groups can not start with '$'\")                                     // 201\n                                                                                                          // 202\n     // convert any periods to underscores                                                                // 203\n     group = group.replace(/\\./g, '_')                                                                    // 204\n   }                                                                                                      // 205\n                                                                                                          // 206\n   // ensure arrays                                                                                       // 207\n   if (!_.isArray(users)) users = [users]                                                                 // 208\n   if (!_.isArray(roles)) roles = [roles]                                                                 // 209\n                                                                                                          // 210\n   // ensure users is an array of user ids                                                                // 211\n   users = _.reduce(users, function (memo, user) {                                                        // 212\n     var _id                                                                                              // 213\n     if ('string' === typeof user) {                                                                      // 214\n       memo.push(user)                                                                                    // 215\n     } else if ('object' === typeof user) {                                                               // 216\n       _id = user._id                                                                                     // 217\n       if ('string' === typeof _id) {                                                                     // 218\n         memo.push(_id)                                                                                   // 219\n       }                                                                                                  // 220\n     }                                                                                                    // 221\n     return memo                                                                                          // 222\n   }, [])                                                                                                 // 223\n                                                                                                          // 224\n   // update all users, remove from roles set                                                             // 225\n                                                                                                          // 226\n   if (group) {                                                                                           // 227\n     update = {$pullAll: {}}                                                                              // 228\n     update.$pullAll['roles.'+group] = roles                                                              // 229\n   } else {                                                                                               // 230\n     update = {$pullAll: {roles: roles}}                                                                  // 231\n   }                                                                                                      // 232\n                                                                                                          // 233\n   try {                                                                                                  // 234\n     if (Meteor.isClient) {                                                                               // 235\n       // Iterate over each user to fulfill Meteor's 'one update per ID' policy                           // 236\n       _.each(users, function (user) {                                                                    // 237\n         Meteor.users.update({_id:user}, update)                                                          // 238\n       })                                                                                                 // 239\n     } else {                                                                                             // 240\n       // On the server we can leverage MongoDB's $in operator for performance                            // 241\n       Meteor.users.update({_id:{$in:users}}, update, {multi: true})                                      // 242\n     }                                                                                                    // 243\n   }                                                                                                      // 244\n   catch (ex) {                                                                                           // 245\n     var removeNonGroupedRoleFromGroupMsg = 'Cannot apply $pull/$pullAll modifier to non-array'           // 246\n                                                                                                          // 247\n     if (ex.name === 'MongoError' &&                                                                      // 248\n         ex.err === removeNonGroupedRoleFromGroupMsg) {                                                   // 249\n       throw new Error (mixingGroupAndNonGroupErrorMsg)                                                   // 250\n     }                                                                                                    // 251\n                                                                                                          // 252\n     throw ex                                                                                             // 253\n   }                                                                                                      // 254\n },                                                                                                       // 255\n                                                                                                          // 256\n /**                                                                                                      // 257\nCheck if user has specified permissions/roles                                                         // 258\n                                                                                                      // 259",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "user",
+                    "description": "User Id or actual user object                                             // 276",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name of role/permission or Array of                                       // 277\n                           roles/permissions to check against.  If array,                             // 278\n                           will return true if user is in _any_ role.                                 // 279",
+                    "type": "String|Array"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional. Name of group.  If supplied, limits check                           // 280\n                        to just that group.                                                           // 281\n                        The user's Roles.GLOBAL_GROUP will always be checked                          // 282\n                        whether group is specified or not.                                            // 283",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "user",
+                    "description": "User Id or actual user object                                             // 373",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional name of group to restrict roles to.                                  // 374\n                        User's Roles.GLOBAL_GROUP will also be included.                              // 375",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "role",
+                    "description": "Name of role/permission.  If array, users                                  // 430\n                           returned will have at least one of the roles                               // 431\n                           specified but need not have _all_ roles.                                   // 432",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional name of group to restrict roles to.                                  // 433\n                        User's Roles.GLOBAL_GROUP will also be checked.                               // 434",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "user",
+                    "description": "User Id or actual user object                                             // 490",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "role",
+                    "description": "Optional name of roles to restrict groups to.                                  // 491\n                                                                                                      // 492",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "roles",
+                    "description": "// 540",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "// 541",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "roles",
+                    "description": "// 565",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "// 566",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "users",
+                    "description": "user id(s) or object(s) with an _id field                                 // 591",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "name(s) of roles/permissions to add users to                              // 592",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Group name. If not null or undefined, roles will be                             // 593\n                        specific to that group.                                                       // 594\n                        Group names can not start with '$'.                                           // 595\n                        Periods in names '.' are automatically converted                              // 596\n                        to underscores.                                                               // 597\n                        The special group Roles.GLOBAL_GROUP provides                                 // 598\n                        a convenient way to assign blanket roles/permissions                          // 599\n                        across all groups.  The roles/permissions in the                              // 600\n                        Roles.GLOBAL_GROUP group will be automatically                                // 601\n                        included in checks for any group.                                             // 602",
+                    "type": "String"
+                },
+                {
+                    "name": "updateFactory",
+                    "description": "Func which returns an update object that                              // 603\n                        will be passed to Mongo.                                                      // 604",
+                    "type": "Function"
+                },
+                {
+                    "name": "roles",
+                    "description": "// 605",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "// 606\n/                                                                                                      // 607\n _updateUserRoles: function (users, roles, group, updateFactory) {                                        // 608\n   if (!users) throw new Error (\"Missing 'users' param\")                                                  // 609\n   if (!roles) throw new Error (\"Missing 'roles' param\")                                                  // 610\n   if (group) {                                                                                           // 611\n     if ('string' !== typeof group)                                                                       // 612\n       throw new Error (\"Roles error: Invalid parameter 'group'. Expected 'string' type\")                 // 613\n     if ('$' === group[0])                                                                                // 614\n       throw new Error (\"Roles error: groups can not start with '$'\")                                     // 615\n                                                                                                          // 616\n     // convert any periods to underscores                                                                // 617\n     group = group.replace(/\\./g, '_')                                                                    // 618\n   }                                                                                                      // 619\n                                                                                                          // 620\n   var existingRoles,                                                                                     // 621\n       query,                                                                                             // 622\n       update                                                                                             // 623\n                                                                                                          // 624\n   // ensure arrays to simplify code                                                                      // 625\n   if (!_.isArray(users)) users = [users]                                                                 // 626\n   if (!_.isArray(roles)) roles = [roles]                                                                 // 627\n                                                                                                          // 628\n   // remove invalid roles                                                                                // 629\n   roles = _.reduce(roles, function (memo, role) {                                                        // 630\n     if (role                                                                                             // 631\n         && 'string' === typeof role                                                                      // 632\n         && role.trim().length > 0) {                                                                     // 633\n       memo.push(role.trim())                                                                             // 634\n     }                                                                                                    // 635\n     return memo                                                                                          // 636\n   }, [])                                                                                                 // 637\n                                                                                                          // 638\n   // empty roles array is ok, since it might be a $set operation to clear roles                          // 639\n   //if (roles.length === 0) return                                                                       // 640\n                                                                                                          // 641\n   // ensure all roles exist in 'roles' collection                                                        // 642\n   existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {                        // 643\n     memo[role.name] = true                                                                               // 644\n     return memo                                                                                          // 645\n   }, {})                                                                                                 // 646\n   _.each(roles, function (role) {                                                                        // 647\n     if (!existingRoles[role]) {                                                                          // 648\n       Roles.createRole(role)                                                                             // 649\n     }                                                                                                    // 650\n   })                                                                                                     // 651\n                                                                                                          // 652\n   // ensure users is an array of user ids                                                                // 653\n   users = _.reduce(users, function (memo, user) {                                                        // 654\n     var _id                                                                                              // 655\n     if ('string' === typeof user) {                                                                      // 656\n       memo.push(user)                                                                                    // 657\n     } else if ('object' === typeof user) {                                                               // 658\n       _id = user._id                                                                                     // 659\n       if ('string' === typeof _id) {                                                                     // 660\n         memo.push(_id)                                                                                   // 661\n       }                                                                                                  // 662\n     }                                                                                                    // 663\n     return memo                                                                                          // 664\n   }, [])                                                                                                 // 665\n                                                                                                          // 666\n   // update all users                                                                                    // 667\n   update = updateFactory(roles, group)                                                                   // 668\n                                                                                                          // 669\n   try {                                                                                                  // 670\n     if (Meteor.isClient) {                                                                               // 671\n       // On client, iterate over each user to fulfill Meteor's                                           // 672\n       // 'one update per ID' policy                                                                      // 673\n       _.each(users, function (user) {                                                                    // 674\n         Meteor.users.update({_id: user}, update)                                                         // 675\n       })                                                                                                 // 676\n     } else {                                                                                             // 677\n       // On the server we can use MongoDB's $in operator for                                             // 678\n       // better performance                                                                              // 679\n       Meteor.users.update(                                                                               // 680\n         {_id: {$in: users}},                                                                             // 681\n         update,                                                                                          // 682\n         {multi: true})                                                                                   // 683\n     }                                                                                                    // 684\n   }                                                                                                      // 685\n   catch (ex) {                                                                                           // 686\n     var addNonGroupToGroupedRolesMsg = 'Cannot apply $addToSet modifier to non-array',                   // 687\n         addGrouped2NonGroupedMsg = \"can't append to array using string field name\"                       // 688\n                                                                                                          // 689\n     if (ex.name === 'MongoError' &&                                                                      // 690\n         (ex.err === addNonGroupToGroupedRolesMsg ||                                                      // 691\n          ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {                                        // 692\n       throw new Error (mixingGroupAndNonGroupErrorMsg)                                                   // 693\n     }                                                                                                    // 694\n                                                                                                          // 695\n     throw ex                                                                                             // 696\n   }                                                                                                      // 697\n }  // end _updateUserRoles                                                                               // 698\n                                                                                                          // 699\n})  // end _.extend(Roles ...)                                                                             // 700\n                                                                                                          // 701\n}());                                                                                                      // 702\n                                                                                                          // 703\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);",
+                    "type": "String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "update object for use in MongoDB update command                                      // 567\n/                                                                                                      // 568\n _update_$addToSet_fn: function (roles, group) {                                                          // 569\n   var update = {}                                                                                        // 570\n                                                                                                          // 571\n   if (group) {                                                                                           // 572\n     // roles is a key/value dict object                                                                  // 573\n     update.$addToSet = {}                                                                                // 574\n     update.$addToSet['roles.' + group] = {$each: roles}                                                  // 575\n   } else {                                                                                               // 576\n     // roles is an array of strings                                                                      // 577\n     update.$addToSet = {roles: {$each: roles}}                                                           // 578\n   }                                                                                                      // 579\n                                                                                                          // 580\n   return update                                                                                          // 581\n },  // end _update_$addToSet_fn                                                                          // 582\n                                                                                                          // 583\n                                                                                                          // 584\n /**                                                                                                      // 585\nInternal function that users the Template pattern to adds or sets roles                               // 586\nfor users.                                                                                            // 587\n                                                                                                      // 588",
+                "type": "Object"
+            },
+            "access": "protected",
+            "tagname": "// 590"
+        },
+        "Roles                                                                                                   // 6\n/                                                                                                                // 7\n                                                                                                                  // 8\n/**                                                                                                                // 9\nRoles collection documents consist only of an id and a role name.                                               // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             // 11\n/                                                                                                                // 12\nif (!Meteor.roles) {                                                                                               // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    // 14\n}                                                                                                                  // 15\n                                                                                                                  // 16\n/**                                                                                                                // 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      // 18\n                                                                                                                // 19\nStores user's current roles in a 'roles' field on the user object.                                              // 20\n                                                                                                                // 21": {
+            "name": "Roles                                                                                                   // 6\n/                                                                                                                // 7\n                                                                                                                  // 8\n/**                                                                                                                // 9\nRoles collection documents consist only of an id and a role name.                                               // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             // 11\n/                                                                                                                // 12\nif (!Meteor.roles) {                                                                                               // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    // 14\n}                                                                                                                  // 15\n                                                                                                                  // 16\n/**                                                                                                                // 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      // 18\n                                                                                                                // 19\nStores user's current roles in a 'roles' field on the user object.                                              // 20\n                                                                                                                // 21",
+            "submodules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {},
+            "tag": "module",
+            "file": "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js",
+            "line": 11,
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5",
+            "is_constructor": 1,
+            "example": [
+                "                                                                                                      // 39\n    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)                                                  // 40\n    Roles.userIsInRole(user, 'admin') // => true                                                              // 41\n                                                                                                              // 42\n    Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)                                             // 43\n    Roles.userIsInRole(user, 'support-staff') // => true                                                      // 44\n    Roles.userIsInRole(user, 'admin') // => false                                                             // 45\n                                                                                                              // 46",
+                "                                                                                                      // 122\n    Roles.addUsersToRoles(userId, 'admin')                                                                    // 123\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')                                            // 124\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])                                                  // 125\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')                // 126\n    Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)                                                // 127\n                                                                                                              // 128",
+                "                                                                                                      // 151\n    Roles.setUserRoles(userId, 'admin')                                                                       // 152\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')                                               // 153\n    Roles.setUserRoles([user1, user2], ['user','editor'])                                                     // 154\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')                   // 155\n    Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)                                                   // 156\n                                                                                                              // 157",
+                "                                                                                                      // 180\n    Roles.removeUsersFromRoles(users.bob, 'admin')                                                            // 181\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])                                            // 182\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])                                    // 183\n    Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')                                                 // 184\n                                                                                                              // 185",
+                "                                                                                                      // 260\n    // non-group usage                                                                                        // 261\n    Roles.userIsInRole(user, 'admin')                                                                         // 262\n    Roles.userIsInRole(user, ['admin','editor'])                                                              // 263\n    Roles.userIsInRole(userId, 'admin')                                                                       // 264\n    Roles.userIsInRole(userId, ['admin','editor'])                                                            // 265\n                                                                                                              // 266\n    // per-group usage                                                                                        // 267\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')                                                  // 268\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')                                                  // 269\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)                                        // 270\n                                                                                                              // 271\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP                                      // 272\n    Roles.userIsInRole(user, 'admin')                                                                         // 273\n                                                                                                              // 274",
+                "                                                                                                      // 27\n    {{#if isInRole 'admin'}}                                                                                  // 28\n    {{/if}}                                                                                                   // 29\n                                                                                                              // 30\n    {{#if isInRole 'editor,user'}}                                                                            // 31\n    {{/if}}                                                                                                   // 32\n                                                                                                              // 33\n    {{#if isInRole 'editor,user' 'group1'}}                                                                   // 34\n    {{/if}}                                                                                                   // 35\n                                                                                                              // 36"
+            ],
+            "itemtype": "method",
+            "type": "String                                                                                                  // 48",
+            "static": "// 41",
+            "final": "// 50\n/                                                                                                              // 51\n GLOBAL_GROUP: '__global_roles__',                                                                                // 52\n                                                                                                                  // 53\n                                                                                                                  // 54\n /**                                                                                                              // 55\nCreate a new role. Whitespace will be trimmed.                                                                // 56\n                                                                                                              // 57",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "Name of role                                                                             // 59",
+                    "type": "String"
+                },
+                {
+                    "name": "role",
+                    "description": "Name of role                                                                             // 93\n/                                                                                                              // 94\n deleteRole: function (role) {                                                                                    // 95\n   if (!role) return                                                                                              // 96\n                                                                                                                  // 97\n   var foundExistingUser = Meteor.users.findOne(                                                                  // 98\n                             {roles: {$in: [role]}},                                                              // 99\n                             {fields: {_id: 1}})                                                                  // 100\n                                                                                                                  // 101\n   if (foundExistingUser) {                                                                                       // 102\n     throw new Meteor.Error(403, 'Role in use')                                                                   // 103\n   }                                                                                                              // 104\n                                                                                                                  // 105\n   var thisRole = Meteor.roles.findOne({name: role})                                                              // 106\n   if (thisRole) {                                                                                                // 107\n     Meteor.roles.remove({_id: thisRole._id})                                                                     // 108\n   }                                                                                                              // 109\n },                                                                                                               // 110\n                                                                                                                  // 111\n /**                                                                                                              // 112\nAdd users to roles. Will create roles as needed.                                                              // 113\n                                                                                                              // 114\nNOTE: Mixing grouped and non-grouped roles for the same user                                                  // 115\n      is not supported and will throw an error.                                                               // 116\n                                                                                                              // 117\nMakes 2 calls to database:                                                                                    // 118\n 1. retrieve list of all existing roles                                                                       // 119\n 2. update users' roles                                                                                       // 120\n                                                                                                              // 121",
+                    "type": "String"
+                },
+                {
+                    "name": "users",
+                    "description": "User id(s) or object(s) with an _id field                                         // 130",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles/permissions to add users to                                      // 131",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional group name. If supplied, roles will be                                       // 132\n                        specific to that group.                                                               // 133\n                        Group names can not start with '$' or numbers.                                        // 134\n                        Periods in names '.' are automatically converted                                      // 135\n                        to underscores.                                                                       // 136\n                        The special group Roles.GLOBAL_GROUP provides                                         // 137\n                        a convenient way to assign blanket roles/permissions                                  // 138\n                        across all groups.  The roles/permissions in the                                      // 139\n                        Roles.GLOBAL_GROUP group will be automatically                                        // 140\n                        included in checks for any group.                                                     // 141\n/                                                                                                              // 142\n addUsersToRoles: function (users, roles, group) {                                                                // 143\n   // use Template pattern to update user roles                                                                   // 144\n   Roles._updateUserRoles(users, roles, group, Roles._update_$addToSet_fn)                                        // 145\n },                                                                                                               // 146\n                                                                                                                  // 147\n /**                                                                                                              // 148\nSet a users roles/permissions.                                                                                // 149\n                                                                                                              // 150",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "users",
+                    "description": "User id(s) or object(s) with an _id field                                         // 159",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles/permissions to add users to                                      // 160",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional group name. If supplied, roles will be                                       // 161\n                        specific to that group.                                                               // 162\n                        Group names can not start with '$'.                                                   // 163\n                        Periods in names '.' are automatically converted                                      // 164\n                        to underscores.                                                                       // 165\n                        The special group Roles.GLOBAL_GROUP provides                                         // 166\n                        a convenient way to assign blanket roles/permissions                                  // 167\n                        across all groups.  The roles/permissions in the                                      // 168\n                        Roles.GLOBAL_GROUP group will be automatically                                        // 169\n                        included in checks for any group.                                                     // 170\n/                                                                                                              // 171\n setUserRoles: function (users, roles, group) {                                                                   // 172\n   // use Template pattern to update user roles                                                                   // 173\n   Roles._updateUserRoles(users, roles, group, Roles._update_$set_fn)                                             // 174\n },                                                                                                               // 175\n                                                                                                                  // 176\n /**                                                                                                              // 177\nRemove users from roles                                                                                       // 178\n                                                                                                              // 179",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "users",
+                    "description": "User id(s) or object(s) with an _id field                                         // 187",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles to add users to                                                  // 188",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional. Group name. If supplied, only that                                          // 189\n                        group will have roles removed.                                                        // 190\n/                                                                                                              // 191\n removeUsersFromRoles: function (users, roles, group) {                                                           // 192\n   var update                                                                                                     // 193\n                                                                                                                  // 194\n   if (!users) throw new Error (\"Missing 'users' param\")                                                          // 195\n   if (!roles) throw new Error (\"Missing 'roles' param\")                                                          // 196\n   if (group) {                                                                                                   // 197\n     if ('string' !== typeof group)                                                                               // 198\n       throw new Error (\"Roles error: Invalid parameter 'group'. Expected 'string' type\")                         // 199\n     if ('$' === group[0])                                                                                        // 200\n       throw new Error (\"Roles error: groups can not start with '$'\")                                             // 201\n                                                                                                                  // 202\n     // convert any periods to underscores                                                                        // 203\n     group = group.replace(/\\./g, '_')                                                                            // 204\n   }                                                                                                              // 205\n                                                                                                                  // 206\n   // ensure arrays                                                                                               // 207\n   if (!_.isArray(users)) users = [users]                                                                         // 208\n   if (!_.isArray(roles)) roles = [roles]                                                                         // 209\n                                                                                                                  // 210\n   // ensure users is an array of user ids                                                                        // 211\n   users = _.reduce(users, function (memo, user) {                                                                // 212\n     var _id                                                                                                      // 213\n     if ('string' === typeof user) {                                                                              // 214\n       memo.push(user)                                                                                            // 215\n     } else if ('object' === typeof user) {                                                                       // 216\n       _id = user._id                                                                                             // 217\n       if ('string' === typeof _id) {                                                                             // 218\n         memo.push(_id)                                                                                           // 219\n       }                                                                                                          // 220\n     }                                                                                                            // 221\n     return memo                                                                                                  // 222\n   }, [])                                                                                                         // 223\n                                                                                                                  // 224\n   // update all users, remove from roles set                                                                     // 225\n                                                                                                                  // 226\n   if (group) {                                                                                                   // 227\n     update = {$pullAll: {}}                                                                                      // 228\n     update.$pullAll['roles.'+group] = roles                                                                      // 229\n   } else {                                                                                                       // 230\n     update = {$pullAll: {roles: roles}}                                                                          // 231\n   }                                                                                                              // 232\n                                                                                                                  // 233\n   try {                                                                                                          // 234\n     if (Meteor.isClient) {                                                                                       // 235\n       // Iterate over each user to fulfill Meteor's 'one update per ID' policy                                   // 236\n       _.each(users, function (user) {                                                                            // 237\n         Meteor.users.update({_id:user}, update)                                                                  // 238\n       })                                                                                                         // 239\n     } else {                                                                                                     // 240\n       // On the server we can leverage MongoDB's $in operator for performance                                    // 241\n       Meteor.users.update({_id:{$in:users}}, update, {multi: true})                                              // 242\n     }                                                                                                            // 243\n   }                                                                                                              // 244\n   catch (ex) {                                                                                                   // 245\n     var removeNonGroupedRoleFromGroupMsg = 'Cannot apply $pull/$pullAll modifier to non-array'                   // 246\n                                                                                                                  // 247\n     if (ex.name === 'MongoError' &&                                                                              // 248\n         ex.err === removeNonGroupedRoleFromGroupMsg) {                                                           // 249\n       throw new Error (mixingGroupAndNonGroupErrorMsg)                                                           // 250\n     }                                                                                                            // 251\n                                                                                                                  // 252\n     throw ex                                                                                                     // 253\n   }                                                                                                              // 254\n },                                                                                                               // 255\n                                                                                                                  // 256\n /**                                                                                                              // 257\nCheck if user has specified permissions/roles                                                                 // 258\n                                                                                                              // 259",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "user",
+                    "description": "User Id or actual user object                                                     // 276",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name of role/permission or Array of                                               // 277\n                           roles/permissions to check against.  If array,                                     // 278\n                           will return true if user is in _any_ role.                                         // 279",
+                    "type": "String|Array"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional. Name of group.  If supplied, limits check                                   // 280\n                        to just that group.                                                                   // 281\n                        The user's Roles.GLOBAL_GROUP will always be checked                                  // 282\n                        whether group is specified or not.                                                    // 283",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "user",
+                    "description": "User Id or actual user object                                                     // 373",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional name of group to restrict roles to.                                          // 374\n                        User's Roles.GLOBAL_GROUP will also be included.                                      // 375",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "role",
+                    "description": "Name of role/permission.  If array, users                                          // 430\n                           returned will have at least one of the roles                                       // 431\n                           specified but need not have _all_ roles.                                           // 432",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional name of group to restrict roles to.                                          // 433\n                        User's Roles.GLOBAL_GROUP will also be checked.                                       // 434",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "user",
+                    "description": "User Id or actual user object                                                     // 490",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "role",
+                    "description": "Optional name of roles to restrict groups to.                                          // 491\n                                                                                                              // 492",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "roles",
+                    "description": "// 540",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "// 541",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "roles",
+                    "description": "// 565",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "// 566",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "users",
+                    "description": "user id(s) or object(s) with an _id field                                         // 591",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "name(s) of roles/permissions to add users to                                      // 592",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "group",
+                    "description": "Group name. If not null or undefined, roles will be                                     // 593\n                        specific to that group.                                                               // 594\n                        Group names can not start with '$'.                                                   // 595\n                        Periods in names '.' are automatically converted                                      // 596\n                        to underscores.                                                                       // 597\n                        The special group Roles.GLOBAL_GROUP provides                                         // 598\n                        a convenient way to assign blanket roles/permissions                                  // 599\n                        across all groups.  The roles/permissions in the                                      // 600\n                        Roles.GLOBAL_GROUP group will be automatically                                        // 601\n                        included in checks for any group.                                                     // 602",
+                    "type": "String"
+                },
+                {
+                    "name": "updateFactory",
+                    "description": "Func which returns an update object that                                      // 603\n                        will be passed to Mongo.                                                              // 604",
+                    "type": "Function"
+                },
+                {
+                    "name": "roles",
+                    "description": "// 605",
+                    "type": "Array"
+                },
+                {
+                    "name": "group",
+                    "description": "// 606\n/                                                                                                              // 607\n _updateUserRoles: function (users, roles, group, updateFactory) {                                                // 608\n   if (!users) throw new Error (\"Missing 'users' param\")                                                          // 609\n   if (!roles) throw new Error (\"Missing 'roles' param\")                                                          // 610\n   if (group) {                                                                                                   // 611\n     if ('string' !== typeof group)                                                                               // 612\n       throw new Error (\"Roles error: Invalid parameter 'group'. Expected 'string' type\")                         // 613\n     if ('$' === group[0])                                                                                        // 614\n       throw new Error (\"Roles error: groups can not start with '$'\")                                             // 615\n                                                                                                                  // 616\n     // convert any periods to underscores                                                                        // 617\n     group = group.replace(/\\./g, '_')                                                                            // 618\n   }                                                                                                              // 619\n                                                                                                                  // 620\n   var existingRoles,                                                                                             // 621\n       query,                                                                                                     // 622\n       update                                                                                                     // 623\n                                                                                                                  // 624\n   // ensure arrays to simplify code                                                                              // 625\n   if (!_.isArray(users)) users = [users]                                                                         // 626\n   if (!_.isArray(roles)) roles = [roles]                                                                         // 627\n                                                                                                                  // 628\n   // remove invalid roles                                                                                        // 629\n   roles = _.reduce(roles, function (memo, role) {                                                                // 630\n     if (role                                                                                                     // 631\n         && 'string' === typeof role                                                                              // 632\n         && role.trim().length > 0) {                                                                             // 633\n       memo.push(role.trim())                                                                                     // 634\n     }                                                                                                            // 635\n     return memo                                                                                                  // 636\n   }, [])                                                                                                         // 637\n                                                                                                                  // 638\n   // empty roles array is ok, since it might be a $set operation to clear roles                                  // 639\n   //if (roles.length === 0) return                                                                               // 640\n                                                                                                                  // 641\n   // ensure all roles exist in 'roles' collection                                                                // 642\n   existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {                                // 643\n     memo[role.name] = true                                                                                       // 644\n     return memo                                                                                                  // 645\n   }, {})                                                                                                         // 646\n   _.each(roles, function (role) {                                                                                // 647\n     if (!existingRoles[role]) {                                                                                  // 648\n       Roles.createRole(role)                                                                                     // 649\n     }                                                                                                            // 650\n   })                                                                                                             // 651\n                                                                                                                  // 652\n   // ensure users is an array of user ids                                                                        // 653\n   users = _.reduce(users, function (memo, user) {                                                                // 654\n     var _id                                                                                                      // 655\n     if ('string' === typeof user) {                                                                              // 656\n       memo.push(user)                                                                                            // 657\n     } else if ('object' === typeof user) {                                                                       // 658\n       _id = user._id                                                                                             // 659\n       if ('string' === typeof _id) {                                                                             // 660\n         memo.push(_id)                                                                                           // 661\n       }                                                                                                          // 662\n     }                                                                                                            // 663\n     return memo                                                                                                  // 664\n   }, [])                                                                                                         // 665\n                                                                                                                  // 666\n   // update all users                                                                                            // 667\n   update = updateFactory(roles, group)                                                                           // 668\n                                                                                                                  // 669\n   try {                                                                                                          // 670\n     if (Meteor.isClient) {                                                                                       // 671\n       // On client, iterate over each user to fulfill Meteor's                                                   // 672\n       // 'one update per ID' policy                                                                              // 673\n       _.each(users, function (user) {                                                                            // 674\n         Meteor.users.update({_id: user}, update)                                                                 // 675\n       })                                                                                                         // 676\n     } else {                                                                                                     // 677\n       // On the server we can use MongoDB's $in operator for                                                     // 678\n       // better performance                                                                                      // 679\n       Meteor.users.update(                                                                                       // 680\n         {_id: {$in: users}},                                                                                     // 681\n         update,                                                                                                  // 682\n         {multi: true})                                                                                           // 683\n     }                                                                                                            // 684\n   }                                                                                                              // 685\n   catch (ex) {                                                                                                   // 686\n     var addNonGroupToGroupedRolesMsg = 'Cannot apply $addToSet modifier to non-array',                           // 687\n         addGrouped2NonGroupedMsg = \"can't append to array using string field name\"                               // 688\n                                                                                                                  // 689\n     if (ex.name === 'MongoError' &&                                                                              // 690\n         (ex.err === addNonGroupToGroupedRolesMsg ||                                                              // 691\n          ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {                                                // 692\n       throw new Error (mixingGroupAndNonGroupErrorMsg)                                                           // 693\n     }                                                                                                            // 694\n                                                                                                                  // 695\n     throw ex                                                                                                     // 696\n   }                                                                                                              // 697\n }  // end _updateUserRoles                                                                                       // 698\n                                                                                                                  // 699\n})  // end _.extend(Roles ...)                                                                                     // 700\n                                                                                                                  // 701\n}());                                                                                                              // 702\n                                                                                                                  // 703\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);\n\n\n\n\n\n\n(function () {\n\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n//                                                                                                                 //\n// packages/alanning:roles/roles_client.js                                                                         //\n//                                                                                                                 //\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n                                                                                                                  //\n;(function () {                                                                                                    // 1\n                                                                                                                  // 2\n/**                                                                                                                // 3\nConvenience functions for use on client.                                                                        // 4\n                                                                                                                // 5\nNOTE: You must restrict user actions on the server-side; any                                                    // 6\nclient-side checks are strictly for convenience and must not be                                                 // 7\ntrusted.                                                                                                        // 8\n                                                                                                                // 9",
+                    "type": "String",
+                    "optional": true
+                },
+                {
+                    "name": "role",
+                    "description": "Name of role or comma-seperated list of roles                                            // 38",
+                    "type": "String"
+                },
+                {
+                    "name": "group",
+                    "description": "Optional, name of group to check                                                      // 39",
+                    "type": "String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "true if current user is in at least one of the target roles                                 // 40",
+                "type": "Boolean"
+            },
+            "access": "protected",
+            "tagname": "// 590"
+        },
+        "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26": {
+            "name": "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26",
+            "submodules": {
+                "undefined": 1
+            },
+            "classes": {
+                "Roles                                                                                                    // 22": 1,
+                "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": 1
+            },
+            "fors": {
+                "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": 1
+            },
+            "namespaces": {},
+            "tag": "module",
+            "file": "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js",
+            "line": 11,
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5"
+        },
         "UIHelpers": {
             "name": "UIHelpers",
             "submodules": {},
@@ -66,6 +514,45 @@
         }
     },
     "classes": {
+        "Roles                                                                                            // 22": {
+            "name": "Roles                                                                                            // 22",
+            "shortname": "Roles                                                                                            // 22",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21",
+            "namespace": "",
+            "file": "roles/.build.alanning:roles/os/packages/alanning:roles.js",
+            "line": 12,
+            "description": "Roles collection documents consist only of an id and a role name.                                       // 5\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 6\n/                                                                                                        // 7\nif (!Meteor.roles) {                                                                                       // 8\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 9\n                                                                                                          // 10\n // Create default indexes for roles collection                                                           // 11\n Meteor.roles._ensureIndex('name', {unique: 1})                                                           // 12\n}                                                                                                          // 13\n                                                                                                          // 14\n                                                                                                          // 15\n/**                                                                                                        // 16\nAlways publish logged-in user's roles so client-side                                                    // 17\nchecks can work.                                                                                        // 18\n/                                                                                                        // 19\nMeteor.publish(null, function () {                                                                         // 20\n var userId = this.userId,                                                                                // 21\n     fields = {roles:1}                                                                                   // 22\n                                                                                                          // 23\n return Meteor.users.find({_id:userId}, {fields: fields})                                                 // 24\n})                                                                                                         // 25\n                                                                                                          // 26\n}());                                                                                                      // 27\n                                                                                                          // 28\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);\n\n\n\n\n\n\n(function () {\n\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n//                                                                                                         //\n// packages/alanning:roles/roles_common.js                                                                 //\n//                                                                                                         //\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n                                                                                                          //\n;(function () {                                                                                            // 1\n                                                                                                          // 2\n/**                                                                                                        // 3\nProvides functions related to user authorization. Compatible with built-in Meteor accounts packages.    // 4\n                                                                                                        // 5"
+        },
+        "Roles                                                                                                    // 22": {
+            "name": "Roles                                                                                                    // 22",
+            "shortname": "Roles                                                                                                    // 22",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26",
+            "namespace": "",
+            "file": "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js",
+            "line": 11,
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5"
+        },
+        "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": {
+            "name": "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);",
+            "shortname": "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26",
+            "namespace": ""
+        },
         "UIHelpers": {
             "name": "UIHelpers",
             "shortname": "UIHelpers",
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
index b8e35bbad8..d4edd73bdb 100644
--- a/docs/files/roles_roles_client.js.html
+++ b/docs/files/roles_roles_client.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.11</em>
+            <em>API Docs for: v1.2.12</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,16 +43,212 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
+            
+                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
+            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../classes/UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);.html">UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/Roles                                                                                                   __ 6
+_                                                                                                                __ 7
+                                                                                                                  __ 8
+_**                                                                                                                __ 9
+Roles collection documents consist only of an id and a role name.                                               __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
+_                                                                                                                __ 12
+if (!Meteor.roles) {                                                                                               __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
+}                                                                                                                  __ 15
+                                                                                                                  __ 16
+_**                                                                                                                __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
+                                                                                                                __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
+                                                                                                                __ 21.html">Roles                                                                                                   // 6
+/                                                                                                                // 7
+                                                                                                                  // 8
+/**                                                                                                                // 9
+Roles collection documents consist only of an id and a role name.                                               // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
+/                                                                                                                // 12
+if (!Meteor.roles) {                                                                                               // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
+}                                                                                                                  // 15
+                                                                                                                  // 16
+/**                                                                                                                // 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
+                                                                                                                // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
+                                                                                                                // 21</a></li>
+            
+                <li><a href="../modules/Roles                                                                                           __ 6
+_                                                                                                        __ 7
+                                                                                                          __ 8
+_**                                                                                                        __ 9
+Roles collection documents consist only of an id and a role name.                                       __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
+_                                                                                                        __ 12
+if (!Meteor.roles) {                                                                                       __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
+}                                                                                                          __ 15
+                                                                                                          __ 16
+_**                                                                                                        __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
+                                                                                                        __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
+                                                                                                        __ 21.html">Roles                                                                                           // 6
+/                                                                                                        // 7
+                                                                                                          // 8
+/**                                                                                                        // 9
+Roles collection documents consist only of an id and a role name.                                       // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
+/                                                                                                        // 12
+if (!Meteor.roles) {                                                                                       // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
+}                                                                                                          // 15
+                                                                                                          // 16
+/**                                                                                                        // 17
+Role-based authorization compatible with built-in Meteor accounts package.                              // 18
+                                                                                                        // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
+                                                                                                        // 21</a></li>
+            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../modules/UIHelpers                                                                                               __ 10
+_                                                                                                                __ 11
+                                                                                                                  __ 12
+____________________________________________________________                                                       __ 13
+__ UI helpers                                                                                                      __ 14
+__                                                                                                                 __ 15
+__ Use a semi-private variable rather than declaring UI                                                            __ 16
+__ helpers directly so that we can unit test the helpers.                                                          __ 17
+__ XXX For some reason, the UI helpers are not registered                                                          __ 18
+__ before the tests run.                                                                                           __ 19
+__                                                                                                                 __ 20
+Roles._uiHelpers = {                                                                                               __ 21
+                                                                                                                  __ 22
+ _**                                                                                                              __ 23
+UI helper to check if current user is in at least one                                                         __ 24
+of the target roles.  For use in client-side templates.                                                       __ 25
+                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
+/                                                                                                                // 11
+                                                                                                                  // 12
+////////////////////////////////////////////////////////////                                                       // 13
+// UI helpers                                                                                                      // 14
+//                                                                                                                 // 15
+// Use a semi-private variable rather than declaring UI                                                            // 16
+// helpers directly so that we can unit test the helpers.                                                          // 17
+// XXX For some reason, the UI helpers are not registered                                                          // 18
+// before the tests run.                                                                                           // 19
+//                                                                                                                 // 20
+Roles._uiHelpers = {                                                                                               // 21
+                                                                                                                  // 22
+ /**                                                                                                              // 23
+UI helper to check if current user is in at least one                                                         // 24
+of the target roles.  For use in client-side templates.                                                       // 25
+                                                                                                              // 26</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 10d971a537..ccdf17fe0d 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.11</em>
+            <em>API Docs for: v1.2.12</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,16 +43,212 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
+            
+                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
+            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../classes/UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);.html">UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/Roles                                                                                                   __ 6
+_                                                                                                                __ 7
+                                                                                                                  __ 8
+_**                                                                                                                __ 9
+Roles collection documents consist only of an id and a role name.                                               __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
+_                                                                                                                __ 12
+if (!Meteor.roles) {                                                                                               __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
+}                                                                                                                  __ 15
+                                                                                                                  __ 16
+_**                                                                                                                __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
+                                                                                                                __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
+                                                                                                                __ 21.html">Roles                                                                                                   // 6
+/                                                                                                                // 7
+                                                                                                                  // 8
+/**                                                                                                                // 9
+Roles collection documents consist only of an id and a role name.                                               // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
+/                                                                                                                // 12
+if (!Meteor.roles) {                                                                                               // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
+}                                                                                                                  // 15
+                                                                                                                  // 16
+/**                                                                                                                // 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
+                                                                                                                // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
+                                                                                                                // 21</a></li>
+            
+                <li><a href="../modules/Roles                                                                                           __ 6
+_                                                                                                        __ 7
+                                                                                                          __ 8
+_**                                                                                                        __ 9
+Roles collection documents consist only of an id and a role name.                                       __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
+_                                                                                                        __ 12
+if (!Meteor.roles) {                                                                                       __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
+}                                                                                                          __ 15
+                                                                                                          __ 16
+_**                                                                                                        __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
+                                                                                                        __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
+                                                                                                        __ 21.html">Roles                                                                                           // 6
+/                                                                                                        // 7
+                                                                                                          // 8
+/**                                                                                                        // 9
+Roles collection documents consist only of an id and a role name.                                       // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
+/                                                                                                        // 12
+if (!Meteor.roles) {                                                                                       // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
+}                                                                                                          // 15
+                                                                                                          // 16
+/**                                                                                                        // 17
+Role-based authorization compatible with built-in Meteor accounts package.                              // 18
+                                                                                                        // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
+                                                                                                        // 21</a></li>
+            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../modules/UIHelpers                                                                                               __ 10
+_                                                                                                                __ 11
+                                                                                                                  __ 12
+____________________________________________________________                                                       __ 13
+__ UI helpers                                                                                                      __ 14
+__                                                                                                                 __ 15
+__ Use a semi-private variable rather than declaring UI                                                            __ 16
+__ helpers directly so that we can unit test the helpers.                                                          __ 17
+__ XXX For some reason, the UI helpers are not registered                                                          __ 18
+__ before the tests run.                                                                                           __ 19
+__                                                                                                                 __ 20
+Roles._uiHelpers = {                                                                                               __ 21
+                                                                                                                  __ 22
+ _**                                                                                                              __ 23
+UI helper to check if current user is in at least one                                                         __ 24
+of the target roles.  For use in client-side templates.                                                       __ 25
+                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
+/                                                                                                                // 11
+                                                                                                                  // 12
+////////////////////////////////////////////////////////////                                                       // 13
+// UI helpers                                                                                                      // 14
+//                                                                                                                 // 15
+// Use a semi-private variable rather than declaring UI                                                            // 16
+// helpers directly so that we can unit test the helpers.                                                          // 17
+// XXX For some reason, the UI helpers are not registered                                                          // 18
+// before the tests run.                                                                                           // 19
+//                                                                                                                 // 20
+Roles._uiHelpers = {                                                                                               // 21
+                                                                                                                  // 22
+ /**                                                                                                              // 23
+UI helper to check if current user is in at least one                                                         // 24
+of the target roles.  For use in client-side templates.                                                       // 25
+                                                                                                              // 26</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index bd19f891e7..aec7958d03 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.11</em>
+            <em>API Docs for: v1.2.12</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,16 +43,212 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
+            
+                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
+            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../classes/UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);.html">UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/Roles                                                                                                   __ 6
+_                                                                                                                __ 7
+                                                                                                                  __ 8
+_**                                                                                                                __ 9
+Roles collection documents consist only of an id and a role name.                                               __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
+_                                                                                                                __ 12
+if (!Meteor.roles) {                                                                                               __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
+}                                                                                                                  __ 15
+                                                                                                                  __ 16
+_**                                                                                                                __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
+                                                                                                                __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
+                                                                                                                __ 21.html">Roles                                                                                                   // 6
+/                                                                                                                // 7
+                                                                                                                  // 8
+/**                                                                                                                // 9
+Roles collection documents consist only of an id and a role name.                                               // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
+/                                                                                                                // 12
+if (!Meteor.roles) {                                                                                               // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
+}                                                                                                                  // 15
+                                                                                                                  // 16
+/**                                                                                                                // 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
+                                                                                                                // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
+                                                                                                                // 21</a></li>
+            
+                <li><a href="../modules/Roles                                                                                           __ 6
+_                                                                                                        __ 7
+                                                                                                          __ 8
+_**                                                                                                        __ 9
+Roles collection documents consist only of an id and a role name.                                       __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
+_                                                                                                        __ 12
+if (!Meteor.roles) {                                                                                       __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
+}                                                                                                          __ 15
+                                                                                                          __ 16
+_**                                                                                                        __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
+                                                                                                        __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
+                                                                                                        __ 21.html">Roles                                                                                           // 6
+/                                                                                                        // 7
+                                                                                                          // 8
+/**                                                                                                        // 9
+Roles collection documents consist only of an id and a role name.                                       // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
+/                                                                                                        // 12
+if (!Meteor.roles) {                                                                                       // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
+}                                                                                                          // 15
+                                                                                                          // 16
+/**                                                                                                        // 17
+Role-based authorization compatible with built-in Meteor accounts package.                              // 18
+                                                                                                        // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
+                                                                                                        // 21</a></li>
+            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../modules/UIHelpers                                                                                               __ 10
+_                                                                                                                __ 11
+                                                                                                                  __ 12
+____________________________________________________________                                                       __ 13
+__ UI helpers                                                                                                      __ 14
+__                                                                                                                 __ 15
+__ Use a semi-private variable rather than declaring UI                                                            __ 16
+__ helpers directly so that we can unit test the helpers.                                                          __ 17
+__ XXX For some reason, the UI helpers are not registered                                                          __ 18
+__ before the tests run.                                                                                           __ 19
+__                                                                                                                 __ 20
+Roles._uiHelpers = {                                                                                               __ 21
+                                                                                                                  __ 22
+ _**                                                                                                              __ 23
+UI helper to check if current user is in at least one                                                         __ 24
+of the target roles.  For use in client-side templates.                                                       __ 25
+                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
+/                                                                                                                // 11
+                                                                                                                  // 12
+////////////////////////////////////////////////////////////                                                       // 13
+// UI helpers                                                                                                      // 14
+//                                                                                                                 // 15
+// Use a semi-private variable rather than declaring UI                                                            // 16
+// helpers directly so that we can unit test the helpers.                                                          // 17
+// XXX For some reason, the UI helpers are not registered                                                          // 18
+// before the tests run.                                                                                           // 19
+//                                                                                                                 // 20
+Roles._uiHelpers = {                                                                                               // 21
+                                                                                                                  // 22
+ /**                                                                                                              // 23
+UI helper to check if current user is in at least one                                                         // 24
+of the target roles.  For use in client-side templates.                                                       // 25
+                                                                                                              // 26</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/index.html b/docs/index.html
index 19a864521e..1fc095e5c1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.11</em>
+            <em>API Docs for: v1.2.12</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,16 +43,212 @@
             
                 <li><a href="./classes/Roles.html">Roles</a></li>
             
+                <li><a href="./classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
+            
+                <li><a href="./classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
+            
                 <li><a href="./classes/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="./classes/UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);.html">UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="./modules/Roles.html">Roles</a></li>
             
+                <li><a href="./modules/Roles                                                                                                   __ 6
+_                                                                                                                __ 7
+                                                                                                                  __ 8
+_**                                                                                                                __ 9
+Roles collection documents consist only of an id and a role name.                                               __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
+_                                                                                                                __ 12
+if (!Meteor.roles) {                                                                                               __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
+}                                                                                                                  __ 15
+                                                                                                                  __ 16
+_**                                                                                                                __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
+                                                                                                                __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
+                                                                                                                __ 21.html">Roles                                                                                                   // 6
+/                                                                                                                // 7
+                                                                                                                  // 8
+/**                                                                                                                // 9
+Roles collection documents consist only of an id and a role name.                                               // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
+/                                                                                                                // 12
+if (!Meteor.roles) {                                                                                               // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
+}                                                                                                                  // 15
+                                                                                                                  // 16
+/**                                                                                                                // 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
+                                                                                                                // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
+                                                                                                                // 21</a></li>
+            
+                <li><a href="./modules/Roles                                                                                           __ 6
+_                                                                                                        __ 7
+                                                                                                          __ 8
+_**                                                                                                        __ 9
+Roles collection documents consist only of an id and a role name.                                       __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
+_                                                                                                        __ 12
+if (!Meteor.roles) {                                                                                       __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
+}                                                                                                          __ 15
+                                                                                                          __ 16
+_**                                                                                                        __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
+                                                                                                        __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
+                                                                                                        __ 21.html">Roles                                                                                           // 6
+/                                                                                                        // 7
+                                                                                                          // 8
+/**                                                                                                        // 9
+Roles collection documents consist only of an id and a role name.                                       // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
+/                                                                                                        // 12
+if (!Meteor.roles) {                                                                                       // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
+}                                                                                                          // 15
+                                                                                                          // 16
+/**                                                                                                        // 17
+Role-based authorization compatible with built-in Meteor accounts package.                              // 18
+                                                                                                        // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
+                                                                                                        // 21</a></li>
+            
                 <li><a href="./modules/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="./modules/UIHelpers                                                                                               __ 10
+_                                                                                                                __ 11
+                                                                                                                  __ 12
+____________________________________________________________                                                       __ 13
+__ UI helpers                                                                                                      __ 14
+__                                                                                                                 __ 15
+__ Use a semi-private variable rather than declaring UI                                                            __ 16
+__ helpers directly so that we can unit test the helpers.                                                          __ 17
+__ XXX For some reason, the UI helpers are not registered                                                          __ 18
+__ before the tests run.                                                                                           __ 19
+__                                                                                                                 __ 20
+Roles._uiHelpers = {                                                                                               __ 21
+                                                                                                                  __ 22
+ _**                                                                                                              __ 23
+UI helper to check if current user is in at least one                                                         __ 24
+of the target roles.  For use in client-side templates.                                                       __ 25
+                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
+/                                                                                                                // 11
+                                                                                                                  // 12
+////////////////////////////////////////////////////////////                                                       // 13
+// UI helpers                                                                                                      // 14
+//                                                                                                                 // 15
+// Use a semi-private variable rather than declaring UI                                                            // 16
+// helpers directly so that we can unit test the helpers.                                                          // 17
+// XXX For some reason, the UI helpers are not registered                                                          // 18
+// before the tests run.                                                                                           // 19
+//                                                                                                                 // 20
+Roles._uiHelpers = {                                                                                               // 21
+                                                                                                                  // 22
+ /**                                                                                                              // 23
+UI helper to check if current user is in at least one                                                         // 24
+of the target roles.  For use in client-side templates.                                                       // 25
+                                                                                                              // 26</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 74e97eec40..2ab0b4ae14 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.11</em>
+            <em>API Docs for: v1.2.12</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,16 +43,212 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
+            
+                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
+            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../classes/UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);.html">UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/Roles                                                                                                   __ 6
+_                                                                                                                __ 7
+                                                                                                                  __ 8
+_**                                                                                                                __ 9
+Roles collection documents consist only of an id and a role name.                                               __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
+_                                                                                                                __ 12
+if (!Meteor.roles) {                                                                                               __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
+}                                                                                                                  __ 15
+                                                                                                                  __ 16
+_**                                                                                                                __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
+                                                                                                                __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
+                                                                                                                __ 21.html">Roles                                                                                                   // 6
+/                                                                                                                // 7
+                                                                                                                  // 8
+/**                                                                                                                // 9
+Roles collection documents consist only of an id and a role name.                                               // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
+/                                                                                                                // 12
+if (!Meteor.roles) {                                                                                               // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
+}                                                                                                                  // 15
+                                                                                                                  // 16
+/**                                                                                                                // 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
+                                                                                                                // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
+                                                                                                                // 21</a></li>
+            
+                <li><a href="../modules/Roles                                                                                           __ 6
+_                                                                                                        __ 7
+                                                                                                          __ 8
+_**                                                                                                        __ 9
+Roles collection documents consist only of an id and a role name.                                       __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
+_                                                                                                        __ 12
+if (!Meteor.roles) {                                                                                       __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
+}                                                                                                          __ 15
+                                                                                                          __ 16
+_**                                                                                                        __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
+                                                                                                        __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
+                                                                                                        __ 21.html">Roles                                                                                           // 6
+/                                                                                                        // 7
+                                                                                                          // 8
+/**                                                                                                        // 9
+Roles collection documents consist only of an id and a role name.                                       // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
+/                                                                                                        // 12
+if (!Meteor.roles) {                                                                                       // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
+}                                                                                                          // 15
+                                                                                                          // 16
+/**                                                                                                        // 17
+Role-based authorization compatible with built-in Meteor accounts package.                              // 18
+                                                                                                        // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
+                                                                                                        // 21</a></li>
+            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../modules/UIHelpers                                                                                               __ 10
+_                                                                                                                __ 11
+                                                                                                                  __ 12
+____________________________________________________________                                                       __ 13
+__ UI helpers                                                                                                      __ 14
+__                                                                                                                 __ 15
+__ Use a semi-private variable rather than declaring UI                                                            __ 16
+__ helpers directly so that we can unit test the helpers.                                                          __ 17
+__ XXX For some reason, the UI helpers are not registered                                                          __ 18
+__ before the tests run.                                                                                           __ 19
+__                                                                                                                 __ 20
+Roles._uiHelpers = {                                                                                               __ 21
+                                                                                                                  __ 22
+ _**                                                                                                              __ 23
+UI helper to check if current user is in at least one                                                         __ 24
+of the target roles.  For use in client-side templates.                                                       __ 25
+                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
+/                                                                                                                // 11
+                                                                                                                  // 12
+////////////////////////////////////////////////////////////                                                       // 13
+// UI helpers                                                                                                      // 14
+//                                                                                                                 // 15
+// Use a semi-private variable rather than declaring UI                                                            // 16
+// helpers directly so that we can unit test the helpers.                                                          // 17
+// XXX For some reason, the UI helpers are not registered                                                          // 18
+// before the tests run.                                                                                           // 19
+//                                                                                                                 // 20
+Roles._uiHelpers = {                                                                                               // 21
+                                                                                                                  // 22
+ /**                                                                                                              // 23
+UI helper to check if current user is in at least one                                                         // 24
+of the target roles.  For use in client-side templates.                                                       // 25
+                                                                                                              // 26</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/docs/modules/UIHelpers.html b/docs/modules/UIHelpers.html
index cbc92903c3..729d4bfdf4 100644
--- a/docs/modules/UIHelpers.html
+++ b/docs/modules/UIHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.11</em>
+            <em>API Docs for: v1.2.12</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,16 +43,212 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
+                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
+            
+                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
+            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../classes/UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);.html">UIHelpers                                                                                                // 42
+/                                                                                                              // 43
+ isInRole: function (role, group) {                                                                               // 44
+   var user = Meteor.user(),                                                                                      // 45
+       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
+       roles                                                                                                      // 47
+                                                                                                                  // 48
+   if (!user) return false                                                                                        // 49
+   if (!Match.test(role, String)) return false                                                                    // 50
+                                                                                                                  // 51
+   if (comma !== -1) {                                                                                            // 52
+     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
+       if (!r || !r.trim()) {                                                                                     // 54
+         return memo                                                                                              // 55
+       }                                                                                                          // 56
+       memo.push(r.trim())                                                                                        // 57
+       return memo                                                                                                // 58
+     }, [])                                                                                                       // 59
+   } else {                                                                                                       // 60
+     roles = [role]                                                                                               // 61
+   }                                                                                                              // 62
+                                                                                                                  // 63
+   if (Match.test(group, String)) {                                                                               // 64
+     return Roles.userIsInRole(user, roles, group)                                                                // 65
+   }                                                                                                              // 66
+                                                                                                                  // 67
+   return Roles.userIsInRole(user, roles)                                                                         // 68
+ }                                                                                                                // 69
+}                                                                                                                  // 70
+                                                                                                                  // 71
+if (Package.ui) {                                                                                                  // 72
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
+   Package.ui.UI.registerHelper(name, func)                                                                       // 74
+ })                                                                                                               // 75
+} else if (Package.handlebars) {                                                                                   // 76
+ _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
+   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
+ })                                                                                                               // 79
+} else {                                                                                                           // 80
+ console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
+}                                                                                                                  // 82
+                                                                                                                  // 83
+}());                                                                                                              // 84
+                                                                                                                  // 85
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+}).call(this);</a></li>
+            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
+                <li><a href="../modules/Roles                                                                                                   __ 6
+_                                                                                                                __ 7
+                                                                                                                  __ 8
+_**                                                                                                                __ 9
+Roles collection documents consist only of an id and a role name.                                               __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
+_                                                                                                                __ 12
+if (!Meteor.roles) {                                                                                               __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
+}                                                                                                                  __ 15
+                                                                                                                  __ 16
+_**                                                                                                                __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
+                                                                                                                __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
+                                                                                                                __ 21.html">Roles                                                                                                   // 6
+/                                                                                                                // 7
+                                                                                                                  // 8
+/**                                                                                                                // 9
+Roles collection documents consist only of an id and a role name.                                               // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
+/                                                                                                                // 12
+if (!Meteor.roles) {                                                                                               // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
+}                                                                                                                  // 15
+                                                                                                                  // 16
+/**                                                                                                                // 17
+Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
+                                                                                                                // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
+                                                                                                                // 21</a></li>
+            
+                <li><a href="../modules/Roles                                                                                           __ 6
+_                                                                                                        __ 7
+                                                                                                          __ 8
+_**                                                                                                        __ 9
+Roles collection documents consist only of an id and a role name.                                       __ 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
+_                                                                                                        __ 12
+if (!Meteor.roles) {                                                                                       __ 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
+}                                                                                                          __ 15
+                                                                                                          __ 16
+_**                                                                                                        __ 17
+Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
+                                                                                                        __ 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
+                                                                                                        __ 21.html">Roles                                                                                           // 6
+/                                                                                                        // 7
+                                                                                                          // 8
+/**                                                                                                        // 9
+Roles collection documents consist only of an id and a role name.                                       // 10
+  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
+/                                                                                                        // 12
+if (!Meteor.roles) {                                                                                       // 13
+ Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
+}                                                                                                          // 15
+                                                                                                          // 16
+/**                                                                                                        // 17
+Role-based authorization compatible with built-in Meteor accounts package.                              // 18
+                                                                                                        // 19
+Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
+                                                                                                        // 21</a></li>
+            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
+                <li><a href="../modules/UIHelpers                                                                                               __ 10
+_                                                                                                                __ 11
+                                                                                                                  __ 12
+____________________________________________________________                                                       __ 13
+__ UI helpers                                                                                                      __ 14
+__                                                                                                                 __ 15
+__ Use a semi-private variable rather than declaring UI                                                            __ 16
+__ helpers directly so that we can unit test the helpers.                                                          __ 17
+__ XXX For some reason, the UI helpers are not registered                                                          __ 18
+__ before the tests run.                                                                                           __ 19
+__                                                                                                                 __ 20
+Roles._uiHelpers = {                                                                                               __ 21
+                                                                                                                  __ 22
+ _**                                                                                                              __ 23
+UI helper to check if current user is in at least one                                                         __ 24
+of the target roles.  For use in client-side templates.                                                       __ 25
+                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
+/                                                                                                                // 11
+                                                                                                                  // 12
+////////////////////////////////////////////////////////////                                                       // 13
+// UI helpers                                                                                                      // 14
+//                                                                                                                 // 15
+// Use a semi-private variable rather than declaring UI                                                            // 16
+// helpers directly so that we can unit test the helpers.                                                          // 17
+// XXX For some reason, the UI helpers are not registered                                                          // 18
+// before the tests run.                                                                                           // 19
+//                                                                                                                 // 20
+Roles._uiHelpers = {                                                                                               // 21
+                                                                                                                  // 22
+ /**                                                                                                              // 23
+UI helper to check if current user is in at least one                                                         // 24
+of the target roles.  For use in client-side templates.                                                       // 25
+                                                                                                              // 26</a></li>
+            
             </ul>
         </div>
     </div>
diff --git a/roles/package.js b/roles/package.js
index a359604f46..6cffaec93a 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -1,8 +1,12 @@
 Package.describe({
-  summary: "Role-based authorization"
+  summary: "Role-based authorization",
+  version: "1.2.12",
+  git: "https://github.com/alanning/meteor-roles.git",
+  name: "alanning:roles"
 });
 
 Package.on_use(function (api) {
+  api.versionsFrom && api.versionsFrom("METEOR@0.9.0");
   var both = ['client', 'server'];
   api.use(['underscore', 'accounts-base'], both);
   api.use(['handlebars'], 'client', {weak: true});
@@ -25,8 +29,13 @@ Package.on_use(function (api) {
 Package.on_test(function (api) {
   var both = ['client', 'server'];
 
-  // include accounts-password so Meteor.users exists
-  api.use(['roles','accounts-password','tinytest'], both);
+  // `accounts-password` is included so `Meteor.users` exists
+
+  if (api.versionsFrom) {
+    api.use(['alanning:roles','accounts-password','tinytest'], both);
+  } else {
+    api.use(['roles','accounts-password','tinytest'], both);
+  }
 
   api.add_files('tests/client.js', 'client');
   api.add_files('tests/server.js', 'server');
diff --git a/roles/smart.json b/roles/smart.json
index fc7849f1c0..4b6ac59dda 100644
--- a/roles/smart.json
+++ b/roles/smart.json
@@ -3,7 +3,7 @@
   "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
   "homepage": "https://github.com/alanning/meteor-roles",
   "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "git": "https://github.com/alanning/meteor-roles.git",
   "packages": {}
 }
diff --git a/roles/versions.json b/roles/versions.json
new file mode 100644
index 0000000000..82627b707d
--- /dev/null
+++ b/roles/versions.json
@@ -0,0 +1,95 @@
+{
+  "dependencies": [
+    [
+      "accounts-base",
+      "1.0.0"
+    ],
+    [
+      "application-configuration",
+      "1.0.0"
+    ],
+    [
+      "binary-heap",
+      "1.0.0"
+    ],
+    [
+      "callback-hook",
+      "1.0.0"
+    ],
+    [
+      "check",
+      "1.0.0"
+    ],
+    [
+      "deps",
+      "1.0.1"
+    ],
+    [
+      "ejson",
+      "1.0.0"
+    ],
+    [
+      "follower-livedata",
+      "1.0.0"
+    ],
+    [
+      "geojson-utils",
+      "1.0.0"
+    ],
+    [
+      "id-map",
+      "1.0.0"
+    ],
+    [
+      "json",
+      "1.0.0"
+    ],
+    [
+      "livedata",
+      "1.0.7"
+    ],
+    [
+      "localstorage",
+      "1.0.0"
+    ],
+    [
+      "logging",
+      "1.0.2"
+    ],
+    [
+      "meteor",
+      "1.0.2"
+    ],
+    [
+      "minimongo",
+      "1.0.1"
+    ],
+    [
+      "mongo-livedata",
+      "1.0.3"
+    ],
+    [
+      "ordered-dict",
+      "1.0.0"
+    ],
+    [
+      "random",
+      "1.0.0"
+    ],
+    [
+      "retry",
+      "1.0.0"
+    ],
+    [
+      "service-configuration",
+      "1.0.0"
+    ],
+    [
+      "underscore",
+      "1.0.0"
+    ]
+  ],
+  "pluginDependencies": [],
+  "toolVersion": "meteor-tool@1.0.16",
+  "format": "1.0"
+}
\ No newline at end of file
diff --git a/yuidoc.json b/yuidoc.json
index 57e6a1eca7..be30a50566 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: a role-based authorization package for Meteor",
-  "version": "v1.2.11",
+  "version": "v1.2.12",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From e06f46a7a30012599baae1f869c7d345ff48217a Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 7 Sep 2014 00:11:27 -0400
Subject: [PATCH 0125/1140] re-org readme.  include instructions for Meteor
 0.9+

---
 README.md | 127 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 86 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index b1fbc49f38..746a4b5840 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,28 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 <br />
 
+<a name="toc">
+### Table of Contents
+* [Contributors](#contributors)
+* [Authorization](#authorization)
+* [Permissions vs roles](#naming)
+* [Changes to default Meteor](#changes)
+* [Installation](#installing)
+* [Usage examples](#usage)
+* [Online API docs](#docs)
+* [Example apps](#example-apps)
+* [Running tests](#testing)
+
+
+<br />
+
+
+<a name="contributors">
 ### Contributors
 
 Thanks to:
 
+  * [@aldeed](https://github.com/aldeed)
   * [@kevb](https://github.com/kevb)
   * [@zimme](https://github.com/zimme)
   * [@danieljonce](https://github.com/danieljonce)
@@ -19,60 +37,27 @@ Thanks to:
 
 <br />
 
-### Blaze Support
-
-v1.2.7 adds support for Blaze UI (Meteor 0.8.0+)!  Older versions of
-Meteor are still supported as are ui-less apps.
-
-NOTE: The 'roles' package must come after 'ui' or 'standard-app-packages' 
-in '.meteor/packages' for the 'isInRole' helper to be registered.
-
-<br />
-
+<a name="authorization">
 ### Authorization
 
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
 
+Meteor versions 0.5 - 0.9.1.1 are supported (with the exception of 0.9.1).  UI-less apps are supported as well.
 
-    Now with per-group support!
-
-    v1.1.0 - adds support for per-group assignment of roles/permissions
+    v1.1.0 - adds support for per-group assignment of permissions
 
     v1.2.0 - adds the special Roles.GLOBAL_GROUP, used to provide blanket permissions across all groups
 
 <br />
 
+<a name="naming">
 ### What's in a name...
 
 Although the name of this package is 'roles', you can define your permissions however you like.  You can have traditional roles like, "admin" or "webmaster".  But you can also assign more granular permissions such as, "view-secrets" or "manage-users".  Often times this is actually better because you are able to handle all those pesky edge cases that come up in real life usage without creating a ton of higher-level 'roles'.  To the roles package, its all strings.
 
 <br />
 
-### Example Apps
-
-The `examples` directory contains Meteor apps which show off the following features:
-* Server-side publishing with authorization to secure sensitive data
-* Client-side navigation with link visibility based on user permissions
-* 'Sign-in required' app with up-front login page using `accounts-ui`
-* Client-side routing
-
-The only difference between the two example apps is the routing packages used: one uses `meteor-router` and the other uses `meteor-mini-pages`.
-(If anyone wants to update the iron-router example, that would be a big help!)
-
-View the `meteor-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
-  
-Run locally:
-  1. install [Meteorite][1]
-  2. `git clone https://github.com/alanning/meteor-roles.git`
-  3. either
-    * `cd meteor-roles/examples/router` or
-    * `cd meteor-roles/examples/mini-pages`
-  4. `mrt update`
-  5. `meteor`
-  6. point browser to `http://localhost:3000`
-
-<br />
-
+<a name="changes">
 ### Changes to default Meteor behavior
 
   1. User entries in the `Meteor.users` collection gain a new field named `roles` corresponding to the user's roles. †
@@ -113,7 +98,27 @@ Meteor.publish(null, function (){
 
 <br />
 
-### Usage
+<a name="installing">
+### Installing
+
+#### Meteor 0.9+ (new packaging system)
+
+1. Add one of the built-in accounts packages so the Meteor.users collection exists.  From a command prompt:
+    ```bash
+    meteor add accounts-password
+    ```
+
+3. Add this package to your project.  From a command prompt:
+    ```bash
+    meteor add alanning:roles
+    ```
+
+4. Run your application:
+    ```bash
+    meteor
+    ```
+
+#### Meteor 0.8.3 and below (meteorite)
 
 1. Add one of the built-in accounts packages so the Meteor.users collection exists.  From a command prompt:
     ```bash
@@ -133,6 +138,15 @@ Meteor.publish(null, function (){
     ```
 
 
+NOTE for Meteor 0.8-0.8.3:  Manually add the 'ui' package to your '.meteor/packages' file so that roles knows you are using it.  Otherwise, the 'isInRole' client-side helper will not be registered.  Since some versions of Meteor had 'standard-app-packages' without 'ui' there is no other way to detect its use.
+
+
+<br />
+
+
+<a name="usage">
+### Usage Examples
+
 <br />
 
 Here are some potential use cases:
@@ -304,9 +318,9 @@ The same with group:
 
 <br />
 
-Note that 
 
-### Documentation
+<a name="docs">
+### API Docs
 
 Online API docs found here: http://alanning.github.io/meteor-roles/classes/Roles.html
 
@@ -326,6 +340,37 @@ To serve documentation locally:
 
 <br />
 
+
+<a name="example-apps">
+### Example Apps
+
+The `examples` directory contains Meteor apps which show off the following features:
+* Server-side publishing with authorization to secure sensitive data
+* Client-side navigation with link visibility based on user permissions
+* 'Sign-in required' app with up-front login page using `accounts-ui`
+* Client-side routing
+
+The only difference between the two example apps is the routing packages used: one uses `meteor-router` and the other uses `meteor-mini-pages`.
+(If anyone wants to update the iron-router example, that would be a big help!)
+
+View the `meteor-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
+  
+Run locally:
+  1. install [Meteorite][1]
+  2. `git clone https://github.com/alanning/meteor-roles.git`
+  3. either
+    * `cd meteor-roles/examples/router` or
+    * `cd meteor-roles/examples/mini-pages`
+  4. `mrt update`
+  5. `meteor`
+  6. point browser to `http://localhost:3000`
+
+<br />
+
+
+
+
+<a name="testing">
 ### Tests
 
 

From 3d1583927816ed7e3739f052ac788fc48a9e813c Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 7 Sep 2014 00:15:22 -0400
Subject: [PATCH 0126/1140] Improve toc links

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 746a4b5840..5fa0cd2443 100644
--- a/README.md
+++ b/README.md
@@ -7,15 +7,15 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 <a name="toc">
 ### Table of Contents
-* [Contributors](#contributors)
-* [Authorization](#authorization)
-* [Permissions vs roles](#naming)
-* [Changes to default Meteor](#changes)
-* [Installation](#installing)
-* [Usage examples](#usage)
-* [Online API docs](#docs)
-* [Example apps](#example-apps)
-* [Running tests](#testing)
+* [Contributors](#user-content-contributors)
+* [Authorization](#user-content-authorization)
+* [Permissions vs roles](#user-content-naming)
+* [Changes to default Meteor](#user-content-changes)
+* [Installation](#user-content-installing)
+* [Usage examples](#user-content-usage)
+* [Online API docs](#user-content-docs)
+* [Example apps](#user-content-example-apps)
+* [Running tests](#user-content-testing)
 
 
 <br />

From 66ff74ab320649a73a50e06f46b57785dbff7fa6 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 7 Sep 2014 00:19:35 -0400
Subject: [PATCH 0127/1140] improve package description

---
 roles/package.js      | 2 +-
 roles/roles_common.js | 2 +-
 yuidoc.json           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/package.js b/roles/package.js
index 6cffaec93a..4155f55b8e 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "Role-based authorization",
+  summary: "Authorization package for Meteor",
   version: "1.2.12",
   git: "https://github.com/alanning/meteor-roles.git",
   name: "alanning:roles"
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 3f3e234de6..897bde71a4 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -15,7 +15,7 @@ if (!Meteor.roles) {
 }
 
 /**
- * Role-based authorization compatible with built-in Meteor accounts package.
+ * Authorization package compatible with built-in Meteor accounts system.
  *
  * Stores user's current roles in a 'roles' field on the user object.
  *
diff --git a/yuidoc.json b/yuidoc.json
index be30a50566..27bbc8f071 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,6 +1,6 @@
 {
   "name": "The meteor-roles API",
-  "description": "The meteor-roles API: a role-based authorization package for Meteor",
+  "description": "The meteor-roles API: an authorization package for Meteor",
   "version": "v1.2.12",
   "options": {
     "outdir": "./docs",

From 176d5a89a059572a5cc3e92e19143598615ff123 Mon Sep 17 00:00:00 2001
From: Chip Castle <chip@chipcastle.com>
Date: Mon, 8 Dec 2014 10:39:05 -0600
Subject: [PATCH 0128/1140] Fix typo for updateRoles usage example

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5fa0cd2443..b7f7361773 100644
--- a/README.md
+++ b/README.md
@@ -277,7 +277,7 @@ Meteor.methods({
       throw new Meteor.Error(403, "Access denied")
     }
 
-    Roles.setUserRoles(targetUser, roles, group)
+    Roles.setUserRoles(targetUserId, roles, group)
   }
 })
 ```

From ccd9b11a2a34fe6a91e7b847a466fe99907f39fb Mon Sep 17 00:00:00 2001
From: Ian Serlin <ian@ianserlin.com>
Date: Sat, 10 Jan 2015 03:12:25 -0800
Subject: [PATCH 0129/1140] getUsersInRole now passes through query options to
 Meteor.users.find

---
 roles/roles_common.js |  6 ++++--
 roles/tests/server.js | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 897bde71a4..1e62b4d260 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -432,9 +432,11 @@ _.extend(Roles, {
    *                            specified but need not have _all_ roles.
    * @param {String} [group] Optional name of group to restrict roles to.
    *                         User's Roles.GLOBAL_GROUP will also be checked.
+   * @param {Object} [options] Optional set options identical to what you may
+   *                         pass to the Collection.find method.
    * @return {Cursor} cursor of users in role
    */
-  getUsersInRole: function (role, group) {
+  getUsersInRole: function (role, group, options) {
     var query,
         roles = role,
         groupQuery
@@ -480,7 +482,7 @@ _.extend(Roles, {
       query.$or.push({roles: {$in: roles}})
     }
 
-    return Meteor.users.find(query)
+    return Meteor.users.find(query, options);
   },  // end getUsersInRole 
   
   /**
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 7fd47af3f5..ede84574c3 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -835,6 +835,20 @@
       test.equal(_.difference(expected, actual), [])
     })
 
+  Tinytest.add(
+    'roles - can get all users in role by group and passes through mongo query arguments', 
+    function (test) {
+      reset()
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
+
+      var results = Roles.getUsersInRole('admin','group1', { fields: { username: 0 }, limit: 1 }).fetch();
+
+      test.equal(1, results.length);
+      test.isTrue(results[0].hasOwnProperty('_id'));
+      test.isFalse(results[0].hasOwnProperty('username'));
+    })
+
 
   Tinytest.add(
     'roles - can use Roles.GLOBAL_GROUP to assign blanket permissions',

From e12b60a956b949c72a6664f945399531aa685723 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 18 Feb 2015 15:17:01 -0500
Subject: [PATCH 0130/1140] Add example of using roles with accounts-ui

---
 .../.meteor/.finished-upgraders               |  7 ++
 .../rolesWithAccountsUI/.meteor/.gitignore    |  1 +
 examples/rolesWithAccountsUI/.meteor/.id      |  7 ++
 examples/rolesWithAccountsUI/.meteor/packages | 10 +++
 .../rolesWithAccountsUI/.meteor/platforms     |  2 +
 examples/rolesWithAccountsUI/.meteor/release  |  1 +
 examples/rolesWithAccountsUI/.meteor/versions | 60 ++++++++++++++++
 .../rolesWithAccountsUI.css                   |  1 +
 .../rolesWithAccountsUI.html                  | 16 +++++
 .../rolesWithAccountsUI.js                    | 23 +++++++
 .../server/addRolesToUserObj.js               | 69 +++++++++++++++++++
 .../rolesWithAccountsUI/server/startup.js     | 19 +++++
 12 files changed, 216 insertions(+)
 create mode 100644 examples/rolesWithAccountsUI/.meteor/.finished-upgraders
 create mode 100644 examples/rolesWithAccountsUI/.meteor/.gitignore
 create mode 100644 examples/rolesWithAccountsUI/.meteor/.id
 create mode 100644 examples/rolesWithAccountsUI/.meteor/packages
 create mode 100644 examples/rolesWithAccountsUI/.meteor/platforms
 create mode 100644 examples/rolesWithAccountsUI/.meteor/release
 create mode 100644 examples/rolesWithAccountsUI/.meteor/versions
 create mode 100644 examples/rolesWithAccountsUI/rolesWithAccountsUI.css
 create mode 100644 examples/rolesWithAccountsUI/rolesWithAccountsUI.html
 create mode 100644 examples/rolesWithAccountsUI/rolesWithAccountsUI.js
 create mode 100644 examples/rolesWithAccountsUI/server/addRolesToUserObj.js
 create mode 100644 examples/rolesWithAccountsUI/server/startup.js

diff --git a/examples/rolesWithAccountsUI/.meteor/.finished-upgraders b/examples/rolesWithAccountsUI/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..68df3d8d0d
--- /dev/null
+++ b/examples/rolesWithAccountsUI/.meteor/.finished-upgraders
@@ -0,0 +1,7 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
diff --git a/examples/rolesWithAccountsUI/.meteor/.gitignore b/examples/rolesWithAccountsUI/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/examples/rolesWithAccountsUI/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/examples/rolesWithAccountsUI/.meteor/.id b/examples/rolesWithAccountsUI/.meteor/.id
new file mode 100644
index 0000000000..c7b0fef3da
--- /dev/null
+++ b/examples/rolesWithAccountsUI/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+1epy1f8p4rl382ol0so
diff --git a/examples/rolesWithAccountsUI/.meteor/packages b/examples/rolesWithAccountsUI/.meteor/packages
new file mode 100644
index 0000000000..c73a37b976
--- /dev/null
+++ b/examples/rolesWithAccountsUI/.meteor/packages
@@ -0,0 +1,10 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-platform
+accounts-password
+accounts-ui
+alanning:roles
diff --git a/examples/rolesWithAccountsUI/.meteor/platforms b/examples/rolesWithAccountsUI/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/examples/rolesWithAccountsUI/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/examples/rolesWithAccountsUI/.meteor/release b/examples/rolesWithAccountsUI/.meteor/release
new file mode 100644
index 0000000000..90f87be959
--- /dev/null
+++ b/examples/rolesWithAccountsUI/.meteor/release
@@ -0,0 +1 @@
+METEOR@1.0.3.1
diff --git a/examples/rolesWithAccountsUI/.meteor/versions b/examples/rolesWithAccountsUI/.meteor/versions
new file mode 100644
index 0000000000..9ad9e722b5
--- /dev/null
+++ b/examples/rolesWithAccountsUI/.meteor/versions
@@ -0,0 +1,60 @@
+accounts-base@1.1.3
+accounts-password@1.0.6
+accounts-ui@1.1.4
+accounts-ui-unstyled@1.1.6
+alanning:roles@1.2.13
+application-configuration@1.0.4
+autoupdate@1.1.5
+base64@1.0.2
+binary-heap@1.0.2
+blaze@2.0.4
+blaze-tools@1.0.2
+boilerplate-generator@1.0.2
+callback-hook@1.0.2
+check@1.0.4
+ddp@1.0.14
+deps@1.0.6
+ejson@1.0.5
+email@1.0.5
+fastclick@1.0.2
+follower-livedata@1.0.3
+geojson-utils@1.0.2
+html-tools@1.0.3
+htmljs@1.0.3
+http@1.0.10
+id-map@1.0.2
+jquery@1.11.3
+json@1.0.2
+launch-screen@1.0.1
+less@1.0.12
+livedata@1.0.12
+localstorage@1.0.2
+logging@1.0.6
+meteor@1.1.4
+meteor-platform@1.2.1
+minifiers@1.1.3
+minimongo@1.0.6
+mobile-status-bar@1.0.2
+mongo@1.0.11
+npm-bcrypt@0.7.7
+observe-sequence@1.0.4
+ordered-dict@1.0.2
+random@1.0.2
+reactive-dict@1.0.5
+reactive-var@1.0.4
+reload@1.1.2
+retry@1.0.2
+routepolicy@1.0.4
+service-configuration@1.0.3
+session@1.0.5
+sha@1.0.2
+spacebars@1.0.5
+spacebars-compiler@1.0.4
+srp@1.0.2
+templating@1.0.11
+tracker@1.0.5
+ui@1.0.5
+underscore@1.0.2
+url@1.0.3
+webapp@1.1.6
+webapp-hashing@1.0.2
diff --git a/examples/rolesWithAccountsUI/rolesWithAccountsUI.css b/examples/rolesWithAccountsUI/rolesWithAccountsUI.css
new file mode 100644
index 0000000000..b6b4052b43
--- /dev/null
+++ b/examples/rolesWithAccountsUI/rolesWithAccountsUI.css
@@ -0,0 +1 @@
+/* CSS declarations go here */
diff --git a/examples/rolesWithAccountsUI/rolesWithAccountsUI.html b/examples/rolesWithAccountsUI/rolesWithAccountsUI.html
new file mode 100644
index 0000000000..56a04c3ebc
--- /dev/null
+++ b/examples/rolesWithAccountsUI/rolesWithAccountsUI.html
@@ -0,0 +1,16 @@
+<head>
+  <title>rolesWithAccountsUI</title>
+</head>
+
+<body>
+  {{> loginButtons}}
+
+  <h1>Welcome to Meteor!</h1>
+
+  {{> hello}}
+</body>
+
+<template name="hello">
+  <button>Click Me</button>
+  <p>You've pressed the button {{counter}} times.</p>
+</template>
diff --git a/examples/rolesWithAccountsUI/rolesWithAccountsUI.js b/examples/rolesWithAccountsUI/rolesWithAccountsUI.js
new file mode 100644
index 0000000000..4f8c65d5c0
--- /dev/null
+++ b/examples/rolesWithAccountsUI/rolesWithAccountsUI.js
@@ -0,0 +1,23 @@
+if (Meteor.isClient) {
+  // counter starts at 0
+  Session.setDefault('counter', 0);
+
+  Template.hello.helpers({
+    counter: function () {
+      return Session.get('counter');
+    }
+  });
+
+  Template.hello.events({
+    'click button': function () {
+      // increment the counter when button is clicked
+      Session.set('counter', Session.get('counter') + 1);
+    }
+  });
+}
+
+if (Meteor.isServer) {
+  Meteor.startup(function () {
+    // code to run on server at startup
+  });
+}
diff --git a/examples/rolesWithAccountsUI/server/addRolesToUserObj.js b/examples/rolesWithAccountsUI/server/addRolesToUserObj.js
new file mode 100644
index 0000000000..4c7cad3b7a
--- /dev/null
+++ b/examples/rolesWithAccountsUI/server/addRolesToUserObj.js
@@ -0,0 +1,69 @@
+Roles.addRolesToUserObj = function (users, roles, group) {
+  if (!users) throw new Error ("Missing 'users' param")
+  if (!roles) throw new Error ("Missing 'roles' param")
+  if (group) {
+    if ('string' !== typeof group)
+      throw new Error ("Roles error: Invalid parameter 'group'. Expected 'string' type")
+    if ('$' === group[0])
+      throw new Error ("Roles error: groups can not start with '$'")
+
+    // convert any periods to underscores
+    group = group.replace(/\./g, '_')
+  }
+
+  // ensure arrays to simplify code
+  if (!_.isArray(users)) users = [users]
+  if (!_.isArray(roles)) roles = [roles]
+
+  
+  // remove invalid roles
+  roles = _.reduce(roles, function (memo, role) {
+    if (role
+        && 'string' === typeof role
+        && role.trim().length > 0) {
+      memo.push(role.trim())
+    }
+    return memo
+  }, [])
+
+  // if roles is empty, quit
+  if (roles.length === 0) return
+
+  // ensure all roles exist in 'roles' collection
+  existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
+    memo[role.name] = true
+    return memo
+  }, {})
+  _.each(roles, function (role) {
+    if (!existingRoles[role]) {
+      Roles.createRole(role)
+    }
+  })
+
+  // ensure users is an array of objects
+  _.each(users, function (user) {
+    if ('object' !== typeof user) {
+      throw new Error("Expected 'users' argument to be an object or array of objects")
+    }
+  })
+
+  if (group) {
+
+    // roles is a key/value dict object
+
+    _.each(users, function (user) {
+      user.roles = {}
+      user.roles[group] = roles
+    })
+
+  } else {
+
+    // roles is an array of strings
+    
+    _.each(users, function (user) {
+      user.roles = roles
+    })
+
+  }
+
+}  // end addRolesToUserObj
diff --git a/examples/rolesWithAccountsUI/server/startup.js b/examples/rolesWithAccountsUI/server/startup.js
new file mode 100644
index 0000000000..8560b13af4
--- /dev/null
+++ b/examples/rolesWithAccountsUI/server/startup.js
@@ -0,0 +1,19 @@
+Meteor.startup(function () {
+
+  console.log('Running server startup code...');
+
+  Accounts.onCreateUser(function (options, user) {
+    Roles.addRolesToUserObj(user, ['admin','view-secrets']);
+
+    if (options.profile) {
+      // include the user profile
+      user.profile = options.profile
+    }
+
+    // other user object changes...
+    // ...
+    
+    return user;
+  });
+
+});

From 3ac4e9aa010774320abda1a75e22c47319dbc5fc Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 18 Feb 2015 15:22:55 -0500
Subject: [PATCH 0131/1140] Change example method to properly reflect action
 taken

---
 .../server/{addRolesToUserObj.js => setRolesOnUserObj.js}  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename examples/rolesWithAccountsUI/server/{addRolesToUserObj.js => setRolesOnUserObj.js} (92%)

diff --git a/examples/rolesWithAccountsUI/server/addRolesToUserObj.js b/examples/rolesWithAccountsUI/server/setRolesOnUserObj.js
similarity index 92%
rename from examples/rolesWithAccountsUI/server/addRolesToUserObj.js
rename to examples/rolesWithAccountsUI/server/setRolesOnUserObj.js
index 4c7cad3b7a..0bee41ab95 100644
--- a/examples/rolesWithAccountsUI/server/addRolesToUserObj.js
+++ b/examples/rolesWithAccountsUI/server/setRolesOnUserObj.js
@@ -1,4 +1,4 @@
-Roles.addRolesToUserObj = function (users, roles, group) {
+Roles.setRolesOnUserObj = function (users, roles, group) {
   if (!users) throw new Error ("Missing 'users' param")
   if (!roles) throw new Error ("Missing 'roles' param")
   if (group) {
@@ -47,6 +47,9 @@ Roles.addRolesToUserObj = function (users, roles, group) {
     }
   })
 
+
+  // Set the roles on the actual user object
+
   if (group) {
 
     // roles is a key/value dict object
@@ -66,4 +69,4 @@ Roles.addRolesToUserObj = function (users, roles, group) {
 
   }
 
-}  // end addRolesToUserObj
+}  // end setRolesOnUserObj

From edfb85e8ccb1986c33c2752ea5ddb42f153ce8f2 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 18 Feb 2015 15:24:49 -0500
Subject: [PATCH 0132/1140] Change example method to properly reflect action
 taken

---
 examples/rolesWithAccountsUI/server/startup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/rolesWithAccountsUI/server/startup.js b/examples/rolesWithAccountsUI/server/startup.js
index 8560b13af4..06285dfc2d 100644
--- a/examples/rolesWithAccountsUI/server/startup.js
+++ b/examples/rolesWithAccountsUI/server/startup.js
@@ -3,7 +3,7 @@ Meteor.startup(function () {
   console.log('Running server startup code...');
 
   Accounts.onCreateUser(function (options, user) {
-    Roles.addRolesToUserObj(user, ['admin','view-secrets']);
+    Roles.setRolesOnUserObj(user, ['admin','view-secrets']);
 
     if (options.profile) {
       // include the user profile

From 7acf356717e1a1c4ff45b943b8437943f9dc871d Mon Sep 17 00:00:00 2001
From: Paul Ward <pward@diem.com>
Date: Fri, 20 Feb 2015 13:54:07 -0600
Subject: [PATCH 0133/1140] Use Mongo.Collection if it's available

---
 roles/roles_common.js | 8 +++++++-
 roles/roles_server.js | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 897bde71a4..fb9443dfaf 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1,5 +1,11 @@
 ;(function () {
 
+/**
+ * Eliminate Meteor.Collection deprecation warning while maintaining
+ * backwards compatibility
+ */
+var Mongo = Mongo || _.pick(Meteor,'Collection');
+
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
@@ -11,7 +17,7 @@
  *   ex: { _id:<uuid>, name: "admin" }
  */
 if (!Meteor.roles) {
-  Meteor.roles = new Meteor.Collection("roles")
+  Meteor.roles = new Mongo.Collection("roles")
 }
 
 /**
diff --git a/roles/roles_server.js b/roles/roles_server.js
index dc9c37beae..4a50f7c404 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,12 +1,17 @@
 ;(function () {
 
+/**
+ * Eliminate Meteor.Collection deprecation warning while maintaining
+ * backwards compatibility
+ */
+var Mongo = Mongo || _.pick(Meteor,'Collection');
 
 /**
  * Roles collection documents consist only of an id and a role name.
  *   ex: { _id:<uuid>, name: "admin" }
  */
 if (!Meteor.roles) {
-  Meteor.roles = new Meteor.Collection("roles")
+  Meteor.roles = new Mongo.Collection("roles")
 
   // Create default indexes for roles collection
   Meteor.roles._ensureIndex('name', {unique: 1})

From 20a71b2f9c825205977c7ed3759fc8d69215fa2f Mon Sep 17 00:00:00 2001
From: leebenson <lee@leebenson.com>
Date: Tue, 10 Mar 2015 09:17:40 +0000
Subject: [PATCH 0134/1140] name the publication

Necessary for using Iron Router's waitOn func, etc.
---
 roles/roles_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index dc9c37beae..c6fcfa6bef 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -17,7 +17,7 @@ if (!Meteor.roles) {
  * Always publish logged-in user's roles so client-side
  * checks can work.
  */
-Meteor.publish(null, function () {
+Meteor.publish('roles', function () {
   var userId = this.userId,
       fields = {roles:1}
 

From 9dce5bcab80f4c65a963582036599863b5a8f979 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Wed, 22 Apr 2015 21:57:16 -0400
Subject: [PATCH 0135/1140] Resolve #97 - improve example for `isInRole` with
 group

Used example from Online API docs:
http://alanning.github.io/meteor-roles/classes/UIHelpers.html#method_isInRole
---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b7f7361773..f13c60b6a2 100644
--- a/README.md
+++ b/README.md
@@ -301,17 +301,20 @@ NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted
   {{#if isInRole 'admin'}}
     {{> admin_nav}}  
   {{/if}}
+  {{#if isInRole 'admin,editor'}}
+    {{> editor_stuff}}
+  {{/if}}
 </template>
 ```
 
-The same with group:
+You can also limit the check to a specific group:
 ```handlebars
 <!-- client/myApp.html -->
 
 <template name="header">
   ... regular header stuff
-  {{#if isInRole 'admin' 'researchAndDevelopment'}}
-    {{> admin_rad_nav}}  
+  {{#if isInRole 'admin,editor' 'group1'}}
+    {{> editor_stuff}}  
   {{/if}}
 </template>
 ```

From 0c2a2003ffe6cf0696ef75118f66bdff84950c8a Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Sun, 26 Apr 2015 13:16:38 -0400
Subject: [PATCH 0136/1140] Resolve #99 - explicitly state support for Meteor
 0.5 through current

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f13c60b6a2..d76cde5910 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Thanks to:
 
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
 
-Meteor versions 0.5 - 0.9.1.1 are supported (with the exception of 0.9.1).  UI-less apps are supported as well.
+All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1).  UI-less apps are supported as well.
 
     v1.1.0 - adds support for per-group assignment of permissions
 

From b43a13b59505ccee605cf93564e7594775391a63 Mon Sep 17 00:00:00 2001
From: Chen Ye <cye@brown.edu>
Date: Tue, 26 May 2015 12:50:55 -0500
Subject: [PATCH 0137/1140] correct typo in _updateUserRoles method description

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 897bde71a4..1412f0c11f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -583,7 +583,7 @@ _.extend(Roles, {
 
 
   /**
-   * Internal function that users the Template pattern to adds or sets roles 
+   * Internal function that uses the Template pattern to adds or sets roles 
    * for users.
    *
    * @method _updateUserRoles

From 9548d6901fbc486615da631b627f52e133cd19df Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Thu, 23 Jul 2015 13:49:46 +0800
Subject: [PATCH 0138/1140] improve description of 'groups'

---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d76cde5910..76f125731f 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,11 @@ All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1
 <a name="naming">
 ### What's in a name...
 
-Although the name of this package is 'roles', you can define your permissions however you like.  You can have traditional roles like, "admin" or "webmaster".  But you can also assign more granular permissions such as, "view-secrets" or "manage-users".  Often times this is actually better because you are able to handle all those pesky edge cases that come up in real life usage without creating a ton of higher-level 'roles'.  To the roles package, its all strings.
+Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign to a user and can check for later.
+
+You can have traditional roles like, "admin" or "webmaster", or you can assign more granular permissions such as, "view-secrets" or "manage-users".  Often times more granular is actually better because you are able to handle all those pesky edge cases that come up in real life usage without creating a ton of higher-level 'roles'.  To the roles package, its all strings.
+
+Sometimes its useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  Users can have one set of permissions in group A and another set of permissions in group B.  The next section gives an example of this using soccer/football teams as groups.
 
 <br />
 
@@ -177,7 +181,7 @@ Add users to roles:
     if (user.roles.length > 0) {
       // Need _id of existing user record so this call must come 
       // after `Accounts.createUser` or `Accounts.onCreate`
-      Roles.addUsersToRoles(id, user.roles);
+      Roles.addUsersToRoles(id, user.roles, 'default-group');
     }
   
   });
@@ -216,6 +220,7 @@ Prevent non-authorized users from creating new users:
     var loggedInUser = Meteor.user();
 
     if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
+      // NOTE: This example assumes the user is not using groups. 
       return true;
     }
 

From e3ab0b1cda84a4dca4194d907c2b33139d10acc3 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 11 Aug 2015 20:09:31 +0800
Subject: [PATCH 0139/1140] add iron-router example

---
 README.md                                     |  21 +++-
 examples/iron-router/.meteor/.id              |   7 ++
 examples/iron-router/.meteor/packages         |   7 +-
 examples/iron-router/.meteor/platforms        |   2 +
 examples/iron-router/.meteor/release          |   2 +-
 examples/iron-router/.meteor/versions         |  68 ++++++++++++
 .../.meteor/meteorite/packages/iron-router    |   1 -
 .../client/.meteor/meteorite/packages/roles   |   1 -
 examples/iron-router/client/example.html      |   6 +-
 examples/iron-router/client/routing.js        | 104 +++++++-----------
 examples/iron-router/client/smart.json        |   6 -
 examples/iron-router/smart.json               |  10 --
 12 files changed, 141 insertions(+), 94 deletions(-)
 create mode 100644 examples/iron-router/.meteor/.id
 create mode 100644 examples/iron-router/.meteor/platforms
 create mode 100644 examples/iron-router/.meteor/versions
 delete mode 120000 examples/iron-router/client/.meteor/meteorite/packages/iron-router
 delete mode 120000 examples/iron-router/client/.meteor/meteorite/packages/roles
 delete mode 100644 examples/iron-router/client/smart.json
 delete mode 100644 examples/iron-router/smart.json

diff --git a/README.md b/README.md
index 76f125731f..faf2adb3a9 100644
--- a/README.md
+++ b/README.md
@@ -358,11 +358,24 @@ The `examples` directory contains Meteor apps which show off the following featu
 * 'Sign-in required' app with up-front login page using `accounts-ui`
 * Client-side routing
 
-The only difference between the two example apps is the routing packages used: one uses `meteor-router` and the other uses `meteor-mini-pages`.
-(If anyone wants to update the iron-router example, that would be a big help!)
+
+The only difference between the example apps is which routing package is used.
 
 View the `meteor-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
-  
+ 
+
+_Iron Router_
+
+Run locally:
+  1. `git clone https://github.com/alanning/meteor-roles.git`
+  2. `cd meteor-roles/examples/iron-router`
+  3. `meteor`
+  4. point browser to `http://localhost:3000`
+
+<br />
+
+_Mini-Pages or Router_
+
 Run locally:
   1. install [Meteorite][1]
   2. `git clone https://github.com/alanning/meteor-roles.git`
@@ -376,8 +389,6 @@ Run locally:
 <br />
 
 
-
-
 <a name="testing">
 ### Tests
 
diff --git a/examples/iron-router/.meteor/.id b/examples/iron-router/.meteor/.id
new file mode 100644
index 0000000000..acd117ac05
--- /dev/null
+++ b/examples/iron-router/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+12nu3d71gkxofl123c8jf
diff --git a/examples/iron-router/.meteor/packages b/examples/iron-router/.meteor/packages
index 5c0c99862b..ee859b51cd 100644
--- a/examples/iron-router/.meteor/packages
+++ b/examples/iron-router/.meteor/packages
@@ -3,11 +3,10 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-preserve-inputs
+meteor-platform
 accounts-password
 accounts-ui
 bootstrap
-roles
 spiderable
-standard-app-packages
-iron-router
+alanning:roles
+iron:router
diff --git a/examples/iron-router/.meteor/platforms b/examples/iron-router/.meteor/platforms
new file mode 100644
index 0000000000..8a3a35f9f6
--- /dev/null
+++ b/examples/iron-router/.meteor/platforms
@@ -0,0 +1,2 @@
+browser
+server
diff --git a/examples/iron-router/.meteor/release b/examples/iron-router/.meteor/release
index ef5e445445..315c635bf3 100644
--- a/examples/iron-router/.meteor/release
+++ b/examples/iron-router/.meteor/release
@@ -1 +1 @@
-0.6.5
+METEOR@1.1.0.3
diff --git a/examples/iron-router/.meteor/versions b/examples/iron-router/.meteor/versions
new file mode 100644
index 0000000000..63b5ff6846
--- /dev/null
+++ b/examples/iron-router/.meteor/versions
@@ -0,0 +1,68 @@
+accounts-base@1.2.0
+accounts-password@1.1.1
+accounts-ui@1.1.5
+accounts-ui-unstyled@1.1.7
+alanning:roles@1.2.13
+autoupdate@1.2.1
+base64@1.0.3
+binary-heap@1.0.3
+blaze@2.1.2
+blaze-tools@1.0.3
+boilerplate-generator@1.0.3
+bootstrap@1.0.1
+callback-hook@1.0.3
+check@1.0.5
+ddp@1.1.0
+deps@1.0.7
+ejson@1.0.6
+email@1.0.6
+fastclick@1.0.3
+geojson-utils@1.0.3
+html-tools@1.0.4
+htmljs@1.0.4
+http@1.1.0
+id-map@1.0.3
+iron:controller@1.0.8
+iron:core@1.0.8
+iron:dynamic-template@1.0.8
+iron:layout@1.0.8
+iron:location@1.0.9
+iron:middleware-stack@1.0.9
+iron:router@1.0.9
+iron:url@1.0.9
+jquery@1.11.3_2
+json@1.0.3
+launch-screen@1.0.2
+less@1.0.14
+livedata@1.0.13
+localstorage@1.0.3
+logging@1.0.7
+meteor@1.1.6
+meteor-platform@1.2.2
+minifiers@1.1.5
+minimongo@1.0.8
+mobile-status-bar@1.0.3
+mongo@1.1.0
+npm-bcrypt@0.7.8_2
+observe-sequence@1.0.6
+ordered-dict@1.0.3
+random@1.0.3
+reactive-dict@1.1.0
+reactive-var@1.0.5
+reload@1.1.3
+retry@1.0.3
+routepolicy@1.0.5
+service-configuration@1.0.4
+session@1.1.0
+sha@1.0.3
+spacebars@1.0.6
+spacebars-compiler@1.0.6
+spiderable@1.0.7
+srp@1.0.3
+templating@1.1.1
+tracker@1.0.7
+ui@1.0.6
+underscore@1.0.3
+url@1.0.4
+webapp@1.2.0
+webapp-hashing@1.0.3
diff --git a/examples/iron-router/client/.meteor/meteorite/packages/iron-router b/examples/iron-router/client/.meteor/meteorite/packages/iron-router
deleted file mode 120000
index 59186f3741..0000000000
--- a/examples/iron-router/client/.meteor/meteorite/packages/iron-router
+++ /dev/null
@@ -1 +0,0 @@
-/Users/alanning/.meteorite/packages/iron-router/EventedMind/iron-router/3e0e22ff85630b7503d0daa1538c6d90abb84020
\ No newline at end of file
diff --git a/examples/iron-router/client/.meteor/meteorite/packages/roles b/examples/iron-router/client/.meteor/meteorite/packages/roles
deleted file mode 120000
index c234078def..0000000000
--- a/examples/iron-router/client/.meteor/meteorite/packages/roles
+++ /dev/null
@@ -1 +0,0 @@
-/Users/alanning/.meteorite/packages/roles/alanning/meteor-roles/f81cbf7c765a4ed7e16a580c288db6f10a90856b/roles
\ No newline at end of file
diff --git a/examples/iron-router/client/example.html b/examples/iron-router/client/example.html
index b7ffb7a465..573cea88b7 100644
--- a/examples/iron-router/client/example.html
+++ b/examples/iron-router/client/example.html
@@ -8,13 +8,13 @@
 <template name="layout">
   {{> header}}
 
-  {{{yield}}}
+  {{> yield}}
 
   <div id="log"></div>
 </template>
 
 <template name="layout_no_header">
-  {{{yield}}}
+  {{> yield}}
 
   <div id="log"></div>
 </template>
@@ -23,7 +23,7 @@
   <div class="signin">
     <div class="login-form">
       <h1>Sign In</h1>
-      {{loginButtons}}
+      {{> loginButtons}}
     </div>
 
     <div class="example-users">
diff --git a/examples/iron-router/client/routing.js b/examples/iron-router/client/routing.js
index 6e41ca3f0c..e6857c395b 100644
--- a/examples/iron-router/client/routing.js
+++ b/examples/iron-router/client/routing.js
@@ -1,9 +1,4 @@
-;(function () {
-
-  //AuthenticateController = {};
-
-  "use strict";
-
+"use strict"
 
 
 ////////////////////////////////////////////////////////////////////
@@ -12,13 +7,13 @@
 
 // override with mini-pages navigate method
 Meteor.navigateTo = function (path) {
-  Router.go(path);
-};
+  Router.go(path)
+}
 
 function emailVerified (user) {
   return _.some(user.emails, function (email) {
-    return email.verified;
-  });
+    return email.verified
+  })
 }
 
 var filters = {
@@ -28,41 +23,36 @@ var filters = {
    * email verified
    */
   authenticate: function () {
-    var user;
+    var user
 
     if (Meteor.loggingIn()) {
 
-      console.log('filter: loading');
-      this.render('loading');
-      this.layout = 'layout_no_header';
-      this.stop();
+      console.log('[authenticate filter] loading')
+      this.layout('layout_no_header')
+      this.render('loading')
 
     } else {
 
-      user = Meteor.user();
+      user = Meteor.user()
 
       if (!user) {
-
-        console.log('filter: signin');
-        this.render('signin');
-        this.layout = 'layout_no_header';
-        this.stop();
+        console.log('[authenticate filter] signin')
+        this.layout('layout_no_header')
+        this.render('signin')
         return
       }
 
       if (!emailVerified(user)) {
-
-        console.log('filter: awaiting-verification');
-        this.render('awaiting-verification');
-        this.layout = 'layout';
-        this.stop();
-
-      } else {
-
-        console.log('filter: done');
-        this.layout = 'layout';
-
+        console.log('[authenticate filter] awaiting-verification')
+        this.layout('layout')
+        this.render('awaiting-verification')
+        return
       }
+
+      console.log('[authenticate filter] done')
+      this.layout('layout')
+
+      this.next()
     }
   },  // end authenticate
 
@@ -71,49 +61,37 @@ var filters = {
    * use-case
    */
   testFilter: function () {
-    console.log('test filter')
+    console.log('[test filter]')
+    this.next()
   }
 
-};  // end filters
-
-//AuthenticateController = RouteController.extend({
-//  before: authenticate
-//});
+}  // end filters
 
 
 Router.configure({
   layout: 'layout',
   loadingTemplate: 'loading',
   notFoundTemplate: 'not_found'
-});
+})
 
-Router.map(function () {
-  this.route('start', {
-    path: '/',
-    before: [filters.authenticate, filters.testFilter]
-  });
-  this.route('start', {
-    before: [filters.authenticate, filters.testFilter]
-  });
 
-  this.route('signin');
+Router.route('/', {
+  template: 'start',
+  before: [filters.authenticate, filters.testFilter]
+})
 
-  this.route('secrets', {
-    //controller: 'AuthenticateController'
-    before: filters.authenticate
-  });
+Router.route('/start', {
+  before: [filters.authenticate, filters.testFilter]
+})
 
-  this.route('manage', {
-    before: filters.authenticate
-  });
+Router.route('/signin')
 
-  this.route('signout', App.signout);
+Router.route('secrets', {
+  before: filters.authenticate
+})
 
-  // why is this necessary when notFoundTemplate is
-  // set in Router.configure?
-  this.route('*', {
-    template: 'not_found'
-  });
-});
+Router.route('manage', {
+  before: filters.authenticate
+})
 
-}());
+Router.route('signout', App.signout)
diff --git a/examples/iron-router/client/smart.json b/examples/iron-router/client/smart.json
deleted file mode 100644
index 76f09b94b6..0000000000
--- a/examples/iron-router/client/smart.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "packages": {
-    "roles": {},
-    "iron-router": {}
-  }
-}
diff --git a/examples/iron-router/smart.json b/examples/iron-router/smart.json
deleted file mode 100644
index 6a5e6c48ab..0000000000
--- a/examples/iron-router/smart.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "meteor": {
-    "git": "https://github.com/meteor/meteor.git",
-    "branch": "master"
-  },
-  "packages": {
-    "roles": {},
-    "iron-router": {}
-  }
-}

From b7ada303a86c611765e7647af13222bd9dce6e4a Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 11 Aug 2015 23:49:32 +0800
Subject: [PATCH 0140/1140] add flow-router example

---
 README.md                                     |   8 +-
 examples/flow-router/.meteor/.gitignore       |   2 +
 examples/flow-router/.meteor/.id              |   7 +
 examples/flow-router/.meteor/packages         |  14 ++
 examples/flow-router/.meteor/platforms        |   2 +
 examples/flow-router/.meteor/release          |   1 +
 examples/flow-router/.meteor/versions         |  65 +++++++++
 examples/flow-router/client/client.js         | 124 ++++++++++++++++++
 examples/flow-router/client/example.css       |  67 ++++++++++
 examples/flow-router/client/example.html      | 112 ++++++++++++++++
 examples/flow-router/client/layouts.html      |  25 ++++
 examples/flow-router/client/layouts.js        |  13 ++
 examples/flow-router/client/lib/globals.js    |   2 +
 examples/flow-router/client/manage-users.html |  34 +++++
 examples/flow-router/client/manage-users.js   |  19 +++
 examples/flow-router/client/routing.js        |  52 ++++++++
 examples/flow-router/client/secrets.html      |  30 +++++
 examples/flow-router/client/secrets.js        |   9 ++
 examples/flow-router/model.js                 |   9 ++
 examples/flow-router/polyfills.js             |  11 ++
 examples/flow-router/server/server.js         | 107 +++++++++++++++
 21 files changed, 709 insertions(+), 4 deletions(-)
 create mode 100644 examples/flow-router/.meteor/.gitignore
 create mode 100644 examples/flow-router/.meteor/.id
 create mode 100644 examples/flow-router/.meteor/packages
 create mode 100644 examples/flow-router/.meteor/platforms
 create mode 100644 examples/flow-router/.meteor/release
 create mode 100644 examples/flow-router/.meteor/versions
 create mode 100644 examples/flow-router/client/client.js
 create mode 100644 examples/flow-router/client/example.css
 create mode 100644 examples/flow-router/client/example.html
 create mode 100644 examples/flow-router/client/layouts.html
 create mode 100644 examples/flow-router/client/layouts.js
 create mode 100644 examples/flow-router/client/lib/globals.js
 create mode 100644 examples/flow-router/client/manage-users.html
 create mode 100644 examples/flow-router/client/manage-users.js
 create mode 100644 examples/flow-router/client/routing.js
 create mode 100644 examples/flow-router/client/secrets.html
 create mode 100644 examples/flow-router/client/secrets.js
 create mode 100644 examples/flow-router/model.js
 create mode 100644 examples/flow-router/polyfills.js
 create mode 100644 examples/flow-router/server/server.js

diff --git a/README.md b/README.md
index faf2adb3a9..1fa981391d 100644
--- a/README.md
+++ b/README.md
@@ -364,11 +364,12 @@ The only difference between the example apps is which routing package is used.
 View the `meteor-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
  
 
-_Iron Router_
+_Iron Router or Flow Router_
 
-Run locally:
   1. `git clone https://github.com/alanning/meteor-roles.git`
-  2. `cd meteor-roles/examples/iron-router`
+  2. either
+    * `cd meteor-roles/examples/iron-router` or
+    * `cd meteor-roles/examples/flow-router`
   3. `meteor`
   4. point browser to `http://localhost:3000`
 
@@ -376,7 +377,6 @@ Run locally:
 
 _Mini-Pages or Router_
 
-Run locally:
   1. install [Meteorite][1]
   2. `git clone https://github.com/alanning/meteor-roles.git`
   3. either
diff --git a/examples/flow-router/.meteor/.gitignore b/examples/flow-router/.meteor/.gitignore
new file mode 100644
index 0000000000..08150d000c
--- /dev/null
+++ b/examples/flow-router/.meteor/.gitignore
@@ -0,0 +1,2 @@
+local
+meteorite
diff --git a/examples/flow-router/.meteor/.id b/examples/flow-router/.meteor/.id
new file mode 100644
index 0000000000..acd117ac05
--- /dev/null
+++ b/examples/flow-router/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+12nu3d71gkxofl123c8jf
diff --git a/examples/flow-router/.meteor/packages b/examples/flow-router/.meteor/packages
new file mode 100644
index 0000000000..b4af8541bd
--- /dev/null
+++ b/examples/flow-router/.meteor/packages
@@ -0,0 +1,14 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-platform
+accounts-password
+accounts-ui
+bootstrap
+spiderable
+alanning:roles
+kadira:flow-router
+kadira:blaze-layout
+alanning:trace
diff --git a/examples/flow-router/.meteor/platforms b/examples/flow-router/.meteor/platforms
new file mode 100644
index 0000000000..8a3a35f9f6
--- /dev/null
+++ b/examples/flow-router/.meteor/platforms
@@ -0,0 +1,2 @@
+browser
+server
diff --git a/examples/flow-router/.meteor/release b/examples/flow-router/.meteor/release
new file mode 100644
index 0000000000..315c635bf3
--- /dev/null
+++ b/examples/flow-router/.meteor/release
@@ -0,0 +1 @@
+METEOR@1.1.0.3
diff --git a/examples/flow-router/.meteor/versions b/examples/flow-router/.meteor/versions
new file mode 100644
index 0000000000..8d509957fe
--- /dev/null
+++ b/examples/flow-router/.meteor/versions
@@ -0,0 +1,65 @@
+accounts-base@1.2.0
+accounts-password@1.1.1
+accounts-ui@1.1.5
+accounts-ui-unstyled@1.1.7
+alanning:roles@1.2.13
+alanning:trace@0.0.2
+autoupdate@1.2.1
+base64@1.0.3
+binary-heap@1.0.3
+blaze@2.1.2
+blaze-tools@1.0.3
+boilerplate-generator@1.0.3
+bootstrap@1.0.1
+callback-hook@1.0.3
+check@1.0.5
+coffeescript@1.0.6
+cosmos:browserify@0.5.0
+ddp@1.1.0
+deps@1.0.7
+ejson@1.0.6
+email@1.0.6
+fastclick@1.0.3
+geojson-utils@1.0.3
+html-tools@1.0.4
+htmljs@1.0.4
+http@1.1.0
+id-map@1.0.3
+jquery@1.11.3_2
+json@1.0.3
+kadira:blaze-layout@2.0.0
+kadira:flow-router@2.1.1
+launch-screen@1.0.2
+less@1.0.14
+livedata@1.0.13
+localstorage@1.0.3
+logging@1.0.7
+meteor@1.1.6
+meteor-platform@1.2.2
+minifiers@1.1.5
+minimongo@1.0.8
+mobile-status-bar@1.0.3
+mongo@1.1.0
+npm-bcrypt@0.7.8_2
+observe-sequence@1.0.6
+ordered-dict@1.0.3
+random@1.0.3
+reactive-dict@1.1.0
+reactive-var@1.0.5
+reload@1.1.3
+retry@1.0.3
+routepolicy@1.0.5
+service-configuration@1.0.4
+session@1.1.0
+sha@1.0.3
+spacebars@1.0.6
+spacebars-compiler@1.0.6
+spiderable@1.0.7
+srp@1.0.3
+templating@1.1.1
+tracker@1.0.7
+ui@1.0.6
+underscore@1.0.3
+url@1.0.4
+webapp@1.2.0
+webapp-hashing@1.0.3
diff --git a/examples/flow-router/client/client.js b/examples/flow-router/client/client.js
new file mode 100644
index 0000000000..9a4bed80f4
--- /dev/null
+++ b/examples/flow-router/client/client.js
@@ -0,0 +1,124 @@
+"use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Routing stub
+//
+// Separate routing package details from general app code.
+Meteor.navigateTo = function (path) {
+  // ...over-ridden in routing.js
+};
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// App.signout
+//
+App.signout = function () {
+  console.log('logging out...');
+  Meteor.logout(function () {
+    console.log('...done');
+    Meteor.navigateTo('/');
+  });
+};
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Patches
+//
+
+// stubs for IE
+if (!window.console) {
+  window.console = {}
+}
+if (!window.console.log) {
+  window.console.log = function (msg) {
+    $('#log').append('<br /><p>' + msg + '</p>')
+  };
+}
+
+// fix bootstrap dropdown unclickable issue on iOS
+// https://github.com/twitter/bootstrap/issues/4550
+$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
+    e.stopPropagation();
+});
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Templates
+//
+
+Template.signin.rendered = function () {
+  // auto-trigger accounts-ui login form dropdown
+  Accounts._loginButtonsSession.set('dropdownVisible', true);
+};
+
+Template.header.events({
+  // template data, if any, is available in 'this'
+  'click .btn-navbar' : openCloseNav
+});
+Template.header.helpers({
+  displayName: function () {
+    return displayName();
+  }
+});
+
+Template.noteOfTheDay.helpers({
+  note: function () {
+    return "Greetings " + displayName() + "!";
+  }
+});
+
+
+
+
+////////////////////////////////////////////////////////////////////
+// Misc helper functions
+//
+
+function displayName (user) {
+  var name;
+
+  if (!user) {
+    user = Meteor.user();
+  }
+
+  if (!user) return "<missing user>";
+
+  if (user.profile) {
+    name = user.profile.name;
+  }
+
+  if ('string' === typeof name) {
+    name = name.trim();
+  } else {
+    name = null;
+  }
+
+  if (!name && user.emails && user.emails.length > 0) {
+    name = user.emails[0].address;
+  }
+
+  return name || "<missing name>";
+}
+
+
+// insta-open/close nav rather than animate collapse.
+// this improves UX on mobile devices
+function openCloseNav (e) {
+  // Select .nav-collapse within same .navbar as current button
+  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
+
+  if (nav.height() != 0) {
+    // If it has a height, hide it
+    nav.height(0);
+  } else {
+    // If it's collapsed, show it
+    nav.height('auto');
+  }
+}
diff --git a/examples/flow-router/client/example.css b/examples/flow-router/client/example.css
new file mode 100644
index 0000000000..a7674b04dd
--- /dev/null
+++ b/examples/flow-router/client/example.css
@@ -0,0 +1,67 @@
+@media (min-width: 980px) {
+  /* wide devices - full navbar */ 
+
+  /* push down content under fixed navbar */
+  body {
+    padding-top:60px;
+    padding-bottom:40px;
+    }
+
+}
+
+
+/**
+ * front-and-center signin form
+ */
+.signin {
+  width:100%;
+  text-align:center;
+}
+.signin .login-form {
+  width:200px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+}
+.signin .login-form {
+}
+.signin .login-close-text {
+  display:none;
+}
+.signin #login-buttons {
+}
+.signin .additional-link-container {
+  display:none;
+}
+.signin .example-users {
+  width:350px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+  top:15em;
+  left:3em;
+}
+
+/**
+ * header
+ */
+#err .close {
+  float:none;
+  margin-left:1em;
+}
+
+/**
+ * note of the day
+ */
+.note {
+  margin:1em 0em;
+  padding:1em;
+  border:1px solid #ccc;
+}
+
+/**
+ * security-note
+ */
+.security-note {
+  margin-top:10em;
+}
diff --git a/examples/flow-router/client/example.html b/examples/flow-router/client/example.html
new file mode 100644
index 0000000000..c48b921e0c
--- /dev/null
+++ b/examples/flow-router/client/example.html
@@ -0,0 +1,112 @@
+<head>
+  <title>example-app</title>
+</head>
+
+<body>
+</body>
+
+<template name="signin">
+  <div class="signin">
+    <div class="login-form">
+      <h1>Sign In</h1>
+      {{> loginButtons}}
+    </div>
+
+    <div class="example-users">
+      <p>Normal User: normal@example.com | apple1</p>
+      <p>View Secrets: view@example.com | apple1</p>
+      <p>Manage Users: manage@example.com | apple1</p>
+      <p>Admin User: admin@example.com | apple1</p>
+    </div>
+  </div>
+</template>
+
+<template name="loading">
+  <h1>Loading...</h1>
+</template>
+
+<template name="awaiting-verification">
+  <h1>Awaiting email verification...</h1>
+</template>
+
+<template name="not_found">
+  <h3>404 - Not found</h3>
+</template>
+
+<template name="invalid-access">
+  <h3>403 Forbidden - Invalid Access</h3>
+</template>
+
+<template name="header">
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container">
+        <a class="btn btn-navbar">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+        <a class="brand" href="/">Roles Example App</a>
+
+        {{#if currentUser}}
+        <div class="nav-collapse collapse">
+          <ul class="nav">
+
+            <li><a href="/start">Start Page</a></li>
+
+            {{#if isInRole 'admin,view-secrets'}}
+            <li><a href="/secrets">Secrets</a></li>
+            {{/if}}
+
+            <li class="dropdown pull-right">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                {{#if isInRole 'admin,manage-users'}}
+                <li><a href="/manageUsers">Manage Users</a></li>
+                {{/if}}
+                <li><a class="signout" href="/signout">Sign out</a></li>
+              </ul>
+            </li>
+
+          </ul>
+        </div>
+        {{/if}}
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<template name="noteOfTheDay">
+<p>Note of the day: {{note}}</p>
+</template>
+
+<template name="start">
+  <div class="page row">
+    <div class="offset4 span8">
+
+      <p class="note">All logged-in users will see this page in their header nav.</p>
+
+      <h2>Start Page</h2>
+
+      {{> noteOfTheDay}}
+
+      <div>
+        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
+      </div>
+          
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="securityNote">
+  <div class="security-note">
+    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
+    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
+    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
+    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
+    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
+    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
+  </div>
+</template>
diff --git a/examples/flow-router/client/layouts.html b/examples/flow-router/client/layouts.html
new file mode 100644
index 0000000000..ed583e9877
--- /dev/null
+++ b/examples/flow-router/client/layouts.html
@@ -0,0 +1,25 @@
+<template name="mainLayout">
+  {{> header}}
+
+  {{#if currentUser}}
+    {{#if notVerified}}
+      {{> awaitingVerification}}
+    {{else}}
+      {{> Template.dynamic template=content}}
+    {{/if}}
+  {{else}}
+    {{#if loggingIn}}
+      {{> loading}}
+    {{else}}
+      {{> signin}}
+    {{/if}}
+  {{/if}}
+
+  <div id="log"></div>
+</template>
+
+<template name="noHeaderLayout">
+  {{> Template.dynamic template=content}}
+
+  <div id="log"></div>
+</template>
diff --git a/examples/flow-router/client/layouts.js b/examples/flow-router/client/layouts.js
new file mode 100644
index 0000000000..6e66fc6f02
--- /dev/null
+++ b/examples/flow-router/client/layouts.js
@@ -0,0 +1,13 @@
+Template.mainLayout.helpers({
+  notVerified: function () { 
+    var user = Meteor.user()
+
+    return !emailVerified(user)
+  }
+})
+
+function emailVerified (user) {
+  return _.some(user.emails, function (email) {
+    return email.verified
+  })
+}
diff --git a/examples/flow-router/client/lib/globals.js b/examples/flow-router/client/lib/globals.js
new file mode 100644
index 0000000000..443d048ba8
--- /dev/null
+++ b/examples/flow-router/client/lib/globals.js
@@ -0,0 +1,2 @@
+// The application
+App = {};
diff --git a/examples/flow-router/client/manage-users.html b/examples/flow-router/client/manage-users.html
new file mode 100644
index 0000000000..000175204e
--- /dev/null
+++ b/examples/flow-router/client/manage-users.html
@@ -0,0 +1,34 @@
+<template name="manageUsers">
+  <div class="manage-users row">
+    <div class="offset4 span8">
+
+      <p class="note">
+        Only Admins and those with the 'manage-users' role
+        will see this page in their nav menu.
+      </p>
+
+      <h2>Manage Users</h2>
+
+      <br />
+
+      <h3>Current Users</h3>
+
+      {{#if Template.subscriptionsReady}}
+        <!-- This is displayed when all data is ready. -->
+        {{> userList}}
+      {{else}}
+        Loading...
+      {{/if}}
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="userList">
+  <ul>
+    {{#each users}}
+    <li>{{email}} - Roles: {{roles}}</li>
+    {{/each}}
+  </ul>
+</template>
diff --git a/examples/flow-router/client/manage-users.js b/examples/flow-router/client/manage-users.js
new file mode 100644
index 0000000000..7fdf0b519c
--- /dev/null
+++ b/examples/flow-router/client/manage-users.js
@@ -0,0 +1,19 @@
+Template.manageUsers.onCreated(function () {
+  this.subscribe("users")
+})
+
+Template.userList.helpers({
+  users: function () {
+    return Meteor.users.find()
+  },
+  email: function () {
+    return this.emails[0].address
+  },
+  roles: function () {
+    if (!this.roles) {
+      return '<none>'
+    }
+
+    return this.roles.join(',')
+  }
+})
diff --git a/examples/flow-router/client/routing.js b/examples/flow-router/client/routing.js
new file mode 100644
index 0000000000..500b3b33c6
--- /dev/null
+++ b/examples/flow-router/client/routing.js
@@ -0,0 +1,52 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////////////
+// Routing
+//
+
+// override with mini-pages navigate method
+Meteor.navigateTo = function (path) {
+  FlowRouter.go(path)
+}
+
+
+FlowRouter.notFound = {
+  action: function () {
+    BlazeLayout.render("noHeaderLayout", {content: "not_found"})
+  }
+}
+
+FlowRouter.route('/', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'start'})
+  }
+})
+
+FlowRouter.route('/start', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'start'})
+  }
+})
+
+FlowRouter.route('/signin', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'signin'})
+  }
+})
+
+FlowRouter.route('/secrets', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'secrets'})
+  }
+})
+
+FlowRouter.route('/manageUsers', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'manageUsers'})
+  }
+})
+
+FlowRouter.route('/signout', {
+    action: App.signout
+})
diff --git a/examples/flow-router/client/secrets.html b/examples/flow-router/client/secrets.html
new file mode 100644
index 0000000000..fb0c65feba
--- /dev/null
+++ b/examples/flow-router/client/secrets.html
@@ -0,0 +1,30 @@
+<template name="secrets">
+  <div class="secrets row">
+    <div class="offset4 span8">
+
+      <p class="note">
+        Only Admins and those with the 'view-secrets'
+        role will see this page in their header nav.
+      </p>
+
+      <h2>Secrets!</h2>
+
+      {{#if Template.subscriptionsReady}}
+        <!-- This is displayed when all data is ready. -->
+        {{> secretList}}
+      {{else}}
+        Loading...
+      {{/if}}
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="secretList">
+  <ul>
+  {{#each secrets}}
+    <li><p>{{secret}}</p></li>
+  {{/each}}
+  </ul>
+</template>
diff --git a/examples/flow-router/client/secrets.js b/examples/flow-router/client/secrets.js
new file mode 100644
index 0000000000..dc1da2c604
--- /dev/null
+++ b/examples/flow-router/client/secrets.js
@@ -0,0 +1,9 @@
+Template.secrets.onCreated(function () {
+  this.subscribe("secrets")
+})
+
+Template.secretList.helpers({
+  secrets: function () {
+    return Meteor.secrets.find()
+  }
+})
diff --git a/examples/flow-router/model.js b/examples/flow-router/model.js
new file mode 100644
index 0000000000..be8a6c57f7
--- /dev/null
+++ b/examples/flow-router/model.js
@@ -0,0 +1,9 @@
+;(function () {
+
+  "use strict";
+
+// run on both the server and the client
+
+Meteor.secrets = new Meteor.Collection('secrets');
+
+}());
diff --git a/examples/flow-router/polyfills.js b/examples/flow-router/polyfills.js
new file mode 100644
index 0000000000..ad286f3645
--- /dev/null
+++ b/examples/flow-router/polyfills.js
@@ -0,0 +1,11 @@
+;(function () {
+
+  "use strict";
+
+  if(typeof String.prototype.trim !== 'function') {
+    String.prototype.trim = function() {
+      return this.replace(/^\s+|\s+$/g, ''); 
+    }
+  }
+
+}());
diff --git a/examples/flow-router/server/server.js b/examples/flow-router/server/server.js
new file mode 100644
index 0000000000..3629a214ef
--- /dev/null
+++ b/examples/flow-router/server/server.js
@@ -0,0 +1,107 @@
+;(function () {
+
+  "use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Startup
+//
+
+Meteor.startup(function () {
+
+  ////////////////////////////////////////////////////////////////////
+  // Create Test Secrets
+  //
+    
+  if (Meteor.secrets.find().fetch().length === 0) {
+    Meteor.secrets.insert({secret:"ec2 password: apple2"});
+    Meteor.secrets.insert({secret:"domain registration pw: apple3"});
+  }
+
+
+  ////////////////////////////////////////////////////////////////////
+  // Create Test Users
+  //
+
+  if (Meteor.users.find().fetch().length === 0) {
+
+    console.log('Creating users: ');
+
+    var users = [
+        {name:"Normal User",email:"normal@example.com",roles:[]},
+        {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
+        {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
+        {name:"Admin User",email:"admin@example.com",roles:['admin']}
+      ];
+
+    _.each(users, function (userData) {
+      var id,
+          user;
+      
+      console.log(userData);
+
+      id = Accounts.createUser({
+        email: userData.email,
+        password: "apple1",
+        profile: { name: userData.name }
+      });
+
+      // email verification
+      Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
+
+      Roles.addUsersToRoles(id, userData.roles);
+    
+    });
+  }
+
+
+
+  ////////////////////////////////////////////////////////////////////
+  // Prevent non-authorized users from creating new users
+  //
+
+  Accounts.validateNewUser(function (user) {
+    var loggedInUser = Meteor.user();
+
+    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
+      return true;
+    }
+
+    throw new Meteor.Error(403, "Not authorized to create new users");
+  });
+
+});
+
+
+////////////////////////////////////////////////////////////////////
+// Publish
+//
+
+
+// Authorized users can view secrets
+Meteor.publish("secrets", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
+
+  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
+    console.log('publishing secrets', this.userId)
+    return Meteor.secrets.find();
+  }
+
+  this.stop();
+  return;
+});
+
+// Authorized users can manage user accounts
+Meteor.publish("users", function () {
+  var user = Meteor.users.findOne({_id:this.userId});
+
+  if (Roles.userIsInRole(user, ["admin","manage-users"])) {
+    console.log('publishing users', this.userId)
+    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
+  } 
+
+  this.stop();
+  return;
+});
+
+}());

From 1f0dcf4d928dc735ffe0ab6dd2447364adf685ea Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Tue, 11 Aug 2015 23:58:45 +0800
Subject: [PATCH 0141/1140] iron-router, flow-router examples now use
 template-level subscriptions

---
 examples/iron-router/.meteor/packages         |  1 +
 examples/iron-router/.meteor/versions         |  1 +
 examples/iron-router/client/client.js         | 40 +----------------
 examples/iron-router/client/example.html      | 43 +------------------
 examples/iron-router/client/manage-users.html | 34 +++++++++++++++
 examples/iron-router/client/manage-users.js   | 19 ++++++++
 examples/iron-router/client/routing.js        | 19 ++++----
 examples/iron-router/client/secrets.html      | 30 +++++++++++++
 examples/iron-router/client/secrets.js        |  9 ++++
 9 files changed, 105 insertions(+), 91 deletions(-)
 create mode 100644 examples/iron-router/client/manage-users.html
 create mode 100644 examples/iron-router/client/manage-users.js
 create mode 100644 examples/iron-router/client/secrets.html
 create mode 100644 examples/iron-router/client/secrets.js

diff --git a/examples/iron-router/.meteor/packages b/examples/iron-router/.meteor/packages
index ee859b51cd..abb04893f8 100644
--- a/examples/iron-router/.meteor/packages
+++ b/examples/iron-router/.meteor/packages
@@ -10,3 +10,4 @@ bootstrap
 spiderable
 alanning:roles
 iron:router
+alanning:trace
diff --git a/examples/iron-router/.meteor/versions b/examples/iron-router/.meteor/versions
index 63b5ff6846..336edb1cf3 100644
--- a/examples/iron-router/.meteor/versions
+++ b/examples/iron-router/.meteor/versions
@@ -3,6 +3,7 @@ accounts-password@1.1.1
 accounts-ui@1.1.5
 accounts-ui-unstyled@1.1.7
 alanning:roles@1.2.13
+alanning:trace@0.0.2
 autoupdate@1.2.1
 base64@1.0.3
 binary-heap@1.0.3
diff --git a/examples/iron-router/client/client.js b/examples/iron-router/client/client.js
index 2ecee3cb25..3ca78a0ded 100644
--- a/examples/iron-router/client/client.js
+++ b/examples/iron-router/client/client.js
@@ -1,6 +1,4 @@
-;(function () {
-
-  "use strict";
+"use strict";
 
 
 ////////////////////////////////////////////////////////////////////
@@ -55,18 +53,7 @@ $(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
 // Subscriptions
 //
 
-Deps.autorun(function () {
-  // register dependency on user so subscriptions
-  // will update once user has logged in
-  var user = Meteor.user();
-
-  // secrets
-  Meteor.subscribe('secrets');
-
-  // users, for manage-users page
-  Meteor.subscribe('users');
-});
-
+// NOTE: Subscriptions are handled at the template level.
 
 
 
@@ -89,32 +76,12 @@ Template.header.helpers({
   }
 });
 
-Template.secrets.helpers({
-  secrets: function () {
-    return Meteor.secrets.find();
-  }
-});
-
 Template.noteOfTheDay.helpers({
   note: function () {
     return "Greetings " + displayName() + "!";
   }
 });
 
-Template.manage.helpers({
-  users: function () {
-    return Meteor.users.find();
-  },
-  email: function () {
-    return this.emails[0].address;
-  },
-  roles: function () {
-    if (!this.roles) return '<none>';
-    return this.roles.join(',');
-  }
-});
-
-
 
 
 
@@ -163,6 +130,3 @@ function openCloseNav (e) {
     nav.height('auto');
   }
 }
-
-
-}());
diff --git a/examples/iron-router/client/example.html b/examples/iron-router/client/example.html
index 573cea88b7..935efb8c61 100644
--- a/examples/iron-router/client/example.html
+++ b/examples/iron-router/client/example.html
@@ -74,7 +74,7 @@
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
               <ul class="dropdown-menu">
                 {{#if isInRole 'admin,manage-users'}}
-                <li><a href="/manage">Manage Users</a></li>
+                <li><a href="/manageUsers">Manage Users</a></li>
                 {{/if}}
                 <li><a class="signout" href="/signout">Sign out</a></li>
               </ul>
@@ -110,47 +110,6 @@
   </div>
 </template>
 
-<template name="secrets">
-  <div class="secrets row">
-    <div class="offset4 span8">
-
-      <p class="note">Only Admins and those with the 'view-secrets' role will see this page in their header nav.</p>
-
-      <h2>Secrets!</h2>
-
-      <ul>
-      {{#each secrets}}
-        <li><p>{{secret}}</p></li>
-      {{/each}}
-      </ul>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="manage">
-  <div class="manage-users row">
-    <div class="offset4 span8">
-
-      <p class="note">Only Admins and those with the 'manage-users' role will see this page in their nav menu.</p>
-
-      <h2>Manage Users</h2>
-
-      <br />
-
-      <h3>Current Users</h3>
-      <ul>
-      {{#each users}}
-      <li>{{email}} - Roles: {{roles}}</li>
-      {{/each}}
-      </ul>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
 <template name="securityNote">
   <div class="security-note">
     <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
diff --git a/examples/iron-router/client/manage-users.html b/examples/iron-router/client/manage-users.html
new file mode 100644
index 0000000000..000175204e
--- /dev/null
+++ b/examples/iron-router/client/manage-users.html
@@ -0,0 +1,34 @@
+<template name="manageUsers">
+  <div class="manage-users row">
+    <div class="offset4 span8">
+
+      <p class="note">
+        Only Admins and those with the 'manage-users' role
+        will see this page in their nav menu.
+      </p>
+
+      <h2>Manage Users</h2>
+
+      <br />
+
+      <h3>Current Users</h3>
+
+      {{#if Template.subscriptionsReady}}
+        <!-- This is displayed when all data is ready. -->
+        {{> userList}}
+      {{else}}
+        Loading...
+      {{/if}}
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="userList">
+  <ul>
+    {{#each users}}
+    <li>{{email}} - Roles: {{roles}}</li>
+    {{/each}}
+  </ul>
+</template>
diff --git a/examples/iron-router/client/manage-users.js b/examples/iron-router/client/manage-users.js
new file mode 100644
index 0000000000..7fdf0b519c
--- /dev/null
+++ b/examples/iron-router/client/manage-users.js
@@ -0,0 +1,19 @@
+Template.manageUsers.onCreated(function () {
+  this.subscribe("users")
+})
+
+Template.userList.helpers({
+  users: function () {
+    return Meteor.users.find()
+  },
+  email: function () {
+    return this.emails[0].address
+  },
+  roles: function () {
+    if (!this.roles) {
+      return '<none>'
+    }
+
+    return this.roles.join(',')
+  }
+})
diff --git a/examples/iron-router/client/routing.js b/examples/iron-router/client/routing.js
index e6857c395b..71beb41894 100644
--- a/examples/iron-router/client/routing.js
+++ b/examples/iron-router/client/routing.js
@@ -79,19 +79,16 @@ Router.route('/', {
   template: 'start',
   before: [filters.authenticate, filters.testFilter]
 })
-
 Router.route('/start', {
   before: [filters.authenticate, filters.testFilter]
 })
 
+Router.route('/secrets', {
+  before: filters.authenticate
+})
+Router.route('/manageUsers', {
+  before: filters.authenticate
+})
+
 Router.route('/signin')
-
-Router.route('secrets', {
-  before: filters.authenticate
-})
-
-Router.route('manage', {
-  before: filters.authenticate
-})
-
-Router.route('signout', App.signout)
+Router.route('/signout', App.signout)
diff --git a/examples/iron-router/client/secrets.html b/examples/iron-router/client/secrets.html
new file mode 100644
index 0000000000..fb0c65feba
--- /dev/null
+++ b/examples/iron-router/client/secrets.html
@@ -0,0 +1,30 @@
+<template name="secrets">
+  <div class="secrets row">
+    <div class="offset4 span8">
+
+      <p class="note">
+        Only Admins and those with the 'view-secrets'
+        role will see this page in their header nav.
+      </p>
+
+      <h2>Secrets!</h2>
+
+      {{#if Template.subscriptionsReady}}
+        <!-- This is displayed when all data is ready. -->
+        {{> secretList}}
+      {{else}}
+        Loading...
+      {{/if}}
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="secretList">
+  <ul>
+  {{#each secrets}}
+    <li><p>{{secret}}</p></li>
+  {{/each}}
+  </ul>
+</template>
diff --git a/examples/iron-router/client/secrets.js b/examples/iron-router/client/secrets.js
new file mode 100644
index 0000000000..dc1da2c604
--- /dev/null
+++ b/examples/iron-router/client/secrets.js
@@ -0,0 +1,9 @@
+Template.secrets.onCreated(function () {
+  this.subscribe("secrets")
+})
+
+Template.secretList.helpers({
+  secrets: function () {
+    return Meteor.secrets.find()
+  }
+})

From f70bf7c9a350a4526fc54406308766c5dd05a0d7 Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Wed, 12 Aug 2015 00:13:02 +0800
Subject: [PATCH 0142/1140] Mention how the `Meteor.roles` collection is not
 used functionally

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1fa981391d..eb66425ff9 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,9 @@ All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1
 
 Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign to a user and can check for later.
 
-You can have traditional roles like, "admin" or "webmaster", or you can assign more granular permissions such as, "view-secrets" or "manage-users".  Often times more granular is actually better because you are able to handle all those pesky edge cases that come up in real life usage without creating a ton of higher-level 'roles'.  To the roles package, its all strings.
+You can have traditional roles like, "admin" or "webmaster", or you can assign more granular permissions such as, "view-secrets", "users.view", or "users.manage".  Often times more granular is actually better because you are able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level 'roles'.  To the roles package, its all strings.
 
-Sometimes its useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  Users can have one set of permissions in group A and another set of permissions in group B.  The next section gives an example of this using soccer/football teams as groups.
+Sometimes its useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is clearer.  Users can have one set of permissions in group A and another set of permissions in group B.  The next section gives an example of this using soccer/football teams as groups.
 
 <br />
 
@@ -91,7 +91,7 @@ Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
 <em>Note: See the `addUsersToRoles` [documentation](http://alanning.github.io/meteor-roles/classes/Roles.html) for restrictions on group names.</em>
 
 
-†† `Meteor.roles` is not published by default.  Here's how you would publish it to every client without needing a subscription:
+†† The `Meteor.roles` collection is currently only for convenience on the UI-side and is not used functionally within this package.  In the future it may be used to support role hierarchies.  Since it is not currently required, it is not automatically published to the client.  Here's how you would publish it to every client without needing a subscription:
 
 ```js
 // in server/publish.js

From d5f596e47bdff5e02a2a9cfc4c854ad911f55c2e Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Wed, 19 Aug 2015 13:41:09 -0400
Subject: [PATCH 0143/1140] Add section explaining groups

---
 README.md | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index eb66425ff9..00f34753a6 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 * [Contributors](#user-content-contributors)
 * [Authorization](#user-content-authorization)
 * [Permissions vs roles](#user-content-naming)
+* [What are "groups"?](#groups)
 * [Changes to default Meteor](#user-content-changes)
 * [Installation](#user-content-installing)
 * [Usage examples](#user-content-usage)
@@ -51,13 +52,43 @@ All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1
 <br />
 
 <a name="naming">
-### What's in a name...
+### Permissions vs roles  (or What's in a name...)
 
-Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign to a user and can check for later.
+Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign on a user and which you can check for later.
 
 You can have traditional roles like, "admin" or "webmaster", or you can assign more granular permissions such as, "view-secrets", "users.view", or "users.manage".  Often times more granular is actually better because you are able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level 'roles'.  To the roles package, its all strings.
 
-Sometimes its useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is clearer.  Users can have one set of permissions in group A and another set of permissions in group B.  The next section gives an example of this using soccer/football teams as groups.
+<br />
+
+<a name="groups">
+### What are "groups"?
+
+Sometimes its useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is more clear.  Users can have one set of permissions in group A and another set of permissions in group B.  Let's go through an example of this using soccer/football teams as groups.
+
+```
+Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com')
+Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
+
+Roles.userIsInRole(joesUserId, 'manage-team', 'manchester-united.com')  // => true
+Roles.userIsInRole(joesUserId, 'manage-team', 'real-madrid.com')  // => false
+```
+
+In this example we can see that Joe manages Manchester United and plays for Real Madrid.  By using groups, we can assign permissions independently and make sure that they don't get mixed up between groups.
+
+NOTE: If you use groups for _ANY_ of your users, you should use groups for _ALL_ of your users.  This is due to how the roles package stores the roles internally in the database.  In roles 2.0, you won't need to worry about this anymore, we'll have a default group that will hold roles not assigned to a specific group.
+
+Now, let's take a look at how to use the Global Group.  Say we want to give Joe permission to do something across all of our groups.  That's what the Global Group is for:
+
+```
+Roles.addUsersToRoles(joesUserId, 'super-admin', Roles.GLOBAL_GROUP)
+
+if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.com')) {
+
+  // True!  Even though Joe doesn't manage Real Madrid, he is 'super-admin' in
+  // the Global Group so this check succeeds.
+
+}
+```
 
 <br />
 

From e40a60c4a920c8f9baf7249647cfb9865f4ce92e Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Mon, 31 Aug 2015 14:05:23 -0400
Subject: [PATCH 0144/1140] Clearer client-side example on groups vs non-groups
 usage

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 00f34753a6..dc2e027ead 100644
--- a/README.md
+++ b/README.md
@@ -329,6 +329,9 @@ since Meteor bundles the same client-side code to all users.  Providing the Role
 
 NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js` file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
 
+
+To check for permissions when not using groups:
+
 ```handlebars
 <!-- client/myApp.html -->
 
@@ -343,7 +346,8 @@ NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted
 </template>
 ```
 
-You can also limit the check to a specific group:
+To check for permissions when using groups:
+
 ```handlebars
 <!-- client/myApp.html -->
 

From dfd967e1e2ea27dc20b34e2bd17f38de70ebed72 Mon Sep 17 00:00:00 2001
From: Connor Hallett <connor.hallett@gmail.com>
Date: Sun, 27 Sep 2015 20:45:47 -0400
Subject: [PATCH 0145/1140] Update package.js

Add dependency for check package
---
 roles/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/package.js b/roles/package.js
index 4155f55b8e..15fd21a96a 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "1.2.12",
+  version: "1.2.13",
   git: "https://github.com/alanning/meteor-roles.git",
   name: "alanning:roles"
 });
@@ -8,7 +8,7 @@ Package.describe({
 Package.on_use(function (api) {
   api.versionsFrom && api.versionsFrom("METEOR@0.9.0");
   var both = ['client', 'server'];
-  api.use(['underscore', 'accounts-base'], both);
+  api.use(['underscore', 'accounts-base', 'check'], both);
   api.use(['handlebars'], 'client', {weak: true});
 
   // This is needed due to Meteor Issue #1358

From 4e8cc93dc52abb2c7ce968c44b8bb937841141f6 Mon Sep 17 00:00:00 2001
From: Connor Hallett <connor.hallett@gmail.com>
Date: Mon, 28 Sep 2015 13:39:31 -0400
Subject: [PATCH 0146/1140] Update package.js

---
 roles/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/package.js b/roles/package.js
index 15fd21a96a..011938cd41 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -9,7 +9,7 @@ Package.on_use(function (api) {
   api.versionsFrom && api.versionsFrom("METEOR@0.9.0");
   var both = ['client', 'server'];
   api.use(['underscore', 'accounts-base', 'check'], both);
-  api.use(['handlebars'], 'client', {weak: true});
+  api.use(['blaze-html-templates', 'handlebars'], 'client', {weak: true});
 
   // This is needed due to Meteor Issue #1358
   //   https://github.com/meteor/meteor/issues/1358

From dc2e34e6c5b4df37d5145cbab66ff7abb6d1d36b Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 01:10:39 -0400
Subject: [PATCH 0147/1140] Fix #125 - make Meteor 1.2 compatible; drop compat
 with Meteor pre-0.9

---
 README.md             | 66 ++++++++++++++++++++++-------------------
 roles/package.js      | 69 ++++++++-----------------------------------
 roles/roles_client.js | 46 ++++++++++++++++++++++++-----
 3 files changed, 86 insertions(+), 95 deletions(-)

diff --git a/README.md b/README.md
index dc2e027ead..f27a9a608b 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 Thanks to:
 
+  * [@challett](https://github.com/challett)
+  * [@dandv](https://github.com/dandv)
   * [@aldeed](https://github.com/aldeed)
   * [@kevb](https://github.com/kevb)
   * [@zimme](https://github.com/zimme)
@@ -38,6 +40,7 @@ Thanks to:
 
 <br />
 
+
 <a name="authorization">
 ### Authorization
 
@@ -49,6 +52,7 @@ All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1
 
     v1.2.0 - adds the special Roles.GLOBAL_GROUP, used to provide blanket permissions across all groups
 
+
 <br />
 
 <a name="naming">
@@ -56,14 +60,14 @@ All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1
 
 Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign on a user and which you can check for later.
 
-You can have traditional roles like, "admin" or "webmaster", or you can assign more granular permissions such as, "view-secrets", "users.view", or "users.manage".  Often times more granular is actually better because you are able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level 'roles'.  To the roles package, its all strings.
+You can have traditional roles like, "admin" or "webmaster", or you can assign more granular permissions such as, "view-secrets", "users.view", or "users.manage".  Often times more granular is actually better because you are able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level 'roles'.  To the roles package, it's all strings.
 
 <br />
 
 <a name="groups">
 ### What are "groups"?
 
-Sometimes its useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is more clear.  Users can have one set of permissions in group A and another set of permissions in group B.  Let's go through an example of this using soccer/football teams as groups.
+Sometimes it's useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is more clear.  Users can have one set of permissions in group A and another set of permissions in group B.  Let's go through an example of this using soccer/football teams as groups.
 
 ```
 Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com')
@@ -136,7 +140,7 @@ Meteor.publish(null, function (){
 <a name="installing">
 ### Installing
 
-#### Meteor 0.9+ (new packaging system)
+#### Meteor 0.9 - latest
 
 1. Add one of the built-in accounts packages so the Meteor.users collection exists.  From a command prompt:
     ```bash
@@ -193,29 +197,29 @@ Here are some potential use cases:
 
 Add users to roles:
 ```js
-  var users = [
+var users = [
       {name:"Normal User",email:"normal@example.com",roles:[]},
       {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
       {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
       {name:"Admin User",email:"admin@example.com",roles:['admin']}
     ];
 
-  _.each(users, function (user) {
-    var id;
-    
-    id = Accounts.createUser({
-      email: user.email,
-      password: "apple1",
-      profile: { name: user.name }
-    });
-
-    if (user.roles.length > 0) {
-      // Need _id of existing user record so this call must come 
-      // after `Accounts.createUser` or `Accounts.onCreate`
-      Roles.addUsersToRoles(id, user.roles, 'default-group');
-    }
+_.each(users, function (user) {
+  var id;
   
+  id = Accounts.createUser({
+    email: user.email,
+    password: "apple1",
+    profile: { name: user.name }
   });
+
+  if (user.roles.length > 0) {
+    // Need _id of existing user record so this call must come 
+    // after `Accounts.createUser` or `Accounts.onCreate`
+    Roles.addUsersToRoles(id, user.roles, 'default-group');
+  }
+
+});
 ```
 
 <br />
@@ -247,16 +251,16 @@ Meteor.publish('secrets', function (group) {
 
 Prevent non-authorized users from creating new users:
 ```js
-  Accounts.validateNewUser(function (user) {
-    var loggedInUser = Meteor.user();
+Accounts.validateNewUser(function (user) {
+  var loggedInUser = Meteor.user();
 
-    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
-      // NOTE: This example assumes the user is not using groups. 
-      return true;
-    }
+  if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
+    // NOTE: This example assumes the user is not using groups. 
+    return true;
+  }
 
-    throw new Meteor.Error(403, "Not authorized to create new users");
-  });
+  throw new Meteor.Error(403, "Not authorized to create new users");
+});
 ```
 
 <br />
@@ -278,7 +282,7 @@ Meteor.methods({
 
     if (!loggedInUser ||
         !Roles.userIsInRole(loggedInUser, 
-                            ['manage-users','support-staff'], group)) {
+                            ['manage-users', 'support-staff'], group)) {
       throw new Meteor.Error(403, "Access denied")
     }
 
@@ -309,7 +313,7 @@ Meteor.methods({
 
     if (!loggedInUser ||
         !Roles.userIsInRole(loggedInUser, 
-                            ['manage-users','support-staff'], group)) {
+                            ['manage-users', 'support-staff'], group)) {
       throw new Meteor.Error(403, "Access denied")
     }
 
@@ -324,7 +328,7 @@ Meteor.methods({
 
 Client javascript has access to all the same Roles functions as the server with the addition of a `isInRole` handlebars helper which is automatically registered by the Roles package.
 
-Like all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
+As with all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
 since Meteor bundles the same client-side code to all users.  Providing the Roles functions client-side also allows for latency compensation during Meteor method calls.
 
 NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js` file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
@@ -394,7 +398,7 @@ The `examples` directory contains Meteor apps which show off the following featu
 * Client-side routing
 
 
-The only difference between the example apps is which routing package is used.
+The only difference among the example apps is which routing package is used.
 
 View the `meteor-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
  
@@ -410,7 +414,7 @@ _Iron Router or Flow Router_
 
 <br />
 
-_Mini-Pages or Router_
+_Deprecated routing packages: Mini-Pages or Router_
 
   1. install [Meteorite][1]
   2. `git clone https://github.com/alanning/meteor-roles.git`
diff --git a/roles/package.js b/roles/package.js
index 011938cd41..1ce25b7fb5 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -1,75 +1,32 @@
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "1.2.13",
+  version: "1.2.14",
   git: "https://github.com/alanning/meteor-roles.git",
   name: "alanning:roles"
 });
 
-Package.on_use(function (api) {
-  api.versionsFrom && api.versionsFrom("METEOR@0.9.0");
+Package.onUse(function (api) {
   var both = ['client', 'server'];
-  api.use(['underscore', 'accounts-base', 'check'], both);
-  api.use(['blaze-html-templates', 'handlebars'], 'client', {weak: true});
 
-  // This is needed due to Meteor Issue #1358
-  //   https://github.com/meteor/meteor/issues/1358
-  // The 'weak' flag doesn't work with packages that aren't 
-  // in meteor's internal cache (ie. non-core packages)
-  if(uiExists()) {
-    api.use(['ui'], 'client', {weak: true});
-  }
+  api.versionsFrom && api.versionsFrom("METEOR@1.2.0.2");
+
+  api.use(['underscore', 'accounts-base', 'check'], both);
+  api.use(['blaze'], 'client', {weak: true});
 
   api.export && api.export('Roles');
 
-  api.add_files('roles_server.js', 'server');
-  api.add_files('roles_common.js', both);
-  api.add_files('roles_client.js', 'client');
+  api.addFiles('roles_server.js', 'server');
+  api.addFiles('roles_common.js', both);
+  api.addFiles('roles_client.js', 'client');
 });
 
-Package.on_test(function (api) {
+Package.onTest(function (api) {
   var both = ['client', 'server'];
 
   // `accounts-password` is included so `Meteor.users` exists
 
-  if (api.versionsFrom) {
-    api.use(['alanning:roles','accounts-password','tinytest'], both);
-  } else {
-    api.use(['roles','accounts-password','tinytest'], both);
-  }
+  api.use(['alanning:roles','accounts-password','tinytest'], both);
 
-  api.add_files('tests/client.js', 'client');
-  api.add_files('tests/server.js', 'server');
+  api.addFiles('tests/client.js', 'client');
+  api.addFiles('tests/server.js', 'server');
 });
-
-// workaround for meter issue #1358
-// https://github.com/meteor/meteor/issues/1358
-function uiExists() {
-  var fs = Npm.require('fs'),
-      path = Npm.require('path'),
-      meteorPackages;
-
-  try {
-    meteorPackages = fs.readFileSync(path.resolve('.meteor/packages'), 'utf8');
-  } catch (ex) {
-    return false;
-  }
-
-  if (!meteorPackages) {
-    return false;
-  }
-
-  if (/^\s*ui\s*$/m.test(meteorPackages)) {
-    // definitely there
-    return true;
-  }
-
-  //if (/^\s*standard-app-packages\s*$/m.test(meteorPackages)) {
-    // The ui package may or may _not_ be there...
-    // Releases before 0.8.0 had standard-app-packages but not
-    // ui.  Without weak references working properly, there is 
-    // no good way to detect the inclusion of the ui package in
-    // bundled apps.
-  //}
-
-  return false;
-}
diff --git a/roles/roles_client.js b/roles/roles_client.js
index 127179c6ad..19207b8d90 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -1,5 +1,7 @@
 ;(function () {
 
+"use strict"
+
 /**
  * Convenience functions for use on client.
  *
@@ -10,6 +12,25 @@
  * @module UIHelpers
  */
 
+////////////////////////////////////////////////////////////
+// Debugging helpers
+//
+// Run this in your browser console to turn on debugging
+// for this package:
+//
+//   localstorage.setItem('Roles.debug', true)
+//
+Roles.debug = false
+
+if (localStorage) {
+  var temp = localStorage.getItem("Roles.debug")
+
+  if ('undefined' !== typeof temp) {
+    Roles.debug = !!temp
+  }
+}
+
+
 ////////////////////////////////////////////////////////////
 // UI helpers
 //
@@ -69,16 +90,25 @@ Roles._uiHelpers = {
   }
 }
 
-if (Package.ui) {
+
+
+////////////////////////////////////////////////////////////
+// Register UI helpers
+//
+
+if (Roles.debug && console.log) {
+  console.log("[roles] Roles.debug =", Roles.debug)
+}
+
+if ('undefined' !== typeof Package.blaze &&
+    'undefined' !== typeof Package.blaze.Blaze &&
+    'function'  === typeof Package.blaze.Blaze.registerHelper) {
   _.each(Roles._uiHelpers, function (func, name) {
-    Package.ui.UI.registerHelper(name, func) 
+    if (Roles.debug && console.log) {
+      console.log("[roles] registering Blaze helper '" + name + "'")
+    }
+    Package.blaze.Blaze.registerHelper(name, func) 
   })
-} else if (Package.handlebars) {
-  _.each(Roles._uiHelpers, function (func, name) {
-    Package.handlebars.Handlebars.registerHelper(name, func)
-  })
-} else {
-  console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found')
 }
 
 }());

From 37da24406d7c8c3e658588eddef630a1a938cce2 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 01:17:13 -0400
Subject: [PATCH 0148/1140] drop pre-Mongo global back-compat

---
 roles/roles_common.js | 6 ------
 roles/roles_server.js | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index acf12b0695..d25dcc1459 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1,11 +1,5 @@
 ;(function () {
 
-/**
- * Eliminate Meteor.Collection deprecation warning while maintaining
- * backwards compatibility
- */
-var Mongo = Mongo || _.pick(Meteor,'Collection');
-
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 4a50f7c404..33f2130baa 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,11 +1,5 @@
 ;(function () {
 
-/**
- * Eliminate Meteor.Collection deprecation warning while maintaining
- * backwards compatibility
- */
-var Mongo = Mongo || _.pick(Meteor,'Collection');
-
 /**
  * Roles collection documents consist only of an id and a role name.
  *   ex: { _id:<uuid>, name: "admin" }

From 6b6b93a3425b1a81298fbfc677dbfecb46d7e644 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 01:23:23 -0400
Subject: [PATCH 0149/1140] reword description of new options argument to
 getUsersInRole

---
 roles/roles_common.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 8f206a2488..84b403072f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -432,8 +432,8 @@ _.extend(Roles, {
    *                            specified but need not have _all_ roles.
    * @param {String} [group] Optional name of group to restrict roles to.
    *                         User's Roles.GLOBAL_GROUP will also be checked.
-   * @param {Object} [options] Optional set options identical to what you may
-   *                         pass to the Collection.find method.
+   * @param {Object} [options] Optional options which are passed directly
+   *                           through to `Meteor.users.find(query, options)`
    * @return {Cursor} cursor of users in role
    */
   getUsersInRole: function (role, group, options) {

From a4d807e71b69abdbf7fd9a3ae3b841842ac538f4 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 02:25:03 -0400
Subject: [PATCH 0150/1140] Fix #61 - name publish function; auto-subscribe
 clients

---
 roles/client/debug.js                         | 21 ++++++++++++
 roles/client/subscriptions.js                 | 11 +++++++
 .../{roles_client.js => client/uiHelpers.js}  | 22 -------------
 roles/package.js                              | 20 +++++++++---
 roles/roles_common.js                         | 32 +++++++++++++------
 roles/roles_server.js                         | 26 +++++++++------
 roles/tests/server.js                         |  8 +++--
 7 files changed, 91 insertions(+), 49 deletions(-)
 create mode 100644 roles/client/debug.js
 create mode 100644 roles/client/subscriptions.js
 rename roles/{roles_client.js => client/uiHelpers.js} (85%)

diff --git a/roles/client/debug.js b/roles/client/debug.js
new file mode 100644
index 0000000000..7b0bf9cec9
--- /dev/null
+++ b/roles/client/debug.js
@@ -0,0 +1,21 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////
+// Debugging helpers
+//
+// Run this in your browser console to turn on debugging
+// for this package:
+//
+//   localstorage.setItem('Roles.debug', true)
+//
+
+Roles.debug = false
+
+if (localStorage) {
+  var temp = localStorage.getItem("Roles.debug")
+
+  if ('undefined' !== typeof temp) {
+    Roles.debug = !!temp
+  }
+}
diff --git a/roles/client/subscriptions.js b/roles/client/subscriptions.js
new file mode 100644
index 0000000000..f30ea94cf8
--- /dev/null
+++ b/roles/client/subscriptions.js
@@ -0,0 +1,11 @@
+"use strict"
+
+
+// Subscribe to get the currently logged in user's permissions.
+//
+// Publish function depends on `this.userId` so it automatically
+// re-runs when logged-in user changes.
+
+Tracker.autorun(function () {
+  Roles.subscription = Meteor.subscribe("_roles")
+})
diff --git a/roles/roles_client.js b/roles/client/uiHelpers.js
similarity index 85%
rename from roles/roles_client.js
rename to roles/client/uiHelpers.js
index 19207b8d90..d596c406fd 100644
--- a/roles/roles_client.js
+++ b/roles/client/uiHelpers.js
@@ -1,5 +1,3 @@
-;(function () {
-
 "use strict"
 
 /**
@@ -12,24 +10,6 @@
  * @module UIHelpers
  */
 
-////////////////////////////////////////////////////////////
-// Debugging helpers
-//
-// Run this in your browser console to turn on debugging
-// for this package:
-//
-//   localstorage.setItem('Roles.debug', true)
-//
-Roles.debug = false
-
-if (localStorage) {
-  var temp = localStorage.getItem("Roles.debug")
-
-  if ('undefined' !== typeof temp) {
-    Roles.debug = !!temp
-  }
-}
-
 
 ////////////////////////////////////////////////////////////
 // UI helpers
@@ -110,5 +90,3 @@ if ('undefined' !== typeof Package.blaze &&
     Package.blaze.Blaze.registerHelper(name, func) 
   })
 }
-
-}());
diff --git a/roles/package.js b/roles/package.js
index 1ce25b7fb5..407c35b969 100644
--- a/roles/package.js
+++ b/roles/package.js
@@ -8,16 +8,23 @@ Package.describe({
 Package.onUse(function (api) {
   var both = ['client', 'server'];
 
-  api.versionsFrom && api.versionsFrom("METEOR@1.2.0.2");
+  api.versionsFrom("METEOR@1.2.0.2");
+
+  api.use(['underscore',
+           'accounts-base',
+           'tracker',
+           'mongo',
+           'check'], both);
 
-  api.use(['underscore', 'accounts-base', 'check'], both);
   api.use(['blaze'], 'client', {weak: true});
 
-  api.export && api.export('Roles');
+  api.export('Roles');
 
   api.addFiles('roles_server.js', 'server');
   api.addFiles('roles_common.js', both);
-  api.addFiles('roles_client.js', 'client');
+  api.addFiles(['client/debug.js',
+                'client/uiHelpers.js',
+                'client/subscriptions.js'], 'client');
 });
 
 Package.onTest(function (api) {
@@ -25,7 +32,10 @@ Package.onTest(function (api) {
 
   // `accounts-password` is included so `Meteor.users` exists
 
-  api.use(['alanning:roles','accounts-password','tinytest'], both);
+  api.use(['alanning:roles',
+           'accounts-password',
+           'underscore',
+           'tinytest'], both);
 
   api.addFiles('tests/client.js', 'client');
   api.addFiles('tests/server.js', 'server');
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 84b403072f..385f288960 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -243,10 +243,7 @@ _.extend(Roles, {
       }
     }
     catch (ex) {
-      var removeNonGroupedRoleFromGroupMsg = 'Cannot apply $pull/$pullAll modifier to non-array' 
-
-      if (ex.name === 'MongoError' &&
-          ex.err === removeNonGroupedRoleFromGroupMsg) {
+      if (ex.name === 'MongoError' && isMongoMixError(ex.err)) {
         throw new Error (mixingGroupAndNonGroupErrorMsg)
       }
 
@@ -686,12 +683,7 @@ _.extend(Roles, {
       }
     }
     catch (ex) {
-      var addNonGroupToGroupedRolesMsg = 'Cannot apply $addToSet modifier to non-array',
-          addGrouped2NonGroupedMsg = "can't append to array using string field name"
-
-      if (ex.name === 'MongoError' &&
-          (ex.err === addNonGroupToGroupedRolesMsg ||
-           ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {
+      if (ex.name === 'MongoError' && isMongoMixError(ex.err)) {
         throw new Error (mixingGroupAndNonGroupErrorMsg)
       }
 
@@ -701,4 +693,24 @@ _.extend(Roles, {
 
 })  // end _.extend(Roles ...)
 
+
+function isMongoMixError (errorMsg) {
+  var expectedMessages = [
+      'Cannot apply $addToSet modifier to non-array',
+      'Cannot apply $addToSet to a non-array field',
+      'Can only apply $pullAll to an array',
+      'Cannot apply $pull/$pullAll modifier to non-array',
+      "can't append to array using string field name",
+      'to traverse the element'
+      ]
+
+  return _.some(expectedMessages, function (snippet) {
+    return strContains(errorMsg, snippet)
+  })
+}
+
+function strContains (haystack, needle) {
+  return -1 !== haystack.indexOf(needle)
+}
+
 }());
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 471e625c0d..4cf5fdcad7 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,8 +1,9 @@
-;(function () {
+"use strict"
+
 
 /**
  * Roles collection documents consist only of an id and a role name.
- *   ex: { _id:<uuid>, name: "admin" }
+ *   ex: { _id: "123", name: "admin" }
  */
 if (!Meteor.roles) {
   Meteor.roles = new Mongo.Collection("roles")
@@ -13,14 +14,19 @@ if (!Meteor.roles) {
 
 
 /**
- * Always publish logged-in user's roles so client-side
- * checks can work.
+ * Publish logged-in user's roles so client-side checks can work.
+ * 
+ * Use a named publish function so clients can check `ready()` state.
  */
-Meteor.publish('roles', function () {
-  var userId = this.userId,
-      fields = {roles:1}
+Meteor.publish('_roles', function () {
+  var loggedInUserId = this.userId,
+      fields = {roles: 1}
 
-  return Meteor.users.find({_id:userId}, {fields: fields})
+  if (!loggedInUserId) {
+    this.ready()
+    return
+  }
+
+  return Meteor.users.find({_id: loggedInUserId},
+                           {fields: fields})
 })
-
-}());
diff --git a/roles/tests/server.js b/roles/tests/server.js
index ede84574c3..8f18c577b9 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -960,8 +960,12 @@
 
       reset() 
       Roles.addUsersToRoles(users.bob, ['editor', 'user'])
-      // don't expect this to throw error
-      Roles.removeUsersFromRoles(users.bob, ['user'], 'group1')
+      try {
+        Roles.removeUsersFromRoles(users.bob, ['user'], 'group1')
+      }
+      catch (ex) {
+        test.isTrue(ex.message == expectedErrorMsg, ex.message)
+      }
 
       reset() 
       Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1')

From dabe0b85212749a6fc5dedd42f87bceeca209afa Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 02:47:27 -0400
Subject: [PATCH 0151/1140] document Roles.subscription property

---
 roles/client/subscriptions.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/roles/client/subscriptions.js b/roles/client/subscriptions.js
index f30ea94cf8..f62e8b12d7 100644
--- a/roles/client/subscriptions.js
+++ b/roles/client/subscriptions.js
@@ -1,10 +1,21 @@
 "use strict"
 
 
-// Subscribe to get the currently logged in user's permissions.
-//
-// Publish function depends on `this.userId` so it automatically
-// re-runs when logged-in user changes.
+/**
+ * Subscription handle for the currently logged in user's permissions.
+ *
+ * NOTE: The corresponding publish function, `_roles`, depends on
+ * `this.userId` so it will automatically re-run when the currently
+ * logged-in user changes.
+ *
+ * @example
+ *
+ *     `Roles.subscription.ready()` // => `true` if user roles have been loaded
+ *
+ * @property subscription
+ * @type Object
+ * @for Roles
+ */
 
 Tracker.autorun(function () {
   Roles.subscription = Meteor.subscribe("_roles")

From 4598de8ab69f40de5c94af42aada7bc3d6c441e8 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 02:48:12 -0400
Subject: [PATCH 0152/1140] update documentation for 1.2.14

---
 docs/api.js                                   |  25 +-
 docs/classes/Roles.html                       | 306 ++++------
 docs/classes/UIHelpers.html                   | 200 +------
 docs/data.json                                | 559 ++----------------
 docs/files/roles_client_subscriptions.js.html | 136 +++++
 docs/files/roles_client_uiHelpers.js.html     | 206 +++++++
 docs/files/roles_roles_client.js.html         | 394 ------------
 docs/files/roles_roles_common.js.html         | 242 +-------
 docs/files/roles_roles_server.js.html         | 225 +------
 docs/index.html                               | 198 +------
 docs/modules/Roles.html                       | 198 +------
 docs/modules/UIHelpers.html                   | 200 +------
 yuidoc.json                                   |   2 +-
 13 files changed, 546 insertions(+), 2345 deletions(-)
 create mode 100644 docs/files/roles_client_subscriptions.js.html
 create mode 100644 docs/files/roles_client_uiHelpers.js.html
 delete mode 100644 docs/files/roles_roles_client.js.html

diff --git a/docs/api.js b/docs/api.js
index 48701a4d90..30c6855ade 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -2,17 +2,11 @@ YUI.add("yuidoc-meta", function(Y) {
    Y.YUIDoc = { meta: {
     "classes": [
         "Roles",
-        "Roles                                                                                                    // 22",
-        "Roles                                                                                            // 22",
-        "UIHelpers",
-        "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);"
+        "UIHelpers"
     ],
     "modules": [
         "Roles",
-        "Roles                                                                                                   __ 6\n_                                                                                                                __ 7\n                                                                                                                  __ 8\n_**                                                                                                                __ 9\nRoles collection documents consist only of an id and a role name.                                               __ 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             __ 11\n_                                                                                                                __ 12\nif (!Meteor.roles) {                                                                                               __ 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    __ 14\n}                                                                                                                  __ 15\n                                                                                                                  __ 16\n_**                                                                                                                __ 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      __ 18\n                                                                                                                __ 19\nStores user's current roles in a 'roles' field on the user object.                                              __ 20\n                                                                                                                __ 21",
-        "Roles                                                                                           __ 6\n_                                                                                                        __ 7\n                                                                                                          __ 8\n_**                                                                                                        __ 9\nRoles collection documents consist only of an id and a role name.                                       __ 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     __ 11\n_                                                                                                        __ 12\nif (!Meteor.roles) {                                                                                       __ 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            __ 14\n}                                                                                                          __ 15\n                                                                                                          __ 16\n_**                                                                                                        __ 17\nRole-based authorization compatible with built-in Meteor accounts package.                              __ 18\n                                                                                                        __ 19\nStores user's current roles in a 'roles' field on the user object.                                      __ 20\n                                                                                                        __ 21",
-        "UIHelpers",
-        "UIHelpers                                                                                               __ 10\n_                                                                                                                __ 11\n                                                                                                                  __ 12\n____________________________________________________________                                                       __ 13\n__ UI helpers                                                                                                      __ 14\n__                                                                                                                 __ 15\n__ Use a semi-private variable rather than declaring UI                                                            __ 16\n__ helpers directly so that we can unit test the helpers.                                                          __ 17\n__ XXX For some reason, the UI helpers are not registered                                                          __ 18\n__ before the tests run.                                                                                           __ 19\n__                                                                                                                 __ 20\nRoles._uiHelpers = {                                                                                               __ 21\n                                                                                                                  __ 22\n _**                                                                                                              __ 23\nUI helper to check if current user is in at least one                                                         __ 24\nof the target roles.  For use in client-side templates.                                                       __ 25\n                                                                                                              __ 26"
+        "UIHelpers"
     ],
     "allModules": [
         {
@@ -20,25 +14,10 @@ YUI.add("yuidoc-meta", function(Y) {
             "name": "Roles",
             "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
         },
-        {
-            "displayName": "Roles                                                                                                   // 6\n/                                                                                                                // 7\n                                                                                                                  // 8\n/**                                                                                                                // 9\nRoles collection documents consist only of an id and a role name.                                               // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             // 11\n/                                                                                                                // 12\nif (!Meteor.roles) {                                                                                               // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    // 14\n}                                                                                                                  // 15\n                                                                                                                  // 16\n/**                                                                                                                // 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      // 18\n                                                                                                                // 19\nStores user's current roles in a 'roles' field on the user object.                                              // 20\n                                                                                                                // 21",
-            "name": "Roles                                                                                                   __ 6\n_                                                                                                                __ 7\n                                                                                                                  __ 8\n_**                                                                                                                __ 9\nRoles collection documents consist only of an id and a role name.                                               __ 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             __ 11\n_                                                                                                                __ 12\nif (!Meteor.roles) {                                                                                               __ 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    __ 14\n}                                                                                                                  __ 15\n                                                                                                                  __ 16\n_**                                                                                                                __ 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      __ 18\n                                                                                                                __ 19\nStores user's current roles in a 'roles' field on the user object.                                              __ 20\n                                                                                                                __ 21",
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5"
-        },
-        {
-            "displayName": "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21",
-            "name": "Roles                                                                                           __ 6\n_                                                                                                        __ 7\n                                                                                                          __ 8\n_**                                                                                                        __ 9\nRoles collection documents consist only of an id and a role name.                                       __ 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     __ 11\n_                                                                                                        __ 12\nif (!Meteor.roles) {                                                                                       __ 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            __ 14\n}                                                                                                          __ 15\n                                                                                                          __ 16\n_**                                                                                                        __ 17\nRole-based authorization compatible with built-in Meteor accounts package.                              __ 18\n                                                                                                        __ 19\nStores user's current roles in a 'roles' field on the user object.                                      __ 20\n                                                                                                        __ 21",
-            "description": "Roles collection documents consist only of an id and a role name.                                       // 5\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 6\n/                                                                                                        // 7\nif (!Meteor.roles) {                                                                                       // 8\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 9\n                                                                                                          // 10\n // Create default indexes for roles collection                                                           // 11\n Meteor.roles._ensureIndex('name', {unique: 1})                                                           // 12\n}                                                                                                          // 13\n                                                                                                          // 14\n                                                                                                          // 15\n/**                                                                                                        // 16\nAlways publish logged-in user's roles so client-side                                                    // 17\nchecks can work.                                                                                        // 18\n/                                                                                                        // 19\nMeteor.publish(null, function () {                                                                         // 20\n var userId = this.userId,                                                                                // 21\n     fields = {roles:1}                                                                                   // 22\n                                                                                                          // 23\n return Meteor.users.find({_id:userId}, {fields: fields})                                                 // 24\n})                                                                                                         // 25\n                                                                                                          // 26\n}());                                                                                                      // 27\n                                                                                                          // 28\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);\n\n\n\n\n\n\n(function () {\n\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n//                                                                                                         //\n// packages/alanning:roles/roles_common.js                                                                 //\n//                                                                                                         //\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n                                                                                                          //\n;(function () {                                                                                            // 1\n                                                                                                          // 2\n/**                                                                                                        // 3\nProvides functions related to user authorization. Compatible with built-in Meteor accounts packages.    // 4\n                                                                                                        // 5"
-        },
         {
             "displayName": "UIHelpers",
             "name": "UIHelpers",
             "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
-        },
-        {
-            "displayName": "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26",
-            "name": "UIHelpers                                                                                               __ 10\n_                                                                                                                __ 11\n                                                                                                                  __ 12\n____________________________________________________________                                                       __ 13\n__ UI helpers                                                                                                      __ 14\n__                                                                                                                 __ 15\n__ Use a semi-private variable rather than declaring UI                                                            __ 16\n__ helpers directly so that we can unit test the helpers.                                                          __ 17\n__ XXX For some reason, the UI helpers are not registered                                                          __ 18\n__ before the tests run.                                                                                           __ 19\n__                                                                                                                 __ 20\nRoles._uiHelpers = {                                                                                               __ 21\n                                                                                                                  __ 22\n _**                                                                                                              __ 23\nUI helper to check if current user is in at least one                                                         __ 24\nof the target roles.  For use in client-side templates.                                                       __ 25\n                                                                                                              __ 26",
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5"
         }
     ]
 } };
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index b5d7ad490c..1eaab5b74f 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.12</em>
+            <em>API Docs for: v1.2.14</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,212 +43,16 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
-                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
-            
-                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
-            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../classes/UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);.html">UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);</a></li>
-            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
-                <li><a href="../modules/Roles                                                                                                   __ 6
-_                                                                                                                __ 7
-                                                                                                                  __ 8
-_**                                                                                                                __ 9
-Roles collection documents consist only of an id and a role name.                                               __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
-_                                                                                                                __ 12
-if (!Meteor.roles) {                                                                                               __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
-}                                                                                                                  __ 15
-                                                                                                                  __ 16
-_**                                                                                                                __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
-                                                                                                                __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
-                                                                                                                __ 21.html">Roles                                                                                                   // 6
-/                                                                                                                // 7
-                                                                                                                  // 8
-/**                                                                                                                // 9
-Roles collection documents consist only of an id and a role name.                                               // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
-/                                                                                                                // 12
-if (!Meteor.roles) {                                                                                               // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
-}                                                                                                                  // 15
-                                                                                                                  // 16
-/**                                                                                                                // 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
-                                                                                                                // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
-                                                                                                                // 21</a></li>
-            
-                <li><a href="../modules/Roles                                                                                           __ 6
-_                                                                                                        __ 7
-                                                                                                          __ 8
-_**                                                                                                        __ 9
-Roles collection documents consist only of an id and a role name.                                       __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
-_                                                                                                        __ 12
-if (!Meteor.roles) {                                                                                       __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
-}                                                                                                          __ 15
-                                                                                                          __ 16
-_**                                                                                                        __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
-                                                                                                        __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
-                                                                                                        __ 21.html">Roles                                                                                           // 6
-/                                                                                                        // 7
-                                                                                                          // 8
-/**                                                                                                        // 9
-Roles collection documents consist only of an id and a role name.                                       // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
-/                                                                                                        // 12
-if (!Meteor.roles) {                                                                                       // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
-}                                                                                                          // 15
-                                                                                                          // 16
-/**                                                                                                        // 17
-Role-based authorization compatible with built-in Meteor accounts package.                              // 18
-                                                                                                        // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
-                                                                                                        // 21</a></li>
-            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../modules/UIHelpers                                                                                               __ 10
-_                                                                                                                __ 11
-                                                                                                                  __ 12
-____________________________________________________________                                                       __ 13
-__ UI helpers                                                                                                      __ 14
-__                                                                                                                 __ 15
-__ Use a semi-private variable rather than declaring UI                                                            __ 16
-__ helpers directly so that we can unit test the helpers.                                                          __ 17
-__ XXX For some reason, the UI helpers are not registered                                                          __ 18
-__ before the tests run.                                                                                           __ 19
-__                                                                                                                 __ 20
-Roles._uiHelpers = {                                                                                               __ 21
-                                                                                                                  __ 22
- _**                                                                                                              __ 23
-UI helper to check if current user is in at least one                                                         __ 24
-of the target roles.  For use in client-side templates.                                                       __ 25
-                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
-/                                                                                                                // 11
-                                                                                                                  // 12
-////////////////////////////////////////////////////////////                                                       // 13
-// UI helpers                                                                                                      // 14
-//                                                                                                                 // 15
-// Use a semi-private variable rather than declaring UI                                                            // 16
-// helpers directly so that we can unit test the helpers.                                                          // 17
-// XXX For some reason, the UI helpers are not registered                                                          // 18
-// before the tests run.                                                                                           // 19
-//                                                                                                                 // 20
-Roles._uiHelpers = {                                                                                               // 21
-                                                                                                                  // 22
- /**                                                                                                              // 23
-UI helper to check if current user is in at least one                                                         // 24
-of the target roles.  For use in client-side templates.                                                       // 25
-                                                                                                              // 26</a></li>
-            
             </ul>
         </div>
     </div>
@@ -308,7 +112,7 @@ of the target roles.  For use in client-side templates.
 
 
 <div class="box intro">
-    <p>Role-based authorization compatible with built-in Meteor accounts package.</p>
+    <p>Authorization package compatible with built-in Meteor accounts system.</p>
 <p>Stores user&#39;s current roles in a &#39;roles&#39; field on the user object.</p>
 
 </div>
@@ -504,6 +308,13 @@ of the target roles.  For use in client-side templates.
                                     <span class="flag static">static</span>
                                 
                                 
+                            </li>
+                        
+                            <li class="index-item property">
+                                <a href="#property_subscription">subscription</a>
+
+                                
+                                
                             </li>
                         
                     </ul>
@@ -574,7 +385,7 @@ of the target roles.  For use in client-side templates.
             
         
         
-        <a href="../files/roles_roles_common.js.html#l559"><code>roles&#x2F;roles_common.js:559</code></a>
+        <a href="../files/roles_roles_common.js.html#l558"><code>roles&#x2F;roles_common.js:558</code></a>
         
         </p>
 
@@ -705,7 +516,7 @@ object for MongoDB.  Passed to _updateUserRoles</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l534"><code>roles&#x2F;roles_common.js:534</code></a>
+        <a href="../files/roles_roles_common.js.html#l533"><code>roles&#x2F;roles_common.js:533</code></a>
         
         </p>
 
@@ -856,7 +667,7 @@ for MongoDB.  Passed to _updateUserRoles</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l585"><code>roles&#x2F;roles_common.js:585</code></a>
+        <a href="../files/roles_roles_common.js.html#l584"><code>roles&#x2F;roles_common.js:584</code></a>
         
         </p>
 
@@ -867,7 +678,7 @@ for MongoDB.  Passed to _updateUserRoles</p>
     </div>
 
     <div class="description">
-        <p>Internal function that users the Template pattern to adds or sets roles 
+        <p>Internal function that uses the Template pattern to adds or sets roles 
 for users.</p>
 
     </div>
@@ -1387,7 +1198,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l411"><code>roles&#x2F;roles_common.js:411</code></a>
+        <a href="../files/roles_roles_common.js.html#l408"><code>roles&#x2F;roles_common.js:408</code></a>
         
         </p>
 
@@ -1476,7 +1287,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l486"><code>roles&#x2F;roles_common.js:486</code></a>
+        <a href="../files/roles_roles_common.js.html#l485"><code>roles&#x2F;roles_common.js:485</code></a>
         
         </p>
 
@@ -1606,7 +1417,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l369"><code>roles&#x2F;roles_common.js:369</code></a>
+        <a href="../files/roles_roles_common.js.html#l366"><code>roles&#x2F;roles_common.js:366</code></a>
         
         </p>
 
@@ -1704,6 +1515,12 @@ are currently assigned to the target role.</p>
                     
                 </li>
             
+                <li class="arg">
+                    
+                        <code class="optional">[options]</code>
+                    
+                </li>
+            
             </ul><span class="paren">)</span>
         </div>
     
@@ -1737,7 +1554,7 @@ are currently assigned to the target role.</p>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l421"><code>roles&#x2F;roles_common.js:421</code></a>
+        <a href="../files/roles_roles_common.js.html#l418"><code>roles&#x2F;roles_common.js:418</code></a>
         
         </p>
 
@@ -1797,6 +1614,24 @@ used automatically.</p>
                     
                 </li>
             
+                <li class="param">
+                    
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+                    
+
+                    
+
+                    <div class="param-description">
+                        <p>Optional options which are passed directly
+                          through to <code>Meteor.users.find(query, options)</code></p>
+
+                    </div>
+
+                    
+                </li>
+            
             </ul>
         </div>
     
@@ -2181,7 +2016,7 @@ Roles.setUserRoles(userId, &#39;admin&#39;, Roles.GLOBAL_GROUP)</code></pre>
             
         
         
-        <a href="../files/roles_roles_common.js.html#l257"><code>roles&#x2F;roles_common.js:257</code></a>
+        <a href="../files/roles_roles_common.js.html#l254"><code>roles&#x2F;roles_common.js:254</code></a>
         
         </p>
 
@@ -2370,6 +2205,63 @@ Roles.userIsInRole(user, &#39;admin&#39;) // =&gt; false</code></pre>
     
 
     
+</div>
+
+                
+                    <div id="property_subscription" class="property item">
+    <h3 class="name"><code>subscription</code></h3>
+    <span class="type">Object</span>
+
+    
+
+    
+
+    
+
+    
+
+    <div class="meta">
+        
+            
+                
+                <p>
+                
+                Defined in
+                
+            
+        
+        
+        <a href="../files/roles_client_subscriptions.js.html#l4"><code>roles&#x2F;client&#x2F;subscriptions.js:4</code></a>
+        
+        </p>
+
+        
+
+        
+    </div>
+
+    <div class="description">
+        <p>Subscription handle for the currently logged in user&#39;s permissions.</p>
+<p>NOTE: The corresponding publish function, <code>_roles</code>, depends on
+<code>this.userId</code> so it will automatically re-run when the currently
+logged-in user changes.</p>
+
+    </div>
+
+    
+
+    
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code><code>Roles.subscription.ready()</code> // =&gt; <code>true</code> if user roles have been loaded</code></pre>
+
+            </div>
+        </div>
+    
+
+    
 </div>
 
                 
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
index 159ae10e2f..c8b9a2ff90 100644
--- a/docs/classes/UIHelpers.html
+++ b/docs/classes/UIHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.12</em>
+            <em>API Docs for: v1.2.14</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,212 +43,16 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
-                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
-            
-                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
-            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../classes/UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);.html">UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);</a></li>
-            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
-                <li><a href="../modules/Roles                                                                                                   __ 6
-_                                                                                                                __ 7
-                                                                                                                  __ 8
-_**                                                                                                                __ 9
-Roles collection documents consist only of an id and a role name.                                               __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
-_                                                                                                                __ 12
-if (!Meteor.roles) {                                                                                               __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
-}                                                                                                                  __ 15
-                                                                                                                  __ 16
-_**                                                                                                                __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
-                                                                                                                __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
-                                                                                                                __ 21.html">Roles                                                                                                   // 6
-/                                                                                                                // 7
-                                                                                                                  // 8
-/**                                                                                                                // 9
-Roles collection documents consist only of an id and a role name.                                               // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
-/                                                                                                                // 12
-if (!Meteor.roles) {                                                                                               // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
-}                                                                                                                  // 15
-                                                                                                                  // 16
-/**                                                                                                                // 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
-                                                                                                                // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
-                                                                                                                // 21</a></li>
-            
-                <li><a href="../modules/Roles                                                                                           __ 6
-_                                                                                                        __ 7
-                                                                                                          __ 8
-_**                                                                                                        __ 9
-Roles collection documents consist only of an id and a role name.                                       __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
-_                                                                                                        __ 12
-if (!Meteor.roles) {                                                                                       __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
-}                                                                                                          __ 15
-                                                                                                          __ 16
-_**                                                                                                        __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
-                                                                                                        __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
-                                                                                                        __ 21.html">Roles                                                                                           // 6
-/                                                                                                        // 7
-                                                                                                          // 8
-/**                                                                                                        // 9
-Roles collection documents consist only of an id and a role name.                                       // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
-/                                                                                                        // 12
-if (!Meteor.roles) {                                                                                       // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
-}                                                                                                          // 15
-                                                                                                          // 16
-/**                                                                                                        // 17
-Role-based authorization compatible with built-in Meteor accounts package.                              // 18
-                                                                                                        // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
-                                                                                                        // 21</a></li>
-            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../modules/UIHelpers                                                                                               __ 10
-_                                                                                                                __ 11
-                                                                                                                  __ 12
-____________________________________________________________                                                       __ 13
-__ UI helpers                                                                                                      __ 14
-__                                                                                                                 __ 15
-__ Use a semi-private variable rather than declaring UI                                                            __ 16
-__ helpers directly so that we can unit test the helpers.                                                          __ 17
-__ XXX For some reason, the UI helpers are not registered                                                          __ 18
-__ before the tests run.                                                                                           __ 19
-__                                                                                                                 __ 20
-Roles._uiHelpers = {                                                                                               __ 21
-                                                                                                                  __ 22
- _**                                                                                                              __ 23
-UI helper to check if current user is in at least one                                                         __ 24
-of the target roles.  For use in client-side templates.                                                       __ 25
-                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
-/                                                                                                                // 11
-                                                                                                                  // 12
-////////////////////////////////////////////////////////////                                                       // 13
-// UI helpers                                                                                                      // 14
-//                                                                                                                 // 15
-// Use a semi-private variable rather than declaring UI                                                            // 16
-// helpers directly so that we can unit test the helpers.                                                          // 17
-// XXX For some reason, the UI helpers are not registered                                                          // 18
-// before the tests run.                                                                                           // 19
-//                                                                                                                 // 20
-Roles._uiHelpers = {                                                                                               // 21
-                                                                                                                  // 22
- /**                                                                                                              // 23
-UI helper to check if current user is in at least one                                                         // 24
-of the target roles.  For use in client-side templates.                                                       // 25
-                                                                                                              // 26</a></li>
-            
             </ul>
         </div>
     </div>
@@ -410,7 +214,7 @@ of the target roles.  For use in client-side templates.
             
         
         
-        <a href="../files/roles_roles_client.js.html#l23"><code>roles&#x2F;roles_client.js:23</code></a>
+        <a href="../files/roles_client_uiHelpers.js.html#l24"><code>roles&#x2F;client&#x2F;uiHelpers.js:24</code></a>
         
         </p>
 
diff --git a/docs/data.json b/docs/data.json
index 9660e7f534..bdf813fd76 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -1,46 +1,21 @@
 {
     "project": {
         "name": "The meteor-roles API",
-        "description": "The meteor-roles API: a role-based authorization package for Meteor",
-        "version": "v1.2.12"
+        "description": "The meteor-roles API: an authorization package for Meteor",
+        "version": "v1.2.14"
     },
     "files": {
-        "roles/.build.alanning:roles/os/packages/alanning:roles.js": {
-            "name": "roles/.build.alanning:roles/os/packages/alanning:roles.js",
-            "modules": {
-                "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21": 1
-            },
-            "classes": {
-                "Roles                                                                                            // 22": 1
-            },
-            "fors": {},
-            "namespaces": {}
-        },
-        "roles/.build.alanning:roles/web.browser/packages/alanning:roles.js": {
-            "name": "roles/.build.alanning:roles/web.browser/packages/alanning:roles.js",
+        "roles/client/subscriptions.js": {
+            "name": "roles/client/subscriptions.js",
             "modules": {},
             "classes": {},
             "fors": {
-                "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": 1
+                "Roles": 1
             },
             "namespaces": {}
         },
-        "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js": {
-            "name": "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js",
-            "modules": {
-                "Roles                                                                                                   // 6\n/                                                                                                                // 7\n                                                                                                                  // 8\n/**                                                                                                                // 9\nRoles collection documents consist only of an id and a role name.                                               // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             // 11\n/                                                                                                                // 12\nif (!Meteor.roles) {                                                                                               // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    // 14\n}                                                                                                                  // 15\n                                                                                                                  // 16\n/**                                                                                                                // 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      // 18\n                                                                                                                // 19\nStores user's current roles in a 'roles' field on the user object.                                              // 20\n                                                                                                                // 21": 1,
-                "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26": 1
-            },
-            "classes": {
-                "Roles                                                                                                    // 22": 1
-            },
-            "fors": {
-                "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": 1
-            },
-            "namespaces": {}
-        },
-        "roles/roles_client.js": {
-            "name": "roles/roles_client.js",
+        "roles/client/uiHelpers.js": {
+            "name": "roles/client/uiHelpers.js",
             "modules": {
                 "UIHelpers": 1
             },
@@ -70,420 +45,6 @@
         }
     },
     "modules": {
-        "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21": {
-            "name": "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21",
-            "submodules": {},
-            "classes": {
-                "Roles                                                                                            // 22": 1
-            },
-            "fors": {},
-            "namespaces": {},
-            "tag": "module",
-            "file": "roles/.build.alanning:roles/os/packages/alanning:roles.js",
-            "line": 12,
-            "description": "Roles collection documents consist only of an id and a role name.                                       // 5\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 6\n/                                                                                                        // 7\nif (!Meteor.roles) {                                                                                       // 8\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 9\n                                                                                                          // 10\n // Create default indexes for roles collection                                                           // 11\n Meteor.roles._ensureIndex('name', {unique: 1})                                                           // 12\n}                                                                                                          // 13\n                                                                                                          // 14\n                                                                                                          // 15\n/**                                                                                                        // 16\nAlways publish logged-in user's roles so client-side                                                    // 17\nchecks can work.                                                                                        // 18\n/                                                                                                        // 19\nMeteor.publish(null, function () {                                                                         // 20\n var userId = this.userId,                                                                                // 21\n     fields = {roles:1}                                                                                   // 22\n                                                                                                          // 23\n return Meteor.users.find({_id:userId}, {fields: fields})                                                 // 24\n})                                                                                                         // 25\n                                                                                                          // 26\n}());                                                                                                      // 27\n                                                                                                          // 28\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);\n\n\n\n\n\n\n(function () {\n\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n//                                                                                                         //\n// packages/alanning:roles/roles_common.js                                                                 //\n//                                                                                                         //\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n                                                                                                          //\n;(function () {                                                                                            // 1\n                                                                                                          // 2\n/**                                                                                                        // 3\nProvides functions related to user authorization. Compatible with built-in Meteor accounts packages.    // 4\n                                                                                                        // 5",
-            "is_constructor": 1,
-            "example": [
-                "                                                                                              // 39\n    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)                                          // 40\n    Roles.userIsInRole(user, 'admin') // => true                                                      // 41\n                                                                                                      // 42\n    Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)                                     // 43\n    Roles.userIsInRole(user, 'support-staff') // => true                                              // 44\n    Roles.userIsInRole(user, 'admin') // => false                                                     // 45\n                                                                                                      // 46",
-                "                                                                                              // 122\n    Roles.addUsersToRoles(userId, 'admin')                                                            // 123\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')                                    // 124\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])                                          // 125\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')        // 126\n    Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)                                        // 127\n                                                                                                      // 128",
-                "                                                                                              // 151\n    Roles.setUserRoles(userId, 'admin')                                                               // 152\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')                                       // 153\n    Roles.setUserRoles([user1, user2], ['user','editor'])                                             // 154\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')           // 155\n    Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)                                           // 156\n                                                                                                      // 157",
-                "                                                                                              // 180\n    Roles.removeUsersFromRoles(users.bob, 'admin')                                                    // 181\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])                                    // 182\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])                            // 183\n    Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')                                         // 184\n                                                                                                      // 185",
-                "                                                                                              // 260\n    // non-group usage                                                                                // 261\n    Roles.userIsInRole(user, 'admin')                                                                 // 262\n    Roles.userIsInRole(user, ['admin','editor'])                                                      // 263\n    Roles.userIsInRole(userId, 'admin')                                                               // 264\n    Roles.userIsInRole(userId, ['admin','editor'])                                                    // 265\n                                                                                                      // 266\n    // per-group usage                                                                                // 267\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')                                          // 268\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')                                          // 269\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)                                // 270\n                                                                                                      // 271\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP                              // 272\n    Roles.userIsInRole(user, 'admin')                                                                 // 273\n                                                                                                      // 274"
-            ],
-            "itemtype": "method",
-            "type": "String                                                                                          // 48",
-            "static": "// 49",
-            "final": "// 50\n/                                                                                                      // 51\n GLOBAL_GROUP: '__global_roles__',                                                                        // 52\n                                                                                                          // 53\n                                                                                                          // 54\n /**                                                                                                      // 55\nCreate a new role. Whitespace will be trimmed.                                                        // 56\n                                                                                                      // 57",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "Name of role                                                                     // 59",
-                    "type": "String"
-                },
-                {
-                    "name": "role",
-                    "description": "Name of role                                                                     // 93\n/                                                                                                      // 94\n deleteRole: function (role) {                                                                            // 95\n   if (!role) return                                                                                      // 96\n                                                                                                          // 97\n   var foundExistingUser = Meteor.users.findOne(                                                          // 98\n                             {roles: {$in: [role]}},                                                      // 99\n                             {fields: {_id: 1}})                                                          // 100\n                                                                                                          // 101\n   if (foundExistingUser) {                                                                               // 102\n     throw new Meteor.Error(403, 'Role in use')                                                           // 103\n   }                                                                                                      // 104\n                                                                                                          // 105\n   var thisRole = Meteor.roles.findOne({name: role})                                                      // 106\n   if (thisRole) {                                                                                        // 107\n     Meteor.roles.remove({_id: thisRole._id})                                                             // 108\n   }                                                                                                      // 109\n },                                                                                                       // 110\n                                                                                                          // 111\n /**                                                                                                      // 112\nAdd users to roles. Will create roles as needed.                                                      // 113\n                                                                                                      // 114\nNOTE: Mixing grouped and non-grouped roles for the same user                                          // 115\n      is not supported and will throw an error.                                                       // 116\n                                                                                                      // 117\nMakes 2 calls to database:                                                                            // 118\n 1. retrieve list of all existing roles                                                               // 119\n 2. update users' roles                                                                               // 120\n                                                                                                      // 121",
-                    "type": "String"
-                },
-                {
-                    "name": "users",
-                    "description": "User id(s) or object(s) with an _id field                                 // 130",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles/permissions to add users to                              // 131",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional group name. If supplied, roles will be                               // 132\n                        specific to that group.                                                       // 133\n                        Group names can not start with '$' or numbers.                                // 134\n                        Periods in names '.' are automatically converted                              // 135\n                        to underscores.                                                               // 136\n                        The special group Roles.GLOBAL_GROUP provides                                 // 137\n                        a convenient way to assign blanket roles/permissions                          // 138\n                        across all groups.  The roles/permissions in the                              // 139\n                        Roles.GLOBAL_GROUP group will be automatically                                // 140\n                        included in checks for any group.                                             // 141\n/                                                                                                      // 142\n addUsersToRoles: function (users, roles, group) {                                                        // 143\n   // use Template pattern to update user roles                                                           // 144\n   Roles._updateUserRoles(users, roles, group, Roles._update_$addToSet_fn)                                // 145\n },                                                                                                       // 146\n                                                                                                          // 147\n /**                                                                                                      // 148\nSet a users roles/permissions.                                                                        // 149\n                                                                                                      // 150",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "users",
-                    "description": "User id(s) or object(s) with an _id field                                 // 159",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles/permissions to add users to                              // 160",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional group name. If supplied, roles will be                               // 161\n                        specific to that group.                                                       // 162\n                        Group names can not start with '$'.                                           // 163\n                        Periods in names '.' are automatically converted                              // 164\n                        to underscores.                                                               // 165\n                        The special group Roles.GLOBAL_GROUP provides                                 // 166\n                        a convenient way to assign blanket roles/permissions                          // 167\n                        across all groups.  The roles/permissions in the                              // 168\n                        Roles.GLOBAL_GROUP group will be automatically                                // 169\n                        included in checks for any group.                                             // 170\n/                                                                                                      // 171\n setUserRoles: function (users, roles, group) {                                                           // 172\n   // use Template pattern to update user roles                                                           // 173\n   Roles._updateUserRoles(users, roles, group, Roles._update_$set_fn)                                     // 174\n },                                                                                                       // 175\n                                                                                                          // 176\n /**                                                                                                      // 177\nRemove users from roles                                                                               // 178\n                                                                                                      // 179",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "users",
-                    "description": "User id(s) or object(s) with an _id field                                 // 187",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to                                          // 188",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional. Group name. If supplied, only that                                  // 189\n                        group will have roles removed.                                                // 190\n/                                                                                                      // 191\n removeUsersFromRoles: function (users, roles, group) {                                                   // 192\n   var update                                                                                             // 193\n                                                                                                          // 194\n   if (!users) throw new Error (\"Missing 'users' param\")                                                  // 195\n   if (!roles) throw new Error (\"Missing 'roles' param\")                                                  // 196\n   if (group) {                                                                                           // 197\n     if ('string' !== typeof group)                                                                       // 198\n       throw new Error (\"Roles error: Invalid parameter 'group'. Expected 'string' type\")                 // 199\n     if ('$' === group[0])                                                                                // 200\n       throw new Error (\"Roles error: groups can not start with '$'\")                                     // 201\n                                                                                                          // 202\n     // convert any periods to underscores                                                                // 203\n     group = group.replace(/\\./g, '_')                                                                    // 204\n   }                                                                                                      // 205\n                                                                                                          // 206\n   // ensure arrays                                                                                       // 207\n   if (!_.isArray(users)) users = [users]                                                                 // 208\n   if (!_.isArray(roles)) roles = [roles]                                                                 // 209\n                                                                                                          // 210\n   // ensure users is an array of user ids                                                                // 211\n   users = _.reduce(users, function (memo, user) {                                                        // 212\n     var _id                                                                                              // 213\n     if ('string' === typeof user) {                                                                      // 214\n       memo.push(user)                                                                                    // 215\n     } else if ('object' === typeof user) {                                                               // 216\n       _id = user._id                                                                                     // 217\n       if ('string' === typeof _id) {                                                                     // 218\n         memo.push(_id)                                                                                   // 219\n       }                                                                                                  // 220\n     }                                                                                                    // 221\n     return memo                                                                                          // 222\n   }, [])                                                                                                 // 223\n                                                                                                          // 224\n   // update all users, remove from roles set                                                             // 225\n                                                                                                          // 226\n   if (group) {                                                                                           // 227\n     update = {$pullAll: {}}                                                                              // 228\n     update.$pullAll['roles.'+group] = roles                                                              // 229\n   } else {                                                                                               // 230\n     update = {$pullAll: {roles: roles}}                                                                  // 231\n   }                                                                                                      // 232\n                                                                                                          // 233\n   try {                                                                                                  // 234\n     if (Meteor.isClient) {                                                                               // 235\n       // Iterate over each user to fulfill Meteor's 'one update per ID' policy                           // 236\n       _.each(users, function (user) {                                                                    // 237\n         Meteor.users.update({_id:user}, update)                                                          // 238\n       })                                                                                                 // 239\n     } else {                                                                                             // 240\n       // On the server we can leverage MongoDB's $in operator for performance                            // 241\n       Meteor.users.update({_id:{$in:users}}, update, {multi: true})                                      // 242\n     }                                                                                                    // 243\n   }                                                                                                      // 244\n   catch (ex) {                                                                                           // 245\n     var removeNonGroupedRoleFromGroupMsg = 'Cannot apply $pull/$pullAll modifier to non-array'           // 246\n                                                                                                          // 247\n     if (ex.name === 'MongoError' &&                                                                      // 248\n         ex.err === removeNonGroupedRoleFromGroupMsg) {                                                   // 249\n       throw new Error (mixingGroupAndNonGroupErrorMsg)                                                   // 250\n     }                                                                                                    // 251\n                                                                                                          // 252\n     throw ex                                                                                             // 253\n   }                                                                                                      // 254\n },                                                                                                       // 255\n                                                                                                          // 256\n /**                                                                                                      // 257\nCheck if user has specified permissions/roles                                                         // 258\n                                                                                                      // 259",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "user",
-                    "description": "User Id or actual user object                                             // 276",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name of role/permission or Array of                                       // 277\n                           roles/permissions to check against.  If array,                             // 278\n                           will return true if user is in _any_ role.                                 // 279",
-                    "type": "String|Array"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional. Name of group.  If supplied, limits check                           // 280\n                        to just that group.                                                           // 281\n                        The user's Roles.GLOBAL_GROUP will always be checked                          // 282\n                        whether group is specified or not.                                            // 283",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "user",
-                    "description": "User Id or actual user object                                             // 373",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional name of group to restrict roles to.                                  // 374\n                        User's Roles.GLOBAL_GROUP will also be included.                              // 375",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "role",
-                    "description": "Name of role/permission.  If array, users                                  // 430\n                           returned will have at least one of the roles                               // 431\n                           specified but need not have _all_ roles.                                   // 432",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional name of group to restrict roles to.                                  // 433\n                        User's Roles.GLOBAL_GROUP will also be checked.                               // 434",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "user",
-                    "description": "User Id or actual user object                                             // 490",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "role",
-                    "description": "Optional name of roles to restrict groups to.                                  // 491\n                                                                                                      // 492",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "roles",
-                    "description": "// 540",
-                    "type": "Array"
-                },
-                {
-                    "name": "group",
-                    "description": "// 541",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "roles",
-                    "description": "// 565",
-                    "type": "Array"
-                },
-                {
-                    "name": "group",
-                    "description": "// 566",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "users",
-                    "description": "user id(s) or object(s) with an _id field                                 // 591",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "name(s) of roles/permissions to add users to                              // 592",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Group name. If not null or undefined, roles will be                             // 593\n                        specific to that group.                                                       // 594\n                        Group names can not start with '$'.                                           // 595\n                        Periods in names '.' are automatically converted                              // 596\n                        to underscores.                                                               // 597\n                        The special group Roles.GLOBAL_GROUP provides                                 // 598\n                        a convenient way to assign blanket roles/permissions                          // 599\n                        across all groups.  The roles/permissions in the                              // 600\n                        Roles.GLOBAL_GROUP group will be automatically                                // 601\n                        included in checks for any group.                                             // 602",
-                    "type": "String"
-                },
-                {
-                    "name": "updateFactory",
-                    "description": "Func which returns an update object that                              // 603\n                        will be passed to Mongo.                                                      // 604",
-                    "type": "Function"
-                },
-                {
-                    "name": "roles",
-                    "description": "// 605",
-                    "type": "Array"
-                },
-                {
-                    "name": "group",
-                    "description": "// 606\n/                                                                                                      // 607\n _updateUserRoles: function (users, roles, group, updateFactory) {                                        // 608\n   if (!users) throw new Error (\"Missing 'users' param\")                                                  // 609\n   if (!roles) throw new Error (\"Missing 'roles' param\")                                                  // 610\n   if (group) {                                                                                           // 611\n     if ('string' !== typeof group)                                                                       // 612\n       throw new Error (\"Roles error: Invalid parameter 'group'. Expected 'string' type\")                 // 613\n     if ('$' === group[0])                                                                                // 614\n       throw new Error (\"Roles error: groups can not start with '$'\")                                     // 615\n                                                                                                          // 616\n     // convert any periods to underscores                                                                // 617\n     group = group.replace(/\\./g, '_')                                                                    // 618\n   }                                                                                                      // 619\n                                                                                                          // 620\n   var existingRoles,                                                                                     // 621\n       query,                                                                                             // 622\n       update                                                                                             // 623\n                                                                                                          // 624\n   // ensure arrays to simplify code                                                                      // 625\n   if (!_.isArray(users)) users = [users]                                                                 // 626\n   if (!_.isArray(roles)) roles = [roles]                                                                 // 627\n                                                                                                          // 628\n   // remove invalid roles                                                                                // 629\n   roles = _.reduce(roles, function (memo, role) {                                                        // 630\n     if (role                                                                                             // 631\n         && 'string' === typeof role                                                                      // 632\n         && role.trim().length > 0) {                                                                     // 633\n       memo.push(role.trim())                                                                             // 634\n     }                                                                                                    // 635\n     return memo                                                                                          // 636\n   }, [])                                                                                                 // 637\n                                                                                                          // 638\n   // empty roles array is ok, since it might be a $set operation to clear roles                          // 639\n   //if (roles.length === 0) return                                                                       // 640\n                                                                                                          // 641\n   // ensure all roles exist in 'roles' collection                                                        // 642\n   existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {                        // 643\n     memo[role.name] = true                                                                               // 644\n     return memo                                                                                          // 645\n   }, {})                                                                                                 // 646\n   _.each(roles, function (role) {                                                                        // 647\n     if (!existingRoles[role]) {                                                                          // 648\n       Roles.createRole(role)                                                                             // 649\n     }                                                                                                    // 650\n   })                                                                                                     // 651\n                                                                                                          // 652\n   // ensure users is an array of user ids                                                                // 653\n   users = _.reduce(users, function (memo, user) {                                                        // 654\n     var _id                                                                                              // 655\n     if ('string' === typeof user) {                                                                      // 656\n       memo.push(user)                                                                                    // 657\n     } else if ('object' === typeof user) {                                                               // 658\n       _id = user._id                                                                                     // 659\n       if ('string' === typeof _id) {                                                                     // 660\n         memo.push(_id)                                                                                   // 661\n       }                                                                                                  // 662\n     }                                                                                                    // 663\n     return memo                                                                                          // 664\n   }, [])                                                                                                 // 665\n                                                                                                          // 666\n   // update all users                                                                                    // 667\n   update = updateFactory(roles, group)                                                                   // 668\n                                                                                                          // 669\n   try {                                                                                                  // 670\n     if (Meteor.isClient) {                                                                               // 671\n       // On client, iterate over each user to fulfill Meteor's                                           // 672\n       // 'one update per ID' policy                                                                      // 673\n       _.each(users, function (user) {                                                                    // 674\n         Meteor.users.update({_id: user}, update)                                                         // 675\n       })                                                                                                 // 676\n     } else {                                                                                             // 677\n       // On the server we can use MongoDB's $in operator for                                             // 678\n       // better performance                                                                              // 679\n       Meteor.users.update(                                                                               // 680\n         {_id: {$in: users}},                                                                             // 681\n         update,                                                                                          // 682\n         {multi: true})                                                                                   // 683\n     }                                                                                                    // 684\n   }                                                                                                      // 685\n   catch (ex) {                                                                                           // 686\n     var addNonGroupToGroupedRolesMsg = 'Cannot apply $addToSet modifier to non-array',                   // 687\n         addGrouped2NonGroupedMsg = \"can't append to array using string field name\"                       // 688\n                                                                                                          // 689\n     if (ex.name === 'MongoError' &&                                                                      // 690\n         (ex.err === addNonGroupToGroupedRolesMsg ||                                                      // 691\n          ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {                                        // 692\n       throw new Error (mixingGroupAndNonGroupErrorMsg)                                                   // 693\n     }                                                                                                    // 694\n                                                                                                          // 695\n     throw ex                                                                                             // 696\n   }                                                                                                      // 697\n }  // end _updateUserRoles                                                                               // 698\n                                                                                                          // 699\n})  // end _.extend(Roles ...)                                                                             // 700\n                                                                                                          // 701\n}());                                                                                                      // 702\n                                                                                                          // 703\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);",
-                    "type": "String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "update object for use in MongoDB update command                                      // 567\n/                                                                                                      // 568\n _update_$addToSet_fn: function (roles, group) {                                                          // 569\n   var update = {}                                                                                        // 570\n                                                                                                          // 571\n   if (group) {                                                                                           // 572\n     // roles is a key/value dict object                                                                  // 573\n     update.$addToSet = {}                                                                                // 574\n     update.$addToSet['roles.' + group] = {$each: roles}                                                  // 575\n   } else {                                                                                               // 576\n     // roles is an array of strings                                                                      // 577\n     update.$addToSet = {roles: {$each: roles}}                                                           // 578\n   }                                                                                                      // 579\n                                                                                                          // 580\n   return update                                                                                          // 581\n },  // end _update_$addToSet_fn                                                                          // 582\n                                                                                                          // 583\n                                                                                                          // 584\n /**                                                                                                      // 585\nInternal function that users the Template pattern to adds or sets roles                               // 586\nfor users.                                                                                            // 587\n                                                                                                      // 588",
-                "type": "Object"
-            },
-            "access": "protected",
-            "tagname": "// 590"
-        },
-        "Roles                                                                                                   // 6\n/                                                                                                                // 7\n                                                                                                                  // 8\n/**                                                                                                                // 9\nRoles collection documents consist only of an id and a role name.                                               // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             // 11\n/                                                                                                                // 12\nif (!Meteor.roles) {                                                                                               // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    // 14\n}                                                                                                                  // 15\n                                                                                                                  // 16\n/**                                                                                                                // 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      // 18\n                                                                                                                // 19\nStores user's current roles in a 'roles' field on the user object.                                              // 20\n                                                                                                                // 21": {
-            "name": "Roles                                                                                                   // 6\n/                                                                                                                // 7\n                                                                                                                  // 8\n/**                                                                                                                // 9\nRoles collection documents consist only of an id and a role name.                                               // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                             // 11\n/                                                                                                                // 12\nif (!Meteor.roles) {                                                                                               // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                                    // 14\n}                                                                                                                  // 15\n                                                                                                                  // 16\n/**                                                                                                                // 17\nRole-based authorization compatible with built-in Meteor accounts package.                                      // 18\n                                                                                                                // 19\nStores user's current roles in a 'roles' field on the user object.                                              // 20\n                                                                                                                // 21",
-            "submodules": {},
-            "classes": {},
-            "fors": {},
-            "namespaces": {},
-            "tag": "module",
-            "file": "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js",
-            "line": 11,
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5",
-            "is_constructor": 1,
-            "example": [
-                "                                                                                                      // 39\n    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)                                                  // 40\n    Roles.userIsInRole(user, 'admin') // => true                                                              // 41\n                                                                                                              // 42\n    Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)                                             // 43\n    Roles.userIsInRole(user, 'support-staff') // => true                                                      // 44\n    Roles.userIsInRole(user, 'admin') // => false                                                             // 45\n                                                                                                              // 46",
-                "                                                                                                      // 122\n    Roles.addUsersToRoles(userId, 'admin')                                                                    // 123\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')                                            // 124\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])                                                  // 125\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')                // 126\n    Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)                                                // 127\n                                                                                                              // 128",
-                "                                                                                                      // 151\n    Roles.setUserRoles(userId, 'admin')                                                                       // 152\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')                                               // 153\n    Roles.setUserRoles([user1, user2], ['user','editor'])                                                     // 154\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')                   // 155\n    Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)                                                   // 156\n                                                                                                              // 157",
-                "                                                                                                      // 180\n    Roles.removeUsersFromRoles(users.bob, 'admin')                                                            // 181\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])                                            // 182\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])                                    // 183\n    Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')                                                 // 184\n                                                                                                              // 185",
-                "                                                                                                      // 260\n    // non-group usage                                                                                        // 261\n    Roles.userIsInRole(user, 'admin')                                                                         // 262\n    Roles.userIsInRole(user, ['admin','editor'])                                                              // 263\n    Roles.userIsInRole(userId, 'admin')                                                                       // 264\n    Roles.userIsInRole(userId, ['admin','editor'])                                                            // 265\n                                                                                                              // 266\n    // per-group usage                                                                                        // 267\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')                                                  // 268\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')                                                  // 269\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)                                        // 270\n                                                                                                              // 271\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP                                      // 272\n    Roles.userIsInRole(user, 'admin')                                                                         // 273\n                                                                                                              // 274",
-                "                                                                                                      // 27\n    {{#if isInRole 'admin'}}                                                                                  // 28\n    {{/if}}                                                                                                   // 29\n                                                                                                              // 30\n    {{#if isInRole 'editor,user'}}                                                                            // 31\n    {{/if}}                                                                                                   // 32\n                                                                                                              // 33\n    {{#if isInRole 'editor,user' 'group1'}}                                                                   // 34\n    {{/if}}                                                                                                   // 35\n                                                                                                              // 36"
-            ],
-            "itemtype": "method",
-            "type": "String                                                                                                  // 48",
-            "static": "// 41",
-            "final": "// 50\n/                                                                                                              // 51\n GLOBAL_GROUP: '__global_roles__',                                                                                // 52\n                                                                                                                  // 53\n                                                                                                                  // 54\n /**                                                                                                              // 55\nCreate a new role. Whitespace will be trimmed.                                                                // 56\n                                                                                                              // 57",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "Name of role                                                                             // 59",
-                    "type": "String"
-                },
-                {
-                    "name": "role",
-                    "description": "Name of role                                                                             // 93\n/                                                                                                              // 94\n deleteRole: function (role) {                                                                                    // 95\n   if (!role) return                                                                                              // 96\n                                                                                                                  // 97\n   var foundExistingUser = Meteor.users.findOne(                                                                  // 98\n                             {roles: {$in: [role]}},                                                              // 99\n                             {fields: {_id: 1}})                                                                  // 100\n                                                                                                                  // 101\n   if (foundExistingUser) {                                                                                       // 102\n     throw new Meteor.Error(403, 'Role in use')                                                                   // 103\n   }                                                                                                              // 104\n                                                                                                                  // 105\n   var thisRole = Meteor.roles.findOne({name: role})                                                              // 106\n   if (thisRole) {                                                                                                // 107\n     Meteor.roles.remove({_id: thisRole._id})                                                                     // 108\n   }                                                                                                              // 109\n },                                                                                                               // 110\n                                                                                                                  // 111\n /**                                                                                                              // 112\nAdd users to roles. Will create roles as needed.                                                              // 113\n                                                                                                              // 114\nNOTE: Mixing grouped and non-grouped roles for the same user                                                  // 115\n      is not supported and will throw an error.                                                               // 116\n                                                                                                              // 117\nMakes 2 calls to database:                                                                                    // 118\n 1. retrieve list of all existing roles                                                                       // 119\n 2. update users' roles                                                                                       // 120\n                                                                                                              // 121",
-                    "type": "String"
-                },
-                {
-                    "name": "users",
-                    "description": "User id(s) or object(s) with an _id field                                         // 130",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles/permissions to add users to                                      // 131",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional group name. If supplied, roles will be                                       // 132\n                        specific to that group.                                                               // 133\n                        Group names can not start with '$' or numbers.                                        // 134\n                        Periods in names '.' are automatically converted                                      // 135\n                        to underscores.                                                                       // 136\n                        The special group Roles.GLOBAL_GROUP provides                                         // 137\n                        a convenient way to assign blanket roles/permissions                                  // 138\n                        across all groups.  The roles/permissions in the                                      // 139\n                        Roles.GLOBAL_GROUP group will be automatically                                        // 140\n                        included in checks for any group.                                                     // 141\n/                                                                                                              // 142\n addUsersToRoles: function (users, roles, group) {                                                                // 143\n   // use Template pattern to update user roles                                                                   // 144\n   Roles._updateUserRoles(users, roles, group, Roles._update_$addToSet_fn)                                        // 145\n },                                                                                                               // 146\n                                                                                                                  // 147\n /**                                                                                                              // 148\nSet a users roles/permissions.                                                                                // 149\n                                                                                                              // 150",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "users",
-                    "description": "User id(s) or object(s) with an _id field                                         // 159",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles/permissions to add users to                                      // 160",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional group name. If supplied, roles will be                                       // 161\n                        specific to that group.                                                               // 162\n                        Group names can not start with '$'.                                                   // 163\n                        Periods in names '.' are automatically converted                                      // 164\n                        to underscores.                                                                       // 165\n                        The special group Roles.GLOBAL_GROUP provides                                         // 166\n                        a convenient way to assign blanket roles/permissions                                  // 167\n                        across all groups.  The roles/permissions in the                                      // 168\n                        Roles.GLOBAL_GROUP group will be automatically                                        // 169\n                        included in checks for any group.                                                     // 170\n/                                                                                                              // 171\n setUserRoles: function (users, roles, group) {                                                                   // 172\n   // use Template pattern to update user roles                                                                   // 173\n   Roles._updateUserRoles(users, roles, group, Roles._update_$set_fn)                                             // 174\n },                                                                                                               // 175\n                                                                                                                  // 176\n /**                                                                                                              // 177\nRemove users from roles                                                                                       // 178\n                                                                                                              // 179",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "users",
-                    "description": "User id(s) or object(s) with an _id field                                         // 187",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to                                                  // 188",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional. Group name. If supplied, only that                                          // 189\n                        group will have roles removed.                                                        // 190\n/                                                                                                              // 191\n removeUsersFromRoles: function (users, roles, group) {                                                           // 192\n   var update                                                                                                     // 193\n                                                                                                                  // 194\n   if (!users) throw new Error (\"Missing 'users' param\")                                                          // 195\n   if (!roles) throw new Error (\"Missing 'roles' param\")                                                          // 196\n   if (group) {                                                                                                   // 197\n     if ('string' !== typeof group)                                                                               // 198\n       throw new Error (\"Roles error: Invalid parameter 'group'. Expected 'string' type\")                         // 199\n     if ('$' === group[0])                                                                                        // 200\n       throw new Error (\"Roles error: groups can not start with '$'\")                                             // 201\n                                                                                                                  // 202\n     // convert any periods to underscores                                                                        // 203\n     group = group.replace(/\\./g, '_')                                                                            // 204\n   }                                                                                                              // 205\n                                                                                                                  // 206\n   // ensure arrays                                                                                               // 207\n   if (!_.isArray(users)) users = [users]                                                                         // 208\n   if (!_.isArray(roles)) roles = [roles]                                                                         // 209\n                                                                                                                  // 210\n   // ensure users is an array of user ids                                                                        // 211\n   users = _.reduce(users, function (memo, user) {                                                                // 212\n     var _id                                                                                                      // 213\n     if ('string' === typeof user) {                                                                              // 214\n       memo.push(user)                                                                                            // 215\n     } else if ('object' === typeof user) {                                                                       // 216\n       _id = user._id                                                                                             // 217\n       if ('string' === typeof _id) {                                                                             // 218\n         memo.push(_id)                                                                                           // 219\n       }                                                                                                          // 220\n     }                                                                                                            // 221\n     return memo                                                                                                  // 222\n   }, [])                                                                                                         // 223\n                                                                                                                  // 224\n   // update all users, remove from roles set                                                                     // 225\n                                                                                                                  // 226\n   if (group) {                                                                                                   // 227\n     update = {$pullAll: {}}                                                                                      // 228\n     update.$pullAll['roles.'+group] = roles                                                                      // 229\n   } else {                                                                                                       // 230\n     update = {$pullAll: {roles: roles}}                                                                          // 231\n   }                                                                                                              // 232\n                                                                                                                  // 233\n   try {                                                                                                          // 234\n     if (Meteor.isClient) {                                                                                       // 235\n       // Iterate over each user to fulfill Meteor's 'one update per ID' policy                                   // 236\n       _.each(users, function (user) {                                                                            // 237\n         Meteor.users.update({_id:user}, update)                                                                  // 238\n       })                                                                                                         // 239\n     } else {                                                                                                     // 240\n       // On the server we can leverage MongoDB's $in operator for performance                                    // 241\n       Meteor.users.update({_id:{$in:users}}, update, {multi: true})                                              // 242\n     }                                                                                                            // 243\n   }                                                                                                              // 244\n   catch (ex) {                                                                                                   // 245\n     var removeNonGroupedRoleFromGroupMsg = 'Cannot apply $pull/$pullAll modifier to non-array'                   // 246\n                                                                                                                  // 247\n     if (ex.name === 'MongoError' &&                                                                              // 248\n         ex.err === removeNonGroupedRoleFromGroupMsg) {                                                           // 249\n       throw new Error (mixingGroupAndNonGroupErrorMsg)                                                           // 250\n     }                                                                                                            // 251\n                                                                                                                  // 252\n     throw ex                                                                                                     // 253\n   }                                                                                                              // 254\n },                                                                                                               // 255\n                                                                                                                  // 256\n /**                                                                                                              // 257\nCheck if user has specified permissions/roles                                                                 // 258\n                                                                                                              // 259",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "user",
-                    "description": "User Id or actual user object                                                     // 276",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name of role/permission or Array of                                               // 277\n                           roles/permissions to check against.  If array,                                     // 278\n                           will return true if user is in _any_ role.                                         // 279",
-                    "type": "String|Array"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional. Name of group.  If supplied, limits check                                   // 280\n                        to just that group.                                                                   // 281\n                        The user's Roles.GLOBAL_GROUP will always be checked                                  // 282\n                        whether group is specified or not.                                                    // 283",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "user",
-                    "description": "User Id or actual user object                                                     // 373",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional name of group to restrict roles to.                                          // 374\n                        User's Roles.GLOBAL_GROUP will also be included.                                      // 375",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "role",
-                    "description": "Name of role/permission.  If array, users                                          // 430\n                           returned will have at least one of the roles                                       // 431\n                           specified but need not have _all_ roles.                                           // 432",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional name of group to restrict roles to.                                          // 433\n                        User's Roles.GLOBAL_GROUP will also be checked.                                       // 434",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "user",
-                    "description": "User Id or actual user object                                                     // 490",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "role",
-                    "description": "Optional name of roles to restrict groups to.                                          // 491\n                                                                                                              // 492",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "roles",
-                    "description": "// 540",
-                    "type": "Array"
-                },
-                {
-                    "name": "group",
-                    "description": "// 541",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "roles",
-                    "description": "// 565",
-                    "type": "Array"
-                },
-                {
-                    "name": "group",
-                    "description": "// 566",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "users",
-                    "description": "user id(s) or object(s) with an _id field                                         // 591",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "name(s) of roles/permissions to add users to                                      // 592",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Group name. If not null or undefined, roles will be                                     // 593\n                        specific to that group.                                                               // 594\n                        Group names can not start with '$'.                                                   // 595\n                        Periods in names '.' are automatically converted                                      // 596\n                        to underscores.                                                                       // 597\n                        The special group Roles.GLOBAL_GROUP provides                                         // 598\n                        a convenient way to assign blanket roles/permissions                                  // 599\n                        across all groups.  The roles/permissions in the                                      // 600\n                        Roles.GLOBAL_GROUP group will be automatically                                        // 601\n                        included in checks for any group.                                                     // 602",
-                    "type": "String"
-                },
-                {
-                    "name": "updateFactory",
-                    "description": "Func which returns an update object that                                      // 603\n                        will be passed to Mongo.                                                              // 604",
-                    "type": "Function"
-                },
-                {
-                    "name": "roles",
-                    "description": "// 605",
-                    "type": "Array"
-                },
-                {
-                    "name": "group",
-                    "description": "// 606\n/                                                                                                              // 607\n _updateUserRoles: function (users, roles, group, updateFactory) {                                                // 608\n   if (!users) throw new Error (\"Missing 'users' param\")                                                          // 609\n   if (!roles) throw new Error (\"Missing 'roles' param\")                                                          // 610\n   if (group) {                                                                                                   // 611\n     if ('string' !== typeof group)                                                                               // 612\n       throw new Error (\"Roles error: Invalid parameter 'group'. Expected 'string' type\")                         // 613\n     if ('$' === group[0])                                                                                        // 614\n       throw new Error (\"Roles error: groups can not start with '$'\")                                             // 615\n                                                                                                                  // 616\n     // convert any periods to underscores                                                                        // 617\n     group = group.replace(/\\./g, '_')                                                                            // 618\n   }                                                                                                              // 619\n                                                                                                                  // 620\n   var existingRoles,                                                                                             // 621\n       query,                                                                                                     // 622\n       update                                                                                                     // 623\n                                                                                                                  // 624\n   // ensure arrays to simplify code                                                                              // 625\n   if (!_.isArray(users)) users = [users]                                                                         // 626\n   if (!_.isArray(roles)) roles = [roles]                                                                         // 627\n                                                                                                                  // 628\n   // remove invalid roles                                                                                        // 629\n   roles = _.reduce(roles, function (memo, role) {                                                                // 630\n     if (role                                                                                                     // 631\n         && 'string' === typeof role                                                                              // 632\n         && role.trim().length > 0) {                                                                             // 633\n       memo.push(role.trim())                                                                                     // 634\n     }                                                                                                            // 635\n     return memo                                                                                                  // 636\n   }, [])                                                                                                         // 637\n                                                                                                                  // 638\n   // empty roles array is ok, since it might be a $set operation to clear roles                                  // 639\n   //if (roles.length === 0) return                                                                               // 640\n                                                                                                                  // 641\n   // ensure all roles exist in 'roles' collection                                                                // 642\n   existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {                                // 643\n     memo[role.name] = true                                                                                       // 644\n     return memo                                                                                                  // 645\n   }, {})                                                                                                         // 646\n   _.each(roles, function (role) {                                                                                // 647\n     if (!existingRoles[role]) {                                                                                  // 648\n       Roles.createRole(role)                                                                                     // 649\n     }                                                                                                            // 650\n   })                                                                                                             // 651\n                                                                                                                  // 652\n   // ensure users is an array of user ids                                                                        // 653\n   users = _.reduce(users, function (memo, user) {                                                                // 654\n     var _id                                                                                                      // 655\n     if ('string' === typeof user) {                                                                              // 656\n       memo.push(user)                                                                                            // 657\n     } else if ('object' === typeof user) {                                                                       // 658\n       _id = user._id                                                                                             // 659\n       if ('string' === typeof _id) {                                                                             // 660\n         memo.push(_id)                                                                                           // 661\n       }                                                                                                          // 662\n     }                                                                                                            // 663\n     return memo                                                                                                  // 664\n   }, [])                                                                                                         // 665\n                                                                                                                  // 666\n   // update all users                                                                                            // 667\n   update = updateFactory(roles, group)                                                                           // 668\n                                                                                                                  // 669\n   try {                                                                                                          // 670\n     if (Meteor.isClient) {                                                                                       // 671\n       // On client, iterate over each user to fulfill Meteor's                                                   // 672\n       // 'one update per ID' policy                                                                              // 673\n       _.each(users, function (user) {                                                                            // 674\n         Meteor.users.update({_id: user}, update)                                                                 // 675\n       })                                                                                                         // 676\n     } else {                                                                                                     // 677\n       // On the server we can use MongoDB's $in operator for                                                     // 678\n       // better performance                                                                                      // 679\n       Meteor.users.update(                                                                                       // 680\n         {_id: {$in: users}},                                                                                     // 681\n         update,                                                                                                  // 682\n         {multi: true})                                                                                           // 683\n     }                                                                                                            // 684\n   }                                                                                                              // 685\n   catch (ex) {                                                                                                   // 686\n     var addNonGroupToGroupedRolesMsg = 'Cannot apply $addToSet modifier to non-array',                           // 687\n         addGrouped2NonGroupedMsg = \"can't append to array using string field name\"                               // 688\n                                                                                                                  // 689\n     if (ex.name === 'MongoError' &&                                                                              // 690\n         (ex.err === addNonGroupToGroupedRolesMsg ||                                                              // 691\n          ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {                                                // 692\n       throw new Error (mixingGroupAndNonGroupErrorMsg)                                                           // 693\n     }                                                                                                            // 694\n                                                                                                                  // 695\n     throw ex                                                                                                     // 696\n   }                                                                                                              // 697\n }  // end _updateUserRoles                                                                                       // 698\n                                                                                                                  // 699\n})  // end _.extend(Roles ...)                                                                                     // 700\n                                                                                                                  // 701\n}());                                                                                                              // 702\n                                                                                                                  // 703\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);\n\n\n\n\n\n\n(function () {\n\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n//                                                                                                                 //\n// packages/alanning:roles/roles_client.js                                                                         //\n//                                                                                                                 //\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n                                                                                                                  //\n;(function () {                                                                                                    // 1\n                                                                                                                  // 2\n/**                                                                                                                // 3\nConvenience functions for use on client.                                                                        // 4\n                                                                                                                // 5\nNOTE: You must restrict user actions on the server-side; any                                                    // 6\nclient-side checks are strictly for convenience and must not be                                                 // 7\ntrusted.                                                                                                        // 8\n                                                                                                                // 9",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "role",
-                    "description": "Name of role or comma-seperated list of roles                                            // 38",
-                    "type": "String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional, name of group to check                                                      // 39",
-                    "type": "String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "true if current user is in at least one of the target roles                                 // 40",
-                "type": "Boolean"
-            },
-            "access": "protected",
-            "tagname": "// 590"
-        },
-        "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26": {
-            "name": "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26",
-            "submodules": {
-                "undefined": 1
-            },
-            "classes": {
-                "Roles                                                                                                    // 22": 1,
-                "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": 1
-            },
-            "fors": {
-                "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": 1
-            },
-            "namespaces": {},
-            "tag": "module",
-            "file": "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js",
-            "line": 11,
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5"
-        },
         "UIHelpers": {
             "name": "UIHelpers",
             "submodules": {},
@@ -495,7 +56,7 @@
             },
             "namespaces": {},
             "tag": "module",
-            "file": "roles/roles_client.js",
+            "file": "roles/client/uiHelpers.js",
             "line": 3,
             "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
         },
@@ -514,44 +75,19 @@
         }
     },
     "classes": {
-        "Roles                                                                                            // 22": {
-            "name": "Roles                                                                                            // 22",
-            "shortname": "Roles                                                                                            // 22",
+        "Roles": {
+            "name": "Roles",
+            "shortname": "Roles",
             "classitems": [],
             "plugins": [],
             "extensions": [],
             "plugin_for": [],
             "extension_for": [],
-            "module": "Roles                                                                                           // 6\n/                                                                                                        // 7\n                                                                                                          // 8\n/**                                                                                                        // 9\nRoles collection documents consist only of an id and a role name.                                       // 10\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 11\n/                                                                                                        // 12\nif (!Meteor.roles) {                                                                                       // 13\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 14\n}                                                                                                          // 15\n                                                                                                          // 16\n/**                                                                                                        // 17\nRole-based authorization compatible with built-in Meteor accounts package.                              // 18\n                                                                                                        // 19\nStores user's current roles in a 'roles' field on the user object.                                      // 20\n                                                                                                        // 21",
-            "namespace": "",
-            "file": "roles/.build.alanning:roles/os/packages/alanning:roles.js",
-            "line": 12,
-            "description": "Roles collection documents consist only of an id and a role name.                                       // 5\n  ex: { _id:<uuid>, name: \"admin\" }                                                                     // 6\n/                                                                                                        // 7\nif (!Meteor.roles) {                                                                                       // 8\n Meteor.roles = new Meteor.Collection(\"roles\")                                                            // 9\n                                                                                                          // 10\n // Create default indexes for roles collection                                                           // 11\n Meteor.roles._ensureIndex('name', {unique: 1})                                                           // 12\n}                                                                                                          // 13\n                                                                                                          // 14\n                                                                                                          // 15\n/**                                                                                                        // 16\nAlways publish logged-in user's roles so client-side                                                    // 17\nchecks can work.                                                                                        // 18\n/                                                                                                        // 19\nMeteor.publish(null, function () {                                                                         // 20\n var userId = this.userId,                                                                                // 21\n     fields = {roles:1}                                                                                   // 22\n                                                                                                          // 23\n return Meteor.users.find({_id:userId}, {fields: fields})                                                 // 24\n})                                                                                                         // 25\n                                                                                                          // 26\n}());                                                                                                      // 27\n                                                                                                          // 28\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);\n\n\n\n\n\n\n(function () {\n\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n//                                                                                                         //\n// packages/alanning:roles/roles_common.js                                                                 //\n//                                                                                                         //\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////\n                                                                                                          //\n;(function () {                                                                                            // 1\n                                                                                                          // 2\n/**                                                                                                        // 3\nProvides functions related to user authorization. Compatible with built-in Meteor accounts packages.    // 4\n                                                                                                        // 5"
-        },
-        "Roles                                                                                                    // 22": {
-            "name": "Roles                                                                                                    // 22",
-            "shortname": "Roles                                                                                                    // 22",
-            "classitems": [],
-            "plugins": [],
-            "extensions": [],
-            "plugin_for": [],
-            "extension_for": [],
-            "module": "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26",
-            "namespace": "",
-            "file": "roles/.build.alanning:roles/web.cordova/packages/alanning:roles.js",
-            "line": 11,
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.            // 4\n                                                                                                                // 5"
-        },
-        "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);": {
-            "name": "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);",
-            "shortname": "UIHelpers                                                                                                // 42\n/                                                                                                              // 43\n isInRole: function (role, group) {                                                                               // 44\n   var user = Meteor.user(),                                                                                      // 45\n       comma = (role || '').indexOf(','),                                                                         // 46\n       roles                                                                                                      // 47\n                                                                                                                  // 48\n   if (!user) return false                                                                                        // 49\n   if (!Match.test(role, String)) return false                                                                    // 50\n                                                                                                                  // 51\n   if (comma !== -1) {                                                                                            // 52\n     roles = _.reduce(role.split(','), function (memo, r) {                                                       // 53\n       if (!r || !r.trim()) {                                                                                     // 54\n         return memo                                                                                              // 55\n       }                                                                                                          // 56\n       memo.push(r.trim())                                                                                        // 57\n       return memo                                                                                                // 58\n     }, [])                                                                                                       // 59\n   } else {                                                                                                       // 60\n     roles = [role]                                                                                               // 61\n   }                                                                                                              // 62\n                                                                                                                  // 63\n   if (Match.test(group, String)) {                                                                               // 64\n     return Roles.userIsInRole(user, roles, group)                                                                // 65\n   }                                                                                                              // 66\n                                                                                                                  // 67\n   return Roles.userIsInRole(user, roles)                                                                         // 68\n }                                                                                                                // 69\n}                                                                                                                  // 70\n                                                                                                                  // 71\nif (Package.ui) {                                                                                                  // 72\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73\n   Package.ui.UI.registerHelper(name, func)                                                                       // 74\n })                                                                                                               // 75\n} else if (Package.handlebars) {                                                                                   // 76\n _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77\n   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78\n })                                                                                                               // 79\n} else {                                                                                                           // 80\n console.log && console.log('WARNING: Roles template helpers not registered. Handlebars or UI package not found') // 81\n}                                                                                                                  // 82\n                                                                                                                  // 83\n}());                                                                                                              // 84\n                                                                                                                  // 85\n/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////\n\n}).call(this);",
-            "classitems": [],
-            "plugins": [],
-            "extensions": [],
-            "plugin_for": [],
-            "extension_for": [],
-            "module": "UIHelpers                                                                                               // 10\n/                                                                                                                // 11\n                                                                                                                  // 12\n////////////////////////////////////////////////////////////                                                       // 13\n// UI helpers                                                                                                      // 14\n//                                                                                                                 // 15\n// Use a semi-private variable rather than declaring UI                                                            // 16\n// helpers directly so that we can unit test the helpers.                                                          // 17\n// XXX For some reason, the UI helpers are not registered                                                          // 18\n// before the tests run.                                                                                           // 19\n//                                                                                                                 // 20\nRoles._uiHelpers = {                                                                                               // 21\n                                                                                                                  // 22\n /**                                                                                                              // 23\nUI helper to check if current user is in at least one                                                         // 24\nof the target roles.  For use in client-side templates.                                                       // 25\n                                                                                                              // 26",
-            "namespace": ""
+            "module": "Roles",
+            "file": "roles/roles_common.js",
+            "line": 17,
+            "description": "Authorization package compatible with built-in Meteor accounts system.\n\nStores user's current roles in a 'roles' field on the user object.",
+            "is_constructor": 1
         },
         "UIHelpers": {
             "name": "UIHelpers",
@@ -563,27 +99,24 @@
             "extension_for": [],
             "module": "UIHelpers",
             "namespace": ""
-        },
-        "Roles": {
-            "name": "Roles",
-            "shortname": "Roles",
-            "classitems": [],
-            "plugins": [],
-            "extensions": [],
-            "plugin_for": [],
-            "extension_for": [],
-            "module": "Roles",
-            "namespace": "",
-            "file": "roles/roles_common.js",
-            "line": 17,
-            "description": "Role-based authorization compatible with built-in Meteor accounts package.\n\nStores user's current roles in a 'roles' field on the user object.",
-            "is_constructor": 1
         }
     },
     "classitems": [
         {
-            "file": "roles/roles_client.js",
-            "line": 23,
+            "file": "roles/client/subscriptions.js",
+            "line": 4,
+            "description": "Subscription handle for the currently logged in user's permissions.\n\nNOTE: The corresponding publish function, `_roles`, depends on\n`this.userId` so it will automatically re-run when the currently\nlogged-in user changes.",
+            "example": [
+                "\n\n    `Roles.subscription.ready()` // => `true` if user roles have been loaded"
+            ],
+            "itemtype": "property",
+            "name": "subscription",
+            "type": "Object",
+            "class": "Roles"
+        },
+        {
+            "file": "roles/client/uiHelpers.js",
+            "line": 24,
             "description": "UI helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
             "example": [
                 "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'group1'}}\n    {{/if}}"
@@ -761,7 +294,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 257,
+            "line": 254,
             "description": "Check if user has specified permissions/roles",
             "example": [
                 "\n    // non-group usage\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // per-group usage\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)\n\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP\n    Roles.userIsInRole(user, 'admin')"
@@ -795,7 +328,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 369,
+            "line": 366,
             "description": "Retrieve users roles",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -821,7 +354,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 411,
+            "line": 408,
             "description": "Retrieve set of all existing roles",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -834,7 +367,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 421,
+            "line": 418,
             "description": "Retrieve all users who are in target role.  \n\nNOTE: This is an expensive query; it performs a full collection scan\non the users collection since there is no index set on the 'roles' field.  \nThis is by design as most queries will specify an _id so the _id index is \nused automatically.",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -849,6 +382,12 @@
                     "description": "Optional name of group to restrict roles to.\n                        User's Roles.GLOBAL_GROUP will also be checked.",
                     "type": "String",
                     "optional": true
+                },
+                {
+                    "name": "options",
+                    "description": "Optional options which are passed directly\n                          through to `Meteor.users.find(query, options)`",
+                    "type": "Object",
+                    "optional": true
                 }
             ],
             "return": {
@@ -860,7 +399,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 486,
+            "line": 485,
             "description": "Retrieve users groups, if any",
             "itemtype": "method",
             "name": "getGroupsForUser",
@@ -886,7 +425,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 534,
+            "line": 533,
             "description": "Private function 'template' that uses $set to construct an update object\nfor MongoDB.  Passed to _updateUserRoles",
             "itemtype": "method",
             "name": "_update_$set_fn",
@@ -914,7 +453,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 559,
+            "line": 558,
             "description": "Private function 'template' that uses $addToSet to construct an update \nobject for MongoDB.  Passed to _updateUserRoles",
             "itemtype": "method",
             "name": "_update_$addToSet_fn",
@@ -942,8 +481,8 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 585,
-            "description": "Internal function that users the Template pattern to adds or sets roles \nfor users.",
+            "line": 584,
+            "description": "Internal function that uses the Template pattern to adds or sets roles \nfor users.",
             "itemtype": "method",
             "name": "_updateUserRoles",
             "access": "protected",
@@ -987,14 +526,14 @@
         {
             "file": "roles/roles_server.js",
             "line": 4,
-            "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
+            "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id: \"123\", name: \"admin\" }",
             "class": "",
             "module": "Roles"
         },
         {
             "file": "roles/roles_server.js",
             "line": 16,
-            "description": "Always publish logged-in user's roles so client-side\nchecks can work.",
+            "description": "Publish logged-in user's roles so client-side checks can work.\n\nUse a named publish function so clients can check `ready()` state.",
             "class": "",
             "module": "Roles"
         }
@@ -1005,11 +544,11 @@
             "line": " roles/roles_common.js:9"
         },
         {
-            "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
+            "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id: \"123\", name: \"admin\" }",
             "line": " roles/roles_server.js:4"
         },
         {
-            "message": "Missing item type\nAlways publish logged-in user's roles so client-side\nchecks can work.",
+            "message": "Missing item type\nPublish logged-in user's roles so client-side checks can work.\n\nUse a named publish function so clients can check `ready()` state.",
             "line": " roles/roles_server.js:16"
         }
     ]
diff --git a/docs/files/roles_client_subscriptions.js.html b/docs/files/roles_client_subscriptions.js.html
new file mode 100644
index 0000000000..d4ca657889
--- /dev/null
+++ b/docs/files/roles_client_subscriptions.js.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>roles/client/subscriptions.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v1.2.14</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="../classes/Roles.html">Roles</a></li>
+            
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="../modules/Roles.html">Roles</a></li>
+            
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1 class="file-heading">File: roles/client/subscriptions.js</h1>
+
+<div class="file">
+    <pre class="code prettyprint linenums">
+&quot;use strict&quot;
+
+
+/**
+ * Subscription handle for the currently logged in user&#x27;s permissions.
+ *
+ * NOTE: The corresponding publish function, &#x60;_roles&#x60;, depends on
+ * &#x60;this.userId&#x60; so it will automatically re-run when the currently
+ * logged-in user changes.
+ *
+ * @example
+ *
+ *     &#x60;Roles.subscription.ready()&#x60; // =&gt; &#x60;true&#x60; if user roles have been loaded
+ *
+ * @property subscription
+ * @type Object
+ * @for Roles
+ */
+
+Tracker.autorun(function () {
+  Roles.subscription = Meteor.subscribe(&quot;_roles&quot;)
+})
+
+    </pre>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/files/roles_client_uiHelpers.js.html b/docs/files/roles_client_uiHelpers.js.html
new file mode 100644
index 0000000000..82cd6ea92a
--- /dev/null
+++ b/docs/files/roles_client_uiHelpers.js.html
@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>roles/client/uiHelpers.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
+            
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v1.2.14</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+    <h2 class="off-left">APIs</h2>
+    <div id="api-tabview" class="tabview">
+        <ul class="tabs">
+            <li><a href="#api-classes">Classes</a></li>
+            <li><a href="#api-modules">Modules</a></li>
+        </ul>
+
+        <div id="api-tabview-filter">
+            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+        </div>
+
+        <div id="api-tabview-panel">
+            <ul id="api-classes" class="apis classes">
+            
+                <li><a href="../classes/Roles.html">Roles</a></li>
+            
+                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+            
+            </ul>
+
+            <ul id="api-modules" class="apis modules">
+            
+                <li><a href="../modules/Roles.html">Roles</a></li>
+            
+                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+            
+            </ul>
+        </div>
+    </div>
+</div>
+
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+        Show:
+        <label for="api-show-inherited">
+            <input type="checkbox" id="api-show-inherited" checked>
+            Inherited
+        </label>
+
+        <label for="api-show-protected">
+            <input type="checkbox" id="api-show-protected">
+            Protected
+        </label>
+
+        <label for="api-show-private">
+            <input type="checkbox" id="api-show-private">
+            Private
+        </label>
+        <label for="api-show-deprecated">
+            <input type="checkbox" id="api-show-deprecated">
+            Deprecated
+        </label>
+
+    </div>
+
+
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+                        <h1 class="file-heading">File: roles/client/uiHelpers.js</h1>
+
+<div class="file">
+    <pre class="code prettyprint linenums">
+&quot;use strict&quot;
+
+/**
+ * Convenience functions for use on client.
+ *
+ * NOTE: You must restrict user actions on the server-side; any
+ * client-side checks are strictly for convenience and must not be
+ * trusted.
+ *
+ * @module UIHelpers
+ */
+
+
+////////////////////////////////////////////////////////////
+// UI helpers
+//
+// Use a semi-private variable rather than declaring UI
+// helpers directly so that we can unit test the helpers.
+// XXX For some reason, the UI helpers are not registered 
+// before the tests run.
+//
+Roles._uiHelpers = {
+
+  /**
+   * UI helper to check if current user is in at least one
+   * of the target roles.  For use in client-side templates.
+   *
+   * @example
+   *     {{#if isInRole &#x27;admin&#x27;}}
+   *     {{/if}}
+   *
+   *     {{#if isInRole &#x27;editor,user&#x27;}}
+   *     {{/if}}
+   *
+   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;group1&#x27;}}
+   *     {{/if}}
+   *
+   * @method isInRole
+   * @param {String} role Name of role or comma-seperated list of roles
+   * @param {String} [group] Optional, name of group to check
+   * @return {Boolean} true if current user is in at least one of the target roles
+   * @static
+   * @for UIHelpers 
+   */
+  isInRole: function (role, group) {
+    var user = Meteor.user(),
+        comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),
+        roles
+
+    if (!user) return false
+    if (!Match.test(role, String)) return false
+
+    if (comma !== -1) {
+      roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {
+        if (!r || !r.trim()) {
+          return memo
+        }
+        memo.push(r.trim())
+        return memo
+      }, [])
+    } else {
+      roles = [role]
+    }
+
+    if (Match.test(group, String)) {
+      return Roles.userIsInRole(user, roles, group)
+    }
+
+    return Roles.userIsInRole(user, roles)
+  }
+}
+
+
+
+////////////////////////////////////////////////////////////
+// Register UI helpers
+//
+
+if (Roles.debug &amp;&amp; console.log) {
+  console.log(&quot;[roles] Roles.debug =&quot;, Roles.debug)
+}
+
+if (&#x27;undefined&#x27; !== typeof Package.blaze &amp;&amp;
+    &#x27;undefined&#x27; !== typeof Package.blaze.Blaze &amp;&amp;
+    &#x27;function&#x27;  === typeof Package.blaze.Blaze.registerHelper) {
+  _.each(Roles._uiHelpers, function (func, name) {
+    if (Roles.debug &amp;&amp; console.log) {
+      console.log(&quot;[roles] registering Blaze helper &#x27;&quot; + name + &quot;&#x27;&quot;)
+    }
+    Package.blaze.Blaze.registerHelper(name, func) 
+  })
+}
+
+    </pre>
+</div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
deleted file mode 100644
index d4edd73bdb..0000000000
--- a/docs/files/roles_roles_client.js.html
+++ /dev/null
@@ -1,394 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>roles/roles_client.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.12</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
-            
-                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-                <li><a href="../classes/UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);.html">UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/Roles                                                                                                   __ 6
-_                                                                                                                __ 7
-                                                                                                                  __ 8
-_**                                                                                                                __ 9
-Roles collection documents consist only of an id and a role name.                                               __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
-_                                                                                                                __ 12
-if (!Meteor.roles) {                                                                                               __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
-}                                                                                                                  __ 15
-                                                                                                                  __ 16
-_**                                                                                                                __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
-                                                                                                                __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
-                                                                                                                __ 21.html">Roles                                                                                                   // 6
-/                                                                                                                // 7
-                                                                                                                  // 8
-/**                                                                                                                // 9
-Roles collection documents consist only of an id and a role name.                                               // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
-/                                                                                                                // 12
-if (!Meteor.roles) {                                                                                               // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
-}                                                                                                                  // 15
-                                                                                                                  // 16
-/**                                                                                                                // 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
-                                                                                                                // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
-                                                                                                                // 21</a></li>
-            
-                <li><a href="../modules/Roles                                                                                           __ 6
-_                                                                                                        __ 7
-                                                                                                          __ 8
-_**                                                                                                        __ 9
-Roles collection documents consist only of an id and a role name.                                       __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
-_                                                                                                        __ 12
-if (!Meteor.roles) {                                                                                       __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
-}                                                                                                          __ 15
-                                                                                                          __ 16
-_**                                                                                                        __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
-                                                                                                        __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
-                                                                                                        __ 21.html">Roles                                                                                           // 6
-/                                                                                                        // 7
-                                                                                                          // 8
-/**                                                                                                        // 9
-Roles collection documents consist only of an id and a role name.                                       // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
-/                                                                                                        // 12
-if (!Meteor.roles) {                                                                                       // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
-}                                                                                                          // 15
-                                                                                                          // 16
-/**                                                                                                        // 17
-Role-based authorization compatible with built-in Meteor accounts package.                              // 18
-                                                                                                        // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
-                                                                                                        // 21</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-                <li><a href="../modules/UIHelpers                                                                                               __ 10
-_                                                                                                                __ 11
-                                                                                                                  __ 12
-____________________________________________________________                                                       __ 13
-__ UI helpers                                                                                                      __ 14
-__                                                                                                                 __ 15
-__ Use a semi-private variable rather than declaring UI                                                            __ 16
-__ helpers directly so that we can unit test the helpers.                                                          __ 17
-__ XXX For some reason, the UI helpers are not registered                                                          __ 18
-__ before the tests run.                                                                                           __ 19
-__                                                                                                                 __ 20
-Roles._uiHelpers = {                                                                                               __ 21
-                                                                                                                  __ 22
- _**                                                                                                              __ 23
-UI helper to check if current user is in at least one                                                         __ 24
-of the target roles.  For use in client-side templates.                                                       __ 25
-                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
-/                                                                                                                // 11
-                                                                                                                  // 12
-////////////////////////////////////////////////////////////                                                       // 13
-// UI helpers                                                                                                      // 14
-//                                                                                                                 // 15
-// Use a semi-private variable rather than declaring UI                                                            // 16
-// helpers directly so that we can unit test the helpers.                                                          // 17
-// XXX For some reason, the UI helpers are not registered                                                          // 18
-// before the tests run.                                                                                           // 19
-//                                                                                                                 // 20
-Roles._uiHelpers = {                                                                                               // 21
-                                                                                                                  // 22
- /**                                                                                                              // 23
-UI helper to check if current user is in at least one                                                         // 24
-of the target roles.  For use in client-side templates.                                                       // 25
-                                                                                                              // 26</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-                        <h1 class="file-heading">File: roles/roles_client.js</h1>
-
-<div class="file">
-    <pre class="code prettyprint linenums">
-;(function () {
-
-/**
- * Convenience functions for use on client.
- *
- * NOTE: You must restrict user actions on the server-side; any
- * client-side checks are strictly for convenience and must not be
- * trusted.
- *
- * @module UIHelpers
- */
-
-////////////////////////////////////////////////////////////
-// UI helpers
-//
-// Use a semi-private variable rather than declaring UI
-// helpers directly so that we can unit test the helpers.
-// XXX For some reason, the UI helpers are not registered 
-// before the tests run.
-//
-Roles._uiHelpers = {
-
-  /**
-   * UI helper to check if current user is in at least one
-   * of the target roles.  For use in client-side templates.
-   *
-   * @example
-   *     {{#if isInRole &#x27;admin&#x27;}}
-   *     {{/if}}
-   *
-   *     {{#if isInRole &#x27;editor,user&#x27;}}
-   *     {{/if}}
-   *
-   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;group1&#x27;}}
-   *     {{/if}}
-   *
-   * @method isInRole
-   * @param {String} role Name of role or comma-seperated list of roles
-   * @param {String} [group] Optional, name of group to check
-   * @return {Boolean} true if current user is in at least one of the target roles
-   * @static
-   * @for UIHelpers 
-   */
-  isInRole: function (role, group) {
-    var user = Meteor.user(),
-        comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),
-        roles
-
-    if (!user) return false
-    if (!Match.test(role, String)) return false
-
-    if (comma !== -1) {
-      roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {
-        if (!r || !r.trim()) {
-          return memo
-        }
-        memo.push(r.trim())
-        return memo
-      }, [])
-    } else {
-      roles = [role]
-    }
-
-    if (Match.test(group, String)) {
-      return Roles.userIsInRole(user, roles, group)
-    }
-
-    return Roles.userIsInRole(user, roles)
-  }
-}
-
-if (Package.ui) {
-  _.each(Roles._uiHelpers, function (func, name) {
-    Package.ui.UI.registerHelper(name, func) 
-  })
-} else if (Package.handlebars) {
-  _.each(Roles._uiHelpers, function (func, name) {
-    Package.handlebars.Handlebars.registerHelper(name, func)
-  })
-} else {
-  console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;)
-}
-
-}());
-
-    </pre>
-</div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index ccdf17fe0d..a85e7b3359 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.12</em>
+            <em>API Docs for: v1.2.14</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,212 +43,16 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
-                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
-            
-                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
-            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../classes/UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);.html">UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);</a></li>
-            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
-                <li><a href="../modules/Roles                                                                                                   __ 6
-_                                                                                                                __ 7
-                                                                                                                  __ 8
-_**                                                                                                                __ 9
-Roles collection documents consist only of an id and a role name.                                               __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
-_                                                                                                                __ 12
-if (!Meteor.roles) {                                                                                               __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
-}                                                                                                                  __ 15
-                                                                                                                  __ 16
-_**                                                                                                                __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
-                                                                                                                __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
-                                                                                                                __ 21.html">Roles                                                                                                   // 6
-/                                                                                                                // 7
-                                                                                                                  // 8
-/**                                                                                                                // 9
-Roles collection documents consist only of an id and a role name.                                               // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
-/                                                                                                                // 12
-if (!Meteor.roles) {                                                                                               // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
-}                                                                                                                  // 15
-                                                                                                                  // 16
-/**                                                                                                                // 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
-                                                                                                                // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
-                                                                                                                // 21</a></li>
-            
-                <li><a href="../modules/Roles                                                                                           __ 6
-_                                                                                                        __ 7
-                                                                                                          __ 8
-_**                                                                                                        __ 9
-Roles collection documents consist only of an id and a role name.                                       __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
-_                                                                                                        __ 12
-if (!Meteor.roles) {                                                                                       __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
-}                                                                                                          __ 15
-                                                                                                          __ 16
-_**                                                                                                        __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
-                                                                                                        __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
-                                                                                                        __ 21.html">Roles                                                                                           // 6
-/                                                                                                        // 7
-                                                                                                          // 8
-/**                                                                                                        // 9
-Roles collection documents consist only of an id and a role name.                                       // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
-/                                                                                                        // 12
-if (!Meteor.roles) {                                                                                       // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
-}                                                                                                          // 15
-                                                                                                          // 16
-/**                                                                                                        // 17
-Role-based authorization compatible with built-in Meteor accounts package.                              // 18
-                                                                                                        // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
-                                                                                                        // 21</a></li>
-            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../modules/UIHelpers                                                                                               __ 10
-_                                                                                                                __ 11
-                                                                                                                  __ 12
-____________________________________________________________                                                       __ 13
-__ UI helpers                                                                                                      __ 14
-__                                                                                                                 __ 15
-__ Use a semi-private variable rather than declaring UI                                                            __ 16
-__ helpers directly so that we can unit test the helpers.                                                          __ 17
-__ XXX For some reason, the UI helpers are not registered                                                          __ 18
-__ before the tests run.                                                                                           __ 19
-__                                                                                                                 __ 20
-Roles._uiHelpers = {                                                                                               __ 21
-                                                                                                                  __ 22
- _**                                                                                                              __ 23
-UI helper to check if current user is in at least one                                                         __ 24
-of the target roles.  For use in client-side templates.                                                       __ 25
-                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
-/                                                                                                                // 11
-                                                                                                                  // 12
-////////////////////////////////////////////////////////////                                                       // 13
-// UI helpers                                                                                                      // 14
-//                                                                                                                 // 15
-// Use a semi-private variable rather than declaring UI                                                            // 16
-// helpers directly so that we can unit test the helpers.                                                          // 17
-// XXX For some reason, the UI helpers are not registered                                                          // 18
-// before the tests run.                                                                                           // 19
-//                                                                                                                 // 20
-Roles._uiHelpers = {                                                                                               // 21
-                                                                                                                  // 22
- /**                                                                                                              // 23
-UI helper to check if current user is in at least one                                                         // 24
-of the target roles.  For use in client-side templates.                                                       // 25
-                                                                                                              // 26</a></li>
-            
             </ul>
         </div>
     </div>
@@ -301,11 +105,11 @@ of the target roles.  For use in client-side templates.
  *   ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }
  */
 if (!Meteor.roles) {
-  Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
+  Meteor.roles = new Mongo.Collection(&quot;roles&quot;)
 }
 
 /**
- * Role-based authorization compatible with built-in Meteor accounts package.
+ * Authorization package compatible with built-in Meteor accounts system.
  *
  * Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.
  *
@@ -533,10 +337,7 @@ _.extend(Roles, {
       }
     }
     catch (ex) {
-      var removeNonGroupedRoleFromGroupMsg = &#x27;Cannot apply $pull/$pullAll modifier to non-array&#x27; 
-
-      if (ex.name === &#x27;MongoError&#x27; &amp;&amp;
-          ex.err === removeNonGroupedRoleFromGroupMsg) {
+      if (ex.name === &#x27;MongoError&#x27; &amp;&amp; isMongoMixError(ex.err)) {
         throw new Error (mixingGroupAndNonGroupErrorMsg)
       }
 
@@ -722,9 +523,11 @@ _.extend(Roles, {
    *                            specified but need not have _all_ roles.
    * @param {String} [group] Optional name of group to restrict roles to.
    *                         User&#x27;s Roles.GLOBAL_GROUP will also be checked.
+   * @param {Object} [options] Optional options which are passed directly
+   *                           through to &#x60;Meteor.users.find(query, options)&#x60;
    * @return {Cursor} cursor of users in role
    */
-  getUsersInRole: function (role, group) {
+  getUsersInRole: function (role, group, options) {
     var query,
         roles = role,
         groupQuery
@@ -770,7 +573,7 @@ _.extend(Roles, {
       query.$or.push({roles: {$in: roles}})
     }
 
-    return Meteor.users.find(query)
+    return Meteor.users.find(query, options);
   },  // end getUsersInRole 
   
   /**
@@ -873,7 +676,7 @@ _.extend(Roles, {
 
 
   /**
-   * Internal function that users the Template pattern to adds or sets roles 
+   * Internal function that uses the Template pattern to adds or sets roles 
    * for users.
    *
    * @method _updateUserRoles
@@ -974,12 +777,7 @@ _.extend(Roles, {
       }
     }
     catch (ex) {
-      var addNonGroupToGroupedRolesMsg = &#x27;Cannot apply $addToSet modifier to non-array&#x27;,
-          addGrouped2NonGroupedMsg = &quot;can&#x27;t append to array using string field name&quot;
-
-      if (ex.name === &#x27;MongoError&#x27; &amp;&amp;
-          (ex.err === addNonGroupToGroupedRolesMsg ||
-           ex.err.substring(0, 45) === addGrouped2NonGroupedMsg)) {
+      if (ex.name === &#x27;MongoError&#x27; &amp;&amp; isMongoMixError(ex.err)) {
         throw new Error (mixingGroupAndNonGroupErrorMsg)
       }
 
@@ -989,6 +787,26 @@ _.extend(Roles, {
 
 })  // end _.extend(Roles ...)
 
+
+function isMongoMixError (errorMsg) {
+  var expectedMessages = [
+      &#x27;Cannot apply $addToSet modifier to non-array&#x27;,
+      &#x27;Cannot apply $addToSet to a non-array field&#x27;,
+      &#x27;Can only apply $pullAll to an array&#x27;,
+      &#x27;Cannot apply $pull/$pullAll modifier to non-array&#x27;,
+      &quot;can&#x27;t append to array using string field name&quot;,
+      &#x27;to traverse the element&#x27;
+      ]
+
+  return _.some(expectedMessages, function (snippet) {
+    return strContains(errorMsg, snippet)
+  })
+}
+
+function strContains (haystack, needle) {
+  return -1 !== haystack.indexOf(needle)
+}
+
 }());
 
     </pre>
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index aec7958d03..4fcce81dcc 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.12</em>
+            <em>API Docs for: v1.2.14</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,212 +43,16 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
-                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
-            
-                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
-            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../classes/UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);.html">UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);</a></li>
-            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
-                <li><a href="../modules/Roles                                                                                                   __ 6
-_                                                                                                                __ 7
-                                                                                                                  __ 8
-_**                                                                                                                __ 9
-Roles collection documents consist only of an id and a role name.                                               __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
-_                                                                                                                __ 12
-if (!Meteor.roles) {                                                                                               __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
-}                                                                                                                  __ 15
-                                                                                                                  __ 16
-_**                                                                                                                __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
-                                                                                                                __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
-                                                                                                                __ 21.html">Roles                                                                                                   // 6
-/                                                                                                                // 7
-                                                                                                                  // 8
-/**                                                                                                                // 9
-Roles collection documents consist only of an id and a role name.                                               // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
-/                                                                                                                // 12
-if (!Meteor.roles) {                                                                                               // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
-}                                                                                                                  // 15
-                                                                                                                  // 16
-/**                                                                                                                // 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
-                                                                                                                // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
-                                                                                                                // 21</a></li>
-            
-                <li><a href="../modules/Roles                                                                                           __ 6
-_                                                                                                        __ 7
-                                                                                                          __ 8
-_**                                                                                                        __ 9
-Roles collection documents consist only of an id and a role name.                                       __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
-_                                                                                                        __ 12
-if (!Meteor.roles) {                                                                                       __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
-}                                                                                                          __ 15
-                                                                                                          __ 16
-_**                                                                                                        __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
-                                                                                                        __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
-                                                                                                        __ 21.html">Roles                                                                                           // 6
-/                                                                                                        // 7
-                                                                                                          // 8
-/**                                                                                                        // 9
-Roles collection documents consist only of an id and a role name.                                       // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
-/                                                                                                        // 12
-if (!Meteor.roles) {                                                                                       // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
-}                                                                                                          // 15
-                                                                                                          // 16
-/**                                                                                                        // 17
-Role-based authorization compatible with built-in Meteor accounts package.                              // 18
-                                                                                                        // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
-                                                                                                        // 21</a></li>
-            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../modules/UIHelpers                                                                                               __ 10
-_                                                                                                                __ 11
-                                                                                                                  __ 12
-____________________________________________________________                                                       __ 13
-__ UI helpers                                                                                                      __ 14
-__                                                                                                                 __ 15
-__ Use a semi-private variable rather than declaring UI                                                            __ 16
-__ helpers directly so that we can unit test the helpers.                                                          __ 17
-__ XXX For some reason, the UI helpers are not registered                                                          __ 18
-__ before the tests run.                                                                                           __ 19
-__                                                                                                                 __ 20
-Roles._uiHelpers = {                                                                                               __ 21
-                                                                                                                  __ 22
- _**                                                                                                              __ 23
-UI helper to check if current user is in at least one                                                         __ 24
-of the target roles.  For use in client-side templates.                                                       __ 25
-                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
-/                                                                                                                // 11
-                                                                                                                  // 12
-////////////////////////////////////////////////////////////                                                       // 13
-// UI helpers                                                                                                      // 14
-//                                                                                                                 // 15
-// Use a semi-private variable rather than declaring UI                                                            // 16
-// helpers directly so that we can unit test the helpers.                                                          // 17
-// XXX For some reason, the UI helpers are not registered                                                          // 18
-// before the tests run.                                                                                           // 19
-//                                                                                                                 // 20
-Roles._uiHelpers = {                                                                                               // 21
-                                                                                                                  // 22
- /**                                                                                                              // 23
-UI helper to check if current user is in at least one                                                         // 24
-of the target roles.  For use in client-side templates.                                                       // 25
-                                                                                                              // 26</a></li>
-            
             </ul>
         </div>
     </div>
@@ -288,15 +92,15 @@ of the target roles.  For use in client-side templates.
 
 <div class="file">
     <pre class="code prettyprint linenums">
-;(function () {
+&quot;use strict&quot;
 
 
 /**
  * Roles collection documents consist only of an id and a role name.
- *   ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }
+ *   ex: { _id: &quot;123&quot;, name: &quot;admin&quot; }
  */
 if (!Meteor.roles) {
-  Meteor.roles = new Meteor.Collection(&quot;roles&quot;)
+  Meteor.roles = new Mongo.Collection(&quot;roles&quot;)
 
   // Create default indexes for roles collection
   Meteor.roles._ensureIndex(&#x27;name&#x27;, {unique: 1})
@@ -304,18 +108,23 @@ if (!Meteor.roles) {
 
 
 /**
- * Always publish logged-in user&#x27;s roles so client-side
- * checks can work.
+ * Publish logged-in user&#x27;s roles so client-side checks can work.
+ * 
+ * Use a named publish function so clients can check &#x60;ready()&#x60; state.
  */
-Meteor.publish(null, function () {
-  var userId = this.userId,
-      fields = {roles:1}
+Meteor.publish(&#x27;_roles&#x27;, function () {
+  var loggedInUserId = this.userId,
+      fields = {roles: 1}
 
-  return Meteor.users.find({_id:userId}, {fields: fields})
+  if (!loggedInUserId) {
+    this.ready()
+    return
+  }
+
+  return Meteor.users.find({_id: loggedInUserId},
+                           {fields: fields})
 })
 
-}());
-
     </pre>
 </div>
 
diff --git a/docs/index.html b/docs/index.html
index 1fc095e5c1..dd5a660860 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.12</em>
+            <em>API Docs for: v1.2.14</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,212 +43,16 @@
             
                 <li><a href="./classes/Roles.html">Roles</a></li>
             
-                <li><a href="./classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
-            
-                <li><a href="./classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
-            
                 <li><a href="./classes/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="./classes/UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);.html">UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);</a></li>
-            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="./modules/Roles.html">Roles</a></li>
             
-                <li><a href="./modules/Roles                                                                                                   __ 6
-_                                                                                                                __ 7
-                                                                                                                  __ 8
-_**                                                                                                                __ 9
-Roles collection documents consist only of an id and a role name.                                               __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
-_                                                                                                                __ 12
-if (!Meteor.roles) {                                                                                               __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
-}                                                                                                                  __ 15
-                                                                                                                  __ 16
-_**                                                                                                                __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
-                                                                                                                __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
-                                                                                                                __ 21.html">Roles                                                                                                   // 6
-/                                                                                                                // 7
-                                                                                                                  // 8
-/**                                                                                                                // 9
-Roles collection documents consist only of an id and a role name.                                               // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
-/                                                                                                                // 12
-if (!Meteor.roles) {                                                                                               // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
-}                                                                                                                  // 15
-                                                                                                                  // 16
-/**                                                                                                                // 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
-                                                                                                                // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
-                                                                                                                // 21</a></li>
-            
-                <li><a href="./modules/Roles                                                                                           __ 6
-_                                                                                                        __ 7
-                                                                                                          __ 8
-_**                                                                                                        __ 9
-Roles collection documents consist only of an id and a role name.                                       __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
-_                                                                                                        __ 12
-if (!Meteor.roles) {                                                                                       __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
-}                                                                                                          __ 15
-                                                                                                          __ 16
-_**                                                                                                        __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
-                                                                                                        __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
-                                                                                                        __ 21.html">Roles                                                                                           // 6
-/                                                                                                        // 7
-                                                                                                          // 8
-/**                                                                                                        // 9
-Roles collection documents consist only of an id and a role name.                                       // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
-/                                                                                                        // 12
-if (!Meteor.roles) {                                                                                       // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
-}                                                                                                          // 15
-                                                                                                          // 16
-/**                                                                                                        // 17
-Role-based authorization compatible with built-in Meteor accounts package.                              // 18
-                                                                                                        // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
-                                                                                                        // 21</a></li>
-            
                 <li><a href="./modules/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="./modules/UIHelpers                                                                                               __ 10
-_                                                                                                                __ 11
-                                                                                                                  __ 12
-____________________________________________________________                                                       __ 13
-__ UI helpers                                                                                                      __ 14
-__                                                                                                                 __ 15
-__ Use a semi-private variable rather than declaring UI                                                            __ 16
-__ helpers directly so that we can unit test the helpers.                                                          __ 17
-__ XXX For some reason, the UI helpers are not registered                                                          __ 18
-__ before the tests run.                                                                                           __ 19
-__                                                                                                                 __ 20
-Roles._uiHelpers = {                                                                                               __ 21
-                                                                                                                  __ 22
- _**                                                                                                              __ 23
-UI helper to check if current user is in at least one                                                         __ 24
-of the target roles.  For use in client-side templates.                                                       __ 25
-                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
-/                                                                                                                // 11
-                                                                                                                  // 12
-////////////////////////////////////////////////////////////                                                       // 13
-// UI helpers                                                                                                      // 14
-//                                                                                                                 // 15
-// Use a semi-private variable rather than declaring UI                                                            // 16
-// helpers directly so that we can unit test the helpers.                                                          // 17
-// XXX For some reason, the UI helpers are not registered                                                          // 18
-// before the tests run.                                                                                           // 19
-//                                                                                                                 // 20
-Roles._uiHelpers = {                                                                                               // 21
-                                                                                                                  // 22
- /**                                                                                                              // 23
-UI helper to check if current user is in at least one                                                         // 24
-of the target roles.  For use in client-side templates.                                                       // 25
-                                                                                                              // 26</a></li>
-            
             </ul>
         </div>
     </div>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index 2ab0b4ae14..b153dc6514 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.12</em>
+            <em>API Docs for: v1.2.14</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,212 +43,16 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
-                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
-            
-                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
-            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../classes/UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);.html">UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);</a></li>
-            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
-                <li><a href="../modules/Roles                                                                                                   __ 6
-_                                                                                                                __ 7
-                                                                                                                  __ 8
-_**                                                                                                                __ 9
-Roles collection documents consist only of an id and a role name.                                               __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
-_                                                                                                                __ 12
-if (!Meteor.roles) {                                                                                               __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
-}                                                                                                                  __ 15
-                                                                                                                  __ 16
-_**                                                                                                                __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
-                                                                                                                __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
-                                                                                                                __ 21.html">Roles                                                                                                   // 6
-/                                                                                                                // 7
-                                                                                                                  // 8
-/**                                                                                                                // 9
-Roles collection documents consist only of an id and a role name.                                               // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
-/                                                                                                                // 12
-if (!Meteor.roles) {                                                                                               // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
-}                                                                                                                  // 15
-                                                                                                                  // 16
-/**                                                                                                                // 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
-                                                                                                                // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
-                                                                                                                // 21</a></li>
-            
-                <li><a href="../modules/Roles                                                                                           __ 6
-_                                                                                                        __ 7
-                                                                                                          __ 8
-_**                                                                                                        __ 9
-Roles collection documents consist only of an id and a role name.                                       __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
-_                                                                                                        __ 12
-if (!Meteor.roles) {                                                                                       __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
-}                                                                                                          __ 15
-                                                                                                          __ 16
-_**                                                                                                        __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
-                                                                                                        __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
-                                                                                                        __ 21.html">Roles                                                                                           // 6
-/                                                                                                        // 7
-                                                                                                          // 8
-/**                                                                                                        // 9
-Roles collection documents consist only of an id and a role name.                                       // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
-/                                                                                                        // 12
-if (!Meteor.roles) {                                                                                       // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
-}                                                                                                          // 15
-                                                                                                          // 16
-/**                                                                                                        // 17
-Role-based authorization compatible with built-in Meteor accounts package.                              // 18
-                                                                                                        // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
-                                                                                                        // 21</a></li>
-            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../modules/UIHelpers                                                                                               __ 10
-_                                                                                                                __ 11
-                                                                                                                  __ 12
-____________________________________________________________                                                       __ 13
-__ UI helpers                                                                                                      __ 14
-__                                                                                                                 __ 15
-__ Use a semi-private variable rather than declaring UI                                                            __ 16
-__ helpers directly so that we can unit test the helpers.                                                          __ 17
-__ XXX For some reason, the UI helpers are not registered                                                          __ 18
-__ before the tests run.                                                                                           __ 19
-__                                                                                                                 __ 20
-Roles._uiHelpers = {                                                                                               __ 21
-                                                                                                                  __ 22
- _**                                                                                                              __ 23
-UI helper to check if current user is in at least one                                                         __ 24
-of the target roles.  For use in client-side templates.                                                       __ 25
-                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
-/                                                                                                                // 11
-                                                                                                                  // 12
-////////////////////////////////////////////////////////////                                                       // 13
-// UI helpers                                                                                                      // 14
-//                                                                                                                 // 15
-// Use a semi-private variable rather than declaring UI                                                            // 16
-// helpers directly so that we can unit test the helpers.                                                          // 17
-// XXX For some reason, the UI helpers are not registered                                                          // 18
-// before the tests run.                                                                                           // 19
-//                                                                                                                 // 20
-Roles._uiHelpers = {                                                                                               // 21
-                                                                                                                  // 22
- /**                                                                                                              // 23
-UI helper to check if current user is in at least one                                                         // 24
-of the target roles.  For use in client-side templates.                                                       // 25
-                                                                                                              // 26</a></li>
-            
             </ul>
         </div>
     </div>
diff --git a/docs/modules/UIHelpers.html b/docs/modules/UIHelpers.html
index 729d4bfdf4..12c58c73c1 100644
--- a/docs/modules/UIHelpers.html
+++ b/docs/modules/UIHelpers.html
@@ -19,7 +19,7 @@
             
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.12</em>
+            <em>API Docs for: v1.2.14</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -43,212 +43,16 @@
             
                 <li><a href="../classes/Roles.html">Roles</a></li>
             
-                <li><a href="../classes/Roles                                                                                                    // 22.html">Roles                                                                                                    // 22</a></li>
-            
-                <li><a href="../classes/Roles                                                                                            // 22.html">Roles                                                                                            // 22</a></li>
-            
                 <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../classes/UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);.html">UIHelpers                                                                                                // 42
-/                                                                                                              // 43
- isInRole: function (role, group) {                                                                               // 44
-   var user = Meteor.user(),                                                                                      // 45
-       comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),                                                                         // 46
-       roles                                                                                                      // 47
-                                                                                                                  // 48
-   if (!user) return false                                                                                        // 49
-   if (!Match.test(role, String)) return false                                                                    // 50
-                                                                                                                  // 51
-   if (comma !== -1) {                                                                                            // 52
-     roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {                                                       // 53
-       if (!r || !r.trim()) {                                                                                     // 54
-         return memo                                                                                              // 55
-       }                                                                                                          // 56
-       memo.push(r.trim())                                                                                        // 57
-       return memo                                                                                                // 58
-     }, [])                                                                                                       // 59
-   } else {                                                                                                       // 60
-     roles = [role]                                                                                               // 61
-   }                                                                                                              // 62
-                                                                                                                  // 63
-   if (Match.test(group, String)) {                                                                               // 64
-     return Roles.userIsInRole(user, roles, group)                                                                // 65
-   }                                                                                                              // 66
-                                                                                                                  // 67
-   return Roles.userIsInRole(user, roles)                                                                         // 68
- }                                                                                                                // 69
-}                                                                                                                  // 70
-                                                                                                                  // 71
-if (Package.ui) {                                                                                                  // 72
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 73
-   Package.ui.UI.registerHelper(name, func)                                                                       // 74
- })                                                                                                               // 75
-} else if (Package.handlebars) {                                                                                   // 76
- _.each(Roles._uiHelpers, function (func, name) {                                                                 // 77
-   Package.handlebars.Handlebars.registerHelper(name, func)                                                       // 78
- })                                                                                                               // 79
-} else {                                                                                                           // 80
- console.log &amp;&amp; console.log(&#x27;WARNING: Roles template helpers not registered. Handlebars or UI package not found&#x27;) // 81
-}                                                                                                                  // 82
-                                                                                                                  // 83
-}());                                                                                                              // 84
-                                                                                                                  // 85
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}).call(this);</a></li>
-            
             </ul>
 
             <ul id="api-modules" class="apis modules">
             
                 <li><a href="../modules/Roles.html">Roles</a></li>
             
-                <li><a href="../modules/Roles                                                                                                   __ 6
-_                                                                                                                __ 7
-                                                                                                                  __ 8
-_**                                                                                                                __ 9
-Roles collection documents consist only of an id and a role name.                                               __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             __ 11
-_                                                                                                                __ 12
-if (!Meteor.roles) {                                                                                               __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    __ 14
-}                                                                                                                  __ 15
-                                                                                                                  __ 16
-_**                                                                                                                __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      __ 18
-                                                                                                                __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              __ 20
-                                                                                                                __ 21.html">Roles                                                                                                   // 6
-/                                                                                                                // 7
-                                                                                                                  // 8
-/**                                                                                                                // 9
-Roles collection documents consist only of an id and a role name.                                               // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                             // 11
-/                                                                                                                // 12
-if (!Meteor.roles) {                                                                                               // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                                    // 14
-}                                                                                                                  // 15
-                                                                                                                  // 16
-/**                                                                                                                // 17
-Role-based authorization compatible with built-in Meteor accounts package.                                      // 18
-                                                                                                                // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                              // 20
-                                                                                                                // 21</a></li>
-            
-                <li><a href="../modules/Roles                                                                                           __ 6
-_                                                                                                        __ 7
-                                                                                                          __ 8
-_**                                                                                                        __ 9
-Roles collection documents consist only of an id and a role name.                                       __ 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     __ 11
-_                                                                                                        __ 12
-if (!Meteor.roles) {                                                                                       __ 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            __ 14
-}                                                                                                          __ 15
-                                                                                                          __ 16
-_**                                                                                                        __ 17
-Role-based authorization compatible with built-in Meteor accounts package.                              __ 18
-                                                                                                        __ 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      __ 20
-                                                                                                        __ 21.html">Roles                                                                                           // 6
-/                                                                                                        // 7
-                                                                                                          // 8
-/**                                                                                                        // 9
-Roles collection documents consist only of an id and a role name.                                       // 10
-  ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }                                                                     // 11
-/                                                                                                        // 12
-if (!Meteor.roles) {                                                                                       // 13
- Meteor.roles = new Meteor.Collection(&quot;roles&quot;)                                                            // 14
-}                                                                                                          // 15
-                                                                                                          // 16
-/**                                                                                                        // 17
-Role-based authorization compatible with built-in Meteor accounts package.                              // 18
-                                                                                                        // 19
-Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.                                      // 20
-                                                                                                        // 21</a></li>
-            
                 <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
             
-                <li><a href="../modules/UIHelpers                                                                                               __ 10
-_                                                                                                                __ 11
-                                                                                                                  __ 12
-____________________________________________________________                                                       __ 13
-__ UI helpers                                                                                                      __ 14
-__                                                                                                                 __ 15
-__ Use a semi-private variable rather than declaring UI                                                            __ 16
-__ helpers directly so that we can unit test the helpers.                                                          __ 17
-__ XXX For some reason, the UI helpers are not registered                                                          __ 18
-__ before the tests run.                                                                                           __ 19
-__                                                                                                                 __ 20
-Roles._uiHelpers = {                                                                                               __ 21
-                                                                                                                  __ 22
- _**                                                                                                              __ 23
-UI helper to check if current user is in at least one                                                         __ 24
-of the target roles.  For use in client-side templates.                                                       __ 25
-                                                                                                              __ 26.html">UIHelpers                                                                                               // 10
-/                                                                                                                // 11
-                                                                                                                  // 12
-////////////////////////////////////////////////////////////                                                       // 13
-// UI helpers                                                                                                      // 14
-//                                                                                                                 // 15
-// Use a semi-private variable rather than declaring UI                                                            // 16
-// helpers directly so that we can unit test the helpers.                                                          // 17
-// XXX For some reason, the UI helpers are not registered                                                          // 18
-// before the tests run.                                                                                           // 19
-//                                                                                                                 // 20
-Roles._uiHelpers = {                                                                                               // 21
-                                                                                                                  // 22
- /**                                                                                                              // 23
-UI helper to check if current user is in at least one                                                         // 24
-of the target roles.  For use in client-side templates.                                                       // 25
-                                                                                                              // 26</a></li>
-            
             </ul>
         </div>
     </div>
@@ -292,7 +96,7 @@ of the target roles.  For use in client-side templates.
 
     
         <div class="foundat">
-            Defined in: <a href="../files/roles_roles_client.js.html#l3"><code>roles&#x2F;roles_client.js:3</code></a>
+            Defined in: <a href="../files/roles_client_uiHelpers.js.html#l3"><code>roles&#x2F;client&#x2F;uiHelpers.js:3</code></a>
         </div>
     
 
diff --git a/yuidoc.json b/yuidoc.json
index 27bbc8f071..b97b8b5619 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: an authorization package for Meteor",
-  "version": "v1.2.12",
+  "version": "v1.2.14",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From f6ec579960dad78edd8a4d7570b8f83cc2263b50 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 02:58:45 -0400
Subject: [PATCH 0153/1140] v1.2.14 - compat with Meteor 1.2; several
 convenience updates

---
 History.md | 23 +++++++++++++++++++++++
 README.md  |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/History.md b/History.md
index e11f9bc78e..5a44d67c07 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,26 @@
+## v1.2.14
+
+* Compatibility with Meteor 1.2. #133
+* Pass options through to getUsersInRole. #77
+* Fix formatting and punctuation in readme. #118
+* Use named publish func so clients can check when ready(). #88
+* Only support Meteor v1.2+ going forward; Older package versions
+  will remain available.
+
+
+## v1.2.13
+
+* Specific release just for bug in Meteor 0.9.1 [1].  #53
+
+  Note: Supporting both 0.9.0 and 0.9.1 with the same code base is not
+  possible [2] so this version only supports Meteor <0.9.0 and 0.9.1+;
+  not 0.9.0 or 0.9.0.1.  Users of 0.9.0 will still use v1.2.12 which has
+  no functional differences.
+
+  1. https://github.com/meteor/meteor/issues/2521#issuecomment-54702099
+  2. https://github.com/meteor/meteor/issues/2531
+
+
 ## v1.2.12
 
 * Support Meteor 0.9.0 - new packaging system (hopefully). #52
diff --git a/README.md b/README.md
index f27a9a608b..1d42d06770 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,9 @@ Authorization package for Meteor - compatible with built-in accounts package.
 Thanks to:
 
   * [@challett](https://github.com/challett)
+  * [@ianserlin](https://github.com/ianserlin)
+  * [@leebenson](https://github.com/leebenson)
+  * [@pward123](https://github.com/pward123)
   * [@dandv](https://github.com/dandv)
   * [@aldeed](https://github.com/aldeed)
   * [@kevb](https://github.com/kevb)

From 947b5322a393b42db7c80b9e3b83a263a979846a Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 03:18:49 -0400
Subject: [PATCH 0154/1140] Fix #124 - link to parent dir's readme so
 atmosphere picks it up

---
 roles/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 roles/README.md

diff --git a/roles/README.md b/roles/README.md
new file mode 120000
index 0000000000..32d46ee883
--- /dev/null
+++ b/roles/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file

From 6d63788174f8b4c97b2f5552094172710d1ae4fb Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 03:29:14 -0400
Subject: [PATCH 0155/1140] update flow-router example to Meteor 1.2

---
 .../flow-router/.meteor/.finished-upgraders   |  12 ++
 examples/flow-router/.meteor/packages         |  15 +-
 examples/flow-router/.meteor/release          |   2 +-
 examples/flow-router/.meteor/versions         | 143 ++++++++++--------
 4 files changed, 108 insertions(+), 64 deletions(-)
 create mode 100644 examples/flow-router/.meteor/.finished-upgraders

diff --git a/examples/flow-router/.meteor/.finished-upgraders b/examples/flow-router/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..61ee313230
--- /dev/null
+++ b/examples/flow-router/.meteor/.finished-upgraders
@@ -0,0 +1,12 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
diff --git a/examples/flow-router/.meteor/packages b/examples/flow-router/.meteor/packages
index b4af8541bd..1b853507f0 100644
--- a/examples/flow-router/.meteor/packages
+++ b/examples/flow-router/.meteor/packages
@@ -3,7 +3,6 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-platform
 accounts-password
 accounts-ui
 bootstrap
@@ -12,3 +11,17 @@ alanning:roles
 kadira:flow-router
 kadira:blaze-layout
 alanning:trace
+standard-minifiers
+meteor-base
+mobile-experience
+mongo
+blaze-html-templates
+session
+jquery
+tracker
+logging
+reload
+random
+ejson
+spacebars
+check
diff --git a/examples/flow-router/.meteor/release b/examples/flow-router/.meteor/release
index 315c635bf3..5684262a83 100644
--- a/examples/flow-router/.meteor/release
+++ b/examples/flow-router/.meteor/release
@@ -1 +1 @@
-METEOR@1.1.0.3
+METEOR@1.2.0.2
diff --git a/examples/flow-router/.meteor/versions b/examples/flow-router/.meteor/versions
index 8d509957fe..16ea8f4c4f 100644
--- a/examples/flow-router/.meteor/versions
+++ b/examples/flow-router/.meteor/versions
@@ -1,65 +1,84 @@
-accounts-base@1.2.0
-accounts-password@1.1.1
-accounts-ui@1.1.5
-accounts-ui-unstyled@1.1.7
-alanning:roles@1.2.13
+accounts-base@1.2.1
+accounts-password@1.1.3
+accounts-ui@1.1.6
+accounts-ui-unstyled@1.1.8
+alanning:roles@1.2.14
 alanning:trace@0.0.2
-autoupdate@1.2.1
-base64@1.0.3
-binary-heap@1.0.3
-blaze@2.1.2
-blaze-tools@1.0.3
-boilerplate-generator@1.0.3
+autoupdate@1.2.3
+babel-compiler@5.8.24_1
+babel-runtime@0.1.4
+base64@1.0.4
+binary-heap@1.0.4
+blaze@2.1.3
+blaze-html-templates@1.0.1
+blaze-tools@1.0.4
+boilerplate-generator@1.0.4
 bootstrap@1.0.1
-callback-hook@1.0.3
-check@1.0.5
-coffeescript@1.0.6
-cosmos:browserify@0.5.0
-ddp@1.1.0
-deps@1.0.7
-ejson@1.0.6
-email@1.0.6
-fastclick@1.0.3
-geojson-utils@1.0.3
-html-tools@1.0.4
-htmljs@1.0.4
-http@1.1.0
-id-map@1.0.3
-jquery@1.11.3_2
-json@1.0.3
-kadira:blaze-layout@2.0.0
-kadira:flow-router@2.1.1
-launch-screen@1.0.2
-less@1.0.14
-livedata@1.0.13
-localstorage@1.0.3
-logging@1.0.7
-meteor@1.1.6
-meteor-platform@1.2.2
-minifiers@1.1.5
-minimongo@1.0.8
-mobile-status-bar@1.0.3
-mongo@1.1.0
+caching-compiler@1.0.0
+caching-html-compiler@1.0.2
+callback-hook@1.0.4
+check@1.0.6
+coffeescript@1.0.10
+cosmos:browserify@0.5.1
+ddp@1.2.2
+ddp-client@1.2.1
+ddp-common@1.2.1
+ddp-rate-limiter@1.0.0
+ddp-server@1.2.1
+deps@1.0.9
+diff-sequence@1.0.1
+ecmascript@0.1.5
+ecmascript-collections@0.1.6
+ejson@1.0.7
+email@1.0.7
+fastclick@1.0.7
+geojson-utils@1.0.4
+hot-code-push@1.0.0
+html-tools@1.0.5
+htmljs@1.0.5
+http@1.1.1
+id-map@1.0.4
+jquery@1.11.4
+kadira:blaze-layout@2.1.0
+kadira:flow-router@2.6.2
+launch-screen@1.0.4
+less@2.5.0_3
+livedata@1.0.15
+localstorage@1.0.5
+logging@1.0.8
+meteor@1.1.9
+meteor-base@1.0.1
+minifiers@1.1.7
+minimongo@1.0.10
+mobile-experience@1.0.1
+mobile-status-bar@1.0.6
+mongo@1.1.2
+mongo-id@1.0.1
 npm-bcrypt@0.7.8_2
-observe-sequence@1.0.6
-ordered-dict@1.0.3
-random@1.0.3
-reactive-dict@1.1.0
-reactive-var@1.0.5
-reload@1.1.3
-retry@1.0.3
-routepolicy@1.0.5
-service-configuration@1.0.4
-session@1.1.0
-sha@1.0.3
-spacebars@1.0.6
-spacebars-compiler@1.0.6
-spiderable@1.0.7
-srp@1.0.3
-templating@1.1.1
-tracker@1.0.7
-ui@1.0.6
-underscore@1.0.3
-url@1.0.4
-webapp@1.2.0
-webapp-hashing@1.0.3
+npm-mongo@1.4.39_1
+observe-sequence@1.0.7
+ordered-dict@1.0.4
+promise@0.5.0
+random@1.0.4
+rate-limit@1.0.0
+reactive-dict@1.1.2
+reactive-var@1.0.6
+reload@1.1.4
+retry@1.0.4
+routepolicy@1.0.6
+service-configuration@1.0.5
+session@1.1.1
+sha@1.0.4
+spacebars@1.0.7
+spacebars-compiler@1.0.7
+spiderable@1.0.9
+srp@1.0.4
+standard-minifiers@1.0.1
+templating@1.1.4
+templating-tools@1.0.0
+tracker@1.0.9
+ui@1.0.8
+underscore@1.0.4
+url@1.0.5
+webapp@1.2.2
+webapp-hashing@1.0.5

From 13171a07500226b04998209d5914d7e8b9340052 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Mon, 5 Oct 2015 03:50:14 -0400
Subject: [PATCH 0156/1140] Fix #126 - update docs; group names can now start
 with numbers

---
 docs/classes/Roles.html               | 6 +++---
 docs/data.json                        | 2 +-
 docs/files/roles_roles_common.js.html | 6 +++---
 roles/roles_common.js                 | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 1eaab5b74f..800aa57e38 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -928,9 +928,9 @@ for users.</p>
 
                     <div class="param-description">
                         <p>Optional group name. If supplied, roles will be
-                        specific to that group.<br>                        Group names can not start with &#39;$&#39; or numbers.
-                        Periods in names &#39;.&#39; are automatically converted
-                        to underscores.
+                        specific to that group.<br>                        Group names can not start with a &#39;$&#39; or contain
+                        null characters.  Periods in names &#39;.&#39; are
+                        automatically converted to underscores.
                         The special group Roles.GLOBAL_GROUP provides 
                         a convenient way to assign blanket roles/permissions
                         across all groups.  The roles/permissions in the 
diff --git a/docs/data.json b/docs/data.json
index bdf813fd76..06ac289c79 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -224,7 +224,7 @@
                 },
                 {
                     "name": "group",
-                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        Group names can not start with '$' or numbers.\n                        Periods in names '.' are automatically converted\n                        to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        Group names can not start with a '$' or contain\n                        null characters.  Periods in names '.' are\n                        automatically converted to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
                     "type": "String",
                     "optional": true
                 }
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index a85e7b3359..7840d21677 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -225,9 +225,9 @@ _.extend(Roles, {
    * @param {Array|String} roles Name(s) of roles/permissions to add users to
    * @param {String} [group] Optional group name. If supplied, roles will be
    *                         specific to that group.  
-   *                         Group names can not start with &#x27;$&#x27; or numbers.
-   *                         Periods in names &#x27;.&#x27; are automatically converted
-   *                         to underscores.
+   *                         Group names can not start with a &#x27;$&#x27; or contain
+   *                         null characters.  Periods in names &#x27;.&#x27; are
+   *                         automatically converted to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
    *                         a convenient way to assign blanket roles/permissions
    *                         across all groups.  The roles/permissions in the 
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 385f288960..d4bac02fb9 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -131,9 +131,9 @@ _.extend(Roles, {
    * @param {Array|String} roles Name(s) of roles/permissions to add users to
    * @param {String} [group] Optional group name. If supplied, roles will be
    *                         specific to that group.  
-   *                         Group names can not start with '$' or numbers.
-   *                         Periods in names '.' are automatically converted
-   *                         to underscores.
+   *                         Group names can not start with a '$' or contain
+   *                         null characters.  Periods in names '.' are
+   *                         automatically converted to underscores.
    *                         The special group Roles.GLOBAL_GROUP provides 
    *                         a convenient way to assign blanket roles/permissions
    *                         across all groups.  The roles/permissions in the 

From 80ebc36307aab9b62804a276d8b83fddc2c0c7ef Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Thu, 22 Oct 2015 17:47:27 -0400
Subject: [PATCH 0157/1140] Add example of with advanced auth pattern and
 modular structure

---
 .../.meteor/.finished-upgraders               | 12 +++
 .../flow-router-advanced/.meteor/.gitignore   |  2 +
 examples/flow-router-advanced/.meteor/.id     |  7 ++
 .../flow-router-advanced/.meteor/packages     | 27 ++++++
 .../flow-router-advanced/.meteor/platforms    |  2 +
 examples/flow-router-advanced/.meteor/release |  1 +
 .../flow-router-advanced/.meteor/versions     | 84 +++++++++++++++++++
 examples/flow-router-advanced/README.md       | 10 +++
 .../main/client/header.html                   | 39 +++++++++
 .../main/client/header.js                     | 34 ++++++++
 .../main/client/layouts.js                    | 13 +++
 .../main/client/lib/app.js                    | 47 +++++++++++
 .../main/client/lib/patches.js                | 22 +++++
 .../main/client/lib/polyfills.js              |  7 ++
 .../main/client/main.html                     | 49 +++++++++++
 .../main/client/mainLayout.html               | 19 +++++
 .../main/client/noteOfTheDay.html             |  3 +
 .../main/client/noteOfTheDay.js               |  7 ++
 .../main/client/publicLayout.html             |  5 ++
 .../main/client/routing.js                    | 40 +++++++++
 .../main/client/signin.html                   | 15 ++++
 .../main/client/signin.js                     | 11 +++
 .../main/client/style.css                     | 67 +++++++++++++++
 .../main/client/t404.html                     |  9 ++
 .../main/server/startup/fixtures.js           | 48 +++++++++++
 .../main/server/startup/validateNewUser.js    | 17 ++++
 .../manageUsers/client/manage-users.html      | 34 ++++++++
 .../manageUsers/client/manage-users.js        | 19 +++++
 .../manageUsers/client/manageController.html  |  3 +
 .../manageUsers/client/manageController.js    | 16 ++++
 .../manageUsers/client/routing.js             | 15 ++++
 .../manageUsers/server/manageUsers.js         | 19 +++++
 .../secrets/client/routing.js                 | 14 ++++
 .../secrets/client/secrets.html               | 30 +++++++
 .../secrets/client/secrets.js                 |  9 ++
 .../secrets/client/secretsController.html     |  3 +
 .../secrets/client/secretsController.js       | 16 ++++
 .../flow-router-advanced/secrets/model.js     |  5 ++
 .../secrets/server/fixtures.js                | 32 +++++++
 .../secrets/server/secrets.js                 | 19 +++++
 40 files changed, 831 insertions(+)
 create mode 100644 examples/flow-router-advanced/.meteor/.finished-upgraders
 create mode 100644 examples/flow-router-advanced/.meteor/.gitignore
 create mode 100644 examples/flow-router-advanced/.meteor/.id
 create mode 100644 examples/flow-router-advanced/.meteor/packages
 create mode 100644 examples/flow-router-advanced/.meteor/platforms
 create mode 100644 examples/flow-router-advanced/.meteor/release
 create mode 100644 examples/flow-router-advanced/.meteor/versions
 create mode 100644 examples/flow-router-advanced/README.md
 create mode 100644 examples/flow-router-advanced/main/client/header.html
 create mode 100644 examples/flow-router-advanced/main/client/header.js
 create mode 100644 examples/flow-router-advanced/main/client/layouts.js
 create mode 100644 examples/flow-router-advanced/main/client/lib/app.js
 create mode 100644 examples/flow-router-advanced/main/client/lib/patches.js
 create mode 100644 examples/flow-router-advanced/main/client/lib/polyfills.js
 create mode 100644 examples/flow-router-advanced/main/client/main.html
 create mode 100644 examples/flow-router-advanced/main/client/mainLayout.html
 create mode 100644 examples/flow-router-advanced/main/client/noteOfTheDay.html
 create mode 100644 examples/flow-router-advanced/main/client/noteOfTheDay.js
 create mode 100644 examples/flow-router-advanced/main/client/publicLayout.html
 create mode 100644 examples/flow-router-advanced/main/client/routing.js
 create mode 100644 examples/flow-router-advanced/main/client/signin.html
 create mode 100644 examples/flow-router-advanced/main/client/signin.js
 create mode 100644 examples/flow-router-advanced/main/client/style.css
 create mode 100644 examples/flow-router-advanced/main/client/t404.html
 create mode 100644 examples/flow-router-advanced/main/server/startup/fixtures.js
 create mode 100644 examples/flow-router-advanced/main/server/startup/validateNewUser.js
 create mode 100644 examples/flow-router-advanced/manageUsers/client/manage-users.html
 create mode 100644 examples/flow-router-advanced/manageUsers/client/manage-users.js
 create mode 100644 examples/flow-router-advanced/manageUsers/client/manageController.html
 create mode 100644 examples/flow-router-advanced/manageUsers/client/manageController.js
 create mode 100644 examples/flow-router-advanced/manageUsers/client/routing.js
 create mode 100644 examples/flow-router-advanced/manageUsers/server/manageUsers.js
 create mode 100644 examples/flow-router-advanced/secrets/client/routing.js
 create mode 100644 examples/flow-router-advanced/secrets/client/secrets.html
 create mode 100644 examples/flow-router-advanced/secrets/client/secrets.js
 create mode 100644 examples/flow-router-advanced/secrets/client/secretsController.html
 create mode 100644 examples/flow-router-advanced/secrets/client/secretsController.js
 create mode 100644 examples/flow-router-advanced/secrets/model.js
 create mode 100644 examples/flow-router-advanced/secrets/server/fixtures.js
 create mode 100644 examples/flow-router-advanced/secrets/server/secrets.js

diff --git a/examples/flow-router-advanced/.meteor/.finished-upgraders b/examples/flow-router-advanced/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..61ee313230
--- /dev/null
+++ b/examples/flow-router-advanced/.meteor/.finished-upgraders
@@ -0,0 +1,12 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
diff --git a/examples/flow-router-advanced/.meteor/.gitignore b/examples/flow-router-advanced/.meteor/.gitignore
new file mode 100644
index 0000000000..08150d000c
--- /dev/null
+++ b/examples/flow-router-advanced/.meteor/.gitignore
@@ -0,0 +1,2 @@
+local
+meteorite
diff --git a/examples/flow-router-advanced/.meteor/.id b/examples/flow-router-advanced/.meteor/.id
new file mode 100644
index 0000000000..acd117ac05
--- /dev/null
+++ b/examples/flow-router-advanced/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+12nu3d71gkxofl123c8jf
diff --git a/examples/flow-router-advanced/.meteor/packages b/examples/flow-router-advanced/.meteor/packages
new file mode 100644
index 0000000000..1b853507f0
--- /dev/null
+++ b/examples/flow-router-advanced/.meteor/packages
@@ -0,0 +1,27 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+accounts-password
+accounts-ui
+bootstrap
+spiderable
+alanning:roles
+kadira:flow-router
+kadira:blaze-layout
+alanning:trace
+standard-minifiers
+meteor-base
+mobile-experience
+mongo
+blaze-html-templates
+session
+jquery
+tracker
+logging
+reload
+random
+ejson
+spacebars
+check
diff --git a/examples/flow-router-advanced/.meteor/platforms b/examples/flow-router-advanced/.meteor/platforms
new file mode 100644
index 0000000000..8a3a35f9f6
--- /dev/null
+++ b/examples/flow-router-advanced/.meteor/platforms
@@ -0,0 +1,2 @@
+browser
+server
diff --git a/examples/flow-router-advanced/.meteor/release b/examples/flow-router-advanced/.meteor/release
new file mode 100644
index 0000000000..5684262a83
--- /dev/null
+++ b/examples/flow-router-advanced/.meteor/release
@@ -0,0 +1 @@
+METEOR@1.2.0.2
diff --git a/examples/flow-router-advanced/.meteor/versions b/examples/flow-router-advanced/.meteor/versions
new file mode 100644
index 0000000000..16ea8f4c4f
--- /dev/null
+++ b/examples/flow-router-advanced/.meteor/versions
@@ -0,0 +1,84 @@
+accounts-base@1.2.1
+accounts-password@1.1.3
+accounts-ui@1.1.6
+accounts-ui-unstyled@1.1.8
+alanning:roles@1.2.14
+alanning:trace@0.0.2
+autoupdate@1.2.3
+babel-compiler@5.8.24_1
+babel-runtime@0.1.4
+base64@1.0.4
+binary-heap@1.0.4
+blaze@2.1.3
+blaze-html-templates@1.0.1
+blaze-tools@1.0.4
+boilerplate-generator@1.0.4
+bootstrap@1.0.1
+caching-compiler@1.0.0
+caching-html-compiler@1.0.2
+callback-hook@1.0.4
+check@1.0.6
+coffeescript@1.0.10
+cosmos:browserify@0.5.1
+ddp@1.2.2
+ddp-client@1.2.1
+ddp-common@1.2.1
+ddp-rate-limiter@1.0.0
+ddp-server@1.2.1
+deps@1.0.9
+diff-sequence@1.0.1
+ecmascript@0.1.5
+ecmascript-collections@0.1.6
+ejson@1.0.7
+email@1.0.7
+fastclick@1.0.7
+geojson-utils@1.0.4
+hot-code-push@1.0.0
+html-tools@1.0.5
+htmljs@1.0.5
+http@1.1.1
+id-map@1.0.4
+jquery@1.11.4
+kadira:blaze-layout@2.1.0
+kadira:flow-router@2.6.2
+launch-screen@1.0.4
+less@2.5.0_3
+livedata@1.0.15
+localstorage@1.0.5
+logging@1.0.8
+meteor@1.1.9
+meteor-base@1.0.1
+minifiers@1.1.7
+minimongo@1.0.10
+mobile-experience@1.0.1
+mobile-status-bar@1.0.6
+mongo@1.1.2
+mongo-id@1.0.1
+npm-bcrypt@0.7.8_2
+npm-mongo@1.4.39_1
+observe-sequence@1.0.7
+ordered-dict@1.0.4
+promise@0.5.0
+random@1.0.4
+rate-limit@1.0.0
+reactive-dict@1.1.2
+reactive-var@1.0.6
+reload@1.1.4
+retry@1.0.4
+routepolicy@1.0.6
+service-configuration@1.0.5
+session@1.1.1
+sha@1.0.4
+spacebars@1.0.7
+spacebars-compiler@1.0.7
+spiderable@1.0.9
+srp@1.0.4
+standard-minifiers@1.0.1
+templating@1.1.4
+templating-tools@1.0.0
+tracker@1.0.9
+ui@1.0.8
+underscore@1.0.4
+url@1.0.5
+webapp@1.2.2
+webapp-hashing@1.0.5
diff --git a/examples/flow-router-advanced/README.md b/examples/flow-router-advanced/README.md
new file mode 100644
index 0000000000..971d7bb303
--- /dev/null
+++ b/examples/flow-router-advanced/README.md
@@ -0,0 +1,10 @@
+## Flow Router Authorization - Advanced
+
+This example illustrates a pattern for reuse of template-based authorization.  It also illustrates a modular way to structure your application where different sections of the application are split out into separate directories.
+
+Authentication is handled by the app's main layout.
+
+Authorization is handled by special wrapper templates called "controllers" which can be reused between various routes.
+
+
+NOTE: The app structure and reusable, template-based authorization pattern is not specific to FlowRouter.  It can be done just as easily using IronRouter.
diff --git a/examples/flow-router-advanced/main/client/header.html b/examples/flow-router-advanced/main/client/header.html
new file mode 100644
index 0000000000..65de655c95
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/header.html
@@ -0,0 +1,39 @@
+<template name="header">
+  <div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container">
+        <a class="btn btn-navbar">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+        <a class="brand" href="/">Roles Example App</a>
+
+        {{#if currentUser}}
+        <div class="nav-collapse collapse">
+          <ul class="nav">
+
+            <li><a href="/start">Start Page</a></li>
+
+            {{#if isInRole 'admin,view-secrets'}}
+            <li><a href="/secrets">Secrets</a></li>
+            {{/if}}
+
+            <li class="dropdown pull-right">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                {{#if isInRole 'admin,manage-users'}}
+                <li><a href="/manageUsers">Manage Users</a></li>
+                {{/if}}
+                <li><a class="signout" href="/signout">Sign out</a></li>
+              </ul>
+            </li>
+
+          </ul>
+        </div>
+        {{/if}}
+
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/examples/flow-router-advanced/main/client/header.js b/examples/flow-router-advanced/main/client/header.js
new file mode 100644
index 0000000000..2abff9391b
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/header.js
@@ -0,0 +1,34 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////////////
+// Header
+//
+Template.header.events({
+  // template data, if any, is available in 'this'
+  'click .btn-navbar' : openCloseNav
+})
+
+Template.header.helpers({
+  displayName: function () {
+    return App.displayName()
+  }
+})
+
+
+
+
+// insta-open/close nav rather than animate collapse.
+// this improves UX on mobile devices
+function openCloseNav (e) {
+  // Select .nav-collapse within same .navbar as current button
+  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
+
+  if (nav.height() != 0) {
+    // If it has a height, hide it
+    nav.height(0);
+  } else {
+    // If it's collapsed, show it
+    nav.height('auto');
+  }
+}
diff --git a/examples/flow-router-advanced/main/client/layouts.js b/examples/flow-router-advanced/main/client/layouts.js
new file mode 100644
index 0000000000..6e66fc6f02
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/layouts.js
@@ -0,0 +1,13 @@
+Template.mainLayout.helpers({
+  notVerified: function () { 
+    var user = Meteor.user()
+
+    return !emailVerified(user)
+  }
+})
+
+function emailVerified (user) {
+  return _.some(user.emails, function (email) {
+    return email.verified
+  })
+}
diff --git a/examples/flow-router-advanced/main/client/lib/app.js b/examples/flow-router-advanced/main/client/lib/app.js
new file mode 100644
index 0000000000..d528259710
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/lib/app.js
@@ -0,0 +1,47 @@
+// The application
+App = {}
+
+"use strict"
+
+_.extend(App, {
+
+  // Separate routing package details from general app code.
+  navigateTo: function (path) {
+    // ...over-ridden in routing.js
+  },
+
+  signout: function () {
+    console.log('logging out...');
+    Meteor.logout(function () {
+      console.log('...done');
+      App.navigateTo('/');
+    });
+  },
+
+  displayName: function (user) {
+    var name;
+
+    if (!user) {
+      user = Meteor.user();
+    }
+
+    if (!user) return "<missing user>";
+
+    if (user.profile) {
+      name = user.profile.name;
+    }
+
+    if ('string' === typeof name) {
+      name = name.trim();
+    } else {
+      name = null;
+    }
+
+    if (!name && user.emails && user.emails.length > 0) {
+      name = user.emails[0].address;
+    }
+
+    return name || "<missing name>";
+  }
+
+})
diff --git a/examples/flow-router-advanced/main/client/lib/patches.js b/examples/flow-router-advanced/main/client/lib/patches.js
new file mode 100644
index 0000000000..2a75faff6f
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/lib/patches.js
@@ -0,0 +1,22 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////////////
+// Patches
+//
+
+// stubs for IE
+if (!window.console) {
+  window.console = {}
+}
+if (!window.console.log) {
+  window.console.log = function (msg) {
+    $('#log').append('<br /><p>' + msg + '</p>')
+  };
+}
+
+// fix bootstrap dropdown unclickable issue on iOS
+// https://github.com/twitter/bootstrap/issues/4550
+$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
+    e.stopPropagation();
+});
diff --git a/examples/flow-router-advanced/main/client/lib/polyfills.js b/examples/flow-router-advanced/main/client/lib/polyfills.js
new file mode 100644
index 0000000000..ca91978e06
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/lib/polyfills.js
@@ -0,0 +1,7 @@
+"use strict";
+
+if(typeof String.prototype.trim !== 'function') {
+  String.prototype.trim = function() {
+    return this.replace(/^\s+|\s+$/g, ''); 
+  }
+}
diff --git a/examples/flow-router-advanced/main/client/main.html b/examples/flow-router-advanced/main/client/main.html
new file mode 100644
index 0000000000..175675fdd4
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/main.html
@@ -0,0 +1,49 @@
+<head>
+  <title>example-app</title>
+</head>
+
+<body>
+</body>
+
+
+<template name="loading">
+  <h1>Loading...</h1>
+</template>
+
+<template name="awaiting-verification">
+  <h1>Awaiting email verification...</h1>
+</template>
+
+<template name="invalid-access">
+  <h3>403 Forbidden - Invalid Access</h3>
+</template>
+
+<template name="start">
+  <div class="page row">
+    <div class="offset4 span8">
+
+      <p class="note">All logged-in users will see this page in their header nav.</p>
+
+      <h2>Start Page</h2>
+
+      {{> noteOfTheDay}}
+
+      <div>
+        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
+      </div>
+          
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="securityNote">
+  <div class="security-note">
+    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
+    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
+    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
+    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
+    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
+    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
+  </div>
+</template>
diff --git a/examples/flow-router-advanced/main/client/mainLayout.html b/examples/flow-router-advanced/main/client/mainLayout.html
new file mode 100644
index 0000000000..47b7d7a96f
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/mainLayout.html
@@ -0,0 +1,19 @@
+<template name="mainLayout">
+  {{> header}}
+
+  {{#if currentUser}}
+    {{#if notVerified}}
+      {{> awaitingVerification}}
+    {{else}}
+      {{> Template.dynamic template=content}}
+    {{/if}}
+  {{else}}
+    {{#if loggingIn}}
+      {{> loading}}
+    {{else}}
+      {{> signin}}
+    {{/if}}
+  {{/if}}
+
+  <div id="log"></div>
+</template>
diff --git a/examples/flow-router-advanced/main/client/noteOfTheDay.html b/examples/flow-router-advanced/main/client/noteOfTheDay.html
new file mode 100644
index 0000000000..3308580029
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/noteOfTheDay.html
@@ -0,0 +1,3 @@
+<template name="noteOfTheDay">
+  <p>Note of the day: {{note}}</p>
+</template>
diff --git a/examples/flow-router-advanced/main/client/noteOfTheDay.js b/examples/flow-router-advanced/main/client/noteOfTheDay.js
new file mode 100644
index 0000000000..0279780cc2
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/noteOfTheDay.js
@@ -0,0 +1,7 @@
+"use strict"
+
+Template.noteOfTheDay.helpers({
+  note: function () {
+    return "Greetings " + App.displayName() + "!"
+  }
+})
diff --git a/examples/flow-router-advanced/main/client/publicLayout.html b/examples/flow-router-advanced/main/client/publicLayout.html
new file mode 100644
index 0000000000..02b50a0da2
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/publicLayout.html
@@ -0,0 +1,5 @@
+<template name="publicLayout">
+  {{> Template.dynamic template=content}}
+
+  <div id="log"></div>
+</template>
diff --git a/examples/flow-router-advanced/main/client/routing.js b/examples/flow-router-advanced/main/client/routing.js
new file mode 100644
index 0000000000..a21ca6ef50
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/routing.js
@@ -0,0 +1,40 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////////////
+// Routing
+//
+
+// override with router-specific navigate method
+App.navigateTo = function (path) {
+  FlowRouter.go(path)
+}
+
+
+FlowRouter.notFound = {
+  action: function () {
+    BlazeLayout.render("publicLayout", {content: "t404"})
+  }
+}
+
+FlowRouter.route('/', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'start'})
+  }
+})
+
+FlowRouter.route('/start', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'start'})
+  }
+})
+
+FlowRouter.route('/signin', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'signin'})
+  }
+})
+
+FlowRouter.route('/signout', {
+    action: App.signout
+})
diff --git a/examples/flow-router-advanced/main/client/signin.html b/examples/flow-router-advanced/main/client/signin.html
new file mode 100644
index 0000000000..35a2a46c69
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/signin.html
@@ -0,0 +1,15 @@
+<template name="signin">
+  <div class="signin">
+    <div class="login-form">
+      <h1>Sign In</h1>
+      {{> loginButtons}}
+    </div>
+
+    <div class="example-users">
+      <p>Normal User: normal@example.com | apple1</p>
+      <p>View Secrets: view@example.com | apple1</p>
+      <p>Manage Users: manage@example.com | apple1</p>
+      <p>Admin User: admin@example.com | apple1</p>
+    </div>
+  </div>
+</template>
diff --git a/examples/flow-router-advanced/main/client/signin.js b/examples/flow-router-advanced/main/client/signin.js
new file mode 100644
index 0000000000..3dbbf9baac
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/signin.js
@@ -0,0 +1,11 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////////////
+// Signin
+//
+
+Template.signin.onRendered(function () {
+  // auto-trigger accounts-ui login form dropdown
+  Accounts._loginButtonsSession.set('dropdownVisible', true);
+})
diff --git a/examples/flow-router-advanced/main/client/style.css b/examples/flow-router-advanced/main/client/style.css
new file mode 100644
index 0000000000..a7674b04dd
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/style.css
@@ -0,0 +1,67 @@
+@media (min-width: 980px) {
+  /* wide devices - full navbar */ 
+
+  /* push down content under fixed navbar */
+  body {
+    padding-top:60px;
+    padding-bottom:40px;
+    }
+
+}
+
+
+/**
+ * front-and-center signin form
+ */
+.signin {
+  width:100%;
+  text-align:center;
+}
+.signin .login-form {
+  width:200px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+}
+.signin .login-form {
+}
+.signin .login-close-text {
+  display:none;
+}
+.signin #login-buttons {
+}
+.signin .additional-link-container {
+  display:none;
+}
+.signin .example-users {
+  width:350px;
+  margin: 0 auto;
+  position:relative;
+  text-align:left;
+  top:15em;
+  left:3em;
+}
+
+/**
+ * header
+ */
+#err .close {
+  float:none;
+  margin-left:1em;
+}
+
+/**
+ * note of the day
+ */
+.note {
+  margin:1em 0em;
+  padding:1em;
+  border:1px solid #ccc;
+}
+
+/**
+ * security-note
+ */
+.security-note {
+  margin-top:10em;
+}
diff --git a/examples/flow-router-advanced/main/client/t404.html b/examples/flow-router-advanced/main/client/t404.html
new file mode 100644
index 0000000000..e65e778fe7
--- /dev/null
+++ b/examples/flow-router-advanced/main/client/t404.html
@@ -0,0 +1,9 @@
+<template name="t404">
+  <div class="row">
+    <div class="offset4 span8">
+      <h3>404 - Not found</h3>
+
+      <p>The page you requested either could not be found or your account does not have permission to access it.</p>
+    </div>
+  </div>
+</template>
diff --git a/examples/flow-router-advanced/main/server/startup/fixtures.js b/examples/flow-router-advanced/main/server/startup/fixtures.js
new file mode 100644
index 0000000000..34f9cdc513
--- /dev/null
+++ b/examples/flow-router-advanced/main/server/startup/fixtures.js
@@ -0,0 +1,48 @@
+"use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Startup Fixtures
+//
+
+Meteor.startup(function () {
+
+  createUsers()
+
+});
+
+
+function createUsers () {
+  var users
+
+  if (Meteor.users.find().fetch().length === 0) {
+
+    console.log('Creating users: ');
+
+    users = [
+      {name:"Normal User",email:"normal@example.com",roles:[]},
+      {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
+      {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
+      {name:"Admin User",email:"admin@example.com",roles:['admin']}
+    ];
+
+    _.each(users, function (userData) {
+      var id
+      
+      console.log(userData);
+
+      id = Accounts.createUser({
+        email: userData.email,
+        password: "apple1",
+        profile: { name: userData.name }
+      });
+
+      // email verification
+      Meteor.users.update({_id: id},
+                          {$set:{'emails.0.verified': true}});
+
+      Roles.addUsersToRoles(id, userData.roles);
+    
+    });
+  }
+}
diff --git a/examples/flow-router-advanced/main/server/startup/validateNewUser.js b/examples/flow-router-advanced/main/server/startup/validateNewUser.js
new file mode 100644
index 0000000000..4270ec8c10
--- /dev/null
+++ b/examples/flow-router-advanced/main/server/startup/validateNewUser.js
@@ -0,0 +1,17 @@
+"use strict"
+
+////////////////////////////////////////////////////////////////////
+// Prevent non-authorized users from creating new users
+//
+
+Meteor.startup(function () {
+
+  Accounts.validateNewUser(function (user) {
+    if (Roles.userIsInRole(Meteor.userId(), ['admin','manage-users'])) {
+      return true;
+    }
+
+    throw new Meteor.Error(403, "Not authorized to create new users");
+  });
+
+})
diff --git a/examples/flow-router-advanced/manageUsers/client/manage-users.html b/examples/flow-router-advanced/manageUsers/client/manage-users.html
new file mode 100644
index 0000000000..000175204e
--- /dev/null
+++ b/examples/flow-router-advanced/manageUsers/client/manage-users.html
@@ -0,0 +1,34 @@
+<template name="manageUsers">
+  <div class="manage-users row">
+    <div class="offset4 span8">
+
+      <p class="note">
+        Only Admins and those with the 'manage-users' role
+        will see this page in their nav menu.
+      </p>
+
+      <h2>Manage Users</h2>
+
+      <br />
+
+      <h3>Current Users</h3>
+
+      {{#if Template.subscriptionsReady}}
+        <!-- This is displayed when all data is ready. -->
+        {{> userList}}
+      {{else}}
+        Loading...
+      {{/if}}
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="userList">
+  <ul>
+    {{#each users}}
+    <li>{{email}} - Roles: {{roles}}</li>
+    {{/each}}
+  </ul>
+</template>
diff --git a/examples/flow-router-advanced/manageUsers/client/manage-users.js b/examples/flow-router-advanced/manageUsers/client/manage-users.js
new file mode 100644
index 0000000000..7fdf0b519c
--- /dev/null
+++ b/examples/flow-router-advanced/manageUsers/client/manage-users.js
@@ -0,0 +1,19 @@
+Template.manageUsers.onCreated(function () {
+  this.subscribe("users")
+})
+
+Template.userList.helpers({
+  users: function () {
+    return Meteor.users.find()
+  },
+  email: function () {
+    return this.emails[0].address
+  },
+  roles: function () {
+    if (!this.roles) {
+      return '<none>'
+    }
+
+    return this.roles.join(',')
+  }
+})
diff --git a/examples/flow-router-advanced/manageUsers/client/manageController.html b/examples/flow-router-advanced/manageUsers/client/manageController.html
new file mode 100644
index 0000000000..48b515e9ac
--- /dev/null
+++ b/examples/flow-router-advanced/manageUsers/client/manageController.html
@@ -0,0 +1,3 @@
+<template name="manageController">
+  {{> Template.dynamic template=target}}
+</template>
diff --git a/examples/flow-router-advanced/manageUsers/client/manageController.js b/examples/flow-router-advanced/manageUsers/client/manageController.js
new file mode 100644
index 0000000000..8ed0c762ff
--- /dev/null
+++ b/examples/flow-router-advanced/manageUsers/client/manageController.js
@@ -0,0 +1,16 @@
+"use strict"
+
+//////////////////////////////////////////////////////////////////////
+// manageController
+//
+Template.manageController.helpers({
+  target: function () {
+    var loggedInUserId = Meteor.userId()
+
+    if (!Roles.userIsInRole(loggedInUserId, ['manage-users', 'admin'])) {
+      return 't404'
+    } else {
+      return this.targetTemplate
+    }
+  }
+})
diff --git a/examples/flow-router-advanced/manageUsers/client/routing.js b/examples/flow-router-advanced/manageUsers/client/routing.js
new file mode 100644
index 0000000000..469c1943ba
--- /dev/null
+++ b/examples/flow-router-advanced/manageUsers/client/routing.js
@@ -0,0 +1,15 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////////////
+// Routing for Manage Users
+//
+// Authentication is handled in mainLayout.
+// Authorization is handled in manageController and can be reused for any route.
+//
+FlowRouter.route('/manageUsers', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'manageController',
+                                      targetTemplate: 'manageUsers'})
+  }
+})
diff --git a/examples/flow-router-advanced/manageUsers/server/manageUsers.js b/examples/flow-router-advanced/manageUsers/server/manageUsers.js
new file mode 100644
index 0000000000..f6e0e2a751
--- /dev/null
+++ b/examples/flow-router-advanced/manageUsers/server/manageUsers.js
@@ -0,0 +1,19 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////////////
+// Publish
+//
+
+
+// Authorized users can manage user accounts
+Meteor.publish("users", function () {
+
+  if (Roles.userIsInRole(this.userId, ["admin","manage-users"])) {
+    console.log('publishing users', this.userId)
+    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}})
+  } 
+
+  this.stop()
+  return
+})
diff --git a/examples/flow-router-advanced/secrets/client/routing.js b/examples/flow-router-advanced/secrets/client/routing.js
new file mode 100644
index 0000000000..c477404bac
--- /dev/null
+++ b/examples/flow-router-advanced/secrets/client/routing.js
@@ -0,0 +1,14 @@
+"use strict"
+
+////////////////////////////////////////////////////////////////////
+// Routing for Secrets
+//
+// Authentication is handled in mainLayout.
+// Authorization is handled in secretsController and can be reused for any route.
+//
+FlowRouter.route('/secrets', {
+  action: function () {
+    BlazeLayout.render('mainLayout', {content: 'secretsController',
+                                      targetTemplate: 'secrets'})
+  }
+})
diff --git a/examples/flow-router-advanced/secrets/client/secrets.html b/examples/flow-router-advanced/secrets/client/secrets.html
new file mode 100644
index 0000000000..fb0c65feba
--- /dev/null
+++ b/examples/flow-router-advanced/secrets/client/secrets.html
@@ -0,0 +1,30 @@
+<template name="secrets">
+  <div class="secrets row">
+    <div class="offset4 span8">
+
+      <p class="note">
+        Only Admins and those with the 'view-secrets'
+        role will see this page in their header nav.
+      </p>
+
+      <h2>Secrets!</h2>
+
+      {{#if Template.subscriptionsReady}}
+        <!-- This is displayed when all data is ready. -->
+        {{> secretList}}
+      {{else}}
+        Loading...
+      {{/if}}
+
+      {{> securityNote}}
+    </div>
+  </div>
+</template>
+
+<template name="secretList">
+  <ul>
+  {{#each secrets}}
+    <li><p>{{secret}}</p></li>
+  {{/each}}
+  </ul>
+</template>
diff --git a/examples/flow-router-advanced/secrets/client/secrets.js b/examples/flow-router-advanced/secrets/client/secrets.js
new file mode 100644
index 0000000000..dc1da2c604
--- /dev/null
+++ b/examples/flow-router-advanced/secrets/client/secrets.js
@@ -0,0 +1,9 @@
+Template.secrets.onCreated(function () {
+  this.subscribe("secrets")
+})
+
+Template.secretList.helpers({
+  secrets: function () {
+    return Meteor.secrets.find()
+  }
+})
diff --git a/examples/flow-router-advanced/secrets/client/secretsController.html b/examples/flow-router-advanced/secrets/client/secretsController.html
new file mode 100644
index 0000000000..5d4c772352
--- /dev/null
+++ b/examples/flow-router-advanced/secrets/client/secretsController.html
@@ -0,0 +1,3 @@
+<template name="secretsController">
+  {{> Template.dynamic template=target}}
+</template>
diff --git a/examples/flow-router-advanced/secrets/client/secretsController.js b/examples/flow-router-advanced/secrets/client/secretsController.js
new file mode 100644
index 0000000000..4d88ca4995
--- /dev/null
+++ b/examples/flow-router-advanced/secrets/client/secretsController.js
@@ -0,0 +1,16 @@
+"use strict"
+
+//////////////////////////////////////////////////////////////////////
+// secretsController
+//
+Template.secretsController.helpers({
+  target: function () {
+    var loggedInUserId = Meteor.userId()
+
+    if (!Roles.userIsInRole(loggedInUserId, ['secrets', 'admin'])) {
+      return 't404'
+    } else {
+      return this.targetTemplate
+    }
+  }
+})
diff --git a/examples/flow-router-advanced/secrets/model.js b/examples/flow-router-advanced/secrets/model.js
new file mode 100644
index 0000000000..78f205d2f8
--- /dev/null
+++ b/examples/flow-router-advanced/secrets/model.js
@@ -0,0 +1,5 @@
+"use strict";
+
+// run on both the server and the client
+
+Meteor.secrets = new Meteor.Collection('secrets');
diff --git a/examples/flow-router-advanced/secrets/server/fixtures.js b/examples/flow-router-advanced/secrets/server/fixtures.js
new file mode 100644
index 0000000000..a12700b35c
--- /dev/null
+++ b/examples/flow-router-advanced/secrets/server/fixtures.js
@@ -0,0 +1,32 @@
+"use strict";
+
+
+////////////////////////////////////////////////////////////////////
+// Startup Fixtures for Secrets
+//
+
+Meteor.startup(function () {
+
+  createSecrets()
+
+});
+
+
+function createSecrets () {
+  var secrets
+ 
+  if (Meteor.secrets.find().fetch().length === 0) {
+    console.log('Creating secrets: ');
+
+    secrets = [
+      {secret:"ec2 password: apple2"},
+      {secret:"domain registration pw: apple3"}
+    ]
+
+    _.each(secrets, function (secret) {
+      console.log(secret)
+
+      Meteor.secrets.insert(secret);
+    })
+  }
+}
diff --git a/examples/flow-router-advanced/secrets/server/secrets.js b/examples/flow-router-advanced/secrets/server/secrets.js
new file mode 100644
index 0000000000..7a8e76a7c2
--- /dev/null
+++ b/examples/flow-router-advanced/secrets/server/secrets.js
@@ -0,0 +1,19 @@
+"use strict"
+
+
+////////////////////////////////////////////////////////////////////
+// Publish
+//
+
+
+// Authorized users can view secrets
+Meteor.publish("secrets", function () {
+
+  if (Roles.userIsInRole(this.userId, ["admin","view-secrets"])) {
+    console.log('publishing secrets', this.userId)
+    return Meteor.secrets.find()
+  }
+
+  this.stop()
+  return
+})

From 02eead86d9d5208075af55cd68e19fa25ef7374d Mon Sep 17 00:00:00 2001
From: Adrian Lanning <alanning@gmail.com>
Date: Tue, 27 Oct 2015 02:29:02 -0400
Subject: [PATCH 0158/1140] Include link to slides

---
 examples/flow-router-advanced/README.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/examples/flow-router-advanced/README.md b/examples/flow-router-advanced/README.md
index 971d7bb303..f4e8d48e6f 100644
--- a/examples/flow-router-advanced/README.md
+++ b/examples/flow-router-advanced/README.md
@@ -1,10 +1,14 @@
 ## Flow Router Authorization - Advanced
 
-This example illustrates a pattern for reuse of template-based authorization.  It also illustrates a modular way to structure your application where different sections of the application are split out into separate directories.
+This example illustrates a pattern for reuse of template-based authorization.  
 
-Authentication is handled by the app's main layout.
-
-Authorization is handled by special wrapper templates called "controllers" which can be reused between various routes.
+Slides for related talk available here: http://slides.com/alanning55/a-pattern-for-flowrouter-auth#/
 
 
-NOTE: The app structure and reusable, template-based authorization pattern is not specific to FlowRouter.  It can be done just as easily using IronRouter.
+Features:
+
+* Modular directory structure - different sections of the application are split out into separate directories
+* Re-usable, nestable templates for handling authorization (dubbed "auth controllers")
+* Authentication handled by the app's main layout.
+
+NOTE: The app structure and reusable, template-based authorization pattern is not unique to FlowRouter.  It can also be used with IronRouter.

From 3d8c947129b7ba10ba27fb52174e2ad66e7da47b Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 11 Nov 2015 15:10:51 -0500
Subject: [PATCH 0159/1140] fix permission check to use 'view-secrets' rather
 than 'secrets'

---
 .../flow-router-advanced/secrets/client/secretsController.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/flow-router-advanced/secrets/client/secretsController.js b/examples/flow-router-advanced/secrets/client/secretsController.js
index 4d88ca4995..69a46318b0 100644
--- a/examples/flow-router-advanced/secrets/client/secretsController.js
+++ b/examples/flow-router-advanced/secrets/client/secretsController.js
@@ -7,7 +7,7 @@ Template.secretsController.helpers({
   target: function () {
     var loggedInUserId = Meteor.userId()
 
-    if (!Roles.userIsInRole(loggedInUserId, ['secrets', 'admin'])) {
+    if (!Roles.userIsInRole(loggedInUserId, ['view-secrets', 'admin'])) {
       return 't404'
     } else {
       return this.targetTemplate

From e8ec48ff4a1b68c66b98612e310114656a394059 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Wed, 11 Nov 2015 15:15:37 -0500
Subject: [PATCH 0160/1140] standardize on 'secrets' permission name

---
 examples/flow-router-advanced/main/client/header.html           | 2 +-
 examples/flow-router-advanced/main/server/startup/fixtures.js   | 2 +-
 examples/flow-router-advanced/secrets/client/secrets.html       | 2 +-
 .../flow-router-advanced/secrets/client/secretsController.js    | 2 +-
 examples/flow-router-advanced/secrets/server/secrets.js         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/flow-router-advanced/main/client/header.html b/examples/flow-router-advanced/main/client/header.html
index 65de655c95..caaa45a51b 100644
--- a/examples/flow-router-advanced/main/client/header.html
+++ b/examples/flow-router-advanced/main/client/header.html
@@ -15,7 +15,7 @@
 
             <li><a href="/start">Start Page</a></li>
 
-            {{#if isInRole 'admin,view-secrets'}}
+            {{#if isInRole 'admin,secrets'}}
             <li><a href="/secrets">Secrets</a></li>
             {{/if}}
 
diff --git a/examples/flow-router-advanced/main/server/startup/fixtures.js b/examples/flow-router-advanced/main/server/startup/fixtures.js
index 34f9cdc513..73a49aed83 100644
--- a/examples/flow-router-advanced/main/server/startup/fixtures.js
+++ b/examples/flow-router-advanced/main/server/startup/fixtures.js
@@ -21,7 +21,7 @@ function createUsers () {
 
     users = [
       {name:"Normal User",email:"normal@example.com",roles:[]},
-      {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
+      {name:"View-Secrets User",email:"view@example.com",roles:['secrets']},
       {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
       {name:"Admin User",email:"admin@example.com",roles:['admin']}
     ];
diff --git a/examples/flow-router-advanced/secrets/client/secrets.html b/examples/flow-router-advanced/secrets/client/secrets.html
index fb0c65feba..c7c1ddcc6d 100644
--- a/examples/flow-router-advanced/secrets/client/secrets.html
+++ b/examples/flow-router-advanced/secrets/client/secrets.html
@@ -3,7 +3,7 @@
     <div class="offset4 span8">
 
       <p class="note">
-        Only Admins and those with the 'view-secrets'
+        Only Admins and those with the 'secrets'
         role will see this page in their header nav.
       </p>
 
diff --git a/examples/flow-router-advanced/secrets/client/secretsController.js b/examples/flow-router-advanced/secrets/client/secretsController.js
index 69a46318b0..4d88ca4995 100644
--- a/examples/flow-router-advanced/secrets/client/secretsController.js
+++ b/examples/flow-router-advanced/secrets/client/secretsController.js
@@ -7,7 +7,7 @@ Template.secretsController.helpers({
   target: function () {
     var loggedInUserId = Meteor.userId()
 
-    if (!Roles.userIsInRole(loggedInUserId, ['view-secrets', 'admin'])) {
+    if (!Roles.userIsInRole(loggedInUserId, ['secrets', 'admin'])) {
       return 't404'
     } else {
       return this.targetTemplate
diff --git a/examples/flow-router-advanced/secrets/server/secrets.js b/examples/flow-router-advanced/secrets/server/secrets.js
index 7a8e76a7c2..e68728321e 100644
--- a/examples/flow-router-advanced/secrets/server/secrets.js
+++ b/examples/flow-router-advanced/secrets/server/secrets.js
@@ -9,7 +9,7 @@
 // Authorized users can view secrets
 Meteor.publish("secrets", function () {
 
-  if (Roles.userIsInRole(this.userId, ["admin","view-secrets"])) {
+  if (Roles.userIsInRole(this.userId, ["admin","secrets"])) {
     console.log('publishing secrets', this.userId)
     return Meteor.secrets.find()
   }

From 37eb3f1d1eca01e06bab99ac6f4c2ec29b9ebf9d Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 14 Nov 2015 12:57:12 -0500
Subject: [PATCH 0161/1140] Improved roles creation.

---
 roles/roles_common.js | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index d4bac02fb9..b00cb08732 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -57,9 +57,10 @@ _.extend(Roles, {
    *
    * @method createRole
    * @param {String} role Name of role
+   * @param {Boolean} [unlessExists] Optional. If true, existence of a role will not throw an exception.
    * @return {String} id of new role
    */
-  createRole: function (role) {
+  createRole: function (role, unlessExists) {
     var id,
         match
 
@@ -77,10 +78,12 @@ _.extend(Roles, {
       // XXX string parsing sucks, maybe
       // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
       if (e.name !== 'MongoError') throw e
-      match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/)
+      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/)
       if (!match) throw e
-      if (match[1].indexOf('$name') !== -1)
+      if (match[1].indexOf('$name') !== -1) {
+        if (unlessExists) return null
         throw new Meteor.Error(403, "Role already exists.")
+      }
       throw e
     }
   },
@@ -639,15 +642,22 @@ _.extend(Roles, {
     //if (roles.length === 0) return
 
     // ensure all roles exist in 'roles' collection
-    existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
-      memo[role.name] = true
-      return memo
-    }, {})
-    _.each(roles, function (role) {
-      if (!existingRoles[role]) {
-        Roles.createRole(role)
-      }
-    })
+    if (Meteor.isClient) {
+      existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
+        memo[role.name] = true
+        return memo
+      }, {})
+      _.each(roles, function (role) {
+        if (!existingRoles[role]) {
+          Roles.createRole(role)
+        }
+      })
+    }
+    else {
+      _.each(roles, function (role) {
+        Roles.createRole(role, true)
+      })
+    }
 
     // ensure users is an array of user ids
     users = _.reduce(users, function (memo, user) {

From 8d636c4d65a28aa18d9b790ccb4d6a853807c3a6 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 14 Nov 2015 17:04:08 -0500
Subject: [PATCH 0162/1140] Moved package.js.

---
 roles/package.js => package.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
 rename roles/package.js => package.js (67%)

diff --git a/roles/package.js b/package.js
similarity index 67%
rename from roles/package.js
rename to package.js
index 407c35b969..ed4a5cd91f 100644
--- a/roles/package.js
+++ b/package.js
@@ -20,11 +20,11 @@ Package.onUse(function (api) {
 
   api.export('Roles');
 
-  api.addFiles('roles_server.js', 'server');
-  api.addFiles('roles_common.js', both);
-  api.addFiles(['client/debug.js',
-                'client/uiHelpers.js',
-                'client/subscriptions.js'], 'client');
+  api.addFiles('roles/roles_server.js', 'server');
+  api.addFiles('roles/roles_common.js', both);
+  api.addFiles(['roles/client/debug.js',
+                'roles/client/uiHelpers.js',
+                'roles/client/subscriptions.js'], 'client');
 });
 
 Package.onTest(function (api) {
@@ -37,6 +37,6 @@ Package.onTest(function (api) {
            'underscore',
            'tinytest'], both);
 
-  api.addFiles('tests/client.js', 'client');
-  api.addFiles('tests/server.js', 'server');
+  api.addFiles('roles/tests/client.js', 'client');
+  api.addFiles('roles/tests/server.js', 'server');
 });

From 71e59b82966508a61778394baf3f4015fab2b911 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 16 Dec 2015 23:38:44 +0100
Subject: [PATCH 0163/1140] Query methods.

---
 package.js                |   2 +-
 roles/client/uiHelpers.js |  10 +-
 roles/roles_common.js     | 621 +++++++++++++-------------------------
 roles/roles_server.js     |  35 ++-
 4 files changed, 232 insertions(+), 436 deletions(-)

diff --git a/package.js b/package.js
index ed4a5cd91f..cb3379e1a3 100644
--- a/package.js
+++ b/package.js
@@ -20,8 +20,8 @@ Package.onUse(function (api) {
 
   api.export('Roles');
 
-  api.addFiles('roles/roles_server.js', 'server');
   api.addFiles('roles/roles_common.js', both);
+  api.addFiles('roles/roles_server.js', 'server');
   api.addFiles(['roles/client/debug.js',
                 'roles/client/uiHelpers.js',
                 'roles/client/subscriptions.js'], 'client');
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index d596c406fd..01983a299d 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -32,17 +32,17 @@ Roles._uiHelpers = {
    *     {{#if isInRole 'editor,user'}}
    *     {{/if}}
    *
-   *     {{#if isInRole 'editor,user' 'group1'}}
+   *     {{#if isInRole 'editor,user' 'partition1'}}
    *     {{/if}}
    *
    * @method isInRole
    * @param {String} role Name of role or comma-seperated list of roles
-   * @param {String} [group] Optional, name of group to check
+   * @param {String} [partition] Optional, name of partition to check
    * @return {Boolean} true if current user is in at least one of the target roles
    * @static
    * @for UIHelpers 
    */
-  isInRole: function (role, group) {
+  isInRole: function (role, partition) {
     var user = Meteor.user(),
         comma = (role || '').indexOf(','),
         roles
@@ -62,8 +62,8 @@ Roles._uiHelpers = {
       roles = [role]
     }
 
-    if (Match.test(group, String)) {
-      return Roles.userIsInRole(user, roles, group)
+    if (Match.test(partition, String)) {
+      return Roles.userIsInRole(user, roles, partition)
     }
 
     return Roles.userIsInRole(user, roles)
diff --git a/roles/roles_common.js b/roles/roles_common.js
index b00cb08732..d84dd0d6b3 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -7,10 +7,20 @@
  */
 
 /**
- * Roles collection documents consist only of an id and a role name.
- *   ex: { _id:<uuid>, name: "admin" }
+ * Roles collection documents consist of:
+ *  - _id
+ *  - name (of the role)
+ *  - children (roles), list of documents:
+ *    - _id
+ *  - descendants (roles), list of documents (recursively flattened children):
+ *    - _id
+ *    - name
+ *
+ * List elements are documents so that they can easier be extended in the future.
+ *
+ * Example: { _id: "123", name: "admin" }
  */
-if (!Meteor.roles) {
+ if (!Meteor.roles) {
   Meteor.roles = new Mongo.Collection("roles")
 }
 
@@ -28,30 +38,10 @@ if ('undefined' === typeof Roles) {
 
 "use strict";
 
-var mixingGroupAndNonGroupErrorMsg = "Roles error: Can't mix grouped and non-grouped roles for same user";
+var getGroupsForUserDeprecationWarning = false;
 
 _.extend(Roles, {
 
-  /**
-   * Constant used to reference the special 'global' group that 
-   * can be used to apply blanket permissions across all groups.
-   *
-   * @example
-   *     Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
-   *     Roles.userIsInRole(user, 'admin') // => true
-   *
-   *     Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)
-   *     Roles.userIsInRole(user, 'support-staff') // => true
-   *     Roles.userIsInRole(user, 'admin') // => false
-   *
-   * @property GLOBAL_GROUP
-   * @type String
-   * @static
-   * @final
-   */
-  GLOBAL_GROUP: '__global_roles__',
-
-
   /**
    * Create a new role. Whitespace will be trimmed.
    *
@@ -115,9 +105,6 @@ _.extend(Roles, {
   /**
    * Add users to roles. Will create roles as needed.
    *
-   * NOTE: Mixing grouped and non-grouped roles for the same user
-   *       is not supported and will throw an error.
-   *
    * Makes 2 calls to database:
    *  1. retrieve list of all existing roles
    *  2. update users' roles
@@ -258,469 +245,275 @@ _.extend(Roles, {
    * Check if user has specified permissions/roles
    *
    * @example
-   *     // non-group usage
+   *     // global roles
    *     Roles.userIsInRole(user, 'admin')
    *     Roles.userIsInRole(user, ['admin','editor'])
    *     Roles.userIsInRole(userId, 'admin')
    *     Roles.userIsInRole(userId, ['admin','editor'])
    *
-   *     // per-group usage
-   *     Roles.userIsInRole(user,   ['admin','editor'], 'group1')
+   *     // partition roles (global roles are still checked)
+   *     Roles.userIsInRole(user, 'admin', 'group1')
    *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
-   *     Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)
+   *     Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})
+   *
+   * Options:
+   *   - partition: name of the partition
    *
-   *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
-   *     Roles.userIsInRole(user, 'admin')
-   *    
    * @method userIsInRole
    * @param {String|Object} user User Id or actual user object
    * @param {String|Array} roles Name of role/permission or Array of 
-   *                            roles/permissions to check against.  If array, 
-   *                            will return true if user is in _any_ role.
-   * @param {String} [group] Optional. Name of group.  If supplied, limits check
-   *                         to just that group.
-   *                         The user's Roles.GLOBAL_GROUP will always be checked
-   *                         whether group is specified or not.  
+   *                             roles/permissions to check against.  If array,
+   *                             will return true if user is in _any_ role.
+   * @param {String|Object} [options] Optional. Name of partition. If supplied, limits check
+   *                                  to just that partition.
+   *                                  The user's global roles will always be checked
+   *                                  whether partition is specified or not.
+   *                                  Alternatively, options.
    * @return {Boolean} true if user is in _any_ of the target roles
    */
-  userIsInRole: function (user, roles, group) {
+  userIsInRole: function (user, roles, options) {
     var id,
-        userRoles,
-        query,
-        groupQuery,
-        found = false
+        query;
 
     // ensure array to simplify code
     if (!_.isArray(roles)) {
-      roles = [roles]
+      roles = [roles];
     }
 
-    if (!user) return false
-    if (group) {
-      if ('string' !== typeof group) return false
-      if ('$' === group[0]) return false
+    if (!roles.length) return false;
 
-      // convert any periods to underscores
-      group = group.replace(/\./g, '_')
+    if (_.isString(options)) {
+      options = {partition: options};
     }
-    
-    if ('object' === typeof user) {
-      userRoles = user.roles
-      if (_.isArray(userRoles)) {
+
+    options.partition = options.partition || null;
+
+    if (!user) return false;
+
+    if (_.isObject(user)) {
+      if (_.has(user, 'roles')) {
         return _.some(roles, function (role) {
-          return _.contains(userRoles, role)
+          return _.some(user.roles || [], Roles._roleAndPartitionMatcher(role, options.partition));
         })
-      } else if ('object' === typeof userRoles) {
-        // roles field is dictionary of groups
-        found = _.isArray(userRoles[group]) && _.some(roles, function (role) {
-          return _.contains(userRoles[group], role)
-        })
-        if (!found) {
-          // not found in regular group or group not specified.  
-          // check Roles.GLOBAL_GROUP, if it exists
-          found = _.isArray(userRoles[Roles.GLOBAL_GROUP]) && _.some(roles, function (role) {
-            return _.contains(userRoles[Roles.GLOBAL_GROUP], role)
-          })
-        }
-        return found
+      } else {
+        // missing roles field, try going direct via id
+        id = user._id;
       }
-
-      // missing roles field, try going direct via id
-      id = user._id
-    } else if ('string' === typeof user) {
-      id = user
-    }
-
-    if (!id) return false
-
-
-    query = {_id: id, $or: []}
-
-    // always check Roles.GLOBAL_GROUP
-    groupQuery = {}
-    groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
-    query.$or.push(groupQuery)
-
-    if (group) {
-      // structure of query, when group specified including Roles.GLOBAL_GROUP 
-      //   {_id: id, 
-      //    $or: [
-      //      {'roles.group1':{$in: ['admin']}},
-      //      {'roles.__global_roles__':{$in: ['admin']}}
-      //    ]}
-      groupQuery = {}
-      groupQuery['roles.'+group] = {$in: roles}
-      query.$or.push(groupQuery)
     } else {
-      // structure of query, where group not specified. includes 
-      // Roles.GLOBAL_GROUP 
-      //   {_id: id, 
-      //    $or: [
-      //      {roles: {$in: ['admin']}},
-      //      {'roles.__global_roles__': {$in: ['admin']}}
-      //    ]}
-      query.$or.push({roles: {$in: roles}})
+      id = user;
     }
 
-    found = Meteor.users.findOne(query, {fields: {_id: 1}})
-    return found ? true : false
+    if (!id) return false;
+
+    query = {
+      _id: id,
+      $or: [{
+        roles: {
+          $elemMatch: {
+            role: {$in: roles},
+            partition: options.partition
+          }
+        }
+      }, {
+        roles: {
+          $elemMatch: {
+            role: {$in: roles},
+            partition: null
+          }
+        }
+      }]
+    };
+
+    return !!Meteor.users.findOne(query, {fields: {_id: 1}});
   },
 
   /**
-   * Retrieve users roles
+   * Retrieve user's roles.
+   *
+   * Options:
+   *   - partition: name of the partition
+   *   - fullObjects: return full roles objects (true) or just names (false) (default false)
+   *   - onlyAssigned: return only assigned roles and not automatically inferred (like subroles)
    *
    * @method getRolesForUser
    * @param {String|Object} user User Id or actual user object
-   * @param {String} [group] Optional name of group to restrict roles to.
-   *                         User's Roles.GLOBAL_GROUP will also be included.
+   * @param {String|Object} [options] Optional. Name of partition to provide roles for.
+   *                                  If not specified, global roles are returned.
+   *                                  Alternatively, options.
    * @return {Array} Array of user's roles, unsorted.
    */
-  getRolesForUser: function (user, group) {
-    if (!user) return []
-    if (group) {
-      if ('string' !== typeof group) return []
-      if ('$' === group[0]) return []
+  getRolesForUser: function (user, options) {
+    var roles;
 
-      // convert any periods to underscores
-      group = group.replace(/\./g, '_')
+    if (_.isString(options)) {
+      options = {partition: options};
     }
 
-    if ('string' === typeof user) {
-      user = Meteor.users.findOne(
-               {_id: user},
-               {fields: {roles: 1}})
+    options.partition = options.partition || null;
 
-    } else if ('object' !== typeof user) {
-      // invalid user object
-      return []
+    options = _.defaults(options, {
+      fullObjects: false,
+      onlyAssigned: false
+    });
+
+    user = Roles._resolveUser(user);
+
+    if (!user) return [];
+
+    roles = _.filter(user.roles || [], Roles._partitionMatcher(options.partition));
+
+    if (options.onlyAssigned) {
+      roles = _.filter(roles, Roles._onlyAssignedMatcher());
     }
 
-    if (!user || !user.roles) return []
-
-    if (group) {
-      return _.union(user.roles[group] || [], user.roles[Roles.GLOBAL_GROUP] || [])
+    if (options.fullObjects) {
+      return roles;
     }
 
-    if (_.isArray(user.roles))
-      return user.roles
-
-    // using groups but group not specified. return global group, if exists
-    return user.roles[Roles.GLOBAL_GROUP] || []
+    return _.pluck(roles, 'role');
   },
 
   /**
-   * Retrieve set of all existing roles
+   * Retrieve set of all existing roles.
    *
    * @method getAllRoles
+   * @param {Object} [queryOptions] Optional. Options which are passed directly
+   *                                through to `Meteor.roles.find(query, options)`
    * @return {Cursor} cursor of existing roles
    */
-  getAllRoles: function () {
-    return Meteor.roles.find({}, {sort: {name: 1}})
+  getAllRoles: function (queryOptions) {
+    queryOptions = queryOptions || {sort: {name: 1}};
+
+    return Meteor.roles.find({}, queryOptions);
   },
 
   /**
-   * Retrieve all users who are in target role.  
+   * Retrieve all users who are in target role.
    *
-   * NOTE: This is an expensive query; it performs a full collection scan
-   * on the users collection since there is no index set on the 'roles' field.  
-   * This is by design as most queries will specify an _id so the _id index is 
-   * used automatically.
+   * Options:
+   *   - partition: name of the partition
+   *   - queryOptions: options which are passed directly
+   *                   through to `Meteor.users.find(query, options)`
    *
    * @method getUsersInRole
-   * @param {Array|String} role Name of role/permission.  If array, users 
-   *                            returned will have at least one of the roles
-   *                            specified but need not have _all_ roles.
-   * @param {String} [group] Optional name of group to restrict roles to.
-   *                         User's Roles.GLOBAL_GROUP will also be checked.
-   * @param {Object} [options] Optional options which are passed directly
-   *                           through to `Meteor.users.find(query, options)`
+   * @param {Array|String} roles Name of role/permission.  If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   * @param {String|Object} [options] Optional. Name of partition to restrict roles to.
+   *                                  User's global roles will also be checked.
+   *                                  Alternatively, options.
+   * @param {Object} [queryOptions] Optional. Options which are passed directly
+   *                                through to `Meteor.users.find(query, options)`
    * @return {Cursor} cursor of users in role
    */
-  getUsersInRole: function (role, group, options) {
-    var query,
-        roles = role,
-        groupQuery
+  getUsersInRole: function (roles, options, queryOptions) {
+    var query;
 
-    // ensure array to simplify query logic
-    if (!_.isArray(roles)) roles = [roles]
-    
-    if (group) {
-      if ('string' !== typeof group)
-        throw new Error ("Roles error: Invalid parameter 'group'. Expected 'string' type")
-      if ('$' === group[0])
-        throw new Error ("Roles error: groups can not start with '$'")
-
-      // convert any periods to underscores
-      group = group.replace(/\./g, '_')
+    // ensure array to simplify code
+    if (!_.isArray(roles)) {
+      roles = [roles];
     }
 
-    query = {$or: []}
-
-    // always check Roles.GLOBAL_GROUP
-    groupQuery = {}
-    groupQuery['roles.'+Roles.GLOBAL_GROUP] = {$in: roles}
-    query.$or.push(groupQuery)
-
-    if (group) {
-      // structure of query, when group specified including Roles.GLOBAL_GROUP 
-      //   {
-      //    $or: [
-      //      {'roles.group1':{$in: ['admin']}},
-      //      {'roles.__global_roles__':{$in: ['admin']}}
-      //    ]}
-      groupQuery = {}
-      groupQuery['roles.'+group] = {$in: roles}
-      query.$or.push(groupQuery)
-    } else {
-      // structure of query, where group not specified. includes 
-      // Roles.GLOBAL_GROUP 
-      //   {
-      //    $or: [
-      //      {roles: {$in: ['admin']}},
-      //      {'roles.__global_roles__': {$in: ['admin']}}
-      //    ]}
-      query.$or.push({roles: {$in: roles}})
+    if (_.isString(options)) {
+      options = {partition: options};
     }
 
-    return Meteor.users.find(query, options);
-  },  // end getUsersInRole 
-  
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      queryOptions: queryOptions || {}
+    });
+
+    query = {
+      $or: [{
+        roles: {
+          $elemMatch: {
+            role: {$in: roles},
+            partition: options.partition
+          }
+        }
+      }, {
+        roles: {
+          $elemMatch: {
+            role: {$in: roles},
+            partition: null
+          }
+        }
+      }]
+    };
+
+    return Meteor.users.find(query, options.queryOptions);
+  },
+
+  getGroupsForUser: function (/*args*/) {
+    if (!getGroupsForUserDeprecationWarning) {
+      getGroupsForUserDeprecationWarning = true;
+      console && console.warn("getGroupsForUser has been deprecated. Use getPartitionsForUser instead.");
+    }
+
+    return Roles.getPartitionsForUser.apply(this, arguments);
+  },
+
   /**
-   * Retrieve users groups, if any
+   * Retrieve users partitions, if any.
    *
-   * @method getGroupsForUser
+   * @method getPartitionsForUser
    * @param {String|Object} user User Id or actual user object
-   * @param {String} [role] Optional name of roles to restrict groups to.
+   * @param {String} [roles] Optional name of roles to restrict partitions to.
    *
-   * @return {Array} Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted
+   * @return {Array} Array of user's partitions, unsorted.
    */
-  getGroupsForUser: function (user, role) {
-    var userGroups = [];
-    
-    if (!user) return []
-    if (role) {
-      if ('string' !== typeof role) return []
-      if ('$' === role[0]) return []
-
-      // convert any periods to underscores
-      role = role.replace('.', '_')
+  getPartitionsForUser: function (user, roles) {
+    // ensure array to simplify code
+    if (!_.isArray(roles)) {
+      roles = [roles];
     }
 
-    if ('string' === typeof user) {
+    user = Roles._resolveUser(user);
+
+    if (!user) return [];
+
+    // != used on purpose.
+    return _.uniq(_.filter(_.pluck(user.roles || [], 'partition'), function (partition) {return partition != null}));
+  },
+
+  _resolveUser: function (user) {
+    // TODO: We could use $elemMatch to limit returned fields here.
+    if (!_.isObject(user)) {
       user = Meteor.users.findOne(
                {_id: user},
-               {fields: {roles: 1}})
-    
-    }else if ('object' !== typeof user) {
-      // invalid user object
-      return []
+               {fields: {roles: 1}});
+    } else if (!_.has(user, 'roles')) {
+      user = Meteor.users.findOne(
+               {_id: user._id},
+               {fields: {roles: 1}});
     }
 
-    //User has no roles or is not using groups
-    if (!user || !user.roles || _.isArray(user.roles)) return []
+    return user;
+  },
 
-    if (role) {
-      _.each(user.roles, function(groupRoles, groupName) {
-        if (_.contains(groupRoles, role) && groupName !== Roles.GLOBAL_GROUP) {
-          userGroups.push(groupName);
-        }
-      });
-      return userGroups;
-    }else {
-      return _.without(_.keys(user.roles), Roles.GLOBAL_GROUP);
-    }
+  _roleAndPartitionMatcher: function (roleName, partition) {
+    return function (userRole) {
+      // == used on purpose in "userRole.partition == null"
+      return (userRole.role === roleName && userRole.partition === partition) ||
+        (userRole.role === roleName && (!_.has(userRole, 'partition') || userRole.partition == null));
+    };
+  },
 
-  }, //End getGroupsForUser
+  _partitionMatcher: function (partition) {
+    return function (userRole) {
+      // == used on purpose in "userRole.partition == null"
+      return (userRole.partition === partition) ||
+        (!_.has(userRole, 'partition') || userRole.partition == null);
+    };
+  },
 
+  _onlyAssignedMatcher: function () {
+    return function (userRole) {
+      return !!userRole.assigned;
+    };
+  }
 
-  /**
-   * Private function 'template' that uses $set to construct an update object
-   * for MongoDB.  Passed to _updateUserRoles
-   *
-   * @method _update_$set_fn 
-   * @protected
-   * @param {Array} roles
-   * @param {String} [group]
-   * @return {Object} update object for use in MongoDB update command
-   */
-  _update_$set_fn: function  (roles, group) {
-    var update = {}
-
-    if (group) {
-      // roles is a key/value dict object
-      update.$set = {}
-      update.$set['roles.' + group] = roles
-    } else {
-      // roles is an array of strings
-      update.$set = {roles: roles}
-    }
-
-    return update
-  },  // end _update_$set_fn 
-
-  /**
-   * Private function 'template' that uses $addToSet to construct an update 
-   * object for MongoDB.  Passed to _updateUserRoles
-   *
-   * @method _update_$addToSet_fn  
-   * @protected
-   * @param {Array} roles
-   * @param {String} [group]
-   * @return {Object} update object for use in MongoDB update command
-   */
-  _update_$addToSet_fn: function (roles, group) {
-    var update = {}
-
-    if (group) {
-      // roles is a key/value dict object
-      update.$addToSet = {}
-      update.$addToSet['roles.' + group] = {$each: roles}
-    } else {
-      // roles is an array of strings
-      update.$addToSet = {roles: {$each: roles}}
-    }
-
-    return update
-  },  // end _update_$addToSet_fn 
-
-
-  /**
-   * Internal function that uses the Template pattern to adds or sets roles 
-   * for users.
-   *
-   * @method _updateUserRoles
-   * @protected
-   * @param {Array|String} users user id(s) or object(s) with an _id field
-   * @param {Array|String} roles name(s) of roles/permissions to add users to
-   * @param {String} group Group name. If not null or undefined, roles will be
-   *                         specific to that group.  
-   *                         Group names can not start with '$'.
-   *                         Periods in names '.' are automatically converted
-   *                         to underscores.
-   *                         The special group Roles.GLOBAL_GROUP provides 
-   *                         a convenient way to assign blanket roles/permissions
-   *                         across all groups.  The roles/permissions in the 
-   *                         Roles.GLOBAL_GROUP group will be automatically 
-   *                         included in checks for any group.
-   * @param {Function} updateFactory Func which returns an update object that
-   *                         will be passed to Mongo.
-   *   @param {Array} roles
-   *   @param {String} [group]
-   */
-  _updateUserRoles: function (users, roles, group, updateFactory) {
-    if (!users) throw new Error ("Missing 'users' param")
-    if (!roles) throw new Error ("Missing 'roles' param")
-    if (group) {
-      if ('string' !== typeof group)
-        throw new Error ("Roles error: Invalid parameter 'group'. Expected 'string' type")
-      if ('$' === group[0])
-        throw new Error ("Roles error: groups can not start with '$'")
-
-      // convert any periods to underscores
-      group = group.replace(/\./g, '_')
-    }
-
-    var existingRoles,
-        query,
-        update
-
-    // ensure arrays to simplify code
-    if (!_.isArray(users)) users = [users]
-    if (!_.isArray(roles)) roles = [roles]
-
-    // remove invalid roles
-    roles = _.reduce(roles, function (memo, role) {
-      if (role
-          && 'string' === typeof role
-          && role.trim().length > 0) {
-        memo.push(role.trim())
-      }
-      return memo
-    }, [])
-
-    // empty roles array is ok, since it might be a $set operation to clear roles
-    //if (roles.length === 0) return
-
-    // ensure all roles exist in 'roles' collection
-    if (Meteor.isClient) {
-      existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
-        memo[role.name] = true
-        return memo
-      }, {})
-      _.each(roles, function (role) {
-        if (!existingRoles[role]) {
-          Roles.createRole(role)
-        }
-      })
-    }
-    else {
-      _.each(roles, function (role) {
-        Roles.createRole(role, true)
-      })
-    }
-
-    // ensure users is an array of user ids
-    users = _.reduce(users, function (memo, user) {
-      var _id
-      if ('string' === typeof user) {
-        memo.push(user)
-      } else if ('object' === typeof user) {
-        _id = user._id
-        if ('string' === typeof _id) {
-          memo.push(_id)
-        }
-      }
-      return memo
-    }, [])
-    
-    // update all users
-    update = updateFactory(roles, group)
-    
-    try {
-      if (Meteor.isClient) {
-        // On client, iterate over each user to fulfill Meteor's 
-        // 'one update per ID' policy
-        _.each(users, function (user) {
-          Meteor.users.update({_id: user}, update)
-        })
-      } else {
-        // On the server we can use MongoDB's $in operator for 
-        // better performance
-        Meteor.users.update(
-          {_id: {$in: users}},
-          update,
-          {multi: true})
-      }
-    }
-    catch (ex) {
-      if (ex.name === 'MongoError' && isMongoMixError(ex.err)) {
-        throw new Error (mixingGroupAndNonGroupErrorMsg)
-      }
-
-      throw ex
-    }
-  }  // end _updateUserRoles
-
-})  // end _.extend(Roles ...)
-
-
-function isMongoMixError (errorMsg) {
-  var expectedMessages = [
-      'Cannot apply $addToSet modifier to non-array',
-      'Cannot apply $addToSet to a non-array field',
-      'Can only apply $pullAll to an array',
-      'Cannot apply $pull/$pullAll modifier to non-array',
-      "can't append to array using string field name",
-      'to traverse the element'
-      ]
-
-  return _.some(expectedMessages, function (snippet) {
-    return strContains(errorMsg, snippet)
-  })
-}
-
-function strContains (haystack, needle) {
-  return -1 !== haystack.indexOf(needle)
-}
+});  // end _.extend(Roles ...)
 
 }());
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 4cf5fdcad7..8d9ba2dfdc 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,17 +1,12 @@
-"use strict"
+"use strict";
 
+// Create default indexes for roles and users collection.
 
-/**
- * Roles collection documents consist only of an id and a role name.
- *   ex: { _id: "123", name: "admin" }
- */
-if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection("roles")
-
-  // Create default indexes for roles collection
-  Meteor.roles._ensureIndex('name', {unique: 1})
-}
+Meteor.roles._ensureIndex({name: 1}, {unique: 1});
 
+Meteor.users._ensureIndex({'roles.name': 1});
+Meteor.users._ensureIndex({'roles.partition': 1});
+Meteor.users._ensureIndex({'roles.name': 1, 'roles.partition': 1});
 
 /**
  * Publish logged-in user's roles so client-side checks can work.
@@ -20,13 +15,21 @@ if (!Meteor.roles) {
  */
 Meteor.publish('_roles', function () {
   var loggedInUserId = this.userId,
-      fields = {roles: 1}
+      fields = {roles: 1};
 
   if (!loggedInUserId) {
-    this.ready()
-    return
+    this.ready();
+    return;
   }
 
   return Meteor.users.find({_id: loggedInUserId},
-                           {fields: fields})
-})
+                           {fields: fields});
+});
+
+Roles._forwardMigrate = function () {
+
+};
+
+Roles._backwardMigrate = function () {
+
+};

From 4257b7ec3c196b0ef88a5692b1f5c9c79f5eca6c Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 17 Dec 2015 11:31:19 +0100
Subject: [PATCH 0164/1140] Document field structure.

---
 roles/roles_common.js | 6 ++++++
 roles/roles_server.js | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index d84dd0d6b3..e0085ff27a 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -3,6 +3,12 @@
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
+ * It uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following
+ * schema:
+ *  - role (role name)
+ *  - partition (partition name)
+ *  - assigned (boolean, if the rule was manually assigned, or was automatically inferred (like subroles))
+ *
  * @module Roles
  */
 
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 8d9ba2dfdc..d9dd378d21 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -4,9 +4,9 @@
 
 Meteor.roles._ensureIndex({name: 1}, {unique: 1});
 
-Meteor.users._ensureIndex({'roles.name': 1});
+Meteor.users._ensureIndex({'roles.role': 1});
 Meteor.users._ensureIndex({'roles.partition': 1});
-Meteor.users._ensureIndex({'roles.name': 1, 'roles.partition': 1});
+Meteor.users._ensureIndex({'roles.role': 1, 'roles.partition': 1});
 
 /**
  * Publish logged-in user's roles so client-side checks can work.

From bc4d8fe958831b867e3b6d62e8aa993e92fb9eb3 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 17 Dec 2015 13:23:40 +0100
Subject: [PATCH 0165/1140] Adding and removing roles.

---
 roles/roles_common.js | 64 +++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index e0085ff27a..46b1293ce6 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -49,63 +49,63 @@ var getGroupsForUserDeprecationWarning = false;
 _.extend(Roles, {
 
   /**
-   * Create a new role. Whitespace will be trimmed.
+   * Create a new role.
+   *
+   * Options:
+   *   - unlessExists: if true, existence of a role will not throw an exception
    *
    * @method createRole
-   * @param {String} role Name of role
-   * @param {Boolean} [unlessExists] Optional. If true, existence of a role will not throw an exception.
+   * @param {String} role Name of role.
+   * @param {Object} [options] Optional.
    * @return {String} id of new role
    */
-  createRole: function (role, unlessExists) {
-    var id,
-        match
+  createRole: function (role, options) {
+    var match;
 
-    if (!role
-        || 'string' !== typeof role
-        || role.trim().length === 0) {
-      return
+    if (!role || !_.isString(role) || role.trim() !== role) {
+      throw new Error("Invalid role name.");
     }
 
+    options = _.defaults(options || {}, {
+      unlessExists: false
+    });
+
     try {
-      id = Meteor.roles.insert({'name': role.trim()})
-      return id
+      return Meteor.roles.insert({name: role, children: [], descendants: []});
     } catch (e) {
       // (from Meteor accounts-base package, insertUserDoc func)
       // XXX string parsing sucks, maybe
       // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-      if (e.name !== 'MongoError') throw e
-      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/)
-      if (!match) throw e
+      if (e.name !== 'MongoError') throw e;
+      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
+      if (!match) throw e;
       if (match[1].indexOf('$name') !== -1) {
-        if (unlessExists) return null
-        throw new Meteor.Error(403, "Role already exists.")
+        if (options.unlessExists) return null;
+        throw new Error("Role already exists.");
       }
-      throw e
+      throw e;
     }
   },
 
   /**
-   * Delete an existing role.  Will throw "Role in use" error if any users
+   * Delete an existing role. Will throw "Role in use." error if any users
    * are currently assigned to the target role.
    *
    * @method deleteRole
    * @param {String} role Name of role
    */
   deleteRole: function (role) {
-    if (!role) return
+    if (!role) return;
 
     var foundExistingUser = Meteor.users.findOne(
-                              {roles: {$in: [role]}},
-                              {fields: {_id: 1}})
+                              {'roles.role': role},
+                              {fields: {_id: 1}});
 
     if (foundExistingUser) {
-      throw new Meteor.Error(403, 'Role in use')
+      throw new Error("Role in use.");
     }
 
-    var thisRole = Meteor.roles.findOne({name: role})
-    if (thisRole) {
-      Meteor.roles.remove({_id: thisRole._id})
-    }
+    Meteor.roles.remove({name: role});
   },
 
   /**
@@ -268,7 +268,7 @@ _.extend(Roles, {
    * @method userIsInRole
    * @param {String|Object} user User Id or actual user object
    * @param {String|Array} roles Name of role/permission or Array of 
-   *                             roles/permissions to check against.  If array,
+   *                             roles/permissions to check against. If array,
    *                             will return true if user is in _any_ role.
    * @param {String|Object} [options] Optional. Name of partition. If supplied, limits check
    *                                  to just that partition.
@@ -342,7 +342,7 @@ _.extend(Roles, {
    *   - onlyAssigned: return only assigned roles and not automatically inferred (like subroles)
    *
    * @method getRolesForUser
-   * @param {String|Object} user User Id or actual user object
+   * @param {String|Object} user User Id or actual user object.
    * @param {String|Object} [options] Optional. Name of partition to provide roles for.
    *                                  If not specified, global roles are returned.
    *                                  Alternatively, options.
@@ -384,7 +384,7 @@ _.extend(Roles, {
    *
    * @method getAllRoles
    * @param {Object} [queryOptions] Optional. Options which are passed directly
-   *                                through to `Meteor.roles.find(query, options)`
+   *                                through to `Meteor.roles.find(query, options)`.
    * @return {Cursor} cursor of existing roles
    */
   getAllRoles: function (queryOptions) {
@@ -402,7 +402,7 @@ _.extend(Roles, {
    *                   through to `Meteor.users.find(query, options)`
    *
    * @method getUsersInRole
-   * @param {Array|String} roles Name of role/permission.  If array, users
+   * @param {Array|String} roles Name of role/permission. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
    * @param {String|Object} [options] Optional. Name of partition to restrict roles to.
@@ -464,7 +464,7 @@ _.extend(Roles, {
    * Retrieve users partitions, if any.
    *
    * @method getPartitionsForUser
-   * @param {String|Object} user User Id or actual user object
+   * @param {String|Object} user User Id or actual user object.
    * @param {String} [roles] Optional name of roles to restrict partitions to.
    *
    * @return {Array} Array of user's partitions, unsorted.

From c61f668f54e7b272127bd0090d2e25c2fd93187f Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 17 Dec 2015 15:16:50 +0100
Subject: [PATCH 0166/1140] Remove unnecessary index.

---
 roles/roles_server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index d9dd378d21..ac44b2292f 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -4,9 +4,9 @@
 
 Meteor.roles._ensureIndex({name: 1}, {unique: 1});
 
-Meteor.users._ensureIndex({'roles.role': 1});
-Meteor.users._ensureIndex({'roles.partition': 1});
+// Index only on "roles.role" is not needed because the combined index works for it as well.
 Meteor.users._ensureIndex({'roles.role': 1, 'roles.partition': 1});
+Meteor.users._ensureIndex({'roles.partition': 1});
 
 /**
  * Publish logged-in user's roles so client-side checks can work.

From 69713a6f7f4582f2c6a3ceec5d89d5813208f3c6 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 17 Dec 2015 16:06:37 +0100
Subject: [PATCH 0167/1140] Make sure we really limit partitions in
 getPartitionsForUser.

---
 roles/roles_common.js | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 46b1293ce6..126ab6ce1f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -62,11 +62,13 @@ _.extend(Roles, {
   createRole: function (role, options) {
     var match;
 
+    options = options || {};
+
     if (!role || !_.isString(role) || role.trim() !== role) {
       throw new Error("Invalid role name.");
     }
 
-    options = _.defaults(options || {}, {
+    options = _.defaults(options, {
       unlessExists: false
     });
 
@@ -266,8 +268,8 @@ _.extend(Roles, {
    *   - partition: name of the partition
    *
    * @method userIsInRole
-   * @param {String|Object} user User Id or actual user object
-   * @param {String|Array} roles Name of role/permission or Array of 
+   * @param {String|Object} user User Id or actual user object.
+   * @param {String|Array} roles Name of role/permission or Array of
    *                             roles/permissions to check against. If array,
    *                             will return true if user is in _any_ role.
    * @param {String|Object} [options] Optional. Name of partition. If supplied, limits check
@@ -281,10 +283,10 @@ _.extend(Roles, {
     var id,
         query;
 
+    options = options || {};
+
     // ensure array to simplify code
-    if (!_.isArray(roles)) {
-      roles = [roles];
-    }
+    if (!_.isArray(roles)) roles = [roles];
 
     if (!roles.length) return false;
 
@@ -351,6 +353,8 @@ _.extend(Roles, {
   getRolesForUser: function (user, options) {
     var roles;
 
+    options = options || {};
+
     if (_.isString(options)) {
       options = {partition: options};
     }
@@ -415,10 +419,10 @@ _.extend(Roles, {
   getUsersInRole: function (roles, options, queryOptions) {
     var query;
 
+    options = options || {};
+
     // ensure array to simplify code
-    if (!_.isArray(roles)) {
-      roles = [roles];
-    }
+    if (!_.isArray(roles)) roles = [roles];
 
     if (_.isString(options)) {
       options = {partition: options};
@@ -470,17 +474,25 @@ _.extend(Roles, {
    * @return {Array} Array of user's partitions, unsorted.
    */
   getPartitionsForUser: function (user, roles) {
+    var partitions;
+
     // ensure array to simplify code
-    if (!_.isArray(roles)) {
-      roles = [roles];
-    }
+    if (roles && !_.isArray(roles)) roles = [roles];
 
     user = Roles._resolveUser(user);
 
     if (!user) return [];
 
-    // != used on purpose.
-    return _.uniq(_.filter(_.pluck(user.roles || [], 'partition'), function (partition) {return partition != null}));
+    partitions = [];
+    _.each(user.roles || [], function (userRole) {
+      // == used on purpose.
+      if (userRole.partition == null) return;
+      if (roles && !_.contains(roles, userRole.role)) return;
+
+      partitions.push(userRole.partition);
+    });
+
+    return _.uniq(partitions);
   },
 
   _resolveUser: function (user) {

From 68ae8b3985ceda4331b0e6c202550c9e2c4edaf1 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 17 Dec 2015 16:41:26 +0100
Subject: [PATCH 0168/1140] Preparation for adding and removing of rules.

---
 roles/roles_common.js | 210 ++++++++++++++++++++----------------------
 1 file changed, 102 insertions(+), 108 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 126ab6ce1f..0db84b3cc9 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -7,7 +7,7 @@
  * schema:
  *  - role (role name)
  *  - partition (partition name)
- *  - assigned (boolean, if the rule was manually assigned, or was automatically inferred (like subroles))
+ *  - assigned (boolean, if the role was manually assigned, or was automatically inferred (like subroles))
  *
  * @module Roles
  */
@@ -111,36 +111,43 @@ _.extend(Roles, {
   },
 
   /**
-   * Add users to roles. Will create roles as needed.
-   *
-   * Makes 2 calls to database:
-   *  1. retrieve list of all existing roles
-   *  2. update users' roles
+   * Add users to roles.
    *
    * @example
    *     Roles.addUsersToRoles(userId, 'admin')
    *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
    *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
    *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-   *     Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)
+   *
+   * Options:
+   *   - partition: name of the partition
    *
    * @method addUsersToRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field
-   * @param {Array|String} roles Name(s) of roles/permissions to add users to
-   * @param {String} [group] Optional group name. If supplied, roles will be
-   *                         specific to that group.  
-   *                         Group names can not start with a '$' or contain
-   *                         null characters.  Periods in names '.' are
-   *                         automatically converted to underscores.
-   *                         The special group Roles.GLOBAL_GROUP provides 
-   *                         a convenient way to assign blanket roles/permissions
-   *                         across all groups.  The roles/permissions in the 
-   *                         Roles.GLOBAL_GROUP group will be automatically 
-   *                         included in checks for any group.
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles/permissions to add users to.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
    */
-  addUsersToRoles: function (users, roles, group) {
-    // use Template pattern to update user roles
-    Roles._updateUserRoles(users, roles, group, Roles._update_$addToSet_fn)
+  addUsersToRoles: function (users, roles, options) {
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    _.each(users, function (user) {
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role, options);
+      });
+    });
   },
 
   /**
@@ -151,106 +158,93 @@ _.extend(Roles, {
    *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
    *     Roles.setUserRoles([user1, user2], ['user','editor'])
    *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-   *     Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)
    *
    * @method setUserRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field
-   * @param {Array|String} roles Name(s) of roles/permissions to add users to
-   * @param {String} [group] Optional group name. If supplied, roles will be
-   *                         specific to that group.  
-   *                         Group names can not start with '$'.
-   *                         Periods in names '.' are automatically converted
-   *                         to underscores.
-   *                         The special group Roles.GLOBAL_GROUP provides 
-   *                         a convenient way to assign blanket roles/permissions
-   *                         across all groups.  The roles/permissions in the 
-   *                         Roles.GLOBAL_GROUP group will be automatically 
-   *                         included in checks for any group.
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles/permissions to add users to.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
    */
-  setUserRoles: function (users, roles, group) {
-    // use Template pattern to update user roles
-    Roles._updateUserRoles(users, roles, group, Roles._update_$set_fn)
-  },
+  setUserRoles: function (users, roles, options) {
+    var id;
 
-  /**
-   * Remove users from roles
-   *
-   * @example
-   *     Roles.removeUsersFromRoles(users.bob, 'admin')
-   *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])
-   *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])
-   *     Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
-   *
-   * @method removeUsersFromRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field
-   * @param {Array|String} roles Name(s) of roles to add users to
-   * @param {String} [group] Optional. Group name. If supplied, only that
-   *                         group will have roles removed.
-   */
-  removeUsersFromRoles: function (users, roles, group) {
-    var update
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
 
-    if (!users) throw new Error ("Missing 'users' param")
-    if (!roles) throw new Error ("Missing 'roles' param")
-    if (group) {
-      if ('string' !== typeof group)
-        throw new Error ("Roles error: Invalid parameter 'group'. Expected 'string' type")
-      if ('$' === group[0])
-        throw new Error ("Roles error: groups can not start with '$'")
-
-      // convert any periods to underscores
-      group = group.replace(/\./g, '_')
-    }
+    options = options || {};
 
     // ensure arrays
-    if (!_.isArray(users)) users = [users]
-    if (!_.isArray(roles)) roles = [roles]
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
 
-    // ensure users is an array of user ids
-    users = _.reduce(users, function (memo, user) {
-      var _id
-      if ('string' === typeof user) {
-        memo.push(user)
-      } else if ('object' === typeof user) {
-        _id = user._id
-        if ('string' === typeof _id) {
-          memo.push(_id)
-        }
-      }
-      return memo
-    }, [])
-
-    // update all users, remove from roles set
-    
-    if (group) {
-      update = {$pullAll: {}}
-      update.$pullAll['roles.'+group] = roles
-    } else {
-      update = {$pullAll: {roles: roles}}
+    if (_.isString(options)) {
+      options = {partition: options};
     }
 
-    try {
-      if (Meteor.isClient) {
-        // Iterate over each user to fulfill Meteor's 'one update per ID' policy
-        _.each(users, function (user) {
-          Meteor.users.update({_id:user}, update)
-        })
-      } else {
-        // On the server we can leverage MongoDB's $in operator for performance
-        Meteor.users.update({_id:{$in:users}}, update, {multi: true})
-      }
-    }
-    catch (ex) {
-      if (ex.name === 'MongoError' && isMongoMixError(ex.err)) {
-        throw new Error (mixingGroupAndNonGroupErrorMsg)
-      }
+    options.partition = options.partition || null;
+
+    _.each(users, function (user) {
+      if (_.isObject(user)) {
+        id = user._id;
+      }
+      else {
+        id = user;
+      }
+      // we first clear all roles for the user
+      Meteor.users.update(id, {$set: {roles: []}});
+
+      // and then add all
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role, options);
+      });
+    });
+  },
+
+  _addUserToRole: function (user, role, options) {
 
-      throw ex
-    }
   },
 
   /**
-   * Check if user has specified permissions/roles
+   * Remove users from roles.
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(userId, 'admin')
+   *     Roles.removeUsersFromRoles([userId, user2], ['editor'])
+   *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles to add users to.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   */
+  removeUsersFromRoles: function (users, roles, options) {
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    _.each(users, function (user) {
+      _.each(roles, function (role) {
+        Roles._removeUserFromRole(user, role, options);
+      });
+    });
+  },
+
+  _removeUserFromRole: function (user, role, options) {
+
+  },
+
+  /**
+   * Check if user has specified permissions/roles.
    *
    * @example
    *     // global roles

From 8fb589e17e31745592074f6c6996c3899baab9ee Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 05:06:07 +0100
Subject: [PATCH 0169/1140] Adding users to a role.

---
 roles/roles_common.js | 89 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 81 insertions(+), 8 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 0db84b3cc9..91980e1a82 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -18,11 +18,9 @@
  *  - name (of the role)
  *  - children (roles), list of documents:
  *    - _id
- *  - descendants (roles), list of documents (recursively flattened children):
- *    - _id
  *    - name
  *
- * List elements are documents so that they can easier be extended in the future.
+ * Children list elements are subdocuments so that they can easier be extended in the future.
  *
  * Example: { _id: "123", name: "admin" }
  */
@@ -48,6 +46,11 @@ var getGroupsForUserDeprecationWarning = false;
 
 _.extend(Roles, {
 
+  /*
+   * Deprecated. Not used anymore.
+   */
+  GLOBAL_GROUP: null,
+
   /**
    * Create a new role.
    *
@@ -65,7 +68,7 @@ _.extend(Roles, {
     options = options || {};
 
     if (!role || !_.isString(role) || role.trim() !== role) {
-      throw new Error("Invalid role name.");
+      throw new Error("Invalid role name '" + role + "'.");
     }
 
     options = _.defaults(options, {
@@ -73,7 +76,7 @@ _.extend(Roles, {
     });
 
     try {
-      return Meteor.roles.insert({name: role, children: [], descendants: []});
+      return Meteor.roles.insert({name: role, children: []});
     } catch (e) {
       // (from Meteor accounts-base package, insertUserDoc func)
       // XXX string parsing sucks, maybe
@@ -83,7 +86,7 @@ _.extend(Roles, {
       if (!match) throw e;
       if (match[1].indexOf('$name') !== -1) {
         if (options.unlessExists) return null;
-        throw new Error("Role already exists.");
+        throw new Error("Role '" + role + "' already exists.");
       }
       throw e;
     }
@@ -104,7 +107,7 @@ _.extend(Roles, {
                               {fields: {_id: 1}});
 
     if (foundExistingUser) {
-      throw new Error("Role in use.");
+      throw new Error("Role '" + role + "' in use.");
     }
 
     Meteor.roles.remove({name: role});
@@ -143,6 +146,10 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    options = _.defaults(options, {
+      _assigned: true
+    });
+
     _.each(users, function (user) {
       _.each(roles, function (role) {
         Roles._addUserToRole(user, role, options);
@@ -182,6 +189,10 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    options = _.defaults(options, {
+      _assigned: true
+    });
+
     _.each(users, function (user) {
       if (_.isObject(user)) {
         id = user._id;
@@ -199,8 +210,70 @@ _.extend(Roles, {
     });
   },
 
-  _addUserToRole: function (user, role, options) {
+  _addUserToRole: function (user, roleName, options) {
+    var id,
+        role,
+        count;
 
+    if (_.isObject(user)) {
+      id = user._id;
+    }
+    else {
+      id = user;
+    }
+
+    if (!id) return;
+
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    if (!role) {
+      throw new Error("Role '" + roleName + "' does not exist.");
+    }
+
+    // add new role if it is not already added
+    count = Meteor.users.update({
+      _id: id,
+      roles: {
+        $not: {
+          $elemMatch: {
+            role: roleName,
+            partition: options.partition
+          }
+        }
+      }
+
+    }, {
+      $addToSet: {
+        roles: {
+          role: roleName,
+          partition: options.partition,
+          assigned: options._assigned
+        }
+      }
+    });
+
+    if (options._assigned && !count) {
+      // a role has not been added, it maybe already exists,
+      // let's make sure it is set as assigned
+      Meteor.users.update({
+        _id: id,
+        roles: {
+          $elemMatch: {
+            role: roleName,
+            partition: options.partition
+          }
+        }
+
+      }, {
+        $set: {
+          'roles.$.assigned': true
+        }
+      });
+    }
+
+    _.each(role.children, function (child) {
+      Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: false}));
+    });
   },
 
   /**

From 5ea000988559c2d530f22b0d07ff053acf26bf5b Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 05:12:46 +0100
Subject: [PATCH 0170/1140] Removing users from a role.

---
 roles/roles_common.js | 45 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 91980e1a82..7db4857a47 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -305,6 +305,10 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    options = _.defaults(options, {
+      _onlyAssigned: true
+    });
+
     _.each(users, function (user) {
       _.each(roles, function (role) {
         Roles._removeUserFromRole(user, role, options);
@@ -312,8 +316,47 @@ _.extend(Roles, {
     });
   },
 
-  _removeUserFromRole: function (user, role, options) {
+  _removeUserFromRole: function (user, roleName, options) {
+    var id,
+        role,
+        update;
 
+    if (_.isObject(user)) {
+      id = user._id;
+    }
+    else {
+      id = user;
+    }
+
+    if (!id) return;
+
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    if (!role) {
+      throw new Error("Role '" + roleName + "' does not exist.");
+    }
+
+    update = {
+      $pull: {
+        roles: {
+          $elemMatch: {
+            role: roleName,
+            partition: options.partition
+          }
+        }
+      }
+    };
+
+    if (options._onlyAssigned) {
+      update.$pull.roles.$elemMatch.assigned = true;
+    }
+
+    Meteor.users.update(id, update);
+
+    _.each(role.children, function (child) {
+      // if a child role has been assigned explicitly, we do not remove it
+      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_onlyAssigned: true}));
+    });
   },
 
   /**

From e7d026aa3adb8b0f4c80172460b9ba169bfce2f1 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 05:26:50 +0100
Subject: [PATCH 0171/1140] Style.

---
 roles/tests/client.js |   68 +--
 roles/tests/server.js | 1040 ++++++++++++++++++++---------------------
 2 files changed, 554 insertions(+), 554 deletions(-)

diff --git a/roles/tests/client.js b/roles/tests/client.js
index bfdeed8514..66e82f1a87 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -3,7 +3,7 @@
   "use strict";
 
   var users,
-      roles = ['admin','editor','user']
+      roles = ['admin','editor','user'];
 
   users = {
     'eve': {
@@ -24,37 +24,37 @@
         'group1': ['editor']
       }
     }
-  }
+  };
 
   function testUser (test, username, expectedRoles, group) {
-    var user = users[username]
+    var user = users[username];
 
     // test using user object rather than userId to avoid mocking
     _.each(roles, function (role) {
       var expected = _.contains(expectedRoles, role),
           msg = username + ' expected to have \'' + role + '\' permission but does not',
-          nmsg = username + ' had un-expected permission ' + role
+          nmsg = username + ' had un-expected permission ' + role;
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(user, role, group), msg)
+        test.isTrue(Roles.userIsInRole(user, role, group), msg);
       } else {
-        test.isFalse(Roles.userIsInRole(user, role, group), nmsg)
+        test.isFalse(Roles.userIsInRole(user, role, group), nmsg);
       }
-    })
+    });
   }
 
 
   // Mock Meteor.user() for isInRole handlebars helper testing
   Meteor.user = function () {
-    return users.eve
-  }
+    return users.eve;
+  };
 
   Tinytest.add(
     'roles - can check current users roles via template helper', 
     function (test) {
       var isInRole,
           expected,
-          actual
+          actual;
 
       if (!Roles._handlebarsHelpers) {
         // probably running package tests outside of a Meteor app.
@@ -62,48 +62,48 @@
         return
       }
 
-      isInRole = Roles._handlebarsHelpers.isInRole
-      test.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
+      isInRole = Roles._handlebarsHelpers.isInRole;
+      test.equal(typeof isInRole, 'function', "'isInRole' helper not registered");
 
-      expected = true
-      actual = isInRole('admin, editor')
-      test.equal(actual, expected)
+      expected = true;
+      actual = isInRole('admin, editor');
+      test.equal(actual, expected);
       
-      expected = true
-      actual = isInRole('admin')
-      test.equal(actual, expected)
+      expected = true;
+      actual = isInRole('admin');
+      test.equal(actual, expected);
 
-      expected = false
-      actual = isInRole('unknown')
-      test.equal(actual, expected)
-    })
+      expected = false;
+      actual = isInRole('unknown');
+      test.equal(actual, expected);
+    });
 
   Tinytest.add(
     'roles - can check if user is in role', 
     function (test) {
-      testUser(test, 'eve', ['admin', 'editor'])
-    })
+      testUser(test, 'eve', ['admin', 'editor']);
+    });
 
   Tinytest.add(
     'roles - can check if user is in role by group', 
     function (test) {
-      testUser(test, 'bob', ['user'], 'group1')
-      testUser(test, 'bob', ['editor'], 'group2')
-    })
+      testUser(test, 'bob', ['user'], 'group1');
+      testUser(test, 'bob', ['editor'], 'group2');
+    });
 
   Tinytest.add(
     'roles - can check if user is in role with Roles.GLOBAL_GROUP', 
     function (test) {
-      testUser(test, 'joe', ['admin'])
-      testUser(test, 'joe', ['admin'], Roles.GLOBAL_GROUP)
-      testUser(test, 'joe', ['admin', 'editor'], 'group1')
-    })
+      testUser(test, 'joe', ['admin']);
+      testUser(test, 'joe', ['admin'], Roles.GLOBAL_GROUP);
+      testUser(test, 'joe', ['admin', 'editor'], 'group1');
+    });
 
   Tinytest.add(
     'roles - can get all roles for user by group with periods in name', 
     function (test) {
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
-      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
-    })
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us');
+      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin']);
+    });
 
 }());
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 8f18c577b9..a138f74669 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1,37 +1,37 @@
 ;(function () {
 
   var users = {},
-      roles = ['admin','editor','user']
+      roles = ['admin','editor','user'];
 
   // use to run individual tests
   //Tinytest.oadd = Tinytest.add
   //Tinytest.add = function () {}
 
   function addUser (name) {
-    return Accounts.createUser({'username': name})
+    return Accounts.createUser({'username': name});
   }
 
   function reset () {
-    Meteor.roles.remove({})
-    Meteor.users.remove({})
+    Meteor.roles.remove({});
+    Meteor.users.remove({});
 
     users = {
       'eve': addUser('eve'),
       'bob': addUser('bob'),
       'joe': addUser('joe')
-    }
+    };
   }
 
 
   function testUser (test, username, expectedRoles, group) {
     var userId = users[username],
-        userObj = Meteor.users.findOne({_id: userId})
+        userObj = Meteor.users.findOne({_id: userId});
         
     // check using user ids (makes db calls)
-    _innerTest(test, userId, username, expectedRoles, group)
+    _innerTest(test, userId, username, expectedRoles, group);
 
     // check using passed-in user object
-    _innerTest(test, userObj, username, expectedRoles, group)
+    _innerTest(test, userObj, username, expectedRoles, group);
   }
 
   function _innerTest (test, userParam, username, expectedRoles, group) {
@@ -39,12 +39,12 @@
     _.each(roles, function (role) {
       var expected = _.contains(expectedRoles, role),
           msg = username + ' expected to have \'' + role + '\' permission but does not',
-          nmsg = username + ' had the following un-expected permission: ' + role
+          nmsg = username + ' had the following un-expected permission: ' + role;
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(userParam, role, group), msg)
+        test.isTrue(Roles.userIsInRole(userParam, role, group), msg);
       } else {
-        test.isFalse(Roles.userIsInRole(userParam, role, group), nmsg)
+        test.isFalse(Roles.userIsInRole(userParam, role, group), nmsg);
       }
     })
   }
@@ -53,968 +53,968 @@
   Tinytest.add(
     'roles - can create and delete roles', 
     function (test) {
-      reset()
+      reset();
 
-      Roles.createRole('test1')
-      test.equal(Meteor.roles.findOne().name, 'test1')
+      Roles.createRole('test1');
+      test.equal(Meteor.roles.findOne().name, 'test1');
 
-      Roles.createRole('test2')
-      test.equal(Meteor.roles.findOne({'name':'test2'}).name, 'test2')
+      Roles.createRole('test2');
+      test.equal(Meteor.roles.findOne({'name':'test2'}).name, 'test2');
 
-      test.equal(Meteor.roles.find().count(), 2)
+      test.equal(Meteor.roles.find().count(), 2);
 
-      Roles.deleteRole('test1')
-      test.equal(typeof Meteor.roles.findOne({'name':'test1'}), 'undefined')
+      Roles.deleteRole('test1');
+      test.equal(typeof Meteor.roles.findOne({'name':'test1'}), 'undefined');
 
-      Roles.deleteRole('test2')
-      test.equal(typeof Meteor.roles.findOne(), 'undefined')
-    })
+      Roles.deleteRole('test2');
+      test.equal(typeof Meteor.roles.findOne(), 'undefined');
+    });
 
   Tinytest.add(
     'roles - can\'t create duplicate roles', 
     function (test) {
-      reset()
+      reset();
 
-      Roles.createRole('test1')
-      test.throws(function () {Roles.createRole('test1')})
-    })
+      Roles.createRole('test1');
+      test.throws(function () {Roles.createRole('test1')});
+    });
 
   Tinytest.add(
     'roles - can\'t create role with empty names', 
     function (test) {
-      reset() 
+      reset();
 
-      Roles.createRole('')
-      Roles.createRole(null)
+      Roles.createRole('');
+      Roles.createRole(null);
 
-      test.equal(Meteor.roles.find().count(), 0)
+      test.equal(Meteor.roles.find().count(), 0);
 
-      Roles.createRole(' ')
-      test.equal(Meteor.roles.find().count(), 0)
-    })
+      Roles.createRole(' ');
+      test.equal(Meteor.roles.find().count(), 0);
+    });
 
   Tinytest.add(
     'roles - can check if user is in role', 
     function (test) {
-      reset()
+      reset();
 
       Meteor.users.update(
         {"_id":users.eve}, 
         {$addToSet: { roles: { $each: ['admin', 'user'] } } }
-      )
-      testUser(test, 'eve', ['admin', 'user'])
-    })
+      );
+      testUser(test, 'eve', ['admin', 'user']);
+    });
 
   Tinytest.add(
     'roles - can check if user is in role by group', 
     function (test) {
-      reset()
+      reset();
 
       Meteor.users.update(
         {"_id":users.eve}, 
-        {$addToSet: { 'roles.group1': { $each: ['admin', 'user'] } } })
+        {$addToSet: { 'roles.group1': { $each: ['admin', 'user'] } } });
       Meteor.users.update(
         {"_id":users.eve}, 
-        {$addToSet: { 'roles.group2': { $each: ['editor'] } } })
+        {$addToSet: { 'roles.group2': { $each: ['editor'] } } });
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1')
+      testUser(test, 'eve', ['admin', 'user'], 'group1');
       testUser(test, 'eve', ['editor'], 'group2')
-    })
+    });
 
   Tinytest.add(
     'roles - can check if non-existant user is in role', 
     function (test) {
-      reset()
+      reset();
 
-      test.isFalse(Roles.userIsInRole('1', 'admin'))
-    })
+      test.isFalse(Roles.userIsInRole('1', 'admin'));
+    });
 
   Tinytest.add(
     'roles - can check if null user is in role', 
     function (test) {
-      var user = null
-      reset()
+      var user = null;
+      reset();
       
-      test.isFalse(Roles.userIsInRole(user, 'admin'))
-    })
+      test.isFalse(Roles.userIsInRole(user, 'admin'));
+    });
 
   Tinytest.add(
     'roles - can check user against several roles at once', 
     function (test) {
-      var user 
-      reset()
+      var user;
+      reset();
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-      user = Meteor.users.findOne({_id:users.eve})
+      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
+      user = Meteor.users.findOne({_id:users.eve});
 
-      test.isTrue(Roles.userIsInRole(user, ['editor','admin']))
-    })
+      test.isTrue(Roles.userIsInRole(user, ['editor','admin']));
+    });
 
   Tinytest.add(
     'roles - can\'t add non-existent user to role', 
     function (test) {
-      reset()
+      reset();
 
-      Roles.addUsersToRoles(['1'], ['admin'])
-      test.equal(Meteor.users.findOne({_id:'1'}), undefined)
-    })
+      Roles.addUsersToRoles(['1'], ['admin']);
+      test.equal(Meteor.users.findOne({_id:'1'}), undefined);
+    });
 
   Tinytest.add(
     'roles - can add individual users to roles', 
     function (test) {
-      reset() 
+      reset();
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
+      testUser(test, 'eve', ['admin', 'user']);
+      testUser(test, 'bob', []);
+      testUser(test, 'joe', []);
 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'])
+      Roles.addUsersToRoles(users.joe, ['editor', 'user']);
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', ['editor', 'user'])
-    })
+      testUser(test, 'eve', ['admin', 'user']);
+      testUser(test, 'bob', []);
+      testUser(test, 'joe', ['editor', 'user']);
+    });
 
   Tinytest.add(
     'roles - can add individual users to roles by group', 
     function (test) {
-      reset() 
+      reset();
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1')
-      testUser(test, 'bob', [], 'group1')
-      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', ['admin', 'user'], 'group1');
+      testUser(test, 'bob', [], 'group1');
+      testUser(test, 'joe', [], 'group1');
 
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', [], 'group2')
-      testUser(test, 'joe', [], 'group2')
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', [], 'group2');
+      testUser(test, 'joe', [], 'group2');
 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1')
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group2')
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1');
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1')
-      testUser(test, 'bob', [], 'group1')
-      testUser(test, 'joe', ['editor', 'user'], 'group1')
+      testUser(test, 'eve', ['admin', 'user'], 'group1');
+      testUser(test, 'bob', [], 'group1');
+      testUser(test, 'joe', ['editor', 'user'], 'group1');
 
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', ['editor', 'user'], 'group2')
-      testUser(test, 'joe', [], 'group2')
-    })
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', ['editor', 'user'], 'group2');
+      testUser(test, 'joe', [], 'group2');
+    });
 
   Tinytest.add(
     'roles - can add user to roles via user object', 
     function (test) {
-      reset() 
+      reset();
 
       var eve = Meteor.users.findOne({_id: users.eve}),
-          bob = Meteor.users.findOne({_id: users.bob})
+          bob = Meteor.users.findOne({_id: users.bob});
 
-      Roles.addUsersToRoles(eve, ['admin', 'user'])
+      Roles.addUsersToRoles(eve, ['admin', 'user']);
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
+      testUser(test, 'eve', ['admin', 'user']);
+      testUser(test, 'bob', []);
+      testUser(test, 'joe', []);
 
-      Roles.addUsersToRoles(bob, ['editor'])
+      Roles.addUsersToRoles(bob, ['editor']);
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['editor'])
-      testUser(test, 'joe', [])
-    })
+      testUser(test, 'eve', ['admin', 'user']);
+      testUser(test, 'bob', ['editor']);
+      testUser(test, 'joe', []);
+    });
 
   Tinytest.add(
     'roles - can add user to roles multiple times', 
     function (test) {
-      reset() 
+      reset();
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
+      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
+      testUser(test, 'eve', ['admin', 'user']);
+      testUser(test, 'bob', []);
+      testUser(test, 'joe', []);
 
-      Roles.addUsersToRoles(users.bob, ['admin'])
-      Roles.addUsersToRoles(users.bob, ['editor'])
+      Roles.addUsersToRoles(users.bob, ['admin']);
+      Roles.addUsersToRoles(users.bob, ['editor']);
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'editor'])
-      testUser(test, 'joe', [])
-    })
+      testUser(test, 'eve', ['admin', 'user']);
+      testUser(test, 'bob', ['admin', 'editor']);
+      testUser(test, 'joe', []);
+    });
 
   Tinytest.add(
     'roles - can add user to roles multiple times by group', 
     function (test) {
-      reset() 
+      reset();
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1')
-      testUser(test, 'bob', [], 'group1')
-      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', ['admin', 'user'], 'group1');
+      testUser(test, 'bob', [], 'group1');
+      testUser(test, 'joe', [], 'group1');
 
-      Roles.addUsersToRoles(users.bob, ['admin'], 'group1')
-      Roles.addUsersToRoles(users.bob, ['editor'], 'group1')
+      Roles.addUsersToRoles(users.bob, ['admin'], 'group1');
+      Roles.addUsersToRoles(users.bob, ['editor'], 'group1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1')
-      testUser(test, 'bob', ['admin', 'editor'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-    })
+      testUser(test, 'eve', ['admin', 'user'], 'group1');
+      testUser(test, 'bob', ['admin', 'editor'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+    });
 
   Tinytest.add(
     'roles - can add multiple users to roles', 
     function (test) {
-      reset() 
+      reset();
 
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user']);
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'user'])
-      testUser(test, 'joe', [])
+      testUser(test, 'eve', ['admin', 'user']);
+      testUser(test, 'bob', ['admin', 'user']);
+      testUser(test, 'joe', []);
 
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user']);
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'editor', 'user'])
-      testUser(test, 'joe', ['editor', 'user'])
-    })
+      testUser(test, 'eve', ['admin', 'user']);
+      testUser(test, 'bob', ['admin', 'editor', 'user']);
+      testUser(test, 'joe', ['editor', 'user']);
+    });
 
   Tinytest.add(
     'roles - can add multiple users to roles by group', 
     function (test) {
-      reset() 
+      reset();
 
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'group1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1')
-      testUser(test, 'bob', ['admin', 'user'], 'group1')
-      testUser(test, 'joe', [], 'group1')
+      testUser(test, 'eve', ['admin', 'user'], 'group1');
+      testUser(test, 'bob', ['admin', 'user'], 'group1');
+      testUser(test, 'joe', [], 'group1');
 
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', [], 'group2')
-      testUser(test, 'joe', [], 'group2')
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', [], 'group2');
+      testUser(test, 'joe', [], 'group2');
 
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'group1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'group2')
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'group1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'group2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1')
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'group1')
-      testUser(test, 'joe', ['editor', 'user'], 'group1')
+      testUser(test, 'eve', ['admin', 'user'], 'group1');
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'group1');
+      testUser(test, 'joe', ['editor', 'user'], 'group1');
 
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', ['editor', 'user'], 'group2')
-      testUser(test, 'joe', ['editor', 'user'], 'group2')
-    })
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', ['editor', 'user'], 'group2');
+      testUser(test, 'joe', ['editor', 'user'], 'group2');
+    });
 
   Tinytest.add(
     'roles - can remove individual users from roles', 
     function (test) {
-      reset() 
+      reset();
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-      testUser(test, 'bob', ['editor', 'user'])
-    })
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
+      testUser(test, 'eve', ['editor', 'user']);
+      testUser(test, 'bob', ['editor', 'user']);
+      Roles.removeUsersFromRoles(users.eve, ['user']);
+      testUser(test, 'eve', ['editor']);
+      testUser(test, 'bob', ['editor', 'user']);
+    });
   Tinytest.add(
     'roles - can remove user from roles multiple times',
     function (test) {
-      reset() 
+      reset();
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-      testUser(test, 'bob', ['editor', 'user'])
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
+      testUser(test, 'eve', ['editor', 'user']);
+      testUser(test, 'bob', ['editor', 'user']);
+      Roles.removeUsersFromRoles(users.eve, ['user']);
+      testUser(test, 'eve', ['editor']);
+      testUser(test, 'bob', ['editor', 'user']);
 
       // try remove again
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-    })
+      Roles.removeUsersFromRoles(users.eve, ['user']);
+      testUser(test, 'eve', ['editor']);
+    });
 
   Tinytest.add(
     'roles - can remove users from roles via user object', 
     function (test) {
-      reset() 
+      reset();
 
       var eve = Meteor.users.findOne({_id: users.eve}),
-          bob = Meteor.users.findOne({_id: users.bob})
+          bob = Meteor.users.findOne({_id: users.bob});
     
       // remove user role - one user
-      Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      Roles.removeUsersFromRoles(eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-      testUser(test, 'bob', ['editor', 'user'])
-    })
+      Roles.addUsersToRoles([eve, bob], ['editor', 'user']);
+      testUser(test, 'eve', ['editor', 'user']);
+      testUser(test, 'bob', ['editor', 'user']);
+      Roles.removeUsersFromRoles(eve, ['user']);
+      testUser(test, 'eve', ['editor']);
+      testUser(test, 'bob', ['editor', 'user']);
+    });
 
 
   Tinytest.add(
     'roles - can remove individual users from roles by group', 
     function (test) {
-      reset() 
+      reset();
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'group1')
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group2')
-      testUser(test, 'eve', ['editor', 'user'], 'group1')
-      testUser(test, 'bob', ['editor', 'user'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'joe', ['admin'], 'group2')
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'group1');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group2');
+      testUser(test, 'eve', ['editor', 'user'], 'group1');
+      testUser(test, 'bob', ['editor', 'user'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'joe', ['admin'], 'group2');
 
-      Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
-      testUser(test, 'eve', ['editor'], 'group1')
-      testUser(test, 'bob', ['editor', 'user'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'joe', ['admin'], 'group2')
-    })
+      Roles.removeUsersFromRoles(users.eve, ['user'], 'group1');
+      testUser(test, 'eve', ['editor'], 'group1');
+      testUser(test, 'bob', ['editor', 'user'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'joe', ['admin'], 'group2');
+    });
 
   Tinytest.add(
     'roles - can remove multiple users from roles', 
     function (test) {
-      reset() 
+      reset();
 
       // remove user role - two users
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
+      testUser(test, 'eve', ['editor', 'user']);
+      testUser(test, 'bob', ['editor', 'user']);
 
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin'))
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'user', 'editor'])
-      testUser(test, 'joe', ['admin', 'user'])
-      Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
-      testUser(test, 'bob', ['user', 'editor'])
-      testUser(test, 'joe', ['user'])
-    })
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin'));
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user']);
+      testUser(test, 'bob', ['admin', 'user', 'editor']);
+      testUser(test, 'joe', ['admin', 'user']);
+      Roles.removeUsersFromRoles([users.bob, users.joe], ['admin']);
+      testUser(test, 'bob', ['user', 'editor']);
+      testUser(test, 'joe', ['user']);
+    });
 
   Tinytest.add(
     'roles - can remove multiple users from roles by group', 
     function (test) {
-      reset() 
+      reset();
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'group1')
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group2')
-      testUser(test, 'eve', ['editor', 'user'], 'group1')
-      testUser(test, 'bob', ['editor', 'user'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'joe', ['admin'], 'group2')
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'group1');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group2');
+      testUser(test, 'eve', ['editor', 'user'], 'group1');
+      testUser(test, 'bob', ['editor', 'user'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'joe', ['admin'], 'group2');
 
-      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'group1')
-      testUser(test, 'eve', ['editor'], 'group1')
-      testUser(test, 'bob', ['editor'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'joe', ['admin'], 'group2')
+      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'group1');
+      testUser(test, 'eve', ['editor'], 'group1');
+      testUser(test, 'bob', ['editor'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'joe', ['admin'], 'group2');
 
-      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'group2')
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', [], 'group2')
-      testUser(test, 'joe', [], 'group2')
-    })
+      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'group2');
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', [], 'group2');
+      testUser(test, 'joe', [], 'group2');
+    });
 
   Tinytest.add(
     'roles - can set user roles', 
     function (test) {
-      reset() 
+      reset();
 
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
-          joe = Meteor.users.findOne({_id: users.joe})
+          joe = Meteor.users.findOne({_id: users.joe});
     
-      Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      testUser(test, 'joe', [])
+      Roles.setUserRoles([users.eve, bob], ['editor', 'user']);
+      testUser(test, 'eve', ['editor', 'user']);
+      testUser(test, 'bob', ['editor', 'user']);
+      testUser(test, 'joe', []);
 
       // use addUsersToRoles add some roles
-      Roles.addUsersToRoles([bob, users.joe], ['admin'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['admin', 'editor', 'user'])
-      testUser(test, 'joe', ['admin'])
+      Roles.addUsersToRoles([bob, users.joe], ['admin']);
+      testUser(test, 'eve', ['editor', 'user']);
+      testUser(test, 'bob', ['admin', 'editor', 'user']);
+      testUser(test, 'joe', ['admin']);
 
-      Roles.setUserRoles([eve, bob], ['user'])
-      testUser(test, 'eve', ['user'])
-      testUser(test, 'bob', ['user'])
-      testUser(test, 'joe', ['admin'])
+      Roles.setUserRoles([eve, bob], ['user']);
+      testUser(test, 'eve', ['user']);
+      testUser(test, 'bob', ['user']);
+      testUser(test, 'joe', ['admin']);
 
-      Roles.setUserRoles(bob, 'editor')
-      testUser(test, 'eve', ['user'])
-      testUser(test, 'bob', ['editor'])
-      testUser(test, 'joe', ['admin'])
+      Roles.setUserRoles(bob, 'editor');
+      testUser(test, 'eve', ['user']);
+      testUser(test, 'bob', ['editor']);
+      testUser(test, 'joe', ['admin']);
 
-      Roles.setUserRoles([users.joe, users.bob], [])
-      testUser(test, 'eve', ['user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
-    })
+      Roles.setUserRoles([users.joe, users.bob], []);
+      testUser(test, 'eve', ['user']);
+      testUser(test, 'bob', []);
+      testUser(test, 'joe', []);
+    });
 
   Tinytest.add(
     'roles - can set user roles by group', 
     function (test) {
-      reset() 
+      reset();
 
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
-          joe = Meteor.users.findOne({_id: users.joe})
+          joe = Meteor.users.findOne({_id: users.joe});
     
-      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'group1')
-      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'group2')
-      testUser(test, 'eve', ['editor', 'user'], 'group1')
-      testUser(test, 'bob', ['editor', 'user'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'joe', ['admin'], 'group2')
+      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'group1');
+      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'group2');
+      testUser(test, 'eve', ['editor', 'user'], 'group1');
+      testUser(test, 'bob', ['editor', 'user'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'joe', ['admin'], 'group2');
 
       // use addUsersToRoles add some roles
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'group1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'group2')
-      testUser(test, 'eve', ['admin', 'editor', 'user'], 'group1')
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', [], 'group2')
-      testUser(test, 'bob', ['admin','editor'], 'group2')
-      testUser(test, 'joe', ['admin','editor'], 'group2')
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'group1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'group2');
+      testUser(test, 'eve', ['admin', 'editor', 'user'], 'group1');
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', [], 'group2');
+      testUser(test, 'bob', ['admin','editor'], 'group2');
+      testUser(test, 'joe', ['admin','editor'], 'group2');
 
-      Roles.setUserRoles([eve, bob], ['user'], 'group1')
-      Roles.setUserRoles([eve, joe], ['editor'], 'group2')
-      testUser(test, 'eve', ['user'], 'group1')
-      testUser(test, 'bob', ['user'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', ['editor'], 'group2')
-      testUser(test, 'bob', ['admin','editor'], 'group2')
-      testUser(test, 'joe', ['editor'], 'group2')
+      Roles.setUserRoles([eve, bob], ['user'], 'group1');
+      Roles.setUserRoles([eve, joe], ['editor'], 'group2');
+      testUser(test, 'eve', ['user'], 'group1');
+      testUser(test, 'bob', ['user'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', ['editor'], 'group2');
+      testUser(test, 'bob', ['admin','editor'], 'group2');
+      testUser(test, 'joe', ['editor'], 'group2');
 
-      Roles.setUserRoles(bob, 'editor', 'group1')
-      testUser(test, 'eve', ['user'], 'group1')
-      testUser(test, 'bob', ['editor'], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', ['editor'], 'group2')
-      testUser(test, 'bob', ['admin','editor'], 'group2')
-      testUser(test, 'joe', ['editor'], 'group2')
+      Roles.setUserRoles(bob, 'editor', 'group1');
+      testUser(test, 'eve', ['user'], 'group1');
+      testUser(test, 'bob', ['editor'], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', ['editor'], 'group2');
+      testUser(test, 'bob', ['admin','editor'], 'group2');
+      testUser(test, 'joe', ['editor'], 'group2');
 
-      Roles.setUserRoles([bob, users.joe], [], 'group1')
-      testUser(test, 'eve', ['user'], 'group1')
-      testUser(test, 'bob', [], 'group1')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'eve', ['editor'], 'group2')
-      testUser(test, 'bob', ['admin','editor'], 'group2')
-      testUser(test, 'joe', ['editor'], 'group2')
-    })
+      Roles.setUserRoles([bob, users.joe], [], 'group1');
+      testUser(test, 'eve', ['user'], 'group1');
+      testUser(test, 'bob', [], 'group1');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'eve', ['editor'], 'group2');
+      testUser(test, 'bob', ['admin','editor'], 'group2');
+      testUser(test, 'joe', ['editor'], 'group2');
+    });
 
   Tinytest.add(
     'roles - can set user roles by group including GLOBAL_GROUP', 
     function (test) {
-      reset() 
+      reset();
 
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
-          joe = Meteor.users.findOne({_id: users.joe})
+          joe = Meteor.users.findOne({_id: users.joe});
     
-      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_GROUP)
-      testUser(test, 'eve', ['admin'], 'group1')
-      testUser(test, 'eve', ['admin'])
+      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_GROUP);
+      testUser(test, 'eve', ['admin'], 'group1');
+      testUser(test, 'eve', ['admin']);
 
-      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_GROUP)
-      testUser(test, 'eve', ['editor'], 'group2')
-      testUser(test, 'eve', ['editor'])
-    })
+      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_GROUP);
+      testUser(test, 'eve', ['editor'], 'group2');
+      testUser(test, 'eve', ['editor']);
+    });
 
 
   Tinytest.add(
     'roles - can get all roles', 
     function (test) {
-      reset()
+      reset();
       _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
+        Roles.createRole(role);
+      });
 
       // compare roles, sorted alphabetically
       var expected = roles,
-          actual = _.pluck(Roles.getAllRoles().fetch(), 'name')
+          actual = _.pluck(Roles.getAllRoles().fetch(), 'name');
 
       test.equal(actual, expected)
-    })
+    });
 
   Tinytest.add(
     'roles - can\'t get roles for non-existant user', 
     function (test) {
-      reset()
-      test.equal(Roles.getRolesForUser('1'), [])
-      test.equal(Roles.getRolesForUser('1', 'group1'), [])
-    })
+      reset();
+      test.equal(Roles.getRolesForUser('1'), []);
+      test.equal(Roles.getRolesForUser('1', 'group1'), []);
+    });
 
   Tinytest.add(
     'roles - can get all roles for user', 
     function (test) {
-      reset()
+      reset();
 
       var userId = users.eve,
-          userObj
+          userObj;
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId), [])
+      test.equal(Roles.getRolesForUser(userId), []);
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId})
-      test.equal(Roles.getRolesForUser(userObj), [])
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getRolesForUser(userObj), []);
 
 
-      Roles.addUsersToRoles(userId, ['admin', 'user'])
+      Roles.addUsersToRoles(userId, ['admin', 'user']);
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId), ['admin', 'user'])
+      test.equal(Roles.getRolesForUser(userId), ['admin', 'user']);
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId})
-      test.equal(Roles.getRolesForUser(userObj), ['admin', 'user'])
-    })
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getRolesForUser(userObj), ['admin', 'user']);
+    });
 
   Tinytest.add(
     'roles - can get all roles for user by group', 
     function (test) {
-      reset()
+      reset();
 
       var userId = users.eve,
-          userObj
+          userObj;
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), [])
+      test.equal(Roles.getRolesForUser(userId, 'group1'), []);
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId})
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), [])
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), []);
 
 
       // add roles
-      Roles.addUsersToRoles(userId, ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles(userId, ['admin', 'user'], 'group1');
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), ['admin', 'user'])
-      test.equal(Roles.getRolesForUser(userId), [])
+      test.equal(Roles.getRolesForUser(userId, 'group1'), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId), []);
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId})
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['admin', 'user'])
-      test.equal(Roles.getRolesForUser(userObj), [])
-    })
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userObj), []);
+    });
 
   Tinytest.add(
     'roles - can get all roles for user by group with periods in name', 
     function (test) {
-      reset()
+      reset();
 
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us');
 
-      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
-    })
+      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin']);
+    });
 
   Tinytest.add(
     'roles - can get all roles for user by group including Roles.GLOBAL_GROUP', 
     function (test) {
-      reset()
+      reset();
 
       var userId = users.eve,
-          userObj
+          userObj;
 
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP)
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1')
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP);
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1');
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), ['admin', 'user', 'editor'])
-      test.equal(Roles.getRolesForUser(userId), ['editor'])
+      test.equal(Roles.getRolesForUser(userId, 'group1'), ['admin', 'user', 'editor']);
+      test.equal(Roles.getRolesForUser(userId), ['editor']);
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId})
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['admin', 'user', 'editor'])
-      test.equal(Roles.getRolesForUser(userObj), ['editor'])
-    })
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['admin', 'user', 'editor']);
+      test.equal(Roles.getRolesForUser(userObj), ['editor']);
+    });
 
 
   Tinytest.add(
     'roles - getRolesForUser should not return null entries if user has no roles for group', 
     function (test) {
-      reset()
+      reset();
 
       var userId = users.eve,
-          userObj
+          userObj;
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), [])
-      test.equal(Roles.getRolesForUser(userId), [])
+      test.equal(Roles.getRolesForUser(userId, 'group1'), []);
+      test.equal(Roles.getRolesForUser(userId), []);
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId})
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), [])
-      test.equal(Roles.getRolesForUser(userObj), [])
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), []);
+      test.equal(Roles.getRolesForUser(userObj), []);
 
 
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP)
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP);
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), ['editor'])
-      test.equal(Roles.getRolesForUser(userId), ['editor'])
+      test.equal(Roles.getRolesForUser(userId, 'group1'), ['editor']);
+      test.equal(Roles.getRolesForUser(userId), ['editor']);
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId})
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['editor'])
-      test.equal(Roles.getRolesForUser(userObj), ['editor'])
-    })
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['editor']);
+      test.equal(Roles.getRolesForUser(userObj), ['editor']);
+    });
     
   Tinytest.add(
     'roles - can get all groups for user', 
     function (test) {
-      reset()
+      reset();
 
     var userId = users.eve,
-        userObj
+        userObj;
 
-    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group2')
+    Roles.addUsersToRoles([users.eve], ['editor'], 'group1');
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group2');
 
     // by userId
-    test.equal(Roles.getGroupsForUser(userId), ['group1', 'group2'])
+    test.equal(Roles.getGroupsForUser(userId), ['group1', 'group2']);
 
     // by user object
-    userObj = Meteor.users.findOne({_id: userId})
-    test.equal(Roles.getGroupsForUser(userObj), ['group1', 'group2'])
-  })
+    userObj = Meteor.users.findOne({_id: userId});
+    test.equal(Roles.getGroupsForUser(userObj), ['group1', 'group2']);
+  });
   
   Tinytest.add(
     'roles - can get all groups for user by role', 
     function (test) {
-      reset()
+      reset();
 
     var userId = users.eve,
-        userObj
+        userObj;
 
-    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
+    Roles.addUsersToRoles([users.eve], ['editor'], 'group1');
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2');
 
     // by userId
-    test.equal(Roles.getGroupsForUser(userId, 'user'), ['group2'])
-    test.equal(Roles.getGroupsForUser(userId, 'editor'), ['group1', 'group2'])
-    test.equal(Roles.getGroupsForUser(userId, 'admin'), [])
+    test.equal(Roles.getGroupsForUser(userId, 'user'), ['group2']);
+    test.equal(Roles.getGroupsForUser(userId, 'editor'), ['group1', 'group2']);
+    test.equal(Roles.getGroupsForUser(userId, 'admin'), []);
 
     // by user object
-    userObj = Meteor.users.findOne({_id: userId})
-    test.equal(Roles.getGroupsForUser(userObj, 'user'), ['group2'])
-    test.equal(Roles.getGroupsForUser(userObj, 'editor'), ['group1', 'group2'])
-    test.equal(Roles.getGroupsForUser(userObj, 'admin'), [])
-  })
+    userObj = Meteor.users.findOne({_id: userId});
+    test.equal(Roles.getGroupsForUser(userObj, 'user'), ['group2']);
+    test.equal(Roles.getGroupsForUser(userObj, 'editor'), ['group1', 'group2']);
+    test.equal(Roles.getGroupsForUser(userObj, 'admin'), []);
+  });
   
   Tinytest.add(
     'roles - getGroupsForUser returns [] when not using groups', 
     function (test) {
-      reset()
+      reset();
 
     var userId = users.eve,
-        userObj
+        userObj;
 
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'])
+    Roles.addUsersToRoles([users.eve], ['editor', 'user']);
 
     // by userId
-    test.equal(Roles.getGroupsForUser(userId), [])
-    test.equal(Roles.getGroupsForUser(userId, 'editor'), [])
+    test.equal(Roles.getGroupsForUser(userId), []);
+    test.equal(Roles.getGroupsForUser(userId, 'editor'), []);
 
     // by user object
-    userObj = Meteor.users.findOne({_id: userId})
-    test.equal(Roles.getGroupsForUser(userObj), [])
-    test.equal(Roles.getGroupsForUser(userObj, 'editor'), [])
-  })
+    userObj = Meteor.users.findOne({_id: userId});
+    test.equal(Roles.getGroupsForUser(userObj), []);
+    test.equal(Roles.getGroupsForUser(userObj, 'editor'), []);
+  });
   
   
   Tinytest.add(
     'roles - getting all groups for user does not include GLOBAL_GROUP', 
     function (test) {
-      reset()
+      reset();
 
     var userId = users.eve,
-        userObj
+        userObj;
 
-    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_GROUP)
+    Roles.addUsersToRoles([users.eve], ['editor'], 'group1');
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2');
+    Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_GROUP);
 
     // by userId
-    test.equal(Roles.getGroupsForUser(userId, 'user'), ['group2'])
-    test.equal(Roles.getGroupsForUser(userId, 'editor'), ['group1', 'group2'])
-    test.equal(Roles.getGroupsForUser(userId, 'admin'), [])
+    test.equal(Roles.getGroupsForUser(userId, 'user'), ['group2']);
+    test.equal(Roles.getGroupsForUser(userId, 'editor'), ['group1', 'group2']);
+    test.equal(Roles.getGroupsForUser(userId, 'admin'), []);
 
     // by user object
-    userObj = Meteor.users.findOne({_id: userId})
-    test.equal(Roles.getGroupsForUser(userObj, 'user'), ['group2'])
-    test.equal(Roles.getGroupsForUser(userObj, 'editor'), ['group1', 'group2'])
-    test.equal(Roles.getGroupsForUser(userObj, 'admin'), [])
-  })
+    userObj = Meteor.users.findOne({_id: userId});
+    test.equal(Roles.getGroupsForUser(userObj, 'user'), ['group2']);
+    test.equal(Roles.getGroupsForUser(userObj, 'editor'), ['group1', 'group2']);
+    test.equal(Roles.getGroupsForUser(userObj, 'admin'), []);
+  });
 
 
   Tinytest.add(
     'roles - can get all users in role', 
     function (test) {
-      reset()
+      reset();
       _.each(roles, function (role) {
-        Roles.createRole(role)
-      })
+        Roles.createRole(role);
+      });
 
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user']);
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor']);
 
       var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
+          actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
-    })
+      test.equal(_.difference(actual, expected), []);
+      test.equal(_.difference(expected, actual), []);
+    });
 
   Tinytest.add(
     'roles - can get all users in role by group', 
     function (test) {
-      reset()
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
+      reset();
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2');
 
       var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
+          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
-    })
+      test.equal(_.difference(actual, expected), []);
+      test.equal(_.difference(expected, actual), []);
+    });
   
   Tinytest.add(
     'roles - can get all users in role by group including Roles.GLOBAL_GROUP', 
     function (test) {
-      reset()
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_GROUP)
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
+      reset();
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_GROUP);
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2');
 
       var expected = [users.eve],
-          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id')
+          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
+      test.equal(_.difference(actual, expected), []);
+      test.equal(_.difference(expected, actual), []);
 
-      expected = [users.eve, users.bob, users.joe]
-      actual = _.pluck(Roles.getUsersInRole('admin','group2').fetch(), '_id')
+      expected = [users.eve, users.bob, users.joe];
+      actual = _.pluck(Roles.getUsersInRole('admin','group2').fetch(), '_id');
 
       // order may be different so check difference instead of equality
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
+      test.equal(_.difference(actual, expected), []);
+      test.equal(_.difference(expected, actual), []);
 
 
-      expected = [users.eve]
-      actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id')
+      expected = [users.eve];
+      actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
 
       // order may be different so check difference instead of equality
-      test.equal(_.difference(actual, expected), [])
-      test.equal(_.difference(expected, actual), [])
-    })
+      test.equal(_.difference(actual, expected), []);
+      test.equal(_.difference(expected, actual), []);
+    });
 
   Tinytest.add(
     'roles - can get all users in role by group and passes through mongo query arguments', 
     function (test) {
-      reset()
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2')
+      reset();
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2');
 
       var results = Roles.getUsersInRole('admin','group1', { fields: { username: 0 }, limit: 1 }).fetch();
 
       test.equal(1, results.length);
       test.isTrue(results[0].hasOwnProperty('_id'));
       test.isFalse(results[0].hasOwnProperty('username'));
-    })
+    });
 
 
   Tinytest.add(
     'roles - can use Roles.GLOBAL_GROUP to assign blanket permissions',
     function (test) {
-      reset()
+      reset();
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_GROUP)
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_GROUP);
 
-      testUser(test, 'eve', [], 'group1')
-      testUser(test, 'joe', ['admin'], 'group2')
-      testUser(test, 'joe', ['admin'], 'group1')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'bob', ['admin'], 'group1')
+      testUser(test, 'eve', [], 'group1');
+      testUser(test, 'joe', ['admin'], 'group2');
+      testUser(test, 'joe', ['admin'], 'group1');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'bob', ['admin'], 'group1');
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_GROUP)
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_GROUP);
 
-      testUser(test, 'eve', [], 'group1')
-      testUser(test, 'joe', [], 'group2')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'bob', ['admin'], 'group1')
-    })
+      testUser(test, 'eve', [], 'group1');
+      testUser(test, 'joe', [], 'group2');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'bob', ['admin'], 'group1');
+    });
 
   Tinytest.add(
     'roles - Roles.GLOBAL_GROUP is independent of other groups',
     function (test) {
-      reset()
+      reset();
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group5')
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_GROUP)
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group5');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_GROUP);
 
-      testUser(test, 'eve', [], 'group1')
-      testUser(test, 'joe', ['admin'], 'group5')
-      testUser(test, 'joe', ['admin'], 'group2')
-      testUser(test, 'joe', ['admin'], 'group1')
-      testUser(test, 'bob', ['admin'], 'group5')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'bob', ['admin'], 'group1')
+      testUser(test, 'eve', [], 'group1');
+      testUser(test, 'joe', ['admin'], 'group5');
+      testUser(test, 'joe', ['admin'], 'group2');
+      testUser(test, 'joe', ['admin'], 'group1');
+      testUser(test, 'bob', ['admin'], 'group5');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'bob', ['admin'], 'group1');
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_GROUP)
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_GROUP);
 
-      testUser(test, 'eve', [], 'group1')
-      testUser(test, 'joe', ['admin'], 'group5')
-      testUser(test, 'joe', [], 'group2')
-      testUser(test, 'joe', [], 'group1')
-      testUser(test, 'bob', ['admin'], 'group5')
-      testUser(test, 'bob', ['admin'], 'group2')
-      testUser(test, 'bob', ['admin'], 'group1')
-    })
+      testUser(test, 'eve', [], 'group1');
+      testUser(test, 'joe', ['admin'], 'group5');
+      testUser(test, 'joe', [], 'group2');
+      testUser(test, 'joe', [], 'group1');
+      testUser(test, 'bob', ['admin'], 'group5');
+      testUser(test, 'bob', ['admin'], 'group2');
+      testUser(test, 'bob', ['admin'], 'group1');
+    });
   
   Tinytest.add(
     'roles - Roles.GLOBAL_GROUP also checked when group not specified',
     function (test) {
-      reset()
+      reset();
 
-      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_GROUP)
+      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_GROUP);
 
-      testUser(test, 'joe', ['admin'])
+      testUser(test, 'joe', ['admin']);
 
-      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_GROUP)
+      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_GROUP);
 
-      testUser(test, 'joe', [])
-    })
+      testUser(test, 'joe', []);
+    });
 
   Tinytest.add(
     'roles - mixing group with non-group throws descriptive error', 
     function (test) {
-      var expectedErrorMsg = "Roles error: Can't mix grouped and non-grouped roles for same user"
+      var expectedErrorMsg = "Roles error: Can't mix grouped and non-grouped roles for same user";
 
-      reset() 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1')
+      reset();
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1');
       try {
-        Roles.addUsersToRoles(users.joe, ['admin'])
-        throw new Error("expected exception but didn't get one")
+        Roles.addUsersToRoles(users.joe, ['admin']);
+        throw new Error("expected exception but didn't get one");
       } 
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message);
       }
 
-      reset() 
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'])
+      reset();
+      Roles.addUsersToRoles(users.bob, ['editor', 'user']);
       try {
-        Roles.addUsersToRoles(users.bob, ['admin'], 'group2')
-        throw new Error("expected exception but didn't get one")
+        Roles.addUsersToRoles(users.bob, ['admin'], 'group2');
+        throw new Error("expected exception but didn't get one");
       }
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message);
       }
 
-      reset() 
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1')
+      reset();
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1');
       try {
-        Roles.removeUsersFromRoles(users.bob, ['user'])
-        throw new Error("expected exception but didn't get one")
+        Roles.removeUsersFromRoles(users.bob, ['user']);
+        throw new Error("expected exception but didn't get one");
       }
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message);
       }
 
-      reset() 
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'])
+      reset();
+      Roles.addUsersToRoles(users.bob, ['editor', 'user']);
       try {
-        Roles.setUserRoles(users.bob, ['user'], 'group1')
-        throw new Error("expected exception but didn't get one")
+        Roles.setUserRoles(users.bob, ['user'], 'group1');
+        throw new Error("expected exception but didn't get one");
       }
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message);
       }
 
-      reset() 
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'])
+      reset();
+      Roles.addUsersToRoles(users.bob, ['editor', 'user']);
       try {
-        Roles.removeUsersFromRoles(users.bob, ['user'], 'group1')
+        Roles.removeUsersFromRoles(users.bob, ['user'], 'group1');
       }
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message);
       }
 
-      reset() 
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1')
+      reset();
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1');
       // this is probably not a good idea but shouldn't throw...
-      Roles.setUserRoles(users.bob, ['user'])
-    })
+      Roles.setUserRoles(users.bob, ['user']);
+    });
 
   Tinytest.add(
     "roles - can use '.' in group name",
     function (test) {
-      reset() 
+      reset();
 
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
-      testUser(test, 'joe', ['admin'], 'example.com')
-    })
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.com');
+      testUser(test, 'joe', ['admin'], 'example.com');
+    });
 
   Tinytest.add(
     "roles - can use multiple periods in group name",
     function (test) {
-      reset() 
+      reset();
 
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
-      testUser(test, 'joe', ['admin'], 'example.k12.va.us')
-    })
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us');
+      testUser(test, 'joe', ['admin'], 'example.k12.va.us');
+    });
 
   Tinytest.add(
     'roles - invalid group name throws descriptive error', 
     function (test) {
-      var expectedErrorMsg = "Roles error: groups can not start with '$'"
+      var expectedErrorMsg = "Roles error: groups can not start with '$'";
 
-      reset() 
+      reset();
       try {
-        Roles.addUsersToRoles(users.joe, ['admin'], '$group1')
-        throw new Error("expected exception but didn't get one")
+        Roles.addUsersToRoles(users.joe, ['admin'], '$group1');
+        throw new Error("expected exception but didn't get one");
       } 
       catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message)
+        test.isTrue(ex.message == expectedErrorMsg, ex.message);
       }
 
-      reset() 
+      reset();
       // should not throw error
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'g$roup1')
-    })
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'g$roup1');
+    });
 
   function printException (ex) {
-    var tmp = {}
+    var tmp = {};
     for (var key in ex) {
       if (key != 'stack') {
-        tmp[key] = ex[key]
+        tmp[key] = ex[key];
       }
     }
     console.log(JSON.stringify(tmp));

From b7c93ab0ee65e0d08f2aea41ba5e9561f3ba990f Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 05:39:49 +0100
Subject: [PATCH 0172/1140] Try to remove roles always.

---
 roles/roles_common.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 7db4857a47..418d3bc51c 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -127,7 +127,7 @@ _.extend(Roles, {
    *
    * @method addUsersToRoles
    * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles/permissions to add users to.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
    */
   addUsersToRoles: function (users, roles, options) {
@@ -158,7 +158,7 @@ _.extend(Roles, {
   },
 
   /**
-   * Set a users roles/permissions.
+   * Set users' roles.
    *
    * @example
    *     Roles.setUserRoles(userId, 'admin')
@@ -168,7 +168,7 @@ _.extend(Roles, {
    *
    * @method setUserRoles
    * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles/permissions to add users to.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
    */
   setUserRoles: function (users, roles, options) {
@@ -286,7 +286,7 @@ _.extend(Roles, {
    *
    * @method removeUsersFromRoles
    * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles to add users to.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles do not have to exist.
    * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
    */
   removeUsersFromRoles: function (users, roles, options) {
@@ -330,12 +330,6 @@ _.extend(Roles, {
 
     if (!id) return;
 
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
-
-    if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.");
-    }
-
     update = {
       $pull: {
         roles: {
@@ -351,8 +345,14 @@ _.extend(Roles, {
       update.$pull.roles.$elemMatch.assigned = true;
     }
 
+    // we try to remove the role in every case, whether the role really exists or not
     Meteor.users.update(id, update);
 
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    // role does not exist, we do not anything more
+    if (!role) return;
+
     _.each(role.children, function (child) {
       // if a child role has been assigned explicitly, we do not remove it
       Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_onlyAssigned: true}));
@@ -360,7 +360,7 @@ _.extend(Roles, {
   },
 
   /**
-   * Check if user has specified permissions/roles.
+   * Check if user has specified roles.
    *
    * @example
    *     // global roles
@@ -380,8 +380,9 @@ _.extend(Roles, {
    * @method userIsInRole
    * @param {String|Object} user User Id or actual user object.
    * @param {String|Array} roles Name of role/permission or Array of
-   *                             roles/permissions to check against. If array,
+   *                             roles to check against. If array,
    *                             will return true if user is in _any_ role.
+   *                             Roles do not have to exist.
    * @param {String|Object} [options] Optional. Name of partition. If supplied, limits check
    *                                  to just that partition.
    *                                  The user's global roles will always be checked
@@ -519,6 +520,7 @@ _.extend(Roles, {
    * @param {Array|String} roles Name of role/permission. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
    * @param {String|Object} [options] Optional. Name of partition to restrict roles to.
    *                                  User's global roles will also be checked.
    *                                  Alternatively, options.

From 3c7d3554153ec789d79dc4bd0887ad95847d5e77 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 05:44:01 +0100
Subject: [PATCH 0173/1140] Be more strict about role names everywhere.

---
 roles/roles_common.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 418d3bc51c..ef60c672c4 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -67,9 +67,7 @@ _.extend(Roles, {
 
     options = options || {};
 
-    if (!role || !_.isString(role) || role.trim() !== role) {
-      throw new Error("Invalid role name '" + role + "'.");
-    }
+    Roles._checkRoleName(role);
 
     options = _.defaults(options, {
       unlessExists: false
@@ -100,7 +98,7 @@ _.extend(Roles, {
    * @param {String} role Name of role
    */
   deleteRole: function (role) {
-    if (!role) return;
+    Roles._checkRoleName(role);
 
     var foundExistingUser = Meteor.users.findOne(
                               {'roles.role': role},
@@ -215,6 +213,8 @@ _.extend(Roles, {
         role,
         count;
 
+    Roles._checkRoleName(roleName);
+
     if (_.isObject(user)) {
       id = user._id;
     }
@@ -321,6 +321,8 @@ _.extend(Roles, {
         role,
         update;
 
+    Roles._checkRoleName(roleName);
+
     if (_.isObject(user)) {
       id = user._id;
     }
@@ -642,6 +644,12 @@ _.extend(Roles, {
     return function (userRole) {
       return !!userRole.assigned;
     };
+  },
+
+  _checkRoleName: function (roleName) {
+    if (!roleName || !_.isString(roleName) || roleName.trim() !== roleName) {
+      throw new Error("Invalid role name '" + roleName + "'.");
+    }
   }
 
 });  // end _.extend(Roles ...)

From 53926208190bb1afc59ad1c9b10eb8e558f0fc9e Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 06:04:42 +0100
Subject: [PATCH 0174/1140] Bugfix. Wrong syntax.

---
 roles/roles_common.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index ef60c672c4..2bcb1b4255 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -335,16 +335,14 @@ _.extend(Roles, {
     update = {
       $pull: {
         roles: {
-          $elemMatch: {
-            role: roleName,
-            partition: options.partition
-          }
+          role: roleName,
+          partition: options.partition
         }
       }
     };
 
     if (options._onlyAssigned) {
-      update.$pull.roles.$elemMatch.assigned = true;
+      update.$pull.roles.assigned = true;
     }
 
     // we try to remove the role in every case, whether the role really exists or not

From 5daafd97595b3c9a57f1c438e24ca7e93ee2a504 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 06:18:39 +0100
Subject: [PATCH 0175/1140] Set roles only per partition.

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 2bcb1b4255..dbb4808c13 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -199,7 +199,7 @@ _.extend(Roles, {
         id = user;
       }
       // we first clear all roles for the user
-      Meteor.users.update(id, {$set: {roles: []}});
+      Meteor.users.update(id, {$pull: {roles: {partition: options.partition}}});
 
       // and then add all
       _.each(roles, function (role) {

From 2adde444f113b093808e10dcfa82ee309752ae9d Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 06:37:46 +0100
Subject: [PATCH 0176/1140] Tests passing.

---
 roles/tests/client.js |  43 ++-
 roles/tests/server.js | 764 ++++++++++++++++++++++--------------------
 2 files changed, 429 insertions(+), 378 deletions(-)

diff --git a/roles/tests/client.js b/roles/tests/client.js
index 66e82f1a87..32b80c612c 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -8,21 +8,39 @@
   users = {
     'eve': {
       _id: 'eve',
-      roles: ['admin', 'editor']
+      roles: [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'editor',
+        partition: null,
+        assigned: true
+      }]
     },
     'bob': {
       _id: 'bob',
-      roles: {
-        'group1': ['user'],
-        'group2': ['editor']
-      }
+      roles: [{
+        role: 'user',
+        partition: 'group1',
+        assigned: true
+      }, {
+        role: 'editor',
+        partition: 'group2',
+        assigned: true
+      }]
     },
     'joe': {
       _id: 'joe',
-      roles: {
-        '__global_roles__': ['admin'],
-        'group1': ['editor']
-      }
+      roles: [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'editor',
+        partition: 'group1',
+        assigned: true
+      }]
     }
   };
 
@@ -99,11 +117,4 @@
       testUser(test, 'joe', ['admin', 'editor'], 'group1');
     });
 
-  Tinytest.add(
-    'roles - can get all roles for user by group with periods in name', 
-    function (test) {
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us');
-      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin']);
-    });
-
 }());
diff --git a/roles/tests/server.js b/roles/tests/server.js
index a138f74669..31637a7871 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -23,28 +23,28 @@
   }
 
 
-  function testUser (test, username, expectedRoles, group) {
+  function testUser (test, username, expectedRoles, partition) {
     var userId = users[username],
         userObj = Meteor.users.findOne({_id: userId});
         
     // check using user ids (makes db calls)
-    _innerTest(test, userId, username, expectedRoles, group);
+    _innerTest(test, userId, username, expectedRoles, partition);
 
     // check using passed-in user object
-    _innerTest(test, userObj, username, expectedRoles, group);
+    _innerTest(test, userObj, username, expectedRoles, partition);
   }
 
-  function _innerTest (test, userParam, username, expectedRoles, group) {
+  function _innerTest (test, userParam, username, expectedRoles, partition) {
     // test that user has only the roles expected and no others
     _.each(roles, function (role) {
       var expected = _.contains(expectedRoles, role),
-          msg = username + ' expected to have \'' + role + '\' permission but does not',
-          nmsg = username + ' had the following un-expected permission: ' + role;
+          msg = username + ' expected to have \'' + role + '\' role but does not',
+          nmsg = username + ' had the following un-expected role: ' + role;
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(userParam, role, group), msg);
+        test.isTrue(Roles.userIsInRole(userParam, role, partition), msg);
       } else {
-        test.isFalse(Roles.userIsInRole(userParam, role, group), nmsg);
+        test.isFalse(Roles.userIsInRole(userParam, role, partition), nmsg);
       }
     })
   }
@@ -84,13 +84,15 @@
     function (test) {
       reset();
 
-      Roles.createRole('');
-      Roles.createRole(null);
-
-      test.equal(Meteor.roles.find().count(), 0);
-
-      Roles.createRole(' ');
-      test.equal(Meteor.roles.find().count(), 0);
+      test.throws(function () {
+        Roles.createRole('');
+      }, /Invalid role name/);
+      test.throws(function () {
+        Roles.createRole(null);
+      }, /Invalid role name/);
+      test.throws(function () {
+        Roles.createRole(' ');
+      }, /Invalid role name/);
     });
 
   Tinytest.add(
@@ -98,27 +100,26 @@
     function (test) {
       reset();
 
-      Meteor.users.update(
-        {"_id":users.eve}, 
-        {$addToSet: { roles: { $each: ['admin', 'user'] } } }
-      );
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
+
       testUser(test, 'eve', ['admin', 'user']);
     });
 
   Tinytest.add(
-    'roles - can check if user is in role by group', 
+    'roles - can check if user is in role by partition', 
     function (test) {
       reset();
 
-      Meteor.users.update(
-        {"_id":users.eve}, 
-        {$addToSet: { 'roles.group1': { $each: ['admin', 'user'] } } });
-      Meteor.users.update(
-        {"_id":users.eve}, 
-        {$addToSet: { 'roles.group2': { $each: ['editor'] } } });
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1');
-      testUser(test, 'eve', ['editor'], 'group2')
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'eve', ['editor'], 'partition2')
     });
 
   Tinytest.add(
@@ -144,9 +145,13 @@
       var user;
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+
       Roles.addUsersToRoles(users.eve, ['admin', 'user']);
       user = Meteor.users.findOne({_id:users.eve});
 
+      // we can check the non-existing role
       test.isTrue(Roles.userIsInRole(user, ['editor','admin']));
     });
 
@@ -155,6 +160,8 @@
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+
       Roles.addUsersToRoles(['1'], ['admin']);
       test.equal(Meteor.users.findOne({_id:'1'}), undefined);
     });
@@ -164,6 +171,10 @@
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       Roles.addUsersToRoles(users.eve, ['admin', 'user']);
 
       testUser(test, 'eve', ['admin', 'user']);
@@ -178,30 +189,34 @@
     });
 
   Tinytest.add(
-    'roles - can add individual users to roles by group', 
+    'roles - can add individual users to roles by partition', 
     function (test) {
       reset();
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1');
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1');
-      testUser(test, 'bob', [], 'group1');
-      testUser(test, 'joe', [], 'group1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
 
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', [], 'group2');
-      testUser(test, 'joe', [], 'group2');
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'bob', [], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1');
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group2');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', [], 'partition2');
+      testUser(test, 'joe', [], 'partition2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1');
-      testUser(test, 'bob', [], 'group1');
-      testUser(test, 'joe', ['editor', 'user'], 'group1');
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'partition2');
 
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', ['editor', 'user'], 'group2');
-      testUser(test, 'joe', [], 'group2');
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'bob', [], 'partition1');
+      testUser(test, 'joe', ['editor', 'user'], 'partition1');
+
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['editor', 'user'], 'partition2');
+      testUser(test, 'joe', [], 'partition2');
     });
 
   Tinytest.add(
@@ -209,6 +224,10 @@
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob});
 
@@ -230,6 +249,10 @@
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       Roles.addUsersToRoles(users.eve, ['admin', 'user']);
       Roles.addUsersToRoles(users.eve, ['admin', 'user']);
 
@@ -246,23 +269,27 @@
     });
 
   Tinytest.add(
-    'roles - can add user to roles multiple times by group', 
+    'roles - can add user to roles multiple times by partition', 
     function (test) {
       reset();
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'group1');
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1');
-      testUser(test, 'bob', [], 'group1');
-      testUser(test, 'joe', [], 'group1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
 
-      Roles.addUsersToRoles(users.bob, ['admin'], 'group1');
-      Roles.addUsersToRoles(users.bob, ['editor'], 'group1');
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'bob', [], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1');
-      testUser(test, 'bob', ['admin', 'editor'], 'group1');
-      testUser(test, 'joe', [], 'group1');
+      Roles.addUsersToRoles(users.bob, ['admin'], 'partition1');
+      Roles.addUsersToRoles(users.bob, ['editor'], 'partition1');
+
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'bob', ['admin', 'editor'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
     });
 
   Tinytest.add(
@@ -270,6 +297,10 @@
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user']);
 
       testUser(test, 'eve', ['admin', 'user']);
@@ -284,30 +315,34 @@
     });
 
   Tinytest.add(
-    'roles - can add multiple users to roles by group', 
+    'roles - can add multiple users to roles by partition', 
     function (test) {
       reset();
 
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'group1');
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1');
-      testUser(test, 'bob', ['admin', 'user'], 'group1');
-      testUser(test, 'joe', [], 'group1');
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'partition1');
 
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', [], 'group2');
-      testUser(test, 'joe', [], 'group2');
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'bob', ['admin', 'user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
 
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'group1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'group2');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', [], 'partition2');
+      testUser(test, 'joe', [], 'partition2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'group1');
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'group1');
-      testUser(test, 'joe', ['editor', 'user'], 'group1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'partition1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'partition2');
 
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', ['editor', 'user'], 'group2');
-      testUser(test, 'joe', ['editor', 'user'], 'group2');
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'partition1');
+      testUser(test, 'joe', ['editor', 'user'], 'partition1');
+
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['editor', 'user'], 'partition2');
+      testUser(test, 'joe', ['editor', 'user'], 'partition2');
     });
 
   Tinytest.add(
@@ -315,6 +350,9 @@
     function (test) {
       reset();
 
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       // remove user role - one user
       Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
       testUser(test, 'eve', ['editor', 'user']);
@@ -328,6 +366,9 @@
     function (test) {
       reset();
 
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       // remove user role - one user
       Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
       testUser(test, 'eve', ['editor', 'user']);
@@ -346,6 +387,9 @@
     function (test) {
       reset();
 
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob});
     
@@ -360,27 +404,31 @@
 
 
   Tinytest.add(
-    'roles - can remove individual users from roles by group', 
+    'roles - can remove individual users from roles by partition', 
     function (test) {
       reset();
 
-      // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'group1');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group2');
-      testUser(test, 'eve', ['editor', 'user'], 'group1');
-      testUser(test, 'bob', ['editor', 'user'], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'joe', ['admin'], 'group2');
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
 
-      Roles.removeUsersFromRoles(users.eve, ['user'], 'group1');
-      testUser(test, 'eve', ['editor'], 'group1');
-      testUser(test, 'bob', ['editor', 'user'], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'joe', ['admin'], 'group2');
+      // remove user role - one user
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'partition1');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'partition2');
+      testUser(test, 'eve', ['editor', 'user'], 'partition1');
+      testUser(test, 'bob', ['editor', 'user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition2');
+
+      Roles.removeUsersFromRoles(users.eve, ['user'], 'partition1');
+      testUser(test, 'eve', ['editor'], 'partition1');
+      testUser(test, 'bob', ['editor', 'user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition2');
     });
 
   Tinytest.add(
@@ -388,6 +436,10 @@
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       // remove user role - two users
       Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
       testUser(test, 'eve', ['editor', 'user']);
@@ -403,32 +455,36 @@
     });
 
   Tinytest.add(
-    'roles - can remove multiple users from roles by group', 
+    'roles - can remove multiple users from roles by partition', 
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'group1');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group2');
-      testUser(test, 'eve', ['editor', 'user'], 'group1');
-      testUser(test, 'bob', ['editor', 'user'], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'joe', ['admin'], 'group2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'partition1');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'partition2');
+      testUser(test, 'eve', ['editor', 'user'], 'partition1');
+      testUser(test, 'bob', ['editor', 'user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition2');
 
-      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'group1');
-      testUser(test, 'eve', ['editor'], 'group1');
-      testUser(test, 'bob', ['editor'], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'joe', ['admin'], 'group2');
+      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'partition1');
+      testUser(test, 'eve', ['editor'], 'partition1');
+      testUser(test, 'bob', ['editor'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition2');
 
-      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'group2');
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', [], 'group2');
-      testUser(test, 'joe', [], 'group2');
+      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'partition2');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', [], 'partition2');
+      testUser(test, 'joe', [], 'partition2');
     });
 
   Tinytest.add(
@@ -436,6 +492,10 @@
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
           joe = Meteor.users.findOne({_id: users.joe});
@@ -468,74 +528,81 @@
     });
 
   Tinytest.add(
-    'roles - can set user roles by group', 
+    'roles - can set user roles by partition', 
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
           joe = Meteor.users.findOne({_id: users.joe});
     
-      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'group1');
-      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'group2');
-      testUser(test, 'eve', ['editor', 'user'], 'group1');
-      testUser(test, 'bob', ['editor', 'user'], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'joe', ['admin'], 'group2');
+      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'partition1');
+      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'partition2');
+      testUser(test, 'eve', ['editor', 'user'], 'partition1');
+      testUser(test, 'bob', ['editor', 'user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition2');
 
       // use addUsersToRoles add some roles
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'group1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'group2');
-      testUser(test, 'eve', ['admin', 'editor', 'user'], 'group1');
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', [], 'group2');
-      testUser(test, 'bob', ['admin','editor'], 'group2');
-      testUser(test, 'joe', ['admin','editor'], 'group2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'partition1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'partition2');
+      testUser(test, 'eve', ['admin', 'editor', 'user'], 'partition1');
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['admin','editor'], 'partition2');
+      testUser(test, 'joe', ['admin','editor'], 'partition2');
 
-      Roles.setUserRoles([eve, bob], ['user'], 'group1');
-      Roles.setUserRoles([eve, joe], ['editor'], 'group2');
-      testUser(test, 'eve', ['user'], 'group1');
-      testUser(test, 'bob', ['user'], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', ['editor'], 'group2');
-      testUser(test, 'bob', ['admin','editor'], 'group2');
-      testUser(test, 'joe', ['editor'], 'group2');
+      Roles.setUserRoles([eve, bob], ['user'], 'partition1');
+      Roles.setUserRoles([eve, joe], ['editor'], 'partition2');
+      testUser(test, 'eve', ['user'], 'partition1');
+      testUser(test, 'bob', ['user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', ['editor'], 'partition2');
+      testUser(test, 'bob', ['admin','editor'], 'partition2');
+      testUser(test, 'joe', ['editor'], 'partition2');
 
-      Roles.setUserRoles(bob, 'editor', 'group1');
-      testUser(test, 'eve', ['user'], 'group1');
-      testUser(test, 'bob', ['editor'], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', ['editor'], 'group2');
-      testUser(test, 'bob', ['admin','editor'], 'group2');
-      testUser(test, 'joe', ['editor'], 'group2');
+      Roles.setUserRoles(bob, 'editor', 'partition1');
+      testUser(test, 'eve', ['user'], 'partition1');
+      testUser(test, 'bob', ['editor'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', ['editor'], 'partition2');
+      testUser(test, 'bob', ['admin','editor'], 'partition2');
+      testUser(test, 'joe', ['editor'], 'partition2');
 
-      Roles.setUserRoles([bob, users.joe], [], 'group1');
-      testUser(test, 'eve', ['user'], 'group1');
-      testUser(test, 'bob', [], 'group1');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'eve', ['editor'], 'group2');
-      testUser(test, 'bob', ['admin','editor'], 'group2');
-      testUser(test, 'joe', ['editor'], 'group2');
+      Roles.setUserRoles([bob, users.joe], [], 'partition1');
+      testUser(test, 'eve', ['user'], 'partition1');
+      testUser(test, 'bob', [], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', ['editor'], 'partition2');
+      testUser(test, 'bob', ['admin','editor'], 'partition2');
+      testUser(test, 'joe', ['editor'], 'partition2');
     });
 
   Tinytest.add(
-    'roles - can set user roles by group including GLOBAL_GROUP', 
+    'roles - can set user roles by partition including GLOBAL_PARTITION', 
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('editor');
+
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
           joe = Meteor.users.findOne({_id: users.joe});
     
-      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_GROUP);
-      testUser(test, 'eve', ['admin'], 'group1');
+      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_PARTITION);
+      testUser(test, 'eve', ['admin'], 'partition1');
       testUser(test, 'eve', ['admin']);
 
-      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_GROUP);
-      testUser(test, 'eve', ['editor'], 'group2');
+      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_PARTITION);
+      testUser(test, 'eve', ['editor'], 'partition2');
       testUser(test, 'eve', ['editor']);
     });
 
@@ -560,7 +627,7 @@
     function (test) {
       reset();
       test.equal(Roles.getRolesForUser('1'), []);
-      test.equal(Roles.getRolesForUser('1', 'group1'), []);
+      test.equal(Roles.getRolesForUser('1', 'partition1'), []);
     });
 
   Tinytest.add(
@@ -568,6 +635,9 @@
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+
       var userId = users.eve,
           userObj;
 
@@ -590,191 +660,218 @@
     });
 
   Tinytest.add(
-    'roles - can get all roles for user by group', 
+    'roles - can get all roles for user by partition', 
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+
       var userId = users.eve,
           userObj;
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), []);
+      test.equal(Roles.getRolesForUser(userId, 'partition1'), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), []);
+      test.equal(Roles.getRolesForUser(userObj, 'partition1'), []);
 
 
       // add roles
-      Roles.addUsersToRoles(userId, ['admin', 'user'], 'group1');
+      Roles.addUsersToRoles(userId, ['admin', 'user'], 'partition1');
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId, 'partition1'), ['admin', 'user']);
       test.equal(Roles.getRolesForUser(userId), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userObj, 'partition1'), ['admin', 'user']);
       test.equal(Roles.getRolesForUser(userObj), []);
     });
 
   Tinytest.add(
-    'roles - can get all roles for user by group with periods in name', 
+    'roles - can get all roles for user by partition with periods in name', 
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+
       Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us');
 
       test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin']);
     });
 
   Tinytest.add(
-    'roles - can get all roles for user by group including Roles.GLOBAL_GROUP', 
+    'roles - can get all roles for user by partition including Roles.GLOBAL_PARTITION', 
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
       var userId = users.eve,
           userObj;
 
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP);
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group1');
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_PARTITION);
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'partition1');
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), ['admin', 'user', 'editor']);
+      test.equal(Roles.getRolesForUser(userId, 'partition1'), ['editor', 'admin', 'user']);
       test.equal(Roles.getRolesForUser(userId), ['editor']);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['admin', 'user', 'editor']);
+      test.equal(Roles.getRolesForUser(userObj, 'partition1'), ['editor', 'admin', 'user']);
       test.equal(Roles.getRolesForUser(userObj), ['editor']);
     });
 
 
   Tinytest.add(
-    'roles - getRolesForUser should not return null entries if user has no roles for group', 
+    'roles - getRolesForUser should not return null entries if user has no roles for partition', 
     function (test) {
       reset();
 
+      Roles.createRole('editor');
+
       var userId = users.eve,
           userObj;
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), []);
+      test.equal(Roles.getRolesForUser(userId, 'partition1'), []);
       test.equal(Roles.getRolesForUser(userId), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), []);
+      test.equal(Roles.getRolesForUser(userObj, 'partition1'), []);
       test.equal(Roles.getRolesForUser(userObj), []);
 
 
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_GROUP);
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_PARTITION);
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'group1'), ['editor']);
+      test.equal(Roles.getRolesForUser(userId, 'partition1'), ['editor']);
       test.equal(Roles.getRolesForUser(userId), ['editor']);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'group1'), ['editor']);
+      test.equal(Roles.getRolesForUser(userObj, 'partition1'), ['editor']);
       test.equal(Roles.getRolesForUser(userObj), ['editor']);
     });
     
   Tinytest.add(
-    'roles - can get all groups for user', 
+    'roles - can get all partitions for user', 
     function (test) {
       reset();
 
-    var userId = users.eve,
-        userObj;
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
 
-    Roles.addUsersToRoles([users.eve], ['editor'], 'group1');
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'group2');
+      var userId = users.eve,
+          userObj;
 
-    // by userId
-    test.equal(Roles.getGroupsForUser(userId), ['group1', 'group2']);
+      Roles.addUsersToRoles([users.eve], ['editor'], 'partition1');
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'partition2');
 
-    // by user object
-    userObj = Meteor.users.findOne({_id: userId});
-    test.equal(Roles.getGroupsForUser(userObj), ['group1', 'group2']);
+      // by userId
+      test.equal(Roles.getPartitionsForUser(userId), ['partition1', 'partition2']);
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getPartitionsForUser(userObj), ['partition1', 'partition2']);
+    });
+  
+  Tinytest.add(
+    'roles - can get all partitions for user by role', 
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
+      var userId = users.eve,
+          userObj;
+
+      Roles.addUsersToRoles([users.eve], ['editor'], 'partition1');
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'partition2');
+
+      // by userId
+      test.equal(Roles.getPartitionsForUser(userId, 'user'), ['partition2']);
+      test.equal(Roles.getPartitionsForUser(userId, 'editor'), ['partition1', 'partition2']);
+      test.equal(Roles.getPartitionsForUser(userId, 'admin'), []);
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getPartitionsForUser(userObj, 'user'), ['partition2']);
+      test.equal(Roles.getPartitionsForUser(userObj, 'editor'), ['partition1', 'partition2']);
+      test.equal(Roles.getPartitionsForUser(userObj, 'admin'), []);
   });
   
   Tinytest.add(
-    'roles - can get all groups for user by role', 
+    'roles - getPartitionsForUser returns [] when not using partitions', 
     function (test) {
       reset();
 
-    var userId = users.eve,
-        userObj;
+      Roles.createRole('user');
+      Roles.createRole('editor');
 
-    Roles.addUsersToRoles([users.eve], ['editor'], 'group1');
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2');
+      var userId = users.eve,
+          userObj;
 
-    // by userId
-    test.equal(Roles.getGroupsForUser(userId, 'user'), ['group2']);
-    test.equal(Roles.getGroupsForUser(userId, 'editor'), ['group1', 'group2']);
-    test.equal(Roles.getGroupsForUser(userId, 'admin'), []);
+      Roles.addUsersToRoles([users.eve], ['editor', 'user']);
 
-    // by user object
-    userObj = Meteor.users.findOne({_id: userId});
-    test.equal(Roles.getGroupsForUser(userObj, 'user'), ['group2']);
-    test.equal(Roles.getGroupsForUser(userObj, 'editor'), ['group1', 'group2']);
-    test.equal(Roles.getGroupsForUser(userObj, 'admin'), []);
-  });
-  
-  Tinytest.add(
-    'roles - getGroupsForUser returns [] when not using groups', 
-    function (test) {
-      reset();
+      // by userId
+      test.equal(Roles.getPartitionsForUser(userId), []);
+      test.equal(Roles.getPartitionsForUser(userId, 'editor'), []);
 
-    var userId = users.eve,
-        userObj;
-
-    Roles.addUsersToRoles([users.eve], ['editor', 'user']);
-
-    // by userId
-    test.equal(Roles.getGroupsForUser(userId), []);
-    test.equal(Roles.getGroupsForUser(userId, 'editor'), []);
-
-    // by user object
-    userObj = Meteor.users.findOne({_id: userId});
-    test.equal(Roles.getGroupsForUser(userObj), []);
-    test.equal(Roles.getGroupsForUser(userObj, 'editor'), []);
-  });
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getPartitionsForUser(userObj), []);
+      test.equal(Roles.getPartitionsForUser(userObj, 'editor'), []);
+    });
   
   
   Tinytest.add(
-    'roles - getting all groups for user does not include GLOBAL_GROUP', 
+    'roles - getting all partitions for user does not include GLOBAL_PARTITION', 
     function (test) {
       reset();
 
-    var userId = users.eve,
-        userObj;
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
 
-    Roles.addUsersToRoles([users.eve], ['editor'], 'group1');
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2');
-    Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_GROUP);
+      var userId = users.eve,
+          userObj;
 
-    // by userId
-    test.equal(Roles.getGroupsForUser(userId, 'user'), ['group2']);
-    test.equal(Roles.getGroupsForUser(userId, 'editor'), ['group1', 'group2']);
-    test.equal(Roles.getGroupsForUser(userId, 'admin'), []);
+      Roles.addUsersToRoles([users.eve], ['editor'], 'partition1');
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'partition2');
+      Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_PARTITION);
 
-    // by user object
-    userObj = Meteor.users.findOne({_id: userId});
-    test.equal(Roles.getGroupsForUser(userObj, 'user'), ['group2']);
-    test.equal(Roles.getGroupsForUser(userObj, 'editor'), ['group1', 'group2']);
-    test.equal(Roles.getGroupsForUser(userObj, 'admin'), []);
-  });
+      // by userId
+      test.equal(Roles.getPartitionsForUser(userId, 'user'), ['partition2']);
+      test.equal(Roles.getPartitionsForUser(userId, 'editor'), ['partition1', 'partition2']);
+      test.equal(Roles.getPartitionsForUser(userId, 'admin'), []);
+
+      // by user object
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getPartitionsForUser(userObj, 'user'), ['partition2']);
+      test.equal(Roles.getPartitionsForUser(userObj, 'editor'), ['partition1', 'partition2']);
+      test.equal(Roles.getPartitionsForUser(userObj, 'admin'), []);
+    });
 
 
   Tinytest.add(
     'roles - can get all users in role', 
     function (test) {
       reset();
-      _.each(roles, function (role) {
-        Roles.createRole(role);
-      });
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
 
       Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user']);
       Roles.addUsersToRoles([users.bob, users.joe], ['editor']);
@@ -789,14 +886,18 @@
     });
 
   Tinytest.add(
-    'roles - can get all users in role by group', 
+    'roles - can get all users in role by partition', 
     function (test) {
       reset();
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2');
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
 
       var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id');
+          actual = _.pluck(Roles.getUsersInRole('admin','partition1').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       // difference uses first array as base so have to check both ways
@@ -805,14 +906,18 @@
     });
   
   Tinytest.add(
-    'roles - can get all users in role by group including Roles.GLOBAL_GROUP', 
+    'roles - can get all users in role by partition including Roles.GLOBAL_PARTITION', 
     function (test) {
       reset();
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_GROUP);
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2');
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_PARTITION);
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
 
       var expected = [users.eve],
-          actual = _.pluck(Roles.getUsersInRole('admin','group1').fetch(), '_id');
+          actual = _.pluck(Roles.getUsersInRole('admin','partition1').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       // difference uses first array as base so have to check both ways
@@ -820,7 +925,7 @@
       test.equal(_.difference(expected, actual), []);
 
       expected = [users.eve, users.bob, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin','group2').fetch(), '_id');
+      actual = _.pluck(Roles.getUsersInRole('admin','partition2').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       test.equal(_.difference(actual, expected), []);
@@ -836,13 +941,17 @@
     });
 
   Tinytest.add(
-    'roles - can get all users in role by group and passes through mongo query arguments', 
+    'roles - can get all users in role by partition and passes through mongo query arguments', 
     function (test) {
       reset();
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'group1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'group2');
 
-      var results = Roles.getUsersInRole('admin','group1', { fields: { username: 0 }, limit: 1 }).fetch();
+      Roles.createRole('admin');
+      Roles.createRole('user');
+
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
+
+      var results = Roles.getUsersInRole('admin','partition1', { fields: { username: 0 }, limit: 1 }).fetch();
 
       test.equal(1, results.length);
       test.isTrue(results[0].hasOwnProperty('_id'));
@@ -851,165 +960,96 @@
 
 
   Tinytest.add(
-    'roles - can use Roles.GLOBAL_GROUP to assign blanket permissions',
+    'roles - can use Roles.GLOBAL_PARTITION to assign blanket roles',
     function (test) {
       reset();
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_GROUP);
+      Roles.createRole('admin');
 
-      testUser(test, 'eve', [], 'group1');
-      testUser(test, 'joe', ['admin'], 'group2');
-      testUser(test, 'joe', ['admin'], 'group1');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'bob', ['admin'], 'group1');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_PARTITION);
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_GROUP);
+      testUser(test, 'eve', [], 'partition1');
+      testUser(test, 'joe', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition1');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition1');
 
-      testUser(test, 'eve', [], 'group1');
-      testUser(test, 'joe', [], 'group2');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'bob', ['admin'], 'group1');
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_PARTITION);
+
+      testUser(test, 'eve', [], 'partition1');
+      testUser(test, 'joe', [], 'partition2');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition1');
     });
 
   Tinytest.add(
-    'roles - Roles.GLOBAL_GROUP is independent of other groups',
+    'roles - Roles.GLOBAL_PARTITION is independent of other partitions',
     function (test) {
       reset();
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'group5');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_GROUP);
+      Roles.createRole('admin');
 
-      testUser(test, 'eve', [], 'group1');
-      testUser(test, 'joe', ['admin'], 'group5');
-      testUser(test, 'joe', ['admin'], 'group2');
-      testUser(test, 'joe', ['admin'], 'group1');
-      testUser(test, 'bob', ['admin'], 'group5');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'bob', ['admin'], 'group1');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'partition5');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_PARTITION);
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_GROUP);
+      testUser(test, 'eve', [], 'partition1');
+      testUser(test, 'joe', ['admin'], 'partition5');
+      testUser(test, 'joe', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition1');
+      testUser(test, 'bob', ['admin'], 'partition5');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition1');
 
-      testUser(test, 'eve', [], 'group1');
-      testUser(test, 'joe', ['admin'], 'group5');
-      testUser(test, 'joe', [], 'group2');
-      testUser(test, 'joe', [], 'group1');
-      testUser(test, 'bob', ['admin'], 'group5');
-      testUser(test, 'bob', ['admin'], 'group2');
-      testUser(test, 'bob', ['admin'], 'group1');
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_PARTITION);
+
+      testUser(test, 'eve', [], 'partition1');
+      testUser(test, 'joe', ['admin'], 'partition5');
+      testUser(test, 'joe', [], 'partition2');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'bob', ['admin'], 'partition5');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition1');
     });
   
   Tinytest.add(
-    'roles - Roles.GLOBAL_GROUP also checked when group not specified',
+    'roles - Roles.GLOBAL_PARTITION also checked when partition not specified',
     function (test) {
       reset();
 
-      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_GROUP);
+      Roles.createRole('admin');
+
+      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_PARTITION);
 
       testUser(test, 'joe', ['admin']);
 
-      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_GROUP);
+      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_PARTITION);
 
       testUser(test, 'joe', []);
     });
 
   Tinytest.add(
-    'roles - mixing group with non-group throws descriptive error', 
-    function (test) {
-      var expectedErrorMsg = "Roles error: Can't mix grouped and non-grouped roles for same user";
-
-      reset();
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'group1');
-      try {
-        Roles.addUsersToRoles(users.joe, ['admin']);
-        throw new Error("expected exception but didn't get one");
-      } 
-      catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message);
-      }
-
-      reset();
-      Roles.addUsersToRoles(users.bob, ['editor', 'user']);
-      try {
-        Roles.addUsersToRoles(users.bob, ['admin'], 'group2');
-        throw new Error("expected exception but didn't get one");
-      }
-      catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message);
-      }
-
-      reset();
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1');
-      try {
-        Roles.removeUsersFromRoles(users.bob, ['user']);
-        throw new Error("expected exception but didn't get one");
-      }
-      catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message);
-      }
-
-      reset();
-      Roles.addUsersToRoles(users.bob, ['editor', 'user']);
-      try {
-        Roles.setUserRoles(users.bob, ['user'], 'group1');
-        throw new Error("expected exception but didn't get one");
-      }
-      catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message);
-      }
-
-      reset();
-      Roles.addUsersToRoles(users.bob, ['editor', 'user']);
-      try {
-        Roles.removeUsersFromRoles(users.bob, ['user'], 'group1');
-      }
-      catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message);
-      }
-
-      reset();
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'group1');
-      // this is probably not a good idea but shouldn't throw...
-      Roles.setUserRoles(users.bob, ['user']);
-    });
-
-  Tinytest.add(
-    "roles - can use '.' in group name",
+    "roles - can use '.' in partition name",
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+
       Roles.addUsersToRoles(users.joe, ['admin'], 'example.com');
       testUser(test, 'joe', ['admin'], 'example.com');
     });
 
   Tinytest.add(
-    "roles - can use multiple periods in group name",
+    "roles - can use multiple periods in partition name",
     function (test) {
       reset();
 
+      Roles.createRole('admin');
+
       Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us');
       testUser(test, 'joe', ['admin'], 'example.k12.va.us');
     });
 
-  Tinytest.add(
-    'roles - invalid group name throws descriptive error', 
-    function (test) {
-      var expectedErrorMsg = "Roles error: groups can not start with '$'";
-
-      reset();
-      try {
-        Roles.addUsersToRoles(users.joe, ['admin'], '$group1');
-        throw new Error("expected exception but didn't get one");
-      } 
-      catch (ex) {
-        test.isTrue(ex.message == expectedErrorMsg, ex.message);
-      }
-
-      reset();
-      // should not throw error
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'g$roup1');
-    });
-
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From e8978ac5987a037ce2dacf2c745e3ee3f637b75d Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 06:40:55 +0100
Subject: [PATCH 0177/1140] Moved edit functions to the server side only.

---
 roles/roles_common.js | 308 ----------------------------------------
 roles/roles_server.js | 320 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 316 insertions(+), 312 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index dbb4808c13..71db063218 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -51,314 +51,6 @@ _.extend(Roles, {
    */
   GLOBAL_GROUP: null,
 
-  /**
-   * Create a new role.
-   *
-   * Options:
-   *   - unlessExists: if true, existence of a role will not throw an exception
-   *
-   * @method createRole
-   * @param {String} role Name of role.
-   * @param {Object} [options] Optional.
-   * @return {String} id of new role
-   */
-  createRole: function (role, options) {
-    var match;
-
-    options = options || {};
-
-    Roles._checkRoleName(role);
-
-    options = _.defaults(options, {
-      unlessExists: false
-    });
-
-    try {
-      return Meteor.roles.insert({name: role, children: []});
-    } catch (e) {
-      // (from Meteor accounts-base package, insertUserDoc func)
-      // XXX string parsing sucks, maybe
-      // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-      if (e.name !== 'MongoError') throw e;
-      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
-      if (!match) throw e;
-      if (match[1].indexOf('$name') !== -1) {
-        if (options.unlessExists) return null;
-        throw new Error("Role '" + role + "' already exists.");
-      }
-      throw e;
-    }
-  },
-
-  /**
-   * Delete an existing role. Will throw "Role in use." error if any users
-   * are currently assigned to the target role.
-   *
-   * @method deleteRole
-   * @param {String} role Name of role
-   */
-  deleteRole: function (role) {
-    Roles._checkRoleName(role);
-
-    var foundExistingUser = Meteor.users.findOne(
-                              {'roles.role': role},
-                              {fields: {_id: 1}});
-
-    if (foundExistingUser) {
-      throw new Error("Role '" + role + "' in use.");
-    }
-
-    Meteor.roles.remove({name: role});
-  },
-
-  /**
-   * Add users to roles.
-   *
-   * @example
-   *     Roles.addUsersToRoles(userId, 'admin')
-   *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
-   *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
-   *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-   *
-   * Options:
-   *   - partition: name of the partition
-   *
-   * @method addUsersToRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
-   */
-  addUsersToRoles: function (users, roles, options) {
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
-
-    options = options || {};
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    options = _.defaults(options, {
-      _assigned: true
-    });
-
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
-        Roles._addUserToRole(user, role, options);
-      });
-    });
-  },
-
-  /**
-   * Set users' roles.
-   *
-   * @example
-   *     Roles.setUserRoles(userId, 'admin')
-   *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
-   *     Roles.setUserRoles([user1, user2], ['user','editor'])
-   *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-   *
-   * @method setUserRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
-   */
-  setUserRoles: function (users, roles, options) {
-    var id;
-
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
-
-    options = options || {};
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    options = _.defaults(options, {
-      _assigned: true
-    });
-
-    _.each(users, function (user) {
-      if (_.isObject(user)) {
-        id = user._id;
-      }
-      else {
-        id = user;
-      }
-      // we first clear all roles for the user
-      Meteor.users.update(id, {$pull: {roles: {partition: options.partition}}});
-
-      // and then add all
-      _.each(roles, function (role) {
-        Roles._addUserToRole(user, role, options);
-      });
-    });
-  },
-
-  _addUserToRole: function (user, roleName, options) {
-    var id,
-        role,
-        count;
-
-    Roles._checkRoleName(roleName);
-
-    if (_.isObject(user)) {
-      id = user._id;
-    }
-    else {
-      id = user;
-    }
-
-    if (!id) return;
-
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
-
-    if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.");
-    }
-
-    // add new role if it is not already added
-    count = Meteor.users.update({
-      _id: id,
-      roles: {
-        $not: {
-          $elemMatch: {
-            role: roleName,
-            partition: options.partition
-          }
-        }
-      }
-
-    }, {
-      $addToSet: {
-        roles: {
-          role: roleName,
-          partition: options.partition,
-          assigned: options._assigned
-        }
-      }
-    });
-
-    if (options._assigned && !count) {
-      // a role has not been added, it maybe already exists,
-      // let's make sure it is set as assigned
-      Meteor.users.update({
-        _id: id,
-        roles: {
-          $elemMatch: {
-            role: roleName,
-            partition: options.partition
-          }
-        }
-
-      }, {
-        $set: {
-          'roles.$.assigned': true
-        }
-      });
-    }
-
-    _.each(role.children, function (child) {
-      Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: false}));
-    });
-  },
-
-  /**
-   * Remove users from roles.
-   *
-   * @example
-   *     Roles.removeUsersFromRoles(userId, 'admin')
-   *     Roles.removeUsersFromRoles([userId, user2], ['editor'])
-   *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
-   *
-   * @method removeUsersFromRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles do not have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
-   */
-  removeUsersFromRoles: function (users, roles, options) {
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
-
-    options = options || {};
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    options = _.defaults(options, {
-      _onlyAssigned: true
-    });
-
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
-        Roles._removeUserFromRole(user, role, options);
-      });
-    });
-  },
-
-  _removeUserFromRole: function (user, roleName, options) {
-    var id,
-        role,
-        update;
-
-    Roles._checkRoleName(roleName);
-
-    if (_.isObject(user)) {
-      id = user._id;
-    }
-    else {
-      id = user;
-    }
-
-    if (!id) return;
-
-    update = {
-      $pull: {
-        roles: {
-          role: roleName,
-          partition: options.partition
-        }
-      }
-    };
-
-    if (options._onlyAssigned) {
-      update.$pull.roles.assigned = true;
-    }
-
-    // we try to remove the role in every case, whether the role really exists or not
-    Meteor.users.update(id, update);
-
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
-
-    // role does not exist, we do not anything more
-    if (!role) return;
-
-    _.each(role.children, function (child) {
-      // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_onlyAssigned: true}));
-    });
-  },
-
   /**
    * Check if user has specified roles.
    *
diff --git a/roles/roles_server.js b/roles/roles_server.js
index ac44b2292f..5d4fa7923d 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -26,10 +26,322 @@ Meteor.publish('_roles', function () {
                            {fields: fields});
 });
 
-Roles._forwardMigrate = function () {
+_.extend(Roles, {
 
-};
+  /**
+   * Create a new role.
+   *
+   * Options:
+   *   - unlessExists: if true, existence of a role will not throw an exception
+   *
+   * @method createRole
+   * @param {String} role Name of role.
+   * @param {Object} [options] Optional.
+   * @return {String} id of new role
+   */
+  createRole: function (role, options) {
+    var match;
 
-Roles._backwardMigrate = function () {
+    options = options || {};
 
-};
+    Roles._checkRoleName(role);
+
+    options = _.defaults(options, {
+      unlessExists: false
+    });
+
+    try {
+      return Meteor.roles.insert({name: role, children: []});
+    } catch (e) {
+      // (from Meteor accounts-base package, insertUserDoc func)
+      // XXX string parsing sucks, maybe
+      // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
+      if (e.name !== 'MongoError') throw e;
+      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
+      if (!match) throw e;
+      if (match[1].indexOf('$name') !== -1) {
+        if (options.unlessExists) return null;
+        throw new Error("Role '" + role + "' already exists.");
+      }
+      throw e;
+    }
+  },
+
+  /**
+   * Delete an existing role. Will throw "Role in use." error if any users
+   * are currently assigned to the target role.
+   *
+   * @method deleteRole
+   * @param {String} role Name of role
+   */
+  deleteRole: function (role) {
+    Roles._checkRoleName(role);
+
+    var foundExistingUser = Meteor.users.findOne(
+                              {'roles.role': role},
+                              {fields: {_id: 1}});
+
+    if (foundExistingUser) {
+      throw new Error("Role '" + role + "' in use.");
+    }
+
+    Meteor.roles.remove({name: role});
+  },
+
+  /**
+   * Add users to roles.
+   *
+   * @example
+   *     Roles.addUsersToRoles(userId, 'admin')
+   *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
+   *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *
+   * Options:
+   *   - partition: name of the partition
+   *
+   * @method addUsersToRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   */
+  addUsersToRoles: function (users, roles, options) {
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      _assigned: true
+    });
+
+    _.each(users, function (user) {
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role, options);
+      });
+    });
+  },
+
+  /**
+   * Set users' roles.
+   *
+   * @example
+   *     Roles.setUserRoles(userId, 'admin')
+   *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.setUserRoles([user1, user2], ['user','editor'])
+   *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *
+   * @method setUserRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   */
+  setUserRoles: function (users, roles, options) {
+    var id;
+
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      _assigned: true
+    });
+
+    _.each(users, function (user) {
+      if (_.isObject(user)) {
+        id = user._id;
+      }
+      else {
+        id = user;
+      }
+      // we first clear all roles for the user
+      Meteor.users.update(id, {$pull: {roles: {partition: options.partition}}});
+
+      // and then add all
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role, options);
+      });
+    });
+  },
+
+  _addUserToRole: function (user, roleName, options) {
+    var id,
+        role,
+        count;
+
+    Roles._checkRoleName(roleName);
+
+    if (_.isObject(user)) {
+      id = user._id;
+    }
+    else {
+      id = user;
+    }
+
+    if (!id) return;
+
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    if (!role) {
+      throw new Error("Role '" + roleName + "' does not exist.");
+    }
+
+    // add new role if it is not already added
+    count = Meteor.users.update({
+      _id: id,
+      roles: {
+        $not: {
+          $elemMatch: {
+            role: roleName,
+            partition: options.partition
+          }
+        }
+      }
+
+    }, {
+      $addToSet: {
+        roles: {
+          role: roleName,
+          partition: options.partition,
+          assigned: options._assigned
+        }
+      }
+    });
+
+    if (options._assigned && !count) {
+      // a role has not been added, it maybe already exists,
+      // let's make sure it is set as assigned
+      Meteor.users.update({
+        _id: id,
+        roles: {
+          $elemMatch: {
+            role: roleName,
+            partition: options.partition
+          }
+        }
+
+      }, {
+        $set: {
+          'roles.$.assigned': true
+        }
+      });
+    }
+
+    _.each(role.children, function (child) {
+      Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: false}));
+    });
+  },
+
+  /**
+   * Remove users from roles.
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(userId, 'admin')
+   *     Roles.removeUsersFromRoles([userId, user2], ['editor'])
+   *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles do not have to exist.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   */
+  removeUsersFromRoles: function (users, roles, options) {
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      _onlyAssigned: true
+    });
+
+    _.each(users, function (user) {
+      _.each(roles, function (role) {
+        Roles._removeUserFromRole(user, role, options);
+      });
+    });
+  },
+
+  _removeUserFromRole: function (user, roleName, options) {
+    var id,
+        role,
+        update;
+
+    Roles._checkRoleName(roleName);
+
+    if (_.isObject(user)) {
+      id = user._id;
+    }
+    else {
+      id = user;
+    }
+
+    if (!id) return;
+
+    update = {
+      $pull: {
+        roles: {
+          role: roleName,
+          partition: options.partition
+        }
+      }
+    };
+
+    if (options._onlyAssigned) {
+      update.$pull.roles.assigned = true;
+    }
+
+    // we try to remove the role in every case, whether the role really exists or not
+    Meteor.users.update(id, update);
+
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    // role does not exist, we do not anything more
+    if (!role) return;
+
+    _.each(role.children, function (child) {
+      // if a child role has been assigned explicitly, we do not remove it
+      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_onlyAssigned: true}));
+    });
+  },
+
+  _forwardMigrate: function () {
+
+  },
+
+  _backwardMigrate: function () {
+
+  }
+
+});  // end _.extend(Roles ...)

From 0709be3d8bebaaadff293b20a0c1a06b60b02470 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 06:47:48 +0100
Subject: [PATCH 0178/1140] Revert "Moved edit functions to the server side
 only."

This reverts commit e8978ac5987a037ce2dacf2c745e3ee3f637b75d.
---
 roles/roles_common.js | 308 ++++++++++++++++++++++++++++++++++++++++
 roles/roles_server.js | 320 +-----------------------------------------
 2 files changed, 312 insertions(+), 316 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 71db063218..dbb4808c13 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -51,6 +51,314 @@ _.extend(Roles, {
    */
   GLOBAL_GROUP: null,
 
+  /**
+   * Create a new role.
+   *
+   * Options:
+   *   - unlessExists: if true, existence of a role will not throw an exception
+   *
+   * @method createRole
+   * @param {String} role Name of role.
+   * @param {Object} [options] Optional.
+   * @return {String} id of new role
+   */
+  createRole: function (role, options) {
+    var match;
+
+    options = options || {};
+
+    Roles._checkRoleName(role);
+
+    options = _.defaults(options, {
+      unlessExists: false
+    });
+
+    try {
+      return Meteor.roles.insert({name: role, children: []});
+    } catch (e) {
+      // (from Meteor accounts-base package, insertUserDoc func)
+      // XXX string parsing sucks, maybe
+      // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
+      if (e.name !== 'MongoError') throw e;
+      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
+      if (!match) throw e;
+      if (match[1].indexOf('$name') !== -1) {
+        if (options.unlessExists) return null;
+        throw new Error("Role '" + role + "' already exists.");
+      }
+      throw e;
+    }
+  },
+
+  /**
+   * Delete an existing role. Will throw "Role in use." error if any users
+   * are currently assigned to the target role.
+   *
+   * @method deleteRole
+   * @param {String} role Name of role
+   */
+  deleteRole: function (role) {
+    Roles._checkRoleName(role);
+
+    var foundExistingUser = Meteor.users.findOne(
+                              {'roles.role': role},
+                              {fields: {_id: 1}});
+
+    if (foundExistingUser) {
+      throw new Error("Role '" + role + "' in use.");
+    }
+
+    Meteor.roles.remove({name: role});
+  },
+
+  /**
+   * Add users to roles.
+   *
+   * @example
+   *     Roles.addUsersToRoles(userId, 'admin')
+   *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
+   *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *
+   * Options:
+   *   - partition: name of the partition
+   *
+   * @method addUsersToRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   */
+  addUsersToRoles: function (users, roles, options) {
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      _assigned: true
+    });
+
+    _.each(users, function (user) {
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role, options);
+      });
+    });
+  },
+
+  /**
+   * Set users' roles.
+   *
+   * @example
+   *     Roles.setUserRoles(userId, 'admin')
+   *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.setUserRoles([user1, user2], ['user','editor'])
+   *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *
+   * @method setUserRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   */
+  setUserRoles: function (users, roles, options) {
+    var id;
+
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      _assigned: true
+    });
+
+    _.each(users, function (user) {
+      if (_.isObject(user)) {
+        id = user._id;
+      }
+      else {
+        id = user;
+      }
+      // we first clear all roles for the user
+      Meteor.users.update(id, {$pull: {roles: {partition: options.partition}}});
+
+      // and then add all
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role, options);
+      });
+    });
+  },
+
+  _addUserToRole: function (user, roleName, options) {
+    var id,
+        role,
+        count;
+
+    Roles._checkRoleName(roleName);
+
+    if (_.isObject(user)) {
+      id = user._id;
+    }
+    else {
+      id = user;
+    }
+
+    if (!id) return;
+
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    if (!role) {
+      throw new Error("Role '" + roleName + "' does not exist.");
+    }
+
+    // add new role if it is not already added
+    count = Meteor.users.update({
+      _id: id,
+      roles: {
+        $not: {
+          $elemMatch: {
+            role: roleName,
+            partition: options.partition
+          }
+        }
+      }
+
+    }, {
+      $addToSet: {
+        roles: {
+          role: roleName,
+          partition: options.partition,
+          assigned: options._assigned
+        }
+      }
+    });
+
+    if (options._assigned && !count) {
+      // a role has not been added, it maybe already exists,
+      // let's make sure it is set as assigned
+      Meteor.users.update({
+        _id: id,
+        roles: {
+          $elemMatch: {
+            role: roleName,
+            partition: options.partition
+          }
+        }
+
+      }, {
+        $set: {
+          'roles.$.assigned': true
+        }
+      });
+    }
+
+    _.each(role.children, function (child) {
+      Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: false}));
+    });
+  },
+
+  /**
+   * Remove users from roles.
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(userId, 'admin')
+   *     Roles.removeUsersFromRoles([userId, user2], ['editor'])
+   *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles do not have to exist.
+   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   */
+  removeUsersFromRoles: function (users, roles, options) {
+    if (!users) throw new Error ("Missing 'users' param.");
+    if (!roles) throw new Error ("Missing 'roles' param.");
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      _onlyAssigned: true
+    });
+
+    _.each(users, function (user) {
+      _.each(roles, function (role) {
+        Roles._removeUserFromRole(user, role, options);
+      });
+    });
+  },
+
+  _removeUserFromRole: function (user, roleName, options) {
+    var id,
+        role,
+        update;
+
+    Roles._checkRoleName(roleName);
+
+    if (_.isObject(user)) {
+      id = user._id;
+    }
+    else {
+      id = user;
+    }
+
+    if (!id) return;
+
+    update = {
+      $pull: {
+        roles: {
+          role: roleName,
+          partition: options.partition
+        }
+      }
+    };
+
+    if (options._onlyAssigned) {
+      update.$pull.roles.assigned = true;
+    }
+
+    // we try to remove the role in every case, whether the role really exists or not
+    Meteor.users.update(id, update);
+
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    // role does not exist, we do not anything more
+    if (!role) return;
+
+    _.each(role.children, function (child) {
+      // if a child role has been assigned explicitly, we do not remove it
+      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_onlyAssigned: true}));
+    });
+  },
+
   /**
    * Check if user has specified roles.
    *
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 5d4fa7923d..ac44b2292f 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -26,322 +26,10 @@ Meteor.publish('_roles', function () {
                            {fields: fields});
 });
 
-_.extend(Roles, {
+Roles._forwardMigrate = function () {
 
-  /**
-   * Create a new role.
-   *
-   * Options:
-   *   - unlessExists: if true, existence of a role will not throw an exception
-   *
-   * @method createRole
-   * @param {String} role Name of role.
-   * @param {Object} [options] Optional.
-   * @return {String} id of new role
-   */
-  createRole: function (role, options) {
-    var match;
+};
 
-    options = options || {};
+Roles._backwardMigrate = function () {
 
-    Roles._checkRoleName(role);
-
-    options = _.defaults(options, {
-      unlessExists: false
-    });
-
-    try {
-      return Meteor.roles.insert({name: role, children: []});
-    } catch (e) {
-      // (from Meteor accounts-base package, insertUserDoc func)
-      // XXX string parsing sucks, maybe
-      // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-      if (e.name !== 'MongoError') throw e;
-      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
-      if (!match) throw e;
-      if (match[1].indexOf('$name') !== -1) {
-        if (options.unlessExists) return null;
-        throw new Error("Role '" + role + "' already exists.");
-      }
-      throw e;
-    }
-  },
-
-  /**
-   * Delete an existing role. Will throw "Role in use." error if any users
-   * are currently assigned to the target role.
-   *
-   * @method deleteRole
-   * @param {String} role Name of role
-   */
-  deleteRole: function (role) {
-    Roles._checkRoleName(role);
-
-    var foundExistingUser = Meteor.users.findOne(
-                              {'roles.role': role},
-                              {fields: {_id: 1}});
-
-    if (foundExistingUser) {
-      throw new Error("Role '" + role + "' in use.");
-    }
-
-    Meteor.roles.remove({name: role});
-  },
-
-  /**
-   * Add users to roles.
-   *
-   * @example
-   *     Roles.addUsersToRoles(userId, 'admin')
-   *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
-   *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
-   *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-   *
-   * Options:
-   *   - partition: name of the partition
-   *
-   * @method addUsersToRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
-   */
-  addUsersToRoles: function (users, roles, options) {
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
-
-    options = options || {};
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    options = _.defaults(options, {
-      _assigned: true
-    });
-
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
-        Roles._addUserToRole(user, role, options);
-      });
-    });
-  },
-
-  /**
-   * Set users' roles.
-   *
-   * @example
-   *     Roles.setUserRoles(userId, 'admin')
-   *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
-   *     Roles.setUserRoles([user1, user2], ['user','editor'])
-   *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-   *
-   * @method setUserRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
-   */
-  setUserRoles: function (users, roles, options) {
-    var id;
-
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
-
-    options = options || {};
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    options = _.defaults(options, {
-      _assigned: true
-    });
-
-    _.each(users, function (user) {
-      if (_.isObject(user)) {
-        id = user._id;
-      }
-      else {
-        id = user;
-      }
-      // we first clear all roles for the user
-      Meteor.users.update(id, {$pull: {roles: {partition: options.partition}}});
-
-      // and then add all
-      _.each(roles, function (role) {
-        Roles._addUserToRole(user, role, options);
-      });
-    });
-  },
-
-  _addUserToRole: function (user, roleName, options) {
-    var id,
-        role,
-        count;
-
-    Roles._checkRoleName(roleName);
-
-    if (_.isObject(user)) {
-      id = user._id;
-    }
-    else {
-      id = user;
-    }
-
-    if (!id) return;
-
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
-
-    if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.");
-    }
-
-    // add new role if it is not already added
-    count = Meteor.users.update({
-      _id: id,
-      roles: {
-        $not: {
-          $elemMatch: {
-            role: roleName,
-            partition: options.partition
-          }
-        }
-      }
-
-    }, {
-      $addToSet: {
-        roles: {
-          role: roleName,
-          partition: options.partition,
-          assigned: options._assigned
-        }
-      }
-    });
-
-    if (options._assigned && !count) {
-      // a role has not been added, it maybe already exists,
-      // let's make sure it is set as assigned
-      Meteor.users.update({
-        _id: id,
-        roles: {
-          $elemMatch: {
-            role: roleName,
-            partition: options.partition
-          }
-        }
-
-      }, {
-        $set: {
-          'roles.$.assigned': true
-        }
-      });
-    }
-
-    _.each(role.children, function (child) {
-      Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: false}));
-    });
-  },
-
-  /**
-   * Remove users from roles.
-   *
-   * @example
-   *     Roles.removeUsersFromRoles(userId, 'admin')
-   *     Roles.removeUsersFromRoles([userId, user2], ['editor'])
-   *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
-   *
-   * @method removeUsersFromRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles do not have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
-   */
-  removeUsersFromRoles: function (users, roles, options) {
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
-
-    options = options || {};
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    options = _.defaults(options, {
-      _onlyAssigned: true
-    });
-
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
-        Roles._removeUserFromRole(user, role, options);
-      });
-    });
-  },
-
-  _removeUserFromRole: function (user, roleName, options) {
-    var id,
-        role,
-        update;
-
-    Roles._checkRoleName(roleName);
-
-    if (_.isObject(user)) {
-      id = user._id;
-    }
-    else {
-      id = user;
-    }
-
-    if (!id) return;
-
-    update = {
-      $pull: {
-        roles: {
-          role: roleName,
-          partition: options.partition
-        }
-      }
-    };
-
-    if (options._onlyAssigned) {
-      update.$pull.roles.assigned = true;
-    }
-
-    // we try to remove the role in every case, whether the role really exists or not
-    Meteor.users.update(id, update);
-
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
-
-    // role does not exist, we do not anything more
-    if (!role) return;
-
-    _.each(role.children, function (child) {
-      // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_onlyAssigned: true}));
-    });
-  },
-
-  _forwardMigrate: function () {
-
-  },
-
-  _backwardMigrate: function () {
-
-  }
-
-});  // end _.extend(Roles ...)
+};

From 7e5a4619e7587053399f33b293b5ec3f14e19f10 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 08:30:14 +0100
Subject: [PATCH 0179/1140] Added migrations.

---
 roles/roles_server.js | 117 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 113 insertions(+), 4 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index ac44b2292f..7c661b5333 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -26,10 +26,119 @@ Meteor.publish('_roles', function () {
                            {fields: fields});
 });
 
-Roles._forwardMigrate = function () {
+_.extend(Roles, {
+  _isNewField: function (roles) {
+    return _.isArray(roles) && _.isObject(roles[0]);
+  },
 
-};
+  _isOldField: function (roles) {
+    return (_.isArray(roles) && _.isString(roles[0])) || _.isObject(roles);
+  },
 
-Roles._backwardMigrate = function () {
+  _convertToNewField: function (oldRoles) {
+    var roles = [];
+    if (_.isArray(oldRoles)) {
+      _.each(oldRoles, function (role, index) {
+        if (!_.isString(role)) throw new Error("Role '" + role + "' is not a string.");
 
-};
+        roles.push({
+          role: role,
+          partition: null,
+          assigned: true
+        })
+      });
+    }
+    else if (_.isObject(oldRoles)) {
+      _.each(oldRoles, function (rolesArray, group) {
+        // unescape
+        group = group.replace(/_/g, '.');
+
+        _.each(rolesArray, function (role, index) {
+          if (!_.isString(role)) throw new Error("Role '" + role + "' is not a string.");
+
+          roles.push({
+            role: role,
+            partition: group,
+            assigned: true
+          })
+        });
+      })
+    }
+    return roles;
+  },
+
+  _convertToOldField: function (newRoles, usingGroups) {
+    var roles;
+
+    if (usingGroups) {
+      roles = {};
+    }
+    else {
+      roles = [];
+    }
+
+    _.each(newRoles, function (userRole, index) {
+      if (!_.isObject(userRole)) throw new Error("Role '" + userRole + "' is not an object.");
+
+      // We assume that we are converting back a failed migration, so values can only be
+      // what were valid values in 1.0. So no group names starting with $ and no subroles.
+      // We always convert to the global roles syntax.
+
+      if (userRole.partition) {
+        if (!usingGroups) throw new Error("Role '" + userRole.role + "' with partition '" + userRole.partition + "' without enabled groups.");
+
+        // escape
+        userRole.partition = group.replace(/./g, '_');
+
+        if (userRole.partition[0] === '$') throw new Error("Group name '" + userRole.partition + "' start with $.");
+
+        roles[userRole.partition] = roles[userRole.partition] || [];
+        roles[userRole.partition].push(userRole.role);
+      }
+      else {
+        if (usingGroups) {
+          roles.__global_roles__ = roles.__global_roles__ || [];
+          roles.__global_roles__.push(userRole.role);
+        }
+        else {
+          roles.push(userRole.role);
+        }
+      }
+    });
+    return roles;
+  },
+
+  _defaultUpdateUser: function (user, roles) {
+    Meteor.users.update({
+      _id: user._id,
+      // making sure nothing changed in meantime
+      roles: user.roles
+    }, {
+      $set: {roles: roles}
+    });
+  },
+
+  _forwardMigrate: function (updateUser) {
+    updateUser = updateUser || Roles._defaultUpdateUser;
+
+    // TODO: Migrate rules collection.
+
+    Meteor.users.find().forEach(function (user, index, cursor) {
+      if (!Roles._isNewField(user.roles)) {
+        updateUser(user, Roles._convertToNewField(user.roles));
+      }
+    });
+  },
+
+  _backwardMigrate: function (updateUser, usingGroups) {
+    updateUser = updateUser || Roles._defaultUpdateUser;
+
+    // TODO: Migrate rules collection.
+
+    Meteor.users.find().forEach(function (user, index, cursor) {
+      if (!Roles._isOldField(user.roles)) {
+        updateUser(user, Roles._convertToOldField(user.roles, usingGroups));
+      }
+    });
+  }
+});

From 1f97d99282be530bc28b2d9b34bdb89d3a005b9b Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 18 Dec 2015 14:03:56 +0100
Subject: [PATCH 0180/1140] Migrate roles as well.

---
 roles/roles_server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 7c661b5333..1a79b9a467 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -121,7 +121,7 @@ _.extend(Roles, {
   _forwardMigrate: function (updateUser) {
     updateUser = updateUser || Roles._defaultUpdateUser;
 
-    // TODO: Migrate rules collection.
+    Meteor.roles.update({children: {$exists: false}}, {$set: {children: []}}, {multi: true});
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isNewField(user.roles)) {
@@ -133,7 +133,7 @@ _.extend(Roles, {
   _backwardMigrate: function (updateUser, usingGroups) {
     updateUser = updateUser || Roles._defaultUpdateUser;
 
-    // TODO: Migrate rules collection.
+    Meteor.roles.update({}, {$unset: {children: ''}}, {multi: true});
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isOldField(user.roles)) {

From f85ef5631b78cd3be43a2a60f0d652acd99a4180 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 23 Dec 2015 17:20:05 +0100
Subject: [PATCH 0181/1140] Allow deletion of roles in use.

---
 roles/roles_common.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index dbb4808c13..6a01155b2f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -91,8 +91,7 @@ _.extend(Roles, {
   },
 
   /**
-   * Delete an existing role. Will throw "Role in use." error if any users
-   * are currently assigned to the target role.
+   * Delete an existing role.
    *
    * @method deleteRole
    * @param {String} role Name of role
@@ -100,6 +99,25 @@ _.extend(Roles, {
   deleteRole: function (role) {
     Roles._checkRoleName(role);
 
+    Meteor.users.update({}, {
+      $pull: {
+        roles: {
+          role: role
+        }
+      }
+    }, {multi: true});
+
+    Meteor.roles.remove({name: role});
+
+    // try once more just to be sure if role was assigned
+    // just before the role itself was removed
+    Meteor.users.update({}, {
+      $pull: {
+        roles: {
+          role: role
+        }
+      }
+    }, {multi: true});
     var foundExistingUser = Meteor.users.findOne(
                               {'roles.role': role},
                               {fields: {_id: 1}});

From 07220a282f187452108e0e33deb1c1d7d939d6aa Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 23 Dec 2015 18:50:06 +0100
Subject: [PATCH 0182/1140] Allow querying for any partition.

---
 roles/roles_common.js | 110 ++++++++++++++++++++++++++++--------------
 1 file changed, 75 insertions(+), 35 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 6a01155b2f..51ec7f6ae4 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -394,6 +394,7 @@ _.extend(Roles, {
    *
    * Options:
    *   - partition: name of the partition
+   *   - anyPartition: if set, role can be in any partition (partition option is ignored)
    *
    * @method userIsInRole
    * @param {String|Object} user User Id or actual user object.
@@ -425,12 +426,21 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    options = _.defaults(options, {
+      anyPartition: false
+    });
+
     if (!user) return false;
 
     if (_.isObject(user)) {
       if (_.has(user, 'roles')) {
         return _.some(roles, function (role) {
-          return _.some(user.roles || [], Roles._roleAndPartitionMatcher(role, options.partition));
+          if (options.anyPartition) {
+            return _.some(user.roles || [], Roles._roleMatcher(role));
+          }
+          else {
+            return _.some(user.roles || [], Roles._roleAndPartitionMatcher(role, options.partition));
+          }
         })
       } else {
         // missing roles field, try going direct via id
@@ -442,24 +452,32 @@ _.extend(Roles, {
 
     if (!id) return false;
 
-    query = {
-      _id: id,
-      $or: [{
-        roles: {
-          $elemMatch: {
-            role: {$in: roles},
-            partition: options.partition
+    if (options.anyPartition) {
+      query = {
+        _id: id,
+        'roles.role': {$in: roles}
+      };
+    }
+    else {
+      query = {
+        _id: id,
+        $or: [{
+          roles: {
+            $elemMatch: {
+              role: {$in: roles},
+              partition: options.partition
+            }
           }
-        }
-      }, {
-        roles: {
-          $elemMatch: {
-            role: {$in: roles},
-            partition: null
+        }, {
+          roles: {
+            $elemMatch: {
+              role: {$in: roles},
+              partition: null
+            }
           }
-        }
-      }]
-    };
+        }]
+      };
+    }
 
     return !!Meteor.users.findOne(query, {fields: {_id: 1}});
   },
@@ -469,6 +487,7 @@ _.extend(Roles, {
    *
    * Options:
    *   - partition: name of the partition
+   *   - anyPartition: if set, role can be in any partition (partition option is ignored)
    *   - fullObjects: return full roles objects (true) or just names (false) (default false)
    *   - onlyAssigned: return only assigned roles and not automatically inferred (like subroles)
    *
@@ -492,14 +511,20 @@ _.extend(Roles, {
 
     options = _.defaults(options, {
       fullObjects: false,
-      onlyAssigned: false
+      onlyAssigned: false,
+      anyPartition: false
     });
 
     user = Roles._resolveUser(user);
 
     if (!user) return [];
 
-    roles = _.filter(user.roles || [], Roles._partitionMatcher(options.partition));
+    if (options.anyPartition) {
+      roles = user.roles || [];
+    }
+    else {
+      roles = _.filter(user.roles || [], Roles._partitionMatcher(options.partition));
+    }
 
     if (options.onlyAssigned) {
       roles = _.filter(roles, Roles._onlyAssignedMatcher());
@@ -531,6 +556,7 @@ _.extend(Roles, {
    *
    * Options:
    *   - partition: name of the partition
+   *   - anyPartition: if set, role can be in any partition (partition option is ignored)
    *   - queryOptions: options which are passed directly
    *                   through to `Meteor.users.find(query, options)`
    *
@@ -561,26 +587,34 @@ _.extend(Roles, {
     options.partition = options.partition || null;
 
     options = _.defaults(options, {
-      queryOptions: queryOptions || {}
+      queryOptions: queryOptions || {},
+      anyPartition: false
     });
 
-    query = {
-      $or: [{
-        roles: {
-          $elemMatch: {
-            role: {$in: roles},
-            partition: options.partition
+    if (options.anyPartition) {
+      query = {
+        'roles.role': {$in: roles}
+      };
+    }
+    else {
+      query = {
+        $or: [{
+          roles: {
+            $elemMatch: {
+              role: {$in: roles},
+              partition: options.partition
+            }
           }
-        }
-      }, {
-        roles: {
-          $elemMatch: {
-            role: {$in: roles},
-            partition: null
+        }, {
+          roles: {
+            $elemMatch: {
+              role: {$in: roles},
+              partition: null
+            }
           }
-        }
-      }]
-    };
+        }]
+      };
+    }
 
     return Meteor.users.find(query, options.queryOptions);
   },
@@ -640,6 +674,12 @@ _.extend(Roles, {
     return user;
   },
 
+  _roleMatcher: function (roleName) {
+    return function (userRole) {
+      return userRole.role === roleName;
+    };
+  },
+
   _roleAndPartitionMatcher: function (roleName, partition) {
     return function (userRole) {
       // == used on purpose in "userRole.partition == null"

From 0bb1559193a096f54310421b0b9b22bdd0466f25 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 23 Dec 2015 19:10:54 +0100
Subject: [PATCH 0183/1140] Forgot to commit.

---
 roles/roles_common.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 51ec7f6ae4..e1ba545c0f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -118,15 +118,6 @@ _.extend(Roles, {
         }
       }
     }, {multi: true});
-    var foundExistingUser = Meteor.users.findOne(
-                              {'roles.role': role},
-                              {fields: {_id: 1}});
-
-    if (foundExistingUser) {
-      throw new Error("Role '" + role + "' in use.");
-    }
-
-    Meteor.roles.remove({name: role});
   },
 
   /**

From 8adf1064ddfa4e8de014e9368c3da543a69c73b6 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 23 Dec 2015 19:11:26 +0100
Subject: [PATCH 0184/1140] Function for adding role parent.

---
 roles/roles_common.js | 53 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index e1ba545c0f..be04b0a2f3 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -22,6 +22,8 @@
  *
  * Children list elements are subdocuments so that they can easier be extended in the future.
  *
+ * Roles can have multiple parents and can be children (subroles) of multiple roles.
+ *
  * Example: { _id: "123", name: "admin" }
  */
  if (!Meteor.roles) {
@@ -120,6 +122,57 @@ _.extend(Roles, {
     }, {multi: true});
   },
 
+  addRoleParent: function (roleName, parentName) {
+    var role,
+        changes,
+        parentRoles;
+
+    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(parentName);
+
+    // query to get role's _id
+    role = Meteor.roles.findOne({name: roleName});
+
+    if (!role) {
+      throw new Error("Role '" + roleName + "' does not exist.");
+    }
+
+    changes = Meteor.roles.update({
+      name: parentName,
+      'children._id': {
+        $ne: role._id
+      }
+    }, {
+      $addToSet: {
+        children: {
+          _id: role._id,
+          name: role.name
+        }
+      }
+    });
+
+    // if there was no change, parent role might not exist, or role is
+    // already a subrole; in any case we do not have anything more to do
+    if (!changes) return;
+
+    Roles.getUsersInRole(parentName, {
+      anyPartition: true,
+      queryOptions: {
+        fields: {
+          _id: 1,
+          roles: 1
+        }
+      }
+    }).forEach(function (user, index, cursor) {
+      // parent role can be assigned multiple times to the user, for multiple partitions
+      // we have to assign a new subrole for each of those partitions
+      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
+      _.each(parentRoles, function (parentRole) {
+        Roles._addUserToRole(user, roleName, {partition: parentRole.partition, _assigned: false})
+      });
+    });
+  },
+
   /**
    * Add users to roles.
    *

From 569ce46d90743a60c2aaaada20ba7d3ce143b682 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 23 Dec 2015 19:17:05 +0100
Subject: [PATCH 0185/1140] Style.

---
 roles/roles_common.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index be04b0a2f3..81070bf9df 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -27,7 +27,7 @@
  * Example: { _id: "123", name: "admin" }
  */
  if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection("roles")
+  Meteor.roles = new Mongo.Collection("roles");
 }
 
 /**
@@ -39,7 +39,7 @@
  * @constructor
  */
 if ('undefined' === typeof Roles) {
-  Roles = {}
+  Roles = {};
 }
 
 "use strict";

From ba44826f155321757f6234c0170690be4a82d402 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 23 Dec 2015 19:47:40 +0100
Subject: [PATCH 0186/1140] Removing of role's parent.

---
 roles/roles_common.js | 79 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 81070bf9df..dad68f2bb0 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -124,20 +124,20 @@ _.extend(Roles, {
 
   addRoleParent: function (roleName, parentName) {
     var role,
-        changes,
+        count,
         parentRoles;
 
     Roles._checkRoleName(roleName);
     Roles._checkRoleName(parentName);
 
     // query to get role's _id
-    role = Meteor.roles.findOne({name: roleName});
+    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1}});
 
     if (!role) {
       throw new Error("Role '" + roleName + "' does not exist.");
     }
 
-    changes = Meteor.roles.update({
+    count = Meteor.roles.update({
       name: parentName,
       'children._id': {
         $ne: role._id
@@ -153,7 +153,7 @@ _.extend(Roles, {
 
     // if there was no change, parent role might not exist, or role is
     // already a subrole; in any case we do not have anything more to do
-    if (!changes) return;
+    if (!count) return;
 
     Roles.getUsersInRole(parentName, {
       anyPartition: true,
@@ -173,6 +173,77 @@ _.extend(Roles, {
     });
   },
 
+  removeRoleParent: function (roleName, parentName) {
+    var role,
+        count,
+        parentRoles;
+
+    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(parentName);
+
+    // to check for role existence
+    // (_id would not really be needed, but we are trying to match addRoleParent)
+    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1}});
+
+    if (!role) {
+      throw new Error("Role '" + roleName + "' does not exist.");
+    }
+
+    count = Meteor.roles.update({
+      name: parentName
+    }, {
+      $pull: {
+        children: {
+          _id: role._id
+        }
+      }
+    });
+
+    // if there was no change, parent role might not exist, or role was
+    // already not a subrole; in any case we do not have anything more to do
+    if (!count) return;
+
+    Roles.getUsersInRole(parentName, {
+      anyPartition: true,
+      queryOptions: {
+        fields: {
+          _id: 1,
+          roles: 1
+        }
+      }
+    }).forEach(function (user, index, cursor) {
+      // parent role can be assigned multiple times to the user, for multiple partitions
+      // we have to remove the subrole for each of those partitions
+      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
+      _.each(parentRoles, function (parentRole) {
+        // but we want to remove it only if it was not also explicitly assigned
+        Roles._removeUserFromRole(user, roleName, {partition: parentRole.partition, _onlyAssigned: true})
+      });
+    });
+
+    // now we have an edge case we have to handle
+    // because we allow the same role to be a child of multiple roles it might happen
+    // that we just removed some subroles which we should not because they are
+    // in effect also through some other parent role
+    // so we simply reassign to all users the parent role again
+    Roles.getUsersInRole(parentName, {
+      anyPartition: true,
+      queryOptions: {
+        fields: {
+          _id: 1,
+          roles: 1
+        }
+      }
+    }).forEach(function (user, index, cursor) {
+      // parent role can be assigned multiple times to the user, for multiple partitions
+      // we have to reassign the parent role for each of those partitions
+      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
+      _.each(parentRoles, function (parentRole) {
+        Roles._addUserToRole(user, parentRole.role, {partition: parentRole.partition, _assigned: parentRole.assigned});
+      });
+    });
+  },
+
   /**
    * Add users to roles.
    *

From d522b33daff8336a57b557946a1fa6d9624dd237 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 23 Dec 2015 19:48:43 +0100
Subject: [PATCH 0187/1140] Style.

---
 roles/roles_common.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index dad68f2bb0..fa103fe67b 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -168,7 +168,10 @@ _.extend(Roles, {
       // we have to assign a new subrole for each of those partitions
       parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
       _.each(parentRoles, function (parentRole) {
-        Roles._addUserToRole(user, roleName, {partition: parentRole.partition, _assigned: false})
+        Roles._addUserToRole(user, roleName, {
+          partition: parentRole.partition,
+          _assigned: false
+        });
       });
     });
   },
@@ -217,7 +220,10 @@ _.extend(Roles, {
       parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
       _.each(parentRoles, function (parentRole) {
         // but we want to remove it only if it was not also explicitly assigned
-        Roles._removeUserFromRole(user, roleName, {partition: parentRole.partition, _onlyAssigned: true})
+        Roles._removeUserFromRole(user, roleName, {
+          partition: parentRole.partition,
+          _onlyAssigned: true
+        });
       });
     });
 
@@ -239,7 +245,10 @@ _.extend(Roles, {
       // we have to reassign the parent role for each of those partitions
       parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
       _.each(parentRoles, function (parentRole) {
-        Roles._addUserToRole(user, parentRole.role, {partition: parentRole.partition, _assigned: parentRole.assigned});
+        Roles._addUserToRole(user, parentRole.role, {
+          partition: parentRole.partition,
+          _assigned: parentRole.assigned}
+        );
       });
     });
   },

From 3388ca03909134b3b92338141fc3015fb227184e Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 23 Dec 2015 21:23:17 +0100
Subject: [PATCH 0188/1140] Correctly remove roles.

---
 roles/roles_common.js | 76 +++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 25 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index fa103fe67b..c45f9ef442 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -60,23 +60,23 @@ _.extend(Roles, {
    *   - unlessExists: if true, existence of a role will not throw an exception
    *
    * @method createRole
-   * @param {String} role Name of role.
+   * @param {String} roleName Name of role.
    * @param {Object} [options] Optional.
    * @return {String} id of new role
    */
-  createRole: function (role, options) {
+  createRole: function (roleName, options) {
     var match;
 
     options = options || {};
 
-    Roles._checkRoleName(role);
+    Roles._checkRoleName(roleName);
 
     options = _.defaults(options, {
       unlessExists: false
     });
 
     try {
-      return Meteor.roles.insert({name: role, children: []});
+      return Meteor.roles.insert({name: roleName, children: []});
     } catch (e) {
       // (from Meteor accounts-base package, insertUserDoc func)
       // XXX string parsing sucks, maybe
@@ -86,7 +86,7 @@ _.extend(Roles, {
       if (!match) throw e;
       if (match[1].indexOf('$name') !== -1) {
         if (options.unlessExists) return null;
-        throw new Error("Role '" + role + "' already exists.");
+        throw new Error("Role '" + roleName + "' already exists.");
       }
       throw e;
     }
@@ -95,31 +95,57 @@ _.extend(Roles, {
   /**
    * Delete an existing role.
    *
+   * If the role is assigned, it is automatically unassigned from users.
+   *
    * @method deleteRole
-   * @param {String} role Name of role
+   * @param {String} roleName Name of role
    */
-  deleteRole: function (role) {
-    Roles._checkRoleName(role);
+  deleteRole: function (roleName) {
+    var roles,
+        users;
 
-    Meteor.users.update({}, {
-      $pull: {
-        roles: {
-          role: role
+    Roles._checkRoleName(roleName);
+
+    users = [];
+    Roles.getUsersInRole(roleName, {
+      anyPartition: true,
+      queryOptions: {
+        fields: {
+          _id: 1,
+          roles: 1
         }
       }
-    }, {multi: true});
+    }).forEach(function (user, index, cursor) {
+      // role can be assigned multiple times to the user, for multiple partitions
+      // we have to remove the role for each of those partitions
+      roles = _.filter(user.roles, Roles._roleMatcher(roleName));
+      _.each(roles, function (role) {
+        Roles._removeUserFromRole(user, roleName, {
+          partition: role.partition
+        });
+      });
 
-    Meteor.roles.remove({name: role});
+      // store users for later
+      users.push(user);
+    });
 
-    // try once more just to be sure if role was assigned
-    // just before the role itself was removed
-    Meteor.users.update({}, {
-      $pull: {
-        roles: {
-          role: role
-        }
-      }
-    }, {multi: true});
+    Meteor.roles.remove({name: roleName});
+
+    // now we have an edge case we have to handle
+    // because we allow the same role to be a child of multiple roles it might happen
+    // that we just removed some subroles which we should not because they are
+    // in effect also through some other parent role
+    // so we simply reassign to all users their assigned roles again
+    _.each(users, function (user) {
+      // only assigned roles
+      roles = _.filter(user.roles, Roles._onlyAssignedMatcher());
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role.role, {
+          partition: role.partition,
+          _assigned: role.assigned
+        });
+      });
+    });
   },
 
   addRoleParent: function (roleName, parentName) {
@@ -247,8 +273,8 @@ _.extend(Roles, {
       _.each(parentRoles, function (parentRole) {
         Roles._addUserToRole(user, parentRole.role, {
           partition: parentRole.partition,
-          _assigned: parentRole.assigned}
-        );
+          _assigned: parentRole.assigned
+        });
       });
     });
   },

From fbe1d6fb576889721ea5d12c4af0cfcf5b8550e5 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 11:56:01 +0100
Subject: [PATCH 0189/1140] Improving consistency.

---
 roles/roles_common.js | 249 +++++++++++++++++++++++++++++-------------
 1 file changed, 172 insertions(+), 77 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index c45f9ef442..b907eeaa55 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -101,12 +101,20 @@ _.extend(Roles, {
    * @param {String} roleName Name of role
    */
   deleteRole: function (roleName) {
-    var roles,
-        users;
+    var roles;
 
     Roles._checkRoleName(roleName);
 
-    users = [];
+    // we first remove the role as a children, otherwise
+    // Roles._assureConsistency might re-add the role
+    Meteor.roles.update({}, {
+      $pull: {
+        children: {
+          name: roleName
+        }
+      }
+    }, {multi: true});
+
     Roles.getUsersInRole(roleName, {
       anyPartition: true,
       queryOptions: {
@@ -121,31 +129,18 @@ _.extend(Roles, {
       roles = _.filter(user.roles, Roles._roleMatcher(roleName));
       _.each(roles, function (role) {
         Roles._removeUserFromRole(user, roleName, {
-          partition: role.partition
-        });
-      });
-
-      // store users for later
-      users.push(user);
-    });
-
-    Meteor.roles.remove({name: roleName});
-
-    // now we have an edge case we have to handle
-    // because we allow the same role to be a child of multiple roles it might happen
-    // that we just removed some subroles which we should not because they are
-    // in effect also through some other parent role
-    // so we simply reassign to all users their assigned roles again
-    _.each(users, function (user) {
-      // only assigned roles
-      roles = _.filter(user.roles, Roles._onlyAssignedMatcher());
-      _.each(roles, function (role) {
-        Roles._addUserToRole(user, role.role, {
           partition: role.partition,
-          _assigned: role.assigned
+          // we want to remove the role in any case
+          _assigned: null
         });
       });
+
+      // handle the edge case
+      Roles._assureConsistency(user);
     });
+
+    // remove the role itself
+    Meteor.roles.remove({name: roleName});
   },
 
   addRoleParent: function (roleName, parentName) {
@@ -196,7 +191,9 @@ _.extend(Roles, {
       _.each(parentRoles, function (parentRole) {
         Roles._addUserToRole(user, roleName, {
           partition: parentRole.partition,
-          _assigned: false
+          // we are assigning a subrole, so we set it as unassigned,
+          // but only if they do not already exist
+          _assigned: null
         });
       });
     });
@@ -245,37 +242,15 @@ _.extend(Roles, {
       // we have to remove the subrole for each of those partitions
       parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
       _.each(parentRoles, function (parentRole) {
-        // but we want to remove it only if it was not also explicitly assigned
         Roles._removeUserFromRole(user, roleName, {
           partition: parentRole.partition,
-          _onlyAssigned: true
+          // but we want to remove it only if it was not also explicitly assigned
+          _assigned: false
         });
       });
-    });
 
-    // now we have an edge case we have to handle
-    // because we allow the same role to be a child of multiple roles it might happen
-    // that we just removed some subroles which we should not because they are
-    // in effect also through some other parent role
-    // so we simply reassign to all users the parent role again
-    Roles.getUsersInRole(parentName, {
-      anyPartition: true,
-      queryOptions: {
-        fields: {
-          _id: 1,
-          roles: 1
-        }
-      }
-    }).forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple partitions
-      // we have to reassign the parent role for each of those partitions
-      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
-      _.each(parentRoles, function (parentRole) {
-        Roles._addUserToRole(user, parentRole.role, {
-          partition: parentRole.partition,
-          _assigned: parentRole.assigned
-        });
-      });
+      // handle the edge case
+      Roles._assureConsistency(user);
     });
   },
 
@@ -290,6 +265,7 @@ _.extend(Roles, {
    *
    * Options:
    *   - partition: name of the partition
+   *   - ifExists: if true, do not throw an exception if the role does not exist
    *
    * @method addUsersToRoles
    * @param {Array|String} users User id(s) or object(s) with an _id field.
@@ -313,6 +289,11 @@ _.extend(Roles, {
     options.partition = options.partition || null;
 
     options = _.defaults(options, {
+      ifExists: false,
+      // internal option, should not be used publicly because it will break assumptions
+      // in te code; publicly, you can only add users to an assigned role
+      // should the role be set as assigned, default is `true`; `null` is the same as `false`,
+      // only that it does not force the value to `false` if the role is already assigned
       _assigned: true
     });
 
@@ -332,6 +313,10 @@ _.extend(Roles, {
    *     Roles.setUserRoles([user1, user2], ['user','editor'])
    *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
    *
+   * Options:
+   *   - partition: name of the partition
+   *   - ifExists: if true, do not throw an exception if the role does not exist
+   *
    * @method setUserRoles
    * @param {Array|String} users User id(s) or object(s) with an _id field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
@@ -356,6 +341,11 @@ _.extend(Roles, {
     options.partition = options.partition || null;
 
     options = _.defaults(options, {
+      ifExists: false,
+      // internal option, should not be used publicly because it will break assumptions
+      // in te code; publicly, you can only add users to an assigned role
+      // should the role be set as assigned, default is `true`; `null` is the same as `false`,
+      // only that it does not force the value to `false` if the role is already assigned
       _assigned: true
     });
 
@@ -379,7 +369,8 @@ _.extend(Roles, {
   _addUserToRole: function (user, roleName, options) {
     var id,
         role,
-        count;
+        count,
+        setRoles;
 
     Roles._checkRoleName(roleName);
 
@@ -390,12 +381,17 @@ _.extend(Roles, {
       id = user;
     }
 
-    if (!id) return;
+    if (!id) return [];
 
     role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.");
+      if (options.ifExists) {
+        return [];
+      }
+      else {
+        throw new Error("Role '" + roleName + "' does not exist.");
+      }
     }
 
     // add new role if it is not already added
@@ -415,37 +411,65 @@ _.extend(Roles, {
         roles: {
           role: roleName,
           partition: options.partition,
-          assigned: options._assigned
+          // we want to make sure it is a boolean value
+          assigned: !!options._assigned
         }
       }
     });
 
-    if (options._assigned && !count) {
-      // a role has not been added, it maybe already exists,
-      // let's make sure it is set as assigned
-      Meteor.users.update({
-        _id: id,
-        roles: {
-          $elemMatch: {
-            role: roleName,
-            partition: options.partition
+    if (!count) {
+      // a role has not been added, it maybe already exists
+      if (options._assigned) {
+        // let's make sure it is set as assigned
+        Meteor.users.update({
+          _id: id,
+          roles: {
+            $elemMatch: {
+              role: roleName,
+              partition: options.partition
+            }
           }
-        }
 
-      }, {
-        $set: {
-          'roles.$.assigned': true
-        }
-      });
+        }, {
+          $set: {
+            'roles.$.assigned': true
+          }
+        });
+      }
+      else if (options._assigned === false) {
+        // let's make sure it is set as unassigned
+        Meteor.users.update({
+          _id: id,
+          roles: {
+            $elemMatch: {
+              role: roleName,
+              partition: options.partition
+            }
+          }
+
+        }, {
+          $set: {
+            'roles.$.assigned': false
+          }
+        });
+      }
     }
 
+    setRoles = [{
+      role: roleName,
+      partition: options.partition
+    }];
+
     _.each(role.children, function (child) {
-      Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: false}));
+      // subroles are set as unassigned, but only if they do not already exist
+      setRoles.concat(Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: null})));
     });
+
+    return setRoles;
   },
 
   /**
-   * Remove users from roles.
+   * Remove users from assigned roles.
    *
    * @example
    *     Roles.removeUsersFromRoles(userId, 'admin')
@@ -474,16 +498,35 @@ _.extend(Roles, {
     options.partition = options.partition || null;
 
     options = _.defaults(options, {
-      _onlyAssigned: true
+      // internal option, should not be used publicly because it will break assumptions
+      // in te code; publicly, you can only remove users from an assigned role
+      // when should the role be removed, default is `true` which means only when it is assigned,
+      // `false` means when it is not assigned, and `null` means always
+      _assigned: true
     });
 
     _.each(users, function (user) {
       _.each(roles, function (role) {
         Roles._removeUserFromRole(user, role, options);
       });
+
+      // handle the edge case
+      Roles._assureConsistency(user);
     });
   },
 
+  /**
+   * Warning: It leaves user's roles in a possibly inconsistent state. Because we allow the same
+   * role to be a child of multiple roles it might happen that it removes some subroles which
+   * it should not because they are in effect also through some other parent role. You should always
+   * call `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a
+   * particular user.
+   *
+   * @param user
+   * @param roleName
+   * @param options
+   * @private
+   */
   _removeUserFromRole: function (user, roleName, options) {
     var id,
         role,
@@ -509,9 +552,12 @@ _.extend(Roles, {
       }
     };
 
-    if (options._onlyAssigned) {
+    if (options._assigned) {
       update.$pull.roles.assigned = true;
     }
+    else if (options._assigned === false) {
+      update.$pull.roles.assigned = false;
+    }
 
     // we try to remove the role in every case, whether the role really exists or not
     Meteor.users.update(id, update);
@@ -523,7 +569,56 @@ _.extend(Roles, {
 
     _.each(role.children, function (child) {
       // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_onlyAssigned: true}));
+      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_assigned: false}));
+    });
+  },
+
+  /**
+   * Makes sure all subroles are correctly set, and no extra subroles are set which should not be.
+   *
+   * Used internally after complicated changes, but it can also be used whenever one feels that
+   * there might be inconsistencies (eg., after a crash).
+   *
+   * We simply re-set to the user their assigned roles again and remove any roles which
+   * are marked as not explicitly assigned, and have not been part of what we currently set.
+   *
+   * @param {String|Object} user User ID or actual user object.
+   * @private
+   */
+  _assureConsistency: function (user) {
+    var roles,
+        setRoles;
+
+    // we want always the latest state
+    user = Roles._resolveUser(user, true);
+
+    // only assigned roles
+    roles = _.filter(user.roles, Roles._onlyAssignedMatcher());
+
+    setRoles = [];
+    _.each(roles, function (role) {
+      setRoles.concat(Roles._addUserToRole(user, role.role, {
+        partition: role.partition,
+        _assigned: role.assigned, // this is true
+        ifExists: true
+      }));
+    });
+
+    // transform into the query
+    roles = _.map(roles, function (role) {
+      return {
+        role: {$ne: role.role},
+        partition: {$ne: role.partition}
+      }
+    });
+
+    // remove all extra entries which should not be there
+    Meteor.users.update(user._id, {
+      $pull: {
+        roles: {
+          $and: roles
+        }
+      }
     });
   },
 
@@ -809,13 +904,13 @@ _.extend(Roles, {
     return _.uniq(partitions);
   },
 
-  _resolveUser: function (user) {
+  _resolveUser: function (user, force) {
     // TODO: We could use $elemMatch to limit returned fields here.
     if (!_.isObject(user)) {
       user = Meteor.users.findOne(
                {_id: user},
                {fields: {roles: 1}});
-    } else if (!_.has(user, 'roles')) {
+    } else if (force || !_.has(user, 'roles')) {
       user = Meteor.users.findOne(
                {_id: user._id},
                {fields: {roles: 1}});

From c092762e92d7c0093c52038b3ae15ed9b2691755 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 12:02:16 +0100
Subject: [PATCH 0190/1140] Bugfix.

---
 roles/roles_common.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index b907eeaa55..a96691f3a7 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -612,14 +612,19 @@ _.extend(Roles, {
       }
     });
 
-    // remove all extra entries which should not be there
-    Meteor.users.update(user._id, {
-      $pull: {
-        roles: {
-          $and: roles
+    if (roles.length) {
+      // remove all extra entries which should not be there
+      Meteor.users.update(user._id, {
+        $pull: {
+          roles: {
+            $and: roles
+          }
         }
-      }
-    });
+      });
+    }
+    else {
+      Meteor.users.update(user._id, {$set: {roles: []}});
+    }
   },
 
   /**

From 14c9bd4c3a1e6e822be4129d2595d053a5f45b5b Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 13:51:40 +0100
Subject: [PATCH 0191/1140] Updated documentation comments.

---
 roles/client/subscriptions.js |  16 +-
 roles/client/uiHelpers.js     |   6 +-
 roles/roles_common.js         | 291 ++++++++++++++++++++++++----------
 roles/roles_server.js         |  68 +++++++-
 4 files changed, 278 insertions(+), 103 deletions(-)

diff --git a/roles/client/subscriptions.js b/roles/client/subscriptions.js
index f62e8b12d7..2f30bb7aec 100644
--- a/roles/client/subscriptions.js
+++ b/roles/client/subscriptions.js
@@ -1,22 +1,18 @@
-"use strict"
-
+"use strict";
 
 /**
- * Subscription handle for the currently logged in user's permissions.
- *
- * NOTE: The corresponding publish function, `_roles`, depends on
- * `this.userId` so it will automatically re-run when the currently
- * logged-in user changes.
+ * Subscription handle for the collection of all existing roles.
  *
  * @example
  *
- *     `Roles.subscription.ready()` // => `true` if user roles have been loaded
+ *     Roles.subscription.ready(); // true if roles have been loaded
  *
  * @property subscription
  * @type Object
  * @for Roles
+ * @static
  */
 
 Tracker.autorun(function () {
-  Roles.subscription = Meteor.subscribe("_roles")
-})
+  Roles.subscription = Meteor.subscribe('_roles');
+});
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 01983a299d..39090d0df1 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -36,9 +36,9 @@ Roles._uiHelpers = {
    *     {{/if}}
    *
    * @method isInRole
-   * @param {String} role Name of role or comma-seperated list of roles
-   * @param {String} [partition] Optional, name of partition to check
-   * @return {Boolean} true if current user is in at least one of the target roles
+   * @param {String} role Name of role or comma-seperated list of roles.
+   * @param {String} [partition] Optional, name of partition to check.
+   * @return {Boolean} `true` if current user is in at least one of the target roles.
    * @static
    * @for UIHelpers 
    */
diff --git a/roles/roles_common.js b/roles/roles_common.js
index a96691f3a7..5ffb149c90 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -5,38 +5,31 @@
  *
  * It uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following
  * schema:
- *  - role (role name)
- *  - partition (partition name)
- *  - assigned (boolean, if the role was manually assigned, or was automatically inferred (like subroles))
+ *  - `role`: role name
+ *  - `partition`: partition name
+ *  - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)
  *
- * @module Roles
- */
-
-/**
- * Roles collection documents consist of:
- *  - _id
- *  - name (of the role)
- *  - children (roles), list of documents:
- *    - _id
- *    - name
+ * Roles themselves are accessible throgh `Meteor.roles` collection and documents consist of:
+ *  - `_id`
+ *  - `name`: role name
+ *  - `children`: list of subdocuments:
+ *    - `_id`
+ *    - `name`
  *
- * Children list elements are subdocuments so that they can easier be extended in the future.
+ * Children list elements are subdocuments so that they can be easier extended in the future.
  *
  * Roles can have multiple parents and can be children (subroles) of multiple roles.
  *
- * Example: { _id: "123", name: "admin" }
+ * Example: `{_id: "123", name: "admin"}`
+ *
+ * @module Roles
  */
  if (!Meteor.roles) {
   Meteor.roles = new Mongo.Collection("roles");
 }
 
 /**
- * Authorization package compatible with built-in Meteor accounts system.
- *
- * Stores user's current roles in a 'roles' field on the user object.
- *
  * @class Roles
- * @constructor
  */
 if ('undefined' === typeof Roles) {
   Roles = {};
@@ -48,21 +41,24 @@ var getGroupsForUserDeprecationWarning = false;
 
 _.extend(Roles, {
 
-  /*
-   * Deprecated. Not used anymore.
+  /**
+   * Used as a global group (now partition) name. Not used anymore.
+   *
+   * @property GLOBAL_GROUP
+   * @static
+   * @deprecated
    */
   GLOBAL_GROUP: null,
 
   /**
    * Create a new role.
    *
-   * Options:
-   *   - unlessExists: if true, existence of a role will not throw an exception
-   *
    * @method createRole
    * @param {String} roleName Name of role.
-   * @param {Object} [options] Optional.
-   * @return {String} id of new role
+   * @param {Object} [options] Options:
+   *   - `unlessExists`: if `true`, exception will not be thrown in the role already exists
+   * @return {String} ID of the new role.
+   * @static
    */
   createRole: function (roleName, options) {
     var match;
@@ -95,10 +91,11 @@ _.extend(Roles, {
   /**
    * Delete an existing role.
    *
-   * If the role is assigned, it is automatically unassigned from users.
+   * If the role is set for any user, it is automatically unset.
    *
    * @method deleteRole
-   * @param {String} roleName Name of role
+   * @param {String} roleName Name of role.
+   * @static
    */
   deleteRole: function (roleName) {
     var roles;
@@ -143,6 +140,17 @@ _.extend(Roles, {
     Meteor.roles.remove({name: roleName});
   },
 
+  /**
+   * Add role parent to the role.
+   *
+   * Previous parents are kept (role can have multiple parents). For users which have the
+   * parent role set, new subroles are added automatically.
+   *
+   * @method addRoleParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @static
+   */
   addRoleParent: function (roleName, parentName) {
     var role,
         count,
@@ -199,6 +207,17 @@ _.extend(Roles, {
     });
   },
 
+  /**
+   * Remove role parent from the role.
+   *
+   * Other parents are kept (role can have multiple parents). For users which have the
+   * parent role set, removed subrole is removed automatically.
+   *
+   * @method removeRoleParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @static
+   */
   removeRoleParent: function (roleName, parentName) {
     var role,
         count,
@@ -257,20 +276,23 @@ _.extend(Roles, {
   /**
    * Add users to roles.
    *
+   * Adds roles to existing roles for each user.
+   *
    * @example
    *     Roles.addUsersToRoles(userId, 'admin')
    *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
    *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
    *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
    *
-   * Options:
-   *   - partition: name of the partition
-   *   - ifExists: if true, do not throw an exception if the role does not exist
-   *
    * @method addUsersToRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   * @param {Object|String} [options] Options:
+   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a partition name string.
+   * @static
    */
   addUsersToRoles: function (users, roles, options) {
     if (!users) throw new Error ("Missing 'users' param.");
@@ -307,20 +329,23 @@ _.extend(Roles, {
   /**
    * Set users' roles.
    *
+   * Replaces all existing roles with a new set of roles.
+   *
    * @example
    *     Roles.setUserRoles(userId, 'admin')
    *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
    *     Roles.setUserRoles([user1, user2], ['user','editor'])
    *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
    *
-   * Options:
-   *   - partition: name of the partition
-   *   - ifExists: if true, do not throw an exception if the role does not exist
-   *
    * @method setUserRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   * @param {Object|String} [options] Options:
+   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a partition name string.
+   * @static
    */
   setUserRoles: function (users, roles, options) {
     var id;
@@ -366,6 +391,23 @@ _.extend(Roles, {
     });
   },
 
+  /**
+   * Add one user to one role.
+   *
+   * @method _addUserToRole
+   * @param {String|Object} user User ID or object with an `_id` field.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   *   - `_assigned`: internal option, should not be used publicly because it will break assumptions
+   *     in te code; publicly, you can only add users to an assigned role
+   *     should the role be set as assigned, default is `true`; `null` is the same as `false`,
+   *     only that it does not force the value to `false` if the role is already assigned
+   * @returns {Array} Roles set during the call (even those already set).
+   * @private
+   * @static
+   */
   _addUserToRole: function (user, roleName, options) {
     var id,
         role,
@@ -477,9 +519,13 @@ _.extend(Roles, {
    *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
    *
    * @method removeUsersFromRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles do not have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. Alternatively, options.
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `partition`: name of the partition, or `null` for the global role
+   *
+   * Alternatively, it can be a partition name string.
+   * @static
    */
   removeUsersFromRoles: function (users, roles, options) {
     if (!users) throw new Error ("Missing 'users' param.");
@@ -516,16 +562,25 @@ _.extend(Roles, {
   },
 
   /**
-   * Warning: It leaves user's roles in a possibly inconsistent state. Because we allow the same
+   * Remove one user from one role.
+   *
+   * WARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same
    * role to be a child of multiple roles it might happen that it removes some subroles which
    * it should not because they are in effect also through some other parent role. You should always
    * call `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a
    * particular user.
    *
-   * @param user
-   * @param roleName
-   * @param options
+   * @method _removeUserFromRole
+   * @param {String|Object} user User ID or object with an `_id` field.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `_assigned`: internal option, should not be used publicly because it will break assumptions
+   *     in te code; publicly, you can only add users to an assigned role
+   *     should the role be set as assigned, default is `true`; `null` is the same as `false`,
+   *     only that it does not force the value to `false` if the role is already assigned
    * @private
+   * @static
    */
   _removeUserFromRole: function (user, roleName, options) {
     var id,
@@ -582,8 +637,10 @@ _.extend(Roles, {
    * We simply re-set to the user their assigned roles again and remove any roles which
    * are marked as not explicitly assigned, and have not been part of what we currently set.
    *
-   * @param {String|Object} user User ID or actual user object.
+   * @method _assureConsistency
+   * @param {String|Object} user User ID or an actual user object.
    * @private
+   * @static
    */
   _assureConsistency: function (user) {
     var roles,
@@ -642,22 +699,19 @@ _.extend(Roles, {
    *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
    *     Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})
    *
-   * Options:
-   *   - partition: name of the partition
-   *   - anyPartition: if set, role can be in any partition (partition option is ignored)
-   *
    * @method userIsInRole
-   * @param {String|Object} user User Id or actual user object.
-   * @param {String|Array} roles Name of role/permission or Array of
-   *                             roles to check against. If array,
-   *                             will return true if user is in _any_ role.
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {String|Array} roles Name of role or an array of roles to check against. If array,
+   *                             will return `true` if user is in _any_ role.
    *                             Roles do not have to exist.
-   * @param {String|Object} [options] Optional. Name of partition. If supplied, limits check
-   *                                  to just that partition.
-   *                                  The user's global roles will always be checked
-   *                                  whether partition is specified or not.
-   *                                  Alternatively, options.
-   * @return {Boolean} true if user is in _any_ of the target roles
+   * @param {Object|String} [options] Options:
+   *   - `partition`: name of the partition; if supplied, limits check to just that partition;
+   *     the user's global roles will always be checked whether partition is specified or not
+   *   - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)
+   *
+   * Alternatively, it can be a partition name string.
+   * @return {Boolean} `true` if user is in _any_ of the target roles
+   * @static
    */
   userIsInRole: function (user, roles, options) {
     var id,
@@ -735,18 +789,17 @@ _.extend(Roles, {
   /**
    * Retrieve user's roles.
    *
-   * Options:
-   *   - partition: name of the partition
-   *   - anyPartition: if set, role can be in any partition (partition option is ignored)
-   *   - fullObjects: return full roles objects (true) or just names (false) (default false)
-   *   - onlyAssigned: return only assigned roles and not automatically inferred (like subroles)
-   *
    * @method getRolesForUser
-   * @param {String|Object} user User Id or actual user object.
-   * @param {String|Object} [options] Optional. Name of partition to provide roles for.
-   *                                  If not specified, global roles are returned.
-   *                                  Alternatively, options.
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Object|String} [options] Options:
+   *   - `partition`: name of partition to provide roles for; if not specified, global roles are returned
+   *   - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)
+   *   - `fullObjects`: return full roles objects (`true`) or just names (`false`) (default `false`)
+   *   - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)
+   *
+   * Alternatively, it can be a partition name string.
    * @return {Array} Array of user's roles, unsorted.
+   * @static
    */
   getRolesForUser: function (user, options) {
     var roles;
@@ -788,12 +841,13 @@ _.extend(Roles, {
   },
 
   /**
-   * Retrieve set of all existing roles.
+   * Retrieve cursor of all existing roles.
    *
    * @method getAllRoles
-   * @param {Object} [queryOptions] Optional. Options which are passed directly
+   * @param {Object} [queryOptions] Options which are passed directly
    *                                through to `Meteor.roles.find(query, options)`.
-   * @return {Cursor} cursor of existing roles
+   * @return {Cursor} Cursor of existing roles.
+   * @static
    */
   getAllRoles: function (queryOptions) {
     queryOptions = queryOptions || {sort: {name: 1}};
@@ -805,22 +859,24 @@ _.extend(Roles, {
    * Retrieve all users who are in target role.
    *
    * Options:
-   *   - partition: name of the partition
-   *   - anyPartition: if set, role can be in any partition (partition option is ignored)
-   *   - queryOptions: options which are passed directly
-   *                   through to `Meteor.users.find(query, options)`
    *
    * @method getUsersInRole
-   * @param {Array|String} roles Name of role/permission. If array, users
+   * @param {String|Array} roles Name of role or an array of roles. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
-   * @param {String|Object} [options] Optional. Name of partition to restrict roles to.
-   *                                  User's global roles will also be checked.
-   *                                  Alternatively, options.
-   * @param {Object} [queryOptions] Optional. Options which are passed directly
+   * @param {Object|String} [options] Options:
+   *   - `partition`: name of the partition to restrict roles to; user's global
+   *     roles will also be checked
+   *   - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)
+   *   - `queryOptions`: options which are passed directly
+   *     through to `Meteor.users.find(query, options)`
+   *
+   * Alternatively, it can be a partition name string.
+   * @param {Object} [queryOptions] Options which are passed directly
    *                                through to `Meteor.users.find(query, options)`
-   * @return {Cursor} cursor of users in role
+   * @return {Cursor} Cursor of users in roles.
+   * @static
    */
   getUsersInRole: function (roles, options, queryOptions) {
     var query;
@@ -869,6 +925,13 @@ _.extend(Roles, {
     return Meteor.users.find(query, options.queryOptions);
   },
 
+  /**
+   * Deprecated. Use `getPartitionsForUser` instead.
+   *
+   * @method getGroupsForUser
+   * @static
+   * @deprecated
+   */
   getGroupsForUser: function (/*args*/) {
     if (!getGroupsForUserDeprecationWarning) {
       getGroupsForUserDeprecationWarning = true;
@@ -882,10 +945,11 @@ _.extend(Roles, {
    * Retrieve users partitions, if any.
    *
    * @method getPartitionsForUser
-   * @param {String|Object} user User Id or actual user object.
-   * @param {String} [roles] Optional name of roles to restrict partitions to.
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {String} [roles] Name of roles to restrict partitions to.
    *
    * @return {Array} Array of user's partitions, unsorted.
+   * @static
    */
   getPartitionsForUser: function (user, roles) {
     var partitions;
@@ -909,6 +973,17 @@ _.extend(Roles, {
     return _.uniq(partitions);
   },
 
+  /**
+   * Resolves the user ID into an actual user object with `roles` field,
+   * if it is not already.
+   *
+   * @method _resolveUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Boolean} force Load a new user object even if it is already one.
+   * @returns {Object} User object.
+   * @private
+   * @static
+   */
   _resolveUser: function (user, force) {
     // TODO: We could use $elemMatch to limit returned fields here.
     if (!_.isObject(user)) {
@@ -924,12 +999,29 @@ _.extend(Roles, {
     return user;
   },
 
+  /**
+   * @method _roleMatcher
+   * @param {String} roleName A role name to match against.
+   * @returns {Function} A matcher function which accepts a role object and returns `true`
+   *                     if its name matches `roleName`.
+   * @private
+   * @static
+   */
   _roleMatcher: function (roleName) {
     return function (userRole) {
       return userRole.role === roleName;
     };
   },
 
+  /**
+   * @method _roleAndPartitionMatcher
+   * @param {String} roleName A role name to match against.
+   * @param {String} partition A partition to match against.
+   * @returns {Function} A matcher function which accepts a role object and returns `true`
+   *                     if its name matches `roleName`, and partition matches `partition`.
+   * @private
+   * @static
+   */
   _roleAndPartitionMatcher: function (roleName, partition) {
     return function (userRole) {
       // == used on purpose in "userRole.partition == null"
@@ -938,6 +1030,14 @@ _.extend(Roles, {
     };
   },
 
+  /**
+   * @method _partitionMatcher
+   * @param {String} partition A partition to match against.
+   * @returns {Function} A matcher function which accepts a role object and returns `true`
+   *                     if its partition matches `partition`.
+   * @private
+   * @static
+   */
   _partitionMatcher: function (partition) {
     return function (userRole) {
       // == used on purpose in "userRole.partition == null"
@@ -946,12 +1046,27 @@ _.extend(Roles, {
     };
   },
 
+  /**
+   * @method _onlyAssignedMatcher
+   * @returns {Function} A matcher function which accepts a role object and returns `true`
+   *                     if the role is an assigned role.
+   * @private
+   * @static
+   */
   _onlyAssignedMatcher: function () {
     return function (userRole) {
       return !!userRole.assigned;
     };
   },
 
+  /**
+   * Throw an exception if `roleName` is an invalid role name.
+   *
+   * @method _checkRoleName
+   * @param {String} roleName A role name to match against.
+   * @private
+   * @static
+   */
   _checkRoleName: function (roleName) {
     if (!roleName || !_.isString(roleName) || roleName.trim() !== roleName) {
       throw new Error("Invalid role name '" + roleName + "'.");
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 1a79b9a467..cd6acc2559 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -8,7 +8,7 @@ Meteor.roles._ensureIndex({name: 1}, {unique: 1});
 Meteor.users._ensureIndex({'roles.role': 1, 'roles.partition': 1});
 Meteor.users._ensureIndex({'roles.partition': 1});
 
-/**
+/*
  * Publish logged-in user's roles so client-side checks can work.
  * 
  * Use a named publish function so clients can check `ready()` state.
@@ -27,14 +27,40 @@ Meteor.publish('_roles', function () {
 });
 
 _.extend(Roles, {
+  /**
+   * @method _isNewField
+   * @param {Array} roles `Meteor.users` document `roles` field.
+   * @returns {Boolean} Returns `true` if the `roles` field is in the new format.
+   *                    If it is ambiguous or it is not, returns `false`.
+   * @for Roles
+   * @private
+   * @static
+   */
   _isNewField: function (roles) {
     return _.isArray(roles) && _.isObject(roles[0]);
   },
 
+  /**
+   * @method _isOldField
+   * @param {Array} roles `Meteor.users` document `roles` field.
+   * @returns {Boolean} Returns `true` if the `roles` field is in the old format.
+   *                    If it is ambiguous or it is not, returns `false`.
+   * @for Roles
+   * @private
+   * @static
+   */
   _isOldField: function (roles) {
     return (_.isArray(roles) && _.isString(roles[0])) || _.isObject(roles);
   },
 
+  /**
+   * @method _convertToNewField
+   * @param {Array} roles `Meteor.users` document `roles` field in the old format.
+   * @returns {Array} Converted `roles` to the new format.
+   * @for Roles
+   * @private
+   * @static
+   */
   _convertToNewField: function (oldRoles) {
     var roles = [];
     if (_.isArray(oldRoles)) {
@@ -67,6 +93,14 @@ _.extend(Roles, {
     return roles;
   },
 
+  /**
+   * @method _convertToOldField
+   * @param {Array} roles `Meteor.users` document `roles` field in the new format.
+   * @returns {Array} Converted `roles` to the old format.
+   * @for Roles
+   * @private
+   * @static
+   */
   _convertToOldField: function (newRoles, usingGroups) {
     var roles;
 
@@ -82,7 +116,6 @@ _.extend(Roles, {
 
       // We assume that we are converting back a failed migration, so values can only be
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
-      // We always convert to the global roles syntax.
 
       if (userRole.partition) {
         if (!usingGroups) throw new Error("Role '" + userRole.role + "' with partition '" + userRole.partition + "' without enabled groups.");
@@ -108,6 +141,14 @@ _.extend(Roles, {
     return roles;
   },
 
+  /**
+   * @method _defaultUpdateUser
+   * @param {Object} user `Meteor.users` document.
+   * @returns {Array|Object} roles Value to which user's `roles` field should be set.
+   * @for Roles
+   * @private
+   * @static
+   */
   _defaultUpdateUser: function (user, roles) {
     Meteor.users.update({
       _id: user._id,
@@ -118,6 +159,15 @@ _.extend(Roles, {
     });
   },
 
+  /**
+   * Migrates `Meteor.users` and `Meteor.roles` to the new format.
+   *
+   * @method _forwardMigrate
+   * @param {Function} updateUser Function which updates the user object. Default `_defaultUpdateUser`.
+   * @for Roles
+   * @private
+   * @static
+   */
   _forwardMigrate: function (updateUser) {
     updateUser = updateUser || Roles._defaultUpdateUser;
 
@@ -130,6 +180,20 @@ _.extend(Roles, {
     });
   },
 
+  /**
+   * Migrates `Meteor.users` and `Meteor.roles` to the old format.
+   *
+   * We assume that we are converting back a failed migration, so values can only be
+   * what were valid values in the old format. So no group names starting with `$` and
+   * no subroles.
+   *
+   * @method _backwardMigrate
+   * @param {Function} updateUser Function which updates the user object. Default `_defaultUpdateUser`.
+   * @param {Boolean} usingGroups Should we use groups or not.
+   * @for Roles
+   * @private
+   * @static
+   */
   _backwardMigrate: function (updateUser, usingGroups) {
     updateUser = updateUser || Roles._defaultUpdateUser;
 

From 3cf904989331e499076938cfd334f91401ad19b1 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 13:52:54 +0100
Subject: [PATCH 0192/1140] Replaced @returns with @return.

---
 roles/roles_common.js | 12 ++++++------
 roles/roles_server.js | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 5ffb149c90..b85791e1d6 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -404,7 +404,7 @@ _.extend(Roles, {
    *     in te code; publicly, you can only add users to an assigned role
    *     should the role be set as assigned, default is `true`; `null` is the same as `false`,
    *     only that it does not force the value to `false` if the role is already assigned
-   * @returns {Array} Roles set during the call (even those already set).
+   * @return {Array} Roles set during the call (even those already set).
    * @private
    * @static
    */
@@ -980,7 +980,7 @@ _.extend(Roles, {
    * @method _resolveUser
    * @param {String|Object} user User ID or an actual user object.
    * @param {Boolean} force Load a new user object even if it is already one.
-   * @returns {Object} User object.
+   * @return {Object} User object.
    * @private
    * @static
    */
@@ -1002,7 +1002,7 @@ _.extend(Roles, {
   /**
    * @method _roleMatcher
    * @param {String} roleName A role name to match against.
-   * @returns {Function} A matcher function which accepts a role object and returns `true`
+   * @return {Function} A matcher function which accepts a role object and returns `true`
    *                     if its name matches `roleName`.
    * @private
    * @static
@@ -1017,7 +1017,7 @@ _.extend(Roles, {
    * @method _roleAndPartitionMatcher
    * @param {String} roleName A role name to match against.
    * @param {String} partition A partition to match against.
-   * @returns {Function} A matcher function which accepts a role object and returns `true`
+   * @return {Function} A matcher function which accepts a role object and returns `true`
    *                     if its name matches `roleName`, and partition matches `partition`.
    * @private
    * @static
@@ -1033,7 +1033,7 @@ _.extend(Roles, {
   /**
    * @method _partitionMatcher
    * @param {String} partition A partition to match against.
-   * @returns {Function} A matcher function which accepts a role object and returns `true`
+   * @return {Function} A matcher function which accepts a role object and returns `true`
    *                     if its partition matches `partition`.
    * @private
    * @static
@@ -1048,7 +1048,7 @@ _.extend(Roles, {
 
   /**
    * @method _onlyAssignedMatcher
-   * @returns {Function} A matcher function which accepts a role object and returns `true`
+   * @return {Function} A matcher function which accepts a role object and returns `true`
    *                     if the role is an assigned role.
    * @private
    * @static
diff --git a/roles/roles_server.js b/roles/roles_server.js
index cd6acc2559..72279d5b44 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -30,7 +30,7 @@ _.extend(Roles, {
   /**
    * @method _isNewField
    * @param {Array} roles `Meteor.users` document `roles` field.
-   * @returns {Boolean} Returns `true` if the `roles` field is in the new format.
+   * @return {Boolean} Returns `true` if the `roles` field is in the new format.
    *                    If it is ambiguous or it is not, returns `false`.
    * @for Roles
    * @private
@@ -43,7 +43,7 @@ _.extend(Roles, {
   /**
    * @method _isOldField
    * @param {Array} roles `Meteor.users` document `roles` field.
-   * @returns {Boolean} Returns `true` if the `roles` field is in the old format.
+   * @return {Boolean} Returns `true` if the `roles` field is in the old format.
    *                    If it is ambiguous or it is not, returns `false`.
    * @for Roles
    * @private
@@ -56,7 +56,7 @@ _.extend(Roles, {
   /**
    * @method _convertToNewField
    * @param {Array} roles `Meteor.users` document `roles` field in the old format.
-   * @returns {Array} Converted `roles` to the new format.
+   * @return {Array} Converted `roles` to the new format.
    * @for Roles
    * @private
    * @static
@@ -96,7 +96,7 @@ _.extend(Roles, {
   /**
    * @method _convertToOldField
    * @param {Array} roles `Meteor.users` document `roles` field in the new format.
-   * @returns {Array} Converted `roles` to the old format.
+   * @return {Array} Converted `roles` to the old format.
    * @for Roles
    * @private
    * @static
@@ -144,7 +144,7 @@ _.extend(Roles, {
   /**
    * @method _defaultUpdateUser
    * @param {Object} user `Meteor.users` document.
-   * @returns {Array|Object} roles Value to which user's `roles` field should be set.
+   * @return {Array|Object} roles Value to which user's `roles` field should be set.
    * @for Roles
    * @private
    * @static

From d975f0b7b1825b8c908097a81988c44f6a5c7fa4 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 13:53:09 +0100
Subject: [PATCH 0193/1140] Generated new documentation.

---
 docs/api.js                                   |    5 +-
 docs/assets/css/external-small.png            |  Bin
 docs/assets/css/logo.png                      |  Bin 6308 -> 7143 bytes
 docs/assets/css/main.css                      |    2 +-
 docs/assets/favicon.ico                       |  Bin 0 -> 5430 bytes
 docs/assets/favicon.png                       |  Bin 740 -> 0 bytes
 docs/assets/img/spinner.gif                   |  Bin
 docs/assets/index.html                        |    0
 docs/assets/js/api-filter.js                  |    6 +-
 docs/assets/js/api-list.js                    |    8 +-
 docs/assets/js/api-search.js                  |    0
 docs/assets/js/apidocs.js                     |   12 +-
 docs/assets/js/yui-prettify.js                |    0
 docs/assets/vendor/prettify/CHANGES.html      |    0
 docs/assets/vendor/prettify/COPYING           |    0
 docs/assets/vendor/prettify/README.html       |    0
 docs/assets/vendor/prettify/prettify-min.css  |    0
 docs/assets/vendor/prettify/prettify-min.js   |    0
 docs/classes/Roles.html                       | 4178 +++++++++--------
 docs/classes/UIHelpers.html                   |  212 +-
 docs/data.json                                |  698 ++-
 docs/elements/index.html                      |   10 +
 docs/files/roles_client_subscriptions.js.html |  126 +-
 docs/files/roles_client_uiHelpers.js.html     |  124 +-
 docs/files/roles_roles_common.js.html         | 1662 ++++---
 docs/files/roles_roles_server.js.html         |  320 +-
 docs/index.html                               |  110 +-
 docs/modules/Roles.html                       |  146 +-
 docs/modules/UIHelpers.html                   |  123 +-
 29 files changed, 4375 insertions(+), 3367 deletions(-)
 mode change 100644 => 100755 docs/assets/css/external-small.png
 mode change 100644 => 100755 docs/assets/css/logo.png
 mode change 100644 => 100755 docs/assets/css/main.css
 create mode 100755 docs/assets/favicon.ico
 delete mode 100644 docs/assets/favicon.png
 mode change 100644 => 100755 docs/assets/img/spinner.gif
 mode change 100644 => 100755 docs/assets/index.html
 mode change 100644 => 100755 docs/assets/js/api-filter.js
 mode change 100644 => 100755 docs/assets/js/api-list.js
 mode change 100644 => 100755 docs/assets/js/api-search.js
 mode change 100644 => 100755 docs/assets/js/apidocs.js
 mode change 100644 => 100755 docs/assets/js/yui-prettify.js
 mode change 100644 => 100755 docs/assets/vendor/prettify/CHANGES.html
 mode change 100644 => 100755 docs/assets/vendor/prettify/COPYING
 mode change 100644 => 100755 docs/assets/vendor/prettify/README.html
 mode change 100644 => 100755 docs/assets/vendor/prettify/prettify-min.css
 mode change 100644 => 100755 docs/assets/vendor/prettify/prettify-min.js
 create mode 100644 docs/elements/index.html

diff --git a/docs/api.js b/docs/api.js
index 30c6855ade..1063680e40 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -12,13 +12,14 @@ YUI.add("yuidoc-meta", function(Y) {
         {
             "displayName": "Roles",
             "name": "Roles",
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `role`: role name\n - `partition`: partition name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`\n - `name`: role name\n - `children`: list of subdocuments:\n   - `_id`\n   - `name`\n\nChildren list elements are subdocuments so that they can be easier extended in the future.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"123\", name: \"admin\"}`"
         },
         {
             "displayName": "UIHelpers",
             "name": "UIHelpers",
             "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
         }
-    ]
+    ],
+    "elements": []
 } };
 });
\ No newline at end of file
diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
old mode 100644
new mode 100755
diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
old mode 100644
new mode 100755
index 609b336c7cc5ef0c787a0068d221d9b8d69b1241..c82444af95895d38bea6fe96cc5354a7419f770c
GIT binary patch
literal 7143
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

literal 6308
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
a0R{k+kX}`<%LV)Z0000<MNUMnLSTX_={r~e

diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
old mode 100644
new mode 100755
index d745d44384..cdfe209e8d
--- a/docs/assets/css/main.css
+++ b/docs/assets/css/main.css
@@ -98,7 +98,7 @@ code, kbd, pre, samp {
     line-height: 1.35;
 }
 
-p code, p kbd, p samp {
+p code, p kbd, p samp, li code {
     background: #FCFBFA;
     border: 1px solid #EFEEED;
     padding: 0 3px;
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
new file mode 100755
index 0000000000000000000000000000000000000000..414ac4fb9e145171ae8f660e51879e18c401e653
GIT binary patch
literal 5430
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

literal 0
HcmV?d00001

diff --git a/docs/assets/favicon.png b/docs/assets/favicon.png
deleted file mode 100644
index 5a95ddab6ff6735b52596ecea54f2b68298cae91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0004@P)t-s0000{
zX|Ygfu`xl0C^>~sYqK3Gcus4xPHVF@NRlx_jU+UHO>DGCVWd%Mvj6}8PiwO?MUOK>
zh#e_-OJS-kK8Z|Xt0XgkGe(eqj=e%xpEO30J581!Eqg~?q%T2?Ek21)YqKpribYwO
zO>DFvE_`l(vNA-DP-?S5PK0`q!bDh@Mq8vgOqNb&rhJXTL|2zvaI{oyv}%RBafiZK
zXPjk$xItE*Ls+3FH-t7xlT2l%b%(okjlX(}z(iM=T5+{UVWUxLu~2HVQ*5(wfwpIY
zx^suTO<$u_Wt}fTi)DPfVSTqxX0Jh2pF>!pWqY$FG=V!yh%`o#I!lpBUZ_i9sy$Mh
zbd0`wjKM-wmsoDGM_{8+Xt7mktWRsRQE9SmezIwQzG;8GYk{~+U!725o-93xU~{x&
zdA3hxu0U0uNL!j<bFv{XeKA9hF++_rMvyyCnMhrwNM5H-Vx>G$nRJA=b%wh=O^H2C
zi#SY{S8At7V4_fHuux~PPinJicdKW6vS@y|OI(^NI)+?xw@qZNU~r`!DtSIqoCqvd
zm;e9(D|Av$Qve|DfN(%S$B)~`AYc$64eo$|fIvW?+sFBE5P*O{KtQ1G#~^@FK%hjn
zkdomz0002TNkl<Z7?opSfCEMmDH$PV7>`w>G^{kLDnt;%<*|0o$}R6`^xy<@RoEM1
zqurZYT;p`r!P4>0S(y=fId&Oc5+FWDLu^>Hac!Eup}&<pkgw>RRh(iLlN#v|TEqoX
z5F2J5;1i==(bn!4tN;>_E30vHG)PRY)6s2(SgB^~Xzyu~5Z0B?0uj)%)~>X1@wKpO
z<%S6GDhHV+Ih7Q7iNigiX=l`)U1%u_7vT4<*Qrj=V?+3pPb|D3u#*89NQ<fpLs$T#
WD=i+B1us|t0000<MNUMnLSTZr5j8&m

diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
old mode 100644
new mode 100755
diff --git a/docs/assets/index.html b/docs/assets/index.html
old mode 100644
new mode 100755
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
old mode 100644
new mode 100755
index 37aefbab98..d442e54306
--- a/docs/assets/js/api-filter.js
+++ b/docs/assets/js/api-filter.js
@@ -14,6 +14,10 @@ Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {
             }
         });
 
+        if (this.get('queryType') === 'elements') {
+            name = '&lt;' + name + '&gt;';
+        }
+
         return name;
     }
 
@@ -24,7 +28,7 @@ Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {
             value: 'phraseMatch'
         },
 
-        // May be set to "classes" or "modules".
+        // May be set to "classes", "elements" or "modules".
         queryType: {
             value: 'classes'
         },
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
old mode 100644
new mode 100755
index 88905b52ea..e8f650d5d5
--- a/docs/assets/js/api-list.js
+++ b/docs/assets/js/api-list.js
@@ -6,6 +6,7 @@ var Lang   = Y.Lang,
     APIList = Y.namespace('APIList'),
 
     classesNode    = Y.one('#api-classes'),
+    elementsNode   = Y.one('#api-elements'),
     inputNode      = Y.one('#api-filter'),
     modulesNode    = Y.one('#api-modules'),
     tabviewNode    = Y.one('#api-tabview'),
@@ -97,7 +98,9 @@ tabview.get('panelNode').all('a').each(function (link) {
 
 // -- Private Functions --------------------------------------------------------
 function getFilterResultNode() {
-    return filter.get('queryType') === 'classes' ? classesNode : modulesNode;
+    var queryType = filter.get('queryType');
+    return queryType === 'classes' ? classesNode
+            : queryType === 'elements' ? elementsNode : modulesNode;
 }
 
 // -- Event Handlers -----------------------------------------------------------
@@ -105,7 +108,7 @@ function onFilterResults(e) {
     var frag         = Y.one(Y.config.doc.createDocumentFragment()),
         resultNode   = getFilterResultNode(),
         typePlural   = filter.get('queryType'),
-        typeSingular = typePlural === 'classes' ? 'class' : 'module';
+        typeSingular = typePlural === 'classes' ? 'class' : typePlural === 'elements' ? 'element' : 'module';
 
     if (e.results.length) {
         YArray.each(e.results, function (result) {
@@ -181,6 +184,7 @@ function onTabSelectionChange(e) {
     };
 
     switch (name) {
+    case 'elements':// fallthru
     case 'classes': // fallthru
     case 'modules':
         filter.setAttrs({
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
old mode 100644
new mode 100755
index c64bb46326..af9ac32209
--- a/docs/assets/js/apidocs.js
+++ b/docs/assets/js/apidocs.js
@@ -43,6 +43,12 @@ pjax = new Y.Pjax({
             callbacks: defaultRoute
         },
 
+        // -- /elements/* -------------------------------------------------------
+        {
+            path     : '/elements/:element.html*',
+            callbacks: defaultRoute
+        },
+
         // -- /classes/* -------------------------------------------------------
         {
             path     : '/classes/:class.html*',
@@ -167,7 +173,7 @@ pjax.initLineNumbers = function () {
 };
 
 pjax.initRoot = function () {
-    var terminators = /^(?:classes|files|modules)$/,
+    var terminators = /^(?:classes|files|elements|modules)$/,
         parts       = pjax._getPathRoot().split('/'),
         root        = [],
         i, len, part;
@@ -284,7 +290,7 @@ pjax.handleClasses = function (req, res, next) {
     var status = res.ioResponse.status;
 
     // Handles success and local filesystem XHRs.
-    if (!status || (status >= 200 && status < 300)) {
+    if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
         pjax.initClassTabView();
     }
 
@@ -295,7 +301,7 @@ pjax.handleFiles = function (req, res, next) {
     var status = res.ioResponse.status;
 
     // Handles success and local filesystem XHRs.
-    if (!status || (status >= 200 && status < 300)) {
+    if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
         pjax.initLineNumbers();
     }
 
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
old mode 100644
new mode 100755
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 800aa57e38..79a3caa108 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <link rel="icon" href="../assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,2253 +25,2553 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1>Roles Class</h1>
+<h1>Roles Class</h1>
 <div class="box meta">
-    
 
-    
 
-    
         <div class="foundat">
-            Defined in: <a href="../files/roles_roles_common.js.html#l17"><code>roles&#x2F;roles_common.js:17</code></a>
+            Defined in: <a href="../files/roles_roles_common.js.html#l31"><code>roles&#x2F;roles_common.js:31</code></a>
         </div>
-    
 
-    
-        
             Module: <a href="../modules/Roles.html">Roles</a>
-        
-    
 
-    
 </div>
 
 
-
 <div class="box intro">
-    <p>Authorization package compatible with built-in Meteor accounts system.</p>
-<p>Stores user&#39;s current roles in a &#39;roles&#39; field on the user object.</p>
-
-</div>
-
-
-    <div class="constructor">
-        <h2>Constructor</h2>
-        <div id="method_Roles" class="method item">
-    <h3 class="name"><code>Roles</code></h3>
-
-    
-        <span class="paren">()</span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l17"><code>roles&#x2F;roles_common.js:17</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-    
-
-    
-
     
 </div>
 
-    </div>
-
 
 <div id="classdocs" class="tabview">
     <ul class="api-class-tabs">
         <li class="api-class-tab index"><a href="#index">Index</a></li>
 
-        
             <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
-        
-        
             <li class="api-class-tab properties"><a href="#properties">Properties</a></li>
-        
-        
-        
     </ul>
 
     <div>
         <div id="index" class="api-class-tabpanel index">
             <h2 class="off-left">Item Index</h2>
 
-            
                 <div class="index-section methods">
                     <h3>Methods</h3>
 
                     <ul class="index-list methods">
-                        
-                            <li class="index-item method protected">
-                                <a href="#method__update_$addToSet_fn">_update_$addToSet_fn</a>
+                            <li class="index-item method private">
+                                <a href="#method__addUserToRole">_addUserToRole</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
-                            <li class="index-item method protected">
-                                <a href="#method__update_$set_fn">_update_$set_fn</a>
+                            <li class="index-item method private">
+                                <a href="#method__assureConsistency">_assureConsistency</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
-                            <li class="index-item method protected">
-                                <a href="#method__updateUserRoles">_updateUserRoles</a>
+                            <li class="index-item method private">
+                                <a href="#method__backwardMigrate">_backwardMigrate</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__checkRoleName">_checkRoleName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__convertToNewField">_convertToNewField</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__convertToOldField">_convertToOldField</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__defaultUpdateUser">_defaultUpdateUser</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__forwardMigrate">_forwardMigrate</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__isNewField">_isNewField</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__isOldField">_isOldField</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__onlyAssignedMatcher">_onlyAssignedMatcher</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__partitionMatcher">_partitionMatcher</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__removeUserFromRole">_removeUserFromRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__resolveUser">_resolveUser</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__roleAndPartitionMatcher">_roleAndPartitionMatcher</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__roleMatcher">_roleMatcher</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_addRoleParent">addRoleParent</a>
+
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_addUsersToRoles">addUsersToRoles</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_createRole">createRole</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_deleteRole">deleteRole</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_getAllRoles">getAllRoles</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
-                            <li class="index-item method">
+                            <li class="index-item method deprecated">
                                 <a href="#method_getGroupsForUser">getGroupsForUser</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
+                                    <span class="flag deprecated">deprecated</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getPartitionsForUser">getPartitionsForUser</a>
+
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_getRolesForUser">getRolesForUser</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_getUsersInRole">getUsersInRole</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_removeRoleParent">removeRoleParent</a>
+
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_removeUsersFromRoles">removeUsersFromRoles</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_setUserRoles">setUserRoles</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
                             <li class="index-item method">
                                 <a href="#method_userIsInRole">userIsInRole</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
                     </ul>
                 </div>
-            
 
-            
                 <div class="index-section properties">
                     <h3>Properties</h3>
 
                     <ul class="index-list properties">
-                        
-                            <li class="index-item property">
+                            <li class="index-item property deprecated">
                                 <a href="#property_GLOBAL_GROUP">GLOBAL_GROUP</a>
 
-                                
                                     <span class="flag static">static</span>
-                                
-                                
+                                    <span class="flag deprecated">deprecated</span>
                             </li>
-                        
                             <li class="index-item property">
                                 <a href="#property_subscription">subscription</a>
 
-                                
-                                
+                                    <span class="flag static">static</span>
                             </li>
-                        
                     </ul>
                 </div>
-            
 
-            
 
-            
         </div>
 
-        
             <div id="methods" class="api-class-tabpanel">
                 <h2 class="off-left">Methods</h2>
 
-                
-                    <div id="method__update_$addToSet_fn" class="method item protected">
-    <h3 class="name"><code>_update_$addToSet_fn</code></h3>
+<div id="method__addUserToRole" class="method item private">
+    <h3 class="name"><code>_addUserToRole</code></h3>
 
-    
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
-            
                 <li class="arg">
-                    
-                        <code>roles</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-    
-
-    
-
-    
-        <span class="flag protected">protected</span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l558"><code>roles&#x2F;roles_common.js:558</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Private function &#39;template&#39; that uses $addToSet to construct an update 
-object for MongoDB.  Passed to _updateUserRoles</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">roles</code>
-                        <span class="type">Array</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                
-                    
-                        <span class="type">Object</span>:
-                    
-                    <p>update object for use in MongoDB update command</p>
-
-                
-            </div>
-        </div>
-    
-
-    
-</div>
-
-                
-                    <div id="method__update_$set_fn" class="method item protected">
-    <h3 class="name"><code>_update_$set_fn</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>roles</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-    
-
-    
-
-    
-        <span class="flag protected">protected</span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l533"><code>roles&#x2F;roles_common.js:533</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Private function &#39;template&#39; that uses $set to construct an update object
-for MongoDB.  Passed to _updateUserRoles</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">roles</code>
-                        <span class="type">Array</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                
-                    
-                        <span class="type">Object</span>:
-                    
-                    <p>update object for use in MongoDB update command</p>
-
-                
-            </div>
-        </div>
-    
-
-    
-</div>
-
-                
-                    <div id="method__updateUserRoles" class="method item protected">
-    <h3 class="name"><code>_updateUserRoles</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>users</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code>roles</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code>group</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code>updateFactory</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code>roles</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-
-    
-
-    
-        <span class="flag protected">protected</span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l584"><code>roles&#x2F;roles_common.js:584</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Internal function that uses the Template pattern to adds or sets roles 
-for users.</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>user id(s) or object(s) with an _id field</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>name(s) of roles/permissions to add users to</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name">group</code>
-                        <span class="type">String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Group name. If not null or undefined, roles will be
-                        specific to that group.<br>                        Group names can not start with &#39;$&#39;.
-                        Periods in names &#39;.&#39; are automatically converted
-                        to underscores.
-                        The special group Roles.GLOBAL_GROUP provides 
-                        a convenient way to assign blanket roles/permissions
-                        across all groups.  The roles/permissions in the 
-                        Roles.GLOBAL_GROUP group will be automatically 
-                        included in checks for any group.</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name">updateFactory</code>
-                        <span class="type">Function</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Func which returns an update object that
-                        will be passed to Mongo.</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name">roles</code>
-                        <span class="type">Array</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-
-    
-</div>
-
-                
-                    <div id="method_addUsersToRoles" class="method item">
-    <h3 class="name"><code>addUsersToRoles</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>users</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code>roles</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l112"><code>roles&#x2F;roles_common.js:112</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Add users to roles. Will create roles as needed.</p>
-<p>NOTE: Mixing grouped and non-grouped roles for the same user
-      is not supported and will throw an error.</p>
-<p>Makes 2 calls to database:</p>
-<ol>
-<li>retrieve list of all existing roles</li>
-<li>update users&#39; roles</li>
-</ol>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>User id(s) or object(s) with an _id field</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Name(s) of roles/permissions to add users to</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Optional group name. If supplied, roles will be
-                        specific to that group.<br>                        Group names can not start with a &#39;$&#39; or contain
-                        null characters.  Periods in names &#39;.&#39; are
-                        automatically converted to underscores.
-                        The special group Roles.GLOBAL_GROUP provides 
-                        a convenient way to assign blanket roles/permissions
-                        across all groups.  The roles/permissions in the 
-                        Roles.GLOBAL_GROUP group will be automatically 
-                        included in checks for any group.</p>
-
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-
-    
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.addUsersToRoles(userId, &#39;admin&#39;)
-Roles.addUsersToRoles(userId, [&#39;view-secrets&#39;], &#39;example.com&#39;)
-Roles.addUsersToRoles([user1, user2], [&#39;user&#39;,&#39;editor&#39;])
-Roles.addUsersToRoles([user1, user2], [&#39;glorious-admin&#39;, &#39;perform-action&#39;], &#39;example.org&#39;)
-Roles.addUsersToRoles(userId, &#39;admin&#39;, Roles.GLOBAL_GROUP)</code></pre>
-
-            </div>
-        </div>
-    
-</div>
-
-                
-                    <div id="method_createRole" class="method item">
-    <h3 class="name"><code>createRole</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>role</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-        <span class="returns-inline">
-            <span class="type">String</span>
-        </span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l55"><code>roles&#x2F;roles_common.js:55</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Create a new role. Whitespace will be trimmed.</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">role</code>
-                        <span class="type">String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Name of role</p>
-
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                
-                    
-                        <span class="type">String</span>:
-                    
-                    <p>id of new role</p>
-
-                
-            </div>
-        </div>
-    
-
-    
-</div>
-
-                
-                    <div id="method_deleteRole" class="method item">
-    <h3 class="name"><code>deleteRole</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>role</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l88"><code>roles&#x2F;roles_common.js:88</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Delete an existing role.  Will throw &quot;Role in use&quot; error if any users
-are currently assigned to the target role.</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">role</code>
-                        <span class="type">String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Name of role</p>
-
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-
-    
-</div>
-
-                
-                    <div id="method_getAllRoles" class="method item">
-    <h3 class="name"><code>getAllRoles</code></h3>
-
-    
-        <span class="paren">()</span>
-    
-
-    
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l408"><code>roles&#x2F;roles_common.js:408</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Retrieve set of all existing roles</p>
-
-    </div>
-
-    
-
-    
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                
-                    
-                        <span class="type">Cursor</span>:
-                    
-                    <p>cursor of existing roles</p>
-
-                
-            </div>
-        </div>
-    
-
-    
-</div>
-
-                
-                    <div id="method_getGroupsForUser" class="method item">
-    <h3 class="name"><code>getGroupsForUser</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
                         <code>user</code>
-                    
                 </li>
-            
                 <li class="arg">
-                    
-                        <code class="optional">[role]</code>
-                    
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>options</code>
                 </li>
-            
             </ul><span class="paren">)</span>
         </div>
-    
 
-    
         <span class="returns-inline">
             <span class="type">Array</span>
         </span>
-    
 
-    
 
-    
+        <span class="flag private">private</span>
 
-    
 
-    
+        <span class="flag static">static</span>
 
-    
 
-    
 
     <div class="meta">
-        
-            
-                
                 <p>
-                
                 Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l485"><code>roles&#x2F;roles_common.js:485</code></a>
-        
+        <a href="../files/roles_roles_common.js.html#l394"><code>roles&#x2F;roles_common.js:394</code></a>
         </p>
 
 
-        
 
-        
     </div>
 
     <div class="description">
-        <p>Retrieve users groups, if any</p>
+        <p>Add one user to one role.</p>
 
     </div>
 
-    
         <div class="params">
             <h4>Parameters:</h4>
 
             <ul class="params-list">
-            
                 <li class="param">
-                    
                         <code class="param-name">user</code>
                         <span class="type">String | Object</span>
-                    
 
-                    
 
                     <div class="param-description">
-                        <p>User Id or actual user object</p>
+                        <p>User ID or object with an <code>_id</code> field.</p>
 
                     </div>
 
-                    
                 </li>
-            
                 <li class="param">
-                    
-                        <code class="param-name optional">[role]</code>
+                        <code class="param-name">roleName</code>
                         <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
 
-                    
 
                     <div class="param-description">
-                        <p>Optional name of roles to restrict groups to.</p>
+                        <p>Name of the role to add the user to. The role have to exist.</p>
 
                     </div>
 
-                    
                 </li>
-            
-            </ul>
-        </div>
-    
-
-    
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                
-                    
-                        <span class="type">Array</span>:
-                    
-                    <p>Array of user&#39;s groups, unsorted. Roles.GLOBAL_GROUP will be omitted</p>
-
-                
-            </div>
-        </div>
-    
-
-    
-</div>
-
-                
-                    <div id="method_getRolesForUser" class="method item">
-    <h3 class="name"><code>getRolesForUser</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>user</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l366"><code>roles&#x2F;roles_common.js:366</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Retrieve users roles</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
                 <li class="param">
-                    
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>User Id or actual user object</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Optional name of group to restrict roles to.
-                        User&#39;s Roles.GLOBAL_GROUP will also be included.</p>
-
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                
-                    
-                        <span class="type">Array</span>:
-                    
-                    <p>Array of user&#39;s roles, unsorted.</p>
-
-                
-            </div>
-        </div>
-    
-
-    
-</div>
-
-                
-                    <div id="method_getUsersInRole" class="method item">
-    <h3 class="name"><code>getUsersInRole</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>role</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[options]</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l418"><code>roles&#x2F;roles_common.js:418</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Retrieve all users who are in target role.  </p>
-<p>NOTE: This is an expensive query; it performs a full collection scan
-on the users collection since there is no index set on the &#39;roles&#39; field.<br>This is by design as most queries will specify an _id so the _id index is 
-used automatically.</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">role</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Name of role/permission.  If array, users 
-                           returned will have at least one of the roles
-                           specified but need not have <em>all</em> roles.</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Optional name of group to restrict roles to.
-                        User&#39;s Roles.GLOBAL_GROUP will also be checked.</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[options]</code>
+                        <code class="param-name">options</code>
                         <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
 
-                    
 
                     <div class="param-description">
-                        <p>Optional options which are passed directly
-                          through to <code>Meteor.users.find(query, options)</code></p>
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+<li><code>_assigned</code>: internal option, should not be used publicly because it will break assumptions
+in te code; publicly, you can only add users to an assigned role
+should the role be set as assigned, default is <code>true</code>; <code>null</code> is the same as <code>false</code>,
+only that it does not force the value to <code>false</code> if the role is already assigned</li>
+</ul>
 
                     </div>
 
-                    
                 </li>
-            
             </ul>
         </div>
-    
 
-    
         <div class="returns">
             <h4>Returns:</h4>
 
             <div class="returns-description">
-                
-                    
-                        <span class="type">Cursor</span>:
-                    
-                    <p>cursor of users in role</p>
-
-                
-            </div>
-        </div>
-    
-
-    
-</div>
-
-                
-                    <div id="method_removeUsersFromRoles" class="method item">
-    <h3 class="name"><code>removeUsersFromRoles</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
-                        <code>users</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code>roles</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l177"><code>roles&#x2F;roles_common.js:177</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Remove users from roles</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>User id(s) or object(s) with an _id field</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to add users to</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Optional. Group name. If supplied, only that
-                        group will have roles removed.</p>
-
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-
-    
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.removeUsersFromRoles(users.bob, &#39;admin&#39;)
-Roles.removeUsersFromRoles([users.bob, users.joe], [&#39;editor&#39;])
-Roles.removeUsersFromRoles([users.bob, users.joe], [&#39;editor&#39;, &#39;user&#39;])
-Roles.removeUsersFromRoles(users.eve, [&#39;user&#39;], &#39;group1&#39;)</code></pre>
+                        <span class="type">Array</span>:
+                    <p>Roles set during the call (even those already set).</p>
 
             </div>
         </div>
-    
+
+
 </div>
+<div id="method__assureConsistency" class="method item private">
+    <h3 class="name"><code>_assureConsistency</code></h3>
 
-                
-                    <div id="method_setUserRoles" class="method item">
-    <h3 class="name"><code>setUserRoles</code></h3>
-
-    
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
-            
                 <li class="arg">
-                    
-                        <code>users</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code>roles</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
-            </ul><span class="paren">)</span>
-        </div>
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    <div class="meta">
-        
-            
-                
-                <p>
-                
-                Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l148"><code>roles&#x2F;roles_common.js:148</code></a>
-        
-        </p>
-
-
-        
-
-        
-    </div>
-
-    <div class="description">
-        <p>Set a users roles/permissions.</p>
-
-    </div>
-
-    
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-            
-                <li class="param">
-                    
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>User id(s) or object(s) with an _id field</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Name(s) of roles/permissions to add users to</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Optional group name. If supplied, roles will be
-                        specific to that group.<br>                        Group names can not start with &#39;$&#39;.
-                        Periods in names &#39;.&#39; are automatically converted
-                        to underscores.
-                        The special group Roles.GLOBAL_GROUP provides 
-                        a convenient way to assign blanket roles/permissions
-                        across all groups.  The roles/permissions in the 
-                        Roles.GLOBAL_GROUP group will be automatically 
-                        included in checks for any group.</p>
-
-                    </div>
-
-                    
-                </li>
-            
-            </ul>
-        </div>
-    
-
-    
-
-    
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.setUserRoles(userId, &#39;admin&#39;)
-Roles.setUserRoles(userId, [&#39;view-secrets&#39;], &#39;example.com&#39;)
-Roles.setUserRoles([user1, user2], [&#39;user&#39;,&#39;editor&#39;])
-Roles.setUserRoles([user1, user2], [&#39;glorious-admin&#39;, &#39;perform-action&#39;], &#39;example.org&#39;)
-Roles.setUserRoles(userId, &#39;admin&#39;, Roles.GLOBAL_GROUP)</code></pre>
-
-            </div>
-        </div>
-    
-</div>
-
-                
-                    <div id="method_userIsInRole" class="method item">
-    <h3 class="name"><code>userIsInRole</code></h3>
-
-    
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-            
-                <li class="arg">
-                    
                         <code>user</code>
-                    
                 </li>
-            
-                <li class="arg">
-                    
-                        <code>roles</code>
-                    
-                </li>
-            
-                <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
-                </li>
-            
             </ul><span class="paren">)</span>
         </div>
-    
 
-    
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l631"><code>roles&#x2F;roles_common.js:631</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Makes sure all subroles are correctly set, and no extra subroles are set which should not be.</p>
+<p>Used internally after complicated changes, but it can also be used whenever one feels that
+there might be inconsistencies (eg., after a crash).</p>
+<p>We simply re-set to the user their assigned roles again and remove any roles which
+are marked as not explicitly assigned, and have not been part of what we currently set.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__backwardMigrate" class="method item private">
+    <h3 class="name"><code>_backwardMigrate</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>updateUser</code>
+                </li>
+                <li class="arg">
+                        <code>usingGroups</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l183"><code>roles&#x2F;roles_server.js:183</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Migrates <code>Meteor.users</code> and <code>Meteor.roles</code> to the old format.</p>
+<p>We assume that we are converting back a failed migration, so values can only be
+what were valid values in the old format. So no group names starting with <code>$</code> and
+no subroles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">updateUser</code>
+                        <span class="type">Function</span>
+
+
+                    <div class="param-description">
+                        <p>Function which updates the user object. Default <code>_defaultUpdateUser</code>.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">usingGroups</code>
+                        <span class="type">Boolean</span>
+
+
+                    <div class="param-description">
+                        <p>Should we use groups or not.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__checkRoleName" class="method item private">
+    <h3 class="name"><code>_checkRoleName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1062"><code>roles&#x2F;roles_common.js:1062</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Throw an exception if <code>roleName</code> is an invalid role name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A role name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__convertToNewField" class="method item private">
+    <h3 class="name"><code>_convertToNewField</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l56"><code>roles&#x2F;roles_server.js:56</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array</span>
+
+
+                    <div class="param-description">
+                        <p><code>Meteor.users</code> document <code>roles</code> field in the old format.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Array</span>:
+                    <p>Converted <code>roles</code> to the new format.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__convertToOldField" class="method item private">
+    <h3 class="name"><code>_convertToOldField</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l96"><code>roles&#x2F;roles_server.js:96</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array</span>
+
+
+                    <div class="param-description">
+                        <p><code>Meteor.users</code> document <code>roles</code> field in the new format.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Array</span>:
+                    <p>Converted <code>roles</code> to the old format.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__defaultUpdateUser" class="method item private">
+    <h3 class="name"><code>_defaultUpdateUser</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Array | Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l144"><code>roles&#x2F;roles_server.js:144</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p><code>Meteor.users</code> document.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Array | Object</span>:
+                    <p>roles Value to which user's <code>roles</code> field should be set.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__forwardMigrate" class="method item private">
+    <h3 class="name"><code>_forwardMigrate</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>updateUser</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l162"><code>roles&#x2F;roles_server.js:162</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Migrates <code>Meteor.users</code> and <code>Meteor.roles</code> to the new format.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">updateUser</code>
+                        <span class="type">Function</span>
+
+
+                    <div class="param-description">
+                        <p>Function which updates the user object. Default <code>_defaultUpdateUser</code>.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__isNewField" class="method item private">
+    <h3 class="name"><code>_isNewField</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
         <span class="returns-inline">
             <span class="type">Boolean</span>
         </span>
-    
 
-    
 
-    
+        <span class="flag private">private</span>
 
-    
 
-    
+        <span class="flag static">static</span>
 
-    
 
-    
 
     <div class="meta">
-        
-            
-                
                 <p>
-                
                 Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l254"><code>roles&#x2F;roles_common.js:254</code></a>
-        
+        <a href="../files/roles_roles_server.js.html#l30"><code>roles&#x2F;roles_server.js:30</code></a>
         </p>
 
 
-        
 
-        
     </div>
 
     <div class="description">
-        <p>Check if user has specified permissions/roles</p>
-
+        
     </div>
 
-    
         <div class="params">
             <h4>Parameters:</h4>
 
             <ul class="params-list">
-            
                 <li class="param">
-                    
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>User Id or actual user object</p>
-
-                    </div>
-
-                    
-                </li>
-            
-                <li class="param">
-                    
                         <code class="param-name">roles</code>
-                        <span class="type">String | Array</span>
-                    
+                        <span class="type">Array</span>
 
-                    
 
                     <div class="param-description">
-                        <p>Name of role/permission or Array of 
-                           roles/permissions to check against.  If array, 
-                           will return true if user is in <em>any</em> role.</p>
+                        <p><code>Meteor.users</code> document <code>roles</code> field.</p>
 
                     </div>
 
-                    
                 </li>
-            
-                <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
-
-                    
-
-                    <div class="param-description">
-                        <p>Optional. Name of group.  If supplied, limits check
-                        to just that group.
-                        The user&#39;s Roles.GLOBAL_GROUP will always be checked
-                        whether group is specified or not.</p>
-
-                    </div>
-
-                    
-                </li>
-            
             </ul>
         </div>
-    
 
-    
         <div class="returns">
             <h4>Returns:</h4>
 
             <div class="returns-description">
-                
-                    
                         <span class="type">Boolean</span>:
-                    
-                    <p>true if user is in <em>any</em> of the target roles</p>
+                    <p>Returns <code>true</code> if the <code>roles</code> field is in the new format.
+If it is ambiguous or it is not, returns <code>false</code>.</p>
 
-                
             </div>
         </div>
-    
 
-    
+
+</div>
+<div id="method__isOldField" class="method item private">
+    <h3 class="name"><code>_isOldField</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l43"><code>roles&#x2F;roles_server.js:43</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array</span>
+
+
+                    <div class="param-description">
+                        <p><code>Meteor.users</code> document <code>roles</code> field.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Boolean</span>:
+                    <p>Returns <code>true</code> if the <code>roles</code> field is in the old format.
+If it is ambiguous or it is not, returns <code>false</code>.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__onlyAssignedMatcher" class="method item private">
+    <h3 class="name"><code>_onlyAssignedMatcher</code></h3>
+
+        <span class="paren">()</span>
+
+        <span class="returns-inline">
+            <span class="type">Function</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1049"><code>roles&#x2F;roles_common.js:1049</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Function</span>:
+                    <p>A matcher function which accepts a role object and returns <code>true</code>
+if the role is an assigned role.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__partitionMatcher" class="method item private">
+    <h3 class="name"><code>_partitionMatcher</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>partition</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Function</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1033"><code>roles&#x2F;roles_common.js:1033</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">partition</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A partition to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Function</span>:
+                    <p>A matcher function which accepts a role object and returns <code>true</code>
+if its partition matches <code>partition</code>.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__removeUserFromRole" class="method item private">
+    <h3 class="name"><code>_removeUserFromRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>options</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l564"><code>roles&#x2F;roles_common.js:564</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove one user from one role.</p>
+<p>WARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same
+role to be a child of multiple roles it might happen that it removes some subroles which
+it should not because they are in effect also through some other parent role. You should always
+call <code>_assureConsistency</code> after you are finished with calls to <code>_removeUserFromRole</code> for a
+particular user.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or object with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of the role to add the user to. The role have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">options</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>_assigned</code>: internal option, should not be used publicly because it will break assumptions
+in te code; publicly, you can only add users to an assigned role
+should the role be set as assigned, default is <code>true</code>; <code>null</code> is the same as <code>false</code>,
+only that it does not force the value to <code>false</code> if the role is already assigned</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__resolveUser" class="method item private">
+    <h3 class="name"><code>_resolveUser</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code>force</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l976"><code>roles&#x2F;roles_common.js:976</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Resolves the user ID into an actual user object with <code>roles</code> field,
+if it is not already.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">force</code>
+                        <span class="type">Boolean</span>
+
+
+                    <div class="param-description">
+                        <p>Load a new user object even if it is already one.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>User object.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__roleAndPartitionMatcher" class="method item private">
+    <h3 class="name"><code>_roleAndPartitionMatcher</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>partition</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Function</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1016"><code>roles&#x2F;roles_common.js:1016</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A role name to match against.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">partition</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A partition to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Function</span>:
+                    <p>A matcher function which accepts a role object and returns <code>true</code>
+if its name matches <code>roleName</code>, and partition matches <code>partition</code>.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__roleMatcher" class="method item private">
+    <h3 class="name"><code>_roleMatcher</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Function</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1002"><code>roles&#x2F;roles_common.js:1002</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A role name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Function</span>:
+                    <p>A matcher function which accepts a role object and returns <code>true</code>
+if its name matches <code>roleName</code>.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_addRoleParent" class="method item">
+    <h3 class="name"><code>addRoleParent</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l143"><code>roles&#x2F;roles_common.js:143</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Add role parent to the role.</p>
+<p>Previous parents are kept (role can have multiple parents). For users which have the
+parent role set, new subroles are added automatically.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_addUsersToRoles" class="method item">
+    <h3 class="name"><code>addUsersToRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l276"><code>roles&#x2F;roles_common.js:276</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Add users to roles.</p>
+<p>Adds roles to existing roles for each user.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+</ul>
+<p>Alternatively, it can be a partition name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
         <div class="example">
             <h4>Example:</h4>
 
             <div class="example-content">
-                <pre class="code prettyprint"><code>// non-group usage
-Roles.userIsInRole(user, &#39;admin&#39;)
-Roles.userIsInRole(user, [&#39;admin&#39;,&#39;editor&#39;])
-Roles.userIsInRole(userId, &#39;admin&#39;)
-Roles.userIsInRole(userId, [&#39;admin&#39;,&#39;editor&#39;])
-
-// per-group usage
-Roles.userIsInRole(user,   [&#39;admin&#39;,&#39;editor&#39;], &#39;group1&#39;)
-Roles.userIsInRole(userId, [&#39;admin&#39;,&#39;editor&#39;], &#39;group1&#39;)
-Roles.userIsInRole(userId, [&#39;admin&#39;,&#39;editor&#39;], Roles.GLOBAL_GROUP)
-
-// this format can also be used as short-hand for Roles.GLOBAL_GROUP
-Roles.userIsInRole(user, &#39;admin&#39;)</code></pre>
+                <pre class="code prettyprint"><code>Roles.addUsersToRoles(userId, 'admin')
+Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+Roles.addUsersToRoles([user1, user2], ['user','editor'])
+Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
 
             </div>
         </div>
-    
 </div>
+<div id="method_createRole" class="method item">
+    <h3 class="name"><code>createRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">String</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l53"><code>roles&#x2F;roles_common.js:53</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Create a new role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>unlessExists</code>: if <code>true</code>, exception will not be thrown in the role already exists</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">String</span>:
+                    <p>ID of the new role.</p>
 
-                
             </div>
-        
+        </div>
+
+
+</div>
+<div id="method_deleteRole" class="method item">
+    <h3 class="name"><code>deleteRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l91"><code>roles&#x2F;roles_common.js:91</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Delete an existing role.</p>
+<p>If the role is set for any user, it is automatically unset.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_getAllRoles" class="method item">
+    <h3 class="name"><code>getAllRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code class="optional">[queryOptions]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l843"><code>roles&#x2F;roles_common.js:843</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve cursor of all existing roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name optional">[queryOptions]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>Meteor.roles.find(query, options)</code>.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Cursor</span>:
+                    <p>Cursor of existing roles.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getGroupsForUser" class="method item deprecated">
+    <h3 class="name"><code>getGroupsForUser</code></h3>
+
+        <span class="paren">()</span>
+
+
+        <span class="flag deprecated">deprecated</span>
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l928"><code>roles&#x2F;roles_common.js:928</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Deprecated. Use <code>getPartitionsForUser</code> instead.</p>
+
+    </div>
+
+
+
+
+</div>
+<div id="method_getPartitionsForUser" class="method item">
+    <h3 class="name"><code>getPartitionsForUser</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[roles]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l944"><code>roles&#x2F;roles_common.js:944</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve users partitions, if any.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[roles]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Name of roles to restrict partitions to.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Array</span>:
+                    <p>Array of user's partitions, unsorted.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getRolesForUser" class="method item">
+    <h3 class="name"><code>getRolesForUser</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l789"><code>roles&#x2F;roles_common.js:789</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve user's roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of partition to provide roles for; if not specified, global roles are returned</li>
+<li><code>anyPartition</code>: if set, role can be in any partition (<code>partition</code> option is ignored)</li>
+<li><code>fullObjects</code>: return full roles objects (<code>true</code>) or just names (<code>false</code>) (default <code>false</code>)</li>
+<li><code>onlyAssigned</code>: return only assigned roles and not automatically inferred (like subroles)</li>
+</ul>
+<p>Alternatively, it can be a partition name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Array</span>:
+                    <p>Array of user's roles, unsorted.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getUsersInRole" class="method item">
+    <h3 class="name"><code>getUsersInRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[queryOptions]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l858"><code>roles&#x2F;roles_common.js:858</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve all users who are in target role.</p>
+<p>Options:</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">String | Array</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles. If array, users
+returned will have at least one of the roles
+specified but need not have <em>all</em> roles.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of the partition to restrict roles to; user's global
+roles will also be checked</li>
+<li><code>anyPartition</code>: if set, role can be in any partition (<code>partition</code> option is ignored)</li>
+<li><code>queryOptions</code>: options which are passed directly
+through to <code>Meteor.users.find(query, options)</code></li>
+</ul>
+<p>Alternatively, it can be a partition name string.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[queryOptions]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>Meteor.users.find(query, options)</code></p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Cursor</span>:
+                    <p>Cursor of users in roles.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_removeRoleParent" class="method item">
+    <h3 class="name"><code>removeRoleParent</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l210"><code>roles&#x2F;roles_common.js:210</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove role parent from the role.</p>
+<p>Other parents are kept (role can have multiple parents). For users which have the
+parent role set, removed subrole is removed automatically.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_removeUsersFromRoles" class="method item">
+    <h3 class="name"><code>removeUsersFromRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l513"><code>roles&#x2F;roles_common.js:513</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove users from assigned roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+</ul>
+<p>Alternatively, it can be a partition name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.removeUsersFromRoles(userId, 'admin')
+Roles.removeUsersFromRoles([userId, user2], ['editor'])
+Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_setUserRoles" class="method item">
+    <h3 class="name"><code>setUserRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l329"><code>roles&#x2F;roles_common.js:329</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Set users' roles.</p>
+<p>Replaces all existing roles with a new set of roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+</ul>
+<p>Alternatively, it can be a partition name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.setUserRoles(userId, 'admin')
+Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+Roles.setUserRoles([user1, user2], ['user','editor'])
+Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_userIsInRole" class="method item">
+    <h3 class="name"><code>userIsInRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l687"><code>roles&#x2F;roles_common.js:687</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Check if user has specified roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">String | Array</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles to check against. If array,
+will return <code>true</code> if user is in <em>any</em> role.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of the partition; if supplied, limits check to just that partition;
+the user's global roles will always be checked whether partition is specified or not</li>
+<li><code>anyPartition</code>: if set, role can be in any partition (<code>partition</code> option is ignored)</li>
+</ul>
+<p>Alternatively, it can be a partition name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Boolean</span>:
+                    <p><code>true</code> if user is in <em>any</em> of the target roles</p>
+
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>// global roles
+Roles.userIsInRole(user, 'admin')
+Roles.userIsInRole(user, ['admin','editor'])
+Roles.userIsInRole(userId, 'admin')
+Roles.userIsInRole(userId, ['admin','editor'])
+
+// partition roles (global roles are still checked)
+Roles.userIsInRole(user, 'admin', 'group1')
+Roles.userIsInRole(userId, ['admin','editor'], 'group1')
+Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})</code></pre>
+
+            </div>
+        </div>
+</div>
+            </div>
 
-        
             <div id="properties" class="api-class-tabpanel">
                 <h2 class="off-left">Properties</h2>
 
-                
-                    <div id="property_GLOBAL_GROUP" class="property item">
+<div id="property_GLOBAL_GROUP" class="property item deprecated">
     <h3 class="name"><code>GLOBAL_GROUP</code></h3>
-    <span class="type">String</span>
+    <span class="type">Unknown</span>
 
-    
+        <span class="flag deprecated">deprecated</span>
 
-    
 
-    
-        <span class="flag final">final</span>
-    
 
-    
         <span class="flag static">static</span>
-    
 
     <div class="meta">
-        
-            
-                
                 <p>
-                
                 Defined in
-                
-            
-        
-        
-        <a href="../files/roles_roles_common.js.html#l35"><code>roles&#x2F;roles_common.js:35</code></a>
-        
+        <a href="../files/roles_roles_common.js.html#l44"><code>roles&#x2F;roles_common.js:44</code></a>
         </p>
 
-        
 
-        
     </div>
 
     <div class="description">
-        <p>Constant used to reference the special &#39;global&#39; group that 
-can be used to apply blanket permissions across all groups.</p>
+        <p>Used as a global group (now partition) name. Not used anymore.</p>
 
     </div>
 
-    
 
-    
-        <div class="example">
-            <h4>Example:</h4>
 
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.addUsersToRoles(user, &#39;admin&#39;, Roles.GLOBAL_GROUP)
-Roles.userIsInRole(user, &#39;admin&#39;) // =&gt; true
-
-Roles.setUserRoles(user, &#39;support-staff&#39;, Roles.GLOBAL_GROUP)
-Roles.userIsInRole(user, &#39;support-staff&#39;) // =&gt; true
-Roles.userIsInRole(user, &#39;admin&#39;) // =&gt; false</code></pre>
-
-            </div>
-        </div>
-    
-
-    
 </div>
-
-                
-                    <div id="property_subscription" class="property item">
+<div id="property_subscription" class="property item">
     <h3 class="name"><code>subscription</code></h3>
     <span class="type">Object</span>
 
-    
 
-    
 
-    
 
-    
+        <span class="flag static">static</span>
 
     <div class="meta">
-        
-            
-                
                 <p>
-                
                 Defined in
-                
-            
-        
-        
-        <a href="../files/roles_client_subscriptions.js.html#l4"><code>roles&#x2F;client&#x2F;subscriptions.js:4</code></a>
-        
+        <a href="../files/roles_client_subscriptions.js.html#l3"><code>roles&#x2F;client&#x2F;subscriptions.js:3</code></a>
         </p>
 
-        
 
-        
     </div>
 
     <div class="description">
-        <p>Subscription handle for the currently logged in user&#39;s permissions.</p>
-<p>NOTE: The corresponding publish function, <code>_roles</code>, depends on
-<code>this.userId</code> so it will automatically re-run when the currently
-logged-in user changes.</p>
+        <p>Subscription handle for the collection of all existing roles.</p>
 
     </div>
 
-    
 
-    
         <div class="example">
             <h4>Example:</h4>
 
             <div class="example-content">
-                <pre class="code prettyprint"><code><code>Roles.subscription.ready()</code> // =&gt; <code>true</code> if user roles have been loaded</code></pre>
+                <pre class="code prettyprint"><code>Roles.subscription.ready(); // true if roles have been loaded</code></pre>
 
             </div>
         </div>
-    
 
-    
 </div>
-
-                
             </div>
-        
 
-        
 
-        
     </div>
 </div>
-
                     </div>
                 </div>
             </div>
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
index c8b9a2ff90..c07d75bf35 100644
--- a/docs/classes/UIHelpers.html
+++ b/docs/classes/UIHelpers.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <link rel="icon" href="../assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,201 +25,138 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1>UIHelpers Class</h1>
+<h1>UIHelpers Class</h1>
 <div class="box meta">
-    
 
-    
 
-    
 
-    
-        
             Module: <a href="../modules/UIHelpers.html">UIHelpers</a>
-        
-    
 
-    
 </div>
 
 
-
 <div class="box intro">
     
 </div>
 
 
-
 <div id="classdocs" class="tabview">
     <ul class="api-class-tabs">
         <li class="api-class-tab index"><a href="#index">Index</a></li>
 
-        
             <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
-        
-        
-        
-        
     </ul>
 
     <div>
         <div id="index" class="api-class-tabpanel index">
             <h2 class="off-left">Item Index</h2>
 
-            
                 <div class="index-section methods">
                     <h3>Methods</h3>
 
                     <ul class="index-list methods">
-                        
                             <li class="index-item method">
                                 <a href="#method_isInRole">isInRole</a>
 
-                                
                                     <span class="flag static">static</span>
-                                
-                                
                             </li>
-                        
                     </ul>
                 </div>
-            
 
-            
 
-            
 
-            
         </div>
 
-        
             <div id="methods" class="api-class-tabpanel">
                 <h2 class="off-left">Methods</h2>
 
-                
-                    <div id="method_isInRole" class="method item">
+<div id="method_isInRole" class="method item">
     <h3 class="name"><code>isInRole</code></h3>
 
-    
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
-            
                 <li class="arg">
-                    
                         <code>role</code>
-                    
                 </li>
-            
                 <li class="arg">
-                    
-                        <code class="optional">[group]</code>
-                    
+                        <code class="optional">[partition]</code>
                 </li>
-            
             </ul><span class="paren">)</span>
         </div>
-    
 
-    
         <span class="returns-inline">
             <span class="type">Boolean</span>
         </span>
-    
 
-    
 
-    
 
-    
 
-    
         <span class="flag static">static</span>
-    
 
-    
 
-    
 
     <div class="meta">
-        
-            
-                
                 <p>
-                
                 Defined in
-                
-            
-        
-        
         <a href="../files/roles_client_uiHelpers.js.html#l24"><code>roles&#x2F;client&#x2F;uiHelpers.js:24</code></a>
-        
         </p>
 
 
-        
 
-        
     </div>
 
     <div class="description">
@@ -230,96 +165,69 @@ of the target roles.  For use in client-side templates.</p>
 
     </div>
 
-    
         <div class="params">
             <h4>Parameters:</h4>
 
             <ul class="params-list">
-            
                 <li class="param">
-                    
                         <code class="param-name">role</code>
                         <span class="type">String</span>
-                    
 
-                    
 
                     <div class="param-description">
-                        <p>Name of role or comma-seperated list of roles</p>
+                        <p>Name of role or comma-seperated list of roles.</p>
 
                     </div>
 
-                    
                 </li>
-            
                 <li class="param">
-                    
-                        <code class="param-name optional">[group]</code>
+                        <code class="param-name optional">[partition]</code>
                         <span class="type">String</span>
                         <span class="flag optional" title="This parameter is optional.">optional</span>
-                    
 
-                    
 
                     <div class="param-description">
-                        <p>Optional, name of group to check</p>
+                        <p>Optional, name of partition to check.</p>
 
                     </div>
 
-                    
                 </li>
-            
             </ul>
         </div>
-    
 
-    
         <div class="returns">
             <h4>Returns:</h4>
 
             <div class="returns-description">
-                
-                    
                         <span class="type">Boolean</span>:
-                    
-                    <p>true if current user is in at least one of the target roles</p>
+                    <p><code>true</code> if current user is in at least one of the target roles.</p>
 
-                
             </div>
         </div>
-    
 
-    
+
         <div class="example">
             <h4>Example:</h4>
 
             <div class="example-content">
-                <pre class="code prettyprint"><code>{{#if isInRole &#39;admin&#39;}}
+                <pre class="code prettyprint"><code>{{#if isInRole 'admin'}}
 {{/if}}
 
-{{#if isInRole &#39;editor,user&#39;}}
+{{#if isInRole 'editor,user'}}
 {{/if}}
 
-{{#if isInRole &#39;editor,user&#39; &#39;group1&#39;}}
+{{#if isInRole 'editor,user' 'partition1'}}
 {{/if}}</code></pre>
 
             </div>
         </div>
-    
 </div>
-
-                
             </div>
-        
 
-        
 
-        
 
-        
     </div>
 </div>
-
                     </div>
                 </div>
             </div>
diff --git a/docs/data.json b/docs/data.json
index 06ac289c79..34dbd72ff8 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -40,7 +40,9 @@
             "name": "roles/roles_server.js",
             "modules": {},
             "classes": {},
-            "fors": {},
+            "fors": {
+                "Roles": 1
+            },
             "namespaces": {}
         }
     },
@@ -48,6 +50,7 @@
         "UIHelpers": {
             "name": "UIHelpers",
             "submodules": {},
+            "elements": {},
             "classes": {
                 "UIHelpers": 1
             },
@@ -63,15 +66,18 @@
         "Roles": {
             "name": "Roles",
             "submodules": {},
+            "elements": {},
             "classes": {
                 "Roles": 1
             },
-            "fors": {},
+            "fors": {
+                "Roles": 1
+            },
             "namespaces": {},
             "tag": "module",
             "file": "roles/roles_common.js",
-            "line": 17,
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages."
+            "line": 31,
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `role`: role name\n - `partition`: partition name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`\n - `name`: role name\n - `children`: list of subdocuments:\n   - `_id`\n   - `name`\n\nChildren list elements are subdocuments so that they can be easier extended in the future.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"123\", name: \"admin\"}`"
         }
     },
     "classes": {
@@ -85,9 +91,7 @@
             "extension_for": [],
             "module": "Roles",
             "file": "roles/roles_common.js",
-            "line": 17,
-            "description": "Authorization package compatible with built-in Meteor accounts system.\n\nStores user's current roles in a 'roles' field on the user object.",
-            "is_constructor": 1
+            "line": 31
         },
         "UIHelpers": {
             "name": "UIHelpers",
@@ -101,17 +105,19 @@
             "namespace": ""
         }
     },
+    "elements": {},
     "classitems": [
         {
             "file": "roles/client/subscriptions.js",
-            "line": 4,
-            "description": "Subscription handle for the currently logged in user's permissions.\n\nNOTE: The corresponding publish function, `_roles`, depends on\n`this.userId` so it will automatically re-run when the currently\nlogged-in user changes.",
+            "line": 3,
+            "description": "Subscription handle for the collection of all existing roles.",
             "example": [
-                "\n\n    `Roles.subscription.ready()` // => `true` if user roles have been loaded"
+                "\n\n    Roles.subscription.ready(); // true if roles have been loaded"
             ],
             "itemtype": "property",
             "name": "subscription",
             "type": "Object",
+            "static": 1,
             "class": "Roles"
         },
         {
@@ -119,25 +125,25 @@
             "line": 24,
             "description": "UI helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
             "example": [
-                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'group1'}}\n    {{/if}}"
+                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'partition1'}}\n    {{/if}}"
             ],
             "itemtype": "method",
             "name": "isInRole",
             "params": [
                 {
                     "name": "role",
-                    "description": "Name of role or comma-seperated list of roles",
+                    "description": "Name of role or comma-seperated list of roles.",
                     "type": "String"
                 },
                 {
-                    "name": "group",
-                    "description": "Optional, name of group to check",
+                    "name": "partition",
+                    "description": "Optional, name of partition to check.",
                     "type": "String",
                     "optional": true
                 }
             ],
             "return": {
-                "description": "true if current user is in at least one of the target roles",
+                "description": "`true` if current user is in at least one of the target roles.",
                 "type": "Boolean"
             },
             "static": 1,
@@ -146,202 +152,328 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 9,
-            "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 35,
-            "description": "Constant used to reference the special 'global' group that \ncan be used to apply blanket permissions across all groups.",
-            "example": [
-                "\n    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)\n    Roles.userIsInRole(user, 'admin') // => true\n\n    Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)\n    Roles.userIsInRole(user, 'support-staff') // => true\n    Roles.userIsInRole(user, 'admin') // => false"
-            ],
+            "line": 44,
+            "description": "Used as a global group (now partition) name. Not used anymore.",
             "itemtype": "property",
             "name": "GLOBAL_GROUP",
-            "type": "String",
             "static": 1,
-            "final": 1,
+            "deprecated": true,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 55,
-            "description": "Create a new role. Whitespace will be trimmed.",
+            "line": 53,
+            "description": "Create a new role.",
             "itemtype": "method",
             "name": "createRole",
             "params": [
                 {
-                    "name": "role",
-                    "description": "Name of role",
+                    "name": "roleName",
+                    "description": "Name of role.",
                     "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `unlessExists`: if `true`, exception will not be thrown in the role already exists",
+                    "type": "Object",
+                    "optional": true
                 }
             ],
             "return": {
-                "description": "id of new role",
+                "description": "ID of the new role.",
                 "type": "String"
             },
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 88,
-            "description": "Delete an existing role.  Will throw \"Role in use\" error if any users\nare currently assigned to the target role.",
+            "line": 91,
+            "description": "Delete an existing role.\n\nIf the role is set for any user, it is automatically unset.",
             "itemtype": "method",
             "name": "deleteRole",
             "params": [
                 {
-                    "name": "role",
-                    "description": "Name of role",
+                    "name": "roleName",
+                    "description": "Name of role.",
                     "type": "String"
                 }
             ],
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 112,
-            "description": "Add users to roles. Will create roles as needed.\n\nNOTE: Mixing grouped and non-grouped roles for the same user\n      is not supported and will throw an error.\n\nMakes 2 calls to database:\n 1. retrieve list of all existing roles\n 2. update users' roles",
+            "line": 143,
+            "description": "Add role parent to the role.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
+            "itemtype": "method",
+            "name": "addRoleParent",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 210,
+            "description": "Remove role parent from the role.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
+            "itemtype": "method",
+            "name": "removeRoleParent",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 276,
+            "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
             "example": [
-                "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')\n    Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)"
+                "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
             ],
             "itemtype": "method",
             "name": "addUsersToRoles",
             "params": [
                 {
                     "name": "users",
-                    "description": "User id(s) or object(s) with an _id field",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
                     "type": "Array|String"
                 },
                 {
                     "name": "roles",
-                    "description": "Name(s) of roles/permissions to add users to",
+                    "description": "Name(s) of roles to add users to. Roles have to exist.",
                     "type": "Array|String"
                 },
                 {
-                    "name": "group",
-                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        Group names can not start with a '$' or contain\n                        null characters.  Periods in names '.' are\n                        automatically converted to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
-                    "type": "String",
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a partition name string.",
+                    "type": "Object|String",
                     "optional": true
                 }
             ],
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 148,
-            "description": "Set a users roles/permissions.",
+            "line": 329,
+            "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
             "example": [
-                "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')\n    Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)"
+                "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
             ],
             "itemtype": "method",
             "name": "setUserRoles",
             "params": [
                 {
                     "name": "users",
-                    "description": "User id(s) or object(s) with an _id field",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
                     "type": "Array|String"
                 },
                 {
                     "name": "roles",
-                    "description": "Name(s) of roles/permissions to add users to",
+                    "description": "Name(s) of roles to add users to. Roles have to exist.",
                     "type": "Array|String"
                 },
                 {
-                    "name": "group",
-                    "description": "Optional group name. If supplied, roles will be\n                        specific to that group.  \n                        Group names can not start with '$'.\n                        Periods in names '.' are automatically converted\n                        to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
-                    "type": "String",
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a partition name string.",
+                    "type": "Object|String",
                     "optional": true
                 }
             ],
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 177,
-            "description": "Remove users from roles",
+            "line": 394,
+            "description": "Add one user to one role.",
+            "itemtype": "method",
+            "name": "_addUserToRole",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or object with an `_id` field.",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "roleName",
+                    "description": "Name of the role to add the user to. The role have to exist.",
+                    "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only add users to an assigned role\n    should the role be set as assigned, default is `true`; `null` is the same as `false`,\n    only that it does not force the value to `false` if the role is already assigned",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Roles set during the call (even those already set).",
+                "type": "Array"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 513,
+            "description": "Remove users from assigned roles.",
             "example": [
-                "\n    Roles.removeUsersFromRoles(users.bob, 'admin')\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])\n    Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])\n    Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')"
+                "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
             ],
             "itemtype": "method",
             "name": "removeUsersFromRoles",
             "params": [
                 {
                     "name": "users",
-                    "description": "User id(s) or object(s) with an _id field",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
                     "type": "Array|String"
                 },
                 {
                     "name": "roles",
-                    "description": "Name(s) of roles to add users to",
+                    "description": "Name(s) of roles to add users to. Roles have to exist.",
                     "type": "Array|String"
                 },
                 {
-                    "name": "group",
-                    "description": "Optional. Group name. If supplied, only that\n                        group will have roles removed.",
-                    "type": "String",
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n\nAlternatively, it can be a partition name string.",
+                    "type": "Object|String",
                     "optional": true
                 }
             ],
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 254,
-            "description": "Check if user has specified permissions/roles",
+            "line": 564,
+            "description": "Remove one user from one role.\n\nWARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same\nrole to be a child of multiple roles it might happen that it removes some subroles which\nit should not because they are in effect also through some other parent role. You should always\ncall `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a\nparticular user.",
+            "itemtype": "method",
+            "name": "_removeUserFromRole",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or object with an `_id` field.",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "roleName",
+                    "description": "Name of the role to add the user to. The role have to exist.",
+                    "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only add users to an assigned role\n    should the role be set as assigned, default is `true`; `null` is the same as `false`,\n    only that it does not force the value to `false` if the role is already assigned",
+                    "type": "Object"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 631,
+            "description": "Makes sure all subroles are correctly set, and no extra subroles are set which should not be.\n\nUsed internally after complicated changes, but it can also be used whenever one feels that\nthere might be inconsistencies (eg., after a crash).\n\nWe simply re-set to the user their assigned roles again and remove any roles which\nare marked as not explicitly assigned, and have not been part of what we currently set.",
+            "itemtype": "method",
+            "name": "_assureConsistency",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or an actual user object.",
+                    "type": "String|Object"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 687,
+            "description": "Check if user has specified roles.",
             "example": [
-                "\n    // non-group usage\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // per-group usage\n    Roles.userIsInRole(user,   ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)\n\n    // this format can also be used as short-hand for Roles.GLOBAL_GROUP\n    Roles.userIsInRole(user, 'admin')"
+                "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // partition roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})"
             ],
             "itemtype": "method",
             "name": "userIsInRole",
             "params": [
                 {
                     "name": "user",
-                    "description": "User Id or actual user object",
+                    "description": "User ID or an actual user object.",
                     "type": "String|Object"
                 },
                 {
                     "name": "roles",
-                    "description": "Name of role/permission or Array of \n                           roles/permissions to check against.  If array, \n                           will return true if user is in _any_ role.",
+                    "description": "Name of role or an array of roles to check against. If array,\n                            will return `true` if user is in _any_ role.\n                            Roles do not have to exist.",
                     "type": "String|Array"
                 },
                 {
-                    "name": "group",
-                    "description": "Optional. Name of group.  If supplied, limits check\n                        to just that group.\n                        The user's Roles.GLOBAL_GROUP will always be checked\n                        whether group is specified or not.",
-                    "type": "String",
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of the partition; if supplied, limits check to just that partition;\n    the user's global roles will always be checked whether partition is specified or not\n  - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)\n\nAlternatively, it can be a partition name string.",
+                    "type": "Object|String",
                     "optional": true
                 }
             ],
             "return": {
-                "description": "true if user is in _any_ of the target roles",
+                "description": "`true` if user is in _any_ of the target roles",
                 "type": "Boolean"
             },
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 366,
-            "description": "Retrieve users roles",
+            "line": 789,
+            "description": "Retrieve user's roles.",
             "itemtype": "method",
             "name": "getRolesForUser",
             "params": [
                 {
                     "name": "user",
-                    "description": "User Id or actual user object",
+                    "description": "User ID or an actual user object.",
                     "type": "String|Object"
                 },
                 {
-                    "name": "group",
-                    "description": "Optional name of group to restrict roles to.\n                        User's Roles.GLOBAL_GROUP will also be included.",
-                    "type": "String",
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of partition to provide roles for; if not specified, global roles are returned\n  - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)\n  - `fullObjects`: return full roles objects (`true`) or just names (`false`) (default `false`)\n  - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)\n\nAlternatively, it can be a partition name string.",
+                    "type": "Object|String",
                     "optional": true
                 }
             ],
@@ -349,207 +481,389 @@
                 "description": "Array of user's roles, unsorted.",
                 "type": "Array"
             },
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 408,
-            "description": "Retrieve set of all existing roles",
+            "line": 843,
+            "description": "Retrieve cursor of all existing roles.",
             "itemtype": "method",
             "name": "getAllRoles",
-            "return": {
-                "description": "cursor of existing roles",
-                "type": "Cursor"
-            },
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 418,
-            "description": "Retrieve all users who are in target role.  \n\nNOTE: This is an expensive query; it performs a full collection scan\non the users collection since there is no index set on the 'roles' field.  \nThis is by design as most queries will specify an _id so the _id index is \nused automatically.",
-            "itemtype": "method",
-            "name": "getUsersInRole",
             "params": [
                 {
-                    "name": "role",
-                    "description": "Name of role/permission.  If array, users \n                           returned will have at least one of the roles\n                           specified but need not have _all_ roles.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Optional name of group to restrict roles to.\n                        User's Roles.GLOBAL_GROUP will also be checked.",
-                    "type": "String",
-                    "optional": true
-                },
-                {
-                    "name": "options",
-                    "description": "Optional options which are passed directly\n                          through to `Meteor.users.find(query, options)`",
+                    "name": "queryOptions",
+                    "description": "Options which are passed directly\n                               through to `Meteor.roles.find(query, options)`.",
                     "type": "Object",
                     "optional": true
                 }
             ],
             "return": {
-                "description": "cursor of users in role",
+                "description": "Cursor of existing roles.",
                 "type": "Cursor"
             },
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 485,
-            "description": "Retrieve users groups, if any",
+            "line": 858,
+            "description": "Retrieve all users who are in target role.\n\nOptions:",
+            "itemtype": "method",
+            "name": "getUsersInRole",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
+                    "type": "String|Array"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of the partition to restrict roles to; user's global\n    roles will also be checked\n  - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a partition name string.",
+                    "type": "Object|String",
+                    "optional": true
+                },
+                {
+                    "name": "queryOptions",
+                    "description": "Options which are passed directly\n                               through to `Meteor.users.find(query, options)`",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Cursor of users in roles.",
+                "type": "Cursor"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 928,
+            "description": "Deprecated. Use `getPartitionsForUser` instead.",
             "itemtype": "method",
             "name": "getGroupsForUser",
+            "static": 1,
+            "deprecated": true,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 944,
+            "description": "Retrieve users partitions, if any.",
+            "itemtype": "method",
+            "name": "getPartitionsForUser",
             "params": [
                 {
                     "name": "user",
-                    "description": "User Id or actual user object",
+                    "description": "User ID or an actual user object.",
                     "type": "String|Object"
                 },
                 {
-                    "name": "role",
-                    "description": "Optional name of roles to restrict groups to.",
+                    "name": "roles",
+                    "description": "Name of roles to restrict partitions to.",
                     "type": "String",
                     "optional": true
                 }
             ],
             "return": {
-                "description": "Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted",
+                "description": "Array of user's partitions, unsorted.",
                 "type": "Array"
             },
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 533,
-            "description": "Private function 'template' that uses $set to construct an update object\nfor MongoDB.  Passed to _updateUserRoles",
+            "line": 976,
+            "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
-            "name": "_update_$set_fn",
-            "access": "protected",
-            "tagname": "",
+            "name": "_resolveUser",
             "params": [
                 {
-                    "name": "roles",
-                    "description": "",
-                    "type": "Array"
+                    "name": "user",
+                    "description": "User ID or an actual user object.",
+                    "type": "String|Object"
                 },
                 {
-                    "name": "group",
-                    "description": "",
-                    "type": "String",
-                    "optional": true
+                    "name": "force",
+                    "description": "Load a new user object even if it is already one.",
+                    "type": "Boolean"
                 }
             ],
             "return": {
-                "description": "update object for use in MongoDB update command",
+                "description": "User object.",
                 "type": "Object"
             },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 558,
-            "description": "Private function 'template' that uses $addToSet to construct an update \nobject for MongoDB.  Passed to _updateUserRoles",
+            "line": 1002,
             "itemtype": "method",
-            "name": "_update_$addToSet_fn",
-            "access": "protected",
-            "tagname": "",
+            "name": "_roleMatcher",
             "params": [
                 {
-                    "name": "roles",
-                    "description": "",
-                    "type": "Array"
-                },
-                {
-                    "name": "group",
-                    "description": "",
-                    "type": "String",
-                    "optional": true
+                    "name": "roleName",
+                    "description": "A role name to match against.",
+                    "type": "String"
                 }
             ],
             "return": {
-                "description": "update object for use in MongoDB update command",
-                "type": "Object"
+                "description": "A matcher function which accepts a role object and returns `true`\n                    if its name matches `roleName`.",
+                "type": "Function"
             },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 584,
-            "description": "Internal function that uses the Template pattern to adds or sets roles \nfor users.",
+            "line": 1016,
             "itemtype": "method",
-            "name": "_updateUserRoles",
-            "access": "protected",
-            "tagname": "",
+            "name": "_roleAndPartitionMatcher",
             "params": [
                 {
-                    "name": "users",
-                    "description": "user id(s) or object(s) with an _id field",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "name(s) of roles/permissions to add users to",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "group",
-                    "description": "Group name. If not null or undefined, roles will be\n                        specific to that group.  \n                        Group names can not start with '$'.\n                        Periods in names '.' are automatically converted\n                        to underscores.\n                        The special group Roles.GLOBAL_GROUP provides \n                        a convenient way to assign blanket roles/permissions\n                        across all groups.  The roles/permissions in the \n                        Roles.GLOBAL_GROUP group will be automatically \n                        included in checks for any group.",
+                    "name": "roleName",
+                    "description": "A role name to match against.",
                     "type": "String"
                 },
                 {
-                    "name": "updateFactory",
-                    "description": "Func which returns an update object that\n                        will be passed to Mongo.",
-                    "type": "Function"
-                },
-                {
-                    "name": "roles",
-                    "description": "",
-                    "type": "Array"
-                },
-                {
-                    "name": "group",
-                    "description": "",
-                    "type": "String",
-                    "optional": true
+                    "name": "partition",
+                    "description": "A partition to match against.",
+                    "type": "String"
                 }
             ],
+            "return": {
+                "description": "A matcher function which accepts a role object and returns `true`\n                    if its name matches `roleName`, and partition matches `partition`.",
+                "type": "Function"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1033,
+            "itemtype": "method",
+            "name": "_partitionMatcher",
+            "params": [
+                {
+                    "name": "partition",
+                    "description": "A partition to match against.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "A matcher function which accepts a role object and returns `true`\n                    if its partition matches `partition`.",
+                "type": "Function"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1049,
+            "itemtype": "method",
+            "name": "_onlyAssignedMatcher",
+            "return": {
+                "description": "A matcher function which accepts a role object and returns `true`\n                    if the role is an assigned role.",
+                "type": "Function"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1062,
+            "description": "Throw an exception if `roleName` is an invalid role name.",
+            "itemtype": "method",
+            "name": "_checkRoleName",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "A role name to match against.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_server.js",
-            "line": 4,
-            "description": "Roles collection documents consist only of an id and a role name.\n  ex: { _id: \"123\", name: \"admin\" }",
-            "class": "",
+            "line": 30,
+            "itemtype": "method",
+            "name": "_isNewField",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "`Meteor.users` document `roles` field.",
+                    "type": "Array"
+                }
+            ],
+            "return": {
+                "description": "Returns `true` if the `roles` field is in the new format.\n                   If it is ambiguous or it is not, returns `false`.",
+                "type": "Boolean"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_server.js",
-            "line": 16,
-            "description": "Publish logged-in user's roles so client-side checks can work.\n\nUse a named publish function so clients can check `ready()` state.",
-            "class": "",
+            "line": 43,
+            "itemtype": "method",
+            "name": "_isOldField",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "`Meteor.users` document `roles` field.",
+                    "type": "Array"
+                }
+            ],
+            "return": {
+                "description": "Returns `true` if the `roles` field is in the old format.\n                   If it is ambiguous or it is not, returns `false`.",
+                "type": "Boolean"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 56,
+            "itemtype": "method",
+            "name": "_convertToNewField",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "`Meteor.users` document `roles` field in the old format.",
+                    "type": "Array"
+                }
+            ],
+            "return": {
+                "description": "Converted `roles` to the new format.",
+                "type": "Array"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 96,
+            "itemtype": "method",
+            "name": "_convertToOldField",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "`Meteor.users` document `roles` field in the new format.",
+                    "type": "Array"
+                }
+            ],
+            "return": {
+                "description": "Converted `roles` to the old format.",
+                "type": "Array"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 144,
+            "itemtype": "method",
+            "name": "_defaultUpdateUser",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "`Meteor.users` document.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "roles Value to which user's `roles` field should be set.",
+                "type": "Array|Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 162,
+            "description": "Migrates `Meteor.users` and `Meteor.roles` to the new format.",
+            "itemtype": "method",
+            "name": "_forwardMigrate",
+            "params": [
+                {
+                    "name": "updateUser",
+                    "description": "Function which updates the user object. Default `_defaultUpdateUser`.",
+                    "type": "Function"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 183,
+            "description": "Migrates `Meteor.users` and `Meteor.roles` to the old format.\n\nWe assume that we are converting back a failed migration, so values can only be\nwhat were valid values in the old format. So no group names starting with `$` and\nno subroles.",
+            "itemtype": "method",
+            "name": "_backwardMigrate",
+            "params": [
+                {
+                    "name": "updateUser",
+                    "description": "Function which updates the user object. Default `_defaultUpdateUser`.",
+                    "type": "Function"
+                },
+                {
+                    "name": "usingGroups",
+                    "description": "Should we use groups or not.",
+                    "type": "Boolean"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
             "module": "Roles"
         }
     ],
-    "warnings": [
-        {
-            "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id:<uuid>, name: \"admin\" }",
-            "line": " roles/roles_common.js:9"
-        },
-        {
-            "message": "Missing item type\nRoles collection documents consist only of an id and a role name.\n  ex: { _id: \"123\", name: \"admin\" }",
-            "line": " roles/roles_server.js:4"
-        },
-        {
-            "message": "Missing item type\nPublish logged-in user's roles so client-side checks can work.\n\nUse a named publish function so clients can check `ready()` state.",
-            "line": " roles/roles_server.js:16"
-        }
-    ]
+    "warnings": []
 }
\ No newline at end of file
diff --git a/docs/elements/index.html b/docs/elements/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/elements/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/docs/files/roles_client_subscriptions.js.html b/docs/files/roles_client_subscriptions.js.html
index d4ca657889..9e42a836e3 100644
--- a/docs/files/roles_client_subscriptions.js.html
+++ b/docs/files/roles_client_subscriptions.js.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <link rel="icon" href="../assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,97 +25,85 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1 class="file-heading">File: roles/client/subscriptions.js</h1>
+<h1 class="file-heading">File: roles/client/subscriptions.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
-&quot;use strict&quot;
-
+&quot;use strict&quot;;
 
 /**
- * Subscription handle for the currently logged in user&#x27;s permissions.
- *
- * NOTE: The corresponding publish function, &#x60;_roles&#x60;, depends on
- * &#x60;this.userId&#x60; so it will automatically re-run when the currently
- * logged-in user changes.
+ * Subscription handle for the collection of all existing roles.
  *
  * @example
  *
- *     &#x60;Roles.subscription.ready()&#x60; // =&gt; &#x60;true&#x60; if user roles have been loaded
+ *     Roles.subscription.ready(); // true if roles have been loaded
  *
  * @property subscription
  * @type Object
  * @for Roles
+ * @static
  */
 
 Tracker.autorun(function () {
-  Roles.subscription = Meteor.subscribe(&quot;_roles&quot;)
-})
+  Roles.subscription = Meteor.subscribe(&#x27;_roles&#x27;);
+});
 
     </pre>
 </div>
-
                     </div>
                 </div>
             </div>
diff --git a/docs/files/roles_client_uiHelpers.js.html b/docs/files/roles_client_uiHelpers.js.html
index 82cd6ea92a..932f3b29cc 100644
--- a/docs/files/roles_client_uiHelpers.js.html
+++ b/docs/files/roles_client_uiHelpers.js.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <link rel="icon" href="../assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,68 +25,61 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1 class="file-heading">File: roles/client/uiHelpers.js</h1>
+<h1 class="file-heading">File: roles/client/uiHelpers.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
@@ -126,17 +117,17 @@ Roles._uiHelpers = {
    *     {{#if isInRole &#x27;editor,user&#x27;}}
    *     {{/if}}
    *
-   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;group1&#x27;}}
+   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;partition1&#x27;}}
    *     {{/if}}
    *
    * @method isInRole
-   * @param {String} role Name of role or comma-seperated list of roles
-   * @param {String} [group] Optional, name of group to check
-   * @return {Boolean} true if current user is in at least one of the target roles
+   * @param {String} role Name of role or comma-seperated list of roles.
+   * @param {String} [partition] Optional, name of partition to check.
+   * @return {Boolean} &#x60;true&#x60; if current user is in at least one of the target roles.
    * @static
    * @for UIHelpers 
    */
-  isInRole: function (role, group) {
+  isInRole: function (role, partition) {
     var user = Meteor.user(),
         comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),
         roles
@@ -156,8 +147,8 @@ Roles._uiHelpers = {
       roles = [role]
     }
 
-    if (Match.test(group, String)) {
-      return Roles.userIsInRole(user, roles, group)
+    if (Match.test(partition, String)) {
+      return Roles.userIsInRole(user, roles, partition)
     }
 
     return Roles.userIsInRole(user, roles)
@@ -187,7 +178,6 @@ if (&#x27;undefined&#x27; !== typeof Package.blaze &amp;&amp;
 
     </pre>
 </div>
-
                     </div>
                 </div>
             </div>
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 7840d21677..84ff750d2d 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <link rel="icon" href="../assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,68 +25,61 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1 class="file-heading">File: roles/roles_common.js</h1>
+<h1 class="file-heading">File: roles/roles_common.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
@@ -97,721 +88,1082 @@
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
+ * It uses &#x60;roles&#x60; field to &#x60;Meteor.users&#x60; documents which is an array of subdocuments with the following
+ * schema:
+ *  - &#x60;role&#x60;: role name
+ *  - &#x60;partition&#x60;: partition name
+ *  - &#x60;assigned&#x60;: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)
+ *
+ * Roles themselves are accessible throgh &#x60;Meteor.roles&#x60; collection and documents consist of:
+ *  - &#x60;_id&#x60;
+ *  - &#x60;name&#x60;: role name
+ *  - &#x60;children&#x60;: list of subdocuments:
+ *    - &#x60;_id&#x60;
+ *    - &#x60;name&#x60;
+ *
+ * Children list elements are subdocuments so that they can be easier extended in the future.
+ *
+ * Roles can have multiple parents and can be children (subroles) of multiple roles.
+ *
+ * Example: &#x60;{_id: &quot;123&quot;, name: &quot;admin&quot;}&#x60;
+ *
  * @module Roles
  */
-
-/**
- * Roles collection documents consist only of an id and a role name.
- *   ex: { _id:&lt;uuid&gt;, name: &quot;admin&quot; }
- */
-if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection(&quot;roles&quot;)
+ if (!Meteor.roles) {
+  Meteor.roles = new Mongo.Collection(&quot;roles&quot;);
 }
 
 /**
- * Authorization package compatible with built-in Meteor accounts system.
- *
- * Stores user&#x27;s current roles in a &#x27;roles&#x27; field on the user object.
- *
  * @class Roles
- * @constructor
  */
 if (&#x27;undefined&#x27; === typeof Roles) {
-  Roles = {}
+  Roles = {};
 }
 
 &quot;use strict&quot;;
 
-var mixingGroupAndNonGroupErrorMsg = &quot;Roles error: Can&#x27;t mix grouped and non-grouped roles for same user&quot;;
+var getGroupsForUserDeprecationWarning = false;
 
 _.extend(Roles, {
 
   /**
-   * Constant used to reference the special &#x27;global&#x27; group that 
-   * can be used to apply blanket permissions across all groups.
-   *
-   * @example
-   *     Roles.addUsersToRoles(user, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
-   *     Roles.userIsInRole(user, &#x27;admin&#x27;) // =&gt; true
-   *
-   *     Roles.setUserRoles(user, &#x27;support-staff&#x27;, Roles.GLOBAL_GROUP)
-   *     Roles.userIsInRole(user, &#x27;support-staff&#x27;) // =&gt; true
-   *     Roles.userIsInRole(user, &#x27;admin&#x27;) // =&gt; false
+   * Used as a global group (now partition) name. Not used anymore.
    *
    * @property GLOBAL_GROUP
-   * @type String
    * @static
-   * @final
+   * @deprecated
    */
-  GLOBAL_GROUP: &#x27;__global_roles__&#x27;,
-
+  GLOBAL_GROUP: null,
 
   /**
-   * Create a new role. Whitespace will be trimmed.
+   * Create a new role.
    *
    * @method createRole
-   * @param {String} role Name of role
-   * @return {String} id of new role
+   * @param {String} roleName Name of role.
+   * @param {Object} [options] Options:
+   *   - &#x60;unlessExists&#x60;: if &#x60;true&#x60;, exception will not be thrown in the role already exists
+   * @return {String} ID of the new role.
+   * @static
    */
-  createRole: function (role) {
-    var id,
-        match
+  createRole: function (roleName, options) {
+    var match;
 
-    if (!role
-        || &#x27;string&#x27; !== typeof role
-        || role.trim().length === 0) {
-      return
-    }
+    options = options || {};
+
+    Roles._checkRoleName(roleName);
+
+    options = _.defaults(options, {
+      unlessExists: false
+    });
 
     try {
-      id = Meteor.roles.insert({&#x27;name&#x27;: role.trim()})
-      return id
+      return Meteor.roles.insert({name: roleName, children: []});
     } catch (e) {
       // (from Meteor accounts-base package, insertUserDoc func)
       // XXX string parsing sucks, maybe
       // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-      if (e.name !== &#x27;MongoError&#x27;) throw e
-      match = e.err.match(/^E11000 duplicate key error index: ([^ ]+)/)
-      if (!match) throw e
-      if (match[1].indexOf(&#x27;$name&#x27;) !== -1)
-        throw new Meteor.Error(403, &quot;Role already exists.&quot;)
-      throw e
+      if (e.name !== &#x27;MongoError&#x27;) throw e;
+      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
+      if (!match) throw e;
+      if (match[1].indexOf(&#x27;$name&#x27;) !== -1) {
+        if (options.unlessExists) return null;
+        throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; already exists.&quot;);
+      }
+      throw e;
     }
   },
 
   /**
-   * Delete an existing role.  Will throw &quot;Role in use&quot; error if any users
-   * are currently assigned to the target role.
+   * Delete an existing role.
+   *
+   * If the role is set for any user, it is automatically unset.
    *
    * @method deleteRole
-   * @param {String} role Name of role
+   * @param {String} roleName Name of role.
+   * @static
    */
-  deleteRole: function (role) {
-    if (!role) return
+  deleteRole: function (roleName) {
+    var roles;
 
-    var foundExistingUser = Meteor.users.findOne(
-                              {roles: {$in: [role]}},
-                              {fields: {_id: 1}})
+    Roles._checkRoleName(roleName);
 
-    if (foundExistingUser) {
-      throw new Meteor.Error(403, &#x27;Role in use&#x27;)
-    }
+    // we first remove the role as a children, otherwise
+    // Roles._assureConsistency might re-add the role
+    Meteor.roles.update({}, {
+      $pull: {
+        children: {
+          name: roleName
+        }
+      }
+    }, {multi: true});
 
-    var thisRole = Meteor.roles.findOne({name: role})
-    if (thisRole) {
-      Meteor.roles.remove({_id: thisRole._id})
-    }
+    Roles.getUsersInRole(roleName, {
+      anyPartition: true,
+      queryOptions: {
+        fields: {
+          _id: 1,
+          roles: 1
+        }
+      }
+    }).forEach(function (user, index, cursor) {
+      // role can be assigned multiple times to the user, for multiple partitions
+      // we have to remove the role for each of those partitions
+      roles = _.filter(user.roles, Roles._roleMatcher(roleName));
+      _.each(roles, function (role) {
+        Roles._removeUserFromRole(user, roleName, {
+          partition: role.partition,
+          // we want to remove the role in any case
+          _assigned: null
+        });
+      });
+
+      // handle the edge case
+      Roles._assureConsistency(user);
+    });
+
+    // remove the role itself
+    Meteor.roles.remove({name: roleName});
   },
 
   /**
-   * Add users to roles. Will create roles as needed.
+   * Add role parent to the role.
    *
-   * NOTE: Mixing grouped and non-grouped roles for the same user
-   *       is not supported and will throw an error.
+   * Previous parents are kept (role can have multiple parents). For users which have the
+   * parent role set, new subroles are added automatically.
    *
-   * Makes 2 calls to database:
-   *  1. retrieve list of all existing roles
-   *  2. update users&#x27; roles
+   * @method addRoleParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @static
+   */
+  addRoleParent: function (roleName, parentName) {
+    var role,
+        count,
+        parentRoles;
+
+    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(parentName);
+
+    // query to get role&#x27;s _id
+    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1}});
+
+    if (!role) {
+      throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
+    }
+
+    count = Meteor.roles.update({
+      name: parentName,
+      &#x27;children._id&#x27;: {
+        $ne: role._id
+      }
+    }, {
+      $addToSet: {
+        children: {
+          _id: role._id,
+          name: role.name
+        }
+      }
+    });
+
+    // if there was no change, parent role might not exist, or role is
+    // already a subrole; in any case we do not have anything more to do
+    if (!count) return;
+
+    Roles.getUsersInRole(parentName, {
+      anyPartition: true,
+      queryOptions: {
+        fields: {
+          _id: 1,
+          roles: 1
+        }
+      }
+    }).forEach(function (user, index, cursor) {
+      // parent role can be assigned multiple times to the user, for multiple partitions
+      // we have to assign a new subrole for each of those partitions
+      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
+      _.each(parentRoles, function (parentRole) {
+        Roles._addUserToRole(user, roleName, {
+          partition: parentRole.partition,
+          // we are assigning a subrole, so we set it as unassigned,
+          // but only if they do not already exist
+          _assigned: null
+        });
+      });
+    });
+  },
+
+  /**
+   * Remove role parent from the role.
+   *
+   * Other parents are kept (role can have multiple parents). For users which have the
+   * parent role set, removed subrole is removed automatically.
+   *
+   * @method removeRoleParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @static
+   */
+  removeRoleParent: function (roleName, parentName) {
+    var role,
+        count,
+        parentRoles;
+
+    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(parentName);
+
+    // to check for role existence
+    // (_id would not really be needed, but we are trying to match addRoleParent)
+    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1}});
+
+    if (!role) {
+      throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
+    }
+
+    count = Meteor.roles.update({
+      name: parentName
+    }, {
+      $pull: {
+        children: {
+          _id: role._id
+        }
+      }
+    });
+
+    // if there was no change, parent role might not exist, or role was
+    // already not a subrole; in any case we do not have anything more to do
+    if (!count) return;
+
+    Roles.getUsersInRole(parentName, {
+      anyPartition: true,
+      queryOptions: {
+        fields: {
+          _id: 1,
+          roles: 1
+        }
+      }
+    }).forEach(function (user, index, cursor) {
+      // parent role can be assigned multiple times to the user, for multiple partitions
+      // we have to remove the subrole for each of those partitions
+      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
+      _.each(parentRoles, function (parentRole) {
+        Roles._removeUserFromRole(user, roleName, {
+          partition: parentRole.partition,
+          // but we want to remove it only if it was not also explicitly assigned
+          _assigned: false
+        });
+      });
+
+      // handle the edge case
+      Roles._assureConsistency(user);
+    });
+  },
+
+  /**
+   * Add users to roles.
+   *
+   * Adds roles to existing roles for each user.
    *
    * @example
    *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;)
    *     Roles.addUsersToRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
    *     Roles.addUsersToRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
    *     Roles.addUsersToRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
-   *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
    *
    * @method addUsersToRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field
-   * @param {Array|String} roles Name(s) of roles/permissions to add users to
-   * @param {String} [group] Optional group name. If supplied, roles will be
-   *                         specific to that group.  
-   *                         Group names can not start with a &#x27;$&#x27; or contain
-   *                         null characters.  Periods in names &#x27;.&#x27; are
-   *                         automatically converted to underscores.
-   *                         The special group Roles.GLOBAL_GROUP provides 
-   *                         a convenient way to assign blanket roles/permissions
-   *                         across all groups.  The roles/permissions in the 
-   *                         Roles.GLOBAL_GROUP group will be automatically 
-   *                         included in checks for any group.
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a partition name string.
+   * @static
    */
-  addUsersToRoles: function (users, roles, group) {
-    // use Template pattern to update user roles
-    Roles._updateUserRoles(users, roles, group, Roles._update_$addToSet_fn)
+  addUsersToRoles: function (users, roles, options) {
+    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
+    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      ifExists: false,
+      // internal option, should not be used publicly because it will break assumptions
+      // in te code; publicly, you can only add users to an assigned role
+      // should the role be set as assigned, default is &#x60;true&#x60;; &#x60;null&#x60; is the same as &#x60;false&#x60;,
+      // only that it does not force the value to &#x60;false&#x60; if the role is already assigned
+      _assigned: true
+    });
+
+    _.each(users, function (user) {
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role, options);
+      });
+    });
   },
 
   /**
-   * Set a users roles/permissions.
+   * Set users&#x27; roles.
+   *
+   * Replaces all existing roles with a new set of roles.
    *
    * @example
    *     Roles.setUserRoles(userId, &#x27;admin&#x27;)
    *     Roles.setUserRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
    *     Roles.setUserRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
    *     Roles.setUserRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
-   *     Roles.setUserRoles(userId, &#x27;admin&#x27;, Roles.GLOBAL_GROUP)
    *
    * @method setUserRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field
-   * @param {Array|String} roles Name(s) of roles/permissions to add users to
-   * @param {String} [group] Optional group name. If supplied, roles will be
-   *                         specific to that group.  
-   *                         Group names can not start with &#x27;$&#x27;.
-   *                         Periods in names &#x27;.&#x27; are automatically converted
-   *                         to underscores.
-   *                         The special group Roles.GLOBAL_GROUP provides 
-   *                         a convenient way to assign blanket roles/permissions
-   *                         across all groups.  The roles/permissions in the 
-   *                         Roles.GLOBAL_GROUP group will be automatically 
-   *                         included in checks for any group.
-   */
-  setUserRoles: function (users, roles, group) {
-    // use Template pattern to update user roles
-    Roles._updateUserRoles(users, roles, group, Roles._update_$set_fn)
-  },
-
-  /**
-   * Remove users from roles
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
    *
-   * @example
-   *     Roles.removeUsersFromRoles(users.bob, &#x27;admin&#x27;)
-   *     Roles.removeUsersFromRoles([users.bob, users.joe], [&#x27;editor&#x27;])
-   *     Roles.removeUsersFromRoles([users.bob, users.joe], [&#x27;editor&#x27;, &#x27;user&#x27;])
-   *     Roles.removeUsersFromRoles(users.eve, [&#x27;user&#x27;], &#x27;group1&#x27;)
-   *
-   * @method removeUsersFromRoles
-   * @param {Array|String} users User id(s) or object(s) with an _id field
-   * @param {Array|String} roles Name(s) of roles to add users to
-   * @param {String} [group] Optional. Group name. If supplied, only that
-   *                         group will have roles removed.
+   * Alternatively, it can be a partition name string.
+   * @static
    */
-  removeUsersFromRoles: function (users, roles, group) {
-    var update
+  setUserRoles: function (users, roles, options) {
+    var id;
 
-    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
-    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
-    if (group) {
-      if (&#x27;string&#x27; !== typeof group)
-        throw new Error (&quot;Roles error: Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
-      if (&#x27;$&#x27; === group[0])
-        throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
+    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
+    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
 
-      // convert any periods to underscores
-      group = group.replace(/\./g, &#x27;_&#x27;)
-    }
+    options = options || {};
 
     // ensure arrays
-    if (!_.isArray(users)) users = [users]
-    if (!_.isArray(roles)) roles = [roles]
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
 
-    // ensure users is an array of user ids
-    users = _.reduce(users, function (memo, user) {
-      var _id
-      if (&#x27;string&#x27; === typeof user) {
-        memo.push(user)
-      } else if (&#x27;object&#x27; === typeof user) {
-        _id = user._id
-        if (&#x27;string&#x27; === typeof _id) {
-          memo.push(_id)
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      ifExists: false,
+      // internal option, should not be used publicly because it will break assumptions
+      // in te code; publicly, you can only add users to an assigned role
+      // should the role be set as assigned, default is &#x60;true&#x60;; &#x60;null&#x60; is the same as &#x60;false&#x60;,
+      // only that it does not force the value to &#x60;false&#x60; if the role is already assigned
+      _assigned: true
+    });
+
+    _.each(users, function (user) {
+      if (_.isObject(user)) {
+        id = user._id;
+      }
+      else {
+        id = user;
+      }
+      // we first clear all roles for the user
+      Meteor.users.update(id, {$pull: {roles: {partition: options.partition}}});
+
+      // and then add all
+      _.each(roles, function (role) {
+        Roles._addUserToRole(user, role, options);
+      });
+    });
+  },
+
+  /**
+   * Add one user to one role.
+   *
+   * @method _addUserToRole
+   * @param {String|Object} user User ID or object with an &#x60;_id&#x60; field.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
+   *   - &#x60;_assigned&#x60;: internal option, should not be used publicly because it will break assumptions
+   *     in te code; publicly, you can only add users to an assigned role
+   *     should the role be set as assigned, default is &#x60;true&#x60;; &#x60;null&#x60; is the same as &#x60;false&#x60;,
+   *     only that it does not force the value to &#x60;false&#x60; if the role is already assigned
+   * @return {Array} Roles set during the call (even those already set).
+   * @private
+   * @static
+   */
+  _addUserToRole: function (user, roleName, options) {
+    var id,
+        role,
+        count,
+        setRoles;
+
+    Roles._checkRoleName(roleName);
+
+    if (_.isObject(user)) {
+      id = user._id;
+    }
+    else {
+      id = user;
+    }
+
+    if (!id) return [];
+
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    if (!role) {
+      if (options.ifExists) {
+        return [];
+      }
+      else {
+        throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
+      }
+    }
+
+    // add new role if it is not already added
+    count = Meteor.users.update({
+      _id: id,
+      roles: {
+        $not: {
+          $elemMatch: {
+            role: roleName,
+            partition: options.partition
+          }
         }
       }
-      return memo
-    }, [])
 
-    // update all users, remove from roles set
-    
-    if (group) {
-      update = {$pullAll: {}}
-      update.$pullAll[&#x27;roles.&#x27;+group] = roles
-    } else {
-      update = {$pullAll: {roles: roles}}
-    }
+    }, {
+      $addToSet: {
+        roles: {
+          role: roleName,
+          partition: options.partition,
+          // we want to make sure it is a boolean value
+          assigned: !!options._assigned
+        }
+      }
+    });
 
-    try {
-      if (Meteor.isClient) {
-        // Iterate over each user to fulfill Meteor&#x27;s &#x27;one update per ID&#x27; policy
-        _.each(users, function (user) {
-          Meteor.users.update({_id:user}, update)
-        })
-      } else {
-        // On the server we can leverage MongoDB&#x27;s $in operator for performance
-        Meteor.users.update({_id:{$in:users}}, update, {multi: true})
+    if (!count) {
+      // a role has not been added, it maybe already exists
+      if (options._assigned) {
+        // let&#x27;s make sure it is set as assigned
+        Meteor.users.update({
+          _id: id,
+          roles: {
+            $elemMatch: {
+              role: roleName,
+              partition: options.partition
+            }
+          }
+
+        }, {
+          $set: {
+            &#x27;roles.$.assigned&#x27;: true
+          }
+        });
+      }
+      else if (options._assigned === false) {
+        // let&#x27;s make sure it is set as unassigned
+        Meteor.users.update({
+          _id: id,
+          roles: {
+            $elemMatch: {
+              role: roleName,
+              partition: options.partition
+            }
+          }
+
+        }, {
+          $set: {
+            &#x27;roles.$.assigned&#x27;: false
+          }
+        });
       }
     }
-    catch (ex) {
-      if (ex.name === &#x27;MongoError&#x27; &amp;&amp; isMongoMixError(ex.err)) {
-        throw new Error (mixingGroupAndNonGroupErrorMsg)
-      }
 
-      throw ex
+    setRoles = [{
+      role: roleName,
+      partition: options.partition
+    }];
+
+    _.each(role.children, function (child) {
+      // subroles are set as unassigned, but only if they do not already exist
+      setRoles.concat(Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: null})));
+    });
+
+    return setRoles;
+  },
+
+  /**
+   * Remove users from assigned roles.
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(userId, &#x27;admin&#x27;)
+   *     Roles.removeUsersFromRoles([userId, user2], [&#x27;editor&#x27;])
+   *     Roles.removeUsersFromRoles(userId, [&#x27;user&#x27;], &#x27;group1&#x27;)
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *
+   * Alternatively, it can be a partition name string.
+   * @static
+   */
+  removeUsersFromRoles: function (users, roles, options) {
+    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
+    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
+
+    options = options || {};
+
+    // ensure arrays
+    if (!_.isArray(users)) users = [users];
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      // internal option, should not be used publicly because it will break assumptions
+      // in te code; publicly, you can only remove users from an assigned role
+      // when should the role be removed, default is &#x60;true&#x60; which means only when it is assigned,
+      // &#x60;false&#x60; means when it is not assigned, and &#x60;null&#x60; means always
+      _assigned: true
+    });
+
+    _.each(users, function (user) {
+      _.each(roles, function (role) {
+        Roles._removeUserFromRole(user, role, options);
+      });
+
+      // handle the edge case
+      Roles._assureConsistency(user);
+    });
+  },
+
+  /**
+   * Remove one user from one role.
+   *
+   * WARNING: It leaves user&#x27;s roles in a possibly inconsistent state. Because we allow the same
+   * role to be a child of multiple roles it might happen that it removes some subroles which
+   * it should not because they are in effect also through some other parent role. You should always
+   * call &#x60;_assureConsistency&#x60; after you are finished with calls to &#x60;_removeUserFromRole&#x60; for a
+   * particular user.
+   *
+   * @method _removeUserFromRole
+   * @param {String|Object} user User ID or object with an &#x60;_id&#x60; field.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;_assigned&#x60;: internal option, should not be used publicly because it will break assumptions
+   *     in te code; publicly, you can only add users to an assigned role
+   *     should the role be set as assigned, default is &#x60;true&#x60;; &#x60;null&#x60; is the same as &#x60;false&#x60;,
+   *     only that it does not force the value to &#x60;false&#x60; if the role is already assigned
+   * @private
+   * @static
+   */
+  _removeUserFromRole: function (user, roleName, options) {
+    var id,
+        role,
+        update;
+
+    Roles._checkRoleName(roleName);
+
+    if (_.isObject(user)) {
+      id = user._id;
+    }
+    else {
+      id = user;
+    }
+
+    if (!id) return;
+
+    update = {
+      $pull: {
+        roles: {
+          role: roleName,
+          partition: options.partition
+        }
+      }
+    };
+
+    if (options._assigned) {
+      update.$pull.roles.assigned = true;
+    }
+    else if (options._assigned === false) {
+      update.$pull.roles.assigned = false;
+    }
+
+    // we try to remove the role in every case, whether the role really exists or not
+    Meteor.users.update(id, update);
+
+    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+
+    // role does not exist, we do not anything more
+    if (!role) return;
+
+    _.each(role.children, function (child) {
+      // if a child role has been assigned explicitly, we do not remove it
+      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_assigned: false}));
+    });
+  },
+
+  /**
+   * Makes sure all subroles are correctly set, and no extra subroles are set which should not be.
+   *
+   * Used internally after complicated changes, but it can also be used whenever one feels that
+   * there might be inconsistencies (eg., after a crash).
+   *
+   * We simply re-set to the user their assigned roles again and remove any roles which
+   * are marked as not explicitly assigned, and have not been part of what we currently set.
+   *
+   * @method _assureConsistency
+   * @param {String|Object} user User ID or an actual user object.
+   * @private
+   * @static
+   */
+  _assureConsistency: function (user) {
+    var roles,
+        setRoles;
+
+    // we want always the latest state
+    user = Roles._resolveUser(user, true);
+
+    // only assigned roles
+    roles = _.filter(user.roles, Roles._onlyAssignedMatcher());
+
+    setRoles = [];
+    _.each(roles, function (role) {
+      setRoles.concat(Roles._addUserToRole(user, role.role, {
+        partition: role.partition,
+        _assigned: role.assigned, // this is true
+        ifExists: true
+      }));
+    });
+
+    // transform into the query
+    roles = _.map(roles, function (role) {
+      return {
+        role: {$ne: role.role},
+        partition: {$ne: role.partition}
+      }
+    });
+
+    if (roles.length) {
+      // remove all extra entries which should not be there
+      Meteor.users.update(user._id, {
+        $pull: {
+          roles: {
+            $and: roles
+          }
+        }
+      });
+    }
+    else {
+      Meteor.users.update(user._id, {$set: {roles: []}});
     }
   },
 
   /**
-   * Check if user has specified permissions/roles
+   * Check if user has specified roles.
    *
    * @example
-   *     // non-group usage
+   *     // global roles
    *     Roles.userIsInRole(user, &#x27;admin&#x27;)
    *     Roles.userIsInRole(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
    *     Roles.userIsInRole(userId, &#x27;admin&#x27;)
    *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
    *
-   *     // per-group usage
-   *     Roles.userIsInRole(user,   [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
+   *     // partition roles (global roles are still checked)
+   *     Roles.userIsInRole(user, &#x27;admin&#x27;, &#x27;group1&#x27;)
    *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
-   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], Roles.GLOBAL_GROUP)
+   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], {partition: &#x27;group1&#x27;})
    *
-   *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
-   *     Roles.userIsInRole(user, &#x27;admin&#x27;)
-   *    
    * @method userIsInRole
-   * @param {String|Object} user User Id or actual user object
-   * @param {String|Array} roles Name of role/permission or Array of 
-   *                            roles/permissions to check against.  If array, 
-   *                            will return true if user is in _any_ role.
-   * @param {String} [group] Optional. Name of group.  If supplied, limits check
-   *                         to just that group.
-   *                         The user&#x27;s Roles.GLOBAL_GROUP will always be checked
-   *                         whether group is specified or not.  
-   * @return {Boolean} true if user is in _any_ of the target roles
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {String|Array} roles Name of role or an array of roles to check against. If array,
+   *                             will return &#x60;true&#x60; if user is in _any_ role.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;partition&#x60;: name of the partition; if supplied, limits check to just that partition;
+   *     the user&#x27;s global roles will always be checked whether partition is specified or not
+   *   - &#x60;anyPartition&#x60;: if set, role can be in any partition (&#x60;partition&#x60; option is ignored)
+   *
+   * Alternatively, it can be a partition name string.
+   * @return {Boolean} &#x60;true&#x60; if user is in _any_ of the target roles
+   * @static
    */
-  userIsInRole: function (user, roles, group) {
+  userIsInRole: function (user, roles, options) {
     var id,
-        userRoles,
-        query,
-        groupQuery,
-        found = false
+        query;
+
+    options = options || {};
 
     // ensure array to simplify code
-    if (!_.isArray(roles)) {
-      roles = [roles]
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (!roles.length) return false;
+
+    if (_.isString(options)) {
+      options = {partition: options};
     }
 
-    if (!user) return false
-    if (group) {
-      if (&#x27;string&#x27; !== typeof group) return false
-      if (&#x27;$&#x27; === group[0]) return false
+    options.partition = options.partition || null;
 
-      // convert any periods to underscores
-      group = group.replace(/\./g, &#x27;_&#x27;)
-    }
-    
-    if (&#x27;object&#x27; === typeof user) {
-      userRoles = user.roles
-      if (_.isArray(userRoles)) {
+    options = _.defaults(options, {
+      anyPartition: false
+    });
+
+    if (!user) return false;
+
+    if (_.isObject(user)) {
+      if (_.has(user, &#x27;roles&#x27;)) {
         return _.some(roles, function (role) {
-          return _.contains(userRoles, role)
-        })
-      } else if (&#x27;object&#x27; === typeof userRoles) {
-        // roles field is dictionary of groups
-        found = _.isArray(userRoles[group]) &amp;&amp; _.some(roles, function (role) {
-          return _.contains(userRoles[group], role)
-        })
-        if (!found) {
-          // not found in regular group or group not specified.  
-          // check Roles.GLOBAL_GROUP, if it exists
-          found = _.isArray(userRoles[Roles.GLOBAL_GROUP]) &amp;&amp; _.some(roles, function (role) {
-            return _.contains(userRoles[Roles.GLOBAL_GROUP], role)
-          })
-        }
-        return found
-      }
-
-      // missing roles field, try going direct via id
-      id = user._id
-    } else if (&#x27;string&#x27; === typeof user) {
-      id = user
-    }
-
-    if (!id) return false
-
-
-    query = {_id: id, $or: []}
-
-    // always check Roles.GLOBAL_GROUP
-    groupQuery = {}
-    groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
-    query.$or.push(groupQuery)
-
-    if (group) {
-      // structure of query, when group specified including Roles.GLOBAL_GROUP 
-      //   {_id: id, 
-      //    $or: [
-      //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
-      //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
-      //    ]}
-      groupQuery = {}
-      groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
-      query.$or.push(groupQuery)
-    } else {
-      // structure of query, where group not specified. includes 
-      // Roles.GLOBAL_GROUP 
-      //   {_id: id, 
-      //    $or: [
-      //      {roles: {$in: [&#x27;admin&#x27;]}},
-      //      {&#x27;roles.__global_roles__&#x27;: {$in: [&#x27;admin&#x27;]}}
-      //    ]}
-      query.$or.push({roles: {$in: roles}})
-    }
-
-    found = Meteor.users.findOne(query, {fields: {_id: 1}})
-    return found ? true : false
-  },
-
-  /**
-   * Retrieve users roles
-   *
-   * @method getRolesForUser
-   * @param {String|Object} user User Id or actual user object
-   * @param {String} [group] Optional name of group to restrict roles to.
-   *                         User&#x27;s Roles.GLOBAL_GROUP will also be included.
-   * @return {Array} Array of user&#x27;s roles, unsorted.
-   */
-  getRolesForUser: function (user, group) {
-    if (!user) return []
-    if (group) {
-      if (&#x27;string&#x27; !== typeof group) return []
-      if (&#x27;$&#x27; === group[0]) return []
-
-      // convert any periods to underscores
-      group = group.replace(/\./g, &#x27;_&#x27;)
-    }
-
-    if (&#x27;string&#x27; === typeof user) {
-      user = Meteor.users.findOne(
-               {_id: user},
-               {fields: {roles: 1}})
-
-    } else if (&#x27;object&#x27; !== typeof user) {
-      // invalid user object
-      return []
-    }
-
-    if (!user || !user.roles) return []
-
-    if (group) {
-      return _.union(user.roles[group] || [], user.roles[Roles.GLOBAL_GROUP] || [])
-    }
-
-    if (_.isArray(user.roles))
-      return user.roles
-
-    // using groups but group not specified. return global group, if exists
-    return user.roles[Roles.GLOBAL_GROUP] || []
-  },
-
-  /**
-   * Retrieve set of all existing roles
-   *
-   * @method getAllRoles
-   * @return {Cursor} cursor of existing roles
-   */
-  getAllRoles: function () {
-    return Meteor.roles.find({}, {sort: {name: 1}})
-  },
-
-  /**
-   * Retrieve all users who are in target role.  
-   *
-   * NOTE: This is an expensive query; it performs a full collection scan
-   * on the users collection since there is no index set on the &#x27;roles&#x27; field.  
-   * This is by design as most queries will specify an _id so the _id index is 
-   * used automatically.
-   *
-   * @method getUsersInRole
-   * @param {Array|String} role Name of role/permission.  If array, users 
-   *                            returned will have at least one of the roles
-   *                            specified but need not have _all_ roles.
-   * @param {String} [group] Optional name of group to restrict roles to.
-   *                         User&#x27;s Roles.GLOBAL_GROUP will also be checked.
-   * @param {Object} [options] Optional options which are passed directly
-   *                           through to &#x60;Meteor.users.find(query, options)&#x60;
-   * @return {Cursor} cursor of users in role
-   */
-  getUsersInRole: function (role, group, options) {
-    var query,
-        roles = role,
-        groupQuery
-
-    // ensure array to simplify query logic
-    if (!_.isArray(roles)) roles = [roles]
-    
-    if (group) {
-      if (&#x27;string&#x27; !== typeof group)
-        throw new Error (&quot;Roles error: Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
-      if (&#x27;$&#x27; === group[0])
-        throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
-
-      // convert any periods to underscores
-      group = group.replace(/\./g, &#x27;_&#x27;)
-    }
-
-    query = {$or: []}
-
-    // always check Roles.GLOBAL_GROUP
-    groupQuery = {}
-    groupQuery[&#x27;roles.&#x27;+Roles.GLOBAL_GROUP] = {$in: roles}
-    query.$or.push(groupQuery)
-
-    if (group) {
-      // structure of query, when group specified including Roles.GLOBAL_GROUP 
-      //   {
-      //    $or: [
-      //      {&#x27;roles.group1&#x27;:{$in: [&#x27;admin&#x27;]}},
-      //      {&#x27;roles.__global_roles__&#x27;:{$in: [&#x27;admin&#x27;]}}
-      //    ]}
-      groupQuery = {}
-      groupQuery[&#x27;roles.&#x27;+group] = {$in: roles}
-      query.$or.push(groupQuery)
-    } else {
-      // structure of query, where group not specified. includes 
-      // Roles.GLOBAL_GROUP 
-      //   {
-      //    $or: [
-      //      {roles: {$in: [&#x27;admin&#x27;]}},
-      //      {&#x27;roles.__global_roles__&#x27;: {$in: [&#x27;admin&#x27;]}}
-      //    ]}
-      query.$or.push({roles: {$in: roles}})
-    }
-
-    return Meteor.users.find(query, options);
-  },  // end getUsersInRole 
-  
-  /**
-   * Retrieve users groups, if any
-   *
-   * @method getGroupsForUser
-   * @param {String|Object} user User Id or actual user object
-   * @param {String} [role] Optional name of roles to restrict groups to.
-   *
-   * @return {Array} Array of user&#x27;s groups, unsorted. Roles.GLOBAL_GROUP will be omitted
-   */
-  getGroupsForUser: function (user, role) {
-    var userGroups = [];
-    
-    if (!user) return []
-    if (role) {
-      if (&#x27;string&#x27; !== typeof role) return []
-      if (&#x27;$&#x27; === role[0]) return []
-
-      // convert any periods to underscores
-      role = role.replace(&#x27;.&#x27;, &#x27;_&#x27;)
-    }
-
-    if (&#x27;string&#x27; === typeof user) {
-      user = Meteor.users.findOne(
-               {_id: user},
-               {fields: {roles: 1}})
-    
-    }else if (&#x27;object&#x27; !== typeof user) {
-      // invalid user object
-      return []
-    }
-
-    //User has no roles or is not using groups
-    if (!user || !user.roles || _.isArray(user.roles)) return []
-
-    if (role) {
-      _.each(user.roles, function(groupRoles, groupName) {
-        if (_.contains(groupRoles, role) &amp;&amp; groupName !== Roles.GLOBAL_GROUP) {
-          userGroups.push(groupName);
-        }
-      });
-      return userGroups;
-    }else {
-      return _.without(_.keys(user.roles), Roles.GLOBAL_GROUP);
-    }
-
-  }, //End getGroupsForUser
-
-
-  /**
-   * Private function &#x27;template&#x27; that uses $set to construct an update object
-   * for MongoDB.  Passed to _updateUserRoles
-   *
-   * @method _update_$set_fn 
-   * @protected
-   * @param {Array} roles
-   * @param {String} [group]
-   * @return {Object} update object for use in MongoDB update command
-   */
-  _update_$set_fn: function  (roles, group) {
-    var update = {}
-
-    if (group) {
-      // roles is a key/value dict object
-      update.$set = {}
-      update.$set[&#x27;roles.&#x27; + group] = roles
-    } else {
-      // roles is an array of strings
-      update.$set = {roles: roles}
-    }
-
-    return update
-  },  // end _update_$set_fn 
-
-  /**
-   * Private function &#x27;template&#x27; that uses $addToSet to construct an update 
-   * object for MongoDB.  Passed to _updateUserRoles
-   *
-   * @method _update_$addToSet_fn  
-   * @protected
-   * @param {Array} roles
-   * @param {String} [group]
-   * @return {Object} update object for use in MongoDB update command
-   */
-  _update_$addToSet_fn: function (roles, group) {
-    var update = {}
-
-    if (group) {
-      // roles is a key/value dict object
-      update.$addToSet = {}
-      update.$addToSet[&#x27;roles.&#x27; + group] = {$each: roles}
-    } else {
-      // roles is an array of strings
-      update.$addToSet = {roles: {$each: roles}}
-    }
-
-    return update
-  },  // end _update_$addToSet_fn 
-
-
-  /**
-   * Internal function that uses the Template pattern to adds or sets roles 
-   * for users.
-   *
-   * @method _updateUserRoles
-   * @protected
-   * @param {Array|String} users user id(s) or object(s) with an _id field
-   * @param {Array|String} roles name(s) of roles/permissions to add users to
-   * @param {String} group Group name. If not null or undefined, roles will be
-   *                         specific to that group.  
-   *                         Group names can not start with &#x27;$&#x27;.
-   *                         Periods in names &#x27;.&#x27; are automatically converted
-   *                         to underscores.
-   *                         The special group Roles.GLOBAL_GROUP provides 
-   *                         a convenient way to assign blanket roles/permissions
-   *                         across all groups.  The roles/permissions in the 
-   *                         Roles.GLOBAL_GROUP group will be automatically 
-   *                         included in checks for any group.
-   * @param {Function} updateFactory Func which returns an update object that
-   *                         will be passed to Mongo.
-   *   @param {Array} roles
-   *   @param {String} [group]
-   */
-  _updateUserRoles: function (users, roles, group, updateFactory) {
-    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param&quot;)
-    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param&quot;)
-    if (group) {
-      if (&#x27;string&#x27; !== typeof group)
-        throw new Error (&quot;Roles error: Invalid parameter &#x27;group&#x27;. Expected &#x27;string&#x27; type&quot;)
-      if (&#x27;$&#x27; === group[0])
-        throw new Error (&quot;Roles error: groups can not start with &#x27;$&#x27;&quot;)
-
-      // convert any periods to underscores
-      group = group.replace(/\./g, &#x27;_&#x27;)
-    }
-
-    var existingRoles,
-        query,
-        update
-
-    // ensure arrays to simplify code
-    if (!_.isArray(users)) users = [users]
-    if (!_.isArray(roles)) roles = [roles]
-
-    // remove invalid roles
-    roles = _.reduce(roles, function (memo, role) {
-      if (role
-          &amp;&amp; &#x27;string&#x27; === typeof role
-          &amp;&amp; role.trim().length &gt; 0) {
-        memo.push(role.trim())
-      }
-      return memo
-    }, [])
-
-    // empty roles array is ok, since it might be a $set operation to clear roles
-    //if (roles.length === 0) return
-
-    // ensure all roles exist in &#x27;roles&#x27; collection
-    existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
-      memo[role.name] = true
-      return memo
-    }, {})
-    _.each(roles, function (role) {
-      if (!existingRoles[role]) {
-        Roles.createRole(role)
-      }
-    })
-
-    // ensure users is an array of user ids
-    users = _.reduce(users, function (memo, user) {
-      var _id
-      if (&#x27;string&#x27; === typeof user) {
-        memo.push(user)
-      } else if (&#x27;object&#x27; === typeof user) {
-        _id = user._id
-        if (&#x27;string&#x27; === typeof _id) {
-          memo.push(_id)
-        }
-      }
-      return memo
-    }, [])
-    
-    // update all users
-    update = updateFactory(roles, group)
-    
-    try {
-      if (Meteor.isClient) {
-        // On client, iterate over each user to fulfill Meteor&#x27;s 
-        // &#x27;one update per ID&#x27; policy
-        _.each(users, function (user) {
-          Meteor.users.update({_id: user}, update)
+          if (options.anyPartition) {
+            return _.some(user.roles || [], Roles._roleMatcher(role));
+          }
+          else {
+            return _.some(user.roles || [], Roles._roleAndPartitionMatcher(role, options.partition));
+          }
         })
       } else {
-        // On the server we can use MongoDB&#x27;s $in operator for 
-        // better performance
-        Meteor.users.update(
-          {_id: {$in: users}},
-          update,
-          {multi: true})
+        // missing roles field, try going direct via id
+        id = user._id;
       }
+    } else {
+      id = user;
     }
-    catch (ex) {
-      if (ex.name === &#x27;MongoError&#x27; &amp;&amp; isMongoMixError(ex.err)) {
-        throw new Error (mixingGroupAndNonGroupErrorMsg)
-      }
 
-      throw ex
+    if (!id) return false;
+
+    if (options.anyPartition) {
+      query = {
+        _id: id,
+        &#x27;roles.role&#x27;: {$in: roles}
+      };
+    }
+    else {
+      query = {
+        _id: id,
+        $or: [{
+          roles: {
+            $elemMatch: {
+              role: {$in: roles},
+              partition: options.partition
+            }
+          }
+        }, {
+          roles: {
+            $elemMatch: {
+              role: {$in: roles},
+              partition: null
+            }
+          }
+        }]
+      };
     }
-  }  // end _updateUserRoles
 
-})  // end _.extend(Roles ...)
+    return !!Meteor.users.findOne(query, {fields: {_id: 1}});
+  },
 
+  /**
+   * Retrieve user&#x27;s roles.
+   *
+   * @method getRolesForUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;partition&#x60;: name of partition to provide roles for; if not specified, global roles are returned
+   *   - &#x60;anyPartition&#x60;: if set, role can be in any partition (&#x60;partition&#x60; option is ignored)
+   *   - &#x60;fullObjects&#x60;: return full roles objects (&#x60;true&#x60;) or just names (&#x60;false&#x60;) (default &#x60;false&#x60;)
+   *   - &#x60;onlyAssigned&#x60;: return only assigned roles and not automatically inferred (like subroles)
+   *
+   * Alternatively, it can be a partition name string.
+   * @return {Array} Array of user&#x27;s roles, unsorted.
+   * @static
+   */
+  getRolesForUser: function (user, options) {
+    var roles;
 
-function isMongoMixError (errorMsg) {
-  var expectedMessages = [
-      &#x27;Cannot apply $addToSet modifier to non-array&#x27;,
-      &#x27;Cannot apply $addToSet to a non-array field&#x27;,
-      &#x27;Can only apply $pullAll to an array&#x27;,
-      &#x27;Cannot apply $pull/$pullAll modifier to non-array&#x27;,
-      &quot;can&#x27;t append to array using string field name&quot;,
-      &#x27;to traverse the element&#x27;
-      ]
+    options = options || {};
 
-  return _.some(expectedMessages, function (snippet) {
-    return strContains(errorMsg, snippet)
-  })
-}
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
 
-function strContains (haystack, needle) {
-  return -1 !== haystack.indexOf(needle)
-}
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      fullObjects: false,
+      onlyAssigned: false,
+      anyPartition: false
+    });
+
+    user = Roles._resolveUser(user);
+
+    if (!user) return [];
+
+    if (options.anyPartition) {
+      roles = user.roles || [];
+    }
+    else {
+      roles = _.filter(user.roles || [], Roles._partitionMatcher(options.partition));
+    }
+
+    if (options.onlyAssigned) {
+      roles = _.filter(roles, Roles._onlyAssignedMatcher());
+    }
+
+    if (options.fullObjects) {
+      return roles;
+    }
+
+    return _.pluck(roles, &#x27;role&#x27;);
+  },
+
+  /**
+   * Retrieve cursor of all existing roles.
+   *
+   * @method getAllRoles
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to &#x60;Meteor.roles.find(query, options)&#x60;.
+   * @return {Cursor} Cursor of existing roles.
+   * @static
+   */
+  getAllRoles: function (queryOptions) {
+    queryOptions = queryOptions || {sort: {name: 1}};
+
+    return Meteor.roles.find({}, queryOptions);
+  },
+
+  /**
+   * Retrieve all users who are in target role.
+   *
+   * Options:
+   *
+   * @method getUsersInRole
+   * @param {String|Array} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;partition&#x60;: name of the partition to restrict roles to; user&#x27;s global
+   *     roles will also be checked
+   *   - &#x60;anyPartition&#x60;: if set, role can be in any partition (&#x60;partition&#x60; option is ignored)
+   *   - &#x60;queryOptions&#x60;: options which are passed directly
+   *     through to &#x60;Meteor.users.find(query, options)&#x60;
+   *
+   * Alternatively, it can be a partition name string.
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to &#x60;Meteor.users.find(query, options)&#x60;
+   * @return {Cursor} Cursor of users in roles.
+   * @static
+   */
+  getUsersInRole: function (roles, options, queryOptions) {
+    var query;
+
+    options = options || {};
+
+    // ensure array to simplify code
+    if (!_.isArray(roles)) roles = [roles];
+
+    if (_.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = options.partition || null;
+
+    options = _.defaults(options, {
+      queryOptions: queryOptions || {},
+      anyPartition: false
+    });
+
+    if (options.anyPartition) {
+      query = {
+        &#x27;roles.role&#x27;: {$in: roles}
+      };
+    }
+    else {
+      query = {
+        $or: [{
+          roles: {
+            $elemMatch: {
+              role: {$in: roles},
+              partition: options.partition
+            }
+          }
+        }, {
+          roles: {
+            $elemMatch: {
+              role: {$in: roles},
+              partition: null
+            }
+          }
+        }]
+      };
+    }
+
+    return Meteor.users.find(query, options.queryOptions);
+  },
+
+  /**
+   * Deprecated. Use &#x60;getPartitionsForUser&#x60; instead.
+   *
+   * @method getGroupsForUser
+   * @static
+   * @deprecated
+   */
+  getGroupsForUser: function (/*args*/) {
+    if (!getGroupsForUserDeprecationWarning) {
+      getGroupsForUserDeprecationWarning = true;
+      console &amp;&amp; console.warn(&quot;getGroupsForUser has been deprecated. Use getPartitionsForUser instead.&quot;);
+    }
+
+    return Roles.getPartitionsForUser.apply(this, arguments);
+  },
+
+  /**
+   * Retrieve users partitions, if any.
+   *
+   * @method getPartitionsForUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {String} [roles] Name of roles to restrict partitions to.
+   *
+   * @return {Array} Array of user&#x27;s partitions, unsorted.
+   * @static
+   */
+  getPartitionsForUser: function (user, roles) {
+    var partitions;
+
+    // ensure array to simplify code
+    if (roles &amp;&amp; !_.isArray(roles)) roles = [roles];
+
+    user = Roles._resolveUser(user);
+
+    if (!user) return [];
+
+    partitions = [];
+    _.each(user.roles || [], function (userRole) {
+      // == used on purpose.
+      if (userRole.partition == null) return;
+      if (roles &amp;&amp; !_.contains(roles, userRole.role)) return;
+
+      partitions.push(userRole.partition);
+    });
+
+    return _.uniq(partitions);
+  },
+
+  /**
+   * Resolves the user ID into an actual user object with &#x60;roles&#x60; field,
+   * if it is not already.
+   *
+   * @method _resolveUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Boolean} force Load a new user object even if it is already one.
+   * @return {Object} User object.
+   * @private
+   * @static
+   */
+  _resolveUser: function (user, force) {
+    // TODO: We could use $elemMatch to limit returned fields here.
+    if (!_.isObject(user)) {
+      user = Meteor.users.findOne(
+               {_id: user},
+               {fields: {roles: 1}});
+    } else if (force || !_.has(user, &#x27;roles&#x27;)) {
+      user = Meteor.users.findOne(
+               {_id: user._id},
+               {fields: {roles: 1}});
+    }
+
+    return user;
+  },
+
+  /**
+   * @method _roleMatcher
+   * @param {String} roleName A role name to match against.
+   * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
+   *                     if its name matches &#x60;roleName&#x60;.
+   * @private
+   * @static
+   */
+  _roleMatcher: function (roleName) {
+    return function (userRole) {
+      return userRole.role === roleName;
+    };
+  },
+
+  /**
+   * @method _roleAndPartitionMatcher
+   * @param {String} roleName A role name to match against.
+   * @param {String} partition A partition to match against.
+   * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
+   *                     if its name matches &#x60;roleName&#x60;, and partition matches &#x60;partition&#x60;.
+   * @private
+   * @static
+   */
+  _roleAndPartitionMatcher: function (roleName, partition) {
+    return function (userRole) {
+      // == used on purpose in &quot;userRole.partition == null&quot;
+      return (userRole.role === roleName &amp;&amp; userRole.partition === partition) ||
+        (userRole.role === roleName &amp;&amp; (!_.has(userRole, &#x27;partition&#x27;) || userRole.partition == null));
+    };
+  },
+
+  /**
+   * @method _partitionMatcher
+   * @param {String} partition A partition to match against.
+   * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
+   *                     if its partition matches &#x60;partition&#x60;.
+   * @private
+   * @static
+   */
+  _partitionMatcher: function (partition) {
+    return function (userRole) {
+      // == used on purpose in &quot;userRole.partition == null&quot;
+      return (userRole.partition === partition) ||
+        (!_.has(userRole, &#x27;partition&#x27;) || userRole.partition == null);
+    };
+  },
+
+  /**
+   * @method _onlyAssignedMatcher
+   * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
+   *                     if the role is an assigned role.
+   * @private
+   * @static
+   */
+  _onlyAssignedMatcher: function () {
+    return function (userRole) {
+      return !!userRole.assigned;
+    };
+  },
+
+  /**
+   * Throw an exception if &#x60;roleName&#x60; is an invalid role name.
+   *
+   * @method _checkRoleName
+   * @param {String} roleName A role name to match against.
+   * @private
+   * @static
+   */
+  _checkRoleName: function (roleName) {
+    if (!roleName || !_.isString(roleName) || roleName.trim() !== roleName) {
+      throw new Error(&quot;Invalid role name &#x27;&quot; + roleName + &quot;&#x27;.&quot;);
+    }
+  }
+
+});  // end _.extend(Roles ...)
 
 }());
 
     </pre>
 </div>
-
                     </div>
                 </div>
             </div>
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 4fcce81dcc..fb49321f1c 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <link rel="icon" href="../assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,107 +25,275 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1 class="file-heading">File: roles/roles_server.js</h1>
+<h1 class="file-heading">File: roles/roles_server.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
-&quot;use strict&quot;
+&quot;use strict&quot;;
 
+// Create default indexes for roles and users collection.
 
-/**
- * Roles collection documents consist only of an id and a role name.
- *   ex: { _id: &quot;123&quot;, name: &quot;admin&quot; }
- */
-if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection(&quot;roles&quot;)
+Meteor.roles._ensureIndex({name: 1}, {unique: 1});
 
-  // Create default indexes for roles collection
-  Meteor.roles._ensureIndex(&#x27;name&#x27;, {unique: 1})
-}
+// Index only on &quot;roles.role&quot; is not needed because the combined index works for it as well.
+Meteor.users._ensureIndex({&#x27;roles.role&#x27;: 1, &#x27;roles.partition&#x27;: 1});
+Meteor.users._ensureIndex({&#x27;roles.partition&#x27;: 1});
 
-
-/**
+/*
  * Publish logged-in user&#x27;s roles so client-side checks can work.
  * 
  * Use a named publish function so clients can check &#x60;ready()&#x60; state.
  */
 Meteor.publish(&#x27;_roles&#x27;, function () {
   var loggedInUserId = this.userId,
-      fields = {roles: 1}
+      fields = {roles: 1};
 
   if (!loggedInUserId) {
-    this.ready()
-    return
+    this.ready();
+    return;
   }
 
   return Meteor.users.find({_id: loggedInUserId},
-                           {fields: fields})
-})
+                           {fields: fields});
+});
+
+_.extend(Roles, {
+  /**
+   * @method _isNewField
+   * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field.
+   * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;roles&#x60; field is in the new format.
+   *                    If it is ambiguous or it is not, returns &#x60;false&#x60;.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _isNewField: function (roles) {
+    return _.isArray(roles) &amp;&amp; _.isObject(roles[0]);
+  },
+
+  /**
+   * @method _isOldField
+   * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field.
+   * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;roles&#x60; field is in the old format.
+   *                    If it is ambiguous or it is not, returns &#x60;false&#x60;.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _isOldField: function (roles) {
+    return (_.isArray(roles) &amp;&amp; _.isString(roles[0])) || _.isObject(roles);
+  },
+
+  /**
+   * @method _convertToNewField
+   * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the old format.
+   * @return {Array} Converted &#x60;roles&#x60; to the new format.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _convertToNewField: function (oldRoles) {
+    var roles = [];
+    if (_.isArray(oldRoles)) {
+      _.each(oldRoles, function (role, index) {
+        if (!_.isString(role)) throw new Error(&quot;Role &#x27;&quot; + role + &quot;&#x27; is not a string.&quot;);
+
+        roles.push({
+          role: role,
+          partition: null,
+          assigned: true
+        })
+      });
+    }
+    else if (_.isObject(oldRoles)) {
+      _.each(oldRoles, function (rolesArray, group) {
+        // unescape
+        group = group.replace(/_/g, &#x27;.&#x27;);
+
+        _.each(rolesArray, function (role, index) {
+          if (!_.isString(role)) throw new Error(&quot;Role &#x27;&quot; + role + &quot;&#x27; is not a string.&quot;);
+
+          roles.push({
+            role: role,
+            partition: group,
+            assigned: true
+          })
+        });
+      })
+    }
+    return roles;
+  },
+
+  /**
+   * @method _convertToOldField
+   * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the new format.
+   * @return {Array} Converted &#x60;roles&#x60; to the old format.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _convertToOldField: function (newRoles, usingGroups) {
+    var roles;
+
+    if (usingGroups) {
+      roles = {};
+    }
+    else {
+      roles = [];
+    }
+
+    _.each(newRoles, function (userRole, index) {
+      if (!_.isObject(userRole)) throw new Error(&quot;Role &#x27;&quot; + userRole + &quot;&#x27; is not an object.&quot;);
+
+      // We assume that we are converting back a failed migration, so values can only be
+      // what were valid values in 1.0. So no group names starting with $ and no subroles.
+
+      if (userRole.partition) {
+        if (!usingGroups) throw new Error(&quot;Role &#x27;&quot; + userRole.role + &quot;&#x27; with partition &#x27;&quot; + userRole.partition + &quot;&#x27; without enabled groups.&quot;);
+
+        // escape
+        userRole.partition = group.replace(/./g, &#x27;_&#x27;);
+
+        if (userRole.partition[0] === &#x27;$&#x27;) throw new Error(&quot;Group name &#x27;&quot; + userRole.partition + &quot;&#x27; start with $.&quot;);
+
+        roles[userRole.partition] = roles[userRole.partition] || [];
+        roles[userRole.partition].push(userRole.role);
+      }
+      else {
+        if (usingGroups) {
+          roles.__global_roles__ = roles.__global_roles__ || [];
+          roles.__global_roles__.push(userRole.role);
+        }
+        else {
+          roles.push(userRole.role);
+        }
+      }
+    });
+    return roles;
+  },
+
+  /**
+   * @method _defaultUpdateUser
+   * @param {Object} user &#x60;Meteor.users&#x60; document.
+   * @return {Array|Object} roles Value to which user&#x27;s &#x60;roles&#x60; field should be set.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _defaultUpdateUser: function (user, roles) {
+    Meteor.users.update({
+      _id: user._id,
+      // making sure nothing changed in meantime
+      roles: user.roles
+    }, {
+      $set: {roles: roles}
+    });
+  },
+
+  /**
+   * Migrates &#x60;Meteor.users&#x60; and &#x60;Meteor.roles&#x60; to the new format.
+   *
+   * @method _forwardMigrate
+   * @param {Function} updateUser Function which updates the user object. Default &#x60;_defaultUpdateUser&#x60;.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _forwardMigrate: function (updateUser) {
+    updateUser = updateUser || Roles._defaultUpdateUser;
+
+    Meteor.roles.update({children: {$exists: false}}, {$set: {children: []}}, {multi: true});
+
+    Meteor.users.find().forEach(function (user, index, cursor) {
+      if (!Roles._isNewField(user.roles)) {
+        updateUser(user, Roles._convertToNewField(user.roles));
+      }
+    });
+  },
+
+  /**
+   * Migrates &#x60;Meteor.users&#x60; and &#x60;Meteor.roles&#x60; to the old format.
+   *
+   * We assume that we are converting back a failed migration, so values can only be
+   * what were valid values in the old format. So no group names starting with &#x60;$&#x60; and
+   * no subroles.
+   *
+   * @method _backwardMigrate
+   * @param {Function} updateUser Function which updates the user object. Default &#x60;_defaultUpdateUser&#x60;.
+   * @param {Boolean} usingGroups Should we use groups or not.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _backwardMigrate: function (updateUser, usingGroups) {
+    updateUser = updateUser || Roles._defaultUpdateUser;
+
+    Meteor.roles.update({}, {$unset: {children: &#x27;&#x27;}}, {multi: true});
+
+    Meteor.users.find().forEach(function (user, index, cursor) {
+      if (!Roles._isOldField(user.roles)) {
+        updateUser(user, Roles._convertToOldField(user.roles, usingGroups));
+      }
+    });
+  }
+});
 
     </pre>
 </div>
-
                     </div>
                 </div>
             </div>
diff --git a/docs/index.html b/docs/index.html
index dd5a660860..c7c6f6d394 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="./assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="./assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="./assets/favicon.png">
+    <link rel="icon" href="./assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="./assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="./assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,68 +25,61 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="./classes/Roles.html">Roles</a></li>
-            
-                <li><a href="./classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="./modules/Roles.html">Roles</a></li>
-            
-                <li><a href="./modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="./classes/Roles.html">Roles</a></li>
+                                <li><a href="./classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="./modules/Roles.html">Roles</a></li>
+                                <li><a href="./modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                            <div class="apidocs">
+    <div class="apidocs">
         <div id="docs-main" class="content">
             <p>
             Browse to a module or class using the sidebar to view its API documentation.
@@ -109,7 +100,6 @@
     </div>
 
 
-
                     </div>
                 </div>
             </div>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index b153dc6514..b018cc76dd 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <link rel="icon" href="../assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,113 +25,115 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1>Roles Module</h1>
+<h1>Roles Module</h1>
 <div class="box clearfix meta">
-    
 
-    
 
-    
         <div class="foundat">
-            Defined in: <a href="../files/roles_roles_common.js.html#l17"><code>roles&#x2F;roles_common.js:17</code></a>
+            Defined in: <a href="../files/roles_roles_common.js.html#l31"><code>roles&#x2F;roles_common.js:31</code></a>
         </div>
-    
 
-    
 </div>
 
 
-
 <div class="box intro">
     <p>Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.</p>
+<p>It uses <code>roles</code> field to <code>Meteor.users</code> documents which is an array of subdocuments with the following
+schema:</p>
+<ul>
+<li><code>role</code>: role name</li>
+<li><code>partition</code>: partition name</li>
+<li><code>assigned</code>: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)</li>
+</ul>
+<p>Roles themselves are accessible throgh <code>Meteor.roles</code> collection and documents consist of:</p>
+<ul>
+<li><code>_id</code></li>
+<li><code>name</code>: role name</li>
+<li><code>children</code>: list of subdocuments:
+<ul>
+<li><code>_id</code></li>
+<li><code>name</code></li>
+</ul>
+</li>
+</ul>
+<p>Children list elements are subdocuments so that they can be easier extended in the future.</p>
+<p>Roles can have multiple parents and can be children (subroles) of multiple roles.</p>
+<p>Example: <code>{_id: &quot;123&quot;, name: &quot;admin&quot;}</code></p>
 
 </div>
 
 
-
 <div class="yui3-g">
     <div class="yui3-u-1-2">
-        
             <p>This module provides the following classes:</p>
 
             <ul class="module-classes">
-            
                 <li class="module-class">
                     <a href="../classes/Roles.html">
                         Roles
                     </a>
                 </li>
-            
             </ul>
-        
     </div>
 
+
     <div class="yui3-u-1-2">
-        
     </div>
 </div>
-
                     </div>
                 </div>
             </div>
diff --git a/docs/modules/UIHelpers.html b/docs/modules/UIHelpers.html
index 12c58c73c1..523881807e 100644
--- a/docs/modules/UIHelpers.html
+++ b/docs/modules/UIHelpers.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
     <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
     <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="shortcut icon" type="image/png" href="../assets/favicon.png">
+    <link rel="icon" href="../assets/favicon.ico">
     <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
 </head>
 <body class="yui3-skin-sam">
@@ -14,9 +14,7 @@
 <div id="doc">
     <div id="hd" class="yui3-g header">
         <div class="yui3-u-3-4">
-            
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API"></h1>
-            
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
         </div>
         <div class="yui3-u-1-4 version">
             <em>API Docs for: v1.2.14</em>
@@ -27,84 +25,71 @@
         <div class="yui3-u-1-4">
             <div id="docs-sidebar" class="sidebar apidocs">
                 <div id="api-list">
-    <h2 class="off-left">APIs</h2>
-    <div id="api-tabview" class="tabview">
-        <ul class="tabs">
-            <li><a href="#api-classes">Classes</a></li>
-            <li><a href="#api-modules">Modules</a></li>
-        </ul>
-
-        <div id="api-tabview-filter">
-            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-        </div>
-
-        <div id="api-tabview-panel">
-            <ul id="api-classes" class="apis classes">
-            
-                <li><a href="../classes/Roles.html">Roles</a></li>
-            
-                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-
-            <ul id="api-modules" class="apis modules">
-            
-                <li><a href="../modules/Roles.html">Roles</a></li>
-            
-                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-            
-            </ul>
-        </div>
-    </div>
-</div>
-
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="yui3-u-3-4">
                 <div id="api-options">
-        Show:
-        <label for="api-show-inherited">
-            <input type="checkbox" id="api-show-inherited" checked>
-            Inherited
-        </label>
-
-        <label for="api-show-protected">
-            <input type="checkbox" id="api-show-protected">
-            Protected
-        </label>
-
-        <label for="api-show-private">
-            <input type="checkbox" id="api-show-private">
-            Private
-        </label>
-        <label for="api-show-deprecated">
-            <input type="checkbox" id="api-show-deprecated">
-            Deprecated
-        </label>
-
-    </div>
-
-
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
             <div class="apidocs">
                 <div id="docs-main">
                     <div class="content">
-                        <h1>UIHelpers Module</h1>
+<h1>UIHelpers Module</h1>
 <div class="box clearfix meta">
-    
 
-    
 
-    
         <div class="foundat">
             Defined in: <a href="../files/roles_client_uiHelpers.js.html#l3"><code>roles&#x2F;client&#x2F;uiHelpers.js:3</code></a>
         </div>
-    
 
-    
 </div>
 
 
-
 <div class="box intro">
     <p>Convenience functions for use on client.</p>
 <p>NOTE: You must restrict user actions on the server-side; any
@@ -114,29 +99,23 @@ trusted.</p>
 </div>
 
 
-
 <div class="yui3-g">
     <div class="yui3-u-1-2">
-        
             <p>This module provides the following classes:</p>
 
             <ul class="module-classes">
-            
                 <li class="module-class">
                     <a href="../classes/UIHelpers.html">
                         UIHelpers
                     </a>
                 </li>
-            
             </ul>
-        
     </div>
 
+
     <div class="yui3-u-1-2">
-        
     </div>
 </div>
-
                     </div>
                 </div>
             </div>

From b0f00928040447d89112fb662ae69965cf3a72f8 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 15:27:19 +0100
Subject: [PATCH 0194/1140] Updated README.

---
 History.md                                |   5 +
 README.md                                 | 270 +++++++++-------------
 examples/mini-pages/.gitignore            |   1 -
 examples/mini-pages/.meteor/.gitignore    |   2 -
 examples/mini-pages/.meteor/packages      |  12 -
 examples/mini-pages/.meteor/release       |   1 -
 examples/mini-pages/client/client.js      | 168 --------------
 examples/mini-pages/client/example.css    |  67 ------
 examples/mini-pages/client/example.html   | 163 -------------
 examples/mini-pages/client/lib/globals.js |   2 -
 examples/mini-pages/client/routing.js     |  80 -------
 examples/mini-pages/model.js              |   9 -
 examples/mini-pages/polyfills.js          |  11 -
 examples/mini-pages/server/server.js      | 119 ----------
 examples/mini-pages/smart.json            |   6 -
 examples/router/.gitignore                |   1 -
 examples/router/.meteor/.gitignore        |   2 -
 examples/router/.meteor/packages          |  13 --
 examples/router/.meteor/release           |   1 -
 examples/router/client/client.js          | 166 -------------
 examples/router/client/example.css        |  67 ------
 examples/router/client/example.html       | 159 -------------
 examples/router/client/lib/globals.js     |   2 -
 examples/router/client/routing.js         |  95 --------
 examples/router/model.js                  |   9 -
 examples/router/polyfills.js              |  11 -
 examples/router/server/server.js          | 119 ----------
 examples/router/smart.json                |   8 -
 28 files changed, 115 insertions(+), 1454 deletions(-)
 delete mode 100644 examples/mini-pages/.gitignore
 delete mode 100644 examples/mini-pages/.meteor/.gitignore
 delete mode 100644 examples/mini-pages/.meteor/packages
 delete mode 100644 examples/mini-pages/.meteor/release
 delete mode 100644 examples/mini-pages/client/client.js
 delete mode 100644 examples/mini-pages/client/example.css
 delete mode 100644 examples/mini-pages/client/example.html
 delete mode 100644 examples/mini-pages/client/lib/globals.js
 delete mode 100644 examples/mini-pages/client/routing.js
 delete mode 100644 examples/mini-pages/model.js
 delete mode 100644 examples/mini-pages/polyfills.js
 delete mode 100644 examples/mini-pages/server/server.js
 delete mode 100644 examples/mini-pages/smart.json
 delete mode 100644 examples/router/.gitignore
 delete mode 100644 examples/router/.meteor/.gitignore
 delete mode 100644 examples/router/.meteor/packages
 delete mode 100644 examples/router/.meteor/release
 delete mode 100644 examples/router/client/client.js
 delete mode 100644 examples/router/client/example.css
 delete mode 100644 examples/router/client/example.html
 delete mode 100644 examples/router/client/lib/globals.js
 delete mode 100644 examples/router/client/routing.js
 delete mode 100644 examples/router/model.js
 delete mode 100644 examples/router/polyfills.js
 delete mode 100644 examples/router/server/server.js
 delete mode 100644 examples/router/smart.json

diff --git a/History.md b/History.md
index 5a44d67c07..d052a96334 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v2.0.0
+
+* Rewrite with new schema for `roles` field.
+* Support for roles hierarchies.
+
 ## v1.2.14
 
 * Compatibility with Meteor 1.2. #133
diff --git a/README.md b/README.md
index 1d42d06770..6df451c576 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 * [Contributors](#user-content-contributors)
 * [Authorization](#user-content-authorization)
 * [Permissions vs roles](#user-content-naming)
-* [What are "groups"?](#groups)
+* [What are "partitions"?](#user-content-partitions)
 * [Changes to default Meteor](#user-content-changes)
 * [Installation](#user-content-installing)
 * [Usage examples](#user-content-usage)
@@ -47,53 +47,69 @@ Thanks to:
 <a name="authorization">
 ### Authorization
 
-This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
-
-All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1).  UI-less apps are supported as well.
-
-    v1.1.0 - adds support for per-group assignment of permissions
-
-    v1.2.0 - adds the special Roles.GLOBAL_GROUP, used to provide blanket permissions across all groups
-
+This package lets you attach roles to a user which you can then check against later when deciding whether to grant
+access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching roles
+to a user object and then checking for the existence of those roles later. In some sense, it is very similar to
+tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying
+those roles easier.
 
 <br />
 
 <a name="naming">
 ### Permissions vs roles  (or What's in a name...)
 
-Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign on a user and which you can check for later.
+Although the name of this package is `roles`, you can define your roles, groups, permissions however you like.
+They are essentially just tags that you assign on a user and which you can check for later.
 
-You can have traditional roles like, "admin" or "webmaster", or you can assign more granular permissions such as, "view-secrets", "users.view", or "users.manage".  Often times more granular is actually better because you are able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level 'roles'.  To the roles package, it's all strings.
+You can have traditional roles like, `admin` or `webmaster`, or you can assign more granular permissions such
+as, `view-secrets`, `users.view`, or `users.manage`.  Often times more granular is actually better because you are
+able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level
+`roles`.  To the roles package, it's all just a role object.
+
+Roles can be put into a hierarchy. Roles can have multiple parents and can be children (subroles) of multiple roles.
+If a parent role is set to the user, all its descendants are also in effect. You can use this to create "super roles"
+combining multiple low-level permissions. For example, you could name your top-level roles `user` and `admin`
+and then you could use your second-level roles as permissions and name them `USERS_VIEW`, `POST_EDIT`, and similar.
+Then you could set `admin` role as parent role for `USERS_VIEW` and `POST_EDIT`, while `user` would be parent
+only of the `POST_EDIT` role. You can then assign `user` and `admin` roles to your users. And if you need to
+change permissions later for the whole role, just add or remove children roles.
 
 <br />
 
-<a name="groups">
-### What are "groups"?
+<a name="partitions">
+### What are "partitions"?
 
-Sometimes it's useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is more clear.  Users can have one set of permissions in group A and another set of permissions in group B.  Let's go through an example of this using soccer/football teams as groups.
+Sometimes it is useful to let a user have independent sets of roles.  The `roles` package calls these independent
+sets "partitions" for lack of a better term. You can use them to represent various communities inside of your
+application. Or maybe your application supports [multiple tenants](https://en.wikipedia.org/wiki/Multitenancy).
+You can put each of those tenants into their own partition. Alternatively, you can use partitions to represent
+various resources you have. But if you really need per-document permissions, if might be that storing permissions
+with documents is a better approach (than one takes by this package, where roles are stored with users).
 
-```
-Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com')
-Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
+Users can have both partition roles assigned, and global roles. Global roles are in effect for all partitions.
+But partitions are independent from each other. Users can have one set of roles in partition A and another set
+of roles in partition B. Let's go through an example of this using soccer/football teams as partitions.
 
-Roles.userIsInRole(joesUserId, 'manage-team', 'manchester-united.com')  // => true
-Roles.userIsInRole(joesUserId, 'manage-team', 'real-madrid.com')  // => false
+```javascript
+Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com');
+Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com');
+
+Roles.userIsInRole(joesUserId, 'manage-team', 'manchester-united.com'); // true
+Roles.userIsInRole(joesUserId, 'manage-team', 'real-madrid.com'); // false
 ```
 
-In this example we can see that Joe manages Manchester United and plays for Real Madrid.  By using groups, we can assign permissions independently and make sure that they don't get mixed up between groups.
+In this example we can see that Joe manages Manchester United and plays for Real Madrid. By using partitions, we can
+assign roles independently and make sure that they don't get mixed up between partitions.
 
-NOTE: If you use groups for _ANY_ of your users, you should use groups for _ALL_ of your users.  This is due to how the roles package stores the roles internally in the database.  In roles 2.0, you won't need to worry about this anymore, we'll have a default group that will hold roles not assigned to a specific group.
-
-Now, let's take a look at how to use the Global Group.  Say we want to give Joe permission to do something across all of our groups.  That's what the Global Group is for:
+Now, let's take a look at how to use the global roles. Say we want to give Joe permission to do something across
+all of our partitions. That is what the global roles are for:
 
 ```
-Roles.addUsersToRoles(joesUserId, 'super-admin', Roles.GLOBAL_GROUP)
+Roles.addUsersToRoles(joesUserId, 'super-admin', null); // Or you could just omit the last argument.
 
 if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.com')) {
-
-  // True!  Even though Joe doesn't manage Real Madrid, he is 'super-admin' in
-  // the Global Group so this check succeeds.
-
+  // True! Even though Joe doesn't manage Real Madrid, he has
+  // a 'super-admin' global role so this check succeeds.
 }
 ```
 
@@ -102,50 +118,17 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <a name="changes">
 ### Changes to default Meteor behavior
 
-  1. User entries in the `Meteor.users` collection gain a new field named `roles` corresponding to the user's roles. †
-  2. A new collection `Meteor.roles` contains a global list of defined role names. ††
+  1. User entries in the `Meteor.users` collection gain a new field named `roles` corresponding to the user's roles.
+  2. A new collection `Meteor.roles` contains a global list of defined role names.
   3. The currently logged-in user's `roles` field is automatically published to the client.
-
-<br />
-
-† The type of the `roles` field depends on whether or not groups are used:
-```js
-Roles.addUsersToRoles(bobsUserId, ['manage-team','schedule-game'])
-// internal representation - no groups 
-// user.roles = ['manage-team','schedule-game']
-
-Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com')
-Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
-// internal representation - groups
-// NOTE: MongoDB uses periods to represent hierarchy so periods in group names
-//   are converted to underscores.
-//
-// user.roles = { 
-//   'manchester-united_com': ['manage-team','schedule-game'],
-//   'real-madrid_com': ['player','goalie']
-// }
-```
-
-<em>Note: See the `addUsersToRoles` [documentation](http://alanning.github.io/meteor-roles/classes/Roles.html) for restrictions on group names.</em>
-
-
-†† The `Meteor.roles` collection is currently only for convenience on the UI-side and is not used functionally within this package.  In the future it may be used to support role hierarchies.  Since it is not currently required, it is not automatically published to the client.  Here's how you would publish it to every client without needing a subscription:
-
-```js
-// in server/publish.js
-Meteor.publish(null, function (){ 
-  return Meteor.roles.find({})
-})
-```
+  4. All existing roles are automatically published to the client.
 
 <br />
 
 <a name="installing">
 ### Installing
 
-#### Meteor 0.9 - latest
-
-1. Add one of the built-in accounts packages so the Meteor.users collection exists.  From a command prompt:
+1. Add one of the built-in accounts packages so the `Meteor.users` collection exists.  From a command prompt:
     ```bash
     meteor add accounts-password
     ```
@@ -160,29 +143,6 @@ Meteor.publish(null, function (){
     meteor
     ```
 
-#### Meteor 0.8.3 and below (meteorite)
-
-1. Add one of the built-in accounts packages so the Meteor.users collection exists.  From a command prompt:
-    ```bash
-    meteor add accounts-password
-    ```
-
-2. Install [Meteorite][1]
-  
-3. Add this smart package to your project.  From a command prompt:
-    ```bash
-    mrt add roles
-    ```
-
-4. Run your application:
-    ```bash
-    meteor
-    ```
-
-
-NOTE for Meteor 0.8-0.8.3:  Manually add the 'ui' package to your '.meteor/packages' file so that roles knows you are using it.  Otherwise, the 'isInRole' client-side helper will not be registered.  Since some versions of Meteor had 'standard-app-packages' without 'ui' there is no other way to detect its use.
-
-
 <br />
 
 
@@ -217,16 +177,21 @@ _.each(users, function (user) {
   });
 
   if (user.roles.length > 0) {
+    _.each(user.roles, function (role) {
+      Roles.createRole(role, {unlessExists: true});
+    });
     // Need _id of existing user record so this call must come 
     // after `Accounts.createUser` or `Accounts.onCreate`
-    Roles.addUsersToRoles(id, user.roles, 'default-group');
+    Roles.addUsersToRoles(id, user.roles);
   }
 
 });
 ```
 
 <br />
-Note that the `Roles.addUsersToRoles` call needs to come _after_ `Accounts.createUser` or `Accounts.onCreate` or else the roles package won't be able to find the user record (since it hasn't been created yet).  This SO answer gives more detail: http://stackoverflow.com/a/22650399/219238
+Note that the `Roles.addUsersToRoles` call needs to come _after_ `Accounts.createUser` or `Accounts.onCreate` or else
+the roles package won't be able to find the user record (since it hasn't been created yet).
+This SO answer gives more detail: http://stackoverflow.com/a/22650399/219238
 
 <br />
 
@@ -235,10 +200,12 @@ Check user roles before publishing sensitive data:
 // server/publish.js
 
 // Give authorized users access to sensitive data by group
-Meteor.publish('secrets', function (group) {
-  if (Roles.userIsInRole(this.userId, ['view-secrets','admin'], group)) {
+Meteor.publish('secrets', function (partition) {
+  check(partition, String);
+
+  if (Roles.userIsInRole(this.userId, ['view-secrets','admin'], partition)) {
     
-    return Meteor.secrets.find({group: group});
+    return Meteor.secrets.find({partition: partition});
     
   } else {
     
@@ -258,11 +225,10 @@ Accounts.validateNewUser(function (user) {
   var loggedInUser = Meteor.user();
 
   if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
-    // NOTE: This example assumes the user is not using groups. 
     return true;
   }
 
-  throw new Meteor.Error(403, "Not authorized to create new users");
+  throw new Meteor.Error('unauthorized', "Not authorized to create new users");
 });
 ```
 
@@ -274,53 +240,58 @@ Prevent access to certain functionality, such as deleting a user:
 
 Meteor.methods({
   /**
-   * delete a user from a specific group
+   * Revokes roles for a user in a specific partition.
    * 
-   * @method deleteUser
-   * @param {String} targetUserId _id of user to delete
-   * @param {String} group Company to update permissions for
+   * @method revokeUser
+   * @param {String} targetUserId ID of user to revoke roles for.
+   * @param {String} partition Company to update roles for.
    */
-  deleteUser: function (targetUserId, group) {
-    var loggedInUser = Meteor.user()
+  revokeUser: function (targetUserId, partition) {
+    check(targetUserId, String);
+    check(partition, String);
+  
+    var loggedInUser = Meteor.user();
 
     if (!loggedInUser ||
         !Roles.userIsInRole(loggedInUser, 
-                            ['manage-users', 'support-staff'], group)) {
-      throw new Meteor.Error(403, "Access denied")
+                            ['manage-users', 'support-staff'], partition)) {
+      throw new Meteor.Error('access-denied', "Access denied")
     }
 
-    // remove permissions for target group
-    Roles.setUserRoles(targetUserId, [], group)
-
-    // do other actions required when a user is removed...
+    // remove roles for target partition
+    Roles.setUserRoles(targetUserId, [], partition)
   }
 })
 ```
 
 <br />
 
-Manage a user's permissions:
+Manage a user's roles:
 ```js
 // server/userMethods.js
 
 Meteor.methods({
   /**
-   * update a user's permissions
+   * Update a user's roles.
    *
-   * @param {Object} targetUserId Id of user to update
-   * @param {Array} roles User's new permissions
-   * @param {String} group Company to update permissions for
+   * @param {Object} targetUserId Id of user to update.
+   * @param {Array} roles User's new roles.
+   * @param {String} partition Company to update roles for.
    */
-  updateRoles: function (targetUserId, roles, group) {
-    var loggedInUser = Meteor.user()
+  updateRoles: function (targetUserId, roles, partition) {
+    check(targetUserId, String);
+    check(roles, [String]);
+    check(partition, String);
+
+    var loggedInUser = Meteor.user();
 
     if (!loggedInUser ||
         !Roles.userIsInRole(loggedInUser, 
-                            ['manage-users', 'support-staff'], group)) {
-      throw new Meteor.Error(403, "Access denied")
+                            ['manage-users', 'support-staff'], partition)) {
+      throw new Meteor.Error('access-denied', "Access denied");
     }
 
-    Roles.setUserRoles(targetUserId, roles, group)
+    Roles.setUserRoles(targetUserId, roles, partition);
   }
 })
 ```
@@ -329,15 +300,21 @@ Meteor.methods({
 
 -- **Client** --
 
-Client javascript has access to all the same Roles functions as the server with the addition of a `isInRole` handlebars helper which is automatically registered by the Roles package.
+Client javascript has access to all the same Roles functions as the server with the addition of a `isInRole`
+handlebars helper which is automatically registered by the Roles package.
 
 As with all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
-since Meteor bundles the same client-side code to all users.  Providing the Roles functions client-side also allows for latency compensation during Meteor method calls.
+since Meteor bundles the same client-side code to all users.  Providing the Roles functions client-side also allows
+for latency compensation during Meteor method calls.  Roles functions which modify the database should not be
+called directly, but inside the Meteor methods.
 
-NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js` file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
+NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends
+all templates, client-side javascript, and published data to the client's browser. This is by design and is a good thing.
+The following example is just sugar to help improve the user experience for normal users. Those interested in seeing
+the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js`
+file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
 
-
-To check for permissions when not using groups:
+To check for global roles or when not using partitions:
 
 ```handlebars
 <!-- client/myApp.html -->
@@ -353,7 +330,7 @@ To check for permissions when not using groups:
 </template>
 ```
 
-To check for permissions when using groups:
+To check for roles with partitions:
 
 ```handlebars
 <!-- client/myApp.html -->
@@ -374,7 +351,7 @@ To check for permissions when using groups:
 
 Online API docs found here: http://alanning.github.io/meteor-roles/classes/Roles.html
 
-API docs generated using [YUIDoc][2]
+API docs generated using [YUIDoc](http://yui.github.com/yuidoc/)
 
 To re-generate documentation:
   1. install YUIDoc
@@ -384,8 +361,8 @@ To re-generate documentation:
 To serve documentation locally:
   1. install YUIDoc
   2. `cd meteor-roles`
-  3. `yuidoc --server`
-  4. point browser at http://localhost:3000/
+  3. `yuidoc --server 5000`
+  4. point browser at http://localhost:5000/
 
 
 <br />
@@ -396,20 +373,14 @@ To serve documentation locally:
 
 The `examples` directory contains Meteor apps which show off the following features:
 * Server-side publishing with authorization to secure sensitive data
-* Client-side navigation with link visibility based on user permissions
+* Client-side navigation with link visibility based on user roles
 * 'Sign-in required' app with up-front login page using `accounts-ui`
 * Client-side routing
 
-
-The only difference among the example apps is which routing package is used.
-
-View the `meteor-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
- 
-
-_Iron Router or Flow Router_
+View the `flow-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
 
   1. `git clone https://github.com/alanning/meteor-roles.git`
-  2. either
+  2. choose an example, eg.
     * `cd meteor-roles/examples/iron-router` or
     * `cd meteor-roles/examples/flow-router`
   3. `meteor`
@@ -417,19 +388,6 @@ _Iron Router or Flow Router_
 
 <br />
 
-_Deprecated routing packages: Mini-Pages or Router_
-
-  1. install [Meteorite][1]
-  2. `git clone https://github.com/alanning/meteor-roles.git`
-  3. either
-    * `cd meteor-roles/examples/router` or
-    * `cd meteor-roles/examples/mini-pages`
-  4. `mrt update`
-  5. `meteor`
-  6. point browser to `http://localhost:3000`
-
-<br />
-
 
 <a name="testing">
 ### Tests
@@ -437,20 +395,12 @@ _Deprecated routing packages: Mini-Pages or Router_
 
 To run tests: 
   1. `cd meteor-roles`
-  2. `meteor test-packages ./roles`
+  2. `meteor test-packages ./`
   3. point browser at http://localhost:3000/
 
 _NOTE_: If you see an error message regarding **"The package named roles does not exist"** that means you are either:
   a) in the wrong directory or 
-  b) left off the './' in front of 'roles' in step 2.  
-  
-Step 2 needs to be run in the main 'meteor-roles' directory and the './' is needed because otherwise Meteor only looks in directories named 'packages'.
+  b) forgot the './' in step 2.  
 
-
-
-
-
-
-[1]: https://github.com/oortcloud/meteorite "Meteorite"
-
-[2]: http://yui.github.com/yuidoc/ "YUIDoc"
+Step 2 needs to be run in the main 'meteor-roles' directory and the './' is needed because otherwise Meteor
+expects to be in a Meteor app directory.
diff --git a/examples/mini-pages/.gitignore b/examples/mini-pages/.gitignore
deleted file mode 100644
index a049b6f89c..0000000000
--- a/examples/mini-pages/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-packages/*
diff --git a/examples/mini-pages/.meteor/.gitignore b/examples/mini-pages/.meteor/.gitignore
deleted file mode 100644
index 08150d000c..0000000000
--- a/examples/mini-pages/.meteor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-local
-meteorite
diff --git a/examples/mini-pages/.meteor/packages b/examples/mini-pages/.meteor/packages
deleted file mode 100644
index 21186b033a..0000000000
--- a/examples/mini-pages/.meteor/packages
+++ /dev/null
@@ -1,12 +0,0 @@
-# Meteor packages used by this project, one per line.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-standard-app-packages
-accounts-password
-accounts-ui
-bootstrap
-roles
-mini-pages
-spiderable
diff --git a/examples/mini-pages/.meteor/release b/examples/mini-pages/.meteor/release
deleted file mode 100644
index 7486fdbc50..0000000000
--- a/examples/mini-pages/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-0.7.2
diff --git a/examples/mini-pages/client/client.js b/examples/mini-pages/client/client.js
deleted file mode 100644
index 2ecee3cb25..0000000000
--- a/examples/mini-pages/client/client.js
+++ /dev/null
@@ -1,168 +0,0 @@
-;(function () {
-
-  "use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Routing stub
-//
-// Separate routing package details from general app code.
-Meteor.navigateTo = function (path) {
-  // ...over-ridden in routing.js
-};
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// App.signout
-//
-App.signout = function () {
-  console.log('logging out...');
-  Meteor.logout(function () {
-    console.log('...done');
-    Meteor.navigateTo('/');
-  });
-};
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Patches
-//
-
-// stubs for IE
-if (!window.console) {
-  window.console = {}
-}
-if (!window.console.log) {
-  window.console.log = function (msg) {
-    $('#log').append('<br /><p>' + msg + '</p>')
-  };
-}
-
-// fix bootstrap dropdown unclickable issue on iOS
-// https://github.com/twitter/bootstrap/issues/4550
-$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
-    e.stopPropagation();
-});
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Subscriptions
-//
-
-Deps.autorun(function () {
-  // register dependency on user so subscriptions
-  // will update once user has logged in
-  var user = Meteor.user();
-
-  // secrets
-  Meteor.subscribe('secrets');
-
-  // users, for manage-users page
-  Meteor.subscribe('users');
-});
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Templates
-//
-
-Template.signin.rendered = function () {
-  // auto-trigger accounts-ui login form dropdown
-  Accounts._loginButtonsSession.set('dropdownVisible', true);
-};
-
-Template.header.events({
-  // template data, if any, is available in 'this'
-  'click .btn-navbar' : openCloseNav
-});
-Template.header.helpers({
-  displayName: function () {
-    return displayName();
-  }
-});
-
-Template.secrets.helpers({
-  secrets: function () {
-    return Meteor.secrets.find();
-  }
-});
-
-Template.noteOfTheDay.helpers({
-  note: function () {
-    return "Greetings " + displayName() + "!";
-  }
-});
-
-Template.manage.helpers({
-  users: function () {
-    return Meteor.users.find();
-  },
-  email: function () {
-    return this.emails[0].address;
-  },
-  roles: function () {
-    if (!this.roles) return '<none>';
-    return this.roles.join(',');
-  }
-});
-
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Misc helper functions
-//
-
-function displayName (user) {
-  var name;
-
-  if (!user) {
-    user = Meteor.user();
-  }
-
-  if (!user) return "<missing user>";
-
-  if (user.profile) {
-    name = user.profile.name;
-  }
-
-  if ('string' === typeof name) {
-    name = name.trim();
-  } else {
-    name = null;
-  }
-
-  if (!name && user.emails && user.emails.length > 0) {
-    name = user.emails[0].address;
-  }
-
-  return name || "<missing name>";
-}
-
-
-// insta-open/close nav rather than animate collapse.
-// this improves UX on mobile devices
-function openCloseNav (e) {
-  // Select .nav-collapse within same .navbar as current button
-  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
-
-  if (nav.height() != 0) {
-    // If it has a height, hide it
-    nav.height(0);
-  } else {
-    // If it's collapsed, show it
-    nav.height('auto');
-  }
-}
-
-
-}());
diff --git a/examples/mini-pages/client/example.css b/examples/mini-pages/client/example.css
deleted file mode 100644
index a7674b04dd..0000000000
--- a/examples/mini-pages/client/example.css
+++ /dev/null
@@ -1,67 +0,0 @@
-@media (min-width: 980px) {
-  /* wide devices - full navbar */ 
-
-  /* push down content under fixed navbar */
-  body {
-    padding-top:60px;
-    padding-bottom:40px;
-    }
-
-}
-
-
-/**
- * front-and-center signin form
- */
-.signin {
-  width:100%;
-  text-align:center;
-}
-.signin .login-form {
-  width:200px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-}
-.signin .login-form {
-}
-.signin .login-close-text {
-  display:none;
-}
-.signin #login-buttons {
-}
-.signin .additional-link-container {
-  display:none;
-}
-.signin .example-users {
-  width:350px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-  top:15em;
-  left:3em;
-}
-
-/**
- * header
- */
-#err .close {
-  float:none;
-  margin-left:1em;
-}
-
-/**
- * note of the day
- */
-.note {
-  margin:1em 0em;
-  padding:1em;
-  border:1px solid #ccc;
-}
-
-/**
- * security-note
- */
-.security-note {
-  margin-top:10em;
-}
diff --git a/examples/mini-pages/client/example.html b/examples/mini-pages/client/example.html
deleted file mode 100644
index b7ffb7a465..0000000000
--- a/examples/mini-pages/client/example.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<head>
-  <title>example-app</title>
-</head>
-
-<body>
-</body>
-
-<template name="layout">
-  {{> header}}
-
-  {{{yield}}}
-
-  <div id="log"></div>
-</template>
-
-<template name="layout_no_header">
-  {{{yield}}}
-
-  <div id="log"></div>
-</template>
-
-<template name="signin">
-  <div class="signin">
-    <div class="login-form">
-      <h1>Sign In</h1>
-      {{loginButtons}}
-    </div>
-
-    <div class="example-users">
-      <p>Normal User: normal@example.com | apple1</p>
-      <p>View Secrets: view@example.com | apple1</p>
-      <p>Manage Users: manage@example.com | apple1</p>
-      <p>Admin User: admin@example.com | apple1</p>
-    </div>
-  </div>
-</template>
-
-<template name="loading">
-  <h1>Loading...</h1>
-</template>
-
-<template name="awaiting-verification">
-  <h1>Awaiting email verification...</h1>
-</template>
-
-<template name="not_found">
-  <h3>404 - Not found</h3>
-</template>
-
-<template name="invalid-access">
-  <h3>403 Forbidden - Invalid Access</h3>
-</template>
-
-<template name="header">
-  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </a>
-        <a class="brand" href="/">Roles Example App</a>
-        <div class="nav-collapse collapse">
-          <ul class="nav">
-
-            <li><a href="/start">Start Page</a></li>
-
-            {{#if isInRole 'admin,view-secrets'}}
-            <li><a href="/secrets">Secrets</a></li>
-            {{/if}}
-
-            <li class="dropdown pull-right">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                {{#if isInRole 'admin,manage-users'}}
-                <li><a href="/manage">Manage Users</a></li>
-                {{/if}}
-                <li><a class="signout" href="/signout">Sign out</a></li>
-              </ul>
-            </li>
-
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<template name="noteOfTheDay">
-<p>Note of the day: {{note}}</p>
-</template>
-
-<template name="start">
-  <div class="page row">
-    <div class="offset4 span8">
-
-      <p class="note">All logged-in users will see this page in their header nav.</p>
-
-      <h2>Start Page</h2>
-
-      {{> noteOfTheDay}}
-
-      <div>
-        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
-      </div>
-          
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="secrets">
-  <div class="secrets row">
-    <div class="offset4 span8">
-
-      <p class="note">Only Admins and those with the 'view-secrets' role will see this page in their header nav.</p>
-
-      <h2>Secrets!</h2>
-
-      <ul>
-      {{#each secrets}}
-        <li><p>{{secret}}</p></li>
-      {{/each}}
-      </ul>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="manage">
-  <div class="manage-users row">
-    <div class="offset4 span8">
-
-      <p class="note">Only Admins and those with the 'manage-users' role will see this page in their nav menu.</p>
-
-      <h2>Manage Users</h2>
-
-      <br />
-
-      <h3>Current Users</h3>
-      <ul>
-      {{#each users}}
-      <li>{{email}} - Roles: {{roles}}</li>
-      {{/each}}
-      </ul>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="securityNote">
-  <div class="security-note">
-    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
-    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
-    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
-    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
-    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
-    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
-  </div>
-</template>
diff --git a/examples/mini-pages/client/lib/globals.js b/examples/mini-pages/client/lib/globals.js
deleted file mode 100644
index 443d048ba8..0000000000
--- a/examples/mini-pages/client/lib/globals.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// The application
-App = {};
diff --git a/examples/mini-pages/client/routing.js b/examples/mini-pages/client/routing.js
deleted file mode 100644
index 7c061d0afb..0000000000
--- a/examples/mini-pages/client/routing.js
+++ /dev/null
@@ -1,80 +0,0 @@
-;(function () {
-
-  "use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Routing
-//
-
-// override with mini-pages navigate method
-Meteor.navigateTo = function (path) {
-  Meteor.go(path);
-};
-
-function emailVerified (user) {
-  return _.some(user.emails, function (email) {
-    return email.verified;
-  });
-}
-
-var authenticate = function () {
-  var user;
-
-  if (Meteor.loggingIn()) {
-
-    console.log('filter: loading');
-    this.template('loading');
-    this.layout('layout_no_header');
-    this.done();
-
-  } else {
-
-    user = Meteor.user();
-
-    if (!user) {
-
-      console.log('filter: signin');
-      this.template('signin');
-      this.layout('layout_no_header');
-      this.done();
-      return;
-
-    }
-
-    if (!emailVerified(user)) {
-
-      console.log('filter: awaiting-verification');
-      this.template('awaiting-verification');
-      this.layout('layout');
-      this.done();
-
-    } else {
-
-      console.log('filter: done');
-      this.layout('layout');
-
-    }
-  }
-};
-
-Meteor.pages({
-  '/': { to: 'start', as: 'root', nav: 'start', 
-         before: [authenticate] },
-  '/signin': 'signin',
-  '/start': { to: 'start', nav: 'start', 
-         before: [authenticate] },
-  '/secrets': { to: 'secrets', nav: 'secrets', 
-         before: [authenticate] },
-  '/manage': { to: 'manage', nav: 'manage', 
-         before: [authenticate] },
-  '/signout': App.signout,
-  '*': 'not_found'
-}, {
-  defaults: {
-    layout: 'layout_no_header'
-  }
-});
-
-
-}());
diff --git a/examples/mini-pages/model.js b/examples/mini-pages/model.js
deleted file mode 100644
index be8a6c57f7..0000000000
--- a/examples/mini-pages/model.js
+++ /dev/null
@@ -1,9 +0,0 @@
-;(function () {
-
-  "use strict";
-
-// run on both the server and the client
-
-Meteor.secrets = new Meteor.Collection('secrets');
-
-}());
diff --git a/examples/mini-pages/polyfills.js b/examples/mini-pages/polyfills.js
deleted file mode 100644
index ad286f3645..0000000000
--- a/examples/mini-pages/polyfills.js
+++ /dev/null
@@ -1,11 +0,0 @@
-;(function () {
-
-  "use strict";
-
-  if(typeof String.prototype.trim !== 'function') {
-    String.prototype.trim = function() {
-      return this.replace(/^\s+|\s+$/g, ''); 
-    }
-  }
-
-}());
diff --git a/examples/mini-pages/server/server.js b/examples/mini-pages/server/server.js
deleted file mode 100644
index 7cb5d4713f..0000000000
--- a/examples/mini-pages/server/server.js
+++ /dev/null
@@ -1,119 +0,0 @@
-;(function () {
-
-  "use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Patches
-//
-
-if (!console || !console.log) {
-  // stub for IE
-  console = { 
-    log: function (msg) {
-      $('#log').append(msg)
-    } 
-  };
-}
-
-
-////////////////////////////////////////////////////////////////////
-// Startup
-//
-
-Meteor.startup(function () {
-
-  ////////////////////////////////////////////////////////////////////
-  // Create Test Secrets
-  //
-    
-  if (Meteor.secrets.find().fetch().length === 0) {
-    Meteor.secrets.insert({secret:"ec2 password: apple2"});
-    Meteor.secrets.insert({secret:"domain registration pw: apple3"});
-  }
-
-
-  ////////////////////////////////////////////////////////////////////
-  // Create Test Users
-  //
-
-  if (Meteor.users.find().fetch().length === 0) {
-
-    console.log('Creating users: ');
-
-    var users = [
-        {name:"Normal User",email:"normal@example.com",roles:[]},
-        {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
-        {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
-        {name:"Admin User",email:"admin@example.com",roles:['admin']}
-      ];
-
-    _.each(users, function (userData) {
-      var id,
-          user;
-      
-      console.log(userData);
-
-      id = Accounts.createUser({
-        email: userData.email,
-        password: "apple1",
-        profile: { name: userData.name }
-      });
-
-      // email verification
-      Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
-
-      Roles.addUsersToRoles(id, userData.roles);
-    
-    });
-  }
-
-
-
-  ////////////////////////////////////////////////////////////////////
-  // Prevent non-authorized users from creating new users
-  //
-
-  Accounts.validateNewUser(function (user) {
-    var loggedInUser = Meteor.user();
-
-    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
-      return true;
-    }
-
-    throw new Meteor.Error(403, "Not authorized to create new users");
-  });
-
-});
-
-
-////////////////////////////////////////////////////////////////////
-// Publish
-//
-
-
-// Authorized users can view secrets
-Meteor.publish("secrets", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
-    return Meteor.secrets.find();
-  }
-
-  this.stop();
-  return;
-});
-
-// Authorized users can manage user accounts
-Meteor.publish("users", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","manage-users"])) {
-    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
-  } 
-
-  this.stop();
-  return;
-});
-
-}());
diff --git a/examples/mini-pages/smart.json b/examples/mini-pages/smart.json
deleted file mode 100644
index 9b3bb1dc43..0000000000
--- a/examples/mini-pages/smart.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "packages": {
-    "roles": {},
-    "mini-pages": {}
-  }
-}
diff --git a/examples/router/.gitignore b/examples/router/.gitignore
deleted file mode 100644
index a049b6f89c..0000000000
--- a/examples/router/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-packages/*
diff --git a/examples/router/.meteor/.gitignore b/examples/router/.meteor/.gitignore
deleted file mode 100644
index 08150d000c..0000000000
--- a/examples/router/.meteor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-local
-meteorite
diff --git a/examples/router/.meteor/packages b/examples/router/.meteor/packages
deleted file mode 100644
index 8afbba39fa..0000000000
--- a/examples/router/.meteor/packages
+++ /dev/null
@@ -1,13 +0,0 @@
-# Meteor packages used by this project, one per line.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-preserve-inputs
-router
-accounts-password
-accounts-ui
-bootstrap
-roles
-spiderable
-standard-app-packages
diff --git a/examples/router/.meteor/release b/examples/router/.meteor/release
deleted file mode 100644
index 7486fdbc50..0000000000
--- a/examples/router/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-0.7.2
diff --git a/examples/router/client/client.js b/examples/router/client/client.js
deleted file mode 100644
index d3a8296d14..0000000000
--- a/examples/router/client/client.js
+++ /dev/null
@@ -1,166 +0,0 @@
-;(function () {
-
-  "use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Routing stub
-//
-// Separate routing package details from general app code.
-Meteor.navigateTo = function (path) {
-  // ...over-ridden in routing.js
-};
-
-
-
-////////////////////////////////////////////////////////////////////
-// App.signout
-//
-App.signout = function () {
-  console.log('logging out...');
-  Meteor.logout(function () {
-    console.log('...done');
-    Meteor.navigateTo('/');
-  });
-};
-
-
-////////////////////////////////////////////////////////////////////
-// Patches
-//
-
-// stubs for IE
-if (!window.console) {
-  window.console = {}
-}
-if (!window.console.log) {
-  window.console.log = function (msg) {
-    $('#log').append('<br /><p>' + msg + '</p>')
-  };
-}
-
-// fix bootstrap dropdown unclickable issue on iOS
-// https://github.com/twitter/bootstrap/issues/4550
-$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
-    e.stopPropagation();
-});
-
-
-
-////////////////////////////////////////////////////////////////////
-// Subscriptions
-//
-
-Deps.autorun(function () {
-  // register dependency on user so subscriptions
-  // will update once user has logged in
-  var user = Meteor.user();
-
-  // secrets
-  Meteor.subscribe('secrets');
-
-  // users, for manage-users page
-  Meteor.subscribe('users');
-});
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Templates
-//
-
-Template.signin.rendered = function () {
-  // auto-trigger accounts-ui login form dropdown
-  Accounts._loginButtonsSession.set('dropdownVisible', true);
-};
-
-Template.header.events({
-  // template data, if any, is available in 'this'
-  'click .btn-navbar' : openCloseNav
-});
-Template.header.helpers({
-  displayName: function () {
-    return displayName();
-  }
-});
-
-Template.secrets.helpers({
-  secrets: function () {
-    return Meteor.secrets.find();
-  }
-});
-
-Template.noteOfTheDay.helpers({
-  note: function () {
-    return "Greetings " + displayName() + "!";
-  }
-});
-
-Template.manage.helpers({
-  users: function () {
-    return Meteor.users.find();
-  },
-  email: function () {
-    return this.emails[0].address;
-  },
-  roles: function () {
-    if (!this.roles) return '<none>';
-    return this.roles.join(',');
-  }
-});
-
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Misc helper functions
-//
-
-function displayName (user) {
-  var name;
-
-  if (!user) {
-    user = Meteor.user();
-  }
-
-  if (!user) return "<missing user>";
-
-  if (user.profile) {
-    name = user.profile.name;
-  }
-
-  if ('string' === typeof name) {
-    name = name.trim();
-  } else {
-    name = null;
-  }
-
-  if (!name && user.emails && user.emails.length > 0) {
-    name = user.emails[0].address;
-  }
-
-  return name || "<missing name>";
-}
-
-
-// insta-open/close nav rather than animate collapse.
-// this improves UX on mobile devices
-function openCloseNav (e) {
-  // Select .nav-collapse within same .navbar as current button
-  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
-
-  if (nav.height() != 0) {
-    // If it has a height, hide it
-    nav.height(0);
-  } else {
-    // If it's collapsed, show it
-    nav.height('auto');
-  }
-}
-
-
-}());
diff --git a/examples/router/client/example.css b/examples/router/client/example.css
deleted file mode 100644
index a7674b04dd..0000000000
--- a/examples/router/client/example.css
+++ /dev/null
@@ -1,67 +0,0 @@
-@media (min-width: 980px) {
-  /* wide devices - full navbar */ 
-
-  /* push down content under fixed navbar */
-  body {
-    padding-top:60px;
-    padding-bottom:40px;
-    }
-
-}
-
-
-/**
- * front-and-center signin form
- */
-.signin {
-  width:100%;
-  text-align:center;
-}
-.signin .login-form {
-  width:200px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-}
-.signin .login-form {
-}
-.signin .login-close-text {
-  display:none;
-}
-.signin #login-buttons {
-}
-.signin .additional-link-container {
-  display:none;
-}
-.signin .example-users {
-  width:350px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-  top:15em;
-  left:3em;
-}
-
-/**
- * header
- */
-#err .close {
-  float:none;
-  margin-left:1em;
-}
-
-/**
- * note of the day
- */
-.note {
-  margin:1em 0em;
-  padding:1em;
-  border:1px solid #ccc;
-}
-
-/**
- * security-note
- */
-.security-note {
-  margin-top:10em;
-}
diff --git a/examples/router/client/example.html b/examples/router/client/example.html
deleted file mode 100644
index 52f52b4875..0000000000
--- a/examples/router/client/example.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<head>
-  <title>example-app</title>
-</head>
-
-<body>
-  {{renderPage}}
-
-  <div id="log"></div>
-</body>
-
-<template name="signin">
-  <div class="signin">
-    <div class="login-form">
-      <h1>Sign In</h1>
-      {{loginButtons}}
-    </div>
-
-    <div class="example-users">
-      <p>Normal User: normal@example.com | apple1</p>
-      <p>View Secrets: view@example.com | apple1</p>
-      <p>Manage Users: manage@example.com | apple1</p>
-      <p>Admin User: admin@example.com | apple1</p>
-    </div>
-  </div>
-</template>
-
-<template name="loading">
-  <h1>Loading...</h1>
-</template>
-
-<template name="awaiting-verification">
-  {{> header}}
-  <h1>Awaiting email verification...</h1>
-</template>
-
-<template name="not_found">
-  {{> header}}
-  <h3>404 - Not found</h3>
-</template>
-
-<template name="invalid-access">
-  {{> header}}
-  <h3>403 Forbidden - Invalid Access</h3>
-</template>
-
-<template name="header">
-  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </a>
-        <a class="brand" href="/">Roles Example App</a>
-        <div class="nav-collapse collapse">
-          <ul class="nav">
-
-            <li><a href="/start">Start Page</a></li>
-
-            {{#if isInRole 'admin,view-secrets'}}
-            <li><a href="/secrets">Secrets</a></li>
-            {{/if}}
-
-            <li class="dropdown pull-right">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                {{#if isInRole 'admin,manage-users'}}
-                <li><a href="/manage">Manage Users</a></li>
-                {{/if}}
-                <li><a class="signout" href="/signout">Sign out</a></li>
-              </ul>
-            </li>
-
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<template name="noteOfTheDay">
-<p>Note of the day: {{note}}</p>
-</template>
-
-<template name="start">
-  {{> header}}
-
-  <div class="page row">
-    <div class="offset4 span8">
-
-      <p class="note">All logged-in users will see this page in their header nav.</p>
-
-      <h2>Start Page</h2>
-
-      {{> noteOfTheDay}}
-
-      <div>
-        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
-      </div>
-          
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="secrets">
-  {{> header}}
-  <div class="secrets row">
-    <div class="offset4 span8">
-
-      <p class="note">Only Admins and those with the 'view-secrets' role will see this page in their header nav.</p>
-
-      <h2>Secrets!</h2>
-
-      <ul>
-      {{#each secrets}}
-        <li><p>{{secret}}</p></li>
-      {{/each}}
-      </ul>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="manage">
-  {{> header}}
-  <div class="manage-users row">
-    <div class="offset4 span8">
-
-      <p class="note">Only Admins and those with the 'manage-users' role will see this page in their nav menu.</p>
-
-      <h2>Manage Users</h2>
-
-      <br />
-
-      <h3>Current Users</h3>
-      <ul>
-      {{#each users}}
-      <li>{{email}} - Roles: {{roles}}</li>
-      {{/each}}
-      </ul>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="securityNote">
-  <div class="security-note">
-    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
-    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
-    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
-    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
-    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
-    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
-  </div>
-</template>
diff --git a/examples/router/client/lib/globals.js b/examples/router/client/lib/globals.js
deleted file mode 100644
index 443d048ba8..0000000000
--- a/examples/router/client/lib/globals.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// The application
-App = {};
diff --git a/examples/router/client/routing.js b/examples/router/client/routing.js
deleted file mode 100644
index 64d267dbe7..0000000000
--- a/examples/router/client/routing.js
+++ /dev/null
@@ -1,95 +0,0 @@
-;(function () {
-
-  "use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Routing
-//
-
-// override with meteor-router navigate method
-Meteor.navigateTo = function (path) {
-  Meteor.Router.to(path);
-};
-
-function emailVerified (user) {
-  return _.some(user.emails, function (email) {
-    return email.verified;
-  });
-}
-
-Meteor.Router.add({
-  '/': function () {
-    var user;
-
-    if (Meteor.loggingIn()) {
-      console.log('home: loading');
-      return 'loading';
-    }
-
-    user = Meteor.user();
-    if (!user) {
-      console.log('home: signin');
-      return 'signin';
-    }
-
-    if (!emailVerified(user)) {
-      console.log('home: awaiting-verification');
-      return 'awaiting-verification';
-    }
-
-    console.log('home: user found');
-    console.log(user.roles);
-
-    // start on 'start' page
-    console.log('home: start');
-    return 'start';
-  },
-  '/signin': 'signin',
-  '/start': 'start',
-  '/secrets': 'secrets',
-  '/manage': 'manage',
-  '/signout': App.signout,
-  '*': 'not_found'
-});
-
-Meteor.Router.filters({
-  checkLoggedIn: function (page) {
-    var user;
-
-    if (Meteor.loggingIn()) {
-
-      console.log('filter: loading');
-      return 'loading';
-
-    } else {
-
-      user = Meteor.user();
-
-      if (!user) {
-
-        console.log('filter: signin');
-        return 'signin';
-
-      }
-
-      if (!emailVerified(user)) {
-
-        console.log('filter: awaiting-verification');
-        return 'awaiting-verification';
-
-      } 
-
-      console.log('filter: done');
-      return page;
-
-    }
-  }
-});
-
-// make sure user has logged in for all appropriate routes
-Meteor.Router.filter('checkLoggedIn', {
-  except:['signin','loading','not-found']
-});
-
-}());
diff --git a/examples/router/model.js b/examples/router/model.js
deleted file mode 100644
index be8a6c57f7..0000000000
--- a/examples/router/model.js
+++ /dev/null
@@ -1,9 +0,0 @@
-;(function () {
-
-  "use strict";
-
-// run on both the server and the client
-
-Meteor.secrets = new Meteor.Collection('secrets');
-
-}());
diff --git a/examples/router/polyfills.js b/examples/router/polyfills.js
deleted file mode 100644
index ad286f3645..0000000000
--- a/examples/router/polyfills.js
+++ /dev/null
@@ -1,11 +0,0 @@
-;(function () {
-
-  "use strict";
-
-  if(typeof String.prototype.trim !== 'function') {
-    String.prototype.trim = function() {
-      return this.replace(/^\s+|\s+$/g, ''); 
-    }
-  }
-
-}());
diff --git a/examples/router/server/server.js b/examples/router/server/server.js
deleted file mode 100644
index 7cb5d4713f..0000000000
--- a/examples/router/server/server.js
+++ /dev/null
@@ -1,119 +0,0 @@
-;(function () {
-
-  "use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Patches
-//
-
-if (!console || !console.log) {
-  // stub for IE
-  console = { 
-    log: function (msg) {
-      $('#log').append(msg)
-    } 
-  };
-}
-
-
-////////////////////////////////////////////////////////////////////
-// Startup
-//
-
-Meteor.startup(function () {
-
-  ////////////////////////////////////////////////////////////////////
-  // Create Test Secrets
-  //
-    
-  if (Meteor.secrets.find().fetch().length === 0) {
-    Meteor.secrets.insert({secret:"ec2 password: apple2"});
-    Meteor.secrets.insert({secret:"domain registration pw: apple3"});
-  }
-
-
-  ////////////////////////////////////////////////////////////////////
-  // Create Test Users
-  //
-
-  if (Meteor.users.find().fetch().length === 0) {
-
-    console.log('Creating users: ');
-
-    var users = [
-        {name:"Normal User",email:"normal@example.com",roles:[]},
-        {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
-        {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
-        {name:"Admin User",email:"admin@example.com",roles:['admin']}
-      ];
-
-    _.each(users, function (userData) {
-      var id,
-          user;
-      
-      console.log(userData);
-
-      id = Accounts.createUser({
-        email: userData.email,
-        password: "apple1",
-        profile: { name: userData.name }
-      });
-
-      // email verification
-      Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
-
-      Roles.addUsersToRoles(id, userData.roles);
-    
-    });
-  }
-
-
-
-  ////////////////////////////////////////////////////////////////////
-  // Prevent non-authorized users from creating new users
-  //
-
-  Accounts.validateNewUser(function (user) {
-    var loggedInUser = Meteor.user();
-
-    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
-      return true;
-    }
-
-    throw new Meteor.Error(403, "Not authorized to create new users");
-  });
-
-});
-
-
-////////////////////////////////////////////////////////////////////
-// Publish
-//
-
-
-// Authorized users can view secrets
-Meteor.publish("secrets", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
-    return Meteor.secrets.find();
-  }
-
-  this.stop();
-  return;
-});
-
-// Authorized users can manage user accounts
-Meteor.publish("users", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","manage-users"])) {
-    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
-  } 
-
-  this.stop();
-  return;
-});
-
-}());
diff --git a/examples/router/smart.json b/examples/router/smart.json
deleted file mode 100644
index 607f05bd1c..0000000000
--- a/examples/router/smart.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "packages": {
-    "roles": {},
-    "router": {
-      "version": "0.5.4"
-    }
-  }
-}

From 8489b0286326507839fc1525d7cd52910618e292 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 15:28:55 +0100
Subject: [PATCH 0195/1140] Use $nor.

---
 roles/roles_common.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index b85791e1d6..7796016151 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -661,20 +661,12 @@ _.extend(Roles, {
       }));
     });
 
-    // transform into the query
-    roles = _.map(roles, function (role) {
-      return {
-        role: {$ne: role.role},
-        partition: {$ne: role.partition}
-      }
-    });
-
     if (roles.length) {
       // remove all extra entries which should not be there
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $and: roles
+            $nor: _.pick(roles, 'role', 'partition')
           }
         }
       });

From a9a550ef2e4b2950c2a29b5d6bf2666a83ba2701 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 15:42:28 +0100
Subject: [PATCH 0196/1140] Do not require String.trim support.

---
 roles/client/uiHelpers.js |  4 ++--
 roles/roles_common.js     | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 39090d0df1..e8aabcdce5 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -52,10 +52,10 @@ Roles._uiHelpers = {
 
     if (comma !== -1) {
       roles = _.reduce(role.split(','), function (memo, r) {
-        if (!r || !r.trim()) {
+        if (!r || !Roles._trim(r)) {
           return memo
         }
-        memo.push(r.trim())
+        memo.push(Roles._trim(r))
         return memo
       }, [])
     } else {
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 7796016151..31a6226013 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1060,9 +1060,18 @@ _.extend(Roles, {
    * @static
    */
   _checkRoleName: function (roleName) {
-    if (!roleName || !_.isString(roleName) || roleName.trim() !== roleName) {
+    if (!roleName || !_.isString(roleName) || Roles._trim(roleName) !== roleName) {
       throw new Error("Invalid role name '" + roleName + "'.");
     }
+  },
+
+  _trim: function (string) {
+    if (string.trim) {
+      return string.trim();
+    }
+    else {
+      return string.replace(/^\s+|\s+$/g, '');
+    }
   }
 
 });  // end _.extend(Roles ...)

From e98ca2854002fd48a410c48eae39906383570620 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 15:55:01 +0100
Subject: [PATCH 0197/1140] Upgraded flow-router example.

---
 examples/flow-router/.meteor/release         |  2 +-
 examples/flow-router/.meteor/versions        | 44 ++++++++++----------
 examples/flow-router/client/manage-users.js  |  6 ++-
 examples/flow-router/packages/alanning:roles |  1 +
 examples/flow-router/polyfills.js            | 11 -----
 examples/flow-router/server/server.js        | 10 +++--
 6 files changed, 35 insertions(+), 39 deletions(-)
 create mode 120000 examples/flow-router/packages/alanning:roles
 delete mode 100644 examples/flow-router/polyfills.js

diff --git a/examples/flow-router/.meteor/release b/examples/flow-router/.meteor/release
index 5684262a83..3a05e0a2f7 100644
--- a/examples/flow-router/.meteor/release
+++ b/examples/flow-router/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.0.2
+METEOR@1.2.1
diff --git a/examples/flow-router/.meteor/versions b/examples/flow-router/.meteor/versions
index 16ea8f4c4f..06b0c5f1a5 100644
--- a/examples/flow-router/.meteor/versions
+++ b/examples/flow-router/.meteor/versions
@@ -1,10 +1,10 @@
-accounts-base@1.2.1
-accounts-password@1.1.3
+accounts-base@1.2.2
+accounts-password@1.1.4
 accounts-ui@1.1.6
 accounts-ui-unstyled@1.1.8
 alanning:roles@1.2.14
 alanning:trace@0.0.2
-autoupdate@1.2.3
+autoupdate@1.2.4
 babel-compiler@5.8.24_1
 babel-runtime@0.1.4
 base64@1.0.4
@@ -17,20 +17,20 @@ bootstrap@1.0.1
 caching-compiler@1.0.0
 caching-html-compiler@1.0.2
 callback-hook@1.0.4
-check@1.0.6
-coffeescript@1.0.10
-cosmos:browserify@0.5.1
+check@1.1.0
+coffeescript@1.0.11
+cosmos:browserify@0.9.3
 ddp@1.2.2
 ddp-client@1.2.1
-ddp-common@1.2.1
+ddp-common@1.2.2
 ddp-rate-limiter@1.0.0
-ddp-server@1.2.1
+ddp-server@1.2.2
 deps@1.0.9
 diff-sequence@1.0.1
-ecmascript@0.1.5
-ecmascript-collections@0.1.6
+ecmascript@0.1.6
+ecmascript-runtime@0.2.6
 ejson@1.0.7
-email@1.0.7
+email@1.0.8
 fastclick@1.0.7
 geojson-utils@1.0.4
 hot-code-push@1.0.0
@@ -39,29 +39,29 @@ htmljs@1.0.5
 http@1.1.1
 id-map@1.0.4
 jquery@1.11.4
-kadira:blaze-layout@2.1.0
-kadira:flow-router@2.6.2
+kadira:blaze-layout@2.3.0
+kadira:flow-router@2.10.0
 launch-screen@1.0.4
-less@2.5.0_3
+less@2.5.1
 livedata@1.0.15
 localstorage@1.0.5
 logging@1.0.8
-meteor@1.1.9
+meteor@1.1.10
 meteor-base@1.0.1
 minifiers@1.1.7
 minimongo@1.0.10
 mobile-experience@1.0.1
 mobile-status-bar@1.0.6
-mongo@1.1.2
+mongo@1.1.3
 mongo-id@1.0.1
 npm-bcrypt@0.7.8_2
 npm-mongo@1.4.39_1
 observe-sequence@1.0.7
 ordered-dict@1.0.4
-promise@0.5.0
-random@1.0.4
+promise@0.5.1
+random@1.0.5
 rate-limit@1.0.0
-reactive-dict@1.1.2
+reactive-dict@1.1.3
 reactive-var@1.0.6
 reload@1.1.4
 retry@1.0.4
@@ -73,12 +73,12 @@ spacebars@1.0.7
 spacebars-compiler@1.0.7
 spiderable@1.0.9
 srp@1.0.4
-standard-minifiers@1.0.1
-templating@1.1.4
+standard-minifiers@1.0.2
+templating@1.1.5
 templating-tools@1.0.0
 tracker@1.0.9
 ui@1.0.8
 underscore@1.0.4
 url@1.0.5
-webapp@1.2.2
+webapp@1.2.3
 webapp-hashing@1.0.5
diff --git a/examples/flow-router/client/manage-users.js b/examples/flow-router/client/manage-users.js
index 7fdf0b519c..d846154d13 100644
--- a/examples/flow-router/client/manage-users.js
+++ b/examples/flow-router/client/manage-users.js
@@ -10,10 +10,12 @@ Template.userList.helpers({
     return this.emails[0].address
   },
   roles: function () {
-    if (!this.roles) {
+    var roles = Roles.getRolesForUser(this)
+
+    if (!roles.length) {
       return '<none>'
     }
 
-    return this.roles.join(',')
+    return roles.join(',')
   }
 })
diff --git a/examples/flow-router/packages/alanning:roles b/examples/flow-router/packages/alanning:roles
new file mode 120000
index 0000000000..a8a4f8c212
--- /dev/null
+++ b/examples/flow-router/packages/alanning:roles
@@ -0,0 +1 @@
+../../..
\ No newline at end of file
diff --git a/examples/flow-router/polyfills.js b/examples/flow-router/polyfills.js
deleted file mode 100644
index ad286f3645..0000000000
--- a/examples/flow-router/polyfills.js
+++ /dev/null
@@ -1,11 +0,0 @@
-;(function () {
-
-  "use strict";
-
-  if(typeof String.prototype.trim !== 'function') {
-    String.prototype.trim = function() {
-      return this.replace(/^\s+|\s+$/g, ''); 
-    }
-  }
-
-}());
diff --git a/examples/flow-router/server/server.js b/examples/flow-router/server/server.js
index 3629a214ef..ae6a84594f 100644
--- a/examples/flow-router/server/server.js
+++ b/examples/flow-router/server/server.js
@@ -49,6 +49,10 @@ Meteor.startup(function () {
       // email verification
       Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
 
+      _.each(userData.roles, function (role) {
+        Roles.createRole(role, {unlessExists: true});
+      });
+
       Roles.addUsersToRoles(id, userData.roles);
     
     });
@@ -67,7 +71,7 @@ Meteor.startup(function () {
       return true;
     }
 
-    throw new Meteor.Error(403, "Not authorized to create new users");
+    throw new Meteor.Error('unauthorized', "Not authorized to create new users");
   });
 
 });
@@ -83,7 +87,7 @@ Meteor.publish("secrets", function () {
   var user = Meteor.users.findOne({_id:this.userId});
 
   if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
-    console.log('publishing secrets', this.userId)
+    console.log('publishing secrets', this.userId);
     return Meteor.secrets.find();
   }
 
@@ -96,7 +100,7 @@ Meteor.publish("users", function () {
   var user = Meteor.users.findOne({_id:this.userId});
 
   if (Roles.userIsInRole(user, ["admin","manage-users"])) {
-    console.log('publishing users', this.userId)
+    console.log('publishing users', this.userId);
     return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
   } 
 

From e8dcb01a65daf129eec02217c7294a296452947d Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 16:00:58 +0100
Subject: [PATCH 0198/1140] Upgraded iron-router example.

---
 .../iron-router/.meteor/.finished-upgraders   |  12 ++
 examples/iron-router/.meteor/packages         |  15 +-
 examples/iron-router/.meteor/release          |   2 +-
 examples/iron-router/.meteor/versions         | 151 ++++++++++--------
 examples/iron-router/client/manage-users.js   |   6 +-
 examples/iron-router/packages/alanning:roles  |   1 +
 examples/iron-router/polyfills.js             |  11 --
 examples/iron-router/server/server.js         |  10 +-
 8 files changed, 124 insertions(+), 84 deletions(-)
 create mode 100644 examples/iron-router/.meteor/.finished-upgraders
 create mode 120000 examples/iron-router/packages/alanning:roles
 delete mode 100644 examples/iron-router/polyfills.js

diff --git a/examples/iron-router/.meteor/.finished-upgraders b/examples/iron-router/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..61ee313230
--- /dev/null
+++ b/examples/iron-router/.meteor/.finished-upgraders
@@ -0,0 +1,12 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
diff --git a/examples/iron-router/.meteor/packages b/examples/iron-router/.meteor/packages
index abb04893f8..eb9a78626a 100644
--- a/examples/iron-router/.meteor/packages
+++ b/examples/iron-router/.meteor/packages
@@ -3,7 +3,6 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-platform
 accounts-password
 accounts-ui
 bootstrap
@@ -11,3 +10,17 @@ spiderable
 alanning:roles
 iron:router
 alanning:trace
+standard-minifiers
+meteor-base
+mobile-experience
+mongo
+blaze-html-templates
+session
+jquery
+tracker
+logging
+reload
+random
+ejson
+spacebars
+check
diff --git a/examples/iron-router/.meteor/release b/examples/iron-router/.meteor/release
index 315c635bf3..3a05e0a2f7 100644
--- a/examples/iron-router/.meteor/release
+++ b/examples/iron-router/.meteor/release
@@ -1 +1 @@
-METEOR@1.1.0.3
+METEOR@1.2.1
diff --git a/examples/iron-router/.meteor/versions b/examples/iron-router/.meteor/versions
index 336edb1cf3..3b792d42a2 100644
--- a/examples/iron-router/.meteor/versions
+++ b/examples/iron-router/.meteor/versions
@@ -1,69 +1,88 @@
-accounts-base@1.2.0
-accounts-password@1.1.1
-accounts-ui@1.1.5
-accounts-ui-unstyled@1.1.7
-alanning:roles@1.2.13
+accounts-base@1.2.2
+accounts-password@1.1.4
+accounts-ui@1.1.6
+accounts-ui-unstyled@1.1.8
+alanning:roles@1.2.14
 alanning:trace@0.0.2
-autoupdate@1.2.1
-base64@1.0.3
-binary-heap@1.0.3
-blaze@2.1.2
-blaze-tools@1.0.3
-boilerplate-generator@1.0.3
+autoupdate@1.2.4
+babel-compiler@5.8.24_1
+babel-runtime@0.1.4
+base64@1.0.4
+binary-heap@1.0.4
+blaze@2.1.3
+blaze-html-templates@1.0.1
+blaze-tools@1.0.4
+boilerplate-generator@1.0.4
 bootstrap@1.0.1
-callback-hook@1.0.3
-check@1.0.5
-ddp@1.1.0
-deps@1.0.7
-ejson@1.0.6
-email@1.0.6
-fastclick@1.0.3
-geojson-utils@1.0.3
-html-tools@1.0.4
-htmljs@1.0.4
-http@1.1.0
-id-map@1.0.3
-iron:controller@1.0.8
-iron:core@1.0.8
-iron:dynamic-template@1.0.8
-iron:layout@1.0.8
-iron:location@1.0.9
-iron:middleware-stack@1.0.9
-iron:router@1.0.9
-iron:url@1.0.9
-jquery@1.11.3_2
-json@1.0.3
-launch-screen@1.0.2
-less@1.0.14
-livedata@1.0.13
-localstorage@1.0.3
-logging@1.0.7
-meteor@1.1.6
-meteor-platform@1.2.2
-minifiers@1.1.5
-minimongo@1.0.8
-mobile-status-bar@1.0.3
-mongo@1.1.0
+caching-compiler@1.0.0
+caching-html-compiler@1.0.2
+callback-hook@1.0.4
+check@1.1.0
+ddp@1.2.2
+ddp-client@1.2.1
+ddp-common@1.2.2
+ddp-rate-limiter@1.0.0
+ddp-server@1.2.2
+deps@1.0.9
+diff-sequence@1.0.1
+ecmascript@0.1.6
+ecmascript-runtime@0.2.6
+ejson@1.0.7
+email@1.0.8
+fastclick@1.0.7
+geojson-utils@1.0.4
+hot-code-push@1.0.0
+html-tools@1.0.5
+htmljs@1.0.5
+http@1.1.1
+id-map@1.0.4
+iron:controller@1.0.12
+iron:core@1.0.11
+iron:dynamic-template@1.0.12
+iron:layout@1.0.12
+iron:location@1.0.11
+iron:middleware-stack@1.0.11
+iron:router@1.0.12
+iron:url@1.0.11
+jquery@1.11.4
+launch-screen@1.0.4
+less@2.5.1
+livedata@1.0.15
+localstorage@1.0.5
+logging@1.0.8
+meteor@1.1.10
+meteor-base@1.0.1
+minifiers@1.1.7
+minimongo@1.0.10
+mobile-experience@1.0.1
+mobile-status-bar@1.0.6
+mongo@1.1.3
+mongo-id@1.0.1
 npm-bcrypt@0.7.8_2
-observe-sequence@1.0.6
-ordered-dict@1.0.3
-random@1.0.3
-reactive-dict@1.1.0
-reactive-var@1.0.5
-reload@1.1.3
-retry@1.0.3
-routepolicy@1.0.5
-service-configuration@1.0.4
-session@1.1.0
-sha@1.0.3
-spacebars@1.0.6
-spacebars-compiler@1.0.6
-spiderable@1.0.7
-srp@1.0.3
-templating@1.1.1
-tracker@1.0.7
-ui@1.0.6
-underscore@1.0.3
-url@1.0.4
-webapp@1.2.0
-webapp-hashing@1.0.3
+npm-mongo@1.4.39_1
+observe-sequence@1.0.7
+ordered-dict@1.0.4
+promise@0.5.1
+random@1.0.5
+rate-limit@1.0.0
+reactive-dict@1.1.3
+reactive-var@1.0.6
+reload@1.1.4
+retry@1.0.4
+routepolicy@1.0.6
+service-configuration@1.0.5
+session@1.1.1
+sha@1.0.4
+spacebars@1.0.7
+spacebars-compiler@1.0.7
+spiderable@1.0.9
+srp@1.0.4
+standard-minifiers@1.0.2
+templating@1.1.5
+templating-tools@1.0.0
+tracker@1.0.9
+ui@1.0.8
+underscore@1.0.4
+url@1.0.5
+webapp@1.2.3
+webapp-hashing@1.0.5
diff --git a/examples/iron-router/client/manage-users.js b/examples/iron-router/client/manage-users.js
index 7fdf0b519c..d846154d13 100644
--- a/examples/iron-router/client/manage-users.js
+++ b/examples/iron-router/client/manage-users.js
@@ -10,10 +10,12 @@ Template.userList.helpers({
     return this.emails[0].address
   },
   roles: function () {
-    if (!this.roles) {
+    var roles = Roles.getRolesForUser(this)
+
+    if (!roles.length) {
       return '<none>'
     }
 
-    return this.roles.join(',')
+    return roles.join(',')
   }
 })
diff --git a/examples/iron-router/packages/alanning:roles b/examples/iron-router/packages/alanning:roles
new file mode 120000
index 0000000000..a8a4f8c212
--- /dev/null
+++ b/examples/iron-router/packages/alanning:roles
@@ -0,0 +1 @@
+../../..
\ No newline at end of file
diff --git a/examples/iron-router/polyfills.js b/examples/iron-router/polyfills.js
deleted file mode 100644
index ad286f3645..0000000000
--- a/examples/iron-router/polyfills.js
+++ /dev/null
@@ -1,11 +0,0 @@
-;(function () {
-
-  "use strict";
-
-  if(typeof String.prototype.trim !== 'function') {
-    String.prototype.trim = function() {
-      return this.replace(/^\s+|\s+$/g, ''); 
-    }
-  }
-
-}());
diff --git a/examples/iron-router/server/server.js b/examples/iron-router/server/server.js
index 3629a214ef..ae6a84594f 100644
--- a/examples/iron-router/server/server.js
+++ b/examples/iron-router/server/server.js
@@ -49,6 +49,10 @@ Meteor.startup(function () {
       // email verification
       Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
 
+      _.each(userData.roles, function (role) {
+        Roles.createRole(role, {unlessExists: true});
+      });
+
       Roles.addUsersToRoles(id, userData.roles);
     
     });
@@ -67,7 +71,7 @@ Meteor.startup(function () {
       return true;
     }
 
-    throw new Meteor.Error(403, "Not authorized to create new users");
+    throw new Meteor.Error('unauthorized', "Not authorized to create new users");
   });
 
 });
@@ -83,7 +87,7 @@ Meteor.publish("secrets", function () {
   var user = Meteor.users.findOne({_id:this.userId});
 
   if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
-    console.log('publishing secrets', this.userId)
+    console.log('publishing secrets', this.userId);
     return Meteor.secrets.find();
   }
 
@@ -96,7 +100,7 @@ Meteor.publish("users", function () {
   var user = Meteor.users.findOne({_id:this.userId});
 
   if (Roles.userIsInRole(user, ["admin","manage-users"])) {
-    console.log('publishing users', this.userId)
+    console.log('publishing users', this.userId);
     return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
   } 
 

From 9be479f46e868416201c755a4c5282ce8eace47f Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 16:05:55 +0100
Subject: [PATCH 0199/1140] Docs assets.

---
 docs/assets/css/external-small.png           | Bin
 docs/assets/css/logo.png                     | Bin
 docs/assets/css/main.css                     |   0
 docs/assets/favicon.ico                      | Bin
 docs/assets/img/spinner.gif                  | Bin
 docs/assets/index.html                       |   0
 docs/assets/js/api-filter.js                 |   0
 docs/assets/js/api-list.js                   |   0
 docs/assets/js/api-search.js                 |   0
 docs/assets/js/apidocs.js                    |   0
 docs/assets/js/yui-prettify.js               |   0
 docs/assets/vendor/prettify/CHANGES.html     |   0
 docs/assets/vendor/prettify/COPYING          |   0
 docs/assets/vendor/prettify/README.html      |   0
 docs/assets/vendor/prettify/prettify-min.css |   0
 docs/assets/vendor/prettify/prettify-min.js  |   0
 16 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 docs/assets/css/external-small.png
 mode change 100755 => 100644 docs/assets/css/logo.png
 mode change 100755 => 100644 docs/assets/css/main.css
 mode change 100755 => 100644 docs/assets/favicon.ico
 mode change 100755 => 100644 docs/assets/img/spinner.gif
 mode change 100755 => 100644 docs/assets/index.html
 mode change 100755 => 100644 docs/assets/js/api-filter.js
 mode change 100755 => 100644 docs/assets/js/api-list.js
 mode change 100755 => 100644 docs/assets/js/api-search.js
 mode change 100755 => 100644 docs/assets/js/apidocs.js
 mode change 100755 => 100644 docs/assets/js/yui-prettify.js
 mode change 100755 => 100644 docs/assets/vendor/prettify/CHANGES.html
 mode change 100755 => 100644 docs/assets/vendor/prettify/COPYING
 mode change 100755 => 100644 docs/assets/vendor/prettify/README.html
 mode change 100755 => 100644 docs/assets/vendor/prettify/prettify-min.css
 mode change 100755 => 100644 docs/assets/vendor/prettify/prettify-min.js

diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
old mode 100755
new mode 100644
diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
old mode 100755
new mode 100644
diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
old mode 100755
new mode 100644
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
old mode 100755
new mode 100644
diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
old mode 100755
new mode 100644
diff --git a/docs/assets/index.html b/docs/assets/index.html
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
old mode 100755
new mode 100644

From 91e4b597ea7c550bd3fb48bec84efed85b5ff32e Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 16:09:41 +0100
Subject: [PATCH 0200/1140] Added .idea to .gitignore.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b2aea70c81..10aed3dc96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ results
 
 npm-debug.log
 smart.lock
+
+.idea
\ No newline at end of file

From 3cbf36fc09ec38e0d9306dbe22a18ec1220628e2 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 16:32:18 +0100
Subject: [PATCH 0201/1140] Added missed documentation comment.

---
 roles/roles_common.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 31a6226013..332cca060d 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1065,6 +1065,12 @@ _.extend(Roles, {
     }
   },
 
+  /**
+   * @param {String} string Input string.
+   * @return {String} Trimmed string.
+   * @private
+   * @static
+   */
   _trim: function (string) {
     if (string.trim) {
       return string.trim();

From ee6ec1db10723ed2303c3d40ea07cddf99e8df5a Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 16:32:38 +0100
Subject: [PATCH 0202/1140] Updated documentation.

---
 docs/classes/Roles.html                   | 24 +++++------
 docs/data.json                            | 51 +++++++++++++++++------
 docs/files/roles_client_uiHelpers.js.html |  4 +-
 docs/files/roles_roles_common.js.html     | 27 +++++++-----
 4 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 79a3caa108..65a0485a1f 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -546,7 +546,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1062"><code>roles&#x2F;roles_common.js:1062</code></a>
+        <a href="../files/roles_roles_common.js.html#l1054"><code>roles&#x2F;roles_common.js:1054</code></a>
         </p>
 
 
@@ -992,7 +992,7 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1049"><code>roles&#x2F;roles_common.js:1049</code></a>
+        <a href="../files/roles_roles_common.js.html#l1041"><code>roles&#x2F;roles_common.js:1041</code></a>
         </p>
 
 
@@ -1043,7 +1043,7 @@ if the role is an assigned role.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1033"><code>roles&#x2F;roles_common.js:1033</code></a>
+        <a href="../files/roles_roles_common.js.html#l1025"><code>roles&#x2F;roles_common.js:1025</code></a>
         </p>
 
 
@@ -1210,7 +1210,7 @@ only that it does not force the value to <code>false</code> if the role is alrea
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l976"><code>roles&#x2F;roles_common.js:976</code></a>
+        <a href="../files/roles_roles_common.js.html#l968"><code>roles&#x2F;roles_common.js:968</code></a>
         </p>
 
 
@@ -1293,7 +1293,7 @@ if it is not already.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1016"><code>roles&#x2F;roles_common.js:1016</code></a>
+        <a href="../files/roles_roles_common.js.html#l1008"><code>roles&#x2F;roles_common.js:1008</code></a>
         </p>
 
 
@@ -1372,7 +1372,7 @@ if its name matches <code>roleName</code>, and partition matches <code>partition
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1002"><code>roles&#x2F;roles_common.js:1002</code></a>
+        <a href="../files/roles_roles_common.js.html#l994"><code>roles&#x2F;roles_common.js:994</code></a>
         </p>
 
 
@@ -1752,7 +1752,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l843"><code>roles&#x2F;roles_common.js:843</code></a>
+        <a href="../files/roles_roles_common.js.html#l835"><code>roles&#x2F;roles_common.js:835</code></a>
         </p>
 
 
@@ -1813,7 +1813,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l928"><code>roles&#x2F;roles_common.js:928</code></a>
+        <a href="../files/roles_roles_common.js.html#l920"><code>roles&#x2F;roles_common.js:920</code></a>
         </p>
 
 
@@ -1857,7 +1857,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l944"><code>roles&#x2F;roles_common.js:944</code></a>
+        <a href="../files/roles_roles_common.js.html#l936"><code>roles&#x2F;roles_common.js:936</code></a>
         </p>
 
 
@@ -1939,7 +1939,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l789"><code>roles&#x2F;roles_common.js:789</code></a>
+        <a href="../files/roles_roles_common.js.html#l781"><code>roles&#x2F;roles_common.js:781</code></a>
         </p>
 
 
@@ -2031,7 +2031,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l858"><code>roles&#x2F;roles_common.js:858</code></a>
+        <a href="../files/roles_roles_common.js.html#l850"><code>roles&#x2F;roles_common.js:850</code></a>
         </p>
 
 
@@ -2411,7 +2411,7 @@ Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exampl
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l687"><code>roles&#x2F;roles_common.js:687</code></a>
+        <a href="../files/roles_roles_common.js.html#l679"><code>roles&#x2F;roles_common.js:679</code></a>
         </p>
 
 
diff --git a/docs/data.json b/docs/data.json
index 34dbd72ff8..37a289cf4c 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -425,7 +425,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 687,
+            "line": 679,
             "description": "Check if user has specified roles.",
             "example": [
                 "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // partition roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})"
@@ -460,7 +460,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 789,
+            "line": 781,
             "description": "Retrieve user's roles.",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -487,7 +487,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 843,
+            "line": 835,
             "description": "Retrieve cursor of all existing roles.",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -509,7 +509,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 858,
+            "line": 850,
             "description": "Retrieve all users who are in target role.\n\nOptions:",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -542,7 +542,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 928,
+            "line": 920,
             "description": "Deprecated. Use `getPartitionsForUser` instead.",
             "itemtype": "method",
             "name": "getGroupsForUser",
@@ -553,7 +553,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 944,
+            "line": 936,
             "description": "Retrieve users partitions, if any.",
             "itemtype": "method",
             "name": "getPartitionsForUser",
@@ -580,7 +580,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 976,
+            "line": 968,
             "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
             "name": "_resolveUser",
@@ -608,7 +608,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1002,
+            "line": 994,
             "itemtype": "method",
             "name": "_roleMatcher",
             "params": [
@@ -630,7 +630,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1016,
+            "line": 1008,
             "itemtype": "method",
             "name": "_roleAndPartitionMatcher",
             "params": [
@@ -657,7 +657,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1033,
+            "line": 1025,
             "itemtype": "method",
             "name": "_partitionMatcher",
             "params": [
@@ -679,7 +679,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1049,
+            "line": 1041,
             "itemtype": "method",
             "name": "_onlyAssignedMatcher",
             "return": {
@@ -694,7 +694,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1062,
+            "line": 1054,
             "description": "Throw an exception if `roleName` is an invalid role name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -711,6 +711,26 @@
             "class": "Roles",
             "module": "Roles"
         },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1068,
+            "params": [
+                {
+                    "name": "string",
+                    "description": "Input string.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "Trimmed string.",
+                "type": "String"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
         {
             "file": "roles/roles_server.js",
             "line": 30,
@@ -865,5 +885,10 @@
             "module": "Roles"
         }
     ],
-    "warnings": []
+    "warnings": [
+        {
+            "message": "Missing item type",
+            "line": " roles/roles_common.js:1068"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_client_uiHelpers.js.html b/docs/files/roles_client_uiHelpers.js.html
index 932f3b29cc..9405da664c 100644
--- a/docs/files/roles_client_uiHelpers.js.html
+++ b/docs/files/roles_client_uiHelpers.js.html
@@ -137,10 +137,10 @@ Roles._uiHelpers = {
 
     if (comma !== -1) {
       roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {
-        if (!r || !r.trim()) {
+        if (!r || !Roles._trim(r)) {
           return memo
         }
-        memo.push(r.trim())
+        memo.push(Roles._trim(r))
         return memo
       }, [])
     } else {
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 84ff750d2d..2fbabf304e 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -746,20 +746,12 @@ _.extend(Roles, {
       }));
     });
 
-    // transform into the query
-    roles = _.map(roles, function (role) {
-      return {
-        role: {$ne: role.role},
-        partition: {$ne: role.partition}
-      }
-    });
-
     if (roles.length) {
       // remove all extra entries which should not be there
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $and: roles
+            $nor: _.pick(roles, &#x27;role&#x27;, &#x27;partition&#x27;)
           }
         }
       });
@@ -1153,9 +1145,24 @@ _.extend(Roles, {
    * @static
    */
   _checkRoleName: function (roleName) {
-    if (!roleName || !_.isString(roleName) || roleName.trim() !== roleName) {
+    if (!roleName || !_.isString(roleName) || Roles._trim(roleName) !== roleName) {
       throw new Error(&quot;Invalid role name &#x27;&quot; + roleName + &quot;&#x27;.&quot;);
     }
+  },
+
+  /**
+   * @param {String} string Input string.
+   * @return {String} Trimmed string.
+   * @private
+   * @static
+   */
+  _trim: function (string) {
+    if (string.trim) {
+      return string.trim();
+    }
+    else {
+      return string.replace(/^\s+|\s+$/g, &#x27;&#x27;);
+    }
   }
 
 });  // end _.extend(Roles ...)

From 484e08fc6afbc1fdbb2b63def25666b3d0159447 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 16:47:42 +0100
Subject: [PATCH 0203/1140] One should use postSignUpHook and not try to
 manually set roles.

It does not work, especially now with subroles. So, a bad example and we
should not have it.
---
 README.md                                     |  7 +-
 .../.meteor/.finished-upgraders               |  7 --
 .../rolesWithAccountsUI/.meteor/.gitignore    |  1 -
 examples/rolesWithAccountsUI/.meteor/.id      |  7 --
 examples/rolesWithAccountsUI/.meteor/packages | 10 ---
 .../rolesWithAccountsUI/.meteor/platforms     |  2 -
 examples/rolesWithAccountsUI/.meteor/release  |  1 -
 examples/rolesWithAccountsUI/.meteor/versions | 60 ----------------
 .../rolesWithAccountsUI.css                   |  1 -
 .../rolesWithAccountsUI.html                  | 16 -----
 .../rolesWithAccountsUI.js                    | 23 ------
 .../server/setRolesOnUserObj.js               | 72 -------------------
 .../rolesWithAccountsUI/server/startup.js     | 19 -----
 13 files changed, 4 insertions(+), 222 deletions(-)
 delete mode 100644 examples/rolesWithAccountsUI/.meteor/.finished-upgraders
 delete mode 100644 examples/rolesWithAccountsUI/.meteor/.gitignore
 delete mode 100644 examples/rolesWithAccountsUI/.meteor/.id
 delete mode 100644 examples/rolesWithAccountsUI/.meteor/packages
 delete mode 100644 examples/rolesWithAccountsUI/.meteor/platforms
 delete mode 100644 examples/rolesWithAccountsUI/.meteor/release
 delete mode 100644 examples/rolesWithAccountsUI/.meteor/versions
 delete mode 100644 examples/rolesWithAccountsUI/rolesWithAccountsUI.css
 delete mode 100644 examples/rolesWithAccountsUI/rolesWithAccountsUI.html
 delete mode 100644 examples/rolesWithAccountsUI/rolesWithAccountsUI.js
 delete mode 100644 examples/rolesWithAccountsUI/server/setRolesOnUserObj.js
 delete mode 100644 examples/rolesWithAccountsUI/server/startup.js

diff --git a/README.md b/README.md
index 6df451c576..61baea6391 100644
--- a/README.md
+++ b/README.md
@@ -180,8 +180,7 @@ _.each(users, function (user) {
     _.each(user.roles, function (role) {
       Roles.createRole(role, {unlessExists: true});
     });
-    // Need _id of existing user record so this call must come 
-    // after `Accounts.createUser` or `Accounts.onCreate`
+    // Need _id of existing user record so this call must come after `Accounts.createUser`.
     Roles.addUsersToRoles(id, user.roles);
   }
 
@@ -189,8 +188,10 @@ _.each(users, function (user) {
 ```
 
 <br />
-Note that the `Roles.addUsersToRoles` call needs to come _after_ `Accounts.createUser` or `Accounts.onCreate` or else
+Note that the `Roles.addUsersToRoles` call needs to come _after_ `Accounts.createUser` or else
 the roles package won't be able to find the user record (since it hasn't been created yet).
+You can use `postSignUpHook` to assign roles when using
+[user accounts package](https://github.com/meteor-useraccounts/core).
 This SO answer gives more detail: http://stackoverflow.com/a/22650399/219238
 
 <br />
diff --git a/examples/rolesWithAccountsUI/.meteor/.finished-upgraders b/examples/rolesWithAccountsUI/.meteor/.finished-upgraders
deleted file mode 100644
index 68df3d8d0d..0000000000
--- a/examples/rolesWithAccountsUI/.meteor/.finished-upgraders
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains information which helps Meteor properly upgrade your
-# app when you run 'meteor update'. You should check it into version control
-# with your project.
-
-notices-for-0.9.0
-notices-for-0.9.1
-0.9.4-platform-file
diff --git a/examples/rolesWithAccountsUI/.meteor/.gitignore b/examples/rolesWithAccountsUI/.meteor/.gitignore
deleted file mode 100644
index 4083037423..0000000000
--- a/examples/rolesWithAccountsUI/.meteor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/examples/rolesWithAccountsUI/.meteor/.id b/examples/rolesWithAccountsUI/.meteor/.id
deleted file mode 100644
index c7b0fef3da..0000000000
--- a/examples/rolesWithAccountsUI/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-1epy1f8p4rl382ol0so
diff --git a/examples/rolesWithAccountsUI/.meteor/packages b/examples/rolesWithAccountsUI/.meteor/packages
deleted file mode 100644
index c73a37b976..0000000000
--- a/examples/rolesWithAccountsUI/.meteor/packages
+++ /dev/null
@@ -1,10 +0,0 @@
-# Meteor packages used by this project, one per line.
-# Check this file (and the other files in this directory) into your repository.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-meteor-platform
-accounts-password
-accounts-ui
-alanning:roles
diff --git a/examples/rolesWithAccountsUI/.meteor/platforms b/examples/rolesWithAccountsUI/.meteor/platforms
deleted file mode 100644
index efeba1b50c..0000000000
--- a/examples/rolesWithAccountsUI/.meteor/platforms
+++ /dev/null
@@ -1,2 +0,0 @@
-server
-browser
diff --git a/examples/rolesWithAccountsUI/.meteor/release b/examples/rolesWithAccountsUI/.meteor/release
deleted file mode 100644
index 90f87be959..0000000000
--- a/examples/rolesWithAccountsUI/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-METEOR@1.0.3.1
diff --git a/examples/rolesWithAccountsUI/.meteor/versions b/examples/rolesWithAccountsUI/.meteor/versions
deleted file mode 100644
index 9ad9e722b5..0000000000
--- a/examples/rolesWithAccountsUI/.meteor/versions
+++ /dev/null
@@ -1,60 +0,0 @@
-accounts-base@1.1.3
-accounts-password@1.0.6
-accounts-ui@1.1.4
-accounts-ui-unstyled@1.1.6
-alanning:roles@1.2.13
-application-configuration@1.0.4
-autoupdate@1.1.5
-base64@1.0.2
-binary-heap@1.0.2
-blaze@2.0.4
-blaze-tools@1.0.2
-boilerplate-generator@1.0.2
-callback-hook@1.0.2
-check@1.0.4
-ddp@1.0.14
-deps@1.0.6
-ejson@1.0.5
-email@1.0.5
-fastclick@1.0.2
-follower-livedata@1.0.3
-geojson-utils@1.0.2
-html-tools@1.0.3
-htmljs@1.0.3
-http@1.0.10
-id-map@1.0.2
-jquery@1.11.3
-json@1.0.2
-launch-screen@1.0.1
-less@1.0.12
-livedata@1.0.12
-localstorage@1.0.2
-logging@1.0.6
-meteor@1.1.4
-meteor-platform@1.2.1
-minifiers@1.1.3
-minimongo@1.0.6
-mobile-status-bar@1.0.2
-mongo@1.0.11
-npm-bcrypt@0.7.7
-observe-sequence@1.0.4
-ordered-dict@1.0.2
-random@1.0.2
-reactive-dict@1.0.5
-reactive-var@1.0.4
-reload@1.1.2
-retry@1.0.2
-routepolicy@1.0.4
-service-configuration@1.0.3
-session@1.0.5
-sha@1.0.2
-spacebars@1.0.5
-spacebars-compiler@1.0.4
-srp@1.0.2
-templating@1.0.11
-tracker@1.0.5
-ui@1.0.5
-underscore@1.0.2
-url@1.0.3
-webapp@1.1.6
-webapp-hashing@1.0.2
diff --git a/examples/rolesWithAccountsUI/rolesWithAccountsUI.css b/examples/rolesWithAccountsUI/rolesWithAccountsUI.css
deleted file mode 100644
index b6b4052b43..0000000000
--- a/examples/rolesWithAccountsUI/rolesWithAccountsUI.css
+++ /dev/null
@@ -1 +0,0 @@
-/* CSS declarations go here */
diff --git a/examples/rolesWithAccountsUI/rolesWithAccountsUI.html b/examples/rolesWithAccountsUI/rolesWithAccountsUI.html
deleted file mode 100644
index 56a04c3ebc..0000000000
--- a/examples/rolesWithAccountsUI/rolesWithAccountsUI.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<head>
-  <title>rolesWithAccountsUI</title>
-</head>
-
-<body>
-  {{> loginButtons}}
-
-  <h1>Welcome to Meteor!</h1>
-
-  {{> hello}}
-</body>
-
-<template name="hello">
-  <button>Click Me</button>
-  <p>You've pressed the button {{counter}} times.</p>
-</template>
diff --git a/examples/rolesWithAccountsUI/rolesWithAccountsUI.js b/examples/rolesWithAccountsUI/rolesWithAccountsUI.js
deleted file mode 100644
index 4f8c65d5c0..0000000000
--- a/examples/rolesWithAccountsUI/rolesWithAccountsUI.js
+++ /dev/null
@@ -1,23 +0,0 @@
-if (Meteor.isClient) {
-  // counter starts at 0
-  Session.setDefault('counter', 0);
-
-  Template.hello.helpers({
-    counter: function () {
-      return Session.get('counter');
-    }
-  });
-
-  Template.hello.events({
-    'click button': function () {
-      // increment the counter when button is clicked
-      Session.set('counter', Session.get('counter') + 1);
-    }
-  });
-}
-
-if (Meteor.isServer) {
-  Meteor.startup(function () {
-    // code to run on server at startup
-  });
-}
diff --git a/examples/rolesWithAccountsUI/server/setRolesOnUserObj.js b/examples/rolesWithAccountsUI/server/setRolesOnUserObj.js
deleted file mode 100644
index 0bee41ab95..0000000000
--- a/examples/rolesWithAccountsUI/server/setRolesOnUserObj.js
+++ /dev/null
@@ -1,72 +0,0 @@
-Roles.setRolesOnUserObj = function (users, roles, group) {
-  if (!users) throw new Error ("Missing 'users' param")
-  if (!roles) throw new Error ("Missing 'roles' param")
-  if (group) {
-    if ('string' !== typeof group)
-      throw new Error ("Roles error: Invalid parameter 'group'. Expected 'string' type")
-    if ('$' === group[0])
-      throw new Error ("Roles error: groups can not start with '$'")
-
-    // convert any periods to underscores
-    group = group.replace(/\./g, '_')
-  }
-
-  // ensure arrays to simplify code
-  if (!_.isArray(users)) users = [users]
-  if (!_.isArray(roles)) roles = [roles]
-
-  
-  // remove invalid roles
-  roles = _.reduce(roles, function (memo, role) {
-    if (role
-        && 'string' === typeof role
-        && role.trim().length > 0) {
-      memo.push(role.trim())
-    }
-    return memo
-  }, [])
-
-  // if roles is empty, quit
-  if (roles.length === 0) return
-
-  // ensure all roles exist in 'roles' collection
-  existingRoles = _.reduce(Meteor.roles.find({}).fetch(), function (memo, role) {
-    memo[role.name] = true
-    return memo
-  }, {})
-  _.each(roles, function (role) {
-    if (!existingRoles[role]) {
-      Roles.createRole(role)
-    }
-  })
-
-  // ensure users is an array of objects
-  _.each(users, function (user) {
-    if ('object' !== typeof user) {
-      throw new Error("Expected 'users' argument to be an object or array of objects")
-    }
-  })
-
-
-  // Set the roles on the actual user object
-
-  if (group) {
-
-    // roles is a key/value dict object
-
-    _.each(users, function (user) {
-      user.roles = {}
-      user.roles[group] = roles
-    })
-
-  } else {
-
-    // roles is an array of strings
-    
-    _.each(users, function (user) {
-      user.roles = roles
-    })
-
-  }
-
-}  // end setRolesOnUserObj
diff --git a/examples/rolesWithAccountsUI/server/startup.js b/examples/rolesWithAccountsUI/server/startup.js
deleted file mode 100644
index 06285dfc2d..0000000000
--- a/examples/rolesWithAccountsUI/server/startup.js
+++ /dev/null
@@ -1,19 +0,0 @@
-Meteor.startup(function () {
-
-  console.log('Running server startup code...');
-
-  Accounts.onCreateUser(function (options, user) {
-    Roles.setRolesOnUserObj(user, ['admin','view-secrets']);
-
-    if (options.profile) {
-      // include the user profile
-      user.profile = options.profile
-    }
-
-    // other user object changes...
-    // ...
-    
-    return user;
-  });
-
-});

From 0051f0dcd47fcce1e16b13ffdb0a89c0335fa372 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 16:54:07 +0100
Subject: [PATCH 0204/1140] Upgraded flow-router-advanced example.

---
 examples/flow-router-advanced/.meteor/release |  2 +-
 .../flow-router-advanced/.meteor/versions     | 44 +++++++++----------
 .../main/server/startup/fixtures.js           |  4 ++
 .../main/server/startup/validateNewUser.js    |  2 +-
 .../manageUsers/client/manage-users.js        |  6 ++-
 .../packages/alanning:roles                   |  1 +
 6 files changed, 33 insertions(+), 26 deletions(-)
 create mode 120000 examples/flow-router-advanced/packages/alanning:roles

diff --git a/examples/flow-router-advanced/.meteor/release b/examples/flow-router-advanced/.meteor/release
index 5684262a83..3a05e0a2f7 100644
--- a/examples/flow-router-advanced/.meteor/release
+++ b/examples/flow-router-advanced/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.0.2
+METEOR@1.2.1
diff --git a/examples/flow-router-advanced/.meteor/versions b/examples/flow-router-advanced/.meteor/versions
index 16ea8f4c4f..06b0c5f1a5 100644
--- a/examples/flow-router-advanced/.meteor/versions
+++ b/examples/flow-router-advanced/.meteor/versions
@@ -1,10 +1,10 @@
-accounts-base@1.2.1
-accounts-password@1.1.3
+accounts-base@1.2.2
+accounts-password@1.1.4
 accounts-ui@1.1.6
 accounts-ui-unstyled@1.1.8
 alanning:roles@1.2.14
 alanning:trace@0.0.2
-autoupdate@1.2.3
+autoupdate@1.2.4
 babel-compiler@5.8.24_1
 babel-runtime@0.1.4
 base64@1.0.4
@@ -17,20 +17,20 @@ bootstrap@1.0.1
 caching-compiler@1.0.0
 caching-html-compiler@1.0.2
 callback-hook@1.0.4
-check@1.0.6
-coffeescript@1.0.10
-cosmos:browserify@0.5.1
+check@1.1.0
+coffeescript@1.0.11
+cosmos:browserify@0.9.3
 ddp@1.2.2
 ddp-client@1.2.1
-ddp-common@1.2.1
+ddp-common@1.2.2
 ddp-rate-limiter@1.0.0
-ddp-server@1.2.1
+ddp-server@1.2.2
 deps@1.0.9
 diff-sequence@1.0.1
-ecmascript@0.1.5
-ecmascript-collections@0.1.6
+ecmascript@0.1.6
+ecmascript-runtime@0.2.6
 ejson@1.0.7
-email@1.0.7
+email@1.0.8
 fastclick@1.0.7
 geojson-utils@1.0.4
 hot-code-push@1.0.0
@@ -39,29 +39,29 @@ htmljs@1.0.5
 http@1.1.1
 id-map@1.0.4
 jquery@1.11.4
-kadira:blaze-layout@2.1.0
-kadira:flow-router@2.6.2
+kadira:blaze-layout@2.3.0
+kadira:flow-router@2.10.0
 launch-screen@1.0.4
-less@2.5.0_3
+less@2.5.1
 livedata@1.0.15
 localstorage@1.0.5
 logging@1.0.8
-meteor@1.1.9
+meteor@1.1.10
 meteor-base@1.0.1
 minifiers@1.1.7
 minimongo@1.0.10
 mobile-experience@1.0.1
 mobile-status-bar@1.0.6
-mongo@1.1.2
+mongo@1.1.3
 mongo-id@1.0.1
 npm-bcrypt@0.7.8_2
 npm-mongo@1.4.39_1
 observe-sequence@1.0.7
 ordered-dict@1.0.4
-promise@0.5.0
-random@1.0.4
+promise@0.5.1
+random@1.0.5
 rate-limit@1.0.0
-reactive-dict@1.1.2
+reactive-dict@1.1.3
 reactive-var@1.0.6
 reload@1.1.4
 retry@1.0.4
@@ -73,12 +73,12 @@ spacebars@1.0.7
 spacebars-compiler@1.0.7
 spiderable@1.0.9
 srp@1.0.4
-standard-minifiers@1.0.1
-templating@1.1.4
+standard-minifiers@1.0.2
+templating@1.1.5
 templating-tools@1.0.0
 tracker@1.0.9
 ui@1.0.8
 underscore@1.0.4
 url@1.0.5
-webapp@1.2.2
+webapp@1.2.3
 webapp-hashing@1.0.5
diff --git a/examples/flow-router-advanced/main/server/startup/fixtures.js b/examples/flow-router-advanced/main/server/startup/fixtures.js
index 73a49aed83..0c9318775e 100644
--- a/examples/flow-router-advanced/main/server/startup/fixtures.js
+++ b/examples/flow-router-advanced/main/server/startup/fixtures.js
@@ -41,6 +41,10 @@ function createUsers () {
       Meteor.users.update({_id: id},
                           {$set:{'emails.0.verified': true}});
 
+      _.each(userData.roles, function (role) {
+        Roles.createRole(role, {unlessExists: true});
+      });
+
       Roles.addUsersToRoles(id, userData.roles);
     
     });
diff --git a/examples/flow-router-advanced/main/server/startup/validateNewUser.js b/examples/flow-router-advanced/main/server/startup/validateNewUser.js
index 4270ec8c10..0d72321a6a 100644
--- a/examples/flow-router-advanced/main/server/startup/validateNewUser.js
+++ b/examples/flow-router-advanced/main/server/startup/validateNewUser.js
@@ -11,7 +11,7 @@ Meteor.startup(function () {
       return true;
     }
 
-    throw new Meteor.Error(403, "Not authorized to create new users");
+    throw new Meteor.Error('unauthorized', "Not authorized to create new users");
   });
 
 })
diff --git a/examples/flow-router-advanced/manageUsers/client/manage-users.js b/examples/flow-router-advanced/manageUsers/client/manage-users.js
index 7fdf0b519c..d846154d13 100644
--- a/examples/flow-router-advanced/manageUsers/client/manage-users.js
+++ b/examples/flow-router-advanced/manageUsers/client/manage-users.js
@@ -10,10 +10,12 @@ Template.userList.helpers({
     return this.emails[0].address
   },
   roles: function () {
-    if (!this.roles) {
+    var roles = Roles.getRolesForUser(this)
+
+    if (!roles.length) {
       return '<none>'
     }
 
-    return this.roles.join(',')
+    return roles.join(',')
   }
 })
diff --git a/examples/flow-router-advanced/packages/alanning:roles b/examples/flow-router-advanced/packages/alanning:roles
new file mode 120000
index 0000000000..a8a4f8c212
--- /dev/null
+++ b/examples/flow-router-advanced/packages/alanning:roles
@@ -0,0 +1 @@
+../../..
\ No newline at end of file

From 05537908881574d6a95558a3721735c971447078 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 18:33:01 +0100
Subject: [PATCH 0205/1140] Document migration.

---
 History.md | 10 ++++++++++
 README.md  | 30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/History.md b/History.md
index d052a96334..6e28e94e3b 100644
--- a/History.md
+++ b/History.md
@@ -2,6 +2,16 @@
 
 * Rewrite with new schema for `roles` field.
 * Support for roles hierarchies.
+* Groups were renamed to partitions.
+* Groups/partitions are always available, if you do not specify a partition, role is seen as a global role.
+* `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a partition, or use `null`).
+* `getGroupsForUser` is deprecated, `getPartitionsForUser` should be used instead.
+* Functions which modify roles are available both on the client and server side, but should be called on the
+  client side only from inside Meteor methods.
+* `deleteRole` can now delete role even when in use, it is automatically unset from all users.
+* Functions `addRoleParent` and `removeRoleParent` were added.
+* `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
+* All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
 
 ## v1.2.14
 
diff --git a/README.md b/README.md
index 61baea6391..056778645f 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 * [What are "partitions"?](#user-content-partitions)
 * [Changes to default Meteor](#user-content-changes)
 * [Installation](#user-content-installing)
+* [Migration to 2.0](#user-content-migration)
 * [Usage examples](#user-content-usage)
 * [Online API docs](#user-content-docs)
 * [Example apps](#user-content-example-apps)
@@ -145,6 +146,35 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 
 <br />
 
+<a name="migration">
+### Migration to 2.0
+
+In meteor-roles 2.0, functions are mostly backwards compatible with 1.0, but roles are stored differently
+in the database. To migrate the database to new schema, run `Meteor._forwardMigrate()` on the server:
+
+```bash
+meteor shell
+> Package['alanning:roles'].Roles._forwardMigrate()
+```
+
+#### Changes between 1.0 and 2.0
+
+Here is the list of important changes between meteor-roles 1.0 and 2.0 to consider when migrating
+to 2.0:
+
+* Groups were renamed to partitions.
+* Groups/partitions are always available, if you do not specify a partition, role is seen as a global role.
+* `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a partition, or use `null`).
+* `getGroupsForUser` is deprecated, `getPartitionsForUser` should be used instead.
+* Functions which modify roles are available both on the client and server side, but should be called on the
+  client side only from inside Meteor methods.
+* `deleteRole` can now delete role even when in use, it is automatically unset from all users.
+* Functions `addRoleParent` and `removeRoleParent` were added.
+* `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
+* All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
+
+<br />
+
 
 <a name="usage">
 ### Usage Examples

From fa6985655cb00c545ad7d27827b758459b858bcd Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 18:36:50 +0100
Subject: [PATCH 0206/1140] Added roles hierarchy example.

---
 README.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 056778645f..0ad38cc0d9 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,18 @@ combining multiple low-level permissions. For example, you could name your top-l
 and then you could use your second-level roles as permissions and name them `USERS_VIEW`, `POST_EDIT`, and similar.
 Then you could set `admin` role as parent role for `USERS_VIEW` and `POST_EDIT`, while `user` would be parent
 only of the `POST_EDIT` role. You can then assign `user` and `admin` roles to your users. And if you need to
-change permissions later for the whole role, just add or remove children roles.
+change permissions later for the whole role, just add or remove children roles. You can create roles from this example
+with:
+
+```javascript
+Roles.createRole('user');
+Roles.createRole('admin');
+Roles.createRole('USERS_VIEW');
+Roles.createRole('POST_EDIT');
+Roles.addRoleParent('USERS_VIEW', 'admin');
+Roles.addRoleParent('POST_EDIT', 'admin');
+Roles.addRoleParent('POST_EDIT', 'user');
+```
 
 <br />
 
@@ -105,7 +116,7 @@ assign roles independently and make sure that they don't get mixed up between pa
 Now, let's take a look at how to use the global roles. Say we want to give Joe permission to do something across
 all of our partitions. That is what the global roles are for:
 
-```
+```javascript
 Roles.addUsersToRoles(joesUserId, 'super-admin', null); // Or you could just omit the last argument.
 
 if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.com')) {

From c1f096ba9abf5b9b618dbafb023746771cf44186 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 19:10:08 +0100
Subject: [PATCH 0207/1140] Bugfix.

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 332cca060d..46282a8c4b 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -666,7 +666,7 @@ _.extend(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.pick(roles, 'role', 'partition')
+            $nor: _.map(roles, function (role) {return _.pick(role, 'role', 'partition')})
           }
         }
       });

From deffd619b52d028a5051b8a95378d2ebd2014319 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 19:57:46 +0100
Subject: [PATCH 0208/1140] Bugfixes in migrations.

---
 roles/roles_server.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 72279d5b44..5641729466 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -50,7 +50,7 @@ _.extend(Roles, {
    * @static
    */
   _isOldField: function (roles) {
-    return (_.isArray(roles) && _.isString(roles[0])) || _.isObject(roles);
+    return (_.isArray(roles) && _.isString(roles[0])) || (_.isObject(roles) && !_.isArray(roles));
   },
 
   /**
@@ -76,8 +76,13 @@ _.extend(Roles, {
     }
     else if (_.isObject(oldRoles)) {
       _.each(oldRoles, function (rolesArray, group) {
-        // unescape
-        group = group.replace(/_/g, '.');
+        if (group === '__global_roles__') {
+          group = null;
+        }
+        else {
+          // unescape
+          group = group.replace(/_/g, '.');
+        }
 
         _.each(rolesArray, function (role, index) {
           if (!_.isString(role)) throw new Error("Role '" + role + "' is not a string.");
@@ -121,12 +126,12 @@ _.extend(Roles, {
         if (!usingGroups) throw new Error("Role '" + userRole.role + "' with partition '" + userRole.partition + "' without enabled groups.");
 
         // escape
-        userRole.partition = group.replace(/./g, '_');
+        var partition = userRole.partition.replace(/\./g, '_');
 
-        if (userRole.partition[0] === '$') throw new Error("Group name '" + userRole.partition + "' start with $.");
+        if (partition[0] === '$') throw new Error("Group name '" + partition + "' start with $.");
 
-        roles[userRole.partition] = roles[userRole.partition] || [];
-        roles[userRole.partition].push(userRole.role);
+        roles[partition] = roles[partition] || [];
+        roles[partition].push(userRole.role);
       }
       else {
         if (usingGroups) {

From 705dd7ea4d7acf56bfffc11f88b026083de4e6b8 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 19:57:54 +0100
Subject: [PATCH 0209/1140] Tests for migrations.

---
 roles/tests/server.js | 160 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 160 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 31637a7871..2f2480f0f0 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1050,6 +1050,166 @@
       testUser(test, 'joe', ['admin'], 'example.k12.va.us');
     });
 
+  Tinytest.add(
+    'roles - migration without global groups',
+    function (test) {
+      reset();
+
+      test.isTrue(Meteor.roles.insert({name: 'admin'}));
+      test.isTrue(Meteor.roles.insert({name: 'editor'}));
+      test.isTrue(Meteor.roles.insert({name: 'user'}));
+
+      test.isTrue(Meteor.users.update(users.eve, {$set: {roles: ['admin', 'editor']}}));
+      test.isTrue(Meteor.users.update(users.bob, {$set: {roles: []}}));
+      test.isTrue(Meteor.users.update(users.joe, {$set: {roles: ['user']}}));
+
+      Roles._forwardMigrate();
+
+      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+        roles: [{
+          role: 'admin',
+          partition: null,
+          assigned: true
+        }, {
+          role: 'editor',
+          partition: null,
+          assigned: true
+        }]
+      });
+      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+        roles: []
+      });
+      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+        roles: [{
+          role: 'user',
+          partition: null,
+          assigned: true
+        }]
+      });
+
+      test.equal(Meteor.roles.findOne({name: 'admin'}, {fields: {_id: 0}}), {
+        name: 'admin',
+        children: []
+      });
+      test.equal(Meteor.roles.findOne({name: 'editor'}, {fields: {_id: 0}}), {
+        name: 'editor',
+        children: []
+      });
+      test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
+        name: 'user',
+        children: []
+      });
+
+      Roles._backwardMigrate(null, false);
+
+      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+        roles: ['admin', 'editor']
+      });
+      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+        roles: []
+      });
+      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+        roles: ['user']
+      });
+
+      test.equal(Meteor.roles.findOne({name: 'admin'}, {fields: {_id: 0}}), {
+        name: 'admin'
+      });
+      test.equal(Meteor.roles.findOne({name: 'editor'}, {fields: {_id: 0}}), {
+        name: 'editor'
+      });
+      test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
+        name: 'user'
+      });
+    });
+
+  Tinytest.add(
+    'roles - migration with global groups',
+    function (test) {
+      reset();
+
+      test.isTrue(Meteor.roles.insert({name: 'admin'}));
+      test.isTrue(Meteor.roles.insert({name: 'editor'}));
+      test.isTrue(Meteor.roles.insert({name: 'user'}));
+
+      test.isTrue(Meteor.users.update(users.eve, {$set: {roles: {__global_roles__: ['admin', 'editor'], foo: ['user']}}}));
+      test.isTrue(Meteor.users.update(users.bob, {$set: {roles: {}}}));
+      test.isTrue(Meteor.users.update(users.joe, {$set: {roles: {__global_roles__: ['user'], foo: ['user']}}}));
+
+      Roles._forwardMigrate();
+
+      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+        roles: [{
+          role: 'admin',
+          partition: null,
+          assigned: true
+        }, {
+          role: 'editor',
+          partition: null,
+          assigned: true
+        }, {
+          role: 'user',
+          partition: 'foo',
+          assigned: true
+        }]
+      });
+      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+        roles: []
+      });
+      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+        roles: [{
+          role: 'user',
+          partition: null,
+          assigned: true
+        }, {
+          role: 'user',
+          partition: 'foo',
+          assigned: true
+        }]
+      });
+
+      test.equal(Meteor.roles.findOne({name: 'admin'}, {fields: {_id: 0}}), {
+        name: 'admin',
+        children: []
+      });
+      test.equal(Meteor.roles.findOne({name: 'editor'}, {fields: {_id: 0}}), {
+        name: 'editor',
+        children: []
+      });
+      test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
+        name: 'user',
+        children: []
+      });
+
+      Roles._backwardMigrate(null, true);
+
+      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+        roles: {
+          __global_roles__: ['admin', 'editor'],
+          foo: ['user']
+        }
+      });
+      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+        roles: {}
+      });
+      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+        roles: {
+          __global_roles__: ['user'],
+          foo: ['user']
+        }
+      });
+
+      test.equal(Meteor.roles.findOne({name: 'admin'}, {fields: {_id: 0}}), {
+        name: 'admin'
+      });
+      test.equal(Meteor.roles.findOne({name: 'editor'}, {fields: {_id: 0}}), {
+        name: 'editor'
+      });
+      test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
+        name: 'user'
+      });
+    });
+
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From 9a61ed48522ab16764d57d6eb4257e36e4c2dded Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 21:31:10 +0100
Subject: [PATCH 0210/1140] Making results unique.

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 46282a8c4b..f108ee4a29 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -829,7 +829,7 @@ _.extend(Roles, {
       return roles;
     }
 
-    return _.pluck(roles, 'role');
+    return _.uniq(_.pluck(roles, 'role'));
   },
 
   /**

From 1f134be0e14a3b33122f24a4a9eb971981804734 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 21:57:40 +0100
Subject: [PATCH 0211/1140] More tests for extra options.

---
 roles/tests/server.js | 275 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 265 insertions(+), 10 deletions(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 2f2480f0f0..526ffd2241 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -55,11 +55,13 @@
     function (test) {
       reset();
 
-      Roles.createRole('test1');
+      var role1Id = Roles.createRole('test1');
       test.equal(Meteor.roles.findOne().name, 'test1');
+      test.equal(Meteor.roles.findOne(role1Id).name, 'test1');
 
-      Roles.createRole('test2');
+      var role2Id = Roles.createRole('test2');
       test.equal(Meteor.roles.findOne({'name':'test2'}).name, 'test2');
+      test.equal(Meteor.roles.findOne(role2Id).name, 'test2');
 
       test.equal(Meteor.roles.find().count(), 2);
 
@@ -77,6 +79,7 @@
 
       Roles.createRole('test1');
       test.throws(function () {Roles.createRole('test1')});
+      test.isNull(Roles.createRole('test1', {unlessExists: true}));
     });
 
   Tinytest.add(
@@ -93,6 +96,12 @@
       test.throws(function () {
         Roles.createRole(' ');
       }, /Invalid role name/);
+      test.throws(function () {
+        Roles.createRole(' foobar');
+      }, /Invalid role name/);
+      test.throws(function () {
+        Roles.createRole(' foobar ');
+      }, /Invalid role name/);
     });
 
   Tinytest.add(
@@ -119,7 +128,54 @@
       Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
 
       testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition2')
+      testUser(test, 'eve', ['editor'], 'partition2');
+
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'partition1'));
+
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], {anyPartition: true}));
+      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], {anyPartition: true}));
+    });
+
+  Tinytest.add(
+    'roles - can check if user is in role by partition through options',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], {partition: 'partition1'});
+      Roles.addUsersToRoles(users.eve, ['editor'], {partition: 'partition2'});
+
+      testUser(test, 'eve', ['admin', 'user'], {partition: 'partition1'});
+      testUser(test, 'eve', ['editor'], {partition: 'partition2'});
+    });
+
+  Tinytest.add(
+    'roles - can check if user is in role by partition with global role',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+      Roles.addUsersToRoles(users.eve, ['admin']);
+
+      test.isTrue(Roles.userIsInRole(users.eve, ['user'], 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'partition2'));
+
+      test.isFalse(Roles.userIsInRole(users.eve, ['user']));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
+
+      test.isFalse(Roles.userIsInRole(users.eve, ['user'], 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'partition1'));
+
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'partition2'));
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
     });
 
   Tinytest.add(
@@ -152,7 +208,7 @@
       user = Meteor.users.findOne({_id:users.eve});
 
       // we can check the non-existing role
-      test.isTrue(Roles.userIsInRole(user, ['editor','admin']));
+      test.isTrue(Roles.userIsInRole(user, ['editor', 'admin']));
     });
 
   Tinytest.add(
@@ -166,6 +222,39 @@
       test.equal(Meteor.users.findOne({_id:'1'}), undefined);
     });
 
+  Tinytest.add(
+    'roles - can\'t add user to non-existent role',
+    function (test) {
+      reset();
+
+      test.throws(function () {
+        Roles.addUsersToRoles(users.eve, ['admin']);
+      }, /Role 'admin' does not exist/);
+      Roles.addUsersToRoles(users.eve, ['admin'], {ifExists: true});
+    });
+
+  Tinytest.add(
+    'roles - can\'t set non-existent user to role',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+
+      Roles.setUserRoles(['1'], ['admin']);
+      test.equal(Meteor.users.findOne({_id:'1'}), undefined);
+    });
+
+  Tinytest.add(
+    'roles - can\'t set user to non-existent role',
+    function (test) {
+      reset();
+
+      test.throws(function () {
+        Roles.setUserRoles(users.eve, ['admin']);
+      }, /Role 'admin' does not exist/);
+      Roles.setUserRoles(users.eve, ['admin'], {ifExists: true});
+    });
+
   Tinytest.add(
     'roles - can add individual users to roles', 
     function (test) {
@@ -361,6 +450,7 @@
       testUser(test, 'eve', ['editor']);
       testUser(test, 'bob', ['editor', 'user']);
     });
+
   Tinytest.add(
     'roles - can remove user from roles multiple times',
     function (test) {
@@ -402,7 +492,6 @@
       testUser(test, 'bob', ['editor', 'user']);
     });
 
-
   Tinytest.add(
     'roles - can remove individual users from roles by partition', 
     function (test) {
@@ -431,6 +520,34 @@
       testUser(test, 'joe', ['admin'], 'partition2');
     });
 
+  Tinytest.add(
+    'roles - can remove individual users from roles by partition through options',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
+      // remove user role - one user
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], {partition: 'partition1'});
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], {partition: 'partition2'});
+      testUser(test, 'eve', ['editor', 'user'], 'partition1');
+      testUser(test, 'bob', ['editor', 'user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition2');
+
+      Roles.removeUsersFromRoles(users.eve, ['user'], {partition: 'partition1'});
+      testUser(test, 'eve', ['editor'], 'partition1');
+      testUser(test, 'bob', ['editor', 'user'], 'partition1');
+      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', [], 'partition2');
+      testUser(test, 'bob', ['admin'], 'partition2');
+      testUser(test, 'joe', ['admin'], 'partition2');
+    });
+
   Tinytest.add(
     'roles - can remove multiple users from roles', 
     function (test) {
@@ -619,7 +736,9 @@
       var expected = roles,
           actual = _.pluck(Roles.getAllRoles().fetch(), 'name');
 
-      test.equal(actual, expected)
+      test.equal(actual, expected);
+
+      test.equal(_.pluck(Roles.getAllRoles({sort: {name: -1}}).fetch(), 'name'), expected.reverse());
     });
 
   Tinytest.add(
@@ -657,6 +776,16 @@
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
       test.equal(Roles.getRolesForUser(userObj), ['admin', 'user']);
+
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'user',
+        partition: null,
+        assigned: true
+      }]);
     });
 
   Tinytest.add(
@@ -680,15 +809,122 @@
 
       // add roles
       Roles.addUsersToRoles(userId, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(userId, ['admin'], 'partition2');
 
       // by userId
       test.equal(Roles.getRolesForUser(userId, 'partition1'), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId, 'partition2'), ['admin']);
       test.equal(Roles.getRolesForUser(userId), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
       test.equal(Roles.getRolesForUser(userObj, 'partition1'), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userObj, 'partition2'), ['admin']);
       test.equal(Roles.getRolesForUser(userObj), []);
+
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1'}), [{
+        role: 'admin',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }]);
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2'}), [{
+        role: 'admin',
+        partition: 'partition2',
+        assigned: true
+      }]);
+
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true}), [{
+        role: 'admin',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'admin',
+        partition: 'partition2',
+        assigned: true
+      }]);
+
+      Roles.createRole('PERMISSION');
+      Roles.addRoleParent('PERMISSION', 'user');
+
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1'}), [{
+        role: 'admin',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'PERMISSION',
+        partition: 'partition1',
+        assigned: false
+      }]);
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2'}), [{
+        role: 'admin',
+        partition: 'partition2',
+        assigned: true
+      }]);
+      test.equal(Roles.getRolesForUser(userId, {partition: 'partition1'}), ['admin', 'user', 'PERMISSION']);
+      test.equal(Roles.getRolesForUser(userId, {partition: 'partition2'}), ['admin']);
+
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true}), [{
+        role: 'admin',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'admin',
+        partition: 'partition2',
+        assigned: true
+      }, {
+        role: 'PERMISSION',
+        partition: 'partition1',
+        assigned: false
+      }]);
+      test.equal(Roles.getRolesForUser(userId, {anyPartition: true}), ['admin', 'user', 'PERMISSION']);
+
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1', onlyAssigned: true}), [{
+        role: 'admin',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }]);
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2', onlyAssigned: true}), [{
+        role: 'admin',
+        partition: 'partition2',
+        assigned: true
+      }]);
+      test.equal(Roles.getRolesForUser(userId, {partition: 'partition1', onlyAssigned: true}), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId, {partition: 'partition2', onlyAssigned: true}), ['admin']);
+
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true, onlyAssigned: true}), [{
+        role: 'admin',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'admin',
+        partition: 'partition2',
+        assigned: true
+      }]);
+      test.equal(Roles.getRolesForUser(userId, {anyPartition: true, onlyAssigned: true}), ['admin', 'user']);
     });
 
   Tinytest.add(
@@ -897,12 +1133,25 @@
       Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
 
       var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin','partition1').fetch(), '_id');
+          actual = _.pluck(Roles.getUsersInRole('admin', 'partition1').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       // difference uses first array as base so have to check both ways
       test.equal(_.difference(actual, expected), []);
       test.equal(_.difference(expected, actual), []);
+
+      expected = [users.eve, users.joe];
+      actual = _.pluck(Roles.getUsersInRole('admin', {partition: 'partition1'}).fetch(), '_id');
+      test.equal(_.difference(actual, expected), []);
+      test.equal(_.difference(expected, actual), []);
+
+      expected = [users.eve, users.bob, users.joe];
+      actual = _.pluck(Roles.getUsersInRole('admin', {anyPartition: true}).fetch(), '_id');
+      test.equal(_.difference(actual, expected), []);
+      test.equal(_.difference(expected, actual), []);
+
+      actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
+      test.equal(actual, []);
     });
   
   Tinytest.add(
@@ -917,7 +1166,7 @@
       Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
 
       var expected = [users.eve],
-          actual = _.pluck(Roles.getUsersInRole('admin','partition1').fetch(), '_id');
+          actual = _.pluck(Roles.getUsersInRole('admin', 'partition1').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       // difference uses first array as base so have to check both ways
@@ -925,19 +1174,25 @@
       test.equal(_.difference(expected, actual), []);
 
       expected = [users.eve, users.bob, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin','partition2').fetch(), '_id');
+      actual = _.pluck(Roles.getUsersInRole('admin', 'partition2').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       test.equal(_.difference(actual, expected), []);
       test.equal(_.difference(expected, actual), []);
 
-
       expected = [users.eve];
       actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
 
       // order may be different so check difference instead of equality
       test.equal(_.difference(actual, expected), []);
       test.equal(_.difference(expected, actual), []);
+
+      expected = [users.eve, users.bob, users.joe];
+      actual = _.pluck(Roles.getUsersInRole('admin', {anyPartition: true}).fetch(), '_id');
+
+      // order may be different so check difference instead of equality
+      test.equal(_.difference(actual, expected), []);
+      test.equal(_.difference(expected, actual), []);
     });
 
   Tinytest.add(

From 726e73e5537475e8a323fe5f57ae3bed07647e79 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 22:04:57 +0100
Subject: [PATCH 0212/1140] Verify partition name as well.

---
 roles/roles_common.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index f108ee4a29..a935a62cd5 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -310,6 +310,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       ifExists: false,
       // internal option, should not be used publicly because it will break assumptions
@@ -365,6 +367,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       ifExists: false,
       // internal option, should not be used publicly because it will break assumptions
@@ -415,6 +419,7 @@ _.extend(Roles, {
         setRoles;
 
     Roles._checkRoleName(roleName);
+    Roles._checkPartitionName(options.partition);
 
     if (_.isObject(user)) {
       id = user._id;
@@ -543,6 +548,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only remove users from an assigned role
@@ -588,6 +595,7 @@ _.extend(Roles, {
         update;
 
     Roles._checkRoleName(roleName);
+    Roles._checkPartitionName(options.partition);
 
     if (_.isObject(user)) {
       id = user._id;
@@ -722,6 +730,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       anyPartition: false
     });
@@ -804,6 +814,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       fullObjects: false,
       onlyAssigned: false,
@@ -884,6 +896,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       queryOptions: queryOptions || {},
       anyPartition: false
@@ -1065,6 +1079,22 @@ _.extend(Roles, {
     }
   },
 
+  /**
+   * Throw an exception if `partitionName` is an invalid partition name.
+   *
+   * @method _checkRoleName
+   * @param {String} partitionName A partition name to match against.
+   * @private
+   * @static
+   */
+  _checkPartitionName: function (partitionName) {
+    if (partitionName === null) return;
+
+    if (!partitionName || !_.isString(partitionName) || Roles._trim(partitionName) !== partitionName) {
+      throw new Error("Invalid partition name '" + partitionName + "'.");
+    }
+  },
+
   /**
    * @param {String} string Input string.
    * @return {String} Trimmed string.

From 188e2c625db2181f447cf4e00ba02c97d45bfa7b Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 22:05:02 +0100
Subject: [PATCH 0213/1140] New docs.

---
 docs/classes/Roles.html               | 103 ++++++++++++++++++++------
 docs/data.json                        |  65 ++++++++++------
 docs/files/roles_roles_common.js.html |  34 ++++++++-
 docs/files/roles_roles_server.js.html |  19 +++--
 4 files changed, 168 insertions(+), 53 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 65a0485a1f..ce195ccee4 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -133,6 +133,11 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__checkRoleName">_checkRoleName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__convertToNewField">_convertToNewField</a>
 
@@ -318,7 +323,7 @@
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l394"><code>roles&#x2F;roles_common.js:394</code></a>
+        <a href="../files/roles_roles_common.js.html#l398"><code>roles&#x2F;roles_common.js:398</code></a>
         </p>
 
 
@@ -413,7 +418,7 @@ only that it does not force the value to <code>false</code> if the role is alrea
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l631"><code>roles&#x2F;roles_common.js:631</code></a>
+        <a href="../files/roles_roles_common.js.html#l639"><code>roles&#x2F;roles_common.js:639</code></a>
         </p>
 
 
@@ -476,7 +481,7 @@ are marked as not explicitly assigned, and have not been part of what we current
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l183"><code>roles&#x2F;roles_server.js:183</code></a>
+        <a href="../files/roles_roles_server.js.html#l188"><code>roles&#x2F;roles_server.js:188</code></a>
         </p>
 
 
@@ -546,7 +551,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1054"><code>roles&#x2F;roles_common.js:1054</code></a>
+        <a href="../files/roles_roles_common.js.html#l1068"><code>roles&#x2F;roles_common.js:1068</code></a>
         </p>
 
 
@@ -578,6 +583,62 @@ no subroles.</p>
 
 
 
+</div>
+<div id="method__checkRoleName" class="method item private">
+    <h3 class="name"><code>_checkRoleName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>partitionName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1082"><code>roles&#x2F;roles_common.js:1082</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Throw an exception if <code>partitionName</code> is an invalid partition name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">partitionName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A partition name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method__convertToNewField" class="method item private">
     <h3 class="name"><code>_convertToNewField</code></h3>
@@ -672,7 +733,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l96"><code>roles&#x2F;roles_server.js:96</code></a>
+        <a href="../files/roles_roles_server.js.html#l101"><code>roles&#x2F;roles_server.js:101</code></a>
         </p>
 
 
@@ -739,7 +800,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l144"><code>roles&#x2F;roles_server.js:144</code></a>
+        <a href="../files/roles_roles_server.js.html#l149"><code>roles&#x2F;roles_server.js:149</code></a>
         </p>
 
 
@@ -803,7 +864,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l162"><code>roles&#x2F;roles_server.js:162</code></a>
+        <a href="../files/roles_roles_server.js.html#l167"><code>roles&#x2F;roles_server.js:167</code></a>
         </p>
 
 
@@ -992,7 +1053,7 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1041"><code>roles&#x2F;roles_common.js:1041</code></a>
+        <a href="../files/roles_roles_common.js.html#l1055"><code>roles&#x2F;roles_common.js:1055</code></a>
         </p>
 
 
@@ -1043,7 +1104,7 @@ if the role is an assigned role.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1025"><code>roles&#x2F;roles_common.js:1025</code></a>
+        <a href="../files/roles_roles_common.js.html#l1039"><code>roles&#x2F;roles_common.js:1039</code></a>
         </p>
 
 
@@ -1114,7 +1175,7 @@ if its partition matches <code>partition</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l564"><code>roles&#x2F;roles_common.js:564</code></a>
+        <a href="../files/roles_roles_common.js.html#l571"><code>roles&#x2F;roles_common.js:571</code></a>
         </p>
 
 
@@ -1210,7 +1271,7 @@ only that it does not force the value to <code>false</code> if the role is alrea
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l968"><code>roles&#x2F;roles_common.js:968</code></a>
+        <a href="../files/roles_roles_common.js.html#l982"><code>roles&#x2F;roles_common.js:982</code></a>
         </p>
 
 
@@ -1293,7 +1354,7 @@ if it is not already.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1008"><code>roles&#x2F;roles_common.js:1008</code></a>
+        <a href="../files/roles_roles_common.js.html#l1022"><code>roles&#x2F;roles_common.js:1022</code></a>
         </p>
 
 
@@ -1372,7 +1433,7 @@ if its name matches <code>roleName</code>, and partition matches <code>partition
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l994"><code>roles&#x2F;roles_common.js:994</code></a>
+        <a href="../files/roles_roles_common.js.html#l1008"><code>roles&#x2F;roles_common.js:1008</code></a>
         </p>
 
 
@@ -1752,7 +1813,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l835"><code>roles&#x2F;roles_common.js:835</code></a>
+        <a href="../files/roles_roles_common.js.html#l847"><code>roles&#x2F;roles_common.js:847</code></a>
         </p>
 
 
@@ -1813,7 +1874,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l920"><code>roles&#x2F;roles_common.js:920</code></a>
+        <a href="../files/roles_roles_common.js.html#l934"><code>roles&#x2F;roles_common.js:934</code></a>
         </p>
 
 
@@ -1857,7 +1918,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l936"><code>roles&#x2F;roles_common.js:936</code></a>
+        <a href="../files/roles_roles_common.js.html#l950"><code>roles&#x2F;roles_common.js:950</code></a>
         </p>
 
 
@@ -1939,7 +2000,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l781"><code>roles&#x2F;roles_common.js:781</code></a>
+        <a href="../files/roles_roles_common.js.html#l791"><code>roles&#x2F;roles_common.js:791</code></a>
         </p>
 
 
@@ -2031,7 +2092,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l850"><code>roles&#x2F;roles_common.js:850</code></a>
+        <a href="../files/roles_roles_common.js.html#l862"><code>roles&#x2F;roles_common.js:862</code></a>
         </p>
 
 
@@ -2209,7 +2270,7 @@ parent role set, removed subrole is removed automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l513"><code>roles&#x2F;roles_common.js:513</code></a>
+        <a href="../files/roles_roles_common.js.html#l518"><code>roles&#x2F;roles_common.js:518</code></a>
         </p>
 
 
@@ -2307,7 +2368,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l329"><code>roles&#x2F;roles_common.js:329</code></a>
+        <a href="../files/roles_roles_common.js.html#l331"><code>roles&#x2F;roles_common.js:331</code></a>
         </p>
 
 
@@ -2411,7 +2472,7 @@ Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exampl
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l679"><code>roles&#x2F;roles_common.js:679</code></a>
+        <a href="../files/roles_roles_common.js.html#l687"><code>roles&#x2F;roles_common.js:687</code></a>
         </p>
 
 
diff --git a/docs/data.json b/docs/data.json
index 37a289cf4c..11cccfde01 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -282,7 +282,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 329,
+            "line": 331,
             "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
             "example": [
                 "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -313,7 +313,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 394,
+            "line": 398,
             "description": "Add one user to one role.",
             "itemtype": "method",
             "name": "_addUserToRole",
@@ -346,7 +346,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 513,
+            "line": 518,
             "description": "Remove users from assigned roles.",
             "example": [
                 "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
@@ -377,7 +377,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 564,
+            "line": 571,
             "description": "Remove one user from one role.\n\nWARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same\nrole to be a child of multiple roles it might happen that it removes some subroles which\nit should not because they are in effect also through some other parent role. You should always\ncall `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a\nparticular user.",
             "itemtype": "method",
             "name": "_removeUserFromRole",
@@ -406,7 +406,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 631,
+            "line": 639,
             "description": "Makes sure all subroles are correctly set, and no extra subroles are set which should not be.\n\nUsed internally after complicated changes, but it can also be used whenever one feels that\nthere might be inconsistencies (eg., after a crash).\n\nWe simply re-set to the user their assigned roles again and remove any roles which\nare marked as not explicitly assigned, and have not been part of what we currently set.",
             "itemtype": "method",
             "name": "_assureConsistency",
@@ -425,7 +425,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 679,
+            "line": 687,
             "description": "Check if user has specified roles.",
             "example": [
                 "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // partition roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})"
@@ -460,7 +460,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 781,
+            "line": 791,
             "description": "Retrieve user's roles.",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -487,7 +487,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 835,
+            "line": 847,
             "description": "Retrieve cursor of all existing roles.",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -509,7 +509,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 850,
+            "line": 862,
             "description": "Retrieve all users who are in target role.\n\nOptions:",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -542,7 +542,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 920,
+            "line": 934,
             "description": "Deprecated. Use `getPartitionsForUser` instead.",
             "itemtype": "method",
             "name": "getGroupsForUser",
@@ -553,7 +553,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 936,
+            "line": 950,
             "description": "Retrieve users partitions, if any.",
             "itemtype": "method",
             "name": "getPartitionsForUser",
@@ -580,7 +580,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 968,
+            "line": 982,
             "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
             "name": "_resolveUser",
@@ -608,7 +608,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 994,
+            "line": 1008,
             "itemtype": "method",
             "name": "_roleMatcher",
             "params": [
@@ -630,7 +630,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1008,
+            "line": 1022,
             "itemtype": "method",
             "name": "_roleAndPartitionMatcher",
             "params": [
@@ -657,7 +657,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1025,
+            "line": 1039,
             "itemtype": "method",
             "name": "_partitionMatcher",
             "params": [
@@ -679,7 +679,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1041,
+            "line": 1055,
             "itemtype": "method",
             "name": "_onlyAssignedMatcher",
             "return": {
@@ -694,7 +694,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1054,
+            "line": 1068,
             "description": "Throw an exception if `roleName` is an invalid role name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -713,7 +713,26 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1068,
+            "line": 1082,
+            "description": "Throw an exception if `partitionName` is an invalid partition name.",
+            "itemtype": "method",
+            "name": "_checkRoleName",
+            "params": [
+                {
+                    "name": "partitionName",
+                    "description": "A partition name to match against.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1098,
             "params": [
                 {
                     "name": "string",
@@ -799,7 +818,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 96,
+            "line": 101,
             "itemtype": "method",
             "name": "_convertToOldField",
             "params": [
@@ -821,7 +840,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 144,
+            "line": 149,
             "itemtype": "method",
             "name": "_defaultUpdateUser",
             "params": [
@@ -843,7 +862,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 162,
+            "line": 167,
             "description": "Migrates `Meteor.users` and `Meteor.roles` to the new format.",
             "itemtype": "method",
             "name": "_forwardMigrate",
@@ -862,7 +881,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 183,
+            "line": 188,
             "description": "Migrates `Meteor.users` and `Meteor.roles` to the old format.\n\nWe assume that we are converting back a failed migration, so values can only be\nwhat were valid values in the old format. So no group names starting with `$` and\nno subroles.",
             "itemtype": "method",
             "name": "_backwardMigrate",
@@ -888,7 +907,7 @@
     "warnings": [
         {
             "message": "Missing item type",
-            "line": " roles/roles_common.js:1068"
+            "line": " roles/roles_common.js:1098"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 2fbabf304e..bb0e5de326 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -395,6 +395,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       ifExists: false,
       // internal option, should not be used publicly because it will break assumptions
@@ -450,6 +452,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       ifExists: false,
       // internal option, should not be used publicly because it will break assumptions
@@ -500,6 +504,7 @@ _.extend(Roles, {
         setRoles;
 
     Roles._checkRoleName(roleName);
+    Roles._checkPartitionName(options.partition);
 
     if (_.isObject(user)) {
       id = user._id;
@@ -628,6 +633,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only remove users from an assigned role
@@ -673,6 +680,7 @@ _.extend(Roles, {
         update;
 
     Roles._checkRoleName(roleName);
+    Roles._checkPartitionName(options.partition);
 
     if (_.isObject(user)) {
       id = user._id;
@@ -751,7 +759,7 @@ _.extend(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.pick(roles, &#x27;role&#x27;, &#x27;partition&#x27;)
+            $nor: _.map(roles, function (role) {return _.pick(role, &#x27;role&#x27;, &#x27;partition&#x27;)})
           }
         }
       });
@@ -807,6 +815,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       anyPartition: false
     });
@@ -889,6 +899,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       fullObjects: false,
       onlyAssigned: false,
@@ -914,7 +926,7 @@ _.extend(Roles, {
       return roles;
     }
 
-    return _.pluck(roles, &#x27;role&#x27;);
+    return _.uniq(_.pluck(roles, &#x27;role&#x27;));
   },
 
   /**
@@ -969,6 +981,8 @@ _.extend(Roles, {
 
     options.partition = options.partition || null;
 
+    Roles._checkPartitionName(options.partition);
+
     options = _.defaults(options, {
       queryOptions: queryOptions || {},
       anyPartition: false
@@ -1150,6 +1164,22 @@ _.extend(Roles, {
     }
   },
 
+  /**
+   * Throw an exception if &#x60;partitionName&#x60; is an invalid partition name.
+   *
+   * @method _checkRoleName
+   * @param {String} partitionName A partition name to match against.
+   * @private
+   * @static
+   */
+  _checkPartitionName: function (partitionName) {
+    if (partitionName === null) return;
+
+    if (!partitionName || !_.isString(partitionName) || Roles._trim(partitionName) !== partitionName) {
+      throw new Error(&quot;Invalid partition name &#x27;&quot; + partitionName + &quot;&#x27;.&quot;);
+    }
+  },
+
   /**
    * @param {String} string Input string.
    * @return {String} Trimmed string.
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index fb49321f1c..5b8eba6f67 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -135,7 +135,7 @@ _.extend(Roles, {
    * @static
    */
   _isOldField: function (roles) {
-    return (_.isArray(roles) &amp;&amp; _.isString(roles[0])) || _.isObject(roles);
+    return (_.isArray(roles) &amp;&amp; _.isString(roles[0])) || (_.isObject(roles) &amp;&amp; !_.isArray(roles));
   },
 
   /**
@@ -161,8 +161,13 @@ _.extend(Roles, {
     }
     else if (_.isObject(oldRoles)) {
       _.each(oldRoles, function (rolesArray, group) {
-        // unescape
-        group = group.replace(/_/g, &#x27;.&#x27;);
+        if (group === &#x27;__global_roles__&#x27;) {
+          group = null;
+        }
+        else {
+          // unescape
+          group = group.replace(/_/g, &#x27;.&#x27;);
+        }
 
         _.each(rolesArray, function (role, index) {
           if (!_.isString(role)) throw new Error(&quot;Role &#x27;&quot; + role + &quot;&#x27; is not a string.&quot;);
@@ -206,12 +211,12 @@ _.extend(Roles, {
         if (!usingGroups) throw new Error(&quot;Role &#x27;&quot; + userRole.role + &quot;&#x27; with partition &#x27;&quot; + userRole.partition + &quot;&#x27; without enabled groups.&quot;);
 
         // escape
-        userRole.partition = group.replace(/./g, &#x27;_&#x27;);
+        var partition = userRole.partition.replace(/\./g, &#x27;_&#x27;);
 
-        if (userRole.partition[0] === &#x27;$&#x27;) throw new Error(&quot;Group name &#x27;&quot; + userRole.partition + &quot;&#x27; start with $.&quot;);
+        if (partition[0] === &#x27;$&#x27;) throw new Error(&quot;Group name &#x27;&quot; + partition + &quot;&#x27; start with $.&quot;);
 
-        roles[userRole.partition] = roles[userRole.partition] || [];
-        roles[userRole.partition].push(userRole.role);
+        roles[partition] = roles[partition] || [];
+        roles[partition].push(userRole.role);
       }
       else {
         if (usingGroups) {

From fbbe9ff89e14ce1e19002bf3621387e00f7938fd Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 22:08:15 +0100
Subject: [PATCH 0214/1140] Tests for invalid partition name.

---
 roles/tests/server.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 526ffd2241..adb032f3c6 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -104,6 +104,31 @@
       }, /Invalid role name/);
     });
 
+  Tinytest.add(
+    'roles - can\'t use invalid partition names',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+
+      test.throws(function () {
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ');
+      }, /Invalid partition name/);
+      test.throws(function () {
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar');
+      }, /Invalid partition name/);
+      test.throws(function () {
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ');
+      }, /Invalid partition name/);
+      test.throws(function () {
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42);
+      }, /Invalid partition name/);
+    });
+
   Tinytest.add(
     'roles - can check if user is in role', 
     function (test) {

From 1a1795e98b373d37eb9b8e5764bdfc51834ae90c Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 22:19:53 +0100
Subject: [PATCH 0215/1140] Dropping support for Meteorite.

---
 roles/smart.json |  9 ---------
 roles/smart.lock | 19 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 roles/smart.json
 delete mode 100644 roles/smart.lock

diff --git a/roles/smart.json b/roles/smart.json
deleted file mode 100644
index 4b6ac59dda..0000000000
--- a/roles/smart.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "roles",
-  "description": "Role-based authorization, compatible with Meteor's built-in accounts packages.  Includes example app, unit tests and online API docs.",
-  "homepage": "https://github.com/alanning/meteor-roles",
-  "author": "Adrian Lanning <alanning@gmail.com>",
-  "version": "1.2.12",
-  "git": "https://github.com/alanning/meteor-roles.git",
-  "packages": {}
-}
diff --git a/roles/smart.lock b/roles/smart.lock
deleted file mode 100644
index f9937203f0..0000000000
--- a/roles/smart.lock
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "meteor": {
-    "git": "https://github.com/meteor/meteor.git",
-    "branch": "master",
-    "commit": "cab491f3650fffc85661bca6b3cecf583410e05d"
-  },
-  "dependencies": {
-    "basePackages": {
-      "roles": {
-        "path": ""
-      }
-    },
-    "packages": {
-      "roles": {
-        "path": ""
-      }
-    }
-  }
-}

From 8803f9c881d010cd10133db0bafe32d94dcdc6b7 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 24 Dec 2015 23:24:13 +0100
Subject: [PATCH 0216/1140] Fixed missing name.

---
 roles/roles_common.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index a935a62cd5..57637c1646 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -159,8 +159,8 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkRoleName(parentName);
 
-    // query to get role's _id
-    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1}});
+    // query to get role's _id and name
+    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1, name: 1}});
 
     if (!role) {
       throw new Error("Role '" + roleName + "' does not exist.");

From 188f4d543811058127111f520aa86ecb18490b63 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 00:28:32 +0100
Subject: [PATCH 0217/1140] Correctly concat.

---
 roles/roles_common.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 57637c1646..8e0399f999 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -509,7 +509,7 @@ _.extend(Roles, {
 
     _.each(role.children, function (child) {
       // subroles are set as unassigned, but only if they do not already exist
-      setRoles.concat(Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: null})));
+      setRoles = setRoles.concat(Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: null})));
     });
 
     return setRoles;
@@ -662,19 +662,19 @@ _.extend(Roles, {
 
     setRoles = [];
     _.each(roles, function (role) {
-      setRoles.concat(Roles._addUserToRole(user, role.role, {
+      setRoles = setRoles.concat(Roles._addUserToRole(user, role.role, {
         partition: role.partition,
         _assigned: role.assigned, // this is true
         ifExists: true
       }));
     });
 
-    if (roles.length) {
+    if (setRoles.length) {
       // remove all extra entries which should not be there
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.map(roles, function (role) {return _.pick(role, 'role', 'partition')})
+            $nor: _.map(setRoles, function (role) {return _.pick(role, 'role', 'partition')})
           }
         }
       });

From 5d4f96ae6c9acac599889de78ebe897d4811e670 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 00:33:35 +0100
Subject: [PATCH 0218/1140] Tests for _assureConsistency.

---
 roles/tests/server.js | 175 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 149 insertions(+), 26 deletions(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index adb032f3c6..d983d23fc4 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -49,6 +49,34 @@
     })
   }
 
+  function itemsEqual (test, actual, expected) {
+    actual = actual || [];
+    expected = expected || [];
+
+    function intersectionObjects(/*args*/) {
+      var array, rest;
+      array = arguments[0];
+      rest = 2 <= arguments.length ? _.toArray(arguments).slice(1) : [];
+      return _.filter(_.uniq(array), function (item) {
+        return _.every(rest, function (other) {
+          return _.any(other, function (element) {
+            return _.isEqual(element, item);
+          });
+        });
+      });
+    }
+
+    if (actual.length === expected.length && intersectionObjects(actual, expected).length === actual.length) {
+      test.ok();
+    }
+    else {
+      test.fail({
+        type: 'itemsEqual',
+        actual: JSON.stringify(actual),
+        expected: JSON.stringify(expected)
+      });
+    }
+  }
 
   Tinytest.add(
     'roles - can create and delete roles', 
@@ -831,7 +859,6 @@
       userObj = Meteor.users.findOne({_id: userId});
       test.equal(Roles.getRolesForUser(userObj, 'partition1'), []);
 
-
       // add roles
       Roles.addUsersToRoles(userId, ['admin', 'user'], 'partition1');
       Roles.addUsersToRoles(userId, ['admin'], 'partition2');
@@ -1140,10 +1167,7 @@
       var expected = [users.eve, users.joe],
           actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
 
-      // order may be different so check difference instead of equality
-      // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), []);
-      test.equal(_.difference(expected, actual), []);
+      itemsEqual(test, actual, expected);
     });
 
   Tinytest.add(
@@ -1160,20 +1184,15 @@
       var expected = [users.eve, users.joe],
           actual = _.pluck(Roles.getUsersInRole('admin', 'partition1').fetch(), '_id');
 
-      // order may be different so check difference instead of equality
-      // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), []);
-      test.equal(_.difference(expected, actual), []);
+      itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.joe];
       actual = _.pluck(Roles.getUsersInRole('admin', {partition: 'partition1'}).fetch(), '_id');
-      test.equal(_.difference(actual, expected), []);
-      test.equal(_.difference(expected, actual), []);
+      itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
       actual = _.pluck(Roles.getUsersInRole('admin', {anyPartition: true}).fetch(), '_id');
-      test.equal(_.difference(actual, expected), []);
-      test.equal(_.difference(expected, actual), []);
+      itemsEqual(test, actual, expected);
 
       actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
       test.equal(actual, []);
@@ -1193,31 +1212,22 @@
       var expected = [users.eve],
           actual = _.pluck(Roles.getUsersInRole('admin', 'partition1').fetch(), '_id');
 
-      // order may be different so check difference instead of equality
-      // difference uses first array as base so have to check both ways
-      test.equal(_.difference(actual, expected), []);
-      test.equal(_.difference(expected, actual), []);
+      itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
       actual = _.pluck(Roles.getUsersInRole('admin', 'partition2').fetch(), '_id');
 
-      // order may be different so check difference instead of equality
-      test.equal(_.difference(actual, expected), []);
-      test.equal(_.difference(expected, actual), []);
+      itemsEqual(test, actual, expected);
 
       expected = [users.eve];
       actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
 
-      // order may be different so check difference instead of equality
-      test.equal(_.difference(actual, expected), []);
-      test.equal(_.difference(expected, actual), []);
+      itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
       actual = _.pluck(Roles.getUsersInRole('admin', {anyPartition: true}).fetch(), '_id');
 
-      // order may be different so check difference instead of equality
-      test.equal(_.difference(actual, expected), []);
-      test.equal(_.difference(expected, actual), []);
+      itemsEqual(test, actual, expected);
     });
 
   Tinytest.add(
@@ -1490,6 +1500,119 @@
       });
     });
 
+  Tinytest.add(
+    'roles - _assureConsistency',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('ALL_PERMISSIONS');
+      Roles.createRole('VIEW_PERMISSION');
+      Roles.createRole('EDIT_PERMISSION');
+      Roles.createRole('DELETE_PERMISSION');
+      Roles.addRoleParent('ALL_PERMISSIONS', 'user');
+      Roles.addRoleParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRoleParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRoleParent('DELETE_PERMISSION', 'admin');
+
+      Roles.addUsersToRoles(users.eve, ['user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['user'], 'partition2');
+
+      var correctRoles = [{
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition1',
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition1',
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: 'partition1',
+        assigned: false
+      }, {
+        role: 'user',
+        partition: 'partition2',
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition2',
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition2',
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: 'partition2',
+        assigned: false
+      }];
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), correctRoles);
+
+      // let's remove all automatically assigned roles
+      // _assureConsistency should recreate those roles
+      Meteor.users.update(users.eve, {$pull: {roles: {assigned: false}}});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'user',
+        partition: 'partition2',
+        assigned: true
+      }]);
+
+      Roles._assureConsistency(users.eve);
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), correctRoles);
+
+      // add an extra role, faking that it is automatically assigned
+      // _assureConsistency should remove this extra role
+      Meteor.users.update(users.eve, {$push: {roles: {role: 'DELETE_PERMISSION', partition: null, assigned: false}}});
+
+      Roles._assureConsistency(users.eve);
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), correctRoles);
+
+      // remove a role, _assureConsistency should remove it from the user
+      Meteor.roles.remove({name: 'VIEW_PERMISSION'});
+
+      Roles._assureConsistency(users.eve);
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: 'partition1',
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition1',
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition1',
+        assigned: false
+      }, {
+        role: 'user',
+        partition: 'partition2',
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition2',
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition2',
+        assigned: false
+      }]);
+    });
+
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From b46911cb28b68ca904697b3cd1d887d17a3fb3cc Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 00:47:22 +0100
Subject: [PATCH 0219/1140] Tests for _addUserToRole.

---
 roles/tests/server.js | 52 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index d983d23fc4..481f1dcaf6 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1613,6 +1613,58 @@
       }]);
     });
 
+  Tinytest.add(
+    'roles - _addUserToRole',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+
+      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: true});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }]);
+
+      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: false});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: false
+      }]);
+
+      Roles.setUserRoles(users.eve, []);
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+
+      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: null});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: false
+      }]);
+
+      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: true});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }]);
+
+      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: null});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }]);
+    });
+
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From eeea1383d07a14394cdc896941219cded0132742 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 00:56:25 +0100
Subject: [PATCH 0220/1140] Fixed comments.

---
 roles/roles_common.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 8e0399f999..9bfbe2665f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -406,7 +406,7 @@ _.extend(Roles, {
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
    *   - `_assigned`: internal option, should not be used publicly because it will break assumptions
    *     in te code; publicly, you can only add users to an assigned role
-   *     should the role be set as assigned, default is `true`; `null` is the same as `false`,
+   *     should the role be set as assigned (`true`), `null` is the same as `false`,
    *     only that it does not force the value to `false` if the role is already assigned
    * @return {Array} Roles set during the call (even those already set).
    * @private
@@ -583,9 +583,9 @@ _.extend(Roles, {
    * @param {Object} options Options:
    *   - `partition`: name of the partition, or `null` for the global role
    *   - `_assigned`: internal option, should not be used publicly because it will break assumptions
-   *     in te code; publicly, you can only add users to an assigned role
-   *     should the role be set as assigned, default is `true`; `null` is the same as `false`,
-   *     only that it does not force the value to `false` if the role is already assigned
+   *     in te code; publicly, you can only remove users from an assigned role
+   *     if `true`, only manually assigned roles are removed, if `false`, only automatically
+   *     assigned roles are removed, if `null`, any role is removed
    * @private
    * @static
    */

From a045ae6ee6a57af38cd0dd0db21b02cd3578ff5b Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 00:56:44 +0100
Subject: [PATCH 0221/1140] Tests for _removeUserFromRole.

---
 roles/tests/server.js | 70 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 481f1dcaf6..ccb00a36c7 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1620,6 +1620,7 @@
 
       Roles.createRole('admin');
 
+      // add role with assigned set to true
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: true});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
@@ -1628,6 +1629,7 @@
         assigned: true
       }]);
 
+      // change assigned to false
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: false});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
@@ -1640,6 +1642,7 @@
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
 
+      // add role with assigned set to false
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: null});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
@@ -1648,6 +1651,7 @@
         assigned: false
       }]);
 
+      // change assigned to true
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: true});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
@@ -1656,6 +1660,7 @@
         assigned: true
       }]);
 
+      // do not change assigned
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: null});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
@@ -1665,6 +1670,71 @@
       }]);
     });
 
+  Tinytest.add(
+    'roles - _removeUserFromRole',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+
+      Roles.addUsersToRoles(users.eve, 'admin');
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }]);
+
+      // remove only roles with assigned set to false, thus do not remove anything
+      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: false});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }]);
+
+      // remove only roles with assigned set to true
+      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: true});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+
+      Roles.addUsersToRoles(users.eve, 'admin');
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }]);
+
+      // remove roles no matter the assignment
+      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: null});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+
+      Roles.addUsersToRoles(users.eve, 'admin', {_assigned: false});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: false
+      }]);
+
+      // remove only roles with assigned set to true, thus do not remove anything
+      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: true});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'admin',
+        partition: null,
+        assigned: false
+      }]);
+
+      // remove only roles with assigned set to false
+      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: false});
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+    });
+
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From 8dbe57d639c08d6aa1bbdeaa317dbf2d53fd6dcc Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 00:56:59 +0100
Subject: [PATCH 0222/1140] Updated documentation.

---
 docs/classes/Roles.html               |  8 ++++----
 docs/data.json                        |  4 ++--
 docs/files/roles_roles_common.js.html | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index ce195ccee4..eafefe2323 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -373,7 +373,7 @@
 <li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
 <li><code>_assigned</code>: internal option, should not be used publicly because it will break assumptions
 in te code; publicly, you can only add users to an assigned role
-should the role be set as assigned, default is <code>true</code>; <code>null</code> is the same as <code>false</code>,
+should the role be set as assigned (<code>true</code>), <code>null</code> is the same as <code>false</code>,
 only that it does not force the value to <code>false</code> if the role is already assigned</li>
 </ul>
 
@@ -1228,9 +1228,9 @@ particular user.</p>
 <ul>
 <li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
 <li><code>_assigned</code>: internal option, should not be used publicly because it will break assumptions
-in te code; publicly, you can only add users to an assigned role
-should the role be set as assigned, default is <code>true</code>; <code>null</code> is the same as <code>false</code>,
-only that it does not force the value to <code>false</code> if the role is already assigned</li>
+in te code; publicly, you can only remove users from an assigned role
+if <code>true</code>, only manually assigned roles are removed, if <code>false</code>, only automatically
+assigned roles are removed, if <code>null</code>, any role is removed</li>
 </ul>
 
                     </div>
diff --git a/docs/data.json b/docs/data.json
index 11cccfde01..b3dbae155a 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -330,7 +330,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only add users to an assigned role\n    should the role be set as assigned, default is `true`; `null` is the same as `false`,\n    only that it does not force the value to `false` if the role is already assigned",
+                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only add users to an assigned role\n    should the role be set as assigned (`true`), `null` is the same as `false`,\n    only that it does not force the value to `false` if the role is already assigned",
                     "type": "Object"
                 }
             ],
@@ -394,7 +394,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only add users to an assigned role\n    should the role be set as assigned, default is `true`; `null` is the same as `false`,\n    only that it does not force the value to `false` if the role is already assigned",
+                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only remove users from an assigned role\n    if `true`, only manually assigned roles are removed, if `false`, only automatically\n    assigned roles are removed, if `null`, any role is removed",
                     "type": "Object"
                 }
             ],
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index bb0e5de326..19b712da6b 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -244,8 +244,8 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkRoleName(parentName);
 
-    // query to get role&#x27;s _id
-    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1}});
+    // query to get role&#x27;s _id and name
+    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1, name: 1}});
 
     if (!role) {
       throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
@@ -491,7 +491,7 @@ _.extend(Roles, {
    *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
    *   - &#x60;_assigned&#x60;: internal option, should not be used publicly because it will break assumptions
    *     in te code; publicly, you can only add users to an assigned role
-   *     should the role be set as assigned, default is &#x60;true&#x60;; &#x60;null&#x60; is the same as &#x60;false&#x60;,
+   *     should the role be set as assigned (&#x60;true&#x60;), &#x60;null&#x60; is the same as &#x60;false&#x60;,
    *     only that it does not force the value to &#x60;false&#x60; if the role is already assigned
    * @return {Array} Roles set during the call (even those already set).
    * @private
@@ -594,7 +594,7 @@ _.extend(Roles, {
 
     _.each(role.children, function (child) {
       // subroles are set as unassigned, but only if they do not already exist
-      setRoles.concat(Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: null})));
+      setRoles = setRoles.concat(Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: null})));
     });
 
     return setRoles;
@@ -668,9 +668,9 @@ _.extend(Roles, {
    * @param {Object} options Options:
    *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
    *   - &#x60;_assigned&#x60;: internal option, should not be used publicly because it will break assumptions
-   *     in te code; publicly, you can only add users to an assigned role
-   *     should the role be set as assigned, default is &#x60;true&#x60;; &#x60;null&#x60; is the same as &#x60;false&#x60;,
-   *     only that it does not force the value to &#x60;false&#x60; if the role is already assigned
+   *     in te code; publicly, you can only remove users from an assigned role
+   *     if &#x60;true&#x60;, only manually assigned roles are removed, if &#x60;false&#x60;, only automatically
+   *     assigned roles are removed, if &#x60;null&#x60;, any role is removed
    * @private
    * @static
    */
@@ -747,19 +747,19 @@ _.extend(Roles, {
 
     setRoles = [];
     _.each(roles, function (role) {
-      setRoles.concat(Roles._addUserToRole(user, role.role, {
+      setRoles = setRoles.concat(Roles._addUserToRole(user, role.role, {
         partition: role.partition,
         _assigned: role.assigned, // this is true
         ifExists: true
       }));
     });
 
-    if (roles.length) {
+    if (setRoles.length) {
       // remove all extra entries which should not be there
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.map(roles, function (role) {return _.pick(role, &#x27;role&#x27;, &#x27;partition&#x27;)})
+            $nor: _.map(setRoles, function (role) {return _.pick(role, &#x27;role&#x27;, &#x27;partition&#x27;)})
           }
         }
       });

From b2822874793f925265d10e59638e4200299882d6 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 08:27:43 +0100
Subject: [PATCH 0223/1140] Do not modify in place.

---
 roles/tests/server.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index ccb00a36c7..c21dd1ad59 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -781,12 +781,13 @@
     'roles - can get all roles', 
     function (test) {
       reset();
+
       _.each(roles, function (role) {
         Roles.createRole(role);
       });
 
       // compare roles, sorted alphabetically
-      var expected = roles,
+      var expected = _.clone(roles),
           actual = _.pluck(Roles.getAllRoles().fetch(), 'name');
 
       test.equal(actual, expected);

From 62983d32bccea62248704efccfc3e5e3fde0c50a Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 09:09:40 +0100
Subject: [PATCH 0224/1140] More tests for hierarchical roles.

---
 roles/tests/server.js | 608 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 608 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index c21dd1ad59..866203d4e8 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1736,6 +1736,614 @@
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
     });
 
+  Tinytest.add(
+    'roles - keep assigned roles',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('ALL_PERMISSIONS');
+      Roles.createRole('VIEW_PERMISSION');
+      Roles.createRole('EDIT_PERMISSION');
+      Roles.createRole('DELETE_PERMISSION');
+      Roles.addRoleParent('ALL_PERMISSIONS', 'user');
+      Roles.addRoleParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRoleParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRoleParent('DELETE_PERMISSION', 'admin');
+
+      Roles.addUsersToRoles(users.eve, ['user']);
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: null,
+        assigned: false
+      }]);
+
+      Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+
+      Roles.removeUsersFromRoles(users.eve, 'user');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'VIEW_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+
+      Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION');
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+    });
+
+  Tinytest.add(
+    'roles - modify assigned hierarchical roles',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('ALL_PERMISSIONS');
+      Roles.createRole('VIEW_PERMISSION');
+      Roles.createRole('EDIT_PERMISSION');
+      Roles.createRole('DELETE_PERMISSION');
+      Roles.addRoleParent('ALL_PERMISSIONS', 'user');
+      Roles.addRoleParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRoleParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRoleParent('DELETE_PERMISSION', 'admin');
+
+      Roles.addUsersToRoles(users.eve, ['user']);
+      Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'partition');
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition',
+        assigned: true
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }]);
+
+      Roles.createRole('MODERATE_PERMISSION');
+
+      Roles.addRoleParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition',
+        assigned: true
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'MODERATE_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'MODERATE_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }]);
+
+      Roles.addUsersToRoles(users.eve, ['admin']);
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition',
+        assigned: true
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'MODERATE_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'MODERATE_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'DELETE_PERMISSION',
+        partition: null,
+        assigned: false
+      }]);
+
+      Roles.addRoleParent('DELETE_PERMISSION', 'ALL_PERMISSIONS');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition',
+        assigned: true
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'MODERATE_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'MODERATE_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'admin',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'DELETE_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'DELETE_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }]);
+
+      Roles.removeUsersFromRoles(users.eve, ['admin']);
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'ALL_PERMISSIONS',
+        partition: 'partition',
+        assigned: true
+      }, {
+        role: 'EDIT_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'VIEW_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'MODERATE_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'MODERATE_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }, {
+        role: 'DELETE_PERMISSION',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'DELETE_PERMISSION',
+        partition: 'partition',
+        assigned: false
+      }]);
+
+      Roles.deleteRole('ALL_PERMISSIONS');
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'user',
+        partition: null,
+        assigned: true
+      }]);
+    });
+
+  Tinytest.add(
+    'roles - delete role with overlapping hierarchical roles',
+    function (test) {
+      reset();
+
+      Roles.createRole('role1');
+      Roles.createRole('role2');
+      Roles.createRole('COMMON_PERMISSION_1');
+      Roles.createRole('COMMON_PERMISSION_2');
+      Roles.createRole('COMMON_PERMISSION_3');
+      Roles.createRole('EXTRA_PERMISSION_ROLE_1');
+      Roles.createRole('EXTRA_PERMISSION_ROLE_2');
+
+      Roles.addRoleParent('COMMON_PERMISSION_1', 'role1');
+      Roles.addRoleParent('COMMON_PERMISSION_2', 'role1');
+      Roles.addRoleParent('COMMON_PERMISSION_3', 'role1');
+      Roles.addRoleParent('EXTRA_PERMISSION_ROLE_1', 'role1');
+
+      Roles.addRoleParent('COMMON_PERMISSION_1', 'role2');
+      Roles.addRoleParent('COMMON_PERMISSION_2', 'role2');
+      Roles.addRoleParent('COMMON_PERMISSION_3', 'role2');
+      Roles.addRoleParent('EXTRA_PERMISSION_ROLE_2', 'role2');
+
+      Roles.addUsersToRoles(users.eve, 'role1');
+      Roles.addUsersToRoles(users.eve, 'role2');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'role1',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'role2',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'COMMON_PERMISSION_1',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'COMMON_PERMISSION_2',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'COMMON_PERMISSION_3',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EXTRA_PERMISSION_ROLE_1',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EXTRA_PERMISSION_ROLE_2',
+        partition: null,
+        assigned: false
+      }]);
+
+      Roles.removeUsersFromRoles(users.eve, 'role2');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'role1',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'COMMON_PERMISSION_1',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'COMMON_PERMISSION_2',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'COMMON_PERMISSION_3',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EXTRA_PERMISSION_ROLE_1',
+        partition: null,
+        assigned: false
+      }]);
+
+      Roles.addUsersToRoles(users.eve, 'role2');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'role1',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'role2',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'COMMON_PERMISSION_1',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'COMMON_PERMISSION_2',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'COMMON_PERMISSION_3',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EXTRA_PERMISSION_ROLE_1',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EXTRA_PERMISSION_ROLE_2',
+        partition: null,
+        assigned: false
+      }]);
+
+      Roles.deleteRole('role2');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'role1',
+        partition: null,
+        assigned: true
+      }, {
+        role: 'COMMON_PERMISSION_1',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'COMMON_PERMISSION_2',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'COMMON_PERMISSION_3',
+        partition: null,
+        assigned: false
+      }, {
+        role: 'EXTRA_PERMISSION_ROLE_1',
+        partition: null,
+        assigned: false
+      }]);
+    });
+
+  Tinytest.add(
+    'roles - set parent on assigned role',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('EDIT_PERMISSION');
+
+      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+
+      Roles.addRoleParent('EDIT_PERMISSION', 'admin');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+    });
+
+  Tinytest.add(
+    'roles - remove parent on assigned role',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('EDIT_PERMISSION');
+
+      Roles.addRoleParent('EDIT_PERMISSION', 'admin');
+
+      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+
+      Roles.removeRoleParent('EDIT_PERMISSION', 'admin');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+    });
+
+  Tinytest.add(
+    'roles - adding and removing extra role parents',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('EDIT_PERMISSION');
+
+      Roles.addRoleParent('EDIT_PERMISSION', 'admin');
+
+      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+
+      Roles.addRoleParent('EDIT_PERMISSION', 'user');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+
+      Roles.removeRoleParent('EDIT_PERMISSION', 'user');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+        role: 'EDIT_PERMISSION',
+        partition: null,
+        assigned: true
+      }]);
+    });
+
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From 0adb4efb72ca8c5ac10a4487fa5cdb318f8df671 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 09:30:37 +0100
Subject: [PATCH 0225/1140] Detect cycles between roles.

---
 roles/roles_common.js | 28 +++++++++++++++++++++++++---
 roles/tests/server.js | 17 +++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 9bfbe2665f..2c16e01120 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -154,18 +154,40 @@ _.extend(Roles, {
   addRoleParent: function (roleName, parentName) {
     var role,
         count,
-        parentRoles;
+        parentRoles,
+        rolesToCheck,
+        alreadyCheckedRoles,
+        checkRoleName,
+        checkRole;
 
     Roles._checkRoleName(roleName);
     Roles._checkRoleName(parentName);
 
-    // query to get role's _id and name
-    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1, name: 1}});
+    // query to get role's _id, name, and children
+    role = Meteor.roles.findOne({name: roleName});
 
     if (!role) {
       throw new Error("Role '" + roleName + "' does not exist.");
     }
 
+    // detect cycles
+    alreadyCheckedRoles = [];
+    rolesToCheck = _.pluck(role.children, 'name');
+    while (rolesToCheck.length) {
+      checkRoleName = rolesToCheck.pop();
+      if (checkRoleName === parentName) {
+        throw new Error("Roles '" + roleName + "' and '" + parentName + "' would form a cycle.");
+      }
+      alreadyCheckedRoles.push(checkRoleName);
+
+      checkRole = Meteor.roles.findOne({name: checkRoleName});
+
+      // This should not happen, but this is a problem to address at some other time.
+      if (!checkRole) continue;
+
+      rolesToCheck = _.union(rolesToCheck, _.difference(_.pluck(checkRole.children, 'name'), alreadyCheckedRoles));
+    }
+
     count = Meteor.roles.update({
       name: parentName,
       'children._id': {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 866203d4e8..e7597b8c21 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -2344,6 +2344,23 @@
       }]);
     });
 
+  Tinytest.add(
+    'roles - cyclic roles',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('editor');
+      Roles.createRole('user');
+
+      Roles.addRoleParent('editor', 'admin');
+      Roles.addRoleParent('user', 'editor');
+
+      test.throws(function () {
+        Roles.addRoleParent('admin', 'user');
+      }, /form a cycle/);
+    });
+
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From 21f24aecf1e40bbba2c746afb4c271758525a606 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 10:26:25 +0100
Subject: [PATCH 0226/1140] Fixing documentation.

---
 roles/roles_server.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 5641729466..e5f4ee9ed8 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -55,7 +55,7 @@ _.extend(Roles, {
 
   /**
    * @method _convertToNewField
-   * @param {Array} roles `Meteor.users` document `roles` field in the old format.
+   * @param {Array} oldRoles `Meteor.users` document `roles` field in the old format.
    * @return {Array} Converted `roles` to the new format.
    * @for Roles
    * @private
@@ -100,7 +100,8 @@ _.extend(Roles, {
 
   /**
    * @method _convertToOldField
-   * @param {Array} roles `Meteor.users` document `roles` field in the new format.
+   * @param {Array} newRoles `Meteor.users` document `roles` field in the new format.
+   * @param {Boolean} usingGroups Should we use groups or not.
    * @return {Array} Converted `roles` to the old format.
    * @for Roles
    * @private
@@ -149,7 +150,7 @@ _.extend(Roles, {
   /**
    * @method _defaultUpdateUser
    * @param {Object} user `Meteor.users` document.
-   * @return {Array|Object} roles Value to which user's `roles` field should be set.
+   * @param {Array|Object} roles Value to which user's `roles` field should be set.
    * @for Roles
    * @private
    * @static

From e6a8ebcb96c0f361e9b9085b4985dc3df306ca5e Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 10:58:16 +0100
Subject: [PATCH 0227/1140] It should not be possible to rename roles.

So we use `_id` as role's name to assure that at the database level.
---
 History.md            |   2 +-
 README.md             |   1 +
 roles/roles_common.js |  89 ++++++-----
 roles/roles_server.js | 127 +++++++++++++---
 roles/tests/client.js |  12 +-
 roles/tests/server.js | 340 +++++++++++++++++++++---------------------
 6 files changed, 325 insertions(+), 246 deletions(-)

diff --git a/History.md b/History.md
index 6e28e94e3b..8d432a9586 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,6 @@
 ## v2.0.0
 
-* Rewrite with new schema for `roles` field.
+* Rewrite with the new schema for `roles` field and `Meteor.roles` collection.
 * Support for roles hierarchies.
 * Groups were renamed to partitions.
 * Groups/partitions are always available, if you do not specify a partition, role is seen as a global role.
diff --git a/README.md b/README.md
index 0ad38cc0d9..e606e5096b 100644
--- a/README.md
+++ b/README.md
@@ -173,6 +173,7 @@ meteor shell
 Here is the list of important changes between meteor-roles 1.0 and 2.0 to consider when migrating
 to 2.0:
 
+* New schema for `roles` field and `Meteor.roles` collection.
 * Groups were renamed to partitions.
 * Groups/partitions are always available, if you do not specify a partition, role is seen as a global role.
 * `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a partition, or use `null`).
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 2c16e01120..5298cdd0be 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -5,22 +5,20 @@
  *
  * It uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following
  * schema:
- *  - `role`: role name
+ *  - `_id`: role name
  *  - `partition`: partition name
  *  - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)
  *
  * Roles themselves are accessible throgh `Meteor.roles` collection and documents consist of:
- *  - `_id`
- *  - `name`: role name
+ *  - `_id`: role name
  *  - `children`: list of subdocuments:
  *    - `_id`
- *    - `name`
  *
- * Children list elements are subdocuments so that they can be easier extended in the future.
+ * Children list elements are subdocuments so that they can be easier extended in the future or by plugins.
  *
  * Roles can have multiple parents and can be children (subroles) of multiple roles.
  *
- * Example: `{_id: "123", name: "admin"}`
+ * Example: `{_id: "admin", children: [{_id: "editor"}]}`
  *
  * @module Roles
  */
@@ -72,7 +70,7 @@ _.extend(Roles, {
     });
 
     try {
-      return Meteor.roles.insert({name: roleName, children: []});
+      return Meteor.roles.insert({_id: roleName, children: []});
     } catch (e) {
       // (from Meteor accounts-base package, insertUserDoc func)
       // XXX string parsing sucks, maybe
@@ -80,7 +78,7 @@ _.extend(Roles, {
       if (e.name !== 'MongoError') throw e;
       match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
       if (!match) throw e;
-      if (match[1].indexOf('$name') !== -1) {
+      if (match[1].indexOf('$_id') !== -1) {
         if (options.unlessExists) return null;
         throw new Error("Role '" + roleName + "' already exists.");
       }
@@ -107,7 +105,7 @@ _.extend(Roles, {
     Meteor.roles.update({}, {
       $pull: {
         children: {
-          name: roleName
+          _id: roleName
         }
       }
     }, {multi: true});
@@ -137,7 +135,7 @@ _.extend(Roles, {
     });
 
     // remove the role itself
-    Meteor.roles.remove({name: roleName});
+    Meteor.roles.remove({_id: roleName});
   },
 
   /**
@@ -163,8 +161,8 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkRoleName(parentName);
 
-    // query to get role's _id, name, and children
-    role = Meteor.roles.findOne({name: roleName});
+    // query to get role's children
+    role = Meteor.roles.findOne({_id: roleName});
 
     if (!role) {
       throw new Error("Role '" + roleName + "' does not exist.");
@@ -172,7 +170,7 @@ _.extend(Roles, {
 
     // detect cycles
     alreadyCheckedRoles = [];
-    rolesToCheck = _.pluck(role.children, 'name');
+    rolesToCheck = _.pluck(role.children, '_id');
     while (rolesToCheck.length) {
       checkRoleName = rolesToCheck.pop();
       if (checkRoleName === parentName) {
@@ -180,24 +178,23 @@ _.extend(Roles, {
       }
       alreadyCheckedRoles.push(checkRoleName);
 
-      checkRole = Meteor.roles.findOne({name: checkRoleName});
+      checkRole = Meteor.roles.findOne({_id: checkRoleName});
 
       // This should not happen, but this is a problem to address at some other time.
       if (!checkRole) continue;
 
-      rolesToCheck = _.union(rolesToCheck, _.difference(_.pluck(checkRole.children, 'name'), alreadyCheckedRoles));
+      rolesToCheck = _.union(rolesToCheck, _.difference(_.pluck(checkRole.children, '_id'), alreadyCheckedRoles));
     }
 
     count = Meteor.roles.update({
-      name: parentName,
+      _id: parentName,
       'children._id': {
         $ne: role._id
       }
     }, {
       $addToSet: {
         children: {
-          _id: role._id,
-          name: role.name
+          _id: role._id
         }
       }
     });
@@ -248,16 +245,16 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkRoleName(parentName);
 
-    // to check for role existence
-    // (_id would not really be needed, but we are trying to match addRoleParent)
-    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1}});
+    // check for role existence
+    // this would not really be needed, but we are trying to match addRoleParent
+    role = Meteor.roles.findOne({_id: roleName}, {fields: {_id: 1}});
 
     if (!role) {
       throw new Error("Role '" + roleName + "' does not exist.");
     }
 
     count = Meteor.roles.update({
-      name: parentName
+      _id: parentName
     }, {
       $pull: {
         children: {
@@ -452,7 +449,7 @@ _.extend(Roles, {
 
     if (!id) return [];
 
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+    role = Meteor.roles.findOne({_id: roleName}, {fields: {children: 1}});
 
     if (!role) {
       if (options.ifExists) {
@@ -469,7 +466,7 @@ _.extend(Roles, {
       roles: {
         $not: {
           $elemMatch: {
-            role: roleName,
+            _id: roleName,
             partition: options.partition
           }
         }
@@ -478,7 +475,7 @@ _.extend(Roles, {
     }, {
       $addToSet: {
         roles: {
-          role: roleName,
+          _id: roleName,
           partition: options.partition,
           // we want to make sure it is a boolean value
           assigned: !!options._assigned
@@ -494,7 +491,7 @@ _.extend(Roles, {
           _id: id,
           roles: {
             $elemMatch: {
-              role: roleName,
+              _id: roleName,
               partition: options.partition
             }
           }
@@ -511,7 +508,7 @@ _.extend(Roles, {
           _id: id,
           roles: {
             $elemMatch: {
-              role: roleName,
+              _id: roleName,
               partition: options.partition
             }
           }
@@ -525,13 +522,13 @@ _.extend(Roles, {
     }
 
     setRoles = [{
-      role: roleName,
+      _id: roleName,
       partition: options.partition
     }];
 
     _.each(role.children, function (child) {
       // subroles are set as unassigned, but only if they do not already exist
-      setRoles = setRoles.concat(Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: null})));
+      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, _.extend({}, options, {_assigned: null})));
     });
 
     return setRoles;
@@ -631,7 +628,7 @@ _.extend(Roles, {
     update = {
       $pull: {
         roles: {
-          role: roleName,
+          _id: roleName,
           partition: options.partition
         }
       }
@@ -647,14 +644,14 @@ _.extend(Roles, {
     // we try to remove the role in every case, whether the role really exists or not
     Meteor.users.update(id, update);
 
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+    role = Meteor.roles.findOne({_id: roleName}, {fields: {children: 1}});
 
     // role does not exist, we do not anything more
     if (!role) return;
 
     _.each(role.children, function (child) {
       // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_assigned: false}));
+      Roles._removeUserFromRole(user, child._id, _.extend({}, options, {_assigned: false}));
     });
   },
 
@@ -684,7 +681,7 @@ _.extend(Roles, {
 
     setRoles = [];
     _.each(roles, function (role) {
-      setRoles = setRoles.concat(Roles._addUserToRole(user, role.role, {
+      setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
         partition: role.partition,
         _assigned: role.assigned, // this is true
         ifExists: true
@@ -696,7 +693,7 @@ _.extend(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.map(setRoles, function (role) {return _.pick(role, 'role', 'partition')})
+            $nor: _.map(setRoles, function (role) {return _.pick(role, '_id', 'partition')})
           }
         }
       });
@@ -783,7 +780,7 @@ _.extend(Roles, {
     if (options.anyPartition) {
       query = {
         _id: id,
-        'roles.role': {$in: roles}
+        'roles._id': {$in: roles}
       };
     }
     else {
@@ -792,14 +789,14 @@ _.extend(Roles, {
         $or: [{
           roles: {
             $elemMatch: {
-              role: {$in: roles},
+              _id: {$in: roles},
               partition: options.partition
             }
           }
         }, {
           roles: {
             $elemMatch: {
-              role: {$in: roles},
+              _id: {$in: roles},
               partition: null
             }
           }
@@ -863,7 +860,7 @@ _.extend(Roles, {
       return roles;
     }
 
-    return _.uniq(_.pluck(roles, 'role'));
+    return _.uniq(_.pluck(roles, '_id'));
   },
 
   /**
@@ -876,7 +873,7 @@ _.extend(Roles, {
    * @static
    */
   getAllRoles: function (queryOptions) {
-    queryOptions = queryOptions || {sort: {name: 1}};
+    queryOptions = queryOptions || {sort: {_id: 1}};
 
     return Meteor.roles.find({}, queryOptions);
   },
@@ -927,7 +924,7 @@ _.extend(Roles, {
 
     if (options.anyPartition) {
       query = {
-        'roles.role': {$in: roles}
+        'roles._id': {$in: roles}
       };
     }
     else {
@@ -935,14 +932,14 @@ _.extend(Roles, {
         $or: [{
           roles: {
             $elemMatch: {
-              role: {$in: roles},
+              _id: {$in: roles},
               partition: options.partition
             }
           }
         }, {
           roles: {
             $elemMatch: {
-              role: {$in: roles},
+              _id: {$in: roles},
               partition: null
             }
           }
@@ -993,7 +990,7 @@ _.extend(Roles, {
     _.each(user.roles || [], function (userRole) {
       // == used on purpose.
       if (userRole.partition == null) return;
-      if (roles && !_.contains(roles, userRole.role)) return;
+      if (roles && !_.contains(roles, userRole._id)) return;
 
       partitions.push(userRole.partition);
     });
@@ -1037,7 +1034,7 @@ _.extend(Roles, {
    */
   _roleMatcher: function (roleName) {
     return function (userRole) {
-      return userRole.role === roleName;
+      return userRole._id === roleName;
     };
   },
 
@@ -1053,8 +1050,8 @@ _.extend(Roles, {
   _roleAndPartitionMatcher: function (roleName, partition) {
     return function (userRole) {
       // == used on purpose in "userRole.partition == null"
-      return (userRole.role === roleName && userRole.partition === partition) ||
-        (userRole.role === roleName && (!_.has(userRole, 'partition') || userRole.partition == null));
+      return (userRole._id === roleName && userRole.partition === partition) ||
+        (userRole._id === roleName && (!_.has(userRole, 'partition') || userRole.partition == null));
     };
   },
 
diff --git a/roles/roles_server.js b/roles/roles_server.js
index e5f4ee9ed8..f1d20bba44 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,11 +1,8 @@
 "use strict";
 
-// Create default indexes for roles and users collection.
-
-Meteor.roles._ensureIndex({name: 1}, {unique: 1});
-
-// Index only on "roles.role" is not needed because the combined index works for it as well.
-Meteor.users._ensureIndex({'roles.role': 1, 'roles.partition': 1});
+// Create default indexes on users collection.
+// Index only on "roles._id" is not needed because the combined index works for it as well.
+Meteor.users._ensureIndex({'roles._id': 1, 'roles.partition': 1});
 Meteor.users._ensureIndex({'roles.partition': 1});
 
 /*
@@ -27,11 +24,37 @@ Meteor.publish('_roles', function () {
 });
 
 _.extend(Roles, {
+  /**
+   * @method _isNewRole
+   * @param {Object} role `Meteor.roles` document.
+   * @return {Boolean} Returns `true` if the `role` is in the new format.
+   *                   If it is ambiguous or it is not, returns `false`.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _isNewRole: function (role) {
+    return !_.has(role, 'name') && _.has(role, 'children');
+  },
+
+  /**
+   * @method _isOldRole
+   * @param {Object} role `Meteor.roles` document.
+   * @return {Boolean} Returns `true` if the `role` is in the old format.
+   *                   If it is ambiguous or it is not, returns `false`.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _isOldRole: function (role) {
+    return _.has(role, 'name') && !_.has(role, 'children');
+  },
+
   /**
    * @method _isNewField
    * @param {Array} roles `Meteor.users` document `roles` field.
    * @return {Boolean} Returns `true` if the `roles` field is in the new format.
-   *                    If it is ambiguous or it is not, returns `false`.
+   *                   If it is ambiguous or it is not, returns `false`.
    * @for Roles
    * @private
    * @static
@@ -44,7 +67,7 @@ _.extend(Roles, {
    * @method _isOldField
    * @param {Array} roles `Meteor.users` document `roles` field.
    * @return {Boolean} Returns `true` if the `roles` field is in the old format.
-   *                    If it is ambiguous or it is not, returns `false`.
+   *                   If it is ambiguous or it is not, returns `false`.
    * @for Roles
    * @private
    * @static
@@ -53,6 +76,39 @@ _.extend(Roles, {
     return (_.isArray(roles) && _.isString(roles[0])) || (_.isObject(roles) && !_.isArray(roles));
   },
 
+  /**
+   * @method _convertToNewRole
+   * @param {Object} oldRole `Meteor.roles` document.
+   * @return {Object} Converted `role` to the new format.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _convertToNewRole: function (oldRole) {
+    if (!_.isString(oldRole.name)) throw new Error("Role name '" + oldRole.name + "' is not a string.");
+
+    return {
+      _id: oldRole.name,
+      children: []
+    };
+  },
+
+  /**
+   * @method _convertToOldRole
+   * @param {Object} newRole `Meteor.roles` document.
+   * @return {Object} Converted `role` to the old format.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _convertToOldRole: function (newRole) {
+    if (!_.isString(newRole._id)) throw new Error("Role name '" + newRole._id + "' is not a string.");
+
+    return {
+      name: newRole._id
+    };
+  },
+
   /**
    * @method _convertToNewField
    * @param {Array} oldRoles `Meteor.users` document `roles` field in the old format.
@@ -68,7 +124,7 @@ _.extend(Roles, {
         if (!_.isString(role)) throw new Error("Role '" + role + "' is not a string.");
 
         roles.push({
-          role: role,
+          _id: role,
           partition: null,
           assigned: true
         })
@@ -88,7 +144,7 @@ _.extend(Roles, {
           if (!_.isString(role)) throw new Error("Role '" + role + "' is not a string.");
 
           roles.push({
-            role: role,
+            _id: role,
             partition: group,
             assigned: true
           })
@@ -124,7 +180,7 @@ _.extend(Roles, {
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
 
       if (userRole.partition) {
-        if (!usingGroups) throw new Error("Role '" + userRole.role + "' with partition '" + userRole.partition + "' without enabled groups.");
+        if (!usingGroups) throw new Error("Role '" + userRole._id + "' with partition '" + userRole.partition + "' without enabled groups.");
 
         // escape
         var partition = userRole.partition.replace(/\./g, '_');
@@ -132,15 +188,15 @@ _.extend(Roles, {
         if (partition[0] === '$') throw new Error("Group name '" + partition + "' start with $.");
 
         roles[partition] = roles[partition] || [];
-        roles[partition].push(userRole.role);
+        roles[partition].push(userRole._id);
       }
       else {
         if (usingGroups) {
           roles.__global_roles__ = roles.__global_roles__ || [];
-          roles.__global_roles__.push(userRole.role);
+          roles.__global_roles__.push(userRole._id);
         }
         else {
-          roles.push(userRole.role);
+          roles.push(userRole._id);
         }
       }
     });
@@ -166,18 +222,37 @@ _.extend(Roles, {
   },
 
   /**
-   * Migrates `Meteor.users` and `Meteor.roles` to the new format.
-   *
-   * @method _forwardMigrate
-   * @param {Function} updateUser Function which updates the user object. Default `_defaultUpdateUser`.
+   * @method _defaultUpdateRole
+   * @param {Object} oldRole Old `Meteor.roles` document.
+   * @param {Object} newRole New `Meteor.roles` document.
    * @for Roles
    * @private
    * @static
    */
-  _forwardMigrate: function (updateUser) {
-    updateUser = updateUser || Roles._defaultUpdateUser;
+  _defaultUpdateRole: function (oldRole, newRole) {
+    Meteor.roles.remove(oldRole._id);
+    Meteor.roles.insert(newRole);
+  },
 
-    Meteor.roles.update({children: {$exists: false}}, {$set: {children: []}}, {multi: true});
+  /**
+   * Migrates `Meteor.users` and `Meteor.roles` to the new format.
+   *
+   * @method _forwardMigrate
+   * @param {Function} updateUser Function which updates the user object. Default `_defaultUpdateUser`.
+   * @param {Function} updateRole Function which updates the role object. Default `_defaultUpdateRole`.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _forwardMigrate: function (updateUser, updateRole) {
+    updateUser = updateUser || Roles._defaultUpdateUser;
+    updateRole = updateRole || Roles._defaultUpdateRole;
+
+    Meteor.roles.find().forEach(function (role, index, cursor) {
+      if (!Roles._isNewRole(role)) {
+        updateRole(role, Roles._convertToNewRole(role));
+      }
+    });
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isNewField(user.roles)) {
@@ -195,15 +270,21 @@ _.extend(Roles, {
    *
    * @method _backwardMigrate
    * @param {Function} updateUser Function which updates the user object. Default `_defaultUpdateUser`.
+   * @param {Function} updateRole Function which updates the role object. Default `_defaultUpdateRole`.
    * @param {Boolean} usingGroups Should we use groups or not.
    * @for Roles
    * @private
    * @static
    */
-  _backwardMigrate: function (updateUser, usingGroups) {
+  _backwardMigrate: function (updateUser, updateRole, usingGroups) {
     updateUser = updateUser || Roles._defaultUpdateUser;
+    updateRole = updateRole || Roles._defaultUpdateRole;
 
-    Meteor.roles.update({}, {$unset: {children: ''}}, {multi: true});
+    Meteor.roles.find().forEach(function (role, index, cursor) {
+      if (!Roles._isOldRole(role)) {
+        updateRole(role, Roles._convertToOldRole(role));
+      }
+    });
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isOldField(user.roles)) {
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 32b80c612c..7709335b7d 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -9,11 +9,11 @@
     'eve': {
       _id: 'eve',
       roles: [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }, {
-        role: 'editor',
+        _id: 'editor',
         partition: null,
         assigned: true
       }]
@@ -21,11 +21,11 @@
     'bob': {
       _id: 'bob',
       roles: [{
-        role: 'user',
+        _id: 'user',
         partition: 'group1',
         assigned: true
       }, {
-        role: 'editor',
+        _id: 'editor',
         partition: 'group2',
         assigned: true
       }]
@@ -33,11 +33,11 @@
     'joe': {
       _id: 'joe',
       roles: [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }, {
-        role: 'editor',
+        _id: 'editor',
         partition: 'group1',
         assigned: true
       }]
diff --git a/roles/tests/server.js b/roles/tests/server.js
index e7597b8c21..e9a59a7880 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -84,17 +84,17 @@
       reset();
 
       var role1Id = Roles.createRole('test1');
-      test.equal(Meteor.roles.findOne().name, 'test1');
-      test.equal(Meteor.roles.findOne(role1Id).name, 'test1');
+      test.equal(Meteor.roles.findOne()._id, 'test1');
+      test.equal(Meteor.roles.findOne(role1Id)._id, 'test1');
 
       var role2Id = Roles.createRole('test2');
-      test.equal(Meteor.roles.findOne({'name':'test2'}).name, 'test2');
-      test.equal(Meteor.roles.findOne(role2Id).name, 'test2');
+      test.equal(Meteor.roles.findOne({_id: 'test2'})._id, 'test2');
+      test.equal(Meteor.roles.findOne(role2Id)._id, 'test2');
 
       test.equal(Meteor.roles.find().count(), 2);
 
       Roles.deleteRole('test1');
-      test.equal(typeof Meteor.roles.findOne({'name':'test1'}), 'undefined');
+      test.equal(typeof Meteor.roles.findOne({_id: 'test1'}), 'undefined');
 
       Roles.deleteRole('test2');
       test.equal(typeof Meteor.roles.findOne(), 'undefined');
@@ -788,11 +788,11 @@
 
       // compare roles, sorted alphabetically
       var expected = _.clone(roles),
-          actual = _.pluck(Roles.getAllRoles().fetch(), 'name');
+          actual = _.pluck(Roles.getAllRoles().fetch(), '_id');
 
       test.equal(actual, expected);
 
-      test.equal(_.pluck(Roles.getAllRoles({sort: {name: -1}}).fetch(), 'name'), expected.reverse());
+      test.equal(_.pluck(Roles.getAllRoles({sort: {_id: -1}}).fetch(), '_id'), expected.reverse());
     });
 
   Tinytest.add(
@@ -832,11 +832,11 @@
       test.equal(Roles.getRolesForUser(userObj), ['admin', 'user']);
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }, {
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }]);
@@ -876,30 +876,30 @@
       test.equal(Roles.getRolesForUser(userObj), []);
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1'}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }]);
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2'}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition2',
         assigned: true
       }]);
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition2',
         assigned: true
       }]);
@@ -908,20 +908,20 @@
       Roles.addRoleParent('PERMISSION', 'user');
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1'}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'PERMISSION',
+        _id: 'PERMISSION',
         partition: 'partition1',
         assigned: false
       }]);
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2'}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition2',
         assigned: true
       }]);
@@ -929,35 +929,35 @@
       test.equal(Roles.getRolesForUser(userId, {partition: 'partition2'}), ['admin']);
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition2',
         assigned: true
       }, {
-        role: 'PERMISSION',
+        _id: 'PERMISSION',
         partition: 'partition1',
         assigned: false
       }]);
       test.equal(Roles.getRolesForUser(userId, {anyPartition: true}), ['admin', 'user', 'PERMISSION']);
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1', onlyAssigned: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }]);
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2', onlyAssigned: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition2',
         assigned: true
       }]);
@@ -965,15 +965,15 @@
       test.equal(Roles.getRolesForUser(userId, {partition: 'partition2', onlyAssigned: true}), ['admin']);
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true, onlyAssigned: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'admin',
+        _id: 'admin',
         partition: 'partition2',
         assigned: true
       }]);
@@ -1358,11 +1358,11 @@
 
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: [{
-          role: 'admin',
+          _id: 'admin',
           partition: null,
           assigned: true
         }, {
-          role: 'editor',
+          _id: 'editor',
           partition: null,
           assigned: true
         }]
@@ -1372,26 +1372,26 @@
       });
       test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
         roles: [{
-          role: 'user',
+          _id: 'user',
           partition: null,
           assigned: true
         }]
       });
 
-      test.equal(Meteor.roles.findOne({name: 'admin'}, {fields: {_id: 0}}), {
-        name: 'admin',
+      test.equal(Meteor.roles.findOne({_id: 'admin'}), {
+        _id: 'admin',
         children: []
       });
-      test.equal(Meteor.roles.findOne({name: 'editor'}, {fields: {_id: 0}}), {
-        name: 'editor',
+      test.equal(Meteor.roles.findOne({_id: 'editor'}), {
+        _id: 'editor',
         children: []
       });
-      test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
-        name: 'user',
+      test.equal(Meteor.roles.findOne({_id: 'user'}), {
+        _id: 'user',
         children: []
       });
 
-      Roles._backwardMigrate(null, false);
+      Roles._backwardMigrate(null, null, false);
 
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: ['admin', 'editor']
@@ -1431,15 +1431,15 @@
 
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: [{
-          role: 'admin',
+          _id: 'admin',
           partition: null,
           assigned: true
         }, {
-          role: 'editor',
+          _id: 'editor',
           partition: null,
           assigned: true
         }, {
-          role: 'user',
+          _id: 'user',
           partition: 'foo',
           assigned: true
         }]
@@ -1449,30 +1449,30 @@
       });
       test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
         roles: [{
-          role: 'user',
+          _id: 'user',
           partition: null,
           assigned: true
         }, {
-          role: 'user',
+          _id: 'user',
           partition: 'foo',
           assigned: true
         }]
       });
 
-      test.equal(Meteor.roles.findOne({name: 'admin'}, {fields: {_id: 0}}), {
-        name: 'admin',
+      test.equal(Meteor.roles.findOne({_id: 'admin'}), {
+        _id: 'admin',
         children: []
       });
-      test.equal(Meteor.roles.findOne({name: 'editor'}, {fields: {_id: 0}}), {
-        name: 'editor',
+      test.equal(Meteor.roles.findOne({_id: 'editor'}), {
+        _id: 'editor',
         children: []
       });
-      test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
-        name: 'user',
+      test.equal(Meteor.roles.findOne({_id: 'user'}), {
+        _id: 'user',
         children: []
       });
 
-      Roles._backwardMigrate(null, true);
+      Roles._backwardMigrate(null, null, true);
 
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: {
@@ -1521,35 +1521,35 @@
       Roles.addUsersToRoles(users.eve, ['user'], 'partition2');
 
       var correctRoles = [{
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition1',
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition1',
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: 'partition1',
         assigned: false
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition2',
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition2',
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition2',
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: 'partition2',
         assigned: false
       }];
@@ -1561,11 +1561,11 @@
       Meteor.users.update(users.eve, {$pull: {roles: {assigned: false}}});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition2',
         assigned: true
       }]);
@@ -1576,39 +1576,39 @@
 
       // add an extra role, faking that it is automatically assigned
       // _assureConsistency should remove this extra role
-      Meteor.users.update(users.eve, {$push: {roles: {role: 'DELETE_PERMISSION', partition: null, assigned: false}}});
+      Meteor.users.update(users.eve, {$push: {roles: {_id: 'DELETE_PERMISSION', partition: null, assigned: false}}});
 
       Roles._assureConsistency(users.eve);
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), correctRoles);
 
       // remove a role, _assureConsistency should remove it from the user
-      Meteor.roles.remove({name: 'VIEW_PERMISSION'});
+      Meteor.roles.remove({_id: 'VIEW_PERMISSION'});
 
       Roles._assureConsistency(users.eve);
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: 'partition1',
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition1',
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition1',
         assigned: false
       }, {
-        role: 'user',
+        _id: 'user',
         partition: 'partition2',
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition2',
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition2',
         assigned: false
       }]);
@@ -1625,7 +1625,7 @@
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: true});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }]);
@@ -1634,7 +1634,7 @@
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: false});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: false
       }]);
@@ -1647,7 +1647,7 @@
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: null});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: false
       }]);
@@ -1656,7 +1656,7 @@
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: true});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }]);
@@ -1665,7 +1665,7 @@
       Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: null});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }]);
@@ -1681,7 +1681,7 @@
       Roles.addUsersToRoles(users.eve, 'admin');
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }]);
@@ -1690,7 +1690,7 @@
       Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: false});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }]);
@@ -1703,7 +1703,7 @@
       Roles.addUsersToRoles(users.eve, 'admin');
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }]);
@@ -1716,7 +1716,7 @@
       Roles.addUsersToRoles(users.eve, 'admin', {_assigned: false});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: false
       }]);
@@ -1725,7 +1725,7 @@
       Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: true});
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: false
       }]);
@@ -1757,19 +1757,19 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: null,
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: null,
         assigned: false
       }]);
@@ -1779,19 +1779,19 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: null,
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: null,
         assigned: true
       }]);
@@ -1801,7 +1801,7 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: null,
         assigned: true
       }]);
@@ -1836,31 +1836,31 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: null,
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition',
         assigned: true
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: 'partition',
         assigned: false
       }]);
@@ -1873,39 +1873,39 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: null,
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition',
         assigned: true
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'MODERATE_PERMISSION',
+        _id: 'MODERATE_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'MODERATE_PERMISSION',
+        _id: 'MODERATE_PERMISSION',
         partition: 'partition',
         assigned: false
       }]);
@@ -1916,47 +1916,47 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: null,
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition',
         assigned: true
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'MODERATE_PERMISSION',
+        _id: 'MODERATE_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'MODERATE_PERMISSION',
+        _id: 'MODERATE_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }, {
-        role: 'DELETE_PERMISSION',
+        _id: 'DELETE_PERMISSION',
         partition: null,
         assigned: false
       }]);
@@ -1967,51 +1967,51 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: null,
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition',
         assigned: true
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'MODERATE_PERMISSION',
+        _id: 'MODERATE_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'MODERATE_PERMISSION',
+        _id: 'MODERATE_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'admin',
+        _id: 'admin',
         partition: null,
         assigned: true
       }, {
-        role: 'DELETE_PERMISSION',
+        _id: 'DELETE_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'DELETE_PERMISSION',
+        _id: 'DELETE_PERMISSION',
         partition: 'partition',
         assigned: false
       }]);
@@ -2022,47 +2022,47 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: null,
         assigned: false
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'ALL_PERMISSIONS',
+        _id: 'ALL_PERMISSIONS',
         partition: 'partition',
         assigned: true
       }, {
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'VIEW_PERMISSION',
+        _id: 'VIEW_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'MODERATE_PERMISSION',
+        _id: 'MODERATE_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'MODERATE_PERMISSION',
+        _id: 'MODERATE_PERMISSION',
         partition: 'partition',
         assigned: false
       }, {
-        role: 'DELETE_PERMISSION',
+        _id: 'DELETE_PERMISSION',
         partition: null,
         assigned: false
       }, {
-        role: 'DELETE_PERMISSION',
+        _id: 'DELETE_PERMISSION',
         partition: 'partition',
         assigned: false
       }]);
@@ -2076,7 +2076,7 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'user',
+        _id: 'user',
         partition: null,
         assigned: true
       }]);
@@ -2113,31 +2113,31 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'role1',
+        _id: 'role1',
         partition: null,
         assigned: true
       }, {
-        role: 'role2',
+        _id: 'role2',
         partition: null,
         assigned: true
       }, {
-        role: 'COMMON_PERMISSION_1',
+        _id: 'COMMON_PERMISSION_1',
         partition: null,
         assigned: false
       }, {
-        role: 'COMMON_PERMISSION_2',
+        _id: 'COMMON_PERMISSION_2',
         partition: null,
         assigned: false
       }, {
-        role: 'COMMON_PERMISSION_3',
+        _id: 'COMMON_PERMISSION_3',
         partition: null,
         assigned: false
       }, {
-        role: 'EXTRA_PERMISSION_ROLE_1',
+        _id: 'EXTRA_PERMISSION_ROLE_1',
         partition: null,
         assigned: false
       }, {
-        role: 'EXTRA_PERMISSION_ROLE_2',
+        _id: 'EXTRA_PERMISSION_ROLE_2',
         partition: null,
         assigned: false
       }]);
@@ -2149,23 +2149,23 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'role1',
+        _id: 'role1',
         partition: null,
         assigned: true
       }, {
-        role: 'COMMON_PERMISSION_1',
+        _id: 'COMMON_PERMISSION_1',
         partition: null,
         assigned: false
       }, {
-        role: 'COMMON_PERMISSION_2',
+        _id: 'COMMON_PERMISSION_2',
         partition: null,
         assigned: false
       }, {
-        role: 'COMMON_PERMISSION_3',
+        _id: 'COMMON_PERMISSION_3',
         partition: null,
         assigned: false
       }, {
-        role: 'EXTRA_PERMISSION_ROLE_1',
+        _id: 'EXTRA_PERMISSION_ROLE_1',
         partition: null,
         assigned: false
       }]);
@@ -2177,31 +2177,31 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'role1',
+        _id: 'role1',
         partition: null,
         assigned: true
       }, {
-        role: 'role2',
+        _id: 'role2',
         partition: null,
         assigned: true
       }, {
-        role: 'COMMON_PERMISSION_1',
+        _id: 'COMMON_PERMISSION_1',
         partition: null,
         assigned: false
       }, {
-        role: 'COMMON_PERMISSION_2',
+        _id: 'COMMON_PERMISSION_2',
         partition: null,
         assigned: false
       }, {
-        role: 'COMMON_PERMISSION_3',
+        _id: 'COMMON_PERMISSION_3',
         partition: null,
         assigned: false
       }, {
-        role: 'EXTRA_PERMISSION_ROLE_1',
+        _id: 'EXTRA_PERMISSION_ROLE_1',
         partition: null,
         assigned: false
       }, {
-        role: 'EXTRA_PERMISSION_ROLE_2',
+        _id: 'EXTRA_PERMISSION_ROLE_2',
         partition: null,
         assigned: false
       }]);
@@ -2213,23 +2213,23 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'role1',
+        _id: 'role1',
         partition: null,
         assigned: true
       }, {
-        role: 'COMMON_PERMISSION_1',
+        _id: 'COMMON_PERMISSION_1',
         partition: null,
         assigned: false
       }, {
-        role: 'COMMON_PERMISSION_2',
+        _id: 'COMMON_PERMISSION_2',
         partition: null,
         assigned: false
       }, {
-        role: 'COMMON_PERMISSION_3',
+        _id: 'COMMON_PERMISSION_3',
         partition: null,
         assigned: false
       }, {
-        role: 'EXTRA_PERMISSION_ROLE_1',
+        _id: 'EXTRA_PERMISSION_ROLE_1',
         partition: null,
         assigned: false
       }]);
@@ -2249,7 +2249,7 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: true
       }]);
@@ -2260,7 +2260,7 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: true
       }]);
@@ -2282,7 +2282,7 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: true
       }]);
@@ -2293,7 +2293,7 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: true
       }]);
@@ -2316,7 +2316,7 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: true
       }]);
@@ -2327,7 +2327,7 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: true
       }]);
@@ -2338,7 +2338,7 @@
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
       itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
-        role: 'EDIT_PERMISSION',
+        _id: 'EDIT_PERMISSION',
         partition: null,
         assigned: true
       }]);

From b9b67ffba26a67b325bd3ed73ae0df3f9b759e9f Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 25 Dec 2015 10:58:34 +0100
Subject: [PATCH 0228/1140] Updated documentation.

---
 docs/api.js                           |   2 +-
 docs/classes/Roles.html               | 506 +++++++++++++++++++++++---
 docs/data.json                        | 215 ++++++++---
 docs/files/roles_roles_common.js.html | 107 +++---
 docs/files/roles_roles_server.js.html | 134 +++++--
 docs/modules/Roles.html               |  12 +-
 6 files changed, 805 insertions(+), 171 deletions(-)

diff --git a/docs/api.js b/docs/api.js
index 1063680e40..17de6dc757 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -12,7 +12,7 @@ YUI.add("yuidoc-meta", function(Y) {
         {
             "displayName": "Roles",
             "name": "Roles",
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `role`: role name\n - `partition`: partition name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`\n - `name`: role name\n - `children`: list of subdocuments:\n   - `_id`\n   - `name`\n\nChildren list elements are subdocuments so that they can be easier extended in the future.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"123\", name: \"admin\"}`"
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `_id`: role name\n - `partition`: partition name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"admin\", children: [{_id: \"editor\"}]}`"
         },
         {
             "displayName": "UIHelpers",
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index eafefe2323..5b8e057f4a 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -84,7 +84,7 @@
 
 
         <div class="foundat">
-            Defined in: <a href="../files/roles_roles_common.js.html#l31"><code>roles&#x2F;roles_common.js:31</code></a>
+            Defined in: <a href="../files/roles_roles_common.js.html#l29"><code>roles&#x2F;roles_common.js:29</code></a>
         </div>
 
             Module: <a href="../modules/Roles.html">Roles</a>
@@ -143,11 +143,26 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__convertToNewRole">_convertToNewRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__convertToOldField">_convertToOldField</a>
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__convertToOldRole">_convertToOldRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__defaultUpdateRole">_defaultUpdateRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__defaultUpdateUser">_defaultUpdateUser</a>
 
@@ -163,11 +178,21 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__isNewRole">_isNewRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__isOldField">_isOldField</a>
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__isOldRole">_isOldRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__onlyAssignedMatcher">_onlyAssignedMatcher</a>
 
@@ -323,7 +348,7 @@
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l398"><code>roles&#x2F;roles_common.js:398</code></a>
+        <a href="../files/roles_roles_common.js.html#l417"><code>roles&#x2F;roles_common.js:417</code></a>
         </p>
 
 
@@ -418,7 +443,7 @@ only that it does not force the value to <code>false</code> if the role is alrea
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l639"><code>roles&#x2F;roles_common.js:639</code></a>
+        <a href="../files/roles_roles_common.js.html#l658"><code>roles&#x2F;roles_common.js:658</code></a>
         </p>
 
 
@@ -463,6 +488,9 @@ are marked as not explicitly assigned, and have not been part of what we current
                 <li class="arg">
                         <code>updateUser</code>
                 </li>
+                <li class="arg">
+                        <code>updateRole</code>
+                </li>
                 <li class="arg">
                         <code>usingGroups</code>
                 </li>
@@ -481,7 +509,7 @@ are marked as not explicitly assigned, and have not been part of what we current
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l188"><code>roles&#x2F;roles_server.js:188</code></a>
+        <a href="../files/roles_roles_server.js.html#l264"><code>roles&#x2F;roles_server.js:264</code></a>
         </p>
 
 
@@ -510,6 +538,17 @@ no subroles.</p>
 
                     </div>
 
+                </li>
+                <li class="param">
+                        <code class="param-name">updateRole</code>
+                        <span class="type">Function</span>
+
+
+                    <div class="param-description">
+                        <p>Function which updates the role object. Default <code>_defaultUpdateRole</code>.</p>
+
+                    </div>
+
                 </li>
                 <li class="param">
                         <code class="param-name">usingGroups</code>
@@ -551,7 +590,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1068"><code>roles&#x2F;roles_common.js:1068</code></a>
+        <a href="../files/roles_roles_common.js.html#l1087"><code>roles&#x2F;roles_common.js:1087</code></a>
         </p>
 
 
@@ -607,7 +646,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1082"><code>roles&#x2F;roles_common.js:1082</code></a>
+        <a href="../files/roles_roles_common.js.html#l1101"><code>roles&#x2F;roles_common.js:1101</code></a>
         </p>
 
 
@@ -646,7 +685,7 @@ no subroles.</p>
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
                 <li class="arg">
-                        <code>roles</code>
+                        <code>oldRoles</code>
                 </li>
             </ul><span class="paren">)</span>
         </div>
@@ -666,7 +705,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l56"><code>roles&#x2F;roles_server.js:56</code></a>
+        <a href="../files/roles_roles_server.js.html#l112"><code>roles&#x2F;roles_server.js:112</code></a>
         </p>
 
 
@@ -682,7 +721,7 @@ no subroles.</p>
 
             <ul class="params-list">
                 <li class="param">
-                        <code class="param-name">roles</code>
+                        <code class="param-name">oldRoles</code>
                         <span class="type">Array</span>
 
 
@@ -706,6 +745,73 @@ no subroles.</p>
         </div>
 
 
+</div>
+<div id="method__convertToNewRole" class="method item private">
+    <h3 class="name"><code>_convertToNewRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldRole</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l79"><code>roles&#x2F;roles_server.js:79</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldRole</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p><code>Meteor.roles</code> document.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>Converted <code>role</code> to the new format.</p>
+
+            </div>
+        </div>
+
+
 </div>
 <div id="method__convertToOldField" class="method item private">
     <h3 class="name"><code>_convertToOldField</code></h3>
@@ -713,7 +819,10 @@ no subroles.</p>
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
                 <li class="arg">
-                        <code>roles</code>
+                        <code>newRoles</code>
+                </li>
+                <li class="arg">
+                        <code>usingGroups</code>
                 </li>
             </ul><span class="paren">)</span>
         </div>
@@ -733,7 +842,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l101"><code>roles&#x2F;roles_server.js:101</code></a>
+        <a href="../files/roles_roles_server.js.html#l157"><code>roles&#x2F;roles_server.js:157</code></a>
         </p>
 
 
@@ -749,7 +858,7 @@ no subroles.</p>
 
             <ul class="params-list">
                 <li class="param">
-                        <code class="param-name">roles</code>
+                        <code class="param-name">newRoles</code>
                         <span class="type">Array</span>
 
 
@@ -759,6 +868,17 @@ no subroles.</p>
                     </div>
 
                 </li>
+                <li class="param">
+                        <code class="param-name">usingGroups</code>
+                        <span class="type">Boolean</span>
+
+
+                    <div class="param-description">
+                        <p>Should we use groups or not.</p>
+
+                    </div>
+
+                </li>
             </ul>
         </div>
 
@@ -774,19 +894,19 @@ no subroles.</p>
 
 
 </div>
-<div id="method__defaultUpdateUser" class="method item private">
-    <h3 class="name"><code>_defaultUpdateUser</code></h3>
+<div id="method__convertToOldRole" class="method item private">
+    <h3 class="name"><code>_convertToOldRole</code></h3>
 
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
                 <li class="arg">
-                        <code>user</code>
+                        <code>newRole</code>
                 </li>
             </ul><span class="paren">)</span>
         </div>
 
         <span class="returns-inline">
-            <span class="type">Array | Object</span>
+            <span class="type">Object</span>
         </span>
 
 
@@ -800,7 +920,143 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l149"><code>roles&#x2F;roles_server.js:149</code></a>
+        <a href="../files/roles_roles_server.js.html#l96"><code>roles&#x2F;roles_server.js:96</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">newRole</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p><code>Meteor.roles</code> document.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>Converted <code>role</code> to the old format.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__defaultUpdateRole" class="method item private">
+    <h3 class="name"><code>_defaultUpdateRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldRole</code>
+                </li>
+                <li class="arg">
+                        <code>newRole</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l224"><code>roles&#x2F;roles_server.js:224</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldRole</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Old <code>Meteor.roles</code> document.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">newRole</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>New <code>Meteor.roles</code> document.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__defaultUpdateUser" class="method item private">
+    <h3 class="name"><code>_defaultUpdateUser</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l206"><code>roles&#x2F;roles_server.js:206</code></a>
         </p>
 
 
@@ -826,18 +1082,20 @@ no subroles.</p>
                     </div>
 
                 </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | Object</span>
+
+
+                    <div class="param-description">
+                        <p>Value to which user's <code>roles</code> field should be set.</p>
+
+                    </div>
+
+                </li>
             </ul>
         </div>
 
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array | Object</span>:
-                    <p>roles Value to which user's <code>roles</code> field should be set.</p>
-
-            </div>
-        </div>
 
 
 </div>
@@ -849,6 +1107,9 @@ no subroles.</p>
                 <li class="arg">
                         <code>updateUser</code>
                 </li>
+                <li class="arg">
+                        <code>updateRole</code>
+                </li>
             </ul><span class="paren">)</span>
         </div>
 
@@ -864,7 +1125,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l167"><code>roles&#x2F;roles_server.js:167</code></a>
+        <a href="../files/roles_roles_server.js.html#l237"><code>roles&#x2F;roles_server.js:237</code></a>
         </p>
 
 
@@ -891,6 +1152,17 @@ no subroles.</p>
                     </div>
 
                 </li>
+                <li class="param">
+                        <code class="param-name">updateRole</code>
+                        <span class="type">Function</span>
+
+
+                    <div class="param-description">
+                        <p>Function which updates the role object. Default <code>_defaultUpdateRole</code>.</p>
+
+                    </div>
+
+                </li>
             </ul>
         </div>
 
@@ -923,7 +1195,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l30"><code>roles&#x2F;roles_server.js:30</code></a>
+        <a href="../files/roles_roles_server.js.html#l53"><code>roles&#x2F;roles_server.js:53</code></a>
         </p>
 
 
@@ -964,6 +1236,74 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
         </div>
 
 
+</div>
+<div id="method__isNewRole" class="method item private">
+    <h3 class="name"><code>_isNewRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>role</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l27"><code>roles&#x2F;roles_server.js:27</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">role</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p><code>Meteor.roles</code> document.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Boolean</span>:
+                    <p>Returns <code>true</code> if the <code>role</code> is in the new format.
+If it is ambiguous or it is not, returns <code>false</code>.</p>
+
+            </div>
+        </div>
+
+
 </div>
 <div id="method__isOldField" class="method item private">
     <h3 class="name"><code>_isOldField</code></h3>
@@ -991,7 +1331,7 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l43"><code>roles&#x2F;roles_server.js:43</code></a>
+        <a href="../files/roles_roles_server.js.html#l66"><code>roles&#x2F;roles_server.js:66</code></a>
         </p>
 
 
@@ -1032,6 +1372,74 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
         </div>
 
 
+</div>
+<div id="method__isOldRole" class="method item private">
+    <h3 class="name"><code>_isOldRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>role</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l40"><code>roles&#x2F;roles_server.js:40</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">role</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p><code>Meteor.roles</code> document.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Boolean</span>:
+                    <p>Returns <code>true</code> if the <code>role</code> is in the old format.
+If it is ambiguous or it is not, returns <code>false</code>.</p>
+
+            </div>
+        </div>
+
+
 </div>
 <div id="method__onlyAssignedMatcher" class="method item private">
     <h3 class="name"><code>_onlyAssignedMatcher</code></h3>
@@ -1053,7 +1461,7 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1055"><code>roles&#x2F;roles_common.js:1055</code></a>
+        <a href="../files/roles_roles_common.js.html#l1074"><code>roles&#x2F;roles_common.js:1074</code></a>
         </p>
 
 
@@ -1104,7 +1512,7 @@ if the role is an assigned role.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1039"><code>roles&#x2F;roles_common.js:1039</code></a>
+        <a href="../files/roles_roles_common.js.html#l1058"><code>roles&#x2F;roles_common.js:1058</code></a>
         </p>
 
 
@@ -1175,7 +1583,7 @@ if its partition matches <code>partition</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l571"><code>roles&#x2F;roles_common.js:571</code></a>
+        <a href="../files/roles_roles_common.js.html#l590"><code>roles&#x2F;roles_common.js:590</code></a>
         </p>
 
 
@@ -1271,7 +1679,7 @@ assigned roles are removed, if <code>null</code>, any role is removed</li>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l982"><code>roles&#x2F;roles_common.js:982</code></a>
+        <a href="../files/roles_roles_common.js.html#l1001"><code>roles&#x2F;roles_common.js:1001</code></a>
         </p>
 
 
@@ -1354,7 +1762,7 @@ if it is not already.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1022"><code>roles&#x2F;roles_common.js:1022</code></a>
+        <a href="../files/roles_roles_common.js.html#l1041"><code>roles&#x2F;roles_common.js:1041</code></a>
         </p>
 
 
@@ -1433,7 +1841,7 @@ if its name matches <code>roleName</code>, and partition matches <code>partition
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1008"><code>roles&#x2F;roles_common.js:1008</code></a>
+        <a href="../files/roles_roles_common.js.html#l1027"><code>roles&#x2F;roles_common.js:1027</code></a>
         </p>
 
 
@@ -1500,7 +1908,7 @@ if its name matches <code>roleName</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l143"><code>roles&#x2F;roles_common.js:143</code></a>
+        <a href="../files/roles_roles_common.js.html#l141"><code>roles&#x2F;roles_common.js:141</code></a>
         </p>
 
 
@@ -1574,7 +1982,7 @@ parent role set, new subroles are added automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l276"><code>roles&#x2F;roles_common.js:276</code></a>
+        <a href="../files/roles_roles_common.js.html#l295"><code>roles&#x2F;roles_common.js:295</code></a>
         </p>
 
 
@@ -1675,7 +2083,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l53"><code>roles&#x2F;roles_common.js:53</code></a>
+        <a href="../files/roles_roles_common.js.html#l51"><code>roles&#x2F;roles_common.js:51</code></a>
         </p>
 
 
@@ -1754,7 +2162,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l91"><code>roles&#x2F;roles_common.js:91</code></a>
+        <a href="../files/roles_roles_common.js.html#l89"><code>roles&#x2F;roles_common.js:89</code></a>
         </p>
 
 
@@ -1813,7 +2221,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l847"><code>roles&#x2F;roles_common.js:847</code></a>
+        <a href="../files/roles_roles_common.js.html#l866"><code>roles&#x2F;roles_common.js:866</code></a>
         </p>
 
 
@@ -1874,7 +2282,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l934"><code>roles&#x2F;roles_common.js:934</code></a>
+        <a href="../files/roles_roles_common.js.html#l953"><code>roles&#x2F;roles_common.js:953</code></a>
         </p>
 
 
@@ -1918,7 +2326,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l950"><code>roles&#x2F;roles_common.js:950</code></a>
+        <a href="../files/roles_roles_common.js.html#l969"><code>roles&#x2F;roles_common.js:969</code></a>
         </p>
 
 
@@ -2000,7 +2408,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l791"><code>roles&#x2F;roles_common.js:791</code></a>
+        <a href="../files/roles_roles_common.js.html#l810"><code>roles&#x2F;roles_common.js:810</code></a>
         </p>
 
 
@@ -2092,7 +2500,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l862"><code>roles&#x2F;roles_common.js:862</code></a>
+        <a href="../files/roles_roles_common.js.html#l881"><code>roles&#x2F;roles_common.js:881</code></a>
         </p>
 
 
@@ -2196,7 +2604,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l210"><code>roles&#x2F;roles_common.js:210</code></a>
+        <a href="../files/roles_roles_common.js.html#l229"><code>roles&#x2F;roles_common.js:229</code></a>
         </p>
 
 
@@ -2270,7 +2678,7 @@ parent role set, removed subrole is removed automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l518"><code>roles&#x2F;roles_common.js:518</code></a>
+        <a href="../files/roles_roles_common.js.html#l537"><code>roles&#x2F;roles_common.js:537</code></a>
         </p>
 
 
@@ -2368,7 +2776,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l331"><code>roles&#x2F;roles_common.js:331</code></a>
+        <a href="../files/roles_roles_common.js.html#l350"><code>roles&#x2F;roles_common.js:350</code></a>
         </p>
 
 
@@ -2472,7 +2880,7 @@ Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exampl
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l687"><code>roles&#x2F;roles_common.js:687</code></a>
+        <a href="../files/roles_roles_common.js.html#l706"><code>roles&#x2F;roles_common.js:706</code></a>
         </p>
 
 
@@ -2580,7 +2988,7 @@ Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})</code></pr
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l44"><code>roles&#x2F;roles_common.js:44</code></a>
+        <a href="../files/roles_roles_common.js.html#l42"><code>roles&#x2F;roles_common.js:42</code></a>
         </p>
 
 
diff --git a/docs/data.json b/docs/data.json
index b3dbae155a..b4955d2f0f 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -76,8 +76,8 @@
             "namespaces": {},
             "tag": "module",
             "file": "roles/roles_common.js",
-            "line": 31,
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `role`: role name\n - `partition`: partition name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`\n - `name`: role name\n - `children`: list of subdocuments:\n   - `_id`\n   - `name`\n\nChildren list elements are subdocuments so that they can be easier extended in the future.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"123\", name: \"admin\"}`"
+            "line": 29,
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `_id`: role name\n - `partition`: partition name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"admin\", children: [{_id: \"editor\"}]}`"
         }
     },
     "classes": {
@@ -91,7 +91,7 @@
             "extension_for": [],
             "module": "Roles",
             "file": "roles/roles_common.js",
-            "line": 31
+            "line": 29
         },
         "UIHelpers": {
             "name": "UIHelpers",
@@ -152,7 +152,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 44,
+            "line": 42,
             "description": "Used as a global group (now partition) name. Not used anymore.",
             "itemtype": "property",
             "name": "GLOBAL_GROUP",
@@ -163,7 +163,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 53,
+            "line": 51,
             "description": "Create a new role.",
             "itemtype": "method",
             "name": "createRole",
@@ -190,7 +190,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 91,
+            "line": 89,
             "description": "Delete an existing role.\n\nIf the role is set for any user, it is automatically unset.",
             "itemtype": "method",
             "name": "deleteRole",
@@ -207,7 +207,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 143,
+            "line": 141,
             "description": "Add role parent to the role.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
             "itemtype": "method",
             "name": "addRoleParent",
@@ -229,7 +229,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 210,
+            "line": 229,
             "description": "Remove role parent from the role.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
             "itemtype": "method",
             "name": "removeRoleParent",
@@ -251,7 +251,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 276,
+            "line": 295,
             "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
             "example": [
                 "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -282,7 +282,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 331,
+            "line": 350,
             "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
             "example": [
                 "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -313,7 +313,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 398,
+            "line": 417,
             "description": "Add one user to one role.",
             "itemtype": "method",
             "name": "_addUserToRole",
@@ -346,7 +346,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 518,
+            "line": 537,
             "description": "Remove users from assigned roles.",
             "example": [
                 "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
@@ -377,7 +377,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 571,
+            "line": 590,
             "description": "Remove one user from one role.\n\nWARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same\nrole to be a child of multiple roles it might happen that it removes some subroles which\nit should not because they are in effect also through some other parent role. You should always\ncall `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a\nparticular user.",
             "itemtype": "method",
             "name": "_removeUserFromRole",
@@ -406,7 +406,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 639,
+            "line": 658,
             "description": "Makes sure all subroles are correctly set, and no extra subroles are set which should not be.\n\nUsed internally after complicated changes, but it can also be used whenever one feels that\nthere might be inconsistencies (eg., after a crash).\n\nWe simply re-set to the user their assigned roles again and remove any roles which\nare marked as not explicitly assigned, and have not been part of what we currently set.",
             "itemtype": "method",
             "name": "_assureConsistency",
@@ -425,7 +425,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 687,
+            "line": 706,
             "description": "Check if user has specified roles.",
             "example": [
                 "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // partition roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})"
@@ -460,7 +460,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 791,
+            "line": 810,
             "description": "Retrieve user's roles.",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -487,7 +487,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 847,
+            "line": 866,
             "description": "Retrieve cursor of all existing roles.",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -509,7 +509,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 862,
+            "line": 881,
             "description": "Retrieve all users who are in target role.\n\nOptions:",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -542,7 +542,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 934,
+            "line": 953,
             "description": "Deprecated. Use `getPartitionsForUser` instead.",
             "itemtype": "method",
             "name": "getGroupsForUser",
@@ -553,7 +553,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 950,
+            "line": 969,
             "description": "Retrieve users partitions, if any.",
             "itemtype": "method",
             "name": "getPartitionsForUser",
@@ -580,7 +580,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 982,
+            "line": 1001,
             "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
             "name": "_resolveUser",
@@ -608,7 +608,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1008,
+            "line": 1027,
             "itemtype": "method",
             "name": "_roleMatcher",
             "params": [
@@ -630,7 +630,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1022,
+            "line": 1041,
             "itemtype": "method",
             "name": "_roleAndPartitionMatcher",
             "params": [
@@ -657,7 +657,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1039,
+            "line": 1058,
             "itemtype": "method",
             "name": "_partitionMatcher",
             "params": [
@@ -679,7 +679,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1055,
+            "line": 1074,
             "itemtype": "method",
             "name": "_onlyAssignedMatcher",
             "return": {
@@ -694,7 +694,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1068,
+            "line": 1087,
             "description": "Throw an exception if `roleName` is an invalid role name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -713,7 +713,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1082,
+            "line": 1101,
             "description": "Throw an exception if `partitionName` is an invalid partition name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -732,7 +732,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1098,
+            "line": 1117,
             "params": [
                 {
                     "name": "string",
@@ -752,7 +752,51 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 30,
+            "line": 27,
+            "itemtype": "method",
+            "name": "_isNewRole",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "`Meteor.roles` document.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Returns `true` if the `role` is in the new format.\n                  If it is ambiguous or it is not, returns `false`.",
+                "type": "Boolean"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 40,
+            "itemtype": "method",
+            "name": "_isOldRole",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "`Meteor.roles` document.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Returns `true` if the `role` is in the old format.\n                  If it is ambiguous or it is not, returns `false`.",
+                "type": "Boolean"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 53,
             "itemtype": "method",
             "name": "_isNewField",
             "params": [
@@ -763,7 +807,7 @@
                 }
             ],
             "return": {
-                "description": "Returns `true` if the `roles` field is in the new format.\n                   If it is ambiguous or it is not, returns `false`.",
+                "description": "Returns `true` if the `roles` field is in the new format.\n                  If it is ambiguous or it is not, returns `false`.",
                 "type": "Boolean"
             },
             "access": "private",
@@ -774,7 +818,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 43,
+            "line": 66,
             "itemtype": "method",
             "name": "_isOldField",
             "params": [
@@ -785,7 +829,7 @@
                 }
             ],
             "return": {
-                "description": "Returns `true` if the `roles` field is in the old format.\n                   If it is ambiguous or it is not, returns `false`.",
+                "description": "Returns `true` if the `roles` field is in the old format.\n                  If it is ambiguous or it is not, returns `false`.",
                 "type": "Boolean"
             },
             "access": "private",
@@ -796,12 +840,56 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 56,
+            "line": 79,
+            "itemtype": "method",
+            "name": "_convertToNewRole",
+            "params": [
+                {
+                    "name": "oldRole",
+                    "description": "`Meteor.roles` document.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Converted `role` to the new format.",
+                "type": "Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 96,
+            "itemtype": "method",
+            "name": "_convertToOldRole",
+            "params": [
+                {
+                    "name": "newRole",
+                    "description": "`Meteor.roles` document.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Converted `role` to the old format.",
+                "type": "Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 112,
             "itemtype": "method",
             "name": "_convertToNewField",
             "params": [
                 {
-                    "name": "roles",
+                    "name": "oldRoles",
                     "description": "`Meteor.users` document `roles` field in the old format.",
                     "type": "Array"
                 }
@@ -818,14 +906,19 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 101,
+            "line": 157,
             "itemtype": "method",
             "name": "_convertToOldField",
             "params": [
                 {
-                    "name": "roles",
+                    "name": "newRoles",
                     "description": "`Meteor.users` document `roles` field in the new format.",
                     "type": "Array"
+                },
+                {
+                    "name": "usingGroups",
+                    "description": "Should we use groups or not.",
+                    "type": "Boolean"
                 }
             ],
             "return": {
@@ -840,7 +933,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 149,
+            "line": 206,
             "itemtype": "method",
             "name": "_defaultUpdateUser",
             "params": [
@@ -848,12 +941,13 @@
                     "name": "user",
                     "description": "`Meteor.users` document.",
                     "type": "Object"
+                },
+                {
+                    "name": "roles",
+                    "description": "Value to which user's `roles` field should be set.",
+                    "type": "Array|Object"
                 }
             ],
-            "return": {
-                "description": "roles Value to which user's `roles` field should be set.",
-                "type": "Array|Object"
-            },
             "access": "private",
             "tagname": "",
             "static": 1,
@@ -862,7 +956,30 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 167,
+            "line": 224,
+            "itemtype": "method",
+            "name": "_defaultUpdateRole",
+            "params": [
+                {
+                    "name": "oldRole",
+                    "description": "Old `Meteor.roles` document.",
+                    "type": "Object"
+                },
+                {
+                    "name": "newRole",
+                    "description": "New `Meteor.roles` document.",
+                    "type": "Object"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 237,
             "description": "Migrates `Meteor.users` and `Meteor.roles` to the new format.",
             "itemtype": "method",
             "name": "_forwardMigrate",
@@ -871,6 +988,11 @@
                     "name": "updateUser",
                     "description": "Function which updates the user object. Default `_defaultUpdateUser`.",
                     "type": "Function"
+                },
+                {
+                    "name": "updateRole",
+                    "description": "Function which updates the role object. Default `_defaultUpdateRole`.",
+                    "type": "Function"
                 }
             ],
             "access": "private",
@@ -881,7 +1003,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 188,
+            "line": 264,
             "description": "Migrates `Meteor.users` and `Meteor.roles` to the old format.\n\nWe assume that we are converting back a failed migration, so values can only be\nwhat were valid values in the old format. So no group names starting with `$` and\nno subroles.",
             "itemtype": "method",
             "name": "_backwardMigrate",
@@ -891,6 +1013,11 @@
                     "description": "Function which updates the user object. Default `_defaultUpdateUser`.",
                     "type": "Function"
                 },
+                {
+                    "name": "updateRole",
+                    "description": "Function which updates the role object. Default `_defaultUpdateRole`.",
+                    "type": "Function"
+                },
                 {
                     "name": "usingGroups",
                     "description": "Should we use groups or not.",
@@ -907,7 +1034,7 @@
     "warnings": [
         {
             "message": "Missing item type",
-            "line": " roles/roles_common.js:1098"
+            "line": " roles/roles_common.js:1117"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 19b712da6b..2a686d20db 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -90,22 +90,20 @@
  *
  * It uses &#x60;roles&#x60; field to &#x60;Meteor.users&#x60; documents which is an array of subdocuments with the following
  * schema:
- *  - &#x60;role&#x60;: role name
+ *  - &#x60;_id&#x60;: role name
  *  - &#x60;partition&#x60;: partition name
  *  - &#x60;assigned&#x60;: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)
  *
  * Roles themselves are accessible throgh &#x60;Meteor.roles&#x60; collection and documents consist of:
- *  - &#x60;_id&#x60;
- *  - &#x60;name&#x60;: role name
+ *  - &#x60;_id&#x60;: role name
  *  - &#x60;children&#x60;: list of subdocuments:
  *    - &#x60;_id&#x60;
- *    - &#x60;name&#x60;
  *
- * Children list elements are subdocuments so that they can be easier extended in the future.
+ * Children list elements are subdocuments so that they can be easier extended in the future or by plugins.
  *
  * Roles can have multiple parents and can be children (subroles) of multiple roles.
  *
- * Example: &#x60;{_id: &quot;123&quot;, name: &quot;admin&quot;}&#x60;
+ * Example: &#x60;{_id: &quot;admin&quot;, children: [{_id: &quot;editor&quot;}]}&#x60;
  *
  * @module Roles
  */
@@ -157,7 +155,7 @@ _.extend(Roles, {
     });
 
     try {
-      return Meteor.roles.insert({name: roleName, children: []});
+      return Meteor.roles.insert({_id: roleName, children: []});
     } catch (e) {
       // (from Meteor accounts-base package, insertUserDoc func)
       // XXX string parsing sucks, maybe
@@ -165,7 +163,7 @@ _.extend(Roles, {
       if (e.name !== &#x27;MongoError&#x27;) throw e;
       match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
       if (!match) throw e;
-      if (match[1].indexOf(&#x27;$name&#x27;) !== -1) {
+      if (match[1].indexOf(&#x27;$_id&#x27;) !== -1) {
         if (options.unlessExists) return null;
         throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; already exists.&quot;);
       }
@@ -192,7 +190,7 @@ _.extend(Roles, {
     Meteor.roles.update({}, {
       $pull: {
         children: {
-          name: roleName
+          _id: roleName
         }
       }
     }, {multi: true});
@@ -222,7 +220,7 @@ _.extend(Roles, {
     });
 
     // remove the role itself
-    Meteor.roles.remove({name: roleName});
+    Meteor.roles.remove({_id: roleName});
   },
 
   /**
@@ -239,28 +237,49 @@ _.extend(Roles, {
   addRoleParent: function (roleName, parentName) {
     var role,
         count,
-        parentRoles;
+        parentRoles,
+        rolesToCheck,
+        alreadyCheckedRoles,
+        checkRoleName,
+        checkRole;
 
     Roles._checkRoleName(roleName);
     Roles._checkRoleName(parentName);
 
-    // query to get role&#x27;s _id and name
-    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1, name: 1}});
+    // query to get role&#x27;s children
+    role = Meteor.roles.findOne({_id: roleName});
 
     if (!role) {
       throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
     }
 
+    // detect cycles
+    alreadyCheckedRoles = [];
+    rolesToCheck = _.pluck(role.children, &#x27;_id&#x27;);
+    while (rolesToCheck.length) {
+      checkRoleName = rolesToCheck.pop();
+      if (checkRoleName === parentName) {
+        throw new Error(&quot;Roles &#x27;&quot; + roleName + &quot;&#x27; and &#x27;&quot; + parentName + &quot;&#x27; would form a cycle.&quot;);
+      }
+      alreadyCheckedRoles.push(checkRoleName);
+
+      checkRole = Meteor.roles.findOne({_id: checkRoleName});
+
+      // This should not happen, but this is a problem to address at some other time.
+      if (!checkRole) continue;
+
+      rolesToCheck = _.union(rolesToCheck, _.difference(_.pluck(checkRole.children, &#x27;_id&#x27;), alreadyCheckedRoles));
+    }
+
     count = Meteor.roles.update({
-      name: parentName,
+      _id: parentName,
       &#x27;children._id&#x27;: {
         $ne: role._id
       }
     }, {
       $addToSet: {
         children: {
-          _id: role._id,
-          name: role.name
+          _id: role._id
         }
       }
     });
@@ -311,16 +330,16 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkRoleName(parentName);
 
-    // to check for role existence
-    // (_id would not really be needed, but we are trying to match addRoleParent)
-    role = Meteor.roles.findOne({name: roleName}, {fields: {_id: 1}});
+    // check for role existence
+    // this would not really be needed, but we are trying to match addRoleParent
+    role = Meteor.roles.findOne({_id: roleName}, {fields: {_id: 1}});
 
     if (!role) {
       throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
     }
 
     count = Meteor.roles.update({
-      name: parentName
+      _id: parentName
     }, {
       $pull: {
         children: {
@@ -515,7 +534,7 @@ _.extend(Roles, {
 
     if (!id) return [];
 
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+    role = Meteor.roles.findOne({_id: roleName}, {fields: {children: 1}});
 
     if (!role) {
       if (options.ifExists) {
@@ -532,7 +551,7 @@ _.extend(Roles, {
       roles: {
         $not: {
           $elemMatch: {
-            role: roleName,
+            _id: roleName,
             partition: options.partition
           }
         }
@@ -541,7 +560,7 @@ _.extend(Roles, {
     }, {
       $addToSet: {
         roles: {
-          role: roleName,
+          _id: roleName,
           partition: options.partition,
           // we want to make sure it is a boolean value
           assigned: !!options._assigned
@@ -557,7 +576,7 @@ _.extend(Roles, {
           _id: id,
           roles: {
             $elemMatch: {
-              role: roleName,
+              _id: roleName,
               partition: options.partition
             }
           }
@@ -574,7 +593,7 @@ _.extend(Roles, {
           _id: id,
           roles: {
             $elemMatch: {
-              role: roleName,
+              _id: roleName,
               partition: options.partition
             }
           }
@@ -588,13 +607,13 @@ _.extend(Roles, {
     }
 
     setRoles = [{
-      role: roleName,
+      _id: roleName,
       partition: options.partition
     }];
 
     _.each(role.children, function (child) {
       // subroles are set as unassigned, but only if they do not already exist
-      setRoles = setRoles.concat(Roles._addUserToRole(user, child.name, _.extend({}, options, {_assigned: null})));
+      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, _.extend({}, options, {_assigned: null})));
     });
 
     return setRoles;
@@ -694,7 +713,7 @@ _.extend(Roles, {
     update = {
       $pull: {
         roles: {
-          role: roleName,
+          _id: roleName,
           partition: options.partition
         }
       }
@@ -710,14 +729,14 @@ _.extend(Roles, {
     // we try to remove the role in every case, whether the role really exists or not
     Meteor.users.update(id, update);
 
-    role = Meteor.roles.findOne({name: roleName}, {fields: {children: 1}});
+    role = Meteor.roles.findOne({_id: roleName}, {fields: {children: 1}});
 
     // role does not exist, we do not anything more
     if (!role) return;
 
     _.each(role.children, function (child) {
       // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child.name, _.extend({}, options, {_assigned: false}));
+      Roles._removeUserFromRole(user, child._id, _.extend({}, options, {_assigned: false}));
     });
   },
 
@@ -747,7 +766,7 @@ _.extend(Roles, {
 
     setRoles = [];
     _.each(roles, function (role) {
-      setRoles = setRoles.concat(Roles._addUserToRole(user, role.role, {
+      setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
         partition: role.partition,
         _assigned: role.assigned, // this is true
         ifExists: true
@@ -759,7 +778,7 @@ _.extend(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.map(setRoles, function (role) {return _.pick(role, &#x27;role&#x27;, &#x27;partition&#x27;)})
+            $nor: _.map(setRoles, function (role) {return _.pick(role, &#x27;_id&#x27;, &#x27;partition&#x27;)})
           }
         }
       });
@@ -846,7 +865,7 @@ _.extend(Roles, {
     if (options.anyPartition) {
       query = {
         _id: id,
-        &#x27;roles.role&#x27;: {$in: roles}
+        &#x27;roles._id&#x27;: {$in: roles}
       };
     }
     else {
@@ -855,14 +874,14 @@ _.extend(Roles, {
         $or: [{
           roles: {
             $elemMatch: {
-              role: {$in: roles},
+              _id: {$in: roles},
               partition: options.partition
             }
           }
         }, {
           roles: {
             $elemMatch: {
-              role: {$in: roles},
+              _id: {$in: roles},
               partition: null
             }
           }
@@ -926,7 +945,7 @@ _.extend(Roles, {
       return roles;
     }
 
-    return _.uniq(_.pluck(roles, &#x27;role&#x27;));
+    return _.uniq(_.pluck(roles, &#x27;_id&#x27;));
   },
 
   /**
@@ -939,7 +958,7 @@ _.extend(Roles, {
    * @static
    */
   getAllRoles: function (queryOptions) {
-    queryOptions = queryOptions || {sort: {name: 1}};
+    queryOptions = queryOptions || {sort: {_id: 1}};
 
     return Meteor.roles.find({}, queryOptions);
   },
@@ -990,7 +1009,7 @@ _.extend(Roles, {
 
     if (options.anyPartition) {
       query = {
-        &#x27;roles.role&#x27;: {$in: roles}
+        &#x27;roles._id&#x27;: {$in: roles}
       };
     }
     else {
@@ -998,14 +1017,14 @@ _.extend(Roles, {
         $or: [{
           roles: {
             $elemMatch: {
-              role: {$in: roles},
+              _id: {$in: roles},
               partition: options.partition
             }
           }
         }, {
           roles: {
             $elemMatch: {
-              role: {$in: roles},
+              _id: {$in: roles},
               partition: null
             }
           }
@@ -1056,7 +1075,7 @@ _.extend(Roles, {
     _.each(user.roles || [], function (userRole) {
       // == used on purpose.
       if (userRole.partition == null) return;
-      if (roles &amp;&amp; !_.contains(roles, userRole.role)) return;
+      if (roles &amp;&amp; !_.contains(roles, userRole._id)) return;
 
       partitions.push(userRole.partition);
     });
@@ -1100,7 +1119,7 @@ _.extend(Roles, {
    */
   _roleMatcher: function (roleName) {
     return function (userRole) {
-      return userRole.role === roleName;
+      return userRole._id === roleName;
     };
   },
 
@@ -1116,8 +1135,8 @@ _.extend(Roles, {
   _roleAndPartitionMatcher: function (roleName, partition) {
     return function (userRole) {
       // == used on purpose in &quot;userRole.partition == null&quot;
-      return (userRole.role === roleName &amp;&amp; userRole.partition === partition) ||
-        (userRole.role === roleName &amp;&amp; (!_.has(userRole, &#x27;partition&#x27;) || userRole.partition == null));
+      return (userRole._id === roleName &amp;&amp; userRole.partition === partition) ||
+        (userRole._id === roleName &amp;&amp; (!_.has(userRole, &#x27;partition&#x27;) || userRole.partition == null));
     };
   },
 
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 5b8eba6f67..a4d980c246 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -85,12 +85,9 @@
     <pre class="code prettyprint linenums">
 &quot;use strict&quot;;
 
-// Create default indexes for roles and users collection.
-
-Meteor.roles._ensureIndex({name: 1}, {unique: 1});
-
-// Index only on &quot;roles.role&quot; is not needed because the combined index works for it as well.
-Meteor.users._ensureIndex({&#x27;roles.role&#x27;: 1, &#x27;roles.partition&#x27;: 1});
+// Create default indexes on users collection.
+// Index only on &quot;roles._id&quot; is not needed because the combined index works for it as well.
+Meteor.users._ensureIndex({&#x27;roles._id&#x27;: 1, &#x27;roles.partition&#x27;: 1});
 Meteor.users._ensureIndex({&#x27;roles.partition&#x27;: 1});
 
 /*
@@ -112,11 +109,37 @@ Meteor.publish(&#x27;_roles&#x27;, function () {
 });
 
 _.extend(Roles, {
+  /**
+   * @method _isNewRole
+   * @param {Object} role &#x60;Meteor.roles&#x60; document.
+   * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;role&#x60; is in the new format.
+   *                   If it is ambiguous or it is not, returns &#x60;false&#x60;.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _isNewRole: function (role) {
+    return !_.has(role, &#x27;name&#x27;) &amp;&amp; _.has(role, &#x27;children&#x27;);
+  },
+
+  /**
+   * @method _isOldRole
+   * @param {Object} role &#x60;Meteor.roles&#x60; document.
+   * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;role&#x60; is in the old format.
+   *                   If it is ambiguous or it is not, returns &#x60;false&#x60;.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _isOldRole: function (role) {
+    return _.has(role, &#x27;name&#x27;) &amp;&amp; !_.has(role, &#x27;children&#x27;);
+  },
+
   /**
    * @method _isNewField
    * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field.
    * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;roles&#x60; field is in the new format.
-   *                    If it is ambiguous or it is not, returns &#x60;false&#x60;.
+   *                   If it is ambiguous or it is not, returns &#x60;false&#x60;.
    * @for Roles
    * @private
    * @static
@@ -129,7 +152,7 @@ _.extend(Roles, {
    * @method _isOldField
    * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field.
    * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;roles&#x60; field is in the old format.
-   *                    If it is ambiguous or it is not, returns &#x60;false&#x60;.
+   *                   If it is ambiguous or it is not, returns &#x60;false&#x60;.
    * @for Roles
    * @private
    * @static
@@ -138,9 +161,42 @@ _.extend(Roles, {
     return (_.isArray(roles) &amp;&amp; _.isString(roles[0])) || (_.isObject(roles) &amp;&amp; !_.isArray(roles));
   },
 
+  /**
+   * @method _convertToNewRole
+   * @param {Object} oldRole &#x60;Meteor.roles&#x60; document.
+   * @return {Object} Converted &#x60;role&#x60; to the new format.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _convertToNewRole: function (oldRole) {
+    if (!_.isString(oldRole.name)) throw new Error(&quot;Role name &#x27;&quot; + oldRole.name + &quot;&#x27; is not a string.&quot;);
+
+    return {
+      _id: oldRole.name,
+      children: []
+    };
+  },
+
+  /**
+   * @method _convertToOldRole
+   * @param {Object} newRole &#x60;Meteor.roles&#x60; document.
+   * @return {Object} Converted &#x60;role&#x60; to the old format.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _convertToOldRole: function (newRole) {
+    if (!_.isString(newRole._id)) throw new Error(&quot;Role name &#x27;&quot; + newRole._id + &quot;&#x27; is not a string.&quot;);
+
+    return {
+      name: newRole._id
+    };
+  },
+
   /**
    * @method _convertToNewField
-   * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the old format.
+   * @param {Array} oldRoles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the old format.
    * @return {Array} Converted &#x60;roles&#x60; to the new format.
    * @for Roles
    * @private
@@ -153,7 +209,7 @@ _.extend(Roles, {
         if (!_.isString(role)) throw new Error(&quot;Role &#x27;&quot; + role + &quot;&#x27; is not a string.&quot;);
 
         roles.push({
-          role: role,
+          _id: role,
           partition: null,
           assigned: true
         })
@@ -173,7 +229,7 @@ _.extend(Roles, {
           if (!_.isString(role)) throw new Error(&quot;Role &#x27;&quot; + role + &quot;&#x27; is not a string.&quot;);
 
           roles.push({
-            role: role,
+            _id: role,
             partition: group,
             assigned: true
           })
@@ -185,7 +241,8 @@ _.extend(Roles, {
 
   /**
    * @method _convertToOldField
-   * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the new format.
+   * @param {Array} newRoles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the new format.
+   * @param {Boolean} usingGroups Should we use groups or not.
    * @return {Array} Converted &#x60;roles&#x60; to the old format.
    * @for Roles
    * @private
@@ -208,7 +265,7 @@ _.extend(Roles, {
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
 
       if (userRole.partition) {
-        if (!usingGroups) throw new Error(&quot;Role &#x27;&quot; + userRole.role + &quot;&#x27; with partition &#x27;&quot; + userRole.partition + &quot;&#x27; without enabled groups.&quot;);
+        if (!usingGroups) throw new Error(&quot;Role &#x27;&quot; + userRole._id + &quot;&#x27; with partition &#x27;&quot; + userRole.partition + &quot;&#x27; without enabled groups.&quot;);
 
         // escape
         var partition = userRole.partition.replace(/\./g, &#x27;_&#x27;);
@@ -216,15 +273,15 @@ _.extend(Roles, {
         if (partition[0] === &#x27;$&#x27;) throw new Error(&quot;Group name &#x27;&quot; + partition + &quot;&#x27; start with $.&quot;);
 
         roles[partition] = roles[partition] || [];
-        roles[partition].push(userRole.role);
+        roles[partition].push(userRole._id);
       }
       else {
         if (usingGroups) {
           roles.__global_roles__ = roles.__global_roles__ || [];
-          roles.__global_roles__.push(userRole.role);
+          roles.__global_roles__.push(userRole._id);
         }
         else {
-          roles.push(userRole.role);
+          roles.push(userRole._id);
         }
       }
     });
@@ -234,7 +291,7 @@ _.extend(Roles, {
   /**
    * @method _defaultUpdateUser
    * @param {Object} user &#x60;Meteor.users&#x60; document.
-   * @return {Array|Object} roles Value to which user&#x27;s &#x60;roles&#x60; field should be set.
+   * @param {Array|Object} roles Value to which user&#x27;s &#x60;roles&#x60; field should be set.
    * @for Roles
    * @private
    * @static
@@ -250,18 +307,37 @@ _.extend(Roles, {
   },
 
   /**
-   * Migrates &#x60;Meteor.users&#x60; and &#x60;Meteor.roles&#x60; to the new format.
-   *
-   * @method _forwardMigrate
-   * @param {Function} updateUser Function which updates the user object. Default &#x60;_defaultUpdateUser&#x60;.
+   * @method _defaultUpdateRole
+   * @param {Object} oldRole Old &#x60;Meteor.roles&#x60; document.
+   * @param {Object} newRole New &#x60;Meteor.roles&#x60; document.
    * @for Roles
    * @private
    * @static
    */
-  _forwardMigrate: function (updateUser) {
-    updateUser = updateUser || Roles._defaultUpdateUser;
+  _defaultUpdateRole: function (oldRole, newRole) {
+    Meteor.roles.remove(oldRole._id);
+    Meteor.roles.insert(newRole);
+  },
 
-    Meteor.roles.update({children: {$exists: false}}, {$set: {children: []}}, {multi: true});
+  /**
+   * Migrates &#x60;Meteor.users&#x60; and &#x60;Meteor.roles&#x60; to the new format.
+   *
+   * @method _forwardMigrate
+   * @param {Function} updateUser Function which updates the user object. Default &#x60;_defaultUpdateUser&#x60;.
+   * @param {Function} updateRole Function which updates the role object. Default &#x60;_defaultUpdateRole&#x60;.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _forwardMigrate: function (updateUser, updateRole) {
+    updateUser = updateUser || Roles._defaultUpdateUser;
+    updateRole = updateRole || Roles._defaultUpdateRole;
+
+    Meteor.roles.find().forEach(function (role, index, cursor) {
+      if (!Roles._isNewRole(role)) {
+        updateRole(role, Roles._convertToNewRole(role));
+      }
+    });
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isNewField(user.roles)) {
@@ -279,15 +355,21 @@ _.extend(Roles, {
    *
    * @method _backwardMigrate
    * @param {Function} updateUser Function which updates the user object. Default &#x60;_defaultUpdateUser&#x60;.
+   * @param {Function} updateRole Function which updates the role object. Default &#x60;_defaultUpdateRole&#x60;.
    * @param {Boolean} usingGroups Should we use groups or not.
    * @for Roles
    * @private
    * @static
    */
-  _backwardMigrate: function (updateUser, usingGroups) {
+  _backwardMigrate: function (updateUser, updateRole, usingGroups) {
     updateUser = updateUser || Roles._defaultUpdateUser;
+    updateRole = updateRole || Roles._defaultUpdateRole;
 
-    Meteor.roles.update({}, {$unset: {children: &#x27;&#x27;}}, {multi: true});
+    Meteor.roles.find().forEach(function (role, index, cursor) {
+      if (!Roles._isOldRole(role)) {
+        updateRole(role, Roles._convertToOldRole(role));
+      }
+    });
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isOldField(user.roles)) {
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index b018cc76dd..aac0dd3e48 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -84,7 +84,7 @@
 
 
         <div class="foundat">
-            Defined in: <a href="../files/roles_roles_common.js.html#l31"><code>roles&#x2F;roles_common.js:31</code></a>
+            Defined in: <a href="../files/roles_roles_common.js.html#l29"><code>roles&#x2F;roles_common.js:29</code></a>
         </div>
 
 </div>
@@ -95,24 +95,22 @@
 <p>It uses <code>roles</code> field to <code>Meteor.users</code> documents which is an array of subdocuments with the following
 schema:</p>
 <ul>
-<li><code>role</code>: role name</li>
+<li><code>_id</code>: role name</li>
 <li><code>partition</code>: partition name</li>
 <li><code>assigned</code>: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)</li>
 </ul>
 <p>Roles themselves are accessible throgh <code>Meteor.roles</code> collection and documents consist of:</p>
 <ul>
-<li><code>_id</code></li>
-<li><code>name</code>: role name</li>
+<li><code>_id</code>: role name</li>
 <li><code>children</code>: list of subdocuments:
 <ul>
 <li><code>_id</code></li>
-<li><code>name</code></li>
 </ul>
 </li>
 </ul>
-<p>Children list elements are subdocuments so that they can be easier extended in the future.</p>
+<p>Children list elements are subdocuments so that they can be easier extended in the future or by plugins.</p>
 <p>Roles can have multiple parents and can be children (subroles) of multiple roles.</p>
-<p>Example: <code>{_id: &quot;123&quot;, name: &quot;admin&quot;}</code></p>
+<p>Example: <code>{_id: &quot;admin&quot;, children: [{_id: &quot;editor&quot;}]}</code></p>
 
 </div>
 

From 530f626f06f77ec54df840fa23d725a20dff3f6a Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Tue, 5 Jan 2016 14:05:09 -0800
Subject: [PATCH 0229/1140] Improve README formatting

In particular, add closing tags to anchors to fix Atmosphere README
rendering
---
 README.md | 60 +++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 1d42d06770..dea695e121 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 <br />
 
-<a name="toc">
+<a name="toc"></a>
 ### Table of Contents
 * [Contributors](#user-content-contributors)
 * [Authorization](#user-content-authorization)
@@ -22,7 +22,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 <br />
 
 
-<a name="contributors">
+<a name="contributors"></a>
 ### Contributors
 
 Thanks to:
@@ -44,7 +44,7 @@ Thanks to:
 <br />
 
 
-<a name="authorization">
+<a name="authorization"></a>
 ### Authorization
 
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
@@ -58,7 +58,7 @@ All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1
 
 <br />
 
-<a name="naming">
+<a name="naming"></a>
 ### Permissions vs roles  (or What's in a name...)
 
 Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign on a user and which you can check for later.
@@ -67,7 +67,7 @@ You can have traditional roles like, "admin" or "webmaster", or you can assign m
 
 <br />
 
-<a name="groups">
+<a name="groups"></a>
 ### What are "groups"?
 
 Sometimes it's useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is more clear.  Users can have one set of permissions in group A and another set of permissions in group B.  Let's go through an example of this using soccer/football teams as groups.
@@ -99,7 +99,7 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 
 <br />
 
-<a name="changes">
+<a name="changes"></a>
 ### Changes to default Meteor behavior
 
   1. User entries in the `Meteor.users` collection gain a new field named `roles` corresponding to the user's roles. †
@@ -111,7 +111,7 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 † The type of the `roles` field depends on whether or not groups are used:
 ```js
 Roles.addUsersToRoles(bobsUserId, ['manage-team','schedule-game'])
-// internal representation - no groups 
+// internal representation - no groups
 // user.roles = ['manage-team','schedule-game']
 
 Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com')
@@ -120,7 +120,7 @@ Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
 // NOTE: MongoDB uses periods to represent hierarchy so periods in group names
 //   are converted to underscores.
 //
-// user.roles = { 
+// user.roles = {
 //   'manchester-united_com': ['manage-team','schedule-game'],
 //   'real-madrid_com': ['player','goalie']
 // }
@@ -133,14 +133,14 @@ Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com')
 
 ```js
 // in server/publish.js
-Meteor.publish(null, function (){ 
+Meteor.publish(null, function (){
   return Meteor.roles.find({})
 })
 ```
 
 <br />
 
-<a name="installing">
+<a name="installing"></a>
 ### Installing
 
 #### Meteor 0.9 - latest
@@ -168,7 +168,7 @@ Meteor.publish(null, function (){
     ```
 
 2. Install [Meteorite][1]
-  
+
 3. Add this smart package to your project.  From a command prompt:
     ```bash
     mrt add roles
@@ -186,7 +186,7 @@ NOTE for Meteor 0.8-0.8.3:  Manually add the 'ui' package to your '.meteor/packa
 <br />
 
 
-<a name="usage">
+<a name="usage"></a>
 ### Usage Examples
 
 <br />
@@ -209,7 +209,7 @@ var users = [
 
 _.each(users, function (user) {
   var id;
-  
+
   id = Accounts.createUser({
     email: user.email,
     password: "apple1",
@@ -217,7 +217,7 @@ _.each(users, function (user) {
   });
 
   if (user.roles.length > 0) {
-    // Need _id of existing user record so this call must come 
+    // Need _id of existing user record so this call must come
     // after `Accounts.createUser` or `Accounts.onCreate`
     Roles.addUsersToRoles(id, user.roles, 'default-group');
   }
@@ -237,15 +237,15 @@ Check user roles before publishing sensitive data:
 // Give authorized users access to sensitive data by group
 Meteor.publish('secrets', function (group) {
   if (Roles.userIsInRole(this.userId, ['view-secrets','admin'], group)) {
-    
+
     return Meteor.secrets.find({group: group});
-    
+
   } else {
-    
+
     // user not authorized. do not publish secrets
     this.stop();
     return;
-  
+
   }
 });
 ```
@@ -258,7 +258,7 @@ Accounts.validateNewUser(function (user) {
   var loggedInUser = Meteor.user();
 
   if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
-    // NOTE: This example assumes the user is not using groups. 
+    // NOTE: This example assumes the user is not using groups.
     return true;
   }
 
@@ -275,7 +275,7 @@ Prevent access to certain functionality, such as deleting a user:
 Meteor.methods({
   /**
    * delete a user from a specific group
-   * 
+   *
    * @method deleteUser
    * @param {String} targetUserId _id of user to delete
    * @param {String} group Company to update permissions for
@@ -284,7 +284,7 @@ Meteor.methods({
     var loggedInUser = Meteor.user()
 
     if (!loggedInUser ||
-        !Roles.userIsInRole(loggedInUser, 
+        !Roles.userIsInRole(loggedInUser,
                             ['manage-users', 'support-staff'], group)) {
       throw new Meteor.Error(403, "Access denied")
     }
@@ -315,7 +315,7 @@ Meteor.methods({
     var loggedInUser = Meteor.user()
 
     if (!loggedInUser ||
-        !Roles.userIsInRole(loggedInUser, 
+        !Roles.userIsInRole(loggedInUser,
                             ['manage-users', 'support-staff'], group)) {
       throw new Meteor.Error(403, "Access denied")
     }
@@ -331,7 +331,7 @@ Meteor.methods({
 
 Client javascript has access to all the same Roles functions as the server with the addition of a `isInRole` handlebars helper which is automatically registered by the Roles package.
 
-As with all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
+As with all Meteor applications, client-side checks are a convenience, rather than a true security implementation
 since Meteor bundles the same client-side code to all users.  Providing the Roles functions client-side also allows for latency compensation during Meteor method calls.
 
 NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends all templates, client-side javascript, and published data to the client's browser.  This is by design and is a good thing.  The following example is just sugar to help improve the user experience for normal users.  Those interested in seeing the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js` file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
@@ -369,7 +369,7 @@ To check for permissions when using groups:
 <br />
 
 
-<a name="docs">
+<a name="docs"></a>
 ### API Docs
 
 Online API docs found here: http://alanning.github.io/meteor-roles/classes/Roles.html
@@ -391,7 +391,7 @@ To serve documentation locally:
 <br />
 
 
-<a name="example-apps">
+<a name="example-apps"></a>
 ### Example Apps
 
 The `examples` directory contains Meteor apps which show off the following features:
@@ -404,7 +404,7 @@ The `examples` directory contains Meteor apps which show off the following featu
 The only difference among the example apps is which routing package is used.
 
 View the `meteor-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
- 
+
 
 _Iron Router or Flow Router_
 
@@ -431,19 +431,19 @@ _Deprecated routing packages: Mini-Pages or Router_
 <br />
 
 
-<a name="testing">
+<a name="testing"></a>
 ### Tests
 
 
-To run tests: 
+To run tests:
   1. `cd meteor-roles`
   2. `meteor test-packages ./roles`
   3. point browser at http://localhost:3000/
 
 _NOTE_: If you see an error message regarding **"The package named roles does not exist"** that means you are either:
-  a) in the wrong directory or 
+  a) in the wrong directory or
   b) left off the './' in front of 'roles' in step 2.  
-  
+
 Step 2 needs to be run in the main 'meteor-roles' directory and the './' is needed because otherwise Meteor only looks in directories named 'packages'.
 
 

From da03086e9f17271d8f1b72570ee86721c2bc0b6d Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 8 Jan 2016 00:29:07 -0500
Subject: [PATCH 0230/1140] namespace anchors to try to fix atmosphere links

---
 README.md | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index dea695e121..b8ca737b0c 100644
--- a/README.md
+++ b/README.md
@@ -5,24 +5,24 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 <br />
 
-<a name="toc"></a>
+<a name="roles-toc"></a>
 ### Table of Contents
-* [Contributors](#user-content-contributors)
-* [Authorization](#user-content-authorization)
-* [Permissions vs roles](#user-content-naming)
-* [What are "groups"?](#groups)
-* [Changes to default Meteor](#user-content-changes)
-* [Installation](#user-content-installing)
-* [Usage examples](#user-content-usage)
-* [Online API docs](#user-content-docs)
-* [Example apps](#user-content-example-apps)
-* [Running tests](#user-content-testing)
+* [Contributors](#user-content-roles-contributors)
+* [Authorization](#user-content-roles-authorization)
+* [Permissions vs roles](#user-content-roles-naming)
+* [What are "groups"?](#user-content-roles-groups)
+* [Changes to default Meteor](#user-content-roles-changes)
+* [Installation](#user-content-roles-installing)
+* [Usage examples](#user-content-roles-usage)
+* [Online API docs](#user-content-roles-docs)
+* [Example apps](#user-content-roles-example-apps)
+* [Running tests](#user-content-roles-testing)
 
 
 <br />
 
 
-<a name="contributors"></a>
+<a name="roles-contributors"></a>
 ### Contributors
 
 Thanks to:
@@ -44,7 +44,7 @@ Thanks to:
 <br />
 
 
-<a name="authorization"></a>
+<a name="roles-authorization"></a>
 ### Authorization
 
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
@@ -58,7 +58,7 @@ All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1
 
 <br />
 
-<a name="naming"></a>
+<a name="roles-naming"></a>
 ### Permissions vs roles  (or What's in a name...)
 
 Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign on a user and which you can check for later.
@@ -67,7 +67,7 @@ You can have traditional roles like, "admin" or "webmaster", or you can assign m
 
 <br />
 
-<a name="groups"></a>
+<a name="roles-groups"></a>
 ### What are "groups"?
 
 Sometimes it's useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is more clear.  Users can have one set of permissions in group A and another set of permissions in group B.  Let's go through an example of this using soccer/football teams as groups.
@@ -99,7 +99,7 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 
 <br />
 
-<a name="changes"></a>
+<a name="roles-changes"></a>
 ### Changes to default Meteor behavior
 
   1. User entries in the `Meteor.users` collection gain a new field named `roles` corresponding to the user's roles. †
@@ -140,7 +140,7 @@ Meteor.publish(null, function (){
 
 <br />
 
-<a name="installing"></a>
+<a name="roles-installing"></a>
 ### Installing
 
 #### Meteor 0.9 - latest
@@ -186,7 +186,7 @@ NOTE for Meteor 0.8-0.8.3:  Manually add the 'ui' package to your '.meteor/packa
 <br />
 
 
-<a name="usage"></a>
+<a name="roles-usage"></a>
 ### Usage Examples
 
 <br />
@@ -369,7 +369,7 @@ To check for permissions when using groups:
 <br />
 
 
-<a name="docs"></a>
+<a name="roles-docs"></a>
 ### API Docs
 
 Online API docs found here: http://alanning.github.io/meteor-roles/classes/Roles.html
@@ -391,7 +391,7 @@ To serve documentation locally:
 <br />
 
 
-<a name="example-apps"></a>
+<a name="roles-example-apps"></a>
 ### Example Apps
 
 The `examples` directory contains Meteor apps which show off the following features:
@@ -431,7 +431,7 @@ _Deprecated routing packages: Mini-Pages or Router_
 <br />
 
 
-<a name="testing"></a>
+<a name="roles-testing"></a>
 ### Tests
 
 

From f1db6cf6764fd84010e80b3e17788b8fc2594172 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 8 Jan 2016 00:37:28 -0500
Subject: [PATCH 0231/1140] fix atmosphere links, take 2

---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index b8ca737b0c..fd51a73e53 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 <br />
 
-<a name="roles-toc"></a>
+<a id="roles-toc" name="roles-toc"></a>
 ### Table of Contents
 * [Contributors](#user-content-roles-contributors)
 * [Authorization](#user-content-roles-authorization)
@@ -22,7 +22,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 <br />
 
 
-<a name="roles-contributors"></a>
+<a id="roles-contributors" name="roles-contributors"></a>
 ### Contributors
 
 Thanks to:
@@ -44,7 +44,7 @@ Thanks to:
 <br />
 
 
-<a name="roles-authorization"></a>
+<a id="roles-authorization" name="roles-authorization"></a>
 ### Authorization
 
 This package lets you attach permissions to a user which you can then check against later when deciding whether to grant access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching strings to a user object and then checking for the existance of those strings later. In some sense, it is very similar to tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying those permissions easier.
@@ -58,7 +58,7 @@ All versions of Meteor from 0.5 to current are supported (excluding Meteor 0.9.1
 
 <br />
 
-<a name="roles-naming"></a>
+<a id="roles-naming" name="roles-naming"></a>
 ### Permissions vs roles  (or What's in a name...)
 
 Although the name of this package is 'roles', you can define your permissions however you like.  They are essentially just tags that you assign on a user and which you can check for later.
@@ -67,7 +67,7 @@ You can have traditional roles like, "admin" or "webmaster", or you can assign m
 
 <br />
 
-<a name="roles-groups"></a>
+<a id="roles-groups" name="roles-groups"></a>
 ### What are "groups"?
 
 Sometimes it's useful to let a user have independent sets of permissions.  The `roles` package calls these independent sets, "groups" for lack of a better term.  You can think of them as "partitions" if that is more clear.  Users can have one set of permissions in group A and another set of permissions in group B.  Let's go through an example of this using soccer/football teams as groups.
@@ -99,7 +99,7 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 
 <br />
 
-<a name="roles-changes"></a>
+<a id="roles-changes" name="roles-changes"></a>
 ### Changes to default Meteor behavior
 
   1. User entries in the `Meteor.users` collection gain a new field named `roles` corresponding to the user's roles. †
@@ -140,7 +140,7 @@ Meteor.publish(null, function (){
 
 <br />
 
-<a name="roles-installing"></a>
+<a id="roles-installing" name="roles-installing"></a>
 ### Installing
 
 #### Meteor 0.9 - latest
@@ -186,7 +186,7 @@ NOTE for Meteor 0.8-0.8.3:  Manually add the 'ui' package to your '.meteor/packa
 <br />
 
 
-<a name="roles-usage"></a>
+<a id="roles-usage" name="roles-usage"></a>
 ### Usage Examples
 
 <br />
@@ -369,7 +369,7 @@ To check for permissions when using groups:
 <br />
 
 
-<a name="roles-docs"></a>
+<a id="roles-docs" name="roles-docs"></a>
 ### API Docs
 
 Online API docs found here: http://alanning.github.io/meteor-roles/classes/Roles.html
@@ -391,7 +391,7 @@ To serve documentation locally:
 <br />
 
 
-<a name="roles-example-apps"></a>
+<a id="roles-example-apps" name="roles-example-apps"></a>
 ### Example Apps
 
 The `examples` directory contains Meteor apps which show off the following features:
@@ -431,7 +431,7 @@ _Deprecated routing packages: Mini-Pages or Router_
 <br />
 
 
-<a name="roles-testing"></a>
+<a id="roles-testing" name="roles-testing"></a>
 ### Tests
 
 

From 90c72b130c9337914486fbb2a2fe738181588b7a Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Fri, 8 Jan 2016 00:49:31 -0500
Subject: [PATCH 0232/1140] fix atmosphere links, take 3

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index fd51a73e53..5d4440275a 100644
--- a/README.md
+++ b/README.md
@@ -7,16 +7,16 @@ Authorization package for Meteor - compatible with built-in accounts package.
 
 <a id="roles-toc" name="roles-toc"></a>
 ### Table of Contents
-* [Contributors](#user-content-roles-contributors)
-* [Authorization](#user-content-roles-authorization)
-* [Permissions vs roles](#user-content-roles-naming)
-* [What are "groups"?](#user-content-roles-groups)
-* [Changes to default Meteor](#user-content-roles-changes)
-* [Installation](#user-content-roles-installing)
-* [Usage examples](#user-content-roles-usage)
-* [Online API docs](#user-content-roles-docs)
-* [Example apps](#user-content-roles-example-apps)
-* [Running tests](#user-content-roles-testing)
+* [Contributors](#roles-contributors)
+* [Authorization](#roles-authorization)
+* [Permissions vs roles](#roles-naming)
+* [What are "groups"?](#roles-groups)
+* [Changes to default Meteor](#roles-changes)
+* [Installation](#roles-installing)
+* [Usage examples](#roles-usage)
+* [Online API docs](#roles-docs)
+* [Example apps](#roles-example-apps)
+* [Running tests](#roles-testing)
 
 
 <br />

From ecd0e0c00b636a32d6180b8d6d7297d2106a2e59 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 19:14:47 -0800
Subject: [PATCH 0233/1140] Support for renaming and removing partitions.

Fixes: #153
---
 roles/roles_common.js | 59 +++++++++++++++++++++++++++++++++++++++++
 roles/tests/server.js | 61 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 5298cdd0be..33c33d048c 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -998,6 +998,65 @@ _.extend(Roles, {
     return _.uniq(partitions);
   },
 
+  /**
+   * Rename a partition.
+   *
+   * Roles assigned with a given partition are changed to be under the new partition.
+   *
+   * @method renamePartition
+   * @param {String} oldName Old name of a partition.
+   * @param {String} newName New name of a partition.
+   * @static
+   */
+  renamePartition: function (oldName, newName) {
+    var count;
+
+    oldName = oldName || null;
+    newName = newName || null;
+
+    Roles._checkPartitionName(oldName);
+    Roles._checkPartitionName(newName);
+
+    if (oldName === newName) return;
+
+    do {
+      count = Meteor.users.update({
+        roles: {
+          $elemMatch: {
+            partition: oldName
+          }
+        }
+      }, {
+        $set: {
+          'roles.$.partition': newName
+        }
+      }, {multi: true});
+    } while (count > 0);
+  },
+
+  /**
+   * Remove a partition.
+   *
+   * Roles assigned with a given partition are removed.
+   *
+   * @method removePartition
+   * @param {String} name The name of a partition.
+   * @static
+   */
+  removePartition: function (name) {
+    name = name || null;
+
+    Roles._checkPartitionName(name);
+
+    Meteor.users.update({}, {
+      $pull: {
+        roles: {
+          partition: name
+        }
+      }
+    }, {multi: true});
+  },
+
   /**
    * Resolves the user ID into an actual user object with `roles` field,
    * if it is not already.
diff --git a/roles/tests/server.js b/roles/tests/server.js
index e9a59a7880..381e5af6be 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -231,6 +231,67 @@
       test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
     });
 
+  Tinytest.add(
+    'roles - renaming partitions',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'eve', ['editor'], 'partition2');
+
+      Roles.renamePartition('partition1', 'partition3');
+
+      testUser(test, 'eve', ['admin', 'user'], 'partition3');
+      testUser(test, 'eve', ['editor'], 'partition2');
+
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition2'));
+
+      Roles.renamePartition('partition3', null);
+
+      testUser(test, 'eve', ['admin', 'user', 'editor'], 'partition2');
+
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
+      test.isTrue(Roles.userIsInRole(users.eve, ['user']));
+
+      Roles.renamePartition(null, 'partition2');
+
+      testUser(test, 'eve', ['admin', 'user', 'editor'], 'partition2');
+
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin']));
+      test.isFalse(Roles.userIsInRole(users.eve, ['user']));
+    });
+
+  Tinytest.add(
+    'roles - removing partitions',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+
+      testUser(test, 'eve', ['admin', 'user'], 'partition1');
+      testUser(test, 'eve', ['editor'], 'partition2');
+
+      Roles.removePartition('partition1');
+
+      testUser(test, 'eve', ['editor'], 'partition2');
+
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition2'));
+    });
+
   Tinytest.add(
     'roles - can check if non-existant user is in role', 
     function (test) {

From 0a6f080fe6bbd88722b1954361a61a3955b7e28a Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 19:15:52 -0800
Subject: [PATCH 0234/1140] Updated documentation.

---
 docs/classes/Roles.html               | 150 ++++++++++++++++++++++++--
 docs/data.json                        |  55 ++++++++--
 docs/files/roles_roles_common.js.html |  59 ++++++++++
 3 files changed, 249 insertions(+), 15 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 5b8e057f4a..ad00323509 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -269,6 +269,11 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method">
+                                <a href="#method_removePartition">removePartition</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method">
                                 <a href="#method_removeRoleParent">removeRoleParent</a>
 
@@ -279,6 +284,11 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method">
+                                <a href="#method_renamePartition">renamePartition</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method">
                                 <a href="#method_setUserRoles">setUserRoles</a>
 
@@ -590,7 +600,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1087"><code>roles&#x2F;roles_common.js:1087</code></a>
+        <a href="../files/roles_roles_common.js.html#l1146"><code>roles&#x2F;roles_common.js:1146</code></a>
         </p>
 
 
@@ -646,7 +656,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1101"><code>roles&#x2F;roles_common.js:1101</code></a>
+        <a href="../files/roles_roles_common.js.html#l1160"><code>roles&#x2F;roles_common.js:1160</code></a>
         </p>
 
 
@@ -1461,7 +1471,7 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1074"><code>roles&#x2F;roles_common.js:1074</code></a>
+        <a href="../files/roles_roles_common.js.html#l1133"><code>roles&#x2F;roles_common.js:1133</code></a>
         </p>
 
 
@@ -1512,7 +1522,7 @@ if the role is an assigned role.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1058"><code>roles&#x2F;roles_common.js:1058</code></a>
+        <a href="../files/roles_roles_common.js.html#l1117"><code>roles&#x2F;roles_common.js:1117</code></a>
         </p>
 
 
@@ -1679,7 +1689,7 @@ assigned roles are removed, if <code>null</code>, any role is removed</li>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1001"><code>roles&#x2F;roles_common.js:1001</code></a>
+        <a href="../files/roles_roles_common.js.html#l1060"><code>roles&#x2F;roles_common.js:1060</code></a>
         </p>
 
 
@@ -1762,7 +1772,7 @@ if it is not already.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1041"><code>roles&#x2F;roles_common.js:1041</code></a>
+        <a href="../files/roles_roles_common.js.html#l1100"><code>roles&#x2F;roles_common.js:1100</code></a>
         </p>
 
 
@@ -1841,7 +1851,7 @@ if its name matches <code>roleName</code>, and partition matches <code>partition
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1027"><code>roles&#x2F;roles_common.js:1027</code></a>
+        <a href="../files/roles_roles_common.js.html#l1086"><code>roles&#x2F;roles_common.js:1086</code></a>
         </p>
 
 
@@ -2578,6 +2588,62 @@ through to <code>Meteor.users.find(query, options)</code></p>
         </div>
 
 
+</div>
+<div id="method_removePartition" class="method item">
+    <h3 class="name"><code>removePartition</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>name</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1037"><code>roles&#x2F;roles_common.js:1037</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove a partition.</p>
+<p>Roles assigned with a given partition are removed.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">name</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The name of a partition.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method_removeRoleParent" class="method item">
     <h3 class="name"><code>removeRoleParent</code></h3>
@@ -2747,6 +2813,76 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
 
             </div>
         </div>
+</div>
+<div id="method_renamePartition" class="method item">
+    <h3 class="name"><code>renamePartition</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldName</code>
+                </li>
+                <li class="arg">
+                        <code>newName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1001"><code>roles&#x2F;roles_common.js:1001</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Rename a partition.</p>
+<p>Roles assigned with a given partition are changed to be under the new partition.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Old name of a partition.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">newName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>New name of a partition.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method_setUserRoles" class="method item">
     <h3 class="name"><code>setUserRoles</code></h3>
diff --git a/docs/data.json b/docs/data.json
index b4955d2f0f..1d6e5ba13f 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -581,6 +581,45 @@
         {
             "file": "roles/roles_common.js",
             "line": 1001,
+            "description": "Rename a partition.\n\nRoles assigned with a given partition are changed to be under the new partition.",
+            "itemtype": "method",
+            "name": "renamePartition",
+            "params": [
+                {
+                    "name": "oldName",
+                    "description": "Old name of a partition.",
+                    "type": "String"
+                },
+                {
+                    "name": "newName",
+                    "description": "New name of a partition.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1037,
+            "description": "Remove a partition.\n\nRoles assigned with a given partition are removed.",
+            "itemtype": "method",
+            "name": "removePartition",
+            "params": [
+                {
+                    "name": "name",
+                    "description": "The name of a partition.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1060,
             "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
             "name": "_resolveUser",
@@ -608,7 +647,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1027,
+            "line": 1086,
             "itemtype": "method",
             "name": "_roleMatcher",
             "params": [
@@ -630,7 +669,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1041,
+            "line": 1100,
             "itemtype": "method",
             "name": "_roleAndPartitionMatcher",
             "params": [
@@ -657,7 +696,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1058,
+            "line": 1117,
             "itemtype": "method",
             "name": "_partitionMatcher",
             "params": [
@@ -679,7 +718,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1074,
+            "line": 1133,
             "itemtype": "method",
             "name": "_onlyAssignedMatcher",
             "return": {
@@ -694,7 +733,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1087,
+            "line": 1146,
             "description": "Throw an exception if `roleName` is an invalid role name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -713,7 +752,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1101,
+            "line": 1160,
             "description": "Throw an exception if `partitionName` is an invalid partition name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -732,7 +771,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1117,
+            "line": 1176,
             "params": [
                 {
                     "name": "string",
@@ -1034,7 +1073,7 @@
     "warnings": [
         {
             "message": "Missing item type",
-            "line": " roles/roles_common.js:1117"
+            "line": " roles/roles_common.js:1176"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 2a686d20db..34ae0a7b26 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -1083,6 +1083,65 @@ _.extend(Roles, {
     return _.uniq(partitions);
   },
 
+  /**
+   * Rename a partition.
+   *
+   * Roles assigned with a given partition are changed to be under the new partition.
+   *
+   * @method renamePartition
+   * @param {String} oldName Old name of a partition.
+   * @param {String} newName New name of a partition.
+   * @static
+   */
+  renamePartition: function (oldName, newName) {
+    var count;
+
+    oldName = oldName || null;
+    newName = newName || null;
+
+    Roles._checkPartitionName(oldName);
+    Roles._checkPartitionName(newName);
+
+    if (oldName === newName) return;
+
+    do {
+      count = Meteor.users.update({
+        roles: {
+          $elemMatch: {
+            partition: oldName
+          }
+        }
+      }, {
+        $set: {
+          &#x27;roles.$.partition&#x27;: newName
+        }
+      }, {multi: true});
+    } while (count &gt; 0);
+  },
+
+  /**
+   * Remove a partition.
+   *
+   * Roles assigned with a given partition are removed.
+   *
+   * @method removePartition
+   * @param {String} name The name of a partition.
+   * @static
+   */
+  removePartition: function (name) {
+    name = name || null;
+
+    Roles._checkPartitionName(name);
+
+    Meteor.users.update({}, {
+      $pull: {
+        roles: {
+          partition: name
+        }
+      }
+    }, {multi: true});
+  },
+
   /**
    * Resolves the user ID into an actual user object with &#x60;roles&#x60; field,
    * if it is not already.

From 70b36c16a283127827798c01c0569c95e09ae972 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 19:27:51 -0800
Subject: [PATCH 0235/1140] Expose query object from getUsersInRole.

Fixes: #100
---
 roles/roles_common.js | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 33c33d048c..397c6a2afc 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -902,6 +902,34 @@ _.extend(Roles, {
    * @static
    */
   getUsersInRole: function (roles, options, queryOptions) {
+    var result;
+
+    result = Roles._usersInRoleQuery(roles, options, queryOptions);
+
+    return Meteor.users.find(result.query, result.queryOptions);
+  },
+
+  /**
+   * @method _usersInRoleQuery
+   * @param {String|Array} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `partition`: name of the partition to restrict roles to; user's global
+   *     roles will also be checked
+   *   - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)
+   *   - `queryOptions`: options which are passed directly
+   *     through to `Meteor.users.find(query, options)`
+   *
+   * Alternatively, it can be a partition name string.
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to `Meteor.users.find(query, options)`
+   * @return {Object} Object with `query` and `queryOptions`.
+   * @private
+   * @static
+   */
+  _usersInRoleQuery: function (roles, options, queryOptions) {
     var query;
 
     options = options || {};
@@ -947,7 +975,10 @@ _.extend(Roles, {
       };
     }
 
-    return Meteor.users.find(query, options.queryOptions);
+    return {
+      query: query,
+      queryOptions: options.queryOptions
+    }
   },
 
   /**

From 715a358f6b799d22c7c24c5b46adb9bd22e5834a Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 19:28:09 -0800
Subject: [PATCH 0236/1140] Updated documentation.

---
 docs/classes/Roles.html               | 136 +++++++++++++++++++++++---
 docs/data.json                        |  60 +++++++++---
 docs/files/roles_roles_common.js.html |  33 ++++++-
 3 files changed, 204 insertions(+), 25 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index ad00323509..90838c7e9c 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -223,6 +223,11 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__usersInRoleQuery">_usersInRoleQuery</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method">
                                 <a href="#method_addRoleParent">addRoleParent</a>
 
@@ -600,7 +605,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1146"><code>roles&#x2F;roles_common.js:1146</code></a>
+        <a href="../files/roles_roles_common.js.html#l1177"><code>roles&#x2F;roles_common.js:1177</code></a>
         </p>
 
 
@@ -656,7 +661,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1160"><code>roles&#x2F;roles_common.js:1160</code></a>
+        <a href="../files/roles_roles_common.js.html#l1191"><code>roles&#x2F;roles_common.js:1191</code></a>
         </p>
 
 
@@ -1471,7 +1476,7 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1133"><code>roles&#x2F;roles_common.js:1133</code></a>
+        <a href="../files/roles_roles_common.js.html#l1164"><code>roles&#x2F;roles_common.js:1164</code></a>
         </p>
 
 
@@ -1522,7 +1527,7 @@ if the role is an assigned role.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1117"><code>roles&#x2F;roles_common.js:1117</code></a>
+        <a href="../files/roles_roles_common.js.html#l1148"><code>roles&#x2F;roles_common.js:1148</code></a>
         </p>
 
 
@@ -1689,7 +1694,7 @@ assigned roles are removed, if <code>null</code>, any role is removed</li>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1060"><code>roles&#x2F;roles_common.js:1060</code></a>
+        <a href="../files/roles_roles_common.js.html#l1091"><code>roles&#x2F;roles_common.js:1091</code></a>
         </p>
 
 
@@ -1772,7 +1777,7 @@ if it is not already.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1100"><code>roles&#x2F;roles_common.js:1100</code></a>
+        <a href="../files/roles_roles_common.js.html#l1131"><code>roles&#x2F;roles_common.js:1131</code></a>
         </p>
 
 
@@ -1851,7 +1856,7 @@ if its name matches <code>roleName</code>, and partition matches <code>partition
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1086"><code>roles&#x2F;roles_common.js:1086</code></a>
+        <a href="../files/roles_roles_common.js.html#l1117"><code>roles&#x2F;roles_common.js:1117</code></a>
         </p>
 
 
@@ -1892,6 +1897,115 @@ if its name matches <code>roleName</code>.</p>
         </div>
 
 
+</div>
+<div id="method__usersInRoleQuery" class="method item private">
+    <h3 class="name"><code>_usersInRoleQuery</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[queryOptions]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l912"><code>roles&#x2F;roles_common.js:912</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">String | Array</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles. If array, users
+returned will have at least one of the roles
+specified but need not have <em>all</em> roles.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>partition</code>: name of the partition to restrict roles to; user's global
+roles will also be checked</li>
+<li><code>anyPartition</code>: if set, role can be in any partition (<code>partition</code> option is ignored)</li>
+<li><code>queryOptions</code>: options which are passed directly
+through to <code>Meteor.users.find(query, options)</code></li>
+</ul>
+<p>Alternatively, it can be a partition name string.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[queryOptions]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>Meteor.users.find(query, options)</code></p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>Object with <code>query</code> and <code>queryOptions</code>.</p>
+
+            </div>
+        </div>
+
+
 </div>
 <div id="method_addRoleParent" class="method item">
     <h3 class="name"><code>addRoleParent</code></h3>
@@ -2292,7 +2406,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l953"><code>roles&#x2F;roles_common.js:953</code></a>
+        <a href="../files/roles_roles_common.js.html#l984"><code>roles&#x2F;roles_common.js:984</code></a>
         </p>
 
 
@@ -2336,7 +2450,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l969"><code>roles&#x2F;roles_common.js:969</code></a>
+        <a href="../files/roles_roles_common.js.html#l1000"><code>roles&#x2F;roles_common.js:1000</code></a>
         </p>
 
 
@@ -2611,7 +2725,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1037"><code>roles&#x2F;roles_common.js:1037</code></a>
+        <a href="../files/roles_roles_common.js.html#l1068"><code>roles&#x2F;roles_common.js:1068</code></a>
         </p>
 
 
@@ -2839,7 +2953,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1001"><code>roles&#x2F;roles_common.js:1001</code></a>
+        <a href="../files/roles_roles_common.js.html#l1032"><code>roles&#x2F;roles_common.js:1032</code></a>
         </p>
 
 
diff --git a/docs/data.json b/docs/data.json
index 1d6e5ba13f..295d923ce6 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -542,7 +542,41 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 953,
+            "line": 912,
+            "itemtype": "method",
+            "name": "_usersInRoleQuery",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
+                    "type": "String|Array"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `partition`: name of the partition to restrict roles to; user's global\n    roles will also be checked\n  - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a partition name string.",
+                    "type": "Object|String",
+                    "optional": true
+                },
+                {
+                    "name": "queryOptions",
+                    "description": "Options which are passed directly\n                               through to `Meteor.users.find(query, options)`",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Object with `query` and `queryOptions`.",
+                "type": "Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 984,
             "description": "Deprecated. Use `getPartitionsForUser` instead.",
             "itemtype": "method",
             "name": "getGroupsForUser",
@@ -553,7 +587,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 969,
+            "line": 1000,
             "description": "Retrieve users partitions, if any.",
             "itemtype": "method",
             "name": "getPartitionsForUser",
@@ -580,7 +614,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1001,
+            "line": 1032,
             "description": "Rename a partition.\n\nRoles assigned with a given partition are changed to be under the new partition.",
             "itemtype": "method",
             "name": "renamePartition",
@@ -602,7 +636,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1037,
+            "line": 1068,
             "description": "Remove a partition.\n\nRoles assigned with a given partition are removed.",
             "itemtype": "method",
             "name": "removePartition",
@@ -619,7 +653,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1060,
+            "line": 1091,
             "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
             "name": "_resolveUser",
@@ -647,7 +681,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1086,
+            "line": 1117,
             "itemtype": "method",
             "name": "_roleMatcher",
             "params": [
@@ -669,7 +703,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1100,
+            "line": 1131,
             "itemtype": "method",
             "name": "_roleAndPartitionMatcher",
             "params": [
@@ -696,7 +730,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1117,
+            "line": 1148,
             "itemtype": "method",
             "name": "_partitionMatcher",
             "params": [
@@ -718,7 +752,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1133,
+            "line": 1164,
             "itemtype": "method",
             "name": "_onlyAssignedMatcher",
             "return": {
@@ -733,7 +767,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1146,
+            "line": 1177,
             "description": "Throw an exception if `roleName` is an invalid role name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -752,7 +786,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1160,
+            "line": 1191,
             "description": "Throw an exception if `partitionName` is an invalid partition name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -771,7 +805,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1176,
+            "line": 1207,
             "params": [
                 {
                     "name": "string",
@@ -1073,7 +1107,7 @@
     "warnings": [
         {
             "message": "Missing item type",
-            "line": " roles/roles_common.js:1176"
+            "line": " roles/roles_common.js:1207"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 34ae0a7b26..c576ac9dae 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -987,6 +987,34 @@ _.extend(Roles, {
    * @static
    */
   getUsersInRole: function (roles, options, queryOptions) {
+    var result;
+
+    result = Roles._usersInRoleQuery(roles, options, queryOptions);
+
+    return Meteor.users.find(result.query, result.queryOptions);
+  },
+
+  /**
+   * @method _usersInRoleQuery
+   * @param {String|Array} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;partition&#x60;: name of the partition to restrict roles to; user&#x27;s global
+   *     roles will also be checked
+   *   - &#x60;anyPartition&#x60;: if set, role can be in any partition (&#x60;partition&#x60; option is ignored)
+   *   - &#x60;queryOptions&#x60;: options which are passed directly
+   *     through to &#x60;Meteor.users.find(query, options)&#x60;
+   *
+   * Alternatively, it can be a partition name string.
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to &#x60;Meteor.users.find(query, options)&#x60;
+   * @return {Object} Object with &#x60;query&#x60; and &#x60;queryOptions&#x60;.
+   * @private
+   * @static
+   */
+  _usersInRoleQuery: function (roles, options, queryOptions) {
     var query;
 
     options = options || {};
@@ -1032,7 +1060,10 @@ _.extend(Roles, {
       };
     }
 
-    return Meteor.users.find(query, options.queryOptions);
+    return {
+      query: query,
+      queryOptions: options.queryOptions
+    }
   },
 
   /**

From f10eadd223cf050118fb54a2e0304f9d5d215b79 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 20:37:02 -0800
Subject: [PATCH 0237/1140] Fixed documentation.

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 397c6a2afc..c50520f801 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1002,7 +1002,7 @@ _.extend(Roles, {
    *
    * @method getPartitionsForUser
    * @param {String|Object} user User ID or an actual user object.
-   * @param {String} [roles] Name of roles to restrict partitions to.
+   * @param {String|Array} [roles] Name of roles to restrict partitions to.
    *
    * @return {Array} Array of user's partitions, unsorted.
    * @static

From c07767d6e0c792e774a156788ee5fad52163c2d3 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 20:38:57 -0800
Subject: [PATCH 0238/1140] Added tests for multiple roles in getGroupsForUser.

Based on the pull request #148 by @ubald.
---
 roles/tests/server.js | 66 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 8 deletions(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 381e5af6be..11dd5aa25b 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1,7 +1,7 @@
 ;(function () {
 
   var users = {},
-      roles = ['admin','editor','user'];
+      roles = ['admin', 'editor', 'user'];
 
   // use to run individual tests
   //Tinytest.oadd = Tinytest.add
@@ -787,8 +787,8 @@
       testUser(test, 'bob', ['admin', 'editor', 'user'], 'partition1');
       testUser(test, 'joe', [], 'partition1');
       testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin','editor'], 'partition2');
-      testUser(test, 'joe', ['admin','editor'], 'partition2');
+      testUser(test, 'bob', ['admin', 'editor'], 'partition2');
+      testUser(test, 'joe', ['admin', 'editor'], 'partition2');
 
       Roles.setUserRoles([eve, bob], ['user'], 'partition1');
       Roles.setUserRoles([eve, joe], ['editor'], 'partition2');
@@ -796,7 +796,7 @@
       testUser(test, 'bob', ['user'], 'partition1');
       testUser(test, 'joe', [], 'partition1');
       testUser(test, 'eve', ['editor'], 'partition2');
-      testUser(test, 'bob', ['admin','editor'], 'partition2');
+      testUser(test, 'bob', ['admin', 'editor'], 'partition2');
       testUser(test, 'joe', ['editor'], 'partition2');
 
       Roles.setUserRoles(bob, 'editor', 'partition1');
@@ -804,7 +804,7 @@
       testUser(test, 'bob', ['editor'], 'partition1');
       testUser(test, 'joe', [], 'partition1');
       testUser(test, 'eve', ['editor'], 'partition2');
-      testUser(test, 'bob', ['admin','editor'], 'partition2');
+      testUser(test, 'bob', ['admin', 'editor'], 'partition2');
       testUser(test, 'joe', ['editor'], 'partition2');
 
       Roles.setUserRoles([bob, users.joe], [], 'partition1');
@@ -812,7 +812,7 @@
       testUser(test, 'bob', [], 'partition1');
       testUser(test, 'joe', [], 'partition1');
       testUser(test, 'eve', ['editor'], 'partition2');
-      testUser(test, 'bob', ['admin','editor'], 'partition2');
+      testUser(test, 'bob', ['admin', 'editor'], 'partition2');
       testUser(test, 'joe', ['editor'], 'partition2');
     });
 
@@ -1177,13 +1177,55 @@
       // by userId
       test.equal(Roles.getPartitionsForUser(userId), []);
       test.equal(Roles.getPartitionsForUser(userId, 'editor'), []);
+      test.equal(Roles.getPartitionsForUser(userId, ['editor']), []);
+      test.equal(Roles.getPartitionsForUser(userId, ['editor', 'user']), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
       test.equal(Roles.getPartitionsForUser(userObj), []);
       test.equal(Roles.getPartitionsForUser(userObj, 'editor'), []);
+      test.equal(Roles.getPartitionsForUser(userObj, ['editor']), []);
+      test.equal(Roles.getPartitionsForUser(userObj, ['editor', 'user']), []);
+    });
+
+  Tinytest.add(
+    'roles - can get all groups for user by role array',
+    function (test) {
+      reset();
+
+      var userId = users.eve,
+          userObj;
+
+      Roles.createRole('user');
+      Roles.createRole('editor');
+      Roles.createRole('moderator');
+      Roles.createRole('admin');
+
+      Roles.addUsersToRoles([users.eve], ['editor'], 'group1');
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2');
+      Roles.addUsersToRoles([users.eve], ['moderator'], 'group3');
+
+      // by userId, one role
+      test.equal(Roles.getPartitionsForUser(userId, ['user']), ['group2']);
+      test.equal(Roles.getPartitionsForUser(userId, ['editor']), ['group1', 'group2']);
+      test.equal(Roles.getPartitionsForUser(userId, ['admin']), []);
+
+      // by userId, multiple roles
+      test.equal(Roles.getPartitionsForUser(userId, ['editor', 'user']), ['group1', 'group2']);
+      test.equal(Roles.getPartitionsForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
+      test.equal(Roles.getPartitionsForUser(userId, ['user', 'moderator']), ['group2', 'group3']);
+
+      // by user object, one role
+      userObj = Meteor.users.findOne({_id: userId});
+      test.equal(Roles.getPartitionsForUser(userObj, ['user']), ['group2']);
+      test.equal(Roles.getPartitionsForUser(userObj, ['editor']), ['group1', 'group2']);
+      test.equal(Roles.getPartitionsForUser(userObj, ['admin']), []);
+
+      // by user object, multiple roles
+      test.equal(Roles.getPartitionsForUser(userObj, ['editor', 'user']), ['group1', 'group2']);
+      test.equal(Roles.getPartitionsForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
+      test.equal(Roles.getPartitionsForUser(userObj, ['user', 'moderator']), ['group2', 'group3']);
     });
-  
   
   Tinytest.add(
     'roles - getting all partitions for user does not include GLOBAL_PARTITION', 
@@ -1205,12 +1247,20 @@
       test.equal(Roles.getPartitionsForUser(userId, 'user'), ['partition2']);
       test.equal(Roles.getPartitionsForUser(userId, 'editor'), ['partition1', 'partition2']);
       test.equal(Roles.getPartitionsForUser(userId, 'admin'), []);
+      test.equal(Roles.getPartitionsForUser(userId, ['user']), ['partition2']);
+      test.equal(Roles.getPartitionsForUser(userId, ['editor']), ['partition1', 'partition2']);
+      test.equal(Roles.getPartitionsForUser(userId, ['admin']), []);
+      test.equal(Roles.getPartitionsForUser(userId, ['user', 'editor', 'admin']), ['partition1', 'partition2']);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
       test.equal(Roles.getPartitionsForUser(userObj, 'user'), ['partition2']);
       test.equal(Roles.getPartitionsForUser(userObj, 'editor'), ['partition1', 'partition2']);
       test.equal(Roles.getPartitionsForUser(userObj, 'admin'), []);
+      test.equal(Roles.getPartitionsForUser(userObj, ['user']), ['partition2']);
+      test.equal(Roles.getPartitionsForUser(userObj, ['editor']), ['partition1', 'partition2']);
+      test.equal(Roles.getPartitionsForUser(userObj, ['admin']), []);
+      test.equal(Roles.getPartitionsForUser(userObj, ['user', 'editor', 'admin']), ['partition1', 'partition2']);
     });
 
 
@@ -1303,7 +1353,7 @@
       Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'partition1');
       Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
 
-      var results = Roles.getUsersInRole('admin','partition1', { fields: { username: 0 }, limit: 1 }).fetch();
+      var results = Roles.getUsersInRole('admin', 'partition1', { fields: { username: 0 }, limit: 1 }).fetch();
 
       test.equal(1, results.length);
       test.isTrue(results[0].hasOwnProperty('_id'));

From d1433f9383d805bb79949218cc12410400377915 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 20:53:46 -0800
Subject: [PATCH 0239/1140] Updated documentation.

---
 docs/classes/Roles.html               | 2 +-
 docs/data.json                        | 2 +-
 docs/files/roles_roles_common.js.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 90838c7e9c..333d13cd1a 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -2479,7 +2479,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
                 </li>
                 <li class="param">
                         <code class="param-name optional">[roles]</code>
-                        <span class="type">String</span>
+                        <span class="type">String | Array</span>
                         <span class="flag optional" title="This parameter is optional.">optional</span>
 
 
diff --git a/docs/data.json b/docs/data.json
index 295d923ce6..a1e6003a0f 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -600,7 +600,7 @@
                 {
                     "name": "roles",
                     "description": "Name of roles to restrict partitions to.",
-                    "type": "String",
+                    "type": "String|Array",
                     "optional": true
                 }
             ],
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index c576ac9dae..f00b6cd940 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -1087,7 +1087,7 @@ _.extend(Roles, {
    *
    * @method getPartitionsForUser
    * @param {String|Object} user User ID or an actual user object.
-   * @param {String} [roles] Name of roles to restrict partitions to.
+   * @param {String|Array} [roles] Name of roles to restrict partitions to.
    *
    * @return {Array} Array of user&#x27;s partitions, unsorted.
    * @static

From 6c8fffd04d8f8ad21baebcccb9bda222c11014b5 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 22:33:20 -0800
Subject: [PATCH 0240/1140] Allow renaming of roles.

Fixes: #112
---
 roles/roles_common.js | 58 +++++++++++++++++++++++++++++++++++++++++++
 roles/tests/server.js | 49 ++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index c50520f801..6c0f4db985 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -138,6 +138,64 @@ _.extend(Roles, {
     Meteor.roles.remove({_id: roleName});
   },
 
+  /**
+   * Rename an existing role.
+   *
+   * @method renameRole
+   * @param {String} oldName Old name of a role.
+   * @param {String} newName New name of a role.
+   * @static
+   */
+  renameRole: function (oldName, newName) {
+    var role,
+        count;
+
+    Roles._checkRoleName(oldName);
+    Roles._checkRoleName(newName);
+
+    if (oldName === newName) return;
+
+    role = Meteor.roles.findOne({_id: oldName});
+
+    if (!role) {
+      throw new Error("Role '" + oldName + "' does not exist.");
+    }
+
+    role._id = newName;
+
+    Meteor.roles.insert(role);
+
+    do {
+      count = Meteor.users.update({
+        roles: {
+          $elemMatch: {
+            _id: oldName
+          }
+        }
+      }, {
+        $set: {
+          'roles.$._id': newName
+        }
+      }, {multi: true});
+    } while (count > 0);
+
+    do {
+      count = Meteor.roles.update({
+        children: {
+          $elemMatch: {
+            _id: oldName
+          }
+        }
+      }, {
+        $set: {
+          'children.$._id': newName
+        }
+      }, {multi: true});
+    } while (count > 0);
+
+    Meteor.roles.remove({_id: oldName});
+  },
+
   /**
    * Add role parent to the role.
    *
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 11dd5aa25b..6a74295f93 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1452,6 +1452,55 @@
       testUser(test, 'joe', ['admin'], 'example.k12.va.us');
     });
 
+  Tinytest.add(
+    'roles - renaming of roles',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+
+      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'partition1');
+      Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'partition2');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'partition2'));
+
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'partition2'));
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'user', 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.joe, 'user', 'partition1'));
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'partition2'));
+      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'partition2'));
+      test.isTrue(Roles.userIsInRole(users.joe, 'user', 'partition2'));
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'partition2'));
+
+      Roles.renameRole('user', 'user2');
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'partition2'));
+
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'partition2'));
+
+      test.isTrue(Roles.userIsInRole(users.eve, 'user2', 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.joe, 'user2', 'partition1'));
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'partition2'));
+      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'partition2'));
+      test.isTrue(Roles.userIsInRole(users.joe, 'user2', 'partition2'));
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'partition2'));
+    });
+
   Tinytest.add(
     'roles - migration without global groups',
     function (test) {

From b89f7b6e2a9c2e9c56f21e864a3c1a3d6dbcec81 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 16 Jan 2016 22:33:42 -0800
Subject: [PATCH 0241/1140] Generated documentation.

---
 docs/classes/Roles.html               | 122 +++++++++++++++++++++-----
 docs/data.json                        |  72 +++++++++------
 docs/files/roles_roles_common.js.html |  58 ++++++++++++
 3 files changed, 203 insertions(+), 49 deletions(-)

diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 333d13cd1a..ff9d7a26d4 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -294,6 +294,11 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method">
+                                <a href="#method_renameRole">renameRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method">
                                 <a href="#method_setUserRoles">setUserRoles</a>
 
@@ -363,7 +368,7 @@
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l417"><code>roles&#x2F;roles_common.js:417</code></a>
+        <a href="../files/roles_roles_common.js.html#l475"><code>roles&#x2F;roles_common.js:475</code></a>
         </p>
 
 
@@ -458,7 +463,7 @@ only that it does not force the value to <code>false</code> if the role is alrea
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l658"><code>roles&#x2F;roles_common.js:658</code></a>
+        <a href="../files/roles_roles_common.js.html#l716"><code>roles&#x2F;roles_common.js:716</code></a>
         </p>
 
 
@@ -605,7 +610,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1177"><code>roles&#x2F;roles_common.js:1177</code></a>
+        <a href="../files/roles_roles_common.js.html#l1235"><code>roles&#x2F;roles_common.js:1235</code></a>
         </p>
 
 
@@ -661,7 +666,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1191"><code>roles&#x2F;roles_common.js:1191</code></a>
+        <a href="../files/roles_roles_common.js.html#l1249"><code>roles&#x2F;roles_common.js:1249</code></a>
         </p>
 
 
@@ -1476,7 +1481,7 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1164"><code>roles&#x2F;roles_common.js:1164</code></a>
+        <a href="../files/roles_roles_common.js.html#l1222"><code>roles&#x2F;roles_common.js:1222</code></a>
         </p>
 
 
@@ -1527,7 +1532,7 @@ if the role is an assigned role.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1148"><code>roles&#x2F;roles_common.js:1148</code></a>
+        <a href="../files/roles_roles_common.js.html#l1206"><code>roles&#x2F;roles_common.js:1206</code></a>
         </p>
 
 
@@ -1598,7 +1603,7 @@ if its partition matches <code>partition</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l590"><code>roles&#x2F;roles_common.js:590</code></a>
+        <a href="../files/roles_roles_common.js.html#l648"><code>roles&#x2F;roles_common.js:648</code></a>
         </p>
 
 
@@ -1694,7 +1699,7 @@ assigned roles are removed, if <code>null</code>, any role is removed</li>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1091"><code>roles&#x2F;roles_common.js:1091</code></a>
+        <a href="../files/roles_roles_common.js.html#l1149"><code>roles&#x2F;roles_common.js:1149</code></a>
         </p>
 
 
@@ -1777,7 +1782,7 @@ if it is not already.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1131"><code>roles&#x2F;roles_common.js:1131</code></a>
+        <a href="../files/roles_roles_common.js.html#l1189"><code>roles&#x2F;roles_common.js:1189</code></a>
         </p>
 
 
@@ -1856,7 +1861,7 @@ if its name matches <code>roleName</code>, and partition matches <code>partition
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1117"><code>roles&#x2F;roles_common.js:1117</code></a>
+        <a href="../files/roles_roles_common.js.html#l1175"><code>roles&#x2F;roles_common.js:1175</code></a>
         </p>
 
 
@@ -1930,7 +1935,7 @@ if its name matches <code>roleName</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l912"><code>roles&#x2F;roles_common.js:912</code></a>
+        <a href="../files/roles_roles_common.js.html#l970"><code>roles&#x2F;roles_common.js:970</code></a>
         </p>
 
 
@@ -2032,7 +2037,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l141"><code>roles&#x2F;roles_common.js:141</code></a>
+        <a href="../files/roles_roles_common.js.html#l199"><code>roles&#x2F;roles_common.js:199</code></a>
         </p>
 
 
@@ -2106,7 +2111,7 @@ parent role set, new subroles are added automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l295"><code>roles&#x2F;roles_common.js:295</code></a>
+        <a href="../files/roles_roles_common.js.html#l353"><code>roles&#x2F;roles_common.js:353</code></a>
         </p>
 
 
@@ -2345,7 +2350,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l866"><code>roles&#x2F;roles_common.js:866</code></a>
+        <a href="../files/roles_roles_common.js.html#l924"><code>roles&#x2F;roles_common.js:924</code></a>
         </p>
 
 
@@ -2406,7 +2411,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l984"><code>roles&#x2F;roles_common.js:984</code></a>
+        <a href="../files/roles_roles_common.js.html#l1042"><code>roles&#x2F;roles_common.js:1042</code></a>
         </p>
 
 
@@ -2450,7 +2455,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1000"><code>roles&#x2F;roles_common.js:1000</code></a>
+        <a href="../files/roles_roles_common.js.html#l1058"><code>roles&#x2F;roles_common.js:1058</code></a>
         </p>
 
 
@@ -2532,7 +2537,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l810"><code>roles&#x2F;roles_common.js:810</code></a>
+        <a href="../files/roles_roles_common.js.html#l868"><code>roles&#x2F;roles_common.js:868</code></a>
         </p>
 
 
@@ -2624,7 +2629,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l881"><code>roles&#x2F;roles_common.js:881</code></a>
+        <a href="../files/roles_roles_common.js.html#l939"><code>roles&#x2F;roles_common.js:939</code></a>
         </p>
 
 
@@ -2725,7 +2730,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1068"><code>roles&#x2F;roles_common.js:1068</code></a>
+        <a href="../files/roles_roles_common.js.html#l1126"><code>roles&#x2F;roles_common.js:1126</code></a>
         </p>
 
 
@@ -2784,7 +2789,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l229"><code>roles&#x2F;roles_common.js:229</code></a>
+        <a href="../files/roles_roles_common.js.html#l287"><code>roles&#x2F;roles_common.js:287</code></a>
         </p>
 
 
@@ -2858,7 +2863,7 @@ parent role set, removed subrole is removed automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l537"><code>roles&#x2F;roles_common.js:537</code></a>
+        <a href="../files/roles_roles_common.js.html#l595"><code>roles&#x2F;roles_common.js:595</code></a>
         </p>
 
 
@@ -2953,7 +2958,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1032"><code>roles&#x2F;roles_common.js:1032</code></a>
+        <a href="../files/roles_roles_common.js.html#l1090"><code>roles&#x2F;roles_common.js:1090</code></a>
         </p>
 
 
@@ -2997,6 +3002,75 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
 
 
 
+</div>
+<div id="method_renameRole" class="method item">
+    <h3 class="name"><code>renameRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldName</code>
+                </li>
+                <li class="arg">
+                        <code>newName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l141"><code>roles&#x2F;roles_common.js:141</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Rename an existing role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Old name of a role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">newName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>New name of a role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method_setUserRoles" class="method item">
     <h3 class="name"><code>setUserRoles</code></h3>
@@ -3026,7 +3100,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l350"><code>roles&#x2F;roles_common.js:350</code></a>
+        <a href="../files/roles_roles_common.js.html#l408"><code>roles&#x2F;roles_common.js:408</code></a>
         </p>
 
 
@@ -3130,7 +3204,7 @@ Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exampl
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l706"><code>roles&#x2F;roles_common.js:706</code></a>
+        <a href="../files/roles_roles_common.js.html#l764"><code>roles&#x2F;roles_common.js:764</code></a>
         </p>
 
 
diff --git a/docs/data.json b/docs/data.json
index a1e6003a0f..b9200256ae 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -208,6 +208,28 @@
         {
             "file": "roles/roles_common.js",
             "line": 141,
+            "description": "Rename an existing role.",
+            "itemtype": "method",
+            "name": "renameRole",
+            "params": [
+                {
+                    "name": "oldName",
+                    "description": "Old name of a role.",
+                    "type": "String"
+                },
+                {
+                    "name": "newName",
+                    "description": "New name of a role.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 199,
             "description": "Add role parent to the role.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
             "itemtype": "method",
             "name": "addRoleParent",
@@ -229,7 +251,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 229,
+            "line": 287,
             "description": "Remove role parent from the role.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
             "itemtype": "method",
             "name": "removeRoleParent",
@@ -251,7 +273,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 295,
+            "line": 353,
             "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
             "example": [
                 "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -282,7 +304,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 350,
+            "line": 408,
             "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
             "example": [
                 "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -313,7 +335,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 417,
+            "line": 475,
             "description": "Add one user to one role.",
             "itemtype": "method",
             "name": "_addUserToRole",
@@ -346,7 +368,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 537,
+            "line": 595,
             "description": "Remove users from assigned roles.",
             "example": [
                 "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
@@ -377,7 +399,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 590,
+            "line": 648,
             "description": "Remove one user from one role.\n\nWARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same\nrole to be a child of multiple roles it might happen that it removes some subroles which\nit should not because they are in effect also through some other parent role. You should always\ncall `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a\nparticular user.",
             "itemtype": "method",
             "name": "_removeUserFromRole",
@@ -406,7 +428,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 658,
+            "line": 716,
             "description": "Makes sure all subroles are correctly set, and no extra subroles are set which should not be.\n\nUsed internally after complicated changes, but it can also be used whenever one feels that\nthere might be inconsistencies (eg., after a crash).\n\nWe simply re-set to the user their assigned roles again and remove any roles which\nare marked as not explicitly assigned, and have not been part of what we currently set.",
             "itemtype": "method",
             "name": "_assureConsistency",
@@ -425,7 +447,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 706,
+            "line": 764,
             "description": "Check if user has specified roles.",
             "example": [
                 "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // partition roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})"
@@ -460,7 +482,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 810,
+            "line": 868,
             "description": "Retrieve user's roles.",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -487,7 +509,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 866,
+            "line": 924,
             "description": "Retrieve cursor of all existing roles.",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -509,7 +531,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 881,
+            "line": 939,
             "description": "Retrieve all users who are in target role.\n\nOptions:",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -542,7 +564,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 912,
+            "line": 970,
             "itemtype": "method",
             "name": "_usersInRoleQuery",
             "params": [
@@ -576,7 +598,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 984,
+            "line": 1042,
             "description": "Deprecated. Use `getPartitionsForUser` instead.",
             "itemtype": "method",
             "name": "getGroupsForUser",
@@ -587,7 +609,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1000,
+            "line": 1058,
             "description": "Retrieve users partitions, if any.",
             "itemtype": "method",
             "name": "getPartitionsForUser",
@@ -614,7 +636,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1032,
+            "line": 1090,
             "description": "Rename a partition.\n\nRoles assigned with a given partition are changed to be under the new partition.",
             "itemtype": "method",
             "name": "renamePartition",
@@ -636,7 +658,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1068,
+            "line": 1126,
             "description": "Remove a partition.\n\nRoles assigned with a given partition are removed.",
             "itemtype": "method",
             "name": "removePartition",
@@ -653,7 +675,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1091,
+            "line": 1149,
             "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
             "name": "_resolveUser",
@@ -681,7 +703,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1117,
+            "line": 1175,
             "itemtype": "method",
             "name": "_roleMatcher",
             "params": [
@@ -703,7 +725,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1131,
+            "line": 1189,
             "itemtype": "method",
             "name": "_roleAndPartitionMatcher",
             "params": [
@@ -730,7 +752,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1148,
+            "line": 1206,
             "itemtype": "method",
             "name": "_partitionMatcher",
             "params": [
@@ -752,7 +774,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1164,
+            "line": 1222,
             "itemtype": "method",
             "name": "_onlyAssignedMatcher",
             "return": {
@@ -767,7 +789,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1177,
+            "line": 1235,
             "description": "Throw an exception if `roleName` is an invalid role name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -786,7 +808,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1191,
+            "line": 1249,
             "description": "Throw an exception if `partitionName` is an invalid partition name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -805,7 +827,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1207,
+            "line": 1265,
             "params": [
                 {
                     "name": "string",
@@ -1107,7 +1129,7 @@
     "warnings": [
         {
             "message": "Missing item type",
-            "line": " roles/roles_common.js:1207"
+            "line": " roles/roles_common.js:1265"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index f00b6cd940..4a0e6f32f2 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -223,6 +223,64 @@ _.extend(Roles, {
     Meteor.roles.remove({_id: roleName});
   },
 
+  /**
+   * Rename an existing role.
+   *
+   * @method renameRole
+   * @param {String} oldName Old name of a role.
+   * @param {String} newName New name of a role.
+   * @static
+   */
+  renameRole: function (oldName, newName) {
+    var role,
+        count;
+
+    Roles._checkRoleName(oldName);
+    Roles._checkRoleName(newName);
+
+    if (oldName === newName) return;
+
+    role = Meteor.roles.findOne({_id: oldName});
+
+    if (!role) {
+      throw new Error(&quot;Role &#x27;&quot; + oldName + &quot;&#x27; does not exist.&quot;);
+    }
+
+    role._id = newName;
+
+    Meteor.roles.insert(role);
+
+    do {
+      count = Meteor.users.update({
+        roles: {
+          $elemMatch: {
+            _id: oldName
+          }
+        }
+      }, {
+        $set: {
+          &#x27;roles.$._id&#x27;: newName
+        }
+      }, {multi: true});
+    } while (count &gt; 0);
+
+    do {
+      count = Meteor.roles.update({
+        children: {
+          $elemMatch: {
+            _id: oldName
+          }
+        }
+      }, {
+        $set: {
+          &#x27;children.$._id&#x27;: newName
+        }
+      }, {multi: true});
+    } while (count &gt; 0);
+
+    Meteor.roles.remove({_id: oldName});
+  },
+
   /**
    * Add role parent to the role.
    *

From 4cb0846e1fc76ebccefbf2777d1e50ae5b2eeccb Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 17 Jan 2016 23:38:53 -0800
Subject: [PATCH 0242/1140] Style.

---
 roles/roles_common.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 6c0f4db985..210ee4a0af 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -778,7 +778,7 @@ _.extend(Roles, {
    *
    * @method userIsInRole
    * @param {String|Object} user User ID or an actual user object.
-   * @param {String|Array} roles Name of role or an array of roles to check against. If array,
+   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
    *                             will return `true` if user is in _any_ role.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
@@ -942,7 +942,7 @@ _.extend(Roles, {
    * Options:
    *
    * @method getUsersInRole
-   * @param {String|Array} roles Name of role or an array of roles. If array, users
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
@@ -969,7 +969,7 @@ _.extend(Roles, {
 
   /**
    * @method _usersInRoleQuery
-   * @param {String|Array} roles Name of role or an array of roles. If array, users
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
@@ -1060,7 +1060,7 @@ _.extend(Roles, {
    *
    * @method getPartitionsForUser
    * @param {String|Object} user User ID or an actual user object.
-   * @param {String|Array} [roles] Name of roles to restrict partitions to.
+   * @param {Array|String} [roles] Name of roles to restrict partitions to.
    *
    * @return {Array} Array of user's partitions, unsorted.
    * @static

From e1495316c0542441f8de815ca2e6daa647f554a4 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 17 Jan 2016 23:45:16 -0800
Subject: [PATCH 0243/1140] Changed to addRolesParent and removeRolesParent
 which accept arrays now.

---
 History.md            |  2 +-
 README.md             |  8 +++---
 roles/roles_common.js | 50 +++++++++++++++++++++++++++------
 roles/tests/server.js | 64 +++++++++++++++++++++----------------------
 4 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/History.md b/History.md
index 8d432a9586..4b58c68c57 100644
--- a/History.md
+++ b/History.md
@@ -9,7 +9,7 @@
 * Functions which modify roles are available both on the client and server side, but should be called on the
   client side only from inside Meteor methods.
 * `deleteRole` can now delete role even when in use, it is automatically unset from all users.
-* Functions `addRoleParent` and `removeRoleParent` were added.
+* Functions `addRolesParent` and `removeRolesParent` were added.
 * `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
 * All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
 
diff --git a/README.md b/README.md
index c50a8ffaa0..26fd94ea65 100644
--- a/README.md
+++ b/README.md
@@ -81,9 +81,9 @@ Roles.createRole('user');
 Roles.createRole('admin');
 Roles.createRole('USERS_VIEW');
 Roles.createRole('POST_EDIT');
-Roles.addRoleParent('USERS_VIEW', 'admin');
-Roles.addRoleParent('POST_EDIT', 'admin');
-Roles.addRoleParent('POST_EDIT', 'user');
+Roles.addRolesParent('USERS_VIEW', 'admin');
+Roles.addRolesParent('POST_EDIT', 'admin');
+Roles.addRolesParent('POST_EDIT', 'user');
 ```
 
 <br />
@@ -179,7 +179,7 @@ Here is the list of important changes between meteor-roles 1.0 and 2.0 to consid
 * Functions which modify roles are available both on the client and server side, but should be called on the
   client side only from inside Meteor methods.
 * `deleteRole` can now delete role even when in use, it is automatically unset from all users.
-* Functions `addRoleParent` and `removeRoleParent` were added.
+* Functions `addRolesParent` and `removeRolesParent` were added.
 * `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
 * All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
 
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 210ee4a0af..9785bcdfec 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -197,17 +197,33 @@ _.extend(Roles, {
   },
 
   /**
-   * Add role parent to the role.
+   * Add role parent to roles.
    *
    * Previous parents are kept (role can have multiple parents). For users which have the
    * parent role set, new subroles are added automatically.
    *
-   * @method addRoleParent
-   * @param {String} roleName Name of role.
+   * @method addRolesParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @static
    */
-  addRoleParent: function (roleName, parentName) {
+  addRolesParent: function (rolesNames, parentName) {
+    // ensure arrays
+    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
+
+    _.each(rolesNames, function (roleName) {
+      Roles._addRoleParent(roleName, parentName);
+    });
+  },
+
+  /**
+   * @method _addRoleParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @private
+   * @static
+   */
+  _addRoleParent: function (roleName, parentName) {
     var role,
         count,
         parentRoles,
@@ -285,17 +301,33 @@ _.extend(Roles, {
   },
 
   /**
-   * Remove role parent from the role.
+   * Remove role parent from roles.
    *
    * Other parents are kept (role can have multiple parents). For users which have the
    * parent role set, removed subrole is removed automatically.
    *
-   * @method removeRoleParent
-   * @param {String} roleName Name of role.
+   * @method removeRolesParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @static
    */
-  removeRoleParent: function (roleName, parentName) {
+  removeRolesParent: function (rolesNames, parentName) {
+    // ensure arrays
+    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
+
+    _.each(rolesNames, function (roleName) {
+      Roles._removeRoleParent(roleName, parentName);
+    });
+  },
+
+  /**
+   * @method _removeRoleParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @private
+   * @static
+   */
+  _removeRoleParent: function (roleName, parentName) {
     var role,
         count,
         parentRoles;
@@ -304,7 +336,7 @@ _.extend(Roles, {
     Roles._checkRoleName(parentName);
 
     // check for role existence
-    // this would not really be needed, but we are trying to match addRoleParent
+    // this would not really be needed, but we are trying to match addRolesParent
     role = Meteor.roles.findOne({_id: roleName}, {fields: {_id: 1}});
 
     if (!role) {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 6a74295f93..6b8324ce5e 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -966,7 +966,7 @@
       }]);
 
       Roles.createRole('PERMISSION');
-      Roles.addRoleParent('PERMISSION', 'user');
+      Roles.addRolesParent('PERMISSION', 'user');
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1'}), [{
         _id: 'admin',
@@ -1672,10 +1672,10 @@
       Roles.createRole('VIEW_PERMISSION');
       Roles.createRole('EDIT_PERMISSION');
       Roles.createRole('DELETE_PERMISSION');
-      Roles.addRoleParent('ALL_PERMISSIONS', 'user');
-      Roles.addRoleParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRoleParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRoleParent('DELETE_PERMISSION', 'admin');
+      Roles.addRolesParent('ALL_PERMISSIONS', 'user');
+      Roles.addRolesParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesParent('DELETE_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, ['user'], 'partition1');
       Roles.addUsersToRoles(users.eve, ['user'], 'partition2');
@@ -1907,10 +1907,10 @@
       Roles.createRole('VIEW_PERMISSION');
       Roles.createRole('EDIT_PERMISSION');
       Roles.createRole('DELETE_PERMISSION');
-      Roles.addRoleParent('ALL_PERMISSIONS', 'user');
-      Roles.addRoleParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRoleParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRoleParent('DELETE_PERMISSION', 'admin');
+      Roles.addRolesParent('ALL_PERMISSIONS', 'user');
+      Roles.addRolesParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesParent('DELETE_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, ['user']);
 
@@ -1984,10 +1984,10 @@
       Roles.createRole('VIEW_PERMISSION');
       Roles.createRole('EDIT_PERMISSION');
       Roles.createRole('DELETE_PERMISSION');
-      Roles.addRoleParent('ALL_PERMISSIONS', 'user');
-      Roles.addRoleParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRoleParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRoleParent('DELETE_PERMISSION', 'admin');
+      Roles.addRolesParent('ALL_PERMISSIONS', 'user');
+      Roles.addRolesParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesParent('DELETE_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, ['user']);
       Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'partition');
@@ -2027,7 +2027,7 @@
 
       Roles.createRole('MODERATE_PERMISSION');
 
-      Roles.addRoleParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
       test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
@@ -2121,7 +2121,7 @@
         assigned: false
       }]);
 
-      Roles.addRoleParent('DELETE_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesParent('DELETE_PERMISSION', 'ALL_PERMISSIONS');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
@@ -2255,15 +2255,15 @@
       Roles.createRole('EXTRA_PERMISSION_ROLE_1');
       Roles.createRole('EXTRA_PERMISSION_ROLE_2');
 
-      Roles.addRoleParent('COMMON_PERMISSION_1', 'role1');
-      Roles.addRoleParent('COMMON_PERMISSION_2', 'role1');
-      Roles.addRoleParent('COMMON_PERMISSION_3', 'role1');
-      Roles.addRoleParent('EXTRA_PERMISSION_ROLE_1', 'role1');
+      Roles.addRolesParent('COMMON_PERMISSION_1', 'role1');
+      Roles.addRolesParent('COMMON_PERMISSION_2', 'role1');
+      Roles.addRolesParent('COMMON_PERMISSION_3', 'role1');
+      Roles.addRolesParent('EXTRA_PERMISSION_ROLE_1', 'role1');
 
-      Roles.addRoleParent('COMMON_PERMISSION_1', 'role2');
-      Roles.addRoleParent('COMMON_PERMISSION_2', 'role2');
-      Roles.addRoleParent('COMMON_PERMISSION_3', 'role2');
-      Roles.addRoleParent('EXTRA_PERMISSION_ROLE_2', 'role2');
+      Roles.addRolesParent('COMMON_PERMISSION_1', 'role2');
+      Roles.addRolesParent('COMMON_PERMISSION_2', 'role2');
+      Roles.addRolesParent('COMMON_PERMISSION_3', 'role2');
+      Roles.addRolesParent('EXTRA_PERMISSION_ROLE_2', 'role2');
 
       Roles.addUsersToRoles(users.eve, 'role1');
       Roles.addUsersToRoles(users.eve, 'role2');
@@ -2414,7 +2414,7 @@
         assigned: true
       }]);
 
-      Roles.addRoleParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesParent('EDIT_PERMISSION', 'admin');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
@@ -2434,7 +2434,7 @@
       Roles.createRole('admin');
       Roles.createRole('EDIT_PERMISSION');
 
-      Roles.addRoleParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesParent('EDIT_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
 
@@ -2447,7 +2447,7 @@
         assigned: true
       }]);
 
-      Roles.removeRoleParent('EDIT_PERMISSION', 'admin');
+      Roles.removeRolesParent('EDIT_PERMISSION', 'admin');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
@@ -2468,7 +2468,7 @@
       Roles.createRole('user');
       Roles.createRole('EDIT_PERMISSION');
 
-      Roles.addRoleParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesParent('EDIT_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
 
@@ -2481,7 +2481,7 @@
         assigned: true
       }]);
 
-      Roles.addRoleParent('EDIT_PERMISSION', 'user');
+      Roles.addRolesParent('EDIT_PERMISSION', 'user');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
@@ -2492,7 +2492,7 @@
         assigned: true
       }]);
 
-      Roles.removeRoleParent('EDIT_PERMISSION', 'user');
+      Roles.removeRolesParent('EDIT_PERMISSION', 'user');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
@@ -2513,11 +2513,11 @@
       Roles.createRole('editor');
       Roles.createRole('user');
 
-      Roles.addRoleParent('editor', 'admin');
-      Roles.addRoleParent('user', 'editor');
+      Roles.addRolesParent('editor', 'admin');
+      Roles.addRolesParent('user', 'editor');
 
       test.throws(function () {
-        Roles.addRoleParent('admin', 'user');
+        Roles.addRolesParent('admin', 'user');
       }, /form a cycle/);
     });
 

From 8c871aa35173eed34464a2d09c360a7a04f20ada Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 17 Jan 2016 23:45:27 -0800
Subject: [PATCH 0244/1140] Generated documentation.

---
 docs/assets/css/external-small.png           | Bin
 docs/assets/css/logo.png                     | Bin
 docs/assets/css/main.css                     |   0
 docs/assets/favicon.ico                      | Bin
 docs/assets/img/spinner.gif                  | Bin
 docs/assets/index.html                       |   0
 docs/assets/js/api-filter.js                 |   0
 docs/assets/js/api-list.js                   |   0
 docs/assets/js/api-search.js                 |   0
 docs/assets/js/apidocs.js                    |   0
 docs/assets/js/yui-prettify.js               |   0
 docs/assets/vendor/prettify/CHANGES.html     |   0
 docs/assets/vendor/prettify/COPYING          |   0
 docs/assets/vendor/prettify/README.html      |   0
 docs/assets/vendor/prettify/prettify-min.css |   0
 docs/assets/vendor/prettify/prettify-min.js  |   0
 docs/classes/Roles.html                      | 344 +++++++++++++------
 docs/data.json                               | 118 +++++--
 docs/files/roles_roles_common.js.html        |  58 +++-
 19 files changed, 373 insertions(+), 147 deletions(-)
 mode change 100644 => 100755 docs/assets/css/external-small.png
 mode change 100644 => 100755 docs/assets/css/logo.png
 mode change 100644 => 100755 docs/assets/css/main.css
 mode change 100644 => 100755 docs/assets/favicon.ico
 mode change 100644 => 100755 docs/assets/img/spinner.gif
 mode change 100644 => 100755 docs/assets/index.html
 mode change 100644 => 100755 docs/assets/js/api-filter.js
 mode change 100644 => 100755 docs/assets/js/api-list.js
 mode change 100644 => 100755 docs/assets/js/api-search.js
 mode change 100644 => 100755 docs/assets/js/apidocs.js
 mode change 100644 => 100755 docs/assets/js/yui-prettify.js
 mode change 100644 => 100755 docs/assets/vendor/prettify/CHANGES.html
 mode change 100644 => 100755 docs/assets/vendor/prettify/COPYING
 mode change 100644 => 100755 docs/assets/vendor/prettify/README.html
 mode change 100644 => 100755 docs/assets/vendor/prettify/prettify-min.css
 mode change 100644 => 100755 docs/assets/vendor/prettify/prettify-min.js

diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
old mode 100644
new mode 100755
diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
old mode 100644
new mode 100755
diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
old mode 100644
new mode 100755
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
old mode 100644
new mode 100755
diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
old mode 100644
new mode 100755
diff --git a/docs/assets/index.html b/docs/assets/index.html
old mode 100644
new mode 100755
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
old mode 100644
new mode 100755
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index ff9d7a26d4..646922be5e 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -113,6 +113,11 @@
                     <h3>Methods</h3>
 
                     <ul class="index-list methods">
+                            <li class="index-item method private">
+                                <a href="#method__addRoleParent">_addRoleParent</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__addUserToRole">_addUserToRole</a>
 
@@ -203,6 +208,11 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__removeRoleParent">_removeRoleParent</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__removeUserFromRole">_removeUserFromRole</a>
 
@@ -229,7 +239,7 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_addRoleParent">addRoleParent</a>
+                                <a href="#method_addRolesParent">addRolesParent</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -280,7 +290,7 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_removeRoleParent">removeRoleParent</a>
+                                <a href="#method_removeRolesParent">removeRolesParent</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -336,6 +346,75 @@
             <div id="methods" class="api-class-tabpanel">
                 <h2 class="off-left">Methods</h2>
 
+<div id="method__addRoleParent" class="method item private">
+    <h3 class="name"><code>_addRoleParent</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l219"><code>roles&#x2F;roles_common.js:219</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
 <div id="method__addUserToRole" class="method item private">
     <h3 class="name"><code>_addUserToRole</code></h3>
 
@@ -368,7 +447,7 @@
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l475"><code>roles&#x2F;roles_common.js:475</code></a>
+        <a href="../files/roles_roles_common.js.html#l507"><code>roles&#x2F;roles_common.js:507</code></a>
         </p>
 
 
@@ -463,7 +542,7 @@ only that it does not force the value to <code>false</code> if the role is alrea
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l716"><code>roles&#x2F;roles_common.js:716</code></a>
+        <a href="../files/roles_roles_common.js.html#l748"><code>roles&#x2F;roles_common.js:748</code></a>
         </p>
 
 
@@ -586,62 +665,6 @@ no subroles.</p>
 
 
 
-</div>
-<div id="method__checkRoleName" class="method item private">
-    <h3 class="name"><code>_checkRoleName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1235"><code>roles&#x2F;roles_common.js:1235</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Throw an exception if <code>roleName</code> is an invalid role name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A role name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
 </div>
 <div id="method__checkRoleName" class="method item private">
     <h3 class="name"><code>_checkRoleName</code></h3>
@@ -666,7 +689,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1249"><code>roles&#x2F;roles_common.js:1249</code></a>
+        <a href="../files/roles_roles_common.js.html#l1281"><code>roles&#x2F;roles_common.js:1281</code></a>
         </p>
 
 
@@ -698,6 +721,62 @@ no subroles.</p>
 
 
 
+</div>
+<div id="method__checkRoleName" class="method item private">
+    <h3 class="name"><code>_checkRoleName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1267"><code>roles&#x2F;roles_common.js:1267</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Throw an exception if <code>roleName</code> is an invalid role name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A role name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method__convertToNewField" class="method item private">
     <h3 class="name"><code>_convertToNewField</code></h3>
@@ -1481,7 +1560,7 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1222"><code>roles&#x2F;roles_common.js:1222</code></a>
+        <a href="../files/roles_roles_common.js.html#l1254"><code>roles&#x2F;roles_common.js:1254</code></a>
         </p>
 
 
@@ -1532,7 +1611,7 @@ if the role is an assigned role.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1206"><code>roles&#x2F;roles_common.js:1206</code></a>
+        <a href="../files/roles_roles_common.js.html#l1238"><code>roles&#x2F;roles_common.js:1238</code></a>
         </p>
 
 
@@ -1573,6 +1652,75 @@ if its partition matches <code>partition</code>.</p>
         </div>
 
 
+</div>
+<div id="method__removeRoleParent" class="method item private">
+    <h3 class="name"><code>_removeRoleParent</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l323"><code>roles&#x2F;roles_common.js:323</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method__removeUserFromRole" class="method item private">
     <h3 class="name"><code>_removeUserFromRole</code></h3>
@@ -1603,7 +1751,7 @@ if its partition matches <code>partition</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l648"><code>roles&#x2F;roles_common.js:648</code></a>
+        <a href="../files/roles_roles_common.js.html#l680"><code>roles&#x2F;roles_common.js:680</code></a>
         </p>
 
 
@@ -1699,7 +1847,7 @@ assigned roles are removed, if <code>null</code>, any role is removed</li>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1149"><code>roles&#x2F;roles_common.js:1149</code></a>
+        <a href="../files/roles_roles_common.js.html#l1181"><code>roles&#x2F;roles_common.js:1181</code></a>
         </p>
 
 
@@ -1782,7 +1930,7 @@ if it is not already.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1189"><code>roles&#x2F;roles_common.js:1189</code></a>
+        <a href="../files/roles_roles_common.js.html#l1221"><code>roles&#x2F;roles_common.js:1221</code></a>
         </p>
 
 
@@ -1861,7 +2009,7 @@ if its name matches <code>roleName</code>, and partition matches <code>partition
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1175"><code>roles&#x2F;roles_common.js:1175</code></a>
+        <a href="../files/roles_roles_common.js.html#l1207"><code>roles&#x2F;roles_common.js:1207</code></a>
         </p>
 
 
@@ -1935,7 +2083,7 @@ if its name matches <code>roleName</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l970"><code>roles&#x2F;roles_common.js:970</code></a>
+        <a href="../files/roles_roles_common.js.html#l1002"><code>roles&#x2F;roles_common.js:1002</code></a>
         </p>
 
 
@@ -1952,7 +2100,7 @@ if its name matches <code>roleName</code>.</p>
             <ul class="params-list">
                 <li class="param">
                         <code class="param-name">roles</code>
-                        <span class="type">String | Array</span>
+                        <span class="type">Array | String</span>
 
 
                     <div class="param-description">
@@ -2012,13 +2160,13 @@ through to <code>Meteor.users.find(query, options)</code></p>
 
 
 </div>
-<div id="method_addRoleParent" class="method item">
-    <h3 class="name"><code>addRoleParent</code></h3>
+<div id="method_addRolesParent" class="method item">
+    <h3 class="name"><code>addRolesParent</code></h3>
 
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
                 <li class="arg">
-                        <code>roleName</code>
+                        <code>rolesNames</code>
                 </li>
                 <li class="arg">
                         <code>parentName</code>
@@ -2045,7 +2193,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     </div>
 
     <div class="description">
-        <p>Add role parent to the role.</p>
+        <p>Add role parent to roles.</p>
 <p>Previous parents are kept (role can have multiple parents). For users which have the
 parent role set, new subroles are added automatically.</p>
 
@@ -2056,12 +2204,12 @@ parent role set, new subroles are added automatically.</p>
 
             <ul class="params-list">
                 <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
+                        <code class="param-name">rolesNames</code>
+                        <span class="type">Array | String</span>
 
 
                     <div class="param-description">
-                        <p>Name of role.</p>
+                        <p>Name(s) of role(s).</p>
 
                     </div>
 
@@ -2111,7 +2259,7 @@ parent role set, new subroles are added automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l353"><code>roles&#x2F;roles_common.js:353</code></a>
+        <a href="../files/roles_roles_common.js.html#l385"><code>roles&#x2F;roles_common.js:385</code></a>
         </p>
 
 
@@ -2350,7 +2498,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l924"><code>roles&#x2F;roles_common.js:924</code></a>
+        <a href="../files/roles_roles_common.js.html#l956"><code>roles&#x2F;roles_common.js:956</code></a>
         </p>
 
 
@@ -2411,7 +2559,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1042"><code>roles&#x2F;roles_common.js:1042</code></a>
+        <a href="../files/roles_roles_common.js.html#l1074"><code>roles&#x2F;roles_common.js:1074</code></a>
         </p>
 
 
@@ -2455,7 +2603,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1058"><code>roles&#x2F;roles_common.js:1058</code></a>
+        <a href="../files/roles_roles_common.js.html#l1090"><code>roles&#x2F;roles_common.js:1090</code></a>
         </p>
 
 
@@ -2484,7 +2632,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
                 </li>
                 <li class="param">
                         <code class="param-name optional">[roles]</code>
-                        <span class="type">String | Array</span>
+                        <span class="type">Array | String</span>
                         <span class="flag optional" title="This parameter is optional.">optional</span>
 
 
@@ -2537,7 +2685,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l868"><code>roles&#x2F;roles_common.js:868</code></a>
+        <a href="../files/roles_roles_common.js.html#l900"><code>roles&#x2F;roles_common.js:900</code></a>
         </p>
 
 
@@ -2629,7 +2777,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l939"><code>roles&#x2F;roles_common.js:939</code></a>
+        <a href="../files/roles_roles_common.js.html#l971"><code>roles&#x2F;roles_common.js:971</code></a>
         </p>
 
 
@@ -2648,7 +2796,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
             <ul class="params-list">
                 <li class="param">
                         <code class="param-name">roles</code>
-                        <span class="type">String | Array</span>
+                        <span class="type">Array | String</span>
 
 
                     <div class="param-description">
@@ -2730,7 +2878,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1126"><code>roles&#x2F;roles_common.js:1126</code></a>
+        <a href="../files/roles_roles_common.js.html#l1158"><code>roles&#x2F;roles_common.js:1158</code></a>
         </p>
 
 
@@ -2764,13 +2912,13 @@ through to <code>Meteor.users.find(query, options)</code></p>
 
 
 </div>
-<div id="method_removeRoleParent" class="method item">
-    <h3 class="name"><code>removeRoleParent</code></h3>
+<div id="method_removeRolesParent" class="method item">
+    <h3 class="name"><code>removeRolesParent</code></h3>
 
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
                 <li class="arg">
-                        <code>roleName</code>
+                        <code>rolesNames</code>
                 </li>
                 <li class="arg">
                         <code>parentName</code>
@@ -2789,7 +2937,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l287"><code>roles&#x2F;roles_common.js:287</code></a>
+        <a href="../files/roles_roles_common.js.html#l303"><code>roles&#x2F;roles_common.js:303</code></a>
         </p>
 
 
@@ -2797,7 +2945,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     </div>
 
     <div class="description">
-        <p>Remove role parent from the role.</p>
+        <p>Remove role parent from roles.</p>
 <p>Other parents are kept (role can have multiple parents). For users which have the
 parent role set, removed subrole is removed automatically.</p>
 
@@ -2808,12 +2956,12 @@ parent role set, removed subrole is removed automatically.</p>
 
             <ul class="params-list">
                 <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
+                        <code class="param-name">rolesNames</code>
+                        <span class="type">Array | String</span>
 
 
                     <div class="param-description">
-                        <p>Name of role.</p>
+                        <p>Name(s) of role(s).</p>
 
                     </div>
 
@@ -2863,7 +3011,7 @@ parent role set, removed subrole is removed automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l595"><code>roles&#x2F;roles_common.js:595</code></a>
+        <a href="../files/roles_roles_common.js.html#l627"><code>roles&#x2F;roles_common.js:627</code></a>
         </p>
 
 
@@ -2958,7 +3106,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1090"><code>roles&#x2F;roles_common.js:1090</code></a>
+        <a href="../files/roles_roles_common.js.html#l1122"><code>roles&#x2F;roles_common.js:1122</code></a>
         </p>
 
 
@@ -3100,7 +3248,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l408"><code>roles&#x2F;roles_common.js:408</code></a>
+        <a href="../files/roles_roles_common.js.html#l440"><code>roles&#x2F;roles_common.js:440</code></a>
         </p>
 
 
@@ -3204,7 +3352,7 @@ Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exampl
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l764"><code>roles&#x2F;roles_common.js:764</code></a>
+        <a href="../files/roles_roles_common.js.html#l796"><code>roles&#x2F;roles_common.js:796</code></a>
         </p>
 
 
@@ -3233,7 +3381,7 @@ Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exampl
                 </li>
                 <li class="param">
                         <code class="param-name">roles</code>
-                        <span class="type">String | Array</span>
+                        <span class="type">Array | String</span>
 
 
                     <div class="param-description">
diff --git a/docs/data.json b/docs/data.json
index b9200256ae..2299f23e9a 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -230,14 +230,14 @@
         {
             "file": "roles/roles_common.js",
             "line": 199,
-            "description": "Add role parent to the role.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
+            "description": "Add role parent to roles.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
             "itemtype": "method",
-            "name": "addRoleParent",
+            "name": "addRolesParent",
             "params": [
                 {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
+                    "name": "rolesNames",
+                    "description": "Name(s) of role(s).",
+                    "type": "Array|String"
                 },
                 {
                     "name": "parentName",
@@ -251,10 +251,9 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 287,
-            "description": "Remove role parent from the role.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
+            "line": 219,
             "itemtype": "method",
-            "name": "removeRoleParent",
+            "name": "_addRoleParent",
             "params": [
                 {
                     "name": "roleName",
@@ -267,13 +266,60 @@
                     "type": "String"
                 }
             ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 303,
+            "description": "Remove role parent from roles.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
+            "itemtype": "method",
+            "name": "removeRolesParent",
+            "params": [
+                {
+                    "name": "rolesNames",
+                    "description": "Name(s) of role(s).",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
             "static": 1,
             "class": "Roles",
             "module": "Roles"
         },
         {
             "file": "roles/roles_common.js",
-            "line": 353,
+            "line": 323,
+            "itemtype": "method",
+            "name": "_removeRoleParent",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 385,
             "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
             "example": [
                 "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -304,7 +350,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 408,
+            "line": 440,
             "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
             "example": [
                 "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -335,7 +381,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 475,
+            "line": 507,
             "description": "Add one user to one role.",
             "itemtype": "method",
             "name": "_addUserToRole",
@@ -368,7 +414,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 595,
+            "line": 627,
             "description": "Remove users from assigned roles.",
             "example": [
                 "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
@@ -399,7 +445,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 648,
+            "line": 680,
             "description": "Remove one user from one role.\n\nWARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same\nrole to be a child of multiple roles it might happen that it removes some subroles which\nit should not because they are in effect also through some other parent role. You should always\ncall `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a\nparticular user.",
             "itemtype": "method",
             "name": "_removeUserFromRole",
@@ -428,7 +474,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 716,
+            "line": 748,
             "description": "Makes sure all subroles are correctly set, and no extra subroles are set which should not be.\n\nUsed internally after complicated changes, but it can also be used whenever one feels that\nthere might be inconsistencies (eg., after a crash).\n\nWe simply re-set to the user their assigned roles again and remove any roles which\nare marked as not explicitly assigned, and have not been part of what we currently set.",
             "itemtype": "method",
             "name": "_assureConsistency",
@@ -447,7 +493,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 764,
+            "line": 796,
             "description": "Check if user has specified roles.",
             "example": [
                 "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // partition roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})"
@@ -463,7 +509,7 @@
                 {
                     "name": "roles",
                     "description": "Name of role or an array of roles to check against. If array,\n                            will return `true` if user is in _any_ role.\n                            Roles do not have to exist.",
-                    "type": "String|Array"
+                    "type": "Array|String"
                 },
                 {
                     "name": "options",
@@ -482,7 +528,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 868,
+            "line": 900,
             "description": "Retrieve user's roles.",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -509,7 +555,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 924,
+            "line": 956,
             "description": "Retrieve cursor of all existing roles.",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -531,7 +577,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 939,
+            "line": 971,
             "description": "Retrieve all users who are in target role.\n\nOptions:",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -539,7 +585,7 @@
                 {
                     "name": "roles",
                     "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "String|Array"
+                    "type": "Array|String"
                 },
                 {
                     "name": "options",
@@ -564,14 +610,14 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 970,
+            "line": 1002,
             "itemtype": "method",
             "name": "_usersInRoleQuery",
             "params": [
                 {
                     "name": "roles",
                     "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "String|Array"
+                    "type": "Array|String"
                 },
                 {
                     "name": "options",
@@ -598,7 +644,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1042,
+            "line": 1074,
             "description": "Deprecated. Use `getPartitionsForUser` instead.",
             "itemtype": "method",
             "name": "getGroupsForUser",
@@ -609,7 +655,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1058,
+            "line": 1090,
             "description": "Retrieve users partitions, if any.",
             "itemtype": "method",
             "name": "getPartitionsForUser",
@@ -622,7 +668,7 @@
                 {
                     "name": "roles",
                     "description": "Name of roles to restrict partitions to.",
-                    "type": "String|Array",
+                    "type": "Array|String",
                     "optional": true
                 }
             ],
@@ -636,7 +682,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1090,
+            "line": 1122,
             "description": "Rename a partition.\n\nRoles assigned with a given partition are changed to be under the new partition.",
             "itemtype": "method",
             "name": "renamePartition",
@@ -658,7 +704,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1126,
+            "line": 1158,
             "description": "Remove a partition.\n\nRoles assigned with a given partition are removed.",
             "itemtype": "method",
             "name": "removePartition",
@@ -675,7 +721,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1149,
+            "line": 1181,
             "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
             "name": "_resolveUser",
@@ -703,7 +749,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1175,
+            "line": 1207,
             "itemtype": "method",
             "name": "_roleMatcher",
             "params": [
@@ -725,7 +771,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1189,
+            "line": 1221,
             "itemtype": "method",
             "name": "_roleAndPartitionMatcher",
             "params": [
@@ -752,7 +798,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1206,
+            "line": 1238,
             "itemtype": "method",
             "name": "_partitionMatcher",
             "params": [
@@ -774,7 +820,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1222,
+            "line": 1254,
             "itemtype": "method",
             "name": "_onlyAssignedMatcher",
             "return": {
@@ -789,7 +835,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1235,
+            "line": 1267,
             "description": "Throw an exception if `roleName` is an invalid role name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -808,7 +854,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1249,
+            "line": 1281,
             "description": "Throw an exception if `partitionName` is an invalid partition name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -827,7 +873,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1265,
+            "line": 1297,
             "params": [
                 {
                     "name": "string",
@@ -1129,7 +1175,7 @@
     "warnings": [
         {
             "message": "Missing item type",
-            "line": " roles/roles_common.js:1265"
+            "line": " roles/roles_common.js:1297"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 4a0e6f32f2..dcd0662d0f 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -282,17 +282,33 @@ _.extend(Roles, {
   },
 
   /**
-   * Add role parent to the role.
+   * Add role parent to roles.
    *
    * Previous parents are kept (role can have multiple parents). For users which have the
    * parent role set, new subroles are added automatically.
    *
-   * @method addRoleParent
-   * @param {String} roleName Name of role.
+   * @method addRolesParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @static
    */
-  addRoleParent: function (roleName, parentName) {
+  addRolesParent: function (rolesNames, parentName) {
+    // ensure arrays
+    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
+
+    _.each(rolesNames, function (roleName) {
+      Roles._addRoleParent(roleName, parentName);
+    });
+  },
+
+  /**
+   * @method _addRoleParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @private
+   * @static
+   */
+  _addRoleParent: function (roleName, parentName) {
     var role,
         count,
         parentRoles,
@@ -370,17 +386,33 @@ _.extend(Roles, {
   },
 
   /**
-   * Remove role parent from the role.
+   * Remove role parent from roles.
    *
    * Other parents are kept (role can have multiple parents). For users which have the
    * parent role set, removed subrole is removed automatically.
    *
-   * @method removeRoleParent
-   * @param {String} roleName Name of role.
+   * @method removeRolesParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @static
    */
-  removeRoleParent: function (roleName, parentName) {
+  removeRolesParent: function (rolesNames, parentName) {
+    // ensure arrays
+    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
+
+    _.each(rolesNames, function (roleName) {
+      Roles._removeRoleParent(roleName, parentName);
+    });
+  },
+
+  /**
+   * @method _removeRoleParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @private
+   * @static
+   */
+  _removeRoleParent: function (roleName, parentName) {
     var role,
         count,
         parentRoles;
@@ -389,7 +421,7 @@ _.extend(Roles, {
     Roles._checkRoleName(parentName);
 
     // check for role existence
-    // this would not really be needed, but we are trying to match addRoleParent
+    // this would not really be needed, but we are trying to match addRolesParent
     role = Meteor.roles.findOne({_id: roleName}, {fields: {_id: 1}});
 
     if (!role) {
@@ -863,7 +895,7 @@ _.extend(Roles, {
    *
    * @method userIsInRole
    * @param {String|Object} user User ID or an actual user object.
-   * @param {String|Array} roles Name of role or an array of roles to check against. If array,
+   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
    *                             will return &#x60;true&#x60; if user is in _any_ role.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
@@ -1027,7 +1059,7 @@ _.extend(Roles, {
    * Options:
    *
    * @method getUsersInRole
-   * @param {String|Array} roles Name of role or an array of roles. If array, users
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
@@ -1054,7 +1086,7 @@ _.extend(Roles, {
 
   /**
    * @method _usersInRoleQuery
-   * @param {String|Array} roles Name of role or an array of roles. If array, users
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
@@ -1145,7 +1177,7 @@ _.extend(Roles, {
    *
    * @method getPartitionsForUser
    * @param {String|Object} user User ID or an actual user object.
-   * @param {String|Array} [roles] Name of roles to restrict partitions to.
+   * @param {Array|String} [roles] Name of roles to restrict partitions to.
    *
    * @return {Array} Array of user&#x27;s partitions, unsorted.
    * @static

From b1f85e175e656341f476224bf1469b265bd7376f Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 20 Jan 2016 09:37:55 -0800
Subject: [PATCH 0245/1140] Renamed methods according to code style.

---
 History.md            |  2 +-
 README.md             |  8 +++---
 roles/roles_common.js | 22 +++++++--------
 roles/tests/server.js | 64 +++++++++++++++++++++----------------------
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/History.md b/History.md
index 4b58c68c57..188844f30b 100644
--- a/History.md
+++ b/History.md
@@ -9,7 +9,7 @@
 * Functions which modify roles are available both on the client and server side, but should be called on the
   client side only from inside Meteor methods.
 * `deleteRole` can now delete role even when in use, it is automatically unset from all users.
-* Functions `addRolesParent` and `removeRolesParent` were added.
+* Functions `addRolesToParent` and `removeRolesFromParent` were added.
 * `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
 * All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
 
diff --git a/README.md b/README.md
index 26fd94ea65..9284512cf1 100644
--- a/README.md
+++ b/README.md
@@ -81,9 +81,9 @@ Roles.createRole('user');
 Roles.createRole('admin');
 Roles.createRole('USERS_VIEW');
 Roles.createRole('POST_EDIT');
-Roles.addRolesParent('USERS_VIEW', 'admin');
-Roles.addRolesParent('POST_EDIT', 'admin');
-Roles.addRolesParent('POST_EDIT', 'user');
+Roles.addRolesToParent('USERS_VIEW', 'admin');
+Roles.addRolesToParent('POST_EDIT', 'admin');
+Roles.addRolesToParent('POST_EDIT', 'user');
 ```
 
 <br />
@@ -179,7 +179,7 @@ Here is the list of important changes between meteor-roles 1.0 and 2.0 to consid
 * Functions which modify roles are available both on the client and server side, but should be called on the
   client side only from inside Meteor methods.
 * `deleteRole` can now delete role even when in use, it is automatically unset from all users.
-* Functions `addRolesParent` and `removeRolesParent` were added.
+* Functions `addRolesToParent` and `removeRolesFromParent` were added.
 * `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
 * All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
 
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 9785bcdfec..6d24be7857 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -202,28 +202,28 @@ _.extend(Roles, {
    * Previous parents are kept (role can have multiple parents). For users which have the
    * parent role set, new subroles are added automatically.
    *
-   * @method addRolesParent
+   * @method addRolesToParent
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @static
    */
-  addRolesParent: function (rolesNames, parentName) {
+  addRolesToParent: function (rolesNames, parentName) {
     // ensure arrays
     if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
 
     _.each(rolesNames, function (roleName) {
-      Roles._addRoleParent(roleName, parentName);
+      Roles._addRoleToParent(roleName, parentName);
     });
   },
 
   /**
-   * @method _addRoleParent
+   * @method _addRoleToParent
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
    * @private
    * @static
    */
-  _addRoleParent: function (roleName, parentName) {
+  _addRoleToParent: function (roleName, parentName) {
     var role,
         count,
         parentRoles,
@@ -306,28 +306,28 @@ _.extend(Roles, {
    * Other parents are kept (role can have multiple parents). For users which have the
    * parent role set, removed subrole is removed automatically.
    *
-   * @method removeRolesParent
+   * @method removeRolesFromParent
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @static
    */
-  removeRolesParent: function (rolesNames, parentName) {
+  removeRolesFromParent: function (rolesNames, parentName) {
     // ensure arrays
     if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
 
     _.each(rolesNames, function (roleName) {
-      Roles._removeRoleParent(roleName, parentName);
+      Roles._removeRoleFromParent(roleName, parentName);
     });
   },
 
   /**
-   * @method _removeRoleParent
+   * @method _removeRoleFromParent
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
    * @private
    * @static
    */
-  _removeRoleParent: function (roleName, parentName) {
+  _removeRoleFromParent: function (roleName, parentName) {
     var role,
         count,
         parentRoles;
@@ -336,7 +336,7 @@ _.extend(Roles, {
     Roles._checkRoleName(parentName);
 
     // check for role existence
-    // this would not really be needed, but we are trying to match addRolesParent
+    // this would not really be needed, but we are trying to match addRolesToParent
     role = Meteor.roles.findOne({_id: roleName}, {fields: {_id: 1}});
 
     if (!role) {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 6b8324ce5e..99c5d5b606 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -966,7 +966,7 @@
       }]);
 
       Roles.createRole('PERMISSION');
-      Roles.addRolesParent('PERMISSION', 'user');
+      Roles.addRolesToParent('PERMISSION', 'user');
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1'}), [{
         _id: 'admin',
@@ -1672,10 +1672,10 @@
       Roles.createRole('VIEW_PERMISSION');
       Roles.createRole('EDIT_PERMISSION');
       Roles.createRole('DELETE_PERMISSION');
-      Roles.addRolesParent('ALL_PERMISSIONS', 'user');
-      Roles.addRolesParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesParent('DELETE_PERMISSION', 'admin');
+      Roles.addRolesToParent('ALL_PERMISSIONS', 'user');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('DELETE_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, ['user'], 'partition1');
       Roles.addUsersToRoles(users.eve, ['user'], 'partition2');
@@ -1907,10 +1907,10 @@
       Roles.createRole('VIEW_PERMISSION');
       Roles.createRole('EDIT_PERMISSION');
       Roles.createRole('DELETE_PERMISSION');
-      Roles.addRolesParent('ALL_PERMISSIONS', 'user');
-      Roles.addRolesParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesParent('DELETE_PERMISSION', 'admin');
+      Roles.addRolesToParent('ALL_PERMISSIONS', 'user');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('DELETE_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, ['user']);
 
@@ -1984,10 +1984,10 @@
       Roles.createRole('VIEW_PERMISSION');
       Roles.createRole('EDIT_PERMISSION');
       Roles.createRole('DELETE_PERMISSION');
-      Roles.addRolesParent('ALL_PERMISSIONS', 'user');
-      Roles.addRolesParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesParent('DELETE_PERMISSION', 'admin');
+      Roles.addRolesToParent('ALL_PERMISSIONS', 'user');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('DELETE_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, ['user']);
       Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'partition');
@@ -2027,7 +2027,7 @@
 
       Roles.createRole('MODERATE_PERMISSION');
 
-      Roles.addRolesParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
       test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
@@ -2121,7 +2121,7 @@
         assigned: false
       }]);
 
-      Roles.addRolesParent('DELETE_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
@@ -2255,15 +2255,15 @@
       Roles.createRole('EXTRA_PERMISSION_ROLE_1');
       Roles.createRole('EXTRA_PERMISSION_ROLE_2');
 
-      Roles.addRolesParent('COMMON_PERMISSION_1', 'role1');
-      Roles.addRolesParent('COMMON_PERMISSION_2', 'role1');
-      Roles.addRolesParent('COMMON_PERMISSION_3', 'role1');
-      Roles.addRolesParent('EXTRA_PERMISSION_ROLE_1', 'role1');
+      Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1');
+      Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1');
+      Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1');
+      Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1');
 
-      Roles.addRolesParent('COMMON_PERMISSION_1', 'role2');
-      Roles.addRolesParent('COMMON_PERMISSION_2', 'role2');
-      Roles.addRolesParent('COMMON_PERMISSION_3', 'role2');
-      Roles.addRolesParent('EXTRA_PERMISSION_ROLE_2', 'role2');
+      Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2');
+      Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2');
+      Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2');
+      Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2');
 
       Roles.addUsersToRoles(users.eve, 'role1');
       Roles.addUsersToRoles(users.eve, 'role2');
@@ -2414,7 +2414,7 @@
         assigned: true
       }]);
 
-      Roles.addRolesParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'admin');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
@@ -2434,7 +2434,7 @@
       Roles.createRole('admin');
       Roles.createRole('EDIT_PERMISSION');
 
-      Roles.addRolesParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
 
@@ -2447,7 +2447,7 @@
         assigned: true
       }]);
 
-      Roles.removeRolesParent('EDIT_PERMISSION', 'admin');
+      Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
@@ -2468,7 +2468,7 @@
       Roles.createRole('user');
       Roles.createRole('EDIT_PERMISSION');
 
-      Roles.addRolesParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
 
@@ -2481,7 +2481,7 @@
         assigned: true
       }]);
 
-      Roles.addRolesParent('EDIT_PERMISSION', 'user');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'user');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
@@ -2492,7 +2492,7 @@
         assigned: true
       }]);
 
-      Roles.removeRolesParent('EDIT_PERMISSION', 'user');
+      Roles.removeRolesFromParent('EDIT_PERMISSION', 'user');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
@@ -2513,11 +2513,11 @@
       Roles.createRole('editor');
       Roles.createRole('user');
 
-      Roles.addRolesParent('editor', 'admin');
-      Roles.addRolesParent('user', 'editor');
+      Roles.addRolesToParent('editor', 'admin');
+      Roles.addRolesToParent('user', 'editor');
 
       test.throws(function () {
-        Roles.addRolesParent('admin', 'user');
+        Roles.addRolesToParent('admin', 'user');
       }, /form a cycle/);
     });
 

From 5c5f0d1f489edbcfa799f58dee0843e3a8fcff00 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 20 Jan 2016 09:49:21 -0800
Subject: [PATCH 0246/1140] Added test that we do not leave any dangling
 database content for partitions not in use anymore.

---
 roles/tests/server.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 99c5d5b606..c84c13da2a 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -807,6 +807,9 @@
       testUser(test, 'bob', ['admin', 'editor'], 'partition2');
       testUser(test, 'joe', ['editor'], 'partition2');
 
+      test.isTrue(_.contains(_.pluck(Roles.getRolesForUser(users.bob, {anyPartition: true, fullObjects: true}), 'partition'), 'partition1'));
+      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.joe, {anyPartition: true, fullObjects: true}), 'partition'), 'partition1'));
+
       Roles.setUserRoles([bob, users.joe], [], 'partition1');
       testUser(test, 'eve', ['user'], 'partition1');
       testUser(test, 'bob', [], 'partition1');
@@ -814,6 +817,10 @@
       testUser(test, 'eve', ['editor'], 'partition2');
       testUser(test, 'bob', ['admin', 'editor'], 'partition2');
       testUser(test, 'joe', ['editor'], 'partition2');
+
+      // When roles in a given partition are removed, we do not want any dangling database content for that partition.
+      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.bob, {anyPartition: true, fullObjects: true}), 'partition'), 'partition1'));
+      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.joe, {anyPartition: true, fullObjects: true}), 'partition'), 'partition1'));
     });
 
   Tinytest.add(

From 820647b06b8b0fde1b8f8f3b45eb1859ea436f58 Mon Sep 17 00:00:00 2001
From: Jules Randolph <theswanted@gmail.com>
Date: Sat, 30 Jan 2016 19:49:42 -0500
Subject: [PATCH 0247/1140] Enhanced description

Great job guys.
Little reformulation to enhance comprehension of your hierarchical schema, hope you'll appreciate!
---
 README.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9284512cf1..151388751b 100644
--- a/README.md
+++ b/README.md
@@ -59,18 +59,19 @@ those roles easier.
 <a id="roles-naming" name="roles-naming"></a>
 ### Permissions vs roles  (or What's in a name...)
 
-Although the name of this package is `roles`, you can define your roles, groups, permissions however you like.
-They are essentially just tags that you assign on a user and which you can check for later.
+Although the name of this package is `roles`, you can define your **roles**, **groups** or **permissions** however you like.
+They are essentially just tags that you assign to a user and which you can check upon later.
 
 You can have traditional roles like, `admin` or `webmaster`, or you can assign more granular permissions such
-as, `view-secrets`, `users.view`, or `users.manage`.  Often times more granular is actually better because you are
+as, `view-secrets`, `users.view`, or `users.manage`.  Often, more granular is actually better because you are
 able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level
-`roles`.  To the roles package, it's all just a role object.
+`roles`.  With the `roles` package, it's all just a role object.
 
-Roles can be put into a hierarchy. Roles can have multiple parents and can be children (subroles) of multiple roles.
-If a parent role is set to the user, all its descendants are also in effect. You can use this to create "super roles"
-combining multiple low-level permissions. For example, you could name your top-level roles `user` and `admin`
-and then you could use your second-level roles as permissions and name them `USERS_VIEW`, `POST_EDIT`, and similar.
+Roles can be put into a **hierarchy**.  
+Roles can have multiple parents and can be children (subroles) of multiple roles.
+If a parent role is set to the user, all its descendants are also applying. 
+You can use this to create "super roles" aggregating permissions all the way through the bottom of the tree.  
+For example, you could name two top-level roles `user` and `admin` and then you could use your second-level roles as permissions and name them `USERS_VIEW`, `POST_EDIT`, and similar.
 Then you could set `admin` role as parent role for `USERS_VIEW` and `POST_EDIT`, while `user` would be parent
 only of the `POST_EDIT` role. You can then assign `user` and `admin` roles to your users. And if you need to
 change permissions later for the whole role, just add or remove children roles. You can create roles from this example

From 0ff2d418688a8f1ee334e795fe41947cc9021a30 Mon Sep 17 00:00:00 2001
From: Jules Randolph <theswanted@gmail.com>
Date: Sun, 31 Jan 2016 19:22:03 -0500
Subject: [PATCH 0248/1140] fix #174 Drop mongodb roles index "name_1" in
 _forwardMigrate

See #174

**WARNING** : throw an exception if index "name_1" does not exists. Any reason to think this might happen?
In that case, might want to surround with a try catch block and print a warning.
---
 roles/roles_server.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index f1d20bba44..685b261495 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -248,6 +248,9 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
+    //drop old index, preventing mongo duplicate key 'null' errors
+    Meteor.roles._dropIndex("name_1");
+
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isNewRole(role)) {
         updateRole(role, Roles._convertToNewRole(role));

From 24f02aa595b5ea215278739ebe01f411f5985ee1 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 31 Jan 2016 21:55:37 -0800
Subject: [PATCH 0249/1140] Make unescaping of group names optional.

---
 roles/roles_server.js | 10 +++++---
 roles/tests/server.js | 59 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index f1d20bba44..8bb28e4dd4 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -112,12 +112,13 @@ _.extend(Roles, {
   /**
    * @method _convertToNewField
    * @param {Array} oldRoles `Meteor.users` document `roles` field in the old format.
+   * @param {Boolean} convertUnderscoresToDots Should we convert underscores to dots in group names.
    * @return {Array} Converted `roles` to the new format.
    * @for Roles
    * @private
    * @static
    */
-  _convertToNewField: function (oldRoles) {
+  _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
     var roles = [];
     if (_.isArray(oldRoles)) {
       _.each(oldRoles, function (role, index) {
@@ -135,7 +136,7 @@ _.extend(Roles, {
         if (group === '__global_roles__') {
           group = null;
         }
-        else {
+        else if (convertUnderscoresToDots) {
           // unescape
           group = group.replace(/_/g, '.');
         }
@@ -240,11 +241,12 @@ _.extend(Roles, {
    * @method _forwardMigrate
    * @param {Function} updateUser Function which updates the user object. Default `_defaultUpdateUser`.
    * @param {Function} updateRole Function which updates the role object. Default `_defaultUpdateRole`.
+   * @param {Boolean} convertUnderscoresToDots Should we convert underscores to dots in group names.
    * @for Roles
    * @private
    * @static
    */
-  _forwardMigrate: function (updateUser, updateRole) {
+  _forwardMigrate: function (updateUser, updateRole, convertUnderscoresToDots) {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
@@ -256,7 +258,7 @@ _.extend(Roles, {
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isNewField(user.roles)) {
-        updateUser(user, Roles._convertToNewField(user.roles));
+        updateUser(user, Roles._convertToNewField(user.roles, convertUnderscoresToDots));
       }
     });
   },
diff --git a/roles/tests/server.js b/roles/tests/server.js
index c84c13da2a..c4007e49e9 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1590,11 +1590,11 @@
       test.isTrue(Meteor.roles.insert({name: 'editor'}));
       test.isTrue(Meteor.roles.insert({name: 'user'}));
 
-      test.isTrue(Meteor.users.update(users.eve, {$set: {roles: {__global_roles__: ['admin', 'editor'], foo: ['user']}}}));
+      test.isTrue(Meteor.users.update(users.eve, {$set: {roles: {__global_roles__: ['admin', 'editor'], foo_bla: ['user']}}}));
       test.isTrue(Meteor.users.update(users.bob, {$set: {roles: {}}}));
-      test.isTrue(Meteor.users.update(users.joe, {$set: {roles: {__global_roles__: ['user'], foo: ['user']}}}));
+      test.isTrue(Meteor.users.update(users.joe, {$set: {roles: {__global_roles__: ['user'], foo_bla: ['user']}}}));
 
-      Roles._forwardMigrate();
+      Roles._forwardMigrate(null, null, false);
 
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: [{
@@ -1607,7 +1607,7 @@
           assigned: true
         }, {
           _id: 'user',
-          partition: 'foo',
+          partition: 'foo_bla',
           assigned: true
         }]
       });
@@ -1621,7 +1621,7 @@
           assigned: true
         }, {
           _id: 'user',
-          partition: 'foo',
+          partition: 'foo_bla',
           assigned: true
         }]
       });
@@ -1644,7 +1644,7 @@
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: {
           __global_roles__: ['admin', 'editor'],
-          foo: ['user']
+          foo_bla: ['user']
         }
       });
       test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
@@ -1653,7 +1653,7 @@
       test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
         roles: {
           __global_roles__: ['user'],
-          foo: ['user']
+          foo_bla: ['user']
         }
       });
 
@@ -1666,6 +1666,51 @@
       test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
         name: 'user'
       });
+
+      Roles._forwardMigrate(null, null, true);
+
+      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+        roles: [{
+          _id: 'admin',
+          partition: null,
+          assigned: true
+        }, {
+          _id: 'editor',
+          partition: null,
+          assigned: true
+        }, {
+          _id: 'user',
+          partition: 'foo.bla',
+          assigned: true
+        }]
+      });
+      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+        roles: []
+      });
+      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+        roles: [{
+          _id: 'user',
+          partition: null,
+          assigned: true
+        }, {
+          _id: 'user',
+          partition: 'foo.bla',
+          assigned: true
+        }]
+      });
+
+      test.equal(Meteor.roles.findOne({_id: 'admin'}), {
+        _id: 'admin',
+        children: []
+      });
+      test.equal(Meteor.roles.findOne({_id: 'editor'}), {
+        _id: 'editor',
+        children: []
+      });
+      test.equal(Meteor.roles.findOne({_id: 'user'}), {
+        _id: 'user',
+        children: []
+      });
     });
 
   Tinytest.add(

From 545c83696cb6ebc8190d170dda24264a900f6681 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 31 Jan 2016 21:56:07 -0800
Subject: [PATCH 0250/1140] Generated documentation.

---
 docs/assets/css/external-small.png           | Bin
 docs/assets/css/logo.png                     | Bin
 docs/assets/css/main.css                     |   0
 docs/assets/favicon.ico                      | Bin
 docs/assets/img/spinner.gif                  | Bin
 docs/assets/index.html                       |   0
 docs/assets/js/api-filter.js                 |   0
 docs/assets/js/api-list.js                   |   0
 docs/assets/js/api-search.js                 |   0
 docs/assets/js/apidocs.js                    |   0
 docs/assets/js/yui-prettify.js               |   0
 docs/assets/vendor/prettify/CHANGES.html     |   0
 docs/assets/vendor/prettify/COPYING          |   0
 docs/assets/vendor/prettify/README.html      |   0
 docs/assets/vendor/prettify/prettify-min.css |   0
 docs/assets/vendor/prettify/prettify-min.js  |   0
 docs/classes/Roles.html                      |  62 ++++++++++++++-----
 docs/data.json                               |  28 ++++++---
 docs/files/roles_roles_common.js.html        |  22 +++----
 docs/files/roles_roles_server.js.html        |  10 +--
 20 files changed, 81 insertions(+), 41 deletions(-)
 mode change 100755 => 100644 docs/assets/css/external-small.png
 mode change 100755 => 100644 docs/assets/css/logo.png
 mode change 100755 => 100644 docs/assets/css/main.css
 mode change 100755 => 100644 docs/assets/favicon.ico
 mode change 100755 => 100644 docs/assets/img/spinner.gif
 mode change 100755 => 100644 docs/assets/index.html
 mode change 100755 => 100644 docs/assets/js/api-filter.js
 mode change 100755 => 100644 docs/assets/js/api-list.js
 mode change 100755 => 100644 docs/assets/js/api-search.js
 mode change 100755 => 100644 docs/assets/js/apidocs.js
 mode change 100755 => 100644 docs/assets/js/yui-prettify.js
 mode change 100755 => 100644 docs/assets/vendor/prettify/CHANGES.html
 mode change 100755 => 100644 docs/assets/vendor/prettify/COPYING
 mode change 100755 => 100644 docs/assets/vendor/prettify/README.html
 mode change 100755 => 100644 docs/assets/vendor/prettify/prettify-min.css
 mode change 100755 => 100644 docs/assets/vendor/prettify/prettify-min.js

diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
old mode 100755
new mode 100644
diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
old mode 100755
new mode 100644
diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
old mode 100755
new mode 100644
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
old mode 100755
new mode 100644
diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
old mode 100755
new mode 100644
diff --git a/docs/assets/index.html b/docs/assets/index.html
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
old mode 100755
new mode 100644
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index 646922be5e..e90e677232 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -114,7 +114,7 @@
 
                     <ul class="index-list methods">
                             <li class="index-item method private">
-                                <a href="#method__addRoleParent">_addRoleParent</a>
+                                <a href="#method__addRoleToParent">_addRoleToParent</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -209,7 +209,7 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method private">
-                                <a href="#method__removeRoleParent">_removeRoleParent</a>
+                                <a href="#method__removeRoleFromParent">_removeRoleFromParent</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -239,7 +239,7 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_addRolesParent">addRolesParent</a>
+                                <a href="#method_addRolesToParent">addRolesToParent</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -290,7 +290,7 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_removeRolesParent">removeRolesParent</a>
+                                <a href="#method_removeRolesFromParent">removeRolesFromParent</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -346,8 +346,8 @@
             <div id="methods" class="api-class-tabpanel">
                 <h2 class="off-left">Methods</h2>
 
-<div id="method__addRoleParent" class="method item private">
-    <h3 class="name"><code>_addRoleParent</code></h3>
+<div id="method__addRoleToParent" class="method item private">
+    <h3 class="name"><code>_addRoleToParent</code></h3>
 
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
@@ -608,7 +608,7 @@ are marked as not explicitly assigned, and have not been part of what we current
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l264"><code>roles&#x2F;roles_server.js:264</code></a>
+        <a href="../files/roles_roles_server.js.html#l266"><code>roles&#x2F;roles_server.js:266</code></a>
         </p>
 
 
@@ -786,6 +786,9 @@ no subroles.</p>
                 <li class="arg">
                         <code>oldRoles</code>
                 </li>
+                <li class="arg">
+                        <code>convertUnderscoresToDots</code>
+                </li>
             </ul><span class="paren">)</span>
         </div>
 
@@ -830,6 +833,17 @@ no subroles.</p>
                     </div>
 
                 </li>
+                <li class="param">
+                        <code class="param-name">convertUnderscoresToDots</code>
+                        <span class="type">Boolean</span>
+
+
+                    <div class="param-description">
+                        <p>Should we convert underscores to dots in group names.</p>
+
+                    </div>
+
+                </li>
             </ul>
         </div>
 
@@ -941,7 +955,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l157"><code>roles&#x2F;roles_server.js:157</code></a>
+        <a href="../files/roles_roles_server.js.html#l158"><code>roles&#x2F;roles_server.js:158</code></a>
         </p>
 
 
@@ -1086,7 +1100,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l224"><code>roles&#x2F;roles_server.js:224</code></a>
+        <a href="../files/roles_roles_server.js.html#l225"><code>roles&#x2F;roles_server.js:225</code></a>
         </p>
 
 
@@ -1155,7 +1169,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l206"><code>roles&#x2F;roles_server.js:206</code></a>
+        <a href="../files/roles_roles_server.js.html#l207"><code>roles&#x2F;roles_server.js:207</code></a>
         </p>
 
 
@@ -1209,6 +1223,9 @@ no subroles.</p>
                 <li class="arg">
                         <code>updateRole</code>
                 </li>
+                <li class="arg">
+                        <code>convertUnderscoresToDots</code>
+                </li>
             </ul><span class="paren">)</span>
         </div>
 
@@ -1224,7 +1241,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l237"><code>roles&#x2F;roles_server.js:237</code></a>
+        <a href="../files/roles_roles_server.js.html#l238"><code>roles&#x2F;roles_server.js:238</code></a>
         </p>
 
 
@@ -1262,6 +1279,17 @@ no subroles.</p>
                     </div>
 
                 </li>
+                <li class="param">
+                        <code class="param-name">convertUnderscoresToDots</code>
+                        <span class="type">Boolean</span>
+
+
+                    <div class="param-description">
+                        <p>Should we convert underscores to dots in group names.</p>
+
+                    </div>
+
+                </li>
             </ul>
         </div>
 
@@ -1653,8 +1681,8 @@ if its partition matches <code>partition</code>.</p>
 
 
 </div>
-<div id="method__removeRoleParent" class="method item private">
-    <h3 class="name"><code>_removeRoleParent</code></h3>
+<div id="method__removeRoleFromParent" class="method item private">
+    <h3 class="name"><code>_removeRoleFromParent</code></h3>
 
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
@@ -2160,8 +2188,8 @@ through to <code>Meteor.users.find(query, options)</code></p>
 
 
 </div>
-<div id="method_addRolesParent" class="method item">
-    <h3 class="name"><code>addRolesParent</code></h3>
+<div id="method_addRolesToParent" class="method item">
+    <h3 class="name"><code>addRolesToParent</code></h3>
 
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
@@ -2912,8 +2940,8 @@ through to <code>Meteor.users.find(query, options)</code></p>
 
 
 </div>
-<div id="method_removeRolesParent" class="method item">
-    <h3 class="name"><code>removeRolesParent</code></h3>
+<div id="method_removeRolesFromParent" class="method item">
+    <h3 class="name"><code>removeRolesFromParent</code></h3>
 
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
diff --git a/docs/data.json b/docs/data.json
index 2299f23e9a..dc775e325c 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -232,7 +232,7 @@
             "line": 199,
             "description": "Add role parent to roles.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
             "itemtype": "method",
-            "name": "addRolesParent",
+            "name": "addRolesToParent",
             "params": [
                 {
                     "name": "rolesNames",
@@ -253,7 +253,7 @@
             "file": "roles/roles_common.js",
             "line": 219,
             "itemtype": "method",
-            "name": "_addRoleParent",
+            "name": "_addRoleToParent",
             "params": [
                 {
                     "name": "roleName",
@@ -277,7 +277,7 @@
             "line": 303,
             "description": "Remove role parent from roles.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
             "itemtype": "method",
-            "name": "removeRolesParent",
+            "name": "removeRolesFromParent",
             "params": [
                 {
                     "name": "rolesNames",
@@ -298,7 +298,7 @@
             "file": "roles/roles_common.js",
             "line": 323,
             "itemtype": "method",
-            "name": "_removeRoleParent",
+            "name": "_removeRoleFromParent",
             "params": [
                 {
                     "name": "roleName",
@@ -1033,6 +1033,11 @@
                     "name": "oldRoles",
                     "description": "`Meteor.users` document `roles` field in the old format.",
                     "type": "Array"
+                },
+                {
+                    "name": "convertUnderscoresToDots",
+                    "description": "Should we convert underscores to dots in group names.",
+                    "type": "Boolean"
                 }
             ],
             "return": {
@@ -1047,7 +1052,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 157,
+            "line": 158,
             "itemtype": "method",
             "name": "_convertToOldField",
             "params": [
@@ -1074,7 +1079,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 206,
+            "line": 207,
             "itemtype": "method",
             "name": "_defaultUpdateUser",
             "params": [
@@ -1097,7 +1102,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 224,
+            "line": 225,
             "itemtype": "method",
             "name": "_defaultUpdateRole",
             "params": [
@@ -1120,7 +1125,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 237,
+            "line": 238,
             "description": "Migrates `Meteor.users` and `Meteor.roles` to the new format.",
             "itemtype": "method",
             "name": "_forwardMigrate",
@@ -1134,6 +1139,11 @@
                     "name": "updateRole",
                     "description": "Function which updates the role object. Default `_defaultUpdateRole`.",
                     "type": "Function"
+                },
+                {
+                    "name": "convertUnderscoresToDots",
+                    "description": "Should we convert underscores to dots in group names.",
+                    "type": "Boolean"
                 }
             ],
             "access": "private",
@@ -1144,7 +1154,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 264,
+            "line": 266,
             "description": "Migrates `Meteor.users` and `Meteor.roles` to the old format.\n\nWe assume that we are converting back a failed migration, so values can only be\nwhat were valid values in the old format. So no group names starting with `$` and\nno subroles.",
             "itemtype": "method",
             "name": "_backwardMigrate",
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index dcd0662d0f..960bbe04d0 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -287,28 +287,28 @@ _.extend(Roles, {
    * Previous parents are kept (role can have multiple parents). For users which have the
    * parent role set, new subroles are added automatically.
    *
-   * @method addRolesParent
+   * @method addRolesToParent
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @static
    */
-  addRolesParent: function (rolesNames, parentName) {
+  addRolesToParent: function (rolesNames, parentName) {
     // ensure arrays
     if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
 
     _.each(rolesNames, function (roleName) {
-      Roles._addRoleParent(roleName, parentName);
+      Roles._addRoleToParent(roleName, parentName);
     });
   },
 
   /**
-   * @method _addRoleParent
+   * @method _addRoleToParent
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
    * @private
    * @static
    */
-  _addRoleParent: function (roleName, parentName) {
+  _addRoleToParent: function (roleName, parentName) {
     var role,
         count,
         parentRoles,
@@ -391,28 +391,28 @@ _.extend(Roles, {
    * Other parents are kept (role can have multiple parents). For users which have the
    * parent role set, removed subrole is removed automatically.
    *
-   * @method removeRolesParent
+   * @method removeRolesFromParent
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @static
    */
-  removeRolesParent: function (rolesNames, parentName) {
+  removeRolesFromParent: function (rolesNames, parentName) {
     // ensure arrays
     if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
 
     _.each(rolesNames, function (roleName) {
-      Roles._removeRoleParent(roleName, parentName);
+      Roles._removeRoleFromParent(roleName, parentName);
     });
   },
 
   /**
-   * @method _removeRoleParent
+   * @method _removeRoleFromParent
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
    * @private
    * @static
    */
-  _removeRoleParent: function (roleName, parentName) {
+  _removeRoleFromParent: function (roleName, parentName) {
     var role,
         count,
         parentRoles;
@@ -421,7 +421,7 @@ _.extend(Roles, {
     Roles._checkRoleName(parentName);
 
     // check for role existence
-    // this would not really be needed, but we are trying to match addRolesParent
+    // this would not really be needed, but we are trying to match addRolesToParent
     role = Meteor.roles.findOne({_id: roleName}, {fields: {_id: 1}});
 
     if (!role) {
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index a4d980c246..038040e693 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -197,12 +197,13 @@ _.extend(Roles, {
   /**
    * @method _convertToNewField
    * @param {Array} oldRoles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the old format.
+   * @param {Boolean} convertUnderscoresToDots Should we convert underscores to dots in group names.
    * @return {Array} Converted &#x60;roles&#x60; to the new format.
    * @for Roles
    * @private
    * @static
    */
-  _convertToNewField: function (oldRoles) {
+  _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
     var roles = [];
     if (_.isArray(oldRoles)) {
       _.each(oldRoles, function (role, index) {
@@ -220,7 +221,7 @@ _.extend(Roles, {
         if (group === &#x27;__global_roles__&#x27;) {
           group = null;
         }
-        else {
+        else if (convertUnderscoresToDots) {
           // unescape
           group = group.replace(/_/g, &#x27;.&#x27;);
         }
@@ -325,11 +326,12 @@ _.extend(Roles, {
    * @method _forwardMigrate
    * @param {Function} updateUser Function which updates the user object. Default &#x60;_defaultUpdateUser&#x60;.
    * @param {Function} updateRole Function which updates the role object. Default &#x60;_defaultUpdateRole&#x60;.
+   * @param {Boolean} convertUnderscoresToDots Should we convert underscores to dots in group names.
    * @for Roles
    * @private
    * @static
    */
-  _forwardMigrate: function (updateUser, updateRole) {
+  _forwardMigrate: function (updateUser, updateRole, convertUnderscoresToDots) {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
@@ -341,7 +343,7 @@ _.extend(Roles, {
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isNewField(user.roles)) {
-        updateUser(user, Roles._convertToNewField(user.roles));
+        updateUser(user, Roles._convertToNewField(user.roles, convertUnderscoresToDots));
       }
     });
   },

From 42750861881e6b28aa219afa3162e3e49ab9f235 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 31 Jan 2016 22:37:05 -0800
Subject: [PATCH 0251/1140] Be more strict with partition names.

---
 roles/roles_common.js | 94 ++++++++++++++++++++++---------------------
 roles/tests/server.js |  3 ++
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 6d24be7857..6526eb3a65 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -61,7 +61,7 @@ _.extend(Roles, {
   createRole: function (roleName, options) {
     var match;
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     Roles._checkRoleName(roleName);
 
@@ -407,18 +407,12 @@ _.extend(Roles, {
     if (!users) throw new Error ("Missing 'users' param.");
     if (!roles) throw new Error ("Missing 'roles' param.");
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure arrays
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
     Roles._checkPartitionName(options.partition);
 
     options = _.defaults(options, {
@@ -464,18 +458,12 @@ _.extend(Roles, {
     if (!users) throw new Error ("Missing 'users' param.");
     if (!roles) throw new Error ("Missing 'roles' param.");
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure arrays
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
     Roles._checkPartitionName(options.partition);
 
     options = _.defaults(options, {
@@ -645,18 +633,12 @@ _.extend(Roles, {
     if (!users) throw new Error ("Missing 'users' param.");
     if (!roles) throw new Error ("Missing 'roles' param.");
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure arrays
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
     Roles._checkPartitionName(options.partition);
 
     options = _.defaults(options, {
@@ -826,19 +808,13 @@ _.extend(Roles, {
     var id,
         query;
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure array to simplify code
     if (!_.isArray(roles)) roles = [roles];
 
     if (!roles.length) return false;
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
     Roles._checkPartitionName(options.partition);
 
     options = _.defaults(options, {
@@ -915,13 +891,7 @@ _.extend(Roles, {
   getRolesForUser: function (user, options) {
     var roles;
 
-    options = options || {};
-
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
+    options = Roles._normalizeOptions(options);
 
     Roles._checkPartitionName(options.partition);
 
@@ -1022,17 +992,11 @@ _.extend(Roles, {
   _usersInRoleQuery: function (roles, options, queryOptions) {
     var query;
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure array to simplify code
     if (!_.isArray(roles)) roles = [roles];
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
     Roles._checkPartitionName(options.partition);
 
     options = _.defaults(options, {
@@ -1165,7 +1129,7 @@ _.extend(Roles, {
    * @static
    */
   removePartition: function (name) {
-    name = name || null;
+    name = Roles._normalizePartitionName(name);
 
     Roles._checkPartitionName(name);
 
@@ -1239,7 +1203,7 @@ _.extend(Roles, {
    * @method _partitionMatcher
    * @param {String} partition A partition to match against.
    * @return {Function} A matcher function which accepts a role object and returns `true`
-   *                     if its partition matches `partition`.
+   *                    if its partition matches `partition`.
    * @private
    * @static
    */
@@ -1278,6 +1242,46 @@ _.extend(Roles, {
     }
   },
 
+  /**
+   * Normalize options.
+   *
+   * @method _normalizeOptions
+   * @param {Object} options Options to normalize.
+   * @return {Object} Normalized options.
+   * @private
+   * @static
+   */
+  _normalizeOptions: function (options) {
+    options = _.isUndefined(options) ? {} : options;
+
+    if (options === null || _.isString(options)) {
+      options = {partition: options};
+    }
+
+    options.partition = Roles._normalizePartitionName(options.partition);
+
+    return options;
+  },
+
+  /**
+   * Normalize partition name.
+   *
+   * @method _normalizePartitionName
+   * @param {String} partitionName A partition name to normalize.
+   * @return {String} Normalized partition name.
+   * @private
+   * @static
+   */
+  _normalizePartitionName: function (partitionName) {
+    // map undefined and null to null
+    if (partitionName == null) {
+      return null;
+    }
+    else {
+      return partitionName;
+    }
+  },
+
   /**
    * Throw an exception if `partitionName` is an invalid partition name.
    *
diff --git a/roles/tests/server.js b/roles/tests/server.js
index c4007e49e9..ad58c9a294 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -143,6 +143,9 @@
       Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
       Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
 
+      test.throws(function () {
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], '');
+      }, /Invalid partition name/);
       test.throws(function () {
         Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ');
       }, /Invalid partition name/);

From e7ef52bd1895fddd557ebdff2f108c0f913a19b3 Mon Sep 17 00:00:00 2001
From: ranj2004 <jrandolph@orange.fr>
Date: Mon, 1 Feb 2016 02:05:48 -0500
Subject: [PATCH 0252/1140] surrounded _forwardMigrate check with try catch
 block

---
 roles/roles_server.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 685b261495..14aa79650b 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -7,7 +7,7 @@ Meteor.users._ensureIndex({'roles.partition': 1});
 
 /*
  * Publish logged-in user's roles so client-side checks can work.
- * 
+ *
  * Use a named publish function so clients can check `ready()` state.
  */
 Meteor.publish('_roles', function () {
@@ -248,8 +248,14 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
-    //drop old index, preventing mongo duplicate key 'null' errors
-    Meteor.roles._dropIndex("name_1");
+    // drop old index, preventing mongo duplicate key 'null' errors
+    try {
+      Meteor.roles._dropIndex("name_1");
+    } catch (e) {
+      if (e.name !== 'MongoError') throw e;
+      match = (e.err || e.errmsg).match(/index not found/);
+      if (!match) throw e;
+    }
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isNewRole(role)) {

From f91c797e85509e2ed799ce25c28221ce8fc03f36 Mon Sep 17 00:00:00 2001
From: sveinburne <theswanted@gmail.com>
Date: Mon, 1 Feb 2016 02:10:33 -0500
Subject: [PATCH 0253/1140] replaced e.err with (e.err || e.errmsg)

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 6d24be7857..20877385ab 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -76,7 +76,7 @@ _.extend(Roles, {
       // XXX string parsing sucks, maybe
       // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
       if (e.name !== 'MongoError') throw e;
-      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
+      match = ( e.err || e.errmsg ).match(/E11000 duplicate key error index: ([^ ]+)/);
       if (!match) throw e;
       if (match[1].indexOf('$_id') !== -1) {
         if (options.unlessExists) return null;

From 67201e93cb39802c3eb8d5243dbae61cedf386b3 Mon Sep 17 00:00:00 2001
From: sveinburne <theswanted@gmail.com>
Date: Mon, 8 Feb 2016 22:59:39 -0500
Subject: [PATCH 0254/1140] refactoring with dropCollectionIndex function +
 _backwardMigrate index drop

---
 roles/roles_server.js | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 14aa79650b..372824e2f5 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -5,6 +5,22 @@
 Meteor.users._ensureIndex({'roles._id': 1, 'roles.partition': 1});
 Meteor.users._ensureIndex({'roles.partition': 1});
 
+/**
+ * Utility function to drop obsolete indexes when migrating
+ *
+ * @param {Object} collection to be proceeded
+ * @param {String} indexName to drop
+ */
+dropCollectionIndex = function(collection,indexName){
+  try {
+    collection._dropIndex(indexName);
+  } catch (e) {
+    if (e.name !== 'MongoError') throw e;
+    match = (e.err || e.errmsg).match(/index not found/);
+    if (!match) throw e;
+  }
+};
+
 /*
  * Publish logged-in user's roles so client-side checks can work.
  *
@@ -248,14 +264,8 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
-    // drop old index, preventing mongo duplicate key 'null' errors
-    try {
-      Meteor.roles._dropIndex("name_1");
-    } catch (e) {
-      if (e.name !== 'MongoError') throw e;
-      match = (e.err || e.errmsg).match(/index not found/);
-      if (!match) throw e;
-    }
+    // drop obsolete index name_1, preventing mongo duplicate key 'null' errors
+    dropCollectionIndex(Meteor.roles,"name_1");
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isNewRole(role)) {
@@ -289,6 +299,10 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
+    // drop 'obsolete' users indexes
+    dropCollectionIndex(Meteor.users,"roles._id_1_roles.partition_1");
+    dropCollectionIndex(Meteor.users,"roles.partition_1");
+
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isOldRole(role)) {
         updateRole(role, Roles._convertToOldRole(role));

From f3c5fbe351c62ceeca3c1445512b1aebbf85b5a7 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 26 Feb 2016 21:57:46 -0800
Subject: [PATCH 0255/1140] Make clear test that null or undefined is the same
 for global partition.

---
 roles/tests/server.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index ad58c9a294..746284ac84 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -225,6 +225,8 @@
 
       test.isFalse(Roles.userIsInRole(users.eve, ['user']));
       test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
+      test.isFalse(Roles.userIsInRole(users.eve, ['user'], null));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null));
 
       test.isFalse(Roles.userIsInRole(users.eve, ['user'], 'partition2'));
       test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'partition1'));
@@ -232,6 +234,7 @@
       test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'partition2'));
       test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'partition1'));
       test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null));
     });
 
   Tinytest.add(
@@ -263,6 +266,9 @@
       test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
       test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
       test.isTrue(Roles.userIsInRole(users.eve, ['user']));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null));
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null));
+      test.isTrue(Roles.userIsInRole(users.eve, ['user'], null));
 
       Roles.renamePartition(null, 'partition2');
 
@@ -271,6 +277,9 @@
       test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
       test.isFalse(Roles.userIsInRole(users.eve, ['admin']));
       test.isFalse(Roles.userIsInRole(users.eve, ['user']));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin'], null));
+      test.isFalse(Roles.userIsInRole(users.eve, ['user'], null));
     });
 
   Tinytest.add(

From 5bf8d52d6dee27f7fa1a461673badc4029014598 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 26 Feb 2016 22:11:40 -0800
Subject: [PATCH 0256/1140] Be explicit about partition name when it is
 required.

---
 roles/roles_common.js | 5 -----
 roles/tests/server.js | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 6526eb3a65..97819eb709 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1096,9 +1096,6 @@ _.extend(Roles, {
   renamePartition: function (oldName, newName) {
     var count;
 
-    oldName = oldName || null;
-    newName = newName || null;
-
     Roles._checkPartitionName(oldName);
     Roles._checkPartitionName(newName);
 
@@ -1129,8 +1126,6 @@ _.extend(Roles, {
    * @static
    */
   removePartition: function (name) {
-    name = Roles._normalizePartitionName(name);
-
     Roles._checkPartitionName(name);
 
     Meteor.users.update({}, {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 746284ac84..aa30637ba0 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -259,6 +259,10 @@
       test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition1'));
       test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition2'));
 
+      test.throws(function () {
+        Roles.renamePartition('partition3');
+      }, /Invalid partition name/);
+
       Roles.renamePartition('partition3', null);
 
       testUser(test, 'eve', ['admin', 'user', 'editor'], 'partition2');

From 76fe6541573e77d1f6cb2ab5875c38894a4a40dc Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Fri, 26 Feb 2016 23:12:52 -0800
Subject: [PATCH 0257/1140] Style.

---
 roles/roles_common.js |  2 +-
 roles/roles_server.js | 41 ++++++++++++++++++++---------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index f80e0f4f51..d5d44b98bf 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -76,7 +76,7 @@ _.extend(Roles, {
       // XXX string parsing sucks, maybe
       // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
       if (e.name !== 'MongoError') throw e;
-      match = ( e.err || e.errmsg ).match(/E11000 duplicate key error index: ([^ ]+)/);
+      match = (e.err || e.errmsg).match(/E11000 duplicate key error index: ([^ ]+)/);
       if (!match) throw e;
       if (match[1].indexOf('$_id') !== -1) {
         if (options.unlessExists) return null;
diff --git a/roles/roles_server.js b/roles/roles_server.js
index eb5e14b6b1..754fb7d21b 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -5,22 +5,6 @@
 Meteor.users._ensureIndex({'roles._id': 1, 'roles.partition': 1});
 Meteor.users._ensureIndex({'roles.partition': 1});
 
-/**
- * Utility function to drop obsolete indexes when migrating
- *
- * @param {Object} collection to be proceeded
- * @param {String} indexName to drop
- */
-dropCollectionIndex = function(collection,indexName){
-  try {
-    collection._dropIndex(indexName);
-  } catch (e) {
-    if (e.name !== 'MongoError') throw e;
-    match = (e.err || e.errmsg).match(/index not found/);
-    if (!match) throw e;
-  }
-};
-
 /*
  * Publish logged-in user's roles so client-side checks can work.
  *
@@ -251,6 +235,23 @@ _.extend(Roles, {
     Meteor.roles.insert(newRole);
   },
 
+  /**
+   * @method _dropCollectionIndex
+   * @param {Object} collection Collection on which to drop the index.
+   * @param {String} indexName Name of the index to drop.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _dropCollectionIndex: function (collection, indexName) {
+    try {
+      collection._dropIndex(indexName);
+    } catch (e) {
+      if (e.name !== 'MongoError') throw e;
+      if (!/index not found/.test(e.err || e.errmsg)) throw e;
+    }
+  },
+
   /**
    * Migrates `Meteor.users` and `Meteor.roles` to the new format.
    *
@@ -266,8 +267,7 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
-    // drop obsolete index name_1, preventing mongo duplicate key 'null' errors
-    dropCollectionIndex(Meteor.roles,"name_1");
+    Roles._dropCollectionIndex(Meteor.roles, 'name_1');
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isNewRole(role)) {
@@ -301,9 +301,8 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
-    // drop 'obsolete' users indexes
-    dropCollectionIndex(Meteor.users,"roles._id_1_roles.partition_1");
-    dropCollectionIndex(Meteor.users,"roles.partition_1");
+    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.partition_1');
+    Roles._dropCollectionIndex(Meteor.users, 'roles.partition_1');
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isOldRole(role)) {

From 038811ff49b4fc21ab62c64125e4fa2220adea75 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 3 Apr 2016 23:31:51 -0700
Subject: [PATCH 0258/1140] Made checking for duplicate key work on MongoDB
 3.2.

Fixes #185.
---
 roles/roles_common.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index d5d44b98bf..a9bd2e0ffe 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -75,14 +75,13 @@ _.extend(Roles, {
       // (from Meteor accounts-base package, insertUserDoc func)
       // XXX string parsing sucks, maybe
       // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-      if (e.name !== 'MongoError') throw e;
-      match = (e.err || e.errmsg).match(/E11000 duplicate key error index: ([^ ]+)/);
-      if (!match) throw e;
-      if (match[1].indexOf('$_id') !== -1) {
+      if (/E11000 duplicate key error.*(index.*roles|roles.*index).*_id/.test(e.err || e.errmsg)) {
         if (options.unlessExists) return null;
         throw new Error("Role '" + roleName + "' already exists.");
       }
-      throw e;
+      else {
+        throw e;
+      }
     }
   },
 

From 2bd1f63efe8299d3c1086e1eb5cb5a47ef207a76 Mon Sep 17 00:00:00 2001
From: Andy Edwards <jedwards@fastmail.com>
Date: Fri, 22 Apr 2016 09:21:33 -0500
Subject: [PATCH 0259/1140] use upsert instead of insert when creating new
 roles

---
 roles/roles_common.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index a9bd2e0ffe..8a31b92db0 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -69,20 +69,14 @@ _.extend(Roles, {
       unlessExists: false
     });
 
-    try {
-      return Meteor.roles.insert({_id: roleName, children: []});
-    } catch (e) {
-      // (from Meteor accounts-base package, insertUserDoc func)
-      // XXX string parsing sucks, maybe
-      // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-      if (/E11000 duplicate key error.*(index.*roles|roles.*index).*_id/.test(e.err || e.errmsg)) {
-        if (options.unlessExists) return null;
-        throw new Error("Role '" + roleName + "' already exists.");
-      }
-      else {
-        throw e;
-      }
+    var result = Meteor.roles.upsert({_id: roleName}, {$setOnInsert: {children: []}});
+
+    if (!result.insertedId) {
+      if (options.unlessExists) return null;
+      throw new Error("Role '" + roleName + "' already exists.");
     }
+
+    return result.insertedId;
   },
 
   /**

From 75f585eb9a977dd045283238208d694010ffa0bb Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 2 Oct 2016 12:39:52 -0700
Subject: [PATCH 0260/1140] Renaming partitions to scopes.

Fixes: #213
---
 History.md                                   |    8 +-
 README.md                                    |   66 +-
 docs/api.js                                  |    2 +-
 docs/assets/css/external-small.png           |  Bin
 docs/assets/css/logo.png                     |  Bin
 docs/assets/css/main.css                     |    0
 docs/assets/favicon.ico                      |  Bin
 docs/assets/img/spinner.gif                  |  Bin
 docs/assets/index.html                       |    0
 docs/assets/js/api-filter.js                 |    0
 docs/assets/js/api-list.js                   |    0
 docs/assets/js/api-search.js                 |    0
 docs/assets/js/apidocs.js                    |    0
 docs/assets/js/yui-prettify.js               |    0
 docs/assets/vendor/prettify/CHANGES.html     |    0
 docs/assets/vendor/prettify/COPYING          |    0
 docs/assets/vendor/prettify/README.html      |    0
 docs/assets/vendor/prettify/prettify-min.css |    0
 docs/assets/vendor/prettify/prettify-min.js  |    0
 docs/classes/Roles.html                      |  948 ++++++++------
 docs/classes/UIHelpers.html                  |    8 +-
 docs/data.json                               |  207 ++-
 docs/files/roles_client_uiHelpers.js.html    |   10 +-
 docs/files/roles_roles_common.js.html        |  352 +++---
 docs/files/roles_roles_server.js.html        |   44 +-
 docs/modules/Roles.html                      |    2 +-
 roles/client/uiHelpers.js                    |   10 +-
 roles/roles_common.js                        |  252 ++--
 roles/roles_server.js                        |   24 +-
 roles/tests/client.js                        |   12 +-
 roles/tests/server.js                        | 1174 +++++++++---------
 31 files changed, 1711 insertions(+), 1408 deletions(-)
 mode change 100644 => 100755 docs/assets/css/external-small.png
 mode change 100644 => 100755 docs/assets/css/logo.png
 mode change 100644 => 100755 docs/assets/css/main.css
 mode change 100644 => 100755 docs/assets/favicon.ico
 mode change 100644 => 100755 docs/assets/img/spinner.gif
 mode change 100644 => 100755 docs/assets/index.html
 mode change 100644 => 100755 docs/assets/js/api-filter.js
 mode change 100644 => 100755 docs/assets/js/api-list.js
 mode change 100644 => 100755 docs/assets/js/api-search.js
 mode change 100644 => 100755 docs/assets/js/apidocs.js
 mode change 100644 => 100755 docs/assets/js/yui-prettify.js
 mode change 100644 => 100755 docs/assets/vendor/prettify/CHANGES.html
 mode change 100644 => 100755 docs/assets/vendor/prettify/COPYING
 mode change 100644 => 100755 docs/assets/vendor/prettify/README.html
 mode change 100644 => 100755 docs/assets/vendor/prettify/prettify-min.css
 mode change 100644 => 100755 docs/assets/vendor/prettify/prettify-min.js

diff --git a/History.md b/History.md
index 188844f30b..0c3a6c0d16 100644
--- a/History.md
+++ b/History.md
@@ -2,10 +2,10 @@
 
 * Rewrite with the new schema for `roles` field and `Meteor.roles` collection.
 * Support for roles hierarchies.
-* Groups were renamed to partitions.
-* Groups/partitions are always available, if you do not specify a partition, role is seen as a global role.
-* `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a partition, or use `null`).
-* `getGroupsForUser` is deprecated, `getPartitionsForUser` should be used instead.
+* Groups were renamed to scopes.
+* Groups/scopes are always available, if you do not specify a scope, role is seen as a global role.
+* `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a scope, or use `null`).
+* `getGroupsForUser` is deprecated, `getScopesForUser` should be used instead.
 * Functions which modify roles are available both on the client and server side, but should be called on the
   client side only from inside Meteor methods.
 * `deleteRole` can now delete role even when in use, it is automatically unset from all users.
diff --git a/README.md b/README.md
index 151388751b..43af11d298 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 * [Contributors](#roles-contributors)
 * [Authorization](#roles-authorization)
 * [Permissions vs roles](#roles-naming)
-* [What are "partitions"?](#roles-partitions)
+* [What are "scopes"?](#roles-scopes)
 * [Changes to default Meteor](#roles-changes)
 * [Installation](#roles-installing)
 * [Migration to 2.0](#roles-migration)
@@ -89,19 +89,19 @@ Roles.addRolesToParent('POST_EDIT', 'user');
 
 <br />
 
-<a id="roles-partitions" name="roles-partitions"></a>
-### What are "partitions"?
+<a id="roles-scopes" name="roles-scopes"></a>
+### What are "scopes"?
 
 Sometimes it is useful to let a user have independent sets of roles.  The `roles` package calls these independent
-sets "partitions" for lack of a better term. You can use them to represent various communities inside of your
+sets "scopes" for lack of a better term. You can use them to represent various communities inside of your
 application. Or maybe your application supports [multiple tenants](https://en.wikipedia.org/wiki/Multitenancy).
-You can put each of those tenants into their own partition. Alternatively, you can use partitions to represent
+You can put each of those tenants into their own scope. Alternatively, you can use scopes to represent
 various resources you have. But if you really need per-document permissions, if might be that storing permissions
 with documents is a better approach (than one takes by this package, where roles are stored with users).
 
-Users can have both partition roles assigned, and global roles. Global roles are in effect for all partitions.
-But partitions are independent from each other. Users can have one set of roles in partition A and another set
-of roles in partition B. Let's go through an example of this using soccer/football teams as partitions.
+Users can have both scope roles assigned, and global roles. Global roles are in effect for all scopes.
+But scopes are independent from each other. Users can have one set of roles in scope A and another set
+of roles in scope B. Let's go through an example of this using soccer/football teams as scopes.
 
 ```javascript
 Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com');
@@ -111,11 +111,11 @@ Roles.userIsInRole(joesUserId, 'manage-team', 'manchester-united.com'); // true
 Roles.userIsInRole(joesUserId, 'manage-team', 'real-madrid.com'); // false
 ```
 
-In this example we can see that Joe manages Manchester United and plays for Real Madrid. By using partitions, we can
-assign roles independently and make sure that they don't get mixed up between partitions.
+In this example we can see that Joe manages Manchester United and plays for Real Madrid. By using scopes, we can
+assign roles independently and make sure that they don't get mixed up between scopes.
 
 Now, let's take a look at how to use the global roles. Say we want to give Joe permission to do something across
-all of our partitions. That is what the global roles are for:
+all of our scopes. That is what the global roles are for:
 
 ```javascript
 Roles.addUsersToRoles(joesUserId, 'super-admin', null); // Or you could just omit the last argument.
@@ -173,10 +173,10 @@ meteor shell
 Here is the list of important changes between meteor-roles 1.0 and 2.0 to consider when migrating to 2.0:
 
 * New schema for `roles` field and `Meteor.roles` collection.
-* Groups were renamed to partitions.
-* Partitions are always available, if you do not specify a partition, role is seen as a global role.
-* `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a partition, or use `null`).
-* `getGroupsForUser` is deprecated, `getPartitionsForUser` should be used instead.
+* Groups were renamed to scopes.
+* Scopes are always available, if you do not specify a scope, role is seen as a global role.
+* `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a scope, or use `null`).
+* `getGroupsForUser` is deprecated, `getScopesForUser` should be used instead.
 * Functions which modify roles are available both on the client and server side, but should be called on the
   client side only from inside Meteor methods.
 * `deleteRole` can now delete role even when in use, it is automatically unset from all users.
@@ -242,12 +242,12 @@ Check user roles before publishing sensitive data:
 // server/publish.js
 
 // Give authorized users access to sensitive data by group
-Meteor.publish('secrets', function (partition) {
-  check(partition, String);
+Meteor.publish('secrets', function (scope) {
+  check(scope, String);
 
-  if (Roles.userIsInRole(this.userId, ['view-secrets','admin'], partition)) {
+  if (Roles.userIsInRole(this.userId, ['view-secrets','admin'], scope)) {
     
-    return Meteor.secrets.find({partition: partition});
+    return Meteor.secrets.find({scope: scope});
     
   } else {
 
@@ -282,26 +282,26 @@ Prevent access to certain functionality, such as deleting a user:
 
 Meteor.methods({
   /**
-   * Revokes roles for a user in a specific partition.
+   * Revokes roles for a user in a specific scope.
    * 
    * @method revokeUser
    * @param {String} targetUserId ID of user to revoke roles for.
-   * @param {String} partition Company to update roles for.
+   * @param {String} scope Company to update roles for.
    */
-  revokeUser: function (targetUserId, partition) {
+  revokeUser: function (targetUserId, scope) {
     check(targetUserId, String);
-    check(partition, String);
+    check(scope, String);
   
     var loggedInUser = Meteor.user();
 
     if (!loggedInUser ||
         !Roles.userIsInRole(loggedInUser, 
-                            ['manage-users', 'support-staff'], partition)) {
+                            ['manage-users', 'support-staff'], scope)) {
       throw new Meteor.Error('access-denied', "Access denied")
     }
 
-    // remove roles for target partition
-    Roles.setUserRoles(targetUserId, [], partition)
+    // remove roles for target scope
+    Roles.setUserRoles(targetUserId, [], scope)
   }
 })
 ```
@@ -318,22 +318,22 @@ Meteor.methods({
    *
    * @param {Object} targetUserId Id of user to update.
    * @param {Array} roles User's new roles.
-   * @param {String} partition Company to update roles for.
+   * @param {String} scope Company to update roles for.
    */
-  updateRoles: function (targetUserId, roles, partition) {
+  updateRoles: function (targetUserId, roles, scope) {
     check(targetUserId, String);
     check(roles, [String]);
-    check(partition, String);
+    check(scope, String);
 
     var loggedInUser = Meteor.user();
 
     if (!loggedInUser ||
         !Roles.userIsInRole(loggedInUser, 
-                            ['manage-users', 'support-staff'], partition)) {
+                            ['manage-users', 'support-staff'], scope)) {
       throw new Meteor.Error('access-denied', "Access denied");
     }
 
-    Roles.setUserRoles(targetUserId, roles, partition);
+    Roles.setUserRoles(targetUserId, roles, scope);
   }
 })
 ```
@@ -356,7 +356,7 @@ The following example is just sugar to help improve the user experience for norm
 the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js`
 file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
 
-To check for global roles or when not using partitions:
+To check for global roles or when not using scopes:
 
 ```handlebars
 <!-- client/myApp.html -->
@@ -372,7 +372,7 @@ To check for global roles or when not using partitions:
 </template>
 ```
 
-To check for roles when using partitions:
+To check for roles when using scopes:
 
 ```handlebars
 <!-- client/myApp.html -->
diff --git a/docs/api.js b/docs/api.js
index 17de6dc757..89f4eb93a7 100644
--- a/docs/api.js
+++ b/docs/api.js
@@ -12,7 +12,7 @@ YUI.add("yuidoc-meta", function(Y) {
         {
             "displayName": "Roles",
             "name": "Roles",
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `_id`: role name\n - `partition`: partition name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"admin\", children: [{_id: \"editor\"}]}`"
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `_id`: role name\n - `scope`: scope name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"admin\", children: [{_id: \"editor\"}]}`"
         },
         {
             "displayName": "UIHelpers",
diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
old mode 100644
new mode 100755
diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
old mode 100644
new mode 100755
diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
old mode 100644
new mode 100755
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
old mode 100644
new mode 100755
diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
old mode 100644
new mode 100755
diff --git a/docs/assets/index.html b/docs/assets/index.html
old mode 100644
new mode 100755
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
old mode 100644
new mode 100755
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
old mode 100644
new mode 100755
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
old mode 100644
new mode 100755
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
index e90e677232..209466135b 100644
--- a/docs/classes/Roles.html
+++ b/docs/classes/Roles.html
@@ -173,6 +173,11 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__dropCollectionIndex">_dropCollectionIndex</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__forwardMigrate">_forwardMigrate</a>
 
@@ -199,12 +204,17 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method private">
-                                <a href="#method__onlyAssignedMatcher">_onlyAssignedMatcher</a>
+                                <a href="#method__normalizeOptions">_normalizeOptions</a>
 
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method private">
-                                <a href="#method__partitionMatcher">_partitionMatcher</a>
+                                <a href="#method__normalizeScopeName">_normalizeScopeName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__onlyAssignedMatcher">_onlyAssignedMatcher</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -224,7 +234,7 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method private">
-                                <a href="#method__roleAndPartitionMatcher">_roleAndPartitionMatcher</a>
+                                <a href="#method__roleAndScopeMatcher">_roleAndScopeMatcher</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -233,6 +243,11 @@
 
                                     <span class="flag static">static</span>
                             </li>
+                            <li class="index-item method private">
+                                <a href="#method__scopeMatcher">_scopeMatcher</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
                             <li class="index-item method private">
                                 <a href="#method__usersInRoleQuery">_usersInRoleQuery</a>
 
@@ -270,12 +285,12 @@
                                     <span class="flag deprecated">deprecated</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_getPartitionsForUser">getPartitionsForUser</a>
+                                <a href="#method_getRolesForUser">getRolesForUser</a>
 
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_getRolesForUser">getRolesForUser</a>
+                                <a href="#method_getScopesForUser">getScopesForUser</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -285,12 +300,12 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_removePartition">removePartition</a>
+                                <a href="#method_removeRolesFromParent">removeRolesFromParent</a>
 
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_removeRolesFromParent">removeRolesFromParent</a>
+                                <a href="#method_removeScope">removeScope</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -300,12 +315,12 @@
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_renamePartition">renamePartition</a>
+                                <a href="#method_renameRole">renameRole</a>
 
                                     <span class="flag static">static</span>
                             </li>
                             <li class="index-item method">
-                                <a href="#method_renameRole">renameRole</a>
+                                <a href="#method_renameScope">renameScope</a>
 
                                     <span class="flag static">static</span>
                             </li>
@@ -372,7 +387,7 @@
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l219"><code>roles&#x2F;roles_common.js:219</code></a>
+        <a href="../files/roles_roles_common.js.html#l212"><code>roles&#x2F;roles_common.js:212</code></a>
         </p>
 
 
@@ -447,7 +462,7 @@
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l507"><code>roles&#x2F;roles_common.js:507</code></a>
+        <a href="../files/roles_roles_common.js.html#l488"><code>roles&#x2F;roles_common.js:488</code></a>
         </p>
 
 
@@ -493,7 +508,7 @@
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
 <li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
 <li><code>_assigned</code>: internal option, should not be used publicly because it will break assumptions
 in te code; publicly, you can only add users to an assigned role
@@ -542,7 +557,7 @@ only that it does not force the value to <code>false</code> if the role is alrea
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l748"><code>roles&#x2F;roles_common.js:748</code></a>
+        <a href="../files/roles_roles_common.js.html#l723"><code>roles&#x2F;roles_common.js:723</code></a>
         </p>
 
 
@@ -608,7 +623,7 @@ are marked as not explicitly assigned, and have not been part of what we current
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l266"><code>roles&#x2F;roles_server.js:266</code></a>
+        <a href="../files/roles_roles_server.js.html#l285"><code>roles&#x2F;roles_server.js:285</code></a>
         </p>
 
 
@@ -665,62 +680,6 @@ no subroles.</p>
 
 
 
-</div>
-<div id="method__checkRoleName" class="method item private">
-    <h3 class="name"><code>_checkRoleName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>partitionName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1281"><code>roles&#x2F;roles_common.js:1281</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Throw an exception if <code>partitionName</code> is an invalid partition name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">partitionName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A partition name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
 </div>
 <div id="method__checkRoleName" class="method item private">
     <h3 class="name"><code>_checkRoleName</code></h3>
@@ -745,7 +704,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1267"><code>roles&#x2F;roles_common.js:1267</code></a>
+        <a href="../files/roles_roles_common.js.html#l1219"><code>roles&#x2F;roles_common.js:1219</code></a>
         </p>
 
 
@@ -777,6 +736,62 @@ no subroles.</p>
 
 
 
+</div>
+<div id="method__checkRoleName" class="method item private">
+    <h3 class="name"><code>_checkRoleName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>scopeName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1273"><code>roles&#x2F;roles_common.js:1273</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Throw an exception if <code>scopeName</code> is an invalid scope name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">scopeName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A scope name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method__convertToNewField" class="method item private">
     <h3 class="name"><code>_convertToNewField</code></h3>
@@ -1211,6 +1226,75 @@ no subroles.</p>
 
 
 
+</div>
+<div id="method__dropCollectionIndex" class="method item private">
+    <h3 class="name"><code>_dropCollectionIndex</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>collection</code>
+                </li>
+                <li class="arg">
+                        <code>indexName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_server.js.html#l238"><code>roles&#x2F;roles_server.js:238</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">collection</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Collection on which to drop the index.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">indexName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of the index to drop.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method__forwardMigrate" class="method item private">
     <h3 class="name"><code>_forwardMigrate</code></h3>
@@ -1241,7 +1325,7 @@ no subroles.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_server.js.html#l238"><code>roles&#x2F;roles_server.js:238</code></a>
+        <a href="../files/roles_roles_server.js.html#l255"><code>roles&#x2F;roles_server.js:255</code></a>
         </p>
 
 
@@ -1568,13 +1652,87 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
 
 
 </div>
-<div id="method__onlyAssignedMatcher" class="method item private">
-    <h3 class="name"><code>_onlyAssignedMatcher</code></h3>
+<div id="method__normalizeOptions" class="method item private">
+    <h3 class="name"><code>_normalizeOptions</code></h3>
 
-        <span class="paren">()</span>
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>options</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
 
         <span class="returns-inline">
-            <span class="type">Function</span>
+            <span class="type">Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1233"><code>roles&#x2F;roles_common.js:1233</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Normalize options.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">options</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options to normalize.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>Normalized options.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__normalizeScopeName" class="method item private">
+    <h3 class="name"><code>_normalizeScopeName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>scopeName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">String</span>
         </span>
 
 
@@ -1596,33 +1754,44 @@ If it is ambiguous or it is not, returns <code>false</code>.</p>
     </div>
 
     <div class="description">
-        
+        <p>Normalize scope name.</p>
+
     </div>
 
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">scopeName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A scope name to normalize.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
 
         <div class="returns">
             <h4>Returns:</h4>
 
             <div class="returns-description">
-                        <span class="type">Function</span>:
-                    <p>A matcher function which accepts a role object and returns <code>true</code>
-if the role is an assigned role.</p>
+                        <span class="type">String</span>:
+                    <p>Normalized scope name.</p>
 
             </div>
         </div>
 
 
 </div>
-<div id="method__partitionMatcher" class="method item private">
-    <h3 class="name"><code>_partitionMatcher</code></h3>
+<div id="method__onlyAssignedMatcher" class="method item private">
+    <h3 class="name"><code>_onlyAssignedMatcher</code></h3>
 
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>partition</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
+        <span class="paren">()</span>
 
         <span class="returns-inline">
             <span class="type">Function</span>
@@ -1639,7 +1808,7 @@ if the role is an assigned role.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1238"><code>roles&#x2F;roles_common.js:1238</code></a>
+        <a href="../files/roles_roles_common.js.html#l1206"><code>roles&#x2F;roles_common.js:1206</code></a>
         </p>
 
 
@@ -1650,23 +1819,6 @@ if the role is an assigned role.</p>
         
     </div>
 
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">partition</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A partition to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
 
         <div class="returns">
             <h4>Returns:</h4>
@@ -1674,7 +1826,7 @@ if the role is an assigned role.</p>
             <div class="returns-description">
                         <span class="type">Function</span>:
                     <p>A matcher function which accepts a role object and returns <code>true</code>
-if its partition matches <code>partition</code>.</p>
+if the role is an assigned role.</p>
 
             </div>
         </div>
@@ -1707,7 +1859,7 @@ if its partition matches <code>partition</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l323"><code>roles&#x2F;roles_common.js:323</code></a>
+        <a href="../files/roles_roles_common.js.html#l316"><code>roles&#x2F;roles_common.js:316</code></a>
         </p>
 
 
@@ -1779,7 +1931,7 @@ if its partition matches <code>partition</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l680"><code>roles&#x2F;roles_common.js:680</code></a>
+        <a href="../files/roles_roles_common.js.html#l655"><code>roles&#x2F;roles_common.js:655</code></a>
         </p>
 
 
@@ -1830,7 +1982,7 @@ particular user.</p>
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
 <li><code>_assigned</code>: internal option, should not be used publicly because it will break assumptions
 in te code; publicly, you can only remove users from an assigned role
 if <code>true</code>, only manually assigned roles are removed, if <code>false</code>, only automatically
@@ -1875,7 +2027,7 @@ assigned roles are removed, if <code>null</code>, any role is removed</li>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1181"><code>roles&#x2F;roles_common.js:1181</code></a>
+        <a href="../files/roles_roles_common.js.html#l1133"><code>roles&#x2F;roles_common.js:1133</code></a>
         </p>
 
 
@@ -1929,8 +2081,8 @@ if it is not already.</p>
 
 
 </div>
-<div id="method__roleAndPartitionMatcher" class="method item private">
-    <h3 class="name"><code>_roleAndPartitionMatcher</code></h3>
+<div id="method__roleAndScopeMatcher" class="method item private">
+    <h3 class="name"><code>_roleAndScopeMatcher</code></h3>
 
         <div class="args">
             <span class="paren">(</span><ul class="args-list inline commas">
@@ -1938,7 +2090,7 @@ if it is not already.</p>
                         <code>roleName</code>
                 </li>
                 <li class="arg">
-                        <code>partition</code>
+                        <code>scope</code>
                 </li>
             </ul><span class="paren">)</span>
         </div>
@@ -1958,7 +2110,7 @@ if it is not already.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1221"><code>roles&#x2F;roles_common.js:1221</code></a>
+        <a href="../files/roles_roles_common.js.html#l1173"><code>roles&#x2F;roles_common.js:1173</code></a>
         </p>
 
 
@@ -1985,12 +2137,12 @@ if it is not already.</p>
 
                 </li>
                 <li class="param">
-                        <code class="param-name">partition</code>
+                        <code class="param-name">scope</code>
                         <span class="type">String</span>
 
 
                     <div class="param-description">
-                        <p>A partition to match against.</p>
+                        <p>A scope to match against.</p>
 
                     </div>
 
@@ -2004,7 +2156,7 @@ if it is not already.</p>
             <div class="returns-description">
                         <span class="type">Function</span>:
                     <p>A matcher function which accepts a role object and returns <code>true</code>
-if its name matches <code>roleName</code>, and partition matches <code>partition</code>.</p>
+if its name matches <code>roleName</code>, and scope matches <code>scope</code>.</p>
 
             </div>
         </div>
@@ -2037,7 +2189,7 @@ if its name matches <code>roleName</code>, and partition matches <code>partition
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1207"><code>roles&#x2F;roles_common.js:1207</code></a>
+        <a href="../files/roles_roles_common.js.html#l1159"><code>roles&#x2F;roles_common.js:1159</code></a>
         </p>
 
 
@@ -2078,6 +2230,74 @@ if its name matches <code>roleName</code>.</p>
         </div>
 
 
+</div>
+<div id="method__scopeMatcher" class="method item private">
+    <h3 class="name"><code>_scopeMatcher</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>scope</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Function</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1190"><code>roles&#x2F;roles_common.js:1190</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">scope</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A scope to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Function</span>:
+                    <p>A matcher function which accepts a role object and returns <code>true</code>
+if its scope matches <code>scope</code>.</p>
+
+            </div>
+        </div>
+
+
 </div>
 <div id="method__usersInRoleQuery" class="method item private">
     <h3 class="name"><code>_usersInRoleQuery</code></h3>
@@ -2111,7 +2331,7 @@ if its name matches <code>roleName</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1002"><code>roles&#x2F;roles_common.js:1002</code></a>
+        <a href="../files/roles_roles_common.js.html#l965"><code>roles&#x2F;roles_common.js:965</code></a>
         </p>
 
 
@@ -2149,13 +2369,13 @@ Roles do not have to exist.</p>
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of the partition to restrict roles to; user's global
+<li><code>scope</code>: name of the scope to restrict roles to; user's global
 roles will also be checked</li>
-<li><code>anyPartition</code>: if set, role can be in any partition (<code>partition</code> option is ignored)</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
 <li><code>queryOptions</code>: options which are passed directly
 through to <code>Meteor.users.find(query, options)</code></li>
 </ul>
-<p>Alternatively, it can be a partition name string.</p>
+<p>Alternatively, it can be a scope name string.</p>
 
                     </div>
 
@@ -2213,7 +2433,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l199"><code>roles&#x2F;roles_common.js:199</code></a>
+        <a href="../files/roles_roles_common.js.html#l192"><code>roles&#x2F;roles_common.js:192</code></a>
         </p>
 
 
@@ -2287,7 +2507,7 @@ parent role set, new subroles are added automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l385"><code>roles&#x2F;roles_common.js:385</code></a>
+        <a href="../files/roles_roles_common.js.html#l378"><code>roles&#x2F;roles_common.js:378</code></a>
         </p>
 
 
@@ -2335,10 +2555,10 @@ parent role set, new subroles are added automatically.</p>
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
 <li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
 </ul>
-<p>Alternatively, it can be a partition name string.</p>
+<p>Alternatively, it can be a scope name string.</p>
 
                     </div>
 
@@ -2467,7 +2687,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l89"><code>roles&#x2F;roles_common.js:89</code></a>
+        <a href="../files/roles_roles_common.js.html#l82"><code>roles&#x2F;roles_common.js:82</code></a>
         </p>
 
 
@@ -2526,7 +2746,7 @@ Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exa
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l956"><code>roles&#x2F;roles_common.js:956</code></a>
+        <a href="../files/roles_roles_common.js.html#l919"><code>roles&#x2F;roles_common.js:919</code></a>
         </p>
 
 
@@ -2587,7 +2807,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l1074"><code>roles&#x2F;roles_common.js:1074</code></a>
+        <a href="../files/roles_roles_common.js.html#l1031"><code>roles&#x2F;roles_common.js:1031</code></a>
         </p>
 
 
@@ -2595,95 +2815,13 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     </div>
 
     <div class="description">
-        <p>Deprecated. Use <code>getPartitionsForUser</code> instead.</p>
+        <p>Deprecated. Use <code>getScopesForUser</code> instead.</p>
 
     </div>
 
 
 
 
-</div>
-<div id="method_getPartitionsForUser" class="method item">
-    <h3 class="name"><code>getPartitionsForUser</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[roles]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1090"><code>roles&#x2F;roles_common.js:1090</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve users partitions, if any.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[roles]</code>
-                        <span class="type">Array | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Name of roles to restrict partitions to.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array</span>:
-                    <p>Array of user's partitions, unsorted.</p>
-
-            </div>
-        </div>
-
-
 </div>
 <div id="method_getRolesForUser" class="method item">
     <h3 class="name"><code>getRolesForUser</code></h3>
@@ -2713,7 +2851,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l900"><code>roles&#x2F;roles_common.js:900</code></a>
+        <a href="../files/roles_roles_common.js.html#l869"><code>roles&#x2F;roles_common.js:869</code></a>
         </p>
 
 
@@ -2749,12 +2887,12 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of partition to provide roles for; if not specified, global roles are returned</li>
-<li><code>anyPartition</code>: if set, role can be in any partition (<code>partition</code> option is ignored)</li>
+<li><code>scope</code>: name of scope to provide roles for; if not specified, global roles are returned</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
 <li><code>fullObjects</code>: return full roles objects (<code>true</code>) or just names (<code>false</code>) (default <code>false</code>)</li>
 <li><code>onlyAssigned</code>: return only assigned roles and not automatically inferred (like subroles)</li>
 </ul>
-<p>Alternatively, it can be a partition name string.</p>
+<p>Alternatively, it can be a scope name string.</p>
 
                     </div>
 
@@ -2773,6 +2911,88 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
         </div>
 
 
+</div>
+<div id="method_getScopesForUser" class="method item">
+    <h3 class="name"><code>getScopesForUser</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[roles]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1047"><code>roles&#x2F;roles_common.js:1047</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve users scopes, if any.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[roles]</code>
+                        <span class="type">Array | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Name of roles to restrict scopes to.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Array</span>:
+                    <p>Array of user's scopes, unsorted.</p>
+
+            </div>
+        </div>
+
+
 </div>
 <div id="method_getUsersInRole" class="method item">
     <h3 class="name"><code>getUsersInRole</code></h3>
@@ -2805,7 +3025,7 @@ through to <code>Meteor.roles.find(query, options)</code>.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l971"><code>roles&#x2F;roles_common.js:971</code></a>
+        <a href="../files/roles_roles_common.js.html#l934"><code>roles&#x2F;roles_common.js:934</code></a>
         </p>
 
 
@@ -2845,13 +3065,13 @@ Roles do not have to exist.</p>
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of the partition to restrict roles to; user's global
+<li><code>scope</code>: name of the scope to restrict roles to; user's global
 roles will also be checked</li>
-<li><code>anyPartition</code>: if set, role can be in any partition (<code>partition</code> option is ignored)</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
 <li><code>queryOptions</code>: options which are passed directly
 through to <code>Meteor.users.find(query, options)</code></li>
 </ul>
-<p>Alternatively, it can be a partition name string.</p>
+<p>Alternatively, it can be a scope name string.</p>
 
                     </div>
 
@@ -2883,62 +3103,6 @@ through to <code>Meteor.users.find(query, options)</code></p>
         </div>
 
 
-</div>
-<div id="method_removePartition" class="method item">
-    <h3 class="name"><code>removePartition</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>name</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1158"><code>roles&#x2F;roles_common.js:1158</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove a partition.</p>
-<p>Roles assigned with a given partition are removed.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">name</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The name of a partition.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
 </div>
 <div id="method_removeRolesFromParent" class="method item">
     <h3 class="name"><code>removeRolesFromParent</code></h3>
@@ -2965,7 +3129,7 @@ through to <code>Meteor.users.find(query, options)</code></p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l303"><code>roles&#x2F;roles_common.js:303</code></a>
+        <a href="../files/roles_roles_common.js.html#l296"><code>roles&#x2F;roles_common.js:296</code></a>
         </p>
 
 
@@ -3010,6 +3174,62 @@ parent role set, removed subrole is removed automatically.</p>
 
 
 
+</div>
+<div id="method_removeScope" class="method item">
+    <h3 class="name"><code>removeScope</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>name</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1112"><code>roles&#x2F;roles_common.js:1112</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove a scope.</p>
+<p>Roles assigned with a given scope are removed.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">name</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The name of a scope.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method_removeUsersFromRoles" class="method item">
     <h3 class="name"><code>removeUsersFromRoles</code></h3>
@@ -3039,7 +3259,7 @@ parent role set, removed subrole is removed automatically.</p>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l627"><code>roles&#x2F;roles_common.js:627</code></a>
+        <a href="../files/roles_roles_common.js.html#l608"><code>roles&#x2F;roles_common.js:608</code></a>
         </p>
 
 
@@ -3086,9 +3306,9 @@ parent role set, removed subrole is removed automatically.</p>
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
 </ul>
-<p>Alternatively, it can be a partition name string.</p>
+<p>Alternatively, it can be a scope name string.</p>
 
                     </div>
 
@@ -3108,76 +3328,6 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
 
             </div>
         </div>
-</div>
-<div id="method_renamePartition" class="method item">
-    <h3 class="name"><code>renamePartition</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldName</code>
-                </li>
-                <li class="arg">
-                        <code>newName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1122"><code>roles&#x2F;roles_common.js:1122</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Rename a partition.</p>
-<p>Roles assigned with a given partition are changed to be under the new partition.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Old name of a partition.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">newName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>New name of a partition.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
 </div>
 <div id="method_renameRole" class="method item">
     <h3 class="name"><code>renameRole</code></h3>
@@ -3204,7 +3354,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l141"><code>roles&#x2F;roles_common.js:141</code></a>
+        <a href="../files/roles_roles_common.js.html#l134"><code>roles&#x2F;roles_common.js:134</code></a>
         </p>
 
 
@@ -3247,6 +3397,76 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
 
 
 
+</div>
+<div id="method_renameScope" class="method item">
+    <h3 class="name"><code>renameScope</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldName</code>
+                </li>
+                <li class="arg">
+                        <code>newName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common.js.html#l1079"><code>roles&#x2F;roles_common.js:1079</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Rename a scope.</p>
+<p>Roles assigned with a given scope are changed to be under the new scope.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Old name of a scope.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">newName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>New name of a scope.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
 </div>
 <div id="method_setUserRoles" class="method item">
     <h3 class="name"><code>setUserRoles</code></h3>
@@ -3276,7 +3496,7 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l440"><code>roles&#x2F;roles_common.js:440</code></a>
+        <a href="../files/roles_roles_common.js.html#l427"><code>roles&#x2F;roles_common.js:427</code></a>
         </p>
 
 
@@ -3324,10 +3544,10 @@ Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of the partition, or <code>null</code> for the global role</li>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
 <li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
 </ul>
-<p>Alternatively, it can be a partition name string.</p>
+<p>Alternatively, it can be a scope name string.</p>
 
                     </div>
 
@@ -3380,7 +3600,7 @@ Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'exampl
     <div class="meta">
                 <p>
                 Defined in
-        <a href="../files/roles_roles_common.js.html#l796"><code>roles&#x2F;roles_common.js:796</code></a>
+        <a href="../files/roles_roles_common.js.html#l771"><code>roles&#x2F;roles_common.js:771</code></a>
         </p>
 
 
@@ -3429,11 +3649,11 @@ Roles do not have to exist.</p>
                     <div class="param-description">
                         <p>Options:</p>
 <ul>
-<li><code>partition</code>: name of the partition; if supplied, limits check to just that partition;
-the user's global roles will always be checked whether partition is specified or not</li>
-<li><code>anyPartition</code>: if set, role can be in any partition (<code>partition</code> option is ignored)</li>
+<li><code>scope</code>: name of the scope; if supplied, limits check to just that scope;
+the user's global roles will always be checked whether scope is specified or not</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
 </ul>
-<p>Alternatively, it can be a partition name string.</p>
+<p>Alternatively, it can be a scope name string.</p>
 
                     </div>
 
@@ -3462,10 +3682,10 @@ Roles.userIsInRole(user, ['admin','editor'])
 Roles.userIsInRole(userId, 'admin')
 Roles.userIsInRole(userId, ['admin','editor'])
 
-// partition roles (global roles are still checked)
+// scope roles (global roles are still checked)
 Roles.userIsInRole(user, 'admin', 'group1')
 Roles.userIsInRole(userId, ['admin','editor'], 'group1')
-Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})</code></pre>
+Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})</code></pre>
 
             </div>
         </div>
@@ -3495,7 +3715,7 @@ Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})</code></pr
     </div>
 
     <div class="description">
-        <p>Used as a global group (now partition) name. Not used anymore.</p>
+        <p>Used as a global group (now scope) name. Not used anymore.</p>
 
     </div>
 
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
index c07d75bf35..a479f19280 100644
--- a/docs/classes/UIHelpers.html
+++ b/docs/classes/UIHelpers.html
@@ -133,7 +133,7 @@
                         <code>role</code>
                 </li>
                 <li class="arg">
-                        <code class="optional">[partition]</code>
+                        <code class="optional">[scope]</code>
                 </li>
             </ul><span class="paren">)</span>
         </div>
@@ -181,13 +181,13 @@ of the target roles.  For use in client-side templates.</p>
 
                 </li>
                 <li class="param">
-                        <code class="param-name optional">[partition]</code>
+                        <code class="param-name optional">[scope]</code>
                         <span class="type">String</span>
                         <span class="flag optional" title="This parameter is optional.">optional</span>
 
 
                     <div class="param-description">
-                        <p>Optional, name of partition to check.</p>
+                        <p>Optional, name of scope to check.</p>
 
                     </div>
 
@@ -216,7 +216,7 @@ of the target roles.  For use in client-side templates.</p>
 {{#if isInRole 'editor,user'}}
 {{/if}}
 
-{{#if isInRole 'editor,user' 'partition1'}}
+{{#if isInRole 'editor,user' 'scope1'}}
 {{/if}}</code></pre>
 
             </div>
diff --git a/docs/data.json b/docs/data.json
index dc775e325c..96ce33d73a 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -77,7 +77,7 @@
             "tag": "module",
             "file": "roles/roles_common.js",
             "line": 29,
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `_id`: role name\n - `partition`: partition name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"admin\", children: [{_id: \"editor\"}]}`"
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `_id`: role name\n - `scope`: scope name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"admin\", children: [{_id: \"editor\"}]}`"
         }
     },
     "classes": {
@@ -125,7 +125,7 @@
             "line": 24,
             "description": "UI helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
             "example": [
-                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'partition1'}}\n    {{/if}}"
+                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'scope1'}}\n    {{/if}}"
             ],
             "itemtype": "method",
             "name": "isInRole",
@@ -136,8 +136,8 @@
                     "type": "String"
                 },
                 {
-                    "name": "partition",
-                    "description": "Optional, name of partition to check.",
+                    "name": "scope",
+                    "description": "Optional, name of scope to check.",
                     "type": "String",
                     "optional": true
                 }
@@ -153,7 +153,7 @@
         {
             "file": "roles/roles_common.js",
             "line": 42,
-            "description": "Used as a global group (now partition) name. Not used anymore.",
+            "description": "Used as a global group (now scope) name. Not used anymore.",
             "itemtype": "property",
             "name": "GLOBAL_GROUP",
             "static": 1,
@@ -190,7 +190,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 89,
+            "line": 82,
             "description": "Delete an existing role.\n\nIf the role is set for any user, it is automatically unset.",
             "itemtype": "method",
             "name": "deleteRole",
@@ -207,7 +207,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 141,
+            "line": 134,
             "description": "Rename an existing role.",
             "itemtype": "method",
             "name": "renameRole",
@@ -229,7 +229,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 199,
+            "line": 192,
             "description": "Add role parent to roles.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
             "itemtype": "method",
             "name": "addRolesToParent",
@@ -251,7 +251,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 219,
+            "line": 212,
             "itemtype": "method",
             "name": "_addRoleToParent",
             "params": [
@@ -274,7 +274,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 303,
+            "line": 296,
             "description": "Remove role parent from roles.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
             "itemtype": "method",
             "name": "removeRolesFromParent",
@@ -296,7 +296,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 323,
+            "line": 316,
             "itemtype": "method",
             "name": "_removeRoleFromParent",
             "params": [
@@ -319,7 +319,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 385,
+            "line": 378,
             "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
             "example": [
                 "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -339,7 +339,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a partition name string.",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a scope name string.",
                     "type": "Object|String",
                     "optional": true
                 }
@@ -350,7 +350,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 440,
+            "line": 427,
             "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
             "example": [
                 "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
@@ -370,7 +370,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a partition name string.",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a scope name string.",
                     "type": "Object|String",
                     "optional": true
                 }
@@ -381,7 +381,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 507,
+            "line": 488,
             "description": "Add one user to one role.",
             "itemtype": "method",
             "name": "_addUserToRole",
@@ -398,7 +398,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only add users to an assigned role\n    should the role be set as assigned (`true`), `null` is the same as `false`,\n    only that it does not force the value to `false` if the role is already assigned",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only add users to an assigned role\n    should the role be set as assigned (`true`), `null` is the same as `false`,\n    only that it does not force the value to `false` if the role is already assigned",
                     "type": "Object"
                 }
             ],
@@ -414,7 +414,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 627,
+            "line": 608,
             "description": "Remove users from assigned roles.",
             "example": [
                 "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
@@ -434,7 +434,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n\nAlternatively, it can be a partition name string.",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n\nAlternatively, it can be a scope name string.",
                     "type": "Object|String",
                     "optional": true
                 }
@@ -445,7 +445,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 680,
+            "line": 655,
             "description": "Remove one user from one role.\n\nWARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same\nrole to be a child of multiple roles it might happen that it removes some subroles which\nit should not because they are in effect also through some other parent role. You should always\ncall `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a\nparticular user.",
             "itemtype": "method",
             "name": "_removeUserFromRole",
@@ -462,7 +462,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition, or `null` for the global role\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only remove users from an assigned role\n    if `true`, only manually assigned roles are removed, if `false`, only automatically\n    assigned roles are removed, if `null`, any role is removed",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only remove users from an assigned role\n    if `true`, only manually assigned roles are removed, if `false`, only automatically\n    assigned roles are removed, if `null`, any role is removed",
                     "type": "Object"
                 }
             ],
@@ -474,7 +474,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 748,
+            "line": 723,
             "description": "Makes sure all subroles are correctly set, and no extra subroles are set which should not be.\n\nUsed internally after complicated changes, but it can also be used whenever one feels that\nthere might be inconsistencies (eg., after a crash).\n\nWe simply re-set to the user their assigned roles again and remove any roles which\nare marked as not explicitly assigned, and have not been part of what we currently set.",
             "itemtype": "method",
             "name": "_assureConsistency",
@@ -493,10 +493,10 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 796,
+            "line": 771,
             "description": "Check if user has specified roles.",
             "example": [
-                "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // partition roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})"
+                "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // scope roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})"
             ],
             "itemtype": "method",
             "name": "userIsInRole",
@@ -513,7 +513,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition; if supplied, limits check to just that partition;\n    the user's global roles will always be checked whether partition is specified or not\n  - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)\n\nAlternatively, it can be a partition name string.",
+                    "description": "Options:\n  - `scope`: name of the scope; if supplied, limits check to just that scope;\n    the user's global roles will always be checked whether scope is specified or not\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
                     "type": "Object|String",
                     "optional": true
                 }
@@ -528,7 +528,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 900,
+            "line": 869,
             "description": "Retrieve user's roles.",
             "itemtype": "method",
             "name": "getRolesForUser",
@@ -540,7 +540,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of partition to provide roles for; if not specified, global roles are returned\n  - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)\n  - `fullObjects`: return full roles objects (`true`) or just names (`false`) (default `false`)\n  - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)\n\nAlternatively, it can be a partition name string.",
+                    "description": "Options:\n  - `scope`: name of scope to provide roles for; if not specified, global roles are returned\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `fullObjects`: return full roles objects (`true`) or just names (`false`) (default `false`)\n  - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)\n\nAlternatively, it can be a scope name string.",
                     "type": "Object|String",
                     "optional": true
                 }
@@ -555,7 +555,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 956,
+            "line": 919,
             "description": "Retrieve cursor of all existing roles.",
             "itemtype": "method",
             "name": "getAllRoles",
@@ -577,7 +577,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 971,
+            "line": 934,
             "description": "Retrieve all users who are in target role.\n\nOptions:",
             "itemtype": "method",
             "name": "getUsersInRole",
@@ -589,7 +589,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition to restrict roles to; user's global\n    roles will also be checked\n  - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a partition name string.",
+                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a scope name string.",
                     "type": "Object|String",
                     "optional": true
                 },
@@ -610,7 +610,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1002,
+            "line": 965,
             "itemtype": "method",
             "name": "_usersInRoleQuery",
             "params": [
@@ -621,7 +621,7 @@
                 },
                 {
                     "name": "options",
-                    "description": "Options:\n  - `partition`: name of the partition to restrict roles to; user's global\n    roles will also be checked\n  - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a partition name string.",
+                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a scope name string.",
                     "type": "Object|String",
                     "optional": true
                 },
@@ -644,8 +644,8 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1074,
-            "description": "Deprecated. Use `getPartitionsForUser` instead.",
+            "line": 1031,
+            "description": "Deprecated. Use `getScopesForUser` instead.",
             "itemtype": "method",
             "name": "getGroupsForUser",
             "static": 1,
@@ -655,10 +655,10 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1090,
-            "description": "Retrieve users partitions, if any.",
+            "line": 1047,
+            "description": "Retrieve users scopes, if any.",
             "itemtype": "method",
-            "name": "getPartitionsForUser",
+            "name": "getScopesForUser",
             "params": [
                 {
                     "name": "user",
@@ -667,13 +667,13 @@
                 },
                 {
                     "name": "roles",
-                    "description": "Name of roles to restrict partitions to.",
+                    "description": "Name of roles to restrict scopes to.",
                     "type": "Array|String",
                     "optional": true
                 }
             ],
             "return": {
-                "description": "Array of user's partitions, unsorted.",
+                "description": "Array of user's scopes, unsorted.",
                 "type": "Array"
             },
             "static": 1,
@@ -682,19 +682,19 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1122,
-            "description": "Rename a partition.\n\nRoles assigned with a given partition are changed to be under the new partition.",
+            "line": 1079,
+            "description": "Rename a scope.\n\nRoles assigned with a given scope are changed to be under the new scope.",
             "itemtype": "method",
-            "name": "renamePartition",
+            "name": "renameScope",
             "params": [
                 {
                     "name": "oldName",
-                    "description": "Old name of a partition.",
+                    "description": "Old name of a scope.",
                     "type": "String"
                 },
                 {
                     "name": "newName",
-                    "description": "New name of a partition.",
+                    "description": "New name of a scope.",
                     "type": "String"
                 }
             ],
@@ -704,14 +704,14 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1158,
-            "description": "Remove a partition.\n\nRoles assigned with a given partition are removed.",
+            "line": 1112,
+            "description": "Remove a scope.\n\nRoles assigned with a given scope are removed.",
             "itemtype": "method",
-            "name": "removePartition",
+            "name": "removeScope",
             "params": [
                 {
                     "name": "name",
-                    "description": "The name of a partition.",
+                    "description": "The name of a scope.",
                     "type": "String"
                 }
             ],
@@ -721,7 +721,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1181,
+            "line": 1133,
             "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
             "itemtype": "method",
             "name": "_resolveUser",
@@ -749,7 +749,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1207,
+            "line": 1159,
             "itemtype": "method",
             "name": "_roleMatcher",
             "params": [
@@ -771,9 +771,9 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1221,
+            "line": 1173,
             "itemtype": "method",
-            "name": "_roleAndPartitionMatcher",
+            "name": "_roleAndScopeMatcher",
             "params": [
                 {
                     "name": "roleName",
@@ -781,13 +781,13 @@
                     "type": "String"
                 },
                 {
-                    "name": "partition",
-                    "description": "A partition to match against.",
+                    "name": "scope",
+                    "description": "A scope to match against.",
                     "type": "String"
                 }
             ],
             "return": {
-                "description": "A matcher function which accepts a role object and returns `true`\n                    if its name matches `roleName`, and partition matches `partition`.",
+                "description": "A matcher function which accepts a role object and returns `true`\n                    if its name matches `roleName`, and scope matches `scope`.",
                 "type": "Function"
             },
             "access": "private",
@@ -798,18 +798,18 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1238,
+            "line": 1190,
             "itemtype": "method",
-            "name": "_partitionMatcher",
+            "name": "_scopeMatcher",
             "params": [
                 {
-                    "name": "partition",
-                    "description": "A partition to match against.",
+                    "name": "scope",
+                    "description": "A scope to match against.",
                     "type": "String"
                 }
             ],
             "return": {
-                "description": "A matcher function which accepts a role object and returns `true`\n                    if its partition matches `partition`.",
+                "description": "A matcher function which accepts a role object and returns `true`\n                   if its scope matches `scope`.",
                 "type": "Function"
             },
             "access": "private",
@@ -820,7 +820,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1254,
+            "line": 1206,
             "itemtype": "method",
             "name": "_onlyAssignedMatcher",
             "return": {
@@ -835,7 +835,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1267,
+            "line": 1219,
             "description": "Throw an exception if `roleName` is an invalid role name.",
             "itemtype": "method",
             "name": "_checkRoleName",
@@ -854,14 +854,60 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1281,
-            "description": "Throw an exception if `partitionName` is an invalid partition name.",
+            "line": 1233,
+            "description": "Normalize options.",
+            "itemtype": "method",
+            "name": "_normalizeOptions",
+            "params": [
+                {
+                    "name": "options",
+                    "description": "Options to normalize.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Normalized options.",
+                "type": "Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1254,
+            "description": "Normalize scope name.",
+            "itemtype": "method",
+            "name": "_normalizeScopeName",
+            "params": [
+                {
+                    "name": "scopeName",
+                    "description": "A scope name to normalize.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "Normalized scope name.",
+                "type": "String"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common.js",
+            "line": 1273,
+            "description": "Throw an exception if `scopeName` is an invalid scope name.",
             "itemtype": "method",
             "name": "_checkRoleName",
             "params": [
                 {
-                    "name": "partitionName",
-                    "description": "A partition name to match against.",
+                    "name": "scopeName",
+                    "description": "A scope name to match against.",
                     "type": "String"
                 }
             ],
@@ -873,7 +919,7 @@
         },
         {
             "file": "roles/roles_common.js",
-            "line": 1297,
+            "line": 1289,
             "params": [
                 {
                     "name": "string",
@@ -1126,6 +1172,29 @@
         {
             "file": "roles/roles_server.js",
             "line": 238,
+            "itemtype": "method",
+            "name": "_dropCollectionIndex",
+            "params": [
+                {
+                    "name": "collection",
+                    "description": "Collection on which to drop the index.",
+                    "type": "Object"
+                },
+                {
+                    "name": "indexName",
+                    "description": "Name of the index to drop.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_server.js",
+            "line": 255,
             "description": "Migrates `Meteor.users` and `Meteor.roles` to the new format.",
             "itemtype": "method",
             "name": "_forwardMigrate",
@@ -1154,7 +1223,7 @@
         },
         {
             "file": "roles/roles_server.js",
-            "line": 266,
+            "line": 285,
             "description": "Migrates `Meteor.users` and `Meteor.roles` to the old format.\n\nWe assume that we are converting back a failed migration, so values can only be\nwhat were valid values in the old format. So no group names starting with `$` and\nno subroles.",
             "itemtype": "method",
             "name": "_backwardMigrate",
@@ -1185,7 +1254,7 @@
     "warnings": [
         {
             "message": "Missing item type",
-            "line": " roles/roles_common.js:1297"
+            "line": " roles/roles_common.js:1289"
         }
     ]
 }
\ No newline at end of file
diff --git a/docs/files/roles_client_uiHelpers.js.html b/docs/files/roles_client_uiHelpers.js.html
index 9405da664c..409cf920c2 100644
--- a/docs/files/roles_client_uiHelpers.js.html
+++ b/docs/files/roles_client_uiHelpers.js.html
@@ -117,17 +117,17 @@ Roles._uiHelpers = {
    *     {{#if isInRole &#x27;editor,user&#x27;}}
    *     {{/if}}
    *
-   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;partition1&#x27;}}
+   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;scope1&#x27;}}
    *     {{/if}}
    *
    * @method isInRole
    * @param {String} role Name of role or comma-seperated list of roles.
-   * @param {String} [partition] Optional, name of partition to check.
+   * @param {String} [scope] Optional, name of scope to check.
    * @return {Boolean} &#x60;true&#x60; if current user is in at least one of the target roles.
    * @static
    * @for UIHelpers 
    */
-  isInRole: function (role, partition) {
+  isInRole: function (role, scope) {
     var user = Meteor.user(),
         comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),
         roles
@@ -147,8 +147,8 @@ Roles._uiHelpers = {
       roles = [role]
     }
 
-    if (Match.test(partition, String)) {
-      return Roles.userIsInRole(user, roles, partition)
+    if (Match.test(scope, String)) {
+      return Roles.userIsInRole(user, roles, scope)
     }
 
     return Roles.userIsInRole(user, roles)
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
index 960bbe04d0..be0a17b66e 100644
--- a/docs/files/roles_roles_common.js.html
+++ b/docs/files/roles_roles_common.js.html
@@ -91,7 +91,7 @@
  * It uses &#x60;roles&#x60; field to &#x60;Meteor.users&#x60; documents which is an array of subdocuments with the following
  * schema:
  *  - &#x60;_id&#x60;: role name
- *  - &#x60;partition&#x60;: partition name
+ *  - &#x60;scope&#x60;: scope name
  *  - &#x60;assigned&#x60;: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)
  *
  * Roles themselves are accessible throgh &#x60;Meteor.roles&#x60; collection and documents consist of:
@@ -125,7 +125,7 @@ var getGroupsForUserDeprecationWarning = false;
 _.extend(Roles, {
 
   /**
-   * Used as a global group (now partition) name. Not used anymore.
+   * Used as a global group (now scope) name. Not used anymore.
    *
    * @property GLOBAL_GROUP
    * @static
@@ -146,7 +146,7 @@ _.extend(Roles, {
   createRole: function (roleName, options) {
     var match;
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     Roles._checkRoleName(roleName);
 
@@ -154,21 +154,14 @@ _.extend(Roles, {
       unlessExists: false
     });
 
-    try {
-      return Meteor.roles.insert({_id: roleName, children: []});
-    } catch (e) {
-      // (from Meteor accounts-base package, insertUserDoc func)
-      // XXX string parsing sucks, maybe
-      // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day
-      if (e.name !== &#x27;MongoError&#x27;) throw e;
-      match = e.err.match(/E11000 duplicate key error index: ([^ ]+)/);
-      if (!match) throw e;
-      if (match[1].indexOf(&#x27;$_id&#x27;) !== -1) {
-        if (options.unlessExists) return null;
-        throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; already exists.&quot;);
-      }
-      throw e;
+    var result = Meteor.roles.upsert({_id: roleName}, {$setOnInsert: {children: []}});
+
+    if (!result.insertedId) {
+      if (options.unlessExists) return null;
+      throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; already exists.&quot;);
     }
+
+    return result.insertedId;
   },
 
   /**
@@ -196,7 +189,7 @@ _.extend(Roles, {
     }, {multi: true});
 
     Roles.getUsersInRole(roleName, {
-      anyPartition: true,
+      anyScope: true,
       queryOptions: {
         fields: {
           _id: 1,
@@ -204,12 +197,12 @@ _.extend(Roles, {
         }
       }
     }).forEach(function (user, index, cursor) {
-      // role can be assigned multiple times to the user, for multiple partitions
-      // we have to remove the role for each of those partitions
+      // role can be assigned multiple times to the user, for multiple scopes
+      // we have to remove the role for each of those scopes
       roles = _.filter(user.roles, Roles._roleMatcher(roleName));
       _.each(roles, function (role) {
         Roles._removeUserFromRole(user, roleName, {
-          partition: role.partition,
+          scope: role.scope,
           // we want to remove the role in any case
           _assigned: null
         });
@@ -363,7 +356,7 @@ _.extend(Roles, {
     if (!count) return;
 
     Roles.getUsersInRole(parentName, {
-      anyPartition: true,
+      anyScope: true,
       queryOptions: {
         fields: {
           _id: 1,
@@ -371,12 +364,12 @@ _.extend(Roles, {
         }
       }
     }).forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple partitions
-      // we have to assign a new subrole for each of those partitions
+      // parent role can be assigned multiple times to the user, for multiple scopes
+      // we have to assign a new subrole for each of those scopes
       parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
       _.each(parentRoles, function (parentRole) {
         Roles._addUserToRole(user, roleName, {
-          partition: parentRole.partition,
+          scope: parentRole.scope,
           // we are assigning a subrole, so we set it as unassigned,
           // but only if they do not already exist
           _assigned: null
@@ -443,7 +436,7 @@ _.extend(Roles, {
     if (!count) return;
 
     Roles.getUsersInRole(parentName, {
-      anyPartition: true,
+      anyScope: true,
       queryOptions: {
         fields: {
           _id: 1,
@@ -451,12 +444,12 @@ _.extend(Roles, {
         }
       }
     }).forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple partitions
-      // we have to remove the subrole for each of those partitions
+      // parent role can be assigned multiple times to the user, for multiple scopes
+      // we have to remove the subrole for each of those scopes
       parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
       _.each(parentRoles, function (parentRole) {
         Roles._removeUserFromRole(user, roleName, {
-          partition: parentRole.partition,
+          scope: parentRole.scope,
           // but we want to remove it only if it was not also explicitly assigned
           _assigned: false
         });
@@ -482,29 +475,23 @@ _.extend(Roles, {
    * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
-   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
    *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @static
    */
   addUsersToRoles: function (users, roles, options) {
     if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
     if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure arrays
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       ifExists: false,
@@ -537,10 +524,10 @@ _.extend(Roles, {
    * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
-   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
    *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @static
    */
   setUserRoles: function (users, roles, options) {
@@ -549,19 +536,13 @@ _.extend(Roles, {
     if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
     if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure arrays
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       ifExists: false,
@@ -580,7 +561,7 @@ _.extend(Roles, {
         id = user;
       }
       // we first clear all roles for the user
-      Meteor.users.update(id, {$pull: {roles: {partition: options.partition}}});
+      Meteor.users.update(id, {$pull: {roles: {scope: options.scope}}});
 
       // and then add all
       _.each(roles, function (role) {
@@ -596,7 +577,7 @@ _.extend(Roles, {
    * @param {String|Object} user User ID or object with an &#x60;_id&#x60; field.
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:
-   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
    *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
    *   - &#x60;_assigned&#x60;: internal option, should not be used publicly because it will break assumptions
    *     in te code; publicly, you can only add users to an assigned role
@@ -613,7 +594,7 @@ _.extend(Roles, {
         setRoles;
 
     Roles._checkRoleName(roleName);
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     if (_.isObject(user)) {
       id = user._id;
@@ -642,7 +623,7 @@ _.extend(Roles, {
         $not: {
           $elemMatch: {
             _id: roleName,
-            partition: options.partition
+            scope: options.scope
           }
         }
       }
@@ -651,7 +632,7 @@ _.extend(Roles, {
       $addToSet: {
         roles: {
           _id: roleName,
-          partition: options.partition,
+          scope: options.scope,
           // we want to make sure it is a boolean value
           assigned: !!options._assigned
         }
@@ -667,7 +648,7 @@ _.extend(Roles, {
           roles: {
             $elemMatch: {
               _id: roleName,
-              partition: options.partition
+              scope: options.scope
             }
           }
 
@@ -684,7 +665,7 @@ _.extend(Roles, {
           roles: {
             $elemMatch: {
               _id: roleName,
-              partition: options.partition
+              scope: options.scope
             }
           }
 
@@ -698,7 +679,7 @@ _.extend(Roles, {
 
     setRoles = [{
       _id: roleName,
-      partition: options.partition
+      scope: options.scope
     }];
 
     _.each(role.children, function (child) {
@@ -721,28 +702,22 @@ _.extend(Roles, {
    * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
-   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @static
    */
   removeUsersFromRoles: function (users, roles, options) {
     if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
     if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure arrays
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       // internal option, should not be used publicly because it will break assumptions
@@ -775,7 +750,7 @@ _.extend(Roles, {
    * @param {String|Object} user User ID or object with an &#x60;_id&#x60; field.
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:
-   *   - &#x60;partition&#x60;: name of the partition, or &#x60;null&#x60; for the global role
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
    *   - &#x60;_assigned&#x60;: internal option, should not be used publicly because it will break assumptions
    *     in te code; publicly, you can only remove users from an assigned role
    *     if &#x60;true&#x60;, only manually assigned roles are removed, if &#x60;false&#x60;, only automatically
@@ -789,7 +764,7 @@ _.extend(Roles, {
         update;
 
     Roles._checkRoleName(roleName);
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     if (_.isObject(user)) {
       id = user._id;
@@ -804,7 +779,7 @@ _.extend(Roles, {
       $pull: {
         roles: {
           _id: roleName,
-          partition: options.partition
+          scope: options.scope
         }
       }
     };
@@ -857,7 +832,7 @@ _.extend(Roles, {
     setRoles = [];
     _.each(roles, function (role) {
       setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
-        partition: role.partition,
+        scope: role.scope,
         _assigned: role.assigned, // this is true
         ifExists: true
       }));
@@ -868,7 +843,7 @@ _.extend(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.map(setRoles, function (role) {return _.pick(role, &#x27;_id&#x27;, &#x27;partition&#x27;)})
+            $nor: _.map(setRoles, function (role) {return _.pick(role, &#x27;_id&#x27;, &#x27;scope&#x27;)})
           }
         }
       });
@@ -888,10 +863,10 @@ _.extend(Roles, {
    *     Roles.userIsInRole(userId, &#x27;admin&#x27;)
    *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
    *
-   *     // partition roles (global roles are still checked)
+   *     // scope roles (global roles are still checked)
    *     Roles.userIsInRole(user, &#x27;admin&#x27;, &#x27;group1&#x27;)
    *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
-   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], {partition: &#x27;group1&#x27;})
+   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], {scope: &#x27;group1&#x27;})
    *
    * @method userIsInRole
    * @param {String|Object} user User ID or an actual user object.
@@ -899,11 +874,11 @@ _.extend(Roles, {
    *                             will return &#x60;true&#x60; if user is in _any_ role.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
-   *   - &#x60;partition&#x60;: name of the partition; if supplied, limits check to just that partition;
-   *     the user&#x27;s global roles will always be checked whether partition is specified or not
-   *   - &#x60;anyPartition&#x60;: if set, role can be in any partition (&#x60;partition&#x60; option is ignored)
+   *   - &#x60;scope&#x60;: name of the scope; if supplied, limits check to just that scope;
+   *     the user&#x27;s global roles will always be checked whether scope is specified or not
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @return {Boolean} &#x60;true&#x60; if user is in _any_ of the target roles
    * @static
    */
@@ -911,23 +886,17 @@ _.extend(Roles, {
     var id,
         query;
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure array to simplify code
     if (!_.isArray(roles)) roles = [roles];
 
     if (!roles.length) return false;
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
-      anyPartition: false
+      anyScope: false
     });
 
     if (!user) return false;
@@ -935,11 +904,11 @@ _.extend(Roles, {
     if (_.isObject(user)) {
       if (_.has(user, &#x27;roles&#x27;)) {
         return _.some(roles, function (role) {
-          if (options.anyPartition) {
+          if (options.anyScope) {
             return _.some(user.roles || [], Roles._roleMatcher(role));
           }
           else {
-            return _.some(user.roles || [], Roles._roleAndPartitionMatcher(role, options.partition));
+            return _.some(user.roles || [], Roles._roleAndScopeMatcher(role, options.scope));
           }
         })
       } else {
@@ -952,7 +921,7 @@ _.extend(Roles, {
 
     if (!id) return false;
 
-    if (options.anyPartition) {
+    if (options.anyScope) {
       query = {
         _id: id,
         &#x27;roles._id&#x27;: {$in: roles}
@@ -965,14 +934,14 @@ _.extend(Roles, {
           roles: {
             $elemMatch: {
               _id: {$in: roles},
-              partition: options.partition
+              scope: options.scope
             }
           }
         }, {
           roles: {
             $elemMatch: {
               _id: {$in: roles},
-              partition: null
+              scope: null
             }
           }
         }]
@@ -988,43 +957,37 @@ _.extend(Roles, {
    * @method getRolesForUser
    * @param {String|Object} user User ID or an actual user object.
    * @param {Object|String} [options] Options:
-   *   - &#x60;partition&#x60;: name of partition to provide roles for; if not specified, global roles are returned
-   *   - &#x60;anyPartition&#x60;: if set, role can be in any partition (&#x60;partition&#x60; option is ignored)
+   *   - &#x60;scope&#x60;: name of scope to provide roles for; if not specified, global roles are returned
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
    *   - &#x60;fullObjects&#x60;: return full roles objects (&#x60;true&#x60;) or just names (&#x60;false&#x60;) (default &#x60;false&#x60;)
    *   - &#x60;onlyAssigned&#x60;: return only assigned roles and not automatically inferred (like subroles)
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @return {Array} Array of user&#x27;s roles, unsorted.
    * @static
    */
   getRolesForUser: function (user, options) {
     var roles;
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       fullObjects: false,
       onlyAssigned: false,
-      anyPartition: false
+      anyScope: false
     });
 
     user = Roles._resolveUser(user);
 
     if (!user) return [];
 
-    if (options.anyPartition) {
+    if (options.anyScope) {
       roles = user.roles || [];
     }
     else {
-      roles = _.filter(user.roles || [], Roles._partitionMatcher(options.partition));
+      roles = _.filter(user.roles || [], Roles._scopeMatcher(options.scope));
     }
 
     if (options.onlyAssigned) {
@@ -1064,13 +1027,13 @@ _.extend(Roles, {
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
-   *   - &#x60;partition&#x60;: name of the partition to restrict roles to; user&#x27;s global
+   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
    *     roles will also be checked
-   *   - &#x60;anyPartition&#x60;: if set, role can be in any partition (&#x60;partition&#x60; option is ignored)
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
    *   - &#x60;queryOptions&#x60;: options which are passed directly
    *     through to &#x60;Meteor.users.find(query, options)&#x60;
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @param {Object} [queryOptions] Options which are passed directly
    *                                through to &#x60;Meteor.users.find(query, options)&#x60;
    * @return {Cursor} Cursor of users in roles.
@@ -1091,13 +1054,13 @@ _.extend(Roles, {
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
-   *   - &#x60;partition&#x60;: name of the partition to restrict roles to; user&#x27;s global
+   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
    *     roles will also be checked
-   *   - &#x60;anyPartition&#x60;: if set, role can be in any partition (&#x60;partition&#x60; option is ignored)
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
    *   - &#x60;queryOptions&#x60;: options which are passed directly
    *     through to &#x60;Meteor.users.find(query, options)&#x60;
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @param {Object} [queryOptions] Options which are passed directly
    *                                through to &#x60;Meteor.users.find(query, options)&#x60;
    * @return {Object} Object with &#x60;query&#x60; and &#x60;queryOptions&#x60;.
@@ -1107,25 +1070,19 @@ _.extend(Roles, {
   _usersInRoleQuery: function (roles, options, queryOptions) {
     var query;
 
-    options = options || {};
+    options = Roles._normalizeOptions(options);
 
     // ensure array to simplify code
     if (!_.isArray(roles)) roles = [roles];
 
-    if (_.isString(options)) {
-      options = {partition: options};
-    }
-
-    options.partition = options.partition || null;
-
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       queryOptions: queryOptions || {},
-      anyPartition: false
+      anyScope: false
     });
 
-    if (options.anyPartition) {
+    if (options.anyScope) {
       query = {
         &#x27;roles._id&#x27;: {$in: roles}
       };
@@ -1136,14 +1093,14 @@ _.extend(Roles, {
           roles: {
             $elemMatch: {
               _id: {$in: roles},
-              partition: options.partition
+              scope: options.scope
             }
           }
         }, {
           roles: {
             $elemMatch: {
               _id: {$in: roles},
-              partition: null
+              scope: null
             }
           }
         }]
@@ -1157,7 +1114,7 @@ _.extend(Roles, {
   },
 
   /**
-   * Deprecated. Use &#x60;getPartitionsForUser&#x60; instead.
+   * Deprecated. Use &#x60;getScopesForUser&#x60; instead.
    *
    * @method getGroupsForUser
    * @static
@@ -1166,24 +1123,24 @@ _.extend(Roles, {
   getGroupsForUser: function (/*args*/) {
     if (!getGroupsForUserDeprecationWarning) {
       getGroupsForUserDeprecationWarning = true;
-      console &amp;&amp; console.warn(&quot;getGroupsForUser has been deprecated. Use getPartitionsForUser instead.&quot;);
+      console &amp;&amp; console.warn(&quot;getGroupsForUser has been deprecated. Use getScopesForUser instead.&quot;);
     }
 
-    return Roles.getPartitionsForUser.apply(this, arguments);
+    return Roles.getScopesForUser.apply(this, arguments);
   },
 
   /**
-   * Retrieve users partitions, if any.
+   * Retrieve users scopes, if any.
    *
-   * @method getPartitionsForUser
+   * @method getScopesForUser
    * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} [roles] Name of roles to restrict partitions to.
+   * @param {Array|String} [roles] Name of roles to restrict scopes to.
    *
-   * @return {Array} Array of user&#x27;s partitions, unsorted.
+   * @return {Array} Array of user&#x27;s scopes, unsorted.
    * @static
    */
-  getPartitionsForUser: function (user, roles) {
-    var partitions;
+  getScopesForUser: function (user, roles) {
+    var scopes;
 
     // ensure array to simplify code
     if (roles &amp;&amp; !_.isArray(roles)) roles = [roles];
@@ -1192,36 +1149,33 @@ _.extend(Roles, {
 
     if (!user) return [];
 
-    partitions = [];
+    scopes = [];
     _.each(user.roles || [], function (userRole) {
       // == used on purpose.
-      if (userRole.partition == null) return;
+      if (userRole.scope == null) return;
       if (roles &amp;&amp; !_.contains(roles, userRole._id)) return;
 
-      partitions.push(userRole.partition);
+      scopes.push(userRole.scope);
     });
 
-    return _.uniq(partitions);
+    return _.uniq(scopes);
   },
 
   /**
-   * Rename a partition.
+   * Rename a scope.
    *
-   * Roles assigned with a given partition are changed to be under the new partition.
+   * Roles assigned with a given scope are changed to be under the new scope.
    *
-   * @method renamePartition
-   * @param {String} oldName Old name of a partition.
-   * @param {String} newName New name of a partition.
+   * @method renameScope
+   * @param {String} oldName Old name of a scope.
+   * @param {String} newName New name of a scope.
    * @static
    */
-  renamePartition: function (oldName, newName) {
+  renameScope: function (oldName, newName) {
     var count;
 
-    oldName = oldName || null;
-    newName = newName || null;
-
-    Roles._checkPartitionName(oldName);
-    Roles._checkPartitionName(newName);
+    Roles._checkScopeName(oldName);
+    Roles._checkScopeName(newName);
 
     if (oldName === newName) return;
 
@@ -1229,35 +1183,33 @@ _.extend(Roles, {
       count = Meteor.users.update({
         roles: {
           $elemMatch: {
-            partition: oldName
+            scope: oldName
           }
         }
       }, {
         $set: {
-          &#x27;roles.$.partition&#x27;: newName
+          &#x27;roles.$.scope&#x27;: newName
         }
       }, {multi: true});
     } while (count &gt; 0);
   },
 
   /**
-   * Remove a partition.
+   * Remove a scope.
    *
-   * Roles assigned with a given partition are removed.
+   * Roles assigned with a given scope are removed.
    *
-   * @method removePartition
-   * @param {String} name The name of a partition.
+   * @method removeScope
+   * @param {String} name The name of a scope.
    * @static
    */
-  removePartition: function (name) {
-    name = name || null;
-
-    Roles._checkPartitionName(name);
+  removeScope: function (name) {
+    Roles._checkScopeName(name);
 
     Meteor.users.update({}, {
       $pull: {
         roles: {
-          partition: name
+          scope: name
         }
       }
     }, {multi: true});
@@ -1304,35 +1256,35 @@ _.extend(Roles, {
   },
 
   /**
-   * @method _roleAndPartitionMatcher
+   * @method _roleAndScopeMatcher
    * @param {String} roleName A role name to match against.
-   * @param {String} partition A partition to match against.
+   * @param {String} scope A scope to match against.
    * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
-   *                     if its name matches &#x60;roleName&#x60;, and partition matches &#x60;partition&#x60;.
+   *                     if its name matches &#x60;roleName&#x60;, and scope matches &#x60;scope&#x60;.
    * @private
    * @static
    */
-  _roleAndPartitionMatcher: function (roleName, partition) {
+  _roleAndScopeMatcher: function (roleName, scope) {
     return function (userRole) {
-      // == used on purpose in &quot;userRole.partition == null&quot;
-      return (userRole._id === roleName &amp;&amp; userRole.partition === partition) ||
-        (userRole._id === roleName &amp;&amp; (!_.has(userRole, &#x27;partition&#x27;) || userRole.partition == null));
+      // == used on purpose in &quot;userRole.scope == null&quot;
+      return (userRole._id === roleName &amp;&amp; userRole.scope === scope) ||
+        (userRole._id === roleName &amp;&amp; (!_.has(userRole, &#x27;scope&#x27;) || userRole.scope == null));
     };
   },
 
   /**
-   * @method _partitionMatcher
-   * @param {String} partition A partition to match against.
+   * @method _scopeMatcher
+   * @param {String} scope A scope to match against.
    * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
-   *                     if its partition matches &#x60;partition&#x60;.
+   *                    if its scope matches &#x60;scope&#x60;.
    * @private
    * @static
    */
-  _partitionMatcher: function (partition) {
+  _scopeMatcher: function (scope) {
     return function (userRole) {
-      // == used on purpose in &quot;userRole.partition == null&quot;
-      return (userRole.partition === partition) ||
-        (!_.has(userRole, &#x27;partition&#x27;) || userRole.partition == null);
+      // == used on purpose in &quot;userRole.scope == null&quot;
+      return (userRole.scope === scope) ||
+        (!_.has(userRole, &#x27;scope&#x27;) || userRole.scope == null);
     };
   },
 
@@ -1364,18 +1316,58 @@ _.extend(Roles, {
   },
 
   /**
-   * Throw an exception if &#x60;partitionName&#x60; is an invalid partition name.
+   * Normalize options.
    *
-   * @method _checkRoleName
-   * @param {String} partitionName A partition name to match against.
+   * @method _normalizeOptions
+   * @param {Object} options Options to normalize.
+   * @return {Object} Normalized options.
    * @private
    * @static
    */
-  _checkPartitionName: function (partitionName) {
-    if (partitionName === null) return;
+  _normalizeOptions: function (options) {
+    options = _.isUndefined(options) ? {} : options;
 
-    if (!partitionName || !_.isString(partitionName) || Roles._trim(partitionName) !== partitionName) {
-      throw new Error(&quot;Invalid partition name &#x27;&quot; + partitionName + &quot;&#x27;.&quot;);
+    if (options === null || _.isString(options)) {
+      options = {scope: options};
+    }
+
+    options.scope = Roles._normalizeScopeName(options.scope);
+
+    return options;
+  },
+
+  /**
+   * Normalize scope name.
+   *
+   * @method _normalizeScopeName
+   * @param {String} scopeName A scope name to normalize.
+   * @return {String} Normalized scope name.
+   * @private
+   * @static
+   */
+  _normalizeScopeName: function (scopeName) {
+    // map undefined and null to null
+    if (scopeName == null) {
+      return null;
+    }
+    else {
+      return scopeName;
+    }
+  },
+
+  /**
+   * Throw an exception if &#x60;scopeName&#x60; is an invalid scope name.
+   *
+   * @method _checkRoleName
+   * @param {String} scopeName A scope name to match against.
+   * @private
+   * @static
+   */
+  _checkScopeName: function (scopeName) {
+    if (scopeName === null) return;
+
+    if (!scopeName || !_.isString(scopeName) || Roles._trim(scopeName) !== scopeName) {
+      throw new Error(&quot;Invalid scope name &#x27;&quot; + scopeName + &quot;&#x27;.&quot;);
     }
   },
 
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
index 038040e693..92d1daedbd 100644
--- a/docs/files/roles_roles_server.js.html
+++ b/docs/files/roles_roles_server.js.html
@@ -87,12 +87,12 @@
 
 // Create default indexes on users collection.
 // Index only on &quot;roles._id&quot; is not needed because the combined index works for it as well.
-Meteor.users._ensureIndex({&#x27;roles._id&#x27;: 1, &#x27;roles.partition&#x27;: 1});
-Meteor.users._ensureIndex({&#x27;roles.partition&#x27;: 1});
+Meteor.users._ensureIndex({&#x27;roles._id&#x27;: 1, &#x27;roles.scope&#x27;: 1});
+Meteor.users._ensureIndex({&#x27;roles.scope&#x27;: 1});
 
 /*
  * Publish logged-in user&#x27;s roles so client-side checks can work.
- * 
+ *
  * Use a named publish function so clients can check &#x60;ready()&#x60; state.
  */
 Meteor.publish(&#x27;_roles&#x27;, function () {
@@ -211,7 +211,7 @@ _.extend(Roles, {
 
         roles.push({
           _id: role,
-          partition: null,
+          scope: null,
           assigned: true
         })
       });
@@ -231,7 +231,7 @@ _.extend(Roles, {
 
           roles.push({
             _id: role,
-            partition: group,
+            scope: group,
             assigned: true
           })
         });
@@ -265,16 +265,16 @@ _.extend(Roles, {
       // We assume that we are converting back a failed migration, so values can only be
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
 
-      if (userRole.partition) {
-        if (!usingGroups) throw new Error(&quot;Role &#x27;&quot; + userRole._id + &quot;&#x27; with partition &#x27;&quot; + userRole.partition + &quot;&#x27; without enabled groups.&quot;);
+      if (userRole.scope) {
+        if (!usingGroups) throw new Error(&quot;Role &#x27;&quot; + userRole._id + &quot;&#x27; with scope &#x27;&quot; + userRole.scope + &quot;&#x27; without enabled groups.&quot;);
 
         // escape
-        var partition = userRole.partition.replace(/\./g, &#x27;_&#x27;);
+        var scope = userRole.scope.replace(/\./g, &#x27;_&#x27;);
 
-        if (partition[0] === &#x27;$&#x27;) throw new Error(&quot;Group name &#x27;&quot; + partition + &quot;&#x27; start with $.&quot;);
+        if (scope[0] === &#x27;$&#x27;) throw new Error(&quot;Group name &#x27;&quot; + scope + &quot;&#x27; start with $.&quot;);
 
-        roles[partition] = roles[partition] || [];
-        roles[partition].push(userRole._id);
+        roles[scope] = roles[scope] || [];
+        roles[scope].push(userRole._id);
       }
       else {
         if (usingGroups) {
@@ -320,6 +320,23 @@ _.extend(Roles, {
     Meteor.roles.insert(newRole);
   },
 
+  /**
+   * @method _dropCollectionIndex
+   * @param {Object} collection Collection on which to drop the index.
+   * @param {String} indexName Name of the index to drop.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _dropCollectionIndex: function (collection, indexName) {
+    try {
+      collection._dropIndex(indexName);
+    } catch (e) {
+      if (e.name !== &#x27;MongoError&#x27;) throw e;
+      if (!/index not found/.test(e.err || e.errmsg)) throw e;
+    }
+  },
+
   /**
    * Migrates &#x60;Meteor.users&#x60; and &#x60;Meteor.roles&#x60; to the new format.
    *
@@ -335,6 +352,8 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
+    Roles._dropCollectionIndex(Meteor.roles, &#x27;name_1&#x27;);
+
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isNewRole(role)) {
         updateRole(role, Roles._convertToNewRole(role));
@@ -367,6 +386,9 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
+    Roles._dropCollectionIndex(Meteor.users, &#x27;roles._id_1_roles.scope_1&#x27;);
+    Roles._dropCollectionIndex(Meteor.users, &#x27;roles.scope_1&#x27;);
+
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isOldRole(role)) {
         updateRole(role, Roles._convertToOldRole(role));
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
index aac0dd3e48..ea45ace279 100644
--- a/docs/modules/Roles.html
+++ b/docs/modules/Roles.html
@@ -96,7 +96,7 @@
 schema:</p>
 <ul>
 <li><code>_id</code>: role name</li>
-<li><code>partition</code>: partition name</li>
+<li><code>scope</code>: scope name</li>
 <li><code>assigned</code>: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)</li>
 </ul>
 <p>Roles themselves are accessible throgh <code>Meteor.roles</code> collection and documents consist of:</p>
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index e8aabcdce5..523f98a981 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -32,17 +32,17 @@ Roles._uiHelpers = {
    *     {{#if isInRole 'editor,user'}}
    *     {{/if}}
    *
-   *     {{#if isInRole 'editor,user' 'partition1'}}
+   *     {{#if isInRole 'editor,user' 'scope1'}}
    *     {{/if}}
    *
    * @method isInRole
    * @param {String} role Name of role or comma-seperated list of roles.
-   * @param {String} [partition] Optional, name of partition to check.
+   * @param {String} [scope] Optional, name of scope to check.
    * @return {Boolean} `true` if current user is in at least one of the target roles.
    * @static
    * @for UIHelpers 
    */
-  isInRole: function (role, partition) {
+  isInRole: function (role, scope) {
     var user = Meteor.user(),
         comma = (role || '').indexOf(','),
         roles
@@ -62,8 +62,8 @@ Roles._uiHelpers = {
       roles = [role]
     }
 
-    if (Match.test(partition, String)) {
-      return Roles.userIsInRole(user, roles, partition)
+    if (Match.test(scope, String)) {
+      return Roles.userIsInRole(user, roles, scope)
     }
 
     return Roles.userIsInRole(user, roles)
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 8a31b92db0..f1814ec877 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -6,7 +6,7 @@
  * It uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following
  * schema:
  *  - `_id`: role name
- *  - `partition`: partition name
+ *  - `scope`: scope name
  *  - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)
  *
  * Roles themselves are accessible throgh `Meteor.roles` collection and documents consist of:
@@ -40,7 +40,7 @@ var getGroupsForUserDeprecationWarning = false;
 _.extend(Roles, {
 
   /**
-   * Used as a global group (now partition) name. Not used anymore.
+   * Used as a global group (now scope) name. Not used anymore.
    *
    * @property GLOBAL_GROUP
    * @static
@@ -104,7 +104,7 @@ _.extend(Roles, {
     }, {multi: true});
 
     Roles.getUsersInRole(roleName, {
-      anyPartition: true,
+      anyScope: true,
       queryOptions: {
         fields: {
           _id: 1,
@@ -112,12 +112,12 @@ _.extend(Roles, {
         }
       }
     }).forEach(function (user, index, cursor) {
-      // role can be assigned multiple times to the user, for multiple partitions
-      // we have to remove the role for each of those partitions
+      // role can be assigned multiple times to the user, for multiple scopes
+      // we have to remove the role for each of those scopes
       roles = _.filter(user.roles, Roles._roleMatcher(roleName));
       _.each(roles, function (role) {
         Roles._removeUserFromRole(user, roleName, {
-          partition: role.partition,
+          scope: role.scope,
           // we want to remove the role in any case
           _assigned: null
         });
@@ -271,7 +271,7 @@ _.extend(Roles, {
     if (!count) return;
 
     Roles.getUsersInRole(parentName, {
-      anyPartition: true,
+      anyScope: true,
       queryOptions: {
         fields: {
           _id: 1,
@@ -279,12 +279,12 @@ _.extend(Roles, {
         }
       }
     }).forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple partitions
-      // we have to assign a new subrole for each of those partitions
+      // parent role can be assigned multiple times to the user, for multiple scopes
+      // we have to assign a new subrole for each of those scopes
       parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
       _.each(parentRoles, function (parentRole) {
         Roles._addUserToRole(user, roleName, {
-          partition: parentRole.partition,
+          scope: parentRole.scope,
           // we are assigning a subrole, so we set it as unassigned,
           // but only if they do not already exist
           _assigned: null
@@ -351,7 +351,7 @@ _.extend(Roles, {
     if (!count) return;
 
     Roles.getUsersInRole(parentName, {
-      anyPartition: true,
+      anyScope: true,
       queryOptions: {
         fields: {
           _id: 1,
@@ -359,12 +359,12 @@ _.extend(Roles, {
         }
       }
     }).forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple partitions
-      // we have to remove the subrole for each of those partitions
+      // parent role can be assigned multiple times to the user, for multiple scopes
+      // we have to remove the subrole for each of those scopes
       parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
       _.each(parentRoles, function (parentRole) {
         Roles._removeUserFromRole(user, roleName, {
-          partition: parentRole.partition,
+          scope: parentRole.scope,
           // but we want to remove it only if it was not also explicitly assigned
           _assigned: false
         });
@@ -390,10 +390,10 @@ _.extend(Roles, {
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
-   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `scope`: name of the scope, or `null` for the global role
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @static
    */
   addUsersToRoles: function (users, roles, options) {
@@ -406,7 +406,7 @@ _.extend(Roles, {
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       ifExists: false,
@@ -439,10 +439,10 @@ _.extend(Roles, {
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
-   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `scope`: name of the scope, or `null` for the global role
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @static
    */
   setUserRoles: function (users, roles, options) {
@@ -457,7 +457,7 @@ _.extend(Roles, {
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       ifExists: false,
@@ -476,7 +476,7 @@ _.extend(Roles, {
         id = user;
       }
       // we first clear all roles for the user
-      Meteor.users.update(id, {$pull: {roles: {partition: options.partition}}});
+      Meteor.users.update(id, {$pull: {roles: {scope: options.scope}}});
 
       // and then add all
       _.each(roles, function (role) {
@@ -492,7 +492,7 @@ _.extend(Roles, {
    * @param {String|Object} user User ID or object with an `_id` field.
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:
-   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `scope`: name of the scope, or `null` for the global role
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
    *   - `_assigned`: internal option, should not be used publicly because it will break assumptions
    *     in te code; publicly, you can only add users to an assigned role
@@ -509,7 +509,7 @@ _.extend(Roles, {
         setRoles;
 
     Roles._checkRoleName(roleName);
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     if (_.isObject(user)) {
       id = user._id;
@@ -538,7 +538,7 @@ _.extend(Roles, {
         $not: {
           $elemMatch: {
             _id: roleName,
-            partition: options.partition
+            scope: options.scope
           }
         }
       }
@@ -547,7 +547,7 @@ _.extend(Roles, {
       $addToSet: {
         roles: {
           _id: roleName,
-          partition: options.partition,
+          scope: options.scope,
           // we want to make sure it is a boolean value
           assigned: !!options._assigned
         }
@@ -563,7 +563,7 @@ _.extend(Roles, {
           roles: {
             $elemMatch: {
               _id: roleName,
-              partition: options.partition
+              scope: options.scope
             }
           }
 
@@ -580,7 +580,7 @@ _.extend(Roles, {
           roles: {
             $elemMatch: {
               _id: roleName,
-              partition: options.partition
+              scope: options.scope
             }
           }
 
@@ -594,7 +594,7 @@ _.extend(Roles, {
 
     setRoles = [{
       _id: roleName,
-      partition: options.partition
+      scope: options.scope
     }];
 
     _.each(role.children, function (child) {
@@ -617,9 +617,9 @@ _.extend(Roles, {
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
-   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `scope`: name of the scope, or `null` for the global role
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @static
    */
   removeUsersFromRoles: function (users, roles, options) {
@@ -632,7 +632,7 @@ _.extend(Roles, {
     if (!_.isArray(users)) users = [users];
     if (!_.isArray(roles)) roles = [roles];
 
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       // internal option, should not be used publicly because it will break assumptions
@@ -665,7 +665,7 @@ _.extend(Roles, {
    * @param {String|Object} user User ID or object with an `_id` field.
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:
-   *   - `partition`: name of the partition, or `null` for the global role
+   *   - `scope`: name of the scope, or `null` for the global role
    *   - `_assigned`: internal option, should not be used publicly because it will break assumptions
    *     in te code; publicly, you can only remove users from an assigned role
    *     if `true`, only manually assigned roles are removed, if `false`, only automatically
@@ -679,7 +679,7 @@ _.extend(Roles, {
         update;
 
     Roles._checkRoleName(roleName);
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     if (_.isObject(user)) {
       id = user._id;
@@ -694,7 +694,7 @@ _.extend(Roles, {
       $pull: {
         roles: {
           _id: roleName,
-          partition: options.partition
+          scope: options.scope
         }
       }
     };
@@ -747,7 +747,7 @@ _.extend(Roles, {
     setRoles = [];
     _.each(roles, function (role) {
       setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
-        partition: role.partition,
+        scope: role.scope,
         _assigned: role.assigned, // this is true
         ifExists: true
       }));
@@ -758,7 +758,7 @@ _.extend(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.map(setRoles, function (role) {return _.pick(role, '_id', 'partition')})
+            $nor: _.map(setRoles, function (role) {return _.pick(role, '_id', 'scope')})
           }
         }
       });
@@ -778,10 +778,10 @@ _.extend(Roles, {
    *     Roles.userIsInRole(userId, 'admin')
    *     Roles.userIsInRole(userId, ['admin','editor'])
    *
-   *     // partition roles (global roles are still checked)
+   *     // scope roles (global roles are still checked)
    *     Roles.userIsInRole(user, 'admin', 'group1')
    *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
-   *     Roles.userIsInRole(userId, ['admin','editor'], {partition: 'group1'})
+   *     Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})
    *
    * @method userIsInRole
    * @param {String|Object} user User ID or an actual user object.
@@ -789,11 +789,11 @@ _.extend(Roles, {
    *                             will return `true` if user is in _any_ role.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
-   *   - `partition`: name of the partition; if supplied, limits check to just that partition;
-   *     the user's global roles will always be checked whether partition is specified or not
-   *   - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)
+   *   - `scope`: name of the scope; if supplied, limits check to just that scope;
+   *     the user's global roles will always be checked whether scope is specified or not
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @return {Boolean} `true` if user is in _any_ of the target roles
    * @static
    */
@@ -808,10 +808,10 @@ _.extend(Roles, {
 
     if (!roles.length) return false;
 
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
-      anyPartition: false
+      anyScope: false
     });
 
     if (!user) return false;
@@ -819,11 +819,11 @@ _.extend(Roles, {
     if (_.isObject(user)) {
       if (_.has(user, 'roles')) {
         return _.some(roles, function (role) {
-          if (options.anyPartition) {
+          if (options.anyScope) {
             return _.some(user.roles || [], Roles._roleMatcher(role));
           }
           else {
-            return _.some(user.roles || [], Roles._roleAndPartitionMatcher(role, options.partition));
+            return _.some(user.roles || [], Roles._roleAndScopeMatcher(role, options.scope));
           }
         })
       } else {
@@ -836,7 +836,7 @@ _.extend(Roles, {
 
     if (!id) return false;
 
-    if (options.anyPartition) {
+    if (options.anyScope) {
       query = {
         _id: id,
         'roles._id': {$in: roles}
@@ -849,14 +849,14 @@ _.extend(Roles, {
           roles: {
             $elemMatch: {
               _id: {$in: roles},
-              partition: options.partition
+              scope: options.scope
             }
           }
         }, {
           roles: {
             $elemMatch: {
               _id: {$in: roles},
-              partition: null
+              scope: null
             }
           }
         }]
@@ -872,12 +872,12 @@ _.extend(Roles, {
    * @method getRolesForUser
    * @param {String|Object} user User ID or an actual user object.
    * @param {Object|String} [options] Options:
-   *   - `partition`: name of partition to provide roles for; if not specified, global roles are returned
-   *   - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)
+   *   - `scope`: name of scope to provide roles for; if not specified, global roles are returned
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *   - `fullObjects`: return full roles objects (`true`) or just names (`false`) (default `false`)
    *   - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @return {Array} Array of user's roles, unsorted.
    * @static
    */
@@ -886,23 +886,23 @@ _.extend(Roles, {
 
     options = Roles._normalizeOptions(options);
 
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       fullObjects: false,
       onlyAssigned: false,
-      anyPartition: false
+      anyScope: false
     });
 
     user = Roles._resolveUser(user);
 
     if (!user) return [];
 
-    if (options.anyPartition) {
+    if (options.anyScope) {
       roles = user.roles || [];
     }
     else {
-      roles = _.filter(user.roles || [], Roles._partitionMatcher(options.partition));
+      roles = _.filter(user.roles || [], Roles._scopeMatcher(options.scope));
     }
 
     if (options.onlyAssigned) {
@@ -942,13 +942,13 @@ _.extend(Roles, {
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
-   *   - `partition`: name of the partition to restrict roles to; user's global
+   *   - `scope`: name of the scope to restrict roles to; user's global
    *     roles will also be checked
-   *   - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *   - `queryOptions`: options which are passed directly
    *     through to `Meteor.users.find(query, options)`
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @param {Object} [queryOptions] Options which are passed directly
    *                                through to `Meteor.users.find(query, options)`
    * @return {Cursor} Cursor of users in roles.
@@ -969,13 +969,13 @@ _.extend(Roles, {
    *                             specified but need not have _all_ roles.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
-   *   - `partition`: name of the partition to restrict roles to; user's global
+   *   - `scope`: name of the scope to restrict roles to; user's global
    *     roles will also be checked
-   *   - `anyPartition`: if set, role can be in any partition (`partition` option is ignored)
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *   - `queryOptions`: options which are passed directly
    *     through to `Meteor.users.find(query, options)`
    *
-   * Alternatively, it can be a partition name string.
+   * Alternatively, it can be a scope name string.
    * @param {Object} [queryOptions] Options which are passed directly
    *                                through to `Meteor.users.find(query, options)`
    * @return {Object} Object with `query` and `queryOptions`.
@@ -990,14 +990,14 @@ _.extend(Roles, {
     // ensure array to simplify code
     if (!_.isArray(roles)) roles = [roles];
 
-    Roles._checkPartitionName(options.partition);
+    Roles._checkScopeName(options.scope);
 
     options = _.defaults(options, {
       queryOptions: queryOptions || {},
-      anyPartition: false
+      anyScope: false
     });
 
-    if (options.anyPartition) {
+    if (options.anyScope) {
       query = {
         'roles._id': {$in: roles}
       };
@@ -1008,14 +1008,14 @@ _.extend(Roles, {
           roles: {
             $elemMatch: {
               _id: {$in: roles},
-              partition: options.partition
+              scope: options.scope
             }
           }
         }, {
           roles: {
             $elemMatch: {
               _id: {$in: roles},
-              partition: null
+              scope: null
             }
           }
         }]
@@ -1029,7 +1029,7 @@ _.extend(Roles, {
   },
 
   /**
-   * Deprecated. Use `getPartitionsForUser` instead.
+   * Deprecated. Use `getScopesForUser` instead.
    *
    * @method getGroupsForUser
    * @static
@@ -1038,24 +1038,24 @@ _.extend(Roles, {
   getGroupsForUser: function (/*args*/) {
     if (!getGroupsForUserDeprecationWarning) {
       getGroupsForUserDeprecationWarning = true;
-      console && console.warn("getGroupsForUser has been deprecated. Use getPartitionsForUser instead.");
+      console && console.warn("getGroupsForUser has been deprecated. Use getScopesForUser instead.");
     }
 
-    return Roles.getPartitionsForUser.apply(this, arguments);
+    return Roles.getScopesForUser.apply(this, arguments);
   },
 
   /**
-   * Retrieve users partitions, if any.
+   * Retrieve users scopes, if any.
    *
-   * @method getPartitionsForUser
+   * @method getScopesForUser
    * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} [roles] Name of roles to restrict partitions to.
+   * @param {Array|String} [roles] Name of roles to restrict scopes to.
    *
-   * @return {Array} Array of user's partitions, unsorted.
+   * @return {Array} Array of user's scopes, unsorted.
    * @static
    */
-  getPartitionsForUser: function (user, roles) {
-    var partitions;
+  getScopesForUser: function (user, roles) {
+    var scopes;
 
     // ensure array to simplify code
     if (roles && !_.isArray(roles)) roles = [roles];
@@ -1064,33 +1064,33 @@ _.extend(Roles, {
 
     if (!user) return [];
 
-    partitions = [];
+    scopes = [];
     _.each(user.roles || [], function (userRole) {
       // == used on purpose.
-      if (userRole.partition == null) return;
+      if (userRole.scope == null) return;
       if (roles && !_.contains(roles, userRole._id)) return;
 
-      partitions.push(userRole.partition);
+      scopes.push(userRole.scope);
     });
 
-    return _.uniq(partitions);
+    return _.uniq(scopes);
   },
 
   /**
-   * Rename a partition.
+   * Rename a scope.
    *
-   * Roles assigned with a given partition are changed to be under the new partition.
+   * Roles assigned with a given scope are changed to be under the new scope.
    *
-   * @method renamePartition
-   * @param {String} oldName Old name of a partition.
-   * @param {String} newName New name of a partition.
+   * @method renameScope
+   * @param {String} oldName Old name of a scope.
+   * @param {String} newName New name of a scope.
    * @static
    */
-  renamePartition: function (oldName, newName) {
+  renameScope: function (oldName, newName) {
     var count;
 
-    Roles._checkPartitionName(oldName);
-    Roles._checkPartitionName(newName);
+    Roles._checkScopeName(oldName);
+    Roles._checkScopeName(newName);
 
     if (oldName === newName) return;
 
@@ -1098,33 +1098,33 @@ _.extend(Roles, {
       count = Meteor.users.update({
         roles: {
           $elemMatch: {
-            partition: oldName
+            scope: oldName
           }
         }
       }, {
         $set: {
-          'roles.$.partition': newName
+          'roles.$.scope': newName
         }
       }, {multi: true});
     } while (count > 0);
   },
 
   /**
-   * Remove a partition.
+   * Remove a scope.
    *
-   * Roles assigned with a given partition are removed.
+   * Roles assigned with a given scope are removed.
    *
-   * @method removePartition
-   * @param {String} name The name of a partition.
+   * @method removeScope
+   * @param {String} name The name of a scope.
    * @static
    */
-  removePartition: function (name) {
-    Roles._checkPartitionName(name);
+  removeScope: function (name) {
+    Roles._checkScopeName(name);
 
     Meteor.users.update({}, {
       $pull: {
         roles: {
-          partition: name
+          scope: name
         }
       }
     }, {multi: true});
@@ -1171,35 +1171,35 @@ _.extend(Roles, {
   },
 
   /**
-   * @method _roleAndPartitionMatcher
+   * @method _roleAndScopeMatcher
    * @param {String} roleName A role name to match against.
-   * @param {String} partition A partition to match against.
+   * @param {String} scope A scope to match against.
    * @return {Function} A matcher function which accepts a role object and returns `true`
-   *                     if its name matches `roleName`, and partition matches `partition`.
+   *                     if its name matches `roleName`, and scope matches `scope`.
    * @private
    * @static
    */
-  _roleAndPartitionMatcher: function (roleName, partition) {
+  _roleAndScopeMatcher: function (roleName, scope) {
     return function (userRole) {
-      // == used on purpose in "userRole.partition == null"
-      return (userRole._id === roleName && userRole.partition === partition) ||
-        (userRole._id === roleName && (!_.has(userRole, 'partition') || userRole.partition == null));
+      // == used on purpose in "userRole.scope == null"
+      return (userRole._id === roleName && userRole.scope === scope) ||
+        (userRole._id === roleName && (!_.has(userRole, 'scope') || userRole.scope == null));
     };
   },
 
   /**
-   * @method _partitionMatcher
-   * @param {String} partition A partition to match against.
+   * @method _scopeMatcher
+   * @param {String} scope A scope to match against.
    * @return {Function} A matcher function which accepts a role object and returns `true`
-   *                    if its partition matches `partition`.
+   *                    if its scope matches `scope`.
    * @private
    * @static
    */
-  _partitionMatcher: function (partition) {
+  _scopeMatcher: function (scope) {
     return function (userRole) {
-      // == used on purpose in "userRole.partition == null"
-      return (userRole.partition === partition) ||
-        (!_.has(userRole, 'partition') || userRole.partition == null);
+      // == used on purpose in "userRole.scope == null"
+      return (userRole.scope === scope) ||
+        (!_.has(userRole, 'scope') || userRole.scope == null);
     };
   },
 
@@ -1243,46 +1243,46 @@ _.extend(Roles, {
     options = _.isUndefined(options) ? {} : options;
 
     if (options === null || _.isString(options)) {
-      options = {partition: options};
+      options = {scope: options};
     }
 
-    options.partition = Roles._normalizePartitionName(options.partition);
+    options.scope = Roles._normalizeScopeName(options.scope);
 
     return options;
   },
 
   /**
-   * Normalize partition name.
+   * Normalize scope name.
    *
-   * @method _normalizePartitionName
-   * @param {String} partitionName A partition name to normalize.
-   * @return {String} Normalized partition name.
+   * @method _normalizeScopeName
+   * @param {String} scopeName A scope name to normalize.
+   * @return {String} Normalized scope name.
    * @private
    * @static
    */
-  _normalizePartitionName: function (partitionName) {
+  _normalizeScopeName: function (scopeName) {
     // map undefined and null to null
-    if (partitionName == null) {
+    if (scopeName == null) {
       return null;
     }
     else {
-      return partitionName;
+      return scopeName;
     }
   },
 
   /**
-   * Throw an exception if `partitionName` is an invalid partition name.
+   * Throw an exception if `scopeName` is an invalid scope name.
    *
    * @method _checkRoleName
-   * @param {String} partitionName A partition name to match against.
+   * @param {String} scopeName A scope name to match against.
    * @private
    * @static
    */
-  _checkPartitionName: function (partitionName) {
-    if (partitionName === null) return;
+  _checkScopeName: function (scopeName) {
+    if (scopeName === null) return;
 
-    if (!partitionName || !_.isString(partitionName) || Roles._trim(partitionName) !== partitionName) {
-      throw new Error("Invalid partition name '" + partitionName + "'.");
+    if (!scopeName || !_.isString(scopeName) || Roles._trim(scopeName) !== scopeName) {
+      throw new Error("Invalid scope name '" + scopeName + "'.");
     }
   },
 
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 754fb7d21b..72fd9411be 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -2,8 +2,8 @@
 
 // Create default indexes on users collection.
 // Index only on "roles._id" is not needed because the combined index works for it as well.
-Meteor.users._ensureIndex({'roles._id': 1, 'roles.partition': 1});
-Meteor.users._ensureIndex({'roles.partition': 1});
+Meteor.users._ensureIndex({'roles._id': 1, 'roles.scope': 1});
+Meteor.users._ensureIndex({'roles.scope': 1});
 
 /*
  * Publish logged-in user's roles so client-side checks can work.
@@ -126,7 +126,7 @@ _.extend(Roles, {
 
         roles.push({
           _id: role,
-          partition: null,
+          scope: null,
           assigned: true
         })
       });
@@ -146,7 +146,7 @@ _.extend(Roles, {
 
           roles.push({
             _id: role,
-            partition: group,
+            scope: group,
             assigned: true
           })
         });
@@ -180,16 +180,16 @@ _.extend(Roles, {
       // We assume that we are converting back a failed migration, so values can only be
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
 
-      if (userRole.partition) {
-        if (!usingGroups) throw new Error("Role '" + userRole._id + "' with partition '" + userRole.partition + "' without enabled groups.");
+      if (userRole.scope) {
+        if (!usingGroups) throw new Error("Role '" + userRole._id + "' with scope '" + userRole.scope + "' without enabled groups.");
 
         // escape
-        var partition = userRole.partition.replace(/\./g, '_');
+        var scope = userRole.scope.replace(/\./g, '_');
 
-        if (partition[0] === '$') throw new Error("Group name '" + partition + "' start with $.");
+        if (scope[0] === '$') throw new Error("Group name '" + scope + "' start with $.");
 
-        roles[partition] = roles[partition] || [];
-        roles[partition].push(userRole._id);
+        roles[scope] = roles[scope] || [];
+        roles[scope].push(userRole._id);
       }
       else {
         if (usingGroups) {
@@ -301,8 +301,8 @@ _.extend(Roles, {
     updateUser = updateUser || Roles._defaultUpdateUser;
     updateRole = updateRole || Roles._defaultUpdateRole;
 
-    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.partition_1');
-    Roles._dropCollectionIndex(Meteor.users, 'roles.partition_1');
+    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1');
+    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1');
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isOldRole(role)) {
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 7709335b7d..34444d0b4e 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -10,11 +10,11 @@
       _id: 'eve',
       roles: [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'editor',
-        partition: null,
+        scope: null,
         assigned: true
       }]
     },
@@ -22,11 +22,11 @@
       _id: 'bob',
       roles: [{
         _id: 'user',
-        partition: 'group1',
+        scope: 'group1',
         assigned: true
       }, {
         _id: 'editor',
-        partition: 'group2',
+        scope: 'group2',
         assigned: true
       }]
     },
@@ -34,11 +34,11 @@
       _id: 'joe',
       roles: [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'editor',
-        partition: 'group1',
+        scope: 'group1',
         assigned: true
       }]
     }
diff --git a/roles/tests/server.js b/roles/tests/server.js
index aa30637ba0..45cabbd25a 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -23,18 +23,18 @@
   }
 
 
-  function testUser (test, username, expectedRoles, partition) {
+  function testUser (test, username, expectedRoles, scope) {
     var userId = users[username],
         userObj = Meteor.users.findOne({_id: userId});
         
     // check using user ids (makes db calls)
-    _innerTest(test, userId, username, expectedRoles, partition);
+    _innerTest(test, userId, username, expectedRoles, scope);
 
     // check using passed-in user object
-    _innerTest(test, userObj, username, expectedRoles, partition);
+    _innerTest(test, userObj, username, expectedRoles, scope);
   }
 
-  function _innerTest (test, userParam, username, expectedRoles, partition) {
+  function _innerTest (test, userParam, username, expectedRoles, scope) {
     // test that user has only the roles expected and no others
     _.each(roles, function (role) {
       var expected = _.contains(expectedRoles, role),
@@ -42,9 +42,9 @@
           nmsg = username + ' had the following un-expected role: ' + role;
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(userParam, role, partition), msg);
+        test.isTrue(Roles.userIsInRole(userParam, role, scope), msg);
       } else {
-        test.isFalse(Roles.userIsInRole(userParam, role, partition), nmsg);
+        test.isFalse(Roles.userIsInRole(userParam, role, scope), nmsg);
       }
     })
   }
@@ -133,31 +133,31 @@
     });
 
   Tinytest.add(
-    'roles - can\'t use invalid partition names',
+    'roles - can\'t use invalid scope names',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
       Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
 
       test.throws(function () {
         Roles.addUsersToRoles(users.eve, ['admin', 'user'], '');
-      }, /Invalid partition name/);
+      }, /Invalid scope name/);
       test.throws(function () {
         Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ');
-      }, /Invalid partition name/);
+      }, /Invalid scope name/);
       test.throws(function () {
         Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar');
-      }, /Invalid partition name/);
+      }, /Invalid scope name/);
       test.throws(function () {
         Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ');
-      }, /Invalid partition name/);
+      }, /Invalid scope name/);
       test.throws(function () {
         Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42);
-      }, /Invalid partition name/);
+      }, /Invalid scope name/);
     });
 
   Tinytest.add(
@@ -173,99 +173,99 @@
     });
 
   Tinytest.add(
-    'roles - can check if user is in role by partition', 
+    'roles - can check if user is in role by scope',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
       Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition2');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'eve', ['editor'], 'scope2');
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition2'));
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'));
 
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], {anyPartition: true}));
-      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], {anyPartition: true}));
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], {anyScope: true}));
+      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], {anyScope: true}));
     });
 
   Tinytest.add(
-    'roles - can check if user is in role by partition through options',
+    'roles - can check if user is in role by scope through options',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
       Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], {partition: 'partition1'});
-      Roles.addUsersToRoles(users.eve, ['editor'], {partition: 'partition2'});
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], {scope: 'scope1'});
+      Roles.addUsersToRoles(users.eve, ['editor'], {scope: 'scope2'});
 
-      testUser(test, 'eve', ['admin', 'user'], {partition: 'partition1'});
-      testUser(test, 'eve', ['editor'], {partition: 'partition2'});
+      testUser(test, 'eve', ['admin', 'user'], {scope: 'scope1'});
+      testUser(test, 'eve', ['editor'], {scope: 'scope2'});
     });
 
   Tinytest.add(
-    'roles - can check if user is in role by partition with global role',
+    'roles - can check if user is in role by scope with global role',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
       Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
       Roles.addUsersToRoles(users.eve, ['admin']);
 
-      test.isTrue(Roles.userIsInRole(users.eve, ['user'], 'partition1'));
-      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'partition2'));
+      test.isTrue(Roles.userIsInRole(users.eve, ['user'], 'scope1'));
+      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'scope2'));
 
       test.isFalse(Roles.userIsInRole(users.eve, ['user']));
       test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
       test.isFalse(Roles.userIsInRole(users.eve, ['user'], null));
       test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null));
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['user'], 'partition2'));
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'partition1'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['user'], 'scope2'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'));
 
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'partition2'));
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope2'));
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope1'));
       test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
       test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null));
     });
 
   Tinytest.add(
-    'roles - renaming partitions',
+    'roles - renaming scopes',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
       Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition2');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'eve', ['editor'], 'scope2');
 
-      Roles.renamePartition('partition1', 'partition3');
+      Roles.renameScope('scope1', 'scope3');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition3');
-      testUser(test, 'eve', ['editor'], 'partition2');
+      testUser(test, 'eve', ['admin', 'user'], 'scope3');
+      testUser(test, 'eve', ['editor'], 'scope2');
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition1'));
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'));
 
       test.throws(function () {
-        Roles.renamePartition('partition3');
-      }, /Invalid partition name/);
+        Roles.renameScope('scope3');
+      }, /Invalid scope name/);
 
-      Roles.renamePartition('partition3', null);
+      Roles.renameScope('scope3', null);
 
-      testUser(test, 'eve', ['admin', 'user', 'editor'], 'partition2');
+      testUser(test, 'eve', ['admin', 'user', 'editor'], 'scope2');
 
       test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
       test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
@@ -274,9 +274,9 @@
       test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null));
       test.isTrue(Roles.userIsInRole(users.eve, ['user'], null));
 
-      Roles.renamePartition(null, 'partition2');
+      Roles.renameScope(null, 'scope2');
 
-      testUser(test, 'eve', ['admin', 'user', 'editor'], 'partition2');
+      testUser(test, 'eve', ['admin', 'user', 'editor'], 'scope2');
 
       test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
       test.isFalse(Roles.userIsInRole(users.eve, ['admin']));
@@ -287,25 +287,25 @@
     });
 
   Tinytest.add(
-    'roles - removing partitions',
+    'roles - removing scopes',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
       Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'partition2');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition2');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'eve', ['editor'], 'scope2');
 
-      Roles.removePartition('partition1');
+      Roles.removeScope('scope1');
 
-      testUser(test, 'eve', ['editor'], 'partition2');
+      testUser(test, 'eve', ['editor'], 'scope2');
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition1'));
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'));
     });
 
   Tinytest.add(
@@ -408,7 +408,7 @@
     });
 
   Tinytest.add(
-    'roles - can add individual users to roles by partition', 
+    'roles - can add individual users to roles by scope',
     function (test) {
       reset();
 
@@ -416,26 +416,26 @@
       Roles.createRole('user');
       Roles.createRole('editor');
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'bob', [], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'bob', [], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
 
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', [], 'partition2');
-      testUser(test, 'joe', [], 'partition2');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', [], 'scope2');
+      testUser(test, 'joe', [], 'scope2');
 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'partition1');
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'partition2');
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'scope2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'bob', [], 'partition1');
-      testUser(test, 'joe', ['editor', 'user'], 'partition1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'bob', [], 'scope1');
+      testUser(test, 'joe', ['editor', 'user'], 'scope1');
 
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['editor', 'user'], 'partition2');
-      testUser(test, 'joe', [], 'partition2');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['editor', 'user'], 'scope2');
+      testUser(test, 'joe', [], 'scope2');
     });
 
   Tinytest.add(
@@ -488,7 +488,7 @@
     });
 
   Tinytest.add(
-    'roles - can add user to roles multiple times by partition', 
+    'roles - can add user to roles multiple times by scope',
     function (test) {
       reset();
 
@@ -496,19 +496,19 @@
       Roles.createRole('user');
       Roles.createRole('editor');
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'bob', [], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'bob', [], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
 
-      Roles.addUsersToRoles(users.bob, ['admin'], 'partition1');
-      Roles.addUsersToRoles(users.bob, ['editor'], 'partition1');
+      Roles.addUsersToRoles(users.bob, ['admin'], 'scope1');
+      Roles.addUsersToRoles(users.bob, ['editor'], 'scope1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'bob', ['admin', 'editor'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'bob', ['admin', 'editor'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
     });
 
   Tinytest.add(
@@ -534,7 +534,7 @@
     });
 
   Tinytest.add(
-    'roles - can add multiple users to roles by partition', 
+    'roles - can add multiple users to roles by scope',
     function (test) {
       reset();
 
@@ -542,26 +542,26 @@
       Roles.createRole('user');
       Roles.createRole('editor');
 
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'scope1');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'bob', ['admin', 'user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'bob', ['admin', 'user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
 
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', [], 'partition2');
-      testUser(test, 'joe', [], 'partition2');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', [], 'scope2');
+      testUser(test, 'joe', [], 'scope2');
 
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'partition1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'partition2');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope2');
 
-      testUser(test, 'eve', ['admin', 'user'], 'partition1');
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'partition1');
-      testUser(test, 'joe', ['editor', 'user'], 'partition1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1');
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'scope1');
+      testUser(test, 'joe', ['editor', 'user'], 'scope1');
 
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['editor', 'user'], 'partition2');
-      testUser(test, 'joe', ['editor', 'user'], 'partition2');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['editor', 'user'], 'scope2');
+      testUser(test, 'joe', ['editor', 'user'], 'scope2');
     });
 
   Tinytest.add(
@@ -623,7 +623,7 @@
     });
 
   Tinytest.add(
-    'roles - can remove individual users from roles by partition', 
+    'roles - can remove individual users from roles by scope',
     function (test) {
       reset();
 
@@ -632,26 +632,26 @@
       Roles.createRole('editor');
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'partition1');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'partition2');
-      testUser(test, 'eve', ['editor', 'user'], 'partition1');
-      testUser(test, 'bob', ['editor', 'user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2');
+      testUser(test, 'eve', ['editor', 'user'], 'scope1');
+      testUser(test, 'bob', ['editor', 'user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope2');
 
-      Roles.removeUsersFromRoles(users.eve, ['user'], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition1');
-      testUser(test, 'bob', ['editor', 'user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition2');
+      Roles.removeUsersFromRoles(users.eve, ['user'], 'scope1');
+      testUser(test, 'eve', ['editor'], 'scope1');
+      testUser(test, 'bob', ['editor', 'user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope2');
     });
 
   Tinytest.add(
-    'roles - can remove individual users from roles by partition through options',
+    'roles - can remove individual users from roles by scope through options',
     function (test) {
       reset();
 
@@ -660,22 +660,22 @@
       Roles.createRole('editor');
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], {partition: 'partition1'});
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], {partition: 'partition2'});
-      testUser(test, 'eve', ['editor', 'user'], 'partition1');
-      testUser(test, 'bob', ['editor', 'user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], {scope: 'scope1'});
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], {scope: 'scope2'});
+      testUser(test, 'eve', ['editor', 'user'], 'scope1');
+      testUser(test, 'bob', ['editor', 'user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope2');
 
-      Roles.removeUsersFromRoles(users.eve, ['user'], {partition: 'partition1'});
-      testUser(test, 'eve', ['editor'], 'partition1');
-      testUser(test, 'bob', ['editor', 'user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition2');
+      Roles.removeUsersFromRoles(users.eve, ['user'], {scope: 'scope1'});
+      testUser(test, 'eve', ['editor'], 'scope1');
+      testUser(test, 'bob', ['editor', 'user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope2');
     });
 
   Tinytest.add(
@@ -702,7 +702,7 @@
     });
 
   Tinytest.add(
-    'roles - can remove multiple users from roles by partition', 
+    'roles - can remove multiple users from roles by scope',
     function (test) {
       reset();
 
@@ -711,27 +711,27 @@
       Roles.createRole('editor');
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'partition1');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'partition2');
-      testUser(test, 'eve', ['editor', 'user'], 'partition1');
-      testUser(test, 'bob', ['editor', 'user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2');
+      testUser(test, 'eve', ['editor', 'user'], 'scope1');
+      testUser(test, 'bob', ['editor', 'user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope2');
 
-      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition1');
-      testUser(test, 'bob', ['editor'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition2');
+      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'scope1');
+      testUser(test, 'eve', ['editor'], 'scope1');
+      testUser(test, 'bob', ['editor'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope2');
 
-      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'partition2');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', [], 'partition2');
-      testUser(test, 'joe', [], 'partition2');
+      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'scope2');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', [], 'scope2');
+      testUser(test, 'joe', [], 'scope2');
     });
 
   Tinytest.add(
@@ -775,7 +775,7 @@
     });
 
   Tinytest.add(
-    'roles - can set user roles by partition', 
+    'roles - can set user roles by scope',
     function (test) {
       reset();
 
@@ -787,60 +787,60 @@
           bob = Meteor.users.findOne({_id: users.bob}),
           joe = Meteor.users.findOne({_id: users.joe});
     
-      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'partition1');
-      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'partition2');
-      testUser(test, 'eve', ['editor', 'user'], 'partition1');
-      testUser(test, 'bob', ['editor', 'user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition2');
+      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
+      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2');
+      testUser(test, 'eve', ['editor', 'user'], 'scope1');
+      testUser(test, 'bob', ['editor', 'user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope2');
 
       // use addUsersToRoles add some roles
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'partition1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'partition2');
-      testUser(test, 'eve', ['admin', 'editor', 'user'], 'partition1');
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', [], 'partition2');
-      testUser(test, 'bob', ['admin', 'editor'], 'partition2');
-      testUser(test, 'joe', ['admin', 'editor'], 'partition2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'scope1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'scope2');
+      testUser(test, 'eve', ['admin', 'editor', 'user'], 'scope1');
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', [], 'scope2');
+      testUser(test, 'bob', ['admin', 'editor'], 'scope2');
+      testUser(test, 'joe', ['admin', 'editor'], 'scope2');
 
-      Roles.setUserRoles([eve, bob], ['user'], 'partition1');
-      Roles.setUserRoles([eve, joe], ['editor'], 'partition2');
-      testUser(test, 'eve', ['user'], 'partition1');
-      testUser(test, 'bob', ['user'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition2');
-      testUser(test, 'bob', ['admin', 'editor'], 'partition2');
-      testUser(test, 'joe', ['editor'], 'partition2');
+      Roles.setUserRoles([eve, bob], ['user'], 'scope1');
+      Roles.setUserRoles([eve, joe], ['editor'], 'scope2');
+      testUser(test, 'eve', ['user'], 'scope1');
+      testUser(test, 'bob', ['user'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', ['editor'], 'scope2');
+      testUser(test, 'bob', ['admin', 'editor'], 'scope2');
+      testUser(test, 'joe', ['editor'], 'scope2');
 
-      Roles.setUserRoles(bob, 'editor', 'partition1');
-      testUser(test, 'eve', ['user'], 'partition1');
-      testUser(test, 'bob', ['editor'], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition2');
-      testUser(test, 'bob', ['admin', 'editor'], 'partition2');
-      testUser(test, 'joe', ['editor'], 'partition2');
+      Roles.setUserRoles(bob, 'editor', 'scope1');
+      testUser(test, 'eve', ['user'], 'scope1');
+      testUser(test, 'bob', ['editor'], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', ['editor'], 'scope2');
+      testUser(test, 'bob', ['admin', 'editor'], 'scope2');
+      testUser(test, 'joe', ['editor'], 'scope2');
 
-      test.isTrue(_.contains(_.pluck(Roles.getRolesForUser(users.bob, {anyPartition: true, fullObjects: true}), 'partition'), 'partition1'));
-      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.joe, {anyPartition: true, fullObjects: true}), 'partition'), 'partition1'));
+      test.isTrue(_.contains(_.pluck(Roles.getRolesForUser(users.bob, {anyScope: true, fullObjects: true}), 'scope'), 'scope1'));
+      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.joe, {anyScope: true, fullObjects: true}), 'scope'), 'scope1'));
 
-      Roles.setUserRoles([bob, users.joe], [], 'partition1');
-      testUser(test, 'eve', ['user'], 'partition1');
-      testUser(test, 'bob', [], 'partition1');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'eve', ['editor'], 'partition2');
-      testUser(test, 'bob', ['admin', 'editor'], 'partition2');
-      testUser(test, 'joe', ['editor'], 'partition2');
+      Roles.setUserRoles([bob, users.joe], [], 'scope1');
+      testUser(test, 'eve', ['user'], 'scope1');
+      testUser(test, 'bob', [], 'scope1');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', ['editor'], 'scope2');
+      testUser(test, 'bob', ['admin', 'editor'], 'scope2');
+      testUser(test, 'joe', ['editor'], 'scope2');
 
-      // When roles in a given partition are removed, we do not want any dangling database content for that partition.
-      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.bob, {anyPartition: true, fullObjects: true}), 'partition'), 'partition1'));
-      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.joe, {anyPartition: true, fullObjects: true}), 'partition'), 'partition1'));
+      // When roles in a given scope are removed, we do not want any dangling database content for that scope.
+      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.bob, {anyScope: true, fullObjects: true}), 'scope'), 'scope1'));
+      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.joe, {anyScope: true, fullObjects: true}), 'scope'), 'scope1'));
     });
 
   Tinytest.add(
-    'roles - can set user roles by partition including GLOBAL_PARTITION', 
+    'roles - can set user roles by scope including GLOBAL_SCOPE',
     function (test) {
       reset();
 
@@ -851,12 +851,12 @@
           bob = Meteor.users.findOne({_id: users.bob}),
           joe = Meteor.users.findOne({_id: users.joe});
     
-      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_PARTITION);
-      testUser(test, 'eve', ['admin'], 'partition1');
+      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE);
+      testUser(test, 'eve', ['admin'], 'scope1');
       testUser(test, 'eve', ['admin']);
 
-      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_PARTITION);
-      testUser(test, 'eve', ['editor'], 'partition2');
+      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_SCOPE);
+      testUser(test, 'eve', ['editor'], 'scope2');
       testUser(test, 'eve', ['editor']);
     });
 
@@ -884,7 +884,7 @@
     function (test) {
       reset();
       test.equal(Roles.getRolesForUser('1'), []);
-      test.equal(Roles.getRolesForUser('1', 'partition1'), []);
+      test.equal(Roles.getRolesForUser('1', 'scope1'), []);
     });
 
   Tinytest.add(
@@ -917,17 +917,17 @@
 
       test.equal(Roles.getRolesForUser(userId, {fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
     });
 
   Tinytest.add(
-    'roles - can get all roles for user by partition', 
+    'roles - can get all roles for user by scope',
     function (test) {
       reset();
 
@@ -938,134 +938,134 @@
           userObj;
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'partition1'), []);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'partition1'), []);
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), []);
 
       // add roles
-      Roles.addUsersToRoles(userId, ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles(userId, ['admin'], 'partition2');
+      Roles.addUsersToRoles(userId, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(userId, ['admin'], 'scope2');
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'partition1'), ['admin', 'user']);
-      test.equal(Roles.getRolesForUser(userId, 'partition2'), ['admin']);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId, 'scope2'), ['admin']);
       test.equal(Roles.getRolesForUser(userId), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'partition1'), ['admin', 'user']);
-      test.equal(Roles.getRolesForUser(userObj, 'partition2'), ['admin']);
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userObj, 'scope2'), ['admin']);
       test.equal(Roles.getRolesForUser(userObj), []);
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1'}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope1'}), [{
         _id: 'admin',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }]);
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2'}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope2'}), [{
         _id: 'admin',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }]);
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyScope: true}), [{
         _id: 'admin',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'admin',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }]);
 
       Roles.createRole('PERMISSION');
       Roles.addRolesToParent('PERMISSION', 'user');
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1'}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope1'}), [{
         _id: 'admin',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'PERMISSION',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: false
       }]);
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2'}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope2'}), [{
         _id: 'admin',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }]);
-      test.equal(Roles.getRolesForUser(userId, {partition: 'partition1'}), ['admin', 'user', 'PERMISSION']);
-      test.equal(Roles.getRolesForUser(userId, {partition: 'partition2'}), ['admin']);
+      test.equal(Roles.getRolesForUser(userId, {scope: 'scope1'}), ['admin', 'user', 'PERMISSION']);
+      test.equal(Roles.getRolesForUser(userId, {scope: 'scope2'}), ['admin']);
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyScope: true}), [{
         _id: 'admin',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'admin',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }, {
         _id: 'PERMISSION',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: false
       }]);
-      test.equal(Roles.getRolesForUser(userId, {anyPartition: true}), ['admin', 'user', 'PERMISSION']);
+      test.equal(Roles.getRolesForUser(userId, {anyScope: true}), ['admin', 'user', 'PERMISSION']);
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition1', onlyAssigned: true}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope1', onlyAssigned: true}), [{
         _id: 'admin',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }]);
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, partition: 'partition2', onlyAssigned: true}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope2', onlyAssigned: true}), [{
         _id: 'admin',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }]);
-      test.equal(Roles.getRolesForUser(userId, {partition: 'partition1', onlyAssigned: true}), ['admin', 'user']);
-      test.equal(Roles.getRolesForUser(userId, {partition: 'partition2', onlyAssigned: true}), ['admin']);
+      test.equal(Roles.getRolesForUser(userId, {scope: 'scope1', onlyAssigned: true}), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId, {scope: 'scope2', onlyAssigned: true}), ['admin']);
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyPartition: true, onlyAssigned: true}), [{
+      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyScope: true, onlyAssigned: true}), [{
         _id: 'admin',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'admin',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }]);
-      test.equal(Roles.getRolesForUser(userId, {anyPartition: true, onlyAssigned: true}), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId, {anyScope: true, onlyAssigned: true}), ['admin', 'user']);
     });
 
   Tinytest.add(
-    'roles - can get all roles for user by partition with periods in name', 
+    'roles - can get all roles for user by scope with periods in name',
     function (test) {
       reset();
 
@@ -1077,7 +1077,7 @@
     });
 
   Tinytest.add(
-    'roles - can get all roles for user by partition including Roles.GLOBAL_PARTITION', 
+    'roles - can get all roles for user by scope including Roles.GLOBAL_SCOPE',
     function (test) {
       reset();
 
@@ -1088,22 +1088,22 @@
       var userId = users.eve,
           userObj;
 
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_PARTITION);
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'partition1');
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE);
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1');
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'partition1'), ['editor', 'admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user']);
       test.equal(Roles.getRolesForUser(userId), ['editor']);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'partition1'), ['editor', 'admin', 'user']);
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user']);
       test.equal(Roles.getRolesForUser(userObj), ['editor']);
     });
 
 
   Tinytest.add(
-    'roles - getRolesForUser should not return null entries if user has no roles for partition', 
+    'roles - getRolesForUser should not return null entries if user has no roles for scope',
     function (test) {
       reset();
 
@@ -1113,29 +1113,29 @@
           userObj;
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'partition1'), []);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), []);
       test.equal(Roles.getRolesForUser(userId), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'partition1'), []);
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), []);
       test.equal(Roles.getRolesForUser(userObj), []);
 
 
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_PARTITION);
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE);
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'partition1'), ['editor']);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['editor']);
       test.equal(Roles.getRolesForUser(userId), ['editor']);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'partition1'), ['editor']);
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor']);
       test.equal(Roles.getRolesForUser(userObj), ['editor']);
     });
     
   Tinytest.add(
-    'roles - can get all partitions for user', 
+    'roles - can get all scopes for user',
     function (test) {
       reset();
 
@@ -1146,19 +1146,19 @@
       var userId = users.eve,
           userObj;
 
-      Roles.addUsersToRoles([users.eve], ['editor'], 'partition1');
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'partition2');
+      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1');
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2');
 
       // by userId
-      test.equal(Roles.getPartitionsForUser(userId), ['partition1', 'partition2']);
+      test.equal(Roles.getScopesForUser(userId), ['scope1', 'scope2']);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getPartitionsForUser(userObj), ['partition1', 'partition2']);
+      test.equal(Roles.getScopesForUser(userObj), ['scope1', 'scope2']);
     });
   
   Tinytest.add(
-    'roles - can get all partitions for user by role', 
+    'roles - can get all scopes for user by role',
     function (test) {
       reset();
 
@@ -1169,23 +1169,23 @@
       var userId = users.eve,
           userObj;
 
-      Roles.addUsersToRoles([users.eve], ['editor'], 'partition1');
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'partition2');
+      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1');
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2');
 
       // by userId
-      test.equal(Roles.getPartitionsForUser(userId, 'user'), ['partition2']);
-      test.equal(Roles.getPartitionsForUser(userId, 'editor'), ['partition1', 'partition2']);
-      test.equal(Roles.getPartitionsForUser(userId, 'admin'), []);
+      test.equal(Roles.getScopesForUser(userId, 'user'), ['scope2']);
+      test.equal(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2']);
+      test.equal(Roles.getScopesForUser(userId, 'admin'), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getPartitionsForUser(userObj, 'user'), ['partition2']);
-      test.equal(Roles.getPartitionsForUser(userObj, 'editor'), ['partition1', 'partition2']);
-      test.equal(Roles.getPartitionsForUser(userObj, 'admin'), []);
+      test.equal(Roles.getScopesForUser(userObj, 'user'), ['scope2']);
+      test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2']);
+      test.equal(Roles.getScopesForUser(userObj, 'admin'), []);
   });
   
   Tinytest.add(
-    'roles - getPartitionsForUser returns [] when not using partitions', 
+    'roles - getScopesForUser returns [] when not using scopes',
     function (test) {
       reset();
 
@@ -1198,17 +1198,17 @@
       Roles.addUsersToRoles([users.eve], ['editor', 'user']);
 
       // by userId
-      test.equal(Roles.getPartitionsForUser(userId), []);
-      test.equal(Roles.getPartitionsForUser(userId, 'editor'), []);
-      test.equal(Roles.getPartitionsForUser(userId, ['editor']), []);
-      test.equal(Roles.getPartitionsForUser(userId, ['editor', 'user']), []);
+      test.equal(Roles.getScopesForUser(userId), []);
+      test.equal(Roles.getScopesForUser(userId, 'editor'), []);
+      test.equal(Roles.getScopesForUser(userId, ['editor']), []);
+      test.equal(Roles.getScopesForUser(userId, ['editor', 'user']), []);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getPartitionsForUser(userObj), []);
-      test.equal(Roles.getPartitionsForUser(userObj, 'editor'), []);
-      test.equal(Roles.getPartitionsForUser(userObj, ['editor']), []);
-      test.equal(Roles.getPartitionsForUser(userObj, ['editor', 'user']), []);
+      test.equal(Roles.getScopesForUser(userObj), []);
+      test.equal(Roles.getScopesForUser(userObj, 'editor'), []);
+      test.equal(Roles.getScopesForUser(userObj, ['editor']), []);
+      test.equal(Roles.getScopesForUser(userObj, ['editor', 'user']), []);
     });
 
   Tinytest.add(
@@ -1229,29 +1229,29 @@
       Roles.addUsersToRoles([users.eve], ['moderator'], 'group3');
 
       // by userId, one role
-      test.equal(Roles.getPartitionsForUser(userId, ['user']), ['group2']);
-      test.equal(Roles.getPartitionsForUser(userId, ['editor']), ['group1', 'group2']);
-      test.equal(Roles.getPartitionsForUser(userId, ['admin']), []);
+      test.equal(Roles.getScopesForUser(userId, ['user']), ['group2']);
+      test.equal(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2']);
+      test.equal(Roles.getScopesForUser(userId, ['admin']), []);
 
       // by userId, multiple roles
-      test.equal(Roles.getPartitionsForUser(userId, ['editor', 'user']), ['group1', 'group2']);
-      test.equal(Roles.getPartitionsForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
-      test.equal(Roles.getPartitionsForUser(userId, ['user', 'moderator']), ['group2', 'group3']);
+      test.equal(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2']);
+      test.equal(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
+      test.equal(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3']);
 
       // by user object, one role
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getPartitionsForUser(userObj, ['user']), ['group2']);
-      test.equal(Roles.getPartitionsForUser(userObj, ['editor']), ['group1', 'group2']);
-      test.equal(Roles.getPartitionsForUser(userObj, ['admin']), []);
+      test.equal(Roles.getScopesForUser(userObj, ['user']), ['group2']);
+      test.equal(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2']);
+      test.equal(Roles.getScopesForUser(userObj, ['admin']), []);
 
       // by user object, multiple roles
-      test.equal(Roles.getPartitionsForUser(userObj, ['editor', 'user']), ['group1', 'group2']);
-      test.equal(Roles.getPartitionsForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
-      test.equal(Roles.getPartitionsForUser(userObj, ['user', 'moderator']), ['group2', 'group3']);
+      test.equal(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2']);
+      test.equal(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
+      test.equal(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3']);
     });
   
   Tinytest.add(
-    'roles - getting all partitions for user does not include GLOBAL_PARTITION', 
+    'roles - getting all scopes for user does not include GLOBAL_SCOPE',
     function (test) {
       reset();
 
@@ -1262,28 +1262,28 @@
       var userId = users.eve,
           userObj;
 
-      Roles.addUsersToRoles([users.eve], ['editor'], 'partition1');
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'partition2');
-      Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_PARTITION);
+      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1');
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2');
+      Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE);
 
       // by userId
-      test.equal(Roles.getPartitionsForUser(userId, 'user'), ['partition2']);
-      test.equal(Roles.getPartitionsForUser(userId, 'editor'), ['partition1', 'partition2']);
-      test.equal(Roles.getPartitionsForUser(userId, 'admin'), []);
-      test.equal(Roles.getPartitionsForUser(userId, ['user']), ['partition2']);
-      test.equal(Roles.getPartitionsForUser(userId, ['editor']), ['partition1', 'partition2']);
-      test.equal(Roles.getPartitionsForUser(userId, ['admin']), []);
-      test.equal(Roles.getPartitionsForUser(userId, ['user', 'editor', 'admin']), ['partition1', 'partition2']);
+      test.equal(Roles.getScopesForUser(userId, 'user'), ['scope2']);
+      test.equal(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2']);
+      test.equal(Roles.getScopesForUser(userId, 'admin'), []);
+      test.equal(Roles.getScopesForUser(userId, ['user']), ['scope2']);
+      test.equal(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2']);
+      test.equal(Roles.getScopesForUser(userId, ['admin']), []);
+      test.equal(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2']);
 
       // by user object
       userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getPartitionsForUser(userObj, 'user'), ['partition2']);
-      test.equal(Roles.getPartitionsForUser(userObj, 'editor'), ['partition1', 'partition2']);
-      test.equal(Roles.getPartitionsForUser(userObj, 'admin'), []);
-      test.equal(Roles.getPartitionsForUser(userObj, ['user']), ['partition2']);
-      test.equal(Roles.getPartitionsForUser(userObj, ['editor']), ['partition1', 'partition2']);
-      test.equal(Roles.getPartitionsForUser(userObj, ['admin']), []);
-      test.equal(Roles.getPartitionsForUser(userObj, ['user', 'editor', 'admin']), ['partition1', 'partition2']);
+      test.equal(Roles.getScopesForUser(userObj, 'user'), ['scope2']);
+      test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2']);
+      test.equal(Roles.getScopesForUser(userObj, 'admin'), []);
+      test.equal(Roles.getScopesForUser(userObj, ['user']), ['scope2']);
+      test.equal(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2']);
+      test.equal(Roles.getScopesForUser(userObj, ['admin']), []);
+      test.equal(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2']);
     });
 
 
@@ -1306,27 +1306,27 @@
     });
 
   Tinytest.add(
-    'roles - can get all users in role by partition', 
+    'roles - can get all users in role by scope',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
 
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2');
 
       var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin', 'partition1').fetch(), '_id');
+          actual = _.pluck(Roles.getUsersInRole('admin', 'scope1').fetch(), '_id');
 
       itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin', {partition: 'partition1'}).fetch(), '_id');
+      actual = _.pluck(Roles.getUsersInRole('admin', {scope: 'scope1'}).fetch(), '_id');
       itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin', {anyPartition: true}).fetch(), '_id');
+      actual = _.pluck(Roles.getUsersInRole('admin', {anyScope: true}).fetch(), '_id');
       itemsEqual(test, actual, expected);
 
       actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
@@ -1334,23 +1334,23 @@
     });
   
   Tinytest.add(
-    'roles - can get all users in role by partition including Roles.GLOBAL_PARTITION', 
+    'roles - can get all users in role by scope including Roles.GLOBAL_SCOPE',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
 
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_PARTITION);
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE);
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2');
 
       var expected = [users.eve],
-          actual = _.pluck(Roles.getUsersInRole('admin', 'partition1').fetch(), '_id');
+          actual = _.pluck(Roles.getUsersInRole('admin', 'scope1').fetch(), '_id');
 
       itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin', 'partition2').fetch(), '_id');
+      actual = _.pluck(Roles.getUsersInRole('admin', 'scope2').fetch(), '_id');
 
       itemsEqual(test, actual, expected);
 
@@ -1360,23 +1360,23 @@
       itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin', {anyPartition: true}).fetch(), '_id');
+      actual = _.pluck(Roles.getUsersInRole('admin', {anyScope: true}).fetch(), '_id');
 
       itemsEqual(test, actual, expected);
     });
 
   Tinytest.add(
-    'roles - can get all users in role by partition and passes through mongo query arguments', 
+    'roles - can get all users in role by scope and passes through mongo query arguments',
     function (test) {
       reset();
 
       Roles.createRole('admin');
       Roles.createRole('user');
 
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'partition1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'partition2');
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2');
 
-      var results = Roles.getUsersInRole('admin', 'partition1', { fields: { username: 0 }, limit: 1 }).fetch();
+      var results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch();
 
       test.equal(1, results.length);
       test.isTrue(results[0].hasOwnProperty('_id'));
@@ -1385,76 +1385,76 @@
 
 
   Tinytest.add(
-    'roles - can use Roles.GLOBAL_PARTITION to assign blanket roles',
+    'roles - can use Roles.GLOBAL_SCOPE to assign blanket roles',
     function (test) {
       reset();
 
       Roles.createRole('admin');
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_PARTITION);
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE);
 
-      testUser(test, 'eve', [], 'partition1');
-      testUser(test, 'joe', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition1');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition1');
+      testUser(test, 'eve', [], 'scope1');
+      testUser(test, 'joe', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope1');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope1');
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_PARTITION);
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE);
 
-      testUser(test, 'eve', [], 'partition1');
-      testUser(test, 'joe', [], 'partition2');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition1');
+      testUser(test, 'eve', [], 'scope1');
+      testUser(test, 'joe', [], 'scope2');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope1');
     });
 
   Tinytest.add(
-    'roles - Roles.GLOBAL_PARTITION is independent of other partitions',
+    'roles - Roles.GLOBAL_SCOPE is independent of other scopes',
     function (test) {
       reset();
 
       Roles.createRole('admin');
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'partition5');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_PARTITION);
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5');
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE);
 
-      testUser(test, 'eve', [], 'partition1');
-      testUser(test, 'joe', ['admin'], 'partition5');
-      testUser(test, 'joe', ['admin'], 'partition2');
-      testUser(test, 'joe', ['admin'], 'partition1');
-      testUser(test, 'bob', ['admin'], 'partition5');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition1');
+      testUser(test, 'eve', [], 'scope1');
+      testUser(test, 'joe', ['admin'], 'scope5');
+      testUser(test, 'joe', ['admin'], 'scope2');
+      testUser(test, 'joe', ['admin'], 'scope1');
+      testUser(test, 'bob', ['admin'], 'scope5');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope1');
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_PARTITION);
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE);
 
-      testUser(test, 'eve', [], 'partition1');
-      testUser(test, 'joe', ['admin'], 'partition5');
-      testUser(test, 'joe', [], 'partition2');
-      testUser(test, 'joe', [], 'partition1');
-      testUser(test, 'bob', ['admin'], 'partition5');
-      testUser(test, 'bob', ['admin'], 'partition2');
-      testUser(test, 'bob', ['admin'], 'partition1');
+      testUser(test, 'eve', [], 'scope1');
+      testUser(test, 'joe', ['admin'], 'scope5');
+      testUser(test, 'joe', [], 'scope2');
+      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'bob', ['admin'], 'scope5');
+      testUser(test, 'bob', ['admin'], 'scope2');
+      testUser(test, 'bob', ['admin'], 'scope1');
     });
   
   Tinytest.add(
-    'roles - Roles.GLOBAL_PARTITION also checked when partition not specified',
+    'roles - Roles.GLOBAL_SCOPE also checked when scope not specified',
     function (test) {
       reset();
 
       Roles.createRole('admin');
 
-      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_PARTITION);
+      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE);
 
       testUser(test, 'joe', ['admin']);
 
-      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_PARTITION);
+      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE);
 
       testUser(test, 'joe', []);
     });
 
   Tinytest.add(
-    "roles - can use '.' in partition name",
+    "roles - can use '.' in scope name",
     function (test) {
       reset();
 
@@ -1465,7 +1465,7 @@
     });
 
   Tinytest.add(
-    "roles - can use multiple periods in partition name",
+    "roles - can use multiple periods in scope name",
     function (test) {
       reset();
 
@@ -1484,44 +1484,44 @@
       Roles.createRole('user');
       Roles.createRole('editor');
 
-      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'partition1');
-      Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'partition2');
+      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
+      Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'scope2');
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'partition1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'partition2'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'));
 
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'partition1'));
-      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'));
+      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'));
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'user', 'partition1'));
-      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'partition1'));
-      test.isFalse(Roles.userIsInRole(users.joe, 'user', 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'user', 'scope1'));
+      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.joe, 'user', 'scope1'));
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'partition2'));
-      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'partition2'));
-      test.isTrue(Roles.userIsInRole(users.joe, 'user', 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'));
+      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope2'));
+      test.isTrue(Roles.userIsInRole(users.joe, 'user', 'scope2'));
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'partition1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'));
 
       Roles.renameRole('user', 'user2');
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'partition1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'partition2'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'));
 
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'partition1'));
-      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'));
+      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'));
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'user2', 'partition1'));
-      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'partition1'));
-      test.isFalse(Roles.userIsInRole(users.joe, 'user2', 'partition1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'user2', 'scope1'));
+      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.joe, 'user2', 'scope1'));
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'partition2'));
-      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'partition2'));
-      test.isTrue(Roles.userIsInRole(users.joe, 'user2', 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'));
+      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope2'));
+      test.isTrue(Roles.userIsInRole(users.joe, 'user2', 'scope2'));
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'partition1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'partition2'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'));
     });
 
   Tinytest.add(
@@ -1542,11 +1542,11 @@
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: [{
           _id: 'admin',
-          partition: null,
+          scope: null,
           assigned: true
         }, {
           _id: 'editor',
-          partition: null,
+          scope: null,
           assigned: true
         }]
       });
@@ -1556,7 +1556,7 @@
       test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
         roles: [{
           _id: 'user',
-          partition: null,
+          scope: null,
           assigned: true
         }]
       });
@@ -1615,15 +1615,15 @@
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: [{
           _id: 'admin',
-          partition: null,
+          scope: null,
           assigned: true
         }, {
           _id: 'editor',
-          partition: null,
+          scope: null,
           assigned: true
         }, {
           _id: 'user',
-          partition: 'foo_bla',
+          scope: 'foo_bla',
           assigned: true
         }]
       });
@@ -1633,11 +1633,11 @@
       test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
         roles: [{
           _id: 'user',
-          partition: null,
+          scope: null,
           assigned: true
         }, {
           _id: 'user',
-          partition: 'foo_bla',
+          scope: 'foo_bla',
           assigned: true
         }]
       });
@@ -1688,15 +1688,15 @@
       test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
         roles: [{
           _id: 'admin',
-          partition: null,
+          scope: null,
           assigned: true
         }, {
           _id: 'editor',
-          partition: null,
+          scope: null,
           assigned: true
         }, {
           _id: 'user',
-          partition: 'foo.bla',
+          scope: 'foo.bla',
           assigned: true
         }]
       });
@@ -1706,11 +1706,11 @@
       test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
         roles: [{
           _id: 'user',
-          partition: null,
+          scope: null,
           assigned: true
         }, {
           _id: 'user',
-          partition: 'foo.bla',
+          scope: 'foo.bla',
           assigned: true
         }]
       });
@@ -1745,99 +1745,99 @@
       Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
       Roles.addRolesToParent('DELETE_PERMISSION', 'admin');
 
-      Roles.addUsersToRoles(users.eve, ['user'], 'partition1');
-      Roles.addUsersToRoles(users.eve, ['user'], 'partition2');
+      Roles.addUsersToRoles(users.eve, ['user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['user'], 'scope2');
 
       var correctRoles = [{
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: false
       }, {
         _id: 'user',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: false
       }];
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), correctRoles);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), correctRoles);
 
       // let's remove all automatically assigned roles
       // _assureConsistency should recreate those roles
       Meteor.users.update(users.eve, {$pull: {roles: {assigned: false}}});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'user',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }]);
 
       Roles._assureConsistency(users.eve);
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), correctRoles);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), correctRoles);
 
       // add an extra role, faking that it is automatically assigned
       // _assureConsistency should remove this extra role
-      Meteor.users.update(users.eve, {$push: {roles: {_id: 'DELETE_PERMISSION', partition: null, assigned: false}}});
+      Meteor.users.update(users.eve, {$push: {roles: {_id: 'DELETE_PERMISSION', scope: null, assigned: false}}});
 
       Roles._assureConsistency(users.eve);
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), correctRoles);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), correctRoles);
 
       // remove a role, _assureConsistency should remove it from the user
       Meteor.roles.remove({_id: 'VIEW_PERMISSION'});
 
       Roles._assureConsistency(users.eve);
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition1',
+        scope: 'scope1',
         assigned: false
       }, {
         _id: 'user',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition2',
+        scope: 'scope2',
         assigned: false
       }]);
     });
@@ -1850,51 +1850,51 @@
       Roles.createRole('admin');
 
       // add role with assigned set to true
-      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: true});
+      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: true});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
       // change assigned to false
-      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: false});
+      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: false});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
       Roles.setUserRoles(users.eve, []);
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
 
       // add role with assigned set to false
-      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: null});
+      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: null});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
       // change assigned to true
-      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: true});
+      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: true});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
       // do not change assigned
-      Roles._addUserToRole(users.eve, 'admin', {partition: null, ifExists: false, _assigned: null});
+      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: null});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
     });
@@ -1908,60 +1908,60 @@
 
       Roles.addUsersToRoles(users.eve, 'admin');
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
       // remove only roles with assigned set to false, thus do not remove anything
-      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: false});
+      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: false});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
       // remove only roles with assigned set to true
-      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: true});
+      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: true});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
 
       Roles.addUsersToRoles(users.eve, 'admin');
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
       // remove roles no matter the assignment
-      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: null});
+      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: null});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
 
       Roles.addUsersToRoles(users.eve, 'admin', {_assigned: false});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
       // remove only roles with assigned set to true, thus do not remove anything
-      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: true});
+      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: true});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
       // remove only roles with assigned set to false
-      Roles._removeUserFromRole(users.eve, 'admin', {partition: null, _assigned: false});
+      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: false});
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
     });
 
   Tinytest.add(
@@ -1984,21 +1984,21 @@
 
       test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
@@ -2006,21 +2006,21 @@
 
       test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
@@ -2028,9 +2028,9 @@
 
       test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'VIEW_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
@@ -2038,7 +2038,7 @@
 
       test.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), []);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
     });
 
   Tinytest.add(
@@ -2058,38 +2058,38 @@
       Roles.addRolesToParent('DELETE_PERMISSION', 'admin');
 
       Roles.addUsersToRoles(users.eve, ['user']);
-      Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'partition');
+      Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'scope');
 
       test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition',
+        scope: 'scope',
         assigned: true
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }]);
 
@@ -2098,214 +2098,214 @@
       Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition',
+        scope: 'scope',
         assigned: true
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'MODERATE_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'MODERATE_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }]);
 
       Roles.addUsersToRoles(users.eve, ['admin']);
 
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition',
+        scope: 'scope',
         assigned: true
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'MODERATE_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'MODERATE_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'DELETE_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
       Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS');
 
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition',
+        scope: 'scope',
         assigned: true
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'MODERATE_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'MODERATE_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'admin',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'DELETE_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'DELETE_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }]);
 
       Roles.removeUsersFromRoles(users.eve, ['admin']);
 
       test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'ALL_PERMISSIONS',
-        partition: 'partition',
+        scope: 'scope',
         assigned: true
       }, {
         _id: 'EDIT_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'VIEW_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'MODERATE_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'MODERATE_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }, {
         _id: 'DELETE_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'DELETE_PERMISSION',
-        partition: 'partition',
+        scope: 'scope',
         assigned: false
       }]);
 
       Roles.deleteRole('ALL_PERMISSIONS');
 
       test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'partition'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'));
 
       test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'partition'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'user',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
     });
@@ -2340,33 +2340,33 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
       test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'role1',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'role2',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'COMMON_PERMISSION_1',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'COMMON_PERMISSION_2',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'COMMON_PERMISSION_3',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EXTRA_PERMISSION_ROLE_1',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EXTRA_PERMISSION_ROLE_2',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
@@ -2376,25 +2376,25 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
       test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'role1',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'COMMON_PERMISSION_1',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'COMMON_PERMISSION_2',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'COMMON_PERMISSION_3',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EXTRA_PERMISSION_ROLE_1',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
@@ -2404,33 +2404,33 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
       test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'role1',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'role2',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'COMMON_PERMISSION_1',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'COMMON_PERMISSION_2',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'COMMON_PERMISSION_3',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EXTRA_PERMISSION_ROLE_1',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EXTRA_PERMISSION_ROLE_2',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
 
@@ -2440,25 +2440,25 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
       test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'role1',
-        partition: null,
+        scope: null,
         assigned: true
       }, {
         _id: 'COMMON_PERMISSION_1',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'COMMON_PERMISSION_2',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'COMMON_PERMISSION_3',
-        partition: null,
+        scope: null,
         assigned: false
       }, {
         _id: 'EXTRA_PERMISSION_ROLE_1',
-        partition: null,
+        scope: null,
         assigned: false
       }]);
     });
@@ -2476,9 +2476,9 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
@@ -2487,9 +2487,9 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
     });
@@ -2509,9 +2509,9 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
@@ -2520,9 +2520,9 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
     });
@@ -2543,9 +2543,9 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
@@ -2554,9 +2554,9 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
 
@@ -2565,9 +2565,9 @@
       test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
       test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyPartition: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
         _id: 'EDIT_PERMISSION',
-        partition: null,
+        scope: null,
         assigned: true
       }]);
     });

From 1e7212a6bf8be5543cc0be20f9a9a2735e092ac4 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 2 Oct 2016 12:44:09 -0700
Subject: [PATCH 0261/1140] Fixed tests.

---
 package.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.js b/package.js
index cb3379e1a3..d34bdc60dc 100644
--- a/package.js
+++ b/package.js
@@ -8,7 +8,7 @@ Package.describe({
 Package.onUse(function (api) {
   var both = ['client', 'server'];
 
-  api.versionsFrom("METEOR@1.2.0.2");
+  api.versionsFrom("METEOR@1.4.1");
 
   api.use(['underscore',
            'accounts-base',
@@ -28,6 +28,8 @@ Package.onUse(function (api) {
 });
 
 Package.onTest(function (api) {
+  api.versionsFrom("METEOR@1.4.1");
+
   var both = ['client', 'server'];
 
   // `accounts-password` is included so `Meteor.users` exists

From c5e27a83ba88eecae00a28283f8ad93bc83916d0 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 2 Oct 2016 12:57:07 -0700
Subject: [PATCH 0262/1140] Test for making sure userIsInRole returns false for
 unknown roles.

See: #204
---
 roles/tests/server.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 45cabbd25a..e6f6f58219 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -2589,6 +2589,28 @@
       }, /form a cycle/);
     });
 
+  Tinytest.add(
+    'roles - userIsInRole returns false for unknown roles',
+    function (test) {
+      reset();
+
+      Roles.createRole('admin');
+      Roles.createRole('user');
+      Roles.createRole('editor');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
+      Roles.addUsersToRoles(users.eve, ['editor']);
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'unknown'));
+      test.isFalse(Roles.userIsInRole(users.eve, []));
+      test.isFalse(Roles.userIsInRole(users.eve, null));
+      test.isFalse(Roles.userIsInRole(users.eve, undefined));
+
+      test.isFalse(Roles.userIsInRole(users.eve, 'unknown', {anyScope: true}));
+      test.isFalse(Roles.userIsInRole(users.eve, [], {anyScope: true}));
+      test.isFalse(Roles.userIsInRole(users.eve, null, {anyScope: true}));
+      test.isFalse(Roles.userIsInRole(users.eve, undefined, {anyScope: true}));
+    });
+
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From 3516b0820f9717fcbee4a06b3c3cae1080c70bec Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sun, 2 Oct 2016 13:01:03 -0700
Subject: [PATCH 0263/1140] New docs.

---
 docs/assets/css/external-small.png           | Bin
 docs/assets/css/logo.png                     | Bin
 docs/assets/css/main.css                     |   0
 docs/assets/favicon.ico                      | Bin
 docs/assets/img/spinner.gif                  | Bin
 docs/assets/index.html                       |   0
 docs/assets/js/api-filter.js                 |   0
 docs/assets/js/api-list.js                   |   0
 docs/assets/js/api-search.js                 |   0
 docs/assets/js/apidocs.js                    |   0
 docs/assets/js/yui-prettify.js               |   0
 docs/assets/vendor/prettify/CHANGES.html     |   0
 docs/assets/vendor/prettify/COPYING          |   0
 docs/assets/vendor/prettify/README.html      |   0
 docs/assets/vendor/prettify/prettify-min.css |   0
 docs/assets/vendor/prettify/prettify-min.js  |   0
 16 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 docs/assets/css/external-small.png
 mode change 100755 => 100644 docs/assets/css/logo.png
 mode change 100755 => 100644 docs/assets/css/main.css
 mode change 100755 => 100644 docs/assets/favicon.ico
 mode change 100755 => 100644 docs/assets/img/spinner.gif
 mode change 100755 => 100644 docs/assets/index.html
 mode change 100755 => 100644 docs/assets/js/api-filter.js
 mode change 100755 => 100644 docs/assets/js/api-list.js
 mode change 100755 => 100644 docs/assets/js/api-search.js
 mode change 100755 => 100644 docs/assets/js/apidocs.js
 mode change 100755 => 100644 docs/assets/js/yui-prettify.js
 mode change 100755 => 100644 docs/assets/vendor/prettify/CHANGES.html
 mode change 100755 => 100644 docs/assets/vendor/prettify/COPYING
 mode change 100755 => 100644 docs/assets/vendor/prettify/README.html
 mode change 100755 => 100644 docs/assets/vendor/prettify/prettify-min.css
 mode change 100755 => 100644 docs/assets/vendor/prettify/prettify-min.js

diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
old mode 100755
new mode 100644
diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
old mode 100755
new mode 100644
diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
old mode 100755
new mode 100644
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
old mode 100755
new mode 100644
diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
old mode 100755
new mode 100644
diff --git a/docs/assets/index.html b/docs/assets/index.html
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
old mode 100755
new mode 100644
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
old mode 100755
new mode 100644
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
old mode 100755
new mode 100644

From 35c2d16f7ce8244c524a19ed1ae8a3dac9a64d8d Mon Sep 17 00:00:00 2001
From: Simon Schick <simonsimcity@gmail.com>
Date: Sun, 13 Aug 2017 18:31:17 +0400
Subject: [PATCH 0264/1140] Simplified some mongo-db queries

---
 roles/roles_common.js | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index f1814ec877..39a4cd3fcd 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -845,21 +845,12 @@ _.extend(Roles, {
     else {
       query = {
         _id: id,
-        $or: [{
-          roles: {
-            $elemMatch: {
-              _id: {$in: roles},
-              scope: options.scope
-            }
+        roles: {
+          $elemMatch: {
+            _id: {$in: roles},
+            scope: {$in: [options.scope, null]}
           }
-        }, {
-          roles: {
-            $elemMatch: {
-              _id: {$in: roles},
-              scope: null
-            }
-          }
-        }]
+        }
       };
     }
 
@@ -1004,21 +995,12 @@ _.extend(Roles, {
     }
     else {
       query = {
-        $or: [{
-          roles: {
-            $elemMatch: {
-              _id: {$in: roles},
-              scope: options.scope
-            }
+        roles: {
+          $elemMatch: {
+            _id: {$in: roles},
+            scope: {$in: [options.scope, null]}
           }
-        }, {
-          roles: {
-            $elemMatch: {
-              _id: {$in: roles},
-              scope: null
-            }
-          }
-        }]
+        }
       };
     }
 

From 791c9fc4eb9b2122747116c1515ca52a4f767005 Mon Sep 17 00:00:00 2001
From: Simon Schick <simonsimcity@gmail.com>
Date: Sun, 13 Aug 2017 18:32:01 +0400
Subject: [PATCH 0265/1140] Add 'mongo' as dependency so tests can also run in
 the new meteor v1.6.0

---
 package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.js b/package.js
index d34bdc60dc..9a6b5a802e 100644
--- a/package.js
+++ b/package.js
@@ -37,6 +37,7 @@ Package.onTest(function (api) {
   api.use(['alanning:roles',
            'accounts-password',
            'underscore',
+           'mongo'
            'tinytest'], both);
 
   api.addFiles('roles/tests/client.js', 'client');

From 4dd0032d6bfac0329ea086acf2bc40a69655e3e8 Mon Sep 17 00:00:00 2001
From: Simon Schick <simonsimcity@gmail.com>
Date: Sun, 13 Aug 2017 18:37:37 +0400
Subject: [PATCH 0266/1140] Added missing comma ...

---
 package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.js b/package.js
index 9a6b5a802e..95576e3239 100644
--- a/package.js
+++ b/package.js
@@ -37,7 +37,7 @@ Package.onTest(function (api) {
   api.use(['alanning:roles',
            'accounts-password',
            'underscore',
-           'mongo'
+           'mongo',
            'tinytest'], both);
 
   api.addFiles('roles/tests/client.js', 'client');

From 93a7b2f2dae19299e5eb6fecd43fc057764436f5 Mon Sep 17 00:00:00 2001
From: alanning <alanning@gmail.com>
Date: Sun, 25 Nov 2018 22:04:11 -0500
Subject: [PATCH 0267/1140] update version to 2.0.0-rc.1

---
 package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.js b/package.js
index 95576e3239..4da904c523 100644
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "1.2.14",
+  version: "2.0.0-rc.1",
   git: "https://github.com/alanning/meteor-roles.git",
   name: "alanning:roles"
 });

From b8fff1278111cba13d77afbc268be17dec797026 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Mon, 21 Jan 2019 13:13:27 +0400
Subject: [PATCH 0268/1140] Added a method to check inheritance of roles

---
 roles/roles_common.js | 41 ++++++++++++++++++++++++++++++++++
 roles/tests/server.js | 51 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index f1814ec877..45b75abeb9 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1230,6 +1230,47 @@ _.extend(Roles, {
     }
   },
 
+  /**
+   * Find out if a role is an ancestor of another role.
+   *
+   * WARNING: If you check this on the client, please make sure all roles are published.
+   *
+   * @method isParentOf
+   * @param {String} parentRoleName The role you want to research.
+   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
+   * @static
+   */
+  isParentOf: function (parentRoleName, childRoleName) {
+    if (parentRoleName === childRoleName) {
+      return true;
+    }
+
+    if (parentRoleName == null || childRoleName == null) {
+      return false;
+    }
+
+    Roles._checkRoleName(parentRoleName);
+    Roles._checkRoleName(childRoleName);
+
+    var rolesToCheck = [parentRoleName];
+    while (rolesToCheck.length !== 0) {
+      var roleName = rolesToCheck.pop();
+
+      if (roleName === childRoleName) {
+        return true;
+      }
+
+      var role = Meteor.roles.findOne({_id: roleName});
+
+      // This should not happen, but this is a problem to address at some other time.
+      if (!role) continue;
+
+      rolesToCheck = rolesToCheck.concat(_.pluck(role.children, '_id'));
+    }
+
+    return false;
+  },
+
   /**
    * Normalize options.
    *
diff --git a/roles/tests/server.js b/roles/tests/server.js
index e6f6f58219..cf54e57202 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -2611,6 +2611,57 @@
       test.isFalse(Roles.userIsInRole(users.eve, undefined, {anyScope: true}));
     });
 
+Tinytest.add(
+  'roles - isParentOf - returns false for unknown roles',
+  function (test) {
+    reset();
+
+    Roles.createRole('admin');
+
+    test.isFalse(Roles.isParentOf('admin', 'unknown'));
+    test.isFalse(Roles.isParentOf('admin', null));
+    test.isFalse(Roles.isParentOf('admin', undefined));
+
+    test.isFalse(Roles.isParentOf('unknown', 'admin'));
+    test.isFalse(Roles.isParentOf(null, 'admin'));
+    test.isFalse(Roles.isParentOf(undefined, 'admin'));
+  });
+
+Tinytest.add(
+  'roles - isParentOf - returns false if role is not parent of',
+  function (test) {
+    reset();
+
+    Roles.createRole('admin');
+    Roles.createRole('editor');
+    Roles.createRole('user');
+    Roles.addRolesToParent(['editor'], 'admin');
+    Roles.addRolesToParent(['user'], 'editor');
+
+    test.isFalse(Roles.isParentOf('user', 'admin'));
+    test.isFalse(Roles.isParentOf('editor', 'admin'));
+  });
+
+Tinytest.add(
+  'roles - isParentOf - returns true if role is parent of the demanded role',
+  function (test) {
+    reset();
+
+    Roles.createRole('admin');
+    Roles.createRole('editor');
+    Roles.createRole('user');
+    Roles.addRolesToParent(['editor'], 'admin');
+    Roles.addRolesToParent(['user'], 'editor');
+
+    test.isTrue(Roles.isParentOf('admin', 'user'));
+    test.isTrue(Roles.isParentOf('editor', 'user'));
+    test.isTrue(Roles.isParentOf('admin', 'editor'));
+
+    test.isTrue(Roles.isParentOf('admin', 'admin'));
+    test.isTrue(Roles.isParentOf('editor', 'editor'));
+    test.isTrue(Roles.isParentOf('user', 'user'));
+  });
+
   function printException (ex) {
     var tmp = {};
     for (var key in ex) {

From 2657ce2e2486efd7bf31b47e2292989045b19db0 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Mon, 21 Jan 2019 13:23:11 +0400
Subject: [PATCH 0269/1140] Removed underscore from code the base and raised
 min Meteor version to 1.6.0

---
 README.md                                     |   4 +-
 .../main/client/layouts.js                    |   4 +-
 .../main/client/lib/app.js                    |   2 +-
 .../main/server/startup/fixtures.js           |   8 +-
 .../secrets/server/fixtures.js                |   4 +-
 examples/flow-router/client/layouts.js        |   4 +-
 examples/flow-router/server/server.js         |  12 +-
 examples/iron-router/client/routing.js        |   4 +-
 examples/iron-router/server/server.js         |  12 +-
 package.js                                    |   9 +-
 roles/client/uiHelpers.js                     |  10 +-
 roles/roles_common.js                         | 177 +++++++++---------
 roles/roles_server.js                         |  32 ++--
 roles/tests/client.js                         |  14 +-
 roles/tests/server.js                         | 140 ++++++++------
 15 files changed, 230 insertions(+), 206 deletions(-)

diff --git a/README.md b/README.md
index 43af11d298..5d9d6461d7 100644
--- a/README.md
+++ b/README.md
@@ -208,7 +208,7 @@ var users = [
       {name:"Admin User",email:"admin@example.com",roles:['admin']}
     ];
 
-_.each(users, function (user) {
+users.forEach(function (user) {
   var id;
 
   id = Accounts.createUser({
@@ -218,7 +218,7 @@ _.each(users, function (user) {
   });
 
   if (user.roles.length > 0) {
-    _.each(user.roles, function (role) {
+    user.roles.forEach(function (role) {
       Roles.createRole(role, {unlessExists: true});
     });
     // Need _id of existing user record so this call must come after `Accounts.createUser`.
diff --git a/examples/flow-router-advanced/main/client/layouts.js b/examples/flow-router-advanced/main/client/layouts.js
index 6e66fc6f02..f77746b83a 100644
--- a/examples/flow-router-advanced/main/client/layouts.js
+++ b/examples/flow-router-advanced/main/client/layouts.js
@@ -1,5 +1,5 @@
 Template.mainLayout.helpers({
-  notVerified: function () { 
+  notVerified: function () {
     var user = Meteor.user()
 
     return !emailVerified(user)
@@ -7,7 +7,7 @@ Template.mainLayout.helpers({
 })
 
 function emailVerified (user) {
-  return _.some(user.emails, function (email) {
+  return user.emails.some(function (email) {
     return email.verified
   })
 }
diff --git a/examples/flow-router-advanced/main/client/lib/app.js b/examples/flow-router-advanced/main/client/lib/app.js
index d528259710..1c5b7902f6 100644
--- a/examples/flow-router-advanced/main/client/lib/app.js
+++ b/examples/flow-router-advanced/main/client/lib/app.js
@@ -3,7 +3,7 @@ App = {}
 
 "use strict"
 
-_.extend(App, {
+Object.assign(App, {
 
   // Separate routing package details from general app code.
   navigateTo: function (path) {
diff --git a/examples/flow-router-advanced/main/server/startup/fixtures.js b/examples/flow-router-advanced/main/server/startup/fixtures.js
index 0c9318775e..5f78d21c1f 100644
--- a/examples/flow-router-advanced/main/server/startup/fixtures.js
+++ b/examples/flow-router-advanced/main/server/startup/fixtures.js
@@ -26,9 +26,9 @@ function createUsers () {
       {name:"Admin User",email:"admin@example.com",roles:['admin']}
     ];
 
-    _.each(users, function (userData) {
+    users.forEach(function (userData) {
       var id
-      
+
       console.log(userData);
 
       id = Accounts.createUser({
@@ -41,12 +41,12 @@ function createUsers () {
       Meteor.users.update({_id: id},
                           {$set:{'emails.0.verified': true}});
 
-      _.each(userData.roles, function (role) {
+      userData.roles.forEach(function (role) {
         Roles.createRole(role, {unlessExists: true});
       });
 
       Roles.addUsersToRoles(id, userData.roles);
-    
+
     });
   }
 }
diff --git a/examples/flow-router-advanced/secrets/server/fixtures.js b/examples/flow-router-advanced/secrets/server/fixtures.js
index a12700b35c..47f163b2f3 100644
--- a/examples/flow-router-advanced/secrets/server/fixtures.js
+++ b/examples/flow-router-advanced/secrets/server/fixtures.js
@@ -14,7 +14,7 @@ Meteor.startup(function () {
 
 function createSecrets () {
   var secrets
- 
+
   if (Meteor.secrets.find().fetch().length === 0) {
     console.log('Creating secrets: ');
 
@@ -23,7 +23,7 @@ function createSecrets () {
       {secret:"domain registration pw: apple3"}
     ]
 
-    _.each(secrets, function (secret) {
+    secrets.forEach(function (secret) {
       console.log(secret)
 
       Meteor.secrets.insert(secret);
diff --git a/examples/flow-router/client/layouts.js b/examples/flow-router/client/layouts.js
index 6e66fc6f02..f77746b83a 100644
--- a/examples/flow-router/client/layouts.js
+++ b/examples/flow-router/client/layouts.js
@@ -1,5 +1,5 @@
 Template.mainLayout.helpers({
-  notVerified: function () { 
+  notVerified: function () {
     var user = Meteor.user()
 
     return !emailVerified(user)
@@ -7,7 +7,7 @@ Template.mainLayout.helpers({
 })
 
 function emailVerified (user) {
-  return _.some(user.emails, function (email) {
+  return user.emails.some(function (email) {
     return email.verified
   })
 }
diff --git a/examples/flow-router/server/server.js b/examples/flow-router/server/server.js
index ae6a84594f..dd853ac8a2 100644
--- a/examples/flow-router/server/server.js
+++ b/examples/flow-router/server/server.js
@@ -12,7 +12,7 @@ Meteor.startup(function () {
   ////////////////////////////////////////////////////////////////////
   // Create Test Secrets
   //
-    
+
   if (Meteor.secrets.find().fetch().length === 0) {
     Meteor.secrets.insert({secret:"ec2 password: apple2"});
     Meteor.secrets.insert({secret:"domain registration pw: apple3"});
@@ -34,10 +34,10 @@ Meteor.startup(function () {
         {name:"Admin User",email:"admin@example.com",roles:['admin']}
       ];
 
-    _.each(users, function (userData) {
+    users.forEach(function (userData) {
       var id,
           user;
-      
+
       console.log(userData);
 
       id = Accounts.createUser({
@@ -49,12 +49,12 @@ Meteor.startup(function () {
       // email verification
       Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
 
-      _.each(userData.roles, function (role) {
+      userData.roles.forEach(function (role) {
         Roles.createRole(role, {unlessExists: true});
       });
 
       Roles.addUsersToRoles(id, userData.roles);
-    
+
     });
   }
 
@@ -102,7 +102,7 @@ Meteor.publish("users", function () {
   if (Roles.userIsInRole(user, ["admin","manage-users"])) {
     console.log('publishing users', this.userId);
     return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
-  } 
+  }
 
   this.stop();
   return;
diff --git a/examples/iron-router/client/routing.js b/examples/iron-router/client/routing.js
index 71beb41894..8b9b72b4ab 100644
--- a/examples/iron-router/client/routing.js
+++ b/examples/iron-router/client/routing.js
@@ -11,7 +11,7 @@ Meteor.navigateTo = function (path) {
 }
 
 function emailVerified (user) {
-  return _.some(user.emails, function (email) {
+  return user.emails.some(function (email) {
     return email.verified
   })
 }
@@ -19,7 +19,7 @@ function emailVerified (user) {
 var filters = {
 
   /**
-   * ensure user is logged in and 
+   * ensure user is logged in and
    * email verified
    */
   authenticate: function () {
diff --git a/examples/iron-router/server/server.js b/examples/iron-router/server/server.js
index ae6a84594f..8df5daa892 100644
--- a/examples/iron-router/server/server.js
+++ b/examples/iron-router/server/server.js
@@ -12,7 +12,7 @@ Meteor.startup(function () {
   ////////////////////////////////////////////////////////////////////
   // Create Test Secrets
   //
-    
+
   if (Meteor.secrets.find().fetch().length === 0) {
     Meteor.secrets.insert({secret:"ec2 password: apple2"});
     Meteor.secrets.insert({secret:"domain registration pw: apple3"});
@@ -34,10 +34,10 @@ Meteor.startup(function () {
         {name:"Admin User",email:"admin@example.com",roles:['admin']}
       ];
 
-    _.each(users, function (userData) {
+      users.forEach(function (userData) {
       var id,
           user;
-      
+
       console.log(userData);
 
       id = Accounts.createUser({
@@ -49,12 +49,12 @@ Meteor.startup(function () {
       // email verification
       Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
 
-      _.each(userData.roles, function (role) {
+      userData.roles.forEach(function (role) {
         Roles.createRole(role, {unlessExists: true});
       });
 
       Roles.addUsersToRoles(id, userData.roles);
-    
+
     });
   }
 
@@ -102,7 +102,7 @@ Meteor.publish("users", function () {
   if (Roles.userIsInRole(user, ["admin","manage-users"])) {
     console.log('publishing users', this.userId);
     return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
-  } 
+  }
 
   this.stop();
   return;
diff --git a/package.js b/package.js
index d34bdc60dc..5379777179 100644
--- a/package.js
+++ b/package.js
@@ -8,10 +8,9 @@ Package.describe({
 Package.onUse(function (api) {
   var both = ['client', 'server'];
 
-  api.versionsFrom("METEOR@1.4.1");
+  api.versionsFrom("METEOR@1.6");
 
-  api.use(['underscore',
-           'accounts-base',
+  api.use(['accounts-base',
            'tracker',
            'mongo',
            'check'], both);
@@ -28,7 +27,7 @@ Package.onUse(function (api) {
 });
 
 Package.onTest(function (api) {
-  api.versionsFrom("METEOR@1.4.1");
+  api.versionsFrom("METEOR@1.6");
 
   var both = ['client', 'server'];
 
@@ -36,7 +35,7 @@ Package.onTest(function (api) {
 
   api.use(['alanning:roles',
            'accounts-password',
-           'underscore',
+           'mongo',
            'tinytest'], both);
 
   api.addFiles('roles/tests/client.js', 'client');
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 523f98a981..d9084b0c93 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -16,7 +16,7 @@
 //
 // Use a semi-private variable rather than declaring UI
 // helpers directly so that we can unit test the helpers.
-// XXX For some reason, the UI helpers are not registered 
+// XXX For some reason, the UI helpers are not registered
 // before the tests run.
 //
 Roles._uiHelpers = {
@@ -40,7 +40,7 @@ Roles._uiHelpers = {
    * @param {String} [scope] Optional, name of scope to check.
    * @return {Boolean} `true` if current user is in at least one of the target roles.
    * @static
-   * @for UIHelpers 
+   * @for UIHelpers
    */
   isInRole: function (role, scope) {
     var user = Meteor.user(),
@@ -51,7 +51,7 @@ Roles._uiHelpers = {
     if (!Match.test(role, String)) return false
 
     if (comma !== -1) {
-      roles = _.reduce(role.split(','), function (memo, r) {
+      roles = role.split(',').reduce(function (memo, r) {
         if (!r || !Roles._trim(r)) {
           return memo
         }
@@ -83,10 +83,10 @@ if (Roles.debug && console.log) {
 if ('undefined' !== typeof Package.blaze &&
     'undefined' !== typeof Package.blaze.Blaze &&
     'function'  === typeof Package.blaze.Blaze.registerHelper) {
-  _.each(Roles._uiHelpers, function (func, name) {
+  Object.entries(Roles._uiHelpers).forEach(([name, func]) => {
     if (Roles.debug && console.log) {
       console.log("[roles] registering Blaze helper '" + name + "'")
     }
-    Package.blaze.Blaze.registerHelper(name, func) 
+    Package.blaze.Blaze.registerHelper(name, func)
   })
 }
diff --git a/roles/roles_common.js b/roles/roles_common.js
index f1814ec877..a3e740095f 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -37,7 +37,7 @@ if ('undefined' === typeof Roles) {
 
 var getGroupsForUserDeprecationWarning = false;
 
-_.extend(Roles, {
+Object.assign(Roles, {
 
   /**
    * Used as a global group (now scope) name. Not used anymore.
@@ -65,9 +65,9 @@ _.extend(Roles, {
 
     Roles._checkRoleName(roleName);
 
-    options = _.defaults(options, {
+    options = Object.assign({
       unlessExists: false
-    });
+    }, options);
 
     var result = Meteor.roles.upsert({_id: roleName}, {$setOnInsert: {children: []}});
 
@@ -111,11 +111,11 @@ _.extend(Roles, {
           roles: 1
         }
       }
-    }).forEach(function (user, index, cursor) {
+    }).fetch().forEach(function (user, index, cursor) {
       // role can be assigned multiple times to the user, for multiple scopes
       // we have to remove the role for each of those scopes
-      roles = _.filter(user.roles, Roles._roleMatcher(roleName));
-      _.each(roles, function (role) {
+      roles = user.roles.filter(Roles._roleMatcher(roleName));
+      roles.forEach(function (role) {
         Roles._removeUserFromRole(user, roleName, {
           scope: role.scope,
           // we want to remove the role in any case
@@ -202,9 +202,9 @@ _.extend(Roles, {
    */
   addRolesToParent: function (rolesNames, parentName) {
     // ensure arrays
-    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
 
-    _.each(rolesNames, function (roleName) {
+    rolesNames.forEach(function (roleName) {
       Roles._addRoleToParent(roleName, parentName);
     });
   },
@@ -236,22 +236,21 @@ _.extend(Roles, {
     }
 
     // detect cycles
-    alreadyCheckedRoles = [];
-    rolesToCheck = _.pluck(role.children, '_id');
-    while (rolesToCheck.length) {
-      checkRoleName = rolesToCheck.pop();
+    alreadyCheckedRoles = new Set();
+    rolesToCheck = new Set(role.children.map(r => r._id));
+    rolesToCheck.forEach(checkRoleName => {
       if (checkRoleName === parentName) {
         throw new Error("Roles '" + roleName + "' and '" + parentName + "' would form a cycle.");
       }
-      alreadyCheckedRoles.push(checkRoleName);
+
+      alreadyCheckedRoles.add(checkRoleName);
 
       checkRole = Meteor.roles.findOne({_id: checkRoleName});
 
-      // This should not happen, but this is a problem to address at some other time.
-      if (!checkRole) continue;
-
-      rolesToCheck = _.union(rolesToCheck, _.difference(_.pluck(checkRole.children, '_id'), alreadyCheckedRoles));
-    }
+      if (checkRole) {
+        checkRole.children.map(r => r._id).filter(r => !alreadyCheckedRoles.has(r)).forEach(r => rolesToCheck.add(r));
+      }
+    })
 
     count = Meteor.roles.update({
       _id: parentName,
@@ -278,11 +277,11 @@ _.extend(Roles, {
           roles: 1
         }
       }
-    }).forEach(function (user, index, cursor) {
+    }).fetch().forEach(function (user, index, cursor) {
       // parent role can be assigned multiple times to the user, for multiple scopes
       // we have to assign a new subrole for each of those scopes
-      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
-      _.each(parentRoles, function (parentRole) {
+      parentRoles = user.roles.filter(Roles._roleMatcher(parentName));
+      parentRoles.forEach(function (parentRole) {
         Roles._addUserToRole(user, roleName, {
           scope: parentRole.scope,
           // we are assigning a subrole, so we set it as unassigned,
@@ -306,9 +305,9 @@ _.extend(Roles, {
    */
   removeRolesFromParent: function (rolesNames, parentName) {
     // ensure arrays
-    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
 
-    _.each(rolesNames, function (roleName) {
+    rolesNames.forEach(function (roleName) {
       Roles._removeRoleFromParent(roleName, parentName);
     });
   },
@@ -358,11 +357,11 @@ _.extend(Roles, {
           roles: 1
         }
       }
-    }).forEach(function (user, index, cursor) {
+    }).fetch().forEach(function (user, index, cursor) {
       // parent role can be assigned multiple times to the user, for multiple scopes
       // we have to remove the subrole for each of those scopes
-      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
-      _.each(parentRoles, function (parentRole) {
+      parentRoles = user.roles.filter(Roles._roleMatcher(parentName));
+      parentRoles.forEach(function (parentRole) {
         Roles._removeUserFromRole(user, roleName, {
           scope: parentRole.scope,
           // but we want to remove it only if it was not also explicitly assigned
@@ -403,22 +402,22 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
+    options = Object.assign({
       ifExists: false,
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only add users to an assigned role
       // should the role be set as assigned, default is `true`; `null` is the same as `false`,
       // only that it does not force the value to `false` if the role is already assigned
       _assigned: true
-    });
+    }, options);
 
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
+    users.forEach(function (user) {
+      roles.forEach(function (role) {
         Roles._addUserToRole(user, role, options);
       });
     });
@@ -454,22 +453,22 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
+    options = Object.assign({
       ifExists: false,
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only add users to an assigned role
       // should the role be set as assigned, default is `true`; `null` is the same as `false`,
       // only that it does not force the value to `false` if the role is already assigned
       _assigned: true
-    });
+    }, options);
 
-    _.each(users, function (user) {
-      if (_.isObject(user)) {
+    users.forEach(function (user) {
+      if (typeof user === 'object') {
         id = user._id;
       }
       else {
@@ -479,7 +478,7 @@ _.extend(Roles, {
       Meteor.users.update(id, {$pull: {roles: {scope: options.scope}}});
 
       // and then add all
-      _.each(roles, function (role) {
+      roles.forEach(function (role) {
         Roles._addUserToRole(user, role, options);
       });
     });
@@ -511,7 +510,7 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkScopeName(options.scope);
 
-    if (_.isObject(user)) {
+    if (typeof user === 'object') {
       id = user._id;
     }
     else {
@@ -597,9 +596,9 @@ _.extend(Roles, {
       scope: options.scope
     }];
 
-    _.each(role.children, function (child) {
+    role.children.forEach(function (child) {
       // subroles are set as unassigned, but only if they do not already exist
-      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, _.extend({}, options, {_assigned: null})));
+      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, Object.assign({}, options, {_assigned: null})));
     });
 
     return setRoles;
@@ -629,21 +628,23 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
+    options = Object.assign({
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only remove users from an assigned role
       // when should the role be removed, default is `true` which means only when it is assigned,
       // `false` means when it is not assigned, and `null` means always
       _assigned: true
-    });
+    }, options);
 
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
+    users.forEach(function (user) {
+      if (!user) return;
+
+      roles.forEach(function (role) {
         Roles._removeUserFromRole(user, role, options);
       });
 
@@ -681,7 +682,7 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkScopeName(options.scope);
 
-    if (_.isObject(user)) {
+    if (typeof user === 'object') {
       id = user._id;
     }
     else {
@@ -714,9 +715,9 @@ _.extend(Roles, {
     // role does not exist, we do not anything more
     if (!role) return;
 
-    _.each(role.children, function (child) {
+    role.children.forEach(function (child) {
       // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child._id, _.extend({}, options, {_assigned: false}));
+      Roles._removeUserFromRole(user, child._id, Object.assign({}, options, {_assigned: false}));
     });
   },
 
@@ -742,10 +743,10 @@ _.extend(Roles, {
     user = Roles._resolveUser(user, true);
 
     // only assigned roles
-    roles = _.filter(user.roles, Roles._onlyAssignedMatcher());
+    roles = user.roles.filter(Roles._onlyAssignedMatcher());
 
     setRoles = [];
-    _.each(roles, function (role) {
+    roles.forEach(function (role) {
       setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
         scope: role.scope,
         _assigned: role.assigned, // this is true
@@ -758,7 +759,7 @@ _.extend(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.map(setRoles, function (role) {return _.pick(role, '_id', 'scope')})
+            $nor: setRoles.map(function (role) { return {_id: role._id, scope: role.scope } })
           }
         }
       });
@@ -804,26 +805,27 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure array to simplify code
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(roles)) roles = [roles];
 
     if (!roles.length) return false;
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
+    options = Object.assign({
       anyScope: false
-    });
+    }, options);
 
     if (!user) return false;
 
-    if (_.isObject(user)) {
-      if (_.has(user, 'roles')) {
-        return _.some(roles, function (role) {
+    if (typeof user === 'object') {
+      if ('roles' in user) {
+        return roles.some(function (role) {
+          const roles = user.roles || [];
           if (options.anyScope) {
-            return _.some(user.roles || [], Roles._roleMatcher(role));
+            return roles.some(Roles._roleMatcher(role));
           }
           else {
-            return _.some(user.roles || [], Roles._roleAndScopeMatcher(role, options.scope));
+            return roles.some(Roles._roleAndScopeMatcher(role, options.scope));
           }
         })
       } else {
@@ -888,32 +890,30 @@ _.extend(Roles, {
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
+    options = Object.assign({
       fullObjects: false,
       onlyAssigned: false,
       anyScope: false
-    });
+    }, options);
 
     user = Roles._resolveUser(user);
 
     if (!user) return [];
 
-    if (options.anyScope) {
-      roles = user.roles || [];
-    }
-    else {
-      roles = _.filter(user.roles || [], Roles._scopeMatcher(options.scope));
+    roles = user.roles || [];
+    if (!options.anyScope) {
+      roles = roles.filter(Roles._scopeMatcher(options.scope));
     }
 
     if (options.onlyAssigned) {
-      roles = _.filter(roles, Roles._onlyAssignedMatcher());
+      roles = roles.filter(Roles._onlyAssignedMatcher());
     }
 
     if (options.fullObjects) {
       return roles;
     }
 
-    return _.uniq(_.pluck(roles, '_id'));
+    return [...new Set(roles.map(r => r._id))];
   },
 
   /**
@@ -988,14 +988,14 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure array to simplify code
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(roles)) roles = [roles];
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
+    options = Object.assign({
       queryOptions: queryOptions || {},
       anyScope: false
-    });
+    }, options);
 
     if (options.anyScope) {
       query = {
@@ -1058,22 +1058,22 @@ _.extend(Roles, {
     var scopes;
 
     // ensure array to simplify code
-    if (roles && !_.isArray(roles)) roles = [roles];
+    if (roles && !Array.isArray(roles)) roles = [roles];
 
     user = Roles._resolveUser(user);
 
     if (!user) return [];
 
     scopes = [];
-    _.each(user.roles || [], function (userRole) {
+    (user.roles || []).forEach(function (userRole) {
       // == used on purpose.
       if (userRole.scope == null) return;
-      if (roles && !_.contains(roles, userRole._id)) return;
+      if (roles && !roles.includes(userRole._id)) return;
 
       scopes.push(userRole.scope);
     });
 
-    return _.uniq(scopes);
+    return [...new Set(scopes)];
   },
 
   /**
@@ -1143,11 +1143,13 @@ _.extend(Roles, {
    */
   _resolveUser: function (user, force) {
     // TODO: We could use $elemMatch to limit returned fields here.
-    if (!_.isObject(user)) {
+    if (!user) {
+      return null;
+    } else if (typeof user !== 'object') {
       user = Meteor.users.findOne(
                {_id: user},
                {fields: {roles: 1}});
-    } else if (force || !_.has(user, 'roles')) {
+    } else if (force || !('roles' in user)) {
       user = Meteor.users.findOne(
                {_id: user._id},
                {fields: {roles: 1}});
@@ -1183,7 +1185,7 @@ _.extend(Roles, {
     return function (userRole) {
       // == used on purpose in "userRole.scope == null"
       return (userRole._id === roleName && userRole.scope === scope) ||
-        (userRole._id === roleName && (!_.has(userRole, 'scope') || userRole.scope == null));
+        (userRole._id === roleName && (!('scope' in userRole) || userRole.scope == null));
     };
   },
 
@@ -1199,7 +1201,7 @@ _.extend(Roles, {
     return function (userRole) {
       // == used on purpose in "userRole.scope == null"
       return (userRole.scope === scope) ||
-        (!_.has(userRole, 'scope') || userRole.scope == null);
+        (!('scope' in userRole) || userRole.scope == null);
     };
   },
 
@@ -1225,7 +1227,7 @@ _.extend(Roles, {
    * @static
    */
   _checkRoleName: function (roleName) {
-    if (!roleName || !_.isString(roleName) || Roles._trim(roleName) !== roleName) {
+    if (!roleName || typeof roleName !== 'string' || Roles._trim(roleName) !== roleName) {
       throw new Error("Invalid role name '" + roleName + "'.");
     }
   },
@@ -1240,9 +1242,9 @@ _.extend(Roles, {
    * @static
    */
   _normalizeOptions: function (options) {
-    options = _.isUndefined(options) ? {} : options;
+    options = options === undefined ? {} : options;
 
-    if (options === null || _.isString(options)) {
+    if (options === null || typeof options === 'string') {
       options = {scope: options};
     }
 
@@ -1281,7 +1283,7 @@ _.extend(Roles, {
   _checkScopeName: function (scopeName) {
     if (scopeName === null) return;
 
-    if (!scopeName || !_.isString(scopeName) || Roles._trim(scopeName) !== scopeName) {
+    if (!scopeName || typeof scopeName !== 'string' || Roles._trim(scopeName) !== scopeName) {
       throw new Error("Invalid scope name '" + scopeName + "'.");
     }
   },
@@ -1300,7 +1302,6 @@ _.extend(Roles, {
       return string.replace(/^\s+|\s+$/g, '');
     }
   }
-
-});  // end _.extend(Roles ...)
+});
 
 }());
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 72fd9411be..a4b2e8277a 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -23,7 +23,7 @@ Meteor.publish('_roles', function () {
                            {fields: fields});
 });
 
-_.extend(Roles, {
+Object.assign(Roles, {
   /**
    * @method _isNewRole
    * @param {Object} role `Meteor.roles` document.
@@ -34,7 +34,7 @@ _.extend(Roles, {
    * @static
    */
   _isNewRole: function (role) {
-    return !_.has(role, 'name') && _.has(role, 'children');
+    return !('name' in role) && 'children' in role;
   },
 
   /**
@@ -47,7 +47,7 @@ _.extend(Roles, {
    * @static
    */
   _isOldRole: function (role) {
-    return _.has(role, 'name') && !_.has(role, 'children');
+    return 'name' in role && !('children' in role);
   },
 
   /**
@@ -60,7 +60,7 @@ _.extend(Roles, {
    * @static
    */
   _isNewField: function (roles) {
-    return _.isArray(roles) && _.isObject(roles[0]);
+    return Array.isArray(roles) && (typeof roles[0] === 'object');
   },
 
   /**
@@ -73,7 +73,7 @@ _.extend(Roles, {
    * @static
    */
   _isOldField: function (roles) {
-    return (_.isArray(roles) && _.isString(roles[0])) || (_.isObject(roles) && !_.isArray(roles));
+    return (Array.isArray(roles) && (typeof roles[0] === 'string')) || ((typeof roles === 'object') && !Array.isArray(roles));
   },
 
   /**
@@ -85,7 +85,7 @@ _.extend(Roles, {
    * @static
    */
   _convertToNewRole: function (oldRole) {
-    if (!_.isString(oldRole.name)) throw new Error("Role name '" + oldRole.name + "' is not a string.");
+    if (!(typeof oldRole.name === 'string')) throw new Error("Role name '" + oldRole.name + "' is not a string.");
 
     return {
       _id: oldRole.name,
@@ -102,7 +102,7 @@ _.extend(Roles, {
    * @static
    */
   _convertToOldRole: function (newRole) {
-    if (!_.isString(newRole._id)) throw new Error("Role name '" + newRole._id + "' is not a string.");
+    if (!(typeof newRole._id === 'string')) throw new Error("Role name '" + newRole._id + "' is not a string.");
 
     return {
       name: newRole._id
@@ -120,9 +120,9 @@ _.extend(Roles, {
    */
   _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
     var roles = [];
-    if (_.isArray(oldRoles)) {
-      _.each(oldRoles, function (role, index) {
-        if (!_.isString(role)) throw new Error("Role '" + role + "' is not a string.");
+    if (Array.isArray(oldRoles)) {
+      oldRoles.forEach(function (role, index) {
+        if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.");
 
         roles.push({
           _id: role,
@@ -131,8 +131,8 @@ _.extend(Roles, {
         })
       });
     }
-    else if (_.isObject(oldRoles)) {
-      _.each(oldRoles, function (rolesArray, group) {
+    else if (typeof oldRoles === 'object') {
+      Object.entries(oldRoles).forEach(([group, rolesArray]) => {
         if (group === '__global_roles__') {
           group = null;
         }
@@ -141,8 +141,8 @@ _.extend(Roles, {
           group = group.replace(/_/g, '.');
         }
 
-        _.each(rolesArray, function (role, index) {
-          if (!_.isString(role)) throw new Error("Role '" + role + "' is not a string.");
+        rolesArray.forEach(function (role) {
+          if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.");
 
           roles.push({
             _id: role,
@@ -174,8 +174,8 @@ _.extend(Roles, {
       roles = [];
     }
 
-    _.each(newRoles, function (userRole, index) {
-      if (!_.isObject(userRole)) throw new Error("Role '" + userRole + "' is not an object.");
+    newRoles.forEach(function (userRole) {
+      if (!(typeof userRole === 'object')) throw new Error("Role '" + userRole + "' is not an object.");
 
       // We assume that we are converting back a failed migration, so values can only be
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 34444d0b4e..6c6e8027c3 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -48,8 +48,8 @@
     var user = users[username];
 
     // test using user object rather than userId to avoid mocking
-    _.each(roles, function (role) {
-      var expected = _.contains(expectedRoles, role),
+    roles.forEach(function (role) {
+      var expected = expectedRoles.includes(role),
           msg = username + ' expected to have \'' + role + '\' permission but does not',
           nmsg = username + ' had un-expected permission ' + role;
 
@@ -68,7 +68,7 @@
   };
 
   Tinytest.add(
-    'roles - can check current users roles via template helper', 
+    'roles - can check current users roles via template helper',
     function (test) {
       var isInRole,
           expected,
@@ -86,7 +86,7 @@
       expected = true;
       actual = isInRole('admin, editor');
       test.equal(actual, expected);
-      
+
       expected = true;
       actual = isInRole('admin');
       test.equal(actual, expected);
@@ -97,20 +97,20 @@
     });
 
   Tinytest.add(
-    'roles - can check if user is in role', 
+    'roles - can check if user is in role',
     function (test) {
       testUser(test, 'eve', ['admin', 'editor']);
     });
 
   Tinytest.add(
-    'roles - can check if user is in role by group', 
+    'roles - can check if user is in role by group',
     function (test) {
       testUser(test, 'bob', ['user'], 'group1');
       testUser(test, 'bob', ['editor'], 'group2');
     });
 
   Tinytest.add(
-    'roles - can check if user is in role with Roles.GLOBAL_GROUP', 
+    'roles - can check if user is in role with Roles.GLOBAL_GROUP',
     function (test) {
       testUser(test, 'joe', ['admin']);
       testUser(test, 'joe', ['admin'], Roles.GLOBAL_GROUP);
diff --git a/roles/tests/server.js b/roles/tests/server.js
index e6f6f58219..557667d5f2 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -26,7 +26,7 @@
   function testUser (test, username, expectedRoles, scope) {
     var userId = users[username],
         userObj = Meteor.users.findOne({_id: userId});
-        
+
     // check using user ids (makes db calls)
     _innerTest(test, userId, username, expectedRoles, scope);
 
@@ -36,8 +36,8 @@
 
   function _innerTest (test, userParam, username, expectedRoles, scope) {
     // test that user has only the roles expected and no others
-    _.each(roles, function (role) {
-      var expected = _.contains(expectedRoles, role),
+    roles.forEach(function (role) {
+      var expected = expectedRoles.includes(role),
           msg = username + ' expected to have \'' + role + '\' role but does not',
           nmsg = username + ' had the following un-expected role: ' + role;
 
@@ -49,18 +49,42 @@
     })
   }
 
+  var deepEqual = function (x, y) {
+    if (x === y) {
+      return true;
+    }
+    else if ((typeof x == "object" && x != null) && (typeof y == "object" && y != null)) {
+      if (Object.keys(x).length != Object.keys(y).length)
+        return false;
+
+      for (var prop in x) {
+        if (y.hasOwnProperty(prop))
+        {
+          if (! deepEqual(x[prop], y[prop]))
+            return false;
+        }
+        else
+          return false;
+      }
+
+      return true;
+    }
+    else
+      return false;
+  }
+
   function itemsEqual (test, actual, expected) {
     actual = actual || [];
     expected = expected || [];
 
-    function intersectionObjects(/*args*/) {
+    function intersectionObjects(...args) {
       var array, rest;
-      array = arguments[0];
-      rest = 2 <= arguments.length ? _.toArray(arguments).slice(1) : [];
-      return _.filter(_.uniq(array), function (item) {
-        return _.every(rest, function (other) {
-          return _.any(other, function (element) {
-            return _.isEqual(element, item);
+      array = args[0];
+      rest = 2 <= args.length ? args.slice(1) : [];
+      return [...new Set(array)].filter(function (item) {
+        return rest.every(function (other) {
+          return other.some(function (element) {
+            return deepEqual(element, item);
           });
         });
       });
@@ -79,7 +103,7 @@
   }
 
   Tinytest.add(
-    'roles - can create and delete roles', 
+    'roles - can create and delete roles',
     function (test) {
       reset();
 
@@ -101,7 +125,7 @@
     });
 
   Tinytest.add(
-    'roles - can\'t create duplicate roles', 
+    'roles - can\'t create duplicate roles',
     function (test) {
       reset();
 
@@ -111,7 +135,7 @@
     });
 
   Tinytest.add(
-    'roles - can\'t create role with empty names', 
+    'roles - can\'t create role with empty names',
     function (test) {
       reset();
 
@@ -161,7 +185,7 @@
     });
 
   Tinytest.add(
-    'roles - can check if user is in role', 
+    'roles - can check if user is in role',
     function (test) {
       reset();
 
@@ -309,7 +333,7 @@
     });
 
   Tinytest.add(
-    'roles - can check if non-existant user is in role', 
+    'roles - can check if non-existant user is in role',
     function (test) {
       reset();
 
@@ -317,16 +341,16 @@
     });
 
   Tinytest.add(
-    'roles - can check if null user is in role', 
+    'roles - can check if null user is in role',
     function (test) {
       var user = null;
       reset();
-      
+
       test.isFalse(Roles.userIsInRole(user, 'admin'));
     });
 
   Tinytest.add(
-    'roles - can check user against several roles at once', 
+    'roles - can check user against several roles at once',
     function (test) {
       var user;
       reset();
@@ -342,7 +366,7 @@
     });
 
   Tinytest.add(
-    'roles - can\'t add non-existent user to role', 
+    'roles - can\'t add non-existent user to role',
     function (test) {
       reset();
 
@@ -386,7 +410,7 @@
     });
 
   Tinytest.add(
-    'roles - can add individual users to roles', 
+    'roles - can add individual users to roles',
     function (test) {
       reset();
 
@@ -439,7 +463,7 @@
     });
 
   Tinytest.add(
-    'roles - can add user to roles via user object', 
+    'roles - can add user to roles via user object',
     function (test) {
       reset();
 
@@ -464,7 +488,7 @@
     });
 
   Tinytest.add(
-    'roles - can add user to roles multiple times', 
+    'roles - can add user to roles multiple times',
     function (test) {
       reset();
 
@@ -512,7 +536,7 @@
     });
 
   Tinytest.add(
-    'roles - can add multiple users to roles', 
+    'roles - can add multiple users to roles',
     function (test) {
       reset();
 
@@ -565,7 +589,7 @@
     });
 
   Tinytest.add(
-    'roles - can remove individual users from roles', 
+    'roles - can remove individual users from roles',
     function (test) {
       reset();
 
@@ -603,7 +627,7 @@
     });
 
   Tinytest.add(
-    'roles - can remove users from roles via user object', 
+    'roles - can remove users from roles via user object',
     function (test) {
       reset();
 
@@ -612,7 +636,7 @@
 
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob});
-    
+
       // remove user role - one user
       Roles.addUsersToRoles([eve, bob], ['editor', 'user']);
       testUser(test, 'eve', ['editor', 'user']);
@@ -679,7 +703,7 @@
     });
 
   Tinytest.add(
-    'roles - can remove multiple users from roles', 
+    'roles - can remove multiple users from roles',
     function (test) {
       reset();
 
@@ -735,7 +759,7 @@
     });
 
   Tinytest.add(
-    'roles - can set user roles', 
+    'roles - can set user roles',
     function (test) {
       reset();
 
@@ -746,7 +770,7 @@
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
           joe = Meteor.users.findOne({_id: users.joe});
-    
+
       Roles.setUserRoles([users.eve, bob], ['editor', 'user']);
       testUser(test, 'eve', ['editor', 'user']);
       testUser(test, 'bob', ['editor', 'user']);
@@ -786,7 +810,7 @@
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
           joe = Meteor.users.findOne({_id: users.joe});
-    
+
       Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
       Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2');
       testUser(test, 'eve', ['editor', 'user'], 'scope1');
@@ -823,8 +847,8 @@
       testUser(test, 'bob', ['admin', 'editor'], 'scope2');
       testUser(test, 'joe', ['editor'], 'scope2');
 
-      test.isTrue(_.contains(_.pluck(Roles.getRolesForUser(users.bob, {anyScope: true, fullObjects: true}), 'scope'), 'scope1'));
-      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.joe, {anyScope: true, fullObjects: true}), 'scope'), 'scope1'));
+      test.isTrue(Roles.getRolesForUser(users.bob, {anyScope: true, fullObjects: true}).map(r => r.scope).includes('scope1'));
+      test.isFalse(Roles.getRolesForUser(users.joe, {anyScope: true, fullObjects: true}).map(r => r.scope).includes('scope1'));
 
       Roles.setUserRoles([bob, users.joe], [], 'scope1');
       testUser(test, 'eve', ['user'], 'scope1');
@@ -835,8 +859,8 @@
       testUser(test, 'joe', ['editor'], 'scope2');
 
       // When roles in a given scope are removed, we do not want any dangling database content for that scope.
-      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.bob, {anyScope: true, fullObjects: true}), 'scope'), 'scope1'));
-      test.isFalse(_.contains(_.pluck(Roles.getRolesForUser(users.joe, {anyScope: true, fullObjects: true}), 'scope'), 'scope1'));
+      test.isFalse(Roles.getRolesForUser(users.bob, {anyScope: true, fullObjects: true}).map(r => r.scope).includes('scope1'));
+      test.isFalse(Roles.getRolesForUser(users.joe, {anyScope: true, fullObjects: true}).map(r => r.scope).includes('scope1'));
     });
 
   Tinytest.add(
@@ -850,7 +874,7 @@
       var eve = Meteor.users.findOne({_id: users.eve}),
           bob = Meteor.users.findOne({_id: users.bob}),
           joe = Meteor.users.findOne({_id: users.joe});
-    
+
       Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE);
       testUser(test, 'eve', ['admin'], 'scope1');
       testUser(test, 'eve', ['admin']);
@@ -862,25 +886,25 @@
 
 
   Tinytest.add(
-    'roles - can get all roles', 
+    'roles - can get all roles',
     function (test) {
       reset();
 
-      _.each(roles, function (role) {
+      roles.forEach(function (role) {
         Roles.createRole(role);
       });
 
       // compare roles, sorted alphabetically
-      var expected = _.clone(roles),
-          actual = _.pluck(Roles.getAllRoles().fetch(), '_id');
+      var expected = roles,
+          actual = Roles.getAllRoles().fetch().map(r => r._id);
 
       test.equal(actual, expected);
 
-      test.equal(_.pluck(Roles.getAllRoles({sort: {_id: -1}}).fetch(), '_id'), expected.reverse());
+      test.equal(Roles.getAllRoles({sort: {_id: -1}}).fetch().map(r => r._id), expected.reverse());
     });
 
   Tinytest.add(
-    'roles - can\'t get roles for non-existant user', 
+    'roles - can\'t get roles for non-existant user',
     function (test) {
       reset();
       test.equal(Roles.getRolesForUser('1'), []);
@@ -888,7 +912,7 @@
     });
 
   Tinytest.add(
-    'roles - can get all roles for user', 
+    'roles - can get all roles for user',
     function (test) {
       reset();
 
@@ -1133,7 +1157,7 @@
       test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor']);
       test.equal(Roles.getRolesForUser(userObj), ['editor']);
     });
-    
+
   Tinytest.add(
     'roles - can get all scopes for user',
     function (test) {
@@ -1156,7 +1180,7 @@
       userObj = Meteor.users.findOne({_id: userId});
       test.equal(Roles.getScopesForUser(userObj), ['scope1', 'scope2']);
     });
-  
+
   Tinytest.add(
     'roles - can get all scopes for user by role',
     function (test) {
@@ -1183,7 +1207,7 @@
       test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2']);
       test.equal(Roles.getScopesForUser(userObj, 'admin'), []);
   });
-  
+
   Tinytest.add(
     'roles - getScopesForUser returns [] when not using scopes',
     function (test) {
@@ -1249,7 +1273,7 @@
       test.equal(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
       test.equal(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3']);
     });
-  
+
   Tinytest.add(
     'roles - getting all scopes for user does not include GLOBAL_SCOPE',
     function (test) {
@@ -1288,7 +1312,7 @@
 
 
   Tinytest.add(
-    'roles - can get all users in role', 
+    'roles - can get all users in role',
     function (test) {
       reset();
 
@@ -1300,7 +1324,7 @@
       Roles.addUsersToRoles([users.bob, users.joe], ['editor']);
 
       var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
+          actual = Roles.getUsersInRole('admin').fetch().map(r => r._id);
 
       itemsEqual(test, actual, expected);
     });
@@ -1317,22 +1341,22 @@
       Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2');
 
       var expected = [users.eve, users.joe],
-          actual = _.pluck(Roles.getUsersInRole('admin', 'scope1').fetch(), '_id');
+          actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id);
 
       itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin', {scope: 'scope1'}).fetch(), '_id');
+      actual = Roles.getUsersInRole('admin', {scope: 'scope1'}).fetch().map(r => r._id);
       itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin', {anyScope: true}).fetch(), '_id');
+      actual = Roles.getUsersInRole('admin', {anyScope: true}).fetch().map(r => r._id);
       itemsEqual(test, actual, expected);
 
-      actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
+      actual = Roles.getUsersInRole('admin').fetch().map(r => r._id);
       test.equal(actual, []);
     });
-  
+
   Tinytest.add(
     'roles - can get all users in role by scope including Roles.GLOBAL_SCOPE',
     function (test) {
@@ -1345,22 +1369,22 @@
       Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2');
 
       var expected = [users.eve],
-          actual = _.pluck(Roles.getUsersInRole('admin', 'scope1').fetch(), '_id');
+          actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id);
 
       itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin', 'scope2').fetch(), '_id');
+      actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id);
 
       itemsEqual(test, actual, expected);
 
       expected = [users.eve];
-      actual = _.pluck(Roles.getUsersInRole('admin').fetch(), '_id');
+      actual = Roles.getUsersInRole('admin').fetch().map(r => r._id);
 
       itemsEqual(test, actual, expected);
 
       expected = [users.eve, users.bob, users.joe];
-      actual = _.pluck(Roles.getUsersInRole('admin', {anyScope: true}).fetch(), '_id');
+      actual = Roles.getUsersInRole('admin', {anyScope: true}).fetch().map(r => r._id);
 
       itemsEqual(test, actual, expected);
     });
@@ -1436,7 +1460,7 @@
       testUser(test, 'bob', ['admin'], 'scope2');
       testUser(test, 'bob', ['admin'], 'scope1');
     });
-  
+
   Tinytest.add(
     'roles - Roles.GLOBAL_SCOPE also checked when scope not specified',
     function (test) {

From 7653119c2cdac387a6b3ab7b9a5d6a83e6c9a95d Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Mon, 21 Jan 2019 14:34:53 +0400
Subject: [PATCH 0270/1140] Removed docs-folder and added npm dev-dependency on
 yuidocjs

---
 .gitignore                                    |    4 +-
 docs/api.js                                   |   25 -
 docs/assets/css/external-small.png            |  Bin 491 -> 0 bytes
 docs/assets/css/logo.png                      |  Bin 7143 -> 0 bytes
 docs/assets/css/main.css                      |  783 ----
 docs/assets/favicon.ico                       |  Bin 5430 -> 0 bytes
 docs/assets/img/spinner.gif                   |  Bin 2685 -> 0 bytes
 docs/assets/index.html                        |   10 -
 docs/assets/js/api-filter.js                  |   56 -
 docs/assets/js/api-list.js                    |  255 --
 docs/assets/js/api-search.js                  |   98 -
 docs/assets/js/apidocs.js                     |  376 --
 docs/assets/js/yui-prettify.js                |   17 -
 docs/assets/vendor/prettify/CHANGES.html      |  130 -
 docs/assets/vendor/prettify/COPYING           |  202 -
 docs/assets/vendor/prettify/README.html       |  203 -
 docs/assets/vendor/prettify/prettify-min.css  |    1 -
 docs/assets/vendor/prettify/prettify-min.js   |    1 -
 docs/classes/Roles.html                       | 3779 -----------------
 docs/classes/UIHelpers.html                   |  246 --
 docs/classes/index.html                       |   10 -
 docs/data.json                                | 1260 ------
 docs/elements/index.html                      |   10 -
 docs/files/index.html                         |   10 -
 docs/files/roles_client_subscriptions.js.html |  122 -
 docs/files/roles_client_uiHelpers.js.html     |  196 -
 docs/files/roles_roles_common.js.html         | 1410 ------
 docs/files/roles_roles_server.js.html         |  423 --
 docs/index.html                               |  118 -
 docs/modules/Roles.html                       |  150 -
 docs/modules/UIHelpers.html                   |  134 -
 docs/modules/index.html                       |   10 -
 package-lock.json                             |  728 ++++
 package.json                                  |    5 +
 34 files changed, 736 insertions(+), 10036 deletions(-)
 delete mode 100644 docs/api.js
 delete mode 100644 docs/assets/css/external-small.png
 delete mode 100644 docs/assets/css/logo.png
 delete mode 100644 docs/assets/css/main.css
 delete mode 100644 docs/assets/favicon.ico
 delete mode 100644 docs/assets/img/spinner.gif
 delete mode 100644 docs/assets/index.html
 delete mode 100644 docs/assets/js/api-filter.js
 delete mode 100644 docs/assets/js/api-list.js
 delete mode 100644 docs/assets/js/api-search.js
 delete mode 100644 docs/assets/js/apidocs.js
 delete mode 100644 docs/assets/js/yui-prettify.js
 delete mode 100644 docs/assets/vendor/prettify/CHANGES.html
 delete mode 100644 docs/assets/vendor/prettify/COPYING
 delete mode 100644 docs/assets/vendor/prettify/README.html
 delete mode 100644 docs/assets/vendor/prettify/prettify-min.css
 delete mode 100644 docs/assets/vendor/prettify/prettify-min.js
 delete mode 100644 docs/classes/Roles.html
 delete mode 100644 docs/classes/UIHelpers.html
 delete mode 100644 docs/classes/index.html
 delete mode 100644 docs/data.json
 delete mode 100644 docs/elements/index.html
 delete mode 100644 docs/files/index.html
 delete mode 100644 docs/files/roles_client_subscriptions.js.html
 delete mode 100644 docs/files/roles_client_uiHelpers.js.html
 delete mode 100644 docs/files/roles_roles_common.js.html
 delete mode 100644 docs/files/roles_roles_server.js.html
 delete mode 100644 docs/index.html
 delete mode 100644 docs/modules/Roles.html
 delete mode 100644 docs/modules/UIHelpers.html
 delete mode 100644 docs/modules/index.html
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
index 10aed3dc96..627a5c1ae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,6 @@ results
 npm-debug.log
 smart.lock
 
-.idea
\ No newline at end of file
+.idea
+docs/
+node_modules/
\ No newline at end of file
diff --git a/docs/api.js b/docs/api.js
deleted file mode 100644
index 89f4eb93a7..0000000000
--- a/docs/api.js
+++ /dev/null
@@ -1,25 +0,0 @@
-YUI.add("yuidoc-meta", function(Y) {
-   Y.YUIDoc = { meta: {
-    "classes": [
-        "Roles",
-        "UIHelpers"
-    ],
-    "modules": [
-        "Roles",
-        "UIHelpers"
-    ],
-    "allModules": [
-        {
-            "displayName": "Roles",
-            "name": "Roles",
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `_id`: role name\n - `scope`: scope name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"admin\", children: [{_id: \"editor\"}]}`"
-        },
-        {
-            "displayName": "UIHelpers",
-            "name": "UIHelpers",
-            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
-        }
-    ],
-    "elements": []
-} };
-});
\ No newline at end of file
diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
deleted file mode 100644
index 759a1cdcb5b1697e5be290d98b830e279cd71f3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzjY&j7RCwBA{Qv(y10{fofkHsB0W2_v
zUBVFtR#sLp=H=xBVFzYr=KaWuf!;khr%J>Ds{zR1^XE?tfB*h@ASKHAa7wwn{MEbP
z7_^nS7{V*>+A}bS;P%45fB%Ai|Neasi2rl3{=EO;!w318%8Ovl7jArHc=P5Brfr~D
z0AYimtss2w$hlYlfd>7*aO3TNzw875LBK0xAD9Np|A(oEVYnB*eE9~V6wP%78SXuL
z&#-X)Er#`zY#Ce<cQE|@_n*NrZu>)^8hM<t@c%yx7=Qlqo#E+=&kU8xDhyfmhZ%Ci
zB^dtyV`g~#;=9AYe+-T|4Pa;I2jl<${xZmkvoM^x_?{uwM}|RLMTp_`2UZ3)Hogb%
z@2x(7(}2e(%NV%1Med)x^p}B+U4TJPLyAFJUXtPFBQCJ`lT(!p@9(X`oen;~J|q6|
z@wSPb3!@4d7=I%C`v334k56{?0OcisymvtS3)uihSYBXcWaI%-d^i%^A0P&W@^_&6
hzgP_zx|s<ezyP)2!%xqD#*+X5002ovPDHLkV1nUx>>B_8

diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
deleted file mode 100644
index c82444af95895d38bea6fe96cc5354a7419f770c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7143
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

diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
deleted file mode 100644
index cdfe209e8d..0000000000
--- a/docs/assets/css/main.css
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
-Font sizes for all selectors other than the body are given in percentages,
-with 100% equal to 13px. To calculate a font size percentage, multiply the
-desired size in pixels by 7.6923076923.
-
-Here's a quick lookup table:
-
-10px - 76.923%
-11px - 84.615%
-12px - 92.308%
-13px - 100%
-14px - 107.692%
-15px - 115.385%
-16px - 123.077%
-17px - 130.769%
-18px - 138.462%
-19px - 146.154%
-20px - 153.846%
-*/
-
-html {
-    background: #fff;
-    color: #333;
-    overflow-y: scroll;
-}
-
-body {
-    /*font: 13px/1.4 'Lucida Grande', 'Lucida Sans Unicode', 'DejaVu Sans', 'Bitstream Vera Sans', 'Helvetica', 'Arial', sans-serif;*/
-    font: 13px/1.4 'Helvetica', 'Arial', sans-serif;
-    margin: 0;
-    padding: 0;
-}
-
-/* -- Links ----------------------------------------------------------------- */
-a {
-    color: #356de4;
-    text-decoration: none;
-}
-
-.hidden {
-    display: none;
-}
-
-a:hover { text-decoration: underline; }
-
-/* "Jump to Table of Contents" link is shown to assistive tools, but hidden from
-   sight until it's focused. */
-.jump {
-    position: absolute;
-    padding: 3px 6px;
-    left: -99999px;
-    top: 0;
-}
-
-.jump:focus { left: 40%; }
-
-/* -- Paragraphs ------------------------------------------------------------ */
-p { margin: 1.3em 0; }
-dd p, td p { margin-bottom: 0; }
-dd p:first-child, td p:first-child { margin-top: 0; }
-
-/* -- Headings -------------------------------------------------------------- */
-h1, h2, h3, h4, h5, h6 {
-    color: #D98527;/*was #f80*/
-    font-family: 'Trebuchet MS', sans-serif;
-    font-weight: bold;
-    line-height: 1.1;
-    margin: 1.1em 0 0.5em;
-}
-
-h1 {
-    font-size: 184.6%;
-    color: #30418C;
-    margin: 0.75em 0 0.5em;
-}
-
-h2 {
-    font-size: 153.846%;
-    color: #E48A2B;
-}
-
-h3 { font-size: 138.462%; }
-
-h4 {
-    border-bottom: 1px solid #DBDFEA;
-    color: #E48A2B;
-    font-size: 115.385%;
-    font-weight: normal;
-    padding-bottom: 2px;
-}
-
-h5, h6 { font-size: 107.692%; }
-
-/* -- Code and examples ----------------------------------------------------- */
-code, kbd, pre, samp {
-    font-family: Menlo, Monaco, 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-    font-size: 92.308%;
-    line-height: 1.35;
-}
-
-p code, p kbd, p samp, li code {
-    background: #FCFBFA;
-    border: 1px solid #EFEEED;
-    padding: 0 3px;
-}
-
-a code, a kbd, a samp,
-pre code, pre kbd, pre samp,
-table code, table kbd, table samp,
-.intro code, .intro kbd, .intro samp,
-.toc code, .toc kbd, .toc samp {
-    background: none;
-    border: none;
-    padding: 0;
-}
-
-pre.code, pre.terminal, pre.cmd {
-    overflow-x: auto;
-    *overflow-x: scroll;
-    padding: 0.3em 0.6em;
-}
-
-pre.code {
-    background: #FCFBFA;
-    border: 1px solid #EFEEED;
-    border-left-width: 5px;
-}
-
-pre.terminal, pre.cmd {
-    background: #F0EFFC;
-    border: 1px solid #D0CBFB;
-    border-left: 5px solid #D0CBFB;
-}
-
-/* Don't reduce the font size of <code>/<kbd>/<samp> elements inside <pre>
-   blocks. */
-pre code, pre kbd, pre samp { font-size: 100%; }
-
-/* Used to denote text that shouldn't be selectable, such as line numbers or
-   shell prompts. Guess which browser this doesn't work in. */
-.noselect {
-    -moz-user-select: -moz-none;
-    -khtml-user-select: none;
-    -webkit-user-select: none;
-    -o-user-select: none;
-    user-select: none;
-}
-
-/* -- Lists ----------------------------------------------------------------- */
-dd { margin: 0.2em 0 0.7em 1em; }
-dl { margin: 1em 0; }
-dt { font-weight: bold; }
-
-/* -- Tables ---------------------------------------------------------------- */
-caption, th { text-align: left; }
-
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-
-td, th {
-    border: 1px solid #fff;
-    padding: 5px 12px;
-    vertical-align: top;
-}
-
-td { background: #E6E9F5; }
-td dl { margin: 0; }
-td dl dl { margin: 1em 0; }
-td pre:first-child { margin-top: 0; }
-
-th {
-    background: #D2D7E6;/*#97A0BF*/
-    border-bottom: none;
-    border-top: none;
-    color: #000;/*#FFF1D5*/
-    font-family: 'Trebuchet MS', sans-serif;
-    font-weight: bold;
-    line-height: 1.3;
-    white-space: nowrap;
-}
-
-
-/* -- Layout and Content ---------------------------------------------------- */
-#doc {
-    margin: auto;
-    min-width: 1024px;
-}
-
-.content { padding: 0 20px 0 25px; }
-
-.sidebar {
-    padding: 0 15px 0 10px;
-}
-#bd {
-    padding: 7px 0 130px;
-    position: relative;
-    width: 99%;
-}
-
-/* -- Table of Contents ----------------------------------------------------- */
-
-/* The #toc id refers to the single global table of contents, while the .toc
-   class refers to generic TOC lists that could be used throughout the page. */
-
-.toc code, .toc kbd, .toc samp { font-size: 100%; }
-.toc li { font-weight: bold; }
-.toc li li { font-weight: normal; }
-
-/* -- Intro and Example Boxes ----------------------------------------------- */
-/*
-.intro, .example { margin-bottom: 2em; }
-.example {
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    -moz-box-shadow: 0 0 5px #bfbfbf;
-    -webkit-box-shadow: 0 0 5px #bfbfbf;
-    box-shadow: 0 0 5px #bfbfbf;
-    padding: 1em;
-}
-.intro {
-    background: none repeat scroll 0 0 #F0F1F8; border: 1px solid #D4D8EB; padding: 0 1em;
-}
-*/
-
-/* -- Other Styles ---------------------------------------------------------- */
-
-/* These are probably YUI-specific, and should be moved out of Selleck's default
-   theme. */
-
-.button {
-    border: 1px solid #dadada;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    color: #444;
-    display: inline-block;
-    font-family: Helvetica, Arial, sans-serif;
-    font-size: 92.308%;
-    font-weight: bold;
-    padding: 4px 13px 3px;
-    -moz-text-shadow: 1px 1px 0 #fff;
-    -webkit-text-shadow: 1px 1px 0 #fff;
-    text-shadow: 1px 1px 0 #fff;
-    white-space: nowrap;
-
-    background: #EFEFEF; /* old browsers */
-    background: -moz-linear-gradient(top, #f5f5f5 0%, #efefef 50%, #e5e5e5 51%, #dfdfdf 100%); /* firefox */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(50%,#efefef), color-stop(51%,#e5e5e5), color-stop(100%,#dfdfdf)); /* webkit */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#dfdfdf',GradientType=0 ); /* ie */
-}
-
-.button:hover {
-    border-color: #466899;
-    color: #fff;
-    text-decoration: none;
-    -moz-text-shadow: 1px 1px 0 #222;
-    -webkit-text-shadow: 1px 1px 0 #222;
-    text-shadow: 1px 1px 0 #222;
-
-    background: #6396D8; /* old browsers */
-    background: -moz-linear-gradient(top, #6396D8 0%, #5A83BC 50%, #547AB7 51%, #466899 100%); /* firefox */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#6396D8), color-stop(50%,#5A83BC), color-stop(51%,#547AB7), color-stop(100%,#466899)); /* webkit */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6396D8', endColorstr='#466899',GradientType=0 ); /* ie */
-}
-
-.newwindow { text-align: center; }
-
-.header .version em {
-    display: block;
-    text-align: right;
-}
-
-
-#classdocs .item {
-    border-bottom: 1px solid #466899;
-    margin: 1em 0;
-    padding: 1.5em;
-}
-
-#classdocs .item .params p,
-    #classdocs .item .returns p,{
-    display: inline;
-}
-
-#classdocs .item em code, #classdocs .item em.comment {
-    color: green;
-}
-
-#classdocs .item em.comment a {
-    color: green;
-    text-decoration: underline;
-}
-
-#classdocs .foundat {
-    font-size: 11px;
-    font-style: normal;
-}
-
-.attrs .emits {
-    margin-left: 2em;
-    padding: .5em;
-    border-left: 1px dashed #ccc;
-}
-
-abbr {
-    border-bottom: 1px dashed #ccc;
-    font-size: 80%;
-    cursor: help;
-}
-
-.prettyprint li.L0, 
-.prettyprint li.L1, 
-.prettyprint li.L2, 
-.prettyprint li.L3, 
-.prettyprint li.L5, 
-.prettyprint li.L6, 
-.prettyprint li.L7, 
-.prettyprint li.L8 {
-    list-style: decimal;
-}
-
-ul li p {
-    margin-top: 0;
-}
-
-.method .name {
-    font-size: 110%;
-}
-
-.apidocs .methods .extends .method,
-.apidocs .properties .extends .property,
-.apidocs .attrs .extends .attr,
-.apidocs .events .extends .event {
-    font-weight: bold;
-}
-
-.apidocs .methods .extends .inherited,
-.apidocs .properties .extends .inherited,
-.apidocs .attrs .extends .inherited,
-.apidocs .events .extends .inherited {
-    font-weight: normal;
-}
-
-#hd {
-    background: whiteSmoke;
-    background: -moz-linear-gradient(top,#DCDBD9 0,#F6F5F3 100%);
-    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#DCDBD9),color-stop(100%,#F6F5F3));
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dcdbd9',endColorstr='#F6F5F3',GradientType=0);
-    border-bottom: 1px solid #DFDFDF;
-    padding: 0 15px 1px 20px;
-    margin-bottom: 15px;
-}
-
-#hd img {
-    margin-right: 10px;
-    vertical-align: middle;
-}
-
-
-/* -- API Docs CSS ---------------------------------------------------------- */
-
-/*
-This file is organized so that more generic styles are nearer the top, and more
-specific styles are nearer the bottom of the file. This allows us to take full
-advantage of the cascade to avoid redundant style rules. Please respect this
-convention when making changes.
-*/
-
-/* -- Generic TabView styles ------------------------------------------------ */
-
-/*
-These styles apply to all API doc tabviews. To change styles only for a
-specific tabview, see the other sections below.
-*/
-
-.yui3-js-enabled .apidocs .tabview {
-    visibility: hidden; /* Hide until the TabView finishes rendering. */
-    _visibility: visible;
-}
-
-.apidocs .tabview.yui3-tabview-content { visibility: visible; }
-.apidocs .tabview .yui3-tabview-panel { background: #fff; }
-
-/* -- Generic Content Styles ------------------------------------------------ */
-
-/* Headings */
-h2, h3, h4, h5, h6 {
-    border: none;
-    color: #30418C;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-.link-docs {
-    float: right;
-    font-size: 15px;
-    margin: 4px 4px 6px;
-    padding: 6px 30px 5px;
-}
-
-.apidocs { zoom: 1; }
-
-/* Generic box styles. */
-.apidocs .box {
-    border: 1px solid;
-    border-radius: 3px;
-    margin: 1em 0;
-    padding: 0 1em;
-}
-
-/* A flag is a compact, capsule-like indicator of some kind. It's used to
-   indicate private and protected items, item return types, etc. in an
-   attractive and unobtrusive way. */
-.apidocs .flag {
-    background: #bababa;
-    border-radius: 3px;
-    color: #fff;
-    font-size: 11px;
-    margin: 0 0.5em;
-    padding: 2px 4px 1px;
-}
-
-/* Class/module metadata such as "Uses", "Extends", "Defined in", etc. */
-.apidocs .meta {
-    background: #f9f9f9;
-    border-color: #efefef;
-    color: #555;
-    font-size: 11px;
-    padding: 3px 6px;
-}
-
-.apidocs .meta p { margin: 0; }
-
-/* Deprecation warning. */
-.apidocs .box.deprecated,
-.apidocs .flag.deprecated {
-    background: #fdac9f;
-    border: 1px solid #fd7775;
-}
-
-.apidocs .box.deprecated p { margin: 0.5em 0; }
-.apidocs .flag.deprecated { color: #333; }
-
-/* Module/Class intro description. */
-.apidocs .intro {
-    background: #f0f1f8;
-    border-color: #d4d8eb;
-}
-
-/* Loading spinners. */
-#bd.loading .apidocs,
-#api-list.loading .yui3-tabview-panel {
-    background: #fff url(../img/spinner.gif) no-repeat center 70px;
-    min-height: 150px;
-}
-
-#bd.loading .apidocs .content,
-#api-list.loading .yui3-tabview-panel .apis {
-    display: none;
-}
-
-.apidocs .no-visible-items { color: #666; }
-
-/* Generic inline list. */
-.apidocs ul.inline {
-    display: inline;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-.apidocs ul.inline li { display: inline; }
-
-/* Comma-separated list. */
-.apidocs ul.commas li:after { content: ','; }
-.apidocs ul.commas li:last-child:after { content: ''; }
-
-/* Keyboard shortcuts. */
-kbd .cmd { font-family: Monaco, Helvetica; }
-
-/* -- Generic Access Level styles ------------------------------------------- */
-.apidocs .item.protected,
-.apidocs .item.private,
-.apidocs .index-item.protected,
-.apidocs .index-item.deprecated,
-.apidocs .index-item.private {
-    display: none;
-}
-
-.show-deprecated .item.deprecated,
-.show-deprecated .index-item.deprecated,
-.show-protected .item.protected,
-.show-protected .index-item.protected,
-.show-private .item.private,
-.show-private .index-item.private {
-    display: block;
-}
-
-.hide-inherited .item.inherited,
-.hide-inherited .index-item.inherited {
-    display: none;
-}
-
-/* -- Generic Item Index styles --------------------------------------------- */
-.apidocs .index { margin: 1.5em 0 3em; }
-
-.apidocs .index h3 {
-    border-bottom: 1px solid #efefef;
-    color: #333;
-    font-size: 13px;
-    margin: 2em 0 0.6em;
-    padding-bottom: 2px;
-}
-
-.apidocs .index .no-visible-items { margin-top: 2em; }
-
-.apidocs .index-list {
-    border-color: #efefef;
-    font-size: 12px;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    -moz-column-count: 4;
-    -moz-column-gap: 10px;
-    -moz-column-width: 170px;
-    -ms-column-count: 4;
-    -ms-column-gap: 10px;
-    -ms-column-width: 170px;
-    -o-column-count: 4;
-    -o-column-gap: 10px;
-    -o-column-width: 170px;
-    -webkit-column-count: 4;
-    -webkit-column-gap: 10px;
-    -webkit-column-width: 170px;
-    column-count: 4;
-    column-gap: 10px;
-    column-width: 170px;
-}
-
-.apidocs .no-columns .index-list {
-    -moz-column-count: 1;
-    -ms-column-count: 1;
-    -o-column-count: 1;
-    -webkit-column-count: 1;
-    column-count: 1;
-}
-
-.apidocs .index-item { white-space: nowrap; }
-
-.apidocs .index-item .flag {
-    background: none;
-    border: none;
-    color: #afafaf;
-    display: inline;
-    margin: 0 0 0 0.2em;
-    padding: 0;
-}
-
-/* -- Generic API item styles ----------------------------------------------- */
-.apidocs .args {
-    display: inline;
-    margin: 0 0.5em;
-}
-
-.apidocs .flag.chainable { background: #46ca3b; }
-.apidocs .flag.protected { background: #9b86fc; }
-.apidocs .flag.private { background: #fd6b1b; }
-.apidocs .flag.async { background: #356de4; }
-.apidocs .flag.required { background: #e60923; }
-
-.apidocs .item {
-    border-bottom: 1px solid #efefef;
-    margin: 1.5em 0 2em;
-    padding-bottom: 2em;
-}
-
-.apidocs .item h4,
-.apidocs .item h5,
-.apidocs .item h6 {
-    color: #333;
-    font-family: inherit;
-    font-size: 100%;
-}
-
-.apidocs .item .description p,
-.apidocs .item pre.code {
-    margin: 1em 0 0;
-}
-
-.apidocs .item .meta {
-    background: none;
-    border: none;
-    padding: 0;
-}
-
-.apidocs .item .name {
-    display: inline;
-    font-size: 14px;
-}
-
-.apidocs .item .type,
-.apidocs .item .type a,
-.apidocs .returns-inline {
-    color: #555;
-}
-
-.apidocs .item .type,
-.apidocs .returns-inline {
-    font-size: 11px;
-    margin: 0 0 0 0;
-}
-
-.apidocs .item .type a { border-bottom: 1px dotted #afafaf; }
-.apidocs .item .type a:hover { border: none; }
-
-/* -- Item Parameter List --------------------------------------------------- */
-.apidocs .params-list {
-    list-style: square;
-    margin: 1em 0 0 2em;
-    padding: 0;
-}
-
-.apidocs .param { margin-bottom: 1em; }
-
-.apidocs .param .type,
-.apidocs .param .type a {
-    color: #666;
-}
-
-.apidocs .param .type {
-    margin: 0 0 0 0.5em;
-    *margin-left: 0.5em;
-}
-
-.apidocs .param-name { font-weight: bold; }
-
-/* -- Item "Emits" block ---------------------------------------------------- */
-.apidocs .item .emits {
-    background: #f9f9f9;
-    border-color: #eaeaea;
-}
-
-/* -- Item "Returns" block -------------------------------------------------- */
-.apidocs .item .returns .type,
-.apidocs .item .returns .type a {
-    font-size: 100%;
-    margin: 0;
-}
-
-/* -- Class Constructor block ----------------------------------------------- */
-.apidocs .constructor .item {
-    border: none;
-    padding-bottom: 0;
-}
-
-/* -- File Source View ------------------------------------------------------ */
-.apidocs .file pre.code,
-#doc .apidocs .file pre.prettyprint {
-    background: inherit;
-    border: none;
-    overflow: visible;
-    padding: 0;
-}
-
-.apidocs .L0,
-.apidocs .L1,
-.apidocs .L2,
-.apidocs .L3,
-.apidocs .L4,
-.apidocs .L5,
-.apidocs .L6,
-.apidocs .L7,
-.apidocs .L8,
-.apidocs .L9 {
-    background: inherit;
-}
-
-/* -- Submodule List -------------------------------------------------------- */
-.apidocs .module-submodule-description {
-    font-size: 12px;
-    margin: 0.3em 0 1em;
-}
-
-.apidocs .module-submodule-description p:first-child { margin-top: 0; }
-
-/* -- Sidebar TabView ------------------------------------------------------- */
-#api-tabview { margin-top: 0.6em; }
-
-#api-tabview-filter,
-#api-tabview-panel {
-    border: 1px solid #dfdfdf;
-}
-
-#api-tabview-filter {
-    border-bottom: none;
-    border-top: none;
-    padding: 0.6em 10px 0 10px;
-}
-
-#api-tabview-panel { border-top: none; }
-#api-filter { width: 97%; }
-
-/* -- Content TabView ------------------------------------------------------- */
-#classdocs .yui3-tabview-panel { border: none; }
-
-/* -- Source File Contents -------------------------------------------------- */
-.prettyprint li.L0,
-.prettyprint li.L1,
-.prettyprint li.L2,
-.prettyprint li.L3,
-.prettyprint li.L5,
-.prettyprint li.L6,
-.prettyprint li.L7,
-.prettyprint li.L8 {
-    list-style: decimal;
-}
-
-/* -- API options ----------------------------------------------------------- */
-#api-options {
-    font-size: 11px;
-    margin-top: 2.2em;
-    position: absolute;
-    right: 1.5em;
-}
-
-/*#api-options label { margin-right: 0.6em; }*/
-
-/* -- API list -------------------------------------------------------------- */
-#api-list {
-    margin-top: 1.5em;
-    *zoom: 1;
-}
-
-.apis {
-    font-size: 12px;
-    line-height: 1.4;
-    list-style: none;
-    margin: 0;
-    padding: 0.5em 0 0.5em 0.4em;
-}
-
-.apis a {
-    border: 1px solid transparent;
-    display: block;
-    margin: 0 0 0 -4px;
-    padding: 1px 4px 0;
-    text-decoration: none;
-    _border: none;
-    _display: inline;
-}
-
-.apis a:hover,
-.apis a:focus {
-    background: #E8EDFC;
-    background: -moz-linear-gradient(top, #e8edfc 0%, #becef7 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E8EDFC), color-stop(100%,#BECEF7));
-    border-color: #AAC0FA;
-    border-radius: 3px;
-    color: #333;
-    outline: none;
-}
-
-.api-list-item a:hover,
-.api-list-item a:focus {
-    font-weight: bold;
-    text-shadow: 1px 1px 1px #fff;
-}
-
-.apis .message { color: #888; }
-.apis .result a { padding: 3px 5px 2px; }
-
-.apis .result .type {
-    right: 4px;
-    top: 7px;
-}
-
-.api-list-item .yui3-highlight {
-    font-weight: bold;
-}
-
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
deleted file mode 100644
index 414ac4fb9e145171ae8f660e51879e18c401e653..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5430
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

diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
deleted file mode 100644
index 44f96ba68c8910d19f49e8365bf589ee4e6991e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2685
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

diff --git a/docs/assets/index.html b/docs/assets/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/assets/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
deleted file mode 100644
index d442e54306..0000000000
--- a/docs/assets/js/api-filter.js
+++ /dev/null
@@ -1,56 +0,0 @@
-YUI.add('api-filter', function (Y) {
-
-Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {
-    // -- Initializer ----------------------------------------------------------
-    initializer: function () {
-        this._bindUIACBase();
-        this._syncUIACBase();
-    },
-    getDisplayName: function(name) {
-
-        Y.each(Y.YUIDoc.meta.allModules, function(i) {
-            if (i.name === name && i.displayName) {
-                name = i.displayName;
-            }
-        });
-
-        if (this.get('queryType') === 'elements') {
-            name = '&lt;' + name + '&gt;';
-        }
-
-        return name;
-    }
-
-}, {
-    // -- Attributes -----------------------------------------------------------
-    ATTRS: {
-        resultHighlighter: {
-            value: 'phraseMatch'
-        },
-
-        // May be set to "classes", "elements" or "modules".
-        queryType: {
-            value: 'classes'
-        },
-
-        source: {
-            valueFn: function() {
-                var self = this;
-                return function(q) {
-                    var data = Y.YUIDoc.meta[self.get('queryType')],
-                        out = [];
-                    Y.each(data, function(v) {
-                        if (v.toLowerCase().indexOf(q.toLowerCase()) > -1) {
-                            out.push(v);
-                        }
-                    });
-                    return out;
-                };
-            }
-        }
-    }
-});
-
-}, '3.4.0', {requires: [
-    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources'
-]});
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
deleted file mode 100644
index e8f650d5d5..0000000000
--- a/docs/assets/js/api-list.js
+++ /dev/null
@@ -1,255 +0,0 @@
-YUI.add('api-list', function (Y) {
-
-var Lang   = Y.Lang,
-    YArray = Y.Array,
-
-    APIList = Y.namespace('APIList'),
-
-    classesNode    = Y.one('#api-classes'),
-    elementsNode   = Y.one('#api-elements'),
-    inputNode      = Y.one('#api-filter'),
-    modulesNode    = Y.one('#api-modules'),
-    tabviewNode    = Y.one('#api-tabview'),
-
-    tabs = APIList.tabs = {},
-
-    filter = APIList.filter = new Y.APIFilter({
-        inputNode : inputNode,
-        maxResults: 1000,
-
-        on: {
-            results: onFilterResults
-        }
-    }),
-
-    search = APIList.search = new Y.APISearch({
-        inputNode : inputNode,
-        maxResults: 100,
-
-        on: {
-            clear  : onSearchClear,
-            results: onSearchResults
-        }
-    }),
-
-    tabview = APIList.tabview = new Y.TabView({
-        srcNode  : tabviewNode,
-        panelNode: '#api-tabview-panel',
-        render   : true,
-
-        on: {
-            selectionChange: onTabSelectionChange
-        }
-    }),
-
-    focusManager = APIList.focusManager = tabviewNode.plug(Y.Plugin.NodeFocusManager, {
-        circular   : true,
-        descendants: '#api-filter, .yui3-tab-panel-selected .api-list-item a, .yui3-tab-panel-selected .result a',
-        keys       : {next: 'down:40', previous: 'down:38'}
-    }).focusManager,
-
-    LIST_ITEM_TEMPLATE =
-        '<li class="api-list-item {typeSingular}">' +
-            '<a href="{rootPath}{typePlural}/{name}.html">{displayName}</a>' +
-        '</li>';
-
-// -- Init ---------------------------------------------------------------------
-
-// Duckpunch FocusManager's key event handling to prevent it from handling key
-// events when a modifier is pressed.
-Y.before(function (e, activeDescendant) {
-    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
-        return new Y.Do.Prevent();
-    }
-}, focusManager, '_focusPrevious', focusManager);
-
-Y.before(function (e, activeDescendant) {
-    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
-        return new Y.Do.Prevent();
-    }
-}, focusManager, '_focusNext', focusManager);
-
-// Create a mapping of tabs in the tabview so we can refer to them easily later.
-tabview.each(function (tab, index) {
-    var name = tab.get('label').toLowerCase();
-
-    tabs[name] = {
-        index: index,
-        name : name,
-        tab  : tab
-    };
-});
-
-// Switch tabs on Ctrl/Cmd-Left/Right arrows.
-tabviewNode.on('key', onTabSwitchKey, 'down:37,39');
-
-// Focus the filter input when the `/` key is pressed.
-Y.one(Y.config.doc).on('key', onSearchKey, 'down:83');
-
-// Keep the Focus Manager up to date.
-inputNode.on('focus', function () {
-    focusManager.set('activeDescendant', inputNode);
-});
-
-// Update all tabview links to resolved URLs.
-tabview.get('panelNode').all('a').each(function (link) {
-    link.setAttribute('href', link.get('href'));
-});
-
-// -- Private Functions --------------------------------------------------------
-function getFilterResultNode() {
-    var queryType = filter.get('queryType');
-    return queryType === 'classes' ? classesNode
-            : queryType === 'elements' ? elementsNode : modulesNode;
-}
-
-// -- Event Handlers -----------------------------------------------------------
-function onFilterResults(e) {
-    var frag         = Y.one(Y.config.doc.createDocumentFragment()),
-        resultNode   = getFilterResultNode(),
-        typePlural   = filter.get('queryType'),
-        typeSingular = typePlural === 'classes' ? 'class' : typePlural === 'elements' ? 'element' : 'module';
-
-    if (e.results.length) {
-        YArray.each(e.results, function (result) {
-            frag.append(Lang.sub(LIST_ITEM_TEMPLATE, {
-                rootPath    : APIList.rootPath,
-                displayName : filter.getDisplayName(result.highlighted),
-                name        : result.text,
-                typePlural  : typePlural,
-                typeSingular: typeSingular
-            }));
-        });
-    } else {
-        frag.append(
-            '<li class="message">' +
-                'No ' + typePlural + ' found.' +
-            '</li>'
-        );
-    }
-
-    resultNode.empty(true);
-    resultNode.append(frag);
-
-    focusManager.refresh();
-}
-
-function onSearchClear(e) {
-
-    focusManager.refresh();
-}
-
-function onSearchKey(e) {
-    var target = e.target;
-
-    if (target.test('input,select,textarea')
-            || target.get('isContentEditable')) {
-        return;
-    }
-
-    e.preventDefault();
-
-    inputNode.focus();
-    focusManager.refresh();
-}
-
-function onSearchResults(e) {
-    var frag = Y.one(Y.config.doc.createDocumentFragment());
-
-    if (e.results.length) {
-        YArray.each(e.results, function (result) {
-            frag.append(result.display);
-        });
-    } else {
-        frag.append(
-            '<li class="message">' +
-                'No results found. Maybe you\'ll have better luck with a ' +
-                'different query?' +
-            '</li>'
-        );
-    }
-
-
-    focusManager.refresh();
-}
-
-function onTabSelectionChange(e) {
-    var tab  = e.newVal,
-        name = tab.get('label').toLowerCase();
-
-    tabs.selected = {
-        index: tab.get('index'),
-        name : name,
-        tab  : tab
-    };
-
-    switch (name) {
-    case 'elements':// fallthru
-    case 'classes': // fallthru
-    case 'modules':
-        filter.setAttrs({
-            minQueryLength: 0,
-            queryType     : name
-        });
-
-        search.set('minQueryLength', -1);
-
-        // Only send a request if this isn't the initially-selected tab.
-        if (e.prevVal) {
-            filter.sendRequest(filter.get('value'));
-        }
-        break;
-
-    case 'everything':
-        filter.set('minQueryLength', -1);
-        search.set('minQueryLength', 1);
-
-        if (search.get('value')) {
-            search.sendRequest(search.get('value'));
-        } else {
-            inputNode.focus();
-        }
-        break;
-
-    default:
-        // WTF? We shouldn't be here!
-        filter.set('minQueryLength', -1);
-        search.set('minQueryLength', -1);
-    }
-
-    if (focusManager) {
-        setTimeout(function () {
-            focusManager.refresh();
-        }, 1);
-    }
-}
-
-function onTabSwitchKey(e) {
-    var currentTabIndex = tabs.selected.index;
-
-    if (!(e.ctrlKey || e.metaKey)) {
-        return;
-    }
-
-    e.preventDefault();
-
-    switch (e.keyCode) {
-    case 37: // left arrow
-        if (currentTabIndex > 0) {
-            tabview.selectChild(currentTabIndex - 1);
-            inputNode.focus();
-        }
-        break;
-
-    case 39: // right arrow
-        if (currentTabIndex < (Y.Object.size(tabs) - 2)) {
-            tabview.selectChild(currentTabIndex + 1);
-            inputNode.focus();
-        }
-        break;
-    }
-}
-
-}, '3.4.0', {requires: [
-    'api-filter', 'api-search', 'event-key', 'node-focusmanager', 'tabview'
-]});
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
deleted file mode 100644
index 175f6a6179..0000000000
--- a/docs/assets/js/api-search.js
+++ /dev/null
@@ -1,98 +0,0 @@
-YUI.add('api-search', function (Y) {
-
-var Lang   = Y.Lang,
-    Node   = Y.Node,
-    YArray = Y.Array;
-
-Y.APISearch = Y.Base.create('apiSearch', Y.Base, [Y.AutoCompleteBase], {
-    // -- Public Properties ----------------------------------------------------
-    RESULT_TEMPLATE:
-        '<li class="result {resultType}">' +
-            '<a href="{url}">' +
-                '<h3 class="title">{name}</h3>' +
-                '<span class="type">{resultType}</span>' +
-                '<div class="description">{description}</div>' +
-                '<span class="className">{class}</span>' +
-            '</a>' +
-        '</li>',
-
-    // -- Initializer ----------------------------------------------------------
-    initializer: function () {
-        this._bindUIACBase();
-        this._syncUIACBase();
-    },
-
-    // -- Protected Methods ----------------------------------------------------
-    _apiResultFilter: function (query, results) {
-        // Filter components out of the results.
-        return YArray.filter(results, function (result) {
-            return result.raw.resultType === 'component' ? false : result;
-        });
-    },
-
-    _apiResultFormatter: function (query, results) {
-        return YArray.map(results, function (result) {
-            var raw  = Y.merge(result.raw), // create a copy
-                desc = raw.description || '';
-
-            // Convert description to text and truncate it if necessary.
-            desc = Node.create('<div>' + desc + '</div>').get('text');
-
-            if (desc.length > 65) {
-                desc = Y.Escape.html(desc.substr(0, 65)) + ' &hellip;';
-            } else {
-                desc = Y.Escape.html(desc);
-            }
-
-            raw['class'] || (raw['class'] = '');
-            raw.description = desc;
-
-            // Use the highlighted result name.
-            raw.name = result.highlighted;
-
-            return Lang.sub(this.RESULT_TEMPLATE, raw);
-        }, this);
-    },
-
-    _apiTextLocator: function (result) {
-        return result.displayName || result.name;
-    }
-}, {
-    // -- Attributes -----------------------------------------------------------
-    ATTRS: {
-        resultFormatter: {
-            valueFn: function () {
-                return this._apiResultFormatter;
-            }
-        },
-
-        resultFilters: {
-            valueFn: function () {
-                return this._apiResultFilter;
-            }
-        },
-
-        resultHighlighter: {
-            value: 'phraseMatch'
-        },
-
-        resultListLocator: {
-            value: 'data.results'
-        },
-
-        resultTextLocator: {
-            valueFn: function () {
-                return this._apiTextLocator;
-            }
-        },
-
-        source: {
-            value: '/api/v1/search?q={query}&count={maxResults}'
-        }
-    }
-});
-
-}, '3.4.0', {requires: [
-    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources',
-    'escape'
-]});
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
deleted file mode 100644
index af9ac32209..0000000000
--- a/docs/assets/js/apidocs.js
+++ /dev/null
@@ -1,376 +0,0 @@
-YUI().use(
-    'yuidoc-meta',
-    'api-list', 'history-hash', 'node-screen', 'node-style', 'pjax',
-function (Y) {
-
-var win          = Y.config.win,
-    localStorage = win.localStorage,
-
-    bdNode = Y.one('#bd'),
-
-    pjax,
-    defaultRoute,
-
-    classTabView,
-    selectedTab;
-
-// Kill pjax functionality unless serving over HTTP.
-if (!Y.getLocation().protocol.match(/^https?\:/)) {
-    Y.Router.html5 = false;
-}
-
-// Create the default route with middleware which enables syntax highlighting
-// on the loaded content.
-defaultRoute = Y.Pjax.defaultRoute.concat(function (req, res, next) {
-    prettyPrint();
-    bdNode.removeClass('loading');
-
-    next();
-});
-
-pjax = new Y.Pjax({
-    container      : '#docs-main',
-    contentSelector: '#docs-main > .content',
-    linkSelector   : '#bd a',
-    titleSelector  : '#xhr-title',
-
-    navigateOnHash: true,
-    root          : '/',
-    routes        : [
-        // -- / ----------------------------------------------------------------
-        {
-            path     : '/(index.html)?',
-            callbacks: defaultRoute
-        },
-
-        // -- /elements/* -------------------------------------------------------
-        {
-            path     : '/elements/:element.html*',
-            callbacks: defaultRoute
-        },
-
-        // -- /classes/* -------------------------------------------------------
-        {
-            path     : '/classes/:class.html*',
-            callbacks: [defaultRoute, 'handleClasses']
-        },
-
-        // -- /files/* ---------------------------------------------------------
-        {
-            path     : '/files/*file',
-            callbacks: [defaultRoute, 'handleFiles']
-        },
-
-        // -- /modules/* -------------------------------------------------------
-        {
-            path     : '/modules/:module.html*',
-            callbacks: defaultRoute
-        }
-    ]
-});
-
-// -- Utility Functions --------------------------------------------------------
-
-pjax.checkVisibility = function (tab) {
-    tab || (tab = selectedTab);
-
-    if (!tab) { return; }
-
-    var panelNode = tab.get('panelNode'),
-        visibleItems;
-
-    // If no items are visible in the tab panel due to the current visibility
-    // settings, display a message to that effect.
-    visibleItems = panelNode.all('.item,.index-item').some(function (itemNode) {
-        if (itemNode.getComputedStyle('display') !== 'none') {
-            return true;
-        }
-    });
-
-    panelNode.all('.no-visible-items').remove();
-
-    if (!visibleItems) {
-        if (Y.one('#index .index-item')) {
-            panelNode.append(
-                '<div class="no-visible-items">' +
-                    '<p>' +
-                    'Some items are not shown due to the current visibility ' +
-                    'settings. Use the checkboxes at the upper right of this ' +
-                    'page to change the visibility settings.' +
-                    '</p>' +
-                '</div>'
-            );
-        } else {
-            panelNode.append(
-                '<div class="no-visible-items">' +
-                    '<p>' +
-                    'This class doesn\'t provide any methods, properties, ' +
-                    'attributes, or events.' +
-                    '</p>' +
-                '</div>'
-            );
-        }
-    }
-
-    // Hide index sections without any visible items.
-    Y.all('.index-section').each(function (section) {
-        var items        = 0,
-            visibleItems = 0;
-
-        section.all('.index-item').each(function (itemNode) {
-            items += 1;
-
-            if (itemNode.getComputedStyle('display') !== 'none') {
-                visibleItems += 1;
-            }
-        });
-
-        section.toggleClass('hidden', !visibleItems);
-        section.toggleClass('no-columns', visibleItems < 4);
-    });
-};
-
-pjax.initClassTabView = function () {
-    if (!Y.all('#classdocs .api-class-tab').size()) {
-        return;
-    }
-
-    if (classTabView) {
-        classTabView.destroy();
-        selectedTab = null;
-    }
-
-    classTabView = new Y.TabView({
-        srcNode: '#classdocs',
-
-        on: {
-            selectionChange: pjax.onTabSelectionChange
-        }
-    });
-
-    pjax.updateTabState();
-    classTabView.render();
-};
-
-pjax.initLineNumbers = function () {
-    var hash      = win.location.hash.substring(1),
-        container = pjax.get('container'),
-        hasLines, node;
-
-    // Add ids for each line number in the file source view.
-    container.all('.linenums>li').each(function (lineNode, index) {
-        lineNode.set('id', 'l' + (index + 1));
-        lineNode.addClass('file-line');
-        hasLines = true;
-    });
-
-    // Scroll to the desired line.
-    if (hasLines && /^l\d+$/.test(hash)) {
-        if ((node = container.getById(hash))) {
-            win.scroll(0, node.getY());
-        }
-    }
-};
-
-pjax.initRoot = function () {
-    var terminators = /^(?:classes|files|elements|modules)$/,
-        parts       = pjax._getPathRoot().split('/'),
-        root        = [],
-        i, len, part;
-
-    for (i = 0, len = parts.length; i < len; i += 1) {
-        part = parts[i];
-
-        if (part.match(terminators)) {
-            // Makes sure the path will end with a "/".
-            root.push('');
-            break;
-        }
-
-        root.push(part);
-    }
-
-    pjax.set('root', root.join('/'));
-};
-
-pjax.updateTabState = function (src) {
-    var hash = win.location.hash.substring(1),
-        defaultTab, node, tab, tabPanel;
-
-    function scrollToNode() {
-        if (node.hasClass('protected')) {
-            Y.one('#api-show-protected').set('checked', true);
-            pjax.updateVisibility();
-        }
-
-        if (node.hasClass('private')) {
-            Y.one('#api-show-private').set('checked', true);
-            pjax.updateVisibility();
-        }
-
-        setTimeout(function () {
-            // For some reason, unless we re-get the node instance here,
-            // getY() always returns 0.
-            var node = Y.one('#classdocs').getById(hash);
-            win.scrollTo(0, node.getY() - 70);
-        }, 1);
-    }
-
-    if (!classTabView) {
-        return;
-    }
-
-    if (src === 'hashchange' && !hash) {
-        defaultTab = 'index';
-    } else {
-        if (localStorage) {
-            defaultTab = localStorage.getItem('tab_' + pjax.getPath()) ||
-                'index';
-        } else {
-            defaultTab = 'index';
-        }
-    }
-
-    if (hash && (node = Y.one('#classdocs').getById(hash))) {
-        if ((tabPanel = node.ancestor('.api-class-tabpanel', true))) {
-            if ((tab = Y.one('#classdocs .api-class-tab.' + tabPanel.get('id')))) {
-                if (classTabView.get('rendered')) {
-                    Y.Widget.getByNode(tab).set('selected', 1);
-                } else {
-                    tab.addClass('yui3-tab-selected');
-                }
-            }
-        }
-
-        // Scroll to the desired element if this is a hash URL.
-        if (node) {
-            if (classTabView.get('rendered')) {
-                scrollToNode();
-            } else {
-                classTabView.once('renderedChange', scrollToNode);
-            }
-        }
-    } else {
-        tab = Y.one('#classdocs .api-class-tab.' + defaultTab);
-
-        // When the `defaultTab` node isn't found, `localStorage` is stale.
-        if (!tab && defaultTab !== 'index') {
-            tab = Y.one('#classdocs .api-class-tab.index');
-        }
-
-        if (classTabView.get('rendered')) {
-            Y.Widget.getByNode(tab).set('selected', 1);
-        } else {
-            tab.addClass('yui3-tab-selected');
-        }
-    }
-};
-
-pjax.updateVisibility = function () {
-    var container = pjax.get('container');
-
-    container.toggleClass('hide-inherited',
-            !Y.one('#api-show-inherited').get('checked'));
-
-    container.toggleClass('show-deprecated',
-            Y.one('#api-show-deprecated').get('checked'));
-
-    container.toggleClass('show-protected',
-            Y.one('#api-show-protected').get('checked'));
-
-    container.toggleClass('show-private',
-            Y.one('#api-show-private').get('checked'));
-
-    pjax.checkVisibility();
-};
-
-// -- Route Handlers -----------------------------------------------------------
-
-pjax.handleClasses = function (req, res, next) {
-    var status = res.ioResponse.status;
-
-    // Handles success and local filesystem XHRs.
-    if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
-        pjax.initClassTabView();
-    }
-
-    next();
-};
-
-pjax.handleFiles = function (req, res, next) {
-    var status = res.ioResponse.status;
-
-    // Handles success and local filesystem XHRs.
-    if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
-        pjax.initLineNumbers();
-    }
-
-    next();
-};
-
-// -- Event Handlers -----------------------------------------------------------
-
-pjax.onNavigate = function (e) {
-    var hash         = e.hash,
-        originTarget = e.originEvent && e.originEvent.target,
-        tab;
-
-    if (hash) {
-        tab = originTarget && originTarget.ancestor('.yui3-tab', true);
-
-        if (hash === win.location.hash) {
-            pjax.updateTabState('hashchange');
-        } else if (!tab) {
-            win.location.hash = hash;
-        }
-
-        e.preventDefault();
-        return;
-    }
-
-    // Only scroll to the top of the page when the URL doesn't have a hash.
-    this.set('scrollToTop', !e.url.match(/#.+$/));
-
-    bdNode.addClass('loading');
-};
-
-pjax.onOptionClick = function (e) {
-    pjax.updateVisibility();
-};
-
-pjax.onTabSelectionChange = function (e) {
-    var tab   = e.newVal,
-        tabId = tab.get('contentBox').getAttribute('href').substring(1);
-
-    selectedTab = tab;
-
-    // If switching from a previous tab (i.e., this is not the default tab),
-    // replace the history entry with a hash URL that will cause this tab to
-    // be selected if the user navigates away and then returns using the back
-    // or forward buttons.
-    if (e.prevVal && localStorage) {
-        localStorage.setItem('tab_' + pjax.getPath(), tabId);
-    }
-
-    pjax.checkVisibility(tab);
-};
-
-// -- Init ---------------------------------------------------------------------
-
-pjax.on('navigate', pjax.onNavigate);
-
-pjax.initRoot();
-pjax.upgrade();
-pjax.initClassTabView();
-pjax.initLineNumbers();
-pjax.updateVisibility();
-
-Y.APIList.rootPath = pjax.get('root');
-
-Y.one('#api-options').delegate('click', pjax.onOptionClick, 'input');
-
-Y.on('hashchange', function (e) {
-    pjax.updateTabState('hashchange');
-}, win);
-
-});
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
deleted file mode 100644
index 18de864953..0000000000
--- a/docs/assets/js/yui-prettify.js
+++ /dev/null
@@ -1,17 +0,0 @@
-YUI().use('node', function(Y) {
-    var code = Y.all('.prettyprint.linenums');
-    if (code.size()) {
-        code.each(function(c) {
-            var lis = c.all('ol li'),
-                l = 1;
-            lis.each(function(n) {
-                n.prepend('<a name="LINENUM_' + l + '"></a>');
-                l++;
-            });
-        });
-        var h = location.hash;
-        location.hash = '';
-        h = h.replace('LINE_', 'LINENUM_');
-        location.hash = h;
-    }
-});
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
deleted file mode 100644
index b50b841499..0000000000
--- a/docs/assets/vendor/prettify/CHANGES.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Change Log</title>
-  </head>
-  <body bgcolor="white">
-    <a style="float:right" href="README.html">README</a>
-
-    <h1>Known Issues</h1>
-    <ul>
-      <li>Perl formatting is really crappy.  Partly because the author is lazy and
-      partly because Perl is
-      <a href="http://www.perlmonks.org/?node_id=663393">hard</a> to parse.
-      <li>On some browsers, <code>&lt;code&gt;</code> elements with newlines in the text
-      which use CSS to specify <code>white-space:pre</code> will have the newlines
-      improperly stripped if the element is not attached to the document at the time
-      the stripping is done.  Also, on IE 6, all newlines will be stripped from
-      <code>&lt;code&gt;</code> elements because of the way IE6 produces
-      <code>innerHTML</code>.  Workaround: use <code>&lt;pre&gt;</code> for code with
-      newlines.
-    </ul>
-
-    <h1>Change Log</h1>
-    <h2>29 March 2007</h2>
-    <ul>
-      <li>Added <a href="tests/prettify_test.html#PHP">tests</a> for PHP support
-        to address 
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=3"
-       >issue 3</a>.
-      <li>Fixed
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=6"
-       >bug</a>: <code>prettyPrintOne</code> was not halting.  This was not
-        reachable through the normal entry point.
-      <li>Fixed
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=4"
-       >bug</a>: recursing into a script block or PHP tag that was not properly
-        closed would not silently drop the content.
-        (<a href="tests/prettify_test.html#issue4">test</a>)
-      <li>Fixed
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=8"
-       >bug</a>: was eating tabs
-        (<a href="tests/prettify_test.html#issue8">test</a>)
-      <li>Fixed entity handling so that the caveat
-        <blockquote>
-          <p>Caveats: please properly escape less-thans.  <tt>x&amp;lt;y</tt>
-          instead of <tt>x&lt;y</tt>, and use <tt>&quot;</tt> instead of 
-          <tt>&amp;quot;</tt> for string delimiters.</p>
-        </blockquote>
-        is no longer applicable.
-      <li>Added noisefree's C#
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=4"
-       >patch</a>
-      <li>Added a <a href="http://google-code-prettify.googlecode.com/files/prettify-small.zip">distribution</a> that has comments and
-        whitespace removed to reduce download size from 45.5kB to 12.8kB.
-    </ul>
-    <h2>4 Jul 2008</h2>
-    <ul>
-      <li>Added <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=17">language specific formatters</a> that are triggered by the presence
-      of a <code>lang-&lt;language-file-extension&gt;</code></li>
-      <li>Fixed <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=29">bug</a>: python handling of <code>'''string'''</code>
-      <li>Fixed bug: <code>/</code> in regex <code>[charsets] should not end regex</code>
-    </ul>
-    <h2>5 Jul 2008</h2>
-    <ul>
-      <li>Defined language extensions for Lisp and Lua</code>
-    </ul>
-    <h2>14 Jul 2008</h2>
-    <ul>
-      <li>Language handlers for F#, OCAML, SQL</code>
-      <li>Support for <code>nocode</code> spans to allow embedding of line
-      numbers and code annotations which should not be styled or otherwise
-      affect the tokenization of prettified code.
-      See the issue 22
-      <a href="tests/prettify_test.html#issue22">testcase</a>.</code>
-    </ul>
-    <h2>6 Jan 2009</h2>
-    <ul>
-      <li>Language handlers for Visual Basic, Haskell, CSS, and WikiText</li>
-      <li>Added <tt>.mxml</tt> extension to the markup style handler for
-        Flex <a href="http://en.wikipedia.org/wiki/MXML">MXML files</a>.  See
-        <a
-        href="http://code.google.com/p/google-code-prettify/issues/detail?id=37"
-        >issue 37</a>.
-      <li>Added <tt>.m</tt> extension to the C style handler so that Objective
-        C source files properly highlight.  See
-        <a
-        href="http://code.google.com/p/google-code-prettify/issues/detail?id=58"
-       >issue 58</a>.
-      <li>Changed HTML lexer to use the same embedded source mechanism as the
-        wiki language handler, and changed to use the registered
-        CSS handler for STYLE element content.
-    </ul>
-    <h2>21 May 2009</h2>
-    <ul>
-      <li>Rewrote to improve performance on large files.
-        See <a href="http://mikesamuel.blogspot.com/2009/05/efficient-parsing-in-javascript.html">benchmarks</a>.</li>
-      <li>Fixed bugs with highlighting of Haskell line comments, Lisp
-        number literals, Lua strings, C preprocessor directives,
-        newlines in Wiki code on Windows, and newlines in IE6.</li>
-    </ul>
-    <h2>14 August 2009</h2>
-    <ul>
-      <li>Fixed prettifying of <code>&lt;code&gt;</code> blocks with embedded newlines.
-    </ul>
-    <h2>3 October 2009</h2>
-    <ul>
-      <li>Fixed prettifying of XML/HTML tags that contain uppercase letters.
-    </ul>
-    <h2>19 July 2010</h2>
-    <ul>
-      <li>Added support for line numbers.  Bug
-        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=22"
-         >22</a></li>
-      <li>Added YAML support.  Bug
-        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=123"
-         >123</a></li>
-      <li>Added VHDL support courtesy Le Poussin.</li>
-      <li>IE performance improvements.  Bug
-        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=102"
-         >102</a> courtesy jacobly.</li>
-      <li>A variety of markup formatting fixes courtesy smain and thezbyg.</li>
-      <li>Fixed copy and paste in IE[678].
-      <li>Changed output to use <code>&amp;#160;</code> instead of
-        <code>&amp;nbsp;</code> so that the output works when embedded in XML.
-        Bug
-        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=108"
-         >108</a>.</li>
-    </ul>
-  </body>
-</html>
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
deleted file mode 100644
index d645695673..0000000000
--- a/docs/assets/vendor/prettify/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
deleted file mode 100644
index c6fe1a32c3..0000000000
--- a/docs/assets/vendor/prettify/README.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-  <head>
-    <title>Javascript code prettifier</title>
-
-    <link href="src/prettify.css" type="text/css" rel="stylesheet" />
-
-    <script src="src/prettify.js" type="text/javascript"></script>
-
-    <style type="text/css">
-      body { margin-left: .5in }
-      h1, h2, h3, h4, .footer { margin-left: -.4in; }
-    </style>
-  </head>
-
-  <body onload="prettyPrint()" bgcolor="white">
-    <small style="float: right">Languages : <a href="README-zh-Hans.html">CH</a></small>
-    <h1>Javascript code prettifier</h1>
-
-    <h2>Setup</h2>
-    <ol>
-      <li><a href="http://code.google.com/p/google-code-prettify/downloads/list">Download</a> a distribution
-      <li>Include the script and stylesheets in your document
-        (you will need to make sure the css and js file are on your server, and
-         adjust the paths in the <tt>script</tt> and <tt>link</tt> tag)
-        <pre class="prettyprint">
-&lt;link href="prettify.css" type="text/css" rel="stylesheet" />
-&lt;script type="text/javascript" src="prettify.js">&lt;/script></pre>
-      <li>Add <code class="prettyprint lang-html">onload="prettyPrint()"</code> to your
-      document's body tag.
-      <li>Modify the stylesheet to get the coloring you prefer</li>
-    </ol>
-
-    <h2>Usage</h2>
-    <p>Put code snippets in
-    <tt>&lt;pre class="prettyprint"&gt;...&lt;/pre&gt;</tt>
-    or <tt>&lt;code class="prettyprint"&gt;...&lt;/code&gt;</tt>
-    and it will automatically be pretty printed.
-
-    <table summary="code examples">
-      <tr>
-        <th>The original
-        <th>Prettier
-      <tr>
-        <td><pre style="border: 1px solid #888;padding: 2px"
-             ><a name="voila1"></a>class Voila {
-public:
-  // Voila
-  static const string VOILA = "Voila";
-
-  // will not interfere with embedded <a href="#voila1">tags</a>.
-}</pre>
-
-        <td><pre class="prettyprint"><a name="voila2"></a>class Voila {
-public:
-  // Voila
-  static const string VOILA = "Voila";
-
-  // will not interfere with embedded <a href="#voila2">tags</a>.
-}</pre>
-    </table>
-
-    <h2>FAQ</h2>
-    <h3 id="langs">Which languages does it work for?</h3>
-    <p>The comments in <tt>prettify.js</tt> are authoritative but the lexer
-    should work on a number of languages including C and friends,
-    Java, Python, Bash, SQL, HTML, XML, CSS, Javascript, and Makefiles.
-    It works passably on Ruby, PHP, VB, and Awk and a decent subset of Perl
-    and Ruby, but, because of commenting conventions, doesn't work on
-    Smalltalk, or CAML-like languages.</p>
-
-    <p>LISPy languages are supported via an extension:
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lisp.js"
-     ><code>lang-lisp.js</code></a>.</p>
-    <p>And similarly for
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-css.js"
-     ><code>CSS</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-hs.js"
-     ><code>Haskell</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lua.js"
-     ><code>Lua</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-ml.js"
-     ><code>OCAML, SML, F#</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-vb.js"
-     ><code>Visual Basic</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-sql.js"
-     ><code>SQL</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-proto.js"
-     ><code>Protocol Buffers</code></a>, and
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-wiki.js"
-     ><code>WikiText</code></a>..
-
-    <p>If you'd like to add an extension for your favorite language, please
-    look at <tt>src/lang-lisp.js</tt> and file an
-    <a href="http://code.google.com/p/google-code-prettify/issues/list"
-     >issue</a> including your language extension, and a testcase.</p>
-
-    <h3>How do I specify which language my code is in?</h3>
-    <p>You don't need to specify the language since <code>prettyprint()</code>
-    will guess.  You can specify a language by specifying the language extension
-    along with the <code>prettyprint</code> class like so:</p>
-    <pre class="prettyprint lang-html"
->&lt;pre class=&quot;prettyprint <b>lang-html</b>&quot;&gt;
-  The lang-* class specifies the language file extensions.
-  File extensions supported by default include
-    "bsh", "c", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html",
-    "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh",
-    "xhtml", "xml", "xsl".
-&lt;/pre&gt;</pre>
-
-    <h3>It doesn't work on <tt>&lt;obfuscated code sample&gt;</tt>?</h3>
-    <p>Yes.  Prettifying obfuscated code is like putting lipstick on a pig
-    &mdash; i.e. outside the scope of this tool.</p>
-
-    <h3>Which browsers does it work with?</h3>
-    <p>It's been tested with IE 6, Firefox 1.5 &amp; 2, and Safari 2.0.4.
-    Look at <a href="tests/prettify_test.html">the test page</a> to see if it
-    works in your browser.</p>
-
-    <h3>What's changed?</h3>
-    <p>See the <a href="CHANGES.html">change log</a></p>
-
-    <h3>Why doesn't Prettyprinting of strings work on WordPress?</h3>
-    <p>Apparently wordpress does "smart quoting" which changes close quotes.
-    This causes end quotes to not match up with open quotes.
-    <p>This breaks prettifying as well as copying and pasting of code samples.
-    See
-    <a href="http://wordpress.org/support/topic/125038"
-    >WordPress's help center</a> for info on how to stop smart quoting of code
-    snippets.</p>
-
-    <h3 id="linenums">How do I put line numbers in my code?</h3>
-    <p>You can use the <code>linenums</code> class to turn on line
-    numbering.  If your code doesn't start at line number 1, you can
-    add a colon and a line number to the end of that class as in
-    <code>linenums:52</code>.
-
-    <p>For example
-<pre class="prettyprint">&lt;pre class="prettyprint linenums:<b>4</b>"
-&gt;// This is line 4.
-foo();
-bar();
-baz();
-boo();
-far();
-faz();
-&lt;pre&gt;</pre>
-    produces
-<pre class="prettyprint linenums:4"
->// This is line 4.
-foo();
-bar();
-baz();
-boo();
-far();
-faz();
-</pre>
-
-    <h3>How do I prevent a portion of markup from being marked as code?</h3>
-    <p>You can use the <code>nocode</code> class to identify a span of markup
-    that is not code.
-<pre class="prettyprint">&lt;pre class=prettyprint&gt;
-int x = foo();  /* This is a comment  &lt;span class="nocode"&gt;This is not code&lt;/span&gt;
-  Continuation of comment */
-int y = bar();
-&lt;/pre&gt;</pre>
-produces
-<pre class="prettyprint">
-int x = foo();  /* This is a comment  <span class="nocode">This is not code</span>
-  Continuation of comment */
-int y = bar();
-</pre>
-
-    <p>For a more complete example see the issue22
-    <a href="tests/prettify_test.html#issue22">testcase</a>.</p>
-
-    <h3>I get an error message "a is not a function" or "opt_whenDone is not a function"</h3>
-    <p>If you are calling <code>prettyPrint</code> via an event handler, wrap it in a function.
-    Instead of doing
-    <blockquote>
-      <code class="prettyprint lang-js"
-       >addEventListener('load', prettyPrint, false);</code>
-    </blockquote>
-    wrap it in a closure like
-    <blockquote>
-      <code class="prettyprint lang-js"
-       >addEventListener('load', function (event) { prettyPrint() }, false);</code>
-    </blockquote>
-    so that the browser does not pass an event object to <code>prettyPrint</code> which
-    will confuse it.
-
-    <br><br><br>
-
-    <div class="footer">
-<!-- Created: Tue Oct  3 17:51:56 PDT 2006 -->
-<!-- hhmts start -->
-Last modified: Wed Jul 19 13:56:00 PST 2010
-<!-- hhmts end -->
-    </div>
-  </body>
-</html>
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
deleted file mode 100644
index d44b3a2282..0000000000
--- a/docs/assets/vendor/prettify/prettify-min.css
+++ /dev/null
@@ -1 +0,0 @@
-.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
\ No newline at end of file
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
deleted file mode 100644
index 4845d05d4b..0000000000
--- a/docs/assets/vendor/prettify/prettify-min.js
+++ /dev/null
@@ -1 +0,0 @@
-window.PR_SHOULD_USE_CONTINUATION=true;var prettyPrintOne;var prettyPrint;(function(){var O=window;var j=["break,continue,do,else,for,if,return,while"];var v=[j,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var q=[v,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var m=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var y=[q,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var T=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"];var s="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes";var x=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var t="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var J=[j,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var g=[j,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var I=[j,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var B=[m,T,x,t+J,g,I];var f=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var D="str";var A="kwd";var k="com";var Q="typ";var H="lit";var M="pun";var G="pln";var n="tag";var F="dec";var K="src";var R="atn";var o="atv";var P="nocode";var N="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function l(ab){var af=0;var U=false;var ae=false;for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.ignoreCase){ae=true}else{if(/[a-z]/i.test(ag.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,""))){U=true;ae=false;break}}}var aa={b:8,t:9,n:10,v:11,f:12,r:13};function ad(aj){var ai=aj.charCodeAt(0);if(ai!==92){return ai}var ah=aj.charAt(1);ai=aa[ah];if(ai){return ai}else{if("0"<=ah&&ah<="7"){return parseInt(aj.substring(1),8)}else{if(ah==="u"||ah==="x"){return parseInt(aj.substring(2),16)}else{return aj.charCodeAt(1)}}}}function V(ah){if(ah<32){return(ah<16?"\\x0":"\\x")+ah.toString(16)}var ai=String.fromCharCode(ah);return(ai==="\\"||ai==="-"||ai==="]"||ai==="^")?"\\"+ai:ai}function Z(an){var ar=an.substring(1,an.length-1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}|\\\\x[0-9A-Fa-f]{2}|\\\\[0-3][0-7]{0,2}|\\\\[0-7]{1,2}|\\\\[\\s\\S]|-|[^-\\\\]","g"));var ah=[];var ap=ar[0]==="^";var ao=["["];if(ap){ao.push("^")}for(var at=ap?1:0,al=ar.length;at<al;++at){var aj=ar[at];if(/\\[bdsw]/i.test(aj)){ao.push(aj)}else{var ai=ad(aj);var am;if(at+2<al&&"-"===ar[at+1]){am=ad(ar[at+2]);at+=2}else{am=ai}ah.push([ai,am]);if(!(am<65||ai>122)){if(!(am<65||ai>90)){ah.push([Math.max(65,ai)|32,Math.min(am,90)|32])}if(!(am<97||ai>122)){ah.push([Math.max(97,ai)&~32,Math.min(am,122)&~32])}}}}ah.sort(function(aw,av){return(aw[0]-av[0])||(av[1]-aw[1])});var ak=[];var aq=[];for(var at=0;at<ah.length;++at){var au=ah[at];if(au[0]<=aq[1]+1){aq[1]=Math.max(aq[1],au[1])}else{ak.push(aq=au)}}for(var at=0;at<ak.length;++at){var au=ak[at];ao.push(V(au[0]));if(au[1]>au[0]){if(au[1]+1>au[0]){ao.push("-")}ao.push(V(au[1]))}}ao.push("]");return ao.join("")}function Y(an){var al=an.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var aj=al.length;var ap=[];for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah){if(ah<=ao){ap[ah]=-1}else{al[am]=V(ah)}}}}}for(var am=1;am<ap.length;++am){if(-1===ap[am]){ap[am]=++af}}for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao;if(!ap[ao]){al[am]="(?:"}}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah&&ah<=ao){al[am]="\\"+ap[ah]}}}}for(var am=0;am<aj;++am){if("^"===al[am]&&"^"!==al[am+1]){al[am]=""}}if(an.ignoreCase&&U){for(var am=0;am<aj;++am){var ai=al[am];var ak=ai.charAt(0);if(ai.length>=2&&ak==="["){al[am]=Z(ai)}else{if(ak!=="\\"){al[am]=ai.replace(/[a-zA-Z]/g,function(aq){var ar=aq.charCodeAt(0);return"["+String.fromCharCode(ar&~32,ar|32)+"]"})}}}}return al.join("")}var ac=[];for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.global||ag.multiline){throw new Error(""+ag)}ac.push("(?:"+Y(ag)+")")}return new RegExp(ac.join("|"),ae?"gi":"g")}function b(aa,Y){var W=/(?:^|\s)nocode(?:\s|$)/;var ab=[];var Z=0;var X=[];var V=0;function U(ac){switch(ac.nodeType){case 1:if(W.test(ac.className)){return}for(var af=ac.firstChild;af;af=af.nextSibling){U(af)}var ae=ac.nodeName.toLowerCase();if("br"===ae||"li"===ae){ab[V]="\n";X[V<<1]=Z++;X[(V++<<1)|1]=ac}break;case 3:case 4:var ad=ac.nodeValue;if(ad.length){if(!Y){ad=ad.replace(/[ \t\r\n]+/g," ")}else{ad=ad.replace(/\r\n?/g,"\n")}ab[V]=ad;X[V<<1]=Z;Z+=ad.length;X[(V++<<1)|1]=ac}break}}U(aa);return{sourceCode:ab.join("").replace(/\n$/,""),spans:X}}function C(U,W,Y,V){if(!W){return}var X={sourceCode:W,basePos:U};Y(X);V.push.apply(V,X.decorations)}var w=/\S/;function p(U){var X=undefined;for(var W=U.firstChild;W;W=W.nextSibling){var V=W.nodeType;X=(V===1)?(X?U:W):(V===3)?(w.test(W.nodeValue)?U:X):X}return X===U?undefined:X}function h(W,V){var U={};var X;(function(){var af=W.concat(V);var aj=[];var ai={};for(var ad=0,ab=af.length;ad<ab;++ad){var aa=af[ad];var ae=aa[3];if(ae){for(var ag=ae.length;--ag>=0;){U[ae.charAt(ag)]=aa}}var ah=aa[1];var ac=""+ah;if(!ai.hasOwnProperty(ac)){aj.push(ah);ai[ac]=null}}aj.push(/[\0-\uffff]/);X=l(aj)})();var Z=V.length;var Y=function(aj){var ab=aj.sourceCode,aa=aj.basePos;var af=[aa,G];var ah=0;var ap=ab.match(X)||[];var al={};for(var ag=0,at=ap.length;ag<at;++ag){var ai=ap[ag];var ar=al[ai];var ak=void 0;var ao;if(typeof ar==="string"){ao=false}else{var ac=U[ai.charAt(0)];if(ac){ak=ai.match(ac[1]);ar=ac[0]}else{for(var aq=0;aq<Z;++aq){ac=V[aq];ak=ai.match(ac[1]);if(ak){ar=ac[0];break}}if(!ak){ar=G}}ao=ar.length>=5&&"lang-"===ar.substring(0,5);if(ao&&!(ak&&typeof ak[1]==="string")){ao=false;ar=K}if(!ao){al[ai]=ar}}var ad=ah;ah+=ai.length;if(!ao){af.push(aa+ad,ar)}else{var an=ak[1];var am=ai.indexOf(an);var ae=am+an.length;if(ak[2]){ae=ai.length-ak[2].length;am=ae-an.length}var au=ar.substring(5);C(aa+ad,ai.substring(0,am),Y,af);C(aa+ad+am,an,r(au,an),af);C(aa+ad+ae,ai.substring(ae),Y,af)}}aj.decorations=af};return Y}function i(V){var Y=[],U=[];if(V.tripleQuotedStrings){Y.push([D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(V.multiLineStrings){Y.push([D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{Y.push([D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(V.verbatimStrings){U.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ab=V.hashComments;if(ab){if(V.cStyleComments){if(ab>1){Y.push([k,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{Y.push([k,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}U.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{Y.push([k,/^#[^\r\n]*/,null,"#"])}}if(V.cStyleComments){U.push([k,/^\/\/[^\r\n]*/,null]);U.push([k,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(V.regexLiterals){var aa=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");U.push(["lang-regex",new RegExp("^"+N+"("+aa+")")])}var X=V.types;if(X){U.push([Q,X])}var W=(""+V.keywords).replace(/^ | $/g,"");if(W.length){U.push([A,new RegExp("^(?:"+W.replace(/[\s,]+/g,"|")+")\\b"),null])}Y.push([G,/^\s+/,null," \r\n\t\xA0"]);var Z=/^.[^\s\w\.$@\'\"\`\/\\]*/;U.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[Q,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[G,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[G,/^\\[\s\S]?/,null],[M,Z,null]);return h(Y,U)}var L=i({keywords:B,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function S(W,ah,aa){var V=/(?:^|\s)nocode(?:\s|$)/;var ac=/\r\n?|\n/;var ad=W.ownerDocument;var ag=ad.createElement("li");while(W.firstChild){ag.appendChild(W.firstChild)}var X=[ag];function af(am){switch(am.nodeType){case 1:if(V.test(am.className)){break}if("br"===am.nodeName){ae(am);if(am.parentNode){am.parentNode.removeChild(am)}}else{for(var ao=am.firstChild;ao;ao=ao.nextSibling){af(ao)}}break;case 3:case 4:if(aa){var an=am.nodeValue;var ak=an.match(ac);if(ak){var aj=an.substring(0,ak.index);am.nodeValue=aj;var ai=an.substring(ak.index+ak[0].length);if(ai){var al=am.parentNode;al.insertBefore(ad.createTextNode(ai),am.nextSibling)}ae(am);if(!aj){am.parentNode.removeChild(am)}}}break}}function ae(al){while(!al.nextSibling){al=al.parentNode;if(!al){return}}function aj(am,at){var ar=at?am.cloneNode(false):am;var ap=am.parentNode;if(ap){var aq=aj(ap,1);var ao=am.nextSibling;aq.appendChild(ar);for(var an=ao;an;an=ao){ao=an.nextSibling;aq.appendChild(an)}}return ar}var ai=aj(al.nextSibling,0);for(var ak;(ak=ai.parentNode)&&ak.nodeType===1;){ai=ak}X.push(ai)}for(var Z=0;Z<X.length;++Z){af(X[Z])}if(ah===(ah|0)){X[0].setAttribute("value",ah)}var ab=ad.createElement("ol");ab.className="linenums";var Y=Math.max(0,((ah-1))|0)||0;for(var Z=0,U=X.length;Z<U;++Z){ag=X[Z];ag.className="L"+((Z+Y)%10);if(!ag.firstChild){ag.appendChild(ad.createTextNode("\xA0"))}ab.appendChild(ag)}W.appendChild(ab)}function E(af){var X=/\bMSIE\s(\d+)/.exec(navigator.userAgent);X=X&&+X[1]<=8;var ao=/\n/g;var an=af.sourceCode;var ap=an.length;var Y=0;var ad=af.spans;var V=ad.length;var aj=0;var aa=af.decorations;var ab=aa.length;var ac=0;aa[ab]=ap;var av,at;for(at=av=0;at<ab;){if(aa[at]!==aa[at+2]){aa[av++]=aa[at++];aa[av++]=aa[at++]}else{at+=2}}ab=av;for(at=av=0;at<ab;){var aw=aa[at];var ae=aa[at+1];var Z=at+2;while(Z+2<=ab&&aa[Z+1]===ae){Z+=2}aa[av++]=aw;aa[av++]=ae;at=Z}ab=aa.length=av;var au=af.sourceNode;var ak;if(au){ak=au.style.display;au.style.display="none"}try{var ah=null;while(aj<V){var ai=ad[aj];var U=ad[aj+2]||ap;var ar=aa[ac+2]||ap;var Z=Math.min(U,ar);var am=ad[aj+1];var W;if(am.nodeType!==1&&(W=an.substring(Y,Z))){if(X){W=W.replace(ao,"\r")}am.nodeValue=W;var al=am.ownerDocument;var aq=al.createElement("span");aq.className=aa[ac+1];var ag=am.parentNode;ag.replaceChild(aq,am);aq.appendChild(am);if(Y<U){ad[aj+1]=am=al.createTextNode(an.substring(Z,U));ag.insertBefore(am,aq.nextSibling)}}Y=Z;if(Y>=U){aj+=2}if(Y>=ar){ac+=2}}}finally{if(au){au.style.display=ak}}}var u={};function d(W,X){for(var U=X.length;--U>=0;){var V=X[U];if(!u.hasOwnProperty(V)){u[V]=W}else{if(O.console){console.warn("cannot override language handler %s",V)}}}}function r(V,U){if(!(V&&u.hasOwnProperty(V))){V=/^\s*</.test(U)?"default-markup":"default-code"}return u[V]}d(L,["default-code"]);d(h([],[[G,/^[^<?]+/],[F,/^<!\w[^>]*(?:>|$)/],[k,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[M,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);d(h([[G,/^[\s]+/,null," \t\r\n"],[o,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[n,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[R,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[M,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);d(h([],[[o,/^[\s\S]+/]]),["uq.val"]);d(i({keywords:m,hashComments:true,cStyleComments:true,types:f}),["c","cc","cpp","cxx","cyc","m"]);d(i({keywords:"null,true,false"}),["json"]);d(i({keywords:T,hashComments:true,cStyleComments:true,verbatimStrings:true,types:f}),["cs"]);d(i({keywords:y,cStyleComments:true}),["java"]);d(i({keywords:I,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);d(i({keywords:J,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);d(i({keywords:t,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);d(i({keywords:g,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);d(i({keywords:x,cStyleComments:true,regexLiterals:true}),["js"]);d(i({keywords:s,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);d(h([],[[D,/^[\s\S]+/]]),["regex"]);function e(X){var W=X.langExtension;try{var U=b(X.sourceNode,X.pre);var V=U.sourceCode;X.sourceCode=V;X.spans=U.spans;X.basePos=0;r(W,V)(X);E(X)}catch(Y){if(O.console){console.log(Y&&Y.stack?Y.stack:Y)}}}function z(Y,X,W){var U=document.createElement("pre");U.innerHTML=Y;if(W){S(U,W,true)}var V={langExtension:X,numberLines:W,sourceNode:U,pre:1};e(V);return U.innerHTML}function c(aj){function ab(al){return document.getElementsByTagName(al)}var ah=[ab("pre"),ab("code"),ab("xmp")];var V=[];for(var ae=0;ae<ah.length;++ae){for(var ac=0,Y=ah[ae].length;ac<Y;++ac){V.push(ah[ae][ac])}}ah=null;var Z=Date;if(!Z.now){Z={now:function(){return +(new Date)}}}var aa=0;var U;var af=/\blang(?:uage)?-([\w.]+)(?!\S)/;var ak=/\bprettyprint\b/;var W=/\bprettyprinted\b/;var ag=/pre|xmp/i;var ai=/^code$/i;var ad=/^(?:pre|code|xmp)$/i;function X(){var ar=(O.PR_SHOULD_USE_CONTINUATION?Z.now()+250:Infinity);for(;aa<V.length&&Z.now()<ar;aa++){var at=V[aa];var au=at.className;if(ak.test(au)&&!W.test(au)){var aw=false;for(var ao=at.parentNode;ao;ao=ao.parentNode){var ax=ao.tagName;if(ad.test(ax)&&ao.className&&ak.test(ao.className)){aw=true;break}}if(!aw){at.className+=" prettyprinted";var aq=au.match(af);var am;if(!aq&&(am=p(at))&&ai.test(am.tagName)){aq=am.className.match(af)}if(aq){aq=aq[1]}var ap;if(ag.test(at.tagName)){ap=1}else{var an=at.currentStyle;var al=(an?an.whiteSpace:(document.defaultView&&document.defaultView.getComputedStyle)?document.defaultView.getComputedStyle(at,null).getPropertyValue("white-space"):0);ap=al&&"pre"===al.substring(0,3)}var av=at.className.match(/\blinenums\b(?::(\d+))?/);av=av?av[1]&&av[1].length?+av[1]:true:false;if(av){S(at,av,ap)}U={langExtension:aq,sourceNode:at,numberLines:av,pre:ap};e(U)}}}if(aa<V.length){setTimeout(X,250)}else{if(aj){aj()}}}X()}var a=O.PR={createSimpleLexer:h,registerLangHandler:d,sourceDecorator:i,PR_ATTRIB_NAME:R,PR_ATTRIB_VALUE:o,PR_COMMENT:k,PR_DECLARATION:F,PR_KEYWORD:A,PR_LITERAL:H,PR_NOCODE:P,PR_PLAIN:G,PR_PUNCTUATION:M,PR_SOURCE:K,PR_STRING:D,PR_TAG:n,PR_TYPE:Q,prettyPrintOne:O.prettyPrintOne=z,prettyPrint:O.prettyPrint=c};if(typeof define==="function"&&define.amd){define("google-code-prettify",[],function(){return a})}})();PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_DECLARATION,/^<!\w[^>]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^<script\b[^>]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:<!--|-->)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]);
\ No newline at end of file
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
deleted file mode 100644
index 209466135b..0000000000
--- a/docs/classes/Roles.html
+++ /dev/null
@@ -1,3779 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Roles - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>Roles Class</h1>
-<div class="box meta">
-
-
-        <div class="foundat">
-            Defined in: <a href="../files/roles_roles_common.js.html#l29"><code>roles&#x2F;roles_common.js:29</code></a>
-        </div>
-
-            Module: <a href="../modules/Roles.html">Roles</a>
-
-</div>
-
-
-<div class="box intro">
-    
-</div>
-
-
-<div id="classdocs" class="tabview">
-    <ul class="api-class-tabs">
-        <li class="api-class-tab index"><a href="#index">Index</a></li>
-
-            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
-            <li class="api-class-tab properties"><a href="#properties">Properties</a></li>
-    </ul>
-
-    <div>
-        <div id="index" class="api-class-tabpanel index">
-            <h2 class="off-left">Item Index</h2>
-
-                <div class="index-section methods">
-                    <h3>Methods</h3>
-
-                    <ul class="index-list methods">
-                            <li class="index-item method private">
-                                <a href="#method__addRoleToParent">_addRoleToParent</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__addUserToRole">_addUserToRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__assureConsistency">_assureConsistency</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__backwardMigrate">_backwardMigrate</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__checkRoleName">_checkRoleName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__checkRoleName">_checkRoleName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__convertToNewField">_convertToNewField</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__convertToNewRole">_convertToNewRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__convertToOldField">_convertToOldField</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__convertToOldRole">_convertToOldRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__defaultUpdateRole">_defaultUpdateRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__defaultUpdateUser">_defaultUpdateUser</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__dropCollectionIndex">_dropCollectionIndex</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__forwardMigrate">_forwardMigrate</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__isNewField">_isNewField</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__isNewRole">_isNewRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__isOldField">_isOldField</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__isOldRole">_isOldRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__normalizeOptions">_normalizeOptions</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__normalizeScopeName">_normalizeScopeName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__onlyAssignedMatcher">_onlyAssignedMatcher</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__removeRoleFromParent">_removeRoleFromParent</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__removeUserFromRole">_removeUserFromRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__resolveUser">_resolveUser</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__roleAndScopeMatcher">_roleAndScopeMatcher</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__roleMatcher">_roleMatcher</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__scopeMatcher">_scopeMatcher</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__usersInRoleQuery">_usersInRoleQuery</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_addRolesToParent">addRolesToParent</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_addUsersToRoles">addUsersToRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_createRole">createRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_deleteRole">deleteRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getAllRoles">getAllRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method deprecated">
-                                <a href="#method_getGroupsForUser">getGroupsForUser</a>
-
-                                    <span class="flag static">static</span>
-                                    <span class="flag deprecated">deprecated</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getRolesForUser">getRolesForUser</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getScopesForUser">getScopesForUser</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getUsersInRole">getUsersInRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeRolesFromParent">removeRolesFromParent</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeScope">removeScope</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeUsersFromRoles">removeUsersFromRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_renameRole">renameRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_renameScope">renameScope</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_setUserRoles">setUserRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_userIsInRole">userIsInRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                    </ul>
-                </div>
-
-                <div class="index-section properties">
-                    <h3>Properties</h3>
-
-                    <ul class="index-list properties">
-                            <li class="index-item property deprecated">
-                                <a href="#property_GLOBAL_GROUP">GLOBAL_GROUP</a>
-
-                                    <span class="flag static">static</span>
-                                    <span class="flag deprecated">deprecated</span>
-                            </li>
-                            <li class="index-item property">
-                                <a href="#property_subscription">subscription</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                    </ul>
-                </div>
-
-
-        </div>
-
-            <div id="methods" class="api-class-tabpanel">
-                <h2 class="off-left">Methods</h2>
-
-<div id="method__addRoleToParent" class="method item private">
-    <h3 class="name"><code>_addRoleToParent</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l212"><code>roles&#x2F;roles_common.js:212</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__addUserToRole" class="method item private">
-    <h3 class="name"><code>_addUserToRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l488"><code>roles&#x2F;roles_common.js:488</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add one user to one role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or object with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of the role to add the user to. The role have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-<li><code>_assigned</code>: internal option, should not be used publicly because it will break assumptions
-in te code; publicly, you can only add users to an assigned role
-should the role be set as assigned (<code>true</code>), <code>null</code> is the same as <code>false</code>,
-only that it does not force the value to <code>false</code> if the role is already assigned</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array</span>:
-                    <p>Roles set during the call (even those already set).</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__assureConsistency" class="method item private">
-    <h3 class="name"><code>_assureConsistency</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l723"><code>roles&#x2F;roles_common.js:723</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Makes sure all subroles are correctly set, and no extra subroles are set which should not be.</p>
-<p>Used internally after complicated changes, but it can also be used whenever one feels that
-there might be inconsistencies (eg., after a crash).</p>
-<p>We simply re-set to the user their assigned roles again and remove any roles which
-are marked as not explicitly assigned, and have not been part of what we currently set.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__backwardMigrate" class="method item private">
-    <h3 class="name"><code>_backwardMigrate</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>updateUser</code>
-                </li>
-                <li class="arg">
-                        <code>updateRole</code>
-                </li>
-                <li class="arg">
-                        <code>usingGroups</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l285"><code>roles&#x2F;roles_server.js:285</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Migrates <code>Meteor.users</code> and <code>Meteor.roles</code> to the old format.</p>
-<p>We assume that we are converting back a failed migration, so values can only be
-what were valid values in the old format. So no group names starting with <code>$</code> and
-no subroles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">updateUser</code>
-                        <span class="type">Function</span>
-
-
-                    <div class="param-description">
-                        <p>Function which updates the user object. Default <code>_defaultUpdateUser</code>.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">updateRole</code>
-                        <span class="type">Function</span>
-
-
-                    <div class="param-description">
-                        <p>Function which updates the role object. Default <code>_defaultUpdateRole</code>.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">usingGroups</code>
-                        <span class="type">Boolean</span>
-
-
-                    <div class="param-description">
-                        <p>Should we use groups or not.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__checkRoleName" class="method item private">
-    <h3 class="name"><code>_checkRoleName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1219"><code>roles&#x2F;roles_common.js:1219</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Throw an exception if <code>roleName</code> is an invalid role name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A role name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__checkRoleName" class="method item private">
-    <h3 class="name"><code>_checkRoleName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>scopeName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1273"><code>roles&#x2F;roles_common.js:1273</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Throw an exception if <code>scopeName</code> is an invalid scope name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">scopeName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A scope name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__convertToNewField" class="method item private">
-    <h3 class="name"><code>_convertToNewField</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldRoles</code>
-                </li>
-                <li class="arg">
-                        <code>convertUnderscoresToDots</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l112"><code>roles&#x2F;roles_server.js:112</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldRoles</code>
-                        <span class="type">Array</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.users</code> document <code>roles</code> field in the old format.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">convertUnderscoresToDots</code>
-                        <span class="type">Boolean</span>
-
-
-                    <div class="param-description">
-                        <p>Should we convert underscores to dots in group names.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array</span>:
-                    <p>Converted <code>roles</code> to the new format.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__convertToNewRole" class="method item private">
-    <h3 class="name"><code>_convertToNewRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldRole</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l79"><code>roles&#x2F;roles_server.js:79</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldRole</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.roles</code> document.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>Converted <code>role</code> to the new format.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__convertToOldField" class="method item private">
-    <h3 class="name"><code>_convertToOldField</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>newRoles</code>
-                </li>
-                <li class="arg">
-                        <code>usingGroups</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l158"><code>roles&#x2F;roles_server.js:158</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">newRoles</code>
-                        <span class="type">Array</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.users</code> document <code>roles</code> field in the new format.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">usingGroups</code>
-                        <span class="type">Boolean</span>
-
-
-                    <div class="param-description">
-                        <p>Should we use groups or not.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array</span>:
-                    <p>Converted <code>roles</code> to the old format.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__convertToOldRole" class="method item private">
-    <h3 class="name"><code>_convertToOldRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>newRole</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l96"><code>roles&#x2F;roles_server.js:96</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">newRole</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.roles</code> document.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>Converted <code>role</code> to the old format.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__defaultUpdateRole" class="method item private">
-    <h3 class="name"><code>_defaultUpdateRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldRole</code>
-                </li>
-                <li class="arg">
-                        <code>newRole</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l225"><code>roles&#x2F;roles_server.js:225</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldRole</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Old <code>Meteor.roles</code> document.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">newRole</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>New <code>Meteor.roles</code> document.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__defaultUpdateUser" class="method item private">
-    <h3 class="name"><code>_defaultUpdateUser</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l207"><code>roles&#x2F;roles_server.js:207</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.users</code> document.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | Object</span>
-
-
-                    <div class="param-description">
-                        <p>Value to which user's <code>roles</code> field should be set.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__dropCollectionIndex" class="method item private">
-    <h3 class="name"><code>_dropCollectionIndex</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>collection</code>
-                </li>
-                <li class="arg">
-                        <code>indexName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l238"><code>roles&#x2F;roles_server.js:238</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">collection</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Collection on which to drop the index.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">indexName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of the index to drop.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__forwardMigrate" class="method item private">
-    <h3 class="name"><code>_forwardMigrate</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>updateUser</code>
-                </li>
-                <li class="arg">
-                        <code>updateRole</code>
-                </li>
-                <li class="arg">
-                        <code>convertUnderscoresToDots</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l255"><code>roles&#x2F;roles_server.js:255</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Migrates <code>Meteor.users</code> and <code>Meteor.roles</code> to the new format.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">updateUser</code>
-                        <span class="type">Function</span>
-
-
-                    <div class="param-description">
-                        <p>Function which updates the user object. Default <code>_defaultUpdateUser</code>.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">updateRole</code>
-                        <span class="type">Function</span>
-
-
-                    <div class="param-description">
-                        <p>Function which updates the role object. Default <code>_defaultUpdateRole</code>.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">convertUnderscoresToDots</code>
-                        <span class="type">Boolean</span>
-
-
-                    <div class="param-description">
-                        <p>Should we convert underscores to dots in group names.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__isNewField" class="method item private">
-    <h3 class="name"><code>_isNewField</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l53"><code>roles&#x2F;roles_server.js:53</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.users</code> document <code>roles</code> field.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p>Returns <code>true</code> if the <code>roles</code> field is in the new format.
-If it is ambiguous or it is not, returns <code>false</code>.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__isNewRole" class="method item private">
-    <h3 class="name"><code>_isNewRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>role</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l27"><code>roles&#x2F;roles_server.js:27</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">role</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.roles</code> document.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p>Returns <code>true</code> if the <code>role</code> is in the new format.
-If it is ambiguous or it is not, returns <code>false</code>.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__isOldField" class="method item private">
-    <h3 class="name"><code>_isOldField</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l66"><code>roles&#x2F;roles_server.js:66</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.users</code> document <code>roles</code> field.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p>Returns <code>true</code> if the <code>roles</code> field is in the old format.
-If it is ambiguous or it is not, returns <code>false</code>.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__isOldRole" class="method item private">
-    <h3 class="name"><code>_isOldRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>role</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_server.js.html#l40"><code>roles&#x2F;roles_server.js:40</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">role</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p><code>Meteor.roles</code> document.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p>Returns <code>true</code> if the <code>role</code> is in the old format.
-If it is ambiguous or it is not, returns <code>false</code>.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__normalizeOptions" class="method item private">
-    <h3 class="name"><code>_normalizeOptions</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1233"><code>roles&#x2F;roles_common.js:1233</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Normalize options.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options to normalize.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>Normalized options.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__normalizeScopeName" class="method item private">
-    <h3 class="name"><code>_normalizeScopeName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>scopeName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">String</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1254"><code>roles&#x2F;roles_common.js:1254</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Normalize scope name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">scopeName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A scope name to normalize.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">String</span>:
-                    <p>Normalized scope name.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__onlyAssignedMatcher" class="method item private">
-    <h3 class="name"><code>_onlyAssignedMatcher</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">Function</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1206"><code>roles&#x2F;roles_common.js:1206</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Function</span>:
-                    <p>A matcher function which accepts a role object and returns <code>true</code>
-if the role is an assigned role.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__removeRoleFromParent" class="method item private">
-    <h3 class="name"><code>_removeRoleFromParent</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l316"><code>roles&#x2F;roles_common.js:316</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__removeUserFromRole" class="method item private">
-    <h3 class="name"><code>_removeUserFromRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l655"><code>roles&#x2F;roles_common.js:655</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove one user from one role.</p>
-<p>WARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same
-role to be a child of multiple roles it might happen that it removes some subroles which
-it should not because they are in effect also through some other parent role. You should always
-call <code>_assureConsistency</code> after you are finished with calls to <code>_removeUserFromRole</code> for a
-particular user.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or object with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of the role to add the user to. The role have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>_assigned</code>: internal option, should not be used publicly because it will break assumptions
-in te code; publicly, you can only remove users from an assigned role
-if <code>true</code>, only manually assigned roles are removed, if <code>false</code>, only automatically
-assigned roles are removed, if <code>null</code>, any role is removed</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__resolveUser" class="method item private">
-    <h3 class="name"><code>_resolveUser</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code>force</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1133"><code>roles&#x2F;roles_common.js:1133</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Resolves the user ID into an actual user object with <code>roles</code> field,
-if it is not already.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">force</code>
-                        <span class="type">Boolean</span>
-
-
-                    <div class="param-description">
-                        <p>Load a new user object even if it is already one.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>User object.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__roleAndScopeMatcher" class="method item private">
-    <h3 class="name"><code>_roleAndScopeMatcher</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>scope</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Function</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1173"><code>roles&#x2F;roles_common.js:1173</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A role name to match against.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">scope</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A scope to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Function</span>:
-                    <p>A matcher function which accepts a role object and returns <code>true</code>
-if its name matches <code>roleName</code>, and scope matches <code>scope</code>.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__roleMatcher" class="method item private">
-    <h3 class="name"><code>_roleMatcher</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Function</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1159"><code>roles&#x2F;roles_common.js:1159</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A role name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Function</span>:
-                    <p>A matcher function which accepts a role object and returns <code>true</code>
-if its name matches <code>roleName</code>.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__scopeMatcher" class="method item private">
-    <h3 class="name"><code>_scopeMatcher</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>scope</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Function</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1190"><code>roles&#x2F;roles_common.js:1190</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">scope</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A scope to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Function</span>:
-                    <p>A matcher function which accepts a role object and returns <code>true</code>
-if its scope matches <code>scope</code>.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__usersInRoleQuery" class="method item private">
-    <h3 class="name"><code>_usersInRoleQuery</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[queryOptions]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l965"><code>roles&#x2F;roles_common.js:965</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles. If array, users
-returned will have at least one of the roles
-specified but need not have <em>all</em> roles.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope to restrict roles to; user's global
-roles will also be checked</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-<li><code>queryOptions</code>: options which are passed directly
-through to <code>Meteor.users.find(query, options)</code></li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[queryOptions]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>Meteor.users.find(query, options)</code></p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>Object with <code>query</code> and <code>queryOptions</code>.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_addRolesToParent" class="method item">
-    <h3 class="name"><code>addRolesToParent</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>rolesNames</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l192"><code>roles&#x2F;roles_common.js:192</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add role parent to roles.</p>
-<p>Previous parents are kept (role can have multiple parents). For users which have the
-parent role set, new subroles are added automatically.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">rolesNames</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of role(s).</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_addUsersToRoles" class="method item">
-    <h3 class="name"><code>addUsersToRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l378"><code>roles&#x2F;roles_common.js:378</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add users to roles.</p>
-<p>Adds roles to existing roles for each user.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.addUsersToRoles(userId, 'admin')
-Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
-Roles.addUsersToRoles([user1, user2], ['user','editor'])
-Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_createRole" class="method item">
-    <h3 class="name"><code>createRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">String</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l51"><code>roles&#x2F;roles_common.js:51</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Create a new role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>unlessExists</code>: if <code>true</code>, exception will not be thrown in the role already exists</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">String</span>:
-                    <p>ID of the new role.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_deleteRole" class="method item">
-    <h3 class="name"><code>deleteRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l82"><code>roles&#x2F;roles_common.js:82</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Delete an existing role.</p>
-<p>If the role is set for any user, it is automatically unset.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_getAllRoles" class="method item">
-    <h3 class="name"><code>getAllRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code class="optional">[queryOptions]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l919"><code>roles&#x2F;roles_common.js:919</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve cursor of all existing roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name optional">[queryOptions]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>Meteor.roles.find(query, options)</code>.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Cursor</span>:
-                    <p>Cursor of existing roles.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getGroupsForUser" class="method item deprecated">
-    <h3 class="name"><code>getGroupsForUser</code></h3>
-
-        <span class="paren">()</span>
-
-
-        <span class="flag deprecated">deprecated</span>
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1031"><code>roles&#x2F;roles_common.js:1031</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Deprecated. Use <code>getScopesForUser</code> instead.</p>
-
-    </div>
-
-
-
-
-</div>
-<div id="method_getRolesForUser" class="method item">
-    <h3 class="name"><code>getRolesForUser</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l869"><code>roles&#x2F;roles_common.js:869</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve user's roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of scope to provide roles for; if not specified, global roles are returned</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-<li><code>fullObjects</code>: return full roles objects (<code>true</code>) or just names (<code>false</code>) (default <code>false</code>)</li>
-<li><code>onlyAssigned</code>: return only assigned roles and not automatically inferred (like subroles)</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array</span>:
-                    <p>Array of user's roles, unsorted.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getScopesForUser" class="method item">
-    <h3 class="name"><code>getScopesForUser</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[roles]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1047"><code>roles&#x2F;roles_common.js:1047</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve users scopes, if any.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[roles]</code>
-                        <span class="type">Array | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Name of roles to restrict scopes to.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array</span>:
-                    <p>Array of user's scopes, unsorted.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getUsersInRole" class="method item">
-    <h3 class="name"><code>getUsersInRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[queryOptions]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l934"><code>roles&#x2F;roles_common.js:934</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve all users who are in target role.</p>
-<p>Options:</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles. If array, users
-returned will have at least one of the roles
-specified but need not have <em>all</em> roles.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope to restrict roles to; user's global
-roles will also be checked</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-<li><code>queryOptions</code>: options which are passed directly
-through to <code>Meteor.users.find(query, options)</code></li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[queryOptions]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>Meteor.users.find(query, options)</code></p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Cursor</span>:
-                    <p>Cursor of users in roles.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_removeRolesFromParent" class="method item">
-    <h3 class="name"><code>removeRolesFromParent</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>rolesNames</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l296"><code>roles&#x2F;roles_common.js:296</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove role parent from roles.</p>
-<p>Other parents are kept (role can have multiple parents). For users which have the
-parent role set, removed subrole is removed automatically.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">rolesNames</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of role(s).</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_removeScope" class="method item">
-    <h3 class="name"><code>removeScope</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>name</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1112"><code>roles&#x2F;roles_common.js:1112</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove a scope.</p>
-<p>Roles assigned with a given scope are removed.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">name</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The name of a scope.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_removeUsersFromRoles" class="method item">
-    <h3 class="name"><code>removeUsersFromRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l608"><code>roles&#x2F;roles_common.js:608</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove users from assigned roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.removeUsersFromRoles(userId, 'admin')
-Roles.removeUsersFromRoles([userId, user2], ['editor'])
-Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_renameRole" class="method item">
-    <h3 class="name"><code>renameRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldName</code>
-                </li>
-                <li class="arg">
-                        <code>newName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l134"><code>roles&#x2F;roles_common.js:134</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Rename an existing role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Old name of a role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">newName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>New name of a role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_renameScope" class="method item">
-    <h3 class="name"><code>renameScope</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldName</code>
-                </li>
-                <li class="arg">
-                        <code>newName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l1079"><code>roles&#x2F;roles_common.js:1079</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Rename a scope.</p>
-<p>Roles assigned with a given scope are changed to be under the new scope.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Old name of a scope.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">newName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>New name of a scope.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_setUserRoles" class="method item">
-    <h3 class="name"><code>setUserRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l427"><code>roles&#x2F;roles_common.js:427</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Set users' roles.</p>
-<p>Replaces all existing roles with a new set of roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.setUserRoles(userId, 'admin')
-Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
-Roles.setUserRoles([user1, user2], ['user','editor'])
-Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_userIsInRole" class="method item">
-    <h3 class="name"><code>userIsInRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l771"><code>roles&#x2F;roles_common.js:771</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Check if user has specified roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles to check against. If array,
-will return <code>true</code> if user is in <em>any</em> role.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope; if supplied, limits check to just that scope;
-the user's global roles will always be checked whether scope is specified or not</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p><code>true</code> if user is in <em>any</em> of the target roles</p>
-
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>// global roles
-Roles.userIsInRole(user, 'admin')
-Roles.userIsInRole(user, ['admin','editor'])
-Roles.userIsInRole(userId, 'admin')
-Roles.userIsInRole(userId, ['admin','editor'])
-
-// scope roles (global roles are still checked)
-Roles.userIsInRole(user, 'admin', 'group1')
-Roles.userIsInRole(userId, ['admin','editor'], 'group1')
-Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})</code></pre>
-
-            </div>
-        </div>
-</div>
-            </div>
-
-            <div id="properties" class="api-class-tabpanel">
-                <h2 class="off-left">Properties</h2>
-
-<div id="property_GLOBAL_GROUP" class="property item deprecated">
-    <h3 class="name"><code>GLOBAL_GROUP</code></h3>
-    <span class="type">Unknown</span>
-
-        <span class="flag deprecated">deprecated</span>
-
-
-
-        <span class="flag static">static</span>
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common.js.html#l42"><code>roles&#x2F;roles_common.js:42</code></a>
-        </p>
-
-
-    </div>
-
-    <div class="description">
-        <p>Used as a global group (now scope) name. Not used anymore.</p>
-
-    </div>
-
-
-
-</div>
-<div id="property_subscription" class="property item">
-    <h3 class="name"><code>subscription</code></h3>
-    <span class="type">Object</span>
-
-
-
-
-        <span class="flag static">static</span>
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_client_subscriptions.js.html#l3"><code>roles&#x2F;client&#x2F;subscriptions.js:3</code></a>
-        </p>
-
-
-    </div>
-
-    <div class="description">
-        <p>Subscription handle for the collection of all existing roles.</p>
-
-    </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.subscription.ready(); // true if roles have been loaded</code></pre>
-
-            </div>
-        </div>
-
-</div>
-            </div>
-
-
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
deleted file mode 100644
index a479f19280..0000000000
--- a/docs/classes/UIHelpers.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>UIHelpers - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>UIHelpers Class</h1>
-<div class="box meta">
-
-
-
-            Module: <a href="../modules/UIHelpers.html">UIHelpers</a>
-
-</div>
-
-
-<div class="box intro">
-    
-</div>
-
-
-<div id="classdocs" class="tabview">
-    <ul class="api-class-tabs">
-        <li class="api-class-tab index"><a href="#index">Index</a></li>
-
-            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
-    </ul>
-
-    <div>
-        <div id="index" class="api-class-tabpanel index">
-            <h2 class="off-left">Item Index</h2>
-
-                <div class="index-section methods">
-                    <h3>Methods</h3>
-
-                    <ul class="index-list methods">
-                            <li class="index-item method">
-                                <a href="#method_isInRole">isInRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                    </ul>
-                </div>
-
-
-
-        </div>
-
-            <div id="methods" class="api-class-tabpanel">
-                <h2 class="off-left">Methods</h2>
-
-<div id="method_isInRole" class="method item">
-    <h3 class="name"><code>isInRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>role</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[scope]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_client_uiHelpers.js.html#l24"><code>roles&#x2F;client&#x2F;uiHelpers.js:24</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>UI helper to check if current user is in at least one
-of the target roles.  For use in client-side templates.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">role</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or comma-seperated list of roles.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[scope]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Optional, name of scope to check.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p><code>true</code> if current user is in at least one of the target roles.</p>
-
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>{{#if isInRole 'admin'}}
-{{/if}}
-
-{{#if isInRole 'editor,user'}}
-{{/if}}
-
-{{#if isInRole 'editor,user' 'scope1'}}
-{{/if}}</code></pre>
-
-            </div>
-        </div>
-</div>
-            </div>
-
-
-
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/classes/index.html b/docs/classes/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/classes/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/docs/data.json b/docs/data.json
deleted file mode 100644
index 96ce33d73a..0000000000
--- a/docs/data.json
+++ /dev/null
@@ -1,1260 +0,0 @@
-{
-    "project": {
-        "name": "The meteor-roles API",
-        "description": "The meteor-roles API: an authorization package for Meteor",
-        "version": "v1.2.14"
-    },
-    "files": {
-        "roles/client/subscriptions.js": {
-            "name": "roles/client/subscriptions.js",
-            "modules": {},
-            "classes": {},
-            "fors": {
-                "Roles": 1
-            },
-            "namespaces": {}
-        },
-        "roles/client/uiHelpers.js": {
-            "name": "roles/client/uiHelpers.js",
-            "modules": {
-                "UIHelpers": 1
-            },
-            "classes": {},
-            "fors": {
-                "UIHelpers": 1
-            },
-            "namespaces": {}
-        },
-        "roles/roles_common.js": {
-            "name": "roles/roles_common.js",
-            "modules": {
-                "Roles": 1
-            },
-            "classes": {
-                "Roles": 1
-            },
-            "fors": {},
-            "namespaces": {}
-        },
-        "roles/roles_server.js": {
-            "name": "roles/roles_server.js",
-            "modules": {},
-            "classes": {},
-            "fors": {
-                "Roles": 1
-            },
-            "namespaces": {}
-        }
-    },
-    "modules": {
-        "UIHelpers": {
-            "name": "UIHelpers",
-            "submodules": {},
-            "elements": {},
-            "classes": {
-                "UIHelpers": 1
-            },
-            "fors": {
-                "UIHelpers": 1
-            },
-            "namespaces": {},
-            "tag": "module",
-            "file": "roles/client/uiHelpers.js",
-            "line": 3,
-            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
-        },
-        "Roles": {
-            "name": "Roles",
-            "submodules": {},
-            "elements": {},
-            "classes": {
-                "Roles": 1
-            },
-            "fors": {
-                "Roles": 1
-            },
-            "namespaces": {},
-            "tag": "module",
-            "file": "roles/roles_common.js",
-            "line": 29,
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nIt uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following\nschema:\n - `_id`: role name\n - `scope`: scope name\n - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)\n\nRoles themselves are accessible throgh `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: \"admin\", children: [{_id: \"editor\"}]}`"
-        }
-    },
-    "classes": {
-        "Roles": {
-            "name": "Roles",
-            "shortname": "Roles",
-            "classitems": [],
-            "plugins": [],
-            "extensions": [],
-            "plugin_for": [],
-            "extension_for": [],
-            "module": "Roles",
-            "file": "roles/roles_common.js",
-            "line": 29
-        },
-        "UIHelpers": {
-            "name": "UIHelpers",
-            "shortname": "UIHelpers",
-            "classitems": [],
-            "plugins": [],
-            "extensions": [],
-            "plugin_for": [],
-            "extension_for": [],
-            "module": "UIHelpers",
-            "namespace": ""
-        }
-    },
-    "elements": {},
-    "classitems": [
-        {
-            "file": "roles/client/subscriptions.js",
-            "line": 3,
-            "description": "Subscription handle for the collection of all existing roles.",
-            "example": [
-                "\n\n    Roles.subscription.ready(); // true if roles have been loaded"
-            ],
-            "itemtype": "property",
-            "name": "subscription",
-            "type": "Object",
-            "static": 1,
-            "class": "Roles"
-        },
-        {
-            "file": "roles/client/uiHelpers.js",
-            "line": 24,
-            "description": "UI helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
-            "example": [
-                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'scope1'}}\n    {{/if}}"
-            ],
-            "itemtype": "method",
-            "name": "isInRole",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "Name of role or comma-seperated list of roles.",
-                    "type": "String"
-                },
-                {
-                    "name": "scope",
-                    "description": "Optional, name of scope to check.",
-                    "type": "String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "`true` if current user is in at least one of the target roles.",
-                "type": "Boolean"
-            },
-            "static": 1,
-            "class": "UIHelpers",
-            "module": "UIHelpers"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 42,
-            "description": "Used as a global group (now scope) name. Not used anymore.",
-            "itemtype": "property",
-            "name": "GLOBAL_GROUP",
-            "static": 1,
-            "deprecated": true,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 51,
-            "description": "Create a new role.",
-            "itemtype": "method",
-            "name": "createRole",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `unlessExists`: if `true`, exception will not be thrown in the role already exists",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "ID of the new role.",
-                "type": "String"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 82,
-            "description": "Delete an existing role.\n\nIf the role is set for any user, it is automatically unset.",
-            "itemtype": "method",
-            "name": "deleteRole",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 134,
-            "description": "Rename an existing role.",
-            "itemtype": "method",
-            "name": "renameRole",
-            "params": [
-                {
-                    "name": "oldName",
-                    "description": "Old name of a role.",
-                    "type": "String"
-                },
-                {
-                    "name": "newName",
-                    "description": "New name of a role.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 192,
-            "description": "Add role parent to roles.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
-            "itemtype": "method",
-            "name": "addRolesToParent",
-            "params": [
-                {
-                    "name": "rolesNames",
-                    "description": "Name(s) of role(s).",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 212,
-            "itemtype": "method",
-            "name": "_addRoleToParent",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 296,
-            "description": "Remove role parent from roles.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
-            "itemtype": "method",
-            "name": "removeRolesFromParent",
-            "params": [
-                {
-                    "name": "rolesNames",
-                    "description": "Name(s) of role(s).",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 316,
-            "itemtype": "method",
-            "name": "_removeRoleFromParent",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 378,
-            "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
-            "example": [
-                "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
-            ],
-            "itemtype": "method",
-            "name": "addUsersToRoles",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 427,
-            "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
-            "example": [
-                "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
-            ],
-            "itemtype": "method",
-            "name": "setUserRoles",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 488,
-            "description": "Add one user to one role.",
-            "itemtype": "method",
-            "name": "_addUserToRole",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or object with an `_id` field.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roleName",
-                    "description": "Name of the role to add the user to. The role have to exist.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only add users to an assigned role\n    should the role be set as assigned (`true`), `null` is the same as `false`,\n    only that it does not force the value to `false` if the role is already assigned",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Roles set during the call (even those already set).",
-                "type": "Array"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 608,
-            "description": "Remove users from assigned roles.",
-            "example": [
-                "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
-            ],
-            "itemtype": "method",
-            "name": "removeUsersFromRoles",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 655,
-            "description": "Remove one user from one role.\n\nWARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same\nrole to be a child of multiple roles it might happen that it removes some subroles which\nit should not because they are in effect also through some other parent role. You should always\ncall `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a\nparticular user.",
-            "itemtype": "method",
-            "name": "_removeUserFromRole",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or object with an `_id` field.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roleName",
-                    "description": "Name of the role to add the user to. The role have to exist.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `_assigned`: internal option, should not be used publicly because it will break assumptions\n    in te code; publicly, you can only remove users from an assigned role\n    if `true`, only manually assigned roles are removed, if `false`, only automatically\n    assigned roles are removed, if `null`, any role is removed",
-                    "type": "Object"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 723,
-            "description": "Makes sure all subroles are correctly set, and no extra subroles are set which should not be.\n\nUsed internally after complicated changes, but it can also be used whenever one feels that\nthere might be inconsistencies (eg., after a crash).\n\nWe simply re-set to the user their assigned roles again and remove any roles which\nare marked as not explicitly assigned, and have not been part of what we currently set.",
-            "itemtype": "method",
-            "name": "_assureConsistency",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 771,
-            "description": "Check if user has specified roles.",
-            "example": [
-                "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // scope roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})"
-            ],
-            "itemtype": "method",
-            "name": "userIsInRole",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles to check against. If array,\n                            will return `true` if user is in _any_ role.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope; if supplied, limits check to just that scope;\n    the user's global roles will always be checked whether scope is specified or not\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "`true` if user is in _any_ of the target roles",
-                "type": "Boolean"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 869,
-            "description": "Retrieve user's roles.",
-            "itemtype": "method",
-            "name": "getRolesForUser",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of scope to provide roles for; if not specified, global roles are returned\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `fullObjects`: return full roles objects (`true`) or just names (`false`) (default `false`)\n  - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Array of user's roles, unsorted.",
-                "type": "Array"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 919,
-            "description": "Retrieve cursor of all existing roles.",
-            "itemtype": "method",
-            "name": "getAllRoles",
-            "params": [
-                {
-                    "name": "queryOptions",
-                    "description": "Options which are passed directly\n                               through to `Meteor.roles.find(query, options)`.",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor of existing roles.",
-                "type": "Cursor"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 934,
-            "description": "Retrieve all users who are in target role.\n\nOptions:",
-            "itemtype": "method",
-            "name": "getUsersInRole",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                },
-                {
-                    "name": "queryOptions",
-                    "description": "Options which are passed directly\n                               through to `Meteor.users.find(query, options)`",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor of users in roles.",
-                "type": "Cursor"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 965,
-            "itemtype": "method",
-            "name": "_usersInRoleQuery",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                },
-                {
-                    "name": "queryOptions",
-                    "description": "Options which are passed directly\n                               through to `Meteor.users.find(query, options)`",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Object with `query` and `queryOptions`.",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1031,
-            "description": "Deprecated. Use `getScopesForUser` instead.",
-            "itemtype": "method",
-            "name": "getGroupsForUser",
-            "static": 1,
-            "deprecated": true,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1047,
-            "description": "Retrieve users scopes, if any.",
-            "itemtype": "method",
-            "name": "getScopesForUser",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name of roles to restrict scopes to.",
-                    "type": "Array|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Array of user's scopes, unsorted.",
-                "type": "Array"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1079,
-            "description": "Rename a scope.\n\nRoles assigned with a given scope are changed to be under the new scope.",
-            "itemtype": "method",
-            "name": "renameScope",
-            "params": [
-                {
-                    "name": "oldName",
-                    "description": "Old name of a scope.",
-                    "type": "String"
-                },
-                {
-                    "name": "newName",
-                    "description": "New name of a scope.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1112,
-            "description": "Remove a scope.\n\nRoles assigned with a given scope are removed.",
-            "itemtype": "method",
-            "name": "removeScope",
-            "params": [
-                {
-                    "name": "name",
-                    "description": "The name of a scope.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1133,
-            "description": "Resolves the user ID into an actual user object with `roles` field,\nif it is not already.",
-            "itemtype": "method",
-            "name": "_resolveUser",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "force",
-                    "description": "Load a new user object even if it is already one.",
-                    "type": "Boolean"
-                }
-            ],
-            "return": {
-                "description": "User object.",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1159,
-            "itemtype": "method",
-            "name": "_roleMatcher",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "A role name to match against.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "A matcher function which accepts a role object and returns `true`\n                    if its name matches `roleName`.",
-                "type": "Function"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1173,
-            "itemtype": "method",
-            "name": "_roleAndScopeMatcher",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "A role name to match against.",
-                    "type": "String"
-                },
-                {
-                    "name": "scope",
-                    "description": "A scope to match against.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "A matcher function which accepts a role object and returns `true`\n                    if its name matches `roleName`, and scope matches `scope`.",
-                "type": "Function"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1190,
-            "itemtype": "method",
-            "name": "_scopeMatcher",
-            "params": [
-                {
-                    "name": "scope",
-                    "description": "A scope to match against.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "A matcher function which accepts a role object and returns `true`\n                   if its scope matches `scope`.",
-                "type": "Function"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1206,
-            "itemtype": "method",
-            "name": "_onlyAssignedMatcher",
-            "return": {
-                "description": "A matcher function which accepts a role object and returns `true`\n                    if the role is an assigned role.",
-                "type": "Function"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1219,
-            "description": "Throw an exception if `roleName` is an invalid role name.",
-            "itemtype": "method",
-            "name": "_checkRoleName",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "A role name to match against.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1233,
-            "description": "Normalize options.",
-            "itemtype": "method",
-            "name": "_normalizeOptions",
-            "params": [
-                {
-                    "name": "options",
-                    "description": "Options to normalize.",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Normalized options.",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1254,
-            "description": "Normalize scope name.",
-            "itemtype": "method",
-            "name": "_normalizeScopeName",
-            "params": [
-                {
-                    "name": "scopeName",
-                    "description": "A scope name to normalize.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "Normalized scope name.",
-                "type": "String"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1273,
-            "description": "Throw an exception if `scopeName` is an invalid scope name.",
-            "itemtype": "method",
-            "name": "_checkRoleName",
-            "params": [
-                {
-                    "name": "scopeName",
-                    "description": "A scope name to match against.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common.js",
-            "line": 1289,
-            "params": [
-                {
-                    "name": "string",
-                    "description": "Input string.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "Trimmed string.",
-                "type": "String"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 27,
-            "itemtype": "method",
-            "name": "_isNewRole",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "`Meteor.roles` document.",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Returns `true` if the `role` is in the new format.\n                  If it is ambiguous or it is not, returns `false`.",
-                "type": "Boolean"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 40,
-            "itemtype": "method",
-            "name": "_isOldRole",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "`Meteor.roles` document.",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Returns `true` if the `role` is in the old format.\n                  If it is ambiguous or it is not, returns `false`.",
-                "type": "Boolean"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 53,
-            "itemtype": "method",
-            "name": "_isNewField",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "`Meteor.users` document `roles` field.",
-                    "type": "Array"
-                }
-            ],
-            "return": {
-                "description": "Returns `true` if the `roles` field is in the new format.\n                  If it is ambiguous or it is not, returns `false`.",
-                "type": "Boolean"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 66,
-            "itemtype": "method",
-            "name": "_isOldField",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "`Meteor.users` document `roles` field.",
-                    "type": "Array"
-                }
-            ],
-            "return": {
-                "description": "Returns `true` if the `roles` field is in the old format.\n                  If it is ambiguous or it is not, returns `false`.",
-                "type": "Boolean"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 79,
-            "itemtype": "method",
-            "name": "_convertToNewRole",
-            "params": [
-                {
-                    "name": "oldRole",
-                    "description": "`Meteor.roles` document.",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Converted `role` to the new format.",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 96,
-            "itemtype": "method",
-            "name": "_convertToOldRole",
-            "params": [
-                {
-                    "name": "newRole",
-                    "description": "`Meteor.roles` document.",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Converted `role` to the old format.",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 112,
-            "itemtype": "method",
-            "name": "_convertToNewField",
-            "params": [
-                {
-                    "name": "oldRoles",
-                    "description": "`Meteor.users` document `roles` field in the old format.",
-                    "type": "Array"
-                },
-                {
-                    "name": "convertUnderscoresToDots",
-                    "description": "Should we convert underscores to dots in group names.",
-                    "type": "Boolean"
-                }
-            ],
-            "return": {
-                "description": "Converted `roles` to the new format.",
-                "type": "Array"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 158,
-            "itemtype": "method",
-            "name": "_convertToOldField",
-            "params": [
-                {
-                    "name": "newRoles",
-                    "description": "`Meteor.users` document `roles` field in the new format.",
-                    "type": "Array"
-                },
-                {
-                    "name": "usingGroups",
-                    "description": "Should we use groups or not.",
-                    "type": "Boolean"
-                }
-            ],
-            "return": {
-                "description": "Converted `roles` to the old format.",
-                "type": "Array"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 207,
-            "itemtype": "method",
-            "name": "_defaultUpdateUser",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "`Meteor.users` document.",
-                    "type": "Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Value to which user's `roles` field should be set.",
-                    "type": "Array|Object"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 225,
-            "itemtype": "method",
-            "name": "_defaultUpdateRole",
-            "params": [
-                {
-                    "name": "oldRole",
-                    "description": "Old `Meteor.roles` document.",
-                    "type": "Object"
-                },
-                {
-                    "name": "newRole",
-                    "description": "New `Meteor.roles` document.",
-                    "type": "Object"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 238,
-            "itemtype": "method",
-            "name": "_dropCollectionIndex",
-            "params": [
-                {
-                    "name": "collection",
-                    "description": "Collection on which to drop the index.",
-                    "type": "Object"
-                },
-                {
-                    "name": "indexName",
-                    "description": "Name of the index to drop.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 255,
-            "description": "Migrates `Meteor.users` and `Meteor.roles` to the new format.",
-            "itemtype": "method",
-            "name": "_forwardMigrate",
-            "params": [
-                {
-                    "name": "updateUser",
-                    "description": "Function which updates the user object. Default `_defaultUpdateUser`.",
-                    "type": "Function"
-                },
-                {
-                    "name": "updateRole",
-                    "description": "Function which updates the role object. Default `_defaultUpdateRole`.",
-                    "type": "Function"
-                },
-                {
-                    "name": "convertUnderscoresToDots",
-                    "description": "Should we convert underscores to dots in group names.",
-                    "type": "Boolean"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_server.js",
-            "line": 285,
-            "description": "Migrates `Meteor.users` and `Meteor.roles` to the old format.\n\nWe assume that we are converting back a failed migration, so values can only be\nwhat were valid values in the old format. So no group names starting with `$` and\nno subroles.",
-            "itemtype": "method",
-            "name": "_backwardMigrate",
-            "params": [
-                {
-                    "name": "updateUser",
-                    "description": "Function which updates the user object. Default `_defaultUpdateUser`.",
-                    "type": "Function"
-                },
-                {
-                    "name": "updateRole",
-                    "description": "Function which updates the role object. Default `_defaultUpdateRole`.",
-                    "type": "Function"
-                },
-                {
-                    "name": "usingGroups",
-                    "description": "Should we use groups or not.",
-                    "type": "Boolean"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        }
-    ],
-    "warnings": [
-        {
-            "message": "Missing item type",
-            "line": " roles/roles_common.js:1289"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/docs/elements/index.html b/docs/elements/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/elements/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/docs/files/index.html b/docs/files/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/files/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/docs/files/roles_client_subscriptions.js.html b/docs/files/roles_client_subscriptions.js.html
deleted file mode 100644
index 9e42a836e3..0000000000
--- a/docs/files/roles_client_subscriptions.js.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>roles/client/subscriptions.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1 class="file-heading">File: roles/client/subscriptions.js</h1>
-
-<div class="file">
-    <pre class="code prettyprint linenums">
-&quot;use strict&quot;;
-
-/**
- * Subscription handle for the collection of all existing roles.
- *
- * @example
- *
- *     Roles.subscription.ready(); // true if roles have been loaded
- *
- * @property subscription
- * @type Object
- * @for Roles
- * @static
- */
-
-Tracker.autorun(function () {
-  Roles.subscription = Meteor.subscribe(&#x27;_roles&#x27;);
-});
-
-    </pre>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/files/roles_client_uiHelpers.js.html b/docs/files/roles_client_uiHelpers.js.html
deleted file mode 100644
index 409cf920c2..0000000000
--- a/docs/files/roles_client_uiHelpers.js.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>roles/client/uiHelpers.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1 class="file-heading">File: roles/client/uiHelpers.js</h1>
-
-<div class="file">
-    <pre class="code prettyprint linenums">
-&quot;use strict&quot;
-
-/**
- * Convenience functions for use on client.
- *
- * NOTE: You must restrict user actions on the server-side; any
- * client-side checks are strictly for convenience and must not be
- * trusted.
- *
- * @module UIHelpers
- */
-
-
-////////////////////////////////////////////////////////////
-// UI helpers
-//
-// Use a semi-private variable rather than declaring UI
-// helpers directly so that we can unit test the helpers.
-// XXX For some reason, the UI helpers are not registered 
-// before the tests run.
-//
-Roles._uiHelpers = {
-
-  /**
-   * UI helper to check if current user is in at least one
-   * of the target roles.  For use in client-side templates.
-   *
-   * @example
-   *     {{#if isInRole &#x27;admin&#x27;}}
-   *     {{/if}}
-   *
-   *     {{#if isInRole &#x27;editor,user&#x27;}}
-   *     {{/if}}
-   *
-   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;scope1&#x27;}}
-   *     {{/if}}
-   *
-   * @method isInRole
-   * @param {String} role Name of role or comma-seperated list of roles.
-   * @param {String} [scope] Optional, name of scope to check.
-   * @return {Boolean} &#x60;true&#x60; if current user is in at least one of the target roles.
-   * @static
-   * @for UIHelpers 
-   */
-  isInRole: function (role, scope) {
-    var user = Meteor.user(),
-        comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;),
-        roles
-
-    if (!user) return false
-    if (!Match.test(role, String)) return false
-
-    if (comma !== -1) {
-      roles = _.reduce(role.split(&#x27;,&#x27;), function (memo, r) {
-        if (!r || !Roles._trim(r)) {
-          return memo
-        }
-        memo.push(Roles._trim(r))
-        return memo
-      }, [])
-    } else {
-      roles = [role]
-    }
-
-    if (Match.test(scope, String)) {
-      return Roles.userIsInRole(user, roles, scope)
-    }
-
-    return Roles.userIsInRole(user, roles)
-  }
-}
-
-
-
-////////////////////////////////////////////////////////////
-// Register UI helpers
-//
-
-if (Roles.debug &amp;&amp; console.log) {
-  console.log(&quot;[roles] Roles.debug =&quot;, Roles.debug)
-}
-
-if (&#x27;undefined&#x27; !== typeof Package.blaze &amp;&amp;
-    &#x27;undefined&#x27; !== typeof Package.blaze.Blaze &amp;&amp;
-    &#x27;function&#x27;  === typeof Package.blaze.Blaze.registerHelper) {
-  _.each(Roles._uiHelpers, function (func, name) {
-    if (Roles.debug &amp;&amp; console.log) {
-      console.log(&quot;[roles] registering Blaze helper &#x27;&quot; + name + &quot;&#x27;&quot;)
-    }
-    Package.blaze.Blaze.registerHelper(name, func) 
-  })
-}
-
-    </pre>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/files/roles_roles_common.js.html b/docs/files/roles_roles_common.js.html
deleted file mode 100644
index be0a17b66e..0000000000
--- a/docs/files/roles_roles_common.js.html
+++ /dev/null
@@ -1,1410 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>roles/roles_common.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1 class="file-heading">File: roles/roles_common.js</h1>
-
-<div class="file">
-    <pre class="code prettyprint linenums">
-;(function () {
-
-/**
- * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
- *
- * It uses &#x60;roles&#x60; field to &#x60;Meteor.users&#x60; documents which is an array of subdocuments with the following
- * schema:
- *  - &#x60;_id&#x60;: role name
- *  - &#x60;scope&#x60;: scope name
- *  - &#x60;assigned&#x60;: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)
- *
- * Roles themselves are accessible throgh &#x60;Meteor.roles&#x60; collection and documents consist of:
- *  - &#x60;_id&#x60;: role name
- *  - &#x60;children&#x60;: list of subdocuments:
- *    - &#x60;_id&#x60;
- *
- * Children list elements are subdocuments so that they can be easier extended in the future or by plugins.
- *
- * Roles can have multiple parents and can be children (subroles) of multiple roles.
- *
- * Example: &#x60;{_id: &quot;admin&quot;, children: [{_id: &quot;editor&quot;}]}&#x60;
- *
- * @module Roles
- */
- if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection(&quot;roles&quot;);
-}
-
-/**
- * @class Roles
- */
-if (&#x27;undefined&#x27; === typeof Roles) {
-  Roles = {};
-}
-
-&quot;use strict&quot;;
-
-var getGroupsForUserDeprecationWarning = false;
-
-_.extend(Roles, {
-
-  /**
-   * Used as a global group (now scope) name. Not used anymore.
-   *
-   * @property GLOBAL_GROUP
-   * @static
-   * @deprecated
-   */
-  GLOBAL_GROUP: null,
-
-  /**
-   * Create a new role.
-   *
-   * @method createRole
-   * @param {String} roleName Name of role.
-   * @param {Object} [options] Options:
-   *   - &#x60;unlessExists&#x60;: if &#x60;true&#x60;, exception will not be thrown in the role already exists
-   * @return {String} ID of the new role.
-   * @static
-   */
-  createRole: function (roleName, options) {
-    var match;
-
-    options = Roles._normalizeOptions(options);
-
-    Roles._checkRoleName(roleName);
-
-    options = _.defaults(options, {
-      unlessExists: false
-    });
-
-    var result = Meteor.roles.upsert({_id: roleName}, {$setOnInsert: {children: []}});
-
-    if (!result.insertedId) {
-      if (options.unlessExists) return null;
-      throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; already exists.&quot;);
-    }
-
-    return result.insertedId;
-  },
-
-  /**
-   * Delete an existing role.
-   *
-   * If the role is set for any user, it is automatically unset.
-   *
-   * @method deleteRole
-   * @param {String} roleName Name of role.
-   * @static
-   */
-  deleteRole: function (roleName) {
-    var roles;
-
-    Roles._checkRoleName(roleName);
-
-    // we first remove the role as a children, otherwise
-    // Roles._assureConsistency might re-add the role
-    Meteor.roles.update({}, {
-      $pull: {
-        children: {
-          _id: roleName
-        }
-      }
-    }, {multi: true});
-
-    Roles.getUsersInRole(roleName, {
-      anyScope: true,
-      queryOptions: {
-        fields: {
-          _id: 1,
-          roles: 1
-        }
-      }
-    }).forEach(function (user, index, cursor) {
-      // role can be assigned multiple times to the user, for multiple scopes
-      // we have to remove the role for each of those scopes
-      roles = _.filter(user.roles, Roles._roleMatcher(roleName));
-      _.each(roles, function (role) {
-        Roles._removeUserFromRole(user, roleName, {
-          scope: role.scope,
-          // we want to remove the role in any case
-          _assigned: null
-        });
-      });
-
-      // handle the edge case
-      Roles._assureConsistency(user);
-    });
-
-    // remove the role itself
-    Meteor.roles.remove({_id: roleName});
-  },
-
-  /**
-   * Rename an existing role.
-   *
-   * @method renameRole
-   * @param {String} oldName Old name of a role.
-   * @param {String} newName New name of a role.
-   * @static
-   */
-  renameRole: function (oldName, newName) {
-    var role,
-        count;
-
-    Roles._checkRoleName(oldName);
-    Roles._checkRoleName(newName);
-
-    if (oldName === newName) return;
-
-    role = Meteor.roles.findOne({_id: oldName});
-
-    if (!role) {
-      throw new Error(&quot;Role &#x27;&quot; + oldName + &quot;&#x27; does not exist.&quot;);
-    }
-
-    role._id = newName;
-
-    Meteor.roles.insert(role);
-
-    do {
-      count = Meteor.users.update({
-        roles: {
-          $elemMatch: {
-            _id: oldName
-          }
-        }
-      }, {
-        $set: {
-          &#x27;roles.$._id&#x27;: newName
-        }
-      }, {multi: true});
-    } while (count &gt; 0);
-
-    do {
-      count = Meteor.roles.update({
-        children: {
-          $elemMatch: {
-            _id: oldName
-          }
-        }
-      }, {
-        $set: {
-          &#x27;children.$._id&#x27;: newName
-        }
-      }, {multi: true});
-    } while (count &gt; 0);
-
-    Meteor.roles.remove({_id: oldName});
-  },
-
-  /**
-   * Add role parent to roles.
-   *
-   * Previous parents are kept (role can have multiple parents). For users which have the
-   * parent role set, new subroles are added automatically.
-   *
-   * @method addRolesToParent
-   * @param {Array|String} rolesNames Name(s) of role(s).
-   * @param {String} parentName Name of parent role.
-   * @static
-   */
-  addRolesToParent: function (rolesNames, parentName) {
-    // ensure arrays
-    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
-
-    _.each(rolesNames, function (roleName) {
-      Roles._addRoleToParent(roleName, parentName);
-    });
-  },
-
-  /**
-   * @method _addRoleToParent
-   * @param {String} roleName Name of role.
-   * @param {String} parentName Name of parent role.
-   * @private
-   * @static
-   */
-  _addRoleToParent: function (roleName, parentName) {
-    var role,
-        count,
-        parentRoles,
-        rolesToCheck,
-        alreadyCheckedRoles,
-        checkRoleName,
-        checkRole;
-
-    Roles._checkRoleName(roleName);
-    Roles._checkRoleName(parentName);
-
-    // query to get role&#x27;s children
-    role = Meteor.roles.findOne({_id: roleName});
-
-    if (!role) {
-      throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
-    }
-
-    // detect cycles
-    alreadyCheckedRoles = [];
-    rolesToCheck = _.pluck(role.children, &#x27;_id&#x27;);
-    while (rolesToCheck.length) {
-      checkRoleName = rolesToCheck.pop();
-      if (checkRoleName === parentName) {
-        throw new Error(&quot;Roles &#x27;&quot; + roleName + &quot;&#x27; and &#x27;&quot; + parentName + &quot;&#x27; would form a cycle.&quot;);
-      }
-      alreadyCheckedRoles.push(checkRoleName);
-
-      checkRole = Meteor.roles.findOne({_id: checkRoleName});
-
-      // This should not happen, but this is a problem to address at some other time.
-      if (!checkRole) continue;
-
-      rolesToCheck = _.union(rolesToCheck, _.difference(_.pluck(checkRole.children, &#x27;_id&#x27;), alreadyCheckedRoles));
-    }
-
-    count = Meteor.roles.update({
-      _id: parentName,
-      &#x27;children._id&#x27;: {
-        $ne: role._id
-      }
-    }, {
-      $addToSet: {
-        children: {
-          _id: role._id
-        }
-      }
-    });
-
-    // if there was no change, parent role might not exist, or role is
-    // already a subrole; in any case we do not have anything more to do
-    if (!count) return;
-
-    Roles.getUsersInRole(parentName, {
-      anyScope: true,
-      queryOptions: {
-        fields: {
-          _id: 1,
-          roles: 1
-        }
-      }
-    }).forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple scopes
-      // we have to assign a new subrole for each of those scopes
-      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
-      _.each(parentRoles, function (parentRole) {
-        Roles._addUserToRole(user, roleName, {
-          scope: parentRole.scope,
-          // we are assigning a subrole, so we set it as unassigned,
-          // but only if they do not already exist
-          _assigned: null
-        });
-      });
-    });
-  },
-
-  /**
-   * Remove role parent from roles.
-   *
-   * Other parents are kept (role can have multiple parents). For users which have the
-   * parent role set, removed subrole is removed automatically.
-   *
-   * @method removeRolesFromParent
-   * @param {Array|String} rolesNames Name(s) of role(s).
-   * @param {String} parentName Name of parent role.
-   * @static
-   */
-  removeRolesFromParent: function (rolesNames, parentName) {
-    // ensure arrays
-    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
-
-    _.each(rolesNames, function (roleName) {
-      Roles._removeRoleFromParent(roleName, parentName);
-    });
-  },
-
-  /**
-   * @method _removeRoleFromParent
-   * @param {String} roleName Name of role.
-   * @param {String} parentName Name of parent role.
-   * @private
-   * @static
-   */
-  _removeRoleFromParent: function (roleName, parentName) {
-    var role,
-        count,
-        parentRoles;
-
-    Roles._checkRoleName(roleName);
-    Roles._checkRoleName(parentName);
-
-    // check for role existence
-    // this would not really be needed, but we are trying to match addRolesToParent
-    role = Meteor.roles.findOne({_id: roleName}, {fields: {_id: 1}});
-
-    if (!role) {
-      throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
-    }
-
-    count = Meteor.roles.update({
-      _id: parentName
-    }, {
-      $pull: {
-        children: {
-          _id: role._id
-        }
-      }
-    });
-
-    // if there was no change, parent role might not exist, or role was
-    // already not a subrole; in any case we do not have anything more to do
-    if (!count) return;
-
-    Roles.getUsersInRole(parentName, {
-      anyScope: true,
-      queryOptions: {
-        fields: {
-          _id: 1,
-          roles: 1
-        }
-      }
-    }).forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple scopes
-      // we have to remove the subrole for each of those scopes
-      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
-      _.each(parentRoles, function (parentRole) {
-        Roles._removeUserFromRole(user, roleName, {
-          scope: parentRole.scope,
-          // but we want to remove it only if it was not also explicitly assigned
-          _assigned: false
-        });
-      });
-
-      // handle the edge case
-      Roles._assureConsistency(user);
-    });
-  },
-
-  /**
-   * Add users to roles.
-   *
-   * Adds roles to existing roles for each user.
-   *
-   * @example
-   *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;)
-   *     Roles.addUsersToRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
-   *     Roles.addUsersToRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
-   *     Roles.addUsersToRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
-   *
-   * @method addUsersToRoles
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  addUsersToRoles: function (users, roles, options) {
-    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
-    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
-
-    options = Roles._normalizeOptions(options);
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    Roles._checkScopeName(options.scope);
-
-    options = _.defaults(options, {
-      ifExists: false,
-      // internal option, should not be used publicly because it will break assumptions
-      // in te code; publicly, you can only add users to an assigned role
-      // should the role be set as assigned, default is &#x60;true&#x60;; &#x60;null&#x60; is the same as &#x60;false&#x60;,
-      // only that it does not force the value to &#x60;false&#x60; if the role is already assigned
-      _assigned: true
-    });
-
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
-        Roles._addUserToRole(user, role, options);
-      });
-    });
-  },
-
-  /**
-   * Set users&#x27; roles.
-   *
-   * Replaces all existing roles with a new set of roles.
-   *
-   * @example
-   *     Roles.setUserRoles(userId, &#x27;admin&#x27;)
-   *     Roles.setUserRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
-   *     Roles.setUserRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
-   *     Roles.setUserRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
-   *
-   * @method setUserRoles
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  setUserRoles: function (users, roles, options) {
-    var id;
-
-    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
-    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
-
-    options = Roles._normalizeOptions(options);
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    Roles._checkScopeName(options.scope);
-
-    options = _.defaults(options, {
-      ifExists: false,
-      // internal option, should not be used publicly because it will break assumptions
-      // in te code; publicly, you can only add users to an assigned role
-      // should the role be set as assigned, default is &#x60;true&#x60;; &#x60;null&#x60; is the same as &#x60;false&#x60;,
-      // only that it does not force the value to &#x60;false&#x60; if the role is already assigned
-      _assigned: true
-    });
-
-    _.each(users, function (user) {
-      if (_.isObject(user)) {
-        id = user._id;
-      }
-      else {
-        id = user;
-      }
-      // we first clear all roles for the user
-      Meteor.users.update(id, {$pull: {roles: {scope: options.scope}}});
-
-      // and then add all
-      _.each(roles, function (role) {
-        Roles._addUserToRole(user, role, options);
-      });
-    });
-  },
-
-  /**
-   * Add one user to one role.
-   *
-   * @method _addUserToRole
-   * @param {String|Object} user User ID or object with an &#x60;_id&#x60; field.
-   * @param {String} roleName Name of the role to add the user to. The role have to exist.
-   * @param {Object} options Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   *   - &#x60;_assigned&#x60;: internal option, should not be used publicly because it will break assumptions
-   *     in te code; publicly, you can only add users to an assigned role
-   *     should the role be set as assigned (&#x60;true&#x60;), &#x60;null&#x60; is the same as &#x60;false&#x60;,
-   *     only that it does not force the value to &#x60;false&#x60; if the role is already assigned
-   * @return {Array} Roles set during the call (even those already set).
-   * @private
-   * @static
-   */
-  _addUserToRole: function (user, roleName, options) {
-    var id,
-        role,
-        count,
-        setRoles;
-
-    Roles._checkRoleName(roleName);
-    Roles._checkScopeName(options.scope);
-
-    if (_.isObject(user)) {
-      id = user._id;
-    }
-    else {
-      id = user;
-    }
-
-    if (!id) return [];
-
-    role = Meteor.roles.findOne({_id: roleName}, {fields: {children: 1}});
-
-    if (!role) {
-      if (options.ifExists) {
-        return [];
-      }
-      else {
-        throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;);
-      }
-    }
-
-    // add new role if it is not already added
-    count = Meteor.users.update({
-      _id: id,
-      roles: {
-        $not: {
-          $elemMatch: {
-            _id: roleName,
-            scope: options.scope
-          }
-        }
-      }
-
-    }, {
-      $addToSet: {
-        roles: {
-          _id: roleName,
-          scope: options.scope,
-          // we want to make sure it is a boolean value
-          assigned: !!options._assigned
-        }
-      }
-    });
-
-    if (!count) {
-      // a role has not been added, it maybe already exists
-      if (options._assigned) {
-        // let&#x27;s make sure it is set as assigned
-        Meteor.users.update({
-          _id: id,
-          roles: {
-            $elemMatch: {
-              _id: roleName,
-              scope: options.scope
-            }
-          }
-
-        }, {
-          $set: {
-            &#x27;roles.$.assigned&#x27;: true
-          }
-        });
-      }
-      else if (options._assigned === false) {
-        // let&#x27;s make sure it is set as unassigned
-        Meteor.users.update({
-          _id: id,
-          roles: {
-            $elemMatch: {
-              _id: roleName,
-              scope: options.scope
-            }
-          }
-
-        }, {
-          $set: {
-            &#x27;roles.$.assigned&#x27;: false
-          }
-        });
-      }
-    }
-
-    setRoles = [{
-      _id: roleName,
-      scope: options.scope
-    }];
-
-    _.each(role.children, function (child) {
-      // subroles are set as unassigned, but only if they do not already exist
-      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, _.extend({}, options, {_assigned: null})));
-    });
-
-    return setRoles;
-  },
-
-  /**
-   * Remove users from assigned roles.
-   *
-   * @example
-   *     Roles.removeUsersFromRoles(userId, &#x27;admin&#x27;)
-   *     Roles.removeUsersFromRoles([userId, user2], [&#x27;editor&#x27;])
-   *     Roles.removeUsersFromRoles(userId, [&#x27;user&#x27;], &#x27;group1&#x27;)
-   *
-   * @method removeUsersFromRoles
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  removeUsersFromRoles: function (users, roles, options) {
-    if (!users) throw new Error (&quot;Missing &#x27;users&#x27; param.&quot;);
-    if (!roles) throw new Error (&quot;Missing &#x27;roles&#x27; param.&quot;);
-
-    options = Roles._normalizeOptions(options);
-
-    // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
-
-    Roles._checkScopeName(options.scope);
-
-    options = _.defaults(options, {
-      // internal option, should not be used publicly because it will break assumptions
-      // in te code; publicly, you can only remove users from an assigned role
-      // when should the role be removed, default is &#x60;true&#x60; which means only when it is assigned,
-      // &#x60;false&#x60; means when it is not assigned, and &#x60;null&#x60; means always
-      _assigned: true
-    });
-
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
-        Roles._removeUserFromRole(user, role, options);
-      });
-
-      // handle the edge case
-      Roles._assureConsistency(user);
-    });
-  },
-
-  /**
-   * Remove one user from one role.
-   *
-   * WARNING: It leaves user&#x27;s roles in a possibly inconsistent state. Because we allow the same
-   * role to be a child of multiple roles it might happen that it removes some subroles which
-   * it should not because they are in effect also through some other parent role. You should always
-   * call &#x60;_assureConsistency&#x60; after you are finished with calls to &#x60;_removeUserFromRole&#x60; for a
-   * particular user.
-   *
-   * @method _removeUserFromRole
-   * @param {String|Object} user User ID or object with an &#x60;_id&#x60; field.
-   * @param {String} roleName Name of the role to add the user to. The role have to exist.
-   * @param {Object} options Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;_assigned&#x60;: internal option, should not be used publicly because it will break assumptions
-   *     in te code; publicly, you can only remove users from an assigned role
-   *     if &#x60;true&#x60;, only manually assigned roles are removed, if &#x60;false&#x60;, only automatically
-   *     assigned roles are removed, if &#x60;null&#x60;, any role is removed
-   * @private
-   * @static
-   */
-  _removeUserFromRole: function (user, roleName, options) {
-    var id,
-        role,
-        update;
-
-    Roles._checkRoleName(roleName);
-    Roles._checkScopeName(options.scope);
-
-    if (_.isObject(user)) {
-      id = user._id;
-    }
-    else {
-      id = user;
-    }
-
-    if (!id) return;
-
-    update = {
-      $pull: {
-        roles: {
-          _id: roleName,
-          scope: options.scope
-        }
-      }
-    };
-
-    if (options._assigned) {
-      update.$pull.roles.assigned = true;
-    }
-    else if (options._assigned === false) {
-      update.$pull.roles.assigned = false;
-    }
-
-    // we try to remove the role in every case, whether the role really exists or not
-    Meteor.users.update(id, update);
-
-    role = Meteor.roles.findOne({_id: roleName}, {fields: {children: 1}});
-
-    // role does not exist, we do not anything more
-    if (!role) return;
-
-    _.each(role.children, function (child) {
-      // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child._id, _.extend({}, options, {_assigned: false}));
-    });
-  },
-
-  /**
-   * Makes sure all subroles are correctly set, and no extra subroles are set which should not be.
-   *
-   * Used internally after complicated changes, but it can also be used whenever one feels that
-   * there might be inconsistencies (eg., after a crash).
-   *
-   * We simply re-set to the user their assigned roles again and remove any roles which
-   * are marked as not explicitly assigned, and have not been part of what we currently set.
-   *
-   * @method _assureConsistency
-   * @param {String|Object} user User ID or an actual user object.
-   * @private
-   * @static
-   */
-  _assureConsistency: function (user) {
-    var roles,
-        setRoles;
-
-    // we want always the latest state
-    user = Roles._resolveUser(user, true);
-
-    // only assigned roles
-    roles = _.filter(user.roles, Roles._onlyAssignedMatcher());
-
-    setRoles = [];
-    _.each(roles, function (role) {
-      setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
-        scope: role.scope,
-        _assigned: role.assigned, // this is true
-        ifExists: true
-      }));
-    });
-
-    if (setRoles.length) {
-      // remove all extra entries which should not be there
-      Meteor.users.update(user._id, {
-        $pull: {
-          roles: {
-            $nor: _.map(setRoles, function (role) {return _.pick(role, &#x27;_id&#x27;, &#x27;scope&#x27;)})
-          }
-        }
-      });
-    }
-    else {
-      Meteor.users.update(user._id, {$set: {roles: []}});
-    }
-  },
-
-  /**
-   * Check if user has specified roles.
-   *
-   * @example
-   *     // global roles
-   *     Roles.userIsInRole(user, &#x27;admin&#x27;)
-   *     Roles.userIsInRole(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
-   *     Roles.userIsInRole(userId, &#x27;admin&#x27;)
-   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
-   *
-   *     // scope roles (global roles are still checked)
-   *     Roles.userIsInRole(user, &#x27;admin&#x27;, &#x27;group1&#x27;)
-   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
-   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], {scope: &#x27;group1&#x27;})
-   *
-   * @method userIsInRole
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
-   *                             will return &#x60;true&#x60; if user is in _any_ role.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope; if supplied, limits check to just that scope;
-   *     the user&#x27;s global roles will always be checked whether scope is specified or not
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *
-   * Alternatively, it can be a scope name string.
-   * @return {Boolean} &#x60;true&#x60; if user is in _any_ of the target roles
-   * @static
-   */
-  userIsInRole: function (user, roles, options) {
-    var id,
-        query;
-
-    options = Roles._normalizeOptions(options);
-
-    // ensure array to simplify code
-    if (!_.isArray(roles)) roles = [roles];
-
-    if (!roles.length) return false;
-
-    Roles._checkScopeName(options.scope);
-
-    options = _.defaults(options, {
-      anyScope: false
-    });
-
-    if (!user) return false;
-
-    if (_.isObject(user)) {
-      if (_.has(user, &#x27;roles&#x27;)) {
-        return _.some(roles, function (role) {
-          if (options.anyScope) {
-            return _.some(user.roles || [], Roles._roleMatcher(role));
-          }
-          else {
-            return _.some(user.roles || [], Roles._roleAndScopeMatcher(role, options.scope));
-          }
-        })
-      } else {
-        // missing roles field, try going direct via id
-        id = user._id;
-      }
-    } else {
-      id = user;
-    }
-
-    if (!id) return false;
-
-    if (options.anyScope) {
-      query = {
-        _id: id,
-        &#x27;roles._id&#x27;: {$in: roles}
-      };
-    }
-    else {
-      query = {
-        _id: id,
-        $or: [{
-          roles: {
-            $elemMatch: {
-              _id: {$in: roles},
-              scope: options.scope
-            }
-          }
-        }, {
-          roles: {
-            $elemMatch: {
-              _id: {$in: roles},
-              scope: null
-            }
-          }
-        }]
-      };
-    }
-
-    return !!Meteor.users.findOne(query, {fields: {_id: 1}});
-  },
-
-  /**
-   * Retrieve user&#x27;s roles.
-   *
-   * @method getRolesForUser
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of scope to provide roles for; if not specified, global roles are returned
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *   - &#x60;fullObjects&#x60;: return full roles objects (&#x60;true&#x60;) or just names (&#x60;false&#x60;) (default &#x60;false&#x60;)
-   *   - &#x60;onlyAssigned&#x60;: return only assigned roles and not automatically inferred (like subroles)
-   *
-   * Alternatively, it can be a scope name string.
-   * @return {Array} Array of user&#x27;s roles, unsorted.
-   * @static
-   */
-  getRolesForUser: function (user, options) {
-    var roles;
-
-    options = Roles._normalizeOptions(options);
-
-    Roles._checkScopeName(options.scope);
-
-    options = _.defaults(options, {
-      fullObjects: false,
-      onlyAssigned: false,
-      anyScope: false
-    });
-
-    user = Roles._resolveUser(user);
-
-    if (!user) return [];
-
-    if (options.anyScope) {
-      roles = user.roles || [];
-    }
-    else {
-      roles = _.filter(user.roles || [], Roles._scopeMatcher(options.scope));
-    }
-
-    if (options.onlyAssigned) {
-      roles = _.filter(roles, Roles._onlyAssignedMatcher());
-    }
-
-    if (options.fullObjects) {
-      return roles;
-    }
-
-    return _.uniq(_.pluck(roles, &#x27;_id&#x27;));
-  },
-
-  /**
-   * Retrieve cursor of all existing roles.
-   *
-   * @method getAllRoles
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to &#x60;Meteor.roles.find(query, options)&#x60;.
-   * @return {Cursor} Cursor of existing roles.
-   * @static
-   */
-  getAllRoles: function (queryOptions) {
-    queryOptions = queryOptions || {sort: {_id: 1}};
-
-    return Meteor.roles.find({}, queryOptions);
-  },
-
-  /**
-   * Retrieve all users who are in target role.
-   *
-   * Options:
-   *
-   * @method getUsersInRole
-   * @param {Array|String} roles Name of role or an array of roles. If array, users
-   *                             returned will have at least one of the roles
-   *                             specified but need not have _all_ roles.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
-   *     roles will also be checked
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *   - &#x60;queryOptions&#x60;: options which are passed directly
-   *     through to &#x60;Meteor.users.find(query, options)&#x60;
-   *
-   * Alternatively, it can be a scope name string.
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to &#x60;Meteor.users.find(query, options)&#x60;
-   * @return {Cursor} Cursor of users in roles.
-   * @static
-   */
-  getUsersInRole: function (roles, options, queryOptions) {
-    var result;
-
-    result = Roles._usersInRoleQuery(roles, options, queryOptions);
-
-    return Meteor.users.find(result.query, result.queryOptions);
-  },
-
-  /**
-   * @method _usersInRoleQuery
-   * @param {Array|String} roles Name of role or an array of roles. If array, users
-   *                             returned will have at least one of the roles
-   *                             specified but need not have _all_ roles.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
-   *     roles will also be checked
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *   - &#x60;queryOptions&#x60;: options which are passed directly
-   *     through to &#x60;Meteor.users.find(query, options)&#x60;
-   *
-   * Alternatively, it can be a scope name string.
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to &#x60;Meteor.users.find(query, options)&#x60;
-   * @return {Object} Object with &#x60;query&#x60; and &#x60;queryOptions&#x60;.
-   * @private
-   * @static
-   */
-  _usersInRoleQuery: function (roles, options, queryOptions) {
-    var query;
-
-    options = Roles._normalizeOptions(options);
-
-    // ensure array to simplify code
-    if (!_.isArray(roles)) roles = [roles];
-
-    Roles._checkScopeName(options.scope);
-
-    options = _.defaults(options, {
-      queryOptions: queryOptions || {},
-      anyScope: false
-    });
-
-    if (options.anyScope) {
-      query = {
-        &#x27;roles._id&#x27;: {$in: roles}
-      };
-    }
-    else {
-      query = {
-        $or: [{
-          roles: {
-            $elemMatch: {
-              _id: {$in: roles},
-              scope: options.scope
-            }
-          }
-        }, {
-          roles: {
-            $elemMatch: {
-              _id: {$in: roles},
-              scope: null
-            }
-          }
-        }]
-      };
-    }
-
-    return {
-      query: query,
-      queryOptions: options.queryOptions
-    }
-  },
-
-  /**
-   * Deprecated. Use &#x60;getScopesForUser&#x60; instead.
-   *
-   * @method getGroupsForUser
-   * @static
-   * @deprecated
-   */
-  getGroupsForUser: function (/*args*/) {
-    if (!getGroupsForUserDeprecationWarning) {
-      getGroupsForUserDeprecationWarning = true;
-      console &amp;&amp; console.warn(&quot;getGroupsForUser has been deprecated. Use getScopesForUser instead.&quot;);
-    }
-
-    return Roles.getScopesForUser.apply(this, arguments);
-  },
-
-  /**
-   * Retrieve users scopes, if any.
-   *
-   * @method getScopesForUser
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} [roles] Name of roles to restrict scopes to.
-   *
-   * @return {Array} Array of user&#x27;s scopes, unsorted.
-   * @static
-   */
-  getScopesForUser: function (user, roles) {
-    var scopes;
-
-    // ensure array to simplify code
-    if (roles &amp;&amp; !_.isArray(roles)) roles = [roles];
-
-    user = Roles._resolveUser(user);
-
-    if (!user) return [];
-
-    scopes = [];
-    _.each(user.roles || [], function (userRole) {
-      // == used on purpose.
-      if (userRole.scope == null) return;
-      if (roles &amp;&amp; !_.contains(roles, userRole._id)) return;
-
-      scopes.push(userRole.scope);
-    });
-
-    return _.uniq(scopes);
-  },
-
-  /**
-   * Rename a scope.
-   *
-   * Roles assigned with a given scope are changed to be under the new scope.
-   *
-   * @method renameScope
-   * @param {String} oldName Old name of a scope.
-   * @param {String} newName New name of a scope.
-   * @static
-   */
-  renameScope: function (oldName, newName) {
-    var count;
-
-    Roles._checkScopeName(oldName);
-    Roles._checkScopeName(newName);
-
-    if (oldName === newName) return;
-
-    do {
-      count = Meteor.users.update({
-        roles: {
-          $elemMatch: {
-            scope: oldName
-          }
-        }
-      }, {
-        $set: {
-          &#x27;roles.$.scope&#x27;: newName
-        }
-      }, {multi: true});
-    } while (count &gt; 0);
-  },
-
-  /**
-   * Remove a scope.
-   *
-   * Roles assigned with a given scope are removed.
-   *
-   * @method removeScope
-   * @param {String} name The name of a scope.
-   * @static
-   */
-  removeScope: function (name) {
-    Roles._checkScopeName(name);
-
-    Meteor.users.update({}, {
-      $pull: {
-        roles: {
-          scope: name
-        }
-      }
-    }, {multi: true});
-  },
-
-  /**
-   * Resolves the user ID into an actual user object with &#x60;roles&#x60; field,
-   * if it is not already.
-   *
-   * @method _resolveUser
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Boolean} force Load a new user object even if it is already one.
-   * @return {Object} User object.
-   * @private
-   * @static
-   */
-  _resolveUser: function (user, force) {
-    // TODO: We could use $elemMatch to limit returned fields here.
-    if (!_.isObject(user)) {
-      user = Meteor.users.findOne(
-               {_id: user},
-               {fields: {roles: 1}});
-    } else if (force || !_.has(user, &#x27;roles&#x27;)) {
-      user = Meteor.users.findOne(
-               {_id: user._id},
-               {fields: {roles: 1}});
-    }
-
-    return user;
-  },
-
-  /**
-   * @method _roleMatcher
-   * @param {String} roleName A role name to match against.
-   * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
-   *                     if its name matches &#x60;roleName&#x60;.
-   * @private
-   * @static
-   */
-  _roleMatcher: function (roleName) {
-    return function (userRole) {
-      return userRole._id === roleName;
-    };
-  },
-
-  /**
-   * @method _roleAndScopeMatcher
-   * @param {String} roleName A role name to match against.
-   * @param {String} scope A scope to match against.
-   * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
-   *                     if its name matches &#x60;roleName&#x60;, and scope matches &#x60;scope&#x60;.
-   * @private
-   * @static
-   */
-  _roleAndScopeMatcher: function (roleName, scope) {
-    return function (userRole) {
-      // == used on purpose in &quot;userRole.scope == null&quot;
-      return (userRole._id === roleName &amp;&amp; userRole.scope === scope) ||
-        (userRole._id === roleName &amp;&amp; (!_.has(userRole, &#x27;scope&#x27;) || userRole.scope == null));
-    };
-  },
-
-  /**
-   * @method _scopeMatcher
-   * @param {String} scope A scope to match against.
-   * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
-   *                    if its scope matches &#x60;scope&#x60;.
-   * @private
-   * @static
-   */
-  _scopeMatcher: function (scope) {
-    return function (userRole) {
-      // == used on purpose in &quot;userRole.scope == null&quot;
-      return (userRole.scope === scope) ||
-        (!_.has(userRole, &#x27;scope&#x27;) || userRole.scope == null);
-    };
-  },
-
-  /**
-   * @method _onlyAssignedMatcher
-   * @return {Function} A matcher function which accepts a role object and returns &#x60;true&#x60;
-   *                     if the role is an assigned role.
-   * @private
-   * @static
-   */
-  _onlyAssignedMatcher: function () {
-    return function (userRole) {
-      return !!userRole.assigned;
-    };
-  },
-
-  /**
-   * Throw an exception if &#x60;roleName&#x60; is an invalid role name.
-   *
-   * @method _checkRoleName
-   * @param {String} roleName A role name to match against.
-   * @private
-   * @static
-   */
-  _checkRoleName: function (roleName) {
-    if (!roleName || !_.isString(roleName) || Roles._trim(roleName) !== roleName) {
-      throw new Error(&quot;Invalid role name &#x27;&quot; + roleName + &quot;&#x27;.&quot;);
-    }
-  },
-
-  /**
-   * Normalize options.
-   *
-   * @method _normalizeOptions
-   * @param {Object} options Options to normalize.
-   * @return {Object} Normalized options.
-   * @private
-   * @static
-   */
-  _normalizeOptions: function (options) {
-    options = _.isUndefined(options) ? {} : options;
-
-    if (options === null || _.isString(options)) {
-      options = {scope: options};
-    }
-
-    options.scope = Roles._normalizeScopeName(options.scope);
-
-    return options;
-  },
-
-  /**
-   * Normalize scope name.
-   *
-   * @method _normalizeScopeName
-   * @param {String} scopeName A scope name to normalize.
-   * @return {String} Normalized scope name.
-   * @private
-   * @static
-   */
-  _normalizeScopeName: function (scopeName) {
-    // map undefined and null to null
-    if (scopeName == null) {
-      return null;
-    }
-    else {
-      return scopeName;
-    }
-  },
-
-  /**
-   * Throw an exception if &#x60;scopeName&#x60; is an invalid scope name.
-   *
-   * @method _checkRoleName
-   * @param {String} scopeName A scope name to match against.
-   * @private
-   * @static
-   */
-  _checkScopeName: function (scopeName) {
-    if (scopeName === null) return;
-
-    if (!scopeName || !_.isString(scopeName) || Roles._trim(scopeName) !== scopeName) {
-      throw new Error(&quot;Invalid scope name &#x27;&quot; + scopeName + &quot;&#x27;.&quot;);
-    }
-  },
-
-  /**
-   * @param {String} string Input string.
-   * @return {String} Trimmed string.
-   * @private
-   * @static
-   */
-  _trim: function (string) {
-    if (string.trim) {
-      return string.trim();
-    }
-    else {
-      return string.replace(/^\s+|\s+$/g, &#x27;&#x27;);
-    }
-  }
-
-});  // end _.extend(Roles ...)
-
-}());
-
-    </pre>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/files/roles_roles_server.js.html b/docs/files/roles_roles_server.js.html
deleted file mode 100644
index 92d1daedbd..0000000000
--- a/docs/files/roles_roles_server.js.html
+++ /dev/null
@@ -1,423 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>roles/roles_server.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1 class="file-heading">File: roles/roles_server.js</h1>
-
-<div class="file">
-    <pre class="code prettyprint linenums">
-&quot;use strict&quot;;
-
-// Create default indexes on users collection.
-// Index only on &quot;roles._id&quot; is not needed because the combined index works for it as well.
-Meteor.users._ensureIndex({&#x27;roles._id&#x27;: 1, &#x27;roles.scope&#x27;: 1});
-Meteor.users._ensureIndex({&#x27;roles.scope&#x27;: 1});
-
-/*
- * Publish logged-in user&#x27;s roles so client-side checks can work.
- *
- * Use a named publish function so clients can check &#x60;ready()&#x60; state.
- */
-Meteor.publish(&#x27;_roles&#x27;, function () {
-  var loggedInUserId = this.userId,
-      fields = {roles: 1};
-
-  if (!loggedInUserId) {
-    this.ready();
-    return;
-  }
-
-  return Meteor.users.find({_id: loggedInUserId},
-                           {fields: fields});
-});
-
-_.extend(Roles, {
-  /**
-   * @method _isNewRole
-   * @param {Object} role &#x60;Meteor.roles&#x60; document.
-   * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;role&#x60; is in the new format.
-   *                   If it is ambiguous or it is not, returns &#x60;false&#x60;.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _isNewRole: function (role) {
-    return !_.has(role, &#x27;name&#x27;) &amp;&amp; _.has(role, &#x27;children&#x27;);
-  },
-
-  /**
-   * @method _isOldRole
-   * @param {Object} role &#x60;Meteor.roles&#x60; document.
-   * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;role&#x60; is in the old format.
-   *                   If it is ambiguous or it is not, returns &#x60;false&#x60;.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _isOldRole: function (role) {
-    return _.has(role, &#x27;name&#x27;) &amp;&amp; !_.has(role, &#x27;children&#x27;);
-  },
-
-  /**
-   * @method _isNewField
-   * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field.
-   * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;roles&#x60; field is in the new format.
-   *                   If it is ambiguous or it is not, returns &#x60;false&#x60;.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _isNewField: function (roles) {
-    return _.isArray(roles) &amp;&amp; _.isObject(roles[0]);
-  },
-
-  /**
-   * @method _isOldField
-   * @param {Array} roles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field.
-   * @return {Boolean} Returns &#x60;true&#x60; if the &#x60;roles&#x60; field is in the old format.
-   *                   If it is ambiguous or it is not, returns &#x60;false&#x60;.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _isOldField: function (roles) {
-    return (_.isArray(roles) &amp;&amp; _.isString(roles[0])) || (_.isObject(roles) &amp;&amp; !_.isArray(roles));
-  },
-
-  /**
-   * @method _convertToNewRole
-   * @param {Object} oldRole &#x60;Meteor.roles&#x60; document.
-   * @return {Object} Converted &#x60;role&#x60; to the new format.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _convertToNewRole: function (oldRole) {
-    if (!_.isString(oldRole.name)) throw new Error(&quot;Role name &#x27;&quot; + oldRole.name + &quot;&#x27; is not a string.&quot;);
-
-    return {
-      _id: oldRole.name,
-      children: []
-    };
-  },
-
-  /**
-   * @method _convertToOldRole
-   * @param {Object} newRole &#x60;Meteor.roles&#x60; document.
-   * @return {Object} Converted &#x60;role&#x60; to the old format.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _convertToOldRole: function (newRole) {
-    if (!_.isString(newRole._id)) throw new Error(&quot;Role name &#x27;&quot; + newRole._id + &quot;&#x27; is not a string.&quot;);
-
-    return {
-      name: newRole._id
-    };
-  },
-
-  /**
-   * @method _convertToNewField
-   * @param {Array} oldRoles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the old format.
-   * @param {Boolean} convertUnderscoresToDots Should we convert underscores to dots in group names.
-   * @return {Array} Converted &#x60;roles&#x60; to the new format.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
-    var roles = [];
-    if (_.isArray(oldRoles)) {
-      _.each(oldRoles, function (role, index) {
-        if (!_.isString(role)) throw new Error(&quot;Role &#x27;&quot; + role + &quot;&#x27; is not a string.&quot;);
-
-        roles.push({
-          _id: role,
-          scope: null,
-          assigned: true
-        })
-      });
-    }
-    else if (_.isObject(oldRoles)) {
-      _.each(oldRoles, function (rolesArray, group) {
-        if (group === &#x27;__global_roles__&#x27;) {
-          group = null;
-        }
-        else if (convertUnderscoresToDots) {
-          // unescape
-          group = group.replace(/_/g, &#x27;.&#x27;);
-        }
-
-        _.each(rolesArray, function (role, index) {
-          if (!_.isString(role)) throw new Error(&quot;Role &#x27;&quot; + role + &quot;&#x27; is not a string.&quot;);
-
-          roles.push({
-            _id: role,
-            scope: group,
-            assigned: true
-          })
-        });
-      })
-    }
-    return roles;
-  },
-
-  /**
-   * @method _convertToOldField
-   * @param {Array} newRoles &#x60;Meteor.users&#x60; document &#x60;roles&#x60; field in the new format.
-   * @param {Boolean} usingGroups Should we use groups or not.
-   * @return {Array} Converted &#x60;roles&#x60; to the old format.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _convertToOldField: function (newRoles, usingGroups) {
-    var roles;
-
-    if (usingGroups) {
-      roles = {};
-    }
-    else {
-      roles = [];
-    }
-
-    _.each(newRoles, function (userRole, index) {
-      if (!_.isObject(userRole)) throw new Error(&quot;Role &#x27;&quot; + userRole + &quot;&#x27; is not an object.&quot;);
-
-      // We assume that we are converting back a failed migration, so values can only be
-      // what were valid values in 1.0. So no group names starting with $ and no subroles.
-
-      if (userRole.scope) {
-        if (!usingGroups) throw new Error(&quot;Role &#x27;&quot; + userRole._id + &quot;&#x27; with scope &#x27;&quot; + userRole.scope + &quot;&#x27; without enabled groups.&quot;);
-
-        // escape
-        var scope = userRole.scope.replace(/\./g, &#x27;_&#x27;);
-
-        if (scope[0] === &#x27;$&#x27;) throw new Error(&quot;Group name &#x27;&quot; + scope + &quot;&#x27; start with $.&quot;);
-
-        roles[scope] = roles[scope] || [];
-        roles[scope].push(userRole._id);
-      }
-      else {
-        if (usingGroups) {
-          roles.__global_roles__ = roles.__global_roles__ || [];
-          roles.__global_roles__.push(userRole._id);
-        }
-        else {
-          roles.push(userRole._id);
-        }
-      }
-    });
-    return roles;
-  },
-
-  /**
-   * @method _defaultUpdateUser
-   * @param {Object} user &#x60;Meteor.users&#x60; document.
-   * @param {Array|Object} roles Value to which user&#x27;s &#x60;roles&#x60; field should be set.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _defaultUpdateUser: function (user, roles) {
-    Meteor.users.update({
-      _id: user._id,
-      // making sure nothing changed in meantime
-      roles: user.roles
-    }, {
-      $set: {roles: roles}
-    });
-  },
-
-  /**
-   * @method _defaultUpdateRole
-   * @param {Object} oldRole Old &#x60;Meteor.roles&#x60; document.
-   * @param {Object} newRole New &#x60;Meteor.roles&#x60; document.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _defaultUpdateRole: function (oldRole, newRole) {
-    Meteor.roles.remove(oldRole._id);
-    Meteor.roles.insert(newRole);
-  },
-
-  /**
-   * @method _dropCollectionIndex
-   * @param {Object} collection Collection on which to drop the index.
-   * @param {String} indexName Name of the index to drop.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _dropCollectionIndex: function (collection, indexName) {
-    try {
-      collection._dropIndex(indexName);
-    } catch (e) {
-      if (e.name !== &#x27;MongoError&#x27;) throw e;
-      if (!/index not found/.test(e.err || e.errmsg)) throw e;
-    }
-  },
-
-  /**
-   * Migrates &#x60;Meteor.users&#x60; and &#x60;Meteor.roles&#x60; to the new format.
-   *
-   * @method _forwardMigrate
-   * @param {Function} updateUser Function which updates the user object. Default &#x60;_defaultUpdateUser&#x60;.
-   * @param {Function} updateRole Function which updates the role object. Default &#x60;_defaultUpdateRole&#x60;.
-   * @param {Boolean} convertUnderscoresToDots Should we convert underscores to dots in group names.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _forwardMigrate: function (updateUser, updateRole, convertUnderscoresToDots) {
-    updateUser = updateUser || Roles._defaultUpdateUser;
-    updateRole = updateRole || Roles._defaultUpdateRole;
-
-    Roles._dropCollectionIndex(Meteor.roles, &#x27;name_1&#x27;);
-
-    Meteor.roles.find().forEach(function (role, index, cursor) {
-      if (!Roles._isNewRole(role)) {
-        updateRole(role, Roles._convertToNewRole(role));
-      }
-    });
-
-    Meteor.users.find().forEach(function (user, index, cursor) {
-      if (!Roles._isNewField(user.roles)) {
-        updateUser(user, Roles._convertToNewField(user.roles, convertUnderscoresToDots));
-      }
-    });
-  },
-
-  /**
-   * Migrates &#x60;Meteor.users&#x60; and &#x60;Meteor.roles&#x60; to the old format.
-   *
-   * We assume that we are converting back a failed migration, so values can only be
-   * what were valid values in the old format. So no group names starting with &#x60;$&#x60; and
-   * no subroles.
-   *
-   * @method _backwardMigrate
-   * @param {Function} updateUser Function which updates the user object. Default &#x60;_defaultUpdateUser&#x60;.
-   * @param {Function} updateRole Function which updates the role object. Default &#x60;_defaultUpdateRole&#x60;.
-   * @param {Boolean} usingGroups Should we use groups or not.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _backwardMigrate: function (updateUser, updateRole, usingGroups) {
-    updateUser = updateUser || Roles._defaultUpdateUser;
-    updateRole = updateRole || Roles._defaultUpdateRole;
-
-    Roles._dropCollectionIndex(Meteor.users, &#x27;roles._id_1_roles.scope_1&#x27;);
-    Roles._dropCollectionIndex(Meteor.users, &#x27;roles.scope_1&#x27;);
-
-    Meteor.roles.find().forEach(function (role, index, cursor) {
-      if (!Roles._isOldRole(role)) {
-        updateRole(role, Roles._convertToOldRole(role));
-      }
-    });
-
-    Meteor.users.find().forEach(function (user, index, cursor) {
-      if (!Roles._isOldField(user.roles)) {
-        updateUser(user, Roles._convertToOldField(user.roles, usingGroups));
-      }
-    });
-  }
-});
-
-    </pre>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/index.html b/docs/index.html
deleted file mode 100644
index c7c6f6d394..0000000000
--- a/docs/index.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="./assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="./assets/css/main.css" id="site_styles">
-    <link rel="icon" href="./assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="./assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="./classes/Roles.html">Roles</a></li>
-                                <li><a href="./classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="./modules/Roles.html">Roles</a></li>
-                                <li><a href="./modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-    <div class="apidocs">
-        <div id="docs-main" class="content">
-            <p>
-            Browse to a module or class using the sidebar to view its API documentation.
-            </p>
-
-            <h2>Keyboard Shortcuts</h2>
-
-            <ul>
-                <li><p>Press <kbd>s</kbd> to focus the API search box.</p></li>
-
-                <li><p>Use <kbd>Up</kbd> and <kbd>Down</kbd> to select classes, modules, and search results.</p></li>
-
-                <li class="mac-only"><p>With the API search box or sidebar focused, use <kbd><span class="cmd">&#x2318;</span>-Left</kbd> or <kbd><span class="cmd">&#x2318;</span>-Right</kbd> to switch sidebar tabs.</p></li>
-
-                <li class="pc-only"><p>With the API search box or sidebar focused, use <kbd>Ctrl+Left</kbd> and <kbd>Ctrl+Right</kbd> to switch sidebar tabs.</p></li>
-            </ul>
-        </div>
-    </div>
-
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="./assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="./assets/js/yui-prettify.js"></script>
-<script src="./assets/../api.js"></script>
-<script src="./assets/js/api-filter.js"></script>
-<script src="./assets/js/api-list.js"></script>
-<script src="./assets/js/api-search.js"></script>
-<script src="./assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
deleted file mode 100644
index ea45ace279..0000000000
--- a/docs/modules/Roles.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Roles - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>Roles Module</h1>
-<div class="box clearfix meta">
-
-
-        <div class="foundat">
-            Defined in: <a href="../files/roles_roles_common.js.html#l29"><code>roles&#x2F;roles_common.js:29</code></a>
-        </div>
-
-</div>
-
-
-<div class="box intro">
-    <p>Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.</p>
-<p>It uses <code>roles</code> field to <code>Meteor.users</code> documents which is an array of subdocuments with the following
-schema:</p>
-<ul>
-<li><code>_id</code>: role name</li>
-<li><code>scope</code>: scope name</li>
-<li><code>assigned</code>: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)</li>
-</ul>
-<p>Roles themselves are accessible throgh <code>Meteor.roles</code> collection and documents consist of:</p>
-<ul>
-<li><code>_id</code>: role name</li>
-<li><code>children</code>: list of subdocuments:
-<ul>
-<li><code>_id</code></li>
-</ul>
-</li>
-</ul>
-<p>Children list elements are subdocuments so that they can be easier extended in the future or by plugins.</p>
-<p>Roles can have multiple parents and can be children (subroles) of multiple roles.</p>
-<p>Example: <code>{_id: &quot;admin&quot;, children: [{_id: &quot;editor&quot;}]}</code></p>
-
-</div>
-
-
-<div class="yui3-g">
-    <div class="yui3-u-1-2">
-            <p>This module provides the following classes:</p>
-
-            <ul class="module-classes">
-                <li class="module-class">
-                    <a href="../classes/Roles.html">
-                        Roles
-                    </a>
-                </li>
-            </ul>
-    </div>
-
-
-    <div class="yui3-u-1-2">
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/modules/UIHelpers.html b/docs/modules/UIHelpers.html
deleted file mode 100644
index 523881807e..0000000000
--- a/docs/modules/UIHelpers.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>UIHelpers - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v1.2.14</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>UIHelpers Module</h1>
-<div class="box clearfix meta">
-
-
-        <div class="foundat">
-            Defined in: <a href="../files/roles_client_uiHelpers.js.html#l3"><code>roles&#x2F;client&#x2F;uiHelpers.js:3</code></a>
-        </div>
-
-</div>
-
-
-<div class="box intro">
-    <p>Convenience functions for use on client.</p>
-<p>NOTE: You must restrict user actions on the server-side; any
-client-side checks are strictly for convenience and must not be
-trusted.</p>
-
-</div>
-
-
-<div class="yui3-g">
-    <div class="yui3-u-1-2">
-            <p>This module provides the following classes:</p>
-
-            <ul class="module-classes">
-                <li class="module-class">
-                    <a href="../classes/UIHelpers.html">
-                        UIHelpers
-                    </a>
-                </li>
-            </ul>
-    </div>
-
-
-    <div class="yui3-u-1-2">
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/modules/index.html b/docs/modules/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/modules/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..c8759c81fb
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,728 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "requires": {
+        "mime-types": "~2.1.18",
+        "negotiator": "0.6.1"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "asn1": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+      "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
+      "optional": true
+    },
+    "assert-plus": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+      "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
+      "optional": true
+    },
+    "async": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+      "optional": true
+    },
+    "aws-sign2": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+      "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
+      "optional": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "body-parser": {
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
+      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "~1.6.3",
+        "iconv-lite": "0.4.23",
+        "on-finished": "~2.3.0",
+        "qs": "6.5.2",
+        "raw-body": "2.3.3",
+        "type-is": "~1.6.16"
+      }
+    },
+    "boom": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+      "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
+      "requires": {
+        "hoek": "0.9.x"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+    },
+    "combined-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+      "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
+      "optional": true,
+      "requires": {
+        "delayed-stream": "0.0.5"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "cryptiles": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+      "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=",
+      "optional": true,
+      "requires": {
+        "boom": "0.4.x"
+      }
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+      "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
+      "optional": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+      "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
+      "optional": true
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "express": {
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+      "requires": {
+        "accepts": "~1.3.5",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.18.3",
+        "content-disposition": "0.5.2",
+        "content-type": "~1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.1.1",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.4",
+        "qs": "6.5.2",
+        "range-parser": "~1.2.0",
+        "safe-buffer": "5.1.2",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "statuses": "~1.4.0",
+        "type-is": "~1.6.16",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.4.0",
+        "unpipe": "~1.0.0"
+      }
+    },
+    "forever-agent": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+      "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA="
+    },
+    "form-data": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "integrity": "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=",
+      "optional": true,
+      "requires": {
+        "async": "~0.9.0",
+        "combined-stream": "~0.0.4",
+        "mime": "~1.2.11"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
+          "optional": true
+        }
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+    },
+    "hawk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+      "integrity": "sha1-h81JH5tG5OKurKM1QWdmiF0tHtk=",
+      "optional": true,
+      "requires": {
+        "boom": "0.4.x",
+        "cryptiles": "0.2.x",
+        "hoek": "0.9.x",
+        "sntp": "0.2.x"
+      }
+    },
+    "hoek": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU="
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      }
+    },
+    "http-signature": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+      "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
+      "optional": true,
+      "requires": {
+        "asn1": "0.1.11",
+        "assert-plus": "^0.1.5",
+        "ctype": "0.5.3"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ip-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-3.0.0.tgz",
+      "integrity": "sha512-T8wDtjy+Qf2TAPDQmBp0eGKJ8GavlWlUnamr3wRn6vvdZlKVuJXXMlSncYFRYgVHOM3If5NR1H4+OvVQU9Idvg==",
+      "optional": true
+    },
+    "ipaddr.js": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
+      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "linkify-it": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
+      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "markdown-it": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
+      "integrity": "sha1-PfNz2+pYepp/7z5WMRtokI91xBQ=",
+      "requires": {
+        "argparse": "~1.0.2",
+        "entities": "~1.1.1",
+        "linkify-it": "~1.2.0",
+        "mdurl": "~1.0.0",
+        "uc.micro": "^1.0.0"
+      }
+    },
+    "mdn-links": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/mdn-links/-/mdn-links-0.1.0.tgz",
+      "integrity": "sha1-4kyDuXy0xYhsw58veAcF+/4nOqU="
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+    },
+    "mime-db": {
+      "version": "1.37.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
+    },
+    "mime-types": {
+      "version": "2.1.21",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
+      "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
+      "requires": {
+        "mime-db": "~1.37.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
+    },
+    "node-uuid": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
+    },
+    "oauth-sign": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
+      "integrity": "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=",
+      "optional": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "proxy-addr": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
+      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.8.0"
+      }
+    },
+    "psl": {
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "optional": true
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "optional": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
+    },
+    "raw-body": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.23",
+        "unpipe": "1.0.0"
+      }
+    },
+    "request": {
+      "version": "2.40.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
+      "integrity": "sha1-TdZw9pbx5uhC5mtLXoOTAaub62c=",
+      "requires": {
+        "aws-sign2": "~0.5.0",
+        "forever-agent": "~0.5.0",
+        "form-data": "~0.1.0",
+        "hawk": "1.1.1",
+        "http-signature": "~0.10.0",
+        "json-stringify-safe": "~5.0.0",
+        "mime-types": "~1.0.1",
+        "node-uuid": "~1.4.0",
+        "oauth-sign": "~0.3.0",
+        "qs": "~1.0.0",
+        "stringstream": "~0.0.4",
+        "tough-cookie": ">=0.12.0",
+        "tunnel-agent": "~0.4.0"
+      },
+      "dependencies": {
+        "mime-types": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "integrity": "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4="
+        },
+        "qs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
+          "integrity": "sha1-UKk+K1r2aRwxvOpdrnjubqGQN2g="
+        }
+      }
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      }
+    },
+    "serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
+      }
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+    },
+    "sntp": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+      "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=",
+      "optional": true,
+      "requires": {
+        "hoek": "0.9.x"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+    },
+    "stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
+      "optional": true
+    },
+    "tough-cookie": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.0.tgz",
+      "integrity": "sha512-LHMvg+RBP/mAVNqVbOX8t+iJ+tqhBA/t49DuI7+IDAWHrASnesqSu1vWbKB7UrE2yk+HMFUBMadRGMkB4VCfog==",
+      "optional": true,
+      "requires": {
+        "ip-regex": "^3.0.0",
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+      "optional": true
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.18"
+      }
+    },
+    "uc.micro": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
+      "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "yui": {
+      "version": "3.18.1",
+      "resolved": "https://registry.npmjs.org/yui/-/yui-3.18.1.tgz",
+      "integrity": "sha1-4AAmnsCntvvHQcu4/L0OZRF7AUw=",
+      "requires": {
+        "request": "~2.40.0"
+      }
+    },
+    "yuidocjs": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/yuidocjs/-/yuidocjs-0.10.2.tgz",
+      "integrity": "sha1-M5JJZ85hkCTNcO9pTiZ9L5iPc/Y=",
+      "requires": {
+        "express": "^4.13.1",
+        "graceful-fs": "^4.1.2",
+        "markdown-it": "^4.3.0",
+        "mdn-links": "^0.1.0",
+        "minimatch": "^3.0.2",
+        "rimraf": "^2.4.1",
+        "yui": "^3.18.1"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000..2cf7685b8c
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "yuidocjs": "^0.10.2"
+  }
+}

From 740592cbd5d6275a1a0a7d48a4a2d0d853bec9e9 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 3 Oct 2019 00:32:30 -0700
Subject: [PATCH 0271/1140] Published a package under new organization.

---
 .versions                                     |  59 +++++++
 History.md                                    | 145 ------------------
 README.md                                     |   9 +-
 .../main/client/main.html                     |   4 +-
 examples/flow-router/client/example.html      |   4 +-
 examples/iron-router/client/example.html      |   4 +-
 package.js                                    |  12 +-
 7 files changed, 77 insertions(+), 160 deletions(-)
 create mode 100644 .versions

diff --git a/.versions b/.versions
new file mode 100644
index 0000000000..3d434fe745
--- /dev/null
+++ b/.versions
@@ -0,0 +1,59 @@
+accounts-base@1.4.4
+accounts-password@1.5.1
+alanning:roles@2.0.0
+allow-deny@1.1.0
+babel-compiler@7.3.4
+babel-runtime@1.3.0
+base64@1.0.12
+binary-heap@1.0.11
+boilerplate-generator@1.6.0
+callback-hook@1.1.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.3.3
+ddp-common@1.4.0
+ddp-rate-limiter@1.0.7
+ddp-server@2.3.0
+diff-sequence@1.1.1
+dynamic-import@0.5.1
+ecmascript@0.12.7
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
+ejson@1.1.0
+email@1.2.3
+fetch@0.1.1
+geojson-utils@1.0.10
+id-map@1.1.0
+inter-process-messaging@0.1.0
+local-test:alanning:roles@2.0.0
+localstorage@1.2.0
+logging@1.1.20
+meteor@1.9.3
+minimongo@1.4.5
+modern-browsers@0.1.4
+modules@0.13.0
+modules-runtime@0.10.3
+mongo@1.6.3
+mongo-decimal@0.1.1
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-bcrypt@0.9.3
+npm-mongo@3.1.2
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.1.0
+rate-limit@1.0.9
+reactive-var@1.0.11
+reload@1.3.0
+retry@1.1.0
+routepolicy@1.1.0
+service-configuration@1.0.11
+sha@1.0.9
+socket-stream-client@0.2.2
+srp@1.0.12
+tinytest@1.1.0
+tracker@1.2.0
+underscore@1.0.10
+webapp@1.7.4
+webapp-hashing@1.0.9
diff --git a/History.md b/History.md
index 0c3a6c0d16..22f7beccff 100644
--- a/History.md
+++ b/History.md
@@ -12,148 +12,3 @@
 * Functions `addRolesToParent` and `removeRolesFromParent` were added.
 * `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
 * All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
-
-## v1.2.14
-
-* Compatibility with Meteor 1.2. #133
-* Pass options through to getUsersInRole. #77
-* Fix formatting and punctuation in readme. #118
-* Use named publish func so clients can check when ready(). #88
-* Only support Meteor v1.2+ going forward; Older package versions
-  will remain available.
-
-
-## v1.2.13
-
-* Specific release just for bug in Meteor 0.9.1 [1].  #53
-
-  Note: Supporting both 0.9.0 and 0.9.1 with the same code base is not
-  possible [2] so this version only supports Meteor <0.9.0 and 0.9.1+;
-  not 0.9.0 or 0.9.0.1.  Users of 0.9.0 will still use v1.2.12 which has
-  no functional differences.
-
-  1. https://github.com/meteor/meteor/issues/2521#issuecomment-54702099
-  2. https://github.com/meteor/meteor/issues/2531
-
-
-## v1.2.12
-
-* Support Meteor 0.9.0 - new packaging system (hopefully). #52
-
-
-## v1.2.11
-
-* Add `getGroupsForUser` function. #39
-
-
-## v1.2.10
-
-* Fix behavior for groups with more than one period in their name. #44
-
-
-## v1.2.9
-
-* Let `meteor test-packages ./roles` work outside of an actual meteor app. #43
-
-
-## v1.2.8
-
-* Bump version number since Atmosphere only supports 3 levels
-
-
-## v1.2.7.1
-
-* Remove debug logging related to Blaze support
-
-
-## v1.2.7
-
-
-* Add support for Blaze UI (Meteor 0.8.0+)!  The 'roles' package must
-  come after 'ui' or 'standard-app-packages' in '.meteor/packages' 
-  for the 'isInRole' helper to be registered.
-
-
-## v1.2.6
-
-* Add descriptive error msg when group name starts with $
-* Auto-convert periods in group names to underscores
-
-
-## v1.2.5
-
-* Add setUserRoles function
-* Support passing user object for Roles.addUsersToRoles
-* Support passing user object for Roles.removeUsersFromRoles
-
-
-## v1.2.4
-
-* Update getRolesForUser to not return null when group is specified but user has no permissions
-
-
-## v1.2.3
-
-* Support using group in 'isInRole' client handlebars helper. 
-  Contributed by [@pascoual](https://github.com/pascoual)
-
-
-## v1.2.2
-
-* Support passing user object in addition to _id for Roles.getRolesForUser
-
-
-## v1.2.1
-
-* Improve internal string value of Roles.GLOBAL_GROUP constant
-
-
-## v1.2.0
-
-* Use constant property Roles.GLOBAL_GROUP instead of hard-coded string to 
-  assign blanket roles/permissions for a user
-* Check Roles.GLOBAL_GROUP even if no group specified.  This does not affect 
-  normal usage but provides a convenient short-hand for group users:
-    Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
-    Roles.userIsInRole(user, 'admin') => true
-* Expand test coverage
-
-
-## v1.1.1
-
-* Add support for global group which provides blanket roles/permissions across all groups for that user
-* Update Roles.getUsersInRole to accept an array of roles
-
-
-## v1.1.0
-
-* Add support for per-group roles
-* Fix for Issue #12 - Roles.userIsInRole returns whole user record
-  This is a breaking change for code that relied on the undocumented (and incorrect) behavior!
-
-
-## v1.0.6
-
-* Add compatibility with Meteor 0.6.5 package system
-* Bug fix for Issue #11 - deleteRole by _id, not name for untrusted code. Contributed by [@nickmoylan](https://github.com/nickmoylan)
-
-
-## v1.0.5
-
-* Fix for Issue #5 - error adding role for single user. Contributed by [@mcrider](https://github.com/mcrider)
-* Get tests working under Meteor 0.6.0
-
-
-## v1.0.4
-
-* Remove need for client subscribe by using 'null' publish
-
-
-## v1.0.3
-
-* Fix for Issue #3 - conflict with spiderable package
-
-
-## v1.0.2
-
-* Murky, ancient history
diff --git a/README.md b/README.md
index 43af11d298..91cc63b1b7 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
-meteor-roles
-============
+meteor-roles v2
+===============
+
+**This version of the package is being maintained just for security and compatibility issues.
+Please consider the [latest version](https://github.com/Meteor-Community-Packages/meteor-roles).**
 
 Authorization package for Meteor - compatible with built-in accounts package.
 
@@ -421,7 +424,7 @@ The `examples` directory contains Meteor apps which show off the following featu
 
 View the `flow-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
 
-  1. `git clone https://github.com/alanning/meteor-roles.git`
+  1. `git clone https://github.com/Meteor-Community-Packages/meteor-roles.git`
   2. choose an example, eg.
     * `cd meteor-roles/examples/iron-router` or
     * `cd meteor-roles/examples/flow-router`
diff --git a/examples/flow-router-advanced/main/client/main.html b/examples/flow-router-advanced/main/client/main.html
index 175675fdd4..9018a14b58 100644
--- a/examples/flow-router-advanced/main/client/main.html
+++ b/examples/flow-router-advanced/main/client/main.html
@@ -29,9 +29,9 @@
       {{> noteOfTheDay}}
 
       <div>
-        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
+        <p>This application is an example app for the <a href="https://github.com/Meteor-Community-Packages/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
       </div>
-          
+
       {{> securityNote}}
     </div>
   </div>
diff --git a/examples/flow-router/client/example.html b/examples/flow-router/client/example.html
index c48b921e0c..41c4a741e8 100644
--- a/examples/flow-router/client/example.html
+++ b/examples/flow-router/client/example.html
@@ -92,9 +92,9 @@
       {{> noteOfTheDay}}
 
       <div>
-        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
+        <p>This application is an example app for the <a href="https://github.com/Meteor-Community-Packages/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
       </div>
-          
+
       {{> securityNote}}
     </div>
   </div>
diff --git a/examples/iron-router/client/example.html b/examples/iron-router/client/example.html
index 935efb8c61..0e63c0a72a 100644
--- a/examples/iron-router/client/example.html
+++ b/examples/iron-router/client/example.html
@@ -102,9 +102,9 @@
       {{> noteOfTheDay}}
 
       <div>
-        <p>This application is an example app for the <a href="https://github.com/alanning/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
+        <p>This application is an example app for the <a href="https://github.com/Meteor-Community-Packages/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
       </div>
-          
+
       {{> securityNote}}
     </div>
   </div>
diff --git a/package.js b/package.js
index 4da904c523..dced1f4b91 100644
--- a/package.js
+++ b/package.js
@@ -1,14 +1,14 @@
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "2.0.0-rc.1",
-  git: "https://github.com/alanning/meteor-roles.git",
+  version: "2.0.0",
+  git: "https://github.com/Meteor-Community-Packages/meteor-roles.git",
   name: "alanning:roles"
 });
 
 Package.onUse(function (api) {
-  var both = ['client', 'server'];
+  api.versionsFrom("METEOR@1.8.1");
 
-  api.versionsFrom("METEOR@1.4.1");
+  var both = ['client', 'server'];
 
   api.use(['underscore',
            'accounts-base',
@@ -16,7 +16,7 @@ Package.onUse(function (api) {
            'mongo',
            'check'], both);
 
-  api.use(['blaze'], 'client', {weak: true});
+  api.use(['blaze@2.3.3'], 'client', {weak: true});
 
   api.export('Roles');
 
@@ -28,7 +28,7 @@ Package.onUse(function (api) {
 });
 
 Package.onTest(function (api) {
-  api.versionsFrom("METEOR@1.4.1");
+  api.versionsFrom("METEOR@1.8.1");
 
   var both = ['client', 'server'];
 

From 0f7fc6f7132c0715a023925f998264d7e648282d Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Thu, 3 Oct 2019 00:36:33 -0700
Subject: [PATCH 0272/1140] Preparing for v3.

---
 History.md | 15 ++-------------
 README.md  |  9 +++++----
 package.js |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/History.md b/History.md
index 22f7beccff..c04629da05 100644
--- a/History.md
+++ b/History.md
@@ -1,14 +1,3 @@
-## v2.0.0
+## v3.0.0
 
-* Rewrite with the new schema for `roles` field and `Meteor.roles` collection.
-* Support for roles hierarchies.
-* Groups were renamed to scopes.
-* Groups/scopes are always available, if you do not specify a scope, role is seen as a global role.
-* `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a scope, or use `null`).
-* `getGroupsForUser` is deprecated, `getScopesForUser` should be used instead.
-* Functions which modify roles are available both on the client and server side, but should be called on the
-  client side only from inside Meteor methods.
-* `deleteRole` can now delete role even when in use, it is automatically unset from all users.
-* Functions `addRolesToParent` and `removeRolesFromParent` were added.
-* `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
-* All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
+* ...
diff --git a/README.md b/README.md
index 91cc63b1b7..0092bc4246 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
-meteor-roles v2
+meteor-roles v3
 ===============
 
-**This version of the package is being maintained just for security and compatibility issues.
-Please consider the [latest version](https://github.com/Meteor-Community-Packages/meteor-roles).**
-
 Authorization package for Meteor - compatible with built-in accounts package.
 
+There are also older versions of this package:
+* [v1](https://github.com/Meteor-Community-Packages/meteor-roles/tree/v1)
+* [v2](https://github.com/Meteor-Community-Packages/meteor-roles/tree/v2)
+
 <br />
 
 <a id="roles-toc" name="roles-toc"></a>
diff --git a/package.js b/package.js
index dced1f4b91..e277d64815 100644
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "2.0.0",
+  version: "3.0.0-rc1",
   git: "https://github.com/Meteor-Community-Packages/meteor-roles.git",
   name: "alanning:roles"
 });

From c9235f616159d0ca51f2f4fbebcb42fdd1e9f6ba Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sun, 6 Oct 2019 12:10:52 +0900
Subject: [PATCH 0273/1140] Fix #182 in v2 branch

---
 .versions             |  4 ++--
 History.md            |  4 ++++
 package.js            |  2 +-
 roles/client/debug.js | 13 +++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.versions b/.versions
index 3d434fe745..2b01b00a97 100644
--- a/.versions
+++ b/.versions
@@ -1,6 +1,6 @@
 accounts-base@1.4.4
 accounts-password@1.5.1
-alanning:roles@2.0.0
+alanning:roles@2.0.1
 allow-deny@1.1.0
 babel-compiler@7.3.4
 babel-runtime@1.3.0
@@ -26,7 +26,7 @@ fetch@0.1.1
 geojson-utils@1.0.10
 id-map@1.1.0
 inter-process-messaging@0.1.0
-local-test:alanning:roles@2.0.0
+local-test:alanning:roles@2.0.1
 localstorage@1.2.0
 logging@1.1.20
 meteor@1.9.3
diff --git a/History.md b/History.md
index 22f7beccff..861ad5ec9c 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+## v2.0.1
+
+* Wrap localStorage in try/catch to avoid crash when disabled. Port fix from v1 branch. #182
+
 ## v2.0.0
 
 * Rewrite with the new schema for `roles` field and `Meteor.roles` collection.
diff --git a/package.js b/package.js
index dced1f4b91..c44a508b6a 100644
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "2.0.0",
+  version: "2.0.1",
   git: "https://github.com/Meteor-Community-Packages/meteor-roles.git",
   name: "alanning:roles"
 });
diff --git a/roles/client/debug.js b/roles/client/debug.js
index 7b0bf9cec9..e235f76ccf 100644
--- a/roles/client/debug.js
+++ b/roles/client/debug.js
@@ -12,10 +12,15 @@
 
 Roles.debug = false
 
-if (localStorage) {
-  var temp = localStorage.getItem("Roles.debug")
+try {
+  if (localStorage) {
+    var temp = localStorage.getItem("Roles.debug")
 
-  if ('undefined' !== typeof temp) {
-    Roles.debug = !!temp
+    if ('undefined' !== typeof temp) {
+      Roles.debug = !!temp
+    }
   }
+} catch (ex) {
+  // ignore: accessing localStorage when its disabled throws
+  // https://github.com/meteor/meteor/issues/5759
 }

From 5ff83e2d7dc0ccba6bf98875646b195edd0d0ab3 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sun, 6 Oct 2019 12:52:44 +0900
Subject: [PATCH 0274/1140] Add link to issue 182 in history

---
 History.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 861ad5ec9c..e6d292d567 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,6 @@
 ## v2.0.1
 
-* Wrap localStorage in try/catch to avoid crash when disabled. Port fix from v1 branch. #182
+* Wrap localStorage in try/catch to avoid crash when disabled. Port fix from v1 branch. [#182](https://github.com/Meteor-Community-Packages/meteor-roles/issues/182)
 
 ## v2.0.0
 

From d511d7e78179e1b3c37e3258e70f5c662410039d Mon Sep 17 00:00:00 2001
From: Mitar <mitar.github@tnode.com>
Date: Sun, 6 Oct 2019 21:10:35 -0700
Subject: [PATCH 0275/1140] Fixing documentation.

Fixes #287.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 91cc63b1b7..9b9baea029 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ those roles easier.
 <a id="roles-naming" name="roles-naming"></a>
 ### Permissions vs roles  (or What's in a name...)
 
-Although the name of this package is `roles`, you can define your **roles**, **groups** or **permissions** however you like.
+Although the name of this package is `roles`, you can define your **roles**, **scopes** or **permissions** however you like.
 They are essentially just tags that you assign to a user and which you can check upon later.
 
 You can have traditional roles like, `admin` or `webmaster`, or you can assign more granular permissions such
@@ -244,7 +244,7 @@ Check user roles before publishing sensitive data:
 ```js
 // server/publish.js
 
-// Give authorized users access to sensitive data by group
+// Give authorized users access to sensitive data by scope
 Meteor.publish('secrets', function (scope) {
   check(scope, String);
 

From 6c499ef20a0f382165161336b13f4e9325fd1e6c Mon Sep 17 00:00:00 2001
From: Kevin Newman <Kevin@unFocus.com>
Date: Tue, 8 Oct 2019 11:30:11 -0400
Subject: [PATCH 0276/1140] Remove underscore from client bundle, add
 ecmascript package

---
 package.js                |   3 +-
 roles/client/uiHelpers.js |  10 +-
 roles/roles_common.js     | 186 +++++++++++++++++++++-----------------
 3 files changed, 110 insertions(+), 89 deletions(-)

diff --git a/package.js b/package.js
index c44a508b6a..042a96241e 100644
--- a/package.js
+++ b/package.js
@@ -10,7 +10,8 @@ Package.onUse(function (api) {
 
   var both = ['client', 'server'];
 
-  api.use(['underscore',
+  api.use('underscore', 'server');
+  api.use(['ecmascript',
            'accounts-base',
            'tracker',
            'mongo',
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 523f98a981..c9f5373634 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -16,7 +16,7 @@
 //
 // Use a semi-private variable rather than declaring UI
 // helpers directly so that we can unit test the helpers.
-// XXX For some reason, the UI helpers are not registered 
+// XXX For some reason, the UI helpers are not registered
 // before the tests run.
 //
 Roles._uiHelpers = {
@@ -40,7 +40,7 @@ Roles._uiHelpers = {
    * @param {String} [scope] Optional, name of scope to check.
    * @return {Boolean} `true` if current user is in at least one of the target roles.
    * @static
-   * @for UIHelpers 
+   * @for UIHelpers
    */
   isInRole: function (role, scope) {
     var user = Meteor.user(),
@@ -51,7 +51,7 @@ Roles._uiHelpers = {
     if (!Match.test(role, String)) return false
 
     if (comma !== -1) {
-      roles = _.reduce(role.split(','), function (memo, r) {
+      roles = role.split(',').reduce(function (memo, r) {
         if (!r || !Roles._trim(r)) {
           return memo
         }
@@ -83,10 +83,10 @@ if (Roles.debug && console.log) {
 if ('undefined' !== typeof Package.blaze &&
     'undefined' !== typeof Package.blaze.Blaze &&
     'function'  === typeof Package.blaze.Blaze.registerHelper) {
-  _.each(Roles._uiHelpers, function (func, name) {
+  Object.entries(Roles._uiHelpers).forEach(function (func, name) {
     if (Roles.debug && console.log) {
       console.log("[roles] registering Blaze helper '" + name + "'")
     }
-    Package.blaze.Blaze.registerHelper(name, func) 
+    Package.blaze.Blaze.registerHelper(name, func)
   })
 }
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 39a4cd3fcd..2de9b5368c 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1,5 +1,16 @@
 ;(function () {
 
+// borrowed from underscore
+function isObject (obj) {
+  var type = typeof obj;
+  return type === 'function' || type === 'object' && !!obj;
+}
+
+const difference = (...arrays) =>
+  arrays.reduce((a, b) =>
+    a.filter((value) => !b.includes(value) )
+  )
+
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
@@ -37,8 +48,7 @@ if ('undefined' === typeof Roles) {
 
 var getGroupsForUserDeprecationWarning = false;
 
-_.extend(Roles, {
-
+Object.assign(Roles, {
   /**
    * Used as a global group (now scope) name. Not used anymore.
    *
@@ -65,9 +75,9 @@ _.extend(Roles, {
 
     Roles._checkRoleName(roleName);
 
-    options = _.defaults(options, {
-      unlessExists: false
-    });
+    if (typeof options.unlessExists === 'undefined') {
+      options.unlessExists = false;
+    }
 
     var result = Meteor.roles.upsert({_id: roleName}, {$setOnInsert: {children: []}});
 
@@ -114,8 +124,8 @@ _.extend(Roles, {
     }).forEach(function (user, index, cursor) {
       // role can be assigned multiple times to the user, for multiple scopes
       // we have to remove the role for each of those scopes
-      roles = _.filter(user.roles, Roles._roleMatcher(roleName));
-      _.each(roles, function (role) {
+      roles = Array.prototype.filter.call(user.roles, Roles._roleMatcher(roleName));
+      Array.prototype.forEach.call(roles, function (role) {
         Roles._removeUserFromRole(user, roleName, {
           scope: role.scope,
           // we want to remove the role in any case
@@ -202,9 +212,9 @@ _.extend(Roles, {
    */
   addRolesToParent: function (rolesNames, parentName) {
     // ensure arrays
-    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
 
-    _.each(rolesNames, function (roleName) {
+    rolesNames.forEach(function (roleName) {
       Roles._addRoleToParent(roleName, parentName);
     });
   },
@@ -214,7 +224,7 @@ _.extend(Roles, {
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
    * @private
-   * @static
+   * @static_.
    */
   _addRoleToParent: function (roleName, parentName) {
     var role,
@@ -237,7 +247,7 @@ _.extend(Roles, {
 
     // detect cycles
     alreadyCheckedRoles = [];
-    rolesToCheck = _.pluck(role.children, '_id');
+    rolesToCheck = role.children.map(function (child) { return child._id; });
     while (rolesToCheck.length) {
       checkRoleName = rolesToCheck.pop();
       if (checkRoleName === parentName) {
@@ -250,7 +260,7 @@ _.extend(Roles, {
       // This should not happen, but this is a problem to address at some other time.
       if (!checkRole) continue;
 
-      rolesToCheck = _.union(rolesToCheck, _.difference(_.pluck(checkRole.children, '_id'), alreadyCheckedRoles));
+      rolesToCheck = [...new Set([...rolesToCheck, ...difference(checkRole.children.map(function (child) { return child._id; }), alreadyCheckedRoles)])];
     }
 
     count = Meteor.roles.update({
@@ -281,8 +291,8 @@ _.extend(Roles, {
     }).forEach(function (user, index, cursor) {
       // parent role can be assigned multiple times to the user, for multiple scopes
       // we have to assign a new subrole for each of those scopes
-      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
-      _.each(parentRoles, function (parentRole) {
+      parentRoles = Array.prototype.filter.call(user.roles, Roles._roleMatcher(parentName));
+      Array.prototype.forEach.call(parentRoles, function (parentRole) {
         Roles._addUserToRole(user, roleName, {
           scope: parentRole.scope,
           // we are assigning a subrole, so we set it as unassigned,
@@ -306,9 +316,9 @@ _.extend(Roles, {
    */
   removeRolesFromParent: function (rolesNames, parentName) {
     // ensure arrays
-    if (!_.isArray(rolesNames)) rolesNames = [rolesNames];
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
 
-    _.each(rolesNames, function (roleName) {
+    Array.prototype.forEach.call(rolesNames, function (roleName) {
       Roles._removeRoleFromParent(roleName, parentName);
     });
   },
@@ -361,8 +371,8 @@ _.extend(Roles, {
     }).forEach(function (user, index, cursor) {
       // parent role can be assigned multiple times to the user, for multiple scopes
       // we have to remove the subrole for each of those scopes
-      parentRoles = _.filter(user.roles, Roles._roleMatcher(parentName));
-      _.each(parentRoles, function (parentRole) {
+      parentRoles = Array.prototype.filter.call(user.roles, Roles._roleMatcher(parentName));
+      Array.prototype.forEach.call(parentRoles, function (parentRole) {
         Roles._removeUserFromRole(user, roleName, {
           scope: parentRole.scope,
           // but we want to remove it only if it was not also explicitly assigned
@@ -403,22 +413,24 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
-      ifExists: false,
+    if (typeof options.ifExists === 'undefined') {
+      options.ifExists = false
+    }
+    if (typeof options._assigned === 'undefined') {
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only add users to an assigned role
       // should the role be set as assigned, default is `true`; `null` is the same as `false`,
       // only that it does not force the value to `false` if the role is already assigned
-      _assigned: true
-    });
+      options._assigned = true
+    }
 
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
+    Array.prototype.forEach.call(users, function (user) {
+      Array.prototype.forEach.call(roles, function (role) {
         Roles._addUserToRole(user, role, options);
       });
     });
@@ -454,22 +466,24 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
-      ifExists: false,
+    if (typeof options.ifExists === 'undefined') {
+      options.ifExists = false
+    }
+    if (typeof options._assigned === 'undefined') {
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only add users to an assigned role
       // should the role be set as assigned, default is `true`; `null` is the same as `false`,
       // only that it does not force the value to `false` if the role is already assigned
-      _assigned: true
-    });
+      options._assigned = true
+    }
 
-    _.each(users, function (user) {
-      if (_.isObject(user)) {
+    Array.prototype.forEach.call(users, function (user) {
+      if (isObject(user)) {
         id = user._id;
       }
       else {
@@ -479,7 +493,7 @@ _.extend(Roles, {
       Meteor.users.update(id, {$pull: {roles: {scope: options.scope}}});
 
       // and then add all
-      _.each(roles, function (role) {
+      Array.prototype.forEach.call(roles, function (role) {
         Roles._addUserToRole(user, role, options);
       });
     });
@@ -511,7 +525,7 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkScopeName(options.scope);
 
-    if (_.isObject(user)) {
+    if (isObject(user)) {
       id = user._id;
     }
     else {
@@ -597,9 +611,9 @@ _.extend(Roles, {
       scope: options.scope
     }];
 
-    _.each(role.children, function (child) {
+    Array.prototype.forEach.call(role.children, function (child) {
       // subroles are set as unassigned, but only if they do not already exist
-      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, _.extend({}, options, {_assigned: null})));
+      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, Object.assign({}, options, {_assigned: null})));
     });
 
     return setRoles;
@@ -629,21 +643,25 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure arrays
-    if (!_.isArray(users)) users = [users];
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
+
+    if (typeof options.ifExists === 'undefined') {
+      options.ifExists = false
+    }
+    if (typeof options._assigned === 'undefined') {
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only remove users from an assigned role
       // when should the role be removed, default is `true` which means only when it is assigned,
       // `false` means when it is not assigned, and `null` means always
-      _assigned: true
-    });
+      options._assigned = true
+    }
 
-    _.each(users, function (user) {
-      _.each(roles, function (role) {
+    Array.prototype.forEach.call(users, function (user) {
+      Array.prototype.forEach.call(roles, function (role) {
         Roles._removeUserFromRole(user, role, options);
       });
 
@@ -681,7 +699,7 @@ _.extend(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkScopeName(options.scope);
 
-    if (_.isObject(user)) {
+    if (isObject(user)) {
       id = user._id;
     }
     else {
@@ -714,9 +732,9 @@ _.extend(Roles, {
     // role does not exist, we do not anything more
     if (!role) return;
 
-    _.each(role.children, function (child) {
+    Array.prototype.forEach.call(role.children, function (child) {
       // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child._id, _.extend({}, options, {_assigned: false}));
+      Roles._removeUserFromRole(user, child._id, Object.assign({}, options, {_assigned: false}));
     });
   },
 
@@ -742,10 +760,10 @@ _.extend(Roles, {
     user = Roles._resolveUser(user, true);
 
     // only assigned roles
-    roles = _.filter(user.roles, Roles._onlyAssignedMatcher());
+    roles = Array.prototype.filter.call(user.roles, Roles._onlyAssignedMatcher());
 
     setRoles = [];
-    _.each(roles, function (role) {
+    Array.prototype.forEach.call(roles, function (role) {
       setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
         scope: role.scope,
         _assigned: role.assigned, // this is true
@@ -758,7 +776,7 @@ _.extend(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: _.map(setRoles, function (role) {return _.pick(role, '_id', 'scope')})
+            $nor: setRoles.map((role) => ({ _id: role._id, scope: role.scope }))
           }
         }
       });
@@ -804,26 +822,26 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure array to simplify code
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(roles)) roles = [roles];
 
     if (!roles.length) return false;
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
-      anyScope: false
-    });
+    if (typeof options.anyScope === 'undefined') {
+      options.anyScope = false;
+    }
 
     if (!user) return false;
 
-    if (_.isObject(user)) {
-      if (_.has(user, 'roles')) {
-        return _.some(roles, function (role) {
+    if (isObject(user)) {
+      if (user.hasOwnProperty('roles')) {
+        return Array.prototype.some.call(roles, function (role) {
           if (options.anyScope) {
-            return _.some(user.roles || [], Roles._roleMatcher(role));
+            return Array.prototype.some.call(user.roles || [], Roles._roleMatcher(role));
           }
           else {
-            return _.some(user.roles || [], Roles._roleAndScopeMatcher(role, options.scope));
+            return Array.prototype.some.call(user.roles || [], Roles._roleAndScopeMatcher(role, options.scope));
           }
         })
       } else {
@@ -879,11 +897,11 @@ _.extend(Roles, {
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
+    options = Object.assign({
       fullObjects: false,
       onlyAssigned: false,
       anyScope: false
-    });
+    }, options);
 
     user = Roles._resolveUser(user);
 
@@ -893,18 +911,18 @@ _.extend(Roles, {
       roles = user.roles || [];
     }
     else {
-      roles = _.filter(user.roles || [], Roles._scopeMatcher(options.scope));
+      roles = Array.prototype.filter.call(user.roles || [], Roles._scopeMatcher(options.scope));
     }
 
     if (options.onlyAssigned) {
-      roles = _.filter(roles, Roles._onlyAssignedMatcher());
+      roles = Array.prototype.filter.call(roles, Roles._onlyAssignedMatcher());
     }
 
     if (options.fullObjects) {
       return roles;
     }
 
-    return _.uniq(_.pluck(roles, '_id'));
+    return [...new Set(roles.map(function (role) { return role._id; }))];
   },
 
   /**
@@ -979,14 +997,16 @@ _.extend(Roles, {
     options = Roles._normalizeOptions(options);
 
     // ensure array to simplify code
-    if (!_.isArray(roles)) roles = [roles];
+    if (!Array.isArray(roles)) roles = [roles];
 
     Roles._checkScopeName(options.scope);
 
-    options = _.defaults(options, {
-      queryOptions: queryOptions || {},
-      anyScope: false
-    });
+    if (typeof options.queryOptions === 'undefined') {
+      options.queryOptions = queryOptions || {}
+    }
+    if (typeof options.anyScope === 'undefined') {
+      options.anyScope = false
+    }
 
     if (options.anyScope) {
       query = {
@@ -1040,22 +1060,22 @@ _.extend(Roles, {
     var scopes;
 
     // ensure array to simplify code
-    if (roles && !_.isArray(roles)) roles = [roles];
+    if (roles && !Array.isArray(roles)) roles = [roles];
 
     user = Roles._resolveUser(user);
 
     if (!user) return [];
 
     scopes = [];
-    _.each(user.roles || [], function (userRole) {
+    Array.prototype.forEach.call(user.roles || [], function (userRole) {
       // == used on purpose.
       if (userRole.scope == null) return;
-      if (roles && !_.contains(roles, userRole._id)) return;
+      if (roles && !roles.includes(userRole._id)) return;
 
       scopes.push(userRole.scope);
     });
 
-    return _.uniq(scopes);
+    return [...new Set(scopes)];
   },
 
   /**
@@ -1125,11 +1145,11 @@ _.extend(Roles, {
    */
   _resolveUser: function (user, force) {
     // TODO: We could use $elemMatch to limit returned fields here.
-    if (!_.isObject(user)) {
+    if (!isObject(user)) {
       user = Meteor.users.findOne(
                {_id: user},
                {fields: {roles: 1}});
-    } else if (force || !_.has(user, 'roles')) {
+    } else if (force || !user.hasOwnProperty('roles')) {
       user = Meteor.users.findOne(
                {_id: user._id},
                {fields: {roles: 1}});
@@ -1165,7 +1185,7 @@ _.extend(Roles, {
     return function (userRole) {
       // == used on purpose in "userRole.scope == null"
       return (userRole._id === roleName && userRole.scope === scope) ||
-        (userRole._id === roleName && (!_.has(userRole, 'scope') || userRole.scope == null));
+        (userRole._id === roleName && (!userRole.hasOwnProperty('scope') || userRole.scope == null));
     };
   },
 
@@ -1181,7 +1201,7 @@ _.extend(Roles, {
     return function (userRole) {
       // == used on purpose in "userRole.scope == null"
       return (userRole.scope === scope) ||
-        (!_.has(userRole, 'scope') || userRole.scope == null);
+        (!userRole.hasOwnProperty('scope') || userRole.scope == null);
     };
   },
 
@@ -1207,7 +1227,7 @@ _.extend(Roles, {
    * @static
    */
   _checkRoleName: function (roleName) {
-    if (!roleName || !_.isString(roleName) || Roles._trim(roleName) !== roleName) {
+    if (!roleName || typeof roleName !== 'string' || Roles._trim(roleName) !== roleName) {
       throw new Error("Invalid role name '" + roleName + "'.");
     }
   },
@@ -1222,9 +1242,9 @@ _.extend(Roles, {
    * @static
    */
   _normalizeOptions: function (options) {
-    options = _.isUndefined(options) ? {} : options;
+    options = typeof options === 'undefined' ? {} : options;
 
-    if (options === null || _.isString(options)) {
+    if (options === null || typeof options === 'string') {
       options = {scope: options};
     }
 
@@ -1263,7 +1283,7 @@ _.extend(Roles, {
   _checkScopeName: function (scopeName) {
     if (scopeName === null) return;
 
-    if (!scopeName || !_.isString(scopeName) || Roles._trim(scopeName) !== scopeName) {
+    if (!scopeName || typeof scopeName !== 'string' || Roles._trim(scopeName) !== scopeName) {
       throw new Error("Invalid scope name '" + scopeName + "'.");
     }
   },
@@ -1283,6 +1303,6 @@ _.extend(Roles, {
     }
   }
 
-});  // end _.extend(Roles ...)
+});  // end Object.assign(Roles ...)
 
 }());

From fa18a4f46a2cdc96752d4bbf91acd2ac2532c528 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 12 Oct 2019 00:14:21 +0200
Subject: [PATCH 0277/1140] Adding to tests.

---
 roles/tests/server.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index e6f6f58219..c052de4aea 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -2609,6 +2609,8 @@
       test.isFalse(Roles.userIsInRole(users.eve, [], {anyScope: true}));
       test.isFalse(Roles.userIsInRole(users.eve, null, {anyScope: true}));
       test.isFalse(Roles.userIsInRole(users.eve, undefined, {anyScope: true}));
+
+      test.isFalse(Roles.userIsInRole(users.eve, ["Role1", "Role2", undefined], "GroupName"));
     });
 
   function printException (ex) {

From b45179088f6ae56c497ae8bcdc8837162b319d06 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Fri, 1 Nov 2019 15:30:18 +0100
Subject: [PATCH 0278/1140] Added back some of the differences

---
 roles/roles_common.js | 79 ++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 47 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 9af05d3166..20b1ff7f66 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1,16 +1,5 @@
 ;(function () {
 
-// borrowed from underscore
-function isObject (obj) {
-  var type = typeof obj;
-  return type === 'function' || type === 'object' && !!obj;
-}
-
-const difference = (...arrays) =>
-  arrays.reduce((a, b) =>
-    a.filter((value) => !b.includes(value) )
-  )
-
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
@@ -75,9 +64,9 @@ Object.assign(Roles, {
 
     Roles._checkRoleName(roleName);
 
-    if (typeof options.unlessExists === 'undefined') {
-      options.unlessExists = false;
-    }
+    options = Object.assign({
+      unlessExists: false
+    }, options);
 
     var result = Meteor.roles.upsert({_id: roleName}, {$setOnInsert: {children: []}});
 
@@ -224,7 +213,7 @@ Object.assign(Roles, {
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
    * @private
-   * @static_.
+   * @static
    */
   _addRoleToParent: function (roleName, parentName) {
     var role,
@@ -478,7 +467,7 @@ Object.assign(Roles, {
     }, options);
 
     users.forEach(function (user) {
-      if (isObject(user)) {
+      if (typeof user === 'object') {
         id = user._id;
       }
       else {
@@ -520,7 +509,7 @@ Object.assign(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkScopeName(options.scope);
 
-    if (isObject(user)) {
+    if (typeof user === 'object') {
       id = user._id;
     }
     else {
@@ -643,20 +632,17 @@ Object.assign(Roles, {
 
     Roles._checkScopeName(options.scope);
 
-    if (typeof options.ifExists === 'undefined') {
-      options.ifExists = false
-    }
-    if (typeof options._assigned === 'undefined') {
-
+    options = Object.assign({
       // internal option, should not be used publicly because it will break assumptions
       // in te code; publicly, you can only remove users from an assigned role
       // when should the role be removed, default is `true` which means only when it is assigned,
       // `false` means when it is not assigned, and `null` means always
-
-      options._assigned = true
-    }
+      _assigned: true
+    }, options);
 
     users.forEach(function (user) {
+      if (!user) return;
+
       roles.forEach(function (role) {
         Roles._removeUserFromRole(user, role, options);
       });
@@ -695,7 +681,7 @@ Object.assign(Roles, {
     Roles._checkRoleName(roleName);
     Roles._checkScopeName(options.scope);
 
-    if (isObject(user)) {
+    if (typeof user === 'object') {
       id = user._id;
     }
     else {
@@ -772,7 +758,7 @@ Object.assign(Roles, {
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: setRoles.map((role) => ({ _id: role._id, scope: role.scope }))
+            $nor: setRoles.map(function (role) { return {_id: role._id, scope: role.scope } })
           }
         }
       });
@@ -824,20 +810,21 @@ Object.assign(Roles, {
 
     Roles._checkScopeName(options.scope);
 
-    if (typeof options.anyScope === 'undefined') {
-      options.anyScope = false;
-    }
+    options = Object.assign({
+      anyScope: false
+    }, options);
 
     if (!user) return false;
 
-    if (isObject(user)) {
-      if (user.hasOwnProperty('roles')) {
+    if (typeof user === 'object') {
+      if ('roles' in user) {
         return roles.some(function (role) {
+          const roles = user.roles || [];
           if (options.anyScope) {
-            return (user.roles || []).some(Roles._roleMatcher(role));
+            return roles.some(Roles._roleMatcher(role));
           }
           else {
-            return (user.roles || []).some(Roles._roleAndScopeMatcher(role, options.scope));
+            return roles.some(Roles._roleAndScopeMatcher(role, options.scope));
           }
         })
       } else {
@@ -903,11 +890,9 @@ Object.assign(Roles, {
 
     if (!user) return [];
 
-    if (options.anyScope) {
-      roles = user.roles || [];
-    }
-    else {
-      roles = (user.roles || []).filter(Roles._scopeMatcher(options.scope));
+    roles = user.roles || [];
+    if (!options.anyScope) {
+      roles = roles.filter(Roles._scopeMatcher(options.scope));
     }
 
     if (options.onlyAssigned) {
@@ -1139,12 +1124,13 @@ Object.assign(Roles, {
    */
   _resolveUser: function (user, force) {
     // TODO: We could use $elemMatch to limit returned fields here.
-
-    if (!isObject(user)) {
+    if (!user) {
+      return null;
+    } else if (typeof user !== 'object') {
       user = Meteor.users.findOne(
                {_id: user},
                {fields: {roles: 1}});
-    } else if (force || !user.hasOwnProperty('roles')) {
+    } else if (force || !('roles' in user)) {
       user = Meteor.users.findOne(
                {_id: user._id},
                {fields: {roles: 1}});
@@ -1180,7 +1166,7 @@ Object.assign(Roles, {
     return function (userRole) {
       // == used on purpose in "userRole.scope == null"
       return (userRole._id === roleName && userRole.scope === scope) ||
-        (userRole._id === roleName && (!userRole.hasOwnProperty('scope') || userRole.scope == null));
+        (userRole._id === roleName && (!('scope' in userRole) || userRole.scope == null));
     };
   },
 
@@ -1196,7 +1182,7 @@ Object.assign(Roles, {
     return function (userRole) {
       // == used on purpose in "userRole.scope == null"
       return (userRole.scope === scope) ||
-        (!userRole.hasOwnProperty('scope') || userRole.scope == null);
+        (!('scope' in userRole) || userRole.scope == null);
     };
   },
 
@@ -1237,7 +1223,7 @@ Object.assign(Roles, {
    * @static
    */
   _normalizeOptions: function (options) {
-    options = typeof options === 'undefined' ? {} : options;
+    options = options === undefined ? {} : options;
 
     if (options === null || typeof options === 'string') {
       options = {scope: options};
@@ -1297,7 +1283,6 @@ Object.assign(Roles, {
       return string.replace(/^\s+|\s+$/g, '');
     }
   }
-
-});  // end Object.assign(Roles ...)
+});
 
 }());

From ab3b67a1a94a12524bd2dfc29946a7edda215c91 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 18:59:53 +0400
Subject: [PATCH 0279/1140] Switching to code style "standard"

---
 package-lock.json             | 1331 ++++++++++++++++-
 package.js                    |   66 +-
 package.json                  |    1 +
 roles/client/debug.js         |    9 +-
 roles/client/subscriptions.js |    6 +-
 roles/client/uiHelpers.js     |   25 +-
 roles/roles_common.js         |  578 ++++----
 roles/roles_server.js         |  143 +-
 roles/tests/client.js         |   81 +-
 roles/tests/server.js         | 2539 ++++++++++++++++-----------------
 10 files changed, 3031 insertions(+), 1748 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c8759c81fb..b3398248ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,47 @@
         "negotiator": "0.6.1"
       }
     },
+    "acorn": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
+    },
+    "acorn-jsx": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
+      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw=="
+    },
+    "ajv": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-keywords": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -24,6 +65,15 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
+      }
+    },
     "asn1": {
       "version": "0.1.11",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
@@ -48,6 +98,38 @@
       "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
       "optional": true
     },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -92,6 +174,83 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
     "combined-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
@@ -106,6 +265,11 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
+    },
     "content-disposition": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
@@ -126,6 +290,18 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
     "cryptiles": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
@@ -149,6 +325,44 @@
         "ms": "2.0.0"
       }
     },
+    "debug-log": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz",
+      "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8="
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "deglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/deglob/-/deglob-2.1.1.tgz",
+      "integrity": "sha512-2kjwuGGonL7gWE1XU4Fv79+vVzpoQCl0V+boMwWtOQJV2AGDabCwez++nB1Nli/8BabAfZQ/UuHPlp6AymKdWw==",
+      "requires": {
+        "find-root": "^1.0.0",
+        "glob": "^7.0.5",
+        "ignore": "^3.0.9",
+        "pkg-config": "^1.1.0",
+        "run-parallel": "^1.1.2",
+        "uniq": "^1.0.1"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "3.3.10",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+        }
+      }
+    },
     "delayed-stream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
@@ -165,6 +379,14 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -180,11 +402,274 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
     },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
+      "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.0",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-inspect": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "string.prototype.trimleft": "^2.1.0",
+        "string.prototype.trimright": "^2.1.0"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "eslint": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz",
+      "integrity": "sha512-UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg==",
+      "requires": {
+        "ajv": "^6.5.0",
+        "babel-code-frame": "^6.26.0",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^4.0.0",
+        "eslint-utils": "^1.3.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^4.0.0",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.2",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^5.2.0",
+        "is-resolvable": "^1.1.0",
+        "js-yaml": "^3.11.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.5",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.0",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.5.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "^2.0.1",
+        "table": "^4.0.3",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "eslint-config-standard": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz",
+      "integrity": "sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ=="
+    },
+    "eslint-config-standard-jsx": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-6.0.2.tgz",
+      "integrity": "sha512-D+YWAoXw+2GIdbMBRAzWwr1ZtvnSf4n4yL0gKGg7ShUOGXkSOLerI17K4F6LdQMJPNMoWYqepzQD/fKY+tXNSg=="
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+      "requires": {
+        "debug": "^2.6.9",
+        "resolve": "^1.5.0"
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
+      "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
+      "requires": {
+        "debug": "^2.6.8",
+        "pkg-dir": "^2.0.0"
+      }
+    },
+    "eslint-plugin-es": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz",
+      "integrity": "sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA==",
+      "requires": {
+        "eslint-utils": "^1.4.2",
+        "regexpp": "^2.0.1"
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz",
+      "integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==",
+      "requires": {
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.8",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.1",
+        "eslint-module-utils": "^2.2.0",
+        "has": "^1.0.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.3",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.6.0"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-node": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz",
+      "integrity": "sha512-lfVw3TEqThwq0j2Ba/Ckn2ABdwmL5dkOgAux1rvOk6CO7A6yGyPI2+zIxN6FyNkp1X1X/BSvKOceD6mBWSj4Yw==",
+      "requires": {
+        "eslint-plugin-es": "^1.3.1",
+        "eslint-utils": "^1.3.1",
+        "ignore": "^4.0.2",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.0"
+      }
+    },
+    "eslint-plugin-promise": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz",
+      "integrity": "sha512-Si16O0+Hqz1gDHsys6RtFRrW7cCTB6P7p3OJmKp3Y3dxpQE2qwOA7d3xnV+0mBmrPoi0RBnxlCKvqu70te6wjg=="
+    },
+    "eslint-plugin-react": {
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz",
+      "integrity": "sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==",
+      "requires": {
+        "array-includes": "^3.0.3",
+        "doctrine": "^2.1.0",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^2.0.1",
+        "prop-types": "^15.6.2"
+      }
+    },
+    "eslint-plugin-standard": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz",
+      "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ=="
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
+    },
+    "espree": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz",
+      "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==",
+      "requires": {
+        "acorn": "^6.0.2",
+        "acorn-jsx": "^5.0.0",
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -227,6 +712,48 @@
         "vary": "~1.1.2"
       }
     },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
     "finalhandler": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
@@ -241,6 +768,30 @@
         "unpipe": "~1.0.0"
       }
     },
+    "find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "requires": {
+        "circular-json": "^0.3.1",
+        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
+        "write": "^0.2.1"
+      }
+    },
     "forever-agent": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
@@ -280,6 +831,21 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    },
+    "get-stdin": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+      "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="
+    },
     "glob": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
@@ -293,11 +859,42 @@
         "path-is-absolute": "^1.0.0"
       }
     },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
     "graceful-fs": {
       "version": "4.1.15",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
       "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
     },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+    },
     "hawk": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
@@ -315,6 +912,11 @@
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
       "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU="
     },
+    "hosted-git-info": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
+      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg=="
+    },
     "http-errors": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -345,6 +947,16 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -359,6 +971,26 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
+    "inquirer": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
+      "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.1.0",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^5.5.2",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      }
+    },
     "ip-regex": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-3.0.0.tgz",
@@ -370,11 +1002,114 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
       "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
     },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
+    "jsx-ast-utils": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz",
+      "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==",
+      "requires": {
+        "array-includes": "^3.0.3",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
     "linkify-it": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
@@ -383,6 +1118,39 @@
         "uc.micro": "^1.0.1"
       }
     },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
     "markdown-it": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
@@ -438,6 +1206,11 @@
         "mime-db": "~1.37.0"
       }
     },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -446,27 +1219,92 @@
         "brace-expansion": "^1.1.7"
       }
     },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
     },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
     "node-uuid": {
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
       "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
     },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
     "oauth-sign": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
       "integrity": "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=",
       "optional": true
     },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-inspect": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -483,21 +1321,188 @@
         "wrappy": "1"
       }
     },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
     "parseurl": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
       "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
     },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+    },
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
+    "path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "requires": {
+        "pify": "^2.0.0"
+      }
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+    },
+    "pkg-conf": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
+      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
+      "requires": {
+        "find-up": "^2.0.0",
+        "load-json-file": "^4.0.0"
+      },
+      "dependencies": {
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
+      }
+    },
+    "pkg-config": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
+      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
+      "requires": {
+        "debug-log": "^1.0.0",
+        "find-root": "^1.0.0",
+        "xtend": "^4.0.1"
+      }
+    },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
     "proxy-addr": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
@@ -516,8 +1521,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "optional": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "qs": {
       "version": "6.5.2",
@@ -540,6 +1544,35 @@
         "unpipe": "1.0.0"
       }
     },
+    "react-is": {
+      "version": "16.11.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz",
+      "integrity": "sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw=="
+    },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "requires": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "requires": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      }
+    },
+    "regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
+    },
     "request": {
       "version": "2.40.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
@@ -572,6 +1605,37 @@
         }
       }
     },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "resolve": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "rimraf": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -580,6 +1644,27 @@
         "glob": "^7.1.3"
       }
     },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-parallel": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+    },
+    "rxjs": {
+      "version": "5.5.12",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+      "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+      "requires": {
+        "symbol-observable": "1.0.1"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -590,6 +1675,11 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+    },
     "send": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
@@ -626,6 +1716,32 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
     },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
     "sntp": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
@@ -635,22 +1751,177 @@
         "hoek": "0.9.x"
       }
     },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
+    "standard": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/standard/-/standard-12.0.1.tgz",
+      "integrity": "sha512-UqdHjh87OG2gUrNCSM4QRLF5n9h3TFPwrCNyVlkqu31Hej0L/rc8hzKqVvkb2W3x0WMq7PzZdkLfEcBhVOR6lg==",
+      "requires": {
+        "eslint": "~5.4.0",
+        "eslint-config-standard": "12.0.0",
+        "eslint-config-standard-jsx": "6.0.2",
+        "eslint-plugin-import": "~2.14.0",
+        "eslint-plugin-node": "~7.0.1",
+        "eslint-plugin-promise": "~4.0.0",
+        "eslint-plugin-react": "~7.11.1",
+        "eslint-plugin-standard": "~4.0.0",
+        "standard-engine": "~9.0.0"
+      }
+    },
+    "standard-engine": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-9.0.0.tgz",
+      "integrity": "sha512-ZfNfCWZ2Xq67VNvKMPiVMKHnMdvxYzvZkf1AH8/cw2NLDBm5LRsxMqvEJpsjLI/dUosZ3Z1d6JlHDp5rAvvk2w==",
+      "requires": {
+        "deglob": "^2.1.0",
+        "get-stdin": "^6.0.0",
+        "minimist": "^1.1.0",
+        "pkg-conf": "^2.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
     "statuses": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
       "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
     },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
       "optional": true
     },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        }
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+    },
+    "symbol-observable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
+    },
+    "table": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz",
+      "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
+      "requires": {
+        "ajv": "^6.0.1",
+        "ajv-keywords": "^3.0.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
     "tough-cookie": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.0.tgz",
@@ -668,6 +1939,14 @@
       "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
       "optional": true
     },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
@@ -682,26 +1961,74 @@
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
       "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="
     },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    },
     "yui": {
       "version": "3.18.1",
       "resolved": "https://registry.npmjs.org/yui/-/yui-3.18.1.tgz",
diff --git a/package.js b/package.js
index f90e539e16..8386283015 100644
--- a/package.js
+++ b/package.js
@@ -1,44 +1,52 @@
+/* global Package */
+
 Package.describe({
-  summary: "Authorization package for Meteor",
-  version: "2.0.1",
-  git: "https://github.com/Meteor-Community-Packages/meteor-roles.git",
-  name: "alanning:roles"
-});
+  summary: 'Authorization package for Meteor',
+  version: '2.0.1',
+  git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
+  name: 'alanning:roles'
+})
 
 Package.onUse(function (api) {
-  api.versionsFrom("METEOR@1.8.1");
+  api.versionsFrom('METEOR@1.8.1')
 
-  var both = ['client', 'server'];
+  var both = ['client', 'server']
 
-  api.use(['ecmascript',
-           'accounts-base',
-           'tracker',
-           'mongo',
-           'check'], both);
+  api.use([
+    'ecmascript',
+    'accounts-base',
+    'tracker',
+    'mongo',
+    'check'
+  ], both)
 
-  api.use(['blaze@2.3.3'], 'client', {weak: true});
+  api.use(['blaze@2.3.3'], 'client', { weak: true })
 
-  api.export('Roles');
+  api.export('Roles')
 
-  api.addFiles('roles/roles_common.js', both);
-  api.addFiles('roles/roles_server.js', 'server');
-  api.addFiles(['roles/client/debug.js',
-                'roles/client/uiHelpers.js',
-                'roles/client/subscriptions.js'], 'client');
-});
+  api.addFiles('roles/roles_common.js', both)
+  api.addFiles('roles/roles_server.js', 'server')
+  api.addFiles([
+    'roles/client/debug.js',
+    'roles/client/uiHelpers.js',
+    'roles/client/subscriptions.js'
+  ], 'client')
+})
 
 Package.onTest(function (api) {
-  api.versionsFrom("METEOR@1.8.1");
+  api.versionsFrom('METEOR@1.8.1')
 
-  var both = ['client', 'server'];
+  var both = ['client', 'server']
 
   // `accounts-password` is included so `Meteor.users` exists
 
-  api.use(['alanning:roles',
-           'accounts-password',
-           'mongo',
-           'tinytest'], both);
+  api.use([
+    'alanning:roles',
+    'accounts-password',
+    'mongo',
+    'tinytest'
+  ], both)
 
-  api.addFiles('roles/tests/client.js', 'client');
-  api.addFiles('roles/tests/server.js', 'server');
-});
+  api.addFiles('roles/tests/client.js', 'client')
+  api.addFiles('roles/tests/server.js', 'server')
+})
diff --git a/package.json b/package.json
index 2cf7685b8c..28e62827be 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "standard": "^12.0.1",
     "yuidocjs": "^0.10.2"
   }
 }
diff --git a/roles/client/debug.js b/roles/client/debug.js
index e235f76ccf..0cb1f431cb 100644
--- a/roles/client/debug.js
+++ b/roles/client/debug.js
@@ -1,7 +1,6 @@
-"use strict"
+/* global Roles, localStorage */
 
-
-////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////
 // Debugging helpers
 //
 // Run this in your browser console to turn on debugging
@@ -14,9 +13,9 @@ Roles.debug = false
 
 try {
   if (localStorage) {
-    var temp = localStorage.getItem("Roles.debug")
+    var temp = localStorage.getItem('Roles.debug')
 
-    if ('undefined' !== typeof temp) {
+    if (typeof temp !== 'undefined') {
       Roles.debug = !!temp
     }
   }
diff --git a/roles/client/subscriptions.js b/roles/client/subscriptions.js
index 2f30bb7aec..76968fc37d 100644
--- a/roles/client/subscriptions.js
+++ b/roles/client/subscriptions.js
@@ -1,4 +1,4 @@
-"use strict";
+/* global Meteor, Roles, Tracker */
 
 /**
  * Subscription handle for the collection of all existing roles.
@@ -14,5 +14,5 @@
  */
 
 Tracker.autorun(function () {
-  Roles.subscription = Meteor.subscribe('_roles');
-});
+  Roles.subscription = Meteor.subscribe('_roles')
+})
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index d9084b0c93..618aafae27 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -1,4 +1,4 @@
-"use strict"
+/* global Meteor, Roles, Match, Package */
 
 /**
  * Convenience functions for use on client.
@@ -10,8 +10,7 @@
  * @module UIHelpers
  */
 
-
-////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////
 // UI helpers
 //
 // Use a semi-private variable rather than declaring UI
@@ -43,9 +42,9 @@ Roles._uiHelpers = {
    * @for UIHelpers
    */
   isInRole: function (role, scope) {
-    var user = Meteor.user(),
-        comma = (role || '').indexOf(','),
-        roles
+    var user = Meteor.user()
+    var comma = (role || '').indexOf(',')
+    var roles
 
     if (!user) return false
     if (!Match.test(role, String)) return false
@@ -70,22 +69,20 @@ Roles._uiHelpers = {
   }
 }
 
-
-
-////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////
 // Register UI helpers
 //
 
 if (Roles.debug && console.log) {
-  console.log("[roles] Roles.debug =", Roles.debug)
+  console.log('[roles] Roles.debug =', Roles.debug)
 }
 
-if ('undefined' !== typeof Package.blaze &&
-    'undefined' !== typeof Package.blaze.Blaze &&
-    'function'  === typeof Package.blaze.Blaze.registerHelper) {
+if (typeof Package.blaze !== 'undefined' &&
+    typeof Package.blaze.Blaze !== 'undefined' &&
+    typeof Package.blaze.Blaze.registerHelper === 'function') {
   Object.entries(Roles._uiHelpers).forEach(([name, func]) => {
     if (Roles.debug && console.log) {
-      console.log("[roles] registering Blaze helper '" + name + "'")
+      console.log('[roles] registering Blaze helper \'' + name + '\'')
     }
     Package.blaze.Blaze.registerHelper(name, func)
   })
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 71d456bee4..9276926dfd 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -1,4 +1,4 @@
-;(function () {
+/* global Meteor, Roles, Mongo */
 
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
@@ -18,26 +18,25 @@
  *
  * Roles can have multiple parents and can be children (subroles) of multiple roles.
  *
- * Example: `{_id: "admin", children: [{_id: "editor"}]}`
+ * Example: `{_id: 'admin', children: [{_id: 'editor'}]}`
  *
  * @module Roles
  */
- if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection("roles");
+if (!Meteor.roles) {
+  Meteor.roles = new Mongo.Collection('roles')
 }
 
 /**
  * @class Roles
  */
-if ('undefined' === typeof Roles) {
-  Roles = {};
+if (typeof Roles === 'undefined') {
+  Roles = {}
 }
 
-"use strict";
-
-var getGroupsForUserDeprecationWarning = false;
+var getGroupsForUserDeprecationWarning = false
 
 Object.assign(Roles, {
+
   /**
    * Used as a global group (now scope) name. Not used anymore.
    *
@@ -58,24 +57,22 @@ Object.assign(Roles, {
    * @static
    */
   createRole: function (roleName, options) {
-    var match;
+    options = Roles._normalizeOptions(options)
 
-    options = Roles._normalizeOptions(options);
-
-    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(roleName)
 
     options = Object.assign({
       unlessExists: false
-    }, options);
+    }, options)
 
-    var result = Meteor.roles.upsert({_id: roleName}, {$setOnInsert: {children: []}});
+    var result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
 
     if (!result.insertedId) {
-      if (options.unlessExists) return null;
-      throw new Error("Role '" + roleName + "' already exists.");
+      if (options.unlessExists) return null
+      throw new Error('Role \'' + roleName + '\' already exists.')
     }
 
-    return result.insertedId;
+    return result.insertedId
   },
 
   /**
@@ -88,9 +85,9 @@ Object.assign(Roles, {
    * @static
    */
   deleteRole: function (roleName) {
-    var roles;
+    var roles
 
-    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(roleName)
 
     // we first remove the role as a children, otherwise
     // Roles._assureConsistency might re-add the role
@@ -100,7 +97,7 @@ Object.assign(Roles, {
           _id: roleName
         }
       }
-    }, {multi: true});
+    }, { multi: true })
 
     Roles.getUsersInRole(roleName, {
       anyScope: true,
@@ -113,21 +110,21 @@ Object.assign(Roles, {
     }).fetch().forEach(function (user, index, cursor) {
       // role can be assigned multiple times to the user, for multiple scopes
       // we have to remove the role for each of those scopes
-      roles = user.roles.filter(Roles._roleMatcher(roleName));
+      roles = user.roles.filter(Roles._roleMatcher(roleName))
       roles.forEach(function (role) {
         Roles._removeUserFromRole(user, roleName, {
           scope: role.scope,
           // we want to remove the role in any case
           _assigned: null
-        });
-      });
+        })
+      })
 
       // handle the edge case
-      Roles._assureConsistency(user);
-    });
+      Roles._assureConsistency(user)
+    })
 
     // remove the role itself
-    Meteor.roles.remove({_id: roleName});
+    Meteor.roles.remove({ _id: roleName })
   },
 
   /**
@@ -139,23 +136,23 @@ Object.assign(Roles, {
    * @static
    */
   renameRole: function (oldName, newName) {
-    var role,
-        count;
+    var role
+    var count
 
-    Roles._checkRoleName(oldName);
-    Roles._checkRoleName(newName);
+    Roles._checkRoleName(oldName)
+    Roles._checkRoleName(newName)
 
-    if (oldName === newName) return;
+    if (oldName === newName) return
 
-    role = Meteor.roles.findOne({_id: oldName});
+    role = Meteor.roles.findOne({ _id: oldName })
 
     if (!role) {
-      throw new Error("Role '" + oldName + "' does not exist.");
+      throw new Error('Role \'' + oldName + '\' does not exist.')
     }
 
-    role._id = newName;
+    role._id = newName
 
-    Meteor.roles.insert(role);
+    Meteor.roles.insert(role)
 
     do {
       count = Meteor.users.update({
@@ -168,8 +165,8 @@ Object.assign(Roles, {
         $set: {
           'roles.$._id': newName
         }
-      }, {multi: true});
-    } while (count > 0);
+      }, { multi: true })
+    } while (count > 0)
 
     do {
       count = Meteor.roles.update({
@@ -182,10 +179,10 @@ Object.assign(Roles, {
         $set: {
           'children.$._id': newName
         }
-      }, {multi: true});
-    } while (count > 0);
+      }, { multi: true })
+    } while (count > 0)
 
-    Meteor.roles.remove({_id: oldName});
+    Meteor.roles.remove({ _id: oldName })
   },
 
   /**
@@ -201,11 +198,11 @@ Object.assign(Roles, {
    */
   addRolesToParent: function (rolesNames, parentName) {
     // ensure arrays
-    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
 
     rolesNames.forEach(function (roleName) {
-      Roles._addRoleToParent(roleName, parentName);
-    });
+      Roles._addRoleToParent(roleName, parentName)
+    })
   },
 
   /**
@@ -216,38 +213,37 @@ Object.assign(Roles, {
    * @static
    */
   _addRoleToParent: function (roleName, parentName) {
-    var role,
-        count,
-        parentRoles,
-        rolesToCheck,
-        alreadyCheckedRoles,
-        checkRoleName,
-        checkRole;
+    var role
+    var count
+    var parentRoles
+    var rolesToCheck
+    var alreadyCheckedRoles
+    var checkRole
 
-    Roles._checkRoleName(roleName);
-    Roles._checkRoleName(parentName);
+    Roles._checkRoleName(roleName)
+    Roles._checkRoleName(parentName)
 
     // query to get role's children
-    role = Meteor.roles.findOne({_id: roleName});
+    role = Meteor.roles.findOne({ _id: roleName })
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.");
+      throw new Error('Role \'' + roleName + '\' does not exist.')
     }
 
     // detect cycles
-    alreadyCheckedRoles = new Set();
-    rolesToCheck = new Set(role.children.map(r => r._id));
+    alreadyCheckedRoles = new Set()
+    rolesToCheck = new Set(role.children.map(r => r._id))
     rolesToCheck.forEach(checkRoleName => {
       if (checkRoleName === parentName) {
-        throw new Error("Roles '" + roleName + "' and '" + parentName + "' would form a cycle.");
+        throw new Error('Roles \'' + roleName + '\' and \'' + parentName + '\' would form a cycle.')
       }
 
-      alreadyCheckedRoles.add(checkRoleName);
+      alreadyCheckedRoles.add(checkRoleName)
 
-      checkRole = Meteor.roles.findOne({_id: checkRoleName});
+      checkRole = Meteor.roles.findOne({ _id: checkRoleName })
 
       if (checkRole) {
-        checkRole.children.map(r => r._id).filter(r => !alreadyCheckedRoles.has(r)).forEach(r => rolesToCheck.add(r));
+        checkRole.children.map(r => r._id).filter(r => !alreadyCheckedRoles.has(r)).forEach(r => rolesToCheck.add(r))
       }
     })
 
@@ -262,11 +258,11 @@ Object.assign(Roles, {
           _id: role._id
         }
       }
-    });
+    })
 
     // if there was no change, parent role might not exist, or role is
     // already a subrole; in any case we do not have anything more to do
-    if (!count) return;
+    if (!count) return
 
     Roles.getUsersInRole(parentName, {
       anyScope: true,
@@ -279,16 +275,16 @@ Object.assign(Roles, {
     }).fetch().forEach(function (user, index, cursor) {
       // parent role can be assigned multiple times to the user, for multiple scopes
       // we have to assign a new subrole for each of those scopes
-      parentRoles = user.roles.filter(Roles._roleMatcher(parentName));
+      parentRoles = user.roles.filter(Roles._roleMatcher(parentName))
       parentRoles.forEach(function (parentRole) {
         Roles._addUserToRole(user, roleName, {
           scope: parentRole.scope,
           // we are assigning a subrole, so we set it as unassigned,
           // but only if they do not already exist
           _assigned: null
-        });
-      });
-    });
+        })
+      })
+    })
   },
 
   /**
@@ -304,11 +300,11 @@ Object.assign(Roles, {
    */
   removeRolesFromParent: function (rolesNames, parentName) {
     // ensure arrays
-    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
 
     rolesNames.forEach(function (roleName) {
-      Roles._removeRoleFromParent(roleName, parentName);
-    });
+      Roles._removeRoleFromParent(roleName, parentName)
+    })
   },
 
   /**
@@ -319,19 +315,19 @@ Object.assign(Roles, {
    * @static
    */
   _removeRoleFromParent: function (roleName, parentName) {
-    var role,
-        count,
-        parentRoles;
+    var role
+    var count
+    var parentRoles
 
-    Roles._checkRoleName(roleName);
-    Roles._checkRoleName(parentName);
+    Roles._checkRoleName(roleName)
+    Roles._checkRoleName(parentName)
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    role = Meteor.roles.findOne({_id: roleName}, {fields: {_id: 1}});
+    role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.");
+      throw new Error('Role \'' + roleName + '\' does not exist.')
     }
 
     count = Meteor.roles.update({
@@ -342,11 +338,11 @@ Object.assign(Roles, {
           _id: role._id
         }
       }
-    });
+    })
 
     // if there was no change, parent role might not exist, or role was
     // already not a subrole; in any case we do not have anything more to do
-    if (!count) return;
+    if (!count) return
 
     Roles.getUsersInRole(parentName, {
       anyScope: true,
@@ -359,18 +355,18 @@ Object.assign(Roles, {
     }).fetch().forEach(function (user, index, cursor) {
       // parent role can be assigned multiple times to the user, for multiple scopes
       // we have to remove the subrole for each of those scopes
-      parentRoles = user.roles.filter(Roles._roleMatcher(parentName));
+      parentRoles = user.roles.filter(Roles._roleMatcher(parentName))
       parentRoles.forEach(function (parentRole) {
         Roles._removeUserFromRole(user, roleName, {
           scope: parentRole.scope,
           // but we want to remove it only if it was not also explicitly assigned
           _assigned: false
-        });
-      });
+        })
+      })
 
       // handle the edge case
-      Roles._assureConsistency(user);
-    });
+      Roles._assureConsistency(user)
+    })
   },
 
   /**
@@ -395,16 +391,16 @@ Object.assign(Roles, {
    * @static
    */
   addUsersToRoles: function (users, roles, options) {
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
+    if (!users) throw new Error('Missing \'users\' param.')
+    if (!roles) throw new Error('Missing \'roles\' param.')
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure arrays
-    if (!Array.isArray(users)) users = [users];
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign({
       ifExists: false,
@@ -413,13 +409,13 @@ Object.assign(Roles, {
       // should the role be set as assigned, default is `true`; `null` is the same as `false`,
       // only that it does not force the value to `false` if the role is already assigned
       _assigned: true
-    }, options);
+    }, options)
 
     users.forEach(function (user) {
       roles.forEach(function (role) {
-        Roles._addUserToRole(user, role, options);
-      });
-    });
+        Roles._addUserToRole(user, role, options)
+      })
+    })
   },
 
   /**
@@ -444,18 +440,18 @@ Object.assign(Roles, {
    * @static
    */
   setUserRoles: function (users, roles, options) {
-    var id;
+    var id
 
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
+    if (!users) throw new Error('Missing \'users\' param.')
+    if (!roles) throw new Error('Missing \'roles\' param.')
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure arrays
-    if (!Array.isArray(users)) users = [users];
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign({
       ifExists: false,
@@ -464,23 +460,22 @@ Object.assign(Roles, {
       // should the role be set as assigned, default is `true`; `null` is the same as `false`,
       // only that it does not force the value to `false` if the role is already assigned
       _assigned: true
-    }, options);
+    }, options)
 
     users.forEach(function (user) {
       if (typeof user === 'object') {
-        id = user._id;
-      }
-      else {
-        id = user;
+        id = user._id
+      } else {
+        id = user
       }
       // we first clear all roles for the user
-      Meteor.users.update(id, {$pull: {roles: {scope: options.scope}}});
+      Meteor.users.update(id, { $pull: { roles: { scope: options.scope } } })
 
       // and then add all
       roles.forEach(function (role) {
-        Roles._addUserToRole(user, role, options);
-      });
-    });
+        Roles._addUserToRole(user, role, options)
+      })
+    })
   },
 
   /**
@@ -501,31 +496,29 @@ Object.assign(Roles, {
    * @static
    */
   _addUserToRole: function (user, roleName, options) {
-    var id,
-        role,
-        count,
-        setRoles;
+    var id
+    var role
+    var count
+    var setRoles
 
-    Roles._checkRoleName(roleName);
-    Roles._checkScopeName(options.scope);
+    Roles._checkRoleName(roleName)
+    Roles._checkScopeName(options.scope)
 
     if (typeof user === 'object') {
-      id = user._id;
-    }
-    else {
-      id = user;
+      id = user._id
+    } else {
+      id = user
     }
 
-    if (!id) return [];
+    if (!id) return []
 
-    role = Meteor.roles.findOne({_id: roleName}, {fields: {children: 1}});
+    role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
 
     if (!role) {
       if (options.ifExists) {
-        return [];
-      }
-      else {
-        throw new Error("Role '" + roleName + "' does not exist.");
+        return []
+      } else {
+        throw new Error('Role \'' + roleName + '\' does not exist.')
       }
     }
 
@@ -550,7 +543,7 @@ Object.assign(Roles, {
           assigned: !!options._assigned
         }
       }
-    });
+    })
 
     if (!count) {
       // a role has not been added, it maybe already exists
@@ -569,9 +562,8 @@ Object.assign(Roles, {
           $set: {
             'roles.$.assigned': true
           }
-        });
-      }
-      else if (options._assigned === false) {
+        })
+      } else if (options._assigned === false) {
         // let's make sure it is set as unassigned
         Meteor.users.update({
           _id: id,
@@ -586,21 +578,21 @@ Object.assign(Roles, {
           $set: {
             'roles.$.assigned': false
           }
-        });
+        })
       }
     }
 
     setRoles = [{
       _id: roleName,
       scope: options.scope
-    }];
+    }]
 
     role.children.forEach(function (child) {
       // subroles are set as unassigned, but only if they do not already exist
-      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, Object.assign({}, options, {_assigned: null})));
-    });
+      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, Object.assign({}, options, { _assigned: null })))
+    })
 
-    return setRoles;
+    return setRoles
   },
 
   /**
@@ -621,16 +613,16 @@ Object.assign(Roles, {
    * @static
    */
   removeUsersFromRoles: function (users, roles, options) {
-    if (!users) throw new Error ("Missing 'users' param.");
-    if (!roles) throw new Error ("Missing 'roles' param.");
+    if (!users) throw new Error('Missing \'users\' param.')
+    if (!roles) throw new Error('Missing \'roles\' param.')
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure arrays
-    if (!Array.isArray(users)) users = [users];
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign({
       // internal option, should not be used publicly because it will break assumptions
@@ -638,18 +630,18 @@ Object.assign(Roles, {
       // when should the role be removed, default is `true` which means only when it is assigned,
       // `false` means when it is not assigned, and `null` means always
       _assigned: true
-    }, options);
+    }, options)
 
     users.forEach(function (user) {
-      if (!user) return;
+      if (!user) return
 
       roles.forEach(function (role) {
-        Roles._removeUserFromRole(user, role, options);
-      });
+        Roles._removeUserFromRole(user, role, options)
+      })
 
       // handle the edge case
-      Roles._assureConsistency(user);
-    });
+      Roles._assureConsistency(user)
+    })
   },
 
   /**
@@ -674,21 +666,20 @@ Object.assign(Roles, {
    * @static
    */
   _removeUserFromRole: function (user, roleName, options) {
-    var id,
-        role,
-        update;
+    var id
+    var role
+    var update
 
-    Roles._checkRoleName(roleName);
-    Roles._checkScopeName(options.scope);
+    Roles._checkRoleName(roleName)
+    Roles._checkScopeName(options.scope)
 
     if (typeof user === 'object') {
-      id = user._id;
-    }
-    else {
-      id = user;
+      id = user._id
+    } else {
+      id = user
     }
 
-    if (!id) return;
+    if (!id) return
 
     update = {
       $pull: {
@@ -697,27 +688,26 @@ Object.assign(Roles, {
           scope: options.scope
         }
       }
-    };
+    }
 
     if (options._assigned) {
-      update.$pull.roles.assigned = true;
-    }
-    else if (options._assigned === false) {
-      update.$pull.roles.assigned = false;
+      update.$pull.roles.assigned = true
+    } else if (options._assigned === false) {
+      update.$pull.roles.assigned = false
     }
 
     // we try to remove the role in every case, whether the role really exists or not
-    Meteor.users.update(id, update);
+    Meteor.users.update(id, update)
 
-    role = Meteor.roles.findOne({_id: roleName}, {fields: {children: 1}});
+    role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
 
     // role does not exist, we do not anything more
-    if (!role) return;
+    if (!role) return
 
     role.children.forEach(function (child) {
       // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child._id, Object.assign({}, options, {_assigned: false}));
-    });
+      Roles._removeUserFromRole(user, child._id, Object.assign({}, options, { _assigned: false }))
+    })
   },
 
   /**
@@ -735,36 +725,35 @@ Object.assign(Roles, {
    * @static
    */
   _assureConsistency: function (user) {
-    var roles,
-        setRoles;
+    var roles
+    var setRoles
 
     // we want always the latest state
-    user = Roles._resolveUser(user, true);
+    user = Roles._resolveUser(user, true)
 
     // only assigned roles
-    roles = user.roles.filter(Roles._onlyAssignedMatcher());
+    roles = user.roles.filter(Roles._onlyAssignedMatcher())
 
-    setRoles = [];
+    setRoles = []
     roles.forEach(function (role) {
       setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
         scope: role.scope,
         _assigned: role.assigned, // this is true
         ifExists: true
-      }));
-    });
+      }))
+    })
 
     if (setRoles.length) {
       // remove all extra entries which should not be there
       Meteor.users.update(user._id, {
         $pull: {
           roles: {
-            $nor: setRoles.map(function (role) { return {_id: role._id, scope: role.scope } })
+            $nor: setRoles.map(function (role) { return { _id: role._id, scope: role.scope } })
           }
         }
-      });
-    }
-    else {
-      Meteor.users.update(user._id, {$set: {roles: []}});
+      })
+    } else {
+      Meteor.users.update(user._id, { $set: { roles: [] } })
     }
   },
 
@@ -789,7 +778,7 @@ Object.assign(Roles, {
    *                             will return `true` if user is in _any_ role.
    *                             Roles do not have to exist.
    * @param {Object|String} [options] Options:
-   *   - `scope`: name of the scope; if supplied, limits check to just that scope;
+   *   - `scope`: name of the scope; if supplied, limits check to just that scope
    *     the user's global roles will always be checked whether scope is specified or not
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *
@@ -798,64 +787,62 @@ Object.assign(Roles, {
    * @static
    */
   userIsInRole: function (user, roles, options) {
-    var id,
-        query;
+    var id
+    var query
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure array to simplify code
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(roles)) roles = [roles]
 
-    if (!roles.length) return false;
+    if (!roles.length) return false
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign({
       anyScope: false
-    }, options);
+    }, options)
 
-    if (!user) return false;
+    if (!user) return false
 
     if (typeof user === 'object') {
       if ('roles' in user) {
         return roles.some(function (role) {
-          const roles = user.roles || [];
+          const roles = user.roles || []
           if (options.anyScope) {
-            return roles.some(Roles._roleMatcher(role));
-          }
-          else {
-            return roles.some(Roles._roleAndScopeMatcher(role, options.scope));
+            return roles.some(Roles._roleMatcher(role))
+          } else {
+            return roles.some(Roles._roleAndScopeMatcher(role, options.scope))
           }
         })
       } else {
         // missing roles field, try going direct via id
-        id = user._id;
+        id = user._id
       }
     } else {
-      id = user;
+      id = user
     }
 
-    if (!id) return false;
+    if (!id) return false
 
     if (options.anyScope) {
       query = {
         _id: id,
-        'roles._id': {$in: roles}
-      };
-    }
-    else {
+        'roles._id': { $in: roles }
+      }
+    } else {
       query = {
         _id: id,
         roles: {
           $elemMatch: {
-            _id: {$in: roles},
-            scope: {$in: [options.scope, null]}
+            _id: { $in: roles },
+            scope: { $in: [options.scope, null] }
           }
         }
-      };
+      }
     }
 
-    return !!Meteor.users.findOne(query, {fields: {_id: 1}});
+    return !!Meteor.users.findOne(query, { fields: { _id: 1 } })
   },
 
   /**
@@ -874,36 +861,36 @@ Object.assign(Roles, {
    * @static
    */
   getRolesForUser: function (user, options) {
-    var roles;
+    var roles
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign({
       fullObjects: false,
       onlyAssigned: false,
       anyScope: false
-    }, options);
+    }, options)
 
-    user = Roles._resolveUser(user);
+    user = Roles._resolveUser(user)
 
-    if (!user) return [];
+    if (!user) return []
 
-    roles = user.roles || [];
+    roles = user.roles || []
     if (!options.anyScope) {
-      roles = roles.filter(Roles._scopeMatcher(options.scope));
+      roles = roles.filter(Roles._scopeMatcher(options.scope))
     }
 
     if (options.onlyAssigned) {
-      roles = roles.filter(Roles._onlyAssignedMatcher());
+      roles = roles.filter(Roles._onlyAssignedMatcher())
     }
 
     if (options.fullObjects) {
-      return roles;
+      return roles
     }
 
-    return [...new Set(roles.map(role => role._id))];
+    return [...new Set(roles.map(r => r._id))]
   },
 
   /**
@@ -916,9 +903,9 @@ Object.assign(Roles, {
    * @static
    */
   getAllRoles: function (queryOptions) {
-    queryOptions = queryOptions || {sort: {_id: 1}};
+    queryOptions = queryOptions || { sort: { _id: 1 } }
 
-    return Meteor.roles.find({}, queryOptions);
+    return Meteor.roles.find({}, queryOptions)
   },
 
   /**
@@ -945,11 +932,11 @@ Object.assign(Roles, {
    * @static
    */
   getUsersInRole: function (roles, options, queryOptions) {
-    var result;
+    var result
 
-    result = Roles._usersInRoleQuery(roles, options, queryOptions);
+    result = Roles._usersInRoleQuery(roles, options, queryOptions)
 
-    return Meteor.users.find(result.query, result.queryOptions);
+    return Meteor.users.find(result.query, result.queryOptions)
   },
 
   /**
@@ -973,34 +960,33 @@ Object.assign(Roles, {
    * @static
    */
   _usersInRoleQuery: function (roles, options, queryOptions) {
-    var query;
+    var query
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure array to simplify code
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(roles)) roles = [roles]
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign({
       queryOptions: queryOptions || {},
       anyScope: false
-    }, options);
+    }, options)
 
     if (options.anyScope) {
       query = {
-        'roles._id': {$in: roles}
-      };
-    }
-    else {
+        'roles._id': { $in: roles }
+      }
+    } else {
       query = {
         roles: {
           $elemMatch: {
-            _id: {$in: roles},
-            scope: {$in: [options.scope, null]}
+            _id: { $in: roles },
+            scope: { $in: [options.scope, null] }
           }
         }
-      };
+      }
     }
 
     return {
@@ -1016,13 +1002,13 @@ Object.assign(Roles, {
    * @static
    * @deprecated
    */
-  getGroupsForUser: function (/*args*/) {
+  getGroupsForUser: function (...args) {
     if (!getGroupsForUserDeprecationWarning) {
-      getGroupsForUserDeprecationWarning = true;
-      console && console.warn("getGroupsForUser has been deprecated. Use getScopesForUser instead.");
+      getGroupsForUserDeprecationWarning = true
+      console && console.warn('getGroupsForUser has been deprecated. Use getScopesForUser instead.')
     }
 
-    return Roles.getScopesForUser.apply(this, arguments);
+    return Roles.getScopesForUser(...args)
   },
 
   /**
@@ -1036,25 +1022,25 @@ Object.assign(Roles, {
    * @static
    */
   getScopesForUser: function (user, roles) {
-    var scopes;
+    var scopes
 
     // ensure array to simplify code
-    if (roles && !Array.isArray(roles)) roles = [roles];
+    if (roles && !Array.isArray(roles)) roles = [roles]
 
-    user = Roles._resolveUser(user);
+    user = Roles._resolveUser(user)
 
-    if (!user) return [];
+    if (!user) return []
 
     scopes = [];
     (user.roles || []).forEach(function (userRole) {
       // == used on purpose.
-      if (userRole.scope == null) return;
-      if (roles && !roles.includes(userRole._id)) return;
+      if (userRole.scope == null) return
+      if (roles && !roles.includes(userRole._id)) return
 
-      scopes.push(userRole.scope);
-    });
+      scopes.push(userRole.scope)
+    })
 
-    return [...new Set(scopes)];
+    return [...new Set(scopes)]
   },
 
   /**
@@ -1068,12 +1054,12 @@ Object.assign(Roles, {
    * @static
    */
   renameScope: function (oldName, newName) {
-    var count;
+    var count
 
-    Roles._checkScopeName(oldName);
-    Roles._checkScopeName(newName);
+    Roles._checkScopeName(oldName)
+    Roles._checkScopeName(newName)
 
-    if (oldName === newName) return;
+    if (oldName === newName) return
 
     do {
       count = Meteor.users.update({
@@ -1086,8 +1072,8 @@ Object.assign(Roles, {
         $set: {
           'roles.$.scope': newName
         }
-      }, {multi: true});
-    } while (count > 0);
+      }, { multi: true })
+    } while (count > 0)
   },
 
   /**
@@ -1100,7 +1086,7 @@ Object.assign(Roles, {
    * @static
    */
   removeScope: function (name) {
-    Roles._checkScopeName(name);
+    Roles._checkScopeName(name)
 
     Meteor.users.update({}, {
       $pull: {
@@ -1108,7 +1094,7 @@ Object.assign(Roles, {
           scope: name
         }
       }
-    }, {multi: true});
+    }, { multi: true })
   },
 
   /**
@@ -1125,18 +1111,18 @@ Object.assign(Roles, {
   _resolveUser: function (user, force) {
     // TODO: We could use $elemMatch to limit returned fields here.
     if (!user) {
-      return null;
+      return null
     } else if (typeof user !== 'object') {
       user = Meteor.users.findOne(
-               {_id: user},
-               {fields: {roles: 1}});
+        { _id: user },
+        { fields: { roles: 1 } })
     } else if (force || !('roles' in user)) {
       user = Meteor.users.findOne(
-               {_id: user._id},
-               {fields: {roles: 1}});
+        { _id: user._id },
+        { fields: { roles: 1 } })
     }
 
-    return user;
+    return user
   },
 
   /**
@@ -1149,8 +1135,8 @@ Object.assign(Roles, {
    */
   _roleMatcher: function (roleName) {
     return function (userRole) {
-      return userRole._id === roleName;
-    };
+      return userRole._id === roleName
+    }
   },
 
   /**
@@ -1164,10 +1150,10 @@ Object.assign(Roles, {
    */
   _roleAndScopeMatcher: function (roleName, scope) {
     return function (userRole) {
-      // == used on purpose in "userRole.scope == null"
+      // == used on purpose in 'userRole.scope == null'
       return (userRole._id === roleName && userRole.scope === scope) ||
-        (userRole._id === roleName && (!('scope' in userRole) || userRole.scope == null));
-    };
+        (userRole._id === roleName && (!('scope' in userRole) || userRole.scope == null))
+    }
   },
 
   /**
@@ -1180,10 +1166,10 @@ Object.assign(Roles, {
    */
   _scopeMatcher: function (scope) {
     return function (userRole) {
-      // == used on purpose in "userRole.scope == null"
+      // == used on purpose in 'userRole.scope == null'
       return (userRole.scope === scope) ||
-        (!('scope' in userRole) || userRole.scope == null);
-    };
+        (!('scope' in userRole) || userRole.scope == null)
+    }
   },
 
   /**
@@ -1195,8 +1181,8 @@ Object.assign(Roles, {
    */
   _onlyAssignedMatcher: function () {
     return function (userRole) {
-      return !!userRole.assigned;
-    };
+      return !!userRole.assigned
+    }
   },
 
   /**
@@ -1209,7 +1195,7 @@ Object.assign(Roles, {
    */
   _checkRoleName: function (roleName) {
     if (!roleName || typeof roleName !== 'string' || Roles._trim(roleName) !== roleName) {
-      throw new Error("Invalid role name '" + roleName + "'.");
+      throw new Error('Invalid role name \'' + roleName + '\'.')
     }
   },
 
@@ -1225,33 +1211,33 @@ Object.assign(Roles, {
    */
   isParentOf: function (parentRoleName, childRoleName) {
     if (parentRoleName === childRoleName) {
-      return true;
+      return true
     }
 
     if (parentRoleName == null || childRoleName == null) {
-      return false;
+      return false
     }
 
-    Roles._checkRoleName(parentRoleName);
-    Roles._checkRoleName(childRoleName);
+    Roles._checkRoleName(parentRoleName)
+    Roles._checkRoleName(childRoleName)
 
-    var rolesToCheck = [parentRoleName];
+    var rolesToCheck = [parentRoleName]
     while (rolesToCheck.length !== 0) {
-      var roleName = rolesToCheck.pop();
+      var roleName = rolesToCheck.pop()
 
       if (roleName === childRoleName) {
-        return true;
+        return true
       }
 
-      var role = Meteor.roles.findOne({_id: roleName});
+      var role = Meteor.roles.findOne({ _id: roleName })
 
       // This should not happen, but this is a problem to address at some other time.
-      if (!role) continue;
+      if (!role) continue
 
-      rolesToCheck = rolesToCheck.concat(_.pluck(role.children, '_id'));
+      rolesToCheck = rolesToCheck.concat(role.children.map(r => r._id))
     }
 
-    return false;
+    return false
   },
 
   /**
@@ -1264,15 +1250,15 @@ Object.assign(Roles, {
    * @static
    */
   _normalizeOptions: function (options) {
-    options = options === undefined ? {} : options;
+    options = options === undefined ? {} : options
 
     if (options === null || typeof options === 'string') {
-      options = {scope: options};
+      options = { scope: options }
     }
 
-    options.scope = Roles._normalizeScopeName(options.scope);
+    options.scope = Roles._normalizeScopeName(options.scope)
 
-    return options;
+    return options
   },
 
   /**
@@ -1287,10 +1273,9 @@ Object.assign(Roles, {
   _normalizeScopeName: function (scopeName) {
     // map undefined and null to null
     if (scopeName == null) {
-      return null;
-    }
-    else {
-      return scopeName;
+      return null
+    } else {
+      return scopeName
     }
   },
 
@@ -1303,10 +1288,10 @@ Object.assign(Roles, {
    * @static
    */
   _checkScopeName: function (scopeName) {
-    if (scopeName === null) return;
+    if (scopeName === null) return
 
     if (!scopeName || typeof scopeName !== 'string' || Roles._trim(scopeName) !== scopeName) {
-      throw new Error("Invalid scope name '" + scopeName + "'.");
+      throw new Error('Invalid scope name \'' + scopeName + '\'.')
     }
   },
 
@@ -1318,12 +1303,9 @@ Object.assign(Roles, {
    */
   _trim: function (string) {
     if (string.trim) {
-      return string.trim();
-    }
-    else {
-      return string.replace(/^\s+|\s+$/g, '');
+      return string.trim()
+    } else {
+      return string.replace(/^\s+|\s+$/g, '')
     }
   }
-});
-
-}());
+})
diff --git a/roles/roles_server.js b/roles/roles_server.js
index a4b2e8277a..e218fd35a4 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,9 +1,9 @@
-"use strict";
+/* global Meteor, Roles */
 
 // Create default indexes on users collection.
 // Index only on "roles._id" is not needed because the combined index works for it as well.
-Meteor.users._ensureIndex({'roles._id': 1, 'roles.scope': 1});
-Meteor.users._ensureIndex({'roles.scope': 1});
+Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
+Meteor.users._ensureIndex({ 'roles.scope': 1 })
 
 /*
  * Publish logged-in user's roles so client-side checks can work.
@@ -11,17 +11,19 @@ Meteor.users._ensureIndex({'roles.scope': 1});
  * Use a named publish function so clients can check `ready()` state.
  */
 Meteor.publish('_roles', function () {
-  var loggedInUserId = this.userId,
-      fields = {roles: 1};
+  var loggedInUserId = this.userId
+  var fields = { roles: 1 }
 
   if (!loggedInUserId) {
-    this.ready();
-    return;
+    this.ready()
+    return
   }
 
-  return Meteor.users.find({_id: loggedInUserId},
-                           {fields: fields});
-});
+  return Meteor.users.find(
+    { _id: loggedInUserId },
+    { fields: fields }
+  )
+})
 
 Object.assign(Roles, {
   /**
@@ -34,7 +36,7 @@ Object.assign(Roles, {
    * @static
    */
   _isNewRole: function (role) {
-    return !('name' in role) && 'children' in role;
+    return !('name' in role) && 'children' in role
   },
 
   /**
@@ -47,7 +49,7 @@ Object.assign(Roles, {
    * @static
    */
   _isOldRole: function (role) {
-    return 'name' in role && !('children' in role);
+    return 'name' in role && !('children' in role)
   },
 
   /**
@@ -60,7 +62,7 @@ Object.assign(Roles, {
    * @static
    */
   _isNewField: function (roles) {
-    return Array.isArray(roles) && (typeof roles[0] === 'object');
+    return Array.isArray(roles) && (typeof roles[0] === 'object')
   },
 
   /**
@@ -73,7 +75,7 @@ Object.assign(Roles, {
    * @static
    */
   _isOldField: function (roles) {
-    return (Array.isArray(roles) && (typeof roles[0] === 'string')) || ((typeof roles === 'object') && !Array.isArray(roles));
+    return (Array.isArray(roles) && (typeof roles[0] === 'string')) || ((typeof roles === 'object') && !Array.isArray(roles))
   },
 
   /**
@@ -85,12 +87,12 @@ Object.assign(Roles, {
    * @static
    */
   _convertToNewRole: function (oldRole) {
-    if (!(typeof oldRole.name === 'string')) throw new Error("Role name '" + oldRole.name + "' is not a string.");
+    if (!(typeof oldRole.name === 'string')) throw new Error("Role name '" + oldRole.name + "' is not a string.")
 
     return {
       _id: oldRole.name,
       children: []
-    };
+    }
   },
 
   /**
@@ -102,11 +104,11 @@ Object.assign(Roles, {
    * @static
    */
   _convertToOldRole: function (newRole) {
-    if (!(typeof newRole._id === 'string')) throw new Error("Role name '" + newRole._id + "' is not a string.");
+    if (!(typeof newRole._id === 'string')) throw new Error("Role name '" + newRole._id + "' is not a string.")
 
     return {
       name: newRole._id
-    };
+    }
   },
 
   /**
@@ -119,40 +121,38 @@ Object.assign(Roles, {
    * @static
    */
   _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
-    var roles = [];
+    var roles = []
     if (Array.isArray(oldRoles)) {
       oldRoles.forEach(function (role, index) {
-        if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.");
+        if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.")
 
         roles.push({
           _id: role,
           scope: null,
           assigned: true
         })
-      });
-    }
-    else if (typeof oldRoles === 'object') {
+      })
+    } else if (typeof oldRoles === 'object') {
       Object.entries(oldRoles).forEach(([group, rolesArray]) => {
         if (group === '__global_roles__') {
-          group = null;
-        }
-        else if (convertUnderscoresToDots) {
+          group = null
+        } else if (convertUnderscoresToDots) {
           // unescape
-          group = group.replace(/_/g, '.');
+          group = group.replace(/_/g, '.')
         }
 
         rolesArray.forEach(function (role) {
-          if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.");
+          if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.")
 
           roles.push({
             _id: role,
             scope: group,
             assigned: true
           })
-        });
+        })
       })
     }
-    return roles;
+    return roles
   },
 
   /**
@@ -165,43 +165,40 @@ Object.assign(Roles, {
    * @static
    */
   _convertToOldField: function (newRoles, usingGroups) {
-    var roles;
+    var roles
 
     if (usingGroups) {
-      roles = {};
-    }
-    else {
-      roles = [];
+      roles = {}
+    } else {
+      roles = []
     }
 
     newRoles.forEach(function (userRole) {
-      if (!(typeof userRole === 'object')) throw new Error("Role '" + userRole + "' is not an object.");
+      if (!(typeof userRole === 'object')) throw new Error("Role '" + userRole + "' is not an object.")
 
       // We assume that we are converting back a failed migration, so values can only be
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
 
       if (userRole.scope) {
-        if (!usingGroups) throw new Error("Role '" + userRole._id + "' with scope '" + userRole.scope + "' without enabled groups.");
+        if (!usingGroups) throw new Error("Role '" + userRole._id + "' with scope '" + userRole.scope + "' without enabled groups.")
 
         // escape
-        var scope = userRole.scope.replace(/\./g, '_');
+        var scope = userRole.scope.replace(/\./g, '_')
 
-        if (scope[0] === '$') throw new Error("Group name '" + scope + "' start with $.");
+        if (scope[0] === '$') throw new Error("Group name '" + scope + "' start with $.")
 
-        roles[scope] = roles[scope] || [];
-        roles[scope].push(userRole._id);
-      }
-      else {
+        roles[scope] = roles[scope] || []
+        roles[scope].push(userRole._id)
+      } else {
         if (usingGroups) {
-          roles.__global_roles__ = roles.__global_roles__ || [];
-          roles.__global_roles__.push(userRole._id);
-        }
-        else {
-          roles.push(userRole._id);
+          roles.__global_roles__ = roles.__global_roles__ || []
+          roles.__global_roles__.push(userRole._id)
+        } else {
+          roles.push(userRole._id)
         }
       }
-    });
-    return roles;
+    })
+    return roles
   },
 
   /**
@@ -218,8 +215,8 @@ Object.assign(Roles, {
       // making sure nothing changed in meantime
       roles: user.roles
     }, {
-      $set: {roles: roles}
-    });
+      $set: { roles }
+    })
   },
 
   /**
@@ -231,8 +228,8 @@ Object.assign(Roles, {
    * @static
    */
   _defaultUpdateRole: function (oldRole, newRole) {
-    Meteor.roles.remove(oldRole._id);
-    Meteor.roles.insert(newRole);
+    Meteor.roles.remove(oldRole._id)
+    Meteor.roles.insert(newRole)
   },
 
   /**
@@ -245,10 +242,10 @@ Object.assign(Roles, {
    */
   _dropCollectionIndex: function (collection, indexName) {
     try {
-      collection._dropIndex(indexName);
+      collection._dropIndex(indexName)
     } catch (e) {
-      if (e.name !== 'MongoError') throw e;
-      if (!/index not found/.test(e.err || e.errmsg)) throw e;
+      if (e.name !== 'MongoError') throw e
+      if (!/index not found/.test(e.err || e.errmsg)) throw e
     }
   },
 
@@ -264,22 +261,22 @@ Object.assign(Roles, {
    * @static
    */
   _forwardMigrate: function (updateUser, updateRole, convertUnderscoresToDots) {
-    updateUser = updateUser || Roles._defaultUpdateUser;
-    updateRole = updateRole || Roles._defaultUpdateRole;
+    updateUser = updateUser || Roles._defaultUpdateUser
+    updateRole = updateRole || Roles._defaultUpdateRole
 
-    Roles._dropCollectionIndex(Meteor.roles, 'name_1');
+    Roles._dropCollectionIndex(Meteor.roles, 'name_1')
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isNewRole(role)) {
-        updateRole(role, Roles._convertToNewRole(role));
+        updateRole(role, Roles._convertToNewRole(role))
       }
-    });
+    })
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isNewField(user.roles)) {
-        updateUser(user, Roles._convertToNewField(user.roles, convertUnderscoresToDots));
+        updateUser(user, Roles._convertToNewField(user.roles, convertUnderscoresToDots))
       }
-    });
+    })
   },
 
   /**
@@ -298,22 +295,22 @@ Object.assign(Roles, {
    * @static
    */
   _backwardMigrate: function (updateUser, updateRole, usingGroups) {
-    updateUser = updateUser || Roles._defaultUpdateUser;
-    updateRole = updateRole || Roles._defaultUpdateRole;
+    updateUser = updateUser || Roles._defaultUpdateUser
+    updateRole = updateRole || Roles._defaultUpdateRole
 
-    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1');
-    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1');
+    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1')
+    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1')
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isOldRole(role)) {
-        updateRole(role, Roles._convertToOldRole(role));
+        updateRole(role, Roles._convertToOldRole(role))
       }
-    });
+    })
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isOldField(user.roles)) {
-        updateUser(user, Roles._convertToOldField(user.roles, usingGroups));
+        updateUser(user, Roles._convertToOldField(user.roles, usingGroups))
       }
-    });
+    })
   }
-});
+})
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 6c6e8027c3..53ac8bbf1f 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -1,9 +1,8 @@
+/* global Meteor, Roles, Tinytest */
+
 ;(function () {
-
-  "use strict";
-
-  var users,
-      roles = ['admin','editor','user'];
+  var users
+  var roles = ['admin', 'editor', 'user']
 
   users = {
     'eve': {
@@ -42,37 +41,36 @@
         assigned: true
       }]
     }
-  };
+  }
 
   function testUser (test, username, expectedRoles, group) {
-    var user = users[username];
+    var user = users[username]
 
     // test using user object rather than userId to avoid mocking
     roles.forEach(function (role) {
-      var expected = expectedRoles.includes(role),
-          msg = username + ' expected to have \'' + role + '\' permission but does not',
-          nmsg = username + ' had un-expected permission ' + role;
+      var expected = expectedRoles.includes(role)
+      var msg = username + ' expected to have \'' + role + '\' permission but does not'
+      var nmsg = username + ' had un-expected permission ' + role
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(user, role, group), msg);
+        test.isTrue(Roles.userIsInRole(user, role, group), msg)
       } else {
-        test.isFalse(Roles.userIsInRole(user, role, group), nmsg);
+        test.isFalse(Roles.userIsInRole(user, role, group), nmsg)
       }
-    });
+    })
   }
 
-
   // Mock Meteor.user() for isInRole handlebars helper testing
   Meteor.user = function () {
-    return users.eve;
-  };
+    return users.eve
+  }
 
   Tinytest.add(
     'roles - can check current users roles via template helper',
     function (test) {
-      var isInRole,
-          expected,
-          actual;
+      var isInRole
+      var expected
+      var actual
 
       if (!Roles._handlebarsHelpers) {
         // probably running package tests outside of a Meteor app.
@@ -80,41 +78,40 @@
         return
       }
 
-      isInRole = Roles._handlebarsHelpers.isInRole;
-      test.equal(typeof isInRole, 'function', "'isInRole' helper not registered");
+      isInRole = Roles._handlebarsHelpers.isInRole
+      test.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
 
-      expected = true;
-      actual = isInRole('admin, editor');
-      test.equal(actual, expected);
+      expected = true
+      actual = isInRole('admin, editor')
+      test.equal(actual, expected)
 
-      expected = true;
-      actual = isInRole('admin');
-      test.equal(actual, expected);
+      expected = true
+      actual = isInRole('admin')
+      test.equal(actual, expected)
 
-      expected = false;
-      actual = isInRole('unknown');
-      test.equal(actual, expected);
-    });
+      expected = false
+      actual = isInRole('unknown')
+      test.equal(actual, expected)
+    })
 
   Tinytest.add(
     'roles - can check if user is in role',
     function (test) {
-      testUser(test, 'eve', ['admin', 'editor']);
-    });
+      testUser(test, 'eve', ['admin', 'editor'])
+    })
 
   Tinytest.add(
     'roles - can check if user is in role by group',
     function (test) {
-      testUser(test, 'bob', ['user'], 'group1');
-      testUser(test, 'bob', ['editor'], 'group2');
-    });
+      testUser(test, 'bob', ['user'], 'group1')
+      testUser(test, 'bob', ['editor'], 'group2')
+    })
 
   Tinytest.add(
     'roles - can check if user is in role with Roles.GLOBAL_GROUP',
     function (test) {
-      testUser(test, 'joe', ['admin']);
-      testUser(test, 'joe', ['admin'], Roles.GLOBAL_GROUP);
-      testUser(test, 'joe', ['admin', 'editor'], 'group1');
-    });
-
-}());
+      testUser(test, 'joe', ['admin'])
+      testUser(test, 'joe', ['admin'], Roles.GLOBAL_GROUP)
+      testUser(test, 'joe', ['admin', 'editor'], 'group1')
+    })
+}())
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 2bd0079388..8d23dd4385 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1,945 +1,935 @@
+/* global Meteor, Roles, Accounts, Tinytest */
+
 ;(function () {
-
-  var users = {},
-      roles = ['admin', 'editor', 'user'];
-
-  // use to run individual tests
-  //Tinytest.oadd = Tinytest.add
-  //Tinytest.add = function () {}
+  var users = {}
+  var roles = ['admin', 'editor', 'user']
 
   function addUser (name) {
-    return Accounts.createUser({'username': name});
+    return Accounts.createUser({ 'username': name })
   }
 
   function reset () {
-    Meteor.roles.remove({});
-    Meteor.users.remove({});
+    Meteor.roles.remove({})
+    Meteor.users.remove({})
 
     users = {
       'eve': addUser('eve'),
       'bob': addUser('bob'),
       'joe': addUser('joe')
-    };
+    }
   }
 
-
   function testUser (test, username, expectedRoles, scope) {
-    var userId = users[username],
-        userObj = Meteor.users.findOne({_id: userId});
+    var userId = users[username]
+    var userObj = Meteor.users.findOne({ _id: userId })
 
     // check using user ids (makes db calls)
-    _innerTest(test, userId, username, expectedRoles, scope);
+    _innerTest(test, userId, username, expectedRoles, scope)
 
     // check using passed-in user object
-    _innerTest(test, userObj, username, expectedRoles, scope);
+    _innerTest(test, userObj, username, expectedRoles, scope)
   }
 
   function _innerTest (test, userParam, username, expectedRoles, scope) {
     // test that user has only the roles expected and no others
     roles.forEach(function (role) {
-      var expected = expectedRoles.includes(role),
-          msg = username + ' expected to have \'' + role + '\' role but does not',
-          nmsg = username + ' had the following un-expected role: ' + role;
+      var expected = expectedRoles.includes(role)
+      var msg = username + ' expected to have \'' + role + '\' role but does not'
+      var nmsg = username + ' had the following un-expected role: ' + role
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(userParam, role, scope), msg);
+        test.isTrue(Roles.userIsInRole(userParam, role, scope), msg)
       } else {
-        test.isFalse(Roles.userIsInRole(userParam, role, scope), nmsg);
+        test.isFalse(Roles.userIsInRole(userParam, role, scope), nmsg)
       }
     })
   }
 
   var deepEqual = function (x, y) {
     if (x === y) {
-      return true;
-    }
-    else if ((typeof x == "object" && x != null) && (typeof y == "object" && y != null)) {
-      if (Object.keys(x).length != Object.keys(y).length)
-        return false;
-
-      for (var prop in x) {
-        if (y.hasOwnProperty(prop))
-        {
-          if (! deepEqual(x[prop], y[prop]))
-            return false;
-        }
-        else
-          return false;
+      return true
+    } else if ((typeof x === 'object' && x != null) && (typeof y === 'object' && y != null)) {
+      if (Object.keys(x).length !== Object.keys(y).length) {
+        return false
       }
 
-      return true;
+      for (var prop in x) {
+        if (y.hasOwnProperty(prop)) {
+          if (!deepEqual(x[prop], y[prop])) {
+            return false
+          }
+        } else {
+          return false
+        }
+      }
+
+      return true
+    } else {
+      return false
     }
-    else
-      return false;
   }
 
   function itemsEqual (test, actual, expected) {
-    actual = actual || [];
-    expected = expected || [];
+    actual = actual || []
+    expected = expected || []
 
-    function intersectionObjects(...args) {
-      var array, rest;
-      array = args[0];
-      rest = 2 <= args.length ? args.slice(1) : [];
+    function intersectionObjects (...args) {
+      var array, rest
+      array = args[0]
+      rest = args.length > 2 ? args.slice(1) : []
       return [...new Set(array)].filter(function (item) {
         return rest.every(function (other) {
           return other.some(function (element) {
-            return deepEqual(element, item);
-          });
-        });
-      });
+            return deepEqual(element, item)
+          })
+        })
+      })
     }
 
     if (actual.length === expected.length && intersectionObjects(actual, expected).length === actual.length) {
-      test.ok();
-    }
-    else {
+      test.ok()
+    } else {
       test.fail({
         type: 'itemsEqual',
         actual: JSON.stringify(actual),
         expected: JSON.stringify(expected)
-      });
+      })
     }
   }
 
   Tinytest.add(
     'roles - can create and delete roles',
     function (test) {
-      reset();
+      reset()
 
-      var role1Id = Roles.createRole('test1');
-      test.equal(Meteor.roles.findOne()._id, 'test1');
-      test.equal(Meteor.roles.findOne(role1Id)._id, 'test1');
+      var role1Id = Roles.createRole('test1')
+      test.equal(Meteor.roles.findOne()._id, 'test1')
+      test.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
 
-      var role2Id = Roles.createRole('test2');
-      test.equal(Meteor.roles.findOne({_id: 'test2'})._id, 'test2');
-      test.equal(Meteor.roles.findOne(role2Id)._id, 'test2');
+      var role2Id = Roles.createRole('test2')
+      test.equal(Meteor.roles.findOne({ _id: 'test2' })._id, 'test2')
+      test.equal(Meteor.roles.findOne(role2Id)._id, 'test2')
 
-      test.equal(Meteor.roles.find().count(), 2);
+      test.equal(Meteor.roles.find().count(), 2)
 
-      Roles.deleteRole('test1');
-      test.equal(typeof Meteor.roles.findOne({_id: 'test1'}), 'undefined');
+      Roles.deleteRole('test1')
+      test.equal(typeof Meteor.roles.findOne({ _id: 'test1' }), 'undefined')
 
-      Roles.deleteRole('test2');
-      test.equal(typeof Meteor.roles.findOne(), 'undefined');
-    });
+      Roles.deleteRole('test2')
+      test.equal(typeof Meteor.roles.findOne(), 'undefined')
+    })
 
   Tinytest.add(
     'roles - can\'t create duplicate roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('test1');
-      test.throws(function () {Roles.createRole('test1')});
-      test.isNull(Roles.createRole('test1', {unlessExists: true}));
-    });
+      Roles.createRole('test1')
+      test.throws(function () { Roles.createRole('test1') })
+      test.isNull(Roles.createRole('test1', { unlessExists: true }))
+    })
 
   Tinytest.add(
     'roles - can\'t create role with empty names',
     function (test) {
-      reset();
+      reset()
 
       test.throws(function () {
-        Roles.createRole('');
-      }, /Invalid role name/);
+        Roles.createRole('')
+      }, /Invalid role name/)
       test.throws(function () {
-        Roles.createRole(null);
-      }, /Invalid role name/);
+        Roles.createRole(null)
+      }, /Invalid role name/)
       test.throws(function () {
-        Roles.createRole(' ');
-      }, /Invalid role name/);
+        Roles.createRole(' ')
+      }, /Invalid role name/)
       test.throws(function () {
-        Roles.createRole(' foobar');
-      }, /Invalid role name/);
+        Roles.createRole(' foobar')
+      }, /Invalid role name/)
       test.throws(function () {
-        Roles.createRole(' foobar ');
-      }, /Invalid role name/);
-    });
+        Roles.createRole(' foobar ')
+      }, /Invalid role name/)
+    })
 
   Tinytest.add(
     'roles - can\'t use invalid scope names',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
 
       test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], '');
-      }, /Invalid scope name/);
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], '')
+      }, /Invalid scope name/)
       test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ');
-      }, /Invalid scope name/);
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ')
+      }, /Invalid scope name/)
       test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar');
-      }, /Invalid scope name/);
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar')
+      }, /Invalid scope name/)
       test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ');
-      }, /Invalid scope name/);
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ')
+      }, /Invalid scope name/)
       test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42);
-      }, /Invalid scope name/);
-    });
+        Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42)
+      }, /Invalid scope name/)
+    })
 
   Tinytest.add(
     'roles - can check if user is in role',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-    });
+      testUser(test, 'eve', ['admin', 'user'])
+    })
 
   Tinytest.add(
     'roles - can check if user is in role by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'eve', ['editor'], 'scope2');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'eve', ['editor'], 'scope2')
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'));
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
 
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], {anyScope: true}));
-      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], {anyScope: true}));
-    });
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], { anyScope: true }))
+      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], { anyScope: true }))
+    })
 
   Tinytest.add(
     'roles - can check if user is in role by scope through options',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], {scope: 'scope1'});
-      Roles.addUsersToRoles(users.eve, ['editor'], {scope: 'scope2'});
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], { scope: 'scope1' })
+      Roles.addUsersToRoles(users.eve, ['editor'], { scope: 'scope2' })
 
-      testUser(test, 'eve', ['admin', 'user'], {scope: 'scope1'});
-      testUser(test, 'eve', ['editor'], {scope: 'scope2'});
-    });
+      testUser(test, 'eve', ['admin', 'user'], { scope: 'scope1' })
+      testUser(test, 'eve', ['editor'], { scope: 'scope2' })
+    })
 
   Tinytest.add(
     'roles - can check if user is in role by scope with global role',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
-      Roles.addUsersToRoles(users.eve, ['admin']);
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+      Roles.addUsersToRoles(users.eve, ['admin'])
 
-      test.isTrue(Roles.userIsInRole(users.eve, ['user'], 'scope1'));
-      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'scope2'));
+      test.isTrue(Roles.userIsInRole(users.eve, ['user'], 'scope1'))
+      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'scope2'))
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['user']));
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
-      test.isFalse(Roles.userIsInRole(users.eve, ['user'], null));
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null));
+      test.isFalse(Roles.userIsInRole(users.eve, ['user']))
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+      test.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['user'], 'scope2'));
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['user'], 'scope2'))
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
 
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope2'));
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope1'));
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null));
-    });
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope2'))
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope1'))
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin']))
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
+    })
 
   Tinytest.add(
     'roles - renaming scopes',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'eve', ['editor'], 'scope2');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'eve', ['editor'], 'scope2')
 
-      Roles.renameScope('scope1', 'scope3');
+      Roles.renameScope('scope1', 'scope3')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope3');
-      testUser(test, 'eve', ['editor'], 'scope2');
+      testUser(test, 'eve', ['admin', 'user'], 'scope3')
+      testUser(test, 'eve', ['editor'], 'scope2')
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'));
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'));
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
 
       test.throws(function () {
-        Roles.renameScope('scope3');
-      }, /Invalid scope name/);
+        Roles.renameScope('scope3')
+      }, /Invalid scope name/)
 
-      Roles.renameScope('scope3', null);
+      Roles.renameScope('scope3', null)
 
-      testUser(test, 'eve', ['admin', 'user', 'editor'], 'scope2');
+      testUser(test, 'eve', ['admin', 'user', 'editor'], 'scope2')
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin']));
-      test.isTrue(Roles.userIsInRole(users.eve, ['user']));
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null));
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null));
-      test.isTrue(Roles.userIsInRole(users.eve, ['user'], null));
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin']))
+      test.isTrue(Roles.userIsInRole(users.eve, ['user']))
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
+      test.isTrue(Roles.userIsInRole(users.eve, ['user'], null))
 
-      Roles.renameScope(null, 'scope2');
+      Roles.renameScope(null, 'scope2')
 
-      testUser(test, 'eve', ['admin', 'user', 'editor'], 'scope2');
+      testUser(test, 'eve', ['admin', 'user', 'editor'], 'scope2')
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor']));
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin']));
-      test.isFalse(Roles.userIsInRole(users.eve, ['user']));
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null));
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin'], null));
-      test.isFalse(Roles.userIsInRole(users.eve, ['user'], null));
-    });
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin']))
+      test.isFalse(Roles.userIsInRole(users.eve, ['user']))
+      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin'], null))
+      test.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
+    })
 
   Tinytest.add(
     'roles - removing scopes',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'eve', ['editor'], 'scope2');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'eve', ['editor'], 'scope2')
 
-      Roles.removeScope('scope1');
+      Roles.removeScope('scope1')
 
-      testUser(test, 'eve', ['editor'], 'scope2');
+      testUser(test, 'eve', ['editor'], 'scope2')
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'));
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'));
-    });
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
+      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+    })
 
   Tinytest.add(
     'roles - can check if non-existant user is in role',
     function (test) {
-      reset();
+      reset()
 
-      test.isFalse(Roles.userIsInRole('1', 'admin'));
-    });
+      test.isFalse(Roles.userIsInRole('1', 'admin'))
+    })
 
   Tinytest.add(
     'roles - can check if null user is in role',
     function (test) {
-      var user = null;
-      reset();
+      var user = null
+      reset()
 
-      test.isFalse(Roles.userIsInRole(user, 'admin'));
-    });
+      test.isFalse(Roles.userIsInRole(user, 'admin'))
+    })
 
   Tinytest.add(
     'roles - can check user against several roles at once',
     function (test) {
-      var user;
-      reset();
+      var user
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
+      Roles.createRole('admin')
+      Roles.createRole('user')
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
-      user = Meteor.users.findOne({_id:users.eve});
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      user = Meteor.users.findOne({ _id: users.eve })
 
       // we can check the non-existing role
-      test.isTrue(Roles.userIsInRole(user, ['editor', 'admin']));
-    });
+      test.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
+    })
 
   Tinytest.add(
     'roles - can\'t add non-existent user to role',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles(['1'], ['admin']);
-      test.equal(Meteor.users.findOne({_id:'1'}), undefined);
-    });
+      Roles.addUsersToRoles(['1'], ['admin'])
+      test.equal(Meteor.users.findOne({ _id: '1' }), undefined)
+    })
 
   Tinytest.add(
     'roles - can\'t add user to non-existent role',
     function (test) {
-      reset();
+      reset()
 
       test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin']);
-      }, /Role 'admin' does not exist/);
-      Roles.addUsersToRoles(users.eve, ['admin'], {ifExists: true});
-    });
+        Roles.addUsersToRoles(users.eve, ['admin'])
+      }, /Role 'admin' does not exist/)
+      Roles.addUsersToRoles(users.eve, ['admin'], { ifExists: true })
+    })
 
   Tinytest.add(
     'roles - can\'t set non-existent user to role',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.setUserRoles(['1'], ['admin']);
-      test.equal(Meteor.users.findOne({_id:'1'}), undefined);
-    });
+      Roles.setUserRoles(['1'], ['admin'])
+      test.equal(Meteor.users.findOne({ _id: '1' }), undefined)
+    })
 
   Tinytest.add(
     'roles - can\'t set user to non-existent role',
     function (test) {
-      reset();
+      reset()
 
       test.throws(function () {
-        Roles.setUserRoles(users.eve, ['admin']);
-      }, /Role 'admin' does not exist/);
-      Roles.setUserRoles(users.eve, ['admin'], {ifExists: true});
-    });
+        Roles.setUserRoles(users.eve, ['admin'])
+      }, /Role 'admin' does not exist/)
+      Roles.setUserRoles(users.eve, ['admin'], { ifExists: true })
+    })
 
   Tinytest.add(
     'roles - can add individual users to roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-      testUser(test, 'bob', []);
-      testUser(test, 'joe', []);
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user']);
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-      testUser(test, 'bob', []);
-      testUser(test, 'joe', ['editor', 'user']);
-    });
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', ['editor', 'user'])
+    })
 
   Tinytest.add(
     'roles - can add individual users to roles by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'bob', [], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'bob', [], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
 
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', [], 'scope2');
-      testUser(test, 'joe', [], 'scope2');
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', [], 'scope2')
+      testUser(test, 'joe', [], 'scope2')
 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'scope1');
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'scope2');
+      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'scope1')
+      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'scope2')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'bob', [], 'scope1');
-      testUser(test, 'joe', ['editor', 'user'], 'scope1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'bob', [], 'scope1')
+      testUser(test, 'joe', ['editor', 'user'], 'scope1')
 
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['editor', 'user'], 'scope2');
-      testUser(test, 'joe', [], 'scope2');
-    });
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['editor', 'user'], 'scope2')
+      testUser(test, 'joe', [], 'scope2')
+    })
 
   Tinytest.add(
     'roles - can add user to roles via user object',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var eve = Meteor.users.findOne({_id: users.eve}),
-          bob = Meteor.users.findOne({_id: users.bob});
+      var eve = Meteor.users.findOne({ _id: users.eve })
+      var bob = Meteor.users.findOne({ _id: users.bob })
 
-      Roles.addUsersToRoles(eve, ['admin', 'user']);
+      Roles.addUsersToRoles(eve, ['admin', 'user'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-      testUser(test, 'bob', []);
-      testUser(test, 'joe', []);
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
 
-      Roles.addUsersToRoles(bob, ['editor']);
+      Roles.addUsersToRoles(bob, ['editor'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-      testUser(test, 'bob', ['editor']);
-      testUser(test, 'joe', []);
-    });
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['editor'])
+      testUser(test, 'joe', [])
+    })
 
   Tinytest.add(
     'roles - can add user to roles multiple times',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
-      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-      testUser(test, 'bob', []);
-      testUser(test, 'joe', []);
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
 
-      Roles.addUsersToRoles(users.bob, ['admin']);
-      Roles.addUsersToRoles(users.bob, ['editor']);
+      Roles.addUsersToRoles(users.bob, ['admin'])
+      Roles.addUsersToRoles(users.bob, ['editor'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-      testUser(test, 'bob', ['admin', 'editor']);
-      testUser(test, 'joe', []);
-    });
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'editor'])
+      testUser(test, 'joe', [])
+    })
 
   Tinytest.add(
     'roles - can add user to roles multiple times by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'bob', [], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'bob', [], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
 
-      Roles.addUsersToRoles(users.bob, ['admin'], 'scope1');
-      Roles.addUsersToRoles(users.bob, ['editor'], 'scope1');
+      Roles.addUsersToRoles(users.bob, ['admin'], 'scope1')
+      Roles.addUsersToRoles(users.bob, ['editor'], 'scope1')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'bob', ['admin', 'editor'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-    });
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'bob', ['admin', 'editor'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+    })
 
   Tinytest.add(
     'roles - can add multiple users to roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user']);
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-      testUser(test, 'bob', ['admin', 'user']);
-      testUser(test, 'joe', []);
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'user'])
+      testUser(test, 'joe', [])
 
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user']);
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
 
-      testUser(test, 'eve', ['admin', 'user']);
-      testUser(test, 'bob', ['admin', 'editor', 'user']);
-      testUser(test, 'joe', ['editor', 'user']);
-    });
+      testUser(test, 'eve', ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'editor', 'user'])
+      testUser(test, 'joe', ['editor', 'user'])
+    })
 
   Tinytest.add(
     'roles - can add multiple users to roles by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'scope1')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'bob', ['admin', 'user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'bob', ['admin', 'user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
 
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', [], 'scope2');
-      testUser(test, 'joe', [], 'scope2');
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', [], 'scope2')
+      testUser(test, 'joe', [], 'scope2')
 
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope2');
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope2')
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1');
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'scope1');
-      testUser(test, 'joe', ['editor', 'user'], 'scope1');
+      testUser(test, 'eve', ['admin', 'user'], 'scope1')
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'scope1')
+      testUser(test, 'joe', ['editor', 'user'], 'scope1')
 
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['editor', 'user'], 'scope2');
-      testUser(test, 'joe', ['editor', 'user'], 'scope2');
-    });
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['editor', 'user'], 'scope2')
+      testUser(test, 'joe', ['editor', 'user'], 'scope2')
+    })
 
   Tinytest.add(
     'roles - can remove individual users from roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
-      testUser(test, 'eve', ['editor', 'user']);
-      testUser(test, 'bob', ['editor', 'user']);
-      Roles.removeUsersFromRoles(users.eve, ['user']);
-      testUser(test, 'eve', ['editor']);
-      testUser(test, 'bob', ['editor', 'user']);
-    });
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+      testUser(test, 'bob', ['editor', 'user'])
+    })
 
   Tinytest.add(
     'roles - can remove user from roles multiple times',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
-      testUser(test, 'eve', ['editor', 'user']);
-      testUser(test, 'bob', ['editor', 'user']);
-      Roles.removeUsersFromRoles(users.eve, ['user']);
-      testUser(test, 'eve', ['editor']);
-      testUser(test, 'bob', ['editor', 'user']);
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+      testUser(test, 'bob', ['editor', 'user'])
 
       // try remove again
-      Roles.removeUsersFromRoles(users.eve, ['user']);
-      testUser(test, 'eve', ['editor']);
-    });
+      Roles.removeUsersFromRoles(users.eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+    })
 
   Tinytest.add(
     'roles - can remove users from roles via user object',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var eve = Meteor.users.findOne({_id: users.eve}),
-          bob = Meteor.users.findOne({_id: users.bob});
+      var eve = Meteor.users.findOne({ _id: users.eve })
+      var bob = Meteor.users.findOne({ _id: users.bob })
 
       // remove user role - one user
-      Roles.addUsersToRoles([eve, bob], ['editor', 'user']);
-      testUser(test, 'eve', ['editor', 'user']);
-      testUser(test, 'bob', ['editor', 'user']);
-      Roles.removeUsersFromRoles(eve, ['user']);
-      testUser(test, 'eve', ['editor']);
-      testUser(test, 'bob', ['editor', 'user']);
-    });
+      Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      Roles.removeUsersFromRoles(eve, ['user'])
+      testUser(test, 'eve', ['editor'])
+      testUser(test, 'bob', ['editor', 'user'])
+    })
 
   Tinytest.add(
     'roles - can remove individual users from roles by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2');
-      testUser(test, 'eve', ['editor', 'user'], 'scope1');
-      testUser(test, 'bob', ['editor', 'user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
+      testUser(test, 'eve', ['editor', 'user'], 'scope1')
+      testUser(test, 'bob', ['editor', 'user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope2')
 
-      Roles.removeUsersFromRoles(users.eve, ['user'], 'scope1');
-      testUser(test, 'eve', ['editor'], 'scope1');
-      testUser(test, 'bob', ['editor', 'user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope2');
-    });
+      Roles.removeUsersFromRoles(users.eve, ['user'], 'scope1')
+      testUser(test, 'eve', ['editor'], 'scope1')
+      testUser(test, 'bob', ['editor', 'user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope2')
+    })
 
   Tinytest.add(
     'roles - can remove individual users from roles by scope through options',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], {scope: 'scope1'});
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], {scope: 'scope2'});
-      testUser(test, 'eve', ['editor', 'user'], 'scope1');
-      testUser(test, 'bob', ['editor', 'user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], { scope: 'scope1' })
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], { scope: 'scope2' })
+      testUser(test, 'eve', ['editor', 'user'], 'scope1')
+      testUser(test, 'bob', ['editor', 'user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope2')
 
-      Roles.removeUsersFromRoles(users.eve, ['user'], {scope: 'scope1'});
-      testUser(test, 'eve', ['editor'], 'scope1');
-      testUser(test, 'bob', ['editor', 'user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope2');
-    });
+      Roles.removeUsersFromRoles(users.eve, ['user'], { scope: 'scope1' })
+      testUser(test, 'eve', ['editor'], 'scope1')
+      testUser(test, 'bob', ['editor', 'user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope2')
+    })
 
   Tinytest.add(
     'roles - can remove multiple users from roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
       // remove user role - two users
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user']);
-      testUser(test, 'eve', ['editor', 'user']);
-      testUser(test, 'bob', ['editor', 'user']);
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
 
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin'));
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user']);
-      testUser(test, 'bob', ['admin', 'user', 'editor']);
-      testUser(test, 'joe', ['admin', 'user']);
-      Roles.removeUsersFromRoles([users.bob, users.joe], ['admin']);
-      testUser(test, 'bob', ['user', 'editor']);
-      testUser(test, 'joe', ['user']);
-    });
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin'))
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
+      testUser(test, 'bob', ['admin', 'user', 'editor'])
+      testUser(test, 'joe', ['admin', 'user'])
+      Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
+      testUser(test, 'bob', ['user', 'editor'])
+      testUser(test, 'joe', ['user'])
+    })
 
   Tinytest.add(
     'roles - can remove multiple users from roles by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
       // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2');
-      testUser(test, 'eve', ['editor', 'user'], 'scope1');
-      testUser(test, 'bob', ['editor', 'user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
+      testUser(test, 'eve', ['editor', 'user'], 'scope1')
+      testUser(test, 'bob', ['editor', 'user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope2')
 
-      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'scope1');
-      testUser(test, 'eve', ['editor'], 'scope1');
-      testUser(test, 'bob', ['editor'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope2');
+      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'scope1')
+      testUser(test, 'eve', ['editor'], 'scope1')
+      testUser(test, 'bob', ['editor'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope2')
 
-      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'scope2');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', [], 'scope2');
-      testUser(test, 'joe', [], 'scope2');
-    });
+      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'scope2')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', [], 'scope2')
+      testUser(test, 'joe', [], 'scope2')
+    })
 
   Tinytest.add(
     'roles - can set user roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var eve = Meteor.users.findOne({_id: users.eve}),
-          bob = Meteor.users.findOne({_id: users.bob}),
-          joe = Meteor.users.findOne({_id: users.joe});
+      var eve = Meteor.users.findOne({ _id: users.eve })
+      var bob = Meteor.users.findOne({ _id: users.bob })
 
-      Roles.setUserRoles([users.eve, bob], ['editor', 'user']);
-      testUser(test, 'eve', ['editor', 'user']);
-      testUser(test, 'bob', ['editor', 'user']);
-      testUser(test, 'joe', []);
+      Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['editor', 'user'])
+      testUser(test, 'joe', [])
 
       // use addUsersToRoles add some roles
-      Roles.addUsersToRoles([bob, users.joe], ['admin']);
-      testUser(test, 'eve', ['editor', 'user']);
-      testUser(test, 'bob', ['admin', 'editor', 'user']);
-      testUser(test, 'joe', ['admin']);
+      Roles.addUsersToRoles([bob, users.joe], ['admin'])
+      testUser(test, 'eve', ['editor', 'user'])
+      testUser(test, 'bob', ['admin', 'editor', 'user'])
+      testUser(test, 'joe', ['admin'])
 
-      Roles.setUserRoles([eve, bob], ['user']);
-      testUser(test, 'eve', ['user']);
-      testUser(test, 'bob', ['user']);
-      testUser(test, 'joe', ['admin']);
+      Roles.setUserRoles([eve, bob], ['user'])
+      testUser(test, 'eve', ['user'])
+      testUser(test, 'bob', ['user'])
+      testUser(test, 'joe', ['admin'])
 
-      Roles.setUserRoles(bob, 'editor');
-      testUser(test, 'eve', ['user']);
-      testUser(test, 'bob', ['editor']);
-      testUser(test, 'joe', ['admin']);
+      Roles.setUserRoles(bob, 'editor')
+      testUser(test, 'eve', ['user'])
+      testUser(test, 'bob', ['editor'])
+      testUser(test, 'joe', ['admin'])
 
-      Roles.setUserRoles([users.joe, users.bob], []);
-      testUser(test, 'eve', ['user']);
-      testUser(test, 'bob', []);
-      testUser(test, 'joe', []);
-    });
+      Roles.setUserRoles([users.joe, users.bob], [])
+      testUser(test, 'eve', ['user'])
+      testUser(test, 'bob', [])
+      testUser(test, 'joe', [])
+    })
 
   Tinytest.add(
     'roles - can set user roles by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var eve = Meteor.users.findOne({_id: users.eve}),
-          bob = Meteor.users.findOne({_id: users.bob}),
-          joe = Meteor.users.findOne({_id: users.joe});
+      var eve = Meteor.users.findOne({ _id: users.eve })
+      var bob = Meteor.users.findOne({ _id: users.bob })
+      var joe = Meteor.users.findOne({ _id: users.joe })
 
-      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
-      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2');
-      testUser(test, 'eve', ['editor', 'user'], 'scope1');
-      testUser(test, 'bob', ['editor', 'user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope2');
+      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2')
+      testUser(test, 'eve', ['editor', 'user'], 'scope1')
+      testUser(test, 'bob', ['editor', 'user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope2')
 
       // use addUsersToRoles add some roles
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'scope1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'scope2');
-      testUser(test, 'eve', ['admin', 'editor', 'user'], 'scope1');
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', [], 'scope2');
-      testUser(test, 'bob', ['admin', 'editor'], 'scope2');
-      testUser(test, 'joe', ['admin', 'editor'], 'scope2');
+      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'scope1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'scope2')
+      testUser(test, 'eve', ['admin', 'editor', 'user'], 'scope1')
+      testUser(test, 'bob', ['admin', 'editor', 'user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', [], 'scope2')
+      testUser(test, 'bob', ['admin', 'editor'], 'scope2')
+      testUser(test, 'joe', ['admin', 'editor'], 'scope2')
 
-      Roles.setUserRoles([eve, bob], ['user'], 'scope1');
-      Roles.setUserRoles([eve, joe], ['editor'], 'scope2');
-      testUser(test, 'eve', ['user'], 'scope1');
-      testUser(test, 'bob', ['user'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', ['editor'], 'scope2');
-      testUser(test, 'bob', ['admin', 'editor'], 'scope2');
-      testUser(test, 'joe', ['editor'], 'scope2');
+      Roles.setUserRoles([eve, bob], ['user'], 'scope1')
+      Roles.setUserRoles([eve, joe], ['editor'], 'scope2')
+      testUser(test, 'eve', ['user'], 'scope1')
+      testUser(test, 'bob', ['user'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', ['editor'], 'scope2')
+      testUser(test, 'bob', ['admin', 'editor'], 'scope2')
+      testUser(test, 'joe', ['editor'], 'scope2')
 
-      Roles.setUserRoles(bob, 'editor', 'scope1');
-      testUser(test, 'eve', ['user'], 'scope1');
-      testUser(test, 'bob', ['editor'], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', ['editor'], 'scope2');
-      testUser(test, 'bob', ['admin', 'editor'], 'scope2');
-      testUser(test, 'joe', ['editor'], 'scope2');
+      Roles.setUserRoles(bob, 'editor', 'scope1')
+      testUser(test, 'eve', ['user'], 'scope1')
+      testUser(test, 'bob', ['editor'], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', ['editor'], 'scope2')
+      testUser(test, 'bob', ['admin', 'editor'], 'scope2')
+      testUser(test, 'joe', ['editor'], 'scope2')
 
-      test.isTrue(Roles.getRolesForUser(users.bob, {anyScope: true, fullObjects: true}).map(r => r.scope).includes('scope1'));
-      test.isFalse(Roles.getRolesForUser(users.joe, {anyScope: true, fullObjects: true}).map(r => r.scope).includes('scope1'));
+      test.isTrue(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+      test.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
 
-      Roles.setUserRoles([bob, users.joe], [], 'scope1');
-      testUser(test, 'eve', ['user'], 'scope1');
-      testUser(test, 'bob', [], 'scope1');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'eve', ['editor'], 'scope2');
-      testUser(test, 'bob', ['admin', 'editor'], 'scope2');
-      testUser(test, 'joe', ['editor'], 'scope2');
+      Roles.setUserRoles([bob, users.joe], [], 'scope1')
+      testUser(test, 'eve', ['user'], 'scope1')
+      testUser(test, 'bob', [], 'scope1')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'eve', ['editor'], 'scope2')
+      testUser(test, 'bob', ['admin', 'editor'], 'scope2')
+      testUser(test, 'joe', ['editor'], 'scope2')
 
       // When roles in a given scope are removed, we do not want any dangling database content for that scope.
-      test.isFalse(Roles.getRolesForUser(users.bob, {anyScope: true, fullObjects: true}).map(r => r.scope).includes('scope1'));
-      test.isFalse(Roles.getRolesForUser(users.joe, {anyScope: true, fullObjects: true}).map(r => r.scope).includes('scope1'));
-    });
+      test.isFalse(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+      test.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+    })
 
   Tinytest.add(
     'roles - can set user roles by scope including GLOBAL_SCOPE',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('editor')
 
-      var eve = Meteor.users.findOne({_id: users.eve}),
-          bob = Meteor.users.findOne({_id: users.bob}),
-          joe = Meteor.users.findOne({_id: users.joe});
+      var eve = Meteor.users.findOne({ _id: users.eve })
 
-      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE);
-      testUser(test, 'eve', ['admin'], 'scope1');
-      testUser(test, 'eve', ['admin']);
-
-      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_SCOPE);
-      testUser(test, 'eve', ['editor'], 'scope2');
-      testUser(test, 'eve', ['editor']);
-    });
+      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE)
+      testUser(test, 'eve', ['admin'], 'scope1')
+      testUser(test, 'eve', ['admin'])
 
+      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_SCOPE)
+      testUser(test, 'eve', ['editor'], 'scope2')
+      testUser(test, 'eve', ['editor'])
+    })
 
   Tinytest.add(
     'roles - can get all roles',
     function (test) {
-      reset();
+      reset()
 
       roles.forEach(function (role) {
-        Roles.createRole(role);
-      });
+        Roles.createRole(role)
+      })
 
       // compare roles, sorted alphabetically
-      var expected = roles,
-          actual = Roles.getAllRoles().fetch().map(r => r._id);
+      var expected = roles
+      var actual = Roles.getAllRoles().fetch().map(r => r._id)
 
-      test.equal(actual, expected);
+      test.equal(actual, expected)
 
-      test.equal(Roles.getAllRoles({sort: {_id: -1}}).fetch().map(r => r._id), expected.reverse());
-    });
+      test.equal(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
+    })
 
   Tinytest.add(
     'roles - can\'t get roles for non-existant user',
     function (test) {
-      reset();
-      test.equal(Roles.getRolesForUser('1'), []);
-      test.equal(Roles.getRolesForUser('1', 'scope1'), []);
-    });
+      reset()
+      test.equal(Roles.getRolesForUser('1'), [])
+      test.equal(Roles.getRolesForUser('1', 'scope1'), [])
+    })
 
   Tinytest.add(
     'roles - can get all roles for user',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
+      Roles.createRole('admin')
+      Roles.createRole('user')
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId), []);
+      test.equal(Roles.getRolesForUser(userId), [])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj), []);
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getRolesForUser(userObj), [])
 
-
-      Roles.addUsersToRoles(userId, ['admin', 'user']);
+      Roles.addUsersToRoles(userId, ['admin', 'user'])
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId), ['admin', 'user']);
+      test.equal(Roles.getRolesForUser(userId), ['admin', 'user'])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj), ['admin', 'user']);
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getRolesForUser(userObj), ['admin', 'user'])
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true}), [{
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: true
@@ -947,43 +937,43 @@
         _id: 'user',
         scope: null,
         assigned: true
-      }]);
-    });
+      }])
+    })
 
   Tinytest.add(
     'roles - can get all roles for user by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
+      Roles.createRole('admin')
+      Roles.createRole('user')
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), []);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), [])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), []);
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), [])
 
       // add roles
-      Roles.addUsersToRoles(userId, ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles(userId, ['admin'], 'scope2');
+      Roles.addUsersToRoles(userId, ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles(userId, ['admin'], 'scope2')
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['admin', 'user']);
-      test.equal(Roles.getRolesForUser(userId, 'scope2'), ['admin']);
-      test.equal(Roles.getRolesForUser(userId), []);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['admin', 'user'])
+      test.equal(Roles.getRolesForUser(userId, 'scope2'), ['admin'])
+      test.equal(Roles.getRolesForUser(userId), [])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['admin', 'user']);
-      test.equal(Roles.getRolesForUser(userObj, 'scope2'), ['admin']);
-      test.equal(Roles.getRolesForUser(userObj), []);
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['admin', 'user'])
+      test.equal(Roles.getRolesForUser(userObj, 'scope2'), ['admin'])
+      test.equal(Roles.getRolesForUser(userObj), [])
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope1'}), [{
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -991,14 +981,14 @@
         _id: 'user',
         scope: 'scope1',
         assigned: true
-      }]);
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope2'}), [{
+      }])
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
         _id: 'admin',
         scope: 'scope2',
         assigned: true
-      }]);
+      }])
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyScope: true}), [{
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1010,12 +1000,12 @@
         _id: 'admin',
         scope: 'scope2',
         assigned: true
-      }]);
+      }])
 
-      Roles.createRole('PERMISSION');
-      Roles.addRolesToParent('PERMISSION', 'user');
+      Roles.createRole('PERMISSION')
+      Roles.addRolesToParent('PERMISSION', 'user')
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope1'}), [{
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1027,16 +1017,16 @@
         _id: 'PERMISSION',
         scope: 'scope1',
         assigned: false
-      }]);
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope2'}), [{
+      }])
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
         _id: 'admin',
         scope: 'scope2',
         assigned: true
-      }]);
-      test.equal(Roles.getRolesForUser(userId, {scope: 'scope1'}), ['admin', 'user', 'PERMISSION']);
-      test.equal(Roles.getRolesForUser(userId, {scope: 'scope2'}), ['admin']);
+      }])
+      test.equal(Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
+      test.equal(Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyScope: true}), [{
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1052,10 +1042,10 @@
         _id: 'PERMISSION',
         scope: 'scope1',
         assigned: false
-      }]);
-      test.equal(Roles.getRolesForUser(userId, {anyScope: true}), ['admin', 'user', 'PERMISSION']);
+      }])
+      test.equal(Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope1', onlyAssigned: true}), [{
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1063,16 +1053,16 @@
         _id: 'user',
         scope: 'scope1',
         assigned: true
-      }]);
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, scope: 'scope2', onlyAssigned: true}), [{
+      }])
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }), [{
         _id: 'admin',
         scope: 'scope2',
         assigned: true
-      }]);
-      test.equal(Roles.getRolesForUser(userId, {scope: 'scope1', onlyAssigned: true}), ['admin', 'user']);
-      test.equal(Roles.getRolesForUser(userId, {scope: 'scope2', onlyAssigned: true}), ['admin']);
+      }])
+      test.equal(Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
+      test.equal(Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
 
-      test.equal(Roles.getRolesForUser(userId, {fullObjects: true, anyScope: true, onlyAssigned: true}), [{
+      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1084,486 +1074,482 @@
         _id: 'admin',
         scope: 'scope2',
         assigned: true
-      }]);
-      test.equal(Roles.getRolesForUser(userId, {anyScope: true, onlyAssigned: true}), ['admin', 'user']);
-    });
+      }])
+      test.equal(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
+    })
 
   Tinytest.add(
     'roles - can get all roles for user by scope with periods in name',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us');
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
 
-      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin']);
-    });
+      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
+    })
 
   Tinytest.add(
     'roles - can get all roles for user by scope including Roles.GLOBAL_SCOPE',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE);
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1');
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user']);
-      test.equal(Roles.getRolesForUser(userId), ['editor']);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user'])
+      test.equal(Roles.getRolesForUser(userId), ['editor'])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user']);
-      test.equal(Roles.getRolesForUser(userObj), ['editor']);
-    });
-
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
+      test.equal(Roles.getRolesForUser(userObj), ['editor'])
+    })
 
   Tinytest.add(
     'roles - getRolesForUser should not return null entries if user has no roles for scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('editor');
+      Roles.createRole('editor')
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), []);
-      test.equal(Roles.getRolesForUser(userId), []);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), [])
+      test.equal(Roles.getRolesForUser(userId), [])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), []);
-      test.equal(Roles.getRolesForUser(userObj), []);
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), [])
+      test.equal(Roles.getRolesForUser(userObj), [])
 
-
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE);
+      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['editor']);
-      test.equal(Roles.getRolesForUser(userId), ['editor']);
+      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['editor'])
+      test.equal(Roles.getRolesForUser(userId), ['editor'])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor']);
-      test.equal(Roles.getRolesForUser(userObj), ['editor']);
-    });
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor'])
+      test.equal(Roles.getRolesForUser(userObj), ['editor'])
+    })
 
   Tinytest.add(
     'roles - can get all scopes for user',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
-      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1');
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2');
+      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
 
       // by userId
-      test.equal(Roles.getScopesForUser(userId), ['scope1', 'scope2']);
+      test.equal(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getScopesForUser(userObj), ['scope1', 'scope2']);
-    });
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
+    })
 
   Tinytest.add(
     'roles - can get all scopes for user by role',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
-      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1');
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2');
+      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
 
       // by userId
-      test.equal(Roles.getScopesForUser(userId, 'user'), ['scope2']);
-      test.equal(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2']);
-      test.equal(Roles.getScopesForUser(userId, 'admin'), []);
+      test.equal(Roles.getScopesForUser(userId, 'user'), ['scope2'])
+      test.equal(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+      test.equal(Roles.getScopesForUser(userId, 'admin'), [])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getScopesForUser(userObj, 'user'), ['scope2']);
-      test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2']);
-      test.equal(Roles.getScopesForUser(userObj, 'admin'), []);
-  });
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+      test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+      test.equal(Roles.getScopesForUser(userObj, 'admin'), [])
+    })
 
   Tinytest.add(
     'roles - getScopesForUser returns [] when not using scopes',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
-      Roles.addUsersToRoles([users.eve], ['editor', 'user']);
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'])
 
       // by userId
-      test.equal(Roles.getScopesForUser(userId), []);
-      test.equal(Roles.getScopesForUser(userId, 'editor'), []);
-      test.equal(Roles.getScopesForUser(userId, ['editor']), []);
-      test.equal(Roles.getScopesForUser(userId, ['editor', 'user']), []);
+      test.equal(Roles.getScopesForUser(userId), [])
+      test.equal(Roles.getScopesForUser(userId, 'editor'), [])
+      test.equal(Roles.getScopesForUser(userId, ['editor']), [])
+      test.equal(Roles.getScopesForUser(userId, ['editor', 'user']), [])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getScopesForUser(userObj), []);
-      test.equal(Roles.getScopesForUser(userObj, 'editor'), []);
-      test.equal(Roles.getScopesForUser(userObj, ['editor']), []);
-      test.equal(Roles.getScopesForUser(userObj, ['editor', 'user']), []);
-    });
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getScopesForUser(userObj), [])
+      test.equal(Roles.getScopesForUser(userObj, 'editor'), [])
+      test.equal(Roles.getScopesForUser(userObj, ['editor']), [])
+      test.equal(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
+    })
 
   Tinytest.add(
     'roles - can get all groups for user by role array',
     function (test) {
-      reset();
+      reset()
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
-      Roles.createRole('user');
-      Roles.createRole('editor');
-      Roles.createRole('moderator');
-      Roles.createRole('admin');
+      Roles.createRole('user')
+      Roles.createRole('editor')
+      Roles.createRole('moderator')
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles([users.eve], ['editor'], 'group1');
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2');
-      Roles.addUsersToRoles([users.eve], ['moderator'], 'group3');
+      Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
+      Roles.addUsersToRoles([users.eve], ['moderator'], 'group3')
 
       // by userId, one role
-      test.equal(Roles.getScopesForUser(userId, ['user']), ['group2']);
-      test.equal(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2']);
-      test.equal(Roles.getScopesForUser(userId, ['admin']), []);
+      test.equal(Roles.getScopesForUser(userId, ['user']), ['group2'])
+      test.equal(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
+      test.equal(Roles.getScopesForUser(userId, ['admin']), [])
 
       // by userId, multiple roles
-      test.equal(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2']);
-      test.equal(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
-      test.equal(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3']);
+      test.equal(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
+      test.equal(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+      test.equal(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
 
       // by user object, one role
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getScopesForUser(userObj, ['user']), ['group2']);
-      test.equal(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2']);
-      test.equal(Roles.getScopesForUser(userObj, ['admin']), []);
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getScopesForUser(userObj, ['user']), ['group2'])
+      test.equal(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
+      test.equal(Roles.getScopesForUser(userObj, ['admin']), [])
 
       // by user object, multiple roles
-      test.equal(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2']);
-      test.equal(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3']);
-      test.equal(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3']);
-    });
+      test.equal(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
+      test.equal(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+      test.equal(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
+    })
 
   Tinytest.add(
     'roles - getting all scopes for user does not include GLOBAL_SCOPE',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      var userId = users.eve,
-          userObj;
+      var userId = users.eve
+      var userObj
 
-      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1');
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2');
-      Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE);
+      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
+      Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
 
       // by userId
-      test.equal(Roles.getScopesForUser(userId, 'user'), ['scope2']);
-      test.equal(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2']);
-      test.equal(Roles.getScopesForUser(userId, 'admin'), []);
-      test.equal(Roles.getScopesForUser(userId, ['user']), ['scope2']);
-      test.equal(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2']);
-      test.equal(Roles.getScopesForUser(userId, ['admin']), []);
-      test.equal(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2']);
+      test.equal(Roles.getScopesForUser(userId, 'user'), ['scope2'])
+      test.equal(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+      test.equal(Roles.getScopesForUser(userId, 'admin'), [])
+      test.equal(Roles.getScopesForUser(userId, ['user']), ['scope2'])
+      test.equal(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
+      test.equal(Roles.getScopesForUser(userId, ['admin']), [])
+      test.equal(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
 
       // by user object
-      userObj = Meteor.users.findOne({_id: userId});
-      test.equal(Roles.getScopesForUser(userObj, 'user'), ['scope2']);
-      test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2']);
-      test.equal(Roles.getScopesForUser(userObj, 'admin'), []);
-      test.equal(Roles.getScopesForUser(userObj, ['user']), ['scope2']);
-      test.equal(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2']);
-      test.equal(Roles.getScopesForUser(userObj, ['admin']), []);
-      test.equal(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2']);
-    });
-
+      userObj = Meteor.users.findOne({ _id: userId })
+      test.equal(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+      test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+      test.equal(Roles.getScopesForUser(userObj, 'admin'), [])
+      test.equal(Roles.getScopesForUser(userObj, ['user']), ['scope2'])
+      test.equal(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
+      test.equal(Roles.getScopesForUser(userObj, ['admin']), [])
+      test.equal(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+    })
 
   Tinytest.add(
     'roles - can get all users in role',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user']);
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor']);
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
+      Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
 
-      var expected = [users.eve, users.joe],
-          actual = Roles.getUsersInRole('admin').fetch().map(r => r._id);
+      var expected = [users.eve, users.joe]
+      var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
 
-      itemsEqual(test, actual, expected);
-    });
+      itemsEqual(test, actual, expected)
+    })
 
   Tinytest.add(
     'roles - can get all users in role by scope',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
+      Roles.createRole('admin')
+      Roles.createRole('user')
 
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2');
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-      var expected = [users.eve, users.joe],
-          actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id);
+      var expected = [users.eve, users.joe]
+      var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
 
-      itemsEqual(test, actual, expected);
+      itemsEqual(test, actual, expected)
 
-      expected = [users.eve, users.joe];
-      actual = Roles.getUsersInRole('admin', {scope: 'scope1'}).fetch().map(r => r._id);
-      itemsEqual(test, actual, expected);
+      expected = [users.eve, users.joe]
+      actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
+      itemsEqual(test, actual, expected)
 
-      expected = [users.eve, users.bob, users.joe];
-      actual = Roles.getUsersInRole('admin', {anyScope: true}).fetch().map(r => r._id);
-      itemsEqual(test, actual, expected);
+      expected = [users.eve, users.bob, users.joe]
+      actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
+      itemsEqual(test, actual, expected)
 
-      actual = Roles.getUsersInRole('admin').fetch().map(r => r._id);
-      test.equal(actual, []);
-    });
+      actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+      test.equal(actual, [])
+    })
 
   Tinytest.add(
     'roles - can get all users in role by scope including Roles.GLOBAL_SCOPE',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
+      Roles.createRole('admin')
+      Roles.createRole('user')
 
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE);
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2');
+      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-      var expected = [users.eve],
-          actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id);
+      var expected = [users.eve]
+      var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
 
-      itemsEqual(test, actual, expected);
+      itemsEqual(test, actual, expected)
 
-      expected = [users.eve, users.bob, users.joe];
-      actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id);
+      expected = [users.eve, users.bob, users.joe]
+      actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id)
 
-      itemsEqual(test, actual, expected);
+      itemsEqual(test, actual, expected)
 
-      expected = [users.eve];
-      actual = Roles.getUsersInRole('admin').fetch().map(r => r._id);
+      expected = [users.eve]
+      actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
 
-      itemsEqual(test, actual, expected);
+      itemsEqual(test, actual, expected)
 
-      expected = [users.eve, users.bob, users.joe];
-      actual = Roles.getUsersInRole('admin', {anyScope: true}).fetch().map(r => r._id);
+      expected = [users.eve, users.bob, users.joe]
+      actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
 
-      itemsEqual(test, actual, expected);
-    });
+      itemsEqual(test, actual, expected)
+    })
 
   Tinytest.add(
     'roles - can get all users in role by scope and passes through mongo query arguments',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
+      Roles.createRole('admin')
+      Roles.createRole('user')
 
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1');
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2');
+      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
+      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-      var results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch();
-
-      test.equal(1, results.length);
-      test.isTrue(results[0].hasOwnProperty('_id'));
-      test.isFalse(results[0].hasOwnProperty('username'));
-    });
+      var results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
 
+      test.equal(1, results.length)
+      test.isTrue(results[0].hasOwnProperty('_id'))
+      test.isFalse(results[0].hasOwnProperty('username'))
+    })
 
   Tinytest.add(
     'roles - can use Roles.GLOBAL_SCOPE to assign blanket roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE);
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
 
-      testUser(test, 'eve', [], 'scope1');
-      testUser(test, 'joe', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope1');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope1');
+      testUser(test, 'eve', [], 'scope1')
+      testUser(test, 'joe', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope1')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope1')
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE);
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
 
-      testUser(test, 'eve', [], 'scope1');
-      testUser(test, 'joe', [], 'scope2');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope1');
-    });
+      testUser(test, 'eve', [], 'scope1')
+      testUser(test, 'joe', [], 'scope2')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope1')
+    })
 
   Tinytest.add(
     'roles - Roles.GLOBAL_SCOPE is independent of other scopes',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5');
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE);
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5')
+      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
 
-      testUser(test, 'eve', [], 'scope1');
-      testUser(test, 'joe', ['admin'], 'scope5');
-      testUser(test, 'joe', ['admin'], 'scope2');
-      testUser(test, 'joe', ['admin'], 'scope1');
-      testUser(test, 'bob', ['admin'], 'scope5');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope1');
+      testUser(test, 'eve', [], 'scope1')
+      testUser(test, 'joe', ['admin'], 'scope5')
+      testUser(test, 'joe', ['admin'], 'scope2')
+      testUser(test, 'joe', ['admin'], 'scope1')
+      testUser(test, 'bob', ['admin'], 'scope5')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope1')
 
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE);
+      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
 
-      testUser(test, 'eve', [], 'scope1');
-      testUser(test, 'joe', ['admin'], 'scope5');
-      testUser(test, 'joe', [], 'scope2');
-      testUser(test, 'joe', [], 'scope1');
-      testUser(test, 'bob', ['admin'], 'scope5');
-      testUser(test, 'bob', ['admin'], 'scope2');
-      testUser(test, 'bob', ['admin'], 'scope1');
-    });
+      testUser(test, 'eve', [], 'scope1')
+      testUser(test, 'joe', ['admin'], 'scope5')
+      testUser(test, 'joe', [], 'scope2')
+      testUser(test, 'joe', [], 'scope1')
+      testUser(test, 'bob', ['admin'], 'scope5')
+      testUser(test, 'bob', ['admin'], 'scope2')
+      testUser(test, 'bob', ['admin'], 'scope1')
+    })
 
   Tinytest.add(
     'roles - Roles.GLOBAL_SCOPE also checked when scope not specified',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE);
+      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
 
-      testUser(test, 'joe', ['admin']);
+      testUser(test, 'joe', ['admin'])
 
-      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE);
+      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
 
-      testUser(test, 'joe', []);
-    });
+      testUser(test, 'joe', [])
+    })
 
   Tinytest.add(
     "roles - can use '.' in scope name",
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.com');
-      testUser(test, 'joe', ['admin'], 'example.com');
-    });
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
+      testUser(test, 'joe', ['admin'], 'example.com')
+    })
 
   Tinytest.add(
-    "roles - can use multiple periods in scope name",
+    'roles - can use multiple periods in scope name',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us');
-      testUser(test, 'joe', ['admin'], 'example.k12.va.us');
-    });
+      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+      testUser(test, 'joe', ['admin'], 'example.k12.va.us')
+    })
 
   Tinytest.add(
     'roles - renaming of roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
 
-      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1');
-      Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'scope2');
+      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+      Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'scope2')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
 
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'));
-      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'));
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
+      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'user', 'scope1'));
-      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope1'));
-      test.isFalse(Roles.userIsInRole(users.joe, 'user', 'scope1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'user', 'scope1'))
+      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope1'))
+      test.isFalse(Roles.userIsInRole(users.joe, 'user', 'scope1'))
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'));
-      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope2'));
-      test.isTrue(Roles.userIsInRole(users.joe, 'user', 'scope2'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
+      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope2'))
+      test.isTrue(Roles.userIsInRole(users.joe, 'user', 'scope2'))
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
 
-      Roles.renameRole('user', 'user2');
+      Roles.renameRole('user', 'user2')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
 
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'));
-      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'));
+      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
+      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'user2', 'scope1'));
-      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope1'));
-      test.isFalse(Roles.userIsInRole(users.joe, 'user2', 'scope1'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
+      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope1'))
+      test.isFalse(Roles.userIsInRole(users.joe, 'user2', 'scope1'))
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'));
-      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope2'));
-      test.isTrue(Roles.userIsInRole(users.joe, 'user2', 'scope2'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
+      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope2'))
+      test.isTrue(Roles.userIsInRole(users.joe, 'user2', 'scope2'))
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'));
-    });
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope1'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
+    })
 
   Tinytest.add(
     'roles - migration without global groups',
     function (test) {
-      reset();
+      reset()
 
-      test.isTrue(Meteor.roles.insert({name: 'admin'}));
-      test.isTrue(Meteor.roles.insert({name: 'editor'}));
-      test.isTrue(Meteor.roles.insert({name: 'user'}));
+      test.isTrue(Meteor.roles.insert({ name: 'admin' }))
+      test.isTrue(Meteor.roles.insert({ name: 'editor' }))
+      test.isTrue(Meteor.roles.insert({ name: 'user' }))
 
-      test.isTrue(Meteor.users.update(users.eve, {$set: {roles: ['admin', 'editor']}}));
-      test.isTrue(Meteor.users.update(users.bob, {$set: {roles: []}}));
-      test.isTrue(Meteor.users.update(users.joe, {$set: {roles: ['user']}}));
+      test.isTrue(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
+      test.isTrue(Meteor.users.update(users.bob, { $set: { roles: [] } }))
+      test.isTrue(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
 
-      Roles._forwardMigrate();
+      Roles._forwardMigrate()
 
-      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
         roles: [{
           _id: 'admin',
           scope: null,
@@ -1573,70 +1559,70 @@
           scope: null,
           assigned: true
         }]
-      });
-      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
         roles: []
-      });
-      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
         roles: [{
           _id: 'user',
           scope: null,
           assigned: true
         }]
-      });
+      })
 
-      test.equal(Meteor.roles.findOne({_id: 'admin'}), {
+      test.equal(Meteor.roles.findOne({ _id: 'admin' }), {
         _id: 'admin',
         children: []
-      });
-      test.equal(Meteor.roles.findOne({_id: 'editor'}), {
+      })
+      test.equal(Meteor.roles.findOne({ _id: 'editor' }), {
         _id: 'editor',
         children: []
-      });
-      test.equal(Meteor.roles.findOne({_id: 'user'}), {
+      })
+      test.equal(Meteor.roles.findOne({ _id: 'user' }), {
         _id: 'user',
         children: []
-      });
+      })
 
-      Roles._backwardMigrate(null, null, false);
+      Roles._backwardMigrate(null, null, false)
 
-      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
         roles: ['admin', 'editor']
-      });
-      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
         roles: []
-      });
-      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
         roles: ['user']
-      });
+      })
 
-      test.equal(Meteor.roles.findOne({name: 'admin'}, {fields: {_id: 0}}), {
+      test.equal(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
         name: 'admin'
-      });
-      test.equal(Meteor.roles.findOne({name: 'editor'}, {fields: {_id: 0}}), {
+      })
+      test.equal(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
         name: 'editor'
-      });
-      test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
+      })
+      test.equal(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
         name: 'user'
-      });
-    });
+      })
+    })
 
   Tinytest.add(
     'roles - migration with global groups',
     function (test) {
-      reset();
+      reset()
 
-      test.isTrue(Meteor.roles.insert({name: 'admin'}));
-      test.isTrue(Meteor.roles.insert({name: 'editor'}));
-      test.isTrue(Meteor.roles.insert({name: 'user'}));
+      test.isTrue(Meteor.roles.insert({ name: 'admin' }))
+      test.isTrue(Meteor.roles.insert({ name: 'editor' }))
+      test.isTrue(Meteor.roles.insert({ name: 'user' }))
 
-      test.isTrue(Meteor.users.update(users.eve, {$set: {roles: {__global_roles__: ['admin', 'editor'], foo_bla: ['user']}}}));
-      test.isTrue(Meteor.users.update(users.bob, {$set: {roles: {}}}));
-      test.isTrue(Meteor.users.update(users.joe, {$set: {roles: {__global_roles__: ['user'], foo_bla: ['user']}}}));
+      test.isTrue(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
+      test.isTrue(Meteor.users.update(users.bob, { $set: { roles: { } } }))
+      test.isTrue(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
 
-      Roles._forwardMigrate(null, null, false);
+      Roles._forwardMigrate(null, null, false)
 
-      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
         roles: [{
           _id: 'admin',
           scope: null,
@@ -1650,11 +1636,11 @@
           scope: 'foo_bla',
           assigned: true
         }]
-      });
-      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
         roles: []
-      });
-      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
         roles: [{
           _id: 'user',
           scope: null,
@@ -1664,52 +1650,52 @@
           scope: 'foo_bla',
           assigned: true
         }]
-      });
+      })
 
-      test.equal(Meteor.roles.findOne({_id: 'admin'}), {
+      test.equal(Meteor.roles.findOne({ _id: 'admin' }), {
         _id: 'admin',
         children: []
-      });
-      test.equal(Meteor.roles.findOne({_id: 'editor'}), {
+      })
+      test.equal(Meteor.roles.findOne({ _id: 'editor' }), {
         _id: 'editor',
         children: []
-      });
-      test.equal(Meteor.roles.findOne({_id: 'user'}), {
+      })
+      test.equal(Meteor.roles.findOne({ _id: 'user' }), {
         _id: 'user',
         children: []
-      });
+      })
 
-      Roles._backwardMigrate(null, null, true);
+      Roles._backwardMigrate(null, null, true)
 
-      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
         roles: {
           __global_roles__: ['admin', 'editor'],
           foo_bla: ['user']
         }
-      });
-      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
         roles: {}
-      });
-      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
         roles: {
           __global_roles__: ['user'],
           foo_bla: ['user']
         }
-      });
+      })
 
-      test.equal(Meteor.roles.findOne({name: 'admin'}, {fields: {_id: 0}}), {
+      test.equal(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
         name: 'admin'
-      });
-      test.equal(Meteor.roles.findOne({name: 'editor'}, {fields: {_id: 0}}), {
+      })
+      test.equal(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
         name: 'editor'
-      });
-      test.equal(Meteor.roles.findOne({name: 'user'}, {fields: {_id: 0}}), {
+      })
+      test.equal(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
         name: 'user'
-      });
+      })
 
-      Roles._forwardMigrate(null, null, true);
+      Roles._forwardMigrate(null, null, true)
 
-      test.equal(Meteor.users.findOne(users.eve, {fields: {roles: 1, _id: 0}}), {
+      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
         roles: [{
           _id: 'admin',
           scope: null,
@@ -1723,11 +1709,11 @@
           scope: 'foo.bla',
           assigned: true
         }]
-      });
-      test.equal(Meteor.users.findOne(users.bob, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
         roles: []
-      });
-      test.equal(Meteor.users.findOne(users.joe, {fields: {roles: 1, _id: 0}}), {
+      })
+      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
         roles: [{
           _id: 'user',
           scope: null,
@@ -1737,40 +1723,40 @@
           scope: 'foo.bla',
           assigned: true
         }]
-      });
+      })
 
-      test.equal(Meteor.roles.findOne({_id: 'admin'}), {
+      test.equal(Meteor.roles.findOne({ _id: 'admin' }), {
         _id: 'admin',
         children: []
-      });
-      test.equal(Meteor.roles.findOne({_id: 'editor'}), {
+      })
+      test.equal(Meteor.roles.findOne({ _id: 'editor' }), {
         _id: 'editor',
         children: []
-      });
-      test.equal(Meteor.roles.findOne({_id: 'user'}), {
+      })
+      test.equal(Meteor.roles.findOne({ _id: 'user' }), {
         _id: 'user',
         children: []
-      });
-    });
+      })
+    })
 
   Tinytest.add(
     'roles - _assureConsistency',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('ALL_PERMISSIONS');
-      Roles.createRole('VIEW_PERMISSION');
-      Roles.createRole('EDIT_PERMISSION');
-      Roles.createRole('DELETE_PERMISSION');
-      Roles.addRolesToParent('ALL_PERMISSIONS', 'user');
-      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesToParent('DELETE_PERMISSION', 'admin');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('ALL_PERMISSIONS')
+      Roles.createRole('VIEW_PERMISSION')
+      Roles.createRole('EDIT_PERMISSION')
+      Roles.createRole('DELETE_PERMISSION')
+      Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+      Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
 
-      Roles.addUsersToRoles(users.eve, ['user'], 'scope1');
-      Roles.addUsersToRoles(users.eve, ['user'], 'scope2');
+      Roles.addUsersToRoles(users.eve, ['user'], 'scope1')
+      Roles.addUsersToRoles(users.eve, ['user'], 'scope2')
 
       var correctRoles = [{
         _id: 'user',
@@ -1804,15 +1790,15 @@
         _id: 'VIEW_PERMISSION',
         scope: 'scope2',
         assigned: false
-      }];
+      }]
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), correctRoles);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
 
       // let's remove all automatically assigned roles
       // _assureConsistency should recreate those roles
-      Meteor.users.update(users.eve, {$pull: {roles: {assigned: false}}});
+      Meteor.users.update(users.eve, { $pull: { roles: { assigned: false } } })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: 'scope1',
         assigned: true
@@ -1820,26 +1806,26 @@
         _id: 'user',
         scope: 'scope2',
         assigned: true
-      }]);
+      }])
 
-      Roles._assureConsistency(users.eve);
+      Roles._assureConsistency(users.eve)
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), correctRoles);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
 
       // add an extra role, faking that it is automatically assigned
       // _assureConsistency should remove this extra role
-      Meteor.users.update(users.eve, {$push: {roles: {_id: 'DELETE_PERMISSION', scope: null, assigned: false}}});
+      Meteor.users.update(users.eve, { $push: { roles: { _id: 'DELETE_PERMISSION', scope: null, assigned: false } } })
 
-      Roles._assureConsistency(users.eve);
+      Roles._assureConsistency(users.eve)
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), correctRoles);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
 
       // remove a role, _assureConsistency should remove it from the user
-      Meteor.roles.remove({_id: 'VIEW_PERMISSION'});
+      Meteor.roles.remove({ _id: 'VIEW_PERMISSION' })
 
-      Roles._assureConsistency(users.eve);
+      Roles._assureConsistency(users.eve)
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: 'scope1',
         assigned: true
@@ -1863,152 +1849,152 @@
         _id: 'EDIT_PERMISSION',
         scope: 'scope2',
         assigned: false
-      }]);
-    });
+      }])
+    })
 
   Tinytest.add(
     'roles - _addUserToRole',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
       // add role with assigned set to true
-      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: true});
+      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: true })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: true
-      }]);
+      }])
 
       // change assigned to false
-      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: false});
+      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: false })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: false
-      }]);
+      }])
 
-      Roles.setUserRoles(users.eve, []);
+      Roles.setUserRoles(users.eve, [])
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
 
       // add role with assigned set to false
-      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: null});
+      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: null })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: false
-      }]);
+      }])
 
       // change assigned to true
-      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: true});
+      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: true })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: true
-      }]);
+      }])
 
       // do not change assigned
-      Roles._addUserToRole(users.eve, 'admin', {scope: null, ifExists: false, _assigned: null});
+      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: null })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: true
-      }]);
-    });
+      }])
+    })
 
   Tinytest.add(
     'roles - _removeUserFromRole',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
+      Roles.createRole('admin')
 
-      Roles.addUsersToRoles(users.eve, 'admin');
+      Roles.addUsersToRoles(users.eve, 'admin')
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: true
-      }]);
+      }])
 
       // remove only roles with assigned set to false, thus do not remove anything
-      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: false});
+      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: false })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: true
-      }]);
+      }])
 
       // remove only roles with assigned set to true
-      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: true});
+      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: true })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
 
-      Roles.addUsersToRoles(users.eve, 'admin');
+      Roles.addUsersToRoles(users.eve, 'admin')
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: true
-      }]);
+      }])
 
       // remove roles no matter the assignment
-      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: null});
+      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: null })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
 
-      Roles.addUsersToRoles(users.eve, 'admin', {_assigned: false});
+      Roles.addUsersToRoles(users.eve, 'admin', { _assigned: false })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: false
-      }]);
+      }])
 
       // remove only roles with assigned set to true, thus do not remove anything
-      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: true});
+      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: true })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'admin',
         scope: null,
         assigned: false
-      }]);
+      }])
 
       // remove only roles with assigned set to false
-      Roles._removeUserFromRole(users.eve, 'admin', {scope: null, _assigned: false});
+      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: false })
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
-    });
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+    })
 
   Tinytest.add(
     'roles - keep assigned roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('ALL_PERMISSIONS');
-      Roles.createRole('VIEW_PERMISSION');
-      Roles.createRole('EDIT_PERMISSION');
-      Roles.createRole('DELETE_PERMISSION');
-      Roles.addRolesToParent('ALL_PERMISSIONS', 'user');
-      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesToParent('DELETE_PERMISSION', 'admin');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('ALL_PERMISSIONS')
+      Roles.createRole('VIEW_PERMISSION')
+      Roles.createRole('EDIT_PERMISSION')
+      Roles.createRole('DELETE_PERMISSION')
+      Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+      Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
 
-      Roles.addUsersToRoles(users.eve, ['user']);
+      Roles.addUsersToRoles(users.eve, ['user'])
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: null,
         assigned: true
@@ -2024,13 +2010,13 @@
         _id: 'VIEW_PERMISSION',
         scope: null,
         assigned: false
-      }]);
+      }])
 
-      Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION');
+      Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: null,
         assigned: true
@@ -2046,48 +2032,48 @@
         _id: 'VIEW_PERMISSION',
         scope: null,
         assigned: true
-      }]);
+      }])
 
-      Roles.removeUsersFromRoles(users.eve, 'user');
+      Roles.removeUsersFromRoles(users.eve, 'user')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'VIEW_PERMISSION',
         scope: null,
         assigned: true
-      }]);
+      }])
 
-      Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION');
+      Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION')
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), []);
-    });
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+    })
 
   Tinytest.add(
     'roles - modify assigned hierarchical roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('ALL_PERMISSIONS');
-      Roles.createRole('VIEW_PERMISSION');
-      Roles.createRole('EDIT_PERMISSION');
-      Roles.createRole('DELETE_PERMISSION');
-      Roles.addRolesToParent('ALL_PERMISSIONS', 'user');
-      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS');
-      Roles.addRolesToParent('DELETE_PERMISSION', 'admin');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('ALL_PERMISSIONS')
+      Roles.createRole('VIEW_PERMISSION')
+      Roles.createRole('EDIT_PERMISSION')
+      Roles.createRole('DELETE_PERMISSION')
+      Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+      Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
 
-      Roles.addUsersToRoles(users.eve, ['user']);
-      Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'scope');
+      Roles.addUsersToRoles(users.eve, ['user'])
+      Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'scope')
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: null,
         assigned: true
@@ -2115,16 +2101,16 @@
         _id: 'VIEW_PERMISSION',
         scope: 'scope',
         assigned: false
-      }]);
+      }])
 
-      Roles.createRole('MODERATE_PERMISSION');
+      Roles.createRole('MODERATE_PERMISSION')
 
-      Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: null,
         assigned: true
@@ -2160,14 +2146,14 @@
         _id: 'MODERATE_PERMISSION',
         scope: 'scope',
         assigned: false
-      }]);
+      }])
 
-      Roles.addUsersToRoles(users.eve, ['admin']);
+      Roles.addUsersToRoles(users.eve, ['admin'])
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: null,
         assigned: true
@@ -2211,14 +2197,14 @@
         _id: 'DELETE_PERMISSION',
         scope: null,
         assigned: false
-      }]);
+      }])
 
-      Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS');
+      Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: null,
         assigned: true
@@ -2266,14 +2252,14 @@
         _id: 'DELETE_PERMISSION',
         scope: 'scope',
         assigned: false
-      }]);
+      }])
 
-      Roles.removeUsersFromRoles(users.eve, ['admin']);
+      Roles.removeUsersFromRoles(users.eve, ['admin'])
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: null,
         assigned: true
@@ -2317,54 +2303,54 @@
         _id: 'DELETE_PERMISSION',
         scope: 'scope',
         assigned: false
-      }]);
+      }])
 
-      Roles.deleteRole('ALL_PERMISSIONS');
+      Roles.deleteRole('ALL_PERMISSIONS')
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'));
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'user',
         scope: null,
         assigned: true
-      }]);
-    });
+      }])
+    })
 
   Tinytest.add(
     'roles - delete role with overlapping hierarchical roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('role1');
-      Roles.createRole('role2');
-      Roles.createRole('COMMON_PERMISSION_1');
-      Roles.createRole('COMMON_PERMISSION_2');
-      Roles.createRole('COMMON_PERMISSION_3');
-      Roles.createRole('EXTRA_PERMISSION_ROLE_1');
-      Roles.createRole('EXTRA_PERMISSION_ROLE_2');
+      Roles.createRole('role1')
+      Roles.createRole('role2')
+      Roles.createRole('COMMON_PERMISSION_1')
+      Roles.createRole('COMMON_PERMISSION_2')
+      Roles.createRole('COMMON_PERMISSION_3')
+      Roles.createRole('EXTRA_PERMISSION_ROLE_1')
+      Roles.createRole('EXTRA_PERMISSION_ROLE_2')
 
-      Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1');
-      Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1');
-      Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1');
-      Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1');
+      Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1')
+      Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1')
+      Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1')
+      Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1')
 
-      Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2');
-      Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2');
-      Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2');
-      Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2');
+      Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2')
+      Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2')
+      Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2')
+      Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2')
 
-      Roles.addUsersToRoles(users.eve, 'role1');
-      Roles.addUsersToRoles(users.eve, 'role2');
+      Roles.addUsersToRoles(users.eve, 'role1')
+      Roles.addUsersToRoles(users.eve, 'role2')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'role1',
         scope: null,
         assigned: true
@@ -2392,15 +2378,15 @@
         _id: 'EXTRA_PERMISSION_ROLE_2',
         scope: null,
         assigned: false
-      }]);
+      }])
 
-      Roles.removeUsersFromRoles(users.eve, 'role2');
+      Roles.removeUsersFromRoles(users.eve, 'role2')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'role1',
         scope: null,
         assigned: true
@@ -2420,15 +2406,15 @@
         _id: 'EXTRA_PERMISSION_ROLE_1',
         scope: null,
         assigned: false
-      }]);
+      }])
 
-      Roles.addUsersToRoles(users.eve, 'role2');
+      Roles.addUsersToRoles(users.eve, 'role2')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'role1',
         scope: null,
         assigned: true
@@ -2456,15 +2442,15 @@
         _id: 'EXTRA_PERMISSION_ROLE_2',
         scope: null,
         assigned: false
-      }]);
+      }])
 
-      Roles.deleteRole('role2');
+      Roles.deleteRole('role2')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'));
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'role1',
         scope: null,
         assigned: true
@@ -2484,218 +2470,207 @@
         _id: 'EXTRA_PERMISSION_ROLE_1',
         scope: null,
         assigned: false
-      }]);
-    });
+      }])
+    })
 
   Tinytest.add(
     'roles - set parent on assigned role',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('EDIT_PERMISSION');
+      Roles.createRole('admin')
+      Roles.createRole('EDIT_PERMISSION')
 
-      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
+      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'EDIT_PERMISSION',
         scope: null,
         assigned: true
-      }]);
+      }])
 
-      Roles.addRolesToParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'EDIT_PERMISSION',
         scope: null,
         assigned: true
-      }]);
-    });
+      }])
+    })
 
   Tinytest.add(
     'roles - remove parent on assigned role',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('EDIT_PERMISSION');
+      Roles.createRole('admin')
+      Roles.createRole('EDIT_PERMISSION')
 
-      Roles.addRolesToParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
 
-      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
+      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'EDIT_PERMISSION',
         scope: null,
         assigned: true
-      }]);
+      }])
 
-      Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin');
+      Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'EDIT_PERMISSION',
         scope: null,
         assigned: true
-      }]);
-    });
+      }])
+    })
 
   Tinytest.add(
     'roles - adding and removing extra role parents',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('EDIT_PERMISSION');
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('EDIT_PERMISSION')
 
-      Roles.addRolesToParent('EDIT_PERMISSION', 'admin');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
 
-      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION');
+      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'EDIT_PERMISSION',
         scope: null,
         assigned: true
-      }]);
+      }])
 
-      Roles.addRolesToParent('EDIT_PERMISSION', 'user');
+      Roles.addRolesToParent('EDIT_PERMISSION', 'user')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'EDIT_PERMISSION',
         scope: null,
         assigned: true
-      }]);
+      }])
 
-      Roles.removeRolesFromParent('EDIT_PERMISSION', 'user');
+      Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
 
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'));
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'));
+      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, {anyScope: true, fullObjects: true}), [{
+      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
         _id: 'EDIT_PERMISSION',
         scope: null,
         assigned: true
-      }]);
-    });
+      }])
+    })
 
   Tinytest.add(
     'roles - cyclic roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('editor');
-      Roles.createRole('user');
+      Roles.createRole('admin')
+      Roles.createRole('editor')
+      Roles.createRole('user')
 
-      Roles.addRolesToParent('editor', 'admin');
-      Roles.addRolesToParent('user', 'editor');
+      Roles.addRolesToParent('editor', 'admin')
+      Roles.addRolesToParent('user', 'editor')
 
       test.throws(function () {
-        Roles.addRolesToParent('admin', 'user');
-      }, /form a cycle/);
-    });
+        Roles.addRolesToParent('admin', 'user')
+      }, /form a cycle/)
+    })
 
   Tinytest.add(
     'roles - userIsInRole returns false for unknown roles',
     function (test) {
-      reset();
+      reset()
 
-      Roles.createRole('admin');
-      Roles.createRole('user');
-      Roles.createRole('editor');
-      Roles.addUsersToRoles(users.eve, ['admin', 'user']);
-      Roles.addUsersToRoles(users.eve, ['editor']);
+      Roles.createRole('admin')
+      Roles.createRole('user')
+      Roles.createRole('editor')
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+      Roles.addUsersToRoles(users.eve, ['editor'])
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'unknown'));
-      test.isFalse(Roles.userIsInRole(users.eve, []));
-      test.isFalse(Roles.userIsInRole(users.eve, null));
-      test.isFalse(Roles.userIsInRole(users.eve, undefined));
+      test.isFalse(Roles.userIsInRole(users.eve, 'unknown'))
+      test.isFalse(Roles.userIsInRole(users.eve, []))
+      test.isFalse(Roles.userIsInRole(users.eve, null))
+      test.isFalse(Roles.userIsInRole(users.eve, undefined))
 
-      test.isFalse(Roles.userIsInRole(users.eve, 'unknown', {anyScope: true}));
-      test.isFalse(Roles.userIsInRole(users.eve, [], {anyScope: true}));
-      test.isFalse(Roles.userIsInRole(users.eve, null, {anyScope: true}));
-      test.isFalse(Roles.userIsInRole(users.eve, undefined, {anyScope: true}));
+      test.isFalse(Roles.userIsInRole(users.eve, 'unknown', { anyScope: true }))
+      test.isFalse(Roles.userIsInRole(users.eve, [], { anyScope: true }))
+      test.isFalse(Roles.userIsInRole(users.eve, null, { anyScope: true }))
+      test.isFalse(Roles.userIsInRole(users.eve, undefined, { anyScope: true }))
 
-      test.isFalse(Roles.userIsInRole(users.eve, ["Role1", "Role2", undefined], "GroupName"));
-    });
+      test.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
+    })
 
-Tinytest.add(
-  'roles - isParentOf - returns false for unknown roles',
-  function (test) {
-    reset();
+  Tinytest.add(
+    'roles - isParentOf - returns false for unknown roles',
+    function (test) {
+      reset()
 
-    Roles.createRole('admin');
+      Roles.createRole('admin')
 
-    test.isFalse(Roles.isParentOf('admin', 'unknown'));
-    test.isFalse(Roles.isParentOf('admin', null));
-    test.isFalse(Roles.isParentOf('admin', undefined));
+      test.isFalse(Roles.isParentOf('admin', 'unknown'))
+      test.isFalse(Roles.isParentOf('admin', null))
+      test.isFalse(Roles.isParentOf('admin', undefined))
 
-    test.isFalse(Roles.isParentOf('unknown', 'admin'));
-    test.isFalse(Roles.isParentOf(null, 'admin'));
-    test.isFalse(Roles.isParentOf(undefined, 'admin'));
-  });
+      test.isFalse(Roles.isParentOf('unknown', 'admin'))
+      test.isFalse(Roles.isParentOf(null, 'admin'))
+      test.isFalse(Roles.isParentOf(undefined, 'admin'))
+    })
 
-Tinytest.add(
-  'roles - isParentOf - returns false if role is not parent of',
-  function (test) {
-    reset();
+  Tinytest.add(
+    'roles - isParentOf - returns false if role is not parent of',
+    function (test) {
+      reset()
 
-    Roles.createRole('admin');
-    Roles.createRole('editor');
-    Roles.createRole('user');
-    Roles.addRolesToParent(['editor'], 'admin');
-    Roles.addRolesToParent(['user'], 'editor');
+      Roles.createRole('admin')
+      Roles.createRole('editor')
+      Roles.createRole('user')
+      Roles.addRolesToParent(['editor'], 'admin')
+      Roles.addRolesToParent(['user'], 'editor')
 
-    test.isFalse(Roles.isParentOf('user', 'admin'));
-    test.isFalse(Roles.isParentOf('editor', 'admin'));
-  });
+      test.isFalse(Roles.isParentOf('user', 'admin'))
+      test.isFalse(Roles.isParentOf('editor', 'admin'))
+    })
 
-Tinytest.add(
-  'roles - isParentOf - returns true if role is parent of the demanded role',
-  function (test) {
-    reset();
+  Tinytest.add(
+    'roles - isParentOf - returns true if role is parent of the demanded role',
+    function (test) {
+      reset()
 
-    Roles.createRole('admin');
-    Roles.createRole('editor');
-    Roles.createRole('user');
-    Roles.addRolesToParent(['editor'], 'admin');
-    Roles.addRolesToParent(['user'], 'editor');
+      Roles.createRole('admin')
+      Roles.createRole('editor')
+      Roles.createRole('user')
+      Roles.addRolesToParent(['editor'], 'admin')
+      Roles.addRolesToParent(['user'], 'editor')
 
-    test.isTrue(Roles.isParentOf('admin', 'user'));
-    test.isTrue(Roles.isParentOf('editor', 'user'));
-    test.isTrue(Roles.isParentOf('admin', 'editor'));
+      test.isTrue(Roles.isParentOf('admin', 'user'))
+      test.isTrue(Roles.isParentOf('editor', 'user'))
+      test.isTrue(Roles.isParentOf('admin', 'editor'))
 
-    test.isTrue(Roles.isParentOf('admin', 'admin'));
-    test.isTrue(Roles.isParentOf('editor', 'editor'));
-    test.isTrue(Roles.isParentOf('user', 'user'));
-  });
-
-  function printException (ex) {
-    var tmp = {};
-    for (var key in ex) {
-      if (key != 'stack') {
-        tmp[key] = ex[key];
-      }
-    }
-    console.log(JSON.stringify(tmp));
-  }
-
-}());
+      test.isTrue(Roles.isParentOf('admin', 'admin'))
+      test.isTrue(Roles.isParentOf('editor', 'editor'))
+      test.isTrue(Roles.isParentOf('user', 'user'))
+    })
+}())

From 20c7fa6e8c7d4a1ea46eeb03efe20aae4602edf0 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 23 Jan 2019 18:32:33 +0400
Subject: [PATCH 0280/1140] Replaced some checks in tests by `itemsEqual` since
 order is not relevant

---
 roles/tests/server.js | 155 ++++++++++++++++++++----------------------
 1 file changed, 75 insertions(+), 80 deletions(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 8d23dd4385..73b45b92e2 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -73,15 +73,10 @@
     actual = actual || []
     expected = expected || []
 
-    function intersectionObjects (...args) {
-      var array, rest
-      array = args[0]
-      rest = args.length > 2 ? args.slice(1) : []
-      return [...new Set(array)].filter(function (item) {
-        return rest.every(function (other) {
-          return other.some(function (element) {
-            return deepEqual(element, item)
-          })
+    function intersectionObjects (array, array2) {
+      return array.filter(function (item) {
+        return array2.some(function (item2) {
+          return deepEqual(item, item2)
         })
       })
     }
@@ -973,7 +968,7 @@
       test.equal(Roles.getRolesForUser(userObj, 'scope2'), ['admin'])
       test.equal(Roles.getRolesForUser(userObj), [])
 
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -982,13 +977,13 @@
         scope: 'scope1',
         assigned: true
       }])
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
         _id: 'admin',
         scope: 'scope2',
         assigned: true
       }])
 
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1005,7 +1000,7 @@
       Roles.createRole('PERMISSION')
       Roles.addRolesToParent('PERMISSION', 'user')
 
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1018,15 +1013,15 @@
         scope: 'scope1',
         assigned: false
       }])
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
         _id: 'admin',
         scope: 'scope2',
         assigned: true
       }])
-      test.equal(Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
-      test.equal(Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
+      itemsEqual(test, Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
+      itemsEqual(test, Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
 
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1043,9 +1038,9 @@
         scope: 'scope1',
         assigned: false
       }])
-      test.equal(Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
+      itemsEqual(test, Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
 
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1054,15 +1049,15 @@
         scope: 'scope1',
         assigned: true
       }])
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }), [{
         _id: 'admin',
         scope: 'scope2',
         assigned: true
       }])
-      test.equal(Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
-      test.equal(Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
+      itemsEqual(test, Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
+      itemsEqual(test, Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
 
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }), [{
+      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }), [{
         _id: 'admin',
         scope: 'scope1',
         assigned: true
@@ -1075,7 +1070,7 @@
         scope: 'scope2',
         assigned: true
       }])
-      test.equal(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
+      itemsEqual(test, Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
     })
 
   Tinytest.add(
@@ -1106,13 +1101,13 @@
       Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user'])
-      test.equal(Roles.getRolesForUser(userId), ['editor'])
+      itemsEqual(test, Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user'])
+      itemsEqual(test, Roles.getRolesForUser(userId), ['editor'])
 
       // by user object
       userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
-      test.equal(Roles.getRolesForUser(userObj), ['editor'])
+      itemsEqual(test, Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
+      itemsEqual(test, Roles.getRolesForUser(userObj), ['editor'])
     })
 
   Tinytest.add(
@@ -1126,24 +1121,24 @@
       var userObj
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), [])
-      test.equal(Roles.getRolesForUser(userId), [])
+      itemsEqual(test, Roles.getRolesForUser(userId, 'scope1'), [])
+      itemsEqual(test, Roles.getRolesForUser(userId), [])
 
       // by user object
       userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), [])
-      test.equal(Roles.getRolesForUser(userObj), [])
+      itemsEqual(test, Roles.getRolesForUser(userObj, 'scope1'), [])
+      itemsEqual(test, Roles.getRolesForUser(userObj), [])
 
       Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
 
       // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['editor'])
-      test.equal(Roles.getRolesForUser(userId), ['editor'])
+      itemsEqual(test, Roles.getRolesForUser(userId, 'scope1'), ['editor'])
+      itemsEqual(test, Roles.getRolesForUser(userId), ['editor'])
 
       // by user object
       userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['editor'])
-      test.equal(Roles.getRolesForUser(userObj), ['editor'])
+      itemsEqual(test, Roles.getRolesForUser(userObj, 'scope1'), ['editor'])
+      itemsEqual(test, Roles.getRolesForUser(userObj), ['editor'])
     })
 
   Tinytest.add(
@@ -1162,11 +1157,11 @@
       Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
 
       // by userId
-      test.equal(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userId), ['scope1', 'scope2'])
 
       // by user object
       userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
     })
 
   Tinytest.add(
@@ -1185,15 +1180,15 @@
       Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
 
       // by userId
-      test.equal(Roles.getScopesForUser(userId, 'user'), ['scope2'])
-      test.equal(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-      test.equal(Roles.getScopesForUser(userId, 'admin'), [])
+      itemsEqual(test, Roles.getScopesForUser(userId, 'user'), ['scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, 'admin'), [])
 
       // by user object
       userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-      test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-      test.equal(Roles.getScopesForUser(userObj, 'admin'), [])
+      itemsEqual(test, Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, 'admin'), [])
     })
 
   Tinytest.add(
@@ -1210,17 +1205,17 @@
       Roles.addUsersToRoles([users.eve], ['editor', 'user'])
 
       // by userId
-      test.equal(Roles.getScopesForUser(userId), [])
-      test.equal(Roles.getScopesForUser(userId, 'editor'), [])
-      test.equal(Roles.getScopesForUser(userId, ['editor']), [])
-      test.equal(Roles.getScopesForUser(userId, ['editor', 'user']), [])
+      itemsEqual(test, Roles.getScopesForUser(userId), [])
+      itemsEqual(test, Roles.getScopesForUser(userId, 'editor'), [])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['editor']), [])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['editor', 'user']), [])
 
       // by user object
       userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getScopesForUser(userObj), [])
-      test.equal(Roles.getScopesForUser(userObj, 'editor'), [])
-      test.equal(Roles.getScopesForUser(userObj, ['editor']), [])
-      test.equal(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
+      itemsEqual(test, Roles.getScopesForUser(userObj), [])
+      itemsEqual(test, Roles.getScopesForUser(userObj, 'editor'), [])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor']), [])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor', 'user']), [])
     })
 
   Tinytest.add(
@@ -1241,25 +1236,25 @@
       Roles.addUsersToRoles([users.eve], ['moderator'], 'group3')
 
       // by userId, one role
-      test.equal(Roles.getScopesForUser(userId, ['user']), ['group2'])
-      test.equal(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
-      test.equal(Roles.getScopesForUser(userId, ['admin']), [])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['user']), ['group2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['admin']), [])
 
       // by userId, multiple roles
-      test.equal(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
-      test.equal(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-      test.equal(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
 
       // by user object, one role
       userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getScopesForUser(userObj, ['user']), ['group2'])
-      test.equal(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
-      test.equal(Roles.getScopesForUser(userObj, ['admin']), [])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['user']), ['group2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['admin']), [])
 
       // by user object, multiple roles
-      test.equal(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
-      test.equal(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-      test.equal(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
     })
 
   Tinytest.add(
@@ -1279,23 +1274,23 @@
       Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
 
       // by userId
-      test.equal(Roles.getScopesForUser(userId, 'user'), ['scope2'])
-      test.equal(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-      test.equal(Roles.getScopesForUser(userId, 'admin'), [])
-      test.equal(Roles.getScopesForUser(userId, ['user']), ['scope2'])
-      test.equal(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
-      test.equal(Roles.getScopesForUser(userId, ['admin']), [])
-      test.equal(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, 'user'), ['scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, 'admin'), [])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['user']), ['scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['admin']), [])
+      itemsEqual(test, Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
 
       // by user object
       userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-      test.equal(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-      test.equal(Roles.getScopesForUser(userObj, 'admin'), [])
-      test.equal(Roles.getScopesForUser(userObj, ['user']), ['scope2'])
-      test.equal(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
-      test.equal(Roles.getScopesForUser(userObj, ['admin']), [])
-      test.equal(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, 'admin'), [])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['user']), ['scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['admin']), [])
+      itemsEqual(test, Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
     })
 
   Tinytest.add(
@@ -1341,7 +1336,7 @@
       itemsEqual(test, actual, expected)
 
       actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-      test.equal(actual, [])
+      itemsEqual(test, actual, [])
     })
 
   Tinytest.add(
@@ -1464,7 +1459,7 @@
     })
 
   Tinytest.add(
-    "roles - can use '.' in scope name",
+    'roles - can use \'.\' in scope name',
     function (test) {
       reset()
 

From 8fd69a1c8839a0f3a08db61aa11fa6d42903c3e1 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 21:05:11 +0400
Subject: [PATCH 0281/1140] Use meteortesting:mocha to run the tests

---
 .gitignore            |    3 +-
 package.js            |   15 +-
 roles/tests/client.js |   89 +-
 roles/tests/server.js | 4796 +++++++++++++++++++----------------------
 4 files changed, 2288 insertions(+), 2615 deletions(-)

diff --git a/.gitignore b/.gitignore
index 627a5c1ae3..6de5788440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ smart.lock
 
 .idea
 docs/
-node_modules/
\ No newline at end of file
+node_modules/
+.npm/
\ No newline at end of file
diff --git a/package.js b/package.js
index 8386283015..1a8142084f 100644
--- a/package.js
+++ b/package.js
@@ -1,4 +1,4 @@
-/* global Package */
+/* global Package, Npm */
 
 Package.describe({
   summary: 'Authorization package for Meteor',
@@ -34,6 +34,14 @@ Package.onUse(function (api) {
 })
 
 Package.onTest(function (api) {
+  api.use([
+    'meteortesting:mocha'
+  ])
+
+  Npm.depends({
+    'chai': '4.2.0'
+  })
+
   api.versionsFrom('METEOR@1.8.1')
 
   var both = ['client', 'server']
@@ -41,10 +49,9 @@ Package.onTest(function (api) {
   // `accounts-password` is included so `Meteor.users` exists
 
   api.use([
+    'ecmascript',
     'alanning:roles',
-    'accounts-password',
-    'mongo',
-    'tinytest'
+    'mongo'
   ], both)
 
   api.addFiles('roles/tests/client.js', 'client')
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 53ac8bbf1f..dc4292d80b 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -1,6 +1,9 @@
-/* global Meteor, Roles, Tinytest */
+/* global Roles, describe, it, beforeEach */
+import { Meteor } from 'meteor/meteor'
+import { Tracker } from 'meteor/tracker'
+import { assert } from 'chai'
 
-;(function () {
+describe('roles', function () {
   var users
   var roles = ['admin', 'editor', 'user']
 
@@ -43,7 +46,7 @@
     }
   }
 
-  function testUser (test, username, expectedRoles, group) {
+  function testUser (username, expectedRoles, group) {
     var user = users[username]
 
     // test using user object rather than userId to avoid mocking
@@ -53,9 +56,9 @@
       var nmsg = username + ' had un-expected permission ' + role
 
       if (expected) {
-        test.isTrue(Roles.userIsInRole(user, role, group), msg)
+        assert.isTrue(Roles.userIsInRole(user, role, group), msg)
       } else {
-        test.isFalse(Roles.userIsInRole(user, role, group), nmsg)
+        assert.isFalse(Roles.userIsInRole(user, role, group), nmsg)
       }
     })
   }
@@ -65,53 +68,45 @@
     return users.eve
   }
 
-  Tinytest.add(
-    'roles - can check current users roles via template helper',
-    function (test) {
-      var isInRole
-      var expected
-      var actual
+  it('can check current users roles via template helper', function () {
+    var isInRole
+    var expected
+    var actual
 
-      if (!Roles._handlebarsHelpers) {
-        // probably running package tests outside of a Meteor app.
-        // skip this test.
-        return
-      }
+    if (!Roles._handlebarsHelpers) {
+      // probably running package tests outside of a Meteor app.
+      // skip this test.
+      return
+    }
 
-      isInRole = Roles._handlebarsHelpers.isInRole
-      test.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
+    isInRole = Roles._handlebarsHelpers.isInRole
+    assert.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
 
-      expected = true
-      actual = isInRole('admin, editor')
-      test.equal(actual, expected)
+    expected = true
+    actual = isInRole('admin, editor')
+    assert.equal(actual, expected)
 
-      expected = true
-      actual = isInRole('admin')
-      test.equal(actual, expected)
+    expected = true
+    actual = isInRole('admin')
+    assert.equal(actual, expected)
 
-      expected = false
-      actual = isInRole('unknown')
-      test.equal(actual, expected)
-    })
+    expected = false
+    actual = isInRole('unknown')
+    assert.equal(actual, expected)
+  })
 
-  Tinytest.add(
-    'roles - can check if user is in role',
-    function (test) {
-      testUser(test, 'eve', ['admin', 'editor'])
-    })
+  it('can check if user is in role', function () {
+    testUser('eve', ['admin', 'editor'])
+  })
 
-  Tinytest.add(
-    'roles - can check if user is in role by group',
-    function (test) {
-      testUser(test, 'bob', ['user'], 'group1')
-      testUser(test, 'bob', ['editor'], 'group2')
-    })
+  it('can check if user is in role by group', function () {
+    testUser('bob', ['user'], 'group1')
+    testUser('bob', ['editor'], 'group2')
+  })
 
-  Tinytest.add(
-    'roles - can check if user is in role with Roles.GLOBAL_GROUP',
-    function (test) {
-      testUser(test, 'joe', ['admin'])
-      testUser(test, 'joe', ['admin'], Roles.GLOBAL_GROUP)
-      testUser(test, 'joe', ['admin', 'editor'], 'group1')
-    })
-}())
+  it('can check if user is in role with Roles.GLOBAL_GROUP', function () {
+    testUser('joe', ['admin'])
+    testUser('joe', ['admin'], Roles.GLOBAL_GROUP)
+    testUser('joe', ['admin', 'editor'], 'group1')
+  })
+})
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 73b45b92e2..1f1da18b71 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1,14 +1,42 @@
-/* global Meteor, Roles, Accounts, Tinytest */
+/* global Roles, describe, it, beforeEach */
+import { Meteor } from 'meteor/meteor'
+import { assert } from 'chai'
 
-;(function () {
+describe('roles', function () {
   var users = {}
   var roles = ['admin', 'editor', 'user']
 
   function addUser (name) {
-    return Accounts.createUser({ 'username': name })
+    return Meteor.users.insert({ 'username': name })
   }
 
-  function reset () {
+  function testUser (username, expectedRoles, scope) {
+    var userId = users[username]
+    var userObj = Meteor.users.findOne({ _id: userId })
+
+    // check using user ids (makes db calls)
+    _innerTest(userId, username, expectedRoles, scope)
+
+    // check using passed-in user object
+    _innerTest(userObj, username, expectedRoles, scope)
+  }
+
+  function _innerTest (userParam, username, expectedRoles, scope) {
+    // test that user has only the roles expected and no others
+    roles.forEach(function (role) {
+      var expected = expectedRoles.includes(role)
+      var msg = username + ' expected to have \'' + role + '\' role but does not'
+      var nmsg = username + ' had the following un-expected role: ' + role
+
+      if (expected) {
+        assert.isTrue(Roles.userIsInRole(userParam, role, scope), msg)
+      } else {
+        assert.isFalse(Roles.userIsInRole(userParam, role, scope), nmsg)
+      }
+    })
+  }
+
+  beforeEach(function () {
     Meteor.roles.remove({})
     Meteor.users.remove({})
 
@@ -17,2655 +45,2297 @@
       'bob': addUser('bob'),
       'joe': addUser('joe')
     }
-  }
+  })
 
-  function testUser (test, username, expectedRoles, scope) {
-    var userId = users[username]
-    var userObj = Meteor.users.findOne({ _id: userId })
+  it('can create and delete roles', function () {
+    var role1Id = Roles.createRole('test1')
+    assert.equal(Meteor.roles.findOne()._id, 'test1')
+    assert.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
 
-    // check using user ids (makes db calls)
-    _innerTest(test, userId, username, expectedRoles, scope)
+    var role2Id = Roles.createRole('test2')
+    assert.equal(Meteor.roles.findOne({ _id: 'test2' })._id, 'test2')
+    assert.equal(Meteor.roles.findOne(role2Id)._id, 'test2')
 
-    // check using passed-in user object
-    _innerTest(test, userObj, username, expectedRoles, scope)
-  }
+    assert.equal(Meteor.roles.find().count(), 2)
 
-  function _innerTest (test, userParam, username, expectedRoles, scope) {
-    // test that user has only the roles expected and no others
+    Roles.deleteRole('test1')
+    assert.equal(typeof Meteor.roles.findOne({ _id: 'test1' }), 'undefined')
+
+    Roles.deleteRole('test2')
+    assert.equal(typeof Meteor.roles.findOne(), 'undefined')
+  })
+
+  it('can\'t create duplicate roles', function () {
+    Roles.createRole('test1')
+    assert.throws(function () { Roles.createRole('test1') })
+    assert.isNull(Roles.createRole('test1', { unlessExists: true }))
+  })
+
+  it('can\'t create role with empty names', function () {
+    assert.throws(function () {
+      Roles.createRole('')
+    }, /Invalid role name/)
+    assert.throws(function () {
+      Roles.createRole(null)
+    }, /Invalid role name/)
+    assert.throws(function () {
+      Roles.createRole(' ')
+    }, /Invalid role name/)
+    assert.throws(function () {
+      Roles.createRole(' foobar')
+    }, /Invalid role name/)
+    assert.throws(function () {
+      Roles.createRole(' foobar ')
+    }, /Invalid role name/)
+  })
+
+  it('can\'t use invalid scope names', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], '')
+    }, /Invalid scope name/)
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ')
+    }, /Invalid scope name/)
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar')
+    }, /Invalid scope name/)
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ')
+    }, /Invalid scope name/)
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42)
+    }, /Invalid scope name/)
+  })
+
+  it('can check if user is in role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+  })
+
+  it('can check if user is in role by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
+
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], { anyScope: true }))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], { anyScope: true }))
+  })
+
+  it('can check if user is in role by scope through options', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], { scope: 'scope1' })
+    Roles.addUsersToRoles(users.eve, ['editor'], { scope: 'scope2' })
+
+    testUser('eve', ['admin', 'user'], { scope: 'scope1' })
+    testUser('eve', ['editor'], { scope: 'scope2' })
+  })
+
+  it('can check if user is in role by scope with global role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, ['user'], 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'scope2'))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], 'scope2'))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
+
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin']))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
+  })
+
+  it('renaming scopes', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+
+    Roles.renameScope('scope1', 'scope3')
+
+    testUser('eve', ['admin', 'user'], 'scope3')
+    testUser('eve', ['editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+
+    assert.throws(function () {
+      Roles.renameScope('scope3')
+    }, /Invalid scope name/)
+
+    Roles.renameScope('scope3', null)
+
+    testUser('eve', ['admin', 'user', 'editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin']))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['user']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['user'], null))
+
+    Roles.renameScope(null, 'scope2')
+
+    testUser('eve', ['admin', 'user', 'editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin'], null))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
+  })
+
+  it('removing scopes', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+
+    Roles.removeScope('scope1')
+
+    testUser('eve', ['editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+  })
+
+  it('can check if non-existant user is in role', function () {
+    assert.isFalse(Roles.userIsInRole('1', 'admin'))
+  })
+
+  it('can check if null user is in role', function () {
+    assert.isFalse(Roles.userIsInRole(null, 'admin'))
+  })
+
+  it('can check user against several roles at once', function () {
+    var user
+
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    user = Meteor.users.findOne({ _id: users.eve })
+
+    // we can check the non-existing role
+    assert.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
+  })
+
+  it('can\'t add non-existent user to role', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(['1'], ['admin'])
+    assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
+  })
+
+  it('can\'t add user to non-existent role', function () {
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin'])
+    }, /Role 'admin' does not exist/)
+    Roles.addUsersToRoles(users.eve, ['admin'], { ifExists: true })
+  })
+
+  it('can\'t set non-existent user to role', function () {
+    Roles.createRole('admin')
+
+    Roles.setUserRoles(['1'], ['admin'])
+    assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
+  })
+
+  it('can\'t set user to non-existent role', function () {
+    assert.throws(function () {
+      Roles.setUserRoles(users.eve, ['admin'])
+    }, /Role 'admin' does not exist/)
+    Roles.setUserRoles(users.eve, ['admin'], { ifExists: true })
+  })
+
+  it('can add individual users to roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', [])
+    testUser('joe', [])
+
+    Roles.addUsersToRoles(users.joe, ['editor', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', [])
+    testUser('joe', ['editor', 'user'])
+  })
+
+  it('can add individual users to roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', [], 'scope1')
+    testUser('joe', [], 'scope1')
+
+    testUser('eve', [], 'scope2')
+    testUser('bob', [], 'scope2')
+    testUser('joe', [], 'scope2')
+
+    Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', [], 'scope1')
+    testUser('joe', ['editor', 'user'], 'scope1')
+
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['editor', 'user'], 'scope2')
+    testUser('joe', [], 'scope2')
+  })
+
+  it('can add user to roles via user object', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    var eve = Meteor.users.findOne({ _id: users.eve })
+    var bob = Meteor.users.findOne({ _id: users.bob })
+
+    Roles.addUsersToRoles(eve, ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', [])
+    testUser('joe', [])
+
+    Roles.addUsersToRoles(bob, ['editor'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', ['editor'])
+    testUser('joe', [])
+  })
+
+  it('can add user to roles multiple times', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', [])
+    testUser('joe', [])
+
+    Roles.addUsersToRoles(users.bob, ['admin'])
+    Roles.addUsersToRoles(users.bob, ['editor'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', ['admin', 'editor'])
+    testUser('joe', [])
+  })
+
+  it('can add user to roles multiple times by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', [], 'scope1')
+    testUser('joe', [], 'scope1')
+
+    Roles.addUsersToRoles(users.bob, ['admin'], 'scope1')
+    Roles.addUsersToRoles(users.bob, ['editor'], 'scope1')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', ['admin', 'editor'], 'scope1')
+    testUser('joe', [], 'scope1')
+  })
+
+  it('can add multiple users to roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', ['admin', 'user'])
+    testUser('joe', [])
+
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', ['admin', 'editor', 'user'])
+    testUser('joe', ['editor', 'user'])
+  })
+
+  it('can add multiple users to roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'scope1')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', ['admin', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+
+    testUser('eve', [], 'scope2')
+    testUser('bob', [], 'scope2')
+    testUser('joe', [], 'scope2')
+
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', ['admin', 'editor', 'user'], 'scope1')
+    testUser('joe', ['editor', 'user'], 'scope1')
+
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['editor', 'user'], 'scope2')
+    testUser('joe', ['editor', 'user'], 'scope2')
+  })
+
+  it('can remove individual users from roles', function () {
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser('eve', ['editor'])
+    testUser('bob', ['editor', 'user'])
+  })
+
+  it('can remove user from roles multiple times', function () {
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser('eve', ['editor'])
+    testUser('bob', ['editor', 'user'])
+
+    // try remove again
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser('eve', ['editor'])
+  })
+
+  it('can remove users from roles via user object', function () {
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    var eve = Meteor.users.findOne({ _id: users.eve })
+    var bob = Meteor.users.findOne({ _id: users.bob })
+
+    // remove user role - one user
+    Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles(eve, ['user'])
+    testUser('eve', ['editor'])
+    testUser('bob', ['editor', 'user'])
+  })
+
+  it('can remove individual users from roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    Roles.removeUsersFromRoles(users.eve, ['user'], 'scope1')
+    testUser('eve', ['editor'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+  })
+
+  it('can remove individual users from roles by scope through options', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], { scope: 'scope1' })
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], { scope: 'scope2' })
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    Roles.removeUsersFromRoles(users.eve, ['user'], { scope: 'scope1' })
+    testUser('eve', ['editor'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+  })
+
+  it('can remove multiple users from roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - two users
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+
+    assert.isFalse(Roles.userIsInRole(users.joe, 'admin'))
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
+    testUser('bob', ['admin', 'user', 'editor'])
+    testUser('joe', ['admin', 'user'])
+    Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
+    testUser('bob', ['user', 'editor'])
+    testUser('joe', ['user'])
+  })
+
+  it('can remove multiple users from roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'scope1')
+    testUser('eve', ['editor'], 'scope1')
+    testUser('bob', ['editor'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'scope2')
+    testUser('eve', [], 'scope2')
+    testUser('bob', [], 'scope2')
+    testUser('joe', [], 'scope2')
+  })
+
+  it('can set user roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    var eve = Meteor.users.findOne({ _id: users.eve })
+    var bob = Meteor.users.findOne({ _id: users.bob })
+
+    Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+    testUser('joe', [])
+
+    // use addUsersToRoles add some roles
+    Roles.addUsersToRoles([bob, users.joe], ['admin'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['admin', 'editor', 'user'])
+    testUser('joe', ['admin'])
+
+    Roles.setUserRoles([eve, bob], ['user'])
+    testUser('eve', ['user'])
+    testUser('bob', ['user'])
+    testUser('joe', ['admin'])
+
+    Roles.setUserRoles(bob, 'editor')
+    testUser('eve', ['user'])
+    testUser('bob', ['editor'])
+    testUser('joe', ['admin'])
+
+    Roles.setUserRoles([users.joe, users.bob], [])
+    testUser('eve', ['user'])
+    testUser('bob', [])
+    testUser('joe', [])
+  })
+
+  it('can set user roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    var eve = Meteor.users.findOne({ _id: users.eve })
+    var bob = Meteor.users.findOne({ _id: users.bob })
+    var joe = Meteor.users.findOne({ _id: users.joe })
+
+    Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2')
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    // use addUsersToRoles add some roles
+    Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'scope1')
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'scope2')
+    testUser('eve', ['admin', 'editor', 'user'], 'scope1')
+    testUser('bob', ['admin', 'editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin', 'editor'], 'scope2')
+    testUser('joe', ['admin', 'editor'], 'scope2')
+
+    Roles.setUserRoles([eve, bob], ['user'], 'scope1')
+    Roles.setUserRoles([eve, joe], ['editor'], 'scope2')
+    testUser('eve', ['user'], 'scope1')
+    testUser('bob', ['user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+    testUser('bob', ['admin', 'editor'], 'scope2')
+    testUser('joe', ['editor'], 'scope2')
+
+    Roles.setUserRoles(bob, 'editor', 'scope1')
+    testUser('eve', ['user'], 'scope1')
+    testUser('bob', ['editor'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+    testUser('bob', ['admin', 'editor'], 'scope2')
+    testUser('joe', ['editor'], 'scope2')
+
+    assert.isTrue(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+    assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+
+    Roles.setUserRoles([bob, users.joe], [], 'scope1')
+    testUser('eve', ['user'], 'scope1')
+    testUser('bob', [], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+    testUser('bob', ['admin', 'editor'], 'scope2')
+    testUser('joe', ['editor'], 'scope2')
+
+    // When roles in a given scope are removed, we do not want any dangling database content for that scope.
+    assert.isFalse(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+    assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+  })
+
+  it('can set user roles by scope including GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+    Roles.createRole('editor')
+
+    var eve = Meteor.users.findOne({ _id: users.eve })
+
+    Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE)
+    testUser('eve', ['admin'], 'scope1')
+    testUser('eve', ['admin'])
+
+    Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_SCOPE)
+    testUser('eve', ['editor'], 'scope2')
+    testUser('eve', ['editor'])
+  })
+
+  it('can get all roles', function () {
     roles.forEach(function (role) {
-      var expected = expectedRoles.includes(role)
-      var msg = username + ' expected to have \'' + role + '\' role but does not'
-      var nmsg = username + ' had the following un-expected role: ' + role
-
-      if (expected) {
-        test.isTrue(Roles.userIsInRole(userParam, role, scope), msg)
-      } else {
-        test.isFalse(Roles.userIsInRole(userParam, role, scope), nmsg)
-      }
-    })
-  }
-
-  var deepEqual = function (x, y) {
-    if (x === y) {
-      return true
-    } else if ((typeof x === 'object' && x != null) && (typeof y === 'object' && y != null)) {
-      if (Object.keys(x).length !== Object.keys(y).length) {
-        return false
-      }
-
-      for (var prop in x) {
-        if (y.hasOwnProperty(prop)) {
-          if (!deepEqual(x[prop], y[prop])) {
-            return false
-          }
-        } else {
-          return false
-        }
-      }
-
-      return true
-    } else {
-      return false
-    }
-  }
-
-  function itemsEqual (test, actual, expected) {
-    actual = actual || []
-    expected = expected || []
-
-    function intersectionObjects (array, array2) {
-      return array.filter(function (item) {
-        return array2.some(function (item2) {
-          return deepEqual(item, item2)
-        })
-      })
-    }
-
-    if (actual.length === expected.length && intersectionObjects(actual, expected).length === actual.length) {
-      test.ok()
-    } else {
-      test.fail({
-        type: 'itemsEqual',
-        actual: JSON.stringify(actual),
-        expected: JSON.stringify(expected)
-      })
-    }
-  }
-
-  Tinytest.add(
-    'roles - can create and delete roles',
-    function (test) {
-      reset()
-
-      var role1Id = Roles.createRole('test1')
-      test.equal(Meteor.roles.findOne()._id, 'test1')
-      test.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
-
-      var role2Id = Roles.createRole('test2')
-      test.equal(Meteor.roles.findOne({ _id: 'test2' })._id, 'test2')
-      test.equal(Meteor.roles.findOne(role2Id)._id, 'test2')
-
-      test.equal(Meteor.roles.find().count(), 2)
-
-      Roles.deleteRole('test1')
-      test.equal(typeof Meteor.roles.findOne({ _id: 'test1' }), 'undefined')
-
-      Roles.deleteRole('test2')
-      test.equal(typeof Meteor.roles.findOne(), 'undefined')
+      Roles.createRole(role)
     })
 
-  Tinytest.add(
-    'roles - can\'t create duplicate roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('test1')
-      test.throws(function () { Roles.createRole('test1') })
-      test.isNull(Roles.createRole('test1', { unlessExists: true }))
-    })
-
-  Tinytest.add(
-    'roles - can\'t create role with empty names',
-    function (test) {
-      reset()
-
-      test.throws(function () {
-        Roles.createRole('')
-      }, /Invalid role name/)
-      test.throws(function () {
-        Roles.createRole(null)
-      }, /Invalid role name/)
-      test.throws(function () {
-        Roles.createRole(' ')
-      }, /Invalid role name/)
-      test.throws(function () {
-        Roles.createRole(' foobar')
-      }, /Invalid role name/)
-      test.throws(function () {
-        Roles.createRole(' foobar ')
-      }, /Invalid role name/)
-    })
-
-  Tinytest.add(
-    'roles - can\'t use invalid scope names',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-      test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], '')
-      }, /Invalid scope name/)
-      test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ')
-      }, /Invalid scope name/)
-      test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar')
-      }, /Invalid scope name/)
-      test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ')
-      }, /Invalid scope name/)
-      test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42)
-      }, /Invalid scope name/)
-    })
-
-  Tinytest.add(
-    'roles - can check if user is in role',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-
-      testUser(test, 'eve', ['admin', 'user'])
-    })
-
-  Tinytest.add(
-    'roles - can check if user is in role by scope',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'eve', ['editor'], 'scope2')
-
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
-
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], { anyScope: true }))
-      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], { anyScope: true }))
-    })
-
-  Tinytest.add(
-    'roles - can check if user is in role by scope through options',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], { scope: 'scope1' })
-      Roles.addUsersToRoles(users.eve, ['editor'], { scope: 'scope2' })
-
-      testUser(test, 'eve', ['admin', 'user'], { scope: 'scope1' })
-      testUser(test, 'eve', ['editor'], { scope: 'scope2' })
-    })
-
-  Tinytest.add(
-    'roles - can check if user is in role by scope with global role',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-      Roles.addUsersToRoles(users.eve, ['admin'])
-
-      test.isTrue(Roles.userIsInRole(users.eve, ['user'], 'scope1'))
-      test.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'scope2'))
-
-      test.isFalse(Roles.userIsInRole(users.eve, ['user']))
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-      test.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
-
-      test.isFalse(Roles.userIsInRole(users.eve, ['user'], 'scope2'))
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
-
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope2'))
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope1'))
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin']))
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
-    })
-
-  Tinytest.add(
-    'roles - renaming scopes',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'eve', ['editor'], 'scope2')
-
-      Roles.renameScope('scope1', 'scope3')
-
-      testUser(test, 'eve', ['admin', 'user'], 'scope3')
-      testUser(test, 'eve', ['editor'], 'scope2')
-
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
-
-      test.throws(function () {
-        Roles.renameScope('scope3')
-      }, /Invalid scope name/)
-
-      Roles.renameScope('scope3', null)
-
-      testUser(test, 'eve', ['admin', 'user', 'editor'], 'scope2')
-
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin']))
-      test.isTrue(Roles.userIsInRole(users.eve, ['user']))
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
-      test.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
-      test.isTrue(Roles.userIsInRole(users.eve, ['user'], null))
-
-      Roles.renameScope(null, 'scope2')
-
-      testUser(test, 'eve', ['admin', 'user', 'editor'], 'scope2')
-
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin']))
-      test.isFalse(Roles.userIsInRole(users.eve, ['user']))
-      test.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin'], null))
-      test.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
-    })
-
-  Tinytest.add(
-    'roles - removing scopes',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'eve', ['editor'], 'scope2')
-
-      Roles.removeScope('scope1')
+    // compare roles, sorted alphabetically
+    var expected = roles
+    var actual = Roles.getAllRoles().fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+
+    assert.sameMembers(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
+  })
+
+  it('can\'t get roles for non-existant user', function () {
+    assert.sameMembers(Roles.getRolesForUser('1'), [])
+    assert.sameMembers(Roles.getRolesForUser('1', 'scope1'), [])
+  })
+
+  it('can get all roles for user', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    var userId = users.eve
+    var userObj
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj), [])
+
+    Roles.addUsersToRoles(userId, ['admin', 'user'])
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId), ['admin', 'user'])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj), ['admin', 'user'])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }])
+  })
+
+  it('can get all roles for user by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    var userId = users.eve
+    var userObj
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), [])
+
+    // add roles
+    Roles.addUsersToRoles(userId, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(userId, ['admin'], 'scope2')
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope2'), ['admin'])
+    assert.sameMembers(Roles.getRolesForUser(userId), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope2'), ['admin'])
+    assert.sameMembers(Roles.getRolesForUser(userObj), [])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
+      _id: 'admin',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }])
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
+      _id: 'admin',
+      scope: 'scope2',
+      assigned: true
+    }])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
+      _id: 'admin',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'admin',
+      scope: 'scope2',
+      assigned: true
+    }])
+
+    Roles.createRole('PERMISSION')
+    Roles.addRolesToParent('PERMISSION', 'user')
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
+      _id: 'admin',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'PERMISSION',
+      scope: 'scope1',
+      assigned: false
+    }])
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
+      _id: 'admin',
+      scope: 'scope2',
+      assigned: true
+    }])
+    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
+    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
+      _id: 'admin',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'admin',
+      scope: 'scope2',
+      assigned: true
+    }, {
+      _id: 'PERMISSION',
+      scope: 'scope1',
+      assigned: false
+    }])
+    assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }), [{
+      _id: 'admin',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }])
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }), [{
+      _id: 'admin',
+      scope: 'scope2',
+      assigned: true
+    }])
+    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }), [{
+      _id: 'admin',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'admin',
+      scope: 'scope2',
+      assigned: true
+    }])
+    assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
+  })
+
+  it('can get all roles for user by scope with periods in name', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+
+    assert.sameMembers(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
+  })
+
+  it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    var userId = users.eve
+    var userObj
+
+    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
+  })
+
+  it('getRolesForUser should not return null entries if user has no roles for scope', function () {
+    Roles.createRole('editor')
+
+    var userId = users.eve
+    var userObj
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
+    assert.sameMembers(Roles.getRolesForUser(userId), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), [])
+    assert.sameMembers(Roles.getRolesForUser(userObj), [])
+
+    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['editor'])
+    assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor'])
+    assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
+  })
+
+  it('can get all scopes for user', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    var userId = users.eve
+    var userObj
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
+
+    // by userId
+    assert.sameMembers(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
+  })
+
+  it('can get all scopes for user by role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    var userId = users.eve
+    var userObj
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
+
+    // by userId
+    assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
+  })
+
+  it('getScopesForUser returns [] when not using scopes', function () {
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    var userId = users.eve
+    var userObj
+
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'])
+
+    // by userId
+    assert.sameMembers(Roles.getScopesForUser(userId), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
+  })
+
+  it('can get all groups for user by role array', function () {
+    var userId = users.eve
+    var userObj
+
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.createRole('moderator')
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
+    Roles.addUsersToRoles([users.eve], ['moderator'], 'group3')
+
+    // by userId, one role
+    assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['group2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
+
+    // by userId, multiple roles
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
+
+    // by user object, one role
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['group2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
+
+    // by user object, multiple roles
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
+  })
+
+  it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
 
-      testUser(test, 'eve', ['editor'], 'scope2')
+    var userId = users.eve
+    var userObj
 
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
-      test.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
-    })
+    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
+
+    // by userId
+    assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+  })
+
+  it('can get all users in role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
 
-  Tinytest.add(
-    'roles - can check if non-existant user is in role',
-    function (test) {
-      reset()
+    var expected = [users.eve, users.joe]
+    var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+  })
 
-      test.isFalse(Roles.userIsInRole('1', 'admin'))
-    })
+  it('can get all users in role by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
+
+    var expected = [users.eve, users.joe]
+    var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve, users.joe]
+    actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
 
-  Tinytest.add(
-    'roles - can check if null user is in role',
-    function (test) {
-      var user = null
-      reset()
+    expected = [users.eve, users.bob, users.joe]
+    actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
 
-      test.isFalse(Roles.userIsInRole(user, 'admin'))
-    })
+    actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+    assert.sameMembers(actual, [])
+  })
 
-  Tinytest.add(
-    'roles - can check user against several roles at once',
-    function (test) {
-      var user
-      reset()
+  it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
 
-      Roles.createRole('admin')
-      Roles.createRole('user')
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-      user = Meteor.users.findOne({ _id: users.eve })
+    var expected = [users.eve]
+    var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
 
-      // we can check the non-existing role
-      test.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
-    })
+    assert.sameMembers(actual, expected)
 
-  Tinytest.add(
-    'roles - can\'t add non-existent user to role',
-    function (test) {
-      reset()
+    expected = [users.eve, users.bob, users.joe]
+    actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id)
 
-      Roles.createRole('admin')
+    assert.sameMembers(actual, expected)
 
-      Roles.addUsersToRoles(['1'], ['admin'])
-      test.equal(Meteor.users.findOne({ _id: '1' }), undefined)
-    })
+    expected = [users.eve]
+    actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
 
-  Tinytest.add(
-    'roles - can\'t add user to non-existent role',
-    function (test) {
-      reset()
+    assert.sameMembers(actual, expected)
 
-      test.throws(function () {
-        Roles.addUsersToRoles(users.eve, ['admin'])
-      }, /Role 'admin' does not exist/)
-      Roles.addUsersToRoles(users.eve, ['admin'], { ifExists: true })
-    })
+    expected = [users.eve, users.bob, users.joe]
+    actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
 
-  Tinytest.add(
-    'roles - can\'t set non-existent user to role',
-    function (test) {
-      reset()
+    assert.sameMembers(actual, expected)
+  })
 
-      Roles.createRole('admin')
+  it('can get all users in role by scope and passes through mongo query arguments', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
 
-      Roles.setUserRoles(['1'], ['admin'])
-      test.equal(Meteor.users.findOne({ _id: '1' }), undefined)
-    })
+    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-  Tinytest.add(
-    'roles - can\'t set user to non-existent role',
-    function (test) {
-      reset()
+    var results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
 
-      test.throws(function () {
-        Roles.setUserRoles(users.eve, ['admin'])
-      }, /Role 'admin' does not exist/)
-      Roles.setUserRoles(users.eve, ['admin'], { ifExists: true })
-    })
+    assert.equal(1, results.length)
+    assert.isTrue(results[0].hasOwnProperty('_id'))
+    assert.isFalse(results[0].hasOwnProperty('username'))
+  })
 
-  Tinytest.add(
-    'roles - can add individual users to roles',
-    function (test) {
-      reset()
+  it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
+    Roles.createRole('admin')
 
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    testUser('eve', [], 'scope1')
+    testUser('joe', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope1')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('bob', ['admin'], 'scope1')
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
+    Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'])
+    testUser('eve', [], 'scope1')
+    testUser('joe', [], 'scope2')
+    testUser('joe', [], 'scope1')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('bob', ['admin'], 'scope1')
+  })
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', ['editor', 'user'])
-    })
+  it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
+    Roles.createRole('admin')
 
-  Tinytest.add(
-    'roles - can add individual users to roles by scope',
-    function (test) {
-      reset()
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5')
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
 
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
+    testUser('eve', [], 'scope1')
+    testUser('joe', ['admin'], 'scope5')
+    testUser('joe', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope1')
+    testUser('bob', ['admin'], 'scope5')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('bob', ['admin'], 'scope1')
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'bob', [], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
+    testUser('eve', [], 'scope1')
+    testUser('joe', ['admin'], 'scope5')
+    testUser('joe', [], 'scope2')
+    testUser('joe', [], 'scope1')
+    testUser('bob', ['admin'], 'scope5')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('bob', ['admin'], 'scope1')
+  })
 
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', [], 'scope2')
-      testUser(test, 'joe', [], 'scope2')
+  it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
+    Roles.createRole('admin')
 
-      Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'scope1')
-      Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'scope2')
+    Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'bob', [], 'scope1')
-      testUser(test, 'joe', ['editor', 'user'], 'scope1')
+    testUser('joe', ['admin'])
 
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['editor', 'user'], 'scope2')
-      testUser(test, 'joe', [], 'scope2')
-    })
+    Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
 
-  Tinytest.add(
-    'roles - can add user to roles via user object',
-    function (test) {
-      reset()
+    testUser('joe', [])
+  })
 
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
+  it('can use \'.\' in scope name', function () {
+    Roles.createRole('admin')
 
-      var eve = Meteor.users.findOne({ _id: users.eve })
-      var bob = Meteor.users.findOne({ _id: users.bob })
+    Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
+    testUser('joe', ['admin'], 'example.com')
+  })
 
-      Roles.addUsersToRoles(eve, ['admin', 'user'])
+  it('can use multiple periods in scope name', function () {
+    Roles.createRole('admin')
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
+    Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+    testUser('joe', ['admin'], 'example.k12.va.us')
+  })
 
-      Roles.addUsersToRoles(bob, ['editor'])
+  it('renaming of roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['editor'])
-      testUser(test, 'joe', [])
-    })
+    Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'scope2')
 
-  Tinytest.add(
-    'roles - can add user to roles multiple times',
-    function (test) {
-      reset()
+    assert.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
 
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
+    assert.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    assert.isTrue(Roles.userIsInRole(users.eve, 'user', 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.joe, 'user', 'scope1'))
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.joe, 'user', 'scope2'))
 
-      Roles.addUsersToRoles(users.bob, ['admin'])
-      Roles.addUsersToRoles(users.bob, ['editor'])
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
 
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'editor'])
-      testUser(test, 'joe', [])
-    })
+    Roles.renameRole('user', 'user2')
 
-  Tinytest.add(
-    'roles - can add user to roles multiple times by scope',
-    function (test) {
-      reset()
+    assert.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
 
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
+    assert.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
 
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    assert.isTrue(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.joe, 'user2', 'scope1'))
 
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'bob', [], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-
-      Roles.addUsersToRoles(users.bob, ['admin'], 'scope1')
-      Roles.addUsersToRoles(users.bob, ['editor'], 'scope1')
-
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'bob', ['admin', 'editor'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-    })
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.joe, 'user2', 'scope2'))
 
-  Tinytest.add(
-    'roles - can add multiple users to roles',
-    function (test) {
-      reset()
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
+  })
 
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
-
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'user'])
-      testUser(test, 'joe', [])
-
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
-
-      testUser(test, 'eve', ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'editor', 'user'])
-      testUser(test, 'joe', ['editor', 'user'])
-    })
-
-  Tinytest.add(
-    'roles - can add multiple users to roles by scope',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'scope1')
-
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'bob', ['admin', 'user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', [], 'scope2')
-      testUser(test, 'joe', [], 'scope2')
-
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope2')
-
-      testUser(test, 'eve', ['admin', 'user'], 'scope1')
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'scope1')
-      testUser(test, 'joe', ['editor', 'user'], 'scope1')
-
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['editor', 'user'], 'scope2')
-      testUser(test, 'joe', ['editor', 'user'], 'scope2')
-    })
-
-  Tinytest.add(
-    'roles - can remove individual users from roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-      testUser(test, 'bob', ['editor', 'user'])
-    })
-
-  Tinytest.add(
-    'roles - can remove user from roles multiple times',
-    function (test) {
-      reset()
-
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-      testUser(test, 'bob', ['editor', 'user'])
-
-      // try remove again
-      Roles.removeUsersFromRoles(users.eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-    })
-
-  Tinytest.add(
-    'roles - can remove users from roles via user object',
-    function (test) {
-      reset()
-
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      var eve = Meteor.users.findOne({ _id: users.eve })
-      var bob = Meteor.users.findOne({ _id: users.bob })
-
-      // remove user role - one user
-      Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      Roles.removeUsersFromRoles(eve, ['user'])
-      testUser(test, 'eve', ['editor'])
-      testUser(test, 'bob', ['editor', 'user'])
-    })
-
-  Tinytest.add(
-    'roles - can remove individual users from roles by scope',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
-      testUser(test, 'eve', ['editor', 'user'], 'scope1')
-      testUser(test, 'bob', ['editor', 'user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope2')
-
-      Roles.removeUsersFromRoles(users.eve, ['user'], 'scope1')
-      testUser(test, 'eve', ['editor'], 'scope1')
-      testUser(test, 'bob', ['editor', 'user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope2')
-    })
-
-  Tinytest.add(
-    'roles - can remove individual users from roles by scope through options',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], { scope: 'scope1' })
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], { scope: 'scope2' })
-      testUser(test, 'eve', ['editor', 'user'], 'scope1')
-      testUser(test, 'bob', ['editor', 'user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope2')
-
-      Roles.removeUsersFromRoles(users.eve, ['user'], { scope: 'scope1' })
-      testUser(test, 'eve', ['editor'], 'scope1')
-      testUser(test, 'bob', ['editor', 'user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope2')
-    })
-
-  Tinytest.add(
-    'roles - can remove multiple users from roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      // remove user role - two users
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin'))
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
-      testUser(test, 'bob', ['admin', 'user', 'editor'])
-      testUser(test, 'joe', ['admin', 'user'])
-      Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
-      testUser(test, 'bob', ['user', 'editor'])
-      testUser(test, 'joe', ['user'])
-    })
-
-  Tinytest.add(
-    'roles - can remove multiple users from roles by scope',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      // remove user role - one user
-      Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
-      testUser(test, 'eve', ['editor', 'user'], 'scope1')
-      testUser(test, 'bob', ['editor', 'user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope2')
-
-      Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'scope1')
-      testUser(test, 'eve', ['editor'], 'scope1')
-      testUser(test, 'bob', ['editor'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope2')
-
-      Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'scope2')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', [], 'scope2')
-      testUser(test, 'joe', [], 'scope2')
-    })
-
-  Tinytest.add(
-    'roles - can set user roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      var eve = Meteor.users.findOne({ _id: users.eve })
-      var bob = Meteor.users.findOne({ _id: users.bob })
-
-      Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['editor', 'user'])
-      testUser(test, 'joe', [])
-
-      // use addUsersToRoles add some roles
-      Roles.addUsersToRoles([bob, users.joe], ['admin'])
-      testUser(test, 'eve', ['editor', 'user'])
-      testUser(test, 'bob', ['admin', 'editor', 'user'])
-      testUser(test, 'joe', ['admin'])
-
-      Roles.setUserRoles([eve, bob], ['user'])
-      testUser(test, 'eve', ['user'])
-      testUser(test, 'bob', ['user'])
-      testUser(test, 'joe', ['admin'])
-
-      Roles.setUserRoles(bob, 'editor')
-      testUser(test, 'eve', ['user'])
-      testUser(test, 'bob', ['editor'])
-      testUser(test, 'joe', ['admin'])
-
-      Roles.setUserRoles([users.joe, users.bob], [])
-      testUser(test, 'eve', ['user'])
-      testUser(test, 'bob', [])
-      testUser(test, 'joe', [])
-    })
-
-  Tinytest.add(
-    'roles - can set user roles by scope',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      var eve = Meteor.users.findOne({ _id: users.eve })
-      var bob = Meteor.users.findOne({ _id: users.bob })
-      var joe = Meteor.users.findOne({ _id: users.joe })
-
-      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-      Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2')
-      testUser(test, 'eve', ['editor', 'user'], 'scope1')
-      testUser(test, 'bob', ['editor', 'user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope2')
-
-      // use addUsersToRoles add some roles
-      Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'scope1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'scope2')
-      testUser(test, 'eve', ['admin', 'editor', 'user'], 'scope1')
-      testUser(test, 'bob', ['admin', 'editor', 'user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', [], 'scope2')
-      testUser(test, 'bob', ['admin', 'editor'], 'scope2')
-      testUser(test, 'joe', ['admin', 'editor'], 'scope2')
-
-      Roles.setUserRoles([eve, bob], ['user'], 'scope1')
-      Roles.setUserRoles([eve, joe], ['editor'], 'scope2')
-      testUser(test, 'eve', ['user'], 'scope1')
-      testUser(test, 'bob', ['user'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', ['editor'], 'scope2')
-      testUser(test, 'bob', ['admin', 'editor'], 'scope2')
-      testUser(test, 'joe', ['editor'], 'scope2')
-
-      Roles.setUserRoles(bob, 'editor', 'scope1')
-      testUser(test, 'eve', ['user'], 'scope1')
-      testUser(test, 'bob', ['editor'], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', ['editor'], 'scope2')
-      testUser(test, 'bob', ['admin', 'editor'], 'scope2')
-      testUser(test, 'joe', ['editor'], 'scope2')
-
-      test.isTrue(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-      test.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-
-      Roles.setUserRoles([bob, users.joe], [], 'scope1')
-      testUser(test, 'eve', ['user'], 'scope1')
-      testUser(test, 'bob', [], 'scope1')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'eve', ['editor'], 'scope2')
-      testUser(test, 'bob', ['admin', 'editor'], 'scope2')
-      testUser(test, 'joe', ['editor'], 'scope2')
-
-      // When roles in a given scope are removed, we do not want any dangling database content for that scope.
-      test.isFalse(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-      test.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-    })
-
-  Tinytest.add(
-    'roles - can set user roles by scope including GLOBAL_SCOPE',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('editor')
-
-      var eve = Meteor.users.findOne({ _id: users.eve })
-
-      Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE)
-      testUser(test, 'eve', ['admin'], 'scope1')
-      testUser(test, 'eve', ['admin'])
-
-      Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_SCOPE)
-      testUser(test, 'eve', ['editor'], 'scope2')
-      testUser(test, 'eve', ['editor'])
-    })
-
-  Tinytest.add(
-    'roles - can get all roles',
-    function (test) {
-      reset()
-
-      roles.forEach(function (role) {
-        Roles.createRole(role)
-      })
-
-      // compare roles, sorted alphabetically
-      var expected = roles
-      var actual = Roles.getAllRoles().fetch().map(r => r._id)
-
-      test.equal(actual, expected)
-
-      test.equal(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
-    })
-
-  Tinytest.add(
-    'roles - can\'t get roles for non-existant user',
-    function (test) {
-      reset()
-      test.equal(Roles.getRolesForUser('1'), [])
-      test.equal(Roles.getRolesForUser('1', 'scope1'), [])
-    })
-
-  Tinytest.add(
-    'roles - can get all roles for user',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-
-      var userId = users.eve
-      var userObj
-
-      // by userId
-      test.equal(Roles.getRolesForUser(userId), [])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getRolesForUser(userObj), [])
-
-      Roles.addUsersToRoles(userId, ['admin', 'user'])
-
-      // by userId
-      test.equal(Roles.getRolesForUser(userId), ['admin', 'user'])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getRolesForUser(userObj), ['admin', 'user'])
-
-      test.equal(Roles.getRolesForUser(userId, { fullObjects: true }), [{
+  it('migration without global groups', function () {
+    assert.isOk(Meteor.roles.insert({ name: 'admin' }))
+    assert.isOk(Meteor.roles.insert({ name: 'editor' }))
+    assert.isOk(Meteor.roles.insert({ name: 'user' }))
+
+    assert.isOk(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
+    assert.isOk(Meteor.users.update(users.bob, { $set: { roles: [] } }))
+    assert.isOk(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
+
+    Roles._forwardMigrate()
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
         _id: 'admin',
         scope: null,
         assigned: true
       }, {
-        _id: 'user',
+        _id: 'editor',
         scope: null,
         assigned: true
-      }])
-    })
-
-  Tinytest.add(
-    'roles - can get all roles for user by scope',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-
-      var userId = users.eve
-      var userObj
-
-      // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), [])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), [])
-
-      // add roles
-      Roles.addUsersToRoles(userId, ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles(userId, ['admin'], 'scope2')
-
-      // by userId
-      test.equal(Roles.getRolesForUser(userId, 'scope1'), ['admin', 'user'])
-      test.equal(Roles.getRolesForUser(userId, 'scope2'), ['admin'])
-      test.equal(Roles.getRolesForUser(userId), [])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      test.equal(Roles.getRolesForUser(userObj, 'scope1'), ['admin', 'user'])
-      test.equal(Roles.getRolesForUser(userObj, 'scope2'), ['admin'])
-      test.equal(Roles.getRolesForUser(userObj), [])
-
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
-        _id: 'admin',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'scope1',
-        assigned: true
-      }])
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
-        _id: 'admin',
-        scope: 'scope2',
-        assigned: true
-      }])
-
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
-        _id: 'admin',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'admin',
-        scope: 'scope2',
-        assigned: true
-      }])
-
-      Roles.createRole('PERMISSION')
-      Roles.addRolesToParent('PERMISSION', 'user')
-
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
-        _id: 'admin',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'PERMISSION',
-        scope: 'scope1',
-        assigned: false
-      }])
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
-        _id: 'admin',
-        scope: 'scope2',
-        assigned: true
-      }])
-      itemsEqual(test, Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
-      itemsEqual(test, Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
-
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
-        _id: 'admin',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'admin',
-        scope: 'scope2',
-        assigned: true
-      }, {
-        _id: 'PERMISSION',
-        scope: 'scope1',
-        assigned: false
-      }])
-      itemsEqual(test, Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
-
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }), [{
-        _id: 'admin',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'scope1',
-        assigned: true
-      }])
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }), [{
-        _id: 'admin',
-        scope: 'scope2',
-        assigned: true
-      }])
-      itemsEqual(test, Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
-      itemsEqual(test, Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
-
-      itemsEqual(test, Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }), [{
-        _id: 'admin',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'admin',
-        scope: 'scope2',
-        assigned: true
-      }])
-      itemsEqual(test, Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
-    })
-
-  Tinytest.add(
-    'roles - can get all roles for user by scope with periods in name',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
-
-      test.equal(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
-    })
-
-  Tinytest.add(
-    'roles - can get all roles for user by scope including Roles.GLOBAL_SCOPE',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      var userId = users.eve
-      var userObj
-
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
-
-      // by userId
-      itemsEqual(test, Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user'])
-      itemsEqual(test, Roles.getRolesForUser(userId), ['editor'])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      itemsEqual(test, Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
-      itemsEqual(test, Roles.getRolesForUser(userObj), ['editor'])
-    })
-
-  Tinytest.add(
-    'roles - getRolesForUser should not return null entries if user has no roles for scope',
-    function (test) {
-      reset()
-
-      Roles.createRole('editor')
-
-      var userId = users.eve
-      var userObj
-
-      // by userId
-      itemsEqual(test, Roles.getRolesForUser(userId, 'scope1'), [])
-      itemsEqual(test, Roles.getRolesForUser(userId), [])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      itemsEqual(test, Roles.getRolesForUser(userObj, 'scope1'), [])
-      itemsEqual(test, Roles.getRolesForUser(userObj), [])
-
-      Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-
-      // by userId
-      itemsEqual(test, Roles.getRolesForUser(userId, 'scope1'), ['editor'])
-      itemsEqual(test, Roles.getRolesForUser(userId), ['editor'])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      itemsEqual(test, Roles.getRolesForUser(userObj, 'scope1'), ['editor'])
-      itemsEqual(test, Roles.getRolesForUser(userObj), ['editor'])
-    })
-
-  Tinytest.add(
-    'roles - can get all scopes for user',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      var userId = users.eve
-      var userObj
-
-      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
-
-      // by userId
-      itemsEqual(test, Roles.getScopesForUser(userId), ['scope1', 'scope2'])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      itemsEqual(test, Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
-    })
-
-  Tinytest.add(
-    'roles - can get all scopes for user by role',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      var userId = users.eve
-      var userObj
-
-      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
-
-      // by userId
-      itemsEqual(test, Roles.getScopesForUser(userId, 'user'), ['scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, 'admin'), [])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      itemsEqual(test, Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, 'admin'), [])
-    })
-
-  Tinytest.add(
-    'roles - getScopesForUser returns [] when not using scopes',
-    function (test) {
-      reset()
-
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      var userId = users.eve
-      var userObj
-
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'])
-
-      // by userId
-      itemsEqual(test, Roles.getScopesForUser(userId), [])
-      itemsEqual(test, Roles.getScopesForUser(userId, 'editor'), [])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['editor']), [])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['editor', 'user']), [])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      itemsEqual(test, Roles.getScopesForUser(userObj), [])
-      itemsEqual(test, Roles.getScopesForUser(userObj, 'editor'), [])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor']), [])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor', 'user']), [])
-    })
-
-  Tinytest.add(
-    'roles - can get all groups for user by role array',
-    function (test) {
-      reset()
-
-      var userId = users.eve
-      var userObj
-
-      Roles.createRole('user')
-      Roles.createRole('editor')
-      Roles.createRole('moderator')
-      Roles.createRole('admin')
-
-      Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
-      Roles.addUsersToRoles([users.eve], ['moderator'], 'group3')
-
-      // by userId, one role
-      itemsEqual(test, Roles.getScopesForUser(userId, ['user']), ['group2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['admin']), [])
-
-      // by userId, multiple roles
-      itemsEqual(test, Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
-
-      // by user object, one role
-      userObj = Meteor.users.findOne({ _id: userId })
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['user']), ['group2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['admin']), [])
-
-      // by user object, multiple roles
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
-    })
-
-  Tinytest.add(
-    'roles - getting all scopes for user does not include GLOBAL_SCOPE',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      var userId = users.eve
-      var userObj
-
-      Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-      Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
-      Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
-
-      // by userId
-      itemsEqual(test, Roles.getScopesForUser(userId, 'user'), ['scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, 'admin'), [])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['user']), ['scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['admin']), [])
-      itemsEqual(test, Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-
-      // by user object
-      userObj = Meteor.users.findOne({ _id: userId })
-      itemsEqual(test, Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, 'admin'), [])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['user']), ['scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['admin']), [])
-      itemsEqual(test, Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-    })
-
-  Tinytest.add(
-    'roles - can get all users in role',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
-      Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
-
-      var expected = [users.eve, users.joe]
-      var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-
-      itemsEqual(test, actual, expected)
-    })
-
-  Tinytest.add(
-    'roles - can get all users in role by scope',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-      var expected = [users.eve, users.joe]
-      var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
-
-      itemsEqual(test, actual, expected)
-
-      expected = [users.eve, users.joe]
-      actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
-      itemsEqual(test, actual, expected)
-
-      expected = [users.eve, users.bob, users.joe]
-      actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
-      itemsEqual(test, actual, expected)
-
-      actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-      itemsEqual(test, actual, [])
-    })
-
-  Tinytest.add(
-    'roles - can get all users in role by scope including Roles.GLOBAL_SCOPE',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-
-      Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-      var expected = [users.eve]
-      var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
-
-      itemsEqual(test, actual, expected)
-
-      expected = [users.eve, users.bob, users.joe]
-      actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id)
-
-      itemsEqual(test, actual, expected)
-
-      expected = [users.eve]
-      actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-
-      itemsEqual(test, actual, expected)
-
-      expected = [users.eve, users.bob, users.joe]
-      actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
-
-      itemsEqual(test, actual, expected)
-    })
-
-  Tinytest.add(
-    'roles - can get all users in role by scope and passes through mongo query arguments',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-
-      Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
-      Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-      var results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
-
-      test.equal(1, results.length)
-      test.isTrue(results[0].hasOwnProperty('_id'))
-      test.isFalse(results[0].hasOwnProperty('username'))
-    })
-
-  Tinytest.add(
-    'roles - can use Roles.GLOBAL_SCOPE to assign blanket roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
-
-      testUser(test, 'eve', [], 'scope1')
-      testUser(test, 'joe', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope1')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope1')
-
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
-
-      testUser(test, 'eve', [], 'scope1')
-      testUser(test, 'joe', [], 'scope2')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope1')
-    })
-
-  Tinytest.add(
-    'roles - Roles.GLOBAL_SCOPE is independent of other scopes',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5')
-      Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
-
-      testUser(test, 'eve', [], 'scope1')
-      testUser(test, 'joe', ['admin'], 'scope5')
-      testUser(test, 'joe', ['admin'], 'scope2')
-      testUser(test, 'joe', ['admin'], 'scope1')
-      testUser(test, 'bob', ['admin'], 'scope5')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope1')
-
-      Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
-
-      testUser(test, 'eve', [], 'scope1')
-      testUser(test, 'joe', ['admin'], 'scope5')
-      testUser(test, 'joe', [], 'scope2')
-      testUser(test, 'joe', [], 'scope1')
-      testUser(test, 'bob', ['admin'], 'scope5')
-      testUser(test, 'bob', ['admin'], 'scope2')
-      testUser(test, 'bob', ['admin'], 'scope1')
-    })
-
-  Tinytest.add(
-    'roles - Roles.GLOBAL_SCOPE also checked when scope not specified',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-
-      Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
-
-      testUser(test, 'joe', ['admin'])
-
-      Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
-
-      testUser(test, 'joe', [])
-    })
-
-  Tinytest.add(
-    'roles - can use \'.\' in scope name',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
-      testUser(test, 'joe', ['admin'], 'example.com')
-    })
-
-  Tinytest.add(
-    'roles - can use multiple periods in scope name',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-
-      Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
-      testUser(test, 'joe', ['admin'], 'example.k12.va.us')
-    })
-
-  Tinytest.add(
-    'roles - renaming of roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-
-      Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-      Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'scope2')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
-
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
-      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'user', 'scope1'))
-      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope1'))
-      test.isFalse(Roles.userIsInRole(users.joe, 'user', 'scope1'))
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
-      test.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope2'))
-      test.isTrue(Roles.userIsInRole(users.joe, 'user', 'scope2'))
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
-
-      Roles.renameRole('user', 'user2')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
-
-      test.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
-      test.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
-      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope1'))
-      test.isFalse(Roles.userIsInRole(users.joe, 'user2', 'scope1'))
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
-      test.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope2'))
-      test.isTrue(Roles.userIsInRole(users.joe, 'user2', 'scope2'))
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope1'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
-    })
-
-  Tinytest.add(
-    'roles - migration without global groups',
-    function (test) {
-      reset()
-
-      test.isTrue(Meteor.roles.insert({ name: 'admin' }))
-      test.isTrue(Meteor.roles.insert({ name: 'editor' }))
-      test.isTrue(Meteor.roles.insert({ name: 'user' }))
-
-      test.isTrue(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
-      test.isTrue(Meteor.users.update(users.bob, { $set: { roles: [] } }))
-      test.isTrue(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
-
-      Roles._forwardMigrate()
-
-      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'admin',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'editor',
-          scope: null,
-          assigned: true
-        }]
-      })
-      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: []
-      })
-      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'user',
-          scope: null,
-          assigned: true
-        }]
-      })
-
-      test.equal(Meteor.roles.findOne({ _id: 'admin' }), {
-        _id: 'admin',
-        children: []
-      })
-      test.equal(Meteor.roles.findOne({ _id: 'editor' }), {
-        _id: 'editor',
-        children: []
-      })
-      test.equal(Meteor.roles.findOne({ _id: 'user' }), {
-        _id: 'user',
-        children: []
-      })
-
-      Roles._backwardMigrate(null, null, false)
-
-      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: ['admin', 'editor']
-      })
-      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: []
-      })
-      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: ['user']
-      })
-
-      test.equal(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-        name: 'admin'
-      })
-      test.equal(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-        name: 'editor'
-      })
-      test.equal(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-        name: 'user'
-      })
-    })
-
-  Tinytest.add(
-    'roles - migration with global groups',
-    function (test) {
-      reset()
-
-      test.isTrue(Meteor.roles.insert({ name: 'admin' }))
-      test.isTrue(Meteor.roles.insert({ name: 'editor' }))
-      test.isTrue(Meteor.roles.insert({ name: 'user' }))
-
-      test.isTrue(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
-      test.isTrue(Meteor.users.update(users.bob, { $set: { roles: { } } }))
-      test.isTrue(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
-
-      Roles._forwardMigrate(null, null, false)
-
-      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'admin',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'editor',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'user',
-          scope: 'foo_bla',
-          assigned: true
-        }]
-      })
-      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: []
-      })
-      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'user',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'user',
-          scope: 'foo_bla',
-          assigned: true
-        }]
-      })
-
-      test.equal(Meteor.roles.findOne({ _id: 'admin' }), {
-        _id: 'admin',
-        children: []
-      })
-      test.equal(Meteor.roles.findOne({ _id: 'editor' }), {
-        _id: 'editor',
-        children: []
-      })
-      test.equal(Meteor.roles.findOne({ _id: 'user' }), {
-        _id: 'user',
-        children: []
-      })
-
-      Roles._backwardMigrate(null, null, true)
-
-      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: {
-          __global_roles__: ['admin', 'editor'],
-          foo_bla: ['user']
-        }
-      })
-      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: {}
-      })
-      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: {
-          __global_roles__: ['user'],
-          foo_bla: ['user']
-        }
-      })
-
-      test.equal(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-        name: 'admin'
-      })
-      test.equal(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-        name: 'editor'
-      })
-      test.equal(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-        name: 'user'
-      })
-
-      Roles._forwardMigrate(null, null, true)
-
-      test.equal(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'admin',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'editor',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'user',
-          scope: 'foo.bla',
-          assigned: true
-        }]
-      })
-      test.equal(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: []
-      })
-      test.equal(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'user',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'user',
-          scope: 'foo.bla',
-          assigned: true
-        }]
-      })
-
-      test.equal(Meteor.roles.findOne({ _id: 'admin' }), {
-        _id: 'admin',
-        children: []
-      })
-      test.equal(Meteor.roles.findOne({ _id: 'editor' }), {
-        _id: 'editor',
-        children: []
-      })
-      test.equal(Meteor.roles.findOne({ _id: 'user' }), {
-        _id: 'user',
-        children: []
-      })
-    })
-
-  Tinytest.add(
-    'roles - _assureConsistency',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('ALL_PERMISSIONS')
-      Roles.createRole('VIEW_PERMISSION')
-      Roles.createRole('EDIT_PERMISSION')
-      Roles.createRole('DELETE_PERMISSION')
-      Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-      Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-
-      Roles.addUsersToRoles(users.eve, ['user'], 'scope1')
-      Roles.addUsersToRoles(users.eve, ['user'], 'scope2')
-
-      var correctRoles = [{
-        _id: 'user',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope1',
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope1',
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: 'scope1',
-        assigned: false
-      }, {
-        _id: 'user',
-        scope: 'scope2',
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope2',
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope2',
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: 'scope2',
-        assigned: false
       }]
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
-
-      // let's remove all automatically assigned roles
-      // _assureConsistency should recreate those roles
-      Meteor.users.update(users.eve, { $pull: { roles: { assigned: false } } })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: []
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
         _id: 'user',
-        scope: 'scope1',
+        scope: null,
         assigned: true
-      }, {
-        _id: 'user',
-        scope: 'scope2',
-        assigned: true
-      }])
-
-      Roles._assureConsistency(users.eve)
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
-
-      // add an extra role, faking that it is automatically assigned
-      // _assureConsistency should remove this extra role
-      Meteor.users.update(users.eve, { $push: { roles: { _id: 'DELETE_PERMISSION', scope: null, assigned: false } } })
-
-      Roles._assureConsistency(users.eve)
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
-
-      // remove a role, _assureConsistency should remove it from the user
-      Meteor.roles.remove({ _id: 'VIEW_PERMISSION' })
-
-      Roles._assureConsistency(users.eve)
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: 'scope1',
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope1',
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope1',
-        assigned: false
-      }, {
-        _id: 'user',
-        scope: 'scope2',
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope2',
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope2',
-        assigned: false
-      }])
+      }]
     })
 
-  Tinytest.add(
-    'roles - _addUserToRole',
-    function (test) {
-      reset()
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+      _id: 'admin',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+      _id: 'editor',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+      _id: 'user',
+      children: []
+    })
 
+    Roles._backwardMigrate(null, null, false)
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: ['admin', 'editor']
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: []
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: ['user']
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
+      name: 'admin'
+    })
+    assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
+      name: 'editor'
+    })
+    assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
+      name: 'user'
+    })
+  })
+
+  it('migration with global groups', function () {
+    assert.isOk(Meteor.roles.insert({ name: 'admin' }))
+    assert.isOk(Meteor.roles.insert({ name: 'editor' }))
+    assert.isOk(Meteor.roles.insert({ name: 'user' }))
+
+    assert.isOk(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
+    assert.isOk(Meteor.users.update(users.bob, { $set: { roles: { } } }))
+    assert.isOk(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
+
+    Roles._forwardMigrate(null, null, false)
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'admin',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'editor',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'user',
+        scope: 'foo_bla',
+        assigned: true
+      }]
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: []
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'user',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'user',
+        scope: 'foo_bla',
+        assigned: true
+      }]
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+      _id: 'admin',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+      _id: 'editor',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+      _id: 'user',
+      children: []
+    })
+
+    Roles._backwardMigrate(null, null, true)
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: {
+        __global_roles__: ['admin', 'editor'],
+        foo_bla: ['user']
+      }
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: {}
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: {
+        __global_roles__: ['user'],
+        foo_bla: ['user']
+      }
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
+      name: 'admin'
+    })
+    assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
+      name: 'editor'
+    })
+    assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
+      name: 'user'
+    })
+
+    Roles._forwardMigrate(null, null, true)
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'admin',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'editor',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'user',
+        scope: 'foo.bla',
+        assigned: true
+      }]
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: []
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'user',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'user',
+        scope: 'foo.bla',
+        assigned: true
+      }]
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+      _id: 'admin',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+      _id: 'editor',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+      _id: 'user',
+      children: []
+    })
+  })
+
+  it('_assureConsistency', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('ALL_PERMISSIONS')
+    Roles.createRole('VIEW_PERMISSION')
+    Roles.createRole('EDIT_PERMISSION')
+    Roles.createRole('DELETE_PERMISSION')
+    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['user'], 'scope2')
+
+    var correctRoles = [{
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope1',
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope1',
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: 'scope1',
+      assigned: false
+    }, {
+      _id: 'user',
+      scope: 'scope2',
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope2',
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope2',
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: 'scope2',
+      assigned: false
+    }]
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
+
+    // let's remove all automatically assigned roles
+    // _assureConsistency should recreate those roles
+    Meteor.users.update(users.eve, { $pull: { roles: { assigned: false } } })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'user',
+      scope: 'scope2',
+      assigned: true
+    }])
+
+    Roles._assureConsistency(users.eve)
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
+
+    // add an extra role, faking that it is automatically assigned
+    // _assureConsistency should remove this extra role
+    Meteor.users.update(users.eve, { $push: { roles: { _id: 'DELETE_PERMISSION', scope: null, assigned: false } } })
+
+    Roles._assureConsistency(users.eve)
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
+
+    // remove a role, _assureConsistency should remove it from the user
+    Meteor.roles.remove({ _id: 'VIEW_PERMISSION' })
+
+    Roles._assureConsistency(users.eve)
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: 'scope1',
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope1',
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope1',
+      assigned: false
+    }, {
+      _id: 'user',
+      scope: 'scope2',
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope2',
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope2',
+      assigned: false
+    }])
+  })
+
+  it('_addUserToRole', function () {
+    Roles.createRole('admin')
+
+    // add role with assigned set to true
+    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: true })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }])
+
+    // change assigned to false
+    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: false })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: false
+    }])
+
+    Roles.setUserRoles(users.eve, [])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+
+    // add role with assigned set to false
+    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: null })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: false
+    }])
+
+    // change assigned to true
+    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: true })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }])
+
+    // do not change assigned
+    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: null })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }])
+  })
+
+  it('_removeUserFromRole', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(users.eve, 'admin')
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }])
+
+    // remove only roles with assigned set to false, thus do not remove anything
+    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: false })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }])
+
+    // remove only roles with assigned set to true
+    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: true })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+
+    Roles.addUsersToRoles(users.eve, 'admin')
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }])
+
+    // remove roles no matter the assignment
+    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: null })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+
+    Roles.addUsersToRoles(users.eve, 'admin', { _assigned: false })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: false
+    }])
+
+    // remove only roles with assigned set to true, thus do not remove anything
+    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: true })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'admin',
+      scope: null,
+      assigned: false
+    }])
+
+    // remove only roles with assigned set to false
+    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: false })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+  })
+
+  it('keep assigned roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('ALL_PERMISSIONS')
+    Roles.createRole('VIEW_PERMISSION')
+    Roles.createRole('EDIT_PERMISSION')
+    Roles.createRole('DELETE_PERMISSION')
+    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['user'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: null,
+      assigned: false
+    }])
+
+    Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+
+    Roles.removeUsersFromRoles(users.eve, 'user')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'VIEW_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+
+    Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+  })
+
+  it('modify assigned hierarchical roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('ALL_PERMISSIONS')
+    Roles.createRole('VIEW_PERMISSION')
+    Roles.createRole('EDIT_PERMISSION')
+    Roles.createRole('DELETE_PERMISSION')
+    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['user'])
+    Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'scope')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope',
+      assigned: true
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }])
+
+    Roles.createRole('MODERATE_PERMISSION')
+
+    Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope',
+      assigned: true
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'MODERATE_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'MODERATE_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }])
+
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope',
+      assigned: true
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'MODERATE_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'MODERATE_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'DELETE_PERMISSION',
+      scope: null,
+      assigned: false
+    }])
+
+    Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope',
+      assigned: true
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'MODERATE_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'MODERATE_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'admin',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'DELETE_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'DELETE_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }])
+
+    Roles.removeUsersFromRoles(users.eve, ['admin'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'ALL_PERMISSIONS',
+      scope: 'scope',
+      assigned: true
+    }, {
+      _id: 'EDIT_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'VIEW_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'MODERATE_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'MODERATE_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }, {
+      _id: 'DELETE_PERMISSION',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'DELETE_PERMISSION',
+      scope: 'scope',
+      assigned: false
+    }])
+
+    Roles.deleteRole('ALL_PERMISSIONS')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'user',
+      scope: null,
+      assigned: true
+    }])
+  })
+
+  it('delete role with overlapping hierarchical roles', function () {
+    Roles.createRole('role1')
+    Roles.createRole('role2')
+    Roles.createRole('COMMON_PERMISSION_1')
+    Roles.createRole('COMMON_PERMISSION_2')
+    Roles.createRole('COMMON_PERMISSION_3')
+    Roles.createRole('EXTRA_PERMISSION_ROLE_1')
+    Roles.createRole('EXTRA_PERMISSION_ROLE_2')
+
+    Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1')
+    Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1')
+    Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1')
+    Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1')
+
+    Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2')
+    Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2')
+    Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2')
+    Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2')
+
+    Roles.addUsersToRoles(users.eve, 'role1')
+    Roles.addUsersToRoles(users.eve, 'role2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'role1',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'role2',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'COMMON_PERMISSION_1',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'COMMON_PERMISSION_2',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'COMMON_PERMISSION_3',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EXTRA_PERMISSION_ROLE_1',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EXTRA_PERMISSION_ROLE_2',
+      scope: null,
+      assigned: false
+    }])
+
+    Roles.removeUsersFromRoles(users.eve, 'role2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'role1',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'COMMON_PERMISSION_1',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'COMMON_PERMISSION_2',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'COMMON_PERMISSION_3',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EXTRA_PERMISSION_ROLE_1',
+      scope: null,
+      assigned: false
+    }])
+
+    Roles.addUsersToRoles(users.eve, 'role2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'role1',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'role2',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'COMMON_PERMISSION_1',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'COMMON_PERMISSION_2',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'COMMON_PERMISSION_3',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EXTRA_PERMISSION_ROLE_1',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EXTRA_PERMISSION_ROLE_2',
+      scope: null,
+      assigned: false
+    }])
+
+    Roles.deleteRole('role2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'role1',
+      scope: null,
+      assigned: true
+    }, {
+      _id: 'COMMON_PERMISSION_1',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'COMMON_PERMISSION_2',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'COMMON_PERMISSION_3',
+      scope: null,
+      assigned: false
+    }, {
+      _id: 'EXTRA_PERMISSION_ROLE_1',
+      scope: null,
+      assigned: false
+    }])
+  })
+
+  it('set parent on assigned role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('EDIT_PERMISSION')
+
+    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+
+    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+  })
+
+  it('remove parent on assigned role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('EDIT_PERMISSION')
+
+    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+
+    Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+  })
+
+  it('adding and removing extra role parents', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('EDIT_PERMISSION')
+
+    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+
+    Roles.addRolesToParent('EDIT_PERMISSION', 'user')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+
+    Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
+      _id: 'EDIT_PERMISSION',
+      scope: null,
+      assigned: true
+    }])
+  })
+
+  it('cyclic roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('editor')
+    Roles.createRole('user')
+
+    Roles.addRolesToParent('editor', 'admin')
+    Roles.addRolesToParent('user', 'editor')
+
+    assert.throws(function () {
+      Roles.addRolesToParent('admin', 'user')
+    }, /form a cycle/)
+  })
+
+  it('userIsInRole returns false for unknown roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    Roles.addUsersToRoles(users.eve, ['editor'])
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'unknown'))
+    assert.isFalse(Roles.userIsInRole(users.eve, []))
+    assert.isFalse(Roles.userIsInRole(users.eve, null))
+    assert.isFalse(Roles.userIsInRole(users.eve, undefined))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'unknown', { anyScope: true }))
+    assert.isFalse(Roles.userIsInRole(users.eve, [], { anyScope: true }))
+    assert.isFalse(Roles.userIsInRole(users.eve, null, { anyScope: true }))
+    assert.isFalse(Roles.userIsInRole(users.eve, undefined, { anyScope: true }))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
+  })
+
+  describe('isParentOf', function () {
+    it('returns false for unknown roles', function () {
       Roles.createRole('admin')
 
-      // add role with assigned set to true
-      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: true })
+      assert.isFalse(Roles.isParentOf('admin', 'unknown'))
+      assert.isFalse(Roles.isParentOf('admin', null))
+      assert.isFalse(Roles.isParentOf('admin', undefined))
 
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }])
-
-      // change assigned to false
-      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: false })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: false
-      }])
-
-      Roles.setUserRoles(users.eve, [])
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
-
-      // add role with assigned set to false
-      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: null })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: false
-      }])
-
-      // change assigned to true
-      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: true })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }])
-
-      // do not change assigned
-      Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: null })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }])
+      assert.isFalse(Roles.isParentOf('unknown', 'admin'))
+      assert.isFalse(Roles.isParentOf(null, 'admin'))
+      assert.isFalse(Roles.isParentOf(undefined, 'admin'))
     })
 
-  Tinytest.add(
-    'roles - _removeUserFromRole',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-
-      Roles.addUsersToRoles(users.eve, 'admin')
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }])
-
-      // remove only roles with assigned set to false, thus do not remove anything
-      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: false })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }])
-
-      // remove only roles with assigned set to true
-      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: true })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
-
-      Roles.addUsersToRoles(users.eve, 'admin')
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }])
-
-      // remove roles no matter the assignment
-      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: null })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
-
-      Roles.addUsersToRoles(users.eve, 'admin', { _assigned: false })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: false
-      }])
-
-      // remove only roles with assigned set to true, thus do not remove anything
-      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: true })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'admin',
-        scope: null,
-        assigned: false
-      }])
-
-      // remove only roles with assigned set to false
-      Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: false })
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
-    })
-
-  Tinytest.add(
-    'roles - keep assigned roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('ALL_PERMISSIONS')
-      Roles.createRole('VIEW_PERMISSION')
-      Roles.createRole('EDIT_PERMISSION')
-      Roles.createRole('DELETE_PERMISSION')
-      Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-      Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-
-      Roles.addUsersToRoles(users.eve, ['user'])
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: null,
-        assigned: false
-      }])
-
-      Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-
-      Roles.removeUsersFromRoles(users.eve, 'user')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'VIEW_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-
-      Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION')
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
-    })
-
-  Tinytest.add(
-    'roles - modify assigned hierarchical roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('ALL_PERMISSIONS')
-      Roles.createRole('VIEW_PERMISSION')
-      Roles.createRole('EDIT_PERMISSION')
-      Roles.createRole('DELETE_PERMISSION')
-      Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-      Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-      Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-      Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-
-      Roles.addUsersToRoles(users.eve, ['user'])
-      Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'scope')
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope',
-        assigned: true
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }])
-
-      Roles.createRole('MODERATE_PERMISSION')
-
-      Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope',
-        assigned: true
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'MODERATE_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'MODERATE_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }])
-
-      Roles.addUsersToRoles(users.eve, ['admin'])
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope',
-        assigned: true
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'MODERATE_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'MODERATE_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'DELETE_PERMISSION',
-        scope: null,
-        assigned: false
-      }])
-
-      Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope',
-        assigned: true
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'MODERATE_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'MODERATE_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'DELETE_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'DELETE_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }])
-
-      Roles.removeUsersFromRoles(users.eve, ['admin'])
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'ALL_PERMISSIONS',
-        scope: 'scope',
-        assigned: true
-      }, {
-        _id: 'EDIT_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'VIEW_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'MODERATE_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'MODERATE_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }, {
-        _id: 'DELETE_PERMISSION',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'DELETE_PERMISSION',
-        scope: 'scope',
-        assigned: false
-      }])
-
-      Roles.deleteRole('ALL_PERMISSIONS')
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }])
-    })
-
-  Tinytest.add(
-    'roles - delete role with overlapping hierarchical roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('role1')
-      Roles.createRole('role2')
-      Roles.createRole('COMMON_PERMISSION_1')
-      Roles.createRole('COMMON_PERMISSION_2')
-      Roles.createRole('COMMON_PERMISSION_3')
-      Roles.createRole('EXTRA_PERMISSION_ROLE_1')
-      Roles.createRole('EXTRA_PERMISSION_ROLE_2')
-
-      Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1')
-      Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1')
-      Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1')
-      Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1')
-
-      Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2')
-      Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2')
-      Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2')
-      Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2')
-
-      Roles.addUsersToRoles(users.eve, 'role1')
-      Roles.addUsersToRoles(users.eve, 'role2')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'role1',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'role2',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'COMMON_PERMISSION_1',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'COMMON_PERMISSION_2',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'COMMON_PERMISSION_3',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EXTRA_PERMISSION_ROLE_1',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EXTRA_PERMISSION_ROLE_2',
-        scope: null,
-        assigned: false
-      }])
-
-      Roles.removeUsersFromRoles(users.eve, 'role2')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'role1',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'COMMON_PERMISSION_1',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'COMMON_PERMISSION_2',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'COMMON_PERMISSION_3',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EXTRA_PERMISSION_ROLE_1',
-        scope: null,
-        assigned: false
-      }])
-
-      Roles.addUsersToRoles(users.eve, 'role2')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'role1',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'role2',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'COMMON_PERMISSION_1',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'COMMON_PERMISSION_2',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'COMMON_PERMISSION_3',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EXTRA_PERMISSION_ROLE_1',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EXTRA_PERMISSION_ROLE_2',
-        scope: null,
-        assigned: false
-      }])
-
-      Roles.deleteRole('role2')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-      test.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'role1',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'COMMON_PERMISSION_1',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'COMMON_PERMISSION_2',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'COMMON_PERMISSION_3',
-        scope: null,
-        assigned: false
-      }, {
-        _id: 'EXTRA_PERMISSION_ROLE_1',
-        scope: null,
-        assigned: false
-      }])
-    })
-
-  Tinytest.add(
-    'roles - set parent on assigned role',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('EDIT_PERMISSION')
-
-      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-
-      Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-    })
-
-  Tinytest.add(
-    'roles - remove parent on assigned role',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('EDIT_PERMISSION')
-
-      Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-
-      Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-    })
-
-  Tinytest.add(
-    'roles - adding and removing extra role parents',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('EDIT_PERMISSION')
-
-      Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-      Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-
-      Roles.addRolesToParent('EDIT_PERMISSION', 'user')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-
-      Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
-
-      test.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-      test.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-      itemsEqual(test, Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-        _id: 'EDIT_PERMISSION',
-        scope: null,
-        assigned: true
-      }])
-    })
-
-  Tinytest.add(
-    'roles - cyclic roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('editor')
-      Roles.createRole('user')
-
-      Roles.addRolesToParent('editor', 'admin')
-      Roles.addRolesToParent('user', 'editor')
-
-      test.throws(function () {
-        Roles.addRolesToParent('admin', 'user')
-      }, /form a cycle/)
-    })
-
-  Tinytest.add(
-    'roles - userIsInRole returns false for unknown roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-      Roles.createRole('user')
-      Roles.createRole('editor')
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-      Roles.addUsersToRoles(users.eve, ['editor'])
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'unknown'))
-      test.isFalse(Roles.userIsInRole(users.eve, []))
-      test.isFalse(Roles.userIsInRole(users.eve, null))
-      test.isFalse(Roles.userIsInRole(users.eve, undefined))
-
-      test.isFalse(Roles.userIsInRole(users.eve, 'unknown', { anyScope: true }))
-      test.isFalse(Roles.userIsInRole(users.eve, [], { anyScope: true }))
-      test.isFalse(Roles.userIsInRole(users.eve, null, { anyScope: true }))
-      test.isFalse(Roles.userIsInRole(users.eve, undefined, { anyScope: true }))
-
-      test.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
-    })
-
-  Tinytest.add(
-    'roles - isParentOf - returns false for unknown roles',
-    function (test) {
-      reset()
-
-      Roles.createRole('admin')
-
-      test.isFalse(Roles.isParentOf('admin', 'unknown'))
-      test.isFalse(Roles.isParentOf('admin', null))
-      test.isFalse(Roles.isParentOf('admin', undefined))
-
-      test.isFalse(Roles.isParentOf('unknown', 'admin'))
-      test.isFalse(Roles.isParentOf(null, 'admin'))
-      test.isFalse(Roles.isParentOf(undefined, 'admin'))
-    })
-
-  Tinytest.add(
-    'roles - isParentOf - returns false if role is not parent of',
-    function (test) {
-      reset()
-
+    it('returns false if role is not parent of', function () {
       Roles.createRole('admin')
       Roles.createRole('editor')
       Roles.createRole('user')
       Roles.addRolesToParent(['editor'], 'admin')
       Roles.addRolesToParent(['user'], 'editor')
 
-      test.isFalse(Roles.isParentOf('user', 'admin'))
-      test.isFalse(Roles.isParentOf('editor', 'admin'))
+      assert.isFalse(Roles.isParentOf('user', 'admin'))
+      assert.isFalse(Roles.isParentOf('editor', 'admin'))
     })
 
-  Tinytest.add(
-    'roles - isParentOf - returns true if role is parent of the demanded role',
-    function (test) {
-      reset()
-
+    it('returns true if role is parent of the demanded role', function () {
       Roles.createRole('admin')
       Roles.createRole('editor')
       Roles.createRole('user')
       Roles.addRolesToParent(['editor'], 'admin')
       Roles.addRolesToParent(['user'], 'editor')
 
-      test.isTrue(Roles.isParentOf('admin', 'user'))
-      test.isTrue(Roles.isParentOf('editor', 'user'))
-      test.isTrue(Roles.isParentOf('admin', 'editor'))
+      assert.isTrue(Roles.isParentOf('admin', 'user'))
+      assert.isTrue(Roles.isParentOf('editor', 'user'))
+      assert.isTrue(Roles.isParentOf('admin', 'editor'))
 
-      test.isTrue(Roles.isParentOf('admin', 'admin'))
-      test.isTrue(Roles.isParentOf('editor', 'editor'))
-      test.isTrue(Roles.isParentOf('user', 'user'))
+      assert.isTrue(Roles.isParentOf('admin', 'admin'))
+      assert.isTrue(Roles.isParentOf('editor', 'editor'))
+      assert.isTrue(Roles.isParentOf('user', 'user'))
     })
-}())
+  })
+})

From a27e1fad622dcc3d1c06ede204d0e676d00ae5a1 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Sun, 27 Jan 2019 21:48:00 +0400
Subject: [PATCH 0282/1140] Added code coverage

---
 .coverage.json        |   6 ++
 .gitignore            |   3 +-
 package-lock.json     | 181 ++++++++++++++++++++++++++++++++++++++++++
 package.js            |   3 +
 package.json          |   7 ++
 roles/tests/client.js |   3 +
 roles/tests/server.js |   4 +
 7 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 .coverage.json

diff --git a/.coverage.json b/.coverage.json
new file mode 100644
index 0000000000..918fc8889e
--- /dev/null
+++ b/.coverage.json
@@ -0,0 +1,6 @@
+{
+  "include": [
+    "**/packages/roles/**/*",
+    "**/packages/*alanning_roles.js"
+  ]
+}
diff --git a/.gitignore b/.gitignore
index 6de5788440..11e07b25f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ smart.lock
 .idea
 docs/
 node_modules/
-.npm/
\ No newline at end of file
+.npm/
+someapp/
diff --git a/package-lock.json b/package-lock.json
index b3398248ca..3210182fa1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,6 +2,11 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
+    "abbrev": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
+    },
     "accepts": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
@@ -37,6 +42,12 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
       "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
     },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "optional": true
+    },
     "ansi-escapes": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
@@ -260,6 +271,12 @@
         "delayed-stream": "0.0.5"
       }
     },
+    "commander": {
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "optional": true
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -447,6 +464,30 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
+    "escodegen": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "requires": {
+        "esprima": "^2.7.1",
+        "estraverse": "^1.9.1",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.2.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+        },
+        "estraverse": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q="
+        }
+      }
+    },
     "eslint": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz",
@@ -869,6 +910,32 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
       "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
     },
+    "handlebars": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
+      "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
+      "requires": {
+        "async": "^2.5.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+          "requires": {
+            "lodash": "^4.17.10"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -1058,6 +1125,69 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
+    "istanbul": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+      "requires": {
+        "abbrev": "1.0.x",
+        "async": "1.x",
+        "escodegen": "1.8.x",
+        "esprima": "2.7.x",
+        "glob": "^5.0.15",
+        "handlebars": "^4.0.1",
+        "js-yaml": "3.x",
+        "mkdirp": "0.5.x",
+        "nopt": "3.x",
+        "once": "1.x",
+        "resolve": "1.1.x",
+        "supports-color": "^3.1.0",
+        "which": "^1.1.1",
+        "wordwrap": "^1.0.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+        },
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+        },
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -1262,6 +1392,14 @@
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
       "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
     },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "requires": {
+        "abbrev": "1"
+      }
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -1329,6 +1467,22 @@
         "mimic-fn": "^1.0.0"
       }
     },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+        }
+      }
+    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -1751,6 +1905,15 @@
         "hoek": "0.9.x"
       }
     },
+    "source-map": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+      "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+      "optional": true,
+      "requires": {
+        "amdefine": ">=0.0.4"
+      }
+    },
     "spdx-correct": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
@@ -1961,6 +2124,24 @@
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
       "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="
     },
+    "uglify-js": {
+      "version": "3.4.9",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
+      "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+      "optional": true,
+      "requires": {
+        "commander": "~2.17.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "optional": true
+        }
+      }
+    },
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
diff --git a/package.js b/package.js
index 1a8142084f..fce3a5c331 100644
--- a/package.js
+++ b/package.js
@@ -34,7 +34,10 @@ Package.onUse(function (api) {
 })
 
 Package.onTest(function (api) {
+  // Add code coverage
   api.use([
+    'lmieulet:meteor-packages-coverage@0.2.0',
+    'lmieulet:meteor-coverage@3.0.0',
     'meteortesting:mocha'
   ])
 
diff --git a/package.json b/package.json
index 28e62827be..ffc020bc59 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,12 @@
 {
+  "scripts": {
+    "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
+    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
+    "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
+    "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/"
+  },
   "dependencies": {
+    "istanbul": "^0.4.5",
     "standard": "^12.0.1",
     "yuidocjs": "^0.10.2"
   }
diff --git a/roles/tests/client.js b/roles/tests/client.js
index dc4292d80b..9aea778c01 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -3,6 +3,9 @@ import { Meteor } from 'meteor/meteor'
 import { Tracker } from 'meteor/tracker'
 import { assert } from 'chai'
 
+// To ensure that the files are loaded for coverage
+import '../roles_common'
+
 describe('roles', function () {
   var users
   var roles = ['admin', 'editor', 'user']
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 1f1da18b71..04af378f8f 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -2,6 +2,10 @@
 import { Meteor } from 'meteor/meteor'
 import { assert } from 'chai'
 
+// To ensure that the files are loaded for coverage
+import '../roles_server'
+import '../roles_common'
+
 describe('roles', function () {
   var users = {}
   var roles = ['admin', 'editor', 'user']

From 192e3798239f6d8fdb8ed22cd3e68cffcc0c8bdc Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Sun, 27 Jan 2019 12:27:12 +0400
Subject: [PATCH 0283/1140] Save permissions in a separate collection

- no need for updating tests
- removed tests for outdated internal behavior
- added publication of new collection to test-files
---
 roles/roles_common.js | 839 ++++++++++++++++--------------------------
 roles/roles_server.js |   4 -
 roles/tests/client.js |  85 +++--
 roles/tests/server.js | 216 ++---------
 4 files changed, 394 insertions(+), 750 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 9276926dfd..0a94ef669d 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -3,13 +3,7 @@
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
- * It uses `roles` field to `Meteor.users` documents which is an array of subdocuments with the following
- * schema:
- *  - `_id`: role name
- *  - `scope`: scope name
- *  - `assigned`: boolean, if the role was manually assigned (set), or was automatically inferred (eg., subroles)
- *
- * Roles themselves are accessible throgh `Meteor.roles` collection and documents consist of:
+ * Roles are accessible throgh `Meteor.roles` collection and documents consist of:
  *  - `_id`: role name
  *  - `children`: list of subdocuments:
  *    - `_id`
@@ -20,17 +14,29 @@
  *
  * Example: `{_id: 'admin', children: [{_id: 'editor'}]}`
  *
+ * The assignment of a role to a user is stored in a collection, accessible through `Meteor.roleAssignment`.
+ * It's documents consist of
+ *  - `_id`: Internal MongoDB id
+ *  - `role`: A role object which got assigned. Usually only contains the `_id` property
+ *  - `user`: A user object, usually only contains the `_id` property
+ *  - `scope`: scope name
+ *  - `inheritedRoles`: A list of all the roles objects inherited by the assigned role.
+ *
  * @module Roles
  */
 if (!Meteor.roles) {
   Meteor.roles = new Mongo.Collection('roles')
 }
 
+if (!Meteor.roleAssignment) {
+  Meteor.roleAssignment = new Mongo.Collection('role-assignment')
+}
+
 /**
  * @class Roles
  */
 if (typeof Roles === 'undefined') {
-  Roles = {}
+  Roles = {} // eslint-disable-line no-global-assign
 }
 
 var getGroupsForUserDeprecationWarning = false
@@ -53,7 +59,7 @@ Object.assign(Roles, {
    * @param {String} roleName Name of role.
    * @param {Object} [options] Options:
    *   - `unlessExists`: if `true`, exception will not be thrown in the role already exists
-   * @return {String} ID of the new role.
+   * @return {String} ID of the new role or null.
    * @static
    */
   createRole: function (roleName, options) {
@@ -86,44 +92,42 @@ Object.assign(Roles, {
    */
   deleteRole: function (roleName) {
     var roles
+    var inheritedRoles
 
     Roles._checkRoleName(roleName)
 
-    // we first remove the role as a children, otherwise
-    // Roles._assureConsistency might re-add the role
-    Meteor.roles.update({}, {
-      $pull: {
-        children: {
-          _id: roleName
-        }
-      }
-    }, { multi: true })
-
-    Roles.getUsersInRole(roleName, {
-      anyScope: true,
-      queryOptions: {
-        fields: {
-          _id: 1,
-          roles: 1
-        }
-      }
-    }).fetch().forEach(function (user, index, cursor) {
-      // role can be assigned multiple times to the user, for multiple scopes
-      // we have to remove the role for each of those scopes
-      roles = user.roles.filter(Roles._roleMatcher(roleName))
-      roles.forEach(function (role) {
-        Roles._removeUserFromRole(user, roleName, {
-          scope: role.scope,
-          // we want to remove the role in any case
-          _assigned: null
-        })
-      })
-
-      // handle the edge case
-      Roles._assureConsistency(user)
+    // Remove all assignments
+    Meteor.roleAssignment.remove({
+      'role._id': roleName
     })
 
-    // remove the role itself
+    do {
+      // For all roles who have it as a dependency ...
+      roles = Roles._getParentRoleNames(Meteor.roles.findOne({ _id: roleName }))
+
+      Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
+        Meteor.roles.update({
+          _id: r._id
+        }, {
+          $pull: {
+            children: {
+              _id: roleName
+            }
+          }
+        })
+
+        inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
+        Meteor.roleAssignment.update({
+          'role._id': r._id
+        }, {
+          $set: {
+            inheritedRoles: [r._id, ...inheritedRoles].map(r2 => ({ _id: r2 }))
+          }
+        }, { multi: true })
+      })
+    } while (roles.length > 0)
+
+    // And finally remove the role itself
     Meteor.roles.remove({ _id: roleName })
   },
 
@@ -155,26 +159,28 @@ Object.assign(Roles, {
     Meteor.roles.insert(role)
 
     do {
-      count = Meteor.users.update({
-        roles: {
-          $elemMatch: {
-            _id: oldName
-          }
-        }
+      count = Meteor.roleAssignment.update({
+        'role._id': oldName
       }, {
         $set: {
-          'roles.$._id': newName
+          'role._id': newName
+        }
+      }, { multi: true })
+    } while (count > 0)
+
+    do {
+      count = Meteor.roleAssignment.update({
+        'inheritedRoles._id': oldName
+      }, {
+        $set: {
+          'inheritedRoles.$._id': newName
         }
       }, { multi: true })
     } while (count > 0)
 
     do {
       count = Meteor.roles.update({
-        children: {
-          $elemMatch: {
-            _id: oldName
-          }
-        }
+        'children._id': oldName
       }, {
         $set: {
           'children.$._id': newName
@@ -215,10 +221,6 @@ Object.assign(Roles, {
   _addRoleToParent: function (roleName, parentName) {
     var role
     var count
-    var parentRoles
-    var rolesToCheck
-    var alreadyCheckedRoles
-    var checkRole
 
     Roles._checkRoleName(roleName)
     Roles._checkRoleName(parentName)
@@ -231,21 +233,9 @@ Object.assign(Roles, {
     }
 
     // detect cycles
-    alreadyCheckedRoles = new Set()
-    rolesToCheck = new Set(role.children.map(r => r._id))
-    rolesToCheck.forEach(checkRoleName => {
-      if (checkRoleName === parentName) {
-        throw new Error('Roles \'' + roleName + '\' and \'' + parentName + '\' would form a cycle.')
-      }
-
-      alreadyCheckedRoles.add(checkRoleName)
-
-      checkRole = Meteor.roles.findOne({ _id: checkRoleName })
-
-      if (checkRole) {
-        checkRole.children.map(r => r._id).filter(r => !alreadyCheckedRoles.has(r)).forEach(r => rolesToCheck.add(r))
-      }
-    })
+    if (Roles._getInheritedRoleNames(role).includes(parentName)) {
+      throw new Error('Roles \'' + roleName + '\' and \'' + parentName + '\' would form a cycle.')
+    }
 
     count = Meteor.roles.update({
       _id: parentName,
@@ -253,7 +243,7 @@ Object.assign(Roles, {
         $ne: role._id
       }
     }, {
-      $addToSet: {
+      $push: {
         children: {
           _id: role._id
         }
@@ -264,27 +254,13 @@ Object.assign(Roles, {
     // already a subrole; in any case we do not have anything more to do
     if (!count) return
 
-    Roles.getUsersInRole(parentName, {
-      anyScope: true,
-      queryOptions: {
-        fields: {
-          _id: 1,
-          roles: 1
-        }
+    Meteor.roleAssignment.update({
+      'inheritedRoles._id': parentName
+    }, {
+      $push: {
+        inheritedRoles: { _id: role._id }
       }
-    }).fetch().forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple scopes
-      // we have to assign a new subrole for each of those scopes
-      parentRoles = user.roles.filter(Roles._roleMatcher(parentName))
-      parentRoles.forEach(function (parentRole) {
-        Roles._addUserToRole(user, roleName, {
-          scope: parentRole.scope,
-          // we are assigning a subrole, so we set it as unassigned,
-          // but only if they do not already exist
-          _assigned: null
-        })
-      })
-    })
+    }, { multi: true })
   },
 
   /**
@@ -317,7 +293,6 @@ Object.assign(Roles, {
   _removeRoleFromParent: function (roleName, parentName) {
     var role
     var count
-    var parentRoles
 
     Roles._checkRoleName(roleName)
     Roles._checkRoleName(parentName)
@@ -344,29 +319,15 @@ Object.assign(Roles, {
     // already not a subrole; in any case we do not have anything more to do
     if (!count) return
 
-    Roles.getUsersInRole(parentName, {
-      anyScope: true,
-      queryOptions: {
-        fields: {
-          _id: 1,
-          roles: 1
+    Meteor.roleAssignment.update({
+      'inheritedRoles._id': parentName
+    }, {
+      $pull: {
+        inheritedRoles: {
+          _id: role._id
         }
       }
-    }).fetch().forEach(function (user, index, cursor) {
-      // parent role can be assigned multiple times to the user, for multiple scopes
-      // we have to remove the subrole for each of those scopes
-      parentRoles = user.roles.filter(Roles._roleMatcher(parentName))
-      parentRoles.forEach(function (parentRole) {
-        Roles._removeUserFromRole(user, roleName, {
-          scope: parentRole.scope,
-          // but we want to remove it only if it was not also explicitly assigned
-          _assigned: false
-        })
-      })
-
-      // handle the edge case
-      Roles._assureConsistency(user)
-    })
+    }, { multi: true })
   },
 
   /**
@@ -391,6 +352,8 @@ Object.assign(Roles, {
    * @static
    */
   addUsersToRoles: function (users, roles, options) {
+    var id
+
     if (!users) throw new Error('Missing \'users\' param.')
     if (!roles) throw new Error('Missing \'roles\' param.')
 
@@ -403,17 +366,18 @@ Object.assign(Roles, {
     Roles._checkScopeName(options.scope)
 
     options = Object.assign({
-      ifExists: false,
-      // internal option, should not be used publicly because it will break assumptions
-      // in te code; publicly, you can only add users to an assigned role
-      // should the role be set as assigned, default is `true`; `null` is the same as `false`,
-      // only that it does not force the value to `false` if the role is already assigned
-      _assigned: true
+      ifExists: false
     }, options)
 
     users.forEach(function (user) {
+      if (typeof user === 'object') {
+        id = user._id
+      } else {
+        id = user
+      }
+
       roles.forEach(function (role) {
-        Roles._addUserToRole(user, role, options)
+        Roles._addUserToRole(id, role, options)
       })
     })
   },
@@ -454,12 +418,7 @@ Object.assign(Roles, {
     Roles._checkScopeName(options.scope)
 
     options = Object.assign({
-      ifExists: false,
-      // internal option, should not be used publicly because it will break assumptions
-      // in te code; publicly, you can only add users to an assigned role
-      // should the role be set as assigned, default is `true`; `null` is the same as `false`,
-      // only that it does not force the value to `false` if the role is already assigned
-      _assigned: true
+      ifExists: false
     }, options)
 
     users.forEach(function (user) {
@@ -469,11 +428,11 @@ Object.assign(Roles, {
         id = user
       }
       // we first clear all roles for the user
-      Meteor.users.update(id, { $pull: { roles: { scope: options.scope } } })
+      Meteor.roleAssignment.remove({ 'user._id': id, scope: options.scope })
 
       // and then add all
       roles.forEach(function (role) {
-        Roles._addUserToRole(user, role, options)
+        Roles._addUserToRole(id, role, options)
       })
     })
   },
@@ -482,37 +441,23 @@ Object.assign(Roles, {
    * Add one user to one role.
    *
    * @method _addUserToRole
-   * @param {String|Object} user User ID or object with an `_id` field.
+   * @param {String} userId The user ID.
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
-   *   - `_assigned`: internal option, should not be used publicly because it will break assumptions
-   *     in te code; publicly, you can only add users to an assigned role
-   *     should the role be set as assigned (`true`), `null` is the same as `false`,
-   *     only that it does not force the value to `false` if the role is already assigned
-   * @return {Array} Roles set during the call (even those already set).
    * @private
    * @static
    */
-  _addUserToRole: function (user, roleName, options) {
-    var id
-    var role
-    var count
-    var setRoles
-
+  _addUserToRole: function (userId, roleName, options) {
     Roles._checkRoleName(roleName)
     Roles._checkScopeName(options.scope)
 
-    if (typeof user === 'object') {
-      id = user._id
-    } else {
-      id = user
+    if (!userId) {
+      return
     }
 
-    if (!id) return []
-
-    role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
+    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
 
     if (!role) {
       if (options.ifExists) {
@@ -522,77 +467,79 @@ Object.assign(Roles, {
       }
     }
 
-    // add new role if it is not already added
-    count = Meteor.users.update({
-      _id: id,
-      roles: {
-        $not: {
-          $elemMatch: {
-            _id: roleName,
-            scope: options.scope
-          }
-        }
-      }
-
-    }, {
-      $addToSet: {
-        roles: {
-          _id: roleName,
-          scope: options.scope,
-          // we want to make sure it is a boolean value
-          assigned: !!options._assigned
-        }
-      }
-    })
-
-    if (!count) {
-      // a role has not been added, it maybe already exists
-      if (options._assigned) {
-        // let's make sure it is set as assigned
-        Meteor.users.update({
-          _id: id,
-          roles: {
-            $elemMatch: {
-              _id: roleName,
-              scope: options.scope
-            }
-          }
-
-        }, {
-          $set: {
-            'roles.$.assigned': true
-          }
-        })
-      } else if (options._assigned === false) {
-        // let's make sure it is set as unassigned
-        Meteor.users.update({
-          _id: id,
-          roles: {
-            $elemMatch: {
-              _id: roleName,
-              scope: options.scope
-            }
-          }
-
-        }, {
-          $set: {
-            'roles.$.assigned': false
-          }
-        })
-      }
-    }
-
-    setRoles = [{
-      _id: roleName,
+    const res = Meteor.roleAssignment.upsert({
+      'user._id': userId,
+      'role._id': roleName,
       scope: options.scope
-    }]
-
-    role.children.forEach(function (child) {
-      // subroles are set as unassigned, but only if they do not already exist
-      setRoles = setRoles.concat(Roles._addUserToRole(user, child._id, Object.assign({}, options, { _assigned: null })))
+    }, {
+      $setOnInsert: {
+        user: { _id: userId },
+        role: { _id: roleName },
+        scope: options.scope
+      }
     })
 
-    return setRoles
+    if (res.insertedId) {
+      Meteor.roleAssignment.update({ _id: res.insertedId }, {
+        $set: {
+          inheritedRoles: [roleName, ...Roles._getInheritedRoleNames(role)].map(r => ({ _id: r }))
+        }
+      })
+    }
+  },
+
+  /**
+   * Returns an array of role names the given role name is a child of.
+   *
+   * @example
+   *     Roles._getParentRoleNames({ _id: 'admin', children; [] })
+   *
+   * @method _getParentRoleNames
+   * @param {object} role The role object
+   * @private
+   * @static
+   */
+  _getParentRoleNames: function (role) {
+    var parentRoles
+
+    parentRoles = new Set([role._id])
+
+    parentRoles.forEach(roleName => {
+      Meteor.roles.find({ 'children._id': roleName }).fetch().forEach(parentRole => {
+        parentRoles.add(parentRole._id)
+      })
+    })
+
+    parentRoles.delete(role._id)
+
+    return [...parentRoles]
+  },
+
+  /**
+   * Returns an array of role names the given role name is a parent of.
+   *
+   * @example
+   *     Roles._getInheritedRoleNames({ _id: 'admin', children; [] })
+   *
+   * @method _getInheritedRoleNames
+   * @param {object} role The role object
+   * @private
+   * @static
+   */
+  _getInheritedRoleNames: function (role) {
+    const inheritedRoles = new Set()
+    const nestedRoles = new Set([role])
+
+    nestedRoles.forEach(r => {
+      const roles = Meteor.roles.find({ _id: { $in: r.children.map(r => r._id) } }, { fields: { children: 1 } }).fetch()
+
+      roles.forEach(r2 => {
+        inheritedRoles.add(r2._id)
+        nestedRoles.add(r2)
+      })
+    })
+
+    return [...inheritedRoles]
   },
 
   /**
@@ -624,139 +571,46 @@ Object.assign(Roles, {
 
     Roles._checkScopeName(options.scope)
 
-    options = Object.assign({
-      // internal option, should not be used publicly because it will break assumptions
-      // in te code; publicly, you can only remove users from an assigned role
-      // when should the role be removed, default is `true` which means only when it is assigned,
-      // `false` means when it is not assigned, and `null` means always
-      _assigned: true
-    }, options)
-
     users.forEach(function (user) {
       if (!user) return
 
       roles.forEach(function (role) {
-        Roles._removeUserFromRole(user, role, options)
-      })
+        let id
+        if (typeof user === 'object') {
+          id = user._id
+        } else {
+          id = user
+        }
 
-      // handle the edge case
-      Roles._assureConsistency(user)
+        Roles._removeUserFromRole(id, role, options)
+      })
     })
   },
 
   /**
    * Remove one user from one role.
    *
-   * WARNING: It leaves user's roles in a possibly inconsistent state. Because we allow the same
-   * role to be a child of multiple roles it might happen that it removes some subroles which
-   * it should not because they are in effect also through some other parent role. You should always
-   * call `_assureConsistency` after you are finished with calls to `_removeUserFromRole` for a
-   * particular user.
-   *
    * @method _removeUserFromRole
-   * @param {String|Object} user User ID or object with an `_id` field.
+   * @param {String} userId The user ID.
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:
    *   - `scope`: name of the scope, or `null` for the global role
-   *   - `_assigned`: internal option, should not be used publicly because it will break assumptions
-   *     in te code; publicly, you can only remove users from an assigned role
-   *     if `true`, only manually assigned roles are removed, if `false`, only automatically
-   *     assigned roles are removed, if `null`, any role is removed
    * @private
    * @static
    */
-  _removeUserFromRole: function (user, roleName, options) {
-    var id
-    var role
-    var update
-
+  _removeUserFromRole: function (userId, roleName, options) {
     Roles._checkRoleName(roleName)
     Roles._checkScopeName(options.scope)
 
-    if (typeof user === 'object') {
-      id = user._id
-    } else {
-      id = user
-    }
+    if (!userId) return
 
-    if (!id) return
-
-    update = {
-      $pull: {
-        roles: {
-          _id: roleName,
-          scope: options.scope
-        }
-      }
-    }
-
-    if (options._assigned) {
-      update.$pull.roles.assigned = true
-    } else if (options._assigned === false) {
-      update.$pull.roles.assigned = false
-    }
-
-    // we try to remove the role in every case, whether the role really exists or not
-    Meteor.users.update(id, update)
-
-    role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
-
-    // role does not exist, we do not anything more
-    if (!role) return
-
-    role.children.forEach(function (child) {
-      // if a child role has been assigned explicitly, we do not remove it
-      Roles._removeUserFromRole(user, child._id, Object.assign({}, options, { _assigned: false }))
+    Meteor.roleAssignment.remove({
+      'user._id': userId,
+      'role._id': roleName,
+      scope: options.scope
     })
   },
 
-  /**
-   * Makes sure all subroles are correctly set, and no extra subroles are set which should not be.
-   *
-   * Used internally after complicated changes, but it can also be used whenever one feels that
-   * there might be inconsistencies (eg., after a crash).
-   *
-   * We simply re-set to the user their assigned roles again and remove any roles which
-   * are marked as not explicitly assigned, and have not been part of what we currently set.
-   *
-   * @method _assureConsistency
-   * @param {String|Object} user User ID or an actual user object.
-   * @private
-   * @static
-   */
-  _assureConsistency: function (user) {
-    var roles
-    var setRoles
-
-    // we want always the latest state
-    user = Roles._resolveUser(user, true)
-
-    // only assigned roles
-    roles = user.roles.filter(Roles._onlyAssignedMatcher())
-
-    setRoles = []
-    roles.forEach(function (role) {
-      setRoles = setRoles.concat(Roles._addUserToRole(user, role._id, {
-        scope: role.scope,
-        _assigned: role.assigned, // this is true
-        ifExists: true
-      }))
-    })
-
-    if (setRoles.length) {
-      // remove all extra entries which should not be there
-      Meteor.users.update(user._id, {
-        $pull: {
-          roles: {
-            $nor: setRoles.map(function (role) { return { _id: role._id, scope: role.scope } })
-          }
-        }
-      })
-    } else {
-      Meteor.users.update(user._id, { $set: { roles: [] } })
-    }
-  },
-
   /**
    * Check if user has specified roles.
    *
@@ -788,13 +642,15 @@ Object.assign(Roles, {
    */
   userIsInRole: function (user, roles, options) {
     var id
-    var query
+    var selector
 
     options = Roles._normalizeOptions(options)
 
     // ensure array to simplify code
     if (!Array.isArray(roles)) roles = [roles]
 
+    roles = roles.filter(r => r != null)
+
     if (!roles.length) return false
 
     Roles._checkScopeName(options.scope)
@@ -806,43 +662,26 @@ Object.assign(Roles, {
     if (!user) return false
 
     if (typeof user === 'object') {
-      if ('roles' in user) {
-        return roles.some(function (role) {
-          const roles = user.roles || []
-          if (options.anyScope) {
-            return roles.some(Roles._roleMatcher(role))
-          } else {
-            return roles.some(Roles._roleAndScopeMatcher(role, options.scope))
-          }
-        })
-      } else {
-        // missing roles field, try going direct via id
-        id = user._id
-      }
+      id = user._id
     } else {
       id = user
     }
 
     if (!id) return false
 
-    if (options.anyScope) {
-      query = {
-        _id: id,
-        'roles._id': { $in: roles }
-      }
-    } else {
-      query = {
-        _id: id,
-        roles: {
-          $elemMatch: {
-            _id: { $in: roles },
-            scope: { $in: [options.scope, null] }
-          }
-        }
-      }
+    selector = {
+      'user._id': id
     }
 
-    return !!Meteor.users.findOne(query, { fields: { _id: 1 } })
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope, null] }
+    }
+
+    return roles.some((roleName) => {
+      selector['inheritedRoles._id'] = roleName
+
+      return Meteor.roleAssignment.find(selector, { limit: 1 }).count() > 0
+    })
   },
 
   /**
@@ -861,6 +700,9 @@ Object.assign(Roles, {
    * @static
    */
   getRolesForUser: function (user, options) {
+    var id
+    var selector
+    var filter
     var roles
 
     options = Roles._normalizeOptions(options)
@@ -873,24 +715,62 @@ Object.assign(Roles, {
       anyScope: false
     }, options)
 
-    user = Roles._resolveUser(user)
+    if (typeof user === 'object') {
+      id = user._id
+    } else {
+      id = user
+    }
 
-    if (!user) return []
+    if (!id) return []
+
+    selector = {
+      'user._id': id
+    }
+
+    filter = {
+      fields: { 'inheritedRoles._id': 1 }
+    }
 
-    roles = user.roles || []
     if (!options.anyScope) {
-      roles = roles.filter(Roles._scopeMatcher(options.scope))
+      selector.scope = { $in: [options.scope, null] }
     }
 
     if (options.onlyAssigned) {
-      roles = roles.filter(Roles._onlyAssignedMatcher())
+      delete filter.fields['inheritedRoles._id']
+      filter.fields['role._id'] = 1
     }
 
     if (options.fullObjects) {
-      return roles
+      delete filter.fields
     }
 
-    return [...new Set(roles.map(r => r._id))]
+    roles = Meteor.roleAssignment.find(selector, filter).fetch()
+
+    if (options.fullObjects) {
+      const objects = new Map();
+      roles.reduce((prev, r) =>
+        prev.concat([
+          { _id: r.role._id, scope: r.scope, assigned: true },
+          ...r.inheritedRoles.map(i => ({ _id: i._id, scope: r.scope, assigned: false }))
+        ]),
+        []
+      ).forEach(r => {
+        if (options.onlyAssigned && !r.assigned) {
+          return
+        }
+
+        const key = `${r._id}||${r.scope}`
+        if (!objects.has(key)) {
+          objects.set(key, r)
+        } else if (r.assigned) {
+          objects.get(key).assigned = true
+        }
+      })
+
+      return [...objects.values()]
+    }
+
+    return [...new Set(roles.map(r => r.inheritedRoles || [r.role]).reduce((rev, current) => rev.concat(current), []).map(r => r._id))]
   },
 
   /**
@@ -932,15 +812,19 @@ Object.assign(Roles, {
    * @static
    */
   getUsersInRole: function (roles, options, queryOptions) {
-    var result
+    var ids
 
-    result = Roles._usersInRoleQuery(roles, options, queryOptions)
+    ids = Roles.getUserAssignmentsForRole(roles, options, {}).fetch().map(a => a.user._id)
 
-    return Meteor.users.find(result.query, result.queryOptions)
+    return Meteor.users.find({ _id: { $in: ids } }, ((options && options.queryOptions) || queryOptions) || {})
   },
 
   /**
-   * @method _usersInRoleQuery
+   * Retrieve all assignments of a user which are for the target role.
+   *
+   * Options:
+   *
+   * @method getUsersInRole
    * @param {Array|String} roles Name of role or an array of roles. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
@@ -950,49 +834,68 @@ Object.assign(Roles, {
    *     roles will also be checked
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *   - `queryOptions`: options which are passed directly
-   *     through to `Meteor.users.find(query, options)`
+   *     through to `Meteor.roleAssignment.find(query, options)`
+
+   * Alternatively, it can be a scope name string.
+   * @return {Cursor} Cursor of user assignments for roles.
+   * @static
+   */
+  getUserAssignmentsForRole: function (roles, options) {
+    options = Roles._normalizeOptions(options)
+
+    options = Object.assign({
+      anyScope: false,
+      queryOptions: {}
+    }, options)
+
+    return Roles._getUsersInRoleCursor(roles, options, options.queryOptions)
+  },
+
+  /**
+   * @method _getUsersInRoleCursor
+   * @param {Array|String} roles Name of role or an array of roles. If array, ids of users are
+   *                             returned which have at least one of the roles
+   *                             assigned but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope to restrict roles to; user's global
+   *     roles will also be checked
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *
    * Alternatively, it can be a scope name string.
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to `Meteor.users.find(query, options)`
-   * @return {Object} Object with `query` and `queryOptions`.
+   * @param {Object} [filter] Options which are passed directly
+   *                                through to `Meteor.roleAssignment.find(query, options)`
+   * @return {Object} Cursor to the assignment documents
    * @private
    * @static
    */
-  _usersInRoleQuery: function (roles, options, queryOptions) {
-    var query
+  _getUsersInRoleCursor: function (roles, options, filter) {
+    var selector
 
     options = Roles._normalizeOptions(options)
 
+    options = Object.assign({
+      anyScope: false
+    }, options)
+
     // ensure array to simplify code
     if (!Array.isArray(roles)) roles = [roles]
 
     Roles._checkScopeName(options.scope)
 
-    options = Object.assign({
-      queryOptions: queryOptions || {},
-      anyScope: false
-    }, options)
+    filter = Object.assign({
+      fields: { 'user._id': 1 }
+    }, filter)
 
-    if (options.anyScope) {
-      query = {
-        'roles._id': { $in: roles }
-      }
-    } else {
-      query = {
-        roles: {
-          $elemMatch: {
-            _id: { $in: roles },
-            scope: { $in: [options.scope, null] }
-          }
-        }
-      }
+    selector = {
+      'inheritedRoles._id': { $in: roles }
     }
 
-    return {
-      query: query,
-      queryOptions: options.queryOptions
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope, null] }
     }
+
+    return Meteor.roleAssignment.find(selector, filter)
   },
 
   /**
@@ -1023,22 +926,28 @@ Object.assign(Roles, {
    */
   getScopesForUser: function (user, roles) {
     var scopes
+    var id
 
-    // ensure array to simplify code
     if (roles && !Array.isArray(roles)) roles = [roles]
 
-    user = Roles._resolveUser(user)
+    if (typeof user === 'object') {
+      id = user._id
+    } else {
+      id = user
+    }
 
-    if (!user) return []
+    if (!id) return []
 
-    scopes = [];
-    (user.roles || []).forEach(function (userRole) {
-      // == used on purpose.
-      if (userRole.scope == null) return
-      if (roles && !roles.includes(userRole._id)) return
+    const selector = {
+      'user._id': id,
+      scope: { $ne: null }
+    }
 
-      scopes.push(userRole.scope)
-    })
+    if (roles) {
+      selector['inheritedRoles._id'] = { $in: roles }
+    }
+
+    scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
 
     return [...new Set(scopes)]
   },
@@ -1062,15 +971,11 @@ Object.assign(Roles, {
     if (oldName === newName) return
 
     do {
-      count = Meteor.users.update({
-        roles: {
-          $elemMatch: {
-            scope: oldName
-          }
-        }
+      count = Meteor.roleAssignment.update({
+        scope: oldName
       }, {
         $set: {
-          'roles.$.scope': newName
+          scope: newName
         }
       }, { multi: true })
     } while (count > 0)
@@ -1088,101 +993,7 @@ Object.assign(Roles, {
   removeScope: function (name) {
     Roles._checkScopeName(name)
 
-    Meteor.users.update({}, {
-      $pull: {
-        roles: {
-          scope: name
-        }
-      }
-    }, { multi: true })
-  },
-
-  /**
-   * Resolves the user ID into an actual user object with `roles` field,
-   * if it is not already.
-   *
-   * @method _resolveUser
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Boolean} force Load a new user object even if it is already one.
-   * @return {Object} User object.
-   * @private
-   * @static
-   */
-  _resolveUser: function (user, force) {
-    // TODO: We could use $elemMatch to limit returned fields here.
-    if (!user) {
-      return null
-    } else if (typeof user !== 'object') {
-      user = Meteor.users.findOne(
-        { _id: user },
-        { fields: { roles: 1 } })
-    } else if (force || !('roles' in user)) {
-      user = Meteor.users.findOne(
-        { _id: user._id },
-        { fields: { roles: 1 } })
-    }
-
-    return user
-  },
-
-  /**
-   * @method _roleMatcher
-   * @param {String} roleName A role name to match against.
-   * @return {Function} A matcher function which accepts a role object and returns `true`
-   *                     if its name matches `roleName`.
-   * @private
-   * @static
-   */
-  _roleMatcher: function (roleName) {
-    return function (userRole) {
-      return userRole._id === roleName
-    }
-  },
-
-  /**
-   * @method _roleAndScopeMatcher
-   * @param {String} roleName A role name to match against.
-   * @param {String} scope A scope to match against.
-   * @return {Function} A matcher function which accepts a role object and returns `true`
-   *                     if its name matches `roleName`, and scope matches `scope`.
-   * @private
-   * @static
-   */
-  _roleAndScopeMatcher: function (roleName, scope) {
-    return function (userRole) {
-      // == used on purpose in 'userRole.scope == null'
-      return (userRole._id === roleName && userRole.scope === scope) ||
-        (userRole._id === roleName && (!('scope' in userRole) || userRole.scope == null))
-    }
-  },
-
-  /**
-   * @method _scopeMatcher
-   * @param {String} scope A scope to match against.
-   * @return {Function} A matcher function which accepts a role object and returns `true`
-   *                    if its scope matches `scope`.
-   * @private
-   * @static
-   */
-  _scopeMatcher: function (scope) {
-    return function (userRole) {
-      // == used on purpose in 'userRole.scope == null'
-      return (userRole.scope === scope) ||
-        (!('scope' in userRole) || userRole.scope == null)
-    }
-  },
-
-  /**
-   * @method _onlyAssignedMatcher
-   * @return {Function} A matcher function which accepts a role object and returns `true`
-   *                     if the role is an assigned role.
-   * @private
-   * @static
-   */
-  _onlyAssignedMatcher: function () {
-    return function (userRole) {
-      return !!userRole.assigned
-    }
+    Meteor.roleAssignment.remove({ scope: name })
   },
 
   /**
@@ -1194,7 +1005,7 @@ Object.assign(Roles, {
    * @static
    */
   _checkRoleName: function (roleName) {
-    if (!roleName || typeof roleName !== 'string' || Roles._trim(roleName) !== roleName) {
+    if (!roleName || typeof roleName !== 'string' || roleName.trim() !== roleName) {
       throw new Error('Invalid role name \'' + roleName + '\'.')
     }
   },
@@ -1290,22 +1101,8 @@ Object.assign(Roles, {
   _checkScopeName: function (scopeName) {
     if (scopeName === null) return
 
-    if (!scopeName || typeof scopeName !== 'string' || Roles._trim(scopeName) !== scopeName) {
+    if (!scopeName || typeof scopeName !== 'string' || scopeName.trim() !== scopeName) {
       throw new Error('Invalid scope name \'' + scopeName + '\'.')
     }
-  },
-
-  /**
-   * @param {String} string Input string.
-   * @return {String} Trimmed string.
-   * @private
-   * @static
-   */
-  _trim: function (string) {
-    if (string.trim) {
-      return string.trim()
-    } else {
-      return string.replace(/^\s+|\s+$/g, '')
-    }
   }
 })
diff --git a/roles/roles_server.js b/roles/roles_server.js
index e218fd35a4..87f8e1bba2 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,9 +1,5 @@
 /* global Meteor, Roles */
 
-// Create default indexes on users collection.
-// Index only on "roles._id" is not needed because the combined index works for it as well.
-Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
-Meteor.users._ensureIndex({ 'roles.scope': 1 })
 
 /*
  * Publish logged-in user's roles so client-side checks can work.
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 9aea778c01..a9a0b7fced 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -10,42 +10,19 @@ describe('roles', function () {
   var users
   var roles = ['admin', 'editor', 'user']
 
+  Tracker.autorun(function () {
+    Roles.assignmentSubscription = Meteor.subscribe('_roleAssignments')
+  })
+
   users = {
     'eve': {
-      _id: 'eve',
-      roles: [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'editor',
-        scope: null,
-        assigned: true
-      }]
+      _id: 'eve'
     },
     'bob': {
-      _id: 'bob',
-      roles: [{
-        _id: 'user',
-        scope: 'group1',
-        assigned: true
-      }, {
-        _id: 'editor',
-        scope: 'group2',
-        assigned: true
-      }]
+      _id: 'bob'
     },
     'joe': {
-      _id: 'joe',
-      roles: [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'editor',
-        scope: 'group1',
-        assigned: true
-      }]
+      _id: 'joe'
     }
   }
 
@@ -71,6 +48,54 @@ describe('roles', function () {
     return users.eve
   }
 
+  beforeEach((done) => {
+    Meteor.roleAssignment.insert({
+      user: users.eve,
+      role: { _id: 'admin' },
+      inheritedRoles: [{ _id: 'admin' }]
+    })
+    Meteor.roleAssignment.insert({
+      user: users.eve,
+      role: { _id: 'editor' },
+      inheritedRoles: [{ _id: 'editor' }]
+    })
+
+    Meteor.roleAssignment.insert({
+      user: users.bob,
+      role: { _id: 'user' },
+      inheritedRoles: [{ _id: 'user' }],
+      scope: 'group1'
+    })
+    Meteor.roleAssignment.insert({
+      user: users.bob,
+      role: { _id: 'editor' },
+      inheritedRoles: [{ _id: 'editor' }],
+      scope: 'group2'
+    })
+
+    Meteor.roleAssignment.insert({
+      user: users.joe,
+      role: { _id: 'admin' },
+      inheritedRoles: [{ _id: 'admin' }]
+    })
+    Meteor.roleAssignment.insert({
+      user: users.joe,
+      role: { _id: 'editor' },
+      inheritedRoles: [{ _id: 'editor' }],
+      scope: 'group1'
+    })
+
+    const timer = () => {
+      if (!Roles.assignmentSubscription.ready()) {
+        Meteor.setTimeout(timer, 100)
+      } else {
+        done()
+      }
+    }
+
+    timer()
+  })
+
   it('can check current users roles via template helper', function () {
     var isInRole
     var expected
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 04af378f8f..3a02bea4e5 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -6,10 +6,28 @@ import { assert } from 'chai'
 import '../roles_server'
 import '../roles_common'
 
+// To allow inserting on the client, needed for testing.
+Meteor.roleAssignment.allow({
+  insert () { return true },
+  update () { return true },
+  remove () { return true }
+})
+
 describe('roles', function () {
   var users = {}
   var roles = ['admin', 'editor', 'user']
 
+  Meteor.publish('_roleAssignments', function () {
+    var loggedInUserId = this.userId
+
+    if (!loggedInUserId) {
+      this.ready()
+      return
+    }
+
+    return Meteor.roleAssignment.find({ _id: loggedInUserId })
+  })
+
   function addUser (name) {
     return Meteor.users.insert({ 'username': name })
   }
@@ -42,6 +60,7 @@ describe('roles', function () {
 
   beforeEach(function () {
     Meteor.roles.remove({})
+    Meteor.roleAssignment.remove({})
     Meteor.users.remove({})
 
     users = {
@@ -1462,160 +1481,12 @@ describe('roles', function () {
     })
   })
 
-  it('_assureConsistency', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('ALL_PERMISSIONS')
-    Roles.createRole('VIEW_PERMISSION')
-    Roles.createRole('EDIT_PERMISSION')
-    Roles.createRole('DELETE_PERMISSION')
-    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['user'], 'scope2')
-
-    var correctRoles = [{
-      _id: 'user',
-      scope: 'scope1',
-      assigned: true
-    }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: 'scope1',
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope1',
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: 'scope1',
-      assigned: false
-    }, {
-      _id: 'user',
-      scope: 'scope2',
-      assigned: true
-    }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: 'scope2',
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope2',
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: 'scope2',
-      assigned: false
-    }]
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
-
-    // let's remove all automatically assigned roles
-    // _assureConsistency should recreate those roles
-    Meteor.users.update(users.eve, { $pull: { roles: { assigned: false } } })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
-      scope: 'scope1',
-      assigned: true
-    }, {
-      _id: 'user',
-      scope: 'scope2',
-      assigned: true
-    }])
-
-    Roles._assureConsistency(users.eve)
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
-
-    // add an extra role, faking that it is automatically assigned
-    // _assureConsistency should remove this extra role
-    Meteor.users.update(users.eve, { $push: { roles: { _id: 'DELETE_PERMISSION', scope: null, assigned: false } } })
-
-    Roles._assureConsistency(users.eve)
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), correctRoles)
-
-    // remove a role, _assureConsistency should remove it from the user
-    Meteor.roles.remove({ _id: 'VIEW_PERMISSION' })
-
-    Roles._assureConsistency(users.eve)
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
-      scope: 'scope1',
-      assigned: true
-    }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: 'scope1',
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope1',
-      assigned: false
-    }, {
-      _id: 'user',
-      scope: 'scope2',
-      assigned: true
-    }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: 'scope2',
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope2',
-      assigned: false
-    }])
-  })
-
   it('_addUserToRole', function () {
     Roles.createRole('admin')
 
-    // add role with assigned set to true
-    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: true })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
-      scope: null,
-      assigned: true
-    }])
-
-    // change assigned to false
-    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: false })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
-      scope: null,
-      assigned: false
-    }])
-
-    Roles.setUserRoles(users.eve, [])
-
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
 
-    // add role with assigned set to false
-    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: null })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
-      scope: null,
-      assigned: false
-    }])
-
-    // change assigned to true
-    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: true })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
-      scope: null,
-      assigned: true
-    }])
-
-    // do not change assigned
-    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false, _assigned: null })
+    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })
 
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
       _id: 'admin',
@@ -1635,52 +1506,7 @@ describe('roles', function () {
       assigned: true
     }])
 
-    // remove only roles with assigned set to false, thus do not remove anything
-    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: false })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
-      scope: null,
-      assigned: true
-    }])
-
-    // remove only roles with assigned set to true
-    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: true })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
-
-    Roles.addUsersToRoles(users.eve, 'admin')
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
-      scope: null,
-      assigned: true
-    }])
-
-    // remove roles no matter the assignment
-    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: null })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
-
-    Roles.addUsersToRoles(users.eve, 'admin', { _assigned: false })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
-      scope: null,
-      assigned: false
-    }])
-
-    // remove only roles with assigned set to true, thus do not remove anything
-    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: true })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
-      scope: null,
-      assigned: false
-    }])
-
-    // remove only roles with assigned set to false
-    Roles._removeUserFromRole(users.eve, 'admin', { scope: null, _assigned: false })
+    Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
 
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
   })

From 2898aee203ccf0ae450a90d901199f93a7baa18d Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Sun, 27 Jan 2019 12:27:58 +0400
Subject: [PATCH 0284/1140] Added indexes speeding up the new structure

---
 roles/roles_server.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 87f8e1bba2..0bb898593c 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,5 +1,12 @@
 /* global Meteor, Roles */
 
+Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
+Meteor.roleAssignment._ensureIndex({ 'role._id': 1 })
+Meteor.roleAssignment._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+Meteor.roleAssignment._ensureIndex({ 'inheritedRoles._id': 1 })
+
+Meteor.roles._ensureIndex({ 'children._id': 1 })
 
 /*
  * Publish logged-in user's roles so client-side checks can work.

From 11c3b0c2ce91616cc50758b993301c97963b5fcc Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 22:23:39 +0400
Subject: [PATCH 0285/1140] Introducing the only BC break: getRolesForUser()
 setting `fullObjects` = true

- Required a lot of changes throughout the tests, which weren't done earlier to make it easy to comprehend that this feature has no BC breaks aside of this
- Using `fullObjects` will ignorer the value set in `onlyAssigned`, which required to change some of the tests
---
 roles/roles_common.js |  22 +-
 roles/tests/server.js | 697 +++++++++++++++++++-----------------------
 2 files changed, 307 insertions(+), 412 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 0a94ef669d..3f6b598326 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -747,27 +747,7 @@ Object.assign(Roles, {
     roles = Meteor.roleAssignment.find(selector, filter).fetch()
 
     if (options.fullObjects) {
-      const objects = new Map();
-      roles.reduce((prev, r) =>
-        prev.concat([
-          { _id: r.role._id, scope: r.scope, assigned: true },
-          ...r.inheritedRoles.map(i => ({ _id: i._id, scope: r.scope, assigned: false }))
-        ]),
-        []
-      ).forEach(r => {
-        if (options.onlyAssigned && !r.assigned) {
-          return
-        }
-
-        const key = `${r._id}||${r.scope}`
-        if (!objects.has(key)) {
-          objects.set(key, r)
-        } else if (r.assigned) {
-          objects.get(key).assigned = true
-        }
-      })
-
-      return [...objects.values()]
+      return roles
     }
 
     return [...new Set(roles.map(r => r.inheritedRoles || [r.role]).reduce((rev, current) => rev.concat(current), []).map(r => r._id))]
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 3a02bea4e5..d5b0603c28 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -755,14 +755,16 @@ describe('roles', function () {
     userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getRolesForUser(userObj), ['admin', 'user'])
 
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: null,
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }, {
-      _id: 'user',
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ '_id': 'user' }]
     }])
   })
 
@@ -795,107 +797,117 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userObj, 'scope2'), ['admin'])
     assert.sameMembers(Roles.getRolesForUser(userObj), [])
 
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }, {
-      _id: 'user',
+      role: { _id: 'user' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }]
     }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope2',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }])
 
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }, {
-      _id: 'user',
+      role: { _id: 'user' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }]
     }, {
-      _id: 'admin',
+      role: { _id: 'admin' },
       scope: 'scope2',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }])
 
     Roles.createRole('PERMISSION')
     Roles.addRolesToParent('PERMISSION', 'user')
 
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }, {
-      _id: 'user',
+      role: { _id: 'user' },
       scope: 'scope1',
-      assigned: true
-    }, {
-      _id: 'PERMISSION',
-      scope: 'scope1',
-      assigned: false
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
     }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope2',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }])
     assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
     assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
 
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }, {
-      _id: 'user',
+      role: { _id: 'user' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
     }, {
-      _id: 'admin',
+      role: { _id: 'admin' },
       scope: 'scope2',
-      assigned: true
-    }, {
-      _id: 'PERMISSION',
-      scope: 'scope1',
-      assigned: false
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }])
     assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
 
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }, {
-      _id: 'user',
+      role: { _id: 'user' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
     }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope2',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }])
     assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
     assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
 
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }, {
-      _id: 'user',
+      role: { _id: 'user' },
       scope: 'scope1',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
     }, {
-      _id: 'admin',
+      role: { _id: 'admin' },
       scope: 'scope2',
-      assigned: true
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
     }])
     assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
   })
@@ -1484,14 +1496,15 @@ describe('roles', function () {
   it('_addUserToRole', function () {
     Roles.createRole('admin')
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
 
     Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
     }])
   })
 
@@ -1500,15 +1513,16 @@ describe('roles', function () {
 
     Roles.addUsersToRoles(users.eve, 'admin')
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'admin',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
     }])
 
     Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
   })
 
   it('keep assigned roles', function () {
@@ -1527,61 +1541,59 @@ describe('roles', function () {
 
     assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
-    }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: null,
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
     }])
 
     Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION')
 
     assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
     }, {
-      _id: 'ALL_PERMISSIONS',
+      role: { _id: 'VIEW_PERMISSION' },
       scope: null,
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'VIEW_PERMISSION' }
+      ]
     }])
 
     Roles.removeUsersFromRoles(users.eve, 'user')
 
     assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'VIEW_PERMISSION',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'VIEW_PERMISSION' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'VIEW_PERMISSION' }
+      ]
     }])
 
     Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION')
 
     assert.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [])
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
   })
 
   it('modify assigned hierarchical roles', function () {
@@ -1602,34 +1614,25 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
     }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'ALL_PERMISSIONS',
+      role: { _id: 'ALL_PERMISSIONS' },
       scope: 'scope',
-      assigned: true
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: 'scope',
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
     }])
 
     Roles.createRole('MODERATE_PERMISSION')
@@ -1639,42 +1642,27 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
     assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
     }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'ALL_PERMISSIONS',
+      role: { _id: 'ALL_PERMISSIONS' },
       scope: 'scope',
-      assigned: true
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'MODERATE_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'MODERATE_PERMISSION',
-      scope: 'scope',
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
     }])
 
     Roles.addUsersToRoles(users.eve, ['admin'])
@@ -1682,50 +1670,35 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
     assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
     }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'ALL_PERMISSIONS',
+      role: { _id: 'ALL_PERMISSIONS' },
       scope: 'scope',
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
     }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'MODERATE_PERMISSION',
+      role: { _id: 'admin' },
       scope: null,
-      assigned: false
-    }, {
-      _id: 'MODERATE_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'admin',
-      scope: null,
-      assigned: true
-    }, {
-      _id: 'DELETE_PERMISSION',
-      scope: null,
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'admin' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
     }])
 
     Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
@@ -1733,54 +1706,37 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
     assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
     }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'ALL_PERMISSIONS',
+      role: { _id: 'ALL_PERMISSIONS' },
       scope: 'scope',
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
     }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'MODERATE_PERMISSION',
+      role: { _id: 'admin' },
       scope: null,
-      assigned: false
-    }, {
-      _id: 'MODERATE_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'admin',
-      scope: null,
-      assigned: true
-    }, {
-      _id: 'DELETE_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'DELETE_PERMISSION',
-      scope: 'scope',
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'admin' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
     }])
 
     Roles.removeUsersFromRoles(users.eve, ['admin'])
@@ -1788,50 +1744,29 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
     assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
     }, {
-      _id: 'ALL_PERMISSIONS',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'ALL_PERMISSIONS',
+      role: { _id: 'ALL_PERMISSIONS' },
       scope: 'scope',
-      assigned: true
-    }, {
-      _id: 'EDIT_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'VIEW_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'MODERATE_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'MODERATE_PERMISSION',
-      scope: 'scope',
-      assigned: false
-    }, {
-      _id: 'DELETE_PERMISSION',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'DELETE_PERMISSION',
-      scope: 'scope',
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
     }])
 
     Roles.deleteRole('ALL_PERMISSIONS')
@@ -1842,10 +1777,13 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'user',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' }
+      ]
     }])
   })
 
@@ -1875,34 +1813,28 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
     assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'role1',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
     }, {
-      _id: 'role2',
+      role: { _id: 'role2' },
       scope: null,
-      assigned: true
-    }, {
-      _id: 'COMMON_PERMISSION_1',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'COMMON_PERMISSION_2',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'COMMON_PERMISSION_3',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EXTRA_PERMISSION_ROLE_1',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EXTRA_PERMISSION_ROLE_2',
-      scope: null,
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role2' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_2' }
+      ]
     }])
 
     Roles.removeUsersFromRoles(users.eve, 'role2')
@@ -1911,26 +1843,17 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'role1',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
       scope: null,
-      assigned: true
-    }, {
-      _id: 'COMMON_PERMISSION_1',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'COMMON_PERMISSION_2',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'COMMON_PERMISSION_3',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EXTRA_PERMISSION_ROLE_1',
-      scope: null,
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
     }])
 
     Roles.addUsersToRoles(users.eve, 'role2')
@@ -1939,34 +1862,28 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
     assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'role1',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
     }, {
-      _id: 'role2',
+      role: { _id: 'role2' },
       scope: null,
-      assigned: true
-    }, {
-      _id: 'COMMON_PERMISSION_1',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'COMMON_PERMISSION_2',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'COMMON_PERMISSION_3',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EXTRA_PERMISSION_ROLE_1',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EXTRA_PERMISSION_ROLE_2',
-      scope: null,
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role2' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_2' }
+      ]
     }])
 
     Roles.deleteRole('role2')
@@ -1975,26 +1892,17 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'role1',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
       scope: null,
-      assigned: true
-    }, {
-      _id: 'COMMON_PERMISSION_1',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'COMMON_PERMISSION_2',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'COMMON_PERMISSION_3',
-      scope: null,
-      assigned: false
-    }, {
-      _id: 'EXTRA_PERMISSION_ROLE_1',
-      scope: null,
-      assigned: false
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
     }])
   })
 
@@ -2007,10 +1915,11 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'EDIT_PERMISSION',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
     }])
 
     Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
@@ -2018,10 +1927,11 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'EDIT_PERMISSION',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
     }])
   })
 
@@ -2036,10 +1946,11 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'EDIT_PERMISSION',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
     }])
 
     Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
@@ -2047,10 +1958,11 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'EDIT_PERMISSION',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
     }])
   })
 
@@ -2066,10 +1978,11 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'EDIT_PERMISSION',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
     }])
 
     Roles.addRolesToParent('EDIT_PERMISSION', 'user')
@@ -2077,10 +1990,11 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'EDIT_PERMISSION',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
     }])
 
     Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
@@ -2088,10 +2002,11 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
     assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }), [{
-      _id: 'EDIT_PERMISSION',
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
       scope: null,
-      assigned: true
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
     }])
   })
 

From 9cc76049b5de42beb373ad50225a556399b9a2b6 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 22:30:42 +0400
Subject: [PATCH 0286/1140] Open up for extending `_addUserToRole`

---
 roles/roles_common.js |  2 ++
 roles/tests/server.js | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 3f6b598326..5a7fd108b0 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -486,6 +486,8 @@ Object.assign(Roles, {
         }
       })
     }
+
+    return res
   },
 
   /**
diff --git a/roles/tests/server.js b/roles/tests/server.js
index d5b0603c28..a94b546629 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1498,7 +1498,22 @@ describe('roles', function () {
 
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
 
-    Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })
+    assert.include(
+      Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
+      'insertedId'
+    )
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    assert.notInclude(
+      Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
+      'insertedId'
+    )
 
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
       role: { _id: 'admin' },

From aee26530d9aaf84574807227f1dafedebf9de059 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 22:31:13 +0400
Subject: [PATCH 0287/1140] Hardened methods userInRole(), getRolesForUser()
 and getScopesForUser()

---
 roles/roles_common.js | 13 ++++++-------
 roles/tests/server.js | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 5a7fd108b0..67f6e69fa9 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -467,6 +467,7 @@ Object.assign(Roles, {
       }
     }
 
+    // This might create duplicates, because we don't have a unique index, but that's all right. In case there are two, withdrawing the role will effectively kill them both.
     const res = Meteor.roleAssignment.upsert({
       'user._id': userId,
       'role._id': roleName,
@@ -661,9 +662,7 @@ Object.assign(Roles, {
       anyScope: false
     }, options)
 
-    if (!user) return false
-
-    if (typeof user === 'object') {
+    if (user && typeof user === 'object') {
       id = user._id
     } else {
       id = user
@@ -717,7 +716,7 @@ Object.assign(Roles, {
       anyScope: false
     }, options)
 
-    if (typeof user === 'object') {
+    if (user && typeof user === 'object') {
       id = user._id
     } else {
       id = user
@@ -796,7 +795,7 @@ Object.assign(Roles, {
   getUsersInRole: function (roles, options, queryOptions) {
     var ids
 
-    ids = Roles.getUserAssignmentsForRole(roles, options, {}).fetch().map(a => a.user._id)
+    ids = Roles.getUserAssignmentsForRole(roles, options).fetch().map(a => a.user._id)
 
     return Meteor.users.find({ _id: { $in: ids } }, ((options && options.queryOptions) || queryOptions) || {})
   },
@@ -806,7 +805,7 @@ Object.assign(Roles, {
    *
    * Options:
    *
-   * @method getUsersInRole
+   * @method getUserAssignmentsForRole
    * @param {Array|String} roles Name of role or an array of roles. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
@@ -912,7 +911,7 @@ Object.assign(Roles, {
 
     if (roles && !Array.isArray(roles)) roles = [roles]
 
-    if (typeof user === 'object') {
+    if (user && typeof user === 'object') {
       id = user._id
     } else {
       id = user
diff --git a/roles/tests/server.js b/roles/tests/server.js
index a94b546629..55253053b0 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -727,7 +727,13 @@ describe('roles', function () {
     assert.sameMembers(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
   })
 
-  it('can\'t get roles for non-existant user', function () {
+  it('get an empty list of roles for an empty user', function () {
+    assert.sameMembers(Roles.getRolesForUser(undefined), [])
+    assert.sameMembers(Roles.getRolesForUser(null), [])
+    assert.sameMembers(Roles.getRolesForUser({}), [])
+  })
+  
+  it('get an empty list of roles for non-existant user', function () {
     assert.sameMembers(Roles.getRolesForUser('1'), [])
     assert.sameMembers(Roles.getRolesForUser('1', 'scope1'), [])
   })
@@ -968,6 +974,14 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
   })
 
+  it('returns an empty list of scopes for null as user-id', function () {
+    assert.sameMembers(Roles.getScopesForUser(undefined), [])
+    assert.sameMembers(Roles.getScopesForUser(null), [])
+    assert.sameMembers(Roles.getScopesForUser('foo'), [])
+    assert.sameMembers(Roles.getScopesForUser({}), [])
+    assert.sameMembers(Roles.getScopesForUser({ _id: 'foo' }), [])
+  })
+
   it('can get all scopes for user', function () {
     Roles.createRole('admin')
     Roles.createRole('user')

From 18416cb816b3354beb363d634129e73ebea75b1a Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 22:32:34 +0400
Subject: [PATCH 0288/1140] Added option `anyScope` to removeUsersFromRoles()

---
 roles/roles_common.js | 15 +++++++++++----
 roles/tests/server.js | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 67f6e69fa9..629ab70310 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -558,6 +558,7 @@ Object.assign(Roles, {
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
    *   - `scope`: name of the scope, or `null` for the global role
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *
    * Alternatively, it can be a scope name string.
    * @static
@@ -598,6 +599,7 @@ Object.assign(Roles, {
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:
    *   - `scope`: name of the scope, or `null` for the global role
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    * @private
    * @static
    */
@@ -607,11 +609,16 @@ Object.assign(Roles, {
 
     if (!userId) return
 
-    Meteor.roleAssignment.remove({
+    const selector = {
       'user._id': userId,
-      'role._id': roleName,
-      scope: options.scope
-    })
+      'role._id': roleName
+    }
+
+    if (!options.anyScope) {
+      selector.scope = options.scope
+    }
+
+    Meteor.roleAssignment.remove(selector)
   },
 
   /**
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 55253053b0..5a2aff2fbc 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -602,6 +602,30 @@ describe('roles', function () {
     testUser('joe', [], 'scope2')
   })
 
+  it('can remove multiple users from roles of any scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.joe, users.bob], ['user'], 'scope2')
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['user'], 'scope2')
+    testUser('joe', ['user'], 'scope2')
+
+    Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], { anyScope: true })
+    testUser('eve', ['editor'], 'scope1')
+    testUser('bob', ['editor'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', [], 'scope2')
+    testUser('joe', ['user'], 'scope2')
+  })
+
   it('can set user roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')

From b55874363adbd18f55b67ed85b18dc43a6ae4a10 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 22:33:50 +0400
Subject: [PATCH 0289/1140] Added a migrate and rollback method (tested only
 manually)

---
 roles/roles_server.js | 73 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 0bb898593c..38cf336364 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -282,6 +282,33 @@ Object.assign(Roles, {
     })
   },
 
+  /**
+   * Moves the assignments from `Meteor.users` to `Meteor.roleAssignment`.
+   *
+   * @method _forwardMigrate2
+   * @param {Object} userSelector An opportunity to share the work among instances. It's advisable to do the division based on user-id.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _forwardMigrate2: function (userSelector) {
+    userSelector = userSelector || {}
+    Object.assign(userSelector, { roles: { $ne: null } })
+
+    Meteor.users.find(userSelector).forEach(function (user, index) {
+      user.roles.filter((r) => r.assigned).forEach(r => {
+        // Added `ifExists` to make it less error-prone
+        Roles._addUserToRole(user._id, r._id, { scope: r.scope, ifExists: true })
+      })
+
+      Meteor.users.update({ _id: user._id }, { $unset: { roles: '' } })
+    })
+
+    // No need to keep the indexes around
+    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1')
+    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1')
+  },
+
   /**
    * Migrates `Meteor.users` and `Meteor.roles` to the old format.
    *
@@ -315,5 +342,51 @@ Object.assign(Roles, {
         updateUser(user, Roles._convertToOldField(user.roles, usingGroups))
       }
     })
+  },
+
+  /**
+   * Moves the assignments from `Meteor.roleAssignment` back to to `Meteor.users`.
+   *
+   * @method _backwardMigrate2
+   * @param {Object} assignmentSelector An opportunity to share the work among instances. It's advisable to do the division based on user-id.
+   * @for Roles
+   * @private
+   * @static
+   */
+  _backwardMigrate2: function (assignmentSelector) {
+    assignmentSelector = assignmentSelector || {}
+
+    Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
+    Meteor.users._ensureIndex({ 'roles.scope': 1 })
+
+    Meteor.roleAssignment.find(assignmentSelector).forEach(r => {
+      const roles = Meteor.users.findOne({ _id: r.user._id }).roles || []
+
+      const currentRole = roles.find(oldRole => oldRole._id === r.role._id && oldRole.scope === r.scope)
+      if (currentRole) {
+        currentRole.assigned = true
+      } else {
+        roles.push({
+          _id: r.role._id,
+          scope: r.scope,
+          assigned: true
+        })
+
+        r.inheritedRoles.forEach(inheritedRole => {
+          const currentInheritedRole = roles.find(oldRole => oldRole._id === inheritedRole._id && oldRole.scope === r.scope)
+
+          if (!currentInheritedRole) {
+            roles.push({
+              _id: inheritedRole._id,
+              scope: r.scope,
+              assigned: false
+            })
+          }
+        })
+      }
+
+      Meteor.users.update({ _id: r.user._id }, { $set: { roles } })
+      Meteor.roleAssignment.remove({ _id: r._id })
+    })
   }
 })

From de118fd7e88904d43a95771fbb77a987ceec9f83 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Tue, 19 Feb 2019 16:50:27 +0400
Subject: [PATCH 0290/1140] Add option `onlyScoped` to `getRolesForUser()` to
 allow limiting the result to only scoped permissions

---
 roles/roles_common.js | 16 ++++++++++++----
 roles/tests/server.js | 25 ++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 629ab70310..71243f2eed 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -699,9 +699,12 @@ Object.assign(Roles, {
    * @param {String|Object} user User ID or an actual user object.
    * @param {Object|String} [options] Options:
    *   - `scope`: name of scope to provide roles for; if not specified, global roles are returned
-   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
-   *   - `fullObjects`: return full roles objects (`true`) or just names (`false`) (default `false`)
+   *   - `anyScope`: if set, role can be in any scope (`scope` and `onlyAssigned` options are ignored)
+   *   - `onlyScoped`: if set, only roles in the specified scope are returned
    *   - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)
+   *   - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)
+   *     If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
+   *     result strongly dependant on the internal data structure of this plugin.
    *
    * Alternatively, it can be a scope name string.
    * @return {Array} Array of user's roles, unsorted.
@@ -720,7 +723,8 @@ Object.assign(Roles, {
     options = Object.assign({
       fullObjects: false,
       onlyAssigned: false,
-      anyScope: false
+      anyScope: false,
+      onlyScoped: false
     }, options)
 
     if (user && typeof user === 'object') {
@@ -740,7 +744,11 @@ Object.assign(Roles, {
     }
 
     if (!options.anyScope) {
-      selector.scope = { $in: [options.scope, null] }
+      selector.scope = { $in: [options.scope] }
+
+      if (!options.onlyScoped) {
+        selector.scope.$in.push(null)
+      }
     }
 
     if (options.onlyAssigned) {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 5a2aff2fbc..0d4066f19c 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -756,7 +756,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(null), [])
     assert.sameMembers(Roles.getRolesForUser({}), [])
   })
-  
+
   it('get an empty list of roles for non-existant user', function () {
     assert.sameMembers(Roles.getRolesForUser('1'), [])
     assert.sameMembers(Roles.getRolesForUser('1', 'scope1'), [])
@@ -942,6 +942,29 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
   })
 
+  it('can get only scoped roles for user', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    var userId = users.eve
+
+    // add roles
+    Roles.addUsersToRoles(userId, ['user'], 'scope1')
+    Roles.addUsersToRoles(userId, ['admin'])
+
+    Roles.createRole('PERMISSION')
+    Roles.addRolesToParent('PERMISSION', 'user')
+
+    assert.sameMembers(Roles.getRolesForUser(userId, { onlyScoped: true, scope: 'scope1' }), ['user', 'PERMISSION'])
+    assert.sameMembers(Roles.getRolesForUser(userId, { onlyScoped: true, onlyAssigned: true, scope: 'scope1' }), ['user'])
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { onlyScoped: true, fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }])
+  })
+
   it('can get all roles for user by scope with periods in name', function () {
     Roles.createRole('admin')
 

From 2210c2deeeb2a097ada40ed53e7ecd545f787ac8 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Thu, 7 Mar 2019 10:23:12 +0100
Subject: [PATCH 0291/1140] Removed superfluous call of `_normalizeOptions`

---
 roles/roles_common.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 71243f2eed..75843d8da3 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -63,8 +63,6 @@ Object.assign(Roles, {
    * @static
    */
   createRole: function (roleName, options) {
-    options = Roles._normalizeOptions(options)
-
     Roles._checkRoleName(roleName)
 
     options = Object.assign({

From d5d30e74735b8f3a5b0581d22192d88bb6f2a119 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 22:49:10 +0400
Subject: [PATCH 0292/1140] Fixed mock for `Meteor.user` and defined
 environment for linter in tests

---
 roles/tests/client.js | 20 +++++++++++++++-----
 roles/tests/server.js |  4 +++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/roles/tests/client.js b/roles/tests/client.js
index a9a0b7fced..a340c256a6 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -1,4 +1,6 @@
-/* global Roles, describe, it, beforeEach */
+/* eslint-env mocha */
+/* global Roles */
+
 import { Meteor } from 'meteor/meteor'
 import { Tracker } from 'meteor/tracker'
 import { assert } from 'chai'
@@ -43,10 +45,18 @@ describe('roles', function () {
     })
   }
 
-  // Mock Meteor.user() for isInRole handlebars helper testing
-  Meteor.user = function () {
-    return users.eve
-  }
+  let meteorUserMethod
+  before(() => {
+    meteorUserMethod = Meteor.user
+    // Mock Meteor.user() for isInRole handlebars helper testing
+    Meteor.user = function () {
+      return users.eve
+    }
+  })
+
+  after(() => {
+    Meteor.user = meteorUserMethod
+  })
 
   beforeEach((done) => {
     Meteor.roleAssignment.insert({
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 0d4066f19c..44a6d0a5c4 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1,4 +1,6 @@
-/* global Roles, describe, it, beforeEach */
+/* eslint-env mocha */
+/* global Roles */
+
 import { Meteor } from 'meteor/meteor'
 import { assert } from 'chai'
 

From f59e7822e505ffdfdbb73de014d270cb85af9f8b Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Tue, 21 May 2019 16:42:12 +0400
Subject: [PATCH 0293/1140] Fixed a bug when adding or removing a role to an
 assigned parent-role which itself has child-roles

---
 roles/roles_common.js | 23 ++++++++++++++---------
 roles/tests/server.js | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 75843d8da3..341a44222c 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -256,7 +256,7 @@ Object.assign(Roles, {
       'inheritedRoles._id': parentName
     }, {
       $push: {
-        inheritedRoles: { _id: role._id }
+        inheritedRoles: { $each: [role._id, ...Roles._getInheritedRoleNames(role)].map(r => ({ _id: r })) }
       }
     }, { multi: true })
   },
@@ -317,15 +317,20 @@ Object.assign(Roles, {
     // already not a subrole; in any case we do not have anything more to do
     if (!count) return
 
-    Meteor.roleAssignment.update({
-      'inheritedRoles._id': parentName
-    }, {
-      $pull: {
-        inheritedRoles: {
-          _id: role._id
+    // For all roles who have had it as a dependency ...
+    roles = [...Roles._getParentRoleNames(Meteor.roles.findOne({ _id: parentName })), parentName]
+
+    Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
+      inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
+      Meteor.roleAssignment.update({
+        'role._id': r._id,
+        'inheritedRoles._id': role._id
+      }, {
+        $set: {
+          inheritedRoles: [r._id, ...inheritedRoles].map(r2 => ({ _id: r2 }))
         }
-      }
-    }, { multi: true })
+      }, { multi: true })
+    })
   },
 
   /**
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 44a6d0a5c4..1b3b5ecd08 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1674,6 +1674,49 @@ describe('roles', function () {
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
   })
 
+  it('adds children of the added role to the assignments', function () {
+    Roles.createRole('admin')
+    Roles.createRole('ALBUM.ADMIN')
+    Roles.createRole('ALBUM.VIEW')
+    Roles.createRole('TRACK.ADMIN')
+    Roles.createRole('TRACK.VIEW')
+
+    Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
+    Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
+
+    Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
+
+    Roles.addRolesToParent('TRACK.ADMIN', 'admin')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
+  })
+
+  it('removes children of the removed role from the assignments', function () {
+    Roles.createRole('admin')
+    Roles.createRole('ALBUM.ADMIN')
+    Roles.createRole('ALBUM.VIEW')
+    Roles.createRole('TRACK.ADMIN')
+    Roles.createRole('TRACK.VIEW')
+
+    Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
+    Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
+
+    Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
+    Roles.addRolesToParent('TRACK.ADMIN', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
+
+    Roles.removeRolesFromParent('TRACK.ADMIN', 'admin')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
+  })
+
   it('modify assigned hierarchical roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')

From 8e2d8f20f688e82f6d3472f5302755b67d856c3f Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Fri, 14 Jun 2019 11:09:02 +0200
Subject: [PATCH 0294/1140] Fixed crash when removing a non-existing role

---
 roles/roles_common.js | 4 ++++
 roles/tests/server.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 341a44222c..cf72988f0e 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -508,6 +508,10 @@ Object.assign(Roles, {
   _getParentRoleNames: function (role) {
     var parentRoles
 
+    if (!role) {
+      return []
+    }
+
     parentRoles = new Set([role._id])
 
     parentRoles.forEach(roleName => {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 1b3b5ecd08..b6d4bde512 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -90,6 +90,10 @@ describe('roles', function () {
     assert.equal(typeof Meteor.roles.findOne(), 'undefined')
   })
 
+  it('can try to remove non-existing roles without crashing', function () {
+    Roles.deleteRole('non-existing-role')
+  })
+
   it('can\'t create duplicate roles', function () {
     Roles.createRole('test1')
     assert.throws(function () { Roles.createRole('test1') })

From 0ad199f64c2d06d5b3e2c9aa1ed8cd08aa91e06b Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 23:06:26 +0400
Subject: [PATCH 0295/1140] Install istanbul if not already installed for
 code-coverage

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ffc020bc59..c646a7c4a7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
-    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
+    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; npx istanbul report --include .coverage/summary.json --root . --dir .coverage",
     "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
     "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/"
   },

From 567d2d8f06bdb8018ca39eec5e2eaf34e3c77e5e Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 13 Nov 2019 23:21:50 +0400
Subject: [PATCH 0296/1140] Bump dev tools

---
 package-lock.json | 687 +++++++++++++++++++++++++++++-----------------
 package.json      |   2 +-
 2 files changed, 438 insertions(+), 251 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3210182fa1..ed61e3c4a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,12 +8,12 @@
       "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
     },
     "accepts": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "requires": {
-        "mime-types": "~2.1.18",
-        "negotiator": "0.6.1"
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
       }
     },
     "acorn": {
@@ -98,10 +98,9 @@
       "optional": true
     },
     "async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-      "optional": true
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
     },
     "aws-sign2": {
       "version": "0.5.0",
@@ -138,6 +137,11 @@
           "requires": {
             "ansi-regex": "^2.0.0"
           }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         }
       }
     },
@@ -147,20 +151,35 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "body-parser": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
-      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
       "requires": {
-        "bytes": "3.0.0",
+        "bytes": "3.1.0",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
         "depd": "~1.1.2",
-        "http-errors": "~1.6.3",
-        "iconv-lite": "0.4.23",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
         "on-finished": "~2.3.0",
-        "qs": "6.5.2",
-        "raw-body": "2.3.3",
-        "type-is": "~1.6.16"
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "boom": {
@@ -181,9 +200,9 @@
       }
     },
     "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
     },
     "caller-path": {
       "version": "0.1.0",
@@ -216,6 +235,11 @@
             "color-convert": "^1.9.0"
           }
         },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -272,9 +296,9 @@
       }
     },
     "commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "optional": true
     },
     "concat-map": {
@@ -288,9 +312,12 @@
       "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
     },
     "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
     },
     "content-type": {
       "version": "1.0.4",
@@ -298,9 +325,9 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
     },
     "cookie-signature": {
       "version": "1.0.6",
@@ -335,11 +362,11 @@
       "optional": true
     },
     "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
       "requires": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
     "debug-log": {
@@ -373,6 +400,19 @@
         "uniq": "^1.0.1"
       },
       "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "ignore": {
           "version": "3.3.10",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
@@ -474,18 +514,6 @@
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.2.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
-        },
-        "estraverse": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q="
-        }
       }
     },
     "eslint": {
@@ -533,18 +561,18 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
           "requires": {
-            "ms": "^2.1.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
@@ -565,6 +593,29 @@
       "requires": {
         "debug": "^2.6.9",
         "resolve": "^1.5.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "resolve": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "eslint-module-utils": {
@@ -574,6 +625,21 @@
       "requires": {
         "debug": "^2.6.8",
         "pkg-dir": "^2.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "eslint-plugin-es": {
@@ -602,6 +668,14 @@
         "resolve": "^1.6.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "doctrine": {
           "version": "1.5.0",
           "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
@@ -610,6 +684,19 @@
             "esutils": "^2.0.2",
             "isarray": "^1.0.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "resolve": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
         }
       }
     },
@@ -624,6 +711,16 @@
         "minimatch": "^3.0.4",
         "resolve": "^1.8.1",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "eslint-plugin-promise": {
@@ -655,6 +752,13 @@
       "requires": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+        }
       }
     },
     "eslint-utils": {
@@ -681,9 +785,9 @@
       }
     },
     "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
     },
     "esquery": {
       "version": "1.0.1",
@@ -691,6 +795,13 @@
       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "requires": {
         "estraverse": "^4.0.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+        }
       }
     },
     "esrecurse": {
@@ -699,12 +810,19 @@
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "requires": {
         "estraverse": "^4.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+        }
       }
     },
     "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+      "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q="
     },
     "esutils": {
       "version": "2.0.3",
@@ -717,40 +835,55 @@
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
     "express": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.18.3",
-        "content-disposition": "0.5.2",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.3.1",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.1.1",
+        "finalhandler": "~1.1.2",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
+        "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.4",
-        "qs": "6.5.2",
-        "range-parser": "~1.2.0",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
         "safe-buffer": "5.1.2",
-        "send": "0.16.2",
-        "serve-static": "1.13.2",
-        "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "external-editor": {
@@ -796,17 +929,32 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
-      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.4.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "find-root": {
@@ -849,6 +997,12 @@
         "mime": "~1.2.11"
       },
       "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "optional": true
+        },
         "mime": {
           "version": "1.2.11",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
@@ -888,14 +1042,13 @@
       "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="
     },
     "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
       "requires": {
-        "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "2 || 3",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       }
@@ -906,29 +1059,21 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
     },
     "graceful-fs": {
-      "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
     "handlebars": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-      "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
+      "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
       "requires": {
-        "async": "^2.5.0",
+        "neo-async": "^2.6.0",
         "optimist": "^0.6.1",
         "source-map": "^0.6.1",
         "uglify-js": "^3.1.4"
       },
       "dependencies": {
-        "async": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
-          "requires": {
-            "lodash": "^4.17.10"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -953,9 +1098,9 @@
       }
     },
     "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
     },
     "has-symbols": {
       "version": "1.0.0",
@@ -985,14 +1130,22 @@
       "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg=="
     },
     "http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "requires": {
         "depd": "~1.1.2",
         "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
       }
     },
     "http-signature": {
@@ -1007,9 +1160,9 @@
       }
     },
     "iconv-lite": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -1034,9 +1187,9 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "inquirer": {
       "version": "5.2.0",
@@ -1059,15 +1212,15 @@
       }
     },
     "ip-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-3.0.0.tgz",
-      "integrity": "sha512-T8wDtjy+Qf2TAPDQmBp0eGKJ8GavlWlUnamr3wRn6vvdZlKVuJXXMlSncYFRYgVHOM3If5NR1H4+OvVQU9Idvg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
       "optional": true
     },
     "ipaddr.js": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
     },
     "is-arrayish": {
       "version": "0.2.1",
@@ -1144,48 +1297,6 @@
         "supports-color": "^3.1.0",
         "which": "^1.1.1",
         "wordwrap": "^1.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-        },
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
       }
     },
     "js-tokens": {
@@ -1200,6 +1311,13 @@
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+        }
       }
     },
     "json-parse-better-errors": {
@@ -1319,21 +1437,21 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.37.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-      "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
+      "version": "1.42.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
+      "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="
     },
     "mime-types": {
-      "version": "2.1.21",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
-      "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
+      "version": "2.1.25",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
+      "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
       "requires": {
-        "mime-db": "~1.37.0"
+        "mime-db": "1.42.0"
       }
     },
     "mimic-fn": {
@@ -1350,9 +1468,9 @@
       }
     },
     "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
     },
     "mkdirp": {
       "version": "0.5.1",
@@ -1360,12 +1478,19 @@
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "requires": {
         "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        }
       }
     },
     "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "mute-stream": {
       "version": "0.0.7",
@@ -1378,9 +1503,14 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
     "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+    },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
     },
     "nice-try": {
       "version": "1.0.5",
@@ -1409,6 +1539,16 @@
         "resolve": "^1.10.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "oauth-sign": {
@@ -1531,9 +1671,9 @@
       }
     },
     "parseurl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
     },
     "path-exists": {
       "version": "3.0.0",
@@ -1658,18 +1798,18 @@
       }
     },
     "proxy-addr": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
-      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
       "requires": {
         "forwarded": "~0.1.2",
-        "ipaddr.js": "1.8.0"
+        "ipaddr.js": "1.9.0"
       }
     },
     "psl": {
-      "version": "1.1.31",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
-      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
       "optional": true
     },
     "punycode": {
@@ -1678,23 +1818,23 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
     },
     "range-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
-      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
       "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.3",
-        "iconv-lite": "0.4.23",
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
     },
@@ -1769,12 +1909,9 @@
       }
     },
     "resolve": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
     },
     "resolve-from": {
       "version": "1.0.1",
@@ -1796,6 +1933,21 @@
       "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "requires": {
         "glob": "^7.1.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
       }
     },
     "run-async": {
@@ -1835,9 +1987,9 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
     "send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
       "requires": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -1846,29 +1998,51 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
         "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        }
       }
     },
     "serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
       }
     },
     "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
     },
     "shebang-command": {
       "version": "1.2.0",
@@ -1982,9 +2156,9 @@
       }
     },
     "statuses": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
     "string-width": {
       "version": "2.1.1",
@@ -2045,9 +2219,12 @@
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
     },
     "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+      "requires": {
+        "has-flag": "^1.0.0"
+      }
     },
     "symbol-observable": {
       "version": "1.0.1",
@@ -2085,13 +2262,18 @@
         "os-tmpdir": "~1.0.2"
       }
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
     "tough-cookie": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.0.tgz",
-      "integrity": "sha512-LHMvg+RBP/mAVNqVbOX8t+iJ+tqhBA/t49DuI7+IDAWHrASnesqSu1vWbKB7UrE2yk+HMFUBMadRGMkB4VCfog==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
       "optional": true,
       "requires": {
-        "ip-regex": "^3.0.0",
+        "ip-regex": "^2.1.0",
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
       }
@@ -2111,26 +2293,26 @@
       }
     },
     "type-is": {
-      "version": "1.6.16",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
+        "mime-types": "~2.1.24"
       }
     },
     "uc.micro": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
-      "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "uglify-js": {
-      "version": "3.4.9",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-      "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+      "version": "3.6.9",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz",
+      "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==",
       "optional": true,
       "requires": {
-        "commander": "~2.17.1",
+        "commander": "~2.20.3",
         "source-map": "~0.6.1"
       },
       "dependencies": {
@@ -2192,6 +2374,11 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
     },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index c646a7c4a7..ffc020bc59 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
-    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; npx istanbul report --include .coverage/summary.json --root . --dir .coverage",
+    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
     "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
     "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/"
   },

From 08fc42474a6785df6c866ee83af617e9026fcb2c Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Thu, 14 Nov 2019 12:13:20 +0400
Subject: [PATCH 0297/1140] Fixed examples and updated the readme

---
 History.md                                    |  17 +-
 README.md                                     | 111 ++++++------
 examples/flow-router-advanced/.meteor/release |   2 +-
 .../flow-router-advanced/.meteor/versions     | 163 ++++++++++--------
 .../main/server/startup/publish.js            |   8 +
 .../manageUsers/server/manageUsers.js         |   5 +-
 .../flow-router-advanced/package-lock.json    |  20 +++
 examples/flow-router-advanced/package.json    |   6 +
 examples/flow-router/.meteor/release          |   2 +-
 examples/flow-router/.meteor/versions         | 163 ++++++++++--------
 examples/flow-router/package-lock.json        |  20 +++
 examples/flow-router/package.json             |   6 +
 examples/flow-router/server/server.js         |  13 +-
 examples/iron-router/.meteor/release          |   2 +-
 examples/iron-router/.meteor/versions         | 163 ++++++++++--------
 examples/iron-router/package-lock.json        |  20 +++
 examples/iron-router/package.json             |   6 +
 examples/iron-router/server/server.js         |  13 +-
 roles/client/uiHelpers.js                     |   4 +-
 19 files changed, 461 insertions(+), 283 deletions(-)
 create mode 100644 examples/flow-router-advanced/main/server/startup/publish.js
 create mode 100644 examples/flow-router-advanced/package-lock.json
 create mode 100644 examples/flow-router-advanced/package.json
 create mode 100644 examples/flow-router/package-lock.json
 create mode 100644 examples/flow-router/package.json
 create mode 100644 examples/iron-router/package-lock.json
 create mode 100644 examples/iron-router/package.json

diff --git a/History.md b/History.md
index c04629da05..f15262d459 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,18 @@
 ## v3.0.0
 
-* ...
+* Role assignments have been moved from the `users` documents to a separate collection called `role-assignment`, available at `Meteor.roleAssignment`.
+* Role assignments are not published automatically. If you want all your role-assignments to be published automatically please include the following code:
+```js
+Meteor.publish(null, function () {
+  if (this.userId) {
+    return Meteor.roleAssignment.find({ 'user._id': this.userId });
+  } else {
+    this.ready()
+  }
+})
+```
+* [BC] The behavior of `getRolesForUser()` used with the option `fullObjects` changed. [In case you need the old behavior ...](https://github.com/Meteor-Community-Packages/meteor-roles/pull/276/commits/41d2ed493852f21cf508b5b0b76e4f8a09ae8f5c#diff-b2ab7f7879884835e55802c6a35ee27e)
+* Added option `anyScope` to `removeUsersFromRoles()`
+* Add option `onlyScoped` to `getRolesForUser()` to allow limiting the result to only scoped permissions
+* All functions (excepted for those listed above) work with 2.x arguments, but in 3.x accept extra arguments and/or options.
+* Details and reasoning can be found in [#276](https://github.com/Meteor-Community-Packages/meteor-roles/pull/276)
diff --git a/README.md b/README.md
index 1dfb8b047b..8acc567f8e 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ Thanks to:
   * [@nickmoylan](https://github.com/nickmoylan)
   * [@mcrider](https://github.com/mcrider)
   * [@alanning](https://github.com/alanning)
+  * [@simonsimcity](https://github.com/simonsimcity)
 
 <br />
 
@@ -53,10 +54,9 @@ Thanks to:
 ### Authorization
 
 This package lets you attach roles to a user which you can then check against later when deciding whether to grant
-access to Meteor methods or publish data.  The core concept is very simple, essentially you are attaching roles
-to a user object and then checking for the existence of those roles later. In some sense, it is very similar to
-tags on blog posts. This package provides helper methods to make the process of adding, removing, and verifying
-those roles easier.
+access to Meteor methods or publish data. The core concept is very simple, essentially you are creating an assignment
+of roles to a user and then checking for the existence of those roles later. This package provides helper methods
+to make the process of adding, removing, and verifying those roles easier.
 
 <br />
 
@@ -71,10 +71,10 @@ as, `view-secrets`, `users.view`, or `users.manage`.  Often, more granular is ac
 able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level
 `roles`.  With the `roles` package, it's all just a role object.
 
-Roles can be put into a **hierarchy**.  
+Roles can be put into a **hierarchy**.
 Roles can have multiple parents and can be children (subroles) of multiple roles.
-If a parent role is set to the user, all its descendants are also applying. 
-You can use this to create "super roles" aggregating permissions all the way through the bottom of the tree.  
+If a parent role is set to the user, all its descendants are also applying.
+You can use this to create "super roles" aggregating permissions all the way through the bottom of the tree.
 For example, you could name two top-level roles `user` and `admin` and then you could use your second-level roles as permissions and name them `USERS_VIEW`, `POST_EDIT`, and similar.
 Then you could set `admin` role as parent role for `USERS_VIEW` and `POST_EDIT`, while `user` would be parent
 only of the `POST_EDIT` role. You can then assign `user` and `admin` roles to your users. And if you need to
@@ -96,12 +96,11 @@ Roles.addRolesToParent('POST_EDIT', 'user');
 <a id="roles-scopes" name="roles-scopes"></a>
 ### What are "scopes"?
 
-Sometimes it is useful to let a user have independent sets of roles.  The `roles` package calls these independent
+Sometimes it is useful to let a user have independent sets of roles. The `roles` package calls these independent
 sets "scopes" for lack of a better term. You can use them to represent various communities inside of your
 application. Or maybe your application supports [multiple tenants](https://en.wikipedia.org/wiki/Multitenancy).
 You can put each of those tenants into their own scope. Alternatively, you can use scopes to represent
-various resources you have. But if you really need per-document permissions, if might be that storing permissions
-with documents is a better approach (than one takes by this package, where roles are stored with users).
+various resources you have.
 
 Users can have both scope roles assigned, and global roles. Global roles are in effect for all scopes.
 But scopes are independent from each other. Users can have one set of roles in scope A and another set
@@ -135,27 +134,37 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <a id="roles-changes" name="roles-changes"></a>
 ### Changes to default Meteor behavior
 
-  1. User entries in the `Meteor.users` collection gain a new field named `roles` corresponding to the user's roles.
-  2. A new collection `Meteor.roles` contains a global list of defined role names.
-  3. The currently logged-in user's `roles` field is automatically published to the client.
-  4. All existing roles are automatically published to the client.
+  1. A new collection `Meteor.roleAssignment` contains the information which role has been assigned to which user.
+  1. A new collection `Meteor.roles` contains a global list of defined role names.
+  1. All existing roles are automatically published to the client.
 
 <br />
 
 <a id="roles-installing" name="roles-installing"></a>
 ### Installing
 
-1. Add one of the built-in accounts packages so the `Meteor.users` collection exists.  From a command prompt:
+1. Add one of the built-in accounts packages so the `Meteor.users` collection exists. From a command prompt:
     ```bash
     meteor add accounts-password
     ```
 
-3. Add this package to your project.  From a command prompt:
+1. Add this package to your project. From a command prompt:
     ```bash
     meteor add alanning:roles
     ```
 
-4. Run your application:
+1. Publish the role assignments you need to the client:
+    ```js
+    Meteor.publish(null, function () {
+      if (this.userId) {
+        return Meteor.roleAssignment.find({ 'user._id': this.userId });
+      } else {
+        this.ready()
+      }
+    })
+    ```
+
+1. Run your application:
     ```bash
     meteor
     ```
@@ -163,30 +172,42 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <br />
 
 <a id="roles-migration" name="roles-migration"></a>
-### Migration to 2.0
+### Migration to 3.0
 
-In meteor-roles 2.0, functions are mostly backwards compatible with 1.0, but roles are stored differently in the database. To migrate the database to new schema, run `Meteor._forwardMigrate()` on the server:
+In meteor-roles 3.0, functions are mostly backwards compatible with 2.0, but roles are stored differently in the database. Please take a backup of the `users` collection before migrating. To migrate the database to the new schema, run `Meteor._forwardMigrate2()` on the server:
 
 ```bash
 meteor shell
-> Package['alanning:roles'].Roles._forwardMigrate()
+> Package['alanning:roles'].Roles._forwardMigrate2()
 ```
 
-#### Changes between 1.0 and 2.0
+In case something fails, there is also a script available for rolling back the changes. But be warned that a backward migration takes a magnitude longer than a foward migration. To migrate the database back to the old schema, run `Meteor._backwardMigrate2()` on the server:
 
-Here is the list of important changes between meteor-roles 1.0 and 2.0 to consider when migrating to 2.0:
+```bash
+meteor shell
+> Package['alanning:roles'].Roles._backwardMigrate2()
+```
 
-* New schema for `roles` field and `Meteor.roles` collection.
-* Groups were renamed to scopes.
-* Scopes are always available, if you do not specify a scope, role is seen as a global role.
-* `GLOBAL_GROUP` is deprecated and should not be used anymore (just do not specify a scope, or use `null`).
-* `getGroupsForUser` is deprecated, `getScopesForUser` should be used instead.
-* Functions which modify roles are available both on the client and server side, but should be called on the
-  client side only from inside Meteor methods.
-* `deleteRole` can now delete role even when in use, it is automatically unset from all users.
-* Functions `addRolesToParent` and `removeRolesFromParent` were added.
-* `addUsersToRoles` and `setUserRoles` now require that roles exist and will not create missing roles automatically.
-* All functions work with 1.0 arguments, but in 2.0 accept extra arguments and/or options.
+#### Changes between 2.0 and 3.0
+
+Here is the list of important changes between meteor-roles 2.0 and 3.0 to consider when migrating to 3.0:
+
+* Role assignments have been moved from the `users` documents to a separate collection called `role-assignment`, available at `Meteor.roleAssignment`.
+* Role assignments are not published automatically. If you want all your role-assignments to be published automatically please include the following code:
+```js
+Meteor.publish(null, function () {
+  if (this.userId) {
+    return Meteor.roleAssignment.find({ 'user._id': this.userId });
+  } else {
+    this.ready()
+  }
+})
+```
+* [BC] The behavior of `getRolesForUser()` used with the option `fullObjects` changed. [In case you need the old behavior ...](https://github.com/Meteor-Community-Packages/meteor-roles/pull/276/commits/41d2ed493852f21cf508b5b0b76e4f8a09ae8f5c#diff-b2ab7f7879884835e55802c6a35ee27e)
+* Added option `anyScope` to `removeUsersFromRoles()`
+* Add option `onlyScoped` to `getRolesForUser()` to allow limiting the result to only scoped permissions
+* All functions (excepted for those listed above) work with 2.x arguments, but in 3.x accept extra arguments and/or options.
+* Details and reasoning can be found in [#276](https://github.com/Meteor-Community-Packages/meteor-roles/pull/276)
 
 <br />
 
@@ -221,7 +242,7 @@ users.forEach(function (user) {
     profile: { name: user.name }
   });
 
-  if (user.roles.length > 0) {
+  if (Meteor.roleAssignment.find({ 'user._id': id }).count() === 0) {
     user.roles.forEach(function (role) {
       Roles.createRole(role, {unlessExists: true});
     });
@@ -346,12 +367,13 @@ Meteor.methods({
 
 -- **Client** --
 
-Client javascript has access to all the same Roles functions as the server with the addition of a `isInRole`
-handlebars helper which is automatically registered by the Roles package.
+Client javascript doese not by default have access to all the same Roles functions as the server unless you publish
+these role-assignments. In addition, Blaze will have the addition of a `isInRole` handlebars helper which is
+automatically registered by the Roles package.
 
 As with all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
-since Meteor bundles the same client-side code to all users.  Providing the Roles functions client-side also allows
-for latency compensation during Meteor method calls.  Roles functions which modify the database should not be
+since Meteor bundles the same client-side code to all users. Providing the Roles functions client-side also allows
+for latency compensation during Meteor method calls. Roles functions which modify the database should not be
 called directly, but inside the Meteor methods.
 
 NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends
@@ -395,7 +417,7 @@ To check for roles when using scopes:
 <a id="roles-docs" name="roles-docs"></a>
 ### API Docs
 
-Online API docs found here: http://alanning.github.io/meteor-roles/classes/Roles.html
+Online API docs found here: https://meteor-community-packages.github.io/meteor-roles/
 
 API docs generated using [YUIDoc](http://yui.github.com/yuidoc/)
 
@@ -438,15 +460,6 @@ View the `flow-router` example app online @  <a href="http://roles.meteor.com/"
 <a id="roles-testing" name="roles-testing"></a>
 ### Tests
 
-
 To run tests:
   1. `cd meteor-roles`
-  2. `meteor test-packages ./`
-  3. point browser at http://localhost:3000/
-
-_NOTE_: If you see an error message regarding **"The package named roles does not exist"** that means you are either:
-  a) in the wrong directory or 
-  b) forgot the './' in step 2.  
-
-Step 2 needs to be run in the main 'meteor-roles' directory and the './' is needed because otherwise Meteor
-expects to be in a Meteor app directory.
+  2. `npm run test`
diff --git a/examples/flow-router-advanced/.meteor/release b/examples/flow-router-advanced/.meteor/release
index 3a05e0a2f7..97064e1993 100644
--- a/examples/flow-router-advanced/.meteor/release
+++ b/examples/flow-router-advanced/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.1
+METEOR@1.8.1
diff --git a/examples/flow-router-advanced/.meteor/versions b/examples/flow-router-advanced/.meteor/versions
index 06b0c5f1a5..df592bd5d9 100644
--- a/examples/flow-router-advanced/.meteor/versions
+++ b/examples/flow-router-advanced/.meteor/versions
@@ -1,84 +1,97 @@
-accounts-base@1.2.2
-accounts-password@1.1.4
-accounts-ui@1.1.6
-accounts-ui-unstyled@1.1.8
-alanning:roles@1.2.14
+accounts-base@1.4.3
+accounts-password@1.5.1
+accounts-ui@1.3.1
+accounts-ui-unstyled@1.4.2
+alanning:roles@3.0.0
 alanning:trace@0.0.2
-autoupdate@1.2.4
-babel-compiler@5.8.24_1
-babel-runtime@0.1.4
-base64@1.0.4
-binary-heap@1.0.4
-blaze@2.1.3
+allow-deny@1.1.0
+autoupdate@1.6.0
+babel-compiler@7.3.4
+babel-runtime@1.3.0
+base64@1.0.11
+binary-heap@1.0.11
+blaze@2.3.3
 blaze-html-templates@1.0.1
-blaze-tools@1.0.4
-boilerplate-generator@1.0.4
+blaze-tools@1.0.10
+boilerplate-generator@1.6.0
 bootstrap@1.0.1
-caching-compiler@1.0.0
-caching-html-compiler@1.0.2
-callback-hook@1.0.4
-check@1.1.0
+caching-compiler@1.2.1
+caching-html-compiler@1.0.6
+callback-hook@1.1.0
+check@1.3.1
 coffeescript@1.0.11
 cosmos:browserify@0.9.3
-ddp@1.2.2
-ddp-client@1.2.1
-ddp-common@1.2.2
-ddp-rate-limiter@1.0.0
-ddp-server@1.2.2
-deps@1.0.9
-diff-sequence@1.0.1
-ecmascript@0.1.6
-ecmascript-runtime@0.2.6
-ejson@1.0.7
-email@1.0.8
-fastclick@1.0.7
-geojson-utils@1.0.4
-hot-code-push@1.0.0
-html-tools@1.0.5
-htmljs@1.0.5
-http@1.1.1
-id-map@1.0.4
-jquery@1.11.4
+ddp@1.4.0
+ddp-client@2.3.3
+ddp-common@1.4.0
+ddp-rate-limiter@1.0.7
+ddp-server@2.3.0
+deps@1.0.12
+diff-sequence@1.1.1
+dynamic-import@0.5.1
+ecmascript@0.12.4
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
+ejson@1.1.0
+email@1.2.3
+es5-shim@4.8.0
+fetch@0.1.1
+geojson-utils@1.0.10
+hot-code-push@1.0.4
+html-tools@1.0.11
+htmljs@1.0.11
+id-map@1.1.0
+inter-process-messaging@0.1.0
+jquery@1.11.9
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.10.0
-launch-screen@1.0.4
-less@2.5.1
-livedata@1.0.15
-localstorage@1.0.5
-logging@1.0.8
-meteor@1.1.10
-meteor-base@1.0.1
-minifiers@1.1.7
-minimongo@1.0.10
-mobile-experience@1.0.1
-mobile-status-bar@1.0.6
-mongo@1.1.3
-mongo-id@1.0.1
-npm-bcrypt@0.7.8_2
-npm-mongo@1.4.39_1
-observe-sequence@1.0.7
-ordered-dict@1.0.4
-promise@0.5.1
-random@1.0.5
-rate-limit@1.0.0
-reactive-dict@1.1.3
-reactive-var@1.0.6
-reload@1.1.4
-retry@1.0.4
-routepolicy@1.0.6
-service-configuration@1.0.5
-session@1.1.1
-sha@1.0.4
-spacebars@1.0.7
-spacebars-compiler@1.0.7
+launch-screen@1.1.1
+less@2.8.0
+livedata@1.0.18
+localstorage@1.2.0
+logging@1.1.20
+meteor@1.9.3
+meteor-base@1.4.0
+minifier-css@1.4.2
+minifier-js@2.4.1
+minimongo@1.4.5
+mobile-experience@1.0.5
+mobile-status-bar@1.0.14
+modern-browsers@0.1.4
+modules@0.13.0
+modules-runtime@0.10.3
+mongo@1.6.2
+mongo-decimal@0.1.1
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-bcrypt@0.9.3
+npm-mongo@3.1.2
+observe-sequence@1.0.16
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.1.0
+rate-limit@1.0.9
+reactive-dict@1.3.0
+reactive-var@1.0.11
+reload@1.3.0
+retry@1.1.0
+routepolicy@1.1.0
+service-configuration@1.0.11
+session@1.2.0
+sha@1.0.9
+socket-stream-client@0.2.2
+spacebars@1.0.12
+spacebars-compiler@1.1.1
 spiderable@1.0.9
-srp@1.0.4
-standard-minifiers@1.0.2
-templating@1.1.5
-templating-tools@1.0.0
-tracker@1.0.9
+srp@1.0.12
+standard-minifier-css@1.5.3
+standard-minifier-js@2.4.1
+standard-minifiers@1.1.0
+templating@1.2.14
+templating-tools@1.1.1
+tracker@1.2.0
 ui@1.0.8
-underscore@1.0.4
-url@1.0.5
-webapp@1.2.3
-webapp-hashing@1.0.5
+underscore@1.0.10
+webapp@1.7.3
+webapp-hashing@1.0.9
diff --git a/examples/flow-router-advanced/main/server/startup/publish.js b/examples/flow-router-advanced/main/server/startup/publish.js
new file mode 100644
index 0000000000..6fc34f067e
--- /dev/null
+++ b/examples/flow-router-advanced/main/server/startup/publish.js
@@ -0,0 +1,8 @@
+// Publish all role-assignments
+Meteor.publish(null, function () {
+  if (this.userId) {
+    return Meteor.roleAssignment.find({ 'user._id': this.userId });
+  } else {
+    this.ready();
+  }
+});
diff --git a/examples/flow-router-advanced/manageUsers/server/manageUsers.js b/examples/flow-router-advanced/manageUsers/server/manageUsers.js
index f6e0e2a751..51eb067d36 100644
--- a/examples/flow-router-advanced/manageUsers/server/manageUsers.js
+++ b/examples/flow-router-advanced/manageUsers/server/manageUsers.js
@@ -11,7 +11,10 @@ Meteor.publish("users", function () {
 
   if (Roles.userIsInRole(this.userId, ["admin","manage-users"])) {
     console.log('publishing users', this.userId)
-    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}})
+    return [
+      Meteor.roleAssignment.find({}),
+      Meteor.users.find({}, {fields: {emails: 1, profile: 1}})
+    ];
   } 
 
   this.stop()
diff --git a/examples/flow-router-advanced/package-lock.json b/examples/flow-router-advanced/package-lock.json
new file mode 100644
index 0000000000..4a9996270f
--- /dev/null
+++ b/examples/flow-router-advanced/package-lock.json
@@ -0,0 +1,20 @@
+{
+  "name": "flow-router-advanced",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/runtime": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz",
+      "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==",
+      "requires": {
+        "regenerator-runtime": "^0.13.2"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+    }
+  }
+}
diff --git a/examples/flow-router-advanced/package.json b/examples/flow-router-advanced/package.json
new file mode 100644
index 0000000000..5ac4ef54a8
--- /dev/null
+++ b/examples/flow-router-advanced/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "flow-router-advanced",
+  "dependencies": {
+    "@babel/runtime": "^7.7.2"
+  }
+}
diff --git a/examples/flow-router/.meteor/release b/examples/flow-router/.meteor/release
index 3a05e0a2f7..97064e1993 100644
--- a/examples/flow-router/.meteor/release
+++ b/examples/flow-router/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.1
+METEOR@1.8.1
diff --git a/examples/flow-router/.meteor/versions b/examples/flow-router/.meteor/versions
index 06b0c5f1a5..df592bd5d9 100644
--- a/examples/flow-router/.meteor/versions
+++ b/examples/flow-router/.meteor/versions
@@ -1,84 +1,97 @@
-accounts-base@1.2.2
-accounts-password@1.1.4
-accounts-ui@1.1.6
-accounts-ui-unstyled@1.1.8
-alanning:roles@1.2.14
+accounts-base@1.4.3
+accounts-password@1.5.1
+accounts-ui@1.3.1
+accounts-ui-unstyled@1.4.2
+alanning:roles@3.0.0
 alanning:trace@0.0.2
-autoupdate@1.2.4
-babel-compiler@5.8.24_1
-babel-runtime@0.1.4
-base64@1.0.4
-binary-heap@1.0.4
-blaze@2.1.3
+allow-deny@1.1.0
+autoupdate@1.6.0
+babel-compiler@7.3.4
+babel-runtime@1.3.0
+base64@1.0.11
+binary-heap@1.0.11
+blaze@2.3.3
 blaze-html-templates@1.0.1
-blaze-tools@1.0.4
-boilerplate-generator@1.0.4
+blaze-tools@1.0.10
+boilerplate-generator@1.6.0
 bootstrap@1.0.1
-caching-compiler@1.0.0
-caching-html-compiler@1.0.2
-callback-hook@1.0.4
-check@1.1.0
+caching-compiler@1.2.1
+caching-html-compiler@1.0.6
+callback-hook@1.1.0
+check@1.3.1
 coffeescript@1.0.11
 cosmos:browserify@0.9.3
-ddp@1.2.2
-ddp-client@1.2.1
-ddp-common@1.2.2
-ddp-rate-limiter@1.0.0
-ddp-server@1.2.2
-deps@1.0.9
-diff-sequence@1.0.1
-ecmascript@0.1.6
-ecmascript-runtime@0.2.6
-ejson@1.0.7
-email@1.0.8
-fastclick@1.0.7
-geojson-utils@1.0.4
-hot-code-push@1.0.0
-html-tools@1.0.5
-htmljs@1.0.5
-http@1.1.1
-id-map@1.0.4
-jquery@1.11.4
+ddp@1.4.0
+ddp-client@2.3.3
+ddp-common@1.4.0
+ddp-rate-limiter@1.0.7
+ddp-server@2.3.0
+deps@1.0.12
+diff-sequence@1.1.1
+dynamic-import@0.5.1
+ecmascript@0.12.4
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
+ejson@1.1.0
+email@1.2.3
+es5-shim@4.8.0
+fetch@0.1.1
+geojson-utils@1.0.10
+hot-code-push@1.0.4
+html-tools@1.0.11
+htmljs@1.0.11
+id-map@1.1.0
+inter-process-messaging@0.1.0
+jquery@1.11.9
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.10.0
-launch-screen@1.0.4
-less@2.5.1
-livedata@1.0.15
-localstorage@1.0.5
-logging@1.0.8
-meteor@1.1.10
-meteor-base@1.0.1
-minifiers@1.1.7
-minimongo@1.0.10
-mobile-experience@1.0.1
-mobile-status-bar@1.0.6
-mongo@1.1.3
-mongo-id@1.0.1
-npm-bcrypt@0.7.8_2
-npm-mongo@1.4.39_1
-observe-sequence@1.0.7
-ordered-dict@1.0.4
-promise@0.5.1
-random@1.0.5
-rate-limit@1.0.0
-reactive-dict@1.1.3
-reactive-var@1.0.6
-reload@1.1.4
-retry@1.0.4
-routepolicy@1.0.6
-service-configuration@1.0.5
-session@1.1.1
-sha@1.0.4
-spacebars@1.0.7
-spacebars-compiler@1.0.7
+launch-screen@1.1.1
+less@2.8.0
+livedata@1.0.18
+localstorage@1.2.0
+logging@1.1.20
+meteor@1.9.3
+meteor-base@1.4.0
+minifier-css@1.4.2
+minifier-js@2.4.1
+minimongo@1.4.5
+mobile-experience@1.0.5
+mobile-status-bar@1.0.14
+modern-browsers@0.1.4
+modules@0.13.0
+modules-runtime@0.10.3
+mongo@1.6.2
+mongo-decimal@0.1.1
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-bcrypt@0.9.3
+npm-mongo@3.1.2
+observe-sequence@1.0.16
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.1.0
+rate-limit@1.0.9
+reactive-dict@1.3.0
+reactive-var@1.0.11
+reload@1.3.0
+retry@1.1.0
+routepolicy@1.1.0
+service-configuration@1.0.11
+session@1.2.0
+sha@1.0.9
+socket-stream-client@0.2.2
+spacebars@1.0.12
+spacebars-compiler@1.1.1
 spiderable@1.0.9
-srp@1.0.4
-standard-minifiers@1.0.2
-templating@1.1.5
-templating-tools@1.0.0
-tracker@1.0.9
+srp@1.0.12
+standard-minifier-css@1.5.3
+standard-minifier-js@2.4.1
+standard-minifiers@1.1.0
+templating@1.2.14
+templating-tools@1.1.1
+tracker@1.2.0
 ui@1.0.8
-underscore@1.0.4
-url@1.0.5
-webapp@1.2.3
-webapp-hashing@1.0.5
+underscore@1.0.10
+webapp@1.7.3
+webapp-hashing@1.0.9
diff --git a/examples/flow-router/package-lock.json b/examples/flow-router/package-lock.json
new file mode 100644
index 0000000000..b6bcd6bbab
--- /dev/null
+++ b/examples/flow-router/package-lock.json
@@ -0,0 +1,20 @@
+{
+  "name": "flow-router",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/runtime": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz",
+      "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==",
+      "requires": {
+        "regenerator-runtime": "^0.13.2"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+    }
+  }
+}
diff --git a/examples/flow-router/package.json b/examples/flow-router/package.json
new file mode 100644
index 0000000000..d79c6aa859
--- /dev/null
+++ b/examples/flow-router/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "flow-router",
+  "dependencies": {
+    "@babel/runtime": "^7.7.2"
+  }
+}
diff --git a/examples/flow-router/server/server.js b/examples/flow-router/server/server.js
index dd853ac8a2..7ad399f4cc 100644
--- a/examples/flow-router/server/server.js
+++ b/examples/flow-router/server/server.js
@@ -81,6 +81,14 @@ Meteor.startup(function () {
 // Publish
 //
 
+// Publish all role-assignments
+Meteor.publish(null, function () {
+  if (this.userId) {
+    return Meteor.roleAssignment.find({ 'user._id': this.userId });
+  } else {
+    this.ready();
+  }
+});
 
 // Authorized users can view secrets
 Meteor.publish("secrets", function () {
@@ -101,7 +109,10 @@ Meteor.publish("users", function () {
 
   if (Roles.userIsInRole(user, ["admin","manage-users"])) {
     console.log('publishing users', this.userId);
-    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
+    return [
+      Meteor.roleAssignment.find({}),
+      Meteor.users.find({}, {fields: {emails: 1, profile: 1}})
+    ];
   }
 
   this.stop();
diff --git a/examples/iron-router/.meteor/release b/examples/iron-router/.meteor/release
index 3a05e0a2f7..97064e1993 100644
--- a/examples/iron-router/.meteor/release
+++ b/examples/iron-router/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.1
+METEOR@1.8.1
diff --git a/examples/iron-router/.meteor/versions b/examples/iron-router/.meteor/versions
index 3b792d42a2..2cfb894bb5 100644
--- a/examples/iron-router/.meteor/versions
+++ b/examples/iron-router/.meteor/versions
@@ -1,41 +1,46 @@
-accounts-base@1.2.2
-accounts-password@1.1.4
-accounts-ui@1.1.6
-accounts-ui-unstyled@1.1.8
-alanning:roles@1.2.14
+accounts-base@1.4.3
+accounts-password@1.5.1
+accounts-ui@1.3.1
+accounts-ui-unstyled@1.4.2
+alanning:roles@3.0.0
 alanning:trace@0.0.2
-autoupdate@1.2.4
-babel-compiler@5.8.24_1
-babel-runtime@0.1.4
-base64@1.0.4
-binary-heap@1.0.4
-blaze@2.1.3
+allow-deny@1.1.0
+autoupdate@1.6.0
+babel-compiler@7.3.4
+babel-runtime@1.3.0
+base64@1.0.11
+binary-heap@1.0.11
+blaze@2.3.3
 blaze-html-templates@1.0.1
-blaze-tools@1.0.4
-boilerplate-generator@1.0.4
+blaze-tools@1.0.10
+boilerplate-generator@1.6.0
 bootstrap@1.0.1
-caching-compiler@1.0.0
-caching-html-compiler@1.0.2
-callback-hook@1.0.4
-check@1.1.0
-ddp@1.2.2
-ddp-client@1.2.1
-ddp-common@1.2.2
-ddp-rate-limiter@1.0.0
-ddp-server@1.2.2
-deps@1.0.9
-diff-sequence@1.0.1
-ecmascript@0.1.6
-ecmascript-runtime@0.2.6
-ejson@1.0.7
-email@1.0.8
-fastclick@1.0.7
-geojson-utils@1.0.4
-hot-code-push@1.0.0
-html-tools@1.0.5
-htmljs@1.0.5
-http@1.1.1
-id-map@1.0.4
+caching-compiler@1.2.1
+caching-html-compiler@1.0.6
+callback-hook@1.1.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.3.3
+ddp-common@1.4.0
+ddp-rate-limiter@1.0.7
+ddp-server@2.3.0
+deps@1.0.12
+diff-sequence@1.1.1
+dynamic-import@0.5.1
+ecmascript@0.12.4
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
+ejson@1.1.0
+email@1.2.3
+es5-shim@4.8.0
+fetch@0.1.1
+geojson-utils@1.0.10
+hot-code-push@1.0.4
+html-tools@1.0.11
+htmljs@1.0.11
+id-map@1.1.0
+inter-process-messaging@0.1.0
 iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
@@ -44,45 +49,53 @@ iron:location@1.0.11
 iron:middleware-stack@1.0.11
 iron:router@1.0.12
 iron:url@1.0.11
-jquery@1.11.4
-launch-screen@1.0.4
-less@2.5.1
-livedata@1.0.15
-localstorage@1.0.5
-logging@1.0.8
-meteor@1.1.10
-meteor-base@1.0.1
-minifiers@1.1.7
-minimongo@1.0.10
-mobile-experience@1.0.1
-mobile-status-bar@1.0.6
-mongo@1.1.3
-mongo-id@1.0.1
-npm-bcrypt@0.7.8_2
-npm-mongo@1.4.39_1
-observe-sequence@1.0.7
-ordered-dict@1.0.4
-promise@0.5.1
-random@1.0.5
-rate-limit@1.0.0
-reactive-dict@1.1.3
-reactive-var@1.0.6
-reload@1.1.4
-retry@1.0.4
-routepolicy@1.0.6
-service-configuration@1.0.5
-session@1.1.1
-sha@1.0.4
-spacebars@1.0.7
-spacebars-compiler@1.0.7
+jquery@1.11.9
+launch-screen@1.1.1
+less@2.8.0
+livedata@1.0.18
+localstorage@1.2.0
+logging@1.1.20
+meteor@1.9.3
+meteor-base@1.4.0
+minifier-css@1.4.2
+minifier-js@2.4.1
+minimongo@1.4.5
+mobile-experience@1.0.5
+mobile-status-bar@1.0.14
+modern-browsers@0.1.4
+modules@0.13.0
+modules-runtime@0.10.3
+mongo@1.6.2
+mongo-decimal@0.1.1
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-bcrypt@0.9.3
+npm-mongo@3.1.2
+observe-sequence@1.0.16
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.1.0
+rate-limit@1.0.9
+reactive-dict@1.3.0
+reactive-var@1.0.11
+reload@1.3.0
+retry@1.1.0
+routepolicy@1.1.0
+service-configuration@1.0.11
+session@1.2.0
+sha@1.0.9
+socket-stream-client@0.2.2
+spacebars@1.0.12
+spacebars-compiler@1.1.1
 spiderable@1.0.9
-srp@1.0.4
-standard-minifiers@1.0.2
-templating@1.1.5
-templating-tools@1.0.0
-tracker@1.0.9
+srp@1.0.12
+standard-minifier-css@1.5.3
+standard-minifier-js@2.4.1
+standard-minifiers@1.1.0
+templating@1.2.14
+templating-tools@1.1.1
+tracker@1.2.0
 ui@1.0.8
-underscore@1.0.4
-url@1.0.5
-webapp@1.2.3
-webapp-hashing@1.0.5
+underscore@1.0.10
+webapp@1.7.3
+webapp-hashing@1.0.9
diff --git a/examples/iron-router/package-lock.json b/examples/iron-router/package-lock.json
new file mode 100644
index 0000000000..a6030f11df
--- /dev/null
+++ b/examples/iron-router/package-lock.json
@@ -0,0 +1,20 @@
+{
+  "name": "iron-router",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/runtime": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz",
+      "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==",
+      "requires": {
+        "regenerator-runtime": "^0.13.2"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+    }
+  }
+}
diff --git a/examples/iron-router/package.json b/examples/iron-router/package.json
new file mode 100644
index 0000000000..fe29949d08
--- /dev/null
+++ b/examples/iron-router/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "iron-router",
+  "dependencies": {
+    "@babel/runtime": "^7.7.2"
+  }
+}
diff --git a/examples/iron-router/server/server.js b/examples/iron-router/server/server.js
index 8df5daa892..09bedaf70a 100644
--- a/examples/iron-router/server/server.js
+++ b/examples/iron-router/server/server.js
@@ -81,6 +81,14 @@ Meteor.startup(function () {
 // Publish
 //
 
+// Publish all role-assignments
+Meteor.publish(null, function () {
+  if (this.userId) {
+    return Meteor.roleAssignment.find({ 'user._id': this.userId });
+  } else {
+    this.ready();
+  }
+});
 
 // Authorized users can view secrets
 Meteor.publish("secrets", function () {
@@ -101,7 +109,10 @@ Meteor.publish("users", function () {
 
   if (Roles.userIsInRole(user, ["admin","manage-users"])) {
     console.log('publishing users', this.userId);
-    return Meteor.users.find({}, {fields: {emails: 1, profile: 1, roles: 1}});
+    return [
+      Meteor.roleAssignment.find({}),
+      Meteor.users.find({}, {fields: {emails: 1, profile: 1}})
+    ];
   }
 
   this.stop();
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 618aafae27..7ee2991c21 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -51,10 +51,10 @@ Roles._uiHelpers = {
 
     if (comma !== -1) {
       roles = role.split(',').reduce(function (memo, r) {
-        if (!r || !Roles._trim(r)) {
+        if (!r) {
           return memo
         }
-        memo.push(Roles._trim(r))
+        memo.push(r)
         return memo
       }, [])
     } else {

From afef7da5d2cf618693782e907a6b5d15dffe895e Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Thu, 14 Nov 2019 12:16:44 +0400
Subject: [PATCH 0298/1140] Version bump

---
 .versions | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.versions b/.versions
index 2b01b00a97..553e026909 100644
--- a/.versions
+++ b/.versions
@@ -1,6 +1,5 @@
 accounts-base@1.4.4
-accounts-password@1.5.1
-alanning:roles@2.0.1
+alanning:roles@3.0.0
 allow-deny@1.1.0
 babel-compiler@7.3.4
 babel-runtime@1.3.0
@@ -21,15 +20,19 @@ ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.8.0
 ecmascript-runtime-server@0.7.1
 ejson@1.1.0
-email@1.2.3
 fetch@0.1.1
 geojson-utils@1.0.10
+http@1.4.2
 id-map@1.1.0
 inter-process-messaging@0.1.0
-local-test:alanning:roles@2.0.1
+lmieulet:meteor-coverage@3.0.0
+lmieulet:meteor-packages-coverage@0.2.0
+local-test:alanning:roles@3.0.0
 localstorage@1.2.0
 logging@1.1.20
 meteor@1.9.3
+meteortesting:browser-tests@0.1.2
+meteortesting:mocha@0.4.4
 minimongo@1.4.5
 modern-browsers@0.1.4
 modules@0.13.0
@@ -38,9 +41,9 @@ mongo@1.6.3
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
-npm-bcrypt@0.9.3
 npm-mongo@3.1.2
 ordered-dict@1.1.0
+practicalmeteor:mocha-core@1.0.1
 promise@0.11.2
 random@1.1.0
 rate-limit@1.0.9
@@ -49,11 +52,9 @@ reload@1.3.0
 retry@1.1.0
 routepolicy@1.1.0
 service-configuration@1.0.11
-sha@1.0.9
 socket-stream-client@0.2.2
-srp@1.0.12
-tinytest@1.1.0
 tracker@1.2.0
 underscore@1.0.10
+url@1.2.0
 webapp@1.7.4
 webapp-hashing@1.0.9

From d916aebd3ae99c42140f1b4df0725c59d48ca004 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Thu, 14 Nov 2019 12:18:32 +0400
Subject: [PATCH 0299/1140] Fixed version number in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8acc567f8e..c8484feeb0 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ There are also older versions of this package:
 * [What are "scopes"?](#roles-scopes)
 * [Changes to default Meteor](#roles-changes)
 * [Installation](#roles-installing)
-* [Migration to 2.0](#roles-migration)
+* [Migration to 3.0](#roles-migration)
 * [Usage examples](#roles-usage)
 * [Online API docs](#roles-docs)
 * [Example apps](#roles-example-apps)

From ad88577fe37259bf4b1f2a0b2109d3acd21723eb Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Thu, 14 Nov 2019 12:26:56 +0400
Subject: [PATCH 0300/1140] Allow setUserRoles() to replace the roles of all
 scopes

---
 roles/roles_common.js | 11 +++++++++--
 roles/tests/server.js | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index cf72988f0e..ce8d29bb5a 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -401,6 +401,7 @@ Object.assign(Roles, {
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
    *   - `scope`: name of the scope, or `null` for the global role
+   *   - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
    *
    * Alternatively, it can be a scope name string.
@@ -421,7 +422,8 @@ Object.assign(Roles, {
     Roles._checkScopeName(options.scope)
 
     options = Object.assign({
-      ifExists: false
+      ifExists: false,
+      anyScope: false
     }, options)
 
     users.forEach(function (user) {
@@ -431,7 +433,12 @@ Object.assign(Roles, {
         id = user
       }
       // we first clear all roles for the user
-      Meteor.roleAssignment.remove({ 'user._id': id, scope: options.scope })
+      const selector = { 'user._id': id }
+      if (!options.anyScope) {
+        selector.scope = options.scope
+      }
+
+      Meteor.roleAssignment.remove(selector)
 
       // and then add all
       roles.forEach(function (role) {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index b6d4bde512..70be6e8537 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -743,6 +743,33 @@ describe('roles', function () {
     testUser('eve', ['editor'])
   })
 
+  it('can set user roles by scope and anyScope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('editor')
+
+    var eve = Meteor.users.findOne({ _id: users.eve })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+
+    Roles.addUsersToRoles(eve, 'admin')
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    Roles.setUserRoles(eve, 'editor', { anyScope: true, scope: 'scope2' })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'editor' },
+      scope: 'scope2',
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'editor' }]
+    }])
+  })
+
   it('can get all roles', function () {
     roles.forEach(function (role) {
       Roles.createRole(role)

From 2d8cf8178c8f8024cbd40936ebb30f524f2bcdd5 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Thu, 14 Nov 2019 12:37:52 +0400
Subject: [PATCH 0301/1140] Bump version

---
 .versions  | 4 ++--
 History.md | 4 ++++
 package.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index 553e026909..bd6c7b20ac 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@1.4.4
-alanning:roles@3.0.0
+alanning:roles@3.1.0
 allow-deny@1.1.0
 babel-compiler@7.3.4
 babel-runtime@1.3.0
@@ -27,7 +27,7 @@ id-map@1.1.0
 inter-process-messaging@0.1.0
 lmieulet:meteor-coverage@3.0.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.0.0
+local-test:alanning:roles@3.1.0
 localstorage@1.2.0
 logging@1.1.20
 meteor@1.9.3
diff --git a/History.md b/History.md
index f15262d459..7cd1fd511f 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+## v3.1.0
+
+* Allow setUserRoles() to replace the roles of all scopes [#294](https://github.com/Meteor-Community-Packages/meteor-roles/pull/294)
+
 ## v3.0.0
 
 * Role assignments have been moved from the `users` documents to a separate collection called `role-assignment`, available at `Meteor.roleAssignment`.
diff --git a/package.js b/package.js
index 4f8cd12c0b..34aab327c4 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.0.0',
+  version: '3.1.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From 84736398bac15cfc5c1e677f9ede1bfc91602296 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Sat, 16 Nov 2019 15:52:02 +0400
Subject: [PATCH 0302/1140] Readme: Advise to upgrade to 2.x first

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c8484feeb0..5de93d6d27 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,9 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <a id="roles-migration" name="roles-migration"></a>
 ### Migration to 3.0
 
-In meteor-roles 3.0, functions are mostly backwards compatible with 2.0, but roles are stored differently in the database. Please take a backup of the `users` collection before migrating. To migrate the database to the new schema, run `Meteor._forwardMigrate2()` on the server:
+If you are currently using this package in a version older than 2.x, please upgrade to 2.0 by running the migration script required there: https://github.com/Meteor-Community-Packages/meteor-roles/tree/v2#migration-to-20
+
+In meteor-roles 3.0, functions are mostly backwards compatible with 2.x, but roles are stored differently in the database. Please take a backup of the `users` collection before migrating. To migrate the database to the new schema, run `Meteor._forwardMigrate2()` on the server:
 
 ```bash
 meteor shell
@@ -188,9 +190,9 @@ meteor shell
 > Package['alanning:roles'].Roles._backwardMigrate2()
 ```
 
-#### Changes between 2.0 and 3.0
+#### Changes between 2.x and 3.0
 
-Here is the list of important changes between meteor-roles 2.0 and 3.0 to consider when migrating to 3.0:
+Here is the list of important changes between meteor-roles 2.x and 3.0 to consider when migrating to 3.0:
 
 * Role assignments have been moved from the `users` documents to a separate collection called `role-assignment`, available at `Meteor.roleAssignment`.
 * Role assignments are not published automatically. If you want all your role-assignments to be published automatically please include the following code:

From 73ce174eb2ea21c24f1fe278ac280d94910f759b Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Tue, 26 Nov 2019 15:25:37 -0800
Subject: [PATCH 0303/1140] changes for issue 298

---
 roles/tests/client.js |  24 +++++-
 roles/tests/server.js | 174 ++++++++++++++++++++++++------------------
 2 files changed, 118 insertions(+), 80 deletions(-)

diff --git a/roles/tests/client.js b/roles/tests/client.js
index a340c256a6..63ac14eda5 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -28,9 +28,12 @@ describe('roles', function () {
     }
   }
 
-  function testUser (username, expectedRoles, group) {
+  function testUser (username, expectedRoles, scope) {
     var user = users[username]
-
+    console.log(`testUser client scope=${typeof scope}`);
+    if(typeof scope == 'string') {
+      scope = {scope: scope}
+    }
     // test using user object rather than userId to avoid mocking
     roles.forEach(function (role) {
       var expected = expectedRoles.includes(role)
@@ -38,9 +41,9 @@ describe('roles', function () {
       var nmsg = username + ' had un-expected permission ' + role
 
       if (expected) {
-        assert.isTrue(Roles.userIsInRole(user, role, group), msg)
+        assert.isTrue(Roles.userIsInRole(user, role, scope), msg)
       } else {
-        assert.isFalse(Roles.userIsInRole(user, role, group), nmsg)
+        assert.isFalse(Roles.userIsInRole(user, role, scope), nmsg)
       }
     })
   }
@@ -88,6 +91,12 @@ describe('roles', function () {
       role: { _id: 'admin' },
       inheritedRoles: [{ _id: 'admin' }]
     })
+    Meteor.roleAssignment.insert({
+      user: users.joe,
+      role: { _id: 'admin' },
+      inheritedRoles: [{ _id: 'admin' }],
+      scope: 'group1'
+    })
     Meteor.roleAssignment.insert({
       user: users.joe,
       role: { _id: 'editor' },
@@ -147,4 +156,11 @@ describe('roles', function () {
     testUser('joe', ['admin'], Roles.GLOBAL_GROUP)
     testUser('joe', ['admin', 'editor'], 'group1')
   })
+
+  it('check if user is in role with scope only, ignoring global', function(){
+    // this is supposed to be true
+    testUser('joe', ['admin'], { scope: 'group1', onlyScoped: true })
+    // this is supposed to fail
+    testUser('eve', ['admin'], { scope: 'group1', onlyScoped: true })
+  })
 })
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 70be6e8537..9983954669 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -18,6 +18,7 @@ Meteor.roleAssignment.allow({
 describe('roles', function () {
   var users = {}
   var roles = ['admin', 'editor', 'user']
+  const allTests = false;
 
   Meteor.publish('_roleAssignments', function () {
     var loggedInUserId = this.userId
@@ -38,6 +39,11 @@ describe('roles', function () {
     var userId = users[username]
     var userObj = Meteor.users.findOne({ _id: userId })
 
+    // console.log(`testUser server scope=${typeof scope}`);
+    if (typeof scope == 'string') {
+      scope = { scope: scope }
+    }
+
     // check using user ids (makes db calls)
     _innerTest(userId, username, expectedRoles, scope)
 
@@ -72,7 +78,7 @@ describe('roles', function () {
     }
   })
 
-  it('can create and delete roles', function () {
+  if(allTests) it('can create and delete roles', function () {
     var role1Id = Roles.createRole('test1')
     assert.equal(Meteor.roles.findOne()._id, 'test1')
     assert.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
@@ -90,17 +96,17 @@ describe('roles', function () {
     assert.equal(typeof Meteor.roles.findOne(), 'undefined')
   })
 
-  it('can try to remove non-existing roles without crashing', function () {
+  if(allTests) it('can try to remove non-existing roles without crashing', function () {
     Roles.deleteRole('non-existing-role')
   })
 
-  it('can\'t create duplicate roles', function () {
+  if(allTests) it('can\'t create duplicate roles', function () {
     Roles.createRole('test1')
     assert.throws(function () { Roles.createRole('test1') })
     assert.isNull(Roles.createRole('test1', { unlessExists: true }))
   })
 
-  it('can\'t create role with empty names', function () {
+  if(allTests) it('can\'t create role with empty names', function () {
     assert.throws(function () {
       Roles.createRole('')
     }, /Invalid role name/)
@@ -118,7 +124,7 @@ describe('roles', function () {
     }, /Invalid role name/)
   })
 
-  it('can\'t use invalid scope names', function () {
+  if(allTests) it('can\'t use invalid scope names', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -142,7 +148,7 @@ describe('roles', function () {
     }, /Invalid scope name/)
   })
 
-  it('can check if user is in role', function () {
+  if(allTests) it('can check if user is in role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.addUsersToRoles(users.eve, ['admin', 'user'])
@@ -150,7 +156,7 @@ describe('roles', function () {
     testUser('eve', ['admin', 'user'])
   })
 
-  it('can check if user is in role by scope', function () {
+  if(allTests) it('can check if user is in role by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -167,7 +173,7 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], { anyScope: true }))
   })
 
-  it('can check if user is in role by scope through options', function () {
+  if(allTests) it('can check if user is in role by scope through options', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -178,7 +184,7 @@ describe('roles', function () {
     testUser('eve', ['editor'], { scope: 'scope2' })
   })
 
-  it('can check if user is in role by scope with global role', function () {
+  if(allTests) it('can check if user is in role by scope with global role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -203,7 +209,7 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
   })
 
-  it('renaming scopes', function () {
+  if(allTests) it('renaming scopes', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -248,7 +254,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
   })
 
-  it('removing scopes', function () {
+  if(allTests) it('removing scopes', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -266,15 +272,15 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
   })
 
-  it('can check if non-existant user is in role', function () {
+  if(allTests) it('can check if non-existant user is in role', function () {
     assert.isFalse(Roles.userIsInRole('1', 'admin'))
   })
 
-  it('can check if null user is in role', function () {
+  if(allTests) it('can check if null user is in role', function () {
     assert.isFalse(Roles.userIsInRole(null, 'admin'))
   })
 
-  it('can check user against several roles at once', function () {
+  if(allTests) it('can check user against several roles at once', function () {
     var user
 
     Roles.createRole('admin')
@@ -287,35 +293,35 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
   })
 
-  it('can\'t add non-existent user to role', function () {
+  if(allTests) it('can\'t add non-existent user to role', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(['1'], ['admin'])
     assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
   })
 
-  it('can\'t add user to non-existent role', function () {
+  if(allTests) it('can\'t add user to non-existent role', function () {
     assert.throws(function () {
       Roles.addUsersToRoles(users.eve, ['admin'])
     }, /Role 'admin' does not exist/)
     Roles.addUsersToRoles(users.eve, ['admin'], { ifExists: true })
   })
 
-  it('can\'t set non-existent user to role', function () {
+  if(allTests) it('can\'t set non-existent user to role', function () {
     Roles.createRole('admin')
 
     Roles.setUserRoles(['1'], ['admin'])
     assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
   })
 
-  it('can\'t set user to non-existent role', function () {
+  if(allTests) it('can\'t set user to non-existent role', function () {
     assert.throws(function () {
       Roles.setUserRoles(users.eve, ['admin'])
     }, /Role 'admin' does not exist/)
     Roles.setUserRoles(users.eve, ['admin'], { ifExists: true })
   })
 
-  it('can add individual users to roles', function () {
+  if(allTests) it('can add individual users to roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -333,7 +339,7 @@ describe('roles', function () {
     testUser('joe', ['editor', 'user'])
   })
 
-  it('can add individual users to roles by scope', function () {
+  if(allTests) it('can add individual users to roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -360,7 +366,7 @@ describe('roles', function () {
     testUser('joe', [], 'scope2')
   })
 
-  it('can add user to roles via user object', function () {
+  if(allTests) it('can add user to roles via user object', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -381,7 +387,7 @@ describe('roles', function () {
     testUser('joe', [])
   })
 
-  it('can add user to roles multiple times', function () {
+  if(allTests) it('can add user to roles multiple times', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -401,7 +407,7 @@ describe('roles', function () {
     testUser('joe', [])
   })
 
-  it('can add user to roles multiple times by scope', function () {
+  if(allTests) it('can add user to roles multiple times by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -421,7 +427,7 @@ describe('roles', function () {
     testUser('joe', [], 'scope1')
   })
 
-  it('can add multiple users to roles', function () {
+  if(allTests) it('can add multiple users to roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -439,7 +445,7 @@ describe('roles', function () {
     testUser('joe', ['editor', 'user'])
   })
 
-  it('can add multiple users to roles by scope', function () {
+  if(allTests) it('can add multiple users to roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -466,7 +472,7 @@ describe('roles', function () {
     testUser('joe', ['editor', 'user'], 'scope2')
   })
 
-  it('can remove individual users from roles', function () {
+  if(allTests) it('can remove individual users from roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
@@ -479,7 +485,7 @@ describe('roles', function () {
     testUser('bob', ['editor', 'user'])
   })
 
-  it('can remove user from roles multiple times', function () {
+  if(allTests) it('can remove user from roles multiple times', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
@@ -496,7 +502,7 @@ describe('roles', function () {
     testUser('eve', ['editor'])
   })
 
-  it('can remove users from roles via user object', function () {
+  if(allTests) it('can remove users from roles via user object', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
@@ -512,7 +518,7 @@ describe('roles', function () {
     testUser('bob', ['editor', 'user'])
   })
 
-  it('can remove individual users from roles by scope', function () {
+  if(allTests) it('can remove individual users from roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -536,7 +542,7 @@ describe('roles', function () {
     testUser('joe', ['admin'], 'scope2')
   })
 
-  it('can remove individual users from roles by scope through options', function () {
+  if(allTests) it('can remove individual users from roles by scope through options', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -560,7 +566,7 @@ describe('roles', function () {
     testUser('joe', ['admin'], 'scope2')
   })
 
-  it('can remove multiple users from roles', function () {
+  if(allTests) it('can remove multiple users from roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -579,7 +585,7 @@ describe('roles', function () {
     testUser('joe', ['user'])
   })
 
-  it('can remove multiple users from roles by scope', function () {
+  if(allTests) it('can remove multiple users from roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -608,7 +614,7 @@ describe('roles', function () {
     testUser('joe', [], 'scope2')
   })
 
-  it('can remove multiple users from roles of any scope', function () {
+  if(allTests) it('can remove multiple users from roles of any scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -632,7 +638,7 @@ describe('roles', function () {
     testUser('joe', ['user'], 'scope2')
   })
 
-  it('can set user roles', function () {
+  if(allTests) it('can set user roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -667,7 +673,7 @@ describe('roles', function () {
     testUser('joe', [])
   })
 
-  it('can set user roles by scope', function () {
+  if(allTests) it('can set user roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -728,7 +734,7 @@ describe('roles', function () {
     assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
   })
 
-  it('can set user roles by scope including GLOBAL_SCOPE', function () {
+  if(allTests) it('can set user roles by scope including GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
@@ -743,7 +749,7 @@ describe('roles', function () {
     testUser('eve', ['editor'])
   })
 
-  it('can set user roles by scope and anyScope', function () {
+  if(allTests) it('can set user roles by scope and anyScope', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
@@ -770,7 +776,7 @@ describe('roles', function () {
     }])
   })
 
-  it('can get all roles', function () {
+  if(allTests) it('can get all roles', function () {
     roles.forEach(function (role) {
       Roles.createRole(role)
     })
@@ -784,18 +790,18 @@ describe('roles', function () {
     assert.sameMembers(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
   })
 
-  it('get an empty list of roles for an empty user', function () {
+  if(allTests) it('get an empty list of roles for an empty user', function () {
     assert.sameMembers(Roles.getRolesForUser(undefined), [])
     assert.sameMembers(Roles.getRolesForUser(null), [])
     assert.sameMembers(Roles.getRolesForUser({}), [])
   })
 
-  it('get an empty list of roles for non-existant user', function () {
+  if(allTests) it('get an empty list of roles for non-existant user', function () {
     assert.sameMembers(Roles.getRolesForUser('1'), [])
     assert.sameMembers(Roles.getRolesForUser('1', 'scope1'), [])
   })
 
-  it('can get all roles for user', function () {
+  if(allTests) it('can get all roles for user', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -831,7 +837,7 @@ describe('roles', function () {
     }])
   })
 
-  it('can get all roles for user by scope', function () {
+  if(allTests) it('can get all roles for user by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -975,7 +981,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
   })
 
-  it('can get only scoped roles for user', function () {
+  if(allTests) it('can get only scoped roles for user', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -998,7 +1004,7 @@ describe('roles', function () {
     }])
   })
 
-  it('can get all roles for user by scope with periods in name', function () {
+  if(allTests) it('can get all roles for user by scope with periods in name', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
@@ -1006,7 +1012,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
   })
 
-  it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
+  if(allTests) it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1027,7 +1033,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
   })
 
-  it('getRolesForUser should not return null entries if user has no roles for scope', function () {
+  if(allTests) it('getRolesForUser should not return null entries if user has no roles for scope', function () {
     Roles.createRole('editor')
 
     var userId = users.eve
@@ -1054,7 +1060,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
   })
 
-  it('returns an empty list of scopes for null as user-id', function () {
+  if(allTests) it('returns an empty list of scopes for null as user-id', function () {
     assert.sameMembers(Roles.getScopesForUser(undefined), [])
     assert.sameMembers(Roles.getScopesForUser(null), [])
     assert.sameMembers(Roles.getScopesForUser('foo'), [])
@@ -1062,7 +1068,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser({ _id: 'foo' }), [])
   })
 
-  it('can get all scopes for user', function () {
+  if(allTests) it('can get all scopes for user', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1081,7 +1087,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
   })
 
-  it('can get all scopes for user by role', function () {
+  if(allTests) it('can get all scopes for user by role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1104,7 +1110,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
   })
 
-  it('getScopesForUser returns [] when not using scopes', function () {
+  if(allTests) it('getScopesForUser returns [] when not using scopes', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
@@ -1127,7 +1133,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
   })
 
-  it('can get all groups for user by role array', function () {
+  if(allTests) it('can get all groups for user by role array', function () {
     var userId = users.eve
     var userObj
 
@@ -1162,7 +1168,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
   })
 
-  it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
+  if(allTests) it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1194,7 +1200,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
   })
 
-  it('can get all users in role', function () {
+  if (allTests) if(allTests) it('can get all users in role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1208,7 +1214,7 @@ describe('roles', function () {
     assert.sameMembers(actual, expected)
   })
 
-  it('can get all users in role by scope', function () {
+  if(allTests) it('can get all users in role by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -1232,7 +1238,7 @@ describe('roles', function () {
     assert.sameMembers(actual, [])
   })
 
-  it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
+  if(allTests) it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -1260,7 +1266,22 @@ describe('roles', function () {
     assert.sameMembers(actual, expected)
   })
 
-  it('can get all users in role by scope and passes through mongo query arguments', function () {
+  if ('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function(){
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
+    Roles.addUsersToRoles([users.bob], ['admin'], 'scope1')
+
+    var expected = [users.eve, users.bob]
+    var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+
+    expected = [users.bob]
+    actual = Roles.getUsersInRole('admin', {scope: 'scope1', onlyScoped: true}).fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+  })
+
+  if(allTests) it('can get all users in role by scope and passes through mongo query arguments', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -1274,7 +1295,7 @@ describe('roles', function () {
     assert.isFalse(results[0].hasOwnProperty('username'))
   })
 
-  it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
+  if(allTests) it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
@@ -1294,7 +1315,7 @@ describe('roles', function () {
     testUser('bob', ['admin'], 'scope1')
   })
 
-  it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
+  if(allTests) it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5')
@@ -1319,7 +1340,7 @@ describe('roles', function () {
     testUser('bob', ['admin'], 'scope1')
   })
 
-  it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
+  if(allTests) it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
@@ -1331,21 +1352,21 @@ describe('roles', function () {
     testUser('joe', [])
   })
 
-  it('can use \'.\' in scope name', function () {
+  if(allTests) it('can use \'.\' in scope name', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
     testUser('joe', ['admin'], 'example.com')
   })
 
-  it('can use multiple periods in scope name', function () {
+  if(allTests) it('can use multiple periods in scope name', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
     testUser('joe', ['admin'], 'example.k12.va.us')
   })
 
-  it('renaming of roles', function () {
+  if(allTests) it('renaming of roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1390,7 +1411,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
   })
 
-  it('migration without global groups', function () {
+  if(allTests) it('migration without global groups', function () {
     assert.isOk(Meteor.roles.insert({ name: 'admin' }))
     assert.isOk(Meteor.roles.insert({ name: 'editor' }))
     assert.isOk(Meteor.roles.insert({ name: 'user' }))
@@ -1459,7 +1480,7 @@ describe('roles', function () {
     })
   })
 
-  it('migration with global groups', function () {
+  if(allTests) it('migration with global groups', function () {
     assert.isOk(Meteor.roles.insert({ name: 'admin' }))
     assert.isOk(Meteor.roles.insert({ name: 'editor' }))
     assert.isOk(Meteor.roles.insert({ name: 'user' }))
@@ -1587,7 +1608,7 @@ describe('roles', function () {
     })
   })
 
-  it('_addUserToRole', function () {
+  if(allTests) it('_addUserToRole', function () {
     Roles.createRole('admin')
 
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
@@ -1617,7 +1638,7 @@ describe('roles', function () {
     }])
   })
 
-  it('_removeUserFromRole', function () {
+  if(allTests) it('_removeUserFromRole', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.eve, 'admin')
@@ -1634,7 +1655,7 @@ describe('roles', function () {
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
   })
 
-  it('keep assigned roles', function () {
+  if(allTests) it('keep assigned roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('ALL_PERMISSIONS')
@@ -1705,7 +1726,7 @@ describe('roles', function () {
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
   })
 
-  it('adds children of the added role to the assignments', function () {
+  if(allTests) it('adds children of the added role to the assignments', function () {
     Roles.createRole('admin')
     Roles.createRole('ALBUM.ADMIN')
     Roles.createRole('ALBUM.VIEW')
@@ -1726,7 +1747,7 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
   })
 
-  it('removes children of the removed role from the assignments', function () {
+  if(allTests) it('removes children of the removed role from the assignments', function () {
     Roles.createRole('admin')
     Roles.createRole('ALBUM.ADMIN')
     Roles.createRole('ALBUM.VIEW')
@@ -1748,7 +1769,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
   })
 
-  it('modify assigned hierarchical roles', function () {
+  if(allTests) it('modify assigned hierarchical roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('ALL_PERMISSIONS')
@@ -1939,7 +1960,7 @@ describe('roles', function () {
     }])
   })
 
-  it('delete role with overlapping hierarchical roles', function () {
+  if(allTests) it('delete role with overlapping hierarchical roles', function () {
     Roles.createRole('role1')
     Roles.createRole('role2')
     Roles.createRole('COMMON_PERMISSION_1')
@@ -2058,7 +2079,7 @@ describe('roles', function () {
     }])
   })
 
-  it('set parent on assigned role', function () {
+  if(allTests) it('set parent on assigned role', function () {
     Roles.createRole('admin')
     Roles.createRole('EDIT_PERMISSION')
 
@@ -2087,7 +2108,7 @@ describe('roles', function () {
     }])
   })
 
-  it('remove parent on assigned role', function () {
+  if(allTests) it('remove parent on assigned role', function () {
     Roles.createRole('admin')
     Roles.createRole('EDIT_PERMISSION')
 
@@ -2118,7 +2139,7 @@ describe('roles', function () {
     }])
   })
 
-  it('adding and removing extra role parents', function () {
+  if(allTests) it('adding and removing extra role parents', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('EDIT_PERMISSION')
@@ -2162,7 +2183,7 @@ describe('roles', function () {
     }])
   })
 
-  it('cyclic roles', function () {
+  if(allTests) it('cyclic roles', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
     Roles.createRole('user')
@@ -2175,7 +2196,7 @@ describe('roles', function () {
     }, /form a cycle/)
   })
 
-  it('userIsInRole returns false for unknown roles', function () {
+  if(allTests) it('userIsInRole returns false for unknown roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -2195,6 +2216,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
   })
 
+  if(allTests)
   describe('isParentOf', function () {
     it('returns false for unknown roles', function () {
       Roles.createRole('admin')

From f890b967aaa22bf544b2541222b54f4479d9b1e4 Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Tue, 26 Nov 2019 17:37:30 -0800
Subject: [PATCH 0304/1140] added server tests and onlyScoped option to
 getUsersInRole

---
 roles/roles_common.js | 10 ++++++++--
 roles/tests/client.js | 16 ++++++++--------
 roles/tests/server.js | 16 ++++++++++------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index ce8d29bb5a..dfeff6c554 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -812,6 +812,7 @@ Object.assign(Roles, {
    *   - `scope`: name of the scope to restrict roles to; user's global
    *     roles will also be checked
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *   - `onlyScoped`: if set, only roles in the specified scope are returned
    *   - `queryOptions`: options which are passed directly
    *     through to `Meteor.users.find(query, options)`
    *
@@ -885,7 +886,8 @@ Object.assign(Roles, {
     options = Roles._normalizeOptions(options)
 
     options = Object.assign({
-      anyScope: false
+      anyScope: false,
+      onlyScoped: false
     }, options)
 
     // ensure array to simplify code
@@ -902,7 +904,11 @@ Object.assign(Roles, {
     }
 
     if (!options.anyScope) {
-      selector.scope = { $in: [options.scope, null] }
+      selector.scope = { $in: [options.scope] }
+
+      if (!options.onlyScoped) {
+        selector.scope.$in.push(null)
+      }
     }
 
     return Meteor.roleAssignment.find(selector, filter)
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 63ac14eda5..f86edff511 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -30,7 +30,7 @@ describe('roles', function () {
 
   function testUser (username, expectedRoles, scope) {
     var user = users[username]
-    console.log(`testUser client scope=${typeof scope}`);
+    // console.log(`testUser client scope=${typeof scope}`);
     if(typeof scope == 'string') {
       scope = {scope: scope}
     }
@@ -104,6 +104,13 @@ describe('roles', function () {
       scope: 'group1'
     })
 
+    Meteor.roleAssignment.insert({
+      user: users.jan,
+      role: { _id: 'admin' },
+      inheritedRoles: [{ _id: 'admin' }],
+      scope: 'group1'
+    })
+
     const timer = () => {
       if (!Roles.assignmentSubscription.ready()) {
         Meteor.setTimeout(timer, 100)
@@ -156,11 +163,4 @@ describe('roles', function () {
     testUser('joe', ['admin'], Roles.GLOBAL_GROUP)
     testUser('joe', ['admin', 'editor'], 'group1')
   })
-
-  it('check if user is in role with scope only, ignoring global', function(){
-    // this is supposed to be true
-    testUser('joe', ['admin'], { scope: 'group1', onlyScoped: true })
-    // this is supposed to fail
-    testUser('eve', ['admin'], { scope: 'group1', onlyScoped: true })
-  })
 })
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 9983954669..6e99aa6080 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -28,7 +28,7 @@ describe('roles', function () {
       return
     }
 
-    return Meteor.roleAssignment.find({ _id: loggedInUserId })
+    return Meteor.roleAssignment.find( { _id: loggedInUserId });
   })
 
   function addUser (name) {
@@ -74,7 +74,7 @@ describe('roles', function () {
     users = {
       'eve': addUser('eve'),
       'bob': addUser('bob'),
-      'joe': addUser('joe')
+      'joe': addUser('joe'),
     }
   })
 
@@ -734,7 +734,7 @@ describe('roles', function () {
     assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
   })
 
-  if(allTests) it('can set user roles by scope including GLOBAL_SCOPE', function () {
+  if (allTests) it('can set user roles by scope including GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
@@ -1238,7 +1238,7 @@ describe('roles', function () {
     assert.sameMembers(actual, [])
   })
 
-  if(allTests) it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
+  it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -1266,16 +1266,20 @@ describe('roles', function () {
     assert.sameMembers(actual, expected)
   })
 
-  if ('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function(){
+  it ('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function(){
     Roles.createRole('admin')
 
     Roles.addUsersToRoles([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
     Roles.addUsersToRoles([users.bob], ['admin'], 'scope1')
 
-    var expected = [users.eve, users.bob]
+    var expected = [users.eve]
     var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
     assert.sameMembers(actual, expected)
 
+    expected = [users.eve, users.bob]
+    actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+
     expected = [users.bob]
     actual = Roles.getUsersInRole('admin', {scope: 'scope1', onlyScoped: true}).fetch().map(r => r._id)
     assert.sameMembers(actual, expected)

From 577a0a142d09332c3c4b36581fd6e56f86f7b47e Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Wed, 27 Nov 2019 08:24:26 -0800
Subject: [PATCH 0305/1140] add function name to isInRole helper

---
 roles/client/uiHelpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 7ee2991c21..8061c719fa 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -41,7 +41,7 @@ Roles._uiHelpers = {
    * @static
    * @for UIHelpers
    */
-  isInRole: function (role, scope) {
+  isInRole: function isInRoleHelper(role, scope) {
     var user = Meteor.user()
     var comma = (role || '').indexOf(',')
     var roles

From 396f9fdc274567e20b18ce967688ceacb186bebb Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Wed, 27 Nov 2019 08:25:44 -0800
Subject: [PATCH 0306/1140] add fail safe in getRolesForUser return value

---
 roles/roles_common.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index dfeff6c554..4056ba860b 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -773,14 +773,20 @@ Object.assign(Roles, {
     if (options.fullObjects) {
       delete filter.fields
     }
-
+// console.log(selector, filter);
     roles = Meteor.roleAssignment.find(selector, filter).fetch()
 
     if (options.fullObjects) {
       return roles
     }
 
-    return [...new Set(roles.map(r => r.inheritedRoles || [r.role]).reduce((rev, current) => rev.concat(current), []).map(r => r._id))]
+    return [
+      ...new Set(roles
+        .map(r => r.inheritedRoles || [r.role])
+        .reduce((rev, current) => rev.concat(current), [])
+        .map(r => r ? r._id : null)
+      )
+    ]
   },
 
   /**

From 3b4f16b678e6dd8b7443ef65840b7756cc3f1d7c Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Wed, 27 Nov 2019 08:26:32 -0800
Subject: [PATCH 0307/1140] remove commented out console.log debug line

---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 4056ba860b..8c40c774f1 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -773,7 +773,7 @@ Object.assign(Roles, {
     if (options.fullObjects) {
       delete filter.fields
     }
-// console.log(selector, filter);
+
     roles = Meteor.roleAssignment.find(selector, filter).fetch()
 
     if (options.fullObjects) {

From 0c2c2bc77210e03fe658218103b8e2d336f3bdef Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Wed, 27 Nov 2019 11:02:35 -0800
Subject: [PATCH 0308/1140] remove debug test flag

---
 roles/tests/server.js | 149 +++++++++++++++++++++---------------------
 1 file changed, 74 insertions(+), 75 deletions(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 6e99aa6080..d10ed434a2 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -18,7 +18,6 @@ Meteor.roleAssignment.allow({
 describe('roles', function () {
   var users = {}
   var roles = ['admin', 'editor', 'user']
-  const allTests = false;
 
   Meteor.publish('_roleAssignments', function () {
     var loggedInUserId = this.userId
@@ -78,7 +77,7 @@ describe('roles', function () {
     }
   })
 
-  if(allTests) it('can create and delete roles', function () {
+  it('can create and delete roles', function () {
     var role1Id = Roles.createRole('test1')
     assert.equal(Meteor.roles.findOne()._id, 'test1')
     assert.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
@@ -96,17 +95,17 @@ describe('roles', function () {
     assert.equal(typeof Meteor.roles.findOne(), 'undefined')
   })
 
-  if(allTests) it('can try to remove non-existing roles without crashing', function () {
+  it('can try to remove non-existing roles without crashing', function () {
     Roles.deleteRole('non-existing-role')
   })
 
-  if(allTests) it('can\'t create duplicate roles', function () {
+  it('can\'t create duplicate roles', function () {
     Roles.createRole('test1')
     assert.throws(function () { Roles.createRole('test1') })
     assert.isNull(Roles.createRole('test1', { unlessExists: true }))
   })
 
-  if(allTests) it('can\'t create role with empty names', function () {
+  it('can\'t create role with empty names', function () {
     assert.throws(function () {
       Roles.createRole('')
     }, /Invalid role name/)
@@ -124,7 +123,7 @@ describe('roles', function () {
     }, /Invalid role name/)
   })
 
-  if(allTests) it('can\'t use invalid scope names', function () {
+  it('can\'t use invalid scope names', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -148,7 +147,7 @@ describe('roles', function () {
     }, /Invalid scope name/)
   })
 
-  if(allTests) it('can check if user is in role', function () {
+  it('can check if user is in role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.addUsersToRoles(users.eve, ['admin', 'user'])
@@ -156,7 +155,7 @@ describe('roles', function () {
     testUser('eve', ['admin', 'user'])
   })
 
-  if(allTests) it('can check if user is in role by scope', function () {
+  it('can check if user is in role by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -173,7 +172,7 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], { anyScope: true }))
   })
 
-  if(allTests) it('can check if user is in role by scope through options', function () {
+  it('can check if user is in role by scope through options', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -184,7 +183,7 @@ describe('roles', function () {
     testUser('eve', ['editor'], { scope: 'scope2' })
   })
 
-  if(allTests) it('can check if user is in role by scope with global role', function () {
+  it('can check if user is in role by scope with global role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -209,7 +208,7 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
   })
 
-  if(allTests) it('renaming scopes', function () {
+  it('renaming scopes', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -254,7 +253,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
   })
 
-  if(allTests) it('removing scopes', function () {
+  it('removing scopes', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -272,15 +271,15 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
   })
 
-  if(allTests) it('can check if non-existant user is in role', function () {
+  it('can check if non-existant user is in role', function () {
     assert.isFalse(Roles.userIsInRole('1', 'admin'))
   })
 
-  if(allTests) it('can check if null user is in role', function () {
+  it('can check if null user is in role', function () {
     assert.isFalse(Roles.userIsInRole(null, 'admin'))
   })
 
-  if(allTests) it('can check user against several roles at once', function () {
+  it('can check user against several roles at once', function () {
     var user
 
     Roles.createRole('admin')
@@ -293,35 +292,35 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
   })
 
-  if(allTests) it('can\'t add non-existent user to role', function () {
+  it('can\'t add non-existent user to role', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(['1'], ['admin'])
     assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
   })
 
-  if(allTests) it('can\'t add user to non-existent role', function () {
+  it('can\'t add user to non-existent role', function () {
     assert.throws(function () {
       Roles.addUsersToRoles(users.eve, ['admin'])
     }, /Role 'admin' does not exist/)
     Roles.addUsersToRoles(users.eve, ['admin'], { ifExists: true })
   })
 
-  if(allTests) it('can\'t set non-existent user to role', function () {
+  it('can\'t set non-existent user to role', function () {
     Roles.createRole('admin')
 
     Roles.setUserRoles(['1'], ['admin'])
     assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
   })
 
-  if(allTests) it('can\'t set user to non-existent role', function () {
+  it('can\'t set user to non-existent role', function () {
     assert.throws(function () {
       Roles.setUserRoles(users.eve, ['admin'])
     }, /Role 'admin' does not exist/)
     Roles.setUserRoles(users.eve, ['admin'], { ifExists: true })
   })
 
-  if(allTests) it('can add individual users to roles', function () {
+  it('can add individual users to roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -339,7 +338,7 @@ describe('roles', function () {
     testUser('joe', ['editor', 'user'])
   })
 
-  if(allTests) it('can add individual users to roles by scope', function () {
+  it('can add individual users to roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -366,7 +365,7 @@ describe('roles', function () {
     testUser('joe', [], 'scope2')
   })
 
-  if(allTests) it('can add user to roles via user object', function () {
+  it('can add user to roles via user object', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -387,7 +386,7 @@ describe('roles', function () {
     testUser('joe', [])
   })
 
-  if(allTests) it('can add user to roles multiple times', function () {
+  it('can add user to roles multiple times', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -407,7 +406,7 @@ describe('roles', function () {
     testUser('joe', [])
   })
 
-  if(allTests) it('can add user to roles multiple times by scope', function () {
+  it('can add user to roles multiple times by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -427,7 +426,7 @@ describe('roles', function () {
     testUser('joe', [], 'scope1')
   })
 
-  if(allTests) it('can add multiple users to roles', function () {
+  it('can add multiple users to roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -445,7 +444,7 @@ describe('roles', function () {
     testUser('joe', ['editor', 'user'])
   })
 
-  if(allTests) it('can add multiple users to roles by scope', function () {
+  it('can add multiple users to roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -472,7 +471,7 @@ describe('roles', function () {
     testUser('joe', ['editor', 'user'], 'scope2')
   })
 
-  if(allTests) it('can remove individual users from roles', function () {
+  it('can remove individual users from roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
@@ -485,7 +484,7 @@ describe('roles', function () {
     testUser('bob', ['editor', 'user'])
   })
 
-  if(allTests) it('can remove user from roles multiple times', function () {
+  it('can remove user from roles multiple times', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
@@ -502,7 +501,7 @@ describe('roles', function () {
     testUser('eve', ['editor'])
   })
 
-  if(allTests) it('can remove users from roles via user object', function () {
+  it('can remove users from roles via user object', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
@@ -518,7 +517,7 @@ describe('roles', function () {
     testUser('bob', ['editor', 'user'])
   })
 
-  if(allTests) it('can remove individual users from roles by scope', function () {
+  it('can remove individual users from roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -542,7 +541,7 @@ describe('roles', function () {
     testUser('joe', ['admin'], 'scope2')
   })
 
-  if(allTests) it('can remove individual users from roles by scope through options', function () {
+  it('can remove individual users from roles by scope through options', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -566,7 +565,7 @@ describe('roles', function () {
     testUser('joe', ['admin'], 'scope2')
   })
 
-  if(allTests) it('can remove multiple users from roles', function () {
+  it('can remove multiple users from roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -585,7 +584,7 @@ describe('roles', function () {
     testUser('joe', ['user'])
   })
 
-  if(allTests) it('can remove multiple users from roles by scope', function () {
+  it('can remove multiple users from roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -614,7 +613,7 @@ describe('roles', function () {
     testUser('joe', [], 'scope2')
   })
 
-  if(allTests) it('can remove multiple users from roles of any scope', function () {
+  it('can remove multiple users from roles of any scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -638,7 +637,7 @@ describe('roles', function () {
     testUser('joe', ['user'], 'scope2')
   })
 
-  if(allTests) it('can set user roles', function () {
+  it('can set user roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -673,7 +672,7 @@ describe('roles', function () {
     testUser('joe', [])
   })
 
-  if(allTests) it('can set user roles by scope', function () {
+  it('can set user roles by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -749,7 +748,7 @@ describe('roles', function () {
     testUser('eve', ['editor'])
   })
 
-  if(allTests) it('can set user roles by scope and anyScope', function () {
+  it('can set user roles by scope and anyScope', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
@@ -776,7 +775,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('can get all roles', function () {
+  it('can get all roles', function () {
     roles.forEach(function (role) {
       Roles.createRole(role)
     })
@@ -790,18 +789,18 @@ describe('roles', function () {
     assert.sameMembers(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
   })
 
-  if(allTests) it('get an empty list of roles for an empty user', function () {
+  it('get an empty list of roles for an empty user', function () {
     assert.sameMembers(Roles.getRolesForUser(undefined), [])
     assert.sameMembers(Roles.getRolesForUser(null), [])
     assert.sameMembers(Roles.getRolesForUser({}), [])
   })
 
-  if(allTests) it('get an empty list of roles for non-existant user', function () {
+  it('get an empty list of roles for non-existant user', function () {
     assert.sameMembers(Roles.getRolesForUser('1'), [])
     assert.sameMembers(Roles.getRolesForUser('1', 'scope1'), [])
   })
 
-  if(allTests) it('can get all roles for user', function () {
+  it('can get all roles for user', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -837,7 +836,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('can get all roles for user by scope', function () {
+  it('can get all roles for user by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -981,7 +980,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
   })
 
-  if(allTests) it('can get only scoped roles for user', function () {
+  it('can get only scoped roles for user', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -1004,7 +1003,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('can get all roles for user by scope with periods in name', function () {
+  it('can get all roles for user by scope with periods in name', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
@@ -1012,7 +1011,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
   })
 
-  if(allTests) it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
+  it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1033,7 +1032,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
   })
 
-  if(allTests) it('getRolesForUser should not return null entries if user has no roles for scope', function () {
+  it('getRolesForUser should not return null entries if user has no roles for scope', function () {
     Roles.createRole('editor')
 
     var userId = users.eve
@@ -1060,7 +1059,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
   })
 
-  if(allTests) it('returns an empty list of scopes for null as user-id', function () {
+  it('returns an empty list of scopes for null as user-id', function () {
     assert.sameMembers(Roles.getScopesForUser(undefined), [])
     assert.sameMembers(Roles.getScopesForUser(null), [])
     assert.sameMembers(Roles.getScopesForUser('foo'), [])
@@ -1068,7 +1067,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser({ _id: 'foo' }), [])
   })
 
-  if(allTests) it('can get all scopes for user', function () {
+  it('can get all scopes for user', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1087,7 +1086,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
   })
 
-  if(allTests) it('can get all scopes for user by role', function () {
+  it('can get all scopes for user by role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1110,7 +1109,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
   })
 
-  if(allTests) it('getScopesForUser returns [] when not using scopes', function () {
+  it('getScopesForUser returns [] when not using scopes', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
@@ -1133,7 +1132,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
   })
 
-  if(allTests) it('can get all groups for user by role array', function () {
+  it('can get all groups for user by role array', function () {
     var userId = users.eve
     var userObj
 
@@ -1168,7 +1167,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
   })
 
-  if(allTests) it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
+  it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1200,7 +1199,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
   })
 
-  if (allTests) if(allTests) it('can get all users in role', function () {
+  if (allTests) it('can get all users in role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1214,7 +1213,7 @@ describe('roles', function () {
     assert.sameMembers(actual, expected)
   })
 
-  if(allTests) it('can get all users in role by scope', function () {
+  it('can get all users in role by scope', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -1285,7 +1284,7 @@ describe('roles', function () {
     assert.sameMembers(actual, expected)
   })
 
-  if(allTests) it('can get all users in role by scope and passes through mongo query arguments', function () {
+  it('can get all users in role by scope and passes through mongo query arguments', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
@@ -1299,7 +1298,7 @@ describe('roles', function () {
     assert.isFalse(results[0].hasOwnProperty('username'))
   })
 
-  if(allTests) it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
+  it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
@@ -1319,7 +1318,7 @@ describe('roles', function () {
     testUser('bob', ['admin'], 'scope1')
   })
 
-  if(allTests) it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
+  it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5')
@@ -1344,7 +1343,7 @@ describe('roles', function () {
     testUser('bob', ['admin'], 'scope1')
   })
 
-  if(allTests) it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
+  it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
@@ -1356,21 +1355,21 @@ describe('roles', function () {
     testUser('joe', [])
   })
 
-  if(allTests) it('can use \'.\' in scope name', function () {
+  it('can use \'.\' in scope name', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
     testUser('joe', ['admin'], 'example.com')
   })
 
-  if(allTests) it('can use multiple periods in scope name', function () {
+  it('can use multiple periods in scope name', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
     testUser('joe', ['admin'], 'example.k12.va.us')
   })
 
-  if(allTests) it('renaming of roles', function () {
+  it('renaming of roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1415,7 +1414,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
   })
 
-  if(allTests) it('migration without global groups', function () {
+  it('migration without global groups', function () {
     assert.isOk(Meteor.roles.insert({ name: 'admin' }))
     assert.isOk(Meteor.roles.insert({ name: 'editor' }))
     assert.isOk(Meteor.roles.insert({ name: 'user' }))
@@ -1484,7 +1483,7 @@ describe('roles', function () {
     })
   })
 
-  if(allTests) it('migration with global groups', function () {
+  it('migration with global groups', function () {
     assert.isOk(Meteor.roles.insert({ name: 'admin' }))
     assert.isOk(Meteor.roles.insert({ name: 'editor' }))
     assert.isOk(Meteor.roles.insert({ name: 'user' }))
@@ -1612,7 +1611,7 @@ describe('roles', function () {
     })
   })
 
-  if(allTests) it('_addUserToRole', function () {
+  it('_addUserToRole', function () {
     Roles.createRole('admin')
 
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
@@ -1642,7 +1641,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('_removeUserFromRole', function () {
+  it('_removeUserFromRole', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles(users.eve, 'admin')
@@ -1659,7 +1658,7 @@ describe('roles', function () {
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
   })
 
-  if(allTests) it('keep assigned roles', function () {
+  it('keep assigned roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('ALL_PERMISSIONS')
@@ -1730,7 +1729,7 @@ describe('roles', function () {
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
   })
 
-  if(allTests) it('adds children of the added role to the assignments', function () {
+  it('adds children of the added role to the assignments', function () {
     Roles.createRole('admin')
     Roles.createRole('ALBUM.ADMIN')
     Roles.createRole('ALBUM.VIEW')
@@ -1751,7 +1750,7 @@ describe('roles', function () {
     assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
   })
 
-  if(allTests) it('removes children of the removed role from the assignments', function () {
+  it('removes children of the removed role from the assignments', function () {
     Roles.createRole('admin')
     Roles.createRole('ALBUM.ADMIN')
     Roles.createRole('ALBUM.VIEW')
@@ -1773,7 +1772,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
   })
 
-  if(allTests) it('modify assigned hierarchical roles', function () {
+  it('modify assigned hierarchical roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('ALL_PERMISSIONS')
@@ -1964,7 +1963,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('delete role with overlapping hierarchical roles', function () {
+  it('delete role with overlapping hierarchical roles', function () {
     Roles.createRole('role1')
     Roles.createRole('role2')
     Roles.createRole('COMMON_PERMISSION_1')
@@ -2083,7 +2082,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('set parent on assigned role', function () {
+  it('set parent on assigned role', function () {
     Roles.createRole('admin')
     Roles.createRole('EDIT_PERMISSION')
 
@@ -2112,7 +2111,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('remove parent on assigned role', function () {
+  it('remove parent on assigned role', function () {
     Roles.createRole('admin')
     Roles.createRole('EDIT_PERMISSION')
 
@@ -2143,7 +2142,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('adding and removing extra role parents', function () {
+  it('adding and removing extra role parents', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('EDIT_PERMISSION')
@@ -2187,7 +2186,7 @@ describe('roles', function () {
     }])
   })
 
-  if(allTests) it('cyclic roles', function () {
+  it('cyclic roles', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
     Roles.createRole('user')
@@ -2200,7 +2199,7 @@ describe('roles', function () {
     }, /form a cycle/)
   })
 
-  if(allTests) it('userIsInRole returns false for unknown roles', function () {
+  it('userIsInRole returns false for unknown roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')

From 05ce4b14cce24c0df7712021481afbbc112d2ff4 Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Wed, 27 Nov 2019 11:03:33 -0800
Subject: [PATCH 0309/1140] remove debug test flag 2

---
 roles/tests/server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index d10ed434a2..284e5cefaf 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -733,7 +733,7 @@ describe('roles', function () {
     assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
   })
 
-  if (allTests) it('can set user roles by scope including GLOBAL_SCOPE', function () {
+ it('can set user roles by scope including GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
@@ -1199,7 +1199,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
   })
 
-  if (allTests) it('can get all users in role', function () {
+ it('can get all users in role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')

From 3ec90cab6cfd9c2541cd9024909bd83a45b490c5 Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Wed, 27 Nov 2019 11:04:22 -0800
Subject: [PATCH 0310/1140] remove debug test flag 3

---
 roles/tests/server.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 284e5cefaf..59a6b72190 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -2219,7 +2219,6 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
   })
 
-  if(allTests)
   describe('isParentOf', function () {
     it('returns false for unknown roles', function () {
       Roles.createRole('admin')

From fa83039907854568622d41a42f4ceb24396baebe Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Wed, 27 Nov 2019 11:05:44 -0800
Subject: [PATCH 0311/1140] remove additional user

---
 roles/tests/client.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/roles/tests/client.js b/roles/tests/client.js
index f86edff511..d0521c0632 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -104,13 +104,6 @@ describe('roles', function () {
       scope: 'group1'
     })
 
-    Meteor.roleAssignment.insert({
-      user: users.jan,
-      role: { _id: 'admin' },
-      inheritedRoles: [{ _id: 'admin' }],
-      scope: 'group1'
-    })
-
     const timer = () => {
       if (!Roles.assignmentSubscription.ready()) {
         Meteor.setTimeout(timer, 100)

From dad17ecfa3281b287832fbd72fa55667d7f60de1 Mon Sep 17 00:00:00 2001
From: Jan Hendrik Mangold <jhm@cotren.net>
Date: Wed, 27 Nov 2019 12:11:58 -0800
Subject: [PATCH 0312/1140] removed console.log

---
 roles/tests/server.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index 59a6b72190..1f9691483b 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -38,7 +38,6 @@ describe('roles', function () {
     var userId = users[username]
     var userObj = Meteor.users.findOne({ _id: userId })
 
-    // console.log(`testUser server scope=${typeof scope}`);
     if (typeof scope == 'string') {
       scope = { scope: scope }
     }

From 32c230ded9cb92b27a3485d143cabf2732fef186 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Sun, 8 Dec 2019 15:32:07 +0400
Subject: [PATCH 0313/1140] Fixed code formatting and minimalized changes

---
 roles/client/uiHelpers.js |  2 +-
 roles/roles_common.js     | 19 +++++--------------
 roles/tests/client.js     | 11 +----------
 roles/tests/server.js     | 16 ++++++----------
 4 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 8061c719fa..7ee2991c21 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -41,7 +41,7 @@ Roles._uiHelpers = {
    * @static
    * @for UIHelpers
    */
-  isInRole: function isInRoleHelper(role, scope) {
+  isInRole: function (role, scope) {
     var user = Meteor.user()
     var comma = (role || '').indexOf(',')
     var roles
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 8c40c774f1..1a3a8aae72 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -289,21 +289,18 @@ Object.assign(Roles, {
    * @static
    */
   _removeRoleFromParent: function (roleName, parentName) {
-    var role
-    var count
-
     Roles._checkRoleName(roleName)
     Roles._checkRoleName(parentName)
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
+    let role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
     }
 
-    count = Meteor.roles.update({
+    const count = Meteor.roles.update({
       _id: parentName
     }, {
       $pull: {
@@ -318,10 +315,10 @@ Object.assign(Roles, {
     if (!count) return
 
     // For all roles who have had it as a dependency ...
-    roles = [...Roles._getParentRoleNames(Meteor.roles.findOne({ _id: parentName })), parentName]
+    const roles = [...Roles._getParentRoleNames(Meteor.roles.findOne({ _id: parentName })), parentName]
 
     Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
-      inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
+      const inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
       Meteor.roleAssignment.update({
         'role._id': r._id,
         'inheritedRoles._id': role._id
@@ -780,13 +777,7 @@ Object.assign(Roles, {
       return roles
     }
 
-    return [
-      ...new Set(roles
-        .map(r => r.inheritedRoles || [r.role])
-        .reduce((rev, current) => rev.concat(current), [])
-        .map(r => r ? r._id : null)
-      )
-    ]
+    return [...new Set(roles.map(r => r.inheritedRoles || [r.role]).reduce((rev, current) => rev.concat(current), []).map(r => r._id))]
   },
 
   /**
diff --git a/roles/tests/client.js b/roles/tests/client.js
index d0521c0632..daaab19a39 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -30,10 +30,7 @@ describe('roles', function () {
 
   function testUser (username, expectedRoles, scope) {
     var user = users[username]
-    // console.log(`testUser client scope=${typeof scope}`);
-    if(typeof scope == 'string') {
-      scope = {scope: scope}
-    }
+
     // test using user object rather than userId to avoid mocking
     roles.forEach(function (role) {
       var expected = expectedRoles.includes(role)
@@ -91,12 +88,6 @@ describe('roles', function () {
       role: { _id: 'admin' },
       inheritedRoles: [{ _id: 'admin' }]
     })
-    Meteor.roleAssignment.insert({
-      user: users.joe,
-      role: { _id: 'admin' },
-      inheritedRoles: [{ _id: 'admin' }],
-      scope: 'group1'
-    })
     Meteor.roleAssignment.insert({
       user: users.joe,
       role: { _id: 'editor' },
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 1f9691483b..03ecf77fd7 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -27,7 +27,7 @@ describe('roles', function () {
       return
     }
 
-    return Meteor.roleAssignment.find( { _id: loggedInUserId });
+    return Meteor.roleAssignment.find({ _id: loggedInUserId })
   })
 
   function addUser (name) {
@@ -38,10 +38,6 @@ describe('roles', function () {
     var userId = users[username]
     var userObj = Meteor.users.findOne({ _id: userId })
 
-    if (typeof scope == 'string') {
-      scope = { scope: scope }
-    }
-
     // check using user ids (makes db calls)
     _innerTest(userId, username, expectedRoles, scope)
 
@@ -72,7 +68,7 @@ describe('roles', function () {
     users = {
       'eve': addUser('eve'),
       'bob': addUser('bob'),
-      'joe': addUser('joe'),
+      'joe': addUser('joe')
     }
   })
 
@@ -732,7 +728,7 @@ describe('roles', function () {
     assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
   })
 
- it('can set user roles by scope including GLOBAL_SCOPE', function () {
+  it('can set user roles by scope including GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
@@ -1198,7 +1194,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
   })
 
- it('can get all users in role', function () {
+  it('can get all users in role', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1264,7 +1260,7 @@ describe('roles', function () {
     assert.sameMembers(actual, expected)
   })
 
-  it ('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function(){
+  it('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function () {
     Roles.createRole('admin')
 
     Roles.addUsersToRoles([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
@@ -1279,7 +1275,7 @@ describe('roles', function () {
     assert.sameMembers(actual, expected)
 
     expected = [users.bob]
-    actual = Roles.getUsersInRole('admin', {scope: 'scope1', onlyScoped: true}).fetch().map(r => r._id)
+    actual = Roles.getUsersInRole('admin', { scope: 'scope1', onlyScoped: true }).fetch().map(r => r._id)
     assert.sameMembers(actual, expected)
   })
 

From ebcb961c99acc208ff28e59ef79675b9233da0d1 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Sun, 8 Dec 2019 15:46:20 +0400
Subject: [PATCH 0314/1140] Bump version

---
 .versions  | 28 ++++++++++++++--------------
 History.md |  4 ++++
 package.js |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.versions b/.versions
index bd6c7b20ac..16a12aecfc 100644
--- a/.versions
+++ b/.versions
@@ -1,12 +1,12 @@
-accounts-base@1.4.4
-alanning:roles@3.1.0
+accounts-base@1.4.5
+alanning:roles@3.2.0
 allow-deny@1.1.0
-babel-compiler@7.3.4
-babel-runtime@1.3.0
+babel-compiler@7.4.0
+babel-runtime@1.4.0
 base64@1.0.12
 binary-heap@1.0.11
 boilerplate-generator@1.6.0
-callback-hook@1.1.0
+callback-hook@1.2.0
 check@1.3.1
 ddp@1.4.0
 ddp-client@2.3.3
@@ -15,10 +15,10 @@ ddp-rate-limiter@1.0.7
 ddp-server@2.3.0
 diff-sequence@1.1.1
 dynamic-import@0.5.1
-ecmascript@0.12.7
+ecmascript@0.13.0
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.8.0
-ecmascript-runtime-server@0.7.1
+ecmascript-runtime-client@0.9.0
+ecmascript-runtime-server@0.8.0
 ejson@1.1.0
 fetch@0.1.1
 geojson-utils@1.0.10
@@ -27,7 +27,7 @@ id-map@1.1.0
 inter-process-messaging@0.1.0
 lmieulet:meteor-coverage@3.0.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.1.0
+local-test:alanning:roles@3.2.0
 localstorage@1.2.0
 logging@1.1.20
 meteor@1.9.3
@@ -35,13 +35,13 @@ meteortesting:browser-tests@0.1.2
 meteortesting:mocha@0.4.4
 minimongo@1.4.5
 modern-browsers@0.1.4
-modules@0.13.0
-modules-runtime@0.10.3
-mongo@1.6.3
+modules@0.14.0
+modules-runtime@0.11.0
+mongo@1.7.0
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
-npm-mongo@3.1.2
+npm-mongo@3.2.0
 ordered-dict@1.1.0
 practicalmeteor:mocha-core@1.0.1
 promise@0.11.2
@@ -56,5 +56,5 @@ socket-stream-client@0.2.2
 tracker@1.2.0
 underscore@1.0.10
 url@1.2.0
-webapp@1.7.4
+webapp@1.7.5
 webapp-hashing@1.0.9
diff --git a/History.md b/History.md
index 7cd1fd511f..19d6fe0efa 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+## v3.2.0
+
+* New option `onlyScope` on getUsersInRole() returning only users having this role in a scoped assignment [#298](https://github.com/Meteor-Community-Packages/meteor-roles/pull/298)
+
 ## v3.1.0
 
 * Allow setUserRoles() to replace the roles of all scopes [#294](https://github.com/Meteor-Community-Packages/meteor-roles/pull/294)
diff --git a/package.js b/package.js
index 34aab327c4..7bc35e0133 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.1.0',
+  version: '3.2.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From ed1097b107b44dbff869bc548684829cde7a3b7f Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Sun, 23 Feb 2020 17:12:19 +0400
Subject: [PATCH 0315/1140] `Roles.getRolesForUser()` should not fail during a
 call of `Roles.addUsersToRoles()`

---
 roles/roles_common.js |  8 +++++++-
 roles/tests/server.js | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 1a3a8aae72..370005de0a 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -777,7 +777,13 @@ Object.assign(Roles, {
       return roles
     }
 
-    return [...new Set(roles.map(r => r.inheritedRoles || [r.role]).reduce((rev, current) => rev.concat(current), []).map(r => r._id))]
+    return [...new Set(roles.reduce((rev, current) => {
+      if (current.inheritedRoles) {
+        return rev.concat(current.inheritedRoles.map(r => r._id))
+      } else if (current.role) {
+        return rev.push(current.role)
+      }
+    }, []))]
   },
 
   /**
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 03ecf77fd7..44bc38f0d9 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1054,6 +1054,25 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
   })
 
+  it('getRolesForUser should not fail during a call of addUsersToRoles', function () {
+    Roles.createRole('editor')
+
+    var userId = users.eve
+
+    const promises = [
+    ];
+
+    const interval = setInterval(() => {
+      promises.push(Promise.resolve().then(() => { Roles.getRolesForUser(userId); }));
+    }, 0);
+    
+    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+    clearInterval(interval);
+
+
+    return Promise.all(promises)
+  })
+
   it('returns an empty list of scopes for null as user-id', function () {
     assert.sameMembers(Roles.getScopesForUser(undefined), [])
     assert.sameMembers(Roles.getScopesForUser(null), [])

From f25a5cc0be15a422b5222e03633867c0580e651a Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Sun, 23 Feb 2020 17:20:01 +0400
Subject: [PATCH 0316/1140] Bump version

---
 .versions  | 30 +++++++++++++++---------------
 History.md |  4 ++++
 package.js |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.versions b/.versions
index 16a12aecfc..b4daa33325 100644
--- a/.versions
+++ b/.versions
@@ -1,12 +1,12 @@
-accounts-base@1.4.5
-alanning:roles@3.2.0
+accounts-base@1.5.0
+alanning:roles@3.2.1
 allow-deny@1.1.0
-babel-compiler@7.4.0
-babel-runtime@1.4.0
+babel-compiler@7.5.2
+babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
 boilerplate-generator@1.6.0
-callback-hook@1.2.0
+callback-hook@1.3.0
 check@1.3.1
 ddp@1.4.0
 ddp-client@2.3.3
@@ -15,11 +15,11 @@ ddp-rate-limiter@1.0.7
 ddp-server@2.3.0
 diff-sequence@1.1.1
 dynamic-import@0.5.1
-ecmascript@0.13.0
+ecmascript@0.14.2
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.9.0
-ecmascript-runtime-server@0.8.0
-ejson@1.1.0
+ecmascript-runtime-client@0.10.0
+ecmascript-runtime-server@0.9.0
+ejson@1.1.1
 fetch@0.1.1
 geojson-utils@1.0.10
 http@1.4.2
@@ -27,7 +27,7 @@ id-map@1.1.0
 inter-process-messaging@0.1.0
 lmieulet:meteor-coverage@3.0.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.2.0
+local-test:alanning:roles@3.2.1
 localstorage@1.2.0
 logging@1.1.20
 meteor@1.9.3
@@ -35,13 +35,13 @@ meteortesting:browser-tests@0.1.2
 meteortesting:mocha@0.4.4
 minimongo@1.4.5
 modern-browsers@0.1.4
-modules@0.14.0
-modules-runtime@0.11.0
-mongo@1.7.0
+modules@0.15.0
+modules-runtime@0.12.0
+mongo@1.8.0
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
-npm-mongo@3.2.0
+npm-mongo@3.3.0
 ordered-dict@1.1.0
 practicalmeteor:mocha-core@1.0.1
 promise@0.11.2
@@ -56,5 +56,5 @@ socket-stream-client@0.2.2
 tracker@1.2.0
 underscore@1.0.10
 url@1.2.0
-webapp@1.7.5
+webapp@1.8.0
 webapp-hashing@1.0.9
diff --git a/History.md b/History.md
index 19d6fe0efa..1c3a3d1129 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+## v3.2.1
+
+* `Roles.getRolesForUser()` should not fail during a call of `Roles.addUsersToRoles()` [#311](https://github.com/Meteor-Community-Packages/meteor-roles/pull/311) ([@ggerber](https://github.com/ggerber))
+
 ## v3.2.0
 
 * New option `onlyScope` on getUsersInRole() returning only users having this role in a scoped assignment [#298](https://github.com/Meteor-Community-Packages/meteor-roles/pull/298)
diff --git a/package.js b/package.js
index 7bc35e0133..fb04bdf30c 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.2.0',
+  version: '3.2.1',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From ea2342818033ff7fd110a1a4be196a03a62ac384 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Wed, 26 Feb 2020 09:33:34 +0200
Subject: [PATCH 0317/1140] Bump version

---
 .versions  | 4 ++--
 History.md | 4 ++++
 package.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index b4daa33325..27734812e4 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@1.5.0
-alanning:roles@3.2.1
+alanning:roles@3.2.1_1
 allow-deny@1.1.0
 babel-compiler@7.5.2
 babel-runtime@1.5.0
@@ -27,7 +27,7 @@ id-map@1.1.0
 inter-process-messaging@0.1.0
 lmieulet:meteor-coverage@3.0.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.2.1
+local-test:alanning:roles@3.2.1_1
 localstorage@1.2.0
 logging@1.1.20
 meteor@1.9.3
diff --git a/History.md b/History.md
index 1c3a3d1129..40fb9bf2b1 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+## v3.2.1_1
+
+* Republish without dev-dependencies
+
 ## v3.2.1
 
 * `Roles.getRolesForUser()` should not fail during a call of `Roles.addUsersToRoles()` [#311](https://github.com/Meteor-Community-Packages/meteor-roles/pull/311) ([@ggerber](https://github.com/ggerber))
diff --git a/package.js b/package.js
index fb04bdf30c..b4f87e12ef 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.2.1',
+  version: '3.2.1_1',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From e9e46d8ac16ac510025903840935b2e007841934 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Mon, 2 Mar 2020 12:38:00 +0400
Subject: [PATCH 0318/1140] Fixed fails when calling `Roles.getRolesForUser()`

---
 roles/roles_common.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 370005de0a..bade76964e 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -781,8 +781,9 @@ Object.assign(Roles, {
       if (current.inheritedRoles) {
         return rev.concat(current.inheritedRoles.map(r => r._id))
       } else if (current.role) {
-        return rev.push(current.role)
+        rev.push(current.role._id)
       }
+      return rev
     }, []))]
   },
 

From 1694e596f3a000f2c2e74eea67d9cf2b85581be6 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSimCity@gmail.com>
Date: Mon, 2 Mar 2020 12:44:03 +0400
Subject: [PATCH 0319/1140] Bump version

---
 .versions  | 4 ++--
 History.md | 4 ++++
 package.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index 27734812e4..c6256587b9 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@1.5.0
-alanning:roles@3.2.1_1
+alanning:roles@3.2.2
 allow-deny@1.1.0
 babel-compiler@7.5.2
 babel-runtime@1.5.0
@@ -27,7 +27,7 @@ id-map@1.1.0
 inter-process-messaging@0.1.0
 lmieulet:meteor-coverage@3.0.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.2.1_1
+local-test:alanning:roles@3.2.2
 localstorage@1.2.0
 logging@1.1.20
 meteor@1.9.3
diff --git a/History.md b/History.md
index 40fb9bf2b1..66dadc724a 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+## v3.2.2
+
+* Fixed fails like `rev.push is not a function` and `number 1 is not iterable (cannot read property Symbol(Symbol.iterator))` calling `Roles.getRolesForUser()`
+
 ## v3.2.1_1
 
 * Republish without dev-dependencies
diff --git a/package.js b/package.js
index b4f87e12ef..e8c3504457 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.2.1_1',
+  version: '3.2.2',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From 71b4aad191b888dcb51eb8b938f406c5714201fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 15 Mar 2020 20:24:26 +0000
Subject: [PATCH 0320/1140] Bump acorn from 6.3.0 to 6.4.1

Bumps [acorn](https://github.com/acornjs/acorn) from 6.3.0 to 6.4.1.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ed61e3c4a0..4a7e97c17b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,9 +17,9 @@
       }
     },
     "acorn": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
     },
     "acorn-jsx": {
       "version": "5.1.0",
@@ -186,6 +186,7 @@
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
       "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
+      "optional": true,
       "requires": {
         "hoek": "0.9.x"
       }
@@ -1122,7 +1123,8 @@
     "hoek": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU="
+      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
+      "optional": true
     },
     "hosted-git-info": {
       "version": "2.8.5",

From 55a3802e33cf268d68b0908f9daed9897d5ee2a4 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 16 Mar 2020 16:18:13 +0900
Subject: [PATCH 0321/1140] Update dependencies

Update npm & Atmosphere dependencies. Bump package, but not published.
---
 History.md   | 4 ++++
 package.js   | 6 +++---
 package.json | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index 66dadc724a..a17297fc10 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+## v3.2.3
+
+* Update dependencies
+
 ## v3.2.2
 
 * Fixed fails like `rev.push is not a function` and `number 1 is not iterable (cannot read property Symbol(Symbol.iterator))` calling `Roles.getRolesForUser()`
diff --git a/package.js b/package.js
index e8c3504457..8f0f032472 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.2.2',
+  version: '3.2.3',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
@@ -20,7 +20,7 @@ Package.onUse(function (api) {
     'check'
   ], both)
 
-  api.use(['blaze@2.3.3'], 'client', { weak: true })
+  api.use(['blaze@2.3.4'], 'client', { weak: true })
 
   api.export('Roles')
 
@@ -37,7 +37,7 @@ Package.onTest(function (api) {
   // Add code coverage
   api.use([
     'lmieulet:meteor-packages-coverage@0.2.0',
-    'lmieulet:meteor-coverage@3.0.0',
+    'lmieulet:meteor-coverage@3.2.0',
     'meteortesting:mocha'
   ])
 
diff --git a/package.json b/package.json
index ffc020bc59..db2001a929 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "istanbul": "^0.4.5",
-    "standard": "^12.0.1",
+    "standard": "^14.3.3",
     "yuidocjs": "^0.10.2"
   }
 }

From edd3cb318085885cf4b0a56424d2bb444c87b542 Mon Sep 17 00:00:00 2001
From: Aleksi Postari <aleksi@teachergaming.com>
Date: Wed, 25 Mar 2020 08:59:38 +0200
Subject: [PATCH 0322/1140] Update roles_common.js

In removeUsersFromRoles documentation change term add to -> remove from.
---
 roles/roles_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index bade76964e..e619fafea0 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -566,7 +566,7 @@ Object.assign(Roles, {
    *
    * @method removeUsersFromRoles
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
    * @param {Object|String} [options] Options:
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)

From 2b29c1f4350328643b6cfe791b1ef8c84b7017e8 Mon Sep 17 00:00:00 2001
From: Simon Schick <simonsimcity@gmail.com>
Date: Wed, 20 May 2020 07:38:12 +0200
Subject: [PATCH 0323/1140] Make sure id is a string before querying users
 collection

---
 roles/roles_common.js | 1 +
 roles/tests/server.js | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index e619fafea0..c2aafa7cdc 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -687,6 +687,7 @@ Object.assign(Roles, {
     }
 
     if (!id) return false
+    if (typeof id !== 'string') return false
 
     selector = {
       'user._id': id
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 44bc38f0d9..c416ba2eb7 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -2233,6 +2233,13 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
   })
 
+  it('userIsInRole returns false if user is a function', function () {
+    Roles.createRole('admin')
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isFalse(Roles.userIsInRole(() => {}, 'admin'))
+  })
+
   describe('isParentOf', function () {
     it('returns false for unknown roles', function () {
       Roles.createRole('admin')

From 017216b9322a871db7c40d6a0b1a3aca59bc9197 Mon Sep 17 00:00:00 2001
From: Simon Schick <simonsimcity@gmail.com>
Date: Wed, 20 May 2020 07:42:24 +0200
Subject: [PATCH 0324/1140] Bump version

---
 .versions  | 36 ++++++++++++++++++------------------
 History.md |  2 ++
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.versions b/.versions
index c6256587b9..a01137bc8a 100644
--- a/.versions
+++ b/.versions
@@ -1,21 +1,21 @@
-accounts-base@1.5.0
-alanning:roles@3.2.2
+accounts-base@1.6.0
+alanning:roles@3.2.3
 allow-deny@1.1.0
-babel-compiler@7.5.2
+babel-compiler@7.5.3
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
-boilerplate-generator@1.6.0
+boilerplate-generator@1.7.0
 callback-hook@1.3.0
 check@1.3.1
 ddp@1.4.0
 ddp-client@2.3.3
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.3.0
+ddp-server@2.3.1
 diff-sequence@1.1.1
-dynamic-import@0.5.1
-ecmascript@0.14.2
+dynamic-import@0.5.2
+ecmascript@0.14.3
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.10.0
 ecmascript-runtime-server@0.9.0
@@ -24,37 +24,37 @@ fetch@0.1.1
 geojson-utils@1.0.10
 http@1.4.2
 id-map@1.1.0
-inter-process-messaging@0.1.0
-lmieulet:meteor-coverage@3.0.0
+inter-process-messaging@0.1.1
+lmieulet:meteor-coverage@3.2.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.2.2
+local-test:alanning:roles@3.2.3
 localstorage@1.2.0
 logging@1.1.20
 meteor@1.9.3
 meteortesting:browser-tests@0.1.2
 meteortesting:mocha@0.4.4
-minimongo@1.4.5
-modern-browsers@0.1.4
+minimongo@1.6.0
+modern-browsers@0.1.5
 modules@0.15.0
 modules-runtime@0.12.0
-mongo@1.8.0
+mongo@1.10.0
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
-npm-mongo@3.3.0
+npm-mongo@3.7.0
 ordered-dict@1.1.0
 practicalmeteor:mocha-core@1.0.1
 promise@0.11.2
-random@1.1.0
+random@1.2.0
 rate-limit@1.0.9
 reactive-var@1.0.11
 reload@1.3.0
 retry@1.1.0
 routepolicy@1.1.0
 service-configuration@1.0.11
-socket-stream-client@0.2.2
+socket-stream-client@0.3.0
 tracker@1.2.0
 underscore@1.0.10
-url@1.2.0
-webapp@1.8.0
+url@1.3.0
+webapp@1.9.1
 webapp-hashing@1.0.9
diff --git a/History.md b/History.md
index a17297fc10..1fc9fd8df0 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,8 @@
 ## v3.2.3
 
 * Update dependencies
+* Update roles_common.js jsdoc documentation [#321](https://github.com/Meteor-Community-Packages/meteor-roles/pull/321)([@kulttuuri](https://github.com/kulttuuri))
+* Function `userIsInRole` should return false if a function is given as user [#324](https://github.com/Meteor-Community-Packages/meteor-roles/pull/324)([@Floriferous](https://github.com/Floriferous))
 
 ## v3.2.2
 

From 8b1853637d13b410d47dec8cd6bfc49c09f9edd4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Jul 2020 19:26:18 +0000
Subject: [PATCH 0325/1140] Bump lodash from 4.17.15 to 4.17.19

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 1186 ++++++++++++++++++++++++++-------------------
 1 file changed, 698 insertions(+), 488 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4a7e97c17b..52dd3a8816 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,6 +2,34 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "requires": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
+    },
+    "@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
+    },
     "abbrev": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
@@ -17,31 +45,26 @@
       }
     },
     "acorn": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+      "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
     },
     "acorn-jsx": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
-      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw=="
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="
     },
     "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "requires": {
-        "fast-deep-equal": "^2.0.1",
+        "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
       }
     },
-    "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
-    },
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
@@ -49,19 +72,32 @@
       "optional": true
     },
     "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "requires": {
+        "type-fest": "^0.11.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="
+        }
+      }
     },
     "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
     },
     "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
     },
     "argparse": {
       "version": "1.0.10",
@@ -77,12 +113,13 @@
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "array-includes": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
-      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
+      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.7.0"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0",
+        "is-string": "^1.0.5"
       }
     },
     "asn1": {
@@ -97,6 +134,11 @@
       "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
       "optional": true
     },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
+    },
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -108,43 +150,6 @@
       "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
       "optional": true
     },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
-      }
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -205,18 +210,10 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
       "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
     },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "requires": {
-        "callsites": "^0.2.0"
-      }
-    },
     "callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "chalk": {
       "version": "2.4.2",
@@ -228,14 +225,6 @@
         "supports-color": "^5.3.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -252,27 +241,22 @@
       }
     },
     "chardet": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
-    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
     },
     "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "requires": {
-        "restore-cursor": "^2.0.0"
+        "restore-cursor": "^3.1.0"
       }
     },
     "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="
     },
     "color-convert": {
       "version": "1.9.3",
@@ -345,6 +329,13 @@
         "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "cryptiles": {
@@ -363,9 +354,9 @@
       "optional": true
     },
     "debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "requires": {
         "ms": "^2.1.1"
       }
@@ -389,13 +380,13 @@
       }
     },
     "deglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/deglob/-/deglob-2.1.1.tgz",
-      "integrity": "sha512-2kjwuGGonL7gWE1XU4Fv79+vVzpoQCl0V+boMwWtOQJV2AGDabCwez++nB1Nli/8BabAfZQ/UuHPlp6AymKdWw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/deglob/-/deglob-4.0.1.tgz",
+      "integrity": "sha512-/g+RDZ7yf2HvoW+E5Cy+K94YhgcFgr6C8LuHZD1O5HoNPkf3KY6RfXJ0DBGlB/NkLi5gml+G9zqRzk9S0mHZCg==",
       "requires": {
         "find-root": "^1.0.0",
         "glob": "^7.0.5",
-        "ignore": "^3.0.9",
+        "ignore": "^5.0.0",
         "pkg-config": "^1.1.0",
         "run-parallel": "^1.1.2",
         "uniq": "^1.0.1"
@@ -415,9 +406,9 @@
           }
         },
         "ignore": {
-          "version": "3.3.10",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+          "version": "5.1.8",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
         }
       }
     },
@@ -438,9 +429,9 @@
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
     "doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "requires": {
         "esutils": "^2.0.2"
       }
@@ -450,6 +441,11 @@
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -469,20 +465,21 @@
       }
     },
     "es-abstract": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
-      "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
       "requires": {
-        "es-to-primitive": "^1.2.0",
+        "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.0",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
-        "object-inspect": "^1.6.0",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
         "object-keys": "^1.1.1",
-        "string.prototype.trimleft": "^2.1.0",
-        "string.prototype.trimright": "^2.1.0"
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
       }
     },
     "es-to-primitive": {
@@ -518,82 +515,66 @@
       }
     },
     "eslint": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz",
-      "integrity": "sha512-UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
       "requires": {
-        "ajv": "^6.5.0",
-        "babel-code-frame": "^6.26.0",
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
         "chalk": "^2.1.0",
         "cross-spawn": "^6.0.5",
-        "debug": "^3.1.0",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^4.0.0",
-        "eslint-utils": "^1.3.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^4.0.0",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.3",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
         "esquery": "^1.0.1",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
+        "file-entry-cache": "^5.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.7.0",
-        "ignore": "^4.0.2",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^5.2.0",
-        "is-resolvable": "^1.1.0",
-        "js-yaml": "^3.11.0",
+        "inquirer": "^7.0.0",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.3.0",
-        "lodash": "^4.17.5",
+        "lodash": "^4.17.14",
         "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
+        "optionator": "^0.8.3",
         "progress": "^2.0.0",
-        "regexpp": "^2.0.0",
-        "require-uncached": "^1.0.3",
-        "semver": "^5.5.0",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "^2.0.1",
-        "table": "^4.0.3",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
       }
     },
     "eslint-config-standard": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz",
-      "integrity": "sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ=="
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz",
+      "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg=="
     },
     "eslint-config-standard-jsx": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-6.0.2.tgz",
-      "integrity": "sha512-D+YWAoXw+2GIdbMBRAzWwr1ZtvnSf4n4yL0gKGg7ShUOGXkSOLerI17K4F6LdQMJPNMoWYqepzQD/fKY+tXNSg=="
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-8.1.0.tgz",
+      "integrity": "sha512-ULVC8qH8qCqbU792ZOO6DaiaZyHNS/5CZt3hKqHkEhVlhPEPN3nfBqqxJCyp59XrjIBZPu1chMYe9T2DXZ7TMw=="
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
-      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
       "requires": {
         "debug": "^2.6.9",
-        "resolve": "^1.5.0"
+        "resolve": "^1.13.1"
       },
       "dependencies": {
         "debug": {
@@ -610,9 +591,9 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "resolve": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
           "requires": {
             "path-parse": "^1.0.6"
           }
@@ -620,11 +601,11 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
-      "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
       "requires": {
-        "debug": "^2.6.8",
+        "debug": "^2.6.9",
         "pkg-dir": "^2.0.0"
       },
       "dependencies": {
@@ -644,29 +625,37 @@
       }
     },
     "eslint-plugin-es": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz",
-      "integrity": "sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz",
+      "integrity": "sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==",
       "requires": {
         "eslint-utils": "^1.4.2",
-        "regexpp": "^2.0.1"
+        "regexpp": "^3.0.0"
+      },
+      "dependencies": {
+        "regexpp": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+          "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="
+        }
       }
     },
     "eslint-plugin-import": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz",
-      "integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==",
+      "version": "2.18.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
+      "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
       "requires": {
+        "array-includes": "^3.0.3",
         "contains-path": "^0.1.0",
-        "debug": "^2.6.8",
+        "debug": "^2.6.9",
         "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.1",
-        "eslint-module-utils": "^2.2.0",
-        "has": "^1.0.1",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.3",
+        "eslint-import-resolver-node": "^0.3.2",
+        "eslint-module-utils": "^2.4.0",
+        "has": "^1.0.3",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.0",
         "read-pkg-up": "^2.0.0",
-        "resolve": "^1.6.0"
+        "resolve": "^1.11.0"
       },
       "dependencies": {
         "debug": {
@@ -692,9 +681,9 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "resolve": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
           "requires": {
             "path-parse": "^1.0.6"
           }
@@ -702,22 +691,27 @@
       }
     },
     "eslint-plugin-node": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz",
-      "integrity": "sha512-lfVw3TEqThwq0j2Ba/Ckn2ABdwmL5dkOgAux1rvOk6CO7A6yGyPI2+zIxN6FyNkp1X1X/BSvKOceD6mBWSj4Yw==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz",
+      "integrity": "sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==",
       "requires": {
-        "eslint-plugin-es": "^1.3.1",
-        "eslint-utils": "^1.3.1",
-        "ignore": "^4.0.2",
+        "eslint-plugin-es": "^2.0.0",
+        "eslint-utils": "^1.4.2",
+        "ignore": "^5.1.1",
         "minimatch": "^3.0.4",
-        "resolve": "^1.8.1",
-        "semver": "^5.5.0"
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
       },
       "dependencies": {
+        "ignore": {
+          "version": "5.1.8",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
+        },
         "resolve": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
           "requires": {
             "path-parse": "^1.0.6"
           }
@@ -725,20 +719,42 @@
       }
     },
     "eslint-plugin-promise": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz",
-      "integrity": "sha512-Si16O0+Hqz1gDHsys6RtFRrW7cCTB6P7p3OJmKp3Y3dxpQE2qwOA7d3xnV+0mBmrPoi0RBnxlCKvqu70te6wjg=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz",
+      "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw=="
     },
     "eslint-plugin-react": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz",
-      "integrity": "sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz",
+      "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==",
       "requires": {
         "array-includes": "^3.0.3",
         "doctrine": "^2.1.0",
         "has": "^1.0.3",
-        "jsx-ast-utils": "^2.0.1",
-        "prop-types": "^15.6.2"
+        "jsx-ast-utils": "^2.1.0",
+        "object.entries": "^1.1.0",
+        "object.fromentries": "^2.0.0",
+        "object.values": "^1.1.0",
+        "prop-types": "^15.7.2",
+        "resolve": "^1.10.1"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "eslint-plugin-standard": {
@@ -747,9 +763,9 @@
       "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ=="
     },
     "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
+      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
       "requires": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
@@ -771,18 +787,18 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
     },
     "espree": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz",
-      "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
       "requires": {
-        "acorn": "^6.0.2",
-        "acorn-jsx": "^5.0.0",
-        "eslint-visitor-keys": "^1.0.0"
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.1.0"
       }
     },
     "esprima": {
@@ -791,17 +807,17 @@
       "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
     },
     "esquery": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
+      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
       "requires": {
-        "estraverse": "^4.0.0"
+        "estraverse": "^5.1.0"
       },
       "dependencies": {
         "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
+          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="
         }
       }
     },
@@ -888,24 +904,24 @@
       }
     },
     "external-editor": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "requires": {
-        "chardet": "^0.4.0",
-        "iconv-lite": "^0.4.17",
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
         "tmp": "^0.0.33"
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -913,20 +929,19 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "requires": {
         "escape-string-regexp": "^1.0.5"
       }
     },
     "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "^2.0.1"
       }
     },
     "finalhandler": {
@@ -972,16 +987,20 @@
       }
     },
     "flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
       "requires": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
       }
     },
+    "flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
+    },
     "forever-agent": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
@@ -1038,9 +1057,9 @@
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
     "get-stdin": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
-      "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
+      "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ=="
     },
     "glob": {
       "version": "5.0.15",
@@ -1054,10 +1073,21 @@
         "path-is-absolute": "^1.0.0"
       }
     },
+    "glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
     "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "requires": {
+        "type-fest": "^0.8.1"
+      }
     },
     "graceful-fs": {
       "version": "4.2.3",
@@ -1090,23 +1120,15 @@
         "function-bind": "^1.1.1"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
     "has-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
       "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
     },
     "has-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
     "hawk": {
       "version": "1.1.1",
@@ -1127,9 +1149,9 @@
       "optional": true
     },
     "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg=="
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
     },
     "http-errors": {
       "version": "1.7.2",
@@ -1174,6 +1196,15 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
     },
+    "import-fresh": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -1194,23 +1225,77 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "inquirer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
-      "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.2.tgz",
+      "integrity": "sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w==",
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^2.1.0",
-        "figures": "^2.0.0",
-        "lodash": "^4.3.0",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^5.5.2",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.16",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
         "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "ip-regex": {
@@ -1230,44 +1315,52 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
     },
     "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "requires": {
-        "has": "^1.0.1"
+        "is-extglob": "^2.1.1"
       }
     },
-    "is-resolvable": {
+    "is-regex": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
     },
     "is-symbol": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
-      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
       "requires": {
-        "has-symbols": "^1.0.0"
+        "has-symbols": "^1.0.1"
       }
     },
     "isarray": {
@@ -1302,9 +1395,9 @@
       }
     },
     "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
       "version": "3.13.1",
@@ -1343,11 +1436,11 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "jsx-ast-utils": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz",
-      "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz",
+      "integrity": "sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w==",
       "requires": {
-        "array-includes": "^3.0.3",
+        "array-includes": "^3.1.1",
         "object.assign": "^4.1.0"
       }
     },
@@ -1389,9 +1482,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
     "loose-envify": {
       "version": "1.4.0",
@@ -1457,9 +1550,9 @@
       }
     },
     "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "minimatch": {
       "version": "3.0.4",
@@ -1495,9 +1588,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
     "natural-compare": {
       "version": "1.4.0",
@@ -1544,12 +1637,17 @@
       },
       "dependencies": {
         "resolve": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
           "requires": {
             "path-parse": "^1.0.6"
           }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -1565,9 +1663,9 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -1585,6 +1683,38 @@
         "object-keys": "^1.0.11"
       }
     },
+    "object.entries": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
+      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5",
+        "has": "^1.0.3"
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
+      "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
+    "object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -1602,11 +1732,11 @@
       }
     },
     "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "mimic-fn": "^2.1.0"
       }
     },
     "optimist": {
@@ -1664,6 +1794,14 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
     },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
     "parse-json": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
@@ -1687,11 +1825,6 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
-    },
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -1721,25 +1854,64 @@
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
     "pkg-conf": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz",
-      "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
+      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
       "requires": {
-        "find-up": "^2.0.0",
-        "load-json-file": "^4.0.0"
+        "find-up": "^3.0.0",
+        "load-json-file": "^5.2.0"
       },
       "dependencies": {
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "locate-path": "^3.0.0"
           }
         },
+        "load-json-file": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
+          "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
+          "requires": {
+            "graceful-fs": "^4.1.15",
+            "parse-json": "^4.0.0",
+            "pify": "^4.0.1",
+            "strip-bom": "^3.0.0",
+            "type-fest": "^0.3.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
         "parse-json": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -1750,9 +1922,14 @@
           }
         },
         "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
+        "type-fest": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="
         }
       }
     },
@@ -1774,11 +1951,6 @@
         "find-up": "^2.1.0"
       }
     },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
-    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -1841,9 +2013,9 @@
       }
     },
     "react-is": {
-      "version": "16.11.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz",
-      "integrity": "sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw=="
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
     "read-pkg": {
       "version": "2.0.0",
@@ -1901,31 +2073,22 @@
         }
       }
     },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
-      }
-    },
     "resolve": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
       "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
     },
     "resolve-from": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
     },
     "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "requires": {
-        "onetime": "^2.0.0",
+        "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
       }
     },
@@ -1953,12 +2116,9 @@
       }
     },
     "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
     },
     "run-parallel": {
       "version": "1.1.9",
@@ -1966,11 +2126,11 @@
       "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
     },
     "rxjs": {
-      "version": "5.5.12",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
-      "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
+      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
       "requires": {
-        "symbol-observable": "1.0.1"
+        "tslib": "^1.9.0"
       }
     },
     "safe-buffer": {
@@ -1984,9 +2144,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
     "send": {
       "version": "0.17.1",
@@ -2060,16 +2220,25 @@
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
     },
     "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
     },
     "slice-ansi": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
       "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
         "is-fullwidth-code-point": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        }
       }
     },
     "sntp": {
@@ -2091,23 +2260,23 @@
       }
     },
     "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
     },
     "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "requires": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
@@ -2124,36 +2293,36 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "standard": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-12.0.1.tgz",
-      "integrity": "sha512-UqdHjh87OG2gUrNCSM4QRLF5n9h3TFPwrCNyVlkqu31Hej0L/rc8hzKqVvkb2W3x0WMq7PzZdkLfEcBhVOR6lg==",
+      "version": "14.3.4",
+      "resolved": "https://registry.npmjs.org/standard/-/standard-14.3.4.tgz",
+      "integrity": "sha512-+lpOkFssMkljJ6eaILmqxHQ2n4csuEABmcubLTb9almFi1ElDzXb1819fjf/5ygSyePCq4kU2wMdb2fBfb9P9Q==",
       "requires": {
-        "eslint": "~5.4.0",
-        "eslint-config-standard": "12.0.0",
-        "eslint-config-standard-jsx": "6.0.2",
-        "eslint-plugin-import": "~2.14.0",
-        "eslint-plugin-node": "~7.0.1",
-        "eslint-plugin-promise": "~4.0.0",
-        "eslint-plugin-react": "~7.11.1",
+        "eslint": "~6.8.0",
+        "eslint-config-standard": "14.1.1",
+        "eslint-config-standard-jsx": "8.1.0",
+        "eslint-plugin-import": "~2.18.0",
+        "eslint-plugin-node": "~10.0.0",
+        "eslint-plugin-promise": "~4.2.1",
+        "eslint-plugin-react": "~7.14.2",
         "eslint-plugin-standard": "~4.0.0",
-        "standard-engine": "~9.0.0"
+        "standard-engine": "^12.0.0"
       }
     },
     "standard-engine": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-9.0.0.tgz",
-      "integrity": "sha512-ZfNfCWZ2Xq67VNvKMPiVMKHnMdvxYzvZkf1AH8/cw2NLDBm5LRsxMqvEJpsjLI/dUosZ3Z1d6JlHDp5rAvvk2w==",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-12.1.0.tgz",
+      "integrity": "sha512-DVJnWM1CGkag4ucFLGdiYWa5/kJURPONmMmk17p8FT5NE4UnPZB1vxWnXnRo2sPSL78pWJG8xEM+1Tu19z0deg==",
       "requires": {
-        "deglob": "^2.1.0",
-        "get-stdin": "^6.0.0",
-        "minimist": "^1.1.0",
-        "pkg-conf": "^2.0.0"
+        "deglob": "^4.0.1",
+        "get-stdin": "^7.0.0",
+        "minimist": "^1.2.5",
+        "pkg-conf": "^3.1.0"
       },
       "dependencies": {
         "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
         }
       }
     },
@@ -2163,30 +2332,41 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
     "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
       "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        }
       }
     },
-    "string.prototype.trimleft": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
-      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+    "string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5"
       }
     },
-    "string.prototype.trimright": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
-      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+    "string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5"
       }
     },
     "stringstream": {
@@ -2196,17 +2376,17 @@
       "optional": true
     },
     "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^4.1.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         }
       }
     },
@@ -2216,9 +2396,9 @@
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
     },
     "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "supports-color": {
       "version": "3.2.3",
@@ -2228,22 +2408,37 @@
         "has-flag": "^1.0.0"
       }
     },
-    "symbol-observable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
-    },
     "table": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz",
-      "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
       "requires": {
-        "ajv": "^6.0.1",
-        "ajv-keywords": "^3.0.0",
-        "chalk": "^2.1.0",
-        "lodash": "^4.17.4",
-        "slice-ansi": "1.0.0",
-        "string-width": "^2.1.1"
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        }
       }
     },
     "text-table": {
@@ -2280,6 +2475,11 @@
         "punycode": "^2.1.1"
       }
     },
+    "tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+    },
     "tunnel-agent": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
@@ -2294,6 +2494,11 @@
         "prelude-ls": "~1.1.2"
       }
     },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+    },
     "type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -2349,6 +2554,11 @@
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
+    "v8-compile-cache": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="
+    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -2387,9 +2597,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "requires": {
         "mkdirp": "^0.5.1"
       }

From 7fbce55f87688e0dd13aa0ed77b4a2e77cdd66c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Sep 2020 01:29:51 +0000
Subject: [PATCH 0326/1140] Bump handlebars from 4.5.1 to 4.7.6

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.1 to 4.7.6.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.1...v4.7.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 52dd3a8816..c095586870 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1095,16 +1095,22 @@
       "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
     "handlebars": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
-      "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
+      "version": "4.7.6",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
+      "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
       "requires": {
+        "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
         "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
+        "uglify-js": "^3.1.4",
+        "wordwrap": "^1.0.0"
       },
       "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -1562,11 +1568,6 @@
         "brace-expansion": "^1.1.7"
       }
     },
-    "minimist": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
-    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -1739,22 +1740,6 @@
         "mimic-fn": "^2.1.0"
       }
     },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-        }
-      }
-    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",

From 184c9f68bfa86ebac61402b90ba4942ab149f35a Mon Sep 17 00:00:00 2001
From: Oli <manolivier93@gmail.com>
Date: Mon, 23 Nov 2020 17:44:07 +0200
Subject: [PATCH 0327/1140] remove online demo http://roles.meteor.com/

This no longer works since *.meteor.com was taken down
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 5de93d6d27..5e549ef339 100644
--- a/README.md
+++ b/README.md
@@ -447,8 +447,6 @@ The `examples` directory contains Meteor apps which show off the following featu
 * 'Sign-in required' app with up-front login page using `accounts-ui`
 * Client-side routing
 
-View the `flow-router` example app online @  <a href="http://roles.meteor.com/" target="_blank">http://roles.meteor.com/</a>
-
   1. `git clone https://github.com/Meteor-Community-Packages/meteor-roles.git`
   2. choose an example, eg.
     * `cd meteor-roles/examples/iron-router` or

From e18c5e4bf7b5b328b44c6e7c58d772fd56a6c6f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 8 May 2021 11:33:06 +0000
Subject: [PATCH 0328/1140] Bump handlebars from 4.7.6 to 4.7.7

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.7.6...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c095586870..6b0286a177 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1095,9 +1095,9 @@
       "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
     "handlebars": {
-      "version": "4.7.6",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
-      "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
+      "version": "4.7.7",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
       "requires": {
         "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
@@ -1106,11 +1106,6 @@
         "wordwrap": "^1.0.0"
       },
       "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -1568,6 +1563,11 @@
         "brace-expansion": "^1.1.7"
       }
     },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",

From 4abd113a183f3055316599627531ab2ff6ca5740 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 May 2021 19:20:27 +0000
Subject: [PATCH 0329/1140] Bump lodash from 4.17.19 to 4.17.21

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c095586870..cba3d3e543 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1488,9 +1488,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "loose-envify": {
       "version": "1.4.0",

From 4f12255fcd2fabc6e9f25e4fdcc93110747da447 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 May 2021 07:20:15 +0000
Subject: [PATCH 0330/1140] Bump hosted-git-info from 2.8.8 to 2.8.9

Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c095586870..2b78fdd79f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1155,9 +1155,9 @@
       "optional": true
     },
     "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
     },
     "http-errors": {
       "version": "1.7.2",

From 344f806f53b765873acc2b4f38d45c27445b0af3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Jun 2021 01:55:31 +0000
Subject: [PATCH 0331/1140] Bump glob-parent from 5.1.1 to 5.1.2

Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/gulpjs/glob-parent/releases)
- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)

---
updated-dependencies:
- dependency-name: glob-parent
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f2f0f13837..c183bc1e4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1074,9 +1074,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "requires": {
         "is-glob": "^4.0.1"
       }

From 95e9e04911cc2caf35cd98006587de12168c9be0 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Thu, 24 Jun 2021 15:39:51 +0200
Subject: [PATCH 0332/1140] Compatibility with Meteor 2.3

---
 History.md   | 5 +++++
 package.js   | 8 ++++----
 package.json | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/History.md b/History.md
index 1fc9fd8df0..ea0d1d7f07 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+## v3.3.0
+
+* Update dependencies
+* Made compatible with Meteor 2.3
+
 ## v3.2.3
 
 * Update dependencies
diff --git a/package.js b/package.js
index 8f0f032472..dd47b1a569 100644
--- a/package.js
+++ b/package.js
@@ -2,13 +2,13 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.2.3',
+  version: '3.3.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('METEOR@1.8.1')
+  api.versionsFrom(['1.12', '2.3'])
 
   var both = ['client', 'server']
 
@@ -20,7 +20,7 @@ Package.onUse(function (api) {
     'check'
   ], both)
 
-  api.use(['blaze@2.3.4'], 'client', { weak: true })
+  api.use(['blaze@2.5.0'], 'client', { weak: true })
 
   api.export('Roles')
 
@@ -45,7 +45,7 @@ Package.onTest(function (api) {
     'chai': '4.2.0'
   })
 
-  api.versionsFrom('METEOR@1.8.1')
+  api.versionsFrom(['1.12', '2.3'])
 
   var both = ['client', 'server']
 
diff --git a/package.json b/package.json
index db2001a929..a5baf18339 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "istanbul": "^0.4.5",
-    "standard": "^14.3.3",
+    "standard": "^14.3.4",
     "yuidocjs": "^0.10.2"
   }
 }

From 8e714593ed37b372e29479610108b29e04852d08 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Thu, 24 Jun 2021 15:41:22 +0200
Subject: [PATCH 0333/1140] Published alanning:roles@3.3.0

---
 .versions | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/.versions b/.versions
index a01137bc8a..d4095338b9 100644
--- a/.versions
+++ b/.versions
@@ -1,24 +1,24 @@
-accounts-base@1.6.0
-alanning:roles@3.2.3
+accounts-base@1.9.0
+alanning:roles@3.3.0
 allow-deny@1.1.0
-babel-compiler@7.5.3
+babel-compiler@7.6.1
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
-boilerplate-generator@1.7.0
+boilerplate-generator@1.7.1
 callback-hook@1.3.0
 check@1.3.1
 ddp@1.4.0
-ddp-client@2.3.3
+ddp-client@2.4.0
 ddp-common@1.4.0
-ddp-rate-limiter@1.0.7
-ddp-server@2.3.1
+ddp-rate-limiter@1.0.9
+ddp-server@2.3.2
 diff-sequence@1.1.1
-dynamic-import@0.5.2
-ecmascript@0.14.3
+dynamic-import@0.6.0
+ecmascript@0.15.1
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.10.0
-ecmascript-runtime-server@0.9.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
 ejson@1.1.1
 fetch@0.1.1
 geojson-utils@1.0.10
@@ -27,34 +27,35 @@ id-map@1.1.0
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@3.2.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.2.3
+local-test:alanning:roles@3.3.0
 localstorage@1.2.0
-logging@1.1.20
+logging@1.2.0
 meteor@1.9.3
 meteortesting:browser-tests@0.1.2
 meteortesting:mocha@0.4.4
-minimongo@1.6.0
+minimongo@1.6.2
 modern-browsers@0.1.5
-modules@0.15.0
+modules@0.16.0
 modules-runtime@0.12.0
-mongo@1.10.0
-mongo-decimal@0.1.1
+mongo@1.11.0
+mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
-npm-mongo@3.7.0
+npm-mongo@3.9.0
 ordered-dict@1.1.0
 practicalmeteor:mocha-core@1.0.1
 promise@0.11.2
 random@1.2.0
 rate-limit@1.0.9
+react-fast-refresh@0.1.1
 reactive-var@1.0.11
-reload@1.3.0
+reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.0
 service-configuration@1.0.11
-socket-stream-client@0.3.0
+socket-stream-client@0.3.1
 tracker@1.2.0
 underscore@1.0.10
-url@1.3.0
-webapp@1.9.1
-webapp-hashing@1.0.9
+url@1.3.1
+webapp@1.10.1
+webapp-hashing@1.1.0

From f220bb5ab610d320b56d6f6657fdfdaa57c351d9 Mon Sep 17 00:00:00 2001
From: Mihail Gaberov <mihail.gaberov@gmail.com>
Date: Thu, 8 Jul 2021 09:57:10 +0200
Subject: [PATCH 0334/1140] Fixed typo.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5e549ef339..279ffe9a29 100644
--- a/README.md
+++ b/README.md
@@ -369,7 +369,7 @@ Meteor.methods({
 
 -- **Client** --
 
-Client javascript doese not by default have access to all the same Roles functions as the server unless you publish
+Client javascript does not by default have access to all the same Roles functions as the server unless you publish
 these role-assignments. In addition, Blaze will have the addition of a `isInRole` handlebars helper which is
 automatically registered by the Roles package.
 

From 611618c5781617dfef59d64fa3227c4e985f9cd5 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Tue, 27 Jul 2021 14:00:10 +0200
Subject: [PATCH 0335/1140] Fix #340

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 279ffe9a29..399f40816e 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,8 @@ change permissions later for the whole role, just add or remove children roles.
 with:
 
 ```javascript
+import { Roles } from 'meteor/alanning:roles';
+
 Roles.createRole('user');
 Roles.createRole('admin');
 Roles.createRole('USERS_VIEW');
@@ -245,6 +247,8 @@ users.forEach(function (user) {
   });
 
   if (Meteor.roleAssignment.find({ 'user._id': id }).count() === 0) {
+    import { Roles } from 'meteor/alanning:roles';
+    
     user.roles.forEach(function (role) {
       Roles.createRole(role, {unlessExists: true});
     });
@@ -267,6 +271,7 @@ This SO answer gives more detail: http://stackoverflow.com/a/22650399/219238
 Check user roles before publishing sensitive data:
 ```js
 // server/publish.js
+import { Roles } from 'meteor/alanning:roles'
 
 // Give authorized users access to sensitive data by scope
 Meteor.publish('secrets', function (scope) {
@@ -291,6 +296,8 @@ Meteor.publish('secrets', function (scope) {
 Prevent non-authorized users from creating new users:
 ```js
 Accounts.validateNewUser(function (user) {
+  import { Roles } from 'meteor/alanning:roles'
+  
   var loggedInUser = Meteor.user();
 
   if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
@@ -306,6 +313,7 @@ Accounts.validateNewUser(function (user) {
 Prevent access to certain functionality, such as deleting a user:
 ```js
 // server/userMethods.js
+import { Roles } from 'meteor/alanning:roles'
 
 Meteor.methods({
   /**
@@ -338,6 +346,7 @@ Meteor.methods({
 Manage a user's roles:
 ```js
 // server/userMethods.js
+import { Roles } from 'meteor/alanning:roles'
 
 Meteor.methods({
   /**

From 9605a3b89fc9c35b29452a8ba38ab10d2ba82e42 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Thu, 5 Aug 2021 14:09:15 +0200
Subject: [PATCH 0336/1140] Use createIndex

---
 History.md            |  4 ++++
 package.js            |  6 +++---
 roles/roles_server.js | 16 ++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/History.md b/History.md
index ea0d1d7f07..ad4e8957ee 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+## v3.4.0
+
+* Use the new `createIndex` instead of `_ensureIndex`
+
 ## v3.3.0
 
 * Update dependencies
diff --git a/package.js b/package.js
index dd47b1a569..d1d410fdc7 100644
--- a/package.js
+++ b/package.js
@@ -2,13 +2,13 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.3.0',
+  version: '3.4.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['1.12', '2.3'])
+  api.versionsFrom('2.4')
 
   var both = ['client', 'server']
 
@@ -45,7 +45,7 @@ Package.onTest(function (api) {
     'chai': '4.2.0'
   })
 
-  api.versionsFrom(['1.12', '2.3'])
+  api.versionsFrom('2.4')
 
   var both = ['client', 'server']
 
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 38cf336364..15b158395b 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,12 +1,12 @@
 /* global Meteor, Roles */
 
-Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-Meteor.roleAssignment._ensureIndex({ 'role._id': 1 })
-Meteor.roleAssignment._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-Meteor.roleAssignment._ensureIndex({ 'inheritedRoles._id': 1 })
+Meteor.roleAssignment.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+Meteor.roleAssignment.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
+Meteor.roleAssignment.createIndex({ 'role._id': 1 })
+Meteor.roleAssignment.createIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+Meteor.roleAssignment.createIndex({ 'inheritedRoles._id': 1 })
 
-Meteor.roles._ensureIndex({ 'children._id': 1 })
+Meteor.roles.createIndex({ 'children._id': 1 })
 
 /*
  * Publish logged-in user's roles so client-side checks can work.
@@ -356,8 +356,8 @@ Object.assign(Roles, {
   _backwardMigrate2: function (assignmentSelector) {
     assignmentSelector = assignmentSelector || {}
 
-    Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
-    Meteor.users._ensureIndex({ 'roles.scope': 1 })
+    Meteor.users.createIndex({ 'roles._id': 1, 'roles.scope': 1 })
+    Meteor.users.createIndex({ 'roles.scope': 1 })
 
     Meteor.roleAssignment.find(assignmentSelector).forEach(r => {
       const roles = Meteor.users.findOne({ _id: r.user._id }).roles || []

From 27a0458f36e76410f1aadd335179c4e2018ae133 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Tue, 10 Aug 2021 11:30:53 +0200
Subject: [PATCH 0337/1140] Make backward compatible

---
 History.md            |  4 +++-
 package.js            |  2 +-
 roles/roles_server.js | 21 +++++++++++++++------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/History.md b/History.md
index ad4e8957ee..96f5face28 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,8 @@
+# Changelog
+
 ## v3.4.0
 
-* Use the new `createIndex` instead of `_ensureIndex`
+* Use the new `createIndex` instead of `_ensureIndex` if available
 
 ## v3.3.0
 
diff --git a/package.js b/package.js
index d1d410fdc7..a0b1da7b45 100644
--- a/package.js
+++ b/package.js
@@ -8,7 +8,7 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('2.4')
+  api.versionsFrom('2.3')
 
   var both = ['client', 'server']
 
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 15b158395b..abbf4bdd0e 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,12 +1,21 @@
 /* global Meteor, Roles */
+if (Meteor.roles.createIndex) {
+  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
+  Meteor.roleAssignment.createIndex({ 'role._id': 1 })
+  Meteor.roleAssignment.createIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+  Meteor.roleAssignment.createIndex({ 'inheritedRoles._id': 1 })
 
-Meteor.roleAssignment.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-Meteor.roleAssignment.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-Meteor.roleAssignment.createIndex({ 'role._id': 1 })
-Meteor.roleAssignment.createIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-Meteor.roleAssignment.createIndex({ 'inheritedRoles._id': 1 })
+  Meteor.roles.createIndex({ 'children._id': 1 })
+} else {
+  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
+  Meteor.roleAssignment._ensureIndex({ 'role._id': 1 })
+  Meteor.roleAssignment._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+  Meteor.roleAssignment._ensureIndex({ 'inheritedRoles._id': 1 })
 
-Meteor.roles.createIndex({ 'children._id': 1 })
+  Meteor.roles._ensureIndex({ 'children._id': 1 })
+}
 
 /*
  * Publish logged-in user's roles so client-side checks can work.

From c49fd40509e8175f3a7a3ac3ef4f3db510295fcc Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Tue, 10 Aug 2021 11:31:59 +0200
Subject: [PATCH 0338/1140] Increase backward compatibility

---
 package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.js b/package.js
index a0b1da7b45..d42b9ea95f 100644
--- a/package.js
+++ b/package.js
@@ -8,7 +8,7 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom('2.3')
+  api.versionsFrom(['1.12', '2.3'])
 
   var both = ['client', 'server']
 

From ece40d59b3bbe6ca899fee592ade2b48f6e71387 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Tue, 10 Aug 2021 11:35:09 +0200
Subject: [PATCH 0339/1140] Compatibility for migration script

---
 roles/roles_server.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index abbf4bdd0e..9a1857d851 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -365,8 +365,13 @@ Object.assign(Roles, {
   _backwardMigrate2: function (assignmentSelector) {
     assignmentSelector = assignmentSelector || {}
 
-    Meteor.users.createIndex({ 'roles._id': 1, 'roles.scope': 1 })
-    Meteor.users.createIndex({ 'roles.scope': 1 })
+    if (Meteor.users.createIndex) {
+      Meteor.users.createIndex({ 'roles._id': 1, 'roles.scope': 1 })
+      Meteor.users.createIndex({ 'roles.scope': 1 })
+    } else {
+      Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
+      Meteor.users._ensureIndex({ 'roles.scope': 1 })
+    }
 
     Meteor.roleAssignment.find(assignmentSelector).forEach(r => {
       const roles = Meteor.users.findOne({ _id: r.user._id }).roles || []

From 12a47fd273fc909d48f5844b0337fefc49675de3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Aug 2021 16:43:45 +0000
Subject: [PATCH 0340/1140] Bump path-parse from 1.0.6 to 1.0.7

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80968ddafa..330db34fa1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1816,9 +1816,9 @@
       "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-to-regexp": {
       "version": "0.1.7",

From c80dde3b2431e7f348d593b1c266e88dfad1910d Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Tue, 17 Aug 2021 12:33:20 +0200
Subject: [PATCH 0341/1140] Published alanning:roles@3.4.0

---
 .versions  | 44 ++++++++++++++++++++++----------------------
 package.js |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.versions b/.versions
index d4095338b9..d3ad54a576 100644
--- a/.versions
+++ b/.versions
@@ -1,61 +1,61 @@
-accounts-base@1.9.0
-alanning:roles@3.3.0
+accounts-base@2.0.1
+alanning:roles@3.4.0
 allow-deny@1.1.0
-babel-compiler@7.6.1
+babel-compiler@7.6.2
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
 boilerplate-generator@1.7.1
-callback-hook@1.3.0
+callback-hook@1.3.1
 check@1.3.1
 ddp@1.4.0
-ddp-client@2.4.0
+ddp-client@2.5.0
 ddp-common@1.4.0
-ddp-rate-limiter@1.0.9
-ddp-server@2.3.2
+ddp-rate-limiter@1.1.0
+ddp-server@2.4.0
 diff-sequence@1.1.1
-dynamic-import@0.6.0
-ecmascript@0.15.1
+dynamic-import@0.7.1
+ecmascript@0.15.2
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.11.0
-ecmascript-runtime-server@0.10.0
+ecmascript-runtime-client@0.11.1
+ecmascript-runtime-server@0.10.1
 ejson@1.1.1
 fetch@0.1.1
 geojson-utils@1.0.10
 http@1.4.2
-id-map@1.1.0
+id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@3.2.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.3.0
+local-test:alanning:roles@3.4.0
 localstorage@1.2.0
 logging@1.2.0
 meteor@1.9.3
 meteortesting:browser-tests@0.1.2
 meteortesting:mocha@0.4.4
-minimongo@1.6.2
+minimongo@1.7.0
 modern-browsers@0.1.5
 modules@0.16.0
 modules-runtime@0.12.0
-mongo@1.11.0
+mongo@1.12.0
 mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
-mongo-id@1.0.7
+mongo-id@1.0.8
 npm-mongo@3.9.0
 ordered-dict@1.1.0
 practicalmeteor:mocha-core@1.0.1
-promise@0.11.2
+promise@0.12.0
 random@1.2.0
 rate-limit@1.0.9
 react-fast-refresh@0.1.1
 reactive-var@1.0.11
 reload@1.3.1
 retry@1.1.0
-routepolicy@1.1.0
-service-configuration@1.0.11
-socket-stream-client@0.3.1
+routepolicy@1.1.1
+service-configuration@1.1.0
+socket-stream-client@0.4.0
 tracker@1.2.0
 underscore@1.0.10
-url@1.3.1
-webapp@1.10.1
+url@1.3.2
+webapp@1.11.1
 webapp-hashing@1.1.0
diff --git a/package.js b/package.js
index d42b9ea95f..90a65850e6 100644
--- a/package.js
+++ b/package.js
@@ -45,7 +45,7 @@ Package.onTest(function (api) {
     'chai': '4.2.0'
   })
 
-  api.versionsFrom('2.4')
+  api.versionsFrom('2.3')
 
   var both = ['client', 'server']
 

From 92ca88772a9c3eb1148c7a5f7b4da0ef018fef79 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Tue, 17 Aug 2021 12:34:00 +0200
Subject: [PATCH 0342/1140] Export collections for direct access

---
 package.js            | 4 ++--
 roles/roles_common.js | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.js b/package.js
index 90a65850e6..db587e81f7 100644
--- a/package.js
+++ b/package.js
@@ -22,10 +22,10 @@ Package.onUse(function (api) {
 
   api.use(['blaze@2.5.0'], 'client', { weak: true })
 
-  api.export('Roles')
+  api.export(['Roles', 'RolesCollection', 'RoleAssignmentCollection'])
 
   api.addFiles('roles/roles_common.js', both)
-  api.addFiles('roles/roles_server.js', 'server')
+  api.mainModule('roles/roles_server.js', 'server')
   api.addFiles([
     'roles/client/debug.js',
     'roles/client/uiHelpers.js',
diff --git a/roles/roles_common.js b/roles/roles_common.js
index c2aafa7cdc..6d2788b345 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -27,10 +27,12 @@
 if (!Meteor.roles) {
   Meteor.roles = new Mongo.Collection('roles')
 }
+export const RolesCollection = Meteor.roles
 
 if (!Meteor.roleAssignment) {
   Meteor.roleAssignment = new Mongo.Collection('role-assignment')
 }
+export const RoleAssignmentCollection = Meteor.roleAssignment
 
 /**
  * @class Roles

From 8eba20f55e31967604b2c55e6eea393d84f6c2d2 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Fri, 21 Oct 2022 12:13:59 +0200
Subject: [PATCH 0343/1140] [webapp] Remove underscore

---
 packages/webapp/package.js       |  4 ++--
 packages/webapp/webapp_server.js | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 5464ea7dc8..7459ba1903 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -15,6 +15,7 @@ Npm.depends({
   qs: '6.10.1',
   useragent: '2.3.0',
   '@vlasky/whomst': '0.1.7',
+  'lodash.has': '4.5.2'
 });
 
 Npm.strip({
@@ -32,7 +33,6 @@ Package.onUse(function(api) {
   api.use(
     [
       'logging',
-      'underscore',
       'routepolicy',
       'modern-browsers',
       'boilerplate-generator',
@@ -60,7 +60,7 @@ Package.onUse(function(api) {
 });
 
 Package.onTest(function(api) {
-  api.use(['tinytest', 'ecmascript', 'webapp', 'http', 'underscore']);
+  api.use(['tinytest', 'ecmascript', 'webapp', 'http']);
   api.addFiles('webapp_tests.js', 'server');
   api.addFiles('webapp_client_tests.js', 'client');
   api.addFiles('socket_file_tests.js', 'server');
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 03d6de971b..8ad6c220d1 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -20,6 +20,7 @@ import {
 } from './socket_file.js';
 import cluster from 'cluster';
 import whomst from '@vlasky/whomst';
+import has from 'lodash.has';
 
 var SHORT_SOCKET_TIMEOUT = 5 * 1000;
 var LONG_SOCKET_TIMEOUT = 120 * 1000;
@@ -194,12 +195,12 @@ WebApp.categorizeRequest = function(req) {
 var htmlAttributeHooks = [];
 var getHtmlAttributes = function(request) {
   var combinedAttributes = {};
-  _.each(htmlAttributeHooks || [], function(hook) {
+  (htmlAttributeHooks || []).forEach(function(hook) {
     var attributes = hook(request);
     if (attributes === null) return;
     if (typeof attributes !== 'object')
       throw Error('HTML attribute hook must return null or object');
-    _.extend(combinedAttributes, attributes);
+    Object.assign(combinedAttributes, attributes);
   });
   return combinedAttributes;
 };
@@ -282,7 +283,7 @@ WebApp._timeoutAdjustmentRequestCallback = function(req, res) {
   res.on('finish', function() {
     res.setTimeout(SHORT_SOCKET_TIMEOUT);
   });
-  _.each(finishListeners, function(l) {
+  finishListeners.forEach(function(l) {
     res.on('finish', l);
   });
 };
@@ -435,13 +436,14 @@ function getBoilerplateAsync(request, arch) {
     });
   });
   runtimeConfig.isUpdatedByArch[arch] = false;
+  const { dynamicHead, dynamicBody } = request;
   const data = Object.assign(
     {},
     boilerplate.baseData,
     {
       htmlAttributes: getHtmlAttributes(request),
     },
-    _.pick(request, 'dynamicHead', 'dynamicBody')
+    { dynamicHead, dynamicBody }
   );
 
   let madeChanges = false;
@@ -524,9 +526,8 @@ WebAppInternals.generateBoilerplateInstance = function(
           return pathJoin(archPath[arch], itemPath);
         },
         baseDataExtension: {
-          additionalStaticJs: _.map(additionalStaticJs || [], function(
-            contents,
-            pathname
+          additionalStaticJs: (Object.entries(additionalStaticJs) || []).map(function(
+            [pathname, contents]
           ) {
             return {
               pathname: pathname,
@@ -603,7 +604,7 @@ WebAppInternals.staticFilesMiddleware = async function(
   };
 
   if (
-    _.has(additionalStaticJs, pathname) &&
+    has(additionalStaticJs, pathname) &&
     !WebAppInternals.inlineScriptsAllowed()
   ) {
     serveStaticJs(additionalStaticJs[pathname]);
@@ -1338,7 +1339,7 @@ function runWebAppServer() {
   });
 
   // start up app
-  _.extend(WebApp, {
+  Object.assign(WebApp, {
     connectHandlers: packageAndAppHandlers,
     rawConnectHandlers: rawConnectHandlers,
     httpServer: httpServer,

From a410b87752247e272a9876ec7e6c81a9aa4c9d8b Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Fri, 21 Oct 2022 13:21:13 +0200
Subject: [PATCH 0344/1140] [test-helpers] Remove underscore

---
 packages/test-helpers/async_multi.js          | 24 +++++++++----------
 packages/test-helpers/callback_logger.js      | 19 ++++++++-------
 packages/test-helpers/connection.js           |  4 +++-
 packages/test-helpers/event_simulation.js     |  4 ++--
 packages/test-helpers/package.js              |  9 +++++--
 packages/test-helpers/try_all_permutations.js |  2 +-
 .../test-helpers/try_all_permutations_test.js |  4 ++--
 7 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/packages/test-helpers/async_multi.js b/packages/test-helpers/async_multi.js
index e5ec3cb43c..22e15576bd 100644
--- a/packages/test-helpers/async_multi.js
+++ b/packages/test-helpers/async_multi.js
@@ -52,32 +52,32 @@ var ExpectationManager = function (test, onComplete) {
   self.outstanding = 0;
 };
 
-_.extend(ExpectationManager.prototype, {
-  expect: function (/* arguments */) {
+Object.assign(ExpectationManager.prototype, {
+  expect: function (...args) {
     var self = this;
 
-    if (typeof arguments[0] === "function")
-      var expected = arguments[0];
+    if (typeof args[0] === "function")
+      var expected = args[0];
     else
-      var expected = _.toArray(arguments);
+      var expected = args;
 
     if (self.closed)
       throw new Error("Too late to add more expectations to the test");
     self.outstanding++;
 
-    return function (/* arguments */) {
+    return function (...args) {
       if (self.dead)
         return;
 
       if (typeof expected === "function") {
         try {
-          expected.apply({}, arguments);
+          expected.apply({}, args);
         } catch (e) {
           if (self.cancel())
             self.test.exception(e);
         }
       } else {
-        self.test.equal(_.toArray(arguments), expected);
+        self.test.equal(args, expected);
       }
 
       self.outstanding--;
@@ -115,12 +115,12 @@ testAsyncMulti = function (name, funcs, { isOnly = false } = {}) {
 
   const addFunction = isOnly ? Tinytest.onlyAsync : Tinytest.addAsync;
   addFunction(name, function (test, onComplete) {
-    var remaining = _.clone(funcs);
+    var remaining = Object.assign({}, funcs);
     var context = {};
     var i = 0;
 
     var runNext = function () {
-      var func = remaining.shift();
+      var func = Object.values(remaining).shift();
       if (!func) {
         delete test.extraDetails.asyncBlock;
         onComplete();
@@ -142,7 +142,7 @@ testAsyncMulti = function (name, funcs, { isOnly = false } = {}) {
         test.extraDetails.asyncBlock = i++;
 
         new Promise(resolve => {
-          resolve(func.apply(context, [test, _.bind(em.expect, em)]));
+          resolve(func.apply(context, [test, em.expect.bind(em)]));
         }).then(result => {
           em.done();
         }, exception => {
@@ -190,4 +190,4 @@ pollUntil = function (expect, f, timeout, step, noFail) {
     timeout,
     step
   );
-};
+};
\ No newline at end of file
diff --git a/packages/test-helpers/callback_logger.js b/packages/test-helpers/callback_logger.js
index fb4f30ee07..4f6e661baf 100644
--- a/packages/test-helpers/callback_logger.js
+++ b/packages/test-helpers/callback_logger.js
@@ -1,3 +1,6 @@
+import isEmpty from 'lodash.isempty';
+import isEqual from 'lodash.isequal';
+
 // This file allows you to write tests that expect certain callbacks to be
 // called in certain orders, or optionally in groups where the order does not
 // matter.  It can be set up in either a synchronous manner, so that each
@@ -19,7 +22,7 @@ withCallbackLogger = function (test, callbackNames, async, fun) {
   if (async) {
     if (!Fiber)
       throw new Error("Fiber is not available");
-    logger.fiber = Fiber(_.bind(fun, null, logger));
+    logger.fiber = Fiber(fun.bind(null, logger));
     logger.fiber.run();
   } else {
     fun(logger);
@@ -31,9 +34,9 @@ var CallbackLogger = function (test, callbackNames) {
   self._log = [];
   self._test = test;
   self._yielded = false;
-  _.each(callbackNames, function (callbackName) {
+  callbackNames.forEach(function (callbackName) {
     self[callbackName] = function () {
-      var args = _.toArray(arguments);
+      var args = Array.from(arguments);
       self._log.push({callback: callbackName, args: args});
       if (self.fiber) {
         setTimeout(function () {
@@ -56,7 +59,7 @@ CallbackLogger.prototype._yield = function (arg) {
 CallbackLogger.prototype.expectResult = function (callbackName, args) {
   var self = this;
   self._waitForLengthOrTimeout(1);
-  if (_.isEmpty(self._log)) {
+  if (isEmpty(self._log)) {
     self._test.fail(["Expected callback " + callbackName + " got none"]);
     return;
   }
@@ -93,13 +96,13 @@ CallbackLogger.prototype.expectResultUnordered = function (list) {
 
   self._waitForLengthOrTimeout(list.length);
 
-  list = _.clone(list); // shallow copy.
+  list = [...list]; // shallow copy.
   var i = list.length;
   while (i > 0) {
     var found = false;
     var dequeued = self._log.shift();
     for (var j = 0; j < list.length; j++) {
-      if (_.isEqual(list[j], dequeued)) {
+      if (isEqual(list[j], dequeued)) {
         list.splice(j, 1);
         found = true;
         break;
@@ -131,11 +134,11 @@ CallbackLogger.prototype.expectNoResult = function (fn) {
       self.fiber.run(handle);
     }, TIMEOUT);
     var foo = self._yield();
-    while (_.isEmpty(self._log) && foo !== handle) {
+    while (isEmpty(self._log) && foo !== handle) {
       foo = self._yield();
     }
     clearTimeout(handle);
   }
 
   self._expectNoResultImpl();
-};
+};
\ No newline at end of file
diff --git a/packages/test-helpers/connection.js b/packages/test-helpers/connection.js
index a78c3dab46..6d597bb0a3 100644
--- a/packages/test-helpers/connection.js
+++ b/packages/test-helpers/connection.js
@@ -1,3 +1,5 @@
+import isString from 'lodash.isstring';
+
 // Establish a connection from the server to the server, and wait
 // until the client side of the connection has received the session
 // id.  On success call `succeeded` with two arguments, the client
@@ -13,7 +15,7 @@ makeTestConnection = function (test, succeeded, failed) {
 
   // Add incoming connections to `serverConns`.
   var onConnectionHandle = Meteor.onConnection(function (serverConn) {
-    test.isTrue(_.isString(serverConn.id), "connection handle id exists and is a string");
+    test.isTrue(isString(serverConn.id), "connection handle id exists and is a string");
     if (serverConns[serverConn.id]) {
       test.fail("onConnection callback called multiple times for same session id");
       failed();
diff --git a/packages/test-helpers/event_simulation.js b/packages/test-helpers/event_simulation.js
index cf4ed8b3af..c4f8cc1086 100644
--- a/packages/test-helpers/event_simulation.js
+++ b/packages/test-helpers/event_simulation.js
@@ -9,11 +9,11 @@ simulateEvent = function (node, event, args, options) {
   if (document.createEvent) {
     var e = document.createEvent("Event");
     e.initEvent(event, bubbles, true);
-    _.extend(e, args);
+    Object.assign(e, args);
     node.dispatchEvent(e);
   } else {
     var e = document.createEventObject();
-    _.extend(e, args);
+    Object.assign(e, args);
     node.fireEvent("on" + event, e);
   }
 };
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 17b6e0f37a..6a2e6992f3 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -3,10 +3,15 @@ Package.describe({
   version: '1.3.0'
 });
 
+Npm.depends({
+  'lodash.isequal': '4.5.0',
+  'lodash.isempty': '4.4.0',
+  'lodash.isstring': '4.0.1'
+});
+
 Package.onUse(function (api) {
   api.use([
     'ecmascript',
-    'underscore',
     'tracker',
     'ejson',
     'tinytest',
@@ -45,7 +50,7 @@ Package.onUse(function (api) {
 
 Package.onTest(function (api) {
   api.use('tinytest');
-  api.use(['test-helpers', 'underscore']);
+  api.use(['test-helpers']);
   api.addFiles('try_all_permutations_test.js', 'client');
   api.addFiles('seeded_random_test.js');
 });
diff --git a/packages/test-helpers/try_all_permutations.js b/packages/test-helpers/try_all_permutations.js
index 2276c10a01..5b60aa62b9 100644
--- a/packages/test-helpers/try_all_permutations.js
+++ b/packages/test-helpers/try_all_permutations.js
@@ -39,7 +39,7 @@ try_all_permutations = function () {
 
   var expand_next_set = function () {
     if (current_set === args.length) {
-      _.each(chosen, function (f) { f(); });
+      chosen.forEach(function (f) { f(); });
     } else {
       var set = args[current_set];
       if (typeof set === "function")
diff --git a/packages/test-helpers/try_all_permutations_test.js b/packages/test-helpers/try_all_permutations_test.js
index f9bebffea9..4c9b451fff 100644
--- a/packages/test-helpers/try_all_permutations_test.js
+++ b/packages/test-helpers/try_all_permutations_test.js
@@ -61,7 +61,7 @@ Tinytest.add("test-helpers - try_all_permutations", function (test) {
     var seen = {};
 
     for (var i = 0; i < n; i++)
-      fs.push(_.bind(function (x) { seq += x + "_"; }, null, i));
+      fs.push(function (x) { seq += x + "_"; }.bind(null, i));
     try_all_permutations(
       function () {seq = "";},
       fs,
@@ -75,7 +75,7 @@ Tinytest.add("test-helpers - try_all_permutations", function (test) {
     var expected_count = 1;
     for (var i = n; i >= 1; i--)
       expected_count *= i;
-    test.equal(_.keys(seen).length, expected_count);
+    test.equal(Object.keys(seen).length, expected_count);
   };
 
   for (var i = 1; i <= 5; i++)

From 605b47cb2a4e9b961647417f7020c93d02ab7870 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Sat, 22 Oct 2022 09:46:40 +0200
Subject: [PATCH 0345/1140] [boilerplate-generator-tests] Remove underscore

---
 packages/boilerplate-generator-tests/package.js           | 1 -
 packages/boilerplate-generator-tests/web.browser-tests.js | 5 -----
 packages/boilerplate-generator-tests/web.cordova-tests.js | 5 +----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/boilerplate-generator-tests/package.js b/packages/boilerplate-generator-tests/package.js
index 7878ff66f2..ec3a817612 100644
--- a/packages/boilerplate-generator-tests/package.js
+++ b/packages/boilerplate-generator-tests/package.js
@@ -14,7 +14,6 @@ Npm.depends({
 Package.onTest(function (api) {
   api.use('ecmascript');
   api.use([
-    'underscore',
     'tinytest',
     'boilerplate-generator'
   ], 'server');
diff --git a/packages/boilerplate-generator-tests/web.browser-tests.js b/packages/boilerplate-generator-tests/web.browser-tests.js
index 915e2f6ebf..48c0d06fd8 100644
--- a/packages/boilerplate-generator-tests/web.browser-tests.js
+++ b/packages/boilerplate-generator-tests/web.browser-tests.js
@@ -1,6 +1,5 @@
 import { parse, serialize } from 'parse5';
 import { generateHTMLForArch } from './test-lib';
-import { _ } from 'meteor/underscore';
 
 Tinytest.addAsync(
   "boilerplate-generator-tests - web.browser - basic output",
@@ -66,10 +65,6 @@ Tinytest.addAsync(
   async function (test) {
     const newHtml = await generateHTMLForArch("web.browser", false);
 
-    _.templateSettings = {
-      interpolate: /\{\{(.+?)\}\}/g
-    };
-
     test.matches(newHtml, /foo="foobar"/);
     test.matches(newHtml, /<link[^<>]*href="[^<>]*bootstrap[^<>]*">/);
     test.matches(newHtml, /<script[^<>]*src="[^<>]*templating[^<>]*">/);
diff --git a/packages/boilerplate-generator-tests/web.cordova-tests.js b/packages/boilerplate-generator-tests/web.cordova-tests.js
index 04eb249ac5..ffe954105e 100644
--- a/packages/boilerplate-generator-tests/web.cordova-tests.js
+++ b/packages/boilerplate-generator-tests/web.cordova-tests.js
@@ -1,6 +1,5 @@
 import { parse, serialize } from 'parse5';
 import { generateHTMLForArch } from './test-lib';
-import { _ } from 'meteor/underscore';
 
 Tinytest.addAsync(
   "boilerplate-generator-tests - web.cordova - basic output",
@@ -60,9 +59,7 @@ Tinytest.addAsync(
   async function (test) {
     const newHtml = await generateHTMLForArch('web.cordova', false);
 
-    _.templateSettings = {
-      interpolate: /\{\{(.+?)\}\}/g
-    };
+    
     test.matches(newHtml, /<link[^<>]*href="[^<>]*bootstrap[^<>]*">/);
     test.matches(newHtml, /<script[^<>]*src="[^<>]*templating[^<>]*">/);
     test.matches(newHtml, /<script>var a/);

From 2a3c0cc97c3dcc5f4dfb805155df5ccb36655698 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Sat, 22 Oct 2022 09:54:20 +0200
Subject: [PATCH 0346/1140] Move underscore & underscore-tests to deprecated
 directory

---
 packages/{ => deprecated}/underscore-tests/.gitignore   | 0
 packages/{ => deprecated}/underscore-tests/README.md    | 0
 packages/{ => deprecated}/underscore-tests/each_test.js | 0
 packages/{ => deprecated}/underscore-tests/package.js   | 3 ++-
 packages/{ => deprecated}/underscore/.gitignore         | 0
 packages/{ => deprecated}/underscore/README.md          | 0
 packages/{ => deprecated}/underscore/package.js         | 3 ++-
 packages/{ => deprecated}/underscore/post.js            | 0
 packages/{ => deprecated}/underscore/pre.js             | 0
 packages/{ => deprecated}/underscore/underscore.js      | 0
 10 files changed, 4 insertions(+), 2 deletions(-)
 rename packages/{ => deprecated}/underscore-tests/.gitignore (100%)
 rename packages/{ => deprecated}/underscore-tests/README.md (100%)
 rename packages/{ => deprecated}/underscore-tests/each_test.js (100%)
 rename packages/{ => deprecated}/underscore-tests/package.js (87%)
 rename packages/{ => deprecated}/underscore/.gitignore (100%)
 rename packages/{ => deprecated}/underscore/README.md (100%)
 rename packages/{ => deprecated}/underscore/package.js (97%)
 rename packages/{ => deprecated}/underscore/post.js (100%)
 rename packages/{ => deprecated}/underscore/pre.js (100%)
 rename packages/{ => deprecated}/underscore/underscore.js (100%)

diff --git a/packages/underscore-tests/.gitignore b/packages/deprecated/underscore-tests/.gitignore
similarity index 100%
rename from packages/underscore-tests/.gitignore
rename to packages/deprecated/underscore-tests/.gitignore
diff --git a/packages/underscore-tests/README.md b/packages/deprecated/underscore-tests/README.md
similarity index 100%
rename from packages/underscore-tests/README.md
rename to packages/deprecated/underscore-tests/README.md
diff --git a/packages/underscore-tests/each_test.js b/packages/deprecated/underscore-tests/each_test.js
similarity index 100%
rename from packages/underscore-tests/each_test.js
rename to packages/deprecated/underscore-tests/each_test.js
diff --git a/packages/underscore-tests/package.js b/packages/deprecated/underscore-tests/package.js
similarity index 87%
rename from packages/underscore-tests/package.js
rename to packages/deprecated/underscore-tests/package.js
index 24cad23716..027b6de21f 100644
--- a/packages/underscore-tests/package.js
+++ b/packages/deprecated/underscore-tests/package.js
@@ -2,7 +2,8 @@ Package.describe({
   // These tests can't be directly in the underscore packages since
   // Tinytest depends on underscore
   summary: "Tests for the underscore package",
-  version: '1.0.8'
+  version: '1.0.8',
+  deprecated: true
 });
 
 Package.onTest(function (api) {
diff --git a/packages/underscore/.gitignore b/packages/deprecated/underscore/.gitignore
similarity index 100%
rename from packages/underscore/.gitignore
rename to packages/deprecated/underscore/.gitignore
diff --git a/packages/underscore/README.md b/packages/deprecated/underscore/README.md
similarity index 100%
rename from packages/underscore/README.md
rename to packages/deprecated/underscore/README.md
diff --git a/packages/underscore/package.js b/packages/deprecated/underscore/package.js
similarity index 97%
rename from packages/underscore/package.js
rename to packages/deprecated/underscore/package.js
index 483509a727..e101a7ff5d 100644
--- a/packages/underscore/package.js
+++ b/packages/deprecated/underscore/package.js
@@ -1,6 +1,7 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10'
+  version: '1.0.10',
+  deprecated: true
 });
 
 Package.onUse(function (api) {
diff --git a/packages/underscore/post.js b/packages/deprecated/underscore/post.js
similarity index 100%
rename from packages/underscore/post.js
rename to packages/deprecated/underscore/post.js
diff --git a/packages/underscore/pre.js b/packages/deprecated/underscore/pre.js
similarity index 100%
rename from packages/underscore/pre.js
rename to packages/deprecated/underscore/pre.js
diff --git a/packages/underscore/underscore.js b/packages/deprecated/underscore/underscore.js
similarity index 100%
rename from packages/underscore/underscore.js
rename to packages/deprecated/underscore/underscore.js

From e19e02bf9adf7511b6cee3c9c9d4ea64bfcb637d Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Sat, 22 Oct 2022 09:55:20 +0200
Subject: [PATCH 0347/1140] [meteor] Remove underscore

---
 packages/meteor/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 98e5453a3c..d632886935 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -57,7 +57,7 @@ Package.onUse(function (api) {
 });
 
 Package.onTest(function (api) {
-  api.use(['underscore', 'tinytest', 'test-helpers']);
+  api.use(['tinytest', 'test-helpers']);
 
   api.addFiles('browser_environment_test.js', 'web.browser');
   api.addFiles('client_environment_test.js', 'client');

From 7428d769155107ca509b60e4e7ca89b0acc853b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=BCster?= <jkuester@uni-bremen.de>
Date: Tue, 6 Dec 2022 12:42:31 +0100
Subject: [PATCH 0348/1140] feature(ci): add comment issue workflow

---
 .github/workflows/comment-issue.yml | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/comment-issue.yml

diff --git a/.github/workflows/comment-issue.yml b/.github/workflows/comment-issue.yml
new file mode 100644
index 0000000000..e654d4f304
--- /dev/null
+++ b/.github/workflows/comment-issue.yml
@@ -0,0 +1,31 @@
+name: Add immediate comment on new issues
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  createComment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create Comment
+        uses: peter-evans/create-or-update-comment@v1.4.2
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Thank you for submitting this issue!
+            
+            We, the Members of Meteor Community Packages take every issue seriously.
+            Our goal is to provide long-term lifecycles for packages and keep up
+            with the newest changes in Meteor and the overall NodeJs/JavaScript ecosystem.
+            
+            However, we contribute to these packages mostly in our free time.
+            Therefore, we can't guarantee your issues to be solved within certain time.
+            
+            If you think this issue is trivial to solve, don't hesitate to submit
+            a pull request, too! We will accompany you in the process with reviews and hints
+            on how to get development set up.
+            
+            Please also consider sponsoring the maintainers of the package.
+            If you don't know who is currently maintaining this package, just leave a comment
+            and we'll let you know

From 4963ec31a6d482d4808fe957d6c50714c9a56d8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Dec 2022 13:23:47 +0000
Subject: [PATCH 0349/1140] Bump express from 4.17.1 to 4.18.2

Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 520 +++++++++++++++++++++++-----------------------
 1 file changed, 265 insertions(+), 255 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 330db34fa1..c7404b812e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,15 +35,6 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
       "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
     },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
     "acorn": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
@@ -155,38 +146,6 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
     "boom": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
@@ -205,10 +164,14 @@
         "concat-map": "0.0.1"
       }
     },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
     },
     "callsites": {
       "version": "3.1.0",
@@ -296,24 +259,11 @@
       "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
       "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
     },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-    },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -418,16 +368,6 @@
       "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
       "optional": true
     },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -852,42 +792,89 @@
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+          "requires": {
+            "mime-types": "~2.1.34",
+            "negotiator": "0.6.3"
+          }
+        },
+        "body-parser": {
+          "version": "1.20.1",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+          "requires": {
+            "bytes": "3.1.2",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "on-finished": "2.4.1",
+            "qs": "6.11.0",
+            "raw-body": "2.5.1",
+            "type-is": "~1.6.18",
+            "unpipe": "1.0.0"
+          }
+        },
+        "bytes": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+        },
+        "content-disposition": {
+          "version": "0.5.4",
+          "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+          "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+          "requires": {
+            "safe-buffer": "5.2.1"
+          }
+        },
+        "cookie": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -896,10 +883,168 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        },
+        "destroy": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+          "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
+        },
+        "finalhandler": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "2.4.1",
+            "parseurl": "~1.3.3",
+            "statuses": "2.0.1",
+            "unpipe": "~1.0.0"
+          }
+        },
+        "forwarded": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+          "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+        },
+        "http-errors": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+          "requires": {
+            "depd": "2.0.0",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "toidentifier": "1.0.1"
+          }
+        },
+        "ipaddr.js": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+        },
+        "mime-db": {
+          "version": "1.52.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+        },
+        "mime-types": {
+          "version": "2.1.35",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+          "requires": {
+            "mime-db": "1.52.0"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "proxy-addr": {
+          "version": "2.0.7",
+          "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+          "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+          "requires": {
+            "forwarded": "0.2.0",
+            "ipaddr.js": "1.9.1"
+          }
+        },
+        "qs": {
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "raw-body": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+          "requires": {
+            "bytes": "3.1.2",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        },
+        "send": {
+          "version": "0.18.0",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+          "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "2.0.0",
+            "mime": "1.6.0",
+            "ms": "2.1.3",
+            "on-finished": "2.4.1",
+            "range-parser": "~1.2.1",
+            "statuses": "2.0.1"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.3",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+            }
+          }
+        },
+        "serve-static": {
+          "version": "1.15.0",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+          "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+          "requires": {
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "parseurl": "~1.3.3",
+            "send": "0.18.0"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+        },
+        "toidentifier": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
         }
       }
     },
@@ -944,35 +1089,6 @@
         "flat-cache": "^2.0.1"
       }
     },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
     "find-root": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
@@ -1031,11 +1147,6 @@
         }
       }
     },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-    },
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -1056,6 +1167,23 @@
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
+    "get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "dependencies": {
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+        }
+      }
+    },
     "get-stdin": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
@@ -1154,25 +1282,6 @@
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
     },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        }
-      }
-    },
     "http-signature": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
@@ -1305,11 +1414,6 @@
       "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
       "optional": true
     },
-    "ipaddr.js": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -1598,11 +1702,6 @@
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
-    },
     "neo-async": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
@@ -1716,14 +1815,6 @@
         "has": "^1.0.3"
       }
     },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1956,15 +2047,6 @@
         "react-is": "^16.8.1"
       }
     },
-    "proxy-addr": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
-      "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.0"
-      }
-    },
     "psl": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
@@ -1976,27 +2058,11 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-    },
     "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -2118,11 +2184,6 @@
         "tslib": "^1.9.0"
       }
     },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -2133,64 +2194,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      }
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -2204,6 +2207,23 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "dependencies": {
+        "object-inspect": {
+          "version": "1.12.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+          "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+        }
+      }
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -2311,11 +2331,6 @@
         }
       }
     },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-    },
     "string-width": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -2444,11 +2459,6 @@
         "os-tmpdir": "~1.0.2"
       }
     },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
     "tough-cookie": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",

From 90bfdc8aadb171cb2ae71f6698392f3ee4ba5511 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 31 Dec 2022 07:58:48 +0000
Subject: [PATCH 0350/1140] Bump ansi-regex from 4.1.0 to 4.1.1

Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7404b812e..b43c748126 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,9 +78,9 @@
       }
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -2384,9 +2384,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
         }
       }
     },

From 1cbc8b1615e18f2213347ba638f89e9dc03bd46d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 31 Dec 2022 07:58:49 +0000
Subject: [PATCH 0351/1140] Bump minimatch from 3.0.4 to 3.1.2

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7404b812e..936d91d77c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1660,9 +1660,9 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }

From 79dcab5d797c9600c469834e3037f719be8b48f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 31 Dec 2022 07:59:02 +0000
Subject: [PATCH 0352/1140] Bump minimist and mkdirp

Bumps [minimist](https://github.com/minimistjs/minimist) and [mkdirp](https://github.com/isaacs/node-mkdirp). These dependencies needed to be updated together.

Updates `minimist` from 1.2.5 to 1.2.7
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7)

Updates `mkdirp` from 0.5.1 to 0.5.6
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/compare/0.5.1...v0.5.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
- dependency-name: mkdirp
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7404b812e..47012edd8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1668,23 +1668,16 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
+        "minimist": "^1.2.6"
       }
     },
     "ms": {
@@ -2322,13 +2315,6 @@
         "get-stdin": "^7.0.0",
         "minimist": "^1.2.5",
         "pkg-conf": "^3.1.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        }
       }
     },
     "string-width": {

From 4f2ab13f2ae766c47abea600d6f87811b01754fc Mon Sep 17 00:00:00 2001
From: Harry Adel <harryadelb@gmail.com>
Date: Sun, 2 Apr 2023 18:19:44 +0200
Subject: [PATCH 0353/1140] Loop over finishListeners keys

---
 packages/webapp/webapp_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 935f54445b..a5430d09a7 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -283,7 +283,7 @@ WebApp._timeoutAdjustmentRequestCallback = function(req, res) {
   res.on('finish', function() {
     res.setTimeout(SHORT_SOCKET_TIMEOUT);
   });
-  finishListeners.forEach(function(l) {
+  Object.keys(finishListeners).forEach(function(l) {
     res.on('finish', l);
   });
 };

From fe0811fe6dba3e4f8b2dbacb727fe8f1a55a6a21 Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Mon, 10 Apr 2023 18:14:43 +0200
Subject: [PATCH 0354/1140] add async common methods

---
 package.js                  |    1 +
 roles/roles_common_async.js | 1276 +++++++++++++++++++++++++++++++++++
 roles/roles_server.js       |  293 ++++----
 3 files changed, 1450 insertions(+), 120 deletions(-)
 create mode 100644 roles/roles_common_async.js

diff --git a/package.js b/package.js
index 90a65850e6..9075e79d41 100644
--- a/package.js
+++ b/package.js
@@ -25,6 +25,7 @@ Package.onUse(function (api) {
   api.export('Roles')
 
   api.addFiles('roles/roles_common.js', both)
+  api.addFiles('roles/roles_common_async.js', both)
   api.addFiles('roles/roles_server.js', 'server')
   api.addFiles([
     'roles/client/debug.js',
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
new file mode 100644
index 0000000000..753eaae8c3
--- /dev/null
+++ b/roles/roles_common_async.js
@@ -0,0 +1,1276 @@
+/* global Meteor, Roles, Mongo */
+
+/**
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
+ *
+ * Roles are accessible throgh `Meteor.roles` collection and documents consist of:
+ *  - `_id`: role name
+ *  - `children`: list of subdocuments:
+ *    - `_id`
+ *
+ * Children list elements are subdocuments so that they can be easier extended in the future or by plugins.
+ *
+ * Roles can have multiple parents and can be children (subroles) of multiple roles.
+ *
+ * Example: `{_id: 'admin', children: [{_id: 'editor'}]}`
+ *
+ * The assignment of a role to a user is stored in a collection, accessible through `Meteor.roleAssignment`.
+ * It's documents consist of
+ *  - `_id`: Internal MongoDB id
+ *  - `role`: A role object which got assigned. Usually only contains the `_id` property
+ *  - `user`: A user object, usually only contains the `_id` property
+ *  - `scope`: scope name
+ *  - `inheritedRoles`: A list of all the roles objects inherited by the assigned role.
+ *
+ * @module Roles
+ */
+if (!Meteor.roles) {
+  Meteor.roles = new Mongo.Collection("roles");
+}
+
+if (!Meteor.roleAssignment) {
+  Meteor.roleAssignment = new Mongo.Collection("role-assignment");
+}
+
+/**
+ * @class Roles
+ */
+if (typeof Roles === "undefined") {
+  Roles = {}; // eslint-disable-line no-global-assign
+}
+
+var getGroupsForUserDeprecationWarning = false;
+
+Object.assign(Roles, {
+  /**
+   * Used as a global group (now scope) name. Not used anymore.
+   *
+   * @property GLOBAL_GROUP
+   * @static
+   * @deprecated
+   */
+  GLOBAL_GROUP: null,
+
+  /**
+   * Create a new role.
+   *
+   * @method createRole
+   * @param {String} roleName Name of role.
+   * @param {Object} [options] Options:
+   *   - `unlessExists`: if `true`, exception will not be thrown in the role already exists
+   * @return {String} ID of the new role or null.
+   * @static
+   */
+  createRoleAsync: async function (roleName, options) {
+    Roles._checkRoleName(roleName);
+
+    options = Object.assign(
+      {
+        unlessExists: false,
+      },
+      options
+    );
+
+    var result = await Meteor.roles.upsertAsync(
+      { _id: roleName },
+      { $setOnInsert: { children: [] } }
+    );
+
+    if (!result.insertedId) {
+      if (options.unlessExists) return null;
+      throw new Error("Role '" + roleName + "' already exists.");
+    }
+
+    return result.insertedId;
+  },
+
+  /**
+   * Delete an existing role.
+   *
+   * If the role is set for any user, it is automatically unset.
+   *
+   * @method deleteRole
+   * @param {String} roleName Name of role.
+   * @static
+   */
+  deleteRoleAsync: async function (roleName) {
+    var roles;
+    var inheritedRoles;
+
+    Roles._checkRoleName(roleName);
+
+    // Remove all assignments
+    await Meteor.roleAssignment.removeAsync({
+      "role._id": roleName,
+    });
+
+    do {
+      // For all roles who have it as a dependency ...
+      roles = Roles._getParentRoleNames(
+        await Meteor.roles.findOneAsync({ _id: roleName })
+      );
+
+      for (const r of await Meteor.roles
+        .find({ _id: { $in: roles } })
+        .fetchAsync()) {
+        await Meteor.roles.updateAsync(
+          {
+            _id: r._id,
+          },
+          {
+            $pull: {
+              children: {
+                _id: roleName,
+              },
+            },
+          }
+        );
+
+        inheritedRoles = await Roles._getInheritedRoleNamesAsync(
+          await Meteor.roles.findOneAsync({ _id: r._id })
+        );
+        await Meteor.roleAssignment.updateAsync(
+          {
+            "role._id": r._id,
+          },
+          {
+            $set: {
+              inheritedRoles: [r._id, ...inheritedRoles].map((r2) => ({
+                _id: r2,
+              })),
+            },
+          },
+          { multi: true }
+        );
+      }
+    } while (roles.length > 0);
+
+    // And finally remove the role itself
+    await Meteor.roles.removeAsync({ _id: roleName });
+  },
+
+  /**
+   * Rename an existing role.
+   *
+   * @method renameRole
+   * @param {String} oldName Old name of a role.
+   * @param {String} newName New name of a role.
+   * @static
+   */
+  renameRoleAsync: async function (oldName, newName) {
+    var role;
+    var count;
+
+    Roles._checkRoleName(oldName);
+    Roles._checkRoleName(newName);
+
+    if (oldName === newName) return;
+
+    role = await Meteor.roles.findOneAsync({ _id: oldName });
+
+    if (!role) {
+      throw new Error("Role '" + oldName + "' does not exist.");
+    }
+
+    role._id = newName;
+
+    await Meteor.roles.insertAsync(role);
+
+    do {
+      count = await Meteor.roleAssignment.updateAsync(
+        {
+          "role._id": oldName,
+        },
+        {
+          $set: {
+            "role._id": newName,
+          },
+        },
+        { multi: true }
+      );
+    } while (count > 0);
+
+    do {
+      count = await Meteor.roleAssignment.updateAsync(
+        {
+          "inheritedRoles._id": oldName,
+        },
+        {
+          $set: {
+            "inheritedRoles.$._id": newName,
+          },
+        },
+        { multi: true }
+      );
+    } while (count > 0);
+
+    do {
+      count = await Meteor.roles.updateAsync(
+        {
+          "children._id": oldName,
+        },
+        {
+          $set: {
+            "children.$._id": newName,
+          },
+        },
+        { multi: true }
+      );
+    } while (count > 0);
+
+    await Meteor.roles.removeAsync({ _id: oldName });
+  },
+
+  /**
+   * Add role parent to roles.
+   *
+   * Previous parents are kept (role can have multiple parents). For users which have the
+   * parent role set, new subroles are added automatically.
+   *
+   * @method addRolesToParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
+   * @param {String} parentName Name of parent role.
+   * @static
+   */
+  addRolesToParentAsync: async function (rolesNames, parentName) {
+    // ensure arrays
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
+
+    for (const roleName of rolesNames) {
+      await Roles._addRoleToParentAsync(roleName, parentName);
+    }
+  },
+
+  /**
+   * @method _addRoleToParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @private
+   * @static
+   */
+  _addRoleToParentAsync: async function (roleName, parentName) {
+    var role;
+    var count;
+
+    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(parentName);
+
+    // query to get role's children
+    role = await Meteor.roles.findOneAsync({ _id: roleName });
+
+    if (!role) {
+      throw new Error("Role '" + roleName + "' does not exist.");
+    }
+
+    // detect cycles
+    if ((await Roles._getInheritedRoleNamesAsync(role)).includes(parentName)) {
+      throw new Error(
+        "Roles '" + roleName + "' and '" + parentName + "' would form a cycle."
+      );
+    }
+
+    count = await Meteor.roles.updateAsync(
+      {
+        _id: parentName,
+        "children._id": {
+          $ne: role._id,
+        },
+      },
+      {
+        $push: {
+          children: {
+            _id: role._id,
+          },
+        },
+      }
+    );
+
+    // if there was no change, parent role might not exist, or role is
+    // already a subrole; in any case we do not have anything more to do
+    if (!count) return;
+
+    await Meteor.roleAssignment.updateAsync(
+      {
+        "inheritedRoles._id": parentName,
+      },
+      {
+        $push: {
+          inheritedRoles: {
+            $each: [
+              role._id,
+              ...(await Roles._getInheritedRoleNamesAsync(role)),
+            ].map((r) => ({ _id: r })),
+          },
+        },
+      },
+      { multi: true }
+    );
+  },
+
+  /**
+   * Remove role parent from roles.
+   *
+   * Other parents are kept (role can have multiple parents). For users which have the
+   * parent role set, removed subrole is removed automatically.
+   *
+   * @method removeRolesFromParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
+   * @param {String} parentName Name of parent role.
+   * @static
+   */
+  removeRolesFromParentAsync: async function (rolesNames, parentName) {
+    // ensure arrays
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
+
+    for (const roleName of rolesNames) {
+      await Roles._removeRoleFromParentAsync(roleName, parentName);
+    }
+  },
+
+  /**
+   * @method _removeRoleFromParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @private
+   * @static
+   */
+  _removeRoleFromParentAsync: async function (roleName, parentName) {
+    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(parentName);
+
+    // check for role existence
+    // this would not really be needed, but we are trying to match addRolesToParent
+    let role = await Meteor.roles.findOneAsync(
+      { _id: roleName },
+      { fields: { _id: 1 } }
+    );
+
+    if (!role) {
+      throw new Error("Role '" + roleName + "' does not exist.");
+    }
+
+    const count = await Meteor.roles.updateAsync(
+      {
+        _id: parentName,
+      },
+      {
+        $pull: {
+          children: {
+            _id: role._id,
+          },
+        },
+      }
+    );
+
+    // if there was no change, parent role might not exist, or role was
+    // already not a subrole; in any case we do not have anything more to do
+    if (!count) return;
+
+    // For all roles who have had it as a dependency ...
+    const roles = [
+      ...(await Roles._getParentRoleNamesAsync(
+        await Meteor.roles.findOneAsync({ _id: parentName })
+      )),
+      parentName,
+    ];
+
+    for (const r of await Meteor.roles
+      .find({ _id: { $in: roles } })
+      .fetchAsync()) {
+      const inheritedRoles = await Roles._getInheritedRoleNamesAsync(
+        await Meteor.roles.findOneAsync({ _id: r._id })
+      );
+      await Meteor.roleAssignment.updateAsync(
+        {
+          "role._id": r._id,
+          "inheritedRoles._id": role._id,
+        },
+        {
+          $set: {
+            inheritedRoles: [r._id, ...inheritedRoles].map((r2) => ({
+              _id: r2,
+            })),
+          },
+        },
+        { multi: true }
+      );
+    }
+  },
+
+  /**
+   * Add users to roles.
+   *
+   * Adds roles to existing roles for each user.
+   *
+   * @example
+   *     Roles.addUsersToRoles(userId, 'admin')
+   *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
+   *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *
+   * @method addUsersToRoles
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope, or `null` for the global role
+   *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  addUsersToRolesAsync: async function (users, roles, options) {
+    var id;
+
+    if (!users) throw new Error("Missing 'users' param.");
+    if (!roles) throw new Error("Missing 'roles' param.");
+
+    options = Roles._normalizeOptions(options);
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
+
+    Roles._checkScopeName(options.scope);
+
+    options = Object.assign(
+      {
+        ifExists: false,
+      },
+      options
+    );
+
+    for (const user of users) {
+      if (typeof user === "object") {
+        id = user._id;
+      } else {
+        id = user;
+      }
+
+      for (const role of roles) {
+        await Roles._addUserToRoleAsync(id, role, options);
+      }
+    }
+  },
+
+  /**
+   * Set users' roles.
+   *
+   * Replaces all existing roles with a new set of roles.
+   *
+   * @example
+   *     Roles.setUserRoles(userId, 'admin')
+   *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.setUserRoles([user1, user2], ['user','editor'])
+   *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *
+   * @method setUserRoles
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope, or `null` for the global role
+   *   - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope
+   *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  setUserRolesAsync: async function (users, roles, options) {
+    var id;
+
+    if (!users) throw new Error("Missing 'users' param.");
+    if (!roles) throw new Error("Missing 'roles' param.");
+
+    options = Roles._normalizeOptions(options);
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
+
+    Roles._checkScopeName(options.scope);
+
+    options = Object.assign(
+      {
+        ifExists: false,
+        anyScope: false,
+      },
+      options
+    );
+
+    for (const user of users) {
+      if (typeof user === "object") {
+        id = user._id;
+      } else {
+        id = user;
+      }
+      // we first clear all roles for the user
+      const selector = { "user._id": id };
+      if (!options.anyScope) {
+        selector.scope = options.scope;
+      }
+
+      await Meteor.roleAssignment.removeAsync(selector);
+
+      // and then add all
+      for (const role of roles) {
+        await Roles._addUserToRole(id, role, options);
+      }
+    }
+  },
+
+  /**
+   * Add one user to one role.
+   *
+   * @method _addUserToRole
+   * @param {String} userId The user ID.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - `scope`: name of the scope, or `null` for the global role
+   *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   * @private
+   * @static
+   */
+  _addUserToRole: async function (userId, roleName, options) {
+    Roles._checkRoleName(roleName);
+    Roles._checkScopeName(options.scope);
+
+    if (!userId) {
+      return;
+    }
+
+    const role = await Meteor.roles.findOneAsync(
+      { _id: roleName },
+      { fields: { children: 1 } }
+    );
+
+    if (!role) {
+      if (options.ifExists) {
+        return [];
+      } else {
+        throw new Error("Role '" + roleName + "' does not exist.");
+      }
+    }
+
+    // This might create duplicates, because we don't have a unique index, but that's all right. In case there are two, withdrawing the role will effectively kill them both.
+    const res = await Meteor.roleAssignment.upsertAsync(
+      {
+        "user._id": userId,
+        "role._id": roleName,
+        scope: options.scope,
+      },
+      {
+        $setOnInsert: {
+          user: { _id: userId },
+          role: { _id: roleName },
+          scope: options.scope,
+        },
+      }
+    );
+
+    if (res.insertedId) {
+      await Meteor.roleAssignment.updateAsync(
+        { _id: res.insertedId },
+        {
+          $set: {
+            inheritedRoles: [
+              roleName,
+              ...(await Roles._getInheritedRoleNamesAsync(role)),
+            ].map((r) => ({ _id: r })),
+          },
+        }
+      );
+    }
+
+    return res;
+  },
+
+  /**
+   * Returns an array of role names the given role name is a child of.
+   *
+   * @example
+   *     Roles._getParentRoleNames({ _id: 'admin', children; [] })
+   *
+   * @method _getParentRoleNames
+   * @param {object} role The role object
+   * @private
+   * @static
+   */
+  _getParentRoleNamesAsync: async function (role) {
+    var parentRoles;
+
+    if (!role) {
+      return [];
+    }
+
+    parentRoles = new Set([role._id]);
+
+    for (const roleName of parentRoles) {
+      for (const parentRole of await Meteor.roles
+        .find({ "children._id": roleName })
+        .fetchAsync()) {
+        parentRoles.add(parentRole._id);
+      }
+    }
+
+    parentRoles.delete(role._id);
+
+    return [...parentRoles];
+  },
+
+  /**
+   * Returns an array of role names the given role name is a parent of.
+   *
+   * @example
+   *     Roles._getInheritedRoleNames({ _id: 'admin', children; [] })
+   *
+   * @method _getInheritedRoleNames
+   * @param {object} role The role object
+   * @private
+   * @static
+   */
+  _getInheritedRoleNamesAsync: async function (role) {
+    const inheritedRoles = new Set();
+    const nestedRoles = new Set([role]);
+
+    for (const r in nestedRoles) {
+      const roles = await Meteor.roles
+        .find(
+          { _id: { $in: r.children.map((r) => r._id) } },
+          { fields: { children: 1 } }
+        )
+        .fetchAsync();
+
+      for (const r2 of roles) {
+        inheritedRoles.add(r2._id);
+        nestedRoles.add(r2);
+      }
+    }
+
+    return [...inheritedRoles];
+  },
+
+  /**
+   * Remove users from assigned roles.
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(userId, 'admin')
+   *     Roles.removeUsersFromRoles([userId, user2], ['editor'])
+   *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
+   * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope, or `null` for the global role
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  removeUsersFromRolesAsync: async function (users, roles, options) {
+    if (!users) throw new Error("Missing 'users' param.");
+    if (!roles) throw new Error("Missing 'roles' param.");
+
+    options = Roles._normalizeOptions(options);
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users];
+    if (!Array.isArray(roles)) roles = [roles];
+
+    Roles._checkScopeName(options.scope);
+
+    for (const user of users) {
+      if (!user) return;
+
+      for (const role of roles) {
+        let id;
+        if (typeof user === "object") {
+          id = user._id;
+        } else {
+          id = user;
+        }
+
+        await Roles._removeUserFromRoleAsync(id, role, options);
+      }
+    }
+  },
+
+  /**
+   * Remove one user from one role.
+   *
+   * @method _removeUserFromRole
+   * @param {String} userId The user ID.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - `scope`: name of the scope, or `null` for the global role
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   * @private
+   * @static
+   */
+  _removeUserFromRoleAsync: async function (userId, roleName, options) {
+    Roles._checkRoleName(roleName);
+    Roles._checkScopeName(options.scope);
+
+    if (!userId) return;
+
+    const selector = {
+      "user._id": userId,
+      "role._id": roleName,
+    };
+
+    if (!options.anyScope) {
+      selector.scope = options.scope;
+    }
+
+    await Meteor.roleAssignment.removeAsync(selector);
+  },
+
+  /**
+   * Check if user has specified roles.
+   *
+   * @example
+   *     // global roles
+   *     Roles.userIsInRole(user, 'admin')
+   *     Roles.userIsInRole(user, ['admin','editor'])
+   *     Roles.userIsInRole(userId, 'admin')
+   *     Roles.userIsInRole(userId, ['admin','editor'])
+   *
+   *     // scope roles (global roles are still checked)
+   *     Roles.userIsInRole(user, 'admin', 'group1')
+   *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
+   *     Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})
+   *
+   * @method userIsInRole
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
+   *                             will return `true` if user is in _any_ role.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope; if supplied, limits check to just that scope
+   *     the user's global roles will always be checked whether scope is specified or not
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Boolean} `true` if user is in _any_ of the target roles
+   * @static
+   */
+  userIsInRoleAsync: async function (user, roles, options) {
+    var id;
+    var selector;
+
+    options = Roles._normalizeOptions(options);
+
+    // ensure array to simplify code
+    if (!Array.isArray(roles)) roles = [roles];
+
+    roles = roles.filter((r) => r != null);
+
+    if (!roles.length) return false;
+
+    Roles._checkScopeName(options.scope);
+
+    options = Object.assign(
+      {
+        anyScope: false,
+      },
+      options
+    );
+
+    if (user && typeof user === "object") {
+      id = user._id;
+    } else {
+      id = user;
+    }
+
+    if (!id) return false;
+    if (typeof id !== "string") return false;
+
+    selector = {
+      "user._id": id,
+    };
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope, null] };
+    }
+
+    // Convert to Promises first, then check via some
+    const rolesPromises = roles.map(
+      (roleName) =>
+        new Promise(async (res, rej) => {
+          selector["inheritedRoles._id"] = roleName;
+
+          res(
+            (await Meteor.roleAssignment
+              .find(selector, { limit: 1 })
+              .countAsync()) > 0
+          );
+        })
+    );
+
+    const result = await Promise.all(rolesPromises);
+
+    return result.some((r) => r);
+  },
+
+  /**
+   * Retrieve user's roles.
+   *
+   * @method getRolesForUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of scope to provide roles for; if not specified, global roles are returned
+   *   - `anyScope`: if set, role can be in any scope (`scope` and `onlyAssigned` options are ignored)
+   *   - `onlyScoped`: if set, only roles in the specified scope are returned
+   *   - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)
+   *   - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)
+   *     If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
+   *     result strongly dependant on the internal data structure of this plugin.
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Array} Array of user's roles, unsorted.
+   * @static
+   */
+  getRolesForUserAsync: async function (user, options) {
+    var id;
+    var selector;
+    var filter;
+    var roles;
+
+    options = Roles._normalizeOptions(options);
+
+    Roles._checkScopeName(options.scope);
+
+    options = Object.assign(
+      {
+        fullObjects: false,
+        onlyAssigned: false,
+        anyScope: false,
+        onlyScoped: false,
+      },
+      options
+    );
+
+    if (user && typeof user === "object") {
+      id = user._id;
+    } else {
+      id = user;
+    }
+
+    if (!id) return [];
+
+    selector = {
+      "user._id": id,
+    };
+
+    filter = {
+      fields: { "inheritedRoles._id": 1 },
+    };
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope] };
+
+      if (!options.onlyScoped) {
+        selector.scope.$in.push(null);
+      }
+    }
+
+    if (options.onlyAssigned) {
+      delete filter.fields["inheritedRoles._id"];
+      filter.fields["role._id"] = 1;
+    }
+
+    if (options.fullObjects) {
+      delete filter.fields;
+    }
+
+    roles = await Meteor.roleAssignment.find(selector, filter).fetchAsync();
+
+    if (options.fullObjects) {
+      return roles;
+    }
+
+    return [
+      ...new Set(
+        roles.reduce((rev, current) => {
+          if (current.inheritedRoles) {
+            return rev.concat(current.inheritedRoles.map((r) => r._id));
+          } else if (current.role) {
+            rev.push(current.role._id);
+          }
+          return rev;
+        }, [])
+      ),
+    ];
+  },
+
+  /**
+   * Retrieve cursor of all existing roles.
+   *
+   * @method getAllRoles
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to `Meteor.roles.find(query, options)`.
+   * @return {Cursor} Cursor of existing roles.
+   * @static
+   */
+  getAllRoles: function (queryOptions) {
+    queryOptions = queryOptions || { sort: { _id: 1 } };
+
+    return Meteor.roles.find({}, queryOptions);
+  },
+
+  /**
+   * Retrieve all users who are in target role.
+   *
+   * Options:
+   *
+   * @method getUsersInRole
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope to restrict roles to; user's global
+   *     roles will also be checked
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *   - `onlyScoped`: if set, only roles in the specified scope are returned
+   *   - `queryOptions`: options which are passed directly
+   *     through to `Meteor.users.find(query, options)`
+   *
+   * Alternatively, it can be a scope name string.
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to `Meteor.users.find(query, options)`
+   * @return {Cursor} Cursor of users in roles.
+   * @static
+   */
+  getUsersInRoleAsync: async function (roles, options, queryOptions) {
+    var ids;
+
+    ids = (
+      await Roles.getUserAssignmentsForRole(roles, options).fetchAsync()
+    ).map((a) => a.user._id);
+
+    return Meteor.users.find(
+      { _id: { $in: ids } },
+      (options && options.queryOptions) || queryOptions || {}
+    );
+  },
+
+  /**
+   * Retrieve all assignments of a user which are for the target role.
+   *
+   * Options:
+   *
+   * @method getUserAssignmentsForRole
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope to restrict roles to; user's global
+   *     roles will also be checked
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *   - `queryOptions`: options which are passed directly
+   *     through to `Meteor.roleAssignment.find(query, options)`
+
+   * Alternatively, it can be a scope name string.
+   * @return {Cursor} Cursor of user assignments for roles.
+   * @static
+   */
+  getUserAssignmentsForRole: function (roles, options) {
+    options = Roles._normalizeOptions(options);
+
+    options = Object.assign(
+      {
+        anyScope: false,
+        queryOptions: {},
+      },
+      options
+    );
+
+    return Roles._getUsersInRoleCursor(roles, options, options.queryOptions);
+  },
+
+  /**
+   * @method _getUsersInRoleCursor
+   * @param {Array|String} roles Name of role or an array of roles. If array, ids of users are
+   *                             returned which have at least one of the roles
+   *                             assigned but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope to restrict roles to; user's global
+   *     roles will also be checked
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @param {Object} [filter] Options which are passed directly
+   *                                through to `Meteor.roleAssignment.find(query, options)`
+   * @return {Object} Cursor to the assignment documents
+   * @private
+   * @static
+   */
+  _getUsersInRoleCursor: function (roles, options, filter) {
+    var selector;
+
+    options = Roles._normalizeOptions(options);
+
+    options = Object.assign(
+      {
+        anyScope: false,
+        onlyScoped: false,
+      },
+      options
+    );
+
+    // ensure array to simplify code
+    if (!Array.isArray(roles)) roles = [roles];
+
+    Roles._checkScopeName(options.scope);
+
+    filter = Object.assign(
+      {
+        fields: { "user._id": 1 },
+      },
+      filter
+    );
+
+    selector = {
+      "inheritedRoles._id": { $in: roles },
+    };
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope] };
+
+      if (!options.onlyScoped) {
+        selector.scope.$in.push(null);
+      }
+    }
+
+    return Meteor.roleAssignment.find(selector, filter);
+  },
+
+  /**
+   * Deprecated. Use `getScopesForUser` instead.
+   *
+   * @method getGroupsForUser
+   * @static
+   * @deprecated
+   */
+  getGroupsForUserAsync: async function (...args) {
+    if (!getGroupsForUserDeprecationWarning) {
+      getGroupsForUserDeprecationWarning = true;
+      console &&
+        console.warn(
+          "getGroupsForUser has been deprecated. Use getScopesForUser instead."
+        );
+    }
+
+    return Roles.getScopesForUser(...args);
+  },
+
+  /**
+   * Retrieve users scopes, if any.
+   *
+   * @method getScopesForUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} [roles] Name of roles to restrict scopes to.
+   *
+   * @return {Array} Array of user's scopes, unsorted.
+   * @static
+   */
+  getScopesForUserAsync: async function (user, roles) {
+    var scopes;
+    var id;
+
+    if (roles && !Array.isArray(roles)) roles = [roles];
+
+    if (user && typeof user === "object") {
+      id = user._id;
+    } else {
+      id = user;
+    }
+
+    if (!id) return [];
+
+    const selector = {
+      "user._id": id,
+      scope: { $ne: null },
+    };
+
+    if (roles) {
+      selector["inheritedRoles._id"] = { $in: roles };
+    }
+
+    scopes = (
+      await Meteor.roleAssignment
+        .find(selector, { fields: { scope: 1 } })
+        .fetchAsync()
+    ).map((obi) => obi.scope);
+
+    return [...new Set(scopes)];
+  },
+
+  /**
+   * Rename a scope.
+   *
+   * Roles assigned with a given scope are changed to be under the new scope.
+   *
+   * @method renameScope
+   * @param {String} oldName Old name of a scope.
+   * @param {String} newName New name of a scope.
+   * @static
+   */
+  renameScopeAsync: async function (oldName, newName) {
+    var count;
+
+    Roles._checkScopeName(oldName);
+    Roles._checkScopeName(newName);
+
+    if (oldName === newName) return;
+
+    do {
+      count = await Meteor.roleAssignment.updateAsync(
+        {
+          scope: oldName,
+        },
+        {
+          $set: {
+            scope: newName,
+          },
+        },
+        { multi: true }
+      );
+    } while (count > 0);
+  },
+
+  /**
+   * Remove a scope.
+   *
+   * Roles assigned with a given scope are removed.
+   *
+   * @method removeScope
+   * @param {String} name The name of a scope.
+   * @static
+   */
+  removeScopeAsync: async function (name) {
+    Roles._checkScopeName(name);
+
+    await Meteor.roleAssignment.removeAsync({ scope: name });
+  },
+
+  /**
+   * Throw an exception if `roleName` is an invalid role name.
+   *
+   * @method _checkRoleName
+   * @param {String} roleName A role name to match against.
+   * @private
+   * @static
+   */
+  _checkRoleName: function (roleName) {
+    if (
+      !roleName ||
+      typeof roleName !== "string" ||
+      roleName.trim() !== roleName
+    ) {
+      throw new Error("Invalid role name '" + roleName + "'.");
+    }
+  },
+
+  /**
+   * Find out if a role is an ancestor of another role.
+   *
+   * WARNING: If you check this on the client, please make sure all roles are published.
+   *
+   * @method isParentOf
+   * @param {String} parentRoleName The role you want to research.
+   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
+   * @static
+   */
+  isParentOfAsync: async function (parentRoleName, childRoleName) {
+    if (parentRoleName === childRoleName) {
+      return true;
+    }
+
+    if (parentRoleName == null || childRoleName == null) {
+      return false;
+    }
+
+    Roles._checkRoleName(parentRoleName);
+    Roles._checkRoleName(childRoleName);
+
+    var rolesToCheck = [parentRoleName];
+    while (rolesToCheck.length !== 0) {
+      var roleName = rolesToCheck.pop();
+
+      if (roleName === childRoleName) {
+        return true;
+      }
+
+      var role = await Meteor.roles.findOneAsync({ _id: roleName });
+
+      // This should not happen, but this is a problem to address at some other time.
+      if (!role) continue;
+
+      rolesToCheck = rolesToCheck.concat(role.children.map((r) => r._id));
+    }
+
+    return false;
+  },
+
+  /**
+   * Normalize options.
+   *
+   * @method _normalizeOptions
+   * @param {Object} options Options to normalize.
+   * @return {Object} Normalized options.
+   * @private
+   * @static
+   */
+  _normalizeOptions: function (options) {
+    options = options === undefined ? {} : options;
+
+    if (options === null || typeof options === "string") {
+      options = { scope: options };
+    }
+
+    options.scope = Roles._normalizeScopeName(options.scope);
+
+    return options;
+  },
+
+  /**
+   * Normalize scope name.
+   *
+   * @method _normalizeScopeName
+   * @param {String} scopeName A scope name to normalize.
+   * @return {String} Normalized scope name.
+   * @private
+   * @static
+   */
+  _normalizeScopeName: function (scopeName) {
+    // map undefined and null to null
+    if (scopeName == null) {
+      return null;
+    } else {
+      return scopeName;
+    }
+  },
+
+  /**
+   * Throw an exception if `scopeName` is an invalid scope name.
+   *
+   * @method _checkRoleName
+   * @param {String} scopeName A scope name to match against.
+   * @private
+   * @static
+   */
+  _checkScopeName: function (scopeName) {
+    if (scopeName === null) return;
+
+    if (
+      !scopeName ||
+      typeof scopeName !== "string" ||
+      scopeName.trim() !== scopeName
+    ) {
+      throw new Error("Invalid scope name '" + scopeName + "'.");
+    }
+  },
+});
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 9a1857d851..8bef6f7ed3 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,20 +1,44 @@
 /* global Meteor, Roles */
-if (Meteor.roles.createIndex) {
-  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-  Meteor.roleAssignment.createIndex({ 'role._id': 1 })
-  Meteor.roleAssignment.createIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-  Meteor.roleAssignment.createIndex({ 'inheritedRoles._id': 1 })
+if (Meteor.roles.createIndexAsync) {
+  Meteor.roleAssignment.createIndexAsync({
+    "user._id": 1,
+    "inheritedRoles._id": 1,
+    scope: 1,
+  });
+  Meteor.roleAssignment.createIndexAsync({
+    "user._id": 1,
+    "role._id": 1,
+    scope: 1,
+  });
+  Meteor.roleAssignment.createIndexAsync({ "role._id": 1 });
+  Meteor.roleAssignment.createIndexAsync({
+    scope: 1,
+    "user._id": 1,
+    "inheritedRoles._id": 1,
+  }); // Adding userId and roleId might speed up other queries depending on the first index
+  Meteor.roleAssignment.createIndexAsync({ "inheritedRoles._id": 1 });
 
-  Meteor.roles.createIndex({ 'children._id': 1 })
+  Meteor.roles.createIndexAsync({ "children._id": 1 });
 } else {
-  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-  Meteor.roleAssignment._ensureIndex({ 'role._id': 1 })
-  Meteor.roleAssignment._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-  Meteor.roleAssignment._ensureIndex({ 'inheritedRoles._id': 1 })
+  Meteor.roleAssignment._ensureIndex({
+    "user._id": 1,
+    "inheritedRoles._id": 1,
+    scope: 1,
+  });
+  Meteor.roleAssignment._ensureIndex({
+    "user._id": 1,
+    "role._id": 1,
+    scope: 1,
+  });
+  Meteor.roleAssignment._ensureIndex({ "role._id": 1 });
+  Meteor.roleAssignment._ensureIndex({
+    scope: 1,
+    "user._id": 1,
+    "inheritedRoles._id": 1,
+  }); // Adding userId and roleId might speed up other queries depending on the first index
+  Meteor.roleAssignment._ensureIndex({ "inheritedRoles._id": 1 });
 
-  Meteor.roles._ensureIndex({ 'children._id': 1 })
+  Meteor.roles._ensureIndex({ "children._id": 1 });
 }
 
 /*
@@ -22,20 +46,17 @@ if (Meteor.roles.createIndex) {
  *
  * Use a named publish function so clients can check `ready()` state.
  */
-Meteor.publish('_roles', function () {
-  var loggedInUserId = this.userId
-  var fields = { roles: 1 }
+Meteor.publish("_roles", function () {
+  var loggedInUserId = this.userId;
+  var fields = { roles: 1 };
 
   if (!loggedInUserId) {
-    this.ready()
-    return
+    this.ready();
+    return;
   }
 
-  return Meteor.users.find(
-    { _id: loggedInUserId },
-    { fields: fields }
-  )
-})
+  return Meteor.users.find({ _id: loggedInUserId }, { fields: fields });
+});
 
 Object.assign(Roles, {
   /**
@@ -48,7 +69,7 @@ Object.assign(Roles, {
    * @static
    */
   _isNewRole: function (role) {
-    return !('name' in role) && 'children' in role
+    return !("name" in role) && "children" in role;
   },
 
   /**
@@ -61,7 +82,7 @@ Object.assign(Roles, {
    * @static
    */
   _isOldRole: function (role) {
-    return 'name' in role && !('children' in role)
+    return "name" in role && !("children" in role);
   },
 
   /**
@@ -74,7 +95,7 @@ Object.assign(Roles, {
    * @static
    */
   _isNewField: function (roles) {
-    return Array.isArray(roles) && (typeof roles[0] === 'object')
+    return Array.isArray(roles) && typeof roles[0] === "object";
   },
 
   /**
@@ -87,7 +108,10 @@ Object.assign(Roles, {
    * @static
    */
   _isOldField: function (roles) {
-    return (Array.isArray(roles) && (typeof roles[0] === 'string')) || ((typeof roles === 'object') && !Array.isArray(roles))
+    return (
+      (Array.isArray(roles) && typeof roles[0] === "string") ||
+      (typeof roles === "object" && !Array.isArray(roles))
+    );
   },
 
   /**
@@ -99,12 +123,13 @@ Object.assign(Roles, {
    * @static
    */
   _convertToNewRole: function (oldRole) {
-    if (!(typeof oldRole.name === 'string')) throw new Error("Role name '" + oldRole.name + "' is not a string.")
+    if (!(typeof oldRole.name === "string"))
+      throw new Error("Role name '" + oldRole.name + "' is not a string.");
 
     return {
       _id: oldRole.name,
-      children: []
-    }
+      children: [],
+    };
   },
 
   /**
@@ -116,11 +141,12 @@ Object.assign(Roles, {
    * @static
    */
   _convertToOldRole: function (newRole) {
-    if (!(typeof newRole._id === 'string')) throw new Error("Role name '" + newRole._id + "' is not a string.")
+    if (!(typeof newRole._id === "string"))
+      throw new Error("Role name '" + newRole._id + "' is not a string.");
 
     return {
-      name: newRole._id
-    }
+      name: newRole._id,
+    };
   },
 
   /**
@@ -133,38 +159,40 @@ Object.assign(Roles, {
    * @static
    */
   _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
-    var roles = []
+    var roles = [];
     if (Array.isArray(oldRoles)) {
       oldRoles.forEach(function (role, index) {
-        if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.")
+        if (!(typeof role === "string"))
+          throw new Error("Role '" + role + "' is not a string.");
 
         roles.push({
           _id: role,
           scope: null,
-          assigned: true
-        })
-      })
-    } else if (typeof oldRoles === 'object') {
+          assigned: true,
+        });
+      });
+    } else if (typeof oldRoles === "object") {
       Object.entries(oldRoles).forEach(([group, rolesArray]) => {
-        if (group === '__global_roles__') {
-          group = null
+        if (group === "__global_roles__") {
+          group = null;
         } else if (convertUnderscoresToDots) {
           // unescape
-          group = group.replace(/_/g, '.')
+          group = group.replace(/_/g, ".");
         }
 
         rolesArray.forEach(function (role) {
-          if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.")
+          if (!(typeof role === "string"))
+            throw new Error("Role '" + role + "' is not a string.");
 
           roles.push({
             _id: role,
             scope: group,
-            assigned: true
-          })
-        })
-      })
+            assigned: true,
+          });
+        });
+      });
     }
-    return roles
+    return roles;
   },
 
   /**
@@ -177,40 +205,49 @@ Object.assign(Roles, {
    * @static
    */
   _convertToOldField: function (newRoles, usingGroups) {
-    var roles
+    var roles;
 
     if (usingGroups) {
-      roles = {}
+      roles = {};
     } else {
-      roles = []
+      roles = [];
     }
 
     newRoles.forEach(function (userRole) {
-      if (!(typeof userRole === 'object')) throw new Error("Role '" + userRole + "' is not an object.")
+      if (!(typeof userRole === "object"))
+        throw new Error("Role '" + userRole + "' is not an object.");
 
       // We assume that we are converting back a failed migration, so values can only be
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
 
       if (userRole.scope) {
-        if (!usingGroups) throw new Error("Role '" + userRole._id + "' with scope '" + userRole.scope + "' without enabled groups.")
+        if (!usingGroups)
+          throw new Error(
+            "Role '" +
+              userRole._id +
+              "' with scope '" +
+              userRole.scope +
+              "' without enabled groups."
+          );
 
         // escape
-        var scope = userRole.scope.replace(/\./g, '_')
+        var scope = userRole.scope.replace(/\./g, "_");
 
-        if (scope[0] === '$') throw new Error("Group name '" + scope + "' start with $.")
+        if (scope[0] === "$")
+          throw new Error("Group name '" + scope + "' start with $.");
 
-        roles[scope] = roles[scope] || []
-        roles[scope].push(userRole._id)
+        roles[scope] = roles[scope] || [];
+        roles[scope].push(userRole._id);
       } else {
         if (usingGroups) {
-          roles.__global_roles__ = roles.__global_roles__ || []
-          roles.__global_roles__.push(userRole._id)
+          roles.__global_roles__ = roles.__global_roles__ || [];
+          roles.__global_roles__.push(userRole._id);
         } else {
-          roles.push(userRole._id)
+          roles.push(userRole._id);
         }
       }
-    })
-    return roles
+    });
+    return roles;
   },
 
   /**
@@ -222,13 +259,16 @@ Object.assign(Roles, {
    * @static
    */
   _defaultUpdateUser: function (user, roles) {
-    Meteor.users.update({
-      _id: user._id,
-      // making sure nothing changed in meantime
-      roles: user.roles
-    }, {
-      $set: { roles }
-    })
+    Meteor.users.update(
+      {
+        _id: user._id,
+        // making sure nothing changed in meantime
+        roles: user.roles,
+      },
+      {
+        $set: { roles },
+      }
+    );
   },
 
   /**
@@ -240,8 +280,8 @@ Object.assign(Roles, {
    * @static
    */
   _defaultUpdateRole: function (oldRole, newRole) {
-    Meteor.roles.remove(oldRole._id)
-    Meteor.roles.insert(newRole)
+    Meteor.roles.remove(oldRole._id);
+    Meteor.roles.insert(newRole);
   },
 
   /**
@@ -254,10 +294,10 @@ Object.assign(Roles, {
    */
   _dropCollectionIndex: function (collection, indexName) {
     try {
-      collection._dropIndex(indexName)
+      collection._dropIndex(indexName);
     } catch (e) {
-      if (e.name !== 'MongoError') throw e
-      if (!/index not found/.test(e.err || e.errmsg)) throw e
+      if (e.name !== "MongoError") throw e;
+      if (!/index not found/.test(e.err || e.errmsg)) throw e;
     }
   },
 
@@ -273,22 +313,25 @@ Object.assign(Roles, {
    * @static
    */
   _forwardMigrate: function (updateUser, updateRole, convertUnderscoresToDots) {
-    updateUser = updateUser || Roles._defaultUpdateUser
-    updateRole = updateRole || Roles._defaultUpdateRole
+    updateUser = updateUser || Roles._defaultUpdateUser;
+    updateRole = updateRole || Roles._defaultUpdateRole;
 
-    Roles._dropCollectionIndex(Meteor.roles, 'name_1')
+    Roles._dropCollectionIndex(Meteor.roles, "name_1");
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isNewRole(role)) {
-        updateRole(role, Roles._convertToNewRole(role))
+        updateRole(role, Roles._convertToNewRole(role));
       }
-    })
+    });
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isNewField(user.roles)) {
-        updateUser(user, Roles._convertToNewField(user.roles, convertUnderscoresToDots))
+        updateUser(
+          user,
+          Roles._convertToNewField(user.roles, convertUnderscoresToDots)
+        );
       }
-    })
+    });
   },
 
   /**
@@ -301,21 +344,26 @@ Object.assign(Roles, {
    * @static
    */
   _forwardMigrate2: function (userSelector) {
-    userSelector = userSelector || {}
-    Object.assign(userSelector, { roles: { $ne: null } })
+    userSelector = userSelector || {};
+    Object.assign(userSelector, { roles: { $ne: null } });
 
     Meteor.users.find(userSelector).forEach(function (user, index) {
-      user.roles.filter((r) => r.assigned).forEach(r => {
-        // Added `ifExists` to make it less error-prone
-        Roles._addUserToRole(user._id, r._id, { scope: r.scope, ifExists: true })
-      })
+      user.roles
+        .filter((r) => r.assigned)
+        .forEach((r) => {
+          // Added `ifExists` to make it less error-prone
+          Roles._addUserToRole(user._id, r._id, {
+            scope: r.scope,
+            ifExists: true,
+          });
+        });
 
-      Meteor.users.update({ _id: user._id }, { $unset: { roles: '' } })
-    })
+      Meteor.users.update({ _id: user._id }, { $unset: { roles: "" } });
+    });
 
     // No need to keep the indexes around
-    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1')
-    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1')
+    Roles._dropCollectionIndex(Meteor.users, "roles._id_1_roles.scope_1");
+    Roles._dropCollectionIndex(Meteor.users, "roles.scope_1");
   },
 
   /**
@@ -334,23 +382,23 @@ Object.assign(Roles, {
    * @static
    */
   _backwardMigrate: function (updateUser, updateRole, usingGroups) {
-    updateUser = updateUser || Roles._defaultUpdateUser
-    updateRole = updateRole || Roles._defaultUpdateRole
+    updateUser = updateUser || Roles._defaultUpdateUser;
+    updateRole = updateRole || Roles._defaultUpdateRole;
 
-    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1')
-    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1')
+    Roles._dropCollectionIndex(Meteor.users, "roles._id_1_roles.scope_1");
+    Roles._dropCollectionIndex(Meteor.users, "roles.scope_1");
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isOldRole(role)) {
-        updateRole(role, Roles._convertToOldRole(role))
+        updateRole(role, Roles._convertToOldRole(role));
       }
-    })
+    });
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isOldField(user.roles)) {
-        updateUser(user, Roles._convertToOldField(user.roles, usingGroups))
+        updateUser(user, Roles._convertToOldField(user.roles, usingGroups));
       }
-    })
+    });
   },
 
   /**
@@ -363,44 +411,49 @@ Object.assign(Roles, {
    * @static
    */
   _backwardMigrate2: function (assignmentSelector) {
-    assignmentSelector = assignmentSelector || {}
+    assignmentSelector = assignmentSelector || {};
 
     if (Meteor.users.createIndex) {
-      Meteor.users.createIndex({ 'roles._id': 1, 'roles.scope': 1 })
-      Meteor.users.createIndex({ 'roles.scope': 1 })
+      Meteor.users.createIndex({ "roles._id": 1, "roles.scope": 1 });
+      Meteor.users.createIndex({ "roles.scope": 1 });
     } else {
-      Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
-      Meteor.users._ensureIndex({ 'roles.scope': 1 })
+      Meteor.users._ensureIndex({ "roles._id": 1, "roles.scope": 1 });
+      Meteor.users._ensureIndex({ "roles.scope": 1 });
     }
 
-    Meteor.roleAssignment.find(assignmentSelector).forEach(r => {
-      const roles = Meteor.users.findOne({ _id: r.user._id }).roles || []
+    Meteor.roleAssignment.find(assignmentSelector).forEach((r) => {
+      const roles = Meteor.users.findOne({ _id: r.user._id }).roles || [];
 
-      const currentRole = roles.find(oldRole => oldRole._id === r.role._id && oldRole.scope === r.scope)
+      const currentRole = roles.find(
+        (oldRole) => oldRole._id === r.role._id && oldRole.scope === r.scope
+      );
       if (currentRole) {
-        currentRole.assigned = true
+        currentRole.assigned = true;
       } else {
         roles.push({
           _id: r.role._id,
           scope: r.scope,
-          assigned: true
-        })
+          assigned: true,
+        });
 
-        r.inheritedRoles.forEach(inheritedRole => {
-          const currentInheritedRole = roles.find(oldRole => oldRole._id === inheritedRole._id && oldRole.scope === r.scope)
+        r.inheritedRoles.forEach((inheritedRole) => {
+          const currentInheritedRole = roles.find(
+            (oldRole) =>
+              oldRole._id === inheritedRole._id && oldRole.scope === r.scope
+          );
 
           if (!currentInheritedRole) {
             roles.push({
               _id: inheritedRole._id,
               scope: r.scope,
-              assigned: false
-            })
+              assigned: false,
+            });
           }
-        })
+        });
       }
 
-      Meteor.users.update({ _id: r.user._id }, { $set: { roles } })
-      Meteor.roleAssignment.remove({ _id: r._id })
-    })
-  }
-})
+      Meteor.users.update({ _id: r.user._id }, { $set: { roles } });
+      Meteor.roleAssignment.remove({ _id: r._id });
+    });
+  },
+});

From 0796250c20adc3abe92edbad3daefc6573102a48 Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Wed, 12 Apr 2023 13:06:24 +0200
Subject: [PATCH 0355/1140] method names

---
 .gitignore                  | 1 +
 roles/roles_common_async.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 11e07b25f6..03f05ca168 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ docs/
 node_modules/
 .npm/
 someapp/
+.DS_Store
\ No newline at end of file
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 753eaae8c3..456328aaf8 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -529,7 +529,7 @@ Object.assign(Roles, {
    * @private
    * @static
    */
-  _addUserToRole: async function (userId, roleName, options) {
+  _addUserToRoleAsync: async function (userId, roleName, options) {
     Roles._checkRoleName(roleName);
     Roles._checkScopeName(options.scope);
 

From 67675d331264d5c3a5fbb460f30b4545ce96e807 Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Wed, 26 Apr 2023 17:11:58 +0200
Subject: [PATCH 0356/1140] buggy Role check fixed

---
 roles/roles_common_async.js | 38 +++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 456328aaf8..ac4160262a 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -41,6 +41,19 @@ if (typeof Roles === "undefined") {
 
 var getGroupsForUserDeprecationWarning = false;
 
+/**
+ * Helper, resolves async some
+ * @param {*} arr
+ * @param {*} predicate
+ * @returns
+ */
+const asyncSome = async (arr, predicate) => {
+  for (let e of arr) {
+    if (await predicate(e)) return true;
+  }
+  return false;
+};
+
 Object.assign(Roles, {
   /**
    * Used as a global group (now scope) name. Not used anymore.
@@ -792,23 +805,16 @@ Object.assign(Roles, {
       selector.scope = { $in: [options.scope, null] };
     }
 
-    // Convert to Promises first, then check via some
-    const rolesPromises = roles.map(
-      (roleName) =>
-        new Promise(async (res, rej) => {
-          selector["inheritedRoles._id"] = roleName;
+    const res = await asyncSome(roles, async (roleName) => {
+      selector["inheritedRoles._id"] = roleName;
+      const out =
+        (await Meteor.roleAssignment
+          .find(selector, { limit: 1 })
+          .countAsync()) > 0;
+      return out;
+    });
 
-          res(
-            (await Meteor.roleAssignment
-              .find(selector, { limit: 1 })
-              .countAsync()) > 0
-          );
-        })
-    );
-
-    const result = await Promise.all(rolesPromises);
-
-    return result.some((r) => r);
+    return res;
   },
 
   /**

From b5e818e13216ef7037ed89ffdf8a1e08b0ec00d6 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Sat, 6 May 2023 14:01:02 +0300
Subject: [PATCH 0357/1140] Iterate over values instead of keys for
 finishListeners

---
 packages/webapp/webapp_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 500110d92e..ca174ae8cd 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -283,7 +283,7 @@ WebApp._timeoutAdjustmentRequestCallback = function(req, res) {
   res.on('finish', function() {
     res.setTimeout(SHORT_SOCKET_TIMEOUT);
   });
-  Object.keys(finishListeners).forEach(function(l) {
+  Object.values(finishListeners).forEach(function(l) {
     res.on('finish', l);
   });
 };

From c57b6e46a15739334bcae1f4238942f308df2907 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Sat, 6 May 2023 14:41:53 +0300
Subject: [PATCH 0358/1140] Remove underscore from legacy syntax check

---
 scripts/admin/check-legacy-syntax/check-syntax.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/admin/check-legacy-syntax/check-syntax.js b/scripts/admin/check-legacy-syntax/check-syntax.js
index 6630a535a7..a4defd2442 100644
--- a/scripts/admin/check-legacy-syntax/check-syntax.js
+++ b/scripts/admin/check-legacy-syntax/check-syntax.js
@@ -91,7 +91,6 @@ const packages = {
   'typescript': {
     serverFiles: ['plugin.js']
   },
-  'underscore': {},
   'url': {},
 };
 

From d783eb11973d544f06d51efebd9706e4d5b8621e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sun, 7 May 2023 16:46:40 +0200
Subject: [PATCH 0359/1140] Update link to yuidocs

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 399f40816e..fad3b5e797 100644
--- a/README.md
+++ b/README.md
@@ -430,7 +430,7 @@ To check for roles when using scopes:
 
 Online API docs found here: https://meteor-community-packages.github.io/meteor-roles/
 
-API docs generated using [YUIDoc](http://yui.github.com/yuidoc/)
+API docs generated using [YUIDoc](https://yui.github.io/yuidoc/)
 
 To re-generate documentation:
   1. install YUIDoc

From 999cc31d326cef95154bcf2391ade89579b6a50c Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sun, 7 May 2023 16:56:39 +0200
Subject: [PATCH 0360/1140] Update version for Yuidoc

---
 package.json | 2 +-
 yuidoc.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a5baf18339..c938fb38a2 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "istanbul": "^0.4.5",
-    "standard": "^14.3.4",
+    "standard": "^17.0.0",
     "yuidocjs": "^0.10.2"
   }
 }
diff --git a/yuidoc.json b/yuidoc.json
index b97b8b5619..68728cdf05 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: an authorization package for Meteor",
-  "version": "v1.2.14",
+  "version": "v3.4.0",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From c8e86ea80f837e9a9ffb3efec40a65d13b0eb991 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sun, 7 May 2023 17:05:52 +0200
Subject: [PATCH 0361/1140] Account for client folder in docs build

---
 yuidoc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuidoc.json b/yuidoc.json
index 68728cdf05..18329a2a96 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -5,6 +5,6 @@
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",
-    "paths": ["roles/"]
+    "paths": ["roles/", "roles/client/"]
   }
 }

From 4a56f242a7d1dd48800695ecde0c9b63ff6d88c2 Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Mon, 22 May 2023 08:20:21 +0200
Subject: [PATCH 0362/1140] async fixes

---
 roles/roles_common_async.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index ac4160262a..0942859309 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -564,6 +564,28 @@ Object.assign(Roles, {
     }
 
     // This might create duplicates, because we don't have a unique index, but that's all right. In case there are two, withdrawing the role will effectively kill them both.
+    const existingAssignment = await Meteor.roleAssignment.findOneAsync({
+      "user._id": userId,
+      "role._id": roleName,
+      scope: options.scope,
+    });
+
+    let insertedId;
+    if (existingAssignment) {
+      await Meteor.roleAssignment.updateAsync(existingAssignment._id, {
+        $set: {
+          user: { _id: userId },
+          role: { _id: roleName },
+          scope: options.scope,
+        },
+      });
+    } else {
+      insertedId = await Meteor.roleAssignment.insertAsync({
+        user: { _id: userId },
+        role: { _id: roleName },
+        scope: options.scope,
+      });
+    }
     const res = await Meteor.roleAssignment.upsertAsync(
       {
         "user._id": userId,
@@ -579,9 +601,9 @@ Object.assign(Roles, {
       }
     );
 
-    if (res.insertedId) {
+    if (insertedId) {
       await Meteor.roleAssignment.updateAsync(
-        { _id: res.insertedId },
+        { _id: insertedId },
         {
           $set: {
             inheritedRoles: [

From d1ff02d5f2fb816048e174adad8174942ffe0813 Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Mon, 22 May 2023 11:07:28 +0200
Subject: [PATCH 0363/1140] add roles fixes

---
 roles/roles_common_async.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 0942859309..30a86608aa 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -571,6 +571,7 @@ Object.assign(Roles, {
     });
 
     let insertedId;
+    let res;
     if (existingAssignment) {
       await Meteor.roleAssignment.updateAsync(existingAssignment._id, {
         $set: {
@@ -579,6 +580,8 @@ Object.assign(Roles, {
           scope: options.scope,
         },
       });
+
+      res = await Meteor.roleAssignment.findOneAsync(existingAssignment._id);
     } else {
       insertedId = await Meteor.roleAssignment.insertAsync({
         user: { _id: userId },
@@ -586,7 +589,7 @@ Object.assign(Roles, {
         scope: options.scope,
       });
     }
-    const res = await Meteor.roleAssignment.upsertAsync(
+    /*const res = await Meteor.roleAssignment.upsertAsync(
       {
         "user._id": userId,
         "role._id": roleName,
@@ -599,7 +602,7 @@ Object.assign(Roles, {
           scope: options.scope,
         },
       }
-    );
+    );*/
 
     if (insertedId) {
       await Meteor.roleAssignment.updateAsync(
@@ -613,6 +616,8 @@ Object.assign(Roles, {
           },
         }
       );
+
+      res = await Meteor.roleAssignment.findOneAsync({ _id: insertedId });
     }
 
     return res;

From 366f4fd5f4fa0d6de4e8d4f2c40895649cf693cc Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Mon, 22 May 2023 17:54:06 +0200
Subject: [PATCH 0364/1140] create Role upsert fix

---
 roles/roles_common_async.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 30a86608aa..5d71357dd5 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -84,17 +84,29 @@ Object.assign(Roles, {
       options
     );
 
-    var result = await Meteor.roles.upsertAsync(
-      { _id: roleName },
-      { $setOnInsert: { children: [] } }
-    );
+    let insertedId = null;
 
-    if (!result.insertedId) {
+    const existingRole = await Meteor.roles.findOneAsync({ _id: roleName });
+
+    if (existingRole) {
+      await Meteor.roles.updateAsync(
+        { _id: roleName },
+        { $setOnInsert: { children: [] } }
+      );
+      return null;
+    } else {
+      insertedId = await Meteor.roles.insertAsync({
+        _id: roleName,
+        children: [],
+      });
+    }
+
+    if (!insertedId) {
       if (options.unlessExists) return null;
       throw new Error("Role '" + roleName + "' already exists.");
     }
 
-    return result.insertedId;
+    return insertedId;
   },
 
   /**

From d938ed4e435a40e7807117460139351840646962 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sat, 8 Jul 2023 10:40:16 +0200
Subject: [PATCH 0365/1140] Move types into the package

---
 History.md            |   5 +
 definitions.d.ts      | 392 ++++++++++++++++++++++++++++++++++++++++++
 package-types.json    |   3 +
 package.js            |   6 +-
 roles/roles_common.js |   4 +-
 5 files changed, 406 insertions(+), 4 deletions(-)
 create mode 100644 definitions.d.ts
 create mode 100644 package-types.json

diff --git a/History.md b/History.md
index 96f5face28..bf34af136b 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.5.0
+
+* Bump `blaze` weak dependency to v2.6.2
+* Bring types to the core and update them
+
 ## v3.4.0
 
 * Use the new `createIndex` instead of `_ensureIndex` if available
diff --git a/definitions.d.ts b/definitions.d.ts
new file mode 100644
index 0000000000..cb648e3939
--- /dev/null
+++ b/definitions.d.ts
@@ -0,0 +1,392 @@
+// Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
+//                 Matthew Zartman <https://github.com/mattmm3d>
+//                 Jan Dvorak <https://github.com/storytellercz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.1
+
+/// <reference types="meteor" />
+
+import { Mongo } from 'meteor/mongo'
+
+/**
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
+ *
+ * @module Roles
+ */
+declare namespace Roles {
+  /**
+   * Constant used to reference the special 'global' group that
+   * can be used to apply blanket permissions across all groups.
+   *
+   * @example
+   *     Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
+   *     Roles.userIsInRole(user, 'admin') // => true
+   *
+   *     Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)
+   *     Roles.userIsInRole(user, 'support-staff') // => true
+   *     Roles.userIsInRole(user, 'admin') // => false
+   *
+   * @static
+   * @final
+   */
+  var GLOBAL_GROUP: string
+
+  /**
+   * Subscription handle for the currently logged in user's permissions.
+   *
+   * NOTE: The corresponding publish function, `_roles`, depends on
+   * `this.userId` so it will automatically re-run when the currently
+   * logged-in user changes.
+   *
+   * @example
+   *
+   *     `Roles.subscription.ready()` // => `true` if user roles have been loaded
+   *
+   * @for Roles
+   */
+  var subscription: Subscription
+
+  /**
+   * Add users to roles.
+   *
+   * Adds roles to existing roles for each user.
+   *
+   * @example
+   *     Roles.addUsersToRoles(userId, 'admin')
+   *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
+   *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *
+   * @method addUsersToRoles
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope, or `null` for the global role
+   *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a scope name string.
+   */
+  function addUsersToRoles(
+    users: string | string[] | Meteor.User | Meteor.User[],
+    roles: string | string[],
+    options?: string | { scope?: string; ifExists?: boolean }
+  ): void
+
+  /**
+   * Create a new role.
+   *
+   * @method createRole
+   * @param {String} roleName Name of role.
+   * @param {Object} [options] Options:
+   *   - `unlessExists`: if `true`, exception will not be thrown in the role already exists
+   * @return {String} ID of the new role or null.
+   */
+  function createRole(roleName: string, options?: { unlessExists: boolean }): string
+
+  /**
+   * Delete an existing role.
+   *
+   * If the role is set for any user, it is automatically unset.
+   *
+   * @method deleteRole
+   * @param {String} roleName Name of role.
+   */
+  function deleteRole(roleName: string): void
+
+  /**
+   * Rename an existing role.
+   *
+   * @method renameRole
+   * @param {String} oldName Old name of a role.
+   * @param {String} newName New name of a role.
+   */
+  function renameRole(oldName: string, newName: string): void
+
+  /**
+   * Add role parent to roles.
+   *
+   * Previous parents are kept (role can have multiple parents). For users which have the
+   * parent role set, new subroles are added automatically.
+   *
+   * @method addRolesToParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
+   * @param {String} parentName Name of parent role.
+   */
+  function addRolesToParent(rolesNames: string | string[], parentName: string): void
+
+  /**
+   * Remove role parent from roles.
+   *
+   * Other parents are kept (role can have multiple parents). For users which have the
+   * parent role set, removed subrole is removed automatically.
+   *
+   * @method removeRolesFromParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
+   * @param {String} parentName Name of parent role.
+   */
+  function removeRolesFromParent(rolesNames: string | string[], parentName: string): void
+
+  /**
+   * Retrieve cursor of all existing roles.
+   *
+   * @method getAllRoles
+   * @param {Object} queryOptions Options which are passed directly
+   *                                through to `Meteor.roles.find(query, options)`.
+   * @return {Cursor} Cursor of existing roles.
+   */
+  function getAllRoles(queryOptions?: QueryOptions): Mongo.Cursor<Role>
+
+  /**
+   * Retrieve users groups, if any
+   * @deprecated Use `getScopesForUser` instead.
+   * @method getGroupsForUser
+   * @param {String|Object} user User ID or actual user object
+   * @param {String} [role] Optional name of roles to restrict groups to.
+   *
+   * @return {Array} Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted
+   */
+  function getGroupsForUser(user: string | Meteor.User, role?: string): string[]
+
+  /**
+   * Retrieve users scopes, if any.
+   *
+   * @method getScopesForUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} [roles] Name of roles to restrict scopes to.
+   *
+   * @return {Array} Array of user's scopes, unsorted.
+   */
+  function getScopesForUser(user: string | Meteor.User, roles?: string | string[]): string[]
+
+  /**
+   * Rename a scope.
+   *
+   * Roles assigned with a given scope are changed to be under the new scope.
+   *
+   * @method renameScope
+   * @param {String} oldName Old name of a scope.
+   * @param {String} newName New name of a scope.
+   */
+  function renameScope(oldName: string, newName: string): void
+
+  /**
+   * Remove a scope.
+   *
+   * Roles assigned with a given scope are removed.
+   *
+   * @method removeScope
+   * @param {String} name The name of a scope.
+   *
+   */
+  function removeScope(name: String): void
+
+  /**
+   * Find out if a role is an ancestor of another role.
+   *
+   * WARNING: If you check this on the client, please make sure all roles are published.
+   *
+   * @method isParentOf
+   * @param {String} parentRoleName The role you want to research.
+   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
+   * @return {Boolean}
+   */
+  function isParentOf(parentRoleName: string, childRoleName: string): boolean
+
+  /**
+   * Retrieve user's roles.
+   *
+   * @method getRolesForUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of scope to provide roles for; if not specified, global roles are returned
+   *   - `anyScope`: if set, role can be in any scope (`scope` and `onlyAssigned` options are ignored)
+   *   - `onlyScoped`: if set, only roles in the specified scope are returned
+   *   - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)
+   *   - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)
+   *     If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
+   *     result strongly dependant on the internal data structure of this plugin.
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Array} Array of user's roles, unsorted.
+   */
+  function getRolesForUser(user: string | Meteor.User, options?: string | {
+    scope?: string;
+    anyScope?: boolean;
+    onlyScoped?: boolean;
+    onlyAssigned?: boolean;
+    fullObjects?: boolean
+  }): string[]
+
+  /**
+   * Retrieve all assignments of a user which are for the target role.
+   *
+   * Options:
+   *
+   * @method getUserAssignmentsForRole
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope to restrict roles to; user's global
+   *     roles will also be checked
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *   - `queryOptions`: options which are passed directly
+   *     through to `Meteor.roleAssignment.find(query, options)`
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Cursor} Cursor of user assignments for roles.
+   */
+  function getUserAssignmentsForRole(roles: string | string[], options?: string | {
+    scope?: string
+    anyScope?: boolean
+    queryOptions?: QueryOptions
+  }): Mongo.Cursor<RoleAssignment>
+
+  /**
+   * Retrieve all users who are in target role.
+   *
+   * Options:
+   *
+   * @method getUsersInRole
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} options Options:
+   *   - `scope`: name of the scope to restrict roles to; user's global
+   *     roles will also be checked
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *   - `onlyScoped`: if set, only roles in the specified scope are returned
+   *   - `queryOptions`: options which are passed directly
+   *     through to `Meteor.users.find(query, options)`
+   *
+   * Alternatively, it can be a scope name string.
+   * @param {Object} queryOptions Options which are passed directly
+   *                                through to `Meteor.users.find(query, options)`
+   * @return {Cursor} Cursor of users in roles.
+   */
+  function getUsersInRole(
+    roles: string | string[],
+    options?: string | { scope?: string; anyScope?: boolean; onlyScoped?: boolean; queryOptions?: QueryOptions },
+    queryOptions?: QueryOptions
+  ): Mongo.Cursor<Meteor.User>
+
+  /**
+   * Remove users from assigned roles.
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(userId, 'admin')
+   *     Roles.removeUsersFromRoles([userId, user2], ['editor'])
+   *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
+   * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope, or `null` for the global role
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   */
+  function removeUsersFromRoles(
+    users: string | string[] | Meteor.User | Meteor.User[],
+    roles?: string | string[],
+    options?: string | { scope?: string; anyScope?: boolean }
+  ): void
+
+  /**
+   * Set users' roles.
+   *
+   * Replaces all existing roles with a new set of roles.
+   *
+   * @example
+   *     Roles.setUserRoles(userId, 'admin')
+   *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+   *     Roles.setUserRoles([user1, user2], ['user','editor'])
+   *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *
+   * @method setUserRoles
+   * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope, or `null` for the global role
+   *   - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope
+   *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a scope name string.
+   */
+  function setUserRoles(
+    users: string | string[] | Meteor.User | Meteor.User[],
+    roles: string | string[],
+    options?: string | { scope?: string; anyScope?: boolean; ifExists?: boolean }
+  ): void
+
+  /**
+   * Check if user has specified roles.
+   *
+   * @example
+   *     // global roles
+   *     Roles.userIsInRole(user, 'admin')
+   *     Roles.userIsInRole(user, ['admin','editor'])
+   *     Roles.userIsInRole(userId, 'admin')
+   *     Roles.userIsInRole(userId, ['admin','editor'])
+   *
+   *     // scope roles (global roles are still checked)
+   *     Roles.userIsInRole(user, 'admin', 'group1')
+   *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
+   *     Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})
+   *
+   * @method userIsInRole
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
+   *                             will return `true` if user is in _any_ role.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - `scope`: name of the scope; if supplied, limits check to just that scope
+   *     the user's global roles will always be checked whether scope is specified or not
+   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Boolean} `true` if user is in _any_ of the target roles
+   */
+  function userIsInRole(
+    user: string | string[] | Meteor.User | Meteor.User[],
+    roles: string | string[],
+    options?: string | { scope?: string; anyScope?: boolean }
+  ): boolean
+
+  interface Role {
+    _id: string
+    name: string
+  }
+
+  interface RoleAssignment {
+    _id: string
+    user: {
+      _id: string
+    }
+    role: {
+      _id: string
+    }
+    inheritedRoles?: {
+      _id: string
+    }[]
+    scope?: string
+  }
+
+  interface QueryOptions {
+    sort?: Mongo.SortSpecifier | undefined
+    skip?: number | undefined
+    limit?: number | undefined
+    fields?: Mongo.FieldSpecifier | undefined
+    projection?: Mongo.FieldSpecifier | undefined
+    reactive?: boolean | undefined
+    transform?: Function | undefined
+  }
+
+} // module
+
+declare namespace Meteor {
+  var roles: Mongo.Collection<Roles.Role>
+}
diff --git a/package-types.json b/package-types.json
new file mode 100644
index 0000000000..7838991b97
--- /dev/null
+++ b/package-types.json
@@ -0,0 +1,3 @@
+{
+  "typesEntry": "definitions.d.ts"
+}
diff --git a/package.js b/package.js
index 90a65850e6..2fea14c343 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.4.0',
+  version: '3.5.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
@@ -20,7 +20,9 @@ Package.onUse(function (api) {
     'check'
   ], both)
 
-  api.use(['blaze@2.5.0'], 'client', { weak: true })
+  api.use('zodern:types')
+
+  api.use(['blaze@2.6.2'], 'client', { weak: true })
 
   api.export('Roles')
 
diff --git a/roles/roles_common.js b/roles/roles_common.js
index c2aafa7cdc..629bdea78e 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -792,7 +792,7 @@ Object.assign(Roles, {
    * Retrieve cursor of all existing roles.
    *
    * @method getAllRoles
-   * @param {Object} [queryOptions] Options which are passed directly
+   * @param {Object} queryOptions Options which are passed directly
    *                                through to `Meteor.roles.find(query, options)`.
    * @return {Cursor} Cursor of existing roles.
    * @static
@@ -851,7 +851,7 @@ Object.assign(Roles, {
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *   - `queryOptions`: options which are passed directly
    *     through to `Meteor.roleAssignment.find(query, options)`
-
+   *
    * Alternatively, it can be a scope name string.
    * @return {Cursor} Cursor of user assignments for roles.
    * @static

From e35a2a9eb0a645a9fbc7e483b6a5cab1de9a0ff2 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sat, 8 Jul 2023 10:54:13 +0200
Subject: [PATCH 0366/1140] Switch collection assignment order

---
 roles/roles_common.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index 6d2788b345..77b4810158 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -24,15 +24,18 @@
  *
  * @module Roles
  */
+
+export const RolesCollection = new Mongo.Collection('roles')
+
 if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection('roles')
+  Meteor.roles = RolesCollection
 }
-export const RolesCollection = Meteor.roles
+
+export const RoleAssignmentCollection = new Mongo.Collection('role-assignment')
 
 if (!Meteor.roleAssignment) {
-  Meteor.roleAssignment = new Mongo.Collection('role-assignment')
+  Meteor.roleAssignment = RoleAssignmentCollection
 }
-export const RoleAssignmentCollection = Meteor.roleAssignment
 
 /**
  * @class Roles

From 7ba9286029e1d8ea5c821bab7fd908f23282ef26 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sat, 8 Jul 2023 10:55:16 +0200
Subject: [PATCH 0367/1140] Update versions

---
 package.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.js b/package.js
index db587e81f7..787bcac6d4 100644
--- a/package.js
+++ b/package.js
@@ -2,13 +2,13 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.4.0',
+  version: '4.0.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['1.12', '2.3'])
+  api.versionsFrom(['2.8'])
 
   var both = ['client', 'server']
 
@@ -20,7 +20,7 @@ Package.onUse(function (api) {
     'check'
   ], both)
 
-  api.use(['blaze@2.5.0'], 'client', { weak: true })
+  api.use(['blaze@2.7.1'], 'client', { weak: true })
 
   api.export(['Roles', 'RolesCollection', 'RoleAssignmentCollection'])
 

From b8036ecfd974538bc0408a95455e0f02ec4f2fd8 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sat, 8 Jul 2023 10:57:43 +0200
Subject: [PATCH 0368/1140] Async index creation

---
 History.md            |  1 +
 package.js            |  2 +-
 roles/roles_server.js | 10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index bf34af136b..97174ade6c 100644
--- a/History.md
+++ b/History.md
@@ -4,6 +4,7 @@
 
 * Bump `blaze` weak dependency to v2.6.2
 * Bring types to the core and update them
+* If you use Meteor 2.8+ indexes are now created using the new async method
 
 ## v3.4.0
 
diff --git a/package.js b/package.js
index 2fea14c343..b8e25ac0a4 100644
--- a/package.js
+++ b/package.js
@@ -8,7 +8,7 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['1.12', '2.3'])
+  api.versionsFrom(['1.12', '2.3', '2.8'])
 
   var both = ['client', 'server']
 
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 9a1857d851..b0d23c76d4 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,5 +1,13 @@
 /* global Meteor, Roles */
-if (Meteor.roles.createIndex) {
+if (Meteor.roles.createIndexAsync) {
+  Meteor.roleAssignment.createIndexAsync({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+  Meteor.roleAssignment.createIndexAsync({ 'user._id': 1, 'role._id': 1, scope: 1 })
+  Meteor.roleAssignment.createIndexAsync({ 'role._id': 1 })
+  Meteor.roleAssignment.createIndexAsync({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+  Meteor.roleAssignment.createIndexAsync({ 'inheritedRoles._id': 1 })
+
+  Meteor.roles.createIndexAsync({ 'children._id': 1 })
+} else if (Meteor.roles.createIndex) {
   Meteor.roleAssignment.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
   Meteor.roleAssignment.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
   Meteor.roleAssignment.createIndex({ 'role._id': 1 })

From 9896d70d57e634e195835c83a803d0c92682b084 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sat, 8 Jul 2023 10:59:43 +0200
Subject: [PATCH 0369/1140] Use new collection variables in index creations

---
 roles/roles_server.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 9a1857d851..58f4246b37 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,20 +1,22 @@
 /* global Meteor, Roles */
+import { RolesCollection, RoleAssignmentCollection  } from './roles_common'
+
 if (Meteor.roles.createIndex) {
-  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-  Meteor.roleAssignment.createIndex({ 'role._id': 1 })
-  Meteor.roleAssignment.createIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-  Meteor.roleAssignment.createIndex({ 'inheritedRoles._id': 1 })
+  RoleAssignmentCollection.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+  RoleAssignmentCollection.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
+  RoleAssignmentCollection.createIndex({ 'role._id': 1 })
+  RoleAssignmentCollection.createIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+  RoleAssignmentCollection.createIndex({ 'inheritedRoles._id': 1 })
 
-  Meteor.roles.createIndex({ 'children._id': 1 })
+  RolesCollection.createIndex({ 'children._id': 1 })
 } else {
-  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-  Meteor.roleAssignment._ensureIndex({ 'role._id': 1 })
-  Meteor.roleAssignment._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-  Meteor.roleAssignment._ensureIndex({ 'inheritedRoles._id': 1 })
+  RoleAssignmentCollection._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+  RoleAssignmentCollection._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
+  RoleAssignmentCollection._ensureIndex({ 'role._id': 1 })
+  RoleAssignmentCollection._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+  RoleAssignmentCollection._ensureIndex({ 'inheritedRoles._id': 1 })
 
-  Meteor.roles._ensureIndex({ 'children._id': 1 })
+  RolesCollection._ensureIndex({ 'children._id': 1 })
 }
 
 /*

From c4d173245c0159ab61d75b28bd024f84c6678c9a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 9 Jul 2023 06:23:42 +0000
Subject: [PATCH 0370/1140] Bump tough-cookie from 3.0.1 to 4.1.3

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 3.0.1 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](https://github.com/salesforce/tough-cookie/commits/v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 2160 ++++++++++++++++++++++++---------------------
 1 file changed, 1169 insertions(+), 991 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 55fce553f5..dfb8e83d6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,33 +2,107 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA=="
+    },
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "requires": {
-        "@babel/highlight": "^7.10.4"
+        "eslint-visitor-keys": "^3.3.0"
       }
     },
-    "@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
+    "@eslint-community/regexpp": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
+      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ=="
     },
-    "@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+    "@eslint/eslintrc": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
+      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        }
       }
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
+    "@eslint/js": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
+      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "abbrev": {
       "version": "1.0.9",
@@ -36,19 +110,19 @@
       "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
     },
     "acorn": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-      "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
     },
     "acorn-jsx": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
     },
     "ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -62,32 +136,17 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "optional": true
     },
-    "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "requires": {
-        "type-fest": "^0.11.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="
-        }
-      }
-    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       }
     },
     "argparse": {
@@ -98,19 +157,64 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      }
+    },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "is-string": "^1.0.5"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      }
+    },
+    "array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.tosorted": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
+      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
       }
     },
     "asn1": {
@@ -125,16 +229,16 @@
       "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
       "optional": true
     },
-    "astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
-    },
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
       "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
     },
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
+    },
     "aws-sign2": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
@@ -164,6 +268,24 @@
         "concat-map": "0.0.1"
       }
     },
+    "builtins": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+      "requires": {
+        "semver": "^7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -179,60 +301,41 @@
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "dependencies": {
         "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="
-    },
     "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
       }
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "combined-stream": {
       "version": "0.0.7",
@@ -254,11 +357,6 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
-    },
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -270,21 +368,22 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
         }
       }
     },
@@ -304,62 +403,25 @@
       "optional": true
     },
     "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
-        "ms": "^2.1.1"
+        "ms": "2.1.2"
       }
     },
-    "debug-log": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz",
-      "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8="
-    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
     },
     "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "deglob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/deglob/-/deglob-4.0.1.tgz",
-      "integrity": "sha512-/g+RDZ7yf2HvoW+E5Cy+K94YhgcFgr6C8LuHZD1O5HoNPkf3KY6RfXJ0DBGlB/NkLi5gml+G9zqRzk9S0mHZCg==",
-      "requires": {
-        "find-root": "^1.0.0",
-        "glob": "^7.0.5",
-        "ignore": "^5.0.0",
-        "pkg-config": "^1.1.0",
-        "run-parallel": "^1.1.2",
-        "uniq": "^1.0.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
-        }
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
     "delayed-stream": {
@@ -381,11 +443,6 @@
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -405,21 +462,75 @@
       }
     },
     "es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "version": "1.21.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
+      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
       "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.2.0",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.9"
+      },
+      "dependencies": {
+        "get-intrinsic": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3"
+          }
+        }
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "requires": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "requires": {
+        "has": "^1.0.3"
       }
     },
     "es-to-primitive": {
@@ -438,9 +549,9 @@
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
     },
     "escodegen": {
       "version": "1.8.1",
@@ -455,228 +566,293 @@
       }
     },
     "eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
+      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
       "requires": {
-        "@babel/code-frame": "^7.0.0",
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
+        "@humanwhocodes/config-array": "^0.11.10",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
         "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.0",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.6.0",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
         "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "levn": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+          "requires": {
+            "prelude-ls": "^1.2.1",
+            "type-check": "~0.4.0"
+          }
+        },
+        "optionator": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+          "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+          "requires": {
+            "@aashutoshrathi/word-wrap": "^1.2.3",
+            "deep-is": "^0.1.3",
+            "fast-levenshtein": "^2.0.6",
+            "levn": "^0.4.1",
+            "prelude-ls": "^1.2.1",
+            "type-check": "^0.4.0"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+        },
+        "type-check": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+          "requires": {
+            "prelude-ls": "^1.2.1"
+          }
+        }
       }
     },
     "eslint-config-standard": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz",
-      "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg=="
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q=="
     },
     "eslint-config-standard-jsx": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-8.1.0.tgz",
-      "integrity": "sha512-ULVC8qH8qCqbU792ZOO6DaiaZyHNS/5CZt3hKqHkEhVlhPEPN3nfBqqxJCyp59XrjIBZPu1chMYe9T2DXZ7TMw=="
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
+      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ=="
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
       "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
+        "debug": "^3.2.7",
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
         "resolve": {
-          "version": "1.17.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "version": "1.22.2",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
           "requires": {
-            "path-parse": "^1.0.6"
+            "is-core-module": "^2.11.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
           }
         }
       }
     },
     "eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "requires": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
+        "debug": "^3.2.7"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
     "eslint-plugin-es": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz",
-      "integrity": "sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
       "requires": {
-        "eslint-utils": "^1.4.2",
+        "eslint-utils": "^2.0.0",
         "regexpp": "^3.0.0"
       },
       "dependencies": {
-        "regexpp": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-          "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="
+        "eslint-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
         }
       }
     },
     "eslint-plugin-import": {
-      "version": "2.18.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
-      "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
+      "version": "2.27.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
       "requires": {
-        "array-includes": "^3.0.3",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.4.0",
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.7.4",
         "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.0",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.11.0"
+        "is-core-module": "^2.11.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.1",
+        "semver": "^6.3.0",
+        "tsconfig-paths": "^3.14.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "doctrine": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
+            "esutils": "^2.0.2"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
         "resolve": {
-          "version": "1.17.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "version": "1.22.2",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
           "requires": {
-            "path-parse": "^1.0.6"
+            "is-core-module": "^2.11.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
           }
         }
       }
     },
-    "eslint-plugin-node": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz",
-      "integrity": "sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==",
+    "eslint-plugin-n": {
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
+      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
       "requires": {
-        "eslint-plugin-es": "^2.0.0",
-        "eslint-utils": "^1.4.2",
+        "builtins": "^5.0.1",
+        "eslint-plugin-es": "^4.1.0",
+        "eslint-utils": "^3.0.0",
         "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
+        "is-core-module": "^2.11.0",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.1",
+        "semver": "^7.3.8"
       },
       "dependencies": {
-        "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
-        },
         "resolve": {
-          "version": "1.17.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "version": "1.22.2",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
           "requires": {
-            "path-parse": "^1.0.6"
+            "is-core-module": "^2.11.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "requires": {
+            "lru-cache": "^6.0.0"
           }
         }
       }
     },
     "eslint-plugin-promise": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz",
-      "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw=="
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
+      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig=="
     },
     "eslint-plugin-react": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz",
-      "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==",
+      "version": "7.32.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
+      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
       "requires": {
-        "array-includes": "^3.0.3",
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "array.prototype.tosorted": "^1.1.1",
         "doctrine": "^2.1.0",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^2.1.0",
-        "object.entries": "^1.1.0",
-        "object.fromentries": "^2.0.0",
-        "object.values": "^1.1.0",
-        "prop-types": "^15.7.2",
-        "resolve": "^1.10.1"
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "object.hasown": "^1.1.2",
+        "object.values": "^1.1.6",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.4",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.8"
       },
       "dependencies": {
         "doctrine": {
@@ -687,58 +863,67 @@
             "esutils": "^2.0.2"
           }
         },
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+        },
         "resolve": {
-          "version": "1.17.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "version": "2.0.0-next.4",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
           "requires": {
-            "path-parse": "^1.0.6"
+            "is-core-module": "^2.9.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
           }
         }
       }
     },
-    "eslint-plugin-standard": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz",
-      "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ=="
-    },
     "eslint-scope": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
-      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
       "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "dependencies": {
         "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
     "eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "requires": {
-        "eslint-visitor-keys": "^1.1.0"
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+        }
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA=="
     },
     "espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
+      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
       "requires": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       }
     },
     "esprima": {
@@ -747,32 +932,32 @@
       "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
     },
     "esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "requires": {
         "estraverse": "^5.1.0"
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
     "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "^5.2.0"
       },
       "dependencies": {
         "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
@@ -1048,16 +1233,6 @@
         }
       }
     },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1073,49 +1248,75 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+    "fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "reusify": "^1.0.4"
       }
     },
     "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "requires": {
-        "flat-cache": "^2.0.1"
+        "flat-cache": "^3.0.4"
       }
     },
-    "find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-    },
     "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       }
     },
     "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
+    },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
     },
     "forever-agent": {
       "version": "0.5.2",
@@ -1162,10 +1363,21 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
     },
     "get-intrinsic": {
       "version": "1.1.3",
@@ -1185,9 +1397,18 @@
       }
     },
     "get-stdin": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
-      "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
     },
     "glob": {
       "version": "5.0.15",
@@ -1202,19 +1423,35 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "requires": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^4.0.3"
       }
     },
     "globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "requires": {
-        "type-fest": "^0.8.1"
+        "type-fest": "^0.20.2"
+      }
+    },
+    "globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "requires": {
+        "define-properties": "^1.1.3"
+      }
+    },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "requires": {
+        "get-intrinsic": "^1.1.3"
       }
     },
     "graceful-fs": {
@@ -1222,6 +1459,11 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
       "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
+    },
     "handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
@@ -1249,15 +1491,41 @@
         "function-bind": "^1.1.1"
       }
     },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
+    },
     "has-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
       "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
     },
-    "has-symbols": {
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "has-proto": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
     },
     "hawk": {
       "version": "1.1.1",
@@ -1277,11 +1545,6 @@
       "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
       "optional": true
     },
-    "hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
-    },
     "http-signature": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
@@ -1302,14 +1565,14 @@
       }
     },
     "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
     },
     "import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -1318,7 +1581,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
     },
     "inflight": {
       "version": "1.0.6",
@@ -1334,144 +1597,178 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "inquirer": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.2.tgz",
-      "integrity": "sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w==",
+    "internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
       "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.16",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+        "get-intrinsic": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "requires": {
-            "has-flag": "^4.0.0"
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3"
           }
         }
       }
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "optional": true
+    "is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
+      },
+      "dependencies": {
+        "get-intrinsic": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3"
+          }
+        }
+      }
     },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
+    },
+    "is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "requires": {
+        "has": "^1.0.3"
+      }
     },
     "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
     },
     "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "requires": {
         "is-extglob": "^2.1.1"
       }
     },
-    "is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "requires": {
-        "has-symbols": "^1.0.1"
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "requires": {
+        "call-bind": "^1.0.2"
       }
     },
     "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "requires": {
-        "has-symbols": "^1.0.1"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-typed-array": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
     },
     "isexe": {
       "version": "2.0.0",
@@ -1533,20 +1830,30 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
-    "jsx-ast-utils": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz",
-      "integrity": "sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w==",
+    "json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "requires": {
-        "array-includes": "^3.1.1",
-        "object.assign": "^4.1.0"
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz",
+      "integrity": "sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==",
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
       }
     },
     "levn": {
@@ -1567,29 +1874,36 @@
       }
     },
     "load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
+      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "strip-bom": "^3.0.0"
+        "graceful-fs": "^4.1.15",
+        "parse-json": "^4.0.0",
+        "pify": "^4.0.1",
+        "strip-bom": "^3.0.0",
+        "type-fest": "^0.3.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="
+        }
       }
     },
     "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^5.0.0"
       }
     },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "loose-envify": {
       "version": "1.4.0",
@@ -1599,6 +1913,14 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
     "markdown-it": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
@@ -1654,11 +1976,6 @@
         "mime-db": "1.42.0"
       }
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
     "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -1685,26 +2002,16 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "neo-async": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
       "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
     },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
     "node-uuid": {
       "version": "1.4.8",
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
@@ -1718,32 +2025,6 @@
         "abbrev": "1"
       }
     },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.17.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
     "oauth-sign": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
@@ -1753,12 +2034,12 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -1766,46 +2047,53 @@
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
       }
     },
     "object.entries": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
-      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "has": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "object.fromentries": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
-      "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.hasown": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "requires": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "once": {
@@ -1816,14 +2104,6 @@
         "wrappy": "1"
       }
     },
-    "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -1837,31 +2117,26 @@
         "word-wrap": "~1.2.3"
       }
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
     "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "requires": {
-        "p-try": "^1.0.0"
+        "yocto-queue": "^0.1.0"
       }
     },
     "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "^3.0.2"
       }
     },
     "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
     "parent-module": {
       "version": "1.0.1",
@@ -1872,11 +2147,12 @@
       }
     },
     "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
       "requires": {
-        "error-ex": "^1.2.0"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
       }
     },
     "parseurl": {
@@ -1885,9 +2161,9 @@
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
     },
     "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
     },
     "path-is-absolute": {
       "version": "1.0.1",
@@ -1895,9 +2171,9 @@
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
       "version": "1.0.7",
@@ -1909,18 +2185,10 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
-    "path-type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-      "requires": {
-        "pify": "^2.0.0"
-      }
-    },
     "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
     },
     "pkg-conf": {
       "version": "3.1.0",
@@ -1939,18 +2207,6 @@
             "locate-path": "^3.0.0"
           }
         },
-        "load-json-file": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-          "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
-          "requires": {
-            "graceful-fs": "^4.1.15",
-            "parse-json": "^4.0.0",
-            "pify": "^4.0.1",
-            "strip-bom": "^3.0.0",
-            "type-fest": "^0.3.0"
-          }
-        },
         "locate-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -1976,80 +2232,47 @@
             "p-limit": "^2.0.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        },
-        "type-fest": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
         }
       }
     },
-    "pkg-config": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz",
-      "integrity": "sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=",
-      "requires": {
-        "debug-log": "^1.0.0",
-        "find-root": "^1.0.0",
-        "xtend": "^4.0.1"
-      }
-    },
-    "pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "requires": {
-        "find-up": "^2.1.0"
-      }
-    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
     "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "requires": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
+        "react-is": "^16.13.1"
       }
     },
     "psl": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
-      "optional": true
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
+    },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
     },
     "range-parser": {
       "version": "1.2.1",
@@ -2061,29 +2284,20 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+    "regexp.prototype.flags": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "requires": {
-        "load-json-file": "^2.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-      "requires": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       }
     },
     "regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
     },
     "request": {
       "version": "2.40.0",
@@ -2117,6 +2331,11 @@
         }
       }
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+    },
     "resolve": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
@@ -2127,14 +2346,10 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
     },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
     },
     "rimraf": {
       "version": "2.6.3",
@@ -2159,22 +2374,22 @@
         }
       }
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
-    },
     "run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
-    },
-    "rxjs": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
-      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
       }
     },
     "safer-buffer": {
@@ -2188,17 +2403,17 @@
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
     "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       }
     },
     "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
     "side-channel": {
       "version": "1.0.4",
@@ -2217,28 +2432,6 @@
         }
       }
     },
-    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        }
-      }
-    },
     "sntp": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
@@ -2257,102 +2450,81 @@
         "amdefine": ">=0.0.4"
       }
     },
-    "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
-    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "standard": {
-      "version": "14.3.4",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-14.3.4.tgz",
-      "integrity": "sha512-+lpOkFssMkljJ6eaILmqxHQ2n4csuEABmcubLTb9almFi1ElDzXb1819fjf/5ygSyePCq4kU2wMdb2fBfb9P9Q==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
+      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
       "requires": {
-        "eslint": "~6.8.0",
-        "eslint-config-standard": "14.1.1",
-        "eslint-config-standard-jsx": "8.1.0",
-        "eslint-plugin-import": "~2.18.0",
-        "eslint-plugin-node": "~10.0.0",
-        "eslint-plugin-promise": "~4.2.1",
-        "eslint-plugin-react": "~7.14.2",
-        "eslint-plugin-standard": "~4.0.0",
-        "standard-engine": "^12.0.0"
+        "eslint": "^8.41.0",
+        "eslint-config-standard": "17.1.0",
+        "eslint-config-standard-jsx": "^11.0.0",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-n": "^15.7.0",
+        "eslint-plugin-promise": "^6.1.1",
+        "eslint-plugin-react": "^7.32.2",
+        "standard-engine": "^15.0.0",
+        "version-guard": "^1.1.1"
       }
     },
     "standard-engine": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-12.1.0.tgz",
-      "integrity": "sha512-DVJnWM1CGkag4ucFLGdiYWa5/kJURPONmMmk17p8FT5NE4UnPZB1vxWnXnRo2sPSL78pWJG8xEM+1Tu19z0deg==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
+      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
       "requires": {
-        "deglob": "^4.0.1",
-        "get-stdin": "^7.0.0",
-        "minimist": "^1.2.5",
-        "pkg-conf": "^3.1.0"
+        "get-stdin": "^8.0.0",
+        "minimist": "^1.2.6",
+        "pkg-conf": "^3.1.0",
+        "xdg-basedir": "^4.0.0"
       }
     },
-    "string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+    "string.prototype.matchall": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
       "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "stringstream": {
@@ -2362,24 +2534,17 @@
       "optional": true
     },
     "strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "requires": {
-        "ansi-regex": "^4.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-        }
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
     },
     "strip-json-comments": {
       "version": "3.1.1",
@@ -2394,72 +2559,37 @@
         "has-flag": "^1.0.0"
       }
     },
-    "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
     },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
     "tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-      "optional": true,
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "requires": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       }
     },
-    "tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+    "tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
     },
     "tunnel-agent": {
       "version": "0.4.3",
@@ -2476,9 +2606,9 @@
       }
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
     },
     "type-is": {
       "version": "1.6.18",
@@ -2489,6 +2619,16 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      }
+    },
     "uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
@@ -2512,10 +2652,21 @@
         }
       }
     },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
+    "unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
     },
     "unpipe": {
       "version": "1.0.0",
@@ -2523,37 +2674,37 @@
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
     "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "requires": {
         "punycode": "^2.1.0"
       }
     },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
-    "v8-compile-cache": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
+    "version-guard": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz",
+      "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ=="
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -2562,6 +2713,31 @@
         "isexe": "^2.0.0"
       }
     },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "which-typed-array": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.10"
+      }
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -2577,18 +2753,20 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
+    "xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
     },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     },
     "yui": {
       "version": "3.18.1",

From 6c29ef73c561a51bc9339c32fee22e03b500cc69 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sun, 9 Jul 2023 18:06:40 +0200
Subject: [PATCH 0371/1140] Remove reference to @types/meteor as it is not
 needed

Per zodern's suggestion
---
 definitions.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/definitions.d.ts b/definitions.d.ts
index cb648e3939..bc7b8b10a9 100644
--- a/definitions.d.ts
+++ b/definitions.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Minimum TypeScript Version: 4.1
 
-/// <reference types="meteor" />
-
 import { Mongo } from 'meteor/mongo'
 
 /**

From edbec5fd8056c9019d17739f80008162f5fb9cc1 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 10 Jul 2023 08:49:07 +0200
Subject: [PATCH 0372/1140] Bump Blaze to v2.7.1

---
 History.md | 2 +-
 package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index bf34af136b..f4ac840cc5 100644
--- a/History.md
+++ b/History.md
@@ -2,7 +2,7 @@
 
 ## v3.5.0
 
-* Bump `blaze` weak dependency to v2.6.2
+* Bump `blaze` weak dependency to v2.7.1
 * Bring types to the core and update them
 
 ## v3.4.0
diff --git a/package.js b/package.js
index 2fea14c343..473d782119 100644
--- a/package.js
+++ b/package.js
@@ -22,7 +22,7 @@ Package.onUse(function (api) {
 
   api.use('zodern:types')
 
-  api.use(['blaze@2.6.2'], 'client', { weak: true })
+  api.use(['blaze@2.7.1'], 'client', { weak: true })
 
   api.export('Roles')
 

From d924934d25f86947d6e9d071533e6dcf2fd6c631 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 01:46:47 +0000
Subject: [PATCH 0373/1140] Bump semver from 6.3.0 to 6.3.1

Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dfb8e83d6d..caff6cc196 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2398,9 +2398,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
     },
     "shebang-command": {
       "version": "2.0.0",

From 0edad3048818b5af46f178f3be610fd857ec4809 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 11 Jul 2023 09:32:58 +0200
Subject: [PATCH 0374/1140] Make index function selection shorter

---
 roles/roles_server.js | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index b0d23c76d4..7e528cd7b7 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,30 +1,28 @@
 /* global Meteor, Roles */
+let indexFnAssignment
+let indexFnRoles
+
 if (Meteor.roles.createIndexAsync) {
-  Meteor.roleAssignment.createIndexAsync({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-  Meteor.roleAssignment.createIndexAsync({ 'user._id': 1, 'role._id': 1, scope: 1 })
-  Meteor.roleAssignment.createIndexAsync({ 'role._id': 1 })
-  Meteor.roleAssignment.createIndexAsync({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-  Meteor.roleAssignment.createIndexAsync({ 'inheritedRoles._id': 1 })
-
-  Meteor.roles.createIndexAsync({ 'children._id': 1 })
+  indexFnAssignment = Meteor.roleAssignment.createIndexAsync
+  indexFnRoles = Meteor.roles.createIndexAsync
 } else if (Meteor.roles.createIndex) {
-  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-  Meteor.roleAssignment.createIndex({ 'role._id': 1 })
-  Meteor.roleAssignment.createIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-  Meteor.roleAssignment.createIndex({ 'inheritedRoles._id': 1 })
-
-  Meteor.roles.createIndex({ 'children._id': 1 })
+  indexFnAssignment = Meteor.roleAssignment.createIndex
+  indexFnRoles = Meteor.roles.createIndex
 } else {
-  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-  Meteor.roleAssignment._ensureIndex({ 'role._id': 1 })
-  Meteor.roleAssignment._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-  Meteor.roleAssignment._ensureIndex({ 'inheritedRoles._id': 1 })
-
-  Meteor.roles._ensureIndex({ 'children._id': 1 })
+  indexFnAssignment = Meteor.roleAssignment._ensureIndex
+  indexFnRoles = Meteor.roles._ensureIndex
 }
 
+[
+  { 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 },
+  { 'user._id': 1, 'role._id': 1, scope: 1 },
+  { 'role._id': 1 },
+  { scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }, // Adding userId and roleId might speed up other queries depending on the first index
+  { 'inheritedRoles._id': 1 }
+].forEach(index => indexFnAssignment(index))
+indexFnRoles({ 'children._id': 1 })
+
+
 /*
  * Publish logged-in user's roles so client-side checks can work.
  *

From 15f8d58f9b311ef5270b9403eaa85d1a5d567076 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 13 Jul 2023 14:34:53 +0200
Subject: [PATCH 0375/1140] Published alanning:roles@3.5.0

---
 .versions         | 82 +++++++++++++++++++++++------------------------
 History.md        |  4 +--
 package-lock.json | 14 +++++---
 package.js        |  4 +--
 package.json      |  4 +--
 5 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/.versions b/.versions
index d3ad54a576..6439142b19 100644
--- a/.versions
+++ b/.versions
@@ -1,61 +1,61 @@
-accounts-base@2.0.1
-alanning:roles@3.4.0
-allow-deny@1.1.0
-babel-compiler@7.6.2
-babel-runtime@1.5.0
+accounts-base@2.2.8
+alanning:roles@3.5.0
+allow-deny@1.1.1
+babel-compiler@7.10.4
+babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
 boilerplate-generator@1.7.1
-callback-hook@1.3.1
-check@1.3.1
-ddp@1.4.0
-ddp-client@2.5.0
+callback-hook@1.5.1
+check@1.3.2
+ddp@1.4.1
+ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-rate-limiter@1.1.0
-ddp-server@2.4.0
-diff-sequence@1.1.1
-dynamic-import@0.7.1
-ecmascript@0.15.2
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.11.1
-ecmascript-runtime-server@0.10.1
-ejson@1.1.1
-fetch@0.1.1
-geojson-utils@1.0.10
+ddp-rate-limiter@1.2.0
+ddp-server@2.6.1
+diff-sequence@1.1.2
+dynamic-import@0.7.3
+ecmascript@0.16.7
+ecmascript-runtime@0.8.1
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
+ejson@1.1.3
+fetch@0.1.3
+geojson-utils@1.0.11
 http@1.4.2
 id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@3.2.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.4.0
+local-test:alanning:roles@3.5.0
 localstorage@1.2.0
-logging@1.2.0
-meteor@1.9.3
+logging@1.3.2
+meteor@1.11.2
 meteortesting:browser-tests@0.1.2
 meteortesting:mocha@0.4.4
-minimongo@1.7.0
-modern-browsers@0.1.5
-modules@0.16.0
-modules-runtime@0.12.0
-mongo@1.12.0
-mongo-decimal@0.1.2
+minimongo@1.9.3
+modern-browsers@0.1.9
+modules@0.19.0
+modules-runtime@0.13.1
+mongo@1.16.6
+mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
-npm-mongo@3.9.0
+npm-mongo@4.16.0
 ordered-dict@1.1.0
 practicalmeteor:mocha-core@1.0.1
-promise@0.12.0
-random@1.2.0
-rate-limit@1.0.9
-react-fast-refresh@0.1.1
-reactive-var@1.0.11
+promise@0.12.2
+random@1.2.1
+rate-limit@1.1.1
+react-fast-refresh@0.2.7
+reactive-var@1.0.12
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.1
-service-configuration@1.1.0
-socket-stream-client@0.4.0
-tracker@1.2.0
-underscore@1.0.10
+socket-stream-client@0.5.1
+tracker@1.3.2
+underscore@1.0.13
 url@1.3.2
-webapp@1.11.1
-webapp-hashing@1.1.0
+webapp@1.13.5
+webapp-hashing@1.1.1
+zodern:types@1.0.9
diff --git a/History.md b/History.md
index 9fe4cad321..7d435aacfd 100644
--- a/History.md
+++ b/History.md
@@ -3,8 +3,8 @@
 ## v3.5.0
 
 * Bump `blaze` weak dependency to v2.7.1
-* Bring types to the core and update them
-* If you use Meteor 2.8+ indexes are now created using the new async method
+* Bring types to the core and update them [#365](https://github.com/Meteor-Community-Packages/meteor-roles/pull/365) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
+* If you use Meteor 2.8+ indexes are now created using the new async method [#366](https://github.com/Meteor-Community-Packages/meteor-roles/pull/366) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
 
 ## v3.4.0
 
diff --git a/package-lock.json b/package-lock.json
index caff6cc196..fb46c3493f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2257,7 +2257,8 @@
     "psl": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
+      "optional": true
     },
     "punycode": {
       "version": "2.3.0",
@@ -2267,7 +2268,8 @@
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "optional": true
     },
     "queue-microtask": {
       "version": "1.2.3",
@@ -2334,7 +2336,8 @@
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "optional": true
     },
     "resolve": {
       "version": "1.1.7",
@@ -2573,6 +2576,7 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
       "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "optional": true,
       "requires": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -2666,7 +2670,8 @@
     "universalify": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "optional": true
     },
     "unpipe": {
       "version": "1.0.0",
@@ -2685,6 +2690,7 @@
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
       "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "optional": true,
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
diff --git a/package.js b/package.js
index 6e66b0cda3..0dbc9e309d 100644
--- a/package.js
+++ b/package.js
@@ -8,7 +8,7 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['1.12', '2.3', '2.8'])
+  api.versionsFrom(['1.12', '2.3', '2.8.0'])
 
   var both = ['client', 'server']
 
@@ -20,7 +20,7 @@ Package.onUse(function (api) {
     'check'
   ], both)
 
-  api.use('zodern:types')
+  api.use('zodern:types@1.0.9')
 
   api.use(['blaze@2.7.1'], 'client', { weak: true })
 
diff --git a/package.json b/package.json
index c938fb38a2..e8948dbec7 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,11 @@
     "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
     "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
     "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
-    "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/"
+    "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
   },
   "dependencies": {
     "istanbul": "^0.4.5",
-    "standard": "^17.0.0",
+    "standard": "^17.1.0",
     "yuidocjs": "^0.10.2"
   }
 }

From d2fc40957455aa6f53aa93bd113d488def21fc08 Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Fri, 14 Jul 2023 20:53:41 +0200
Subject: [PATCH 0376/1140] re-added fiber version of createIndex

---
 roles/roles_server.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 8bef6f7ed3..e42ba29ee6 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -19,6 +19,26 @@ if (Meteor.roles.createIndexAsync) {
   Meteor.roleAssignment.createIndexAsync({ "inheritedRoles._id": 1 });
 
   Meteor.roles.createIndexAsync({ "children._id": 1 });
+} else if (Meteor.roles.createIndex) {
+  Meteor.roleAssignment.createIndex({
+    "user._id": 1,
+    "inheritedRoles._id": 1,
+    scope: 1,
+  });
+  Meteor.roleAssignment.createIndex({
+    "user._id": 1,
+    "role._id": 1,
+    scope: 1,
+  });
+  Meteor.roleAssignment.createIndex({ "role._id": 1 });
+  Meteor.roleAssignment.createIndex({
+    scope: 1,
+    "user._id": 1,
+    "inheritedRoles._id": 1,
+  }); // Adding userId and roleId might speed up other queries depending on the first index
+  Meteor.roleAssignment.createIndex({ "inheritedRoles._id": 1 });
+
+  Meteor.roles.createIndex({ "children._id": 1 });
 } else {
   Meteor.roleAssignment._ensureIndex({
     "user._id": 1,

From ec7206f9fdb737ab8d0f9d133da2ca75b7b31cd6 Mon Sep 17 00:00:00 2001
From: Kelly Copley <copleykj@gmail.com>
Date: Fri, 14 Jul 2023 16:30:15 -0400
Subject: [PATCH 0377/1140] fix for index creation functions losing context

---
 roles/roles_server.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 7e528cd7b7..9f830f093c 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -3,14 +3,14 @@ let indexFnAssignment
 let indexFnRoles
 
 if (Meteor.roles.createIndexAsync) {
-  indexFnAssignment = Meteor.roleAssignment.createIndexAsync
-  indexFnRoles = Meteor.roles.createIndexAsync
+  indexFnAssignment = Meteor.roleAssignment.createIndexAsync.bind(Meteor.roleAssignment)
+  indexFnRoles = Meteor.roles.createIndexAsync.bind(Meteor.roles)
 } else if (Meteor.roles.createIndex) {
-  indexFnAssignment = Meteor.roleAssignment.createIndex
-  indexFnRoles = Meteor.roles.createIndex
+  indexFnAssignment = Meteor.roleAssignment.createIndex.bind(Meteor.roleAssignment)
+  indexFnRoles = Meteor.roles.createIndex.bind(Meteor.roles)
 } else {
-  indexFnAssignment = Meteor.roleAssignment._ensureIndex
-  indexFnRoles = Meteor.roles._ensureIndex
+  indexFnAssignment = Meteor.roleAssignment._ensureIndex.bind(Meteor.roleAssignment)
+  indexFnRoles = Meteor.roles._ensureIndex.bind(Meteor.roles)
 }
 
 [

From b8e402813ceb5335684728ea9dc11dd73fa49c08 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 15 Jul 2023 12:11:19 +0200
Subject: [PATCH 0378/1140] Published alanning:roles@3.5.1

---
 .versions  | 4 ++--
 History.md | 4 ++++
 package.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index 6439142b19..06d249bb32 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@2.2.8
-alanning:roles@3.5.0
+alanning:roles@3.5.1
 allow-deny@1.1.1
 babel-compiler@7.10.4
 babel-runtime@1.5.1
@@ -27,7 +27,7 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@3.2.0
 lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.5.0
+local-test:alanning:roles@3.5.1
 localstorage@1.2.0
 logging@1.3.2
 meteor@1.11.2
diff --git a/History.md b/History.md
index 7d435aacfd..7242730ea9 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.5.1
+
+* Fix for index creation functions losing context [#371](https://github.com/Meteor-Community-Packages/meteor-roles/pull/371) [@copleykj](https://github.com/sponsors/copleykj)
+
 ## v3.5.0
 
 * Bump `blaze` weak dependency to v2.7.1
diff --git a/package.js b/package.js
index 0dbc9e309d..37e7d43530 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.5.0',
+  version: '3.5.1',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From e41a14a70a52d2f4da6604d12997cd48ec656ccc Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 15 Jul 2023 12:17:58 +0200
Subject: [PATCH 0379/1140] Account for the new index creation method

---
 roles/roles_server.js | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 54d5416e2e..8c282e3c8c 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,18 +1,5 @@
 /* global Meteor, Roles */
 import { RolesCollection, RoleAssignmentCollection  } from './roles_common'
-let indexFnAssignment
-let indexFnRoles
-
-if (Meteor.roles.createIndexAsync) {
-  indexFnAssignment = Meteor.roleAssignment.createIndexAsync.bind(Meteor.roleAssignment)
-  indexFnRoles = Meteor.roles.createIndexAsync.bind(Meteor.roles)
-} else if (Meteor.roles.createIndex) {
-  indexFnAssignment = Meteor.roleAssignment.createIndex.bind(Meteor.roleAssignment)
-  indexFnRoles = Meteor.roles.createIndex.bind(Meteor.roles)
-} else {
-  indexFnAssignment = Meteor.roleAssignment._ensureIndex.bind(Meteor.roleAssignment)
-  indexFnRoles = Meteor.roles._ensureIndex.bind(Meteor.roles)
-}
 
 [
   { 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 },
@@ -20,8 +7,8 @@ if (Meteor.roles.createIndexAsync) {
   { 'role._id': 1 },
   { scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }, // Adding userId and roleId might speed up other queries depending on the first index
   { 'inheritedRoles._id': 1 }
-].forEach(index => indexFnAssignment(index))
-indexFnRoles({ 'children._id': 1 })
+].forEach(index => RoleAssignmentCollection.createIndexAsync(index))
+RolesCollection.createIndexAsync({ 'children._id': 1 })
 
 
 /*

From 5390b7e6f3453d630bca0fbfbeead9f7daa64119 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 15 Jul 2023 12:25:07 +0200
Subject: [PATCH 0380/1140] Add to history

---
 History.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.md b/History.md
index 7242730ea9..174e978cbf 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v4.0.0
+
+* Collections are now directly exported from the package [#344](https://github.com/Meteor-Community-Packages/meteor-roles/pull/344) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
+
 ## v3.5.1
 
 * Fix for index creation functions losing context [#371](https://github.com/Meteor-Community-Packages/meteor-roles/pull/371) [@copleykj](https://github.com/sponsors/copleykj)

From f3ced66ad4b66499a8283cb67d18f46447d3975e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 20:11:00 +0000
Subject: [PATCH 0381/1140] Bump word-wrap from 1.2.3 to 1.2.4

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fb46c3493f..fac22c16ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2745,9 +2745,9 @@
       }
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA=="
     },
     "wordwrap": {
       "version": "1.0.0",

From 507ee1afb051a55d789bab24ae7dce95992a2b02 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 08:56:03 +0200
Subject: [PATCH 0382/1140] build(core): add lint script to package.json

---
 package.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package.json b/package.json
index e8948dbec7..83a5b2201e 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,18 @@
     "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
     "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
     "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
+    "lint": "standard -v ./",
     "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
   },
   "dependencies": {
     "istanbul": "^0.4.5",
     "standard": "^17.1.0",
     "yuidocjs": "^0.10.2"
+  },
+  "standard": {
+    "ignore": [
+      "**/.meteor/",
+      "**/packages/"
+    ]
   }
 }

From 4cac3172f6fa0d6cc9023ace04205c6873a72aa8 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 09:08:45 +0200
Subject: [PATCH 0383/1140] fix: standard lint fixed

---
 package.js                |   6 +-
 package.json              |   4 +-
 roles/client/debug.js     |   2 +-
 roles/client/uiHelpers.js |   6 +-
 roles/roles_common.js     |  77 +++++++-------------
 roles/roles_server.js     |  13 ++--
 roles/tests/client.js     |  26 ++++---
 roles/tests/server.js     | 144 ++++++++++++++++++--------------------
 8 files changed, 121 insertions(+), 157 deletions(-)

diff --git a/package.js b/package.js
index 37e7d43530..95c2f030fd 100644
--- a/package.js
+++ b/package.js
@@ -10,7 +10,7 @@ Package.describe({
 Package.onUse(function (api) {
   api.versionsFrom(['1.12', '2.3', '2.8.0'])
 
-  var both = ['client', 'server']
+  const both = ['client', 'server']
 
   api.use([
     'ecmascript',
@@ -44,12 +44,12 @@ Package.onTest(function (api) {
   ])
 
   Npm.depends({
-    'chai': '4.2.0'
+    chai: '4.2.0'
   })
 
   api.versionsFrom('2.3')
 
-  var both = ['client', 'server']
+  const both = ['client', 'server']
 
   // `accounts-password` is included so `Meteor.users` exists
 
diff --git a/package.json b/package.json
index 83a5b2201e..c7b64671ef 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
     "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
     "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
     "lint": "standard -v ./",
+    "lint:fix": "standard --fix -v ./",
     "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
   },
   "dependencies": {
@@ -14,7 +15,8 @@
   "standard": {
     "ignore": [
       "**/.meteor/",
-      "**/packages/"
+      "**/packages/",
+      "examples/"
     ]
   }
 }
diff --git a/roles/client/debug.js b/roles/client/debug.js
index 0cb1f431cb..4e2ebd33db 100644
--- a/roles/client/debug.js
+++ b/roles/client/debug.js
@@ -13,7 +13,7 @@ Roles.debug = false
 
 try {
   if (localStorage) {
-    var temp = localStorage.getItem('Roles.debug')
+    const temp = localStorage.getItem('Roles.debug')
 
     if (typeof temp !== 'undefined') {
       Roles.debug = !!temp
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 7ee2991c21..e73040a817 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -42,9 +42,9 @@ Roles._uiHelpers = {
    * @for UIHelpers
    */
   isInRole: function (role, scope) {
-    var user = Meteor.user()
-    var comma = (role || '').indexOf(',')
-    var roles
+    const user = Meteor.user()
+    const comma = (role || '').indexOf(',')
+    let roles
 
     if (!user) return false
     if (!Match.test(role, String)) return false
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 629bdea78e..f05d62067d 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -39,7 +39,7 @@ if (typeof Roles === 'undefined') {
   Roles = {} // eslint-disable-line no-global-assign
 }
 
-var getGroupsForUserDeprecationWarning = false
+let getGroupsForUserDeprecationWarning = false
 
 Object.assign(Roles, {
 
@@ -69,7 +69,7 @@ Object.assign(Roles, {
       unlessExists: false
     }, options)
 
-    var result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
+    const result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
 
     if (!result.insertedId) {
       if (options.unlessExists) return null
@@ -89,8 +89,8 @@ Object.assign(Roles, {
    * @static
    */
   deleteRole: function (roleName) {
-    var roles
-    var inheritedRoles
+    let roles
+    let inheritedRoles
 
     Roles._checkRoleName(roleName)
 
@@ -138,15 +138,14 @@ Object.assign(Roles, {
    * @static
    */
   renameRole: function (oldName, newName) {
-    var role
-    var count
+    let count
 
     Roles._checkRoleName(oldName)
     Roles._checkRoleName(newName)
 
     if (oldName === newName) return
 
-    role = Meteor.roles.findOne({ _id: oldName })
+    const role = Meteor.roles.findOne({ _id: oldName })
 
     if (!role) {
       throw new Error('Role \'' + oldName + '\' does not exist.')
@@ -217,14 +216,11 @@ Object.assign(Roles, {
    * @static
    */
   _addRoleToParent: function (roleName, parentName) {
-    var role
-    var count
-
     Roles._checkRoleName(roleName)
     Roles._checkRoleName(parentName)
 
     // query to get role's children
-    role = Meteor.roles.findOne({ _id: roleName })
+    const role = Meteor.roles.findOne({ _id: roleName })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
@@ -235,7 +231,7 @@ Object.assign(Roles, {
       throw new Error('Roles \'' + roleName + '\' and \'' + parentName + '\' would form a cycle.')
     }
 
-    count = Meteor.roles.update({
+    const count = Meteor.roles.update({
       _id: parentName,
       'children._id': {
         $ne: role._id
@@ -294,7 +290,7 @@ Object.assign(Roles, {
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    let role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
+    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
@@ -352,7 +348,7 @@ Object.assign(Roles, {
    * @static
    */
   addUsersToRoles: function (users, roles, options) {
-    var id
+    let id
 
     if (!users) throw new Error('Missing \'users\' param.')
     if (!roles) throw new Error('Missing \'roles\' param.')
@@ -405,7 +401,7 @@ Object.assign(Roles, {
    * @static
    */
   setUserRoles: function (users, roles, options) {
-    var id
+    let id
 
     if (!users) throw new Error('Missing \'users\' param.')
     if (!roles) throw new Error('Missing \'roles\' param.')
@@ -510,13 +506,11 @@ Object.assign(Roles, {
    * @static
    */
   _getParentRoleNames: function (role) {
-    var parentRoles
-
     if (!role) {
       return []
     }
 
-    parentRoles = new Set([role._id])
+    const parentRoles = new Set([role._id])
 
     parentRoles.forEach(roleName => {
       Meteor.roles.find({ 'children._id': roleName }).fetch().forEach(parentRole => {
@@ -662,9 +656,7 @@ Object.assign(Roles, {
    * @static
    */
   userIsInRole: function (user, roles, options) {
-    var id
-    var selector
-
+    let id
     options = Roles._normalizeOptions(options)
 
     // ensure array to simplify code
@@ -689,9 +681,7 @@ Object.assign(Roles, {
     if (!id) return false
     if (typeof id !== 'string') return false
 
-    selector = {
-      'user._id': id
-    }
+    const selector = { 'user._id': id }
 
     if (!options.anyScope) {
       selector.scope = { $in: [options.scope, null] }
@@ -723,10 +713,7 @@ Object.assign(Roles, {
    * @static
    */
   getRolesForUser: function (user, options) {
-    var id
-    var selector
-    var filter
-    var roles
+    let id
 
     options = Roles._normalizeOptions(options)
 
@@ -747,13 +734,8 @@ Object.assign(Roles, {
 
     if (!id) return []
 
-    selector = {
-      'user._id': id
-    }
-
-    filter = {
-      fields: { 'inheritedRoles._id': 1 }
-    }
+    const selector = { 'user._id': id }
+    const filter = { fields: { 'inheritedRoles._id': 1 } }
 
     if (!options.anyScope) {
       selector.scope = { $in: [options.scope] }
@@ -772,7 +754,7 @@ Object.assign(Roles, {
       delete filter.fields
     }
 
-    roles = Meteor.roleAssignment.find(selector, filter).fetch()
+    const roles = Meteor.roleAssignment.find(selector, filter).fetch()
 
     if (options.fullObjects) {
       return roles
@@ -828,9 +810,7 @@ Object.assign(Roles, {
    * @static
    */
   getUsersInRole: function (roles, options, queryOptions) {
-    var ids
-
-    ids = Roles.getUserAssignmentsForRole(roles, options).fetch().map(a => a.user._id)
+    const ids = Roles.getUserAssignmentsForRole(roles, options).fetch().map(a => a.user._id)
 
     return Meteor.users.find({ _id: { $in: ids } }, ((options && options.queryOptions) || queryOptions) || {})
   },
@@ -886,8 +866,6 @@ Object.assign(Roles, {
    * @static
    */
   _getUsersInRoleCursor: function (roles, options, filter) {
-    var selector
-
     options = Roles._normalizeOptions(options)
 
     options = Object.assign({
@@ -904,9 +882,7 @@ Object.assign(Roles, {
       fields: { 'user._id': 1 }
     }, filter)
 
-    selector = {
-      'inheritedRoles._id': { $in: roles }
-    }
+    const selector = { 'inheritedRoles._id': { $in: roles } }
 
     if (!options.anyScope) {
       selector.scope = { $in: [options.scope] }
@@ -946,8 +922,7 @@ Object.assign(Roles, {
    * @static
    */
   getScopesForUser: function (user, roles) {
-    var scopes
-    var id
+    let id
 
     if (roles && !Array.isArray(roles)) roles = [roles]
 
@@ -968,7 +943,7 @@ Object.assign(Roles, {
       selector['inheritedRoles._id'] = { $in: roles }
     }
 
-    scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
+    const scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
 
     return [...new Set(scopes)]
   },
@@ -984,7 +959,7 @@ Object.assign(Roles, {
    * @static
    */
   renameScope: function (oldName, newName) {
-    var count
+    let count
 
     Roles._checkScopeName(oldName)
     Roles._checkScopeName(newName)
@@ -1053,15 +1028,15 @@ Object.assign(Roles, {
     Roles._checkRoleName(parentRoleName)
     Roles._checkRoleName(childRoleName)
 
-    var rolesToCheck = [parentRoleName]
+    let rolesToCheck = [parentRoleName]
     while (rolesToCheck.length !== 0) {
-      var roleName = rolesToCheck.pop()
+      const roleName = rolesToCheck.pop()
 
       if (roleName === childRoleName) {
         return true
       }
 
-      var role = Meteor.roles.findOne({ _id: roleName })
+      const role = Meteor.roles.findOne({ _id: roleName })
 
       // This should not happen, but this is a problem to address at some other time.
       if (!role) continue
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 9f830f093c..1f31c9662a 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -22,15 +22,14 @@ if (Meteor.roles.createIndexAsync) {
 ].forEach(index => indexFnAssignment(index))
 indexFnRoles({ 'children._id': 1 })
 
-
 /*
  * Publish logged-in user's roles so client-side checks can work.
  *
  * Use a named publish function so clients can check `ready()` state.
  */
 Meteor.publish('_roles', function () {
-  var loggedInUserId = this.userId
-  var fields = { roles: 1 }
+  const loggedInUserId = this.userId
+  const fields = { roles: 1 }
 
   if (!loggedInUserId) {
     this.ready()
@@ -39,7 +38,7 @@ Meteor.publish('_roles', function () {
 
   return Meteor.users.find(
     { _id: loggedInUserId },
-    { fields: fields }
+    { fields }
   )
 })
 
@@ -139,7 +138,7 @@ Object.assign(Roles, {
    * @static
    */
   _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
-    var roles = []
+    const roles = []
     if (Array.isArray(oldRoles)) {
       oldRoles.forEach(function (role, index) {
         if (!(typeof role === 'string')) throw new Error("Role '" + role + "' is not a string.")
@@ -183,7 +182,7 @@ Object.assign(Roles, {
    * @static
    */
   _convertToOldField: function (newRoles, usingGroups) {
-    var roles
+    let roles
 
     if (usingGroups) {
       roles = {}
@@ -201,7 +200,7 @@ Object.assign(Roles, {
         if (!usingGroups) throw new Error("Role '" + userRole._id + "' with scope '" + userRole.scope + "' without enabled groups.")
 
         // escape
-        var scope = userRole.scope.replace(/\./g, '_')
+        const scope = userRole.scope.replace(/\./g, '_')
 
         if (scope[0] === '$') throw new Error("Group name '" + scope + "' start with $.")
 
diff --git a/roles/tests/client.js b/roles/tests/client.js
index daaab19a39..67dc0cab8a 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -9,33 +9,32 @@ import { assert } from 'chai'
 import '../roles_common'
 
 describe('roles', function () {
-  var users
-  var roles = ['admin', 'editor', 'user']
+  const roles = ['admin', 'editor', 'user']
 
   Tracker.autorun(function () {
     Roles.assignmentSubscription = Meteor.subscribe('_roleAssignments')
   })
 
-  users = {
-    'eve': {
+  const users = {
+    eve: {
       _id: 'eve'
     },
-    'bob': {
+    bob: {
       _id: 'bob'
     },
-    'joe': {
+    joe: {
       _id: 'joe'
     }
   }
 
   function testUser (username, expectedRoles, scope) {
-    var user = users[username]
+    const user = users[username]
 
     // test using user object rather than userId to avoid mocking
     roles.forEach(function (role) {
-      var expected = expectedRoles.includes(role)
-      var msg = username + ' expected to have \'' + role + '\' permission but does not'
-      var nmsg = username + ' had un-expected permission ' + role
+      const expected = expectedRoles.includes(role)
+      const msg = username + ' expected to have \'' + role + '\' permission but does not'
+      const nmsg = username + ' had un-expected permission ' + role
 
       if (expected) {
         assert.isTrue(Roles.userIsInRole(user, role, scope), msg)
@@ -107,9 +106,8 @@ describe('roles', function () {
   })
 
   it('can check current users roles via template helper', function () {
-    var isInRole
-    var expected
-    var actual
+    let expected
+    let actual
 
     if (!Roles._handlebarsHelpers) {
       // probably running package tests outside of a Meteor app.
@@ -117,7 +115,7 @@ describe('roles', function () {
       return
     }
 
-    isInRole = Roles._handlebarsHelpers.isInRole
+    const isInRole = Roles._handlebarsHelpers.isInRole
     assert.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
 
     expected = true
diff --git a/roles/tests/server.js b/roles/tests/server.js
index c416ba2eb7..71cab248f2 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -15,12 +15,14 @@ Meteor.roleAssignment.allow({
   remove () { return true }
 })
 
+const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)
+
 describe('roles', function () {
-  var users = {}
-  var roles = ['admin', 'editor', 'user']
+  let users = {}
+  const roles = ['admin', 'editor', 'user']
 
   Meteor.publish('_roleAssignments', function () {
-    var loggedInUserId = this.userId
+    const loggedInUserId = this.userId
 
     if (!loggedInUserId) {
       this.ready()
@@ -31,12 +33,12 @@ describe('roles', function () {
   })
 
   function addUser (name) {
-    return Meteor.users.insert({ 'username': name })
+    return Meteor.users.insert({ username: name })
   }
 
   function testUser (username, expectedRoles, scope) {
-    var userId = users[username]
-    var userObj = Meteor.users.findOne({ _id: userId })
+    const userId = users[username]
+    const userObj = Meteor.users.findOne({ _id: userId })
 
     // check using user ids (makes db calls)
     _innerTest(userId, username, expectedRoles, scope)
@@ -48,9 +50,9 @@ describe('roles', function () {
   function _innerTest (userParam, username, expectedRoles, scope) {
     // test that user has only the roles expected and no others
     roles.forEach(function (role) {
-      var expected = expectedRoles.includes(role)
-      var msg = username + ' expected to have \'' + role + '\' role but does not'
-      var nmsg = username + ' had the following un-expected role: ' + role
+      const expected = expectedRoles.includes(role)
+      const msg = username + ' expected to have \'' + role + '\' role but does not'
+      const nmsg = username + ' had the following un-expected role: ' + role
 
       if (expected) {
         assert.isTrue(Roles.userIsInRole(userParam, role, scope), msg)
@@ -66,18 +68,18 @@ describe('roles', function () {
     Meteor.users.remove({})
 
     users = {
-      'eve': addUser('eve'),
-      'bob': addUser('bob'),
-      'joe': addUser('joe')
+      eve: addUser('eve'),
+      bob: addUser('bob'),
+      joe: addUser('joe')
     }
   })
 
   it('can create and delete roles', function () {
-    var role1Id = Roles.createRole('test1')
+    const role1Id = Roles.createRole('test1')
     assert.equal(Meteor.roles.findOne()._id, 'test1')
     assert.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
 
-    var role2Id = Roles.createRole('test2')
+    const role2Id = Roles.createRole('test2')
     assert.equal(Meteor.roles.findOne({ _id: 'test2' })._id, 'test2')
     assert.equal(Meteor.roles.findOne(role2Id)._id, 'test2')
 
@@ -275,13 +277,11 @@ describe('roles', function () {
   })
 
   it('can check user against several roles at once', function () {
-    var user
-
     Roles.createRole('admin')
     Roles.createRole('user')
 
     Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    user = Meteor.users.findOne({ _id: users.eve })
+    const user = Meteor.users.findOne({ _id: users.eve })
 
     // we can check the non-existing role
     assert.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
@@ -365,8 +365,8 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
-    var bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
 
     Roles.addUsersToRoles(eve, ['admin', 'user'])
 
@@ -500,8 +500,8 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
-    var bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
 
     // remove user role - one user
     Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
@@ -637,8 +637,8 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
-    var bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
 
     Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
     testUser('eve', ['editor', 'user'])
@@ -672,9 +672,9 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
-    var bob = Meteor.users.findOne({ _id: users.bob })
-    var joe = Meteor.users.findOne({ _id: users.joe })
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
+    const joe = Meteor.users.findOne({ _id: users.joe })
 
     Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
     Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2')
@@ -732,7 +732,7 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
+    const eve = Meteor.users.findOne({ _id: users.eve })
 
     Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE)
     testUser('eve', ['admin'], 'scope1')
@@ -747,7 +747,7 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
+    const eve = Meteor.users.findOne({ _id: users.eve })
 
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
 
@@ -776,8 +776,8 @@ describe('roles', function () {
     })
 
     // compare roles, sorted alphabetically
-    var expected = roles
-    var actual = Roles.getAllRoles().fetch().map(r => r._id)
+    const expected = roles
+    const actual = Roles.getAllRoles().fetch().map(r => r._id)
 
     assert.sameMembers(actual, expected)
 
@@ -799,8 +799,8 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
+    let userObj
 
     // by userId
     assert.sameMembers(Roles.getRolesForUser(userId), [])
@@ -827,7 +827,7 @@ describe('roles', function () {
       role: { _id: 'user' },
       scope: null,
       user: { _id: userId },
-      inheritedRoles: [{ '_id': 'user' }]
+      inheritedRoles: [{ _id: 'user' }]
     }])
   })
 
@@ -835,8 +835,8 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
+    let userObj
 
     // by userId
     assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
@@ -979,7 +979,7 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
-    var userId = users.eve
+    const userId = users.eve
 
     // add roles
     Roles.addUsersToRoles(userId, ['user'], 'scope1')
@@ -1011,8 +1011,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
     Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
@@ -1022,7 +1021,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
     assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
   })
@@ -1030,8 +1029,8 @@ describe('roles', function () {
   it('getRolesForUser should not return null entries if user has no roles for scope', function () {
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
+    let userObj
 
     // by userId
     assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
@@ -1057,18 +1056,14 @@ describe('roles', function () {
   it('getRolesForUser should not fail during a call of addUsersToRoles', function () {
     Roles.createRole('editor')
 
-    var userId = users.eve
-
-    const promises = [
-    ];
-
+    const userId = users.eve
+    const promises = []
     const interval = setInterval(() => {
-      promises.push(Promise.resolve().then(() => { Roles.getRolesForUser(userId); }));
-    }, 0);
-    
-    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-    clearInterval(interval);
+      promises.push(Promise.resolve().then(() => { Roles.getRolesForUser(userId) }))
+    }, 0)
 
+    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+    clearInterval(interval)
 
     return Promise.all(promises)
   })
@@ -1086,8 +1081,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
     Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
@@ -1096,7 +1090,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
   })
 
@@ -1105,8 +1099,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
     Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
@@ -1117,7 +1110,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
@@ -1127,8 +1120,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor', 'user'])
 
@@ -1139,7 +1131,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), [])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj), [])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), [])
     assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), [])
@@ -1147,8 +1139,7 @@ describe('roles', function () {
   })
 
   it('can get all groups for user by role array', function () {
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1170,7 +1161,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
 
     // by user object, one role
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['group2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
@@ -1186,8 +1177,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
     Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
@@ -1203,7 +1193,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
@@ -1221,8 +1211,8 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
     Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
 
-    var expected = [users.eve, users.joe]
-    var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+    const expected = [users.eve, users.joe]
+    const actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
 
     assert.sameMembers(actual, expected)
   })
@@ -1234,8 +1224,8 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
     Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-    var expected = [users.eve, users.joe]
-    var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+    let expected = [users.eve, users.joe]
+    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
 
     assert.sameMembers(actual, expected)
 
@@ -1258,8 +1248,8 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
     Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-    var expected = [users.eve]
-    var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+    let expected = [users.eve]
+    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
 
     assert.sameMembers(actual, expected)
 
@@ -1285,8 +1275,8 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
     Roles.addUsersToRoles([users.bob], ['admin'], 'scope1')
 
-    var expected = [users.eve]
-    var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+    let expected = [users.eve]
+    let actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
     assert.sameMembers(actual, expected)
 
     expected = [users.eve, users.bob]
@@ -1305,11 +1295,11 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
     Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-    var results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
+    const results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
 
     assert.equal(1, results.length)
-    assert.isTrue(results[0].hasOwnProperty('_id'))
-    assert.isFalse(results[0].hasOwnProperty('username'))
+    assert.isTrue(hasProp(results[0], '_id'))
+    assert.isFalse(hasProp(results[0], 'username'))
   })
 
   it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {

From 0ef4a6a6cb210f15b0b67115c4a42c92e06901e5 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:14:27 +0200
Subject: [PATCH 0384/1140] tests: added complete working test and dev
 infrastructure project

---
 testapp/.coverage.json              |    6 +
 testapp/.gitignore                  |    4 +
 testapp/.meteor/.finished-upgraders |   19 +
 testapp/.meteor/.gitignore          |    1 +
 testapp/.meteor/.id                 |    7 +
 testapp/.meteor/packages            |   18 +
 testapp/.meteor/platforms           |    2 +
 testapp/.meteor/release             |    1 +
 testapp/.meteor/versions            |   62 +
 testapp/package-lock.json           | 5317 +++++++++++++++++++++++++++
 testapp/package.json                |   40 +
 11 files changed, 5477 insertions(+)
 create mode 100644 testapp/.coverage.json
 create mode 100644 testapp/.gitignore
 create mode 100644 testapp/.meteor/.finished-upgraders
 create mode 100644 testapp/.meteor/.gitignore
 create mode 100644 testapp/.meteor/.id
 create mode 100644 testapp/.meteor/packages
 create mode 100644 testapp/.meteor/platforms
 create mode 100644 testapp/.meteor/release
 create mode 100644 testapp/.meteor/versions
 create mode 100644 testapp/package-lock.json
 create mode 100644 testapp/package.json

diff --git a/testapp/.coverage.json b/testapp/.coverage.json
new file mode 100644
index 0000000000..918fc8889e
--- /dev/null
+++ b/testapp/.coverage.json
@@ -0,0 +1,6 @@
+{
+  "include": [
+    "**/packages/roles/**/*",
+    "**/packages/*alanning_roles.js"
+  ]
+}
diff --git a/testapp/.gitignore b/testapp/.gitignore
new file mode 100644
index 0000000000..d1f89f83a8
--- /dev/null
+++ b/testapp/.gitignore
@@ -0,0 +1,4 @@
+node_modules/
+.npm/
+.coverage/
+packages/
diff --git a/testapp/.meteor/.finished-upgraders b/testapp/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..c07b6ff75a
--- /dev/null
+++ b/testapp/.meteor/.finished-upgraders
@@ -0,0 +1,19 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/testapp/.meteor/.gitignore b/testapp/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/testapp/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/testapp/.meteor/.id b/testapp/.meteor/.id
new file mode 100644
index 0000000000..404dd7470a
--- /dev/null
+++ b/testapp/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+uffl2v6ap9ck.g2922xjmnljm
diff --git a/testapp/.meteor/packages b/testapp/.meteor/packages
new file mode 100644
index 0000000000..63f32aa28d
--- /dev/null
+++ b/testapp/.meteor/packages
@@ -0,0 +1,18 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor@1.11.2                  # Shared foundation for all Meteor packages
+static-html@1.3.2             # Define static page content in .html files
+standard-minifier-css@1.9.2   # CSS minifier run for production mode
+standard-minifier-js@2.8.1    # JS minifier run for production mode
+es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
+ecmascript@0.16.7              # Enable ECMAScript2015+ syntax in app code
+typescript@4.9.4              # Enable TypeScript syntax in .ts and .tsx modules
+shell-server@0.5.0            # Server-side component of the `meteor shell` command
+webapp@1.13.5                  # Serves a Meteor app over HTTP
+server-render@0.4.1           # Support for server-side rendering
+hot-module-replacement@0.5.3  # Rebuilds the client if there is a change on the client without restarting the server
+
diff --git a/testapp/.meteor/platforms b/testapp/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/testapp/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/testapp/.meteor/release b/testapp/.meteor/release
new file mode 100644
index 0000000000..e8cfc7ec4c
--- /dev/null
+++ b/testapp/.meteor/release
@@ -0,0 +1 @@
+METEOR@2.12
diff --git a/testapp/.meteor/versions b/testapp/.meteor/versions
new file mode 100644
index 0000000000..24b5002129
--- /dev/null
+++ b/testapp/.meteor/versions
@@ -0,0 +1,62 @@
+autoupdate@1.8.0
+babel-compiler@7.10.4
+babel-runtime@1.5.1
+base64@1.0.12
+blaze-tools@1.1.3
+boilerplate-generator@1.7.1
+caching-compiler@1.2.2
+caching-html-compiler@1.2.1
+callback-hook@1.5.1
+check@1.3.2
+ddp@1.4.1
+ddp-client@2.6.1
+ddp-common@1.4.0
+ddp-server@2.6.1
+diff-sequence@1.1.2
+dynamic-import@0.7.3
+ecmascript@0.16.7
+ecmascript-runtime@0.8.1
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
+ejson@1.1.3
+es5-shim@4.8.0
+fetch@0.1.3
+hot-code-push@1.0.4
+hot-module-replacement@0.5.3
+html-tools@1.1.3
+htmljs@1.1.1
+http@1.0.10
+id-map@1.1.1
+inter-process-messaging@0.1.1
+logging@1.3.2
+meteor@1.11.2
+meteortesting:browser-tests@1.4.2
+meteortesting:mocha@2.1.0
+meteortesting:mocha-core@8.0.1
+minifier-css@1.6.4
+minifier-js@2.7.5
+modern-browsers@0.1.9
+modules@0.19.0
+modules-runtime@0.13.1
+modules-runtime-hot@0.14.2
+mongo-id@1.0.8
+promise@0.12.2
+random@1.2.1
+react-fast-refresh@0.2.7
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.1
+server-render@0.4.1
+shell-server@0.5.0
+socket-stream-client@0.5.1
+spacebars-compiler@1.3.1
+standard-minifier-css@1.9.2
+standard-minifier-js@2.8.1
+static-html@1.3.2
+templating-tools@1.2.2
+tracker@1.3.2
+typescript@4.9.4
+underscore@1.0.13
+url@1.3.2
+webapp@1.13.5
+webapp-hashing@1.1.1
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
new file mode 100644
index 0000000000..375467bbb8
--- /dev/null
+++ b/testapp/package-lock.json
@@ -0,0 +1,5317 @@
+{
+  "name": "someapp",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
+    "@ampproject/remapping": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.22.5"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+      "dev": true
+    },
+    "@babel/core": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
+      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "dev": true,
+      "requires": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helpers": "^7.22.6",
+        "@babel/parser": "^7.22.7",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.8",
+        "@babel/types": "^7.22.5",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.2",
+        "semver": "^6.3.1"
+      }
+    },
+    "@babel/generator": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
+      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
+      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.5",
+        "browserslist": "^4.21.9",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "dev": true
+    },
+    "@babel/helper-function-name": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.5"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "dev": true
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "dev": true
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "dev": true
+    },
+    "@babel/helpers": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
+      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.6",
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+      "dev": true
+    },
+    "@babel/runtime": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "requires": {
+        "regenerator-runtime": "^0.13.11"
+      }
+    },
+    "@babel/template": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
+      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.7",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.22.7",
+        "@babel/types": "^7.22.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/types": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
+      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+      "dev": true
+    },
+    "@eslint/eslintrc": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
+      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "globals": {
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
+      }
+    },
+    "@eslint/js": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
+      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
+      "dev": true
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      }
+    },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      },
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.14",
+          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+          "dev": true
+        }
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@puppeteer/browsers": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz",
+      "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4.3.4",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "yargs": "17.7.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "cliui": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.1",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "17.7.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+          "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "21.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+          "dev": true
+        }
+      }
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "20.4.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz",
+      "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==",
+      "dev": true,
+      "optional": true
+    },
+    "@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "requires": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      }
+    },
+    "acorn": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4"
+      }
+    },
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "append-transform": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
+      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "^3.0.0"
+      }
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      }
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      }
+    },
+    "array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      }
+    },
+    "array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.tosorted": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
+      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      }
+    },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      }
+    },
+    "asn1": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+      "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
+      "optional": true
+    },
+    "assert-plus": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+      "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
+      "optional": true
+    },
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+      "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
+      "optional": true
+    },
+    "babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-instrument": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+          "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "requires": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "boom": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+      "integrity": "sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==",
+      "optional": true,
+      "requires": {
+        "hoek": "0.9.x"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "browserslist": {
+      "version": "4.21.10",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.11"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true
+    },
+    "builtins": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+    },
+    "caching-transform": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
+      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
+      "dev": true,
+      "requires": {
+        "hasha": "^5.0.0",
+        "make-dir": "^3.0.0",
+        "package-hash": "^4.0.0",
+        "write-file-atomic": "^3.0.0"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001518",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz",
+      "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "chromium-bidi": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz",
+      "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==",
+      "dev": true,
+      "requires": {
+        "mitt": "3.0.0"
+      }
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+      "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
+      "optional": true,
+      "requires": {
+        "delayed-stream": "0.0.5"
+      }
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "requires": {
+        "safe-buffer": "5.2.1"
+      }
+    },
+    "content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
+    },
+    "convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "cosmiconfig": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        }
+      }
+    },
+    "cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dev": true,
+      "requires": {
+        "node-fetch": "2.6.7"
+      }
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "cryptiles": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+      "integrity": "sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==",
+      "optional": true,
+      "requires": {
+        "boom": "0.4.x"
+      }
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+      "integrity": "sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==",
+      "optional": true
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "default-require-extensions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
+      "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==",
+      "dev": true,
+      "requires": {
+        "strip-bom": "^4.0.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+      "dev": true,
+      "requires": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "delayed-stream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+      "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
+      "optional": true
+    },
+    "depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+    },
+    "destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
+    },
+    "devtools-protocol": {
+      "version": "0.0.1107588",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
+      "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
+      "dev": true
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "electron-to-chromium": {
+      "version": "1.4.479",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz",
+      "integrity": "sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ==",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.2.1",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.10"
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true
+    },
+    "eslint": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
+      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.1",
+        "@eslint/js": "^8.46.0",
+        "@humanwhocodes/config-array": "^0.11.10",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.2",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "globals": {
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "levn": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "^1.2.1",
+            "type-check": "~0.4.0"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "optionator": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+          "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+          "dev": true,
+          "requires": {
+            "@aashutoshrathi/word-wrap": "^1.2.3",
+            "deep-is": "^0.1.3",
+            "fast-levenshtein": "^2.0.6",
+            "levn": "^0.4.1",
+            "prelude-ls": "^1.2.1",
+            "type-check": "^0.4.0"
+          }
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-check": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "^1.2.1"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-config-standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
+      "dev": true
+    },
+    "eslint-config-standard-jsx": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
+      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==",
+      "dev": true
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "resolve": {
+          "version": "1.22.2",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.11.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-es": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+      "dev": true,
+      "requires": {
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      },
+      "dependencies": {
+        "eslint-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.8.0",
+        "has": "^1.0.3",
+        "is-core-module": "^2.12.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "resolve": {
+          "version": "1.22.3",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
+          "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.12.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-n": {
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
+      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
+      "dev": true,
+      "requires": {
+        "builtins": "^5.0.1",
+        "eslint-plugin-es": "^4.1.0",
+        "eslint-utils": "^3.0.0",
+        "ignore": "^5.1.1",
+        "is-core-module": "^2.11.0",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.1",
+        "semver": "^7.3.8"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "resolve": {
+          "version": "1.22.2",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.11.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-promise": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
+      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==",
+      "dev": true
+    },
+    "eslint-plugin-react": {
+      "version": "7.33.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
+      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "array.prototype.tosorted": "^1.1.1",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "object.hasown": "^1.1.2",
+        "object.values": "^1.1.6",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.4",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.8"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "resolve": {
+          "version": "2.0.0-next.4",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.9.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
+    },
+    "express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "requires": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "foreground-child": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
+      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "forever-agent": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+      "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A=="
+    },
+    "form-data": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
+      "optional": true,
+      "requires": {
+        "async": "~0.9.0",
+        "combined-stream": "~0.0.4",
+        "mime": "~1.2.11"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
+          "optional": true
+        },
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
+          "optional": true
+        }
+      }
+    },
+    "forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+    },
+    "fromentries": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
+      "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
+      "dev": true
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.3"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3"
+      }
+    },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true
+    },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "hasha": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
+      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
+      "dev": true,
+      "requires": {
+        "is-stream": "^2.0.0",
+        "type-fest": "^0.8.0"
+      }
+    },
+    "hawk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+      "integrity": "sha512-am8sVA2bCJIw8fuuVcKvmmNnGFUGW8spTkVtj2fXTEZVkfN42bwFZFtDem57eFi+NSxurJB8EQ7Jd3uCHLn8Vw==",
+      "optional": true,
+      "requires": {
+        "boom": "0.4.x",
+        "cryptiles": "0.2.x",
+        "hoek": "0.9.x",
+        "sntp": "0.2.x"
+      }
+    },
+    "hoek": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+      "integrity": "sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==",
+      "optional": true
+    },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "requires": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      }
+    },
+    "http-signature": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+      "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
+      "optional": true,
+      "requires": {
+        "asn1": "0.1.11",
+        "assert-plus": "^0.1.5",
+        "ctype": "0.5.3"
+      }
+    },
+    "https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "requires": {
+        "agent-base": "6",
+        "debug": "4"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        }
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+    },
+    "is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true
+    },
+    "is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dev": true,
+      "requires": {
+        "which-typed-array": "^1.1.11"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
+      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
+      "dev": true,
+      "requires": {
+        "append-transform": "^2.0.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      }
+    },
+    "istanbul-lib-processinfo": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz",
+      "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==",
+      "dev": true,
+      "requires": {
+        "archy": "^1.0.0",
+        "cross-spawn": "^7.0.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "p-map": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "uuid": "^8.3.2"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+          "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+          "dev": true,
+          "requires": {
+            "semver": "^7.5.3"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "dev": true,
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+    },
+    "json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
+    },
+    "jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "linkify-it": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
+      "integrity": "sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg==",
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "load-json-file": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
+      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.15",
+        "parse-json": "^4.0.0",
+        "pify": "^4.0.1",
+        "strip-bom": "^3.0.0",
+        "type-fest": "^0.3.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+          "dev": true
+        }
+      }
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
+      "dev": true
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      }
+    },
+    "markdown-it": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
+      "integrity": "sha512-Rl8dHHeLuAh3E72OPY0tY7CLvlxgHiLhlshIYswAAabAg4YDBLa6e/LTgNkkxBO2K61ESzoquPQFMw/iMrT1PA==",
+      "requires": {
+        "argparse": "~1.0.2",
+        "entities": "~1.1.1",
+        "linkify-it": "~1.2.0",
+        "mdurl": "~1.0.0",
+        "uc.micro": "^1.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        }
+      }
+    },
+    "mdn-links": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/mdn-links/-/mdn-links-0.1.0.tgz",
+      "integrity": "sha512-m+gI2Hrgro1O0SwqHd9cFkqN8VGzP56eprB63gxu6z9EFQDMeaR083wcNqMVADIbgiMP/TOCCe0ZIXHLBv2tUg=="
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "meteor-node-stubs": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.5.tgz",
+      "integrity": "sha512-FLlOFZx3KnZ5s3yPCK+x58DyX9ewN+oQ12LcpwBXMLtzJ/YyprMQVivd6KIrahZbKJrNenPNUGuDS37WUFg+Mw==",
+      "requires": {
+        "assert": "^2.0.0",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^5.7.1",
+        "console-browserify": "^1.2.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.12.0",
+        "domain-browser": "^4.22.0",
+        "elliptic": "^6.5.4",
+        "events": "^3.3.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^3.6.0",
+        "stream-browserify": "^3.0.0",
+        "stream-http": "^3.2.0",
+        "string_decoder": "^1.3.0",
+        "timers-browserify": "^2.0.12",
+        "tty-browserify": "0.0.1",
+        "url": "^0.11.0",
+        "util": "^0.12.4",
+        "vm-browserify": "^1.1.2"
+      },
+      "dependencies": {
+        "asn1.js": {
+          "version": "5.4.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0",
+            "safer-buffer": "^2.1.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "assert": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "es6-object-assign": "^1.1.0",
+            "is-nan": "^1.2.1",
+            "object-is": "^1.0.1",
+            "util": "^0.12.0"
+          }
+        },
+        "available-typed-arrays": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "base64-js": {
+          "version": "1.5.1",
+          "bundled": true
+        },
+        "bn.js": {
+          "version": "5.2.0",
+          "bundled": true
+        },
+        "brorand": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "browserify-aes": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "buffer-xor": "^1.0.3",
+            "cipher-base": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.3",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "browserify-cipher": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "browserify-aes": "^1.0.4",
+            "browserify-des": "^1.0.0",
+            "evp_bytestokey": "^1.0.0"
+          }
+        },
+        "browserify-des": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "des.js": "^1.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "browserify-rsa": {
+          "version": "4.1.0",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.0.0",
+            "randombytes": "^2.0.1"
+          }
+        },
+        "browserify-sign": {
+          "version": "4.2.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.1.1",
+            "browserify-rsa": "^4.0.1",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "elliptic": "^6.5.3",
+            "inherits": "^2.0.4",
+            "parse-asn1": "^5.1.5",
+            "readable-stream": "^3.6.0",
+            "safe-buffer": "^5.2.0"
+          }
+        },
+        "browserify-zlib": {
+          "version": "0.2.0",
+          "bundled": true,
+          "requires": {
+            "pako": "~1.0.5"
+          }
+        },
+        "buffer": {
+          "version": "5.7.1",
+          "bundled": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "buffer-xor": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "builtin-status-codes": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "call-bind": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.0.2"
+          }
+        },
+        "cipher-base": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "console-browserify": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "constants-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "create-ecdh": {
+          "version": "4.0.4",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "elliptic": "^6.5.3"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "create-hash": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "inherits": "^2.0.1",
+            "md5.js": "^1.3.4",
+            "ripemd160": "^2.0.1",
+            "sha.js": "^2.4.0"
+          }
+        },
+        "create-hmac": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.3",
+            "create-hash": "^1.1.0",
+            "inherits": "^2.0.1",
+            "ripemd160": "^2.0.0",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "crypto-browserify": {
+          "version": "3.12.0",
+          "bundled": true,
+          "requires": {
+            "browserify-cipher": "^1.0.0",
+            "browserify-sign": "^4.0.0",
+            "create-ecdh": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "create-hmac": "^1.1.0",
+            "diffie-hellman": "^5.0.0",
+            "inherits": "^2.0.1",
+            "pbkdf2": "^3.0.3",
+            "public-encrypt": "^4.0.0",
+            "randombytes": "^2.0.0",
+            "randomfill": "^1.0.3"
+          }
+        },
+        "define-properties": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "object-keys": "^1.0.12"
+          }
+        },
+        "des.js": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
+          }
+        },
+        "diffie-hellman": {
+          "version": "5.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "miller-rabin": "^4.0.0",
+            "randombytes": "^2.0.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "domain-browser": {
+          "version": "4.22.0",
+          "bundled": true
+        },
+        "elliptic": {
+          "version": "6.5.4",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.11.9",
+            "brorand": "^1.1.0",
+            "hash.js": "^1.0.0",
+            "hmac-drbg": "^1.0.1",
+            "inherits": "^2.0.4",
+            "minimalistic-assert": "^1.0.1",
+            "minimalistic-crypto-utils": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "es-abstract": {
+          "version": "1.18.3",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.3",
+            "is-string": "^1.0.6",
+            "object-inspect": "^1.10.3",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "es6-object-assign": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "events": {
+          "version": "3.3.0",
+          "bundled": true
+        },
+        "evp_bytestokey": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "md5.js": "^1.3.4",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "foreach": {
+          "version": "2.0.5",
+          "bundled": true
+        },
+        "function-bind": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "get-intrinsic": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "has": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        },
+        "has-bigints": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "hash-base": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "safe-buffer": "^5.2.0"
+          }
+        },
+        "hash.js": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "minimalistic-assert": "^1.0.1"
+          }
+        },
+        "hmac-drbg": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "hash.js": "^1.0.3",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.1"
+          }
+        },
+        "https-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "ieee754": {
+          "version": "1.2.1",
+          "bundled": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true
+        },
+        "is-arguments": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0"
+          }
+        },
+        "is-bigint": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "is-boolean-object": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2"
+          }
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "bundled": true
+        },
+        "is-date-object": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "is-generator-function": {
+          "version": "1.0.9",
+          "bundled": true
+        },
+        "is-nan": {
+          "version": "1.3.2",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "is-negative-zero": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "is-number-object": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "is-regex": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.2"
+          }
+        },
+        "is-string": {
+          "version": "1.0.6",
+          "bundled": true
+        },
+        "is-symbol": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "has-symbols": "^1.0.2"
+          }
+        },
+        "is-typed-array": {
+          "version": "1.1.5",
+          "bundled": true,
+          "requires": {
+            "available-typed-arrays": "^1.0.2",
+            "call-bind": "^1.0.2",
+            "es-abstract": "^1.18.0-next.2",
+            "foreach": "^2.0.5",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "md5.js": {
+          "version": "1.3.5",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "miller-rabin": {
+          "version": "4.0.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "brorand": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "minimalistic-assert": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "minimalistic-crypto-utils": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-inspect": {
+          "version": "1.10.3",
+          "bundled": true
+        },
+        "object-is": {
+          "version": "1.1.5",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "object-keys": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "os-browserify": {
+          "version": "0.3.0",
+          "bundled": true
+        },
+        "pako": {
+          "version": "1.0.11",
+          "bundled": true
+        },
+        "parse-asn1": {
+          "version": "5.1.6",
+          "bundled": true,
+          "requires": {
+            "asn1.js": "^5.2.0",
+            "browserify-aes": "^1.0.0",
+            "evp_bytestokey": "^1.0.0",
+            "pbkdf2": "^3.0.3",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "path-browserify": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "pbkdf2": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "create-hash": "^1.1.2",
+            "create-hmac": "^1.1.4",
+            "ripemd160": "^2.0.1",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "process": {
+          "version": "0.11.10",
+          "bundled": true
+        },
+        "public-encrypt": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "parse-asn1": "^5.0.0",
+            "randombytes": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "querystring": {
+          "version": "0.2.0",
+          "bundled": true
+        },
+        "querystring-es3": {
+          "version": "0.2.1",
+          "bundled": true
+        },
+        "randombytes": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "randomfill": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "randombytes": "^2.0.5",
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "ripemd160": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "bundled": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true
+        },
+        "setimmediate": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "sha.js": {
+          "version": "2.4.11",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "stream-browserify": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "~2.0.4",
+            "readable-stream": "^3.5.0"
+          }
+        },
+        "stream-http": {
+          "version": "3.2.0",
+          "bundled": true,
+          "requires": {
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "xtend": "^4.0.2"
+          }
+        },
+        "string.prototype.trimend": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "string.prototype.trimstart": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        },
+        "timers-browserify": {
+          "version": "2.0.12",
+          "bundled": true,
+          "requires": {
+            "setimmediate": "^1.0.4"
+          }
+        },
+        "tty-browserify": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "unbox-primitive": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has-bigints": "^1.0.1",
+            "has-symbols": "^1.0.2",
+            "which-boxed-primitive": "^1.0.2"
+          }
+        },
+        "url": {
+          "version": "0.11.0",
+          "bundled": true,
+          "requires": {
+            "punycode": "1.3.2",
+            "querystring": "0.2.0"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "1.3.2",
+              "bundled": true
+            }
+          }
+        },
+        "util": {
+          "version": "0.12.4",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "is-arguments": "^1.0.4",
+            "is-generator-function": "^1.0.7",
+            "is-typed-array": "^1.1.3",
+            "safe-buffer": "^5.1.2",
+            "which-typed-array": "^1.1.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "vm-browserify": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "which-boxed-primitive": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "is-bigint": "^1.0.1",
+            "is-boolean-object": "^1.1.0",
+            "is-number-object": "^1.0.4",
+            "is-string": "^1.0.5",
+            "is-symbol": "^1.0.3"
+          }
+        },
+        "which-typed-array": {
+          "version": "1.1.4",
+          "bundled": true,
+          "requires": {
+            "available-typed-arrays": "^1.0.2",
+            "call-bind": "^1.0.0",
+            "es-abstract": "^1.18.0-next.1",
+            "foreach": "^2.0.5",
+            "function-bind": "^1.1.1",
+            "has-symbols": "^1.0.1",
+            "is-typed-array": "^1.1.3"
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "bundled": true
+        }
+      }
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true
+    },
+    "mitt": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
+      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
+      "dev": true
+    },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+    },
+    "node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
+    "node-preload": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
+      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
+      "dev": true,
+      "requires": {
+        "process-on-spawn": "^1.0.0"
+      }
+    },
+    "node-releases": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "dev": true
+    },
+    "node-uuid": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA=="
+    },
+    "nyc": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
+      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "caching-transform": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "decamelize": "^1.2.0",
+        "find-cache-dir": "^3.2.0",
+        "find-up": "^4.1.0",
+        "foreground-child": "^2.0.0",
+        "get-package-type": "^0.1.0",
+        "glob": "^7.1.6",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-hook": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-processinfo": "^2.0.2",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "make-dir": "^3.0.0",
+        "node-preload": "^0.2.1",
+        "p-map": "^3.0.0",
+        "process-on-spawn": "^1.0.0",
+        "resolve-from": "^5.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "spawn-wrap": "^2.0.0",
+        "test-exclude": "^6.0.0",
+        "yargs": "^15.0.2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "oauth-sign": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
+      "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
+      "optional": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
+    "object.hasown": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
+    "p-map": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "package-hash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
+      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.15",
+        "hasha": "^5.0.0",
+        "lodash.flattendeep": "^4.4.0",
+        "release-zalgo": "^1.0.0"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true
+    },
+    "pkg-conf": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
+      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0",
+        "load-json-file": "^5.2.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+          "dev": true
+        }
+      }
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
+    "process-on-spawn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
+      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
+      "dev": true,
+      "requires": {
+        "fromentries": "^1.2.0"
+      }
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "requires": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      }
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "optional": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
+    },
+    "puppeteer": {
+      "version": "19.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz",
+      "integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==",
+      "dev": true,
+      "requires": {
+        "@puppeteer/browsers": "0.5.0",
+        "cosmiconfig": "8.1.3",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "puppeteer-core": "19.11.1"
+      }
+    },
+    "puppeteer-core": {
+      "version": "19.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz",
+      "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==",
+      "dev": true,
+      "requires": {
+        "@puppeteer/browsers": "0.5.0",
+        "chromium-bidi": "0.4.7",
+        "cross-fetch": "3.1.5",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1107588",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "proxy-from-env": "1.1.0",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "ws": "8.13.0"
+      }
+    },
+    "qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
+    },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "optional": true
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    },
+    "raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "requires": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
+    },
+    "readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "regexp.prototype.flags": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
+      }
+    },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
+    "release-zalgo": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
+      "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
+      "dev": true,
+      "requires": {
+        "es6-error": "^4.0.1"
+      }
+    },
+    "request": {
+      "version": "2.40.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
+      "integrity": "sha512-waNoGB4Z7bPn+lgqPk7l7hhze4Vd68jKccnwLeS7vr9GMxz0iWQbYTbBNWzfIk87Urx7V44pu29qjF/omej+Fw==",
+      "requires": {
+        "aws-sign2": "~0.5.0",
+        "forever-agent": "~0.5.0",
+        "form-data": "~0.1.0",
+        "hawk": "1.1.1",
+        "http-signature": "~0.10.0",
+        "json-stringify-safe": "~5.0.0",
+        "mime-types": "~1.0.1",
+        "node-uuid": "~1.4.0",
+        "oauth-sign": "~0.3.0",
+        "qs": "~1.0.0",
+        "stringstream": "~0.0.4",
+        "tough-cookie": ">=0.12.0",
+        "tunnel-agent": "~0.4.0"
+      },
+      "dependencies": {
+        "mime-types": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "integrity": "sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw=="
+        },
+        "qs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
+          "integrity": "sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg=="
+        }
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "optional": true
+    },
+    "resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true
+    },
+    "send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "sntp": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+      "integrity": "sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==",
+      "optional": true,
+      "requires": {
+        "hoek": "0.9.x"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "spawn-wrap": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
+      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
+      "dev": true,
+      "requires": {
+        "foreground-child": "^2.0.0",
+        "is-windows": "^1.0.2",
+        "make-dir": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "which": "^2.0.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+    },
+    "standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
+      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
+      "dev": true,
+      "requires": {
+        "eslint": "^8.41.0",
+        "eslint-config-standard": "17.1.0",
+        "eslint-config-standard-jsx": "^11.0.0",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-n": "^15.7.0",
+        "eslint-plugin-promise": "^6.1.1",
+        "eslint-plugin-react": "^7.32.2",
+        "standard-engine": "^15.0.0",
+        "version-guard": "^1.1.1"
+      }
+    },
+    "standard-engine": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
+      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^8.0.0",
+        "minimist": "^1.2.6",
+        "pkg-conf": "^3.1.0",
+        "xdg-basedir": "^4.0.0"
+      }
+    },
+    "statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "string.prototype.matchall": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
+      "optional": true
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
+    "tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "requires": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true
+    },
+    "toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+    },
+    "tough-cookie": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "optional": true,
+      "requires": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+          "optional": true
+        }
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
+    },
+    "tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "dev": true,
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+          "dev": true
+        }
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
+      "optional": true
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      }
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
+    "unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
+    },
+    "update-browserslist-db": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "dev": true,
+      "requires": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "optional": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+    },
+    "version-guard": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz",
+      "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ==",
+      "dev": true
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "dev": true
+    },
+    "which-typed-array": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "ws": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "dev": true
+    },
+    "xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      }
+    },
+    "yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
+    },
+    "yui": {
+      "version": "3.18.1",
+      "resolved": "https://registry.npmjs.org/yui/-/yui-3.18.1.tgz",
+      "integrity": "sha512-M4/mHnq5uGvpwKEpRBh3SclL70cpDEus9LNGnrK5ZBzp4HOoueY7EkXfgtRBd+9VOQHWlFukXL2udHE53N4Wqw==",
+      "requires": {
+        "request": "~2.40.0"
+      }
+    },
+    "yuidocjs": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/yuidocjs/-/yuidocjs-0.10.2.tgz",
+      "integrity": "sha512-g0ZrXsaCmQL9zsvkgD+RxWDsMNkHne5tK72iWYodro9JQlfKxePcV1dwbGhKMy/fl1XCIW3R3erZudohU+PcEw==",
+      "requires": {
+        "express": "^4.13.1",
+        "graceful-fs": "^4.1.2",
+        "markdown-it": "^4.3.0",
+        "mdn-links": "^0.1.0",
+        "minimatch": "^3.0.2",
+        "rimraf": "^2.4.1",
+        "yui": "^3.18.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/testapp/package.json b/testapp/package.json
new file mode 100644
index 0000000000..2902dffc11
--- /dev/null
+++ b/testapp/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "testapp",
+  "private": true,
+  "scripts": {
+    "setup": "mkdir packages && ln -s ../../ ./packages/roles",
+    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
+    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
+    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
+    "report": "nyc report -t .coverage",
+    "lint": "standard -v ./packages/roles",
+    "lint:fix": "standard --fix -v ./packages/roles"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.17.9",
+    "meteor-node-stubs": "^1.2.1",
+    "yuidocjs": "^0.10.2"
+  },
+  "devDependencies": {
+    "babel-plugin-istanbul": "^6.1.1",
+    "nyc": "^15.1.0",
+    "puppeteer": "^19.4.0",
+    "standard": "^17.1.0"
+  },
+  "babel": {
+    "env": {
+      "COVERAGE": {
+        "plugins": [
+          "istanbul"
+        ]
+      }
+    }
+  },
+  "standard": {
+    "ignore": [
+      "**/.meteor/",
+      "**/examples/",
+      "**/testapp"
+    ]
+  }
+}

From 2f1e3fcee95e5a77aa0a5e886e8f0402c34876c8 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:18:45 +0200
Subject: [PATCH 0385/1140] docs: add contribution guidelines and testing guide

---
 CONTRIBUTING.md | 104 ++++++++++++++++++++++++++++++++++++++++++++++++
 README.md       |   9 ++---
 2 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..de40874feb
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,104 @@
+# Contributing to Meteor Roles
+
+Any contribution to this repository is highly appreciated!
+
+## Setup development env
+
+### Clone project and create a new branch to work on
+
+First, clone this repository and create a new branch to work on.
+Branch names should start with a descriptive suffix of their intended outcome, for example:
+
+- `feature-` for features
+- `tests-` for contributions that improve testing
+- `fix-` for general fixes
+- `build-` for contributions that update the build process
+- `ci-` for contributions that improve/update the ci
+
+```shell
+$ git clone git@github.com:Meteor-Community-Packages/meteor-roles.git
+$ cd meteor-roles
+$ git checkout -b fix-some-issue
+```
+
+### Initialize test app
+
+We use a proxy Meteor application to run our tests and handle coverage etc.
+This app contains several npm scripts to provide the complete toolchain that is required
+for your development and testing needs.
+
+The setup is very easy. Go into the `testapp` directory, install dependencies and link
+the package:
+
+```shell
+$ cd testapp
+$ meteor npm install
+$ meteor npm run setup # this is important for the tools to work!
+```
+
+## Development toolchain
+
+The `testapp` comes with some builtin scripts you can utilize during your development.
+They will also be picked up by our CI during pull requests.
+Therefore, it's a good call for you, that if they pass or fail, the CI will do so, too.
+
+**Note: all tools require the npm `setup` script has been executed at least once!**
+
+### Linter
+
+We use `standard` as our linter. You can run either the linter or use it's autofix feature for
+the most common issues:
+
+```shell
+# in testapp
+$ meteor npm run lint # show only outputs
+$ meteor npm run lint:fix # with fixes + outputs
+```
+
+### Tests
+
+We provide three forms of tests: once, watch, coverage
+
+#### Once
+
+Simply runs the test suite once, without coverage collection:
+
+```shell
+$ meteor npm run test
+```
+
+#### Watch
+
+Runs the test suite in watch mode, good to use during active development, where your changes
+are picked up automatically to re-run the tests:
+
+```shell
+$ meteor npm run test:watch
+```
+
+#### Coverage
+
+Runs the test suite once, including coverage report generation.
+Generates an html and json report output.
+
+```shell
+$ meteor npm run test:coverage
+$ meteor npm run report # summary output in console
+```
+
+If you want to watch the HTML output to find (un)covered lines, open
+the file at `testapp/.coverage/index.html` in your browser.
+
+## Open a pull request
+
+If you open a pull request, please make sure the following requirements are met:
+
+- the `lint` script is passing
+- the `test` script is passing
+- your contribution is on point and solves one issue (not multiple)
+- your commit messages are descriptive and informative
+- complex changes are documented in the code with comments or jsDoc-compatible documentation
+
+Please understand, that there will be a review process and your contribution
+might require changes before being merged. This is entirely to ensure quality and is
+never used as a personal offense.
diff --git a/README.md b/README.md
index fad3b5e797..97424b9d10 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ There are also older versions of this package:
 * [Usage examples](#roles-usage)
 * [Online API docs](#roles-docs)
 * [Example apps](#roles-example-apps)
-* [Running tests](#roles-testing)
+* [Running tests](#roles-contributions-development-and-tests)
 
 <br />
 
@@ -467,8 +467,7 @@ The `examples` directory contains Meteor apps which show off the following featu
 
 
 <a id="roles-testing" name="roles-testing"></a>
-### Tests
+### Contributions, development and tests
 
-To run tests:
-  1. `cd meteor-roles`
-  2. `npm run test`
+Please read our [contribution guidelines](./CONTRIBUTING.md),
+which also describe how to set up and run the linter and tests.

From 0723443c061df6a122c77323d2995145fe4bd102 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:19:07 +0200
Subject: [PATCH 0386/1140] core: update gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 11e07b25f6..497cb990d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,4 @@ smart.lock
 docs/
 node_modules/
 .npm/
-someapp/
+.coverage/

From e3c4353c2ca5490b26bd7e7a4b616f4b9b4b338a Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:19:32 +0200
Subject: [PATCH 0387/1140] core: move package json to testapp

---
 package-lock.json | 2800 ---------------------------------------------
 package.json      |   22 -
 2 files changed, 2822 deletions(-)
 delete mode 100644 package-lock.json
 delete mode 100644 package.json

diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index fac22c16ec..0000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,2800 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA=="
-    },
-    "@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "requires": {
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "@eslint-community/regexpp": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
-      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ=="
-    },
-    "@eslint/eslintrc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
-      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        }
-      }
-    },
-    "@eslint/js": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
-      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
-    },
-    "abbrev": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
-    },
-    "acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "optional": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
-      }
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
-    "array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "asn1": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-      "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
-      "optional": true
-    },
-    "assert-plus": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-      "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
-      "optional": true
-    },
-    "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
-    },
-    "aws-sign2": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-      "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
-      "optional": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "boom": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
-      "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
-      "optional": true,
-      "requires": {
-        "hoek": "0.9.x"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "builtins": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-      "requires": {
-        "semver": "^7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "combined-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-      "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
-      "optional": true,
-      "requires": {
-        "delayed-stream": "0.0.5"
-      }
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "optional": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "dependencies": {
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "cryptiles": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
-      "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=",
-      "optional": true,
-      "requires": {
-        "boom": "0.4.x"
-      }
-    },
-    "ctype": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-      "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
-      "optional": true
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-    },
-    "define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-      "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-      "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
-      "optional": true
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.0",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3"
-          }
-        }
-      }
-    },
-    "es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-    },
-    "escodegen": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-      "requires": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.2.0"
-      }
-    },
-    "eslint": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
-      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
-      "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
-        "@humanwhocodes/config-array": "^0.11.10",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "levn": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "optionator": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-          "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-          "requires": {
-            "@aashutoshrathi/word-wrap": "^1.2.3",
-            "deep-is": "^0.1.3",
-            "fast-levenshtein": "^2.0.6",
-            "levn": "^0.4.1",
-            "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
-        },
-        "type-check": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-          "requires": {
-            "prelude-ls": "^1.2.1"
-          }
-        }
-      }
-    },
-    "eslint-config-standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
-      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q=="
-    },
-    "eslint-config-standard-jsx": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
-      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ=="
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
-      "requires": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
-      "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-es": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
-      "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "dependencies": {
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
-        "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-n": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
-      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
-      "requires": {
-        "builtins": "^5.0.1",
-        "eslint-plugin-es": "^4.1.0",
-        "eslint-utils": "^3.0.0",
-        "ignore": "^5.1.1",
-        "is-core-module": "^2.11.0",
-        "minimatch": "^3.1.2",
-        "resolve": "^1.22.1",
-        "semver": "^7.3.8"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-promise": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
-      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig=="
-    },
-    "eslint-plugin-react": {
-      "version": "7.32.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
-      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.8"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        },
-        "resolve": {
-          "version": "2.0.0-next.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-scope": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA=="
-    },
-    "espree": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
-      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
-      "requires": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      }
-    },
-    "esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
-    },
-    "esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "estraverse": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-      "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q="
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-    },
-    "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-      "requires": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "accepts": {
-          "version": "1.3.8",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-          "requires": {
-            "mime-types": "~2.1.34",
-            "negotiator": "0.6.3"
-          }
-        },
-        "body-parser": {
-          "version": "1.20.1",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-          "requires": {
-            "bytes": "3.1.2",
-            "content-type": "~1.0.4",
-            "debug": "2.6.9",
-            "depd": "2.0.0",
-            "destroy": "1.2.0",
-            "http-errors": "2.0.0",
-            "iconv-lite": "0.4.24",
-            "on-finished": "2.4.1",
-            "qs": "6.11.0",
-            "raw-body": "2.5.1",
-            "type-is": "~1.6.18",
-            "unpipe": "1.0.0"
-          }
-        },
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
-        "content-disposition": {
-          "version": "0.5.4",
-          "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-          "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-          "requires": {
-            "safe-buffer": "5.2.1"
-          }
-        },
-        "cookie": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
-        "destroy": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-          "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-        },
-        "finalhandler": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-          "requires": {
-            "debug": "2.6.9",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "on-finished": "2.4.1",
-            "parseurl": "~1.3.3",
-            "statuses": "2.0.1",
-            "unpipe": "~1.0.0"
-          }
-        },
-        "forwarded": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-          "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-        },
-        "http-errors": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-          "requires": {
-            "depd": "2.0.0",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.2.0",
-            "statuses": "2.0.1",
-            "toidentifier": "1.0.1"
-          }
-        },
-        "ipaddr.js": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-        },
-        "mime-db": {
-          "version": "1.52.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-        },
-        "mime-types": {
-          "version": "2.1.35",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-          "requires": {
-            "mime-db": "1.52.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        },
-        "negotiator": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-        },
-        "on-finished": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "proxy-addr": {
-          "version": "2.0.7",
-          "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-          "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-          "requires": {
-            "forwarded": "0.2.0",
-            "ipaddr.js": "1.9.1"
-          }
-        },
-        "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-          "requires": {
-            "side-channel": "^1.0.4"
-          }
-        },
-        "raw-body": {
-          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-          "requires": {
-            "bytes": "3.1.2",
-            "http-errors": "2.0.0",
-            "iconv-lite": "0.4.24",
-            "unpipe": "1.0.0"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "send": {
-          "version": "0.18.0",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-          "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "2.0.0",
-            "destroy": "1.2.0",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "2.0.0",
-            "mime": "1.6.0",
-            "ms": "2.1.3",
-            "on-finished": "2.4.1",
-            "range-parser": "~1.2.1",
-            "statuses": "2.0.1"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.1.3",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-            }
-          }
-        },
-        "serve-static": {
-          "version": "1.15.0",
-          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-          "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-          "requires": {
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "parseurl": "~1.3.3",
-            "send": "0.18.0"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-        },
-        "toidentifier": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-        }
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-    },
-    "fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.1.1",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
-    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "forever-agent": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-      "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA="
-    },
-    "form-data": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "integrity": "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=",
-      "optional": true,
-      "requires": {
-        "async": "~0.9.0",
-        "combined-stream": "~0.0.4",
-        "mime": "~1.2.11"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-          "optional": true
-        },
-        "mime": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
-          "optional": true
-        }
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
-    "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        }
-      }
-    },
-    "get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-      "requires": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "requires": {
-        "is-glob": "^4.0.3"
-      }
-    },
-    "globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
-    },
-    "globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
-    },
-    "graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
-    },
-    "handlebars": {
-      "version": "4.7.7",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
-      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
-      "requires": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4",
-        "wordwrap": "^1.0.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-    },
-    "has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "hawk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-      "integrity": "sha1-h81JH5tG5OKurKM1QWdmiF0tHtk=",
-      "optional": true,
-      "requires": {
-        "boom": "0.4.x",
-        "cryptiles": "0.2.x",
-        "hoek": "0.9.x",
-        "sntp": "0.2.x"
-      }
-    },
-    "hoek": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
-      "optional": true
-    },
-    "http-signature": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-      "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
-      "optional": true,
-      "requires": {
-        "asn1": "0.1.11",
-        "assert-plus": "^0.1.5",
-        "ctype": "0.5.3"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-      "requires": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3"
-          }
-        }
-      }
-    },
-    "is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3"
-          }
-        }
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-    },
-    "is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "istanbul": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-      "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-        }
-      }
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "jsx-ast-utils": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz",
-      "integrity": "sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==",
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "linkify-it": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-      "requires": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "load-json-file": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="
-        }
-      }
-    },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "requires": {
-        "p-locate": "^5.0.0"
-      }
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "markdown-it": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
-      "integrity": "sha1-PfNz2+pYepp/7z5WMRtokI91xBQ=",
-      "requires": {
-        "argparse": "~1.0.2",
-        "entities": "~1.1.1",
-        "linkify-it": "~1.2.0",
-        "mdurl": "~1.0.0",
-        "uc.micro": "^1.0.0"
-      }
-    },
-    "mdn-links": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/mdn-links/-/mdn-links-0.1.0.tgz",
-      "integrity": "sha1-4kyDuXy0xYhsw58veAcF+/4nOqU="
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "mime-db": {
-      "version": "1.42.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
-      "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="
-    },
-    "mime-types": {
-      "version": "2.1.25",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
-      "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
-      "requires": {
-        "mime-db": "1.42.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
-    },
-    "mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "requires": {
-        "minimist": "^1.2.6"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
-    },
-    "node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "oauth-sign": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-      "integrity": "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=",
-      "optional": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
-      "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-    },
-    "pkg-conf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
-      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
-      "requires": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
-        }
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-    },
-    "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
-      "optional": true
-    },
-    "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "optional": true
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
-    },
-    "request": {
-      "version": "2.40.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
-      "integrity": "sha1-TdZw9pbx5uhC5mtLXoOTAaub62c=",
-      "requires": {
-        "aws-sign2": "~0.5.0",
-        "forever-agent": "~0.5.0",
-        "form-data": "~0.1.0",
-        "hawk": "1.1.1",
-        "http-signature": "~0.10.0",
-        "json-stringify-safe": "~5.0.0",
-        "mime-types": "~1.0.1",
-        "node-uuid": "~1.4.0",
-        "oauth-sign": "~0.3.0",
-        "qs": "~1.0.0",
-        "stringstream": "~0.0.4",
-        "tough-cookie": ">=0.12.0",
-        "tunnel-agent": "~0.4.0"
-      },
-      "dependencies": {
-        "mime-types": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
-          "integrity": "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4="
-        },
-        "qs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
-          "integrity": "sha1-UKk+K1r2aRwxvOpdrnjubqGQN2g="
-        }
-      }
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "optional": true
-    },
-    "resolve": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
-    },
-    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "requires": {
-        "glob": "^7.1.3"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "dependencies": {
-        "object-inspect": {
-          "version": "1.12.2",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-          "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
-        }
-      }
-    },
-    "sntp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-      "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=",
-      "optional": true,
-      "requires": {
-        "hoek": "0.9.x"
-      }
-    },
-    "source-map": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-      "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-      "optional": true,
-      "requires": {
-        "amdefine": ">=0.0.4"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
-      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
-      "requires": {
-        "eslint": "^8.41.0",
-        "eslint-config-standard": "17.1.0",
-        "eslint-config-standard-jsx": "^11.0.0",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^15.7.0",
-        "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-react": "^7.32.2",
-        "standard-engine": "^15.0.0",
-        "version-guard": "^1.1.1"
-      }
-    },
-    "standard-engine": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
-      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
-      "requires": {
-        "get-stdin": "^8.0.0",
-        "minimist": "^1.2.6",
-        "pkg-conf": "^3.1.0",
-        "xdg-basedir": "^4.0.0"
-      }
-    },
-    "string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-      "optional": true
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
-    },
-    "supports-color": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-      "requires": {
-        "has-flag": "^1.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
-    },
-    "tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "optional": true,
-      "requires": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      }
-    },
-    "tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-      "optional": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      }
-    },
-    "uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
-    },
-    "uglify-js": {
-      "version": "3.6.9",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz",
-      "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==",
-      "optional": true,
-      "requires": {
-        "commander": "~2.20.3",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "optional": true
-        }
-      }
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "optional": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "optional": true,
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "version-guard": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz",
-      "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ=="
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA=="
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
-    },
-    "yui": {
-      "version": "3.18.1",
-      "resolved": "https://registry.npmjs.org/yui/-/yui-3.18.1.tgz",
-      "integrity": "sha1-4AAmnsCntvvHQcu4/L0OZRF7AUw=",
-      "requires": {
-        "request": "~2.40.0"
-      }
-    },
-    "yuidocjs": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/yuidocjs/-/yuidocjs-0.10.2.tgz",
-      "integrity": "sha1-M5JJZ85hkCTNcO9pTiZ9L5iPc/Y=",
-      "requires": {
-        "express": "^4.13.1",
-        "graceful-fs": "^4.1.2",
-        "markdown-it": "^4.3.0",
-        "mdn-links": "^0.1.0",
-        "minimatch": "^3.0.2",
-        "rimraf": "^2.4.1",
-        "yui": "^3.18.1"
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
deleted file mode 100644
index c7b64671ef..0000000000
--- a/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "scripts": {
-    "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
-    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
-    "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
-    "lint": "standard -v ./",
-    "lint:fix": "standard --fix -v ./",
-    "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
-  },
-  "dependencies": {
-    "istanbul": "^0.4.5",
-    "standard": "^17.1.0",
-    "yuidocjs": "^0.10.2"
-  },
-  "standard": {
-    "ignore": [
-      "**/.meteor/",
-      "**/packages/",
-      "examples/"
-    ]
-  }
-}

From b8a092503fac659a513abf1a13c52224a86e4641 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:20:08 +0200
Subject: [PATCH 0388/1140] tests: fix tests to enable complete coverage
 #report

---
 package.js            |  6 +++---
 roles/roles_server.js |  7 +++++--
 roles/tests/client.js | 36 +++++++++++++-----------------------
 roles/tests/server.js |  8 ++++++--
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/package.js b/package.js
index 95c2f030fd..e06c2f87d9 100644
--- a/package.js
+++ b/package.js
@@ -38,9 +38,9 @@ Package.onUse(function (api) {
 Package.onTest(function (api) {
   // Add code coverage
   api.use([
-    'lmieulet:meteor-packages-coverage@0.2.0',
+    'lmieulet:meteor-legacy-coverage',
     'lmieulet:meteor-coverage@3.2.0',
-    'meteortesting:mocha'
+    'meteortesting:mocha@2.1.0'
   ])
 
   Npm.depends({
@@ -59,6 +59,6 @@ Package.onTest(function (api) {
     'mongo'
   ], both)
 
-  api.addFiles('roles/tests/client.js', 'client')
   api.addFiles('roles/tests/server.js', 'server')
+  api.addFiles('roles/tests/client.js', 'client')
 })
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 1f31c9662a..78c11c397e 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -261,8 +261,11 @@ Object.assign(Roles, {
     try {
       collection._dropIndex(indexName)
     } catch (e) {
-      if (e.name !== 'MongoError') throw e
-      if (!/index not found/.test(e.err || e.errmsg)) throw e
+      const indexNotFound = /index not found/.test(e.message || e.err || e.errmsg)
+
+      if (!indexNotFound) {
+        throw e
+      }
     }
   },
 
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 67dc0cab8a..84e8808f3f 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -2,19 +2,19 @@
 /* global Roles */
 
 import { Meteor } from 'meteor/meteor'
-import { Tracker } from 'meteor/tracker'
 import { assert } from 'chai'
 
 // To ensure that the files are loaded for coverage
 import '../roles_common'
 
+const safeInsert = (collection, data) => {
+  try {
+    collection.insert(data)
+  } catch (e) {}
+}
+
 describe('roles', function () {
   const roles = ['admin', 'editor', 'user']
-
-  Tracker.autorun(function () {
-    Roles.assignmentSubscription = Meteor.subscribe('_roleAssignments')
-  })
-
   const users = {
     eve: {
       _id: 'eve'
@@ -57,52 +57,42 @@ describe('roles', function () {
     Meteor.user = meteorUserMethod
   })
 
-  beforeEach((done) => {
-    Meteor.roleAssignment.insert({
+  beforeEach(() => {
+    safeInsert(Meteor.roleAssignment, {
       user: users.eve,
       role: { _id: 'admin' },
       inheritedRoles: [{ _id: 'admin' }]
     })
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.eve,
       role: { _id: 'editor' },
       inheritedRoles: [{ _id: 'editor' }]
     })
 
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.bob,
       role: { _id: 'user' },
       inheritedRoles: [{ _id: 'user' }],
       scope: 'group1'
     })
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.bob,
       role: { _id: 'editor' },
       inheritedRoles: [{ _id: 'editor' }],
       scope: 'group2'
     })
 
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.joe,
       role: { _id: 'admin' },
       inheritedRoles: [{ _id: 'admin' }]
     })
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.joe,
       role: { _id: 'editor' },
       inheritedRoles: [{ _id: 'editor' }],
       scope: 'group1'
     })
-
-    const timer = () => {
-      if (!Roles.assignmentSubscription.ready()) {
-        Meteor.setTimeout(timer, 100)
-      } else {
-        done()
-      }
-    }
-
-    timer()
   })
 
   it('can check current users roles via template helper', function () {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 71cab248f2..b3fb854dac 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1418,7 +1418,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
   })
 
-  it('migration without global groups', function () {
+  it('migration without global groups (to v2)', function () {
     assert.isOk(Meteor.roles.insert({ name: 'admin' }))
     assert.isOk(Meteor.roles.insert({ name: 'editor' }))
     assert.isOk(Meteor.roles.insert({ name: 'user' }))
@@ -1487,7 +1487,9 @@ describe('roles', function () {
     })
   })
 
-  it('migration with global groups', function () {
+  it('migration without global groups (to v3)')
+
+  it('migration with global groups (to v2)', function () {
     assert.isOk(Meteor.roles.insert({ name: 'admin' }))
     assert.isOk(Meteor.roles.insert({ name: 'editor' }))
     assert.isOk(Meteor.roles.insert({ name: 'user' }))
@@ -1615,6 +1617,8 @@ describe('roles', function () {
     })
   })
 
+  it('migration with global groups (to v3)')
+
   it('_addUserToRole', function () {
     Roles.createRole('admin')
 

From 81f602c62f99e4b69cd5232e8dfc30a6693164f7 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:40:38 +0200
Subject: [PATCH 0389/1140] core: add .meteorignore for package publishing

---
 .meteorignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .meteorignore

diff --git a/.meteorignore b/.meteorignore
new file mode 100644
index 0000000000..c13dcb8e6a
--- /dev/null
+++ b/.meteorignore
@@ -0,0 +1,3 @@
+/testapp
+/tests
+**/*tests.js
\ No newline at end of file

From 5bce682f070da2ba2fa0abec649c1f87e78a3472 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:41:04 +0200
Subject: [PATCH 0390/1140] ci: add testsuite

---
 .github/workflows/testsuite.yml | 65 +++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 .github/workflows/testsuite.yml

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
new file mode 100644
index 0000000000..2b007de657
--- /dev/null
+++ b/.github/workflows/testsuite.yml
@@ -0,0 +1,65 @@
+# the test suite runs the tests (headless, server+client) for multiple Meteor releases
+name: Test suite
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  lint:
+    name: Javascript standard lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-16-
+
+      - run: cd testapp && npm ci && npm run setup && npm run lint
+
+  test:
+    name: Meteor ${{ matrix.meteorRelease }} package tests
+    needs: [lint]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        meteorRelease:
+          - '--release 2.3'
+          - '--release 2.7.3'
+          - '--release 2.12.0'
+          # Latest version
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Setup meteor
+        uses: meteorengineer/setup-meteor@v1
+        with:
+          meteor-release: ${{ matrix.meteorRelease }}
+
+      - name: cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-16-
+
+      - run: cd testapp && npm run ci && npm run setup && npm run test

From 28c5493849e3770358b5e19ffc78f29c0cbe00bf Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:46:34 +0200
Subject: [PATCH 0391/1140] core: ignore examples folder on publishing

---
 .meteorignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.meteorignore b/.meteorignore
index c13dcb8e6a..e5abd9bb74 100644
--- a/.meteorignore
+++ b/.meteorignore
@@ -1,3 +1,4 @@
 /testapp
 /tests
-**/*tests.js
\ No newline at end of file
+**/*tests.js
+/examples

From 791aa80fa1bf900c2fc067ea30da618a1a219a98 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:48:04 +0200
Subject: [PATCH 0392/1140] ci: fix matrix args

---
 .github/workflows/testsuite.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 2b007de657..a192827a17 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -30,15 +30,15 @@ jobs:
       - run: cd testapp && npm ci && npm run setup && npm run lint
 
   test:
-    name: Meteor ${{ matrix.meteorRelease }} package tests
+    name: Meteor package tests
     needs: [lint]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         meteorRelease:
-          - '--release 2.3'
-          - '--release 2.7.3'
-          - '--release 2.12.0'
+          - '2.3'
+          - '2.7.3'
+          - '2.12.0'
           # Latest version
     steps:
       - name: Checkout code
@@ -49,7 +49,7 @@ jobs:
         with:
           node-version: 16
 
-      - name: Setup meteor
+      - name: Setup meteor ${{ matrix.meteorRelease }}
         uses: meteorengineer/setup-meteor@v1
         with:
           meteor-release: ${{ matrix.meteorRelease }}

From 004dbe09628145257a7f3ea9744c0811aa8c0f15 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:50:54 +0200
Subject: [PATCH 0393/1140] build(core): move chai dependency to package.json

---
 package.js                |  4 ---
 testapp/package-lock.json | 65 ++++++++++++++++++++++++++++++++++++++-
 testapp/package.json      |  1 +
 3 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/package.js b/package.js
index e06c2f87d9..7e44f82a5b 100644
--- a/package.js
+++ b/package.js
@@ -43,10 +43,6 @@ Package.onTest(function (api) {
     'meteortesting:mocha@2.1.0'
   ])
 
-  Npm.depends({
-    chai: '4.2.0'
-  })
-
   api.versionsFrom('2.3')
 
   const both = ['client', 'server']
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 375467bbb8..4d42b56eef 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "someapp",
+  "name": "testapp",
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
@@ -741,6 +741,12 @@
       "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
       "optional": true
     },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
     "available-typed-arrays": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
@@ -962,6 +968,21 @@
       "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
       "dev": true
     },
+    "chai": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^4.1.2",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -973,6 +994,12 @@
         "supports-color": "^5.3.0"
       }
     },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true
+    },
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -1159,6 +1186,15 @@
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true
     },
+    "deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -2194,6 +2230,12 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true
+    },
     "get-intrinsic": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
@@ -2935,6 +2977,15 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "loupe": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.0"
+      }
+    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -4129,6 +4180,12 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
+    "pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true
+    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -4937,6 +4994,12 @@
       "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
       "optional": true
     },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
     "type-fest": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
diff --git a/testapp/package.json b/testapp/package.json
index 2902dffc11..e70b46da6a 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -17,6 +17,7 @@
   },
   "devDependencies": {
     "babel-plugin-istanbul": "^6.1.1",
+    "chai": "^4.3.7",
     "nyc": "^15.1.0",
     "puppeteer": "^19.4.0",
     "standard": "^17.1.0"

From e4e7c12dfac09ec4b9bae44f87c05840c7695d7a Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:55:02 +0200
Subject: [PATCH 0394/1140] fix(tests): use correct path in testapp setup
 script

---
 testapp/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testapp/package.json b/testapp/package.json
index e70b46da6a..e26525cab6 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -2,7 +2,7 @@
   "name": "testapp",
   "private": true,
   "scripts": {
-    "setup": "mkdir packages && ln -s ../../ ./packages/roles",
+    "setup": "mkdir packages && ln -s ../ ./packages/roles",
     "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
     "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
     "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",

From 65bf1d84d62f309cfde53b4c0757134950a693bf Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:08:23 +0200
Subject: [PATCH 0395/1140] fix(tests/ci): update paths and lint args to run
 linter

---
 package.js           |  2 +-
 testapp/package.json | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.js b/package.js
index 7e44f82a5b..632bc37463 100644
--- a/package.js
+++ b/package.js
@@ -1,4 +1,4 @@
-/* global Package, Npm */
+/* eslint-env meteor */
 
 Package.describe({
   summary: 'Authorization package for Meteor',
diff --git a/testapp/package.json b/testapp/package.json
index e26525cab6..f894d6e5ad 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -2,13 +2,13 @@
   "name": "testapp",
   "private": true,
   "scripts": {
-    "setup": "mkdir packages && ln -s ../ ./packages/roles",
-    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
-    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
-    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
+    "setup": "mkdir -p packages && ln -sfn ../../ ./packages/meteor-roles",
+    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
     "report": "nyc report -t .coverage",
-    "lint": "standard -v ./packages/roles",
-    "lint:fix": "standard --fix -v ./packages/roles"
+    "lint": "standard ../",
+    "lint:fix": "standard --fix ../"
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",

From aea1cdedfea1448f72487e223161bbdcbf425d3c Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:10:55 +0200
Subject: [PATCH 0396/1140] ci: fix tests install

---
 .github/workflows/testsuite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index a192827a17..b7db8de65f 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -62,4 +62,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-16-
 
-      - run: cd testapp && npm run ci && npm run setup && npm run test
+      - run: cd testapp && npm ci && npm run setup && npm run test

From c204818ac133aa1e5c22d0b96a566242675e2c87 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:14:30 +0200
Subject: [PATCH 0397/1140] ci: fix meteor version to 2.12

---
 .github/workflows/testsuite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index b7db8de65f..54a3d3794e 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -38,7 +38,7 @@ jobs:
         meteorRelease:
           - '2.3'
           - '2.7.3'
-          - '2.12.0'
+          - '2.12'
           # Latest version
     steps:
       - name: Checkout code

From 64519897c73d115b9d632c59d80aa63f1cd28aa5 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 08:56:03 +0200
Subject: [PATCH 0398/1140] build(core): add lint script to package.json

---
 package.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package.json b/package.json
index e8948dbec7..83a5b2201e 100644
--- a/package.json
+++ b/package.json
@@ -3,11 +3,18 @@
     "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
     "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
     "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
+    "lint": "standard -v ./",
     "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
   },
   "dependencies": {
     "istanbul": "^0.4.5",
     "standard": "^17.1.0",
     "yuidocjs": "^0.10.2"
+  },
+  "standard": {
+    "ignore": [
+      "**/.meteor/",
+      "**/packages/"
+    ]
   }
 }

From 4c853eb884cd08fa05b284666aebb5cf1713e14b Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 09:08:45 +0200
Subject: [PATCH 0399/1140] fix: standard lint fixed

---
 package.js                |   6 +-
 package.json              |   4 +-
 roles/client/debug.js     |   2 +-
 roles/client/uiHelpers.js |   6 +-
 roles/roles_common.js     |  77 +++++++-------------
 roles/roles_server.js     |  20 +++---
 roles/tests/client.js     |  26 ++++---
 roles/tests/server.js     | 144 ++++++++++++++++++--------------------
 8 files changed, 126 insertions(+), 159 deletions(-)

diff --git a/package.js b/package.js
index 3e61a7f985..e15b6b1269 100644
--- a/package.js
+++ b/package.js
@@ -10,7 +10,7 @@ Package.describe({
 Package.onUse(function (api) {
   api.versionsFrom(['1.12', '2.3', '2.8.0'])
 
-  var both = ['client', 'server']
+  const both = ['client', 'server']
 
   api.use([
     'ecmascript',
@@ -45,12 +45,12 @@ Package.onTest(function (api) {
   ])
 
   Npm.depends({
-    'chai': '4.2.0'
+    chai: '4.2.0'
   })
 
   api.versionsFrom('2.3')
 
-  var both = ['client', 'server']
+  const both = ['client', 'server']
 
   // `accounts-password` is included so `Meteor.users` exists
 
diff --git a/package.json b/package.json
index 83a5b2201e..c7b64671ef 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
     "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
     "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
     "lint": "standard -v ./",
+    "lint:fix": "standard --fix -v ./",
     "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
   },
   "dependencies": {
@@ -14,7 +15,8 @@
   "standard": {
     "ignore": [
       "**/.meteor/",
-      "**/packages/"
+      "**/packages/",
+      "examples/"
     ]
   }
 }
diff --git a/roles/client/debug.js b/roles/client/debug.js
index 0cb1f431cb..4e2ebd33db 100644
--- a/roles/client/debug.js
+++ b/roles/client/debug.js
@@ -13,7 +13,7 @@ Roles.debug = false
 
 try {
   if (localStorage) {
-    var temp = localStorage.getItem('Roles.debug')
+    const temp = localStorage.getItem('Roles.debug')
 
     if (typeof temp !== 'undefined') {
       Roles.debug = !!temp
diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index 7ee2991c21..e73040a817 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -42,9 +42,9 @@ Roles._uiHelpers = {
    * @for UIHelpers
    */
   isInRole: function (role, scope) {
-    var user = Meteor.user()
-    var comma = (role || '').indexOf(',')
-    var roles
+    const user = Meteor.user()
+    const comma = (role || '').indexOf(',')
+    let roles
 
     if (!user) return false
     if (!Match.test(role, String)) return false
diff --git a/roles/roles_common.js b/roles/roles_common.js
index 629bdea78e..f05d62067d 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -39,7 +39,7 @@ if (typeof Roles === 'undefined') {
   Roles = {} // eslint-disable-line no-global-assign
 }
 
-var getGroupsForUserDeprecationWarning = false
+let getGroupsForUserDeprecationWarning = false
 
 Object.assign(Roles, {
 
@@ -69,7 +69,7 @@ Object.assign(Roles, {
       unlessExists: false
     }, options)
 
-    var result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
+    const result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
 
     if (!result.insertedId) {
       if (options.unlessExists) return null
@@ -89,8 +89,8 @@ Object.assign(Roles, {
    * @static
    */
   deleteRole: function (roleName) {
-    var roles
-    var inheritedRoles
+    let roles
+    let inheritedRoles
 
     Roles._checkRoleName(roleName)
 
@@ -138,15 +138,14 @@ Object.assign(Roles, {
    * @static
    */
   renameRole: function (oldName, newName) {
-    var role
-    var count
+    let count
 
     Roles._checkRoleName(oldName)
     Roles._checkRoleName(newName)
 
     if (oldName === newName) return
 
-    role = Meteor.roles.findOne({ _id: oldName })
+    const role = Meteor.roles.findOne({ _id: oldName })
 
     if (!role) {
       throw new Error('Role \'' + oldName + '\' does not exist.')
@@ -217,14 +216,11 @@ Object.assign(Roles, {
    * @static
    */
   _addRoleToParent: function (roleName, parentName) {
-    var role
-    var count
-
     Roles._checkRoleName(roleName)
     Roles._checkRoleName(parentName)
 
     // query to get role's children
-    role = Meteor.roles.findOne({ _id: roleName })
+    const role = Meteor.roles.findOne({ _id: roleName })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
@@ -235,7 +231,7 @@ Object.assign(Roles, {
       throw new Error('Roles \'' + roleName + '\' and \'' + parentName + '\' would form a cycle.')
     }
 
-    count = Meteor.roles.update({
+    const count = Meteor.roles.update({
       _id: parentName,
       'children._id': {
         $ne: role._id
@@ -294,7 +290,7 @@ Object.assign(Roles, {
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    let role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
+    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
@@ -352,7 +348,7 @@ Object.assign(Roles, {
    * @static
    */
   addUsersToRoles: function (users, roles, options) {
-    var id
+    let id
 
     if (!users) throw new Error('Missing \'users\' param.')
     if (!roles) throw new Error('Missing \'roles\' param.')
@@ -405,7 +401,7 @@ Object.assign(Roles, {
    * @static
    */
   setUserRoles: function (users, roles, options) {
-    var id
+    let id
 
     if (!users) throw new Error('Missing \'users\' param.')
     if (!roles) throw new Error('Missing \'roles\' param.')
@@ -510,13 +506,11 @@ Object.assign(Roles, {
    * @static
    */
   _getParentRoleNames: function (role) {
-    var parentRoles
-
     if (!role) {
       return []
     }
 
-    parentRoles = new Set([role._id])
+    const parentRoles = new Set([role._id])
 
     parentRoles.forEach(roleName => {
       Meteor.roles.find({ 'children._id': roleName }).fetch().forEach(parentRole => {
@@ -662,9 +656,7 @@ Object.assign(Roles, {
    * @static
    */
   userIsInRole: function (user, roles, options) {
-    var id
-    var selector
-
+    let id
     options = Roles._normalizeOptions(options)
 
     // ensure array to simplify code
@@ -689,9 +681,7 @@ Object.assign(Roles, {
     if (!id) return false
     if (typeof id !== 'string') return false
 
-    selector = {
-      'user._id': id
-    }
+    const selector = { 'user._id': id }
 
     if (!options.anyScope) {
       selector.scope = { $in: [options.scope, null] }
@@ -723,10 +713,7 @@ Object.assign(Roles, {
    * @static
    */
   getRolesForUser: function (user, options) {
-    var id
-    var selector
-    var filter
-    var roles
+    let id
 
     options = Roles._normalizeOptions(options)
 
@@ -747,13 +734,8 @@ Object.assign(Roles, {
 
     if (!id) return []
 
-    selector = {
-      'user._id': id
-    }
-
-    filter = {
-      fields: { 'inheritedRoles._id': 1 }
-    }
+    const selector = { 'user._id': id }
+    const filter = { fields: { 'inheritedRoles._id': 1 } }
 
     if (!options.anyScope) {
       selector.scope = { $in: [options.scope] }
@@ -772,7 +754,7 @@ Object.assign(Roles, {
       delete filter.fields
     }
 
-    roles = Meteor.roleAssignment.find(selector, filter).fetch()
+    const roles = Meteor.roleAssignment.find(selector, filter).fetch()
 
     if (options.fullObjects) {
       return roles
@@ -828,9 +810,7 @@ Object.assign(Roles, {
    * @static
    */
   getUsersInRole: function (roles, options, queryOptions) {
-    var ids
-
-    ids = Roles.getUserAssignmentsForRole(roles, options).fetch().map(a => a.user._id)
+    const ids = Roles.getUserAssignmentsForRole(roles, options).fetch().map(a => a.user._id)
 
     return Meteor.users.find({ _id: { $in: ids } }, ((options && options.queryOptions) || queryOptions) || {})
   },
@@ -886,8 +866,6 @@ Object.assign(Roles, {
    * @static
    */
   _getUsersInRoleCursor: function (roles, options, filter) {
-    var selector
-
     options = Roles._normalizeOptions(options)
 
     options = Object.assign({
@@ -904,9 +882,7 @@ Object.assign(Roles, {
       fields: { 'user._id': 1 }
     }, filter)
 
-    selector = {
-      'inheritedRoles._id': { $in: roles }
-    }
+    const selector = { 'inheritedRoles._id': { $in: roles } }
 
     if (!options.anyScope) {
       selector.scope = { $in: [options.scope] }
@@ -946,8 +922,7 @@ Object.assign(Roles, {
    * @static
    */
   getScopesForUser: function (user, roles) {
-    var scopes
-    var id
+    let id
 
     if (roles && !Array.isArray(roles)) roles = [roles]
 
@@ -968,7 +943,7 @@ Object.assign(Roles, {
       selector['inheritedRoles._id'] = { $in: roles }
     }
 
-    scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
+    const scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
 
     return [...new Set(scopes)]
   },
@@ -984,7 +959,7 @@ Object.assign(Roles, {
    * @static
    */
   renameScope: function (oldName, newName) {
-    var count
+    let count
 
     Roles._checkScopeName(oldName)
     Roles._checkScopeName(newName)
@@ -1053,15 +1028,15 @@ Object.assign(Roles, {
     Roles._checkRoleName(parentRoleName)
     Roles._checkRoleName(childRoleName)
 
-    var rolesToCheck = [parentRoleName]
+    let rolesToCheck = [parentRoleName]
     while (rolesToCheck.length !== 0) {
-      var roleName = rolesToCheck.pop()
+      const roleName = rolesToCheck.pop()
 
       if (roleName === childRoleName) {
         return true
       }
 
-      var role = Meteor.roles.findOne({ _id: roleName })
+      const role = Meteor.roles.findOne({ _id: roleName })
 
       // This should not happen, but this is a problem to address at some other time.
       if (!role) continue
diff --git a/roles/roles_server.js b/roles/roles_server.js
index ec10482085..a432e6ccd9 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -22,23 +22,25 @@ if (Meteor.roles.createIndexAsync) {
 ].forEach(index => indexFnAssignment(index))
 indexFnRoles({ 'children._id': 1 })
 
-
 /*
  * Publish logged-in user's roles so client-side checks can work.
  *
  * Use a named publish function so clients can check `ready()` state.
  */
-Meteor.publish("_roles", function () {
-  var loggedInUserId = this.userId;
-  var fields = { roles: 1 };
+Meteor.publish('_roles', function () {
+  const loggedInUserId = this.userId
+  const fields = { roles: 1 }
 
   if (!loggedInUserId) {
     this.ready();
     return;
   }
 
-  return Meteor.users.find({ _id: loggedInUserId }, { fields: fields });
-});
+  return Meteor.users.find(
+    { _id: loggedInUserId },
+    { fields }
+  )
+})
 
 Object.assign(Roles, {
   /**
@@ -141,7 +143,7 @@ Object.assign(Roles, {
    * @static
    */
   _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
-    var roles = [];
+    const roles = []
     if (Array.isArray(oldRoles)) {
       oldRoles.forEach(function (role, index) {
         if (!(typeof role === "string"))
@@ -187,7 +189,7 @@ Object.assign(Roles, {
    * @static
    */
   _convertToOldField: function (newRoles, usingGroups) {
-    var roles;
+    let roles
 
     if (usingGroups) {
       roles = {};
@@ -213,7 +215,7 @@ Object.assign(Roles, {
           );
 
         // escape
-        var scope = userRole.scope.replace(/\./g, "_");
+        const scope = userRole.scope.replace(/\./g, '_')
 
         if (scope[0] === "$")
           throw new Error("Group name '" + scope + "' start with $.");
diff --git a/roles/tests/client.js b/roles/tests/client.js
index daaab19a39..67dc0cab8a 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -9,33 +9,32 @@ import { assert } from 'chai'
 import '../roles_common'
 
 describe('roles', function () {
-  var users
-  var roles = ['admin', 'editor', 'user']
+  const roles = ['admin', 'editor', 'user']
 
   Tracker.autorun(function () {
     Roles.assignmentSubscription = Meteor.subscribe('_roleAssignments')
   })
 
-  users = {
-    'eve': {
+  const users = {
+    eve: {
       _id: 'eve'
     },
-    'bob': {
+    bob: {
       _id: 'bob'
     },
-    'joe': {
+    joe: {
       _id: 'joe'
     }
   }
 
   function testUser (username, expectedRoles, scope) {
-    var user = users[username]
+    const user = users[username]
 
     // test using user object rather than userId to avoid mocking
     roles.forEach(function (role) {
-      var expected = expectedRoles.includes(role)
-      var msg = username + ' expected to have \'' + role + '\' permission but does not'
-      var nmsg = username + ' had un-expected permission ' + role
+      const expected = expectedRoles.includes(role)
+      const msg = username + ' expected to have \'' + role + '\' permission but does not'
+      const nmsg = username + ' had un-expected permission ' + role
 
       if (expected) {
         assert.isTrue(Roles.userIsInRole(user, role, scope), msg)
@@ -107,9 +106,8 @@ describe('roles', function () {
   })
 
   it('can check current users roles via template helper', function () {
-    var isInRole
-    var expected
-    var actual
+    let expected
+    let actual
 
     if (!Roles._handlebarsHelpers) {
       // probably running package tests outside of a Meteor app.
@@ -117,7 +115,7 @@ describe('roles', function () {
       return
     }
 
-    isInRole = Roles._handlebarsHelpers.isInRole
+    const isInRole = Roles._handlebarsHelpers.isInRole
     assert.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
 
     expected = true
diff --git a/roles/tests/server.js b/roles/tests/server.js
index c416ba2eb7..71cab248f2 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -15,12 +15,14 @@ Meteor.roleAssignment.allow({
   remove () { return true }
 })
 
+const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)
+
 describe('roles', function () {
-  var users = {}
-  var roles = ['admin', 'editor', 'user']
+  let users = {}
+  const roles = ['admin', 'editor', 'user']
 
   Meteor.publish('_roleAssignments', function () {
-    var loggedInUserId = this.userId
+    const loggedInUserId = this.userId
 
     if (!loggedInUserId) {
       this.ready()
@@ -31,12 +33,12 @@ describe('roles', function () {
   })
 
   function addUser (name) {
-    return Meteor.users.insert({ 'username': name })
+    return Meteor.users.insert({ username: name })
   }
 
   function testUser (username, expectedRoles, scope) {
-    var userId = users[username]
-    var userObj = Meteor.users.findOne({ _id: userId })
+    const userId = users[username]
+    const userObj = Meteor.users.findOne({ _id: userId })
 
     // check using user ids (makes db calls)
     _innerTest(userId, username, expectedRoles, scope)
@@ -48,9 +50,9 @@ describe('roles', function () {
   function _innerTest (userParam, username, expectedRoles, scope) {
     // test that user has only the roles expected and no others
     roles.forEach(function (role) {
-      var expected = expectedRoles.includes(role)
-      var msg = username + ' expected to have \'' + role + '\' role but does not'
-      var nmsg = username + ' had the following un-expected role: ' + role
+      const expected = expectedRoles.includes(role)
+      const msg = username + ' expected to have \'' + role + '\' role but does not'
+      const nmsg = username + ' had the following un-expected role: ' + role
 
       if (expected) {
         assert.isTrue(Roles.userIsInRole(userParam, role, scope), msg)
@@ -66,18 +68,18 @@ describe('roles', function () {
     Meteor.users.remove({})
 
     users = {
-      'eve': addUser('eve'),
-      'bob': addUser('bob'),
-      'joe': addUser('joe')
+      eve: addUser('eve'),
+      bob: addUser('bob'),
+      joe: addUser('joe')
     }
   })
 
   it('can create and delete roles', function () {
-    var role1Id = Roles.createRole('test1')
+    const role1Id = Roles.createRole('test1')
     assert.equal(Meteor.roles.findOne()._id, 'test1')
     assert.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
 
-    var role2Id = Roles.createRole('test2')
+    const role2Id = Roles.createRole('test2')
     assert.equal(Meteor.roles.findOne({ _id: 'test2' })._id, 'test2')
     assert.equal(Meteor.roles.findOne(role2Id)._id, 'test2')
 
@@ -275,13 +277,11 @@ describe('roles', function () {
   })
 
   it('can check user against several roles at once', function () {
-    var user
-
     Roles.createRole('admin')
     Roles.createRole('user')
 
     Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    user = Meteor.users.findOne({ _id: users.eve })
+    const user = Meteor.users.findOne({ _id: users.eve })
 
     // we can check the non-existing role
     assert.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
@@ -365,8 +365,8 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
-    var bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
 
     Roles.addUsersToRoles(eve, ['admin', 'user'])
 
@@ -500,8 +500,8 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
-    var bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
 
     // remove user role - one user
     Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
@@ -637,8 +637,8 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
-    var bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
 
     Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
     testUser('eve', ['editor', 'user'])
@@ -672,9 +672,9 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
-    var bob = Meteor.users.findOne({ _id: users.bob })
-    var joe = Meteor.users.findOne({ _id: users.joe })
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
+    const joe = Meteor.users.findOne({ _id: users.joe })
 
     Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
     Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2')
@@ -732,7 +732,7 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
+    const eve = Meteor.users.findOne({ _id: users.eve })
 
     Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE)
     testUser('eve', ['admin'], 'scope1')
@@ -747,7 +747,7 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('editor')
 
-    var eve = Meteor.users.findOne({ _id: users.eve })
+    const eve = Meteor.users.findOne({ _id: users.eve })
 
     assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
 
@@ -776,8 +776,8 @@ describe('roles', function () {
     })
 
     // compare roles, sorted alphabetically
-    var expected = roles
-    var actual = Roles.getAllRoles().fetch().map(r => r._id)
+    const expected = roles
+    const actual = Roles.getAllRoles().fetch().map(r => r._id)
 
     assert.sameMembers(actual, expected)
 
@@ -799,8 +799,8 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
+    let userObj
 
     // by userId
     assert.sameMembers(Roles.getRolesForUser(userId), [])
@@ -827,7 +827,7 @@ describe('roles', function () {
       role: { _id: 'user' },
       scope: null,
       user: { _id: userId },
-      inheritedRoles: [{ '_id': 'user' }]
+      inheritedRoles: [{ _id: 'user' }]
     }])
   })
 
@@ -835,8 +835,8 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
+    let userObj
 
     // by userId
     assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
@@ -979,7 +979,7 @@ describe('roles', function () {
     Roles.createRole('admin')
     Roles.createRole('user')
 
-    var userId = users.eve
+    const userId = users.eve
 
     // add roles
     Roles.addUsersToRoles(userId, ['user'], 'scope1')
@@ -1011,8 +1011,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
     Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
@@ -1022,7 +1021,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
     assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
   })
@@ -1030,8 +1029,8 @@ describe('roles', function () {
   it('getRolesForUser should not return null entries if user has no roles for scope', function () {
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
+    let userObj
 
     // by userId
     assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
@@ -1057,18 +1056,14 @@ describe('roles', function () {
   it('getRolesForUser should not fail during a call of addUsersToRoles', function () {
     Roles.createRole('editor')
 
-    var userId = users.eve
-
-    const promises = [
-    ];
-
+    const userId = users.eve
+    const promises = []
     const interval = setInterval(() => {
-      promises.push(Promise.resolve().then(() => { Roles.getRolesForUser(userId); }));
-    }, 0);
-    
-    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-    clearInterval(interval);
+      promises.push(Promise.resolve().then(() => { Roles.getRolesForUser(userId) }))
+    }, 0)
 
+    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+    clearInterval(interval)
 
     return Promise.all(promises)
   })
@@ -1086,8 +1081,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
     Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
@@ -1096,7 +1090,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
   })
 
@@ -1105,8 +1099,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
     Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
@@ -1117,7 +1110,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
@@ -1127,8 +1120,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor', 'user'])
 
@@ -1139,7 +1131,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), [])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj), [])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), [])
     assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), [])
@@ -1147,8 +1139,7 @@ describe('roles', function () {
   })
 
   it('can get all groups for user by role array', function () {
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.createRole('user')
     Roles.createRole('editor')
@@ -1170,7 +1161,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
 
     // by user object, one role
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['group2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
@@ -1186,8 +1177,7 @@ describe('roles', function () {
     Roles.createRole('user')
     Roles.createRole('editor')
 
-    var userId = users.eve
-    var userObj
+    const userId = users.eve
 
     Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
     Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
@@ -1203,7 +1193,7 @@ describe('roles', function () {
     assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
 
     // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = Meteor.users.findOne({ _id: userId })
     assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
     assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
@@ -1221,8 +1211,8 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
     Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
 
-    var expected = [users.eve, users.joe]
-    var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+    const expected = [users.eve, users.joe]
+    const actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
 
     assert.sameMembers(actual, expected)
   })
@@ -1234,8 +1224,8 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
     Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-    var expected = [users.eve, users.joe]
-    var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+    let expected = [users.eve, users.joe]
+    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
 
     assert.sameMembers(actual, expected)
 
@@ -1258,8 +1248,8 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
     Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-    var expected = [users.eve]
-    var actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+    let expected = [users.eve]
+    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
 
     assert.sameMembers(actual, expected)
 
@@ -1285,8 +1275,8 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
     Roles.addUsersToRoles([users.bob], ['admin'], 'scope1')
 
-    var expected = [users.eve]
-    var actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+    let expected = [users.eve]
+    let actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
     assert.sameMembers(actual, expected)
 
     expected = [users.eve, users.bob]
@@ -1305,11 +1295,11 @@ describe('roles', function () {
     Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
     Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
 
-    var results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
+    const results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
 
     assert.equal(1, results.length)
-    assert.isTrue(results[0].hasOwnProperty('_id'))
-    assert.isFalse(results[0].hasOwnProperty('username'))
+    assert.isTrue(hasProp(results[0], '_id'))
+    assert.isFalse(hasProp(results[0], 'username'))
   })
 
   it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {

From 527307c5cb92370329f51ac89f0c2a13e7ff99e4 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:14:27 +0200
Subject: [PATCH 0400/1140] tests: added complete working test and dev
 infrastructure project

---
 testapp/.coverage.json              |    6 +
 testapp/.gitignore                  |    4 +
 testapp/.meteor/.finished-upgraders |   19 +
 testapp/.meteor/.gitignore          |    1 +
 testapp/.meteor/.id                 |    7 +
 testapp/.meteor/packages            |   18 +
 testapp/.meteor/platforms           |    2 +
 testapp/.meteor/release             |    1 +
 testapp/.meteor/versions            |   62 +
 testapp/package-lock.json           | 5317 +++++++++++++++++++++++++++
 testapp/package.json                |   40 +
 11 files changed, 5477 insertions(+)
 create mode 100644 testapp/.coverage.json
 create mode 100644 testapp/.gitignore
 create mode 100644 testapp/.meteor/.finished-upgraders
 create mode 100644 testapp/.meteor/.gitignore
 create mode 100644 testapp/.meteor/.id
 create mode 100644 testapp/.meteor/packages
 create mode 100644 testapp/.meteor/platforms
 create mode 100644 testapp/.meteor/release
 create mode 100644 testapp/.meteor/versions
 create mode 100644 testapp/package-lock.json
 create mode 100644 testapp/package.json

diff --git a/testapp/.coverage.json b/testapp/.coverage.json
new file mode 100644
index 0000000000..918fc8889e
--- /dev/null
+++ b/testapp/.coverage.json
@@ -0,0 +1,6 @@
+{
+  "include": [
+    "**/packages/roles/**/*",
+    "**/packages/*alanning_roles.js"
+  ]
+}
diff --git a/testapp/.gitignore b/testapp/.gitignore
new file mode 100644
index 0000000000..d1f89f83a8
--- /dev/null
+++ b/testapp/.gitignore
@@ -0,0 +1,4 @@
+node_modules/
+.npm/
+.coverage/
+packages/
diff --git a/testapp/.meteor/.finished-upgraders b/testapp/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..c07b6ff75a
--- /dev/null
+++ b/testapp/.meteor/.finished-upgraders
@@ -0,0 +1,19 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/testapp/.meteor/.gitignore b/testapp/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/testapp/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/testapp/.meteor/.id b/testapp/.meteor/.id
new file mode 100644
index 0000000000..404dd7470a
--- /dev/null
+++ b/testapp/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+uffl2v6ap9ck.g2922xjmnljm
diff --git a/testapp/.meteor/packages b/testapp/.meteor/packages
new file mode 100644
index 0000000000..63f32aa28d
--- /dev/null
+++ b/testapp/.meteor/packages
@@ -0,0 +1,18 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor@1.11.2                  # Shared foundation for all Meteor packages
+static-html@1.3.2             # Define static page content in .html files
+standard-minifier-css@1.9.2   # CSS minifier run for production mode
+standard-minifier-js@2.8.1    # JS minifier run for production mode
+es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
+ecmascript@0.16.7              # Enable ECMAScript2015+ syntax in app code
+typescript@4.9.4              # Enable TypeScript syntax in .ts and .tsx modules
+shell-server@0.5.0            # Server-side component of the `meteor shell` command
+webapp@1.13.5                  # Serves a Meteor app over HTTP
+server-render@0.4.1           # Support for server-side rendering
+hot-module-replacement@0.5.3  # Rebuilds the client if there is a change on the client without restarting the server
+
diff --git a/testapp/.meteor/platforms b/testapp/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/testapp/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/testapp/.meteor/release b/testapp/.meteor/release
new file mode 100644
index 0000000000..e8cfc7ec4c
--- /dev/null
+++ b/testapp/.meteor/release
@@ -0,0 +1 @@
+METEOR@2.12
diff --git a/testapp/.meteor/versions b/testapp/.meteor/versions
new file mode 100644
index 0000000000..24b5002129
--- /dev/null
+++ b/testapp/.meteor/versions
@@ -0,0 +1,62 @@
+autoupdate@1.8.0
+babel-compiler@7.10.4
+babel-runtime@1.5.1
+base64@1.0.12
+blaze-tools@1.1.3
+boilerplate-generator@1.7.1
+caching-compiler@1.2.2
+caching-html-compiler@1.2.1
+callback-hook@1.5.1
+check@1.3.2
+ddp@1.4.1
+ddp-client@2.6.1
+ddp-common@1.4.0
+ddp-server@2.6.1
+diff-sequence@1.1.2
+dynamic-import@0.7.3
+ecmascript@0.16.7
+ecmascript-runtime@0.8.1
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
+ejson@1.1.3
+es5-shim@4.8.0
+fetch@0.1.3
+hot-code-push@1.0.4
+hot-module-replacement@0.5.3
+html-tools@1.1.3
+htmljs@1.1.1
+http@1.0.10
+id-map@1.1.1
+inter-process-messaging@0.1.1
+logging@1.3.2
+meteor@1.11.2
+meteortesting:browser-tests@1.4.2
+meteortesting:mocha@2.1.0
+meteortesting:mocha-core@8.0.1
+minifier-css@1.6.4
+minifier-js@2.7.5
+modern-browsers@0.1.9
+modules@0.19.0
+modules-runtime@0.13.1
+modules-runtime-hot@0.14.2
+mongo-id@1.0.8
+promise@0.12.2
+random@1.2.1
+react-fast-refresh@0.2.7
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.1
+server-render@0.4.1
+shell-server@0.5.0
+socket-stream-client@0.5.1
+spacebars-compiler@1.3.1
+standard-minifier-css@1.9.2
+standard-minifier-js@2.8.1
+static-html@1.3.2
+templating-tools@1.2.2
+tracker@1.3.2
+typescript@4.9.4
+underscore@1.0.13
+url@1.3.2
+webapp@1.13.5
+webapp-hashing@1.1.1
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
new file mode 100644
index 0000000000..375467bbb8
--- /dev/null
+++ b/testapp/package-lock.json
@@ -0,0 +1,5317 @@
+{
+  "name": "someapp",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
+    "@ampproject/remapping": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.22.5"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+      "dev": true
+    },
+    "@babel/core": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
+      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "dev": true,
+      "requires": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helpers": "^7.22.6",
+        "@babel/parser": "^7.22.7",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.8",
+        "@babel/types": "^7.22.5",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.2",
+        "semver": "^6.3.1"
+      }
+    },
+    "@babel/generator": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
+      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
+      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-validator-option": "^7.22.5",
+        "browserslist": "^4.21.9",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "dev": true
+    },
+    "@babel/helper-function-name": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-validator-identifier": "^7.22.5"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "dev": true
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "dev": true
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "dev": true
+    },
+    "@babel/helpers": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
+      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.6",
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+      "dev": true
+    },
+    "@babel/runtime": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "requires": {
+        "regenerator-runtime": "^0.13.11"
+      }
+    },
+    "@babel/template": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
+      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.7",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.22.7",
+        "@babel/types": "^7.22.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/types": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
+      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
+      "dev": true
+    },
+    "@eslint/eslintrc": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
+      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "globals": {
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
+      }
+    },
+    "@eslint/js": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
+      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
+      "dev": true
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      }
+    },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      },
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.14",
+          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+          "dev": true
+        }
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@puppeteer/browsers": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz",
+      "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4.3.4",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "yargs": "17.7.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "cliui": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.1",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "17.7.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+          "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "21.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+          "dev": true
+        }
+      }
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "20.4.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz",
+      "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==",
+      "dev": true,
+      "optional": true
+    },
+    "@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "requires": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      }
+    },
+    "acorn": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4"
+      }
+    },
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "append-transform": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
+      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "^3.0.0"
+      }
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      }
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      }
+    },
+    "array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      }
+    },
+    "array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.tosorted": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
+      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      }
+    },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      }
+    },
+    "asn1": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+      "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
+      "optional": true
+    },
+    "assert-plus": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+      "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
+      "optional": true
+    },
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+      "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
+      "optional": true
+    },
+    "babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-instrument": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+          "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "requires": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "boom": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+      "integrity": "sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==",
+      "optional": true,
+      "requires": {
+        "hoek": "0.9.x"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "browserslist": {
+      "version": "4.21.10",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
+        "node-releases": "^2.0.13",
+        "update-browserslist-db": "^1.0.11"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true
+    },
+    "builtins": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+    },
+    "caching-transform": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
+      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
+      "dev": true,
+      "requires": {
+        "hasha": "^5.0.0",
+        "make-dir": "^3.0.0",
+        "package-hash": "^4.0.0",
+        "write-file-atomic": "^3.0.0"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001518",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz",
+      "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "chromium-bidi": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz",
+      "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==",
+      "dev": true,
+      "requires": {
+        "mitt": "3.0.0"
+      }
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+      "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
+      "optional": true,
+      "requires": {
+        "delayed-stream": "0.0.5"
+      }
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "requires": {
+        "safe-buffer": "5.2.1"
+      }
+    },
+    "content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
+    },
+    "convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "cosmiconfig": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        }
+      }
+    },
+    "cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dev": true,
+      "requires": {
+        "node-fetch": "2.6.7"
+      }
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "cryptiles": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+      "integrity": "sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==",
+      "optional": true,
+      "requires": {
+        "boom": "0.4.x"
+      }
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+      "integrity": "sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==",
+      "optional": true
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "default-require-extensions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
+      "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==",
+      "dev": true,
+      "requires": {
+        "strip-bom": "^4.0.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+      "dev": true,
+      "requires": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "delayed-stream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+      "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
+      "optional": true
+    },
+    "depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+    },
+    "destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
+    },
+    "devtools-protocol": {
+      "version": "0.0.1107588",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
+      "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
+      "dev": true
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "electron-to-chromium": {
+      "version": "1.4.479",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz",
+      "integrity": "sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ==",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.2.1",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.10"
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true
+    },
+    "eslint": {
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
+      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.1",
+        "@eslint/js": "^8.46.0",
+        "@humanwhocodes/config-array": "^0.11.10",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.2",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "globals": {
+          "version": "13.20.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "levn": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "^1.2.1",
+            "type-check": "~0.4.0"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "optionator": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+          "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+          "dev": true,
+          "requires": {
+            "@aashutoshrathi/word-wrap": "^1.2.3",
+            "deep-is": "^0.1.3",
+            "fast-levenshtein": "^2.0.6",
+            "levn": "^0.4.1",
+            "prelude-ls": "^1.2.1",
+            "type-check": "^0.4.0"
+          }
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-check": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "^1.2.1"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-config-standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
+      "dev": true
+    },
+    "eslint-config-standard-jsx": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
+      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==",
+      "dev": true
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "resolve": {
+          "version": "1.22.2",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.11.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-es": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+      "dev": true,
+      "requires": {
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      },
+      "dependencies": {
+        "eslint-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.8.0",
+        "has": "^1.0.3",
+        "is-core-module": "^2.12.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "resolve": {
+          "version": "1.22.3",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
+          "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.12.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-n": {
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
+      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
+      "dev": true,
+      "requires": {
+        "builtins": "^5.0.1",
+        "eslint-plugin-es": "^4.1.0",
+        "eslint-utils": "^3.0.0",
+        "ignore": "^5.1.1",
+        "is-core-module": "^2.11.0",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.1",
+        "semver": "^7.3.8"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "resolve": {
+          "version": "1.22.2",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.11.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-promise": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
+      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==",
+      "dev": true
+    },
+    "eslint-plugin-react": {
+      "version": "7.33.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
+      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "array.prototype.tosorted": "^1.1.1",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "object.hasown": "^1.1.2",
+        "object.values": "^1.1.6",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.4",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.8"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "resolve": {
+          "version": "2.0.0-next.4",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.9.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
+    },
+    "express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "requires": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "foreground-child": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
+      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "forever-agent": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+      "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A=="
+    },
+    "form-data": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
+      "optional": true,
+      "requires": {
+        "async": "~0.9.0",
+        "combined-stream": "~0.0.4",
+        "mime": "~1.2.11"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
+          "optional": true
+        },
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
+          "optional": true
+        }
+      }
+    },
+    "forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+    },
+    "fromentries": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
+      "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
+      "dev": true
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.3"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3"
+      }
+    },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true
+    },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "hasha": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
+      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
+      "dev": true,
+      "requires": {
+        "is-stream": "^2.0.0",
+        "type-fest": "^0.8.0"
+      }
+    },
+    "hawk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+      "integrity": "sha512-am8sVA2bCJIw8fuuVcKvmmNnGFUGW8spTkVtj2fXTEZVkfN42bwFZFtDem57eFi+NSxurJB8EQ7Jd3uCHLn8Vw==",
+      "optional": true,
+      "requires": {
+        "boom": "0.4.x",
+        "cryptiles": "0.2.x",
+        "hoek": "0.9.x",
+        "sntp": "0.2.x"
+      }
+    },
+    "hoek": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+      "integrity": "sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==",
+      "optional": true
+    },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "requires": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      }
+    },
+    "http-signature": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+      "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
+      "optional": true,
+      "requires": {
+        "asn1": "0.1.11",
+        "assert-plus": "^0.1.5",
+        "ctype": "0.5.3"
+      }
+    },
+    "https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "requires": {
+        "agent-base": "6",
+        "debug": "4"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        }
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+    },
+    "is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true
+    },
+    "is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dev": true,
+      "requires": {
+        "which-typed-array": "^1.1.11"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
+      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
+      "dev": true,
+      "requires": {
+        "append-transform": "^2.0.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      }
+    },
+    "istanbul-lib-processinfo": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz",
+      "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==",
+      "dev": true,
+      "requires": {
+        "archy": "^1.0.0",
+        "cross-spawn": "^7.0.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "p-map": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "uuid": "^8.3.2"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+          "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+          "dev": true,
+          "requires": {
+            "semver": "^7.5.3"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "dev": true,
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+    },
+    "json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
+    },
+    "jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "linkify-it": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
+      "integrity": "sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg==",
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "load-json-file": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
+      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.15",
+        "parse-json": "^4.0.0",
+        "pify": "^4.0.1",
+        "strip-bom": "^3.0.0",
+        "type-fest": "^0.3.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+          "dev": true
+        }
+      }
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
+      "dev": true
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      }
+    },
+    "markdown-it": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
+      "integrity": "sha512-Rl8dHHeLuAh3E72OPY0tY7CLvlxgHiLhlshIYswAAabAg4YDBLa6e/LTgNkkxBO2K61ESzoquPQFMw/iMrT1PA==",
+      "requires": {
+        "argparse": "~1.0.2",
+        "entities": "~1.1.1",
+        "linkify-it": "~1.2.0",
+        "mdurl": "~1.0.0",
+        "uc.micro": "^1.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        }
+      }
+    },
+    "mdn-links": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/mdn-links/-/mdn-links-0.1.0.tgz",
+      "integrity": "sha512-m+gI2Hrgro1O0SwqHd9cFkqN8VGzP56eprB63gxu6z9EFQDMeaR083wcNqMVADIbgiMP/TOCCe0ZIXHLBv2tUg=="
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "meteor-node-stubs": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.5.tgz",
+      "integrity": "sha512-FLlOFZx3KnZ5s3yPCK+x58DyX9ewN+oQ12LcpwBXMLtzJ/YyprMQVivd6KIrahZbKJrNenPNUGuDS37WUFg+Mw==",
+      "requires": {
+        "assert": "^2.0.0",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^5.7.1",
+        "console-browserify": "^1.2.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.12.0",
+        "domain-browser": "^4.22.0",
+        "elliptic": "^6.5.4",
+        "events": "^3.3.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^3.6.0",
+        "stream-browserify": "^3.0.0",
+        "stream-http": "^3.2.0",
+        "string_decoder": "^1.3.0",
+        "timers-browserify": "^2.0.12",
+        "tty-browserify": "0.0.1",
+        "url": "^0.11.0",
+        "util": "^0.12.4",
+        "vm-browserify": "^1.1.2"
+      },
+      "dependencies": {
+        "asn1.js": {
+          "version": "5.4.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0",
+            "safer-buffer": "^2.1.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "assert": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "es6-object-assign": "^1.1.0",
+            "is-nan": "^1.2.1",
+            "object-is": "^1.0.1",
+            "util": "^0.12.0"
+          }
+        },
+        "available-typed-arrays": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "base64-js": {
+          "version": "1.5.1",
+          "bundled": true
+        },
+        "bn.js": {
+          "version": "5.2.0",
+          "bundled": true
+        },
+        "brorand": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "browserify-aes": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "buffer-xor": "^1.0.3",
+            "cipher-base": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.3",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "browserify-cipher": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "browserify-aes": "^1.0.4",
+            "browserify-des": "^1.0.0",
+            "evp_bytestokey": "^1.0.0"
+          }
+        },
+        "browserify-des": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "des.js": "^1.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "browserify-rsa": {
+          "version": "4.1.0",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.0.0",
+            "randombytes": "^2.0.1"
+          }
+        },
+        "browserify-sign": {
+          "version": "4.2.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.1.1",
+            "browserify-rsa": "^4.0.1",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "elliptic": "^6.5.3",
+            "inherits": "^2.0.4",
+            "parse-asn1": "^5.1.5",
+            "readable-stream": "^3.6.0",
+            "safe-buffer": "^5.2.0"
+          }
+        },
+        "browserify-zlib": {
+          "version": "0.2.0",
+          "bundled": true,
+          "requires": {
+            "pako": "~1.0.5"
+          }
+        },
+        "buffer": {
+          "version": "5.7.1",
+          "bundled": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "buffer-xor": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "builtin-status-codes": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "call-bind": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.0.2"
+          }
+        },
+        "cipher-base": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "console-browserify": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "constants-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "create-ecdh": {
+          "version": "4.0.4",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "elliptic": "^6.5.3"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "create-hash": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "inherits": "^2.0.1",
+            "md5.js": "^1.3.4",
+            "ripemd160": "^2.0.1",
+            "sha.js": "^2.4.0"
+          }
+        },
+        "create-hmac": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.3",
+            "create-hash": "^1.1.0",
+            "inherits": "^2.0.1",
+            "ripemd160": "^2.0.0",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "crypto-browserify": {
+          "version": "3.12.0",
+          "bundled": true,
+          "requires": {
+            "browserify-cipher": "^1.0.0",
+            "browserify-sign": "^4.0.0",
+            "create-ecdh": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "create-hmac": "^1.1.0",
+            "diffie-hellman": "^5.0.0",
+            "inherits": "^2.0.1",
+            "pbkdf2": "^3.0.3",
+            "public-encrypt": "^4.0.0",
+            "randombytes": "^2.0.0",
+            "randomfill": "^1.0.3"
+          }
+        },
+        "define-properties": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "object-keys": "^1.0.12"
+          }
+        },
+        "des.js": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
+          }
+        },
+        "diffie-hellman": {
+          "version": "5.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "miller-rabin": "^4.0.0",
+            "randombytes": "^2.0.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "domain-browser": {
+          "version": "4.22.0",
+          "bundled": true
+        },
+        "elliptic": {
+          "version": "6.5.4",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.11.9",
+            "brorand": "^1.1.0",
+            "hash.js": "^1.0.0",
+            "hmac-drbg": "^1.0.1",
+            "inherits": "^2.0.4",
+            "minimalistic-assert": "^1.0.1",
+            "minimalistic-crypto-utils": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "es-abstract": {
+          "version": "1.18.3",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.3",
+            "is-string": "^1.0.6",
+            "object-inspect": "^1.10.3",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "es6-object-assign": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "events": {
+          "version": "3.3.0",
+          "bundled": true
+        },
+        "evp_bytestokey": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "md5.js": "^1.3.4",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "foreach": {
+          "version": "2.0.5",
+          "bundled": true
+        },
+        "function-bind": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "get-intrinsic": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "has": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        },
+        "has-bigints": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "hash-base": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "safe-buffer": "^5.2.0"
+          }
+        },
+        "hash.js": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "minimalistic-assert": "^1.0.1"
+          }
+        },
+        "hmac-drbg": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "hash.js": "^1.0.3",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.1"
+          }
+        },
+        "https-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "ieee754": {
+          "version": "1.2.1",
+          "bundled": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true
+        },
+        "is-arguments": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0"
+          }
+        },
+        "is-bigint": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "is-boolean-object": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2"
+          }
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "bundled": true
+        },
+        "is-date-object": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "is-generator-function": {
+          "version": "1.0.9",
+          "bundled": true
+        },
+        "is-nan": {
+          "version": "1.3.2",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "is-negative-zero": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "is-number-object": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "is-regex": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.2"
+          }
+        },
+        "is-string": {
+          "version": "1.0.6",
+          "bundled": true
+        },
+        "is-symbol": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "has-symbols": "^1.0.2"
+          }
+        },
+        "is-typed-array": {
+          "version": "1.1.5",
+          "bundled": true,
+          "requires": {
+            "available-typed-arrays": "^1.0.2",
+            "call-bind": "^1.0.2",
+            "es-abstract": "^1.18.0-next.2",
+            "foreach": "^2.0.5",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "md5.js": {
+          "version": "1.3.5",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "miller-rabin": {
+          "version": "4.0.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "brorand": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "minimalistic-assert": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "minimalistic-crypto-utils": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-inspect": {
+          "version": "1.10.3",
+          "bundled": true
+        },
+        "object-is": {
+          "version": "1.1.5",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "object-keys": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "os-browserify": {
+          "version": "0.3.0",
+          "bundled": true
+        },
+        "pako": {
+          "version": "1.0.11",
+          "bundled": true
+        },
+        "parse-asn1": {
+          "version": "5.1.6",
+          "bundled": true,
+          "requires": {
+            "asn1.js": "^5.2.0",
+            "browserify-aes": "^1.0.0",
+            "evp_bytestokey": "^1.0.0",
+            "pbkdf2": "^3.0.3",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "path-browserify": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "pbkdf2": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "create-hash": "^1.1.2",
+            "create-hmac": "^1.1.4",
+            "ripemd160": "^2.0.1",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "process": {
+          "version": "0.11.10",
+          "bundled": true
+        },
+        "public-encrypt": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "parse-asn1": "^5.0.0",
+            "randombytes": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "querystring": {
+          "version": "0.2.0",
+          "bundled": true
+        },
+        "querystring-es3": {
+          "version": "0.2.1",
+          "bundled": true
+        },
+        "randombytes": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "randomfill": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "randombytes": "^2.0.5",
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "ripemd160": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "bundled": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true
+        },
+        "setimmediate": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "sha.js": {
+          "version": "2.4.11",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "stream-browserify": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "~2.0.4",
+            "readable-stream": "^3.5.0"
+          }
+        },
+        "stream-http": {
+          "version": "3.2.0",
+          "bundled": true,
+          "requires": {
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "xtend": "^4.0.2"
+          }
+        },
+        "string.prototype.trimend": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "string.prototype.trimstart": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        },
+        "timers-browserify": {
+          "version": "2.0.12",
+          "bundled": true,
+          "requires": {
+            "setimmediate": "^1.0.4"
+          }
+        },
+        "tty-browserify": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "unbox-primitive": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has-bigints": "^1.0.1",
+            "has-symbols": "^1.0.2",
+            "which-boxed-primitive": "^1.0.2"
+          }
+        },
+        "url": {
+          "version": "0.11.0",
+          "bundled": true,
+          "requires": {
+            "punycode": "1.3.2",
+            "querystring": "0.2.0"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "1.3.2",
+              "bundled": true
+            }
+          }
+        },
+        "util": {
+          "version": "0.12.4",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "is-arguments": "^1.0.4",
+            "is-generator-function": "^1.0.7",
+            "is-typed-array": "^1.1.3",
+            "safe-buffer": "^5.1.2",
+            "which-typed-array": "^1.1.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "vm-browserify": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "which-boxed-primitive": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "is-bigint": "^1.0.1",
+            "is-boolean-object": "^1.1.0",
+            "is-number-object": "^1.0.4",
+            "is-string": "^1.0.5",
+            "is-symbol": "^1.0.3"
+          }
+        },
+        "which-typed-array": {
+          "version": "1.1.4",
+          "bundled": true,
+          "requires": {
+            "available-typed-arrays": "^1.0.2",
+            "call-bind": "^1.0.0",
+            "es-abstract": "^1.18.0-next.1",
+            "foreach": "^2.0.5",
+            "function-bind": "^1.1.1",
+            "has-symbols": "^1.0.1",
+            "is-typed-array": "^1.1.3"
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "bundled": true
+        }
+      }
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true
+    },
+    "mitt": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
+      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
+      "dev": true
+    },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+    },
+    "node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
+    "node-preload": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
+      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
+      "dev": true,
+      "requires": {
+        "process-on-spawn": "^1.0.0"
+      }
+    },
+    "node-releases": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "dev": true
+    },
+    "node-uuid": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA=="
+    },
+    "nyc": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
+      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "caching-transform": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "decamelize": "^1.2.0",
+        "find-cache-dir": "^3.2.0",
+        "find-up": "^4.1.0",
+        "foreground-child": "^2.0.0",
+        "get-package-type": "^0.1.0",
+        "glob": "^7.1.6",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-hook": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-processinfo": "^2.0.2",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "make-dir": "^3.0.0",
+        "node-preload": "^0.2.1",
+        "p-map": "^3.0.0",
+        "process-on-spawn": "^1.0.0",
+        "resolve-from": "^5.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "spawn-wrap": "^2.0.0",
+        "test-exclude": "^6.0.0",
+        "yargs": "^15.0.2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "oauth-sign": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
+      "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
+      "optional": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
+    "object.hasown": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
+    "p-map": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "package-hash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
+      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.15",
+        "hasha": "^5.0.0",
+        "lodash.flattendeep": "^4.4.0",
+        "release-zalgo": "^1.0.0"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true
+    },
+    "pkg-conf": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
+      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0",
+        "load-json-file": "^5.2.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+          "dev": true
+        }
+      }
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
+    "process-on-spawn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
+      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
+      "dev": true,
+      "requires": {
+        "fromentries": "^1.2.0"
+      }
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "requires": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      }
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "optional": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
+    },
+    "puppeteer": {
+      "version": "19.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz",
+      "integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==",
+      "dev": true,
+      "requires": {
+        "@puppeteer/browsers": "0.5.0",
+        "cosmiconfig": "8.1.3",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "puppeteer-core": "19.11.1"
+      }
+    },
+    "puppeteer-core": {
+      "version": "19.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz",
+      "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==",
+      "dev": true,
+      "requires": {
+        "@puppeteer/browsers": "0.5.0",
+        "chromium-bidi": "0.4.7",
+        "cross-fetch": "3.1.5",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1107588",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "proxy-from-env": "1.1.0",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "ws": "8.13.0"
+      }
+    },
+    "qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
+    },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "optional": true
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    },
+    "raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "requires": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
+    },
+    "readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "regexp.prototype.flags": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
+      }
+    },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
+    "release-zalgo": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
+      "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
+      "dev": true,
+      "requires": {
+        "es6-error": "^4.0.1"
+      }
+    },
+    "request": {
+      "version": "2.40.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
+      "integrity": "sha512-waNoGB4Z7bPn+lgqPk7l7hhze4Vd68jKccnwLeS7vr9GMxz0iWQbYTbBNWzfIk87Urx7V44pu29qjF/omej+Fw==",
+      "requires": {
+        "aws-sign2": "~0.5.0",
+        "forever-agent": "~0.5.0",
+        "form-data": "~0.1.0",
+        "hawk": "1.1.1",
+        "http-signature": "~0.10.0",
+        "json-stringify-safe": "~5.0.0",
+        "mime-types": "~1.0.1",
+        "node-uuid": "~1.4.0",
+        "oauth-sign": "~0.3.0",
+        "qs": "~1.0.0",
+        "stringstream": "~0.0.4",
+        "tough-cookie": ">=0.12.0",
+        "tunnel-agent": "~0.4.0"
+      },
+      "dependencies": {
+        "mime-types": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "integrity": "sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw=="
+        },
+        "qs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
+          "integrity": "sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg=="
+        }
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "optional": true
+    },
+    "resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true
+    },
+    "send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "sntp": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+      "integrity": "sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==",
+      "optional": true,
+      "requires": {
+        "hoek": "0.9.x"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "spawn-wrap": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
+      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
+      "dev": true,
+      "requires": {
+        "foreground-child": "^2.0.0",
+        "is-windows": "^1.0.2",
+        "make-dir": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "which": "^2.0.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+    },
+    "standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
+      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
+      "dev": true,
+      "requires": {
+        "eslint": "^8.41.0",
+        "eslint-config-standard": "17.1.0",
+        "eslint-config-standard-jsx": "^11.0.0",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-n": "^15.7.0",
+        "eslint-plugin-promise": "^6.1.1",
+        "eslint-plugin-react": "^7.32.2",
+        "standard-engine": "^15.0.0",
+        "version-guard": "^1.1.1"
+      }
+    },
+    "standard-engine": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
+      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^8.0.0",
+        "minimist": "^1.2.6",
+        "pkg-conf": "^3.1.0",
+        "xdg-basedir": "^4.0.0"
+      }
+    },
+    "statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "string.prototype.matchall": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
+      "optional": true
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
+    "tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "requires": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true
+    },
+    "toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+    },
+    "tough-cookie": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "optional": true,
+      "requires": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+          "optional": true
+        }
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
+    },
+    "tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "dev": true,
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+          "dev": true
+        }
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
+      "optional": true
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      }
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
+    "unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
+    },
+    "update-browserslist-db": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "dev": true,
+      "requires": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "optional": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+    },
+    "version-guard": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz",
+      "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ==",
+      "dev": true
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "dev": true
+    },
+    "which-typed-array": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "ws": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "dev": true
+    },
+    "xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      }
+    },
+    "yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
+    },
+    "yui": {
+      "version": "3.18.1",
+      "resolved": "https://registry.npmjs.org/yui/-/yui-3.18.1.tgz",
+      "integrity": "sha512-M4/mHnq5uGvpwKEpRBh3SclL70cpDEus9LNGnrK5ZBzp4HOoueY7EkXfgtRBd+9VOQHWlFukXL2udHE53N4Wqw==",
+      "requires": {
+        "request": "~2.40.0"
+      }
+    },
+    "yuidocjs": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/yuidocjs/-/yuidocjs-0.10.2.tgz",
+      "integrity": "sha512-g0ZrXsaCmQL9zsvkgD+RxWDsMNkHne5tK72iWYodro9JQlfKxePcV1dwbGhKMy/fl1XCIW3R3erZudohU+PcEw==",
+      "requires": {
+        "express": "^4.13.1",
+        "graceful-fs": "^4.1.2",
+        "markdown-it": "^4.3.0",
+        "mdn-links": "^0.1.0",
+        "minimatch": "^3.0.2",
+        "rimraf": "^2.4.1",
+        "yui": "^3.18.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/testapp/package.json b/testapp/package.json
new file mode 100644
index 0000000000..2902dffc11
--- /dev/null
+++ b/testapp/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "testapp",
+  "private": true,
+  "scripts": {
+    "setup": "mkdir packages && ln -s ../../ ./packages/roles",
+    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
+    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
+    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
+    "report": "nyc report -t .coverage",
+    "lint": "standard -v ./packages/roles",
+    "lint:fix": "standard --fix -v ./packages/roles"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.17.9",
+    "meteor-node-stubs": "^1.2.1",
+    "yuidocjs": "^0.10.2"
+  },
+  "devDependencies": {
+    "babel-plugin-istanbul": "^6.1.1",
+    "nyc": "^15.1.0",
+    "puppeteer": "^19.4.0",
+    "standard": "^17.1.0"
+  },
+  "babel": {
+    "env": {
+      "COVERAGE": {
+        "plugins": [
+          "istanbul"
+        ]
+      }
+    }
+  },
+  "standard": {
+    "ignore": [
+      "**/.meteor/",
+      "**/examples/",
+      "**/testapp"
+    ]
+  }
+}

From 42b26bbf1bee0729a14a8d3e95e644b99181946f Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:18:45 +0200
Subject: [PATCH 0401/1140] docs: add contribution guidelines and testing guide

---
 CONTRIBUTING.md | 104 ++++++++++++++++++++++++++++++++++++++++++++++++
 README.md       |   9 ++---
 2 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..de40874feb
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,104 @@
+# Contributing to Meteor Roles
+
+Any contribution to this repository is highly appreciated!
+
+## Setup development env
+
+### Clone project and create a new branch to work on
+
+First, clone this repository and create a new branch to work on.
+Branch names should start with a descriptive suffix of their intended outcome, for example:
+
+- `feature-` for features
+- `tests-` for contributions that improve testing
+- `fix-` for general fixes
+- `build-` for contributions that update the build process
+- `ci-` for contributions that improve/update the ci
+
+```shell
+$ git clone git@github.com:Meteor-Community-Packages/meteor-roles.git
+$ cd meteor-roles
+$ git checkout -b fix-some-issue
+```
+
+### Initialize test app
+
+We use a proxy Meteor application to run our tests and handle coverage etc.
+This app contains several npm scripts to provide the complete toolchain that is required
+for your development and testing needs.
+
+The setup is very easy. Go into the `testapp` directory, install dependencies and link
+the package:
+
+```shell
+$ cd testapp
+$ meteor npm install
+$ meteor npm run setup # this is important for the tools to work!
+```
+
+## Development toolchain
+
+The `testapp` comes with some builtin scripts you can utilize during your development.
+They will also be picked up by our CI during pull requests.
+Therefore, it's a good call for you, that if they pass or fail, the CI will do so, too.
+
+**Note: all tools require the npm `setup` script has been executed at least once!**
+
+### Linter
+
+We use `standard` as our linter. You can run either the linter or use it's autofix feature for
+the most common issues:
+
+```shell
+# in testapp
+$ meteor npm run lint # show only outputs
+$ meteor npm run lint:fix # with fixes + outputs
+```
+
+### Tests
+
+We provide three forms of tests: once, watch, coverage
+
+#### Once
+
+Simply runs the test suite once, without coverage collection:
+
+```shell
+$ meteor npm run test
+```
+
+#### Watch
+
+Runs the test suite in watch mode, good to use during active development, where your changes
+are picked up automatically to re-run the tests:
+
+```shell
+$ meteor npm run test:watch
+```
+
+#### Coverage
+
+Runs the test suite once, including coverage report generation.
+Generates an html and json report output.
+
+```shell
+$ meteor npm run test:coverage
+$ meteor npm run report # summary output in console
+```
+
+If you want to watch the HTML output to find (un)covered lines, open
+the file at `testapp/.coverage/index.html` in your browser.
+
+## Open a pull request
+
+If you open a pull request, please make sure the following requirements are met:
+
+- the `lint` script is passing
+- the `test` script is passing
+- your contribution is on point and solves one issue (not multiple)
+- your commit messages are descriptive and informative
+- complex changes are documented in the code with comments or jsDoc-compatible documentation
+
+Please understand, that there will be a review process and your contribution
+might require changes before being merged. This is entirely to ensure quality and is
+never used as a personal offense.
diff --git a/README.md b/README.md
index fad3b5e797..97424b9d10 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ There are also older versions of this package:
 * [Usage examples](#roles-usage)
 * [Online API docs](#roles-docs)
 * [Example apps](#roles-example-apps)
-* [Running tests](#roles-testing)
+* [Running tests](#roles-contributions-development-and-tests)
 
 <br />
 
@@ -467,8 +467,7 @@ The `examples` directory contains Meteor apps which show off the following featu
 
 
 <a id="roles-testing" name="roles-testing"></a>
-### Tests
+### Contributions, development and tests
 
-To run tests:
-  1. `cd meteor-roles`
-  2. `npm run test`
+Please read our [contribution guidelines](./CONTRIBUTING.md),
+which also describe how to set up and run the linter and tests.

From 5029e7a1c344f8820a0e27c8dd9789ea93de3232 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:19:07 +0200
Subject: [PATCH 0402/1140] core: update gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 03f05ca168..a8b515889e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ docs/
 node_modules/
 .npm/
 someapp/
-.DS_Store
\ No newline at end of file
+.DS_Store
+.coverage/

From 49d6574154b7f0920ee858faf79d4c49eb8db422 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:19:32 +0200
Subject: [PATCH 0403/1140] core: move package json to testapp

---
 package-lock.json | 2800 ---------------------------------------------
 package.json      |   22 -
 2 files changed, 2822 deletions(-)
 delete mode 100644 package-lock.json
 delete mode 100644 package.json

diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index fac22c16ec..0000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,2800 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA=="
-    },
-    "@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "requires": {
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "@eslint-community/regexpp": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
-      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ=="
-    },
-    "@eslint/eslintrc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
-      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        }
-      }
-    },
-    "@eslint/js": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
-      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
-    },
-    "abbrev": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
-    },
-    "acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "optional": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
-      }
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
-    "array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "asn1": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-      "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
-      "optional": true
-    },
-    "assert-plus": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-      "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
-      "optional": true
-    },
-    "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
-    },
-    "aws-sign2": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-      "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
-      "optional": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "boom": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
-      "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
-      "optional": true,
-      "requires": {
-        "hoek": "0.9.x"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "builtins": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-      "requires": {
-        "semver": "^7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "combined-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-      "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
-      "optional": true,
-      "requires": {
-        "delayed-stream": "0.0.5"
-      }
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "optional": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "dependencies": {
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "cryptiles": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
-      "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=",
-      "optional": true,
-      "requires": {
-        "boom": "0.4.x"
-      }
-    },
-    "ctype": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-      "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
-      "optional": true
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-    },
-    "define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-      "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-      "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
-      "optional": true
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.0",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3"
-          }
-        }
-      }
-    },
-    "es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-    },
-    "escodegen": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-      "requires": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.2.0"
-      }
-    },
-    "eslint": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
-      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
-      "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
-        "@humanwhocodes/config-array": "^0.11.10",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "levn": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "optionator": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-          "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-          "requires": {
-            "@aashutoshrathi/word-wrap": "^1.2.3",
-            "deep-is": "^0.1.3",
-            "fast-levenshtein": "^2.0.6",
-            "levn": "^0.4.1",
-            "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
-        },
-        "type-check": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-          "requires": {
-            "prelude-ls": "^1.2.1"
-          }
-        }
-      }
-    },
-    "eslint-config-standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
-      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q=="
-    },
-    "eslint-config-standard-jsx": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
-      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ=="
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
-      "requires": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
-      "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-es": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
-      "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "dependencies": {
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
-        "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-n": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
-      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
-      "requires": {
-        "builtins": "^5.0.1",
-        "eslint-plugin-es": "^4.1.0",
-        "eslint-utils": "^3.0.0",
-        "ignore": "^5.1.1",
-        "is-core-module": "^2.11.0",
-        "minimatch": "^3.1.2",
-        "resolve": "^1.22.1",
-        "semver": "^7.3.8"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-promise": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
-      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig=="
-    },
-    "eslint-plugin-react": {
-      "version": "7.32.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
-      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.8"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        },
-        "resolve": {
-          "version": "2.0.0-next.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-scope": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA=="
-    },
-    "espree": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
-      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
-      "requires": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      }
-    },
-    "esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
-    },
-    "esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "estraverse": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-      "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q="
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-    },
-    "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-      "requires": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "accepts": {
-          "version": "1.3.8",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-          "requires": {
-            "mime-types": "~2.1.34",
-            "negotiator": "0.6.3"
-          }
-        },
-        "body-parser": {
-          "version": "1.20.1",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-          "requires": {
-            "bytes": "3.1.2",
-            "content-type": "~1.0.4",
-            "debug": "2.6.9",
-            "depd": "2.0.0",
-            "destroy": "1.2.0",
-            "http-errors": "2.0.0",
-            "iconv-lite": "0.4.24",
-            "on-finished": "2.4.1",
-            "qs": "6.11.0",
-            "raw-body": "2.5.1",
-            "type-is": "~1.6.18",
-            "unpipe": "1.0.0"
-          }
-        },
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
-        "content-disposition": {
-          "version": "0.5.4",
-          "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-          "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-          "requires": {
-            "safe-buffer": "5.2.1"
-          }
-        },
-        "cookie": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
-        "destroy": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-          "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-        },
-        "finalhandler": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-          "requires": {
-            "debug": "2.6.9",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "on-finished": "2.4.1",
-            "parseurl": "~1.3.3",
-            "statuses": "2.0.1",
-            "unpipe": "~1.0.0"
-          }
-        },
-        "forwarded": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-          "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-        },
-        "http-errors": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-          "requires": {
-            "depd": "2.0.0",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.2.0",
-            "statuses": "2.0.1",
-            "toidentifier": "1.0.1"
-          }
-        },
-        "ipaddr.js": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-        },
-        "mime-db": {
-          "version": "1.52.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-        },
-        "mime-types": {
-          "version": "2.1.35",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-          "requires": {
-            "mime-db": "1.52.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        },
-        "negotiator": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-        },
-        "on-finished": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "proxy-addr": {
-          "version": "2.0.7",
-          "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-          "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-          "requires": {
-            "forwarded": "0.2.0",
-            "ipaddr.js": "1.9.1"
-          }
-        },
-        "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-          "requires": {
-            "side-channel": "^1.0.4"
-          }
-        },
-        "raw-body": {
-          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-          "requires": {
-            "bytes": "3.1.2",
-            "http-errors": "2.0.0",
-            "iconv-lite": "0.4.24",
-            "unpipe": "1.0.0"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "send": {
-          "version": "0.18.0",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-          "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "2.0.0",
-            "destroy": "1.2.0",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "2.0.0",
-            "mime": "1.6.0",
-            "ms": "2.1.3",
-            "on-finished": "2.4.1",
-            "range-parser": "~1.2.1",
-            "statuses": "2.0.1"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.1.3",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-            }
-          }
-        },
-        "serve-static": {
-          "version": "1.15.0",
-          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-          "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-          "requires": {
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "parseurl": "~1.3.3",
-            "send": "0.18.0"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-        },
-        "toidentifier": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-        }
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-    },
-    "fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.1.1",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
-    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "forever-agent": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-      "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA="
-    },
-    "form-data": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "integrity": "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=",
-      "optional": true,
-      "requires": {
-        "async": "~0.9.0",
-        "combined-stream": "~0.0.4",
-        "mime": "~1.2.11"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-          "optional": true
-        },
-        "mime": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
-          "optional": true
-        }
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
-    "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "dependencies": {
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        }
-      }
-    },
-    "get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-      "requires": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "requires": {
-        "is-glob": "^4.0.3"
-      }
-    },
-    "globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
-    },
-    "globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
-    },
-    "graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
-    },
-    "handlebars": {
-      "version": "4.7.7",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
-      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
-      "requires": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4",
-        "wordwrap": "^1.0.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-    },
-    "has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "hawk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-      "integrity": "sha1-h81JH5tG5OKurKM1QWdmiF0tHtk=",
-      "optional": true,
-      "requires": {
-        "boom": "0.4.x",
-        "cryptiles": "0.2.x",
-        "hoek": "0.9.x",
-        "sntp": "0.2.x"
-      }
-    },
-    "hoek": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
-      "optional": true
-    },
-    "http-signature": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-      "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
-      "optional": true,
-      "requires": {
-        "asn1": "0.1.11",
-        "assert-plus": "^0.1.5",
-        "ctype": "0.5.3"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-      "requires": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3"
-          }
-        }
-      }
-    },
-    "is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-          "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3"
-          }
-        }
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-    },
-    "is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "istanbul": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-      "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-        }
-      }
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "jsx-ast-utils": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz",
-      "integrity": "sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==",
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "linkify-it": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-      "integrity": "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=",
-      "requires": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "load-json-file": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="
-        }
-      }
-    },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "requires": {
-        "p-locate": "^5.0.0"
-      }
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "markdown-it": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
-      "integrity": "sha1-PfNz2+pYepp/7z5WMRtokI91xBQ=",
-      "requires": {
-        "argparse": "~1.0.2",
-        "entities": "~1.1.1",
-        "linkify-it": "~1.2.0",
-        "mdurl": "~1.0.0",
-        "uc.micro": "^1.0.0"
-      }
-    },
-    "mdn-links": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/mdn-links/-/mdn-links-0.1.0.tgz",
-      "integrity": "sha1-4kyDuXy0xYhsw58veAcF+/4nOqU="
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "mime-db": {
-      "version": "1.42.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
-      "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="
-    },
-    "mime-types": {
-      "version": "2.1.25",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
-      "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
-      "requires": {
-        "mime-db": "1.42.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
-    },
-    "mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "requires": {
-        "minimist": "^1.2.6"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
-    },
-    "node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "oauth-sign": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-      "integrity": "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=",
-      "optional": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
-      "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-    },
-    "pkg-conf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
-      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
-      "requires": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
-        }
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-    },
-    "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
-      "optional": true
-    },
-    "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "optional": true
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
-    },
-    "request": {
-      "version": "2.40.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
-      "integrity": "sha1-TdZw9pbx5uhC5mtLXoOTAaub62c=",
-      "requires": {
-        "aws-sign2": "~0.5.0",
-        "forever-agent": "~0.5.0",
-        "form-data": "~0.1.0",
-        "hawk": "1.1.1",
-        "http-signature": "~0.10.0",
-        "json-stringify-safe": "~5.0.0",
-        "mime-types": "~1.0.1",
-        "node-uuid": "~1.4.0",
-        "oauth-sign": "~0.3.0",
-        "qs": "~1.0.0",
-        "stringstream": "~0.0.4",
-        "tough-cookie": ">=0.12.0",
-        "tunnel-agent": "~0.4.0"
-      },
-      "dependencies": {
-        "mime-types": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
-          "integrity": "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4="
-        },
-        "qs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
-          "integrity": "sha1-UKk+K1r2aRwxvOpdrnjubqGQN2g="
-        }
-      }
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "optional": true
-    },
-    "resolve": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
-    },
-    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "requires": {
-        "glob": "^7.1.3"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "dependencies": {
-        "object-inspect": {
-          "version": "1.12.2",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-          "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
-        }
-      }
-    },
-    "sntp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-      "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=",
-      "optional": true,
-      "requires": {
-        "hoek": "0.9.x"
-      }
-    },
-    "source-map": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-      "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-      "optional": true,
-      "requires": {
-        "amdefine": ">=0.0.4"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
-      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
-      "requires": {
-        "eslint": "^8.41.0",
-        "eslint-config-standard": "17.1.0",
-        "eslint-config-standard-jsx": "^11.0.0",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^15.7.0",
-        "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-react": "^7.32.2",
-        "standard-engine": "^15.0.0",
-        "version-guard": "^1.1.1"
-      }
-    },
-    "standard-engine": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
-      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
-      "requires": {
-        "get-stdin": "^8.0.0",
-        "minimist": "^1.2.6",
-        "pkg-conf": "^3.1.0",
-        "xdg-basedir": "^4.0.0"
-      }
-    },
-    "string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-      "optional": true
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
-    },
-    "supports-color": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-      "requires": {
-        "has-flag": "^1.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
-    },
-    "tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "optional": true,
-      "requires": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      }
-    },
-    "tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-      "optional": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      }
-    },
-    "uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
-    },
-    "uglify-js": {
-      "version": "3.6.9",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz",
-      "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==",
-      "optional": true,
-      "requires": {
-        "commander": "~2.20.3",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "optional": true
-        }
-      }
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "optional": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "optional": true,
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "version-guard": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz",
-      "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ=="
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA=="
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
-    },
-    "yui": {
-      "version": "3.18.1",
-      "resolved": "https://registry.npmjs.org/yui/-/yui-3.18.1.tgz",
-      "integrity": "sha1-4AAmnsCntvvHQcu4/L0OZRF7AUw=",
-      "requires": {
-        "request": "~2.40.0"
-      }
-    },
-    "yuidocjs": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/yuidocjs/-/yuidocjs-0.10.2.tgz",
-      "integrity": "sha1-M5JJZ85hkCTNcO9pTiZ9L5iPc/Y=",
-      "requires": {
-        "express": "^4.13.1",
-        "graceful-fs": "^4.1.2",
-        "markdown-it": "^4.3.0",
-        "mdn-links": "^0.1.0",
-        "minimatch": "^3.0.2",
-        "rimraf": "^2.4.1",
-        "yui": "^3.18.1"
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
deleted file mode 100644
index c7b64671ef..0000000000
--- a/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "scripts": {
-    "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
-    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
-    "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
-    "lint": "standard -v ./",
-    "lint:fix": "standard --fix -v ./",
-    "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
-  },
-  "dependencies": {
-    "istanbul": "^0.4.5",
-    "standard": "^17.1.0",
-    "yuidocjs": "^0.10.2"
-  },
-  "standard": {
-    "ignore": [
-      "**/.meteor/",
-      "**/packages/",
-      "examples/"
-    ]
-  }
-}

From 94566ccfdc92311614134ed5549f8cdf6febec56 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:20:08 +0200
Subject: [PATCH 0404/1140] tests: fix tests to enable complete coverage
 #report

---
 package.js            |  6 +++---
 roles/roles_server.js |  7 +++++--
 roles/tests/client.js | 36 +++++++++++++-----------------------
 roles/tests/server.js |  8 ++++++--
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/package.js b/package.js
index e15b6b1269..904fd2f918 100644
--- a/package.js
+++ b/package.js
@@ -39,9 +39,9 @@ Package.onUse(function (api) {
 Package.onTest(function (api) {
   // Add code coverage
   api.use([
-    'lmieulet:meteor-packages-coverage@0.2.0',
+    'lmieulet:meteor-legacy-coverage',
     'lmieulet:meteor-coverage@3.2.0',
-    'meteortesting:mocha'
+    'meteortesting:mocha@2.1.0'
   ])
 
   Npm.depends({
@@ -60,6 +60,6 @@ Package.onTest(function (api) {
     'mongo'
   ], both)
 
-  api.addFiles('roles/tests/client.js', 'client')
   api.addFiles('roles/tests/server.js', 'server')
+  api.addFiles('roles/tests/client.js', 'client')
 })
diff --git a/roles/roles_server.js b/roles/roles_server.js
index a432e6ccd9..174f310f6f 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -280,8 +280,11 @@ Object.assign(Roles, {
     try {
       collection._dropIndex(indexName);
     } catch (e) {
-      if (e.name !== "MongoError") throw e;
-      if (!/index not found/.test(e.err || e.errmsg)) throw e;
+      const indexNotFound = /index not found/.test(e.message || e.err || e.errmsg)
+
+      if (!indexNotFound) {
+        throw e
+      }
     }
   },
 
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 67dc0cab8a..84e8808f3f 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -2,19 +2,19 @@
 /* global Roles */
 
 import { Meteor } from 'meteor/meteor'
-import { Tracker } from 'meteor/tracker'
 import { assert } from 'chai'
 
 // To ensure that the files are loaded for coverage
 import '../roles_common'
 
+const safeInsert = (collection, data) => {
+  try {
+    collection.insert(data)
+  } catch (e) {}
+}
+
 describe('roles', function () {
   const roles = ['admin', 'editor', 'user']
-
-  Tracker.autorun(function () {
-    Roles.assignmentSubscription = Meteor.subscribe('_roleAssignments')
-  })
-
   const users = {
     eve: {
       _id: 'eve'
@@ -57,52 +57,42 @@ describe('roles', function () {
     Meteor.user = meteorUserMethod
   })
 
-  beforeEach((done) => {
-    Meteor.roleAssignment.insert({
+  beforeEach(() => {
+    safeInsert(Meteor.roleAssignment, {
       user: users.eve,
       role: { _id: 'admin' },
       inheritedRoles: [{ _id: 'admin' }]
     })
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.eve,
       role: { _id: 'editor' },
       inheritedRoles: [{ _id: 'editor' }]
     })
 
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.bob,
       role: { _id: 'user' },
       inheritedRoles: [{ _id: 'user' }],
       scope: 'group1'
     })
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.bob,
       role: { _id: 'editor' },
       inheritedRoles: [{ _id: 'editor' }],
       scope: 'group2'
     })
 
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.joe,
       role: { _id: 'admin' },
       inheritedRoles: [{ _id: 'admin' }]
     })
-    Meteor.roleAssignment.insert({
+    safeInsert(Meteor.roleAssignment, {
       user: users.joe,
       role: { _id: 'editor' },
       inheritedRoles: [{ _id: 'editor' }],
       scope: 'group1'
     })
-
-    const timer = () => {
-      if (!Roles.assignmentSubscription.ready()) {
-        Meteor.setTimeout(timer, 100)
-      } else {
-        done()
-      }
-    }
-
-    timer()
   })
 
   it('can check current users roles via template helper', function () {
diff --git a/roles/tests/server.js b/roles/tests/server.js
index 71cab248f2..b3fb854dac 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1418,7 +1418,7 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
   })
 
-  it('migration without global groups', function () {
+  it('migration without global groups (to v2)', function () {
     assert.isOk(Meteor.roles.insert({ name: 'admin' }))
     assert.isOk(Meteor.roles.insert({ name: 'editor' }))
     assert.isOk(Meteor.roles.insert({ name: 'user' }))
@@ -1487,7 +1487,9 @@ describe('roles', function () {
     })
   })
 
-  it('migration with global groups', function () {
+  it('migration without global groups (to v3)')
+
+  it('migration with global groups (to v2)', function () {
     assert.isOk(Meteor.roles.insert({ name: 'admin' }))
     assert.isOk(Meteor.roles.insert({ name: 'editor' }))
     assert.isOk(Meteor.roles.insert({ name: 'user' }))
@@ -1615,6 +1617,8 @@ describe('roles', function () {
     })
   })
 
+  it('migration with global groups (to v3)')
+
   it('_addUserToRole', function () {
     Roles.createRole('admin')
 

From 494d63b5399b715c28149338ef9fa9d69f3639d8 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:40:38 +0200
Subject: [PATCH 0405/1140] core: add .meteorignore for package publishing

---
 .meteorignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .meteorignore

diff --git a/.meteorignore b/.meteorignore
new file mode 100644
index 0000000000..c13dcb8e6a
--- /dev/null
+++ b/.meteorignore
@@ -0,0 +1,3 @@
+/testapp
+/tests
+**/*tests.js
\ No newline at end of file

From 9109a9cf9278d4da04e5c83170a74d12cc037d43 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:41:04 +0200
Subject: [PATCH 0406/1140] ci: add testsuite

---
 .github/workflows/testsuite.yml | 65 +++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 .github/workflows/testsuite.yml

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
new file mode 100644
index 0000000000..2b007de657
--- /dev/null
+++ b/.github/workflows/testsuite.yml
@@ -0,0 +1,65 @@
+# the test suite runs the tests (headless, server+client) for multiple Meteor releases
+name: Test suite
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  lint:
+    name: Javascript standard lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-16-
+
+      - run: cd testapp && npm ci && npm run setup && npm run lint
+
+  test:
+    name: Meteor ${{ matrix.meteorRelease }} package tests
+    needs: [lint]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        meteorRelease:
+          - '--release 2.3'
+          - '--release 2.7.3'
+          - '--release 2.12.0'
+          # Latest version
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Setup meteor
+        uses: meteorengineer/setup-meteor@v1
+        with:
+          meteor-release: ${{ matrix.meteorRelease }}
+
+      - name: cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-16-
+
+      - run: cd testapp && npm run ci && npm run setup && npm run test

From bfb1cc54fe0c2076c2bb4d0991c5a6fa31e90c5d Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:46:34 +0200
Subject: [PATCH 0407/1140] core: ignore examples folder on publishing

---
 .meteorignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.meteorignore b/.meteorignore
index c13dcb8e6a..e5abd9bb74 100644
--- a/.meteorignore
+++ b/.meteorignore
@@ -1,3 +1,4 @@
 /testapp
 /tests
-**/*tests.js
\ No newline at end of file
+**/*tests.js
+/examples

From 993bae57c32a1ea5fd18e08418daba9df51af3cb Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:48:04 +0200
Subject: [PATCH 0408/1140] ci: fix matrix args

---
 .github/workflows/testsuite.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 2b007de657..a192827a17 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -30,15 +30,15 @@ jobs:
       - run: cd testapp && npm ci && npm run setup && npm run lint
 
   test:
-    name: Meteor ${{ matrix.meteorRelease }} package tests
+    name: Meteor package tests
     needs: [lint]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         meteorRelease:
-          - '--release 2.3'
-          - '--release 2.7.3'
-          - '--release 2.12.0'
+          - '2.3'
+          - '2.7.3'
+          - '2.12.0'
           # Latest version
     steps:
       - name: Checkout code
@@ -49,7 +49,7 @@ jobs:
         with:
           node-version: 16
 
-      - name: Setup meteor
+      - name: Setup meteor ${{ matrix.meteorRelease }}
         uses: meteorengineer/setup-meteor@v1
         with:
           meteor-release: ${{ matrix.meteorRelease }}

From 62b6822db504d3961f52a4c70dc781ce82909126 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:50:54 +0200
Subject: [PATCH 0409/1140] build(core): move chai dependency to package.json

---
 package.js                |  4 ---
 testapp/package-lock.json | 65 ++++++++++++++++++++++++++++++++++++++-
 testapp/package.json      |  1 +
 3 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/package.js b/package.js
index 904fd2f918..c08772ed3a 100644
--- a/package.js
+++ b/package.js
@@ -44,10 +44,6 @@ Package.onTest(function (api) {
     'meteortesting:mocha@2.1.0'
   ])
 
-  Npm.depends({
-    chai: '4.2.0'
-  })
-
   api.versionsFrom('2.3')
 
   const both = ['client', 'server']
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 375467bbb8..4d42b56eef 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "someapp",
+  "name": "testapp",
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
@@ -741,6 +741,12 @@
       "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
       "optional": true
     },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
     "available-typed-arrays": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
@@ -962,6 +968,21 @@
       "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
       "dev": true
     },
+    "chai": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^4.1.2",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -973,6 +994,12 @@
         "supports-color": "^5.3.0"
       }
     },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true
+    },
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -1159,6 +1186,15 @@
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true
     },
+    "deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -2194,6 +2230,12 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true
+    },
     "get-intrinsic": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
@@ -2935,6 +2977,15 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "loupe": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.0"
+      }
+    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -4129,6 +4180,12 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
+    "pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true
+    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -4937,6 +4994,12 @@
       "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
       "optional": true
     },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
     "type-fest": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
diff --git a/testapp/package.json b/testapp/package.json
index 2902dffc11..e70b46da6a 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -17,6 +17,7 @@
   },
   "devDependencies": {
     "babel-plugin-istanbul": "^6.1.1",
+    "chai": "^4.3.7",
     "nyc": "^15.1.0",
     "puppeteer": "^19.4.0",
     "standard": "^17.1.0"

From cef37789bd549103b638818d504d9d7671d11520 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:55:02 +0200
Subject: [PATCH 0410/1140] fix(tests): use correct path in testapp setup
 script

---
 testapp/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testapp/package.json b/testapp/package.json
index e70b46da6a..e26525cab6 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -2,7 +2,7 @@
   "name": "testapp",
   "private": true,
   "scripts": {
-    "setup": "mkdir packages && ln -s ../../ ./packages/roles",
+    "setup": "mkdir packages && ln -s ../ ./packages/roles",
     "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
     "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
     "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",

From e8a0803091c05e667b3864c2bfb9868984b7c31a Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:08:23 +0200
Subject: [PATCH 0411/1140] fix(tests/ci): update paths and lint args to run
 linter

---
 package.js           |  2 +-
 testapp/package.json | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.js b/package.js
index c08772ed3a..db40327c09 100644
--- a/package.js
+++ b/package.js
@@ -1,4 +1,4 @@
-/* global Package, Npm */
+/* eslint-env meteor */
 
 Package.describe({
   summary: 'Authorization package for Meteor',
diff --git a/testapp/package.json b/testapp/package.json
index e26525cab6..f894d6e5ad 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -2,13 +2,13 @@
   "name": "testapp",
   "private": true,
   "scripts": {
-    "setup": "mkdir packages && ln -s ../ ./packages/roles",
-    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
-    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
-    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
+    "setup": "mkdir -p packages && ln -sfn ../../ ./packages/meteor-roles",
+    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
     "report": "nyc report -t .coverage",
-    "lint": "standard -v ./packages/roles",
-    "lint:fix": "standard --fix -v ./packages/roles"
+    "lint": "standard ../",
+    "lint:fix": "standard --fix ../"
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",

From eb544d6760e889e07cb3d302d3b7d4e34ee5b343 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:10:55 +0200
Subject: [PATCH 0412/1140] ci: fix tests install

---
 .github/workflows/testsuite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index a192827a17..b7db8de65f 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -62,4 +62,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-16-
 
-      - run: cd testapp && npm run ci && npm run setup && npm run test
+      - run: cd testapp && npm ci && npm run setup && npm run test

From dea8b4319df37669ab09d67b6268909f54a4c0e4 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:14:30 +0200
Subject: [PATCH 0413/1140] ci: fix meteor version to 2.12

---
 .github/workflows/testsuite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index b7db8de65f..54a3d3794e 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -38,7 +38,7 @@ jobs:
         meteorRelease:
           - '2.3'
           - '2.7.3'
-          - '2.12.0'
+          - '2.12'
           # Latest version
     steps:
       - name: Checkout code

From eaeb5e6b7304c76b8a1e043bc04aa1d88e009016 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 08:56:03 +0200
Subject: [PATCH 0414/1140] build(core): add lint script to package.json

---
 package.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package.json

diff --git a/package.json b/package.json
new file mode 100644
index 0000000000..83a5b2201e
--- /dev/null
+++ b/package.json
@@ -0,0 +1,20 @@
+{
+  "scripts": {
+    "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
+    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
+    "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
+    "lint": "standard -v ./",
+    "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
+  },
+  "dependencies": {
+    "istanbul": "^0.4.5",
+    "standard": "^17.1.0",
+    "yuidocjs": "^0.10.2"
+  },
+  "standard": {
+    "ignore": [
+      "**/.meteor/",
+      "**/packages/"
+    ]
+  }
+}

From 58cb565657576e3b9509af47e65bfb8fd20c9991 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 09:08:45 +0200
Subject: [PATCH 0415/1140] fix: standard lint fixed

---
 package.js            | 4 ++++
 package.json          | 4 +++-
 roles/tests/client.js | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package.js b/package.js
index db40327c09..baf94dce79 100644
--- a/package.js
+++ b/package.js
@@ -44,6 +44,10 @@ Package.onTest(function (api) {
     'meteortesting:mocha@2.1.0'
   ])
 
+  Npm.depends({
+    chai: '4.2.0'
+  })
+
   api.versionsFrom('2.3')
 
   const both = ['client', 'server']
diff --git a/package.json b/package.json
index 83a5b2201e..c7b64671ef 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
     "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
     "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
     "lint": "standard -v ./",
+    "lint:fix": "standard --fix -v ./",
     "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
   },
   "dependencies": {
@@ -14,7 +15,8 @@
   "standard": {
     "ignore": [
       "**/.meteor/",
-      "**/packages/"
+      "**/packages/",
+      "examples/"
     ]
   }
 }
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 84e8808f3f..839973f412 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -15,6 +15,11 @@ const safeInsert = (collection, data) => {
 
 describe('roles', function () {
   const roles = ['admin', 'editor', 'user']
+
+  Tracker.autorun(function () {
+    Roles.assignmentSubscription = Meteor.subscribe('_roleAssignments')
+  })
+
   const users = {
     eve: {
       _id: 'eve'

From 9a8e83205e0783e500d45db0ef91bbf4c237a24c Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:14:27 +0200
Subject: [PATCH 0416/1140] tests: added complete working test and dev
 infrastructure project

---
 testapp/package-lock.json | 65 +--------------------------------------
 testapp/package.json      | 13 ++++----
 2 files changed, 7 insertions(+), 71 deletions(-)

diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 4d42b56eef..375467bbb8 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "testapp",
+  "name": "someapp",
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
@@ -741,12 +741,6 @@
       "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
       "optional": true
     },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
     "available-typed-arrays": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
@@ -968,21 +962,6 @@
       "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
       "dev": true
     },
-    "chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
-      }
-    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -994,12 +973,6 @@
         "supports-color": "^5.3.0"
       }
     },
-    "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
-      "dev": true
-    },
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -1186,15 +1159,6 @@
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true
     },
-    "deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "^4.0.0"
-      }
-    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -2230,12 +2194,6 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
-    "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
-      "dev": true
-    },
     "get-intrinsic": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
@@ -2977,15 +2935,6 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
-      "dev": true,
-      "requires": {
-        "get-func-name": "^2.0.0"
-      }
-    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -4180,12 +4129,6 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
-    "pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true
-    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -4994,12 +4937,6 @@
       "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
       "optional": true
     },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
     "type-fest": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
diff --git a/testapp/package.json b/testapp/package.json
index f894d6e5ad..2902dffc11 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -2,13 +2,13 @@
   "name": "testapp",
   "private": true,
   "scripts": {
-    "setup": "mkdir -p packages && ln -sfn ../../ ./packages/meteor-roles",
-    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
-    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/meteor-roles",
-    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "setup": "mkdir packages && ln -s ../../ ./packages/roles",
+    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
+    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
+    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
     "report": "nyc report -t .coverage",
-    "lint": "standard ../",
-    "lint:fix": "standard --fix ../"
+    "lint": "standard -v ./packages/roles",
+    "lint:fix": "standard --fix -v ./packages/roles"
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",
@@ -17,7 +17,6 @@
   },
   "devDependencies": {
     "babel-plugin-istanbul": "^6.1.1",
-    "chai": "^4.3.7",
     "nyc": "^15.1.0",
     "puppeteer": "^19.4.0",
     "standard": "^17.1.0"

From 5e22b58fa6d03194f0f6453574f9597a57424a2c Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:19:07 +0200
Subject: [PATCH 0417/1140] core: update gitignore

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8b515889e..497cb990d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,4 @@ smart.lock
 docs/
 node_modules/
 .npm/
-someapp/
-.DS_Store
 .coverage/

From 8e175c75f4560db2dfa846f5d2cbe9fc4256a581 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:19:32 +0200
Subject: [PATCH 0418/1140] core: move package json to testapp

---
 package.json | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 package.json

diff --git a/package.json b/package.json
deleted file mode 100644
index c7b64671ef..0000000000
--- a/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "scripts": {
-    "setup-test": "rm -rf ./someapp && meteor create --minimal someapp && cd someapp && cp ../.coverage.json . && meteor npm i --save puppeteer && mkdir packages && ln -s ../../ ./packages/roles",
-    "test": "npm run setup-test && cd someapp && TEST_BROWSER_DRIVER=puppeteer COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles; istanbul report --include .coverage/summary.json --root . --dir .coverage",
-    "test:watch": "cd someapp && TEST_WATCH=1 COVERAGE=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
-    "lint": "standard -v ./",
-    "lint:fix": "standard --fix -v ./",
-    "todobeforepublish": "rm -rf .npm/ node_modules/ someapp/ docs/"
-  },
-  "dependencies": {
-    "istanbul": "^0.4.5",
-    "standard": "^17.1.0",
-    "yuidocjs": "^0.10.2"
-  },
-  "standard": {
-    "ignore": [
-      "**/.meteor/",
-      "**/packages/",
-      "examples/"
-    ]
-  }
-}

From 796689d9d19af18e905e4fe3b6316b357504d761 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:20:08 +0200
Subject: [PATCH 0419/1140] tests: fix tests to enable complete coverage
 #report

---
 roles/tests/client.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/roles/tests/client.js b/roles/tests/client.js
index 839973f412..84e8808f3f 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -15,11 +15,6 @@ const safeInsert = (collection, data) => {
 
 describe('roles', function () {
   const roles = ['admin', 'editor', 'user']
-
-  Tracker.autorun(function () {
-    Roles.assignmentSubscription = Meteor.subscribe('_roleAssignments')
-  })
-
   const users = {
     eve: {
       _id: 'eve'

From d9a7ee738c7eb144deab86524d69ffe98b7d457f Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:40:38 +0200
Subject: [PATCH 0420/1140] core: add .meteorignore for package publishing

---
 .meteorignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.meteorignore b/.meteorignore
index e5abd9bb74..8cc899f22e 100644
--- a/.meteorignore
+++ b/.meteorignore
@@ -1,4 +1,3 @@
 /testapp
 /tests
 **/*tests.js
-/examples

From 0caa9f807944d1203ba4aa1ad112b74a95dda460 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:41:04 +0200
Subject: [PATCH 0421/1140] ci: add testsuite

---
 .github/workflows/testsuite.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 54a3d3794e..2b007de657 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -30,15 +30,15 @@ jobs:
       - run: cd testapp && npm ci && npm run setup && npm run lint
 
   test:
-    name: Meteor package tests
+    name: Meteor ${{ matrix.meteorRelease }} package tests
     needs: [lint]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         meteorRelease:
-          - '2.3'
-          - '2.7.3'
-          - '2.12'
+          - '--release 2.3'
+          - '--release 2.7.3'
+          - '--release 2.12.0'
           # Latest version
     steps:
       - name: Checkout code
@@ -49,7 +49,7 @@ jobs:
         with:
           node-version: 16
 
-      - name: Setup meteor ${{ matrix.meteorRelease }}
+      - name: Setup meteor
         uses: meteorengineer/setup-meteor@v1
         with:
           meteor-release: ${{ matrix.meteorRelease }}
@@ -62,4 +62,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-16-
 
-      - run: cd testapp && npm ci && npm run setup && npm run test
+      - run: cd testapp && npm run ci && npm run setup && npm run test

From f95eea63e4abc52ef431e41a731832a45a58ddc8 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:46:34 +0200
Subject: [PATCH 0422/1140] core: ignore examples folder on publishing

---
 .meteorignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.meteorignore b/.meteorignore
index 8cc899f22e..e5abd9bb74 100644
--- a/.meteorignore
+++ b/.meteorignore
@@ -1,3 +1,4 @@
 /testapp
 /tests
 **/*tests.js
+/examples

From c6920ac966ca7e1ce977658e72a390f6e39fb285 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:48:04 +0200
Subject: [PATCH 0423/1140] ci: fix matrix args

---
 .github/workflows/testsuite.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 2b007de657..a192827a17 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -30,15 +30,15 @@ jobs:
       - run: cd testapp && npm ci && npm run setup && npm run lint
 
   test:
-    name: Meteor ${{ matrix.meteorRelease }} package tests
+    name: Meteor package tests
     needs: [lint]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         meteorRelease:
-          - '--release 2.3'
-          - '--release 2.7.3'
-          - '--release 2.12.0'
+          - '2.3'
+          - '2.7.3'
+          - '2.12.0'
           # Latest version
     steps:
       - name: Checkout code
@@ -49,7 +49,7 @@ jobs:
         with:
           node-version: 16
 
-      - name: Setup meteor
+      - name: Setup meteor ${{ matrix.meteorRelease }}
         uses: meteorengineer/setup-meteor@v1
         with:
           meteor-release: ${{ matrix.meteorRelease }}

From ab44ffe6d9e720546002b6a6534e812de103726c Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:50:54 +0200
Subject: [PATCH 0424/1140] build(core): move chai dependency to package.json

---
 package.js                |  4 ---
 testapp/package-lock.json | 65 ++++++++++++++++++++++++++++++++++++++-
 testapp/package.json      |  1 +
 3 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/package.js b/package.js
index baf94dce79..db40327c09 100644
--- a/package.js
+++ b/package.js
@@ -44,10 +44,6 @@ Package.onTest(function (api) {
     'meteortesting:mocha@2.1.0'
   ])
 
-  Npm.depends({
-    chai: '4.2.0'
-  })
-
   api.versionsFrom('2.3')
 
   const both = ['client', 'server']
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 375467bbb8..4d42b56eef 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "someapp",
+  "name": "testapp",
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
@@ -741,6 +741,12 @@
       "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
       "optional": true
     },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
     "available-typed-arrays": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
@@ -962,6 +968,21 @@
       "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
       "dev": true
     },
+    "chai": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^4.1.2",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -973,6 +994,12 @@
         "supports-color": "^5.3.0"
       }
     },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true
+    },
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -1159,6 +1186,15 @@
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true
     },
+    "deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -2194,6 +2230,12 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true
+    },
     "get-intrinsic": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
@@ -2935,6 +2977,15 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "loupe": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.0"
+      }
+    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -4129,6 +4180,12 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
+    "pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true
+    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -4937,6 +4994,12 @@
       "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
       "optional": true
     },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
     "type-fest": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
diff --git a/testapp/package.json b/testapp/package.json
index 2902dffc11..e70b46da6a 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -17,6 +17,7 @@
   },
   "devDependencies": {
     "babel-plugin-istanbul": "^6.1.1",
+    "chai": "^4.3.7",
     "nyc": "^15.1.0",
     "puppeteer": "^19.4.0",
     "standard": "^17.1.0"

From a690b716917c625007ca12a3d432bd724bd17068 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 11:55:02 +0200
Subject: [PATCH 0425/1140] fix(tests): use correct path in testapp setup
 script

---
 testapp/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testapp/package.json b/testapp/package.json
index e70b46da6a..e26525cab6 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -2,7 +2,7 @@
   "name": "testapp",
   "private": true,
   "scripts": {
-    "setup": "mkdir packages && ln -s ../../ ./packages/roles",
+    "setup": "mkdir packages && ln -s ../ ./packages/roles",
     "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
     "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
     "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",

From 5e788e2ca78245b952b447f50015ee19641d3742 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:08:23 +0200
Subject: [PATCH 0426/1140] fix(tests/ci): update paths and lint args to run
 linter

---
 testapp/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/testapp/package.json b/testapp/package.json
index e26525cab6..f894d6e5ad 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -2,13 +2,13 @@
   "name": "testapp",
   "private": true,
   "scripts": {
-    "setup": "mkdir packages && ln -s ../ ./packages/roles",
-    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
-    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/roles",
-    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/roles",
+    "setup": "mkdir -p packages && ln -sfn ../../ ./packages/meteor-roles",
+    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
     "report": "nyc report -t .coverage",
-    "lint": "standard -v ./packages/roles",
-    "lint:fix": "standard --fix -v ./packages/roles"
+    "lint": "standard ../",
+    "lint:fix": "standard --fix ../"
   },
   "dependencies": {
     "@babel/runtime": "^7.17.9",

From 5ab110641d03e7a6ba228c200e927a81ffe148f5 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:10:55 +0200
Subject: [PATCH 0427/1140] ci: fix tests install

---
 .github/workflows/testsuite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index a192827a17..b7db8de65f 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -62,4 +62,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-16-
 
-      - run: cd testapp && npm run ci && npm run setup && npm run test
+      - run: cd testapp && npm ci && npm run setup && npm run test

From 111c251bbeaa3b1168f177e4b7a07db450bb8617 Mon Sep 17 00:00:00 2001
From: jankapunkt <jkuester@uni-bremen.de>
Date: Tue, 1 Aug 2023 12:14:30 +0200
Subject: [PATCH 0428/1140] ci: fix meteor version to 2.12

---
 .github/workflows/testsuite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index b7db8de65f..54a3d3794e 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -38,7 +38,7 @@ jobs:
         meteorRelease:
           - '2.3'
           - '2.7.3'
-          - '2.12.0'
+          - '2.12'
           # Latest version
     steps:
       - name: Checkout code

From 20ab907ce764196e4c19d2455bc2248a722841d9 Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Tue, 1 Aug 2023 13:40:33 +0200
Subject: [PATCH 0429/1140] rebase

---
 .DS_Store                           |  Bin 0 -> 6148 bytes
 roles/.DS_Store                     |  Bin 0 -> 6148 bytes
 someapp/.coverage.json              |    6 +
 someapp/.gitignore                  |    1 +
 someapp/.meteor/.finished-upgraders |   19 +
 someapp/.meteor/.gitignore          |    1 +
 someapp/.meteor/.id                 |    7 +
 someapp/.meteor/packages            |   18 +
 someapp/.meteor/platforms           |    2 +
 someapp/.meteor/release             |    1 +
 someapp/.meteor/versions            |   57 ++
 someapp/client/main.css             |    4 +
 someapp/client/main.html            |   21 +
 someapp/client/main.js              |    1 +
 someapp/package-lock.json           | 1428 +++++++++++++++++++++++++++
 someapp/package.json                |   22 +
 someapp/packages/roles              |    1 +
 someapp/server/main.js              |   15 +
 someapp/tests/main.js               |   20 +
 19 files changed, 1624 insertions(+)
 create mode 100644 .DS_Store
 create mode 100644 roles/.DS_Store
 create mode 100644 someapp/.coverage.json
 create mode 100644 someapp/.gitignore
 create mode 100644 someapp/.meteor/.finished-upgraders
 create mode 100644 someapp/.meteor/.gitignore
 create mode 100644 someapp/.meteor/.id
 create mode 100644 someapp/.meteor/packages
 create mode 100644 someapp/.meteor/platforms
 create mode 100644 someapp/.meteor/release
 create mode 100644 someapp/.meteor/versions
 create mode 100644 someapp/client/main.css
 create mode 100644 someapp/client/main.html
 create mode 100644 someapp/client/main.js
 create mode 100644 someapp/package-lock.json
 create mode 100644 someapp/package.json
 create mode 120000 someapp/packages/roles
 create mode 100644 someapp/server/main.js
 create mode 100644 someapp/tests/main.js

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..97a2704690b7e919d553c06d7dd398da483f2f27
GIT binary patch
literal 6148
zcmeHKI|>3Z5S{S@f{mqRuHX%V=n1@lg<>NLiq>0sE|2D$PqQrBt%dRiCNG)HOUNsB
zc0@$ikHbo2AtE!lp}cJ9n(do+Y?KiN!g0p^xw~D?*UPDs+ZQnIRBm#Wvm9G|+o4eb
zDnJFO02QDDLo1LKb~YdSV4g<>sKC!FVBd!VH>`<Gpnp0rcnbiWAnb;@_Y%Nj0bosR
z0ug~}P=P_!Y%w(Gh?mT(iA`Y8MYH+PyjinDQNJDM7f%<hfgGs-6=*9kj^)DY{}$fU
z|F=n8Q2{FOR|@E4v)iokq^zx-$62i{@IBme-f%O_or1y3G0@8~7FLdzo)me-=Gd=^
UO`y{ecRG+i1Evd&3Vd6E59{?5-T(jq

literal 0
HcmV?d00001

diff --git a/roles/.DS_Store b/roles/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..08f885a9493341c272bf64c0c0e3f8b93ed6b7f2
GIT binary patch
literal 6148
zcmeHK!A=4}41I$fAYO<kkMje9c=5UtxTyz;o<(;PNI(p*8gKjQzP1wrSxvlXh-pdt
zx}CN&`zG080E9uA_kj+87FDp(rujl-T(l;Q6cG&C;|3!{T=3VeWqaTd8IZj@!5#PQ
z3PbGf-#IS1i+!~V<gc5j>vFwWF@JzDKCs3H1s3Sx0ZYtL(k~e8vCo8K6MFZ2F0j(*
zGp6)rS~uh93*Kp`tSp$B)4oyX^resVUNZlTD&4K~uK)9O-==l9_ujM1dGbTt5?_-u
z;0!nezs>;9Y?0Qnp<8Fb8E^)+49NE(QU$Ywm7#t*X!Hs|Y%;7uU+xl86BA|$D?^S@
zf|U}jG^8s=uyV#@%F7Z~hE|TCGqX>cIiwp((AgP}nvReex^)Jefqe#!?6D)~|LFVs
z|9+7_IRnnXzhWRXhvVUZuawT#+RMpV8>x>}5y`6zw<UD+C}yr4#ivvi#-ljIEMaBH
Q2*v*hC=G6$fj?#76Q+kZjsO4v

literal 0
HcmV?d00001

diff --git a/someapp/.coverage.json b/someapp/.coverage.json
new file mode 100644
index 0000000000..918fc8889e
--- /dev/null
+++ b/someapp/.coverage.json
@@ -0,0 +1,6 @@
+{
+  "include": [
+    "**/packages/roles/**/*",
+    "**/packages/*alanning_roles.js"
+  ]
+}
diff --git a/someapp/.gitignore b/someapp/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/someapp/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/someapp/.meteor/.finished-upgraders b/someapp/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..c07b6ff75a
--- /dev/null
+++ b/someapp/.meteor/.finished-upgraders
@@ -0,0 +1,19 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/someapp/.meteor/.gitignore b/someapp/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/someapp/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/someapp/.meteor/.id b/someapp/.meteor/.id
new file mode 100644
index 0000000000..fedba0b55e
--- /dev/null
+++ b/someapp/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+mgytvi9cz557.lvsfnftl2z8
diff --git a/someapp/.meteor/packages b/someapp/.meteor/packages
new file mode 100644
index 0000000000..63f32aa28d
--- /dev/null
+++ b/someapp/.meteor/packages
@@ -0,0 +1,18 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor@1.11.2                  # Shared foundation for all Meteor packages
+static-html@1.3.2             # Define static page content in .html files
+standard-minifier-css@1.9.2   # CSS minifier run for production mode
+standard-minifier-js@2.8.1    # JS minifier run for production mode
+es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
+ecmascript@0.16.7              # Enable ECMAScript2015+ syntax in app code
+typescript@4.9.4              # Enable TypeScript syntax in .ts and .tsx modules
+shell-server@0.5.0            # Server-side component of the `meteor shell` command
+webapp@1.13.5                  # Serves a Meteor app over HTTP
+server-render@0.4.1           # Support for server-side rendering
+hot-module-replacement@0.5.3  # Rebuilds the client if there is a change on the client without restarting the server
+
diff --git a/someapp/.meteor/platforms b/someapp/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/someapp/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/someapp/.meteor/release b/someapp/.meteor/release
new file mode 100644
index 0000000000..e8cfc7ec4c
--- /dev/null
+++ b/someapp/.meteor/release
@@ -0,0 +1 @@
+METEOR@2.12
diff --git a/someapp/.meteor/versions b/someapp/.meteor/versions
new file mode 100644
index 0000000000..67a85b1d57
--- /dev/null
+++ b/someapp/.meteor/versions
@@ -0,0 +1,57 @@
+autoupdate@1.8.0
+babel-compiler@7.10.4
+babel-runtime@1.5.1
+base64@1.0.12
+blaze-tools@1.1.3
+boilerplate-generator@1.7.1
+caching-compiler@1.2.2
+caching-html-compiler@1.2.1
+callback-hook@1.5.1
+check@1.3.2
+ddp@1.4.1
+ddp-client@2.6.1
+ddp-common@1.4.0
+ddp-server@2.6.1
+diff-sequence@1.1.2
+dynamic-import@0.7.3
+ecmascript@0.16.7
+ecmascript-runtime@0.8.1
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
+ejson@1.1.3
+es5-shim@4.8.0
+fetch@0.1.3
+hot-code-push@1.0.4
+hot-module-replacement@0.5.3
+html-tools@1.1.3
+htmljs@1.1.1
+id-map@1.1.1
+inter-process-messaging@0.1.1
+logging@1.3.2
+meteor@1.11.2
+minifier-css@1.6.4
+minifier-js@2.7.5
+modern-browsers@0.1.9
+modules@0.19.0
+modules-runtime@0.13.1
+modules-runtime-hot@0.14.2
+mongo-id@1.0.8
+promise@0.12.2
+random@1.2.1
+react-fast-refresh@0.2.7
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.1
+server-render@0.4.1
+shell-server@0.5.0
+socket-stream-client@0.5.1
+spacebars-compiler@1.3.1
+standard-minifier-css@1.9.2
+standard-minifier-js@2.8.1
+static-html@1.3.2
+templating-tools@1.2.2
+tracker@1.3.2
+typescript@4.9.4
+underscore@1.0.13
+webapp@1.13.5
+webapp-hashing@1.1.1
diff --git a/someapp/client/main.css b/someapp/client/main.css
new file mode 100644
index 0000000000..7f354f0fa7
--- /dev/null
+++ b/someapp/client/main.css
@@ -0,0 +1,4 @@
+body {
+  padding: 10px;
+  font-family: sans-serif;
+}
diff --git a/someapp/client/main.html b/someapp/client/main.html
new file mode 100644
index 0000000000..19789db4de
--- /dev/null
+++ b/someapp/client/main.html
@@ -0,0 +1,21 @@
+<head>
+  <title>Minimal Meteor app</title>
+</head>
+
+<body>
+  <h1>Minimal Meteor app</h1>
+  <p>
+    This Meteor app uses as few Meteor packages as possible, to keep the
+    client JavaScript bundle as small as possible.
+  </p>
+
+  <em id="server-render-target"></em>
+
+  <h2>Learn Meteor!</h2>
+  <ul>
+    <li><a href="https://www.meteor.com/try" target="_blank">Do the Tutorial</a></li>
+    <li><a href="http://guide.meteor.com" target="_blank">Follow the Guide</a></li>
+    <li><a href="https://docs.meteor.com" target="_blank">Read the Docs</a></li>
+    <li><a href="https://forums.meteor.com" target="_blank">Discussions</a></li>
+  </ul>
+</body>
diff --git a/someapp/client/main.js b/someapp/client/main.js
new file mode 100644
index 0000000000..fb4b5bae20
--- /dev/null
+++ b/someapp/client/main.js
@@ -0,0 +1 @@
+console.log(`Greetings from ${module.id}!`)
diff --git a/someapp/package-lock.json b/someapp/package-lock.json
new file mode 100644
index 0000000000..ef2dbadb4e
--- /dev/null
+++ b/someapp/package-lock.json
@@ -0,0 +1,1428 @@
+{
+  "name": "someapp",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "requires": {
+        "@babel/highlight": "^7.22.5"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
+    },
+    "@babel/highlight": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
+      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "requires": {
+        "regenerator-runtime": "^0.13.11"
+      }
+    },
+    "@puppeteer/browsers": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.5.tgz",
+      "integrity": "sha512-a0gpUa+XlxZHotoOklh99X6RC5R+hQGcVcYOH+oOIEBfQXPp8Z5c765XAu/zhxsjRuAZN4Xx4vZNlwN4wJro2A==",
+      "requires": {
+        "debug": "4.3.4",
+        "extract-zip": "2.0.1",
+        "http-proxy-agent": "7.0.0",
+        "https-proxy-agent": "7.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "socks-proxy-agent": "8.0.1",
+        "tar-fs": "3.0.4",
+        "unbzip2-stream": "1.4.3",
+        "yargs": "17.7.1"
+      }
+    },
+    "@types/node": {
+      "version": "20.4.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.2.tgz",
+      "integrity": "sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw==",
+      "optional": true
+    },
+    "@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "agent-base": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
+      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
+      "requires": {
+        "debug": "^4.3.4"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "b4a": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
+      "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+        }
+      }
+    },
+    "chromium-bidi": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.16.tgz",
+      "integrity": "sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==",
+      "requires": {
+        "mitt": "3.0.0"
+      }
+    },
+    "cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "cosmiconfig": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
+      "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
+      "requires": {
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0"
+      }
+    },
+    "cross-fetch": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+      "requires": {
+        "node-fetch": "^2.6.12"
+      }
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "devtools-protocol": {
+      "version": "0.0.1135028",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1135028.tgz",
+      "integrity": "sha512-jEcNGrh6lOXNRJvZb9RjeevtZGrgugPKSMJZxfyxWQnhlKawMPhMtk/dfC+Z/6xNXExlzTKlY5LzIAK/fRpQIw=="
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+    },
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      }
+    },
+    "fast-fifo": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.0.tgz",
+      "integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw=="
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+    },
+    "get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+    },
+    "http-proxy-agent": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+      "requires": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      }
+    },
+    "https-proxy-agent": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz",
+      "integrity": "sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==",
+      "requires": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "meteor-node-stubs": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.5.tgz",
+      "integrity": "sha512-FLlOFZx3KnZ5s3yPCK+x58DyX9ewN+oQ12LcpwBXMLtzJ/YyprMQVivd6KIrahZbKJrNenPNUGuDS37WUFg+Mw==",
+      "requires": {
+        "assert": "^2.0.0",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^5.7.1",
+        "console-browserify": "^1.2.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.12.0",
+        "domain-browser": "^4.22.0",
+        "elliptic": "^6.5.4",
+        "events": "^3.3.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^3.6.0",
+        "stream-browserify": "^3.0.0",
+        "stream-http": "^3.2.0",
+        "string_decoder": "^1.3.0",
+        "timers-browserify": "^2.0.12",
+        "tty-browserify": "0.0.1",
+        "url": "^0.11.0",
+        "util": "^0.12.4",
+        "vm-browserify": "^1.1.2"
+      },
+      "dependencies": {
+        "asn1.js": {
+          "version": "5.4.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0",
+            "safer-buffer": "^2.1.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "assert": {
+          "version": "2.0.0",
+          "bundled": true,
+          "requires": {
+            "es6-object-assign": "^1.1.0",
+            "is-nan": "^1.2.1",
+            "object-is": "^1.0.1",
+            "util": "^0.12.0"
+          }
+        },
+        "available-typed-arrays": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "base64-js": {
+          "version": "1.5.1",
+          "bundled": true
+        },
+        "bn.js": {
+          "version": "5.2.0",
+          "bundled": true
+        },
+        "brorand": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "browserify-aes": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "buffer-xor": "^1.0.3",
+            "cipher-base": "^1.0.0",
+            "create-hash": "^1.1.0",
+            "evp_bytestokey": "^1.0.3",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "browserify-cipher": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "browserify-aes": "^1.0.4",
+            "browserify-des": "^1.0.0",
+            "evp_bytestokey": "^1.0.0"
+          }
+        },
+        "browserify-des": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "des.js": "^1.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "browserify-rsa": {
+          "version": "4.1.0",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.0.0",
+            "randombytes": "^2.0.1"
+          }
+        },
+        "browserify-sign": {
+          "version": "4.2.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^5.1.1",
+            "browserify-rsa": "^4.0.1",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "elliptic": "^6.5.3",
+            "inherits": "^2.0.4",
+            "parse-asn1": "^5.1.5",
+            "readable-stream": "^3.6.0",
+            "safe-buffer": "^5.2.0"
+          }
+        },
+        "browserify-zlib": {
+          "version": "0.2.0",
+          "bundled": true,
+          "requires": {
+            "pako": "~1.0.5"
+          }
+        },
+        "buffer": {
+          "version": "5.7.1",
+          "bundled": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "buffer-xor": {
+          "version": "1.0.3",
+          "bundled": true
+        },
+        "builtin-status-codes": {
+          "version": "3.0.0",
+          "bundled": true
+        },
+        "call-bind": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.0.2"
+          }
+        },
+        "cipher-base": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "console-browserify": {
+          "version": "1.2.0",
+          "bundled": true
+        },
+        "constants-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "create-ecdh": {
+          "version": "4.0.4",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "elliptic": "^6.5.3"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "create-hash": {
+          "version": "1.2.0",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.1",
+            "inherits": "^2.0.1",
+            "md5.js": "^1.3.4",
+            "ripemd160": "^2.0.1",
+            "sha.js": "^2.4.0"
+          }
+        },
+        "create-hmac": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "cipher-base": "^1.0.3",
+            "create-hash": "^1.1.0",
+            "inherits": "^2.0.1",
+            "ripemd160": "^2.0.0",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "crypto-browserify": {
+          "version": "3.12.0",
+          "bundled": true,
+          "requires": {
+            "browserify-cipher": "^1.0.0",
+            "browserify-sign": "^4.0.0",
+            "create-ecdh": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "create-hmac": "^1.1.0",
+            "diffie-hellman": "^5.0.0",
+            "inherits": "^2.0.1",
+            "pbkdf2": "^3.0.3",
+            "public-encrypt": "^4.0.0",
+            "randombytes": "^2.0.0",
+            "randomfill": "^1.0.3"
+          }
+        },
+        "define-properties": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "object-keys": "^1.0.12"
+          }
+        },
+        "des.js": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0"
+          }
+        },
+        "diffie-hellman": {
+          "version": "5.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "miller-rabin": "^4.0.0",
+            "randombytes": "^2.0.0"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "domain-browser": {
+          "version": "4.22.0",
+          "bundled": true
+        },
+        "elliptic": {
+          "version": "6.5.4",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.11.9",
+            "brorand": "^1.1.0",
+            "hash.js": "^1.0.0",
+            "hmac-drbg": "^1.0.1",
+            "inherits": "^2.0.4",
+            "minimalistic-assert": "^1.0.1",
+            "minimalistic-crypto-utils": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "es-abstract": {
+          "version": "1.18.3",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.3",
+            "is-string": "^1.0.6",
+            "object-inspect": "^1.10.3",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "bundled": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "es6-object-assign": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "events": {
+          "version": "3.3.0",
+          "bundled": true
+        },
+        "evp_bytestokey": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "md5.js": "^1.3.4",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "foreach": {
+          "version": "2.0.5",
+          "bundled": true
+        },
+        "function-bind": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "get-intrinsic": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "has": {
+          "version": "1.0.3",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        },
+        "has-bigints": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "hash-base": {
+          "version": "3.1.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "safe-buffer": "^5.2.0"
+          }
+        },
+        "hash.js": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "minimalistic-assert": "^1.0.1"
+          }
+        },
+        "hmac-drbg": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "hash.js": "^1.0.3",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.1"
+          }
+        },
+        "https-browserify": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "ieee754": {
+          "version": "1.2.1",
+          "bundled": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true
+        },
+        "is-arguments": {
+          "version": "1.1.0",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0"
+          }
+        },
+        "is-bigint": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "is-boolean-object": {
+          "version": "1.1.1",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2"
+          }
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "bundled": true
+        },
+        "is-date-object": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "is-generator-function": {
+          "version": "1.0.9",
+          "bundled": true
+        },
+        "is-nan": {
+          "version": "1.3.2",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "is-negative-zero": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "is-number-object": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "is-regex": {
+          "version": "1.1.3",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.2"
+          }
+        },
+        "is-string": {
+          "version": "1.0.6",
+          "bundled": true
+        },
+        "is-symbol": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "has-symbols": "^1.0.2"
+          }
+        },
+        "is-typed-array": {
+          "version": "1.1.5",
+          "bundled": true,
+          "requires": {
+            "available-typed-arrays": "^1.0.2",
+            "call-bind": "^1.0.2",
+            "es-abstract": "^1.18.0-next.2",
+            "foreach": "^2.0.5",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "md5.js": {
+          "version": "1.3.5",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          }
+        },
+        "miller-rabin": {
+          "version": "4.0.1",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.0.0",
+            "brorand": "^1.0.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "minimalistic-assert": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "minimalistic-crypto-utils": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-inspect": {
+          "version": "1.10.3",
+          "bundled": true
+        },
+        "object-is": {
+          "version": "1.1.5",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "object-keys": {
+          "version": "1.1.1",
+          "bundled": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "os-browserify": {
+          "version": "0.3.0",
+          "bundled": true
+        },
+        "pako": {
+          "version": "1.0.11",
+          "bundled": true
+        },
+        "parse-asn1": {
+          "version": "5.1.6",
+          "bundled": true,
+          "requires": {
+            "asn1.js": "^5.2.0",
+            "browserify-aes": "^1.0.0",
+            "evp_bytestokey": "^1.0.0",
+            "pbkdf2": "^3.0.3",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "path-browserify": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "pbkdf2": {
+          "version": "3.1.2",
+          "bundled": true,
+          "requires": {
+            "create-hash": "^1.1.2",
+            "create-hmac": "^1.1.4",
+            "ripemd160": "^2.0.1",
+            "safe-buffer": "^5.0.1",
+            "sha.js": "^2.4.8"
+          }
+        },
+        "process": {
+          "version": "0.11.10",
+          "bundled": true
+        },
+        "public-encrypt": {
+          "version": "4.0.3",
+          "bundled": true,
+          "requires": {
+            "bn.js": "^4.1.0",
+            "browserify-rsa": "^4.0.0",
+            "create-hash": "^1.1.0",
+            "parse-asn1": "^5.0.0",
+            "randombytes": "^2.0.1",
+            "safe-buffer": "^5.1.2"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "4.12.0",
+              "bundled": true
+            }
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true
+        },
+        "querystring": {
+          "version": "0.2.0",
+          "bundled": true
+        },
+        "querystring-es3": {
+          "version": "0.2.1",
+          "bundled": true
+        },
+        "randombytes": {
+          "version": "2.1.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "randomfill": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "randombytes": "^2.0.5",
+            "safe-buffer": "^5.1.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "ripemd160": {
+          "version": "2.0.2",
+          "bundled": true,
+          "requires": {
+            "hash-base": "^3.0.0",
+            "inherits": "^2.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "bundled": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true
+        },
+        "setimmediate": {
+          "version": "1.0.5",
+          "bundled": true
+        },
+        "sha.js": {
+          "version": "2.4.11",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "stream-browserify": {
+          "version": "3.0.0",
+          "bundled": true,
+          "requires": {
+            "inherits": "~2.0.4",
+            "readable-stream": "^3.5.0"
+          }
+        },
+        "stream-http": {
+          "version": "3.2.0",
+          "bundled": true,
+          "requires": {
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "xtend": "^4.0.2"
+          }
+        },
+        "string.prototype.trimend": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "string.prototype.trimstart": {
+          "version": "1.0.4",
+          "bundled": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3"
+          }
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        },
+        "timers-browserify": {
+          "version": "2.0.12",
+          "bundled": true,
+          "requires": {
+            "setimmediate": "^1.0.4"
+          }
+        },
+        "tty-browserify": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "unbox-primitive": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has-bigints": "^1.0.1",
+            "has-symbols": "^1.0.2",
+            "which-boxed-primitive": "^1.0.2"
+          }
+        },
+        "url": {
+          "version": "0.11.0",
+          "bundled": true,
+          "requires": {
+            "punycode": "1.3.2",
+            "querystring": "0.2.0"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "1.3.2",
+              "bundled": true
+            }
+          }
+        },
+        "util": {
+          "version": "0.12.4",
+          "bundled": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "is-arguments": "^1.0.4",
+            "is-generator-function": "^1.0.7",
+            "is-typed-array": "^1.1.3",
+            "safe-buffer": "^5.1.2",
+            "which-typed-array": "^1.1.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "vm-browserify": {
+          "version": "1.1.2",
+          "bundled": true
+        },
+        "which-boxed-primitive": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "is-bigint": "^1.0.1",
+            "is-boolean-object": "^1.1.0",
+            "is-number-object": "^1.0.4",
+            "is-string": "^1.0.5",
+            "is-symbol": "^1.0.3"
+          }
+        },
+        "which-typed-array": {
+          "version": "1.1.4",
+          "bundled": true,
+          "requires": {
+            "available-typed-arrays": "^1.0.2",
+            "call-bind": "^1.0.0",
+            "es-abstract": "^1.18.0-next.1",
+            "foreach": "^2.0.5",
+            "function-bind": "^1.1.1",
+            "has-symbols": "^1.0.1",
+            "is-typed-array": "^1.1.3"
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "bundled": true
+        }
+      }
+    },
+    "mitt": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
+      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
+    },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node-fetch": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
+      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "puppeteer": {
+      "version": "20.8.2",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.8.2.tgz",
+      "integrity": "sha512-+VRywTRGF09UyiesFL7pcU19Cq7vf2HsE/eulwSpl7YHcr8g8X+Va4qLmp7mOECwteGvP7rU8vQ7PP43fcubbA==",
+      "requires": {
+        "@puppeteer/browsers": "1.4.5",
+        "cosmiconfig": "8.2.0",
+        "puppeteer-core": "20.8.2"
+      }
+    },
+    "puppeteer-core": {
+      "version": "20.8.2",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.8.2.tgz",
+      "integrity": "sha512-dWo60gFuFPdNhdabW9MMm6GpvkG6tND2D8FvrZ2MF+HggNApHrvLfbERj8vD6vXKV7UqDAJO0KI1OMo3S3Cm5w==",
+      "requires": {
+        "@puppeteer/browsers": "1.4.5",
+        "chromium-bidi": "0.4.16",
+        "cross-fetch": "4.0.0",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1135028",
+        "ws": "8.13.0"
+      }
+    },
+    "queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
+    },
+    "regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+    },
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
+    },
+    "socks": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
+      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "requires": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz",
+      "integrity": "sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==",
+      "requires": {
+        "agent-base": "^7.0.1",
+        "debug": "^4.3.4",
+        "socks": "^2.7.1"
+      }
+    },
+    "streamx": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.0.tgz",
+      "integrity": "sha512-HcxY6ncGjjklGs1xsP1aR71INYcsXFJet5CU1CHqihQ2J5nOsbd4OjgjHO42w/4QNv9gZb3BueV+Vxok5pLEXg==",
+      "requires": {
+        "fast-fifo": "^1.1.0",
+        "queue-tick": "^1.0.1"
+      }
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "tar-fs": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+      "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+      "requires": {
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^3.1.5"
+      }
+    },
+    "tar-stream": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
+      "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+      "requires": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "requires": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "ws": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="
+    },
+    "y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+    },
+    "yargs": {
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "requires": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      }
+    },
+    "yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    }
+  }
+}
diff --git a/someapp/package.json b/someapp/package.json
new file mode 100644
index 0000000000..fd0ec41cc8
--- /dev/null
+++ b/someapp/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "someapp",
+  "private": true,
+  "scripts": {
+    "start": "meteor run",
+    "test": "meteor test --once --driver-package meteortesting:mocha",
+    "test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha",
+    "visualize": "meteor --production --extra-packages bundle-visualizer"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.17.9",
+    "meteor-node-stubs": "^1.2.1",
+    "puppeteer": "^20.8.2"
+  },
+  "meteor": {
+    "mainModule": {
+      "client": "client/main.js",
+      "server": "server/main.js"
+    },
+    "testModule": "tests/main.js"
+  }
+}
diff --git a/someapp/packages/roles b/someapp/packages/roles
new file mode 120000
index 0000000000..6581736d62
--- /dev/null
+++ b/someapp/packages/roles
@@ -0,0 +1 @@
+../../
\ No newline at end of file
diff --git a/someapp/server/main.js b/someapp/server/main.js
new file mode 100644
index 0000000000..0f22191abf
--- /dev/null
+++ b/someapp/server/main.js
@@ -0,0 +1,15 @@
+import { Meteor } from 'meteor/meteor'
+import { onPageLoad } from 'meteor/server-render'
+
+Meteor.startup(() => {
+  // Code to run on server startup.
+  console.log(`Greetings from ${module.id}!`)
+})
+
+onPageLoad(sink => {
+  // Code to run on every request.
+  sink.renderIntoElementById(
+    'server-render-target',
+    `Server time: ${new Date()}`
+  )
+})
diff --git a/someapp/tests/main.js b/someapp/tests/main.js
new file mode 100644
index 0000000000..9a7482e75c
--- /dev/null
+++ b/someapp/tests/main.js
@@ -0,0 +1,20 @@
+import assert from 'assert'
+
+describe('someapp', function () {
+  it('package.json has correct name', async function () {
+    const { name } = await import('../package.json')
+    assert.strictEqual(name, 'someapp')
+  })
+
+  if (Meteor.isClient) {
+    it('client is not server', function () {
+      assert.strictEqual(Meteor.isServer, false)
+    })
+  }
+
+  if (Meteor.isServer) {
+    it('server is not client', function () {
+      assert.strictEqual(Meteor.isClient, false)
+    })
+  }
+})

From a934d0e5ad3593393195b25973579a5ce0abe53a Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 24 Aug 2023 11:27:05 +0200
Subject: [PATCH 0430/1140] UI helpers console logs to debugs

---
 roles/client/uiHelpers.js |  8 ++--
 roles/versions.json       | 95 ---------------------------------------
 2 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 roles/versions.json

diff --git a/roles/client/uiHelpers.js b/roles/client/uiHelpers.js
index e73040a817..0414adc359 100644
--- a/roles/client/uiHelpers.js
+++ b/roles/client/uiHelpers.js
@@ -73,16 +73,16 @@ Roles._uiHelpers = {
 // Register UI helpers
 //
 
-if (Roles.debug && console.log) {
-  console.log('[roles] Roles.debug =', Roles.debug)
+if (Roles.debug && console.debug) {
+  console.debug('[roles] Roles.debug =', Roles.debug)
 }
 
 if (typeof Package.blaze !== 'undefined' &&
     typeof Package.blaze.Blaze !== 'undefined' &&
     typeof Package.blaze.Blaze.registerHelper === 'function') {
   Object.entries(Roles._uiHelpers).forEach(([name, func]) => {
-    if (Roles.debug && console.log) {
-      console.log('[roles] registering Blaze helper \'' + name + '\'')
+    if (Roles.debug && console.debug) {
+      console.debug('[roles] registering Blaze helper \'' + name + '\'')
     }
     Package.blaze.Blaze.registerHelper(name, func)
   })
diff --git a/roles/versions.json b/roles/versions.json
deleted file mode 100644
index 82627b707d..0000000000
--- a/roles/versions.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "dependencies": [
-    [
-      "accounts-base",
-      "1.0.0"
-    ],
-    [
-      "application-configuration",
-      "1.0.0"
-    ],
-    [
-      "binary-heap",
-      "1.0.0"
-    ],
-    [
-      "callback-hook",
-      "1.0.0"
-    ],
-    [
-      "check",
-      "1.0.0"
-    ],
-    [
-      "deps",
-      "1.0.1"
-    ],
-    [
-      "ejson",
-      "1.0.0"
-    ],
-    [
-      "follower-livedata",
-      "1.0.0"
-    ],
-    [
-      "geojson-utils",
-      "1.0.0"
-    ],
-    [
-      "id-map",
-      "1.0.0"
-    ],
-    [
-      "json",
-      "1.0.0"
-    ],
-    [
-      "livedata",
-      "1.0.7"
-    ],
-    [
-      "localstorage",
-      "1.0.0"
-    ],
-    [
-      "logging",
-      "1.0.2"
-    ],
-    [
-      "meteor",
-      "1.0.2"
-    ],
-    [
-      "minimongo",
-      "1.0.1"
-    ],
-    [
-      "mongo-livedata",
-      "1.0.3"
-    ],
-    [
-      "ordered-dict",
-      "1.0.0"
-    ],
-    [
-      "random",
-      "1.0.0"
-    ],
-    [
-      "retry",
-      "1.0.0"
-    ],
-    [
-      "service-configuration",
-      "1.0.0"
-    ],
-    [
-      "underscore",
-      "1.0.0"
-    ]
-  ],
-  "pluginDependencies": [],
-  "toolVersion": "meteor-tool@1.0.16",
-  "format": "1.0"
-}
\ No newline at end of file

From 2d57e390d9c79a80001d94d1a49b1547d808a924 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 24 Aug 2023 11:31:45 +0200
Subject: [PATCH 0431/1140] Prep package.js for v4

---
 package.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.js b/package.js
index 632bc37463..12c902ddd0 100644
--- a/package.js
+++ b/package.js
@@ -2,13 +2,13 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.5.1',
+  version: '4.0.0-alpha.1',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['1.12', '2.3', '2.8.0'])
+  api.versionsFrom(['2.8.1', '3.0-alpha.11'])
 
   const both = ['client', 'server']
 
@@ -43,7 +43,7 @@ Package.onTest(function (api) {
     'meteortesting:mocha@2.1.0'
   ])
 
-  api.versionsFrom('2.3')
+  api.versionsFrom('2.8.1')
 
   const both = ['client', 'server']
 

From 9e7275bdb29b7e0963ca314ef585102ec74034e0 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 24 Aug 2023 11:32:19 +0200
Subject: [PATCH 0432/1140] Update lmieulet:meteor-coverage

---
 package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.js b/package.js
index 632bc37463..5cd7213e3d 100644
--- a/package.js
+++ b/package.js
@@ -39,7 +39,7 @@ Package.onTest(function (api) {
   // Add code coverage
   api.use([
     'lmieulet:meteor-legacy-coverage',
-    'lmieulet:meteor-coverage@3.2.0',
+    'lmieulet:meteor-coverage@4.1.0',
     'meteortesting:mocha@2.1.0'
   ])
 

From 1c3c756ed27e7dda69622a3c5929452e72ba4ec3 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 24 Aug 2023 12:09:56 +0200
Subject: [PATCH 0433/1140] =?UTF-8?q?Run=20lint=20&=20fix=20lint=20issues?=
 =?UTF-8?q?=20=F0=9F=92=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/roles_common_async.js | 661 ++++++++++++++++++------------------
 roles/roles_server.js       | 187 +++++-----
 someapp/tests/main.js       |   2 +
 testapp/package-lock.json   |  14 +-
 testapp/package.json        |   4 +-
 5 files changed, 425 insertions(+), 443 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 5d71357dd5..9a97bee87b 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -25,21 +25,21 @@
  * @module Roles
  */
 if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection("roles");
+  Meteor.roles = new Mongo.Collection('roles')
 }
 
 if (!Meteor.roleAssignment) {
-  Meteor.roleAssignment = new Mongo.Collection("role-assignment");
+  Meteor.roleAssignment = new Mongo.Collection('role-assignment')
 }
 
 /**
  * @class Roles
  */
-if (typeof Roles === "undefined") {
-  Roles = {}; // eslint-disable-line no-global-assign
+if (typeof Roles === 'undefined') {
+  Roles = {} // eslint-disable-line no-global-assign
 }
 
-var getGroupsForUserDeprecationWarning = false;
+let getGroupsForUserDeprecationWarning = false
 
 /**
  * Helper, resolves async some
@@ -48,11 +48,11 @@ var getGroupsForUserDeprecationWarning = false;
  * @returns
  */
 const asyncSome = async (arr, predicate) => {
-  for (let e of arr) {
-    if (await predicate(e)) return true;
+  for (const e of arr) {
+    if (await predicate(e)) return true
   }
-  return false;
-};
+  return false
+}
 
 Object.assign(Roles, {
   /**
@@ -75,38 +75,38 @@ Object.assign(Roles, {
    * @static
    */
   createRoleAsync: async function (roleName, options) {
-    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(roleName)
 
     options = Object.assign(
       {
-        unlessExists: false,
+        unlessExists: false
       },
       options
-    );
+    )
 
-    let insertedId = null;
+    let insertedId = null
 
-    const existingRole = await Meteor.roles.findOneAsync({ _id: roleName });
+    const existingRole = await Meteor.roles.findOneAsync({ _id: roleName })
 
     if (existingRole) {
       await Meteor.roles.updateAsync(
         { _id: roleName },
         { $setOnInsert: { children: [] } }
-      );
-      return null;
+      )
+      return null
     } else {
       insertedId = await Meteor.roles.insertAsync({
         _id: roleName,
-        children: [],
-      });
+        children: []
+      })
     }
 
     if (!insertedId) {
-      if (options.unlessExists) return null;
-      throw new Error("Role '" + roleName + "' already exists.");
+      if (options.unlessExists) return null
+      throw new Error("Role '" + roleName + "' already exists.")
     }
 
-    return insertedId;
+    return insertedId
   },
 
   /**
@@ -119,59 +119,59 @@ Object.assign(Roles, {
    * @static
    */
   deleteRoleAsync: async function (roleName) {
-    var roles;
-    var inheritedRoles;
+    let roles
+    let inheritedRoles
 
-    Roles._checkRoleName(roleName);
+    Roles._checkRoleName(roleName)
 
     // Remove all assignments
     await Meteor.roleAssignment.removeAsync({
-      "role._id": roleName,
-    });
+      'role._id': roleName
+    })
 
     do {
       // For all roles who have it as a dependency ...
       roles = Roles._getParentRoleNames(
         await Meteor.roles.findOneAsync({ _id: roleName })
-      );
+      )
 
       for (const r of await Meteor.roles
         .find({ _id: { $in: roles } })
         .fetchAsync()) {
         await Meteor.roles.updateAsync(
           {
-            _id: r._id,
+            _id: r._id
           },
           {
             $pull: {
               children: {
-                _id: roleName,
-              },
-            },
+                _id: roleName
+              }
+            }
           }
-        );
+        )
 
         inheritedRoles = await Roles._getInheritedRoleNamesAsync(
           await Meteor.roles.findOneAsync({ _id: r._id })
-        );
+        )
         await Meteor.roleAssignment.updateAsync(
           {
-            "role._id": r._id,
+            'role._id': r._id
           },
           {
             $set: {
               inheritedRoles: [r._id, ...inheritedRoles].map((r2) => ({
-                _id: r2,
-              })),
-            },
+                _id: r2
+              }))
+            }
           },
           { multi: true }
-        );
+        )
       }
-    } while (roles.length > 0);
+    } while (roles.length > 0)
 
     // And finally remove the role itself
-    await Meteor.roles.removeAsync({ _id: roleName });
+    await Meteor.roles.removeAsync({ _id: roleName })
   },
 
   /**
@@ -183,67 +183,66 @@ Object.assign(Roles, {
    * @static
    */
   renameRoleAsync: async function (oldName, newName) {
-    var role;
-    var count;
+    let count
 
-    Roles._checkRoleName(oldName);
-    Roles._checkRoleName(newName);
+    Roles._checkRoleName(oldName)
+    Roles._checkRoleName(newName)
 
-    if (oldName === newName) return;
+    if (oldName === newName) return
 
-    role = await Meteor.roles.findOneAsync({ _id: oldName });
+    const role = await Meteor.roles.findOneAsync({ _id: oldName })
 
     if (!role) {
-      throw new Error("Role '" + oldName + "' does not exist.");
+      throw new Error("Role '" + oldName + "' does not exist.")
     }
 
-    role._id = newName;
+    role._id = newName
 
-    await Meteor.roles.insertAsync(role);
+    await Meteor.roles.insertAsync(role)
 
     do {
       count = await Meteor.roleAssignment.updateAsync(
         {
-          "role._id": oldName,
+          'role._id': oldName
         },
         {
           $set: {
-            "role._id": newName,
-          },
+            'role._id': newName
+          }
         },
         { multi: true }
-      );
-    } while (count > 0);
+      )
+    } while (count > 0)
 
     do {
       count = await Meteor.roleAssignment.updateAsync(
         {
-          "inheritedRoles._id": oldName,
+          'inheritedRoles._id': oldName
         },
         {
           $set: {
-            "inheritedRoles.$._id": newName,
-          },
+            'inheritedRoles.$._id': newName
+          }
         },
         { multi: true }
-      );
-    } while (count > 0);
+      )
+    } while (count > 0)
 
     do {
       count = await Meteor.roles.updateAsync(
         {
-          "children._id": oldName,
+          'children._id': oldName
         },
         {
           $set: {
-            "children.$._id": newName,
-          },
+            'children.$._id': newName
+          }
         },
         { multi: true }
-      );
-    } while (count > 0);
+      )
+    } while (count > 0)
 
-    await Meteor.roles.removeAsync({ _id: oldName });
+    await Meteor.roles.removeAsync({ _id: oldName })
   },
 
   /**
@@ -259,10 +258,10 @@ Object.assign(Roles, {
    */
   addRolesToParentAsync: async function (rolesNames, parentName) {
     // ensure arrays
-    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
 
     for (const roleName of rolesNames) {
-      await Roles._addRoleToParentAsync(roleName, parentName);
+      await Roles._addRoleToParentAsync(roleName, parentName)
     }
   },
 
@@ -274,62 +273,59 @@ Object.assign(Roles, {
    * @static
    */
   _addRoleToParentAsync: async function (roleName, parentName) {
-    var role;
-    var count;
-
-    Roles._checkRoleName(roleName);
-    Roles._checkRoleName(parentName);
+    Roles._checkRoleName(roleName)
+    Roles._checkRoleName(parentName)
 
     // query to get role's children
-    role = await Meteor.roles.findOneAsync({ _id: roleName });
+    const role = await Meteor.roles.findOneAsync({ _id: roleName })
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.");
+      throw new Error("Role '" + roleName + "' does not exist.")
     }
 
     // detect cycles
     if ((await Roles._getInheritedRoleNamesAsync(role)).includes(parentName)) {
       throw new Error(
         "Roles '" + roleName + "' and '" + parentName + "' would form a cycle."
-      );
+      )
     }
 
-    count = await Meteor.roles.updateAsync(
+    const count = await Meteor.roles.updateAsync(
       {
         _id: parentName,
-        "children._id": {
-          $ne: role._id,
-        },
+        'children._id': {
+          $ne: role._id
+        }
       },
       {
         $push: {
           children: {
-            _id: role._id,
-          },
-        },
+            _id: role._id
+          }
+        }
       }
-    );
+    )
 
     // if there was no change, parent role might not exist, or role is
     // already a subrole; in any case we do not have anything more to do
-    if (!count) return;
+    if (!count) return
 
     await Meteor.roleAssignment.updateAsync(
       {
-        "inheritedRoles._id": parentName,
+        'inheritedRoles._id': parentName
       },
       {
         $push: {
           inheritedRoles: {
             $each: [
               role._id,
-              ...(await Roles._getInheritedRoleNamesAsync(role)),
-            ].map((r) => ({ _id: r })),
-          },
-        },
+              ...(await Roles._getInheritedRoleNamesAsync(role))
+            ].map((r) => ({ _id: r }))
+          }
+        }
       },
       { multi: true }
-    );
+    )
   },
 
   /**
@@ -345,10 +341,10 @@ Object.assign(Roles, {
    */
   removeRolesFromParentAsync: async function (rolesNames, parentName) {
     // ensure arrays
-    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames];
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
 
     for (const roleName of rolesNames) {
-      await Roles._removeRoleFromParentAsync(roleName, parentName);
+      await Roles._removeRoleFromParentAsync(roleName, parentName)
     }
   },
 
@@ -360,65 +356,65 @@ Object.assign(Roles, {
    * @static
    */
   _removeRoleFromParentAsync: async function (roleName, parentName) {
-    Roles._checkRoleName(roleName);
-    Roles._checkRoleName(parentName);
+    Roles._checkRoleName(roleName)
+    Roles._checkRoleName(parentName)
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    let role = await Meteor.roles.findOneAsync(
+    const role = await Meteor.roles.findOneAsync(
       { _id: roleName },
       { fields: { _id: 1 } }
-    );
+    )
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.");
+      throw new Error("Role '" + roleName + "' does not exist.")
     }
 
     const count = await Meteor.roles.updateAsync(
       {
-        _id: parentName,
+        _id: parentName
       },
       {
         $pull: {
           children: {
-            _id: role._id,
-          },
-        },
+            _id: role._id
+          }
+        }
       }
-    );
+    )
 
     // if there was no change, parent role might not exist, or role was
     // already not a subrole; in any case we do not have anything more to do
-    if (!count) return;
+    if (!count) return
 
     // For all roles who have had it as a dependency ...
     const roles = [
       ...(await Roles._getParentRoleNamesAsync(
         await Meteor.roles.findOneAsync({ _id: parentName })
       )),
-      parentName,
-    ];
+      parentName
+    ]
 
     for (const r of await Meteor.roles
       .find({ _id: { $in: roles } })
       .fetchAsync()) {
       const inheritedRoles = await Roles._getInheritedRoleNamesAsync(
         await Meteor.roles.findOneAsync({ _id: r._id })
-      );
+      )
       await Meteor.roleAssignment.updateAsync(
         {
-          "role._id": r._id,
-          "inheritedRoles._id": role._id,
+          'role._id': r._id,
+          'inheritedRoles._id': role._id
         },
         {
           $set: {
             inheritedRoles: [r._id, ...inheritedRoles].map((r2) => ({
-              _id: r2,
-            })),
-          },
+              _id: r2
+            }))
+          }
         },
         { multi: true }
-      );
+      )
     }
   },
 
@@ -444,35 +440,35 @@ Object.assign(Roles, {
    * @static
    */
   addUsersToRolesAsync: async function (users, roles, options) {
-    var id;
+    let id
 
-    if (!users) throw new Error("Missing 'users' param.");
-    if (!roles) throw new Error("Missing 'roles' param.");
+    if (!users) throw new Error("Missing 'users' param.")
+    if (!roles) throw new Error("Missing 'roles' param.")
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure arrays
-    if (!Array.isArray(users)) users = [users];
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign(
       {
-        ifExists: false,
+        ifExists: false
       },
       options
-    );
+    )
 
     for (const user of users) {
-      if (typeof user === "object") {
-        id = user._id;
+      if (typeof user === 'object') {
+        id = user._id
       } else {
-        id = user;
+        id = user
       }
 
       for (const role of roles) {
-        await Roles._addUserToRoleAsync(id, role, options);
+        await Roles._addUserToRoleAsync(id, role, options)
       }
     }
   },
@@ -500,44 +496,44 @@ Object.assign(Roles, {
    * @static
    */
   setUserRolesAsync: async function (users, roles, options) {
-    var id;
+    let id
 
-    if (!users) throw new Error("Missing 'users' param.");
-    if (!roles) throw new Error("Missing 'roles' param.");
+    if (!users) throw new Error("Missing 'users' param.")
+    if (!roles) throw new Error("Missing 'roles' param.")
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure arrays
-    if (!Array.isArray(users)) users = [users];
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign(
       {
         ifExists: false,
-        anyScope: false,
+        anyScope: false
       },
       options
-    );
+    )
 
     for (const user of users) {
-      if (typeof user === "object") {
-        id = user._id;
+      if (typeof user === 'object') {
+        id = user._id
       } else {
-        id = user;
+        id = user
       }
       // we first clear all roles for the user
-      const selector = { "user._id": id };
+      const selector = { 'user._id': id }
       if (!options.anyScope) {
-        selector.scope = options.scope;
+        selector.scope = options.scope
       }
 
-      await Meteor.roleAssignment.removeAsync(selector);
+      await Meteor.roleAssignment.removeAsync(selector)
 
       // and then add all
       for (const role of roles) {
-        await Roles._addUserToRole(id, role, options);
+        await Roles._addUserToRole(id, role, options)
       }
     }
   },
@@ -555,53 +551,53 @@ Object.assign(Roles, {
    * @static
    */
   _addUserToRoleAsync: async function (userId, roleName, options) {
-    Roles._checkRoleName(roleName);
-    Roles._checkScopeName(options.scope);
+    Roles._checkRoleName(roleName)
+    Roles._checkScopeName(options.scope)
 
     if (!userId) {
-      return;
+      return
     }
 
     const role = await Meteor.roles.findOneAsync(
       { _id: roleName },
       { fields: { children: 1 } }
-    );
+    )
 
     if (!role) {
       if (options.ifExists) {
-        return [];
+        return []
       } else {
-        throw new Error("Role '" + roleName + "' does not exist.");
+        throw new Error("Role '" + roleName + "' does not exist.")
       }
     }
 
     // This might create duplicates, because we don't have a unique index, but that's all right. In case there are two, withdrawing the role will effectively kill them both.
     const existingAssignment = await Meteor.roleAssignment.findOneAsync({
-      "user._id": userId,
-      "role._id": roleName,
-      scope: options.scope,
-    });
+      'user._id': userId,
+      'role._id': roleName,
+      scope: options.scope
+    })
 
-    let insertedId;
-    let res;
+    let insertedId
+    let res
     if (existingAssignment) {
       await Meteor.roleAssignment.updateAsync(existingAssignment._id, {
         $set: {
           user: { _id: userId },
           role: { _id: roleName },
-          scope: options.scope,
-        },
-      });
+          scope: options.scope
+        }
+      })
 
-      res = await Meteor.roleAssignment.findOneAsync(existingAssignment._id);
+      res = await Meteor.roleAssignment.findOneAsync(existingAssignment._id)
     } else {
       insertedId = await Meteor.roleAssignment.insertAsync({
         user: { _id: userId },
         role: { _id: roleName },
-        scope: options.scope,
-      });
+        scope: options.scope
+      })
     }
-    /*const res = await Meteor.roleAssignment.upsertAsync(
+    /* const res = await Meteor.roleAssignment.upsertAsync(
       {
         "user._id": userId,
         "role._id": roleName,
@@ -614,7 +610,7 @@ Object.assign(Roles, {
           scope: options.scope,
         },
       }
-    );*/
+    ); */
 
     if (insertedId) {
       await Meteor.roleAssignment.updateAsync(
@@ -623,16 +619,16 @@ Object.assign(Roles, {
           $set: {
             inheritedRoles: [
               roleName,
-              ...(await Roles._getInheritedRoleNamesAsync(role)),
-            ].map((r) => ({ _id: r })),
-          },
+              ...(await Roles._getInheritedRoleNamesAsync(role))
+            ].map((r) => ({ _id: r }))
+          }
         }
-      );
+      )
 
-      res = await Meteor.roleAssignment.findOneAsync({ _id: insertedId });
+      res = await Meteor.roleAssignment.findOneAsync({ _id: insertedId })
     }
 
-    return res;
+    return res
   },
 
   /**
@@ -647,25 +643,23 @@ Object.assign(Roles, {
    * @static
    */
   _getParentRoleNamesAsync: async function (role) {
-    var parentRoles;
-
     if (!role) {
-      return [];
+      return []
     }
 
-    parentRoles = new Set([role._id]);
+    const parentRoles = new Set([role._id])
 
     for (const roleName of parentRoles) {
       for (const parentRole of await Meteor.roles
-        .find({ "children._id": roleName })
+        .find({ 'children._id': roleName })
         .fetchAsync()) {
-        parentRoles.add(parentRole._id);
+        parentRoles.add(parentRole._id)
       }
     }
 
-    parentRoles.delete(role._id);
+    parentRoles.delete(role._id)
 
-    return [...parentRoles];
+    return [...parentRoles]
   },
 
   /**
@@ -680,8 +674,8 @@ Object.assign(Roles, {
    * @static
    */
   _getInheritedRoleNamesAsync: async function (role) {
-    const inheritedRoles = new Set();
-    const nestedRoles = new Set([role]);
+    const inheritedRoles = new Set()
+    const nestedRoles = new Set([role])
 
     for (const r in nestedRoles) {
       const roles = await Meteor.roles
@@ -689,15 +683,15 @@ Object.assign(Roles, {
           { _id: { $in: r.children.map((r) => r._id) } },
           { fields: { children: 1 } }
         )
-        .fetchAsync();
+        .fetchAsync()
 
       for (const r2 of roles) {
-        inheritedRoles.add(r2._id);
-        nestedRoles.add(r2);
+        inheritedRoles.add(r2._id)
+        nestedRoles.add(r2)
       }
     }
 
-    return [...inheritedRoles];
+    return [...inheritedRoles]
   },
 
   /**
@@ -719,29 +713,29 @@ Object.assign(Roles, {
    * @static
    */
   removeUsersFromRolesAsync: async function (users, roles, options) {
-    if (!users) throw new Error("Missing 'users' param.");
-    if (!roles) throw new Error("Missing 'roles' param.");
+    if (!users) throw new Error("Missing 'users' param.")
+    if (!roles) throw new Error("Missing 'roles' param.")
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure arrays
-    if (!Array.isArray(users)) users = [users];
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     for (const user of users) {
-      if (!user) return;
+      if (!user) return
 
       for (const role of roles) {
-        let id;
-        if (typeof user === "object") {
-          id = user._id;
+        let id
+        if (typeof user === 'object') {
+          id = user._id
         } else {
-          id = user;
+          id = user
         }
 
-        await Roles._removeUserFromRoleAsync(id, role, options);
+        await Roles._removeUserFromRoleAsync(id, role, options)
       }
     }
   },
@@ -759,21 +753,21 @@ Object.assign(Roles, {
    * @static
    */
   _removeUserFromRoleAsync: async function (userId, roleName, options) {
-    Roles._checkRoleName(roleName);
-    Roles._checkScopeName(options.scope);
+    Roles._checkRoleName(roleName)
+    Roles._checkScopeName(options.scope)
 
-    if (!userId) return;
+    if (!userId) return
 
     const selector = {
-      "user._id": userId,
-      "role._id": roleName,
-    };
-
-    if (!options.anyScope) {
-      selector.scope = options.scope;
+      'user._id': userId,
+      'role._id': roleName
     }
 
-    await Meteor.roleAssignment.removeAsync(selector);
+    if (!options.anyScope) {
+      selector.scope = options.scope
+    }
+
+    await Meteor.roleAssignment.removeAsync(selector)
   },
 
   /**
@@ -806,54 +800,53 @@ Object.assign(Roles, {
    * @static
    */
   userIsInRoleAsync: async function (user, roles, options) {
-    var id;
-    var selector;
+    let id
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     // ensure array to simplify code
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(roles)) roles = [roles]
 
-    roles = roles.filter((r) => r != null);
+    roles = roles.filter((r) => r != null)
 
-    if (!roles.length) return false;
+    if (!roles.length) return false
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign(
       {
-        anyScope: false,
+        anyScope: false
       },
       options
-    );
+    )
 
-    if (user && typeof user === "object") {
-      id = user._id;
+    if (user && typeof user === 'object') {
+      id = user._id
     } else {
-      id = user;
+      id = user
     }
 
-    if (!id) return false;
-    if (typeof id !== "string") return false;
+    if (!id) return false
+    if (typeof id !== 'string') return false
 
-    selector = {
-      "user._id": id,
-    };
+    const selector = {
+      'user._id': id
+    }
 
     if (!options.anyScope) {
-      selector.scope = { $in: [options.scope, null] };
+      selector.scope = { $in: [options.scope, null] }
     }
 
     const res = await asyncSome(roles, async (roleName) => {
-      selector["inheritedRoles._id"] = roleName;
+      selector['inheritedRoles._id'] = roleName
       const out =
         (await Meteor.roleAssignment
           .find(selector, { limit: 1 })
-          .countAsync()) > 0;
-      return out;
-    });
+          .countAsync()) > 0
+      return out
+    })
 
-    return res;
+    return res
   },
 
   /**
@@ -875,76 +868,73 @@ Object.assign(Roles, {
    * @static
    */
   getRolesForUserAsync: async function (user, options) {
-    var id;
-    var selector;
-    var filter;
-    var roles;
+    let id
 
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     options = Object.assign(
       {
         fullObjects: false,
         onlyAssigned: false,
         anyScope: false,
-        onlyScoped: false,
+        onlyScoped: false
       },
       options
-    );
+    )
 
-    if (user && typeof user === "object") {
-      id = user._id;
+    if (user && typeof user === 'object') {
+      id = user._id
     } else {
-      id = user;
+      id = user
     }
 
-    if (!id) return [];
+    if (!id) return []
 
-    selector = {
-      "user._id": id,
-    };
+    const selector = {
+      'user._id': id
+    }
 
-    filter = {
-      fields: { "inheritedRoles._id": 1 },
-    };
+    const filter = {
+      fields: { 'inheritedRoles._id': 1 }
+    }
 
     if (!options.anyScope) {
-      selector.scope = { $in: [options.scope] };
+      selector.scope = { $in: [options.scope] }
 
       if (!options.onlyScoped) {
-        selector.scope.$in.push(null);
+        selector.scope.$in.push(null)
       }
     }
 
     if (options.onlyAssigned) {
-      delete filter.fields["inheritedRoles._id"];
-      filter.fields["role._id"] = 1;
+      delete filter.fields['inheritedRoles._id']
+      filter.fields['role._id'] = 1
     }
 
     if (options.fullObjects) {
-      delete filter.fields;
+      delete filter.fields
     }
 
-    roles = await Meteor.roleAssignment.find(selector, filter).fetchAsync();
+    const roles = await Meteor.roleAssignment.find(selector, filter).fetchAsync()
 
     if (options.fullObjects) {
-      return roles;
+      return roles
     }
 
     return [
       ...new Set(
         roles.reduce((rev, current) => {
           if (current.inheritedRoles) {
-            return rev.concat(current.inheritedRoles.map((r) => r._id));
+            return rev.concat(current.inheritedRoles.map((r) => r._id))
           } else if (current.role) {
-            rev.push(current.role._id);
+            rev.push(current.role._id)
           }
-          return rev;
+          return rev
         }, [])
-      ),
-    ];
+      )
+    ]
   },
 
   /**
@@ -957,9 +947,9 @@ Object.assign(Roles, {
    * @static
    */
   getAllRoles: function (queryOptions) {
-    queryOptions = queryOptions || { sort: { _id: 1 } };
+    queryOptions = queryOptions || { sort: { _id: 1 } }
 
-    return Meteor.roles.find({}, queryOptions);
+    return Meteor.roles.find({}, queryOptions)
   },
 
   /**
@@ -987,16 +977,14 @@ Object.assign(Roles, {
    * @static
    */
   getUsersInRoleAsync: async function (roles, options, queryOptions) {
-    var ids;
-
-    ids = (
+    const ids = (
       await Roles.getUserAssignmentsForRole(roles, options).fetchAsync()
-    ).map((a) => a.user._id);
+    ).map((a) => a.user._id)
 
     return Meteor.users.find(
       { _id: { $in: ids } },
       (options && options.queryOptions) || queryOptions || {}
-    );
+    )
   },
 
   /**
@@ -1021,17 +1009,17 @@ Object.assign(Roles, {
    * @static
    */
   getUserAssignmentsForRole: function (roles, options) {
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     options = Object.assign(
       {
         anyScope: false,
-        queryOptions: {},
+        queryOptions: {}
       },
       options
-    );
+    )
 
-    return Roles._getUsersInRoleCursor(roles, options, options.queryOptions);
+    return Roles._getUsersInRoleCursor(roles, options, options.queryOptions)
   },
 
   /**
@@ -1053,43 +1041,41 @@ Object.assign(Roles, {
    * @static
    */
   _getUsersInRoleCursor: function (roles, options, filter) {
-    var selector;
-
-    options = Roles._normalizeOptions(options);
+    options = Roles._normalizeOptions(options)
 
     options = Object.assign(
       {
         anyScope: false,
-        onlyScoped: false,
+        onlyScoped: false
       },
       options
-    );
+    )
 
     // ensure array to simplify code
-    if (!Array.isArray(roles)) roles = [roles];
+    if (!Array.isArray(roles)) roles = [roles]
 
-    Roles._checkScopeName(options.scope);
+    Roles._checkScopeName(options.scope)
 
     filter = Object.assign(
       {
-        fields: { "user._id": 1 },
+        fields: { 'user._id': 1 }
       },
       filter
-    );
+    )
 
-    selector = {
-      "inheritedRoles._id": { $in: roles },
-    };
+    const selector = {
+      'inheritedRoles._id': { $in: roles }
+    }
 
     if (!options.anyScope) {
-      selector.scope = { $in: [options.scope] };
+      selector.scope = { $in: [options.scope] }
 
       if (!options.onlyScoped) {
-        selector.scope.$in.push(null);
+        selector.scope.$in.push(null)
       }
     }
 
-    return Meteor.roleAssignment.find(selector, filter);
+    return Meteor.roleAssignment.find(selector, filter)
   },
 
   /**
@@ -1101,14 +1087,14 @@ Object.assign(Roles, {
    */
   getGroupsForUserAsync: async function (...args) {
     if (!getGroupsForUserDeprecationWarning) {
-      getGroupsForUserDeprecationWarning = true;
+      getGroupsForUserDeprecationWarning = true
       console &&
         console.warn(
-          "getGroupsForUser has been deprecated. Use getScopesForUser instead."
-        );
+          'getGroupsForUser has been deprecated. Use getScopesForUser instead.'
+        )
     }
 
-    return Roles.getScopesForUser(...args);
+    return Roles.getScopesForUser(...args)
   },
 
   /**
@@ -1122,35 +1108,34 @@ Object.assign(Roles, {
    * @static
    */
   getScopesForUserAsync: async function (user, roles) {
-    var scopes;
-    var id;
+    let id
 
-    if (roles && !Array.isArray(roles)) roles = [roles];
+    if (roles && !Array.isArray(roles)) roles = [roles]
 
-    if (user && typeof user === "object") {
-      id = user._id;
+    if (user && typeof user === 'object') {
+      id = user._id
     } else {
-      id = user;
+      id = user
     }
 
-    if (!id) return [];
+    if (!id) return []
 
     const selector = {
-      "user._id": id,
-      scope: { $ne: null },
-    };
-
-    if (roles) {
-      selector["inheritedRoles._id"] = { $in: roles };
+      'user._id': id,
+      scope: { $ne: null }
     }
 
-    scopes = (
+    if (roles) {
+      selector['inheritedRoles._id'] = { $in: roles }
+    }
+
+    const scopes = (
       await Meteor.roleAssignment
         .find(selector, { fields: { scope: 1 } })
         .fetchAsync()
-    ).map((obi) => obi.scope);
+    ).map((obi) => obi.scope)
 
-    return [...new Set(scopes)];
+    return [...new Set(scopes)]
   },
 
   /**
@@ -1164,26 +1149,26 @@ Object.assign(Roles, {
    * @static
    */
   renameScopeAsync: async function (oldName, newName) {
-    var count;
+    let count
 
-    Roles._checkScopeName(oldName);
-    Roles._checkScopeName(newName);
+    Roles._checkScopeName(oldName)
+    Roles._checkScopeName(newName)
 
-    if (oldName === newName) return;
+    if (oldName === newName) return
 
     do {
       count = await Meteor.roleAssignment.updateAsync(
         {
-          scope: oldName,
+          scope: oldName
         },
         {
           $set: {
-            scope: newName,
-          },
+            scope: newName
+          }
         },
         { multi: true }
-      );
-    } while (count > 0);
+      )
+    } while (count > 0)
   },
 
   /**
@@ -1196,9 +1181,9 @@ Object.assign(Roles, {
    * @static
    */
   removeScopeAsync: async function (name) {
-    Roles._checkScopeName(name);
+    Roles._checkScopeName(name)
 
-    await Meteor.roleAssignment.removeAsync({ scope: name });
+    await Meteor.roleAssignment.removeAsync({ scope: name })
   },
 
   /**
@@ -1212,10 +1197,10 @@ Object.assign(Roles, {
   _checkRoleName: function (roleName) {
     if (
       !roleName ||
-      typeof roleName !== "string" ||
+      typeof roleName !== 'string' ||
       roleName.trim() !== roleName
     ) {
-      throw new Error("Invalid role name '" + roleName + "'.");
+      throw new Error("Invalid role name '" + roleName + "'.")
     }
   },
 
@@ -1231,33 +1216,33 @@ Object.assign(Roles, {
    */
   isParentOfAsync: async function (parentRoleName, childRoleName) {
     if (parentRoleName === childRoleName) {
-      return true;
+      return true
     }
 
     if (parentRoleName == null || childRoleName == null) {
-      return false;
+      return false
     }
 
-    Roles._checkRoleName(parentRoleName);
-    Roles._checkRoleName(childRoleName);
+    Roles._checkRoleName(parentRoleName)
+    Roles._checkRoleName(childRoleName)
 
-    var rolesToCheck = [parentRoleName];
+    let rolesToCheck = [parentRoleName]
     while (rolesToCheck.length !== 0) {
-      var roleName = rolesToCheck.pop();
+      const roleName = rolesToCheck.pop()
 
       if (roleName === childRoleName) {
-        return true;
+        return true
       }
 
-      var role = await Meteor.roles.findOneAsync({ _id: roleName });
+      const role = await Meteor.roles.findOneAsync({ _id: roleName })
 
       // This should not happen, but this is a problem to address at some other time.
-      if (!role) continue;
+      if (!role) continue
 
-      rolesToCheck = rolesToCheck.concat(role.children.map((r) => r._id));
+      rolesToCheck = rolesToCheck.concat(role.children.map((r) => r._id))
     }
 
-    return false;
+    return false
   },
 
   /**
@@ -1270,15 +1255,15 @@ Object.assign(Roles, {
    * @static
    */
   _normalizeOptions: function (options) {
-    options = options === undefined ? {} : options;
+    options = options === undefined ? {} : options
 
-    if (options === null || typeof options === "string") {
-      options = { scope: options };
+    if (options === null || typeof options === 'string') {
+      options = { scope: options }
     }
 
-    options.scope = Roles._normalizeScopeName(options.scope);
+    options.scope = Roles._normalizeScopeName(options.scope)
 
-    return options;
+    return options
   },
 
   /**
@@ -1293,9 +1278,9 @@ Object.assign(Roles, {
   _normalizeScopeName: function (scopeName) {
     // map undefined and null to null
     if (scopeName == null) {
-      return null;
+      return null
     } else {
-      return scopeName;
+      return scopeName
     }
   },
 
@@ -1308,14 +1293,14 @@ Object.assign(Roles, {
    * @static
    */
   _checkScopeName: function (scopeName) {
-    if (scopeName === null) return;
+    if (scopeName === null) return
 
     if (
       !scopeName ||
-      typeof scopeName !== "string" ||
+      typeof scopeName !== 'string' ||
       scopeName.trim() !== scopeName
     ) {
-      throw new Error("Invalid scope name '" + scopeName + "'.");
+      throw new Error("Invalid scope name '" + scopeName + "'.")
     }
-  },
-});
+  }
+})
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 174f310f6f..fdf03794e2 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -32,8 +32,8 @@ Meteor.publish('_roles', function () {
   const fields = { roles: 1 }
 
   if (!loggedInUserId) {
-    this.ready();
-    return;
+    this.ready()
+    return
   }
 
   return Meteor.users.find(
@@ -53,7 +53,7 @@ Object.assign(Roles, {
    * @static
    */
   _isNewRole: function (role) {
-    return !("name" in role) && "children" in role;
+    return !('name' in role) && 'children' in role
   },
 
   /**
@@ -66,7 +66,7 @@ Object.assign(Roles, {
    * @static
    */
   _isOldRole: function (role) {
-    return "name" in role && !("children" in role);
+    return 'name' in role && !('children' in role)
   },
 
   /**
@@ -79,7 +79,7 @@ Object.assign(Roles, {
    * @static
    */
   _isNewField: function (roles) {
-    return Array.isArray(roles) && typeof roles[0] === "object";
+    return Array.isArray(roles) && typeof roles[0] === 'object'
   },
 
   /**
@@ -93,9 +93,9 @@ Object.assign(Roles, {
    */
   _isOldField: function (roles) {
     return (
-      (Array.isArray(roles) && typeof roles[0] === "string") ||
-      (typeof roles === "object" && !Array.isArray(roles))
-    );
+      (Array.isArray(roles) && typeof roles[0] === 'string') ||
+      (typeof roles === 'object' && !Array.isArray(roles))
+    )
   },
 
   /**
@@ -107,13 +107,12 @@ Object.assign(Roles, {
    * @static
    */
   _convertToNewRole: function (oldRole) {
-    if (!(typeof oldRole.name === "string"))
-      throw new Error("Role name '" + oldRole.name + "' is not a string.");
+    if (!(typeof oldRole.name === 'string')) { throw new Error("Role name '" + oldRole.name + "' is not a string.") }
 
     return {
       _id: oldRole.name,
-      children: [],
-    };
+      children: []
+    }
   },
 
   /**
@@ -125,12 +124,11 @@ Object.assign(Roles, {
    * @static
    */
   _convertToOldRole: function (newRole) {
-    if (!(typeof newRole._id === "string"))
-      throw new Error("Role name '" + newRole._id + "' is not a string.");
+    if (!(typeof newRole._id === 'string')) { throw new Error("Role name '" + newRole._id + "' is not a string.") }
 
     return {
-      name: newRole._id,
-    };
+      name: newRole._id
+    }
   },
 
   /**
@@ -146,37 +144,35 @@ Object.assign(Roles, {
     const roles = []
     if (Array.isArray(oldRoles)) {
       oldRoles.forEach(function (role, index) {
-        if (!(typeof role === "string"))
-          throw new Error("Role '" + role + "' is not a string.");
+        if (!(typeof role === 'string')) { throw new Error("Role '" + role + "' is not a string.") }
 
         roles.push({
           _id: role,
           scope: null,
-          assigned: true,
-        });
-      });
-    } else if (typeof oldRoles === "object") {
+          assigned: true
+        })
+      })
+    } else if (typeof oldRoles === 'object') {
       Object.entries(oldRoles).forEach(([group, rolesArray]) => {
-        if (group === "__global_roles__") {
-          group = null;
+        if (group === '__global_roles__') {
+          group = null
         } else if (convertUnderscoresToDots) {
           // unescape
-          group = group.replace(/_/g, ".");
+          group = group.replace(/_/g, '.')
         }
 
         rolesArray.forEach(function (role) {
-          if (!(typeof role === "string"))
-            throw new Error("Role '" + role + "' is not a string.");
+          if (!(typeof role === 'string')) { throw new Error("Role '" + role + "' is not a string.") }
 
           roles.push({
             _id: role,
             scope: group,
-            assigned: true,
-          });
-        });
-      });
+            assigned: true
+          })
+        })
+      })
     }
-    return roles;
+    return roles
   },
 
   /**
@@ -192,46 +188,45 @@ Object.assign(Roles, {
     let roles
 
     if (usingGroups) {
-      roles = {};
+      roles = {}
     } else {
-      roles = [];
+      roles = []
     }
 
     newRoles.forEach(function (userRole) {
-      if (!(typeof userRole === "object"))
-        throw new Error("Role '" + userRole + "' is not an object.");
+      if (!(typeof userRole === 'object')) { throw new Error("Role '" + userRole + "' is not an object.") }
 
       // We assume that we are converting back a failed migration, so values can only be
       // what were valid values in 1.0. So no group names starting with $ and no subroles.
 
       if (userRole.scope) {
-        if (!usingGroups)
+        if (!usingGroups) {
           throw new Error(
             "Role '" +
               userRole._id +
               "' with scope '" +
               userRole.scope +
               "' without enabled groups."
-          );
+          )
+        }
 
         // escape
         const scope = userRole.scope.replace(/\./g, '_')
 
-        if (scope[0] === "$")
-          throw new Error("Group name '" + scope + "' start with $.");
+        if (scope[0] === '$') { throw new Error("Group name '" + scope + "' start with $.") }
 
-        roles[scope] = roles[scope] || [];
-        roles[scope].push(userRole._id);
+        roles[scope] = roles[scope] || []
+        roles[scope].push(userRole._id)
       } else {
         if (usingGroups) {
-          roles.__global_roles__ = roles.__global_roles__ || [];
-          roles.__global_roles__.push(userRole._id);
+          roles.__global_roles__ = roles.__global_roles__ || []
+          roles.__global_roles__.push(userRole._id)
         } else {
-          roles.push(userRole._id);
+          roles.push(userRole._id)
         }
       }
-    });
-    return roles;
+    })
+    return roles
   },
 
   /**
@@ -247,12 +242,12 @@ Object.assign(Roles, {
       {
         _id: user._id,
         // making sure nothing changed in meantime
-        roles: user.roles,
+        roles: user.roles
       },
       {
-        $set: { roles },
+        $set: { roles }
       }
-    );
+    )
   },
 
   /**
@@ -264,8 +259,8 @@ Object.assign(Roles, {
    * @static
    */
   _defaultUpdateRole: function (oldRole, newRole) {
-    Meteor.roles.remove(oldRole._id);
-    Meteor.roles.insert(newRole);
+    Meteor.roles.remove(oldRole._id)
+    Meteor.roles.insert(newRole)
   },
 
   /**
@@ -278,7 +273,7 @@ Object.assign(Roles, {
    */
   _dropCollectionIndex: function (collection, indexName) {
     try {
-      collection._dropIndex(indexName);
+      collection._dropIndex(indexName)
     } catch (e) {
       const indexNotFound = /index not found/.test(e.message || e.err || e.errmsg)
 
@@ -300,25 +295,25 @@ Object.assign(Roles, {
    * @static
    */
   _forwardMigrate: function (updateUser, updateRole, convertUnderscoresToDots) {
-    updateUser = updateUser || Roles._defaultUpdateUser;
-    updateRole = updateRole || Roles._defaultUpdateRole;
+    updateUser = updateUser || Roles._defaultUpdateUser
+    updateRole = updateRole || Roles._defaultUpdateRole
 
-    Roles._dropCollectionIndex(Meteor.roles, "name_1");
+    Roles._dropCollectionIndex(Meteor.roles, 'name_1')
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isNewRole(role)) {
-        updateRole(role, Roles._convertToNewRole(role));
+        updateRole(role, Roles._convertToNewRole(role))
       }
-    });
+    })
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isNewField(user.roles)) {
         updateUser(
           user,
           Roles._convertToNewField(user.roles, convertUnderscoresToDots)
-        );
+        )
       }
-    });
+    })
   },
 
   /**
@@ -331,8 +326,8 @@ Object.assign(Roles, {
    * @static
    */
   _forwardMigrate2: function (userSelector) {
-    userSelector = userSelector || {};
-    Object.assign(userSelector, { roles: { $ne: null } });
+    userSelector = userSelector || {}
+    Object.assign(userSelector, { roles: { $ne: null } })
 
     Meteor.users.find(userSelector).forEach(function (user, index) {
       user.roles
@@ -341,16 +336,16 @@ Object.assign(Roles, {
           // Added `ifExists` to make it less error-prone
           Roles._addUserToRole(user._id, r._id, {
             scope: r.scope,
-            ifExists: true,
-          });
-        });
+            ifExists: true
+          })
+        })
 
-      Meteor.users.update({ _id: user._id }, { $unset: { roles: "" } });
-    });
+      Meteor.users.update({ _id: user._id }, { $unset: { roles: '' } })
+    })
 
     // No need to keep the indexes around
-    Roles._dropCollectionIndex(Meteor.users, "roles._id_1_roles.scope_1");
-    Roles._dropCollectionIndex(Meteor.users, "roles.scope_1");
+    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1')
+    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1')
   },
 
   /**
@@ -369,23 +364,23 @@ Object.assign(Roles, {
    * @static
    */
   _backwardMigrate: function (updateUser, updateRole, usingGroups) {
-    updateUser = updateUser || Roles._defaultUpdateUser;
-    updateRole = updateRole || Roles._defaultUpdateRole;
+    updateUser = updateUser || Roles._defaultUpdateUser
+    updateRole = updateRole || Roles._defaultUpdateRole
 
-    Roles._dropCollectionIndex(Meteor.users, "roles._id_1_roles.scope_1");
-    Roles._dropCollectionIndex(Meteor.users, "roles.scope_1");
+    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1')
+    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1')
 
     Meteor.roles.find().forEach(function (role, index, cursor) {
       if (!Roles._isOldRole(role)) {
-        updateRole(role, Roles._convertToOldRole(role));
+        updateRole(role, Roles._convertToOldRole(role))
       }
-    });
+    })
 
     Meteor.users.find().forEach(function (user, index, cursor) {
       if (!Roles._isOldField(user.roles)) {
-        updateUser(user, Roles._convertToOldField(user.roles, usingGroups));
+        updateUser(user, Roles._convertToOldField(user.roles, usingGroups))
       }
-    });
+    })
   },
 
   /**
@@ -398,49 +393,49 @@ Object.assign(Roles, {
    * @static
    */
   _backwardMigrate2: function (assignmentSelector) {
-    assignmentSelector = assignmentSelector || {};
+    assignmentSelector = assignmentSelector || {}
 
     if (Meteor.users.createIndex) {
-      Meteor.users.createIndex({ "roles._id": 1, "roles.scope": 1 });
-      Meteor.users.createIndex({ "roles.scope": 1 });
+      Meteor.users.createIndex({ 'roles._id': 1, 'roles.scope': 1 })
+      Meteor.users.createIndex({ 'roles.scope': 1 })
     } else {
-      Meteor.users._ensureIndex({ "roles._id": 1, "roles.scope": 1 });
-      Meteor.users._ensureIndex({ "roles.scope": 1 });
+      Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
+      Meteor.users._ensureIndex({ 'roles.scope': 1 })
     }
 
     Meteor.roleAssignment.find(assignmentSelector).forEach((r) => {
-      const roles = Meteor.users.findOne({ _id: r.user._id }).roles || [];
+      const roles = Meteor.users.findOne({ _id: r.user._id }).roles || []
 
       const currentRole = roles.find(
         (oldRole) => oldRole._id === r.role._id && oldRole.scope === r.scope
-      );
+      )
       if (currentRole) {
-        currentRole.assigned = true;
+        currentRole.assigned = true
       } else {
         roles.push({
           _id: r.role._id,
           scope: r.scope,
-          assigned: true,
-        });
+          assigned: true
+        })
 
         r.inheritedRoles.forEach((inheritedRole) => {
           const currentInheritedRole = roles.find(
             (oldRole) =>
               oldRole._id === inheritedRole._id && oldRole.scope === r.scope
-          );
+          )
 
           if (!currentInheritedRole) {
             roles.push({
               _id: inheritedRole._id,
               scope: r.scope,
-              assigned: false,
-            });
+              assigned: false
+            })
           }
-        });
+        })
       }
 
-      Meteor.users.update({ _id: r.user._id }, { $set: { roles } });
-      Meteor.roleAssignment.remove({ _id: r._id });
-    });
-  },
-});
+      Meteor.users.update({ _id: r.user._id }, { $set: { roles } })
+      Meteor.roleAssignment.remove({ _id: r._id })
+    })
+  }
+})
diff --git a/someapp/tests/main.js b/someapp/tests/main.js
index 9a7482e75c..a161c8d844 100644
--- a/someapp/tests/main.js
+++ b/someapp/tests/main.js
@@ -1,3 +1,5 @@
+/* eslint-env mocha */
+import { Meteor } from 'meteor/meteor'
 import assert from 'assert'
 
 describe('someapp', function () {
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 4d42b56eef..7a2921ca25 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -200,11 +200,11 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz",
+      "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==",
       "requires": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       }
     },
     "@babel/template": {
@@ -4408,9 +4408,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
     },
     "regexp.prototype.flags": {
       "version": "1.5.0",
diff --git a/testapp/package.json b/testapp/package.json
index f894d6e5ad..f986e8f7ca 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -11,8 +11,8 @@
     "lint:fix": "standard --fix ../"
   },
   "dependencies": {
-    "@babel/runtime": "^7.17.9",
-    "meteor-node-stubs": "^1.2.1",
+    "@babel/runtime": "^7.22.10",
+    "meteor-node-stubs": "^1.2.5",
     "yuidocjs": "^0.10.2"
   },
   "devDependencies": {

From c0a1c9a405ff060c6144963f599384a8adb42b2f Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 25 Aug 2023 09:29:30 +0200
Subject: [PATCH 0434/1140] Remove someapp

---
 someapp/.coverage.json              |    6 -
 someapp/.gitignore                  |    1 -
 someapp/.meteor/.finished-upgraders |   19 -
 someapp/.meteor/.gitignore          |    1 -
 someapp/.meteor/.id                 |    7 -
 someapp/.meteor/packages            |   18 -
 someapp/.meteor/platforms           |    2 -
 someapp/.meteor/release             |    1 -
 someapp/.meteor/versions            |   57 --
 someapp/client/main.css             |    4 -
 someapp/client/main.html            |   21 -
 someapp/client/main.js              |    1 -
 someapp/package-lock.json           | 1428 ---------------------------
 someapp/package.json                |   22 -
 someapp/packages/roles              |    1 -
 someapp/server/main.js              |   15 -
 someapp/tests/main.js               |   22 -
 17 files changed, 1626 deletions(-)
 delete mode 100644 someapp/.coverage.json
 delete mode 100644 someapp/.gitignore
 delete mode 100644 someapp/.meteor/.finished-upgraders
 delete mode 100644 someapp/.meteor/.gitignore
 delete mode 100644 someapp/.meteor/.id
 delete mode 100644 someapp/.meteor/packages
 delete mode 100644 someapp/.meteor/platforms
 delete mode 100644 someapp/.meteor/release
 delete mode 100644 someapp/.meteor/versions
 delete mode 100644 someapp/client/main.css
 delete mode 100644 someapp/client/main.html
 delete mode 100644 someapp/client/main.js
 delete mode 100644 someapp/package-lock.json
 delete mode 100644 someapp/package.json
 delete mode 120000 someapp/packages/roles
 delete mode 100644 someapp/server/main.js
 delete mode 100644 someapp/tests/main.js

diff --git a/someapp/.coverage.json b/someapp/.coverage.json
deleted file mode 100644
index 918fc8889e..0000000000
--- a/someapp/.coverage.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "include": [
-    "**/packages/roles/**/*",
-    "**/packages/*alanning_roles.js"
-  ]
-}
diff --git a/someapp/.gitignore b/someapp/.gitignore
deleted file mode 100644
index 40b878db5b..0000000000
--- a/someapp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/
\ No newline at end of file
diff --git a/someapp/.meteor/.finished-upgraders b/someapp/.meteor/.finished-upgraders
deleted file mode 100644
index c07b6ff75a..0000000000
--- a/someapp/.meteor/.finished-upgraders
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file contains information which helps Meteor properly upgrade your
-# app when you run 'meteor update'. You should check it into version control
-# with your project.
-
-notices-for-0.9.0
-notices-for-0.9.1
-0.9.4-platform-file
-notices-for-facebook-graph-api-2
-1.2.0-standard-minifiers-package
-1.2.0-meteor-platform-split
-1.2.0-cordova-changes
-1.2.0-breaking-changes
-1.3.0-split-minifiers-package
-1.4.0-remove-old-dev-bundle-link
-1.4.1-add-shell-server-package
-1.4.3-split-account-service-packages
-1.5-add-dynamic-import-package
-1.7-split-underscore-from-meteor-base
-1.8.3-split-jquery-from-blaze
diff --git a/someapp/.meteor/.gitignore b/someapp/.meteor/.gitignore
deleted file mode 100644
index 4083037423..0000000000
--- a/someapp/.meteor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/someapp/.meteor/.id b/someapp/.meteor/.id
deleted file mode 100644
index fedba0b55e..0000000000
--- a/someapp/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-mgytvi9cz557.lvsfnftl2z8
diff --git a/someapp/.meteor/packages b/someapp/.meteor/packages
deleted file mode 100644
index 63f32aa28d..0000000000
--- a/someapp/.meteor/packages
+++ /dev/null
@@ -1,18 +0,0 @@
-# Meteor packages used by this project, one per line.
-# Check this file (and the other files in this directory) into your repository.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-meteor@1.11.2                  # Shared foundation for all Meteor packages
-static-html@1.3.2             # Define static page content in .html files
-standard-minifier-css@1.9.2   # CSS minifier run for production mode
-standard-minifier-js@2.8.1    # JS minifier run for production mode
-es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.16.7              # Enable ECMAScript2015+ syntax in app code
-typescript@4.9.4              # Enable TypeScript syntax in .ts and .tsx modules
-shell-server@0.5.0            # Server-side component of the `meteor shell` command
-webapp@1.13.5                  # Serves a Meteor app over HTTP
-server-render@0.4.1           # Support for server-side rendering
-hot-module-replacement@0.5.3  # Rebuilds the client if there is a change on the client without restarting the server
-
diff --git a/someapp/.meteor/platforms b/someapp/.meteor/platforms
deleted file mode 100644
index efeba1b50c..0000000000
--- a/someapp/.meteor/platforms
+++ /dev/null
@@ -1,2 +0,0 @@
-server
-browser
diff --git a/someapp/.meteor/release b/someapp/.meteor/release
deleted file mode 100644
index e8cfc7ec4c..0000000000
--- a/someapp/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-METEOR@2.12
diff --git a/someapp/.meteor/versions b/someapp/.meteor/versions
deleted file mode 100644
index 67a85b1d57..0000000000
--- a/someapp/.meteor/versions
+++ /dev/null
@@ -1,57 +0,0 @@
-autoupdate@1.8.0
-babel-compiler@7.10.4
-babel-runtime@1.5.1
-base64@1.0.12
-blaze-tools@1.1.3
-boilerplate-generator@1.7.1
-caching-compiler@1.2.2
-caching-html-compiler@1.2.1
-callback-hook@1.5.1
-check@1.3.2
-ddp@1.4.1
-ddp-client@2.6.1
-ddp-common@1.4.0
-ddp-server@2.6.1
-diff-sequence@1.1.2
-dynamic-import@0.7.3
-ecmascript@0.16.7
-ecmascript-runtime@0.8.1
-ecmascript-runtime-client@0.12.1
-ecmascript-runtime-server@0.11.0
-ejson@1.1.3
-es5-shim@4.8.0
-fetch@0.1.3
-hot-code-push@1.0.4
-hot-module-replacement@0.5.3
-html-tools@1.1.3
-htmljs@1.1.1
-id-map@1.1.1
-inter-process-messaging@0.1.1
-logging@1.3.2
-meteor@1.11.2
-minifier-css@1.6.4
-minifier-js@2.7.5
-modern-browsers@0.1.9
-modules@0.19.0
-modules-runtime@0.13.1
-modules-runtime-hot@0.14.2
-mongo-id@1.0.8
-promise@0.12.2
-random@1.2.1
-react-fast-refresh@0.2.7
-reload@1.3.1
-retry@1.1.0
-routepolicy@1.1.1
-server-render@0.4.1
-shell-server@0.5.0
-socket-stream-client@0.5.1
-spacebars-compiler@1.3.1
-standard-minifier-css@1.9.2
-standard-minifier-js@2.8.1
-static-html@1.3.2
-templating-tools@1.2.2
-tracker@1.3.2
-typescript@4.9.4
-underscore@1.0.13
-webapp@1.13.5
-webapp-hashing@1.1.1
diff --git a/someapp/client/main.css b/someapp/client/main.css
deleted file mode 100644
index 7f354f0fa7..0000000000
--- a/someapp/client/main.css
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
-  padding: 10px;
-  font-family: sans-serif;
-}
diff --git a/someapp/client/main.html b/someapp/client/main.html
deleted file mode 100644
index 19789db4de..0000000000
--- a/someapp/client/main.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<head>
-  <title>Minimal Meteor app</title>
-</head>
-
-<body>
-  <h1>Minimal Meteor app</h1>
-  <p>
-    This Meteor app uses as few Meteor packages as possible, to keep the
-    client JavaScript bundle as small as possible.
-  </p>
-
-  <em id="server-render-target"></em>
-
-  <h2>Learn Meteor!</h2>
-  <ul>
-    <li><a href="https://www.meteor.com/try" target="_blank">Do the Tutorial</a></li>
-    <li><a href="http://guide.meteor.com" target="_blank">Follow the Guide</a></li>
-    <li><a href="https://docs.meteor.com" target="_blank">Read the Docs</a></li>
-    <li><a href="https://forums.meteor.com" target="_blank">Discussions</a></li>
-  </ul>
-</body>
diff --git a/someapp/client/main.js b/someapp/client/main.js
deleted file mode 100644
index fb4b5bae20..0000000000
--- a/someapp/client/main.js
+++ /dev/null
@@ -1 +0,0 @@
-console.log(`Greetings from ${module.id}!`)
diff --git a/someapp/package-lock.json b/someapp/package-lock.json
deleted file mode 100644
index ef2dbadb4e..0000000000
--- a/someapp/package-lock.json
+++ /dev/null
@@ -1,1428 +0,0 @@
-{
-  "name": "someapp",
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
-      "requires": {
-        "@babel/highlight": "^7.22.5"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
-    },
-    "@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
-      "requires": {
-        "regenerator-runtime": "^0.13.11"
-      }
-    },
-    "@puppeteer/browsers": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.4.5.tgz",
-      "integrity": "sha512-a0gpUa+XlxZHotoOklh99X6RC5R+hQGcVcYOH+oOIEBfQXPp8Z5c765XAu/zhxsjRuAZN4Xx4vZNlwN4wJro2A==",
-      "requires": {
-        "debug": "4.3.4",
-        "extract-zip": "2.0.1",
-        "http-proxy-agent": "7.0.0",
-        "https-proxy-agent": "7.0.1",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "socks-proxy-agent": "8.0.1",
-        "tar-fs": "3.0.4",
-        "unbzip2-stream": "1.4.3",
-        "yargs": "17.7.1"
-      }
-    },
-    "@types/node": {
-      "version": "20.4.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.2.tgz",
-      "integrity": "sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw==",
-      "optional": true
-    },
-    "@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-      "optional": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "agent-base": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
-      "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-      "requires": {
-        "debug": "^4.3.4"
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
-    "b4a": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
-      "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-        }
-      }
-    },
-    "chromium-bidi": {
-      "version": "0.4.16",
-      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.16.tgz",
-      "integrity": "sha512-7ZbXdWERxRxSwo3txsBjjmc/NLxqb1Bk30mRb0BMS4YIaiV6zvKZqL/UAH+DdqcDYayDWk2n/y8klkBDODrPvA==",
-      "requires": {
-        "mitt": "3.0.0"
-      }
-    },
-    "cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "cosmiconfig": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz",
-      "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==",
-      "requires": {
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0"
-      }
-    },
-    "cross-fetch": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
-      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
-      "requires": {
-        "node-fetch": "^2.6.12"
-      }
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "devtools-protocol": {
-      "version": "0.0.1135028",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1135028.tgz",
-      "integrity": "sha512-jEcNGrh6lOXNRJvZb9RjeevtZGrgugPKSMJZxfyxWQnhlKawMPhMtk/dfC+Z/6xNXExlzTKlY5LzIAK/fRpQIw=="
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-    },
-    "extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "requires": {
-        "@types/yauzl": "^2.9.1",
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      }
-    },
-    "fast-fifo": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.0.tgz",
-      "integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw=="
-    },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-    },
-    "http-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
-      "requires": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz",
-      "integrity": "sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==",
-      "requires": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "ip": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "requires": {
-        "argparse": "^2.0.1"
-      }
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "meteor-node-stubs": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.5.tgz",
-      "integrity": "sha512-FLlOFZx3KnZ5s3yPCK+x58DyX9ewN+oQ12LcpwBXMLtzJ/YyprMQVivd6KIrahZbKJrNenPNUGuDS37WUFg+Mw==",
-      "requires": {
-        "assert": "^2.0.0",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^5.7.1",
-        "console-browserify": "^1.2.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.12.0",
-        "domain-browser": "^4.22.0",
-        "elliptic": "^6.5.4",
-        "events": "^3.3.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "^1.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.4.1",
-        "querystring-es3": "^0.2.1",
-        "readable-stream": "^3.6.0",
-        "stream-browserify": "^3.0.0",
-        "stream-http": "^3.2.0",
-        "string_decoder": "^1.3.0",
-        "timers-browserify": "^2.0.12",
-        "tty-browserify": "0.0.1",
-        "url": "^0.11.0",
-        "util": "^0.12.4",
-        "vm-browserify": "^1.1.2"
-      },
-      "dependencies": {
-        "asn1.js": {
-          "version": "5.4.1",
-          "bundled": true,
-          "requires": {
-            "bn.js": "^4.0.0",
-            "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0",
-            "safer-buffer": "^2.1.0"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
-            }
-          }
-        },
-        "assert": {
-          "version": "2.0.0",
-          "bundled": true,
-          "requires": {
-            "es6-object-assign": "^1.1.0",
-            "is-nan": "^1.2.1",
-            "object-is": "^1.0.1",
-            "util": "^0.12.0"
-          }
-        },
-        "available-typed-arrays": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "base64-js": {
-          "version": "1.5.1",
-          "bundled": true
-        },
-        "bn.js": {
-          "version": "5.2.0",
-          "bundled": true
-        },
-        "brorand": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "browserify-aes": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "buffer-xor": "^1.0.3",
-            "cipher-base": "^1.0.0",
-            "create-hash": "^1.1.0",
-            "evp_bytestokey": "^1.0.3",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "browserify-cipher": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "browserify-aes": "^1.0.4",
-            "browserify-des": "^1.0.0",
-            "evp_bytestokey": "^1.0.0"
-          }
-        },
-        "browserify-des": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "cipher-base": "^1.0.1",
-            "des.js": "^1.0.0",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          }
-        },
-        "browserify-rsa": {
-          "version": "4.1.0",
-          "bundled": true,
-          "requires": {
-            "bn.js": "^5.0.0",
-            "randombytes": "^2.0.1"
-          }
-        },
-        "browserify-sign": {
-          "version": "4.2.1",
-          "bundled": true,
-          "requires": {
-            "bn.js": "^5.1.1",
-            "browserify-rsa": "^4.0.1",
-            "create-hash": "^1.2.0",
-            "create-hmac": "^1.1.7",
-            "elliptic": "^6.5.3",
-            "inherits": "^2.0.4",
-            "parse-asn1": "^5.1.5",
-            "readable-stream": "^3.6.0",
-            "safe-buffer": "^5.2.0"
-          }
-        },
-        "browserify-zlib": {
-          "version": "0.2.0",
-          "bundled": true,
-          "requires": {
-            "pako": "~1.0.5"
-          }
-        },
-        "buffer": {
-          "version": "5.7.1",
-          "bundled": true,
-          "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-          }
-        },
-        "buffer-xor": {
-          "version": "1.0.3",
-          "bundled": true
-        },
-        "builtin-status-codes": {
-          "version": "3.0.0",
-          "bundled": true
-        },
-        "call-bind": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.0.2"
-          }
-        },
-        "cipher-base": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "console-browserify": {
-          "version": "1.2.0",
-          "bundled": true
-        },
-        "constants-browserify": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "create-ecdh": {
-          "version": "4.0.4",
-          "bundled": true,
-          "requires": {
-            "bn.js": "^4.1.0",
-            "elliptic": "^6.5.3"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
-            }
-          }
-        },
-        "create-hash": {
-          "version": "1.2.0",
-          "bundled": true,
-          "requires": {
-            "cipher-base": "^1.0.1",
-            "inherits": "^2.0.1",
-            "md5.js": "^1.3.4",
-            "ripemd160": "^2.0.1",
-            "sha.js": "^2.4.0"
-          }
-        },
-        "create-hmac": {
-          "version": "1.1.7",
-          "bundled": true,
-          "requires": {
-            "cipher-base": "^1.0.3",
-            "create-hash": "^1.1.0",
-            "inherits": "^2.0.1",
-            "ripemd160": "^2.0.0",
-            "safe-buffer": "^5.0.1",
-            "sha.js": "^2.4.8"
-          }
-        },
-        "crypto-browserify": {
-          "version": "3.12.0",
-          "bundled": true,
-          "requires": {
-            "browserify-cipher": "^1.0.0",
-            "browserify-sign": "^4.0.0",
-            "create-ecdh": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "create-hmac": "^1.1.0",
-            "diffie-hellman": "^5.0.0",
-            "inherits": "^2.0.1",
-            "pbkdf2": "^3.0.3",
-            "public-encrypt": "^4.0.0",
-            "randombytes": "^2.0.0",
-            "randomfill": "^1.0.3"
-          }
-        },
-        "define-properties": {
-          "version": "1.1.3",
-          "bundled": true,
-          "requires": {
-            "object-keys": "^1.0.12"
-          }
-        },
-        "des.js": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0"
-          }
-        },
-        "diffie-hellman": {
-          "version": "5.0.3",
-          "bundled": true,
-          "requires": {
-            "bn.js": "^4.1.0",
-            "miller-rabin": "^4.0.0",
-            "randombytes": "^2.0.0"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
-            }
-          }
-        },
-        "domain-browser": {
-          "version": "4.22.0",
-          "bundled": true
-        },
-        "elliptic": {
-          "version": "6.5.4",
-          "bundled": true,
-          "requires": {
-            "bn.js": "^4.11.9",
-            "brorand": "^1.1.0",
-            "hash.js": "^1.0.0",
-            "hmac-drbg": "^1.0.1",
-            "inherits": "^2.0.4",
-            "minimalistic-assert": "^1.0.1",
-            "minimalistic-crypto-utils": "^1.0.1"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
-            }
-          }
-        },
-        "es-abstract": {
-          "version": "1.18.3",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "is-callable": "^1.2.3",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.3",
-            "is-string": "^1.0.6",
-            "object-inspect": "^1.10.3",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "es-to-primitive": {
-          "version": "1.2.1",
-          "bundled": true,
-          "requires": {
-            "is-callable": "^1.1.4",
-            "is-date-object": "^1.0.1",
-            "is-symbol": "^1.0.2"
-          }
-        },
-        "es6-object-assign": {
-          "version": "1.1.0",
-          "bundled": true
-        },
-        "events": {
-          "version": "3.3.0",
-          "bundled": true
-        },
-        "evp_bytestokey": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "md5.js": "^1.3.4",
-            "safe-buffer": "^5.1.1"
-          }
-        },
-        "foreach": {
-          "version": "2.0.5",
-          "bundled": true
-        },
-        "function-bind": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "get-intrinsic": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1"
-          }
-        },
-        "has": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "function-bind": "^1.1.1"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "has-symbols": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "hash-base": {
-          "version": "3.1.0",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.6.0",
-            "safe-buffer": "^5.2.0"
-          }
-        },
-        "hash.js": {
-          "version": "1.1.7",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "minimalistic-assert": "^1.0.1"
-          }
-        },
-        "hmac-drbg": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "hash.js": "^1.0.3",
-            "minimalistic-assert": "^1.0.0",
-            "minimalistic-crypto-utils": "^1.0.1"
-          }
-        },
-        "https-browserify": {
-          "version": "1.0.0",
-          "bundled": true
-        },
-        "ieee754": {
-          "version": "1.2.1",
-          "bundled": true
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true
-        },
-        "is-arguments": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.0"
-          }
-        },
-        "is-bigint": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "is-boolean-object": {
-          "version": "1.1.1",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.3",
-          "bundled": true
-        },
-        "is-date-object": {
-          "version": "1.0.4",
-          "bundled": true
-        },
-        "is-generator-function": {
-          "version": "1.0.9",
-          "bundled": true
-        },
-        "is-nan": {
-          "version": "1.3.2",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "is-negative-zero": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "is-number-object": {
-          "version": "1.0.5",
-          "bundled": true
-        },
-        "is-regex": {
-          "version": "1.1.3",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-symbols": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.6",
-          "bundled": true
-        },
-        "is-symbol": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "has-symbols": "^1.0.2"
-          }
-        },
-        "is-typed-array": {
-          "version": "1.1.5",
-          "bundled": true,
-          "requires": {
-            "available-typed-arrays": "^1.0.2",
-            "call-bind": "^1.0.2",
-            "es-abstract": "^1.18.0-next.2",
-            "foreach": "^2.0.5",
-            "has-symbols": "^1.0.1"
-          }
-        },
-        "md5.js": {
-          "version": "1.3.5",
-          "bundled": true,
-          "requires": {
-            "hash-base": "^3.0.0",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          }
-        },
-        "miller-rabin": {
-          "version": "4.0.1",
-          "bundled": true,
-          "requires": {
-            "bn.js": "^4.0.0",
-            "brorand": "^1.0.1"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
-            }
-          }
-        },
-        "minimalistic-assert": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "minimalistic-crypto-utils": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "object-inspect": {
-          "version": "1.10.3",
-          "bundled": true
-        },
-        "object-is": {
-          "version": "1.1.5",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "object-keys": {
-          "version": "1.1.1",
-          "bundled": true
-        },
-        "object.assign": {
-          "version": "4.1.2",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3",
-            "has-symbols": "^1.0.1",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "os-browserify": {
-          "version": "0.3.0",
-          "bundled": true
-        },
-        "pako": {
-          "version": "1.0.11",
-          "bundled": true
-        },
-        "parse-asn1": {
-          "version": "5.1.6",
-          "bundled": true,
-          "requires": {
-            "asn1.js": "^5.2.0",
-            "browserify-aes": "^1.0.0",
-            "evp_bytestokey": "^1.0.0",
-            "pbkdf2": "^3.0.3",
-            "safe-buffer": "^5.1.1"
-          }
-        },
-        "path-browserify": {
-          "version": "1.0.1",
-          "bundled": true
-        },
-        "pbkdf2": {
-          "version": "3.1.2",
-          "bundled": true,
-          "requires": {
-            "create-hash": "^1.1.2",
-            "create-hmac": "^1.1.4",
-            "ripemd160": "^2.0.1",
-            "safe-buffer": "^5.0.1",
-            "sha.js": "^2.4.8"
-          }
-        },
-        "process": {
-          "version": "0.11.10",
-          "bundled": true
-        },
-        "public-encrypt": {
-          "version": "4.0.3",
-          "bundled": true,
-          "requires": {
-            "bn.js": "^4.1.0",
-            "browserify-rsa": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "parse-asn1": "^5.0.0",
-            "randombytes": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
-            }
-          }
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true
-        },
-        "querystring": {
-          "version": "0.2.0",
-          "bundled": true
-        },
-        "querystring-es3": {
-          "version": "0.2.1",
-          "bundled": true
-        },
-        "randombytes": {
-          "version": "2.1.0",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "^5.1.0"
-          }
-        },
-        "randomfill": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "randombytes": "^2.0.5",
-            "safe-buffer": "^5.1.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "ripemd160": {
-          "version": "2.0.2",
-          "bundled": true,
-          "requires": {
-            "hash-base": "^3.0.0",
-            "inherits": "^2.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "bundled": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true
-        },
-        "setimmediate": {
-          "version": "1.0.5",
-          "bundled": true
-        },
-        "sha.js": {
-          "version": "2.4.11",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "stream-browserify": {
-          "version": "3.0.0",
-          "bundled": true,
-          "requires": {
-            "inherits": "~2.0.4",
-            "readable-stream": "^3.5.0"
-          }
-        },
-        "stream-http": {
-          "version": "3.2.0",
-          "bundled": true,
-          "requires": {
-            "builtin-status-codes": "^3.0.0",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.6.0",
-            "xtend": "^4.0.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "bundled": true,
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          }
-        },
-        "timers-browserify": {
-          "version": "2.0.12",
-          "bundled": true,
-          "requires": {
-            "setimmediate": "^1.0.4"
-          }
-        },
-        "tty-browserify": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "unbox-primitive": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has-bigints": "^1.0.1",
-            "has-symbols": "^1.0.2",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        },
-        "url": {
-          "version": "0.11.0",
-          "bundled": true,
-          "requires": {
-            "punycode": "1.3.2",
-            "querystring": "0.2.0"
-          },
-          "dependencies": {
-            "punycode": {
-              "version": "1.3.2",
-              "bundled": true
-            }
-          }
-        },
-        "util": {
-          "version": "0.12.4",
-          "bundled": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "is-arguments": "^1.0.4",
-            "is-generator-function": "^1.0.7",
-            "is-typed-array": "^1.1.3",
-            "safe-buffer": "^5.1.2",
-            "which-typed-array": "^1.1.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "vm-browserify": {
-          "version": "1.1.2",
-          "bundled": true
-        },
-        "which-boxed-primitive": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "is-bigint": "^1.0.1",
-            "is-boolean-object": "^1.1.0",
-            "is-number-object": "^1.0.4",
-            "is-string": "^1.0.5",
-            "is-symbol": "^1.0.3"
-          }
-        },
-        "which-typed-array": {
-          "version": "1.1.4",
-          "bundled": true,
-          "requires": {
-            "available-typed-arrays": "^1.0.2",
-            "call-bind": "^1.0.0",
-            "es-abstract": "^1.18.0-next.1",
-            "foreach": "^2.0.5",
-            "function-bind": "^1.1.1",
-            "has-symbols": "^1.0.1",
-            "is-typed-array": "^1.1.3"
-          }
-        },
-        "xtend": {
-          "version": "4.0.2",
-          "bundled": true
-        }
-      }
-    },
-    "mitt": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
-      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
-    },
-    "mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node-fetch": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "puppeteer": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-20.8.2.tgz",
-      "integrity": "sha512-+VRywTRGF09UyiesFL7pcU19Cq7vf2HsE/eulwSpl7YHcr8g8X+Va4qLmp7mOECwteGvP7rU8vQ7PP43fcubbA==",
-      "requires": {
-        "@puppeteer/browsers": "1.4.5",
-        "cosmiconfig": "8.2.0",
-        "puppeteer-core": "20.8.2"
-      }
-    },
-    "puppeteer-core": {
-      "version": "20.8.2",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-20.8.2.tgz",
-      "integrity": "sha512-dWo60gFuFPdNhdabW9MMm6GpvkG6tND2D8FvrZ2MF+HggNApHrvLfbERj8vD6vXKV7UqDAJO0KI1OMo3S3Cm5w==",
-      "requires": {
-        "@puppeteer/browsers": "1.4.5",
-        "chromium-bidi": "0.4.16",
-        "cross-fetch": "4.0.0",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.1135028",
-        "ws": "8.13.0"
-      }
-    },
-    "queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-    },
-    "smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
-    },
-    "socks": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-      "requires": {
-        "ip": "^2.0.0",
-        "smart-buffer": "^4.2.0"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz",
-      "integrity": "sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==",
-      "requires": {
-        "agent-base": "^7.0.1",
-        "debug": "^4.3.4",
-        "socks": "^2.7.1"
-      }
-    },
-    "streamx": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.0.tgz",
-      "integrity": "sha512-HcxY6ncGjjklGs1xsP1aR71INYcsXFJet5CU1CHqihQ2J5nOsbd4OjgjHO42w/4QNv9gZb3BueV+Vxok5pLEXg==",
-      "requires": {
-        "fast-fifo": "^1.1.0",
-        "queue-tick": "^1.0.1"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "tar-fs": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
-      "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
-      "requires": {
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^3.1.5"
-      }
-    },
-    "tar-stream": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
-      "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
-      "requires": {
-        "b4a": "^1.6.4",
-        "fast-fifo": "^1.2.0",
-        "streamx": "^2.15.0"
-      }
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "requires": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="
-    },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-    },
-    "yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-      "requires": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      }
-    },
-    "yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-    },
-    "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "requires": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    }
-  }
-}
diff --git a/someapp/package.json b/someapp/package.json
deleted file mode 100644
index fd0ec41cc8..0000000000
--- a/someapp/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "someapp",
-  "private": true,
-  "scripts": {
-    "start": "meteor run",
-    "test": "meteor test --once --driver-package meteortesting:mocha",
-    "test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha",
-    "visualize": "meteor --production --extra-packages bundle-visualizer"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.17.9",
-    "meteor-node-stubs": "^1.2.1",
-    "puppeteer": "^20.8.2"
-  },
-  "meteor": {
-    "mainModule": {
-      "client": "client/main.js",
-      "server": "server/main.js"
-    },
-    "testModule": "tests/main.js"
-  }
-}
diff --git a/someapp/packages/roles b/someapp/packages/roles
deleted file mode 120000
index 6581736d62..0000000000
--- a/someapp/packages/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../
\ No newline at end of file
diff --git a/someapp/server/main.js b/someapp/server/main.js
deleted file mode 100644
index 0f22191abf..0000000000
--- a/someapp/server/main.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Meteor } from 'meteor/meteor'
-import { onPageLoad } from 'meteor/server-render'
-
-Meteor.startup(() => {
-  // Code to run on server startup.
-  console.log(`Greetings from ${module.id}!`)
-})
-
-onPageLoad(sink => {
-  // Code to run on every request.
-  sink.renderIntoElementById(
-    'server-render-target',
-    `Server time: ${new Date()}`
-  )
-})
diff --git a/someapp/tests/main.js b/someapp/tests/main.js
deleted file mode 100644
index a161c8d844..0000000000
--- a/someapp/tests/main.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* eslint-env mocha */
-import { Meteor } from 'meteor/meteor'
-import assert from 'assert'
-
-describe('someapp', function () {
-  it('package.json has correct name', async function () {
-    const { name } = await import('../package.json')
-    assert.strictEqual(name, 'someapp')
-  })
-
-  if (Meteor.isClient) {
-    it('client is not server', function () {
-      assert.strictEqual(Meteor.isServer, false)
-    })
-  }
-
-  if (Meteor.isServer) {
-    it('server is not client', function () {
-      assert.strictEqual(Meteor.isClient, false)
-    })
-  }
-})

From e03fa6cb374cd700a677c85778d697f91769da6b Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 25 Aug 2023 09:32:36 +0200
Subject: [PATCH 0435/1140] Remove .DS_Store

---
 .DS_Store        | Bin 6148 -> 0 bytes
 .gitignore       |   1 +
 roles/.DS_Store  | Bin 6148 -> 0 bytes
 roles/.gitignore |   1 +
 4 files changed, 2 insertions(+)
 delete mode 100644 .DS_Store
 delete mode 100644 roles/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 97a2704690b7e919d553c06d7dd398da483f2f27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKI|>3Z5S{S@f{mqRuHX%V=n1@lg<>NLiq>0sE|2D$PqQrBt%dRiCNG)HOUNsB
zc0@$ikHbo2AtE!lp}cJ9n(do+Y?KiN!g0p^xw~D?*UPDs+ZQnIRBm#Wvm9G|+o4eb
zDnJFO02QDDLo1LKb~YdSV4g<>sKC!FVBd!VH>`<Gpnp0rcnbiWAnb;@_Y%Nj0bosR
z0ug~}P=P_!Y%w(Gh?mT(iA`Y8MYH+PyjinDQNJDM7f%<hfgGs-6=*9kj^)DY{}$fU
z|F=n8Q2{FOR|@E4v)iokq^zx-$62i{@IBme-f%O_or1y3G0@8~7FLdzo)me-=Gd=^
UO`y{ecRG+i1Evd&3Vd6E59{?5-T(jq

diff --git a/.gitignore b/.gitignore
index 497cb990d8..936ee1e8eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ npm-debug.log
 smart.lock
 
 .idea
+.DS_Store
 docs/
 node_modules/
 .npm/
diff --git a/roles/.DS_Store b/roles/.DS_Store
deleted file mode 100644
index 08f885a9493341c272bf64c0c0e3f8b93ed6b7f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!A=4}41I$fAYO<kkMje9c=5UtxTyz;o<(;PNI(p*8gKjQzP1wrSxvlXh-pdt
zx}CN&`zG080E9uA_kj+87FDp(rujl-T(l;Q6cG&C;|3!{T=3VeWqaTd8IZj@!5#PQ
z3PbGf-#IS1i+!~V<gc5j>vFwWF@JzDKCs3H1s3Sx0ZYtL(k~e8vCo8K6MFZ2F0j(*
zGp6)rS~uh93*Kp`tSp$B)4oyX^resVUNZlTD&4K~uK)9O-==l9_ujM1dGbTt5?_-u
z;0!nezs>;9Y?0Qnp<8Fb8E^)+49NE(QU$Ywm7#t*X!Hs|Y%;7uU+xl86BA|$D?^S@
zf|U}jG^8s=uyV#@%F7Z~hE|TCGqX>cIiwp((AgP}nvReex^)Jefqe#!?6D)~|LFVs
z|9+7_IRnnXzhWRXhvVUZuawT#+RMpV8>x>}5y`6zw<UD+C}yr4#ivvi#-ljIEMaBH
Q2*v*hC=G6$fj?#76Q+kZjsO4v

diff --git a/roles/.gitignore b/roles/.gitignore
index 677a6fc263..964bc0647d 100644
--- a/roles/.gitignore
+++ b/roles/.gitignore
@@ -1 +1,2 @@
 .build*
+.DS_Store

From 78d4ccf7aefe35642895ed9553d3c3abf7018556 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 25 Aug 2023 10:05:32 +0200
Subject: [PATCH 0436/1140] Async client tests

Also adjusted Meteor versions for test and package
---
 .github/workflows/testsuite.yml |    5 +-
 package.js                      |    3 +-
 roles/tests/clientAsync.js      |  138 ++
 roles/tests/serverAsync.js      | 2277 +++++++++++++++++++++++++++++++
 4 files changed, 2419 insertions(+), 4 deletions(-)
 create mode 100644 roles/tests/clientAsync.js
 create mode 100644 roles/tests/serverAsync.js

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 54a3d3794e..aa1ff189dc 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -36,9 +36,8 @@ jobs:
     strategy:
       matrix:
         meteorRelease:
-          - '2.3'
-          - '2.7.3'
-          - '2.12'
+          - '2.8.0'
+          - '2.13'
           # Latest version
     steps:
       - name: Checkout code
diff --git a/package.js b/package.js
index c7f599537a..4a01cbbcc0 100644
--- a/package.js
+++ b/package.js
@@ -8,7 +8,7 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['1.12', '2.3', '2.8.0'])
+  api.versionsFrom(['2.8.0'])
 
   const both = ['client', 'server']
 
@@ -58,4 +58,5 @@ Package.onTest(function (api) {
 
   api.addFiles('roles/tests/server.js', 'server')
   api.addFiles('roles/tests/client.js', 'client')
+  api.addFiles('roles/tests/clientAsync.js', 'client')
 })
diff --git a/roles/tests/clientAsync.js b/roles/tests/clientAsync.js
new file mode 100644
index 0000000000..c931896c4a
--- /dev/null
+++ b/roles/tests/clientAsync.js
@@ -0,0 +1,138 @@
+/* eslint-env mocha */
+/* global Roles */
+
+import { Meteor } from 'meteor/meteor'
+import { assert } from 'chai'
+
+// To ensure that the files are loaded for coverage
+import '../roles_common'
+
+const safeInsert = async (collection, data) => {
+  try {
+    await collection.insertAsync(data)
+  } catch (e) {}
+}
+
+describe('roles async', function () {
+  const roles = ['admin', 'editor', 'user']
+  const users = {
+    eve: {
+      _id: 'eve'
+    },
+    bob: {
+      _id: 'bob'
+    },
+    joe: {
+      _id: 'joe'
+    }
+  }
+
+  async function testUser (username, expectedRoles, scope) {
+    const user = users[username]
+
+    // test using user object rather than userId to avoid mocking
+    for (const role of roles) {
+      const expected = expectedRoles.includes(role)
+      const msg = username + ' expected to have \'' + role + '\' permission but does not'
+      const nmsg = username + ' had un-expected permission ' + role
+
+      if (expected) {
+        assert.isTrue(await Roles.userIsInRoleAsync(user, role, scope), msg)
+      } else {
+        assert.isFalse(await Roles.userIsInRoleAsync(user, role, scope), nmsg)
+      }
+    }
+  }
+
+  let meteorUserMethod
+  before(() => {
+    meteorUserMethod = Meteor.user
+    // Mock Meteor.user() for isInRole handlebars helper testing
+    Meteor.user = function () {
+      return users.eve
+    }
+  })
+
+  after(() => {
+    Meteor.user = meteorUserMethod
+  })
+
+  beforeEach(async () => {
+    await safeInsert(Meteor.roleAssignment, {
+      user: users.eve,
+      role: { _id: 'admin' },
+      inheritedRoles: [{ _id: 'admin' }]
+    })
+    await safeInsert(Meteor.roleAssignment, {
+      user: users.eve,
+      role: { _id: 'editor' },
+      inheritedRoles: [{ _id: 'editor' }]
+    })
+
+    await safeInsert(Meteor.roleAssignment, {
+      user: users.bob,
+      role: { _id: 'user' },
+      inheritedRoles: [{ _id: 'user' }],
+      scope: 'group1'
+    })
+    await safeInsert(Meteor.roleAssignment, {
+      user: users.bob,
+      role: { _id: 'editor' },
+      inheritedRoles: [{ _id: 'editor' }],
+      scope: 'group2'
+    })
+
+    await safeInsert(Meteor.roleAssignment, {
+      user: users.joe,
+      role: { _id: 'admin' },
+      inheritedRoles: [{ _id: 'admin' }]
+    })
+    await safeInsert(Meteor.roleAssignment, {
+      user: users.joe,
+      role: { _id: 'editor' },
+      inheritedRoles: [{ _id: 'editor' }],
+      scope: 'group1'
+    })
+  })
+
+  it('can check current users roles via template helper', function () {
+    let expected
+    let actual
+
+    if (!Roles._handlebarsHelpers) {
+      // probably running package tests outside of a Meteor app.
+      // skip this test.
+      return
+    }
+
+    const isInRole = Roles._handlebarsHelpers.isInRole
+    assert.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
+
+    expected = true
+    actual = isInRole('admin, editor')
+    assert.equal(actual, expected)
+
+    expected = true
+    actual = isInRole('admin')
+    assert.equal(actual, expected)
+
+    expected = false
+    actual = isInRole('unknown')
+    assert.equal(actual, expected)
+  })
+
+  it('can check if user is in role', async function () {
+    await testUser('eve', ['admin', 'editor'])
+  })
+
+  it('can check if user is in role by group', async function () {
+    await testUser('bob', ['user'], 'group1')
+    await testUser('bob', ['editor'], 'group2')
+  })
+
+  it('can check if user is in role with Roles.GLOBAL_GROUP', async function () {
+    await testUser('joe', ['admin'])
+    await testUser('joe', ['admin'], Roles.GLOBAL_GROUP)
+    await testUser('joe', ['admin', 'editor'], 'group1')
+  })
+})
diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
new file mode 100644
index 0000000000..b3fb854dac
--- /dev/null
+++ b/roles/tests/serverAsync.js
@@ -0,0 +1,2277 @@
+/* eslint-env mocha */
+/* global Roles */
+
+import { Meteor } from 'meteor/meteor'
+import { assert } from 'chai'
+
+// To ensure that the files are loaded for coverage
+import '../roles_server'
+import '../roles_common'
+
+// To allow inserting on the client, needed for testing.
+Meteor.roleAssignment.allow({
+  insert () { return true },
+  update () { return true },
+  remove () { return true }
+})
+
+const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)
+
+describe('roles', function () {
+  let users = {}
+  const roles = ['admin', 'editor', 'user']
+
+  Meteor.publish('_roleAssignments', function () {
+    const loggedInUserId = this.userId
+
+    if (!loggedInUserId) {
+      this.ready()
+      return
+    }
+
+    return Meteor.roleAssignment.find({ _id: loggedInUserId })
+  })
+
+  function addUser (name) {
+    return Meteor.users.insert({ username: name })
+  }
+
+  function testUser (username, expectedRoles, scope) {
+    const userId = users[username]
+    const userObj = Meteor.users.findOne({ _id: userId })
+
+    // check using user ids (makes db calls)
+    _innerTest(userId, username, expectedRoles, scope)
+
+    // check using passed-in user object
+    _innerTest(userObj, username, expectedRoles, scope)
+  }
+
+  function _innerTest (userParam, username, expectedRoles, scope) {
+    // test that user has only the roles expected and no others
+    roles.forEach(function (role) {
+      const expected = expectedRoles.includes(role)
+      const msg = username + ' expected to have \'' + role + '\' role but does not'
+      const nmsg = username + ' had the following un-expected role: ' + role
+
+      if (expected) {
+        assert.isTrue(Roles.userIsInRole(userParam, role, scope), msg)
+      } else {
+        assert.isFalse(Roles.userIsInRole(userParam, role, scope), nmsg)
+      }
+    })
+  }
+
+  beforeEach(function () {
+    Meteor.roles.remove({})
+    Meteor.roleAssignment.remove({})
+    Meteor.users.remove({})
+
+    users = {
+      eve: addUser('eve'),
+      bob: addUser('bob'),
+      joe: addUser('joe')
+    }
+  })
+
+  it('can create and delete roles', function () {
+    const role1Id = Roles.createRole('test1')
+    assert.equal(Meteor.roles.findOne()._id, 'test1')
+    assert.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
+
+    const role2Id = Roles.createRole('test2')
+    assert.equal(Meteor.roles.findOne({ _id: 'test2' })._id, 'test2')
+    assert.equal(Meteor.roles.findOne(role2Id)._id, 'test2')
+
+    assert.equal(Meteor.roles.find().count(), 2)
+
+    Roles.deleteRole('test1')
+    assert.equal(typeof Meteor.roles.findOne({ _id: 'test1' }), 'undefined')
+
+    Roles.deleteRole('test2')
+    assert.equal(typeof Meteor.roles.findOne(), 'undefined')
+  })
+
+  it('can try to remove non-existing roles without crashing', function () {
+    Roles.deleteRole('non-existing-role')
+  })
+
+  it('can\'t create duplicate roles', function () {
+    Roles.createRole('test1')
+    assert.throws(function () { Roles.createRole('test1') })
+    assert.isNull(Roles.createRole('test1', { unlessExists: true }))
+  })
+
+  it('can\'t create role with empty names', function () {
+    assert.throws(function () {
+      Roles.createRole('')
+    }, /Invalid role name/)
+    assert.throws(function () {
+      Roles.createRole(null)
+    }, /Invalid role name/)
+    assert.throws(function () {
+      Roles.createRole(' ')
+    }, /Invalid role name/)
+    assert.throws(function () {
+      Roles.createRole(' foobar')
+    }, /Invalid role name/)
+    assert.throws(function () {
+      Roles.createRole(' foobar ')
+    }, /Invalid role name/)
+  })
+
+  it('can\'t use invalid scope names', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], '')
+    }, /Invalid scope name/)
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ')
+    }, /Invalid scope name/)
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar')
+    }, /Invalid scope name/)
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ')
+    }, /Invalid scope name/)
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42)
+    }, /Invalid scope name/)
+  })
+
+  it('can check if user is in role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+  })
+
+  it('can check if user is in role by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
+
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], { anyScope: true }))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], { anyScope: true }))
+  })
+
+  it('can check if user is in role by scope through options', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], { scope: 'scope1' })
+    Roles.addUsersToRoles(users.eve, ['editor'], { scope: 'scope2' })
+
+    testUser('eve', ['admin', 'user'], { scope: 'scope1' })
+    testUser('eve', ['editor'], { scope: 'scope2' })
+  })
+
+  it('can check if user is in role by scope with global role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, ['user'], 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'scope2'))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], 'scope2'))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
+
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin']))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
+  })
+
+  it('renaming scopes', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+
+    Roles.renameScope('scope1', 'scope3')
+
+    testUser('eve', ['admin', 'user'], 'scope3')
+    testUser('eve', ['editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+
+    assert.throws(function () {
+      Roles.renameScope('scope3')
+    }, /Invalid scope name/)
+
+    Roles.renameScope('scope3', null)
+
+    testUser('eve', ['admin', 'user', 'editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin']))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['user']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
+    assert.isTrue(Roles.userIsInRole(users.eve, ['user'], null))
+
+    Roles.renameScope(null, 'scope2')
+
+    testUser('eve', ['admin', 'user', 'editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user']))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin'], null))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
+  })
+
+  it('removing scopes', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+
+    Roles.removeScope('scope1')
+
+    testUser('eve', ['editor'], 'scope2')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+  })
+
+  it('can check if non-existant user is in role', function () {
+    assert.isFalse(Roles.userIsInRole('1', 'admin'))
+  })
+
+  it('can check if null user is in role', function () {
+    assert.isFalse(Roles.userIsInRole(null, 'admin'))
+  })
+
+  it('can check user against several roles at once', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    const user = Meteor.users.findOne({ _id: users.eve })
+
+    // we can check the non-existing role
+    assert.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
+  })
+
+  it('can\'t add non-existent user to role', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(['1'], ['admin'])
+    assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
+  })
+
+  it('can\'t add user to non-existent role', function () {
+    assert.throws(function () {
+      Roles.addUsersToRoles(users.eve, ['admin'])
+    }, /Role 'admin' does not exist/)
+    Roles.addUsersToRoles(users.eve, ['admin'], { ifExists: true })
+  })
+
+  it('can\'t set non-existent user to role', function () {
+    Roles.createRole('admin')
+
+    Roles.setUserRoles(['1'], ['admin'])
+    assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
+  })
+
+  it('can\'t set user to non-existent role', function () {
+    assert.throws(function () {
+      Roles.setUserRoles(users.eve, ['admin'])
+    }, /Role 'admin' does not exist/)
+    Roles.setUserRoles(users.eve, ['admin'], { ifExists: true })
+  })
+
+  it('can add individual users to roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', [])
+    testUser('joe', [])
+
+    Roles.addUsersToRoles(users.joe, ['editor', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', [])
+    testUser('joe', ['editor', 'user'])
+  })
+
+  it('can add individual users to roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', [], 'scope1')
+    testUser('joe', [], 'scope1')
+
+    testUser('eve', [], 'scope2')
+    testUser('bob', [], 'scope2')
+    testUser('joe', [], 'scope2')
+
+    Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', [], 'scope1')
+    testUser('joe', ['editor', 'user'], 'scope1')
+
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['editor', 'user'], 'scope2')
+    testUser('joe', [], 'scope2')
+  })
+
+  it('can add user to roles via user object', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
+
+    Roles.addUsersToRoles(eve, ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', [])
+    testUser('joe', [])
+
+    Roles.addUsersToRoles(bob, ['editor'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', ['editor'])
+    testUser('joe', [])
+  })
+
+  it('can add user to roles multiple times', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', [])
+    testUser('joe', [])
+
+    Roles.addUsersToRoles(users.bob, ['admin'])
+    Roles.addUsersToRoles(users.bob, ['editor'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', ['admin', 'editor'])
+    testUser('joe', [])
+  })
+
+  it('can add user to roles multiple times by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', [], 'scope1')
+    testUser('joe', [], 'scope1')
+
+    Roles.addUsersToRoles(users.bob, ['admin'], 'scope1')
+    Roles.addUsersToRoles(users.bob, ['editor'], 'scope1')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', ['admin', 'editor'], 'scope1')
+    testUser('joe', [], 'scope1')
+  })
+
+  it('can add multiple users to roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', ['admin', 'user'])
+    testUser('joe', [])
+
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
+
+    testUser('eve', ['admin', 'user'])
+    testUser('bob', ['admin', 'editor', 'user'])
+    testUser('joe', ['editor', 'user'])
+  })
+
+  it('can add multiple users to roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'scope1')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', ['admin', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+
+    testUser('eve', [], 'scope2')
+    testUser('bob', [], 'scope2')
+    testUser('joe', [], 'scope2')
+
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope2')
+
+    testUser('eve', ['admin', 'user'], 'scope1')
+    testUser('bob', ['admin', 'editor', 'user'], 'scope1')
+    testUser('joe', ['editor', 'user'], 'scope1')
+
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['editor', 'user'], 'scope2')
+    testUser('joe', ['editor', 'user'], 'scope2')
+  })
+
+  it('can remove individual users from roles', function () {
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser('eve', ['editor'])
+    testUser('bob', ['editor', 'user'])
+  })
+
+  it('can remove user from roles multiple times', function () {
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser('eve', ['editor'])
+    testUser('bob', ['editor', 'user'])
+
+    // try remove again
+    Roles.removeUsersFromRoles(users.eve, ['user'])
+    testUser('eve', ['editor'])
+  })
+
+  it('can remove users from roles via user object', function () {
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
+
+    // remove user role - one user
+    Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+    Roles.removeUsersFromRoles(eve, ['user'])
+    testUser('eve', ['editor'])
+    testUser('bob', ['editor', 'user'])
+  })
+
+  it('can remove individual users from roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    Roles.removeUsersFromRoles(users.eve, ['user'], 'scope1')
+    testUser('eve', ['editor'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+  })
+
+  it('can remove individual users from roles by scope through options', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], { scope: 'scope1' })
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], { scope: 'scope2' })
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    Roles.removeUsersFromRoles(users.eve, ['user'], { scope: 'scope1' })
+    testUser('eve', ['editor'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+  })
+
+  it('can remove multiple users from roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - two users
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+
+    assert.isFalse(Roles.userIsInRole(users.joe, 'admin'))
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
+    testUser('bob', ['admin', 'user', 'editor'])
+    testUser('joe', ['admin', 'user'])
+    Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
+    testUser('bob', ['user', 'editor'])
+    testUser('joe', ['user'])
+  })
+
+  it('can remove multiple users from roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'scope1')
+    testUser('eve', ['editor'], 'scope1')
+    testUser('bob', ['editor'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'scope2')
+    testUser('eve', [], 'scope2')
+    testUser('bob', [], 'scope2')
+    testUser('joe', [], 'scope2')
+  })
+
+  it('can remove multiple users from roles of any scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    // remove user role - one user
+    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.joe, users.bob], ['user'], 'scope2')
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['user'], 'scope2')
+    testUser('joe', ['user'], 'scope2')
+
+    Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], { anyScope: true })
+    testUser('eve', ['editor'], 'scope1')
+    testUser('bob', ['editor'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', [], 'scope2')
+    testUser('joe', ['user'], 'scope2')
+  })
+
+  it('can set user roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
+
+    Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['editor', 'user'])
+    testUser('joe', [])
+
+    // use addUsersToRoles add some roles
+    Roles.addUsersToRoles([bob, users.joe], ['admin'])
+    testUser('eve', ['editor', 'user'])
+    testUser('bob', ['admin', 'editor', 'user'])
+    testUser('joe', ['admin'])
+
+    Roles.setUserRoles([eve, bob], ['user'])
+    testUser('eve', ['user'])
+    testUser('bob', ['user'])
+    testUser('joe', ['admin'])
+
+    Roles.setUserRoles(bob, 'editor')
+    testUser('eve', ['user'])
+    testUser('bob', ['editor'])
+    testUser('joe', ['admin'])
+
+    Roles.setUserRoles([users.joe, users.bob], [])
+    testUser('eve', ['user'])
+    testUser('bob', [])
+    testUser('joe', [])
+  })
+
+  it('can set user roles by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const eve = Meteor.users.findOne({ _id: users.eve })
+    const bob = Meteor.users.findOne({ _id: users.bob })
+    const joe = Meteor.users.findOne({ _id: users.joe })
+
+    Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2')
+    testUser('eve', ['editor', 'user'], 'scope1')
+    testUser('bob', ['editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope2')
+
+    // use addUsersToRoles add some roles
+    Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'scope1')
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'scope2')
+    testUser('eve', ['admin', 'editor', 'user'], 'scope1')
+    testUser('bob', ['admin', 'editor', 'user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', [], 'scope2')
+    testUser('bob', ['admin', 'editor'], 'scope2')
+    testUser('joe', ['admin', 'editor'], 'scope2')
+
+    Roles.setUserRoles([eve, bob], ['user'], 'scope1')
+    Roles.setUserRoles([eve, joe], ['editor'], 'scope2')
+    testUser('eve', ['user'], 'scope1')
+    testUser('bob', ['user'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+    testUser('bob', ['admin', 'editor'], 'scope2')
+    testUser('joe', ['editor'], 'scope2')
+
+    Roles.setUserRoles(bob, 'editor', 'scope1')
+    testUser('eve', ['user'], 'scope1')
+    testUser('bob', ['editor'], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+    testUser('bob', ['admin', 'editor'], 'scope2')
+    testUser('joe', ['editor'], 'scope2')
+
+    assert.isTrue(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+    assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+
+    Roles.setUserRoles([bob, users.joe], [], 'scope1')
+    testUser('eve', ['user'], 'scope1')
+    testUser('bob', [], 'scope1')
+    testUser('joe', [], 'scope1')
+    testUser('eve', ['editor'], 'scope2')
+    testUser('bob', ['admin', 'editor'], 'scope2')
+    testUser('joe', ['editor'], 'scope2')
+
+    // When roles in a given scope are removed, we do not want any dangling database content for that scope.
+    assert.isFalse(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+    assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+  })
+
+  it('can set user roles by scope including GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+    Roles.createRole('editor')
+
+    const eve = Meteor.users.findOne({ _id: users.eve })
+
+    Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE)
+    testUser('eve', ['admin'], 'scope1')
+    testUser('eve', ['admin'])
+
+    Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_SCOPE)
+    testUser('eve', ['editor'], 'scope2')
+    testUser('eve', ['editor'])
+  })
+
+  it('can set user roles by scope and anyScope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('editor')
+
+    const eve = Meteor.users.findOne({ _id: users.eve })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+
+    Roles.addUsersToRoles(eve, 'admin')
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    Roles.setUserRoles(eve, 'editor', { anyScope: true, scope: 'scope2' })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'editor' },
+      scope: 'scope2',
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'editor' }]
+    }])
+  })
+
+  it('can get all roles', function () {
+    roles.forEach(function (role) {
+      Roles.createRole(role)
+    })
+
+    // compare roles, sorted alphabetically
+    const expected = roles
+    const actual = Roles.getAllRoles().fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+
+    assert.sameMembers(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
+  })
+
+  it('get an empty list of roles for an empty user', function () {
+    assert.sameMembers(Roles.getRolesForUser(undefined), [])
+    assert.sameMembers(Roles.getRolesForUser(null), [])
+    assert.sameMembers(Roles.getRolesForUser({}), [])
+  })
+
+  it('get an empty list of roles for non-existant user', function () {
+    assert.sameMembers(Roles.getRolesForUser('1'), [])
+    assert.sameMembers(Roles.getRolesForUser('1', 'scope1'), [])
+  })
+
+  it('can get all roles for user', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    const userId = users.eve
+    let userObj
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj), [])
+
+    Roles.addUsersToRoles(userId, ['admin', 'user'])
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId), ['admin', 'user'])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj), ['admin', 'user'])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }]
+    }])
+  })
+
+  it('can get all roles for user by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    const userId = users.eve
+    let userObj
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), [])
+
+    // add roles
+    Roles.addUsersToRoles(userId, ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles(userId, ['admin'], 'scope2')
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope2'), ['admin'])
+    assert.sameMembers(Roles.getRolesForUser(userId), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope2'), ['admin'])
+    assert.sameMembers(Roles.getRolesForUser(userObj), [])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }]
+    }])
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }]
+    }, {
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    Roles.createRole('PERMISSION')
+    Roles.addRolesToParent('PERMISSION', 'user')
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }])
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
+    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }, {
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+    assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }])
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
+
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }, {
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+    assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
+  })
+
+  it('can get only scoped roles for user', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    const userId = users.eve
+
+    // add roles
+    Roles.addUsersToRoles(userId, ['user'], 'scope1')
+    Roles.addUsersToRoles(userId, ['admin'])
+
+    Roles.createRole('PERMISSION')
+    Roles.addRolesToParent('PERMISSION', 'user')
+
+    assert.sameMembers(Roles.getRolesForUser(userId, { onlyScoped: true, scope: 'scope1' }), ['user', 'PERMISSION'])
+    assert.sameMembers(Roles.getRolesForUser(userId, { onlyScoped: true, onlyAssigned: true, scope: 'scope1' }), ['user'])
+    assert.sameDeepMembers(Roles.getRolesForUser(userId, { onlyScoped: true, fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }])
+  })
+
+  it('can get all roles for user by scope with periods in name', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+
+    assert.sameMembers(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
+  })
+
+  it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const userId = users.eve
+
+    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
+
+    // by user object
+    const userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
+    assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
+  })
+
+  it('getRolesForUser should not return null entries if user has no roles for scope', function () {
+    Roles.createRole('editor')
+
+    const userId = users.eve
+    let userObj
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
+    assert.sameMembers(Roles.getRolesForUser(userId), [])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), [])
+    assert.sameMembers(Roles.getRolesForUser(userObj), [])
+
+    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+
+    // by userId
+    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['editor'])
+    assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
+
+    // by user object
+    userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor'])
+    assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
+  })
+
+  it('getRolesForUser should not fail during a call of addUsersToRoles', function () {
+    Roles.createRole('editor')
+
+    const userId = users.eve
+    const promises = []
+    const interval = setInterval(() => {
+      promises.push(Promise.resolve().then(() => { Roles.getRolesForUser(userId) }))
+    }, 0)
+
+    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+    clearInterval(interval)
+
+    return Promise.all(promises)
+  })
+
+  it('returns an empty list of scopes for null as user-id', function () {
+    assert.sameMembers(Roles.getScopesForUser(undefined), [])
+    assert.sameMembers(Roles.getScopesForUser(null), [])
+    assert.sameMembers(Roles.getScopesForUser('foo'), [])
+    assert.sameMembers(Roles.getScopesForUser({}), [])
+    assert.sameMembers(Roles.getScopesForUser({ _id: 'foo' }), [])
+  })
+
+  it('can get all scopes for user', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const userId = users.eve
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
+
+    // by userId
+    assert.sameMembers(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
+
+    // by user object
+    const userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
+  })
+
+  it('can get all scopes for user by role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const userId = users.eve
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
+
+    // by userId
+    assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
+
+    // by user object
+    const userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
+  })
+
+  it('getScopesForUser returns [] when not using scopes', function () {
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const userId = users.eve
+
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'])
+
+    // by userId
+    assert.sameMembers(Roles.getScopesForUser(userId), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), [])
+
+    // by user object
+    const userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
+  })
+
+  it('can get all groups for user by role array', function () {
+    const userId = users.eve
+
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.createRole('moderator')
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
+    Roles.addUsersToRoles([users.eve], ['moderator'], 'group3')
+
+    // by userId, one role
+    assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['group2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
+
+    // by userId, multiple roles
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
+
+    // by user object, one role
+    const userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['group2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
+
+    // by user object, multiple roles
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
+  })
+
+  it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    const userId = users.eve
+
+    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
+    Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
+
+    // by userId
+    assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
+    assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+
+    // by user object
+    const userObj = Meteor.users.findOne({ _id: userId })
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
+    assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+  })
+
+  it('can get all users in role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
+    Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
+
+    const expected = [users.eve, users.joe]
+    const actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+  })
+
+  it('can get all users in role by scope', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
+
+    let expected = [users.eve, users.joe]
+    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve, users.joe]
+    actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve, users.bob, users.joe]
+    actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+
+    actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+    assert.sameMembers(actual, [])
+  })
+
+  it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
+
+    let expected = [users.eve]
+    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve, users.bob, users.joe]
+    actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve]
+    actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve, users.bob, users.joe]
+    actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+  })
+
+  it('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
+    Roles.addUsersToRoles([users.bob], ['admin'], 'scope1')
+
+    let expected = [users.eve]
+    let actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve, users.bob]
+    actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+
+    expected = [users.bob]
+    actual = Roles.getUsersInRole('admin', { scope: 'scope1', onlyScoped: true }).fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+  })
+
+  it('can get all users in role by scope and passes through mongo query arguments', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+
+    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
+    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
+
+    const results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
+
+    assert.equal(1, results.length)
+    assert.isTrue(hasProp(results[0], '_id'))
+    assert.isFalse(hasProp(results[0], 'username'))
+  })
+
+  it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
+
+    testUser('eve', [], 'scope1')
+    testUser('joe', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope1')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('bob', ['admin'], 'scope1')
+
+    Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
+
+    testUser('eve', [], 'scope1')
+    testUser('joe', [], 'scope2')
+    testUser('joe', [], 'scope1')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('bob', ['admin'], 'scope1')
+  })
+
+  it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5')
+    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
+
+    testUser('eve', [], 'scope1')
+    testUser('joe', ['admin'], 'scope5')
+    testUser('joe', ['admin'], 'scope2')
+    testUser('joe', ['admin'], 'scope1')
+    testUser('bob', ['admin'], 'scope5')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('bob', ['admin'], 'scope1')
+
+    Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
+
+    testUser('eve', [], 'scope1')
+    testUser('joe', ['admin'], 'scope5')
+    testUser('joe', [], 'scope2')
+    testUser('joe', [], 'scope1')
+    testUser('bob', ['admin'], 'scope5')
+    testUser('bob', ['admin'], 'scope2')
+    testUser('bob', ['admin'], 'scope1')
+  })
+
+  it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
+
+    testUser('joe', ['admin'])
+
+    Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
+
+    testUser('joe', [])
+  })
+
+  it('can use \'.\' in scope name', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
+    testUser('joe', ['admin'], 'example.com')
+  })
+
+  it('can use multiple periods in scope name', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
+    testUser('joe', ['admin'], 'example.k12.va.us')
+  })
+
+  it('renaming of roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+
+    Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'scope2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
+
+    assert.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'user', 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.joe, 'user', 'scope1'))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.joe, 'user', 'scope2'))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
+
+    Roles.renameRole('user', 'user2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
+
+    assert.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
+    assert.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.joe, 'user2', 'scope1'))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope2'))
+    assert.isTrue(Roles.userIsInRole(users.joe, 'user2', 'scope2'))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
+  })
+
+  it('migration without global groups (to v2)', function () {
+    assert.isOk(Meteor.roles.insert({ name: 'admin' }))
+    assert.isOk(Meteor.roles.insert({ name: 'editor' }))
+    assert.isOk(Meteor.roles.insert({ name: 'user' }))
+
+    assert.isOk(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
+    assert.isOk(Meteor.users.update(users.bob, { $set: { roles: [] } }))
+    assert.isOk(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
+
+    Roles._forwardMigrate()
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'admin',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'editor',
+        scope: null,
+        assigned: true
+      }]
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: []
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'user',
+        scope: null,
+        assigned: true
+      }]
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+      _id: 'admin',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+      _id: 'editor',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+      _id: 'user',
+      children: []
+    })
+
+    Roles._backwardMigrate(null, null, false)
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: ['admin', 'editor']
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: []
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: ['user']
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
+      name: 'admin'
+    })
+    assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
+      name: 'editor'
+    })
+    assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
+      name: 'user'
+    })
+  })
+
+  it('migration without global groups (to v3)')
+
+  it('migration with global groups (to v2)', function () {
+    assert.isOk(Meteor.roles.insert({ name: 'admin' }))
+    assert.isOk(Meteor.roles.insert({ name: 'editor' }))
+    assert.isOk(Meteor.roles.insert({ name: 'user' }))
+
+    assert.isOk(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
+    assert.isOk(Meteor.users.update(users.bob, { $set: { roles: { } } }))
+    assert.isOk(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
+
+    Roles._forwardMigrate(null, null, false)
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'admin',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'editor',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'user',
+        scope: 'foo_bla',
+        assigned: true
+      }]
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: []
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'user',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'user',
+        scope: 'foo_bla',
+        assigned: true
+      }]
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+      _id: 'admin',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+      _id: 'editor',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+      _id: 'user',
+      children: []
+    })
+
+    Roles._backwardMigrate(null, null, true)
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: {
+        __global_roles__: ['admin', 'editor'],
+        foo_bla: ['user']
+      }
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: {}
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: {
+        __global_roles__: ['user'],
+        foo_bla: ['user']
+      }
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
+      name: 'admin'
+    })
+    assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
+      name: 'editor'
+    })
+    assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
+      name: 'user'
+    })
+
+    Roles._forwardMigrate(null, null, true)
+
+    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'admin',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'editor',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'user',
+        scope: 'foo.bla',
+        assigned: true
+      }]
+    })
+    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+      roles: []
+    })
+    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+      roles: [{
+        _id: 'user',
+        scope: null,
+        assigned: true
+      }, {
+        _id: 'user',
+        scope: 'foo.bla',
+        assigned: true
+      }]
+    })
+
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+      _id: 'admin',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+      _id: 'editor',
+      children: []
+    })
+    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+      _id: 'user',
+      children: []
+    })
+  })
+
+  it('migration with global groups (to v3)')
+
+  it('_addUserToRole', function () {
+    Roles.createRole('admin')
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+
+    assert.include(
+      Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
+      'insertedId'
+    )
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    assert.notInclude(
+      Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
+      'insertedId'
+    )
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+  })
+
+  it('_removeUserFromRole', function () {
+    Roles.createRole('admin')
+
+    Roles.addUsersToRoles(users.eve, 'admin')
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+  })
+
+  it('keep assigned roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('ALL_PERMISSIONS')
+    Roles.createRole('VIEW_PERMISSION')
+    Roles.createRole('EDIT_PERMISSION')
+    Roles.createRole('DELETE_PERMISSION')
+    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['user'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }])
+
+    Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'VIEW_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }])
+
+    Roles.removeUsersFromRoles(users.eve, 'user')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'VIEW_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }])
+
+    Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+  })
+
+  it('adds children of the added role to the assignments', function () {
+    Roles.createRole('admin')
+    Roles.createRole('ALBUM.ADMIN')
+    Roles.createRole('ALBUM.VIEW')
+    Roles.createRole('TRACK.ADMIN')
+    Roles.createRole('TRACK.VIEW')
+
+    Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
+    Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
+
+    Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
+
+    Roles.addRolesToParent('TRACK.ADMIN', 'admin')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
+  })
+
+  it('removes children of the removed role from the assignments', function () {
+    Roles.createRole('admin')
+    Roles.createRole('ALBUM.ADMIN')
+    Roles.createRole('ALBUM.VIEW')
+    Roles.createRole('TRACK.ADMIN')
+    Roles.createRole('TRACK.VIEW')
+
+    Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
+    Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
+
+    Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
+    Roles.addRolesToParent('TRACK.ADMIN', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
+
+    Roles.removeRolesFromParent('TRACK.ADMIN', 'admin')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
+  })
+
+  it('modify assigned hierarchical roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('ALL_PERMISSIONS')
+    Roles.createRole('VIEW_PERMISSION')
+    Roles.createRole('EDIT_PERMISSION')
+    Roles.createRole('DELETE_PERMISSION')
+    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, ['user'])
+    Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'scope')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }])
+
+    Roles.createRole('MODERATE_PERMISSION')
+
+    Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
+    }])
+
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'admin' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }])
+
+    Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'admin' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }])
+
+    Roles.removeUsersFromRoles(users.eve, ['admin'])
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }])
+
+    Roles.deleteRole('ALL_PERMISSIONS')
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' }
+      ]
+    }])
+  })
+
+  it('delete role with overlapping hierarchical roles', function () {
+    Roles.createRole('role1')
+    Roles.createRole('role2')
+    Roles.createRole('COMMON_PERMISSION_1')
+    Roles.createRole('COMMON_PERMISSION_2')
+    Roles.createRole('COMMON_PERMISSION_3')
+    Roles.createRole('EXTRA_PERMISSION_ROLE_1')
+    Roles.createRole('EXTRA_PERMISSION_ROLE_2')
+
+    Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1')
+    Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1')
+    Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1')
+    Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1')
+
+    Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2')
+    Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2')
+    Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2')
+    Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2')
+
+    Roles.addUsersToRoles(users.eve, 'role1')
+    Roles.addUsersToRoles(users.eve, 'role2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
+    }, {
+      role: { _id: 'role2' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role2' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_2' }
+      ]
+    }])
+
+    Roles.removeUsersFromRoles(users.eve, 'role2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
+    }])
+
+    Roles.addUsersToRoles(users.eve, 'role2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
+    }, {
+      role: { _id: 'role2' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role2' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_2' }
+      ]
+    }])
+
+    Roles.deleteRole('role2')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
+    }])
+  })
+
+  it('set parent on assigned role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('EDIT_PERMISSION')
+
+    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+
+    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+  })
+
+  it('remove parent on assigned role', function () {
+    Roles.createRole('admin')
+    Roles.createRole('EDIT_PERMISSION')
+
+    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+
+    Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+  })
+
+  it('adding and removing extra role parents', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('EDIT_PERMISSION')
+
+    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+
+    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+
+    Roles.addRolesToParent('EDIT_PERMISSION', 'user')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+
+    Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
+
+    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
+
+    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+  })
+
+  it('cyclic roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('editor')
+    Roles.createRole('user')
+
+    Roles.addRolesToParent('editor', 'admin')
+    Roles.addRolesToParent('user', 'editor')
+
+    assert.throws(function () {
+      Roles.addRolesToParent('admin', 'user')
+    }, /form a cycle/)
+  })
+
+  it('userIsInRole returns false for unknown roles', function () {
+    Roles.createRole('admin')
+    Roles.createRole('user')
+    Roles.createRole('editor')
+    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    Roles.addUsersToRoles(users.eve, ['editor'])
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'unknown'))
+    assert.isFalse(Roles.userIsInRole(users.eve, []))
+    assert.isFalse(Roles.userIsInRole(users.eve, null))
+    assert.isFalse(Roles.userIsInRole(users.eve, undefined))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, 'unknown', { anyScope: true }))
+    assert.isFalse(Roles.userIsInRole(users.eve, [], { anyScope: true }))
+    assert.isFalse(Roles.userIsInRole(users.eve, null, { anyScope: true }))
+    assert.isFalse(Roles.userIsInRole(users.eve, undefined, { anyScope: true }))
+
+    assert.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
+  })
+
+  it('userIsInRole returns false if user is a function', function () {
+    Roles.createRole('admin')
+    Roles.addUsersToRoles(users.eve, ['admin'])
+
+    assert.isFalse(Roles.userIsInRole(() => {}, 'admin'))
+  })
+
+  describe('isParentOf', function () {
+    it('returns false for unknown roles', function () {
+      Roles.createRole('admin')
+
+      assert.isFalse(Roles.isParentOf('admin', 'unknown'))
+      assert.isFalse(Roles.isParentOf('admin', null))
+      assert.isFalse(Roles.isParentOf('admin', undefined))
+
+      assert.isFalse(Roles.isParentOf('unknown', 'admin'))
+      assert.isFalse(Roles.isParentOf(null, 'admin'))
+      assert.isFalse(Roles.isParentOf(undefined, 'admin'))
+    })
+
+    it('returns false if role is not parent of', function () {
+      Roles.createRole('admin')
+      Roles.createRole('editor')
+      Roles.createRole('user')
+      Roles.addRolesToParent(['editor'], 'admin')
+      Roles.addRolesToParent(['user'], 'editor')
+
+      assert.isFalse(Roles.isParentOf('user', 'admin'))
+      assert.isFalse(Roles.isParentOf('editor', 'admin'))
+    })
+
+    it('returns true if role is parent of the demanded role', function () {
+      Roles.createRole('admin')
+      Roles.createRole('editor')
+      Roles.createRole('user')
+      Roles.addRolesToParent(['editor'], 'admin')
+      Roles.addRolesToParent(['user'], 'editor')
+
+      assert.isTrue(Roles.isParentOf('admin', 'user'))
+      assert.isTrue(Roles.isParentOf('editor', 'user'))
+      assert.isTrue(Roles.isParentOf('admin', 'editor'))
+
+      assert.isTrue(Roles.isParentOf('admin', 'admin'))
+      assert.isTrue(Roles.isParentOf('editor', 'editor'))
+      assert.isTrue(Roles.isParentOf('user', 'user'))
+    })
+  })
+})

From 5037425b21871fe2633c23ce4ebe3a83627cd6d8 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 25 Aug 2023 11:31:28 +0200
Subject: [PATCH 0437/1140] Start work on async server tests

---
 package.js                 |  1 +
 roles/tests/serverAsync.js | 11 +++++++----
 testapp/package-lock.json  |  9 +++++++++
 testapp/package.json       |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/package.js b/package.js
index 4a01cbbcc0..f362cf22f3 100644
--- a/package.js
+++ b/package.js
@@ -57,6 +57,7 @@ Package.onTest(function (api) {
   ], both)
 
   api.addFiles('roles/tests/server.js', 'server')
+  api.addFiles('roles/tests/serverAsync.js', 'server')
   api.addFiles('roles/tests/client.js', 'client')
   api.addFiles('roles/tests/clientAsync.js', 'client')
 })
diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index b3fb854dac..d3385ce0d0 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -2,7 +2,10 @@
 /* global Roles */
 
 import { Meteor } from 'meteor/meteor'
-import { assert } from 'chai'
+import chai, { assert, expect } from 'chai'
+import chaiAsPromised from 'chai-as-promised'
+
+chai.use(chaiAsPromised)
 
 // To ensure that the files are loaded for coverage
 import '../roles_server'
@@ -17,7 +20,7 @@ Meteor.roleAssignment.allow({
 
 const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)
 
-describe('roles', function () {
+describe('roles async', async function () {
   let users = {}
   const roles = ['admin', 'editor', 'user']
 
@@ -32,8 +35,8 @@ describe('roles', function () {
     return Meteor.roleAssignment.find({ _id: loggedInUserId })
   })
 
-  function addUser (name) {
-    return Meteor.users.insert({ username: name })
+  async function addUser (name) {
+    return await Meteor.users.insertAsync({ username: name })
   }
 
   function testUser (username, expectedRoles, scope) {
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 7a2921ca25..12d666b94a 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -983,6 +983,15 @@
         "type-detect": "^4.0.5"
       }
     },
+    "chai-as-promised": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
+      "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
+      "dev": true,
+      "requires": {
+        "check-error": "^1.0.2"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
diff --git a/testapp/package.json b/testapp/package.json
index f986e8f7ca..42e60dab82 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -18,6 +18,7 @@
   "devDependencies": {
     "babel-plugin-istanbul": "^6.1.1",
     "chai": "^4.3.7",
+    "chai-as-promised": "^7.1.1",
     "nyc": "^15.1.0",
     "puppeteer": "^19.4.0",
     "standard": "^17.1.0"

From a0b1859bf451cd118820cd98c106f5a8d14dd203 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 25 Aug 2023 12:33:20 +0200
Subject: [PATCH 0438/1140] Improve JSDocs

And import Meteor and Mongo
---
 roles/roles_common_async.js | 63 ++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 9a97bee87b..de847a971a 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -1,4 +1,6 @@
-/* global Meteor, Roles, Mongo */
+/* global Roles */
+import { Meteor } from 'meteor/meteor'
+import { Mongo } from 'meteor/mongo'
 
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
@@ -45,7 +47,7 @@ let getGroupsForUserDeprecationWarning = false
  * Helper, resolves async some
  * @param {*} arr
  * @param {*} predicate
- * @returns
+ * @returns {Promise<Boolean>}
  */
 const asyncSome = async (arr, predicate) => {
   for (const e of arr) {
@@ -71,7 +73,7 @@ Object.assign(Roles, {
    * @param {String} roleName Name of role.
    * @param {Object} [options] Options:
    *   - `unlessExists`: if `true`, exception will not be thrown in the role already exists
-   * @return {String} ID of the new role or null.
+   * @return {Promise<String>} ID of the new role or null.
    * @static
    */
   createRoleAsync: async function (roleName, options) {
@@ -103,7 +105,7 @@ Object.assign(Roles, {
 
     if (!insertedId) {
       if (options.unlessExists) return null
-      throw new Error("Role '" + roleName + "' already exists.")
+      throw new Meteor.Error("Role '" + roleName + "' already exists.")
     }
 
     return insertedId
@@ -116,6 +118,7 @@ Object.assign(Roles, {
    *
    * @method deleteRole
    * @param {String} roleName Name of role.
+   * @returns {Promise}
    * @static
    */
   deleteRoleAsync: async function (roleName) {
@@ -180,6 +183,7 @@ Object.assign(Roles, {
    * @method renameRole
    * @param {String} oldName Old name of a role.
    * @param {String} newName New name of a role.
+   * @returns {Promise}
    * @static
    */
   renameRoleAsync: async function (oldName, newName) {
@@ -193,7 +197,7 @@ Object.assign(Roles, {
     const role = await Meteor.roles.findOneAsync({ _id: oldName })
 
     if (!role) {
-      throw new Error("Role '" + oldName + "' does not exist.")
+      throw new Meteor.Error("Role '" + oldName + "' does not exist.")
     }
 
     role._id = newName
@@ -254,6 +258,7 @@ Object.assign(Roles, {
    * @method addRolesToParent
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
+   * @returns {Promise}
    * @static
    */
   addRolesToParentAsync: async function (rolesNames, parentName) {
@@ -269,6 +274,7 @@ Object.assign(Roles, {
    * @method _addRoleToParent
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
+   * @returns {Promise}
    * @private
    * @static
    */
@@ -280,12 +286,12 @@ Object.assign(Roles, {
     const role = await Meteor.roles.findOneAsync({ _id: roleName })
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.")
+      throw new Meteor.Error("Role '" + roleName + "' does not exist.")
     }
 
     // detect cycles
     if ((await Roles._getInheritedRoleNamesAsync(role)).includes(parentName)) {
-      throw new Error(
+      throw new Meteor.Error(
         "Roles '" + roleName + "' and '" + parentName + "' would form a cycle."
       )
     }
@@ -337,6 +343,7 @@ Object.assign(Roles, {
    * @method removeRolesFromParent
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
+   * @returns {Promise}
    * @static
    */
   removeRolesFromParentAsync: async function (rolesNames, parentName) {
@@ -352,6 +359,7 @@ Object.assign(Roles, {
    * @method _removeRoleFromParent
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
+   * @returns {Promise}
    * @private
    * @static
    */
@@ -367,7 +375,7 @@ Object.assign(Roles, {
     )
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.")
+      throw new Meteor.Error("Role '" + roleName + "' does not exist.")
     }
 
     const count = await Meteor.roles.updateAsync(
@@ -435,6 +443,7 @@ Object.assign(Roles, {
    * @param {Object|String} [options] Options:
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   * @returns {Promise}
    *
    * Alternatively, it can be a scope name string.
    * @static
@@ -442,8 +451,8 @@ Object.assign(Roles, {
   addUsersToRolesAsync: async function (users, roles, options) {
     let id
 
-    if (!users) throw new Error("Missing 'users' param.")
-    if (!roles) throw new Error("Missing 'roles' param.")
+    if (!users) throw new Meteor.Error("Missing 'users' param.")
+    if (!roles) throw new Meteor.Error("Missing 'roles' param.")
 
     options = Roles._normalizeOptions(options)
 
@@ -491,6 +500,7 @@ Object.assign(Roles, {
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   * @returns {Promise}
    *
    * Alternatively, it can be a scope name string.
    * @static
@@ -498,8 +508,8 @@ Object.assign(Roles, {
   setUserRolesAsync: async function (users, roles, options) {
     let id
 
-    if (!users) throw new Error("Missing 'users' param.")
-    if (!roles) throw new Error("Missing 'roles' param.")
+    if (!users) throw new Meteor.Error("Missing 'users' param.")
+    if (!roles) throw new Meteor.Error("Missing 'roles' param.")
 
     options = Roles._normalizeOptions(options)
 
@@ -547,6 +557,7 @@ Object.assign(Roles, {
    * @param {Object} options Options:
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
+   * @returns {Promise}
    * @private
    * @static
    */
@@ -567,7 +578,7 @@ Object.assign(Roles, {
       if (options.ifExists) {
         return []
       } else {
-        throw new Error("Role '" + roleName + "' does not exist.")
+        throw new Meteor.Error("Role '" + roleName + "' does not exist.")
       }
     }
 
@@ -639,6 +650,7 @@ Object.assign(Roles, {
    *
    * @method _getParentRoleNames
    * @param {object} role The role object
+   * @returns {Promise}
    * @private
    * @static
    */
@@ -670,6 +682,7 @@ Object.assign(Roles, {
    *
    * @method _getInheritedRoleNames
    * @param {object} role The role object
+   * @returns {Promise}
    * @private
    * @static
    */
@@ -708,13 +721,14 @@ Object.assign(Roles, {
    * @param {Object|String} [options] Options:
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   * @returns {Promise}
    *
    * Alternatively, it can be a scope name string.
    * @static
    */
   removeUsersFromRolesAsync: async function (users, roles, options) {
-    if (!users) throw new Error("Missing 'users' param.")
-    if (!roles) throw new Error("Missing 'roles' param.")
+    if (!users) throw new Meteor.Error("Missing 'users' param.")
+    if (!roles) throw new Meteor.Error("Missing 'roles' param.")
 
     options = Roles._normalizeOptions(options)
 
@@ -749,6 +763,7 @@ Object.assign(Roles, {
    * @param {Object} options Options:
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   * @returns {Promise}
    * @private
    * @static
    */
@@ -796,7 +811,7 @@ Object.assign(Roles, {
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *
    * Alternatively, it can be a scope name string.
-   * @return {Boolean} `true` if user is in _any_ of the target roles
+   * @return {Promise<Boolean>} `true` if user is in _any_ of the target roles
    * @static
    */
   userIsInRoleAsync: async function (user, roles, options) {
@@ -864,7 +879,7 @@ Object.assign(Roles, {
    *     result strongly dependant on the internal data structure of this plugin.
    *
    * Alternatively, it can be a scope name string.
-   * @return {Array} Array of user's roles, unsorted.
+   * @return {Promise<Array>} Array of user's roles, unsorted.
    * @static
    */
   getRolesForUserAsync: async function (user, options) {
@@ -973,7 +988,7 @@ Object.assign(Roles, {
    * Alternatively, it can be a scope name string.
    * @param {Object} [queryOptions] Options which are passed directly
    *                                through to `Meteor.users.find(query, options)`
-   * @return {Cursor} Cursor of users in roles.
+   * @return {Promise<Cursor>} Cursor of users in roles.
    * @static
    */
   getUsersInRoleAsync: async function (roles, options, queryOptions) {
@@ -1082,6 +1097,7 @@ Object.assign(Roles, {
    * Deprecated. Use `getScopesForUser` instead.
    *
    * @method getGroupsForUser
+   * @returns {Promise<Array>}
    * @static
    * @deprecated
    */
@@ -1094,7 +1110,7 @@ Object.assign(Roles, {
         )
     }
 
-    return Roles.getScopesForUser(...args)
+    return await Roles.getScopesForUser(...args)
   },
 
   /**
@@ -1104,7 +1120,7 @@ Object.assign(Roles, {
    * @param {String|Object} user User ID or an actual user object.
    * @param {Array|String} [roles] Name of roles to restrict scopes to.
    *
-   * @return {Array} Array of user's scopes, unsorted.
+   * @return {Promise<Array>} Array of user's scopes, unsorted.
    * @static
    */
   getScopesForUserAsync: async function (user, roles) {
@@ -1146,6 +1162,7 @@ Object.assign(Roles, {
    * @method renameScope
    * @param {String} oldName Old name of a scope.
    * @param {String} newName New name of a scope.
+   * @returns {Promise}
    * @static
    */
   renameScopeAsync: async function (oldName, newName) {
@@ -1178,6 +1195,7 @@ Object.assign(Roles, {
    *
    * @method removeScope
    * @param {String} name The name of a scope.
+   * @returns {Promise}
    * @static
    */
   removeScopeAsync: async function (name) {
@@ -1200,7 +1218,7 @@ Object.assign(Roles, {
       typeof roleName !== 'string' ||
       roleName.trim() !== roleName
     ) {
-      throw new Error("Invalid role name '" + roleName + "'.")
+      throw new Meteor.Error(500,"Invalid role name '" + roleName + "'.")
     }
   },
 
@@ -1212,6 +1230,7 @@ Object.assign(Roles, {
    * @method isParentOf
    * @param {String} parentRoleName The role you want to research.
    * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
+   * @returns {Promise}
    * @static
    */
   isParentOfAsync: async function (parentRoleName, childRoleName) {
@@ -1300,7 +1319,7 @@ Object.assign(Roles, {
       typeof scopeName !== 'string' ||
       scopeName.trim() !== scopeName
     ) {
-      throw new Error("Invalid scope name '" + scopeName + "'.")
+      throw new Meteor.Error("Invalid scope name '" + scopeName + "'.")
     }
   }
 })

From a299af350c95358409a98a50c5d4593ec80f2b89 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 25 Aug 2023 13:04:13 +0200
Subject: [PATCH 0439/1140] Revert Meteor.Error

Not for this PR
---
 roles/roles_common_async.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index de847a971a..ad9c0fcd85 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -105,7 +105,7 @@ Object.assign(Roles, {
 
     if (!insertedId) {
       if (options.unlessExists) return null
-      throw new Meteor.Error("Role '" + roleName + "' already exists.")
+      throw new Error("Role '" + roleName + "' already exists.")
     }
 
     return insertedId
@@ -197,7 +197,7 @@ Object.assign(Roles, {
     const role = await Meteor.roles.findOneAsync({ _id: oldName })
 
     if (!role) {
-      throw new Meteor.Error("Role '" + oldName + "' does not exist.")
+      throw new Error("Role '" + oldName + "' does not exist.")
     }
 
     role._id = newName
@@ -286,12 +286,12 @@ Object.assign(Roles, {
     const role = await Meteor.roles.findOneAsync({ _id: roleName })
 
     if (!role) {
-      throw new Meteor.Error("Role '" + roleName + "' does not exist.")
+      throw new Error("Role '" + roleName + "' does not exist.")
     }
 
     // detect cycles
     if ((await Roles._getInheritedRoleNamesAsync(role)).includes(parentName)) {
-      throw new Meteor.Error(
+      throw new Error(
         "Roles '" + roleName + "' and '" + parentName + "' would form a cycle."
       )
     }
@@ -375,7 +375,7 @@ Object.assign(Roles, {
     )
 
     if (!role) {
-      throw new Meteor.Error("Role '" + roleName + "' does not exist.")
+      throw new Error("Role '" + roleName + "' does not exist.")
     }
 
     const count = await Meteor.roles.updateAsync(
@@ -451,8 +451,8 @@ Object.assign(Roles, {
   addUsersToRolesAsync: async function (users, roles, options) {
     let id
 
-    if (!users) throw new Meteor.Error("Missing 'users' param.")
-    if (!roles) throw new Meteor.Error("Missing 'roles' param.")
+    if (!users) throw new Error("Missing 'users' param.")
+    if (!roles) throw new Error("Missing 'roles' param.")
 
     options = Roles._normalizeOptions(options)
 
@@ -508,8 +508,8 @@ Object.assign(Roles, {
   setUserRolesAsync: async function (users, roles, options) {
     let id
 
-    if (!users) throw new Meteor.Error("Missing 'users' param.")
-    if (!roles) throw new Meteor.Error("Missing 'roles' param.")
+    if (!users) throw new Error("Missing 'users' param.")
+    if (!roles) throw new Error("Missing 'roles' param.")
 
     options = Roles._normalizeOptions(options)
 
@@ -578,7 +578,7 @@ Object.assign(Roles, {
       if (options.ifExists) {
         return []
       } else {
-        throw new Meteor.Error("Role '" + roleName + "' does not exist.")
+        throw new Error("Role '" + roleName + "' does not exist.")
       }
     }
 
@@ -727,8 +727,8 @@ Object.assign(Roles, {
    * @static
    */
   removeUsersFromRolesAsync: async function (users, roles, options) {
-    if (!users) throw new Meteor.Error("Missing 'users' param.")
-    if (!roles) throw new Meteor.Error("Missing 'roles' param.")
+    if (!users) throw new Error("Missing 'users' param.")
+    if (!roles) throw new Error("Missing 'roles' param.")
 
     options = Roles._normalizeOptions(options)
 
@@ -1218,7 +1218,7 @@ Object.assign(Roles, {
       typeof roleName !== 'string' ||
       roleName.trim() !== roleName
     ) {
-      throw new Meteor.Error(500,"Invalid role name '" + roleName + "'.")
+      throw new Error("Invalid role name '" + roleName + "'.")
     }
   },
 
@@ -1319,7 +1319,7 @@ Object.assign(Roles, {
       typeof scopeName !== 'string' ||
       scopeName.trim() !== scopeName
     ) {
-      throw new Meteor.Error("Invalid scope name '" + scopeName + "'.")
+      throw new Error("Invalid scope name '" + scopeName + "'.")
     }
   }
 })

From a8bc5a80ac615b1b2f560a914eddd7afc3dfd62b Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sun, 24 Sep 2023 12:18:19 +0200
Subject: [PATCH 0440/1140] Get more async tests and fix lint test error

---
 roles/tests/serverAsync.js | 4017 ++++++++++++++++++------------------
 testapp/.meteor/packages   |    2 +-
 testapp/.meteor/release    |    2 +-
 testapp/.meteor/versions   |    9 +-
 4 files changed, 2013 insertions(+), 2017 deletions(-)

diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index d3385ce0d0..5b4fda6fd3 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -2,15 +2,15 @@
 /* global Roles */
 
 import { Meteor } from 'meteor/meteor'
-import chai, { assert, expect } from 'chai'
+import chai, { assert } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 
-chai.use(chaiAsPromised)
-
 // To ensure that the files are loaded for coverage
 import '../roles_server'
 import '../roles_common'
 
+chai.use(chaiAsPromised)
+
 // To allow inserting on the client, needed for testing.
 Meteor.roleAssignment.allow({
   insert () { return true },
@@ -39,733 +39,734 @@ describe('roles async', async function () {
     return await Meteor.users.insertAsync({ username: name })
   }
 
-  function testUser (username, expectedRoles, scope) {
+  async function testUser (username, expectedRoles, scope) {
     const userId = users[username]
-    const userObj = Meteor.users.findOne({ _id: userId })
+    const userObj = await Meteor.users.findOneAsync({ _id: userId })
 
     // check using user ids (makes db calls)
-    _innerTest(userId, username, expectedRoles, scope)
+    await _innerTest(userId, username, expectedRoles, scope)
 
     // check using passed-in user object
-    _innerTest(userObj, username, expectedRoles, scope)
+    await _innerTest(userObj, username, expectedRoles, scope)
   }
 
-  function _innerTest (userParam, username, expectedRoles, scope) {
+  async function _innerTest (userParam, username, expectedRoles, scope) {
     // test that user has only the roles expected and no others
-    roles.forEach(function (role) {
+    for (const role of roles) {
       const expected = expectedRoles.includes(role)
       const msg = username + ' expected to have \'' + role + '\' role but does not'
       const nmsg = username + ' had the following un-expected role: ' + role
 
       if (expected) {
-        assert.isTrue(Roles.userIsInRole(userParam, role, scope), msg)
+        assert.isTrue(await Roles.userIsInRoleAsync(userParam, role, scope), msg)
       } else {
-        assert.isFalse(Roles.userIsInRole(userParam, role, scope), nmsg)
+        assert.isFalse(await Roles.userIsInRoleAsync(userParam, role, scope), nmsg)
       }
-    })
+    }
   }
 
-  beforeEach(function () {
-    Meteor.roles.remove({})
-    Meteor.roleAssignment.remove({})
-    Meteor.users.remove({})
+  beforeEach(async function () {
+    await Meteor.roles.removeAsync({})
+    await Meteor.roleAssignment.removeAsync({})
+    await Meteor.users.removeAsync({})
 
     users = {
-      eve: addUser('eve'),
-      bob: addUser('bob'),
-      joe: addUser('joe')
+      eve: await addUser('eve'),
+      bob: await addUser('bob'),
+      joe: await addUser('joe')
     }
   })
 
-  it('can create and delete roles', function () {
-    const role1Id = Roles.createRole('test1')
-    assert.equal(Meteor.roles.findOne()._id, 'test1')
-    assert.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
+  it('can create and delete roles', async function () {
+    const role1Id = await Roles.createRoleAsync('test1')
+    const test1a = await Meteor.roles.findOneAsync()
+    const test1b = await Meteor.roles.findOneAsync(role1Id)
+    assert.equal(test1a._id, 'test1')
+    assert.equal(test1b._id, 'test1')
 
-    const role2Id = Roles.createRole('test2')
-    assert.equal(Meteor.roles.findOne({ _id: 'test2' })._id, 'test2')
-    assert.equal(Meteor.roles.findOne(role2Id)._id, 'test2')
+    const role2Id = await Roles.createRoleAsync('test2')
+    const test2a = await Meteor.roles.findOneAsync({ _id: 'test2' })
+    const test2b = await Meteor.roles.findOneAsync(role2Id)
+    assert.equal(test2a._id, 'test2')
+    assert.equal(test2b._id, 'test2')
 
-    assert.equal(Meteor.roles.find().count(), 2)
+    assert.equal(await Meteor.roles.countDocuments(), 2)
 
-    Roles.deleteRole('test1')
-    assert.equal(typeof Meteor.roles.findOne({ _id: 'test1' }), 'undefined')
+    await Roles.deleteRoleAsync('test1')
+    const undefinedTest = await Meteor.roles.findOneAsync({ _id: 'test1' })
+    assert.equal(typeof undefinedTest, 'undefined')
 
-    Roles.deleteRole('test2')
-    assert.equal(typeof Meteor.roles.findOne(), 'undefined')
+    await Roles.deleteRoleAsync('test2')
+    const undefinedTest2 = await Meteor.roles.findOneAsync()
+    assert.equal(typeof undefinedTest2, 'undefined')
   })
 
-  it('can try to remove non-existing roles without crashing', function () {
-    Roles.deleteRole('non-existing-role')
+  it('can try to remove non-existing roles without crashing', async function () {
+    try {
+      await Roles.deleteRoleAsync('non-existing-role')
+    } catch (e) {
+      assert.notExists(e)
+    }
+    // Roles.deleteRoleAsync('non-existing-role').should.be.fulfilled
   })
 
-  it('can\'t create duplicate roles', function () {
-    Roles.createRole('test1')
-    assert.throws(function () { Roles.createRole('test1') })
-    assert.isNull(Roles.createRole('test1', { unlessExists: true }))
+  it('can\'t create duplicate roles', async function () {
+    try {
+      await Roles.createRoleAsync('test1')
+    } catch (e) {
+      assert.notExists(e)
+    }
+    // assert.eventually.throws(Roles.createRoleAsync('test1'))
+    try {
+      await Roles.createRoleAsync('test1')
+    } catch (e) {
+      assert.exists(e)
+    }
+    assert.isNull(await Roles.createRoleAsync('test1', { unlessExists: true }))
   })
 
-  it('can\'t create role with empty names', function () {
-    assert.throws(function () {
-      Roles.createRole('')
-    }, /Invalid role name/)
-    assert.throws(function () {
-      Roles.createRole(null)
-    }, /Invalid role name/)
-    assert.throws(function () {
-      Roles.createRole(' ')
-    }, /Invalid role name/)
-    assert.throws(function () {
-      Roles.createRole(' foobar')
-    }, /Invalid role name/)
-    assert.throws(function () {
-      Roles.createRole(' foobar ')
-    }, /Invalid role name/)
+  it('can\'t create role with empty names', async function () {
+    assert.isRejected(Roles.createRoleAsync(''), /Invalid role name/)
+    assert.isRejected(Roles.createRoleAsync(null), /Invalid role name/)
+    assert.isRejected(Roles.createRoleAsync(' '), /Invalid role name/)
+    assert.isRejected(Roles.createRoleAsync(' foobar'), /Invalid role name/)
+    assert.isRejected(Roles.createRoleAsync(' foobar '), /Invalid role name/)
   })
 
-  it('can\'t use invalid scope names', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+  it('can\'t use invalid scope names', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
 
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], '')
-    }, /Invalid scope name/)
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ')
-    }, /Invalid scope name/)
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar')
-    }, /Invalid scope name/)
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ')
-    }, /Invalid scope name/)
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42)
-    }, /Invalid scope name/)
+    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ''), /Invalid scope name/)
+    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' '), /Invalid scope name/)
+    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' foobar'), /Invalid scope name/)
+    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' foobar '), /Invalid scope name/)
+    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 42), /Invalid scope name/)
   })
 
-  it('can check if user is in role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+  it('can check if user is in role', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
 
-    testUser('eve', ['admin', 'user'])
+    await testUser('eve', ['admin', 'user'])
   })
 
-  it('can check if user is in role by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+  it('can check if user is in role by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
 
     testUser('eve', ['admin', 'user'], 'scope1')
     testUser('eve', ['editor'], 'scope2')
 
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope2'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope1'))
 
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], { anyScope: true }))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], { anyScope: true }))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], { anyScope: true }))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['editor'], { anyScope: true }))
   })
 
-  it('can check if user is in role by scope through options', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], { scope: 'scope1' })
-    Roles.addUsersToRoles(users.eve, ['editor'], { scope: 'scope2' })
+  it('can check if user is in role by scope through options', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], { scope: 'scope1' })
+    await Roles.addUsersToRolesAsync(users.eve, ['editor'], { scope: 'scope2' })
 
-    testUser('eve', ['admin', 'user'], { scope: 'scope1' })
-    testUser('eve', ['editor'], { scope: 'scope2' })
+    await testUser('eve', ['admin', 'user'], { scope: 'scope1' })
+    await testUser('eve', ['editor'], { scope: 'scope2' })
   })
 
-  it('can check if user is in role by scope with global role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-    Roles.addUsersToRoles(users.eve, ['admin'])
+  // it('can check if user is in role by scope with global role', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //   Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+  //   Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
+  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['user'], 'scope1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope2'))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['user']))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['editor']))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['user'], null))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['editor'], null))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['user'], 'scope2'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope1'))
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['admin'], 'scope2'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['admin'], 'scope1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['admin']))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['admin'], null))
+  // })
 
-    assert.isTrue(Roles.userIsInRole(users.eve, ['user'], 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'scope2'))
+  it('renaming scopes', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
 
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
+    await testUser('eve', ['admin', 'user'], 'scope1')
+    await testUser('eve', ['editor'], 'scope2')
 
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], 'scope2'))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
+    await Roles.renameScopeAsync('scope1', 'scope3')
 
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin']))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
+    await testUser('eve', ['admin', 'user'], 'scope3')
+    await testUser('eve', ['editor'], 'scope2')
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope2'))
+
+    assert.isRejected(Roles.renameScopeAsync('scope3'), /Invalid scope name/)
+
+    await Roles.renameScopeAsync('scope3', null)
+
+    await testUser('eve', ['admin', 'user', 'editor'], 'scope2')
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor']))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin']))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['user']))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], null))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin'], null))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['user'], null))
+
+    await Roles.renameScopeAsync(null, 'scope2')
+
+    await testUser('eve', ['admin', 'user', 'editor'], 'scope2')
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor']))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin']))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user']))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], null))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin'], null))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user'], null))
   })
 
-  it('renaming scopes', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
+  it('removing scopes', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
 
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
+    await testUser('eve', ['admin', 'user'], 'scope1')
+    await testUser('eve', ['editor'], 'scope2')
 
-    Roles.renameScope('scope1', 'scope3')
+    await Roles.removeScopeAsync('scope1')
 
-    testUser('eve', ['admin', 'user'], 'scope3')
-    testUser('eve', ['editor'], 'scope2')
+    await testUser('eve', ['editor'], 'scope2')
 
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
-
-    assert.throws(function () {
-      Roles.renameScope('scope3')
-    }, /Invalid scope name/)
-
-    Roles.renameScope('scope3', null)
-
-    testUser('eve', ['admin', 'user', 'editor'], 'scope2')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin']))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['user']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['user'], null))
-
-    Roles.renameScope(null, 'scope2')
-
-    testUser('eve', ['admin', 'user', 'editor'], 'scope2')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin'], null))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope2'))
   })
 
-  it('removing scopes', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-
-    Roles.removeScope('scope1')
-
-    testUser('eve', ['editor'], 'scope2')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
+  it('can check if non-existant user is in role', async function () {
+    assert.isFalse(await Roles.userIsInRoleAsync('1', 'admin'))
   })
 
-  it('can check if non-existant user is in role', function () {
-    assert.isFalse(Roles.userIsInRole('1', 'admin'))
+  it('can check if null user is in role', async function () {
+    assert.isFalse(await Roles.userIsInRoleAsync(null, 'admin'))
   })
 
-  it('can check if null user is in role', function () {
-    assert.isFalse(Roles.userIsInRole(null, 'admin'))
-  })
+  it('can check user against several roles at once', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
 
-  it('can check user against several roles at once', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    const user = Meteor.users.findOne({ _id: users.eve })
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
+    const user = await Meteor.users.findOneAsync({ _id: users.eve })
 
     // we can check the non-existing role
-    assert.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
+    assert.isTrue(await Roles.userIsInRoleAsync(user, ['editor', 'admin']))
   })
 
-  it('can\'t add non-existent user to role', function () {
-    Roles.createRole('admin')
+  it('can\'t add non-existent user to role', async function () {
+    await Roles.createRoleAsync('admin')
 
-    Roles.addUsersToRoles(['1'], ['admin'])
-    assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
+    await Roles.addUsersToRolesAsync(['1'], ['admin'])
+    assert.equal(await Meteor.users.findOneAsync({ _id: '1' }), undefined)
   })
 
-  it('can\'t add user to non-existent role', function () {
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin'])
-    }, /Role 'admin' does not exist/)
-    Roles.addUsersToRoles(users.eve, ['admin'], { ifExists: true })
+  it('can\'t add user to non-existent role', async function () {
+    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin']), /Role 'admin' does not exist/)
+    await Roles.addUsersToRolesAsync(users.eve, ['admin'], { ifExists: true })
   })
 
-  it('can\'t set non-existent user to role', function () {
-    Roles.createRole('admin')
+  it('can\'t set non-existent user to role', async function () {
+    await Roles.createRoleAsync('admin')
 
-    Roles.setUserRoles(['1'], ['admin'])
-    assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
+    await Roles.setUserRolesAsync(['1'], ['admin'])
+    assert.equal(await Meteor.users.findOneAsync({ _id: '1' }), undefined)
   })
 
-  it('can\'t set user to non-existent role', function () {
-    assert.throws(function () {
-      Roles.setUserRoles(users.eve, ['admin'])
-    }, /Role 'admin' does not exist/)
-    Roles.setUserRoles(users.eve, ['admin'], { ifExists: true })
+  it('can\'t set user to non-existent role', async function () {
+    assert.isRejected(Roles.setUserRolesAsync(users.eve, ['admin']), /Role 'admin' does not exist/)
+    await Roles.setUserRolesAsync(users.eve, ['admin'], { ifExists: true })
   })
 
-  it('can add individual users to roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can add individual users to roles', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
 
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', [])
-    testUser('joe', [])
+    await testUser('eve', ['admin', 'user'])
+    await testUser('bob', [])
+    await testUser('joe', [])
 
-    Roles.addUsersToRoles(users.joe, ['editor', 'user'])
+    await Roles.addUsersToRolesAsync(users.joe, ['editor', 'user'])
 
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', [])
-    testUser('joe', ['editor', 'user'])
+    await testUser('eve', ['admin', 'user'])
+    await testUser('bob', [])
+    await testUser('joe', ['editor', 'user'])
   })
 
-  it('can add individual users to roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can add individual users to roles by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
 
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', [], 'scope1')
-    testUser('joe', [], 'scope1')
+    await testUser('eve', ['admin', 'user'], 'scope1')
+    await testUser('bob', [], 'scope1')
+    await testUser('joe', [], 'scope1')
 
-    testUser('eve', [], 'scope2')
-    testUser('bob', [], 'scope2')
-    testUser('joe', [], 'scope2')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', [], 'scope2')
+    await testUser('joe', [], 'scope2')
 
-    Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'scope2')
+    await Roles.addUsersToRolesAsync(users.joe, ['editor', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.bob, ['editor', 'user'], 'scope2')
 
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', [], 'scope1')
-    testUser('joe', ['editor', 'user'], 'scope1')
+    await testUser('eve', ['admin', 'user'], 'scope1')
+    await testUser('bob', [], 'scope1')
+    await testUser('joe', ['editor', 'user'], 'scope1')
 
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['editor', 'user'], 'scope2')
-    testUser('joe', [], 'scope2')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['editor', 'user'], 'scope2')
+    await testUser('joe', [], 'scope2')
   })
 
-  it('can add user to roles via user object', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can add user to roles via user object', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    const eve = Meteor.users.findOne({ _id: users.eve })
-    const bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
+    const bob = await Meteor.users.findOneAsync({ _id: users.bob })
 
-    Roles.addUsersToRoles(eve, ['admin', 'user'])
+    await Roles.addUsersToRolesAsync(eve, ['admin', 'user'])
 
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', [])
-    testUser('joe', [])
+    await testUser('eve', ['admin', 'user'])
+    await testUser('bob', [])
+    await testUser('joe', [])
 
-    Roles.addUsersToRoles(bob, ['editor'])
+    await Roles.addUsersToRolesAsync(bob, ['editor'])
 
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', ['editor'])
-    testUser('joe', [])
+    await testUser('eve', ['admin', 'user'])
+    await testUser('bob', ['editor'])
+    await testUser('joe', [])
   })
 
-  it('can add user to roles multiple times', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can add user to roles multiple times', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
 
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', [])
-    testUser('joe', [])
+    await testUser('eve', ['admin', 'user'])
+    await testUser('bob', [])
+    await testUser('joe', [])
 
-    Roles.addUsersToRoles(users.bob, ['admin'])
-    Roles.addUsersToRoles(users.bob, ['editor'])
+    await Roles.addUsersToRolesAsync(users.bob, ['admin'])
+    await Roles.addUsersToRolesAsync(users.bob, ['editor'])
 
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', ['admin', 'editor'])
-    testUser('joe', [])
+    await testUser('eve', ['admin', 'user'])
+    await testUser('bob', ['admin', 'editor'])
+    await testUser('joe', [])
   })
 
-  it('can add user to roles multiple times by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can add user to roles multiple times by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
 
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', [], 'scope1')
-    testUser('joe', [], 'scope1')
+    await testUser('eve', ['admin', 'user'], 'scope1')
+    await testUser('bob', [], 'scope1')
+    await testUser('joe', [], 'scope1')
 
-    Roles.addUsersToRoles(users.bob, ['admin'], 'scope1')
-    Roles.addUsersToRoles(users.bob, ['editor'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.bob, ['admin'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.bob, ['editor'], 'scope1')
 
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', ['admin', 'editor'], 'scope1')
-    testUser('joe', [], 'scope1')
+    await testUser('eve', ['admin', 'user'], 'scope1')
+    await testUser('bob', ['admin', 'editor'], 'scope1')
+    await testUser('joe', [], 'scope1')
   })
 
-  it('can add multiple users to roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can add multiple users to roles', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['admin', 'user'])
 
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', ['admin', 'user'])
-    testUser('joe', [])
+    await testUser('eve', ['admin', 'user'])
+    await testUser('bob', ['admin', 'user'])
+    await testUser('joe', [])
 
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor', 'user'])
 
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', ['admin', 'editor', 'user'])
-    testUser('joe', ['editor', 'user'])
+    await testUser('eve', ['admin', 'user'])
+    await testUser('bob', ['admin', 'editor', 'user'])
+    await testUser('joe', ['editor', 'user'])
   })
 
-  it('can add multiple users to roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can add multiple users to roles by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['admin', 'user'], 'scope1')
 
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', ['admin', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
+    await testUser('eve', ['admin', 'user'], 'scope1')
+    await testUser('bob', ['admin', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
 
-    testUser('eve', [], 'scope2')
-    testUser('bob', [], 'scope2')
-    testUser('joe', [], 'scope2')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', [], 'scope2')
+    await testUser('joe', [], 'scope2')
 
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope2')
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor', 'user'], 'scope2')
 
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', ['admin', 'editor', 'user'], 'scope1')
-    testUser('joe', ['editor', 'user'], 'scope1')
+    await testUser('eve', ['admin', 'user'], 'scope1')
+    await testUser('bob', ['admin', 'editor', 'user'], 'scope1')
+    await testUser('joe', ['editor', 'user'], 'scope1')
 
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['editor', 'user'], 'scope2')
-    testUser('joe', ['editor', 'user'], 'scope2')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['editor', 'user'], 'scope2')
+    await testUser('joe', ['editor', 'user'], 'scope2')
   })
 
-  it('can remove individual users from roles', function () {
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can remove individual users from roles', async function () {
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
     // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser('eve', ['editor'])
-    testUser('bob', ['editor', 'user'])
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'])
+    await testUser('eve', ['editor', 'user'])
+    await testUser('bob', ['editor', 'user'])
+    await Roles.removeUsersFromRolesAsync(users.eve, ['user'])
+    await testUser('eve', ['editor'])
+    await testUser('bob', ['editor', 'user'])
   })
 
-  it('can remove user from roles multiple times', function () {
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can remove user from roles multiple times', async function () {
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
     // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser('eve', ['editor'])
-    testUser('bob', ['editor', 'user'])
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'])
+    await testUser('eve', ['editor', 'user'])
+    await testUser('bob', ['editor', 'user'])
+    await Roles.removeUsersFromRolesAsync(users.eve, ['user'])
+    await testUser('eve', ['editor'])
+    await testUser('bob', ['editor', 'user'])
 
     // try remove again
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser('eve', ['editor'])
+    await Roles.removeUsersFromRolesAsync(users.eve, ['user'])
+    await testUser('eve', ['editor'])
   })
 
-  it('can remove users from roles via user object', function () {
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can remove users from roles via user object', async function () {
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    const eve = Meteor.users.findOne({ _id: users.eve })
-    const bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
+    const bob = await Meteor.users.findOneAsync({ _id: users.bob })
 
     // remove user role - one user
-    Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles(eve, ['user'])
-    testUser('eve', ['editor'])
-    testUser('bob', ['editor', 'user'])
+    await Roles.addUsersToRolesAsync([eve, bob], ['editor', 'user'])
+    await testUser('eve', ['editor', 'user'])
+    await testUser('bob', ['editor', 'user'])
+    await Roles.removeUsersFromRolesAsync(eve, ['user'])
+    await testUser('eve', ['editor'])
+    await testUser('bob', ['editor', 'user'])
   })
 
-  it('can remove individual users from roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can remove individual users from roles by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
     // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], 'scope2')
+    await testUser('eve', ['editor', 'user'], 'scope1')
+    await testUser('bob', ['editor', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope2')
 
-    Roles.removeUsersFromRoles(users.eve, ['user'], 'scope1')
-    testUser('eve', ['editor'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
+    await Roles.removeUsersFromRolesAsync(users.eve, ['user'], 'scope1')
+    await testUser('eve', ['editor'], 'scope1')
+    await testUser('bob', ['editor', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope2')
   })
 
-  it('can remove individual users from roles by scope through options', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can remove individual users from roles by scope through options', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
     // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], { scope: 'scope1' })
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], { scope: 'scope2' })
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'], { scope: 'scope1' })
+    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], { scope: 'scope2' })
+    await testUser('eve', ['editor', 'user'], 'scope1')
+    await testUser('bob', ['editor', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope2')
 
-    Roles.removeUsersFromRoles(users.eve, ['user'], { scope: 'scope1' })
-    testUser('eve', ['editor'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
+    await Roles.removeUsersFromRolesAsync(users.eve, ['user'], { scope: 'scope1' })
+    await testUser('eve', ['editor'], 'scope1')
+    await testUser('bob', ['editor', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope2')
   })
 
-  it('can remove multiple users from roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can remove multiple users from roles', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
     // remove user role - two users
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'])
+    await testUser('eve', ['editor', 'user'])
+    await testUser('bob', ['editor', 'user'])
 
-    assert.isFalse(Roles.userIsInRole(users.joe, 'admin'))
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
-    testUser('bob', ['admin', 'user', 'editor'])
-    testUser('joe', ['admin', 'user'])
-    Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
-    testUser('bob', ['user', 'editor'])
-    testUser('joe', ['user'])
+    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'admin'))
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin', 'user'])
+    await testUser('bob', ['admin', 'user', 'editor'])
+    await testUser('joe', ['admin', 'user'])
+    await Roles.removeUsersFromRolesAsync([users.bob, users.joe], ['admin'])
+    await testUser('bob', ['user', 'editor'])
+    await testUser('joe', ['user'])
   })
 
-  it('can remove multiple users from roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can remove multiple users from roles by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
     // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], 'scope2')
+    await testUser('eve', ['editor', 'user'], 'scope1')
+    await testUser('bob', ['editor', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope2')
 
-    Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'scope1')
-    testUser('eve', ['editor'], 'scope1')
-    testUser('bob', ['editor'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
+    await Roles.removeUsersFromRolesAsync([users.eve, users.bob], ['user'], 'scope1')
+    await testUser('eve', ['editor'], 'scope1')
+    await testUser('bob', ['editor'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope2')
 
-    Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'scope2')
-    testUser('eve', [], 'scope2')
-    testUser('bob', [], 'scope2')
-    testUser('joe', [], 'scope2')
+    await Roles.removeUsersFromRolesAsync([users.joe, users.bob], ['admin'], 'scope2')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', [], 'scope2')
+    await testUser('joe', [], 'scope2')
   })
 
-  it('can remove multiple users from roles of any scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can remove multiple users from roles of any scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
     // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.joe, users.bob], ['user'], 'scope2')
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['user'], 'scope2')
-    testUser('joe', ['user'], 'scope2')
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['user'], 'scope2')
+    await testUser('eve', ['editor', 'user'], 'scope1')
+    await testUser('bob', ['editor', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['user'], 'scope2')
+    await testUser('joe', ['user'], 'scope2')
 
-    Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], { anyScope: true })
-    testUser('eve', ['editor'], 'scope1')
-    testUser('bob', ['editor'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', [], 'scope2')
-    testUser('joe', ['user'], 'scope2')
+    await Roles.removeUsersFromRolesAsync([users.eve, users.bob], ['user'], { anyScope: true })
+    await testUser('eve', ['editor'], 'scope1')
+    await testUser('bob', ['editor'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', [], 'scope2')
+    await testUser('joe', ['user'], 'scope2')
   })
 
-  it('can set user roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can set user roles', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    const eve = Meteor.users.findOne({ _id: users.eve })
-    const bob = Meteor.users.findOne({ _id: users.bob })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
+    const bob = await Meteor.users.findOneAsync({ _id: users.bob })
 
-    Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-    testUser('joe', [])
+    await Roles.setUserRolesAsync([users.eve, bob], ['editor', 'user'])
+    await testUser('eve', ['editor', 'user'])
+    await testUser('bob', ['editor', 'user'])
+    await testUser('joe', [])
 
     // use addUsersToRoles add some roles
-    Roles.addUsersToRoles([bob, users.joe], ['admin'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['admin', 'editor', 'user'])
-    testUser('joe', ['admin'])
+    await Roles.addUsersToRolesAsync([bob, users.joe], ['admin'])
+    await testUser('eve', ['editor', 'user'])
+    await testUser('bob', ['admin', 'editor', 'user'])
+    await testUser('joe', ['admin'])
 
-    Roles.setUserRoles([eve, bob], ['user'])
-    testUser('eve', ['user'])
-    testUser('bob', ['user'])
-    testUser('joe', ['admin'])
+    await Roles.setUserRolesAsync([eve, bob], ['user'])
+    await testUser('eve', ['user'])
+    await testUser('bob', ['user'])
+    await testUser('joe', ['admin'])
 
-    Roles.setUserRoles(bob, 'editor')
-    testUser('eve', ['user'])
-    testUser('bob', ['editor'])
-    testUser('joe', ['admin'])
+    await Roles.setUserRolesAsync(bob, 'editor')
+    await testUser('eve', ['user'])
+    await testUser('bob', ['editor'])
+    await testUser('joe', ['admin'])
 
-    Roles.setUserRoles([users.joe, users.bob], [])
-    testUser('eve', ['user'])
-    testUser('bob', [])
-    testUser('joe', [])
+    await Roles.setUserRolesAsync([users.joe, users.bob], [])
+    await testUser('eve', ['user'])
+    await testUser('bob', [])
+    await testUser('joe', [])
   })
 
-  it('can set user roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
+  it('can set user roles by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
 
-    const eve = Meteor.users.findOne({ _id: users.eve })
-    const bob = Meteor.users.findOne({ _id: users.bob })
-    const joe = Meteor.users.findOne({ _id: users.joe })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
+    const bob = await Meteor.users.findOneAsync({ _id: users.bob })
+    const joe = await Meteor.users.findOneAsync({ _id: users.joe })
 
-    Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2')
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
+    await Roles.setUserRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    await Roles.setUserRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
+    await testUser('eve', ['editor', 'user'], 'scope1')
+    await testUser('bob', ['editor', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope2')
 
     // use addUsersToRoles add some roles
-    Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'scope1')
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'scope2')
-    testUser('eve', ['admin', 'editor', 'user'], 'scope1')
-    testUser('bob', ['admin', 'editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin', 'editor'], 'scope2')
-    testUser('joe', ['admin', 'editor'], 'scope2')
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['admin'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor'], 'scope2')
+    await testUser('eve', ['admin', 'editor', 'user'], 'scope1')
+    await testUser('bob', ['admin', 'editor', 'user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', [], 'scope2')
+    await testUser('bob', ['admin', 'editor'], 'scope2')
+    await testUser('joe', ['admin', 'editor'], 'scope2')
 
-    Roles.setUserRoles([eve, bob], ['user'], 'scope1')
-    Roles.setUserRoles([eve, joe], ['editor'], 'scope2')
-    testUser('eve', ['user'], 'scope1')
-    testUser('bob', ['user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-    testUser('bob', ['admin', 'editor'], 'scope2')
-    testUser('joe', ['editor'], 'scope2')
+    await Roles.setUserRolesAsync([eve, bob], ['user'], 'scope1')
+    await Roles.setUserRolesAsync([eve, joe], ['editor'], 'scope2')
+    await testUser('eve', ['user'], 'scope1')
+    await testUser('bob', ['user'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', ['editor'], 'scope2')
+    await testUser('bob', ['admin', 'editor'], 'scope2')
+    await testUser('joe', ['editor'], 'scope2')
 
-    Roles.setUserRoles(bob, 'editor', 'scope1')
-    testUser('eve', ['user'], 'scope1')
-    testUser('bob', ['editor'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-    testUser('bob', ['admin', 'editor'], 'scope2')
-    testUser('joe', ['editor'], 'scope2')
+    await Roles.setUserRolesAsync(bob, 'editor', 'scope1')
+    await testUser('eve', ['user'], 'scope1')
+    await testUser('bob', ['editor'], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', ['editor'], 'scope2')
+    await testUser('bob', ['admin', 'editor'], 'scope2')
+    await testUser('joe', ['editor'], 'scope2')
 
-    assert.isTrue(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-    assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+    const bobRoles1 = await Roles.getRolesForUserAsync(users.bob, { anyScope: true, fullObjects: true })
+    const joeRoles1 = await Roles.getRolesForUserAsync(users.joe, { anyScope: true, fullObjects: true })
+    assert.isTrue(bobRoles1.map(r => r.scope).includes('scope1'))
+    assert.isFalse(joeRoles1.map(r => r.scope).includes('scope1'))
 
-    Roles.setUserRoles([bob, users.joe], [], 'scope1')
-    testUser('eve', ['user'], 'scope1')
-    testUser('bob', [], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-    testUser('bob', ['admin', 'editor'], 'scope2')
-    testUser('joe', ['editor'], 'scope2')
+    await Roles.setUserRolesAsync([bob, users.joe], [], 'scope1')
+    await testUser('eve', ['user'], 'scope1')
+    await testUser('bob', [], 'scope1')
+    await testUser('joe', [], 'scope1')
+    await testUser('eve', ['editor'], 'scope2')
+    await testUser('bob', ['admin', 'editor'], 'scope2')
+    await testUser('joe', ['editor'], 'scope2')
 
     // When roles in a given scope are removed, we do not want any dangling database content for that scope.
-    assert.isFalse(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-    assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
+    const bobRoles2 = await Roles.getRolesForUserAsync(users.bob, { anyScope: true, fullObjects: true })
+    const joeRoles2 = await Roles.getRolesForUserAsync(users.joe, { anyScope: true, fullObjects: true })
+    assert.isFalse(bobRoles2.map(r => r.scope).includes('scope1'))
+    assert.isFalse(joeRoles2.map(r => r.scope).includes('scope1'))
   })
 
-  it('can set user roles by scope including GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-    Roles.createRole('editor')
+  it('can set user roles by scope including GLOBAL_SCOPE', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('editor')
 
-    const eve = Meteor.users.findOne({ _id: users.eve })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
 
-    Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE)
-    testUser('eve', ['admin'], 'scope1')
-    testUser('eve', ['admin'])
+    await Roles.addUsersToRolesAsync(eve, 'admin', Roles.GLOBAL_SCOPE)
+    await testUser('eve', ['admin'], 'scope1')
+    await testUser('eve', ['admin'])
 
-    Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_SCOPE)
-    testUser('eve', ['editor'], 'scope2')
-    testUser('eve', ['editor'])
+    await Roles.setUserRolesAsync(eve, 'editor', Roles.GLOBAL_SCOPE)
+    await testUser('eve', ['editor'], 'scope2')
+    await testUser('eve', ['editor'])
   })
 
-  it('can set user roles by scope and anyScope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('editor')
+  it('can set user roles by scope and anyScope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('editor')
 
-    const eve = Meteor.users.findOne({ _id: users.eve })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+    const eveRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(eveRoles.map(obj => { delete obj._id; return obj }), [])
 
-    Roles.addUsersToRoles(eve, 'admin')
+    await Roles.addUsersToRolesAsync(eve, 'admin')
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+    const eveRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(eveRoles2.map(obj => { delete obj._id; return obj }), [{
       role: { _id: 'admin' },
       scope: null,
       user: { _id: users.eve },
       inheritedRoles: [{ _id: 'admin' }]
     }])
 
-    Roles.setUserRoles(eve, 'editor', { anyScope: true, scope: 'scope2' })
+    await Roles.setUserRolesAsync(eve, 'editor', { anyScope: true, scope: 'scope2' })
 
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+    const eveRoles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(eveRoles3.map(obj => { delete obj._id; return obj }), [{
       role: { _id: 'editor' },
       scope: 'scope2',
       user: { _id: users.eve },
@@ -773,10 +774,10 @@ describe('roles async', async function () {
     }])
   })
 
-  it('can get all roles', function () {
-    roles.forEach(function (role) {
-      Roles.createRole(role)
-    })
+  it('can get all roles', async function () {
+    for (const role of roles) {
+      await Roles.createRoleAsync(role)
+    }
 
     // compare roles, sorted alphabetically
     const expected = roles
@@ -787,1494 +788,1494 @@ describe('roles async', async function () {
     assert.sameMembers(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
   })
 
-  it('get an empty list of roles for an empty user', function () {
-    assert.sameMembers(Roles.getRolesForUser(undefined), [])
-    assert.sameMembers(Roles.getRolesForUser(null), [])
-    assert.sameMembers(Roles.getRolesForUser({}), [])
+  it('get an empty list of roles for an empty user', async function () {
+    assert.sameMembers(await Roles.getRolesForUserAsync(undefined), [])
+    assert.sameMembers(await Roles.getRolesForUserAsync(null), [])
+    assert.sameMembers(await Roles.getRolesForUserAsync({}), [])
   })
 
-  it('get an empty list of roles for non-existant user', function () {
-    assert.sameMembers(Roles.getRolesForUser('1'), [])
-    assert.sameMembers(Roles.getRolesForUser('1', 'scope1'), [])
+  it('get an empty list of roles for non-existant user', async function () {
+    assert.sameMembers(await Roles.getRolesForUserAsync('1'), [])
+    assert.sameMembers(await Roles.getRolesForUserAsync('1', 'scope1'), [])
   })
 
-  it('can get all roles for user', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    const userId = users.eve
-    let userObj
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId), [])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj), [])
-
-    Roles.addUsersToRoles(userId, ['admin', 'user'])
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId), ['admin', 'user'])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj), ['admin', 'user'])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }])
-  })
-
-  it('can get all roles for user by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    const userId = users.eve
-    let userObj
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), [])
-
-    // add roles
-    Roles.addUsersToRoles(userId, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(userId, ['admin'], 'scope2')
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope2'), ['admin'])
-    assert.sameMembers(Roles.getRolesForUser(userId), [])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope2'), ['admin'])
-    assert.sameMembers(Roles.getRolesForUser(userObj), [])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    Roles.createRole('PERMISSION')
-    Roles.addRolesToParent('PERMISSION', 'user')
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
-    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
-  })
-
-  it('can get only scoped roles for user', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    const userId = users.eve
-
-    // add roles
-    Roles.addUsersToRoles(userId, ['user'], 'scope1')
-    Roles.addUsersToRoles(userId, ['admin'])
-
-    Roles.createRole('PERMISSION')
-    Roles.addRolesToParent('PERMISSION', 'user')
-
-    assert.sameMembers(Roles.getRolesForUser(userId, { onlyScoped: true, scope: 'scope1' }), ['user', 'PERMISSION'])
-    assert.sameMembers(Roles.getRolesForUser(userId, { onlyScoped: true, onlyAssigned: true, scope: 'scope1' }), ['user'])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { onlyScoped: true, fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-  })
-
-  it('can get all roles for user by scope with periods in name', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
-
-    assert.sameMembers(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
-  })
-
-  it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
-  })
-
-  it('getRolesForUser should not return null entries if user has no roles for scope', function () {
-    Roles.createRole('editor')
-
-    const userId = users.eve
-    let userObj
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
-    assert.sameMembers(Roles.getRolesForUser(userId), [])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), [])
-    assert.sameMembers(Roles.getRolesForUser(userObj), [])
-
-    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['editor'])
-    assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor'])
-    assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
-  })
-
-  it('getRolesForUser should not fail during a call of addUsersToRoles', function () {
-    Roles.createRole('editor')
-
-    const userId = users.eve
-    const promises = []
-    const interval = setInterval(() => {
-      promises.push(Promise.resolve().then(() => { Roles.getRolesForUser(userId) }))
-    }, 0)
-
-    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-    clearInterval(interval)
-
-    return Promise.all(promises)
-  })
-
-  it('returns an empty list of scopes for null as user-id', function () {
-    assert.sameMembers(Roles.getScopesForUser(undefined), [])
-    assert.sameMembers(Roles.getScopesForUser(null), [])
-    assert.sameMembers(Roles.getScopesForUser('foo'), [])
-    assert.sameMembers(Roles.getScopesForUser({}), [])
-    assert.sameMembers(Roles.getScopesForUser({ _id: 'foo' }), [])
-  })
-
-  it('can get all scopes for user', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
-
-    // by userId
-    assert.sameMembers(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
-  })
-
-  it('can get all scopes for user by role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
-
-    // by userId
-    assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
-  })
-
-  it('getScopesForUser returns [] when not using scopes', function () {
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'])
-
-    // by userId
-    assert.sameMembers(Roles.getScopesForUser(userId), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), [])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
-  })
-
-  it('can get all groups for user by role array', function () {
-    const userId = users.eve
-
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.createRole('moderator')
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
-    Roles.addUsersToRoles([users.eve], ['moderator'], 'group3')
-
-    // by userId, one role
-    assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['group2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
-
-    // by userId, multiple roles
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
-
-    // by user object, one role
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['group2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
-
-    // by user object, multiple roles
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
-  })
-
-  it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
-
-    // by userId
-    assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-  })
-
-  it('can get all users in role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
-
-    const expected = [users.eve, users.joe]
-    const actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-  })
-
-  it('can get all users in role by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-    let expected = [users.eve, users.joe]
-    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.joe]
-    actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.bob, users.joe]
-    actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-
-    actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-    assert.sameMembers(actual, [])
-  })
-
-  it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-    let expected = [users.eve]
-    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.bob, users.joe]
-    actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve]
-    actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.bob, users.joe]
-    actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-  })
-
-  it('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
-    Roles.addUsersToRoles([users.bob], ['admin'], 'scope1')
-
-    let expected = [users.eve]
-    let actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.bob]
-    actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-
-    expected = [users.bob]
-    actual = Roles.getUsersInRole('admin', { scope: 'scope1', onlyScoped: true }).fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-  })
-
-  it('can get all users in role by scope and passes through mongo query arguments', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-    const results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
+  // it('can get all roles for user', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //
+  //   const userId = users.eve
+  //   let userObj
+  //
+  //   // by userId
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
+  //
+  //   // by user object
+  //   userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
+  //
+  //   Roles.addUsersToRolesAsync(userId, ['admin', 'user'])
+  //
+  //   // by userId
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['admin', 'user'])
+  //
+  //   // by user object
+  //   userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['admin', 'user'])
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: null,
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }, {
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'user' }]
+  //   }])
+  // })
+  //
+  // it('can get all roles for user by scope', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //
+  //   const userId = users.eve
+  //   let userObj
+  //
+  //   // by userId
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), [])
+  //
+  //   // by user object
+  //   userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), [])
+  //
+  //   // add roles
+  //   Roles.addUsersToRolesAsync(userId, ['admin', 'user'], 'scope1')
+  //   Roles.addUsersToRolesAsync(userId, ['admin'], 'scope2')
+  //
+  //   // by userId
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['admin', 'user'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope2'), ['admin'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
+  //
+  //   // by user object
+  //   userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['admin', 'user'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope2'), ['admin'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }, {
+  //     role: { _id: 'user' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'user' }]
+  //   }])
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope2',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }, {
+  //     role: { _id: 'user' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'user' }]
+  //   }, {
+  //     role: { _id: 'admin' },
+  //     scope: 'scope2',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  //
+  //   Roles.createRoleAsync('PERMISSION')
+  //   Roles.addRolesToParent('PERMISSION', 'user')
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }, {
+  //     role: { _id: 'user' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+  //   }])
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope2',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope2' }), ['admin'])
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }, {
+  //     role: { _id: 'user' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+  //   }, {
+  //     role: { _id: 'admin' },
+  //     scope: 'scope2',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }, {
+  //     role: { _id: 'user' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+  //   }])
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope2',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }, {
+  //     role: { _id: 'user' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+  //   }, {
+  //     role: { _id: 'admin' },
+  //     scope: 'scope2',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
+  // })
+  //
+  // it('can get only scoped roles for user', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //
+  //   const userId = users.eve
+  //
+  //   // add roles
+  //   Roles.addUsersToRolesAsync(userId, ['user'], 'scope1')
+  //   Roles.addUsersToRolesAsync(userId, ['admin'])
+  //
+  //   Roles.createRoleAsync('PERMISSION')
+  //   Roles.addRolesToParent('PERMISSION', 'user')
+  //
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, scope: 'scope1' }), ['user', 'PERMISSION'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, onlyAssigned: true, scope: 'scope1' }), ['user'])
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: 'scope1',
+  //     user: { _id: userId },
+  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+  //   }])
+  // })
+  //
+  // it('can get all roles for user by scope with periods in name', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.k12.va.us')
+  //
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(users.joe, 'example.k12.va.us'), ['admin'])
+  // })
+  //
+  // it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //
+  //   const userId = users.eve
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+  //   Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], 'scope1')
+  //
+  //   // by userId
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['editor', 'admin', 'user'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['editor'])
+  //
+  //   // by user object
+  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['editor', 'admin', 'user'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['editor'])
+  // })
+  //
+  // it('getRolesForUser should not return null entries if user has no roles for scope', function () {
+  //   Roles.createRoleAsync('editor')
+  //
+  //   const userId = users.eve
+  //   let userObj
+  //
+  //   // by userId
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), [])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
+  //
+  //   // by user object
+  //   userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), [])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+  //
+  //   // by userId
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['editor'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['editor'])
+  //
+  //   // by user object
+  //   userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['editor'])
+  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['editor'])
+  // })
+  //
+  // it('getRolesForUser should not fail during a call of addUsersToRoles', function () {
+  //   Roles.createRoleAsync('editor')
+  //
+  //   const userId = users.eve
+  //   const promises = []
+  //   const interval = setInterval(() => {
+  //     promises.push(Promise.resolve().then(() => { await Roles.getRolesForUserAsync(userId) }))
+  //   }, 0)
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+  //   clearInterval(interval)
+  //
+  //   return Promise.all(promises)
+  // })
+  //
+  // it('returns an empty list of scopes for null as user-id', function () {
+  //   assert.sameMembers(Roles.getScopesForUser(undefined), [])
+  //   assert.sameMembers(Roles.getScopesForUser(null), [])
+  //   assert.sameMembers(Roles.getScopesForUser('foo'), [])
+  //   assert.sameMembers(Roles.getScopesForUser({}), [])
+  //   assert.sameMembers(Roles.getScopesForUser({ _id: 'foo' }), [])
+  // })
+  //
+  // it('can get all scopes for user', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //
+  //   const userId = users.eve
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
+  //   Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], 'scope2')
+  //
+  //   // by userId
+  //   assert.sameMembers(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
+  //
+  //   // by user object
+  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
+  // })
+  //
+  // it('can get all scopes for user by role', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //
+  //   const userId = users.eve
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'scope2')
+  //
+  //   // by userId
+  //   assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
+  //
+  //   // by user object
+  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
+  // })
+  //
+  // it('getScopesForUser returns [] when not using scopes', function () {
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //
+  //   const userId = users.eve
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'])
+  //
+  //   // by userId
+  //   assert.sameMembers(Roles.getScopesForUser(userId), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), [])
+  //
+  //   // by user object
+  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(Roles.getScopesForUser(userObj), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
+  // })
+  //
+  // it('can get all groups for user by role array', function () {
+  //   const userId = users.eve
+  //
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //   Roles.createRoleAsync('moderator')
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], 'group1')
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'group2')
+  //   Roles.addUsersToRolesAsync([users.eve], ['moderator'], 'group3')
+  //
+  //   // by userId, one role
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['group2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
+  //
+  //   // by userId, multiple roles
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
+  //
+  //   // by user object, one role
+  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['group2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
+  //
+  //   // by user object, multiple roles
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
+  // })
+  //
+  // it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //
+  //   const userId = users.eve
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'scope2')
+  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
+  //
+  //   // by userId
+  //   assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+  //
+  //   // by user object
+  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
+  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+  // })
+  //
+  // it('can get all users in role', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //
+  //   Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'])
+  //   Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor'])
+  //
+  //   const expected = [users.eve, users.joe]
+  //   const actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+  //
+  //   assert.sameMembers(actual, expected)
+  // })
+  //
+  // it('can get all users in role by scope', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //
+  //   Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'], 'scope1')
+  //   Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
+  //
+  //   let expected = [users.eve, users.joe]
+  //   let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+  //
+  //   assert.sameMembers(actual, expected)
+  //
+  //   expected = [users.eve, users.joe]
+  //   actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
+  //   assert.sameMembers(actual, expected)
+  //
+  //   expected = [users.eve, users.bob, users.joe]
+  //   actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
+  //   assert.sameMembers(actual, expected)
+  //
+  //   actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+  //   assert.sameMembers(actual, [])
+  // })
+  //
+  // it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
+  //   Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
+  //
+  //   let expected = [users.eve]
+  //   let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+  //
+  //   assert.sameMembers(actual, expected)
+  //
+  //   expected = [users.eve, users.bob, users.joe]
+  //   actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id)
+  //
+  //   assert.sameMembers(actual, expected)
+  //
+  //   expected = [users.eve]
+  //   actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+  //
+  //   assert.sameMembers(actual, expected)
+  //
+  //   expected = [users.eve, users.bob, users.joe]
+  //   actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
+  //
+  //   assert.sameMembers(actual, expected)
+  // })
+  //
+  // it('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
+  //   Roles.addUsersToRolesAsync([users.bob], ['admin'], 'scope1')
+  //
+  //   let expected = [users.eve]
+  //   let actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+  //   assert.sameMembers(actual, expected)
+  //
+  //   expected = [users.eve, users.bob]
+  //   actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
+  //   assert.sameMembers(actual, expected)
+  //
+  //   expected = [users.bob]
+  //   actual = Roles.getUsersInRole('admin', { scope: 'scope1', onlyScoped: true }).fetch().map(r => r._id)
+  //   assert.sameMembers(actual, expected)
+  // })
+
+  it('can get all users in role by scope and passes through mongo query arguments', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+
+    await Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
+
+    const results = await Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
 
     assert.equal(1, results.length)
     assert.isTrue(hasProp(results[0], '_id'))
     assert.isFalse(hasProp(results[0], 'username'))
   })
 
-  it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
-
-    testUser('eve', [], 'scope1')
-    testUser('joe', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope1')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('bob', ['admin'], 'scope1')
-
-    Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
-
-    testUser('eve', [], 'scope1')
-    testUser('joe', [], 'scope2')
-    testUser('joe', [], 'scope1')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('bob', ['admin'], 'scope1')
-  })
-
-  it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5')
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
-
-    testUser('eve', [], 'scope1')
-    testUser('joe', ['admin'], 'scope5')
-    testUser('joe', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope1')
-    testUser('bob', ['admin'], 'scope5')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('bob', ['admin'], 'scope1')
-
-    Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
-
-    testUser('eve', [], 'scope1')
-    testUser('joe', ['admin'], 'scope5')
-    testUser('joe', [], 'scope2')
-    testUser('joe', [], 'scope1')
-    testUser('bob', ['admin'], 'scope5')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('bob', ['admin'], 'scope1')
-  })
-
-  it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
-
-    testUser('joe', ['admin'])
-
-    Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
-
-    testUser('joe', [])
-  })
-
-  it('can use \'.\' in scope name', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
-    testUser('joe', ['admin'], 'example.com')
-  })
-
-  it('can use multiple periods in scope name', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
-    testUser('joe', ['admin'], 'example.k12.va.us')
-  })
-
-  it('renaming of roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'scope2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'user', 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.joe, 'user', 'scope1'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.joe, 'user', 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
-
-    Roles.renameRole('user', 'user2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.joe, 'user2', 'scope1'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.joe, 'user2', 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
-  })
-
-  it('migration without global groups (to v2)', function () {
-    assert.isOk(Meteor.roles.insert({ name: 'admin' }))
-    assert.isOk(Meteor.roles.insert({ name: 'editor' }))
-    assert.isOk(Meteor.roles.insert({ name: 'user' }))
-
-    assert.isOk(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
-    assert.isOk(Meteor.users.update(users.bob, { $set: { roles: [] } }))
-    assert.isOk(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
-
-    Roles._forwardMigrate()
-
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'editor',
-        scope: null,
-        assigned: true
-      }]
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: []
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }]
-    })
-
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-      _id: 'admin',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-      _id: 'editor',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-      _id: 'user',
-      children: []
-    })
-
-    Roles._backwardMigrate(null, null, false)
-
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: ['admin', 'editor']
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: []
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: ['user']
-    })
-
-    assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-      name: 'admin'
-    })
-    assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-      name: 'editor'
-    })
-    assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-      name: 'user'
-    })
-  })
-
-  it('migration without global groups (to v3)')
-
-  it('migration with global groups (to v2)', function () {
-    assert.isOk(Meteor.roles.insert({ name: 'admin' }))
-    assert.isOk(Meteor.roles.insert({ name: 'editor' }))
-    assert.isOk(Meteor.roles.insert({ name: 'user' }))
-
-    assert.isOk(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
-    assert.isOk(Meteor.users.update(users.bob, { $set: { roles: { } } }))
-    assert.isOk(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
-
-    Roles._forwardMigrate(null, null, false)
-
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'editor',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'foo_bla',
-        assigned: true
-      }]
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: []
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'foo_bla',
-        assigned: true
-      }]
-    })
-
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-      _id: 'admin',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-      _id: 'editor',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-      _id: 'user',
-      children: []
-    })
-
-    Roles._backwardMigrate(null, null, true)
-
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: {
-        __global_roles__: ['admin', 'editor'],
-        foo_bla: ['user']
-      }
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: {}
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: {
-        __global_roles__: ['user'],
-        foo_bla: ['user']
-      }
-    })
-
-    assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-      name: 'admin'
-    })
-    assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-      name: 'editor'
-    })
-    assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-      name: 'user'
-    })
-
-    Roles._forwardMigrate(null, null, true)
-
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'editor',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'foo.bla',
-        assigned: true
-      }]
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: []
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'foo.bla',
-        assigned: true
-      }]
-    })
-
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-      _id: 'admin',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-      _id: 'editor',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-      _id: 'user',
-      children: []
-    })
-  })
-
-  it('migration with global groups (to v3)')
-
-  it('_addUserToRole', function () {
-    Roles.createRole('admin')
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-
-    assert.include(
-      Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
-      'insertedId'
-    )
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    assert.notInclude(
-      Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
-      'insertedId'
-    )
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-  })
-
-  it('_removeUserFromRole', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.eve, 'admin')
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-  })
-
-  it('keep assigned roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('ALL_PERMISSIONS')
-    Roles.createRole('VIEW_PERMISSION')
-    Roles.createRole('EDIT_PERMISSION')
-    Roles.createRole('DELETE_PERMISSION')
-    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['user'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }])
-
-    Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'VIEW_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }])
-
-    Roles.removeUsersFromRoles(users.eve, 'user')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'VIEW_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }])
-
-    Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-  })
-
-  it('adds children of the added role to the assignments', function () {
-    Roles.createRole('admin')
-    Roles.createRole('ALBUM.ADMIN')
-    Roles.createRole('ALBUM.VIEW')
-    Roles.createRole('TRACK.ADMIN')
-    Roles.createRole('TRACK.VIEW')
-
-    Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
-    Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
-
-    Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
-
-    Roles.addRolesToParent('TRACK.ADMIN', 'admin')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
-  })
-
-  it('removes children of the removed role from the assignments', function () {
-    Roles.createRole('admin')
-    Roles.createRole('ALBUM.ADMIN')
-    Roles.createRole('ALBUM.VIEW')
-    Roles.createRole('TRACK.ADMIN')
-    Roles.createRole('TRACK.VIEW')
-
-    Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
-    Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
-
-    Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
-    Roles.addRolesToParent('TRACK.ADMIN', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
-
-    Roles.removeRolesFromParent('TRACK.ADMIN', 'admin')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
-  })
-
-  it('modify assigned hierarchical roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('ALL_PERMISSIONS')
-    Roles.createRole('VIEW_PERMISSION')
-    Roles.createRole('EDIT_PERMISSION')
-    Roles.createRole('DELETE_PERMISSION')
-    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['user'])
-    Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'scope')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }])
-
-    Roles.createRole('MODERATE_PERMISSION')
-
-    Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
-      ]
-    }])
-
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'admin' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }])
-
-    Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'admin' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }])
-
-    Roles.removeUsersFromRoles(users.eve, ['admin'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }])
-
-    Roles.deleteRole('ALL_PERMISSIONS')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' }
-      ]
-    }])
-  })
-
-  it('delete role with overlapping hierarchical roles', function () {
-    Roles.createRole('role1')
-    Roles.createRole('role2')
-    Roles.createRole('COMMON_PERMISSION_1')
-    Roles.createRole('COMMON_PERMISSION_2')
-    Roles.createRole('COMMON_PERMISSION_3')
-    Roles.createRole('EXTRA_PERMISSION_ROLE_1')
-    Roles.createRole('EXTRA_PERMISSION_ROLE_2')
-
-    Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1')
-    Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1')
-    Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1')
-    Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1')
-
-    Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2')
-    Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2')
-    Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2')
-    Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2')
-
-    Roles.addUsersToRoles(users.eve, 'role1')
-    Roles.addUsersToRoles(users.eve, 'role2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }, {
-      role: { _id: 'role2' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role2' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_2' }
-      ]
-    }])
-
-    Roles.removeUsersFromRoles(users.eve, 'role2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }])
-
-    Roles.addUsersToRoles(users.eve, 'role2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }, {
-      role: { _id: 'role2' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role2' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_2' }
-      ]
-    }])
-
-    Roles.deleteRole('role2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }])
-  })
-
-  it('set parent on assigned role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('EDIT_PERMISSION')
-
-    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-
-    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
-
-  it('remove parent on assigned role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('EDIT_PERMISSION')
-
-    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-
-    Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
-
-  it('adding and removing extra role parents', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('EDIT_PERMISSION')
-
-    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-
-    Roles.addRolesToParent('EDIT_PERMISSION', 'user')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-
-    Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
-
-  it('cyclic roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('editor')
-    Roles.createRole('user')
-
-    Roles.addRolesToParent('editor', 'admin')
-    Roles.addRolesToParent('user', 'editor')
-
-    assert.throws(function () {
-      Roles.addRolesToParent('admin', 'user')
-    }, /form a cycle/)
-  })
-
-  it('userIsInRole returns false for unknown roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    Roles.addUsersToRoles(users.eve, ['editor'])
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'unknown'))
-    assert.isFalse(Roles.userIsInRole(users.eve, []))
-    assert.isFalse(Roles.userIsInRole(users.eve, null))
-    assert.isFalse(Roles.userIsInRole(users.eve, undefined))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'unknown', { anyScope: true }))
-    assert.isFalse(Roles.userIsInRole(users.eve, [], { anyScope: true }))
-    assert.isFalse(Roles.userIsInRole(users.eve, null, { anyScope: true }))
-    assert.isFalse(Roles.userIsInRole(users.eve, undefined, { anyScope: true }))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
-  })
-
-  it('userIsInRole returns false if user is a function', function () {
-    Roles.createRole('admin')
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isFalse(Roles.userIsInRole(() => {}, 'admin'))
-  })
-
-  describe('isParentOf', function () {
-    it('returns false for unknown roles', function () {
-      Roles.createRole('admin')
-
-      assert.isFalse(Roles.isParentOf('admin', 'unknown'))
-      assert.isFalse(Roles.isParentOf('admin', null))
-      assert.isFalse(Roles.isParentOf('admin', undefined))
-
-      assert.isFalse(Roles.isParentOf('unknown', 'admin'))
-      assert.isFalse(Roles.isParentOf(null, 'admin'))
-      assert.isFalse(Roles.isParentOf(undefined, 'admin'))
-    })
-
-    it('returns false if role is not parent of', function () {
-      Roles.createRole('admin')
-      Roles.createRole('editor')
-      Roles.createRole('user')
-      Roles.addRolesToParent(['editor'], 'admin')
-      Roles.addRolesToParent(['user'], 'editor')
-
-      assert.isFalse(Roles.isParentOf('user', 'admin'))
-      assert.isFalse(Roles.isParentOf('editor', 'admin'))
-    })
-
-    it('returns true if role is parent of the demanded role', function () {
-      Roles.createRole('admin')
-      Roles.createRole('editor')
-      Roles.createRole('user')
-      Roles.addRolesToParent(['editor'], 'admin')
-      Roles.addRolesToParent(['user'], 'editor')
-
-      assert.isTrue(Roles.isParentOf('admin', 'user'))
-      assert.isTrue(Roles.isParentOf('editor', 'user'))
-      assert.isTrue(Roles.isParentOf('admin', 'editor'))
-
-      assert.isTrue(Roles.isParentOf('admin', 'admin'))
-      assert.isTrue(Roles.isParentOf('editor', 'editor'))
-      assert.isTrue(Roles.isParentOf('user', 'user'))
-    })
-  })
+  // it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
+  //
+  //   testUser('eve', [], 'scope1')
+  //   testUser('joe', ['admin'], 'scope2')
+  //   testUser('joe', ['admin'], 'scope1')
+  //   testUser('bob', ['admin'], 'scope2')
+  //   testUser('bob', ['admin'], 'scope1')
+  //
+  //   Roles.removeUsersFromRolesAsync(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
+  //
+  //   testUser('eve', [], 'scope1')
+  //   testUser('joe', [], 'scope2')
+  //   testUser('joe', [], 'scope1')
+  //   testUser('bob', ['admin'], 'scope2')
+  //   testUser('bob', ['admin'], 'scope1')
+  // })
+  //
+  // it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], 'scope5')
+  //   Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
+  //
+  //   testUser('eve', [], 'scope1')
+  //   testUser('joe', ['admin'], 'scope5')
+  //   testUser('joe', ['admin'], 'scope2')
+  //   testUser('joe', ['admin'], 'scope1')
+  //   testUser('bob', ['admin'], 'scope5')
+  //   testUser('bob', ['admin'], 'scope2')
+  //   testUser('bob', ['admin'], 'scope1')
+  //
+  //   Roles.removeUsersFromRolesAsync(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
+  //
+  //   testUser('eve', [], 'scope1')
+  //   testUser('joe', ['admin'], 'scope5')
+  //   testUser('joe', [], 'scope2')
+  //   testUser('joe', [], 'scope1')
+  //   testUser('bob', ['admin'], 'scope5')
+  //   testUser('bob', ['admin'], 'scope2')
+  //   testUser('bob', ['admin'], 'scope1')
+  // })
+  //
+  // it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.joe, 'admin', Roles.GLOBAL_SCOPE)
+  //
+  //   testUser('joe', ['admin'])
+  //
+  //   Roles.removeUsersFromRolesAsync(users.joe, 'admin', Roles.GLOBAL_SCOPE)
+  //
+  //   testUser('joe', [])
+  // })
+  //
+  // it('can use \'.\' in scope name', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.com')
+  //   testUser('joe', ['admin'], 'example.com')
+  // })
+  //
+  // it('can use multiple periods in scope name', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.k12.va.us')
+  //   testUser('joe', ['admin'], 'example.k12.va.us')
+  // })
+  //
+  // it('renaming of roles', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //
+  //   await Roles.setUserRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
+  //   await Roles.setUserRolesAsync([users.bob, users.joe], ['user', 'admin'], 'scope2')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'editor', 'scope1'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'editor', 'scope2'))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.joe, 'admin', 'scope1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.joe, 'admin', 'scope2'))
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'user', 'scope1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.bob, 'user', 'scope1'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.joe, 'user', 'scope1'))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user', 'scope2'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.bob, 'user', 'scope2'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.joe, 'user', 'scope2'))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user2', 'scope1'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user2', 'scope2'))
+  //
+  //   Roles.renameRole('user', 'user2')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'editor', 'scope1'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'editor', 'scope2'))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.joe, 'admin', 'scope1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.joe, 'admin', 'scope2'))
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'user2', 'scope1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.bob, 'user2', 'scope1'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.joe, 'user2', 'scope1'))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user2', 'scope2'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.bob, 'user2', 'scope2'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.joe, 'user2', 'scope2'))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user', 'scope1'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user', 'scope2'))
+  // })
+  //
+  // it('migration without global groups (to v2)', function () {
+  //   assert.isOk(Meteor.roles.insert({ name: 'admin' }))
+  //   assert.isOk(Meteor.roles.insert({ name: 'editor' }))
+  //   assert.isOk(Meteor.roles.insert({ name: 'user' }))
+  //
+  //   assert.isOk(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
+  //   assert.isOk(Meteor.users.update(users.bob, { $set: { roles: [] } }))
+  //   assert.isOk(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
+  //
+  //   Roles._forwardMigrate()
+  //
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: [{
+  //       _id: 'admin',
+  //       scope: null,
+  //       assigned: true
+  //     }, {
+  //       _id: 'editor',
+  //       scope: null,
+  //       assigned: true
+  //     }]
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: []
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: [{
+  //       _id: 'user',
+  //       scope: null,
+  //       assigned: true
+  //     }]
+  //   })
+  //
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+  //     _id: 'admin',
+  //     children: []
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+  //     _id: 'editor',
+  //     children: []
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+  //     _id: 'user',
+  //     children: []
+  //   })
+  //
+  //   Roles._backwardMigrate(null, null, false)
+  //
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: ['admin', 'editor']
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: []
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: ['user']
+  //   })
+  //
+  //   assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
+  //     name: 'admin'
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
+  //     name: 'editor'
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
+  //     name: 'user'
+  //   })
+  // })
+  //
+  // it('migration without global groups (to v3)')
+  //
+  // it('migration with global groups (to v2)', function () {
+  //   assert.isOk(Meteor.roles.insert({ name: 'admin' }))
+  //   assert.isOk(Meteor.roles.insert({ name: 'editor' }))
+  //   assert.isOk(Meteor.roles.insert({ name: 'user' }))
+  //
+  //   assert.isOk(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
+  //   assert.isOk(Meteor.users.update(users.bob, { $set: { roles: { } } }))
+  //   assert.isOk(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
+  //
+  //   Roles._forwardMigrate(null, null, false)
+  //
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: [{
+  //       _id: 'admin',
+  //       scope: null,
+  //       assigned: true
+  //     }, {
+  //       _id: 'editor',
+  //       scope: null,
+  //       assigned: true
+  //     }, {
+  //       _id: 'user',
+  //       scope: 'foo_bla',
+  //       assigned: true
+  //     }]
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: []
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: [{
+  //       _id: 'user',
+  //       scope: null,
+  //       assigned: true
+  //     }, {
+  //       _id: 'user',
+  //       scope: 'foo_bla',
+  //       assigned: true
+  //     }]
+  //   })
+  //
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+  //     _id: 'admin',
+  //     children: []
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+  //     _id: 'editor',
+  //     children: []
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+  //     _id: 'user',
+  //     children: []
+  //   })
+  //
+  //   Roles._backwardMigrate(null, null, true)
+  //
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: {
+  //       __global_roles__: ['admin', 'editor'],
+  //       foo_bla: ['user']
+  //     }
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: {}
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: {
+  //       __global_roles__: ['user'],
+  //       foo_bla: ['user']
+  //     }
+  //   })
+  //
+  //   assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
+  //     name: 'admin'
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
+  //     name: 'editor'
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
+  //     name: 'user'
+  //   })
+  //
+  //   Roles._forwardMigrate(null, null, true)
+  //
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: [{
+  //       _id: 'admin',
+  //       scope: null,
+  //       assigned: true
+  //     }, {
+  //       _id: 'editor',
+  //       scope: null,
+  //       assigned: true
+  //     }, {
+  //       _id: 'user',
+  //       scope: 'foo.bla',
+  //       assigned: true
+  //     }]
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: []
+  //   })
+  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
+  //     roles: [{
+  //       _id: 'user',
+  //       scope: null,
+  //       assigned: true
+  //     }, {
+  //       _id: 'user',
+  //       scope: 'foo.bla',
+  //       assigned: true
+  //     }]
+  //   })
+  //
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+  //     _id: 'admin',
+  //     children: []
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+  //     _id: 'editor',
+  //     children: []
+  //   })
+  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+  //     _id: 'user',
+  //     children: []
+  //   })
+  // })
+  //
+  // it('migration with global groups (to v3)')
+  //
+  // it('_addUserToRole', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+  //
+  //   assert.include(
+  //     Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
+  //     'insertedId'
+  //   )
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  //
+  //   assert.notInclude(
+  //     Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
+  //     'insertedId'
+  //   )
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  // })
+  //
+  // it('_removeUserFromRole', function () {
+  //   Roles.createRoleAsync('admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, 'admin')
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'admin' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'admin' }]
+  //   }])
+  //
+  //   Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+  // })
+  //
+  // it('keep assigned roles', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('ALL_PERMISSIONS')
+  //   Roles.createRoleAsync('VIEW_PERMISSION')
+  //   Roles.createRoleAsync('EDIT_PERMISSION')
+  //   Roles.createRoleAsync('DELETE_PERMISSION')
+  //   Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+  //   Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+  //   Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+  //   Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, ['user'])
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'user' },
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' }
+  //     ]
+  //   }])
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, 'VIEW_PERMISSION')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'user' },
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'VIEW_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'VIEW_PERMISSION' }
+  //     ]
+  //   }])
+  //
+  //   Roles.removeUsersFromRolesAsync(users.eve, 'user')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'VIEW_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'VIEW_PERMISSION' }
+  //     ]
+  //   }])
+  //
+  //   Roles.removeUsersFromRolesAsync(users.eve, 'VIEW_PERMISSION')
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
+  // })
+  //
+  // it('adds children of the added role to the assignments', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('ALBUM.ADMIN')
+  //   Roles.createRoleAsync('ALBUM.VIEW')
+  //   Roles.createRoleAsync('TRACK.ADMIN')
+  //   Roles.createRoleAsync('TRACK.VIEW')
+  //
+  //   Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
+  //   Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
+  //
+  //   Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
+  //
+  //   Roles.addRolesToParent('TRACK.ADMIN', 'admin')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
+  // })
+  //
+  // it('removes children of the removed role from the assignments', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('ALBUM.ADMIN')
+  //   Roles.createRoleAsync('ALBUM.VIEW')
+  //   Roles.createRoleAsync('TRACK.ADMIN')
+  //   Roles.createRoleAsync('TRACK.VIEW')
+  //
+  //   Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
+  //   Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
+  //
+  //   Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
+  //   Roles.addRolesToParent('TRACK.ADMIN', 'admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
+  //
+  //   Roles.removeRolesFromParent('TRACK.ADMIN', 'admin')
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
+  // })
+  //
+  // it('modify assigned hierarchical roles', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('ALL_PERMISSIONS')
+  //   Roles.createRoleAsync('VIEW_PERMISSION')
+  //   Roles.createRoleAsync('EDIT_PERMISSION')
+  //   Roles.createRoleAsync('DELETE_PERMISSION')
+  //   Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
+  //   Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+  //   Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+  //   Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, ['user'])
+  //   Roles.addUsersToRolesAsync(users.eve, ['ALL_PERMISSIONS'], 'scope')
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'user' },
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'ALL_PERMISSIONS' },
+  //     scope: 'scope',
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' }
+  //     ]
+  //   }])
+  //
+  //   Roles.createRoleAsync('MODERATE_PERMISSION')
+  //
+  //   Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'user' },
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' },
+  //       { _id: 'MODERATE_PERMISSION' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'ALL_PERMISSIONS' },
+  //     scope: 'scope',
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' },
+  //       { _id: 'MODERATE_PERMISSION' }
+  //     ]
+  //   }])
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'user' },
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' },
+  //       { _id: 'MODERATE_PERMISSION' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'ALL_PERMISSIONS' },
+  //     scope: 'scope',
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' },
+  //       { _id: 'MODERATE_PERMISSION' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'admin' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'admin' },
+  //       { _id: 'DELETE_PERMISSION' }
+  //     ]
+  //   }])
+  //
+  //   Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'user' },
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' },
+  //       { _id: 'MODERATE_PERMISSION' },
+  //       { _id: 'DELETE_PERMISSION' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'ALL_PERMISSIONS' },
+  //     scope: 'scope',
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' },
+  //       { _id: 'MODERATE_PERMISSION' },
+  //       { _id: 'DELETE_PERMISSION' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'admin' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'admin' },
+  //       { _id: 'DELETE_PERMISSION' }
+  //     ]
+  //   }])
+  //
+  //   Roles.removeUsersFromRolesAsync(users.eve, ['admin'])
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'user' },
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' },
+  //       { _id: 'MODERATE_PERMISSION' },
+  //       { _id: 'DELETE_PERMISSION' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'ALL_PERMISSIONS' },
+  //     scope: 'scope',
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'ALL_PERMISSIONS' },
+  //       { _id: 'EDIT_PERMISSION' },
+  //       { _id: 'VIEW_PERMISSION' },
+  //       { _id: 'MODERATE_PERMISSION' },
+  //       { _id: 'DELETE_PERMISSION' }
+  //     ]
+  //   }])
+  //
+  //   Roles.deleteRole('ALL_PERMISSIONS')
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'user' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'user' }
+  //     ]
+  //   }])
+  // })
+  //
+  // it('delete role with overlapping hierarchical roles', function () {
+  //   Roles.createRoleAsync('role1')
+  //   Roles.createRoleAsync('role2')
+  //   Roles.createRoleAsync('COMMON_PERMISSION_1')
+  //   Roles.createRoleAsync('COMMON_PERMISSION_2')
+  //   Roles.createRoleAsync('COMMON_PERMISSION_3')
+  //   Roles.createRoleAsync('EXTRA_PERMISSION_ROLE_1')
+  //   Roles.createRoleAsync('EXTRA_PERMISSION_ROLE_2')
+  //
+  //   Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1')
+  //   Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1')
+  //   Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1')
+  //   Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1')
+  //
+  //   Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2')
+  //   Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2')
+  //   Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2')
+  //   Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, 'role1')
+  //   Roles.addUsersToRolesAsync(users.eve, 'role2')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'role1' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'role1' },
+  //       { _id: 'COMMON_PERMISSION_1' },
+  //       { _id: 'COMMON_PERMISSION_2' },
+  //       { _id: 'COMMON_PERMISSION_3' },
+  //       { _id: 'EXTRA_PERMISSION_ROLE_1' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'role2' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'role2' },
+  //       { _id: 'COMMON_PERMISSION_1' },
+  //       { _id: 'COMMON_PERMISSION_2' },
+  //       { _id: 'COMMON_PERMISSION_3' },
+  //       { _id: 'EXTRA_PERMISSION_ROLE_2' }
+  //     ]
+  //   }])
+  //
+  //   Roles.removeUsersFromRolesAsync(users.eve, 'role2')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'role1' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'role1' },
+  //       { _id: 'COMMON_PERMISSION_1' },
+  //       { _id: 'COMMON_PERMISSION_2' },
+  //       { _id: 'COMMON_PERMISSION_3' },
+  //       { _id: 'EXTRA_PERMISSION_ROLE_1' }
+  //     ]
+  //   }])
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, 'role2')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'role1' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'role1' },
+  //       { _id: 'COMMON_PERMISSION_1' },
+  //       { _id: 'COMMON_PERMISSION_2' },
+  //       { _id: 'COMMON_PERMISSION_3' },
+  //       { _id: 'EXTRA_PERMISSION_ROLE_1' }
+  //     ]
+  //   }, {
+  //     role: { _id: 'role2' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'role2' },
+  //       { _id: 'COMMON_PERMISSION_1' },
+  //       { _id: 'COMMON_PERMISSION_2' },
+  //       { _id: 'COMMON_PERMISSION_3' },
+  //       { _id: 'EXTRA_PERMISSION_ROLE_2' }
+  //     ]
+  //   }])
+  //
+  //   Roles.deleteRole('role2')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'role1' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [
+  //       { _id: 'role1' },
+  //       { _id: 'COMMON_PERMISSION_1' },
+  //       { _id: 'COMMON_PERMISSION_2' },
+  //       { _id: 'COMMON_PERMISSION_3' },
+  //       { _id: 'EXTRA_PERMISSION_ROLE_1' }
+  //     ]
+  //   }])
+  // })
+  //
+  // it('set parent on assigned role', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('EDIT_PERMISSION')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'EDIT_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+  //   }])
+  //
+  //   Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'EDIT_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+  //   }])
+  // })
+  //
+  // it('remove parent on assigned role', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('EDIT_PERMISSION')
+  //
+  //   Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'EDIT_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+  //   }])
+  //
+  //   Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'EDIT_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+  //   }])
+  // })
+  //
+  // it('adding and removing extra role parents', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('EDIT_PERMISSION')
+  //
+  //   Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
+  //
+  //   Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'EDIT_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+  //   }])
+  //
+  //   Roles.addRolesToParent('EDIT_PERMISSION', 'user')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'EDIT_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+  //   }])
+  //
+  //   Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
+  //
+  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
+  //
+  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
+  //     role: { _id: 'EDIT_PERMISSION' },
+  //     scope: null,
+  //     user: { _id: users.eve },
+  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+  //   }])
+  // })
+  //
+  // it('cyclic roles', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('editor')
+  //   Roles.createRoleAsync('user')
+  //
+  //   Roles.addRolesToParent('editor', 'admin')
+  //   Roles.addRolesToParent('user', 'editor')
+  //
+  //   assert.throws(function () {
+  //     Roles.addRolesToParent('admin', 'user')
+  //   }, /form a cycle/)
+  // })
+  //
+  // it('userIsInRole returns false for unknown roles', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.createRoleAsync('user')
+  //   Roles.createRoleAsync('editor')
+  //   Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
+  //   Roles.addUsersToRolesAsync(users.eve, ['editor'])
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'unknown'))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, []))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, null))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, undefined))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'unknown', { anyScope: true }))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, [], { anyScope: true }))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, null, { anyScope: true }))
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, undefined, { anyScope: true }))
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
+  // })
+  //
+  // it('userIsInRole returns false if user is a function', function () {
+  //   Roles.createRoleAsync('admin')
+  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
+  //
+  //   assert.isFalse(Roles.userIsInRoleAsync(() => {}, 'admin'))
+  // })
+  //
+  // describe('isParentOf', function () {
+  //   it('returns false for unknown roles', function () {
+  //     Roles.createRoleAsync('admin')
+  //
+  //     assert.isFalse(Roles.isParentOf('admin', 'unknown'))
+  //     assert.isFalse(Roles.isParentOf('admin', null))
+  //     assert.isFalse(Roles.isParentOf('admin', undefined))
+  //
+  //     assert.isFalse(Roles.isParentOf('unknown', 'admin'))
+  //     assert.isFalse(Roles.isParentOf(null, 'admin'))
+  //     assert.isFalse(Roles.isParentOf(undefined, 'admin'))
+  //   })
+  //
+  //   it('returns false if role is not parent of', function () {
+  //     Roles.createRoleAsync('admin')
+  //     Roles.createRoleAsync('editor')
+  //     Roles.createRoleAsync('user')
+  //     Roles.addRolesToParent(['editor'], 'admin')
+  //     Roles.addRolesToParent(['user'], 'editor')
+  //
+  //     assert.isFalse(Roles.isParentOf('user', 'admin'))
+  //     assert.isFalse(Roles.isParentOf('editor', 'admin'))
+  //   })
+  //
+  //   it('returns true if role is parent of the demanded role', function () {
+  //     Roles.createRoleAsync('admin')
+  //     Roles.createRoleAsync('editor')
+  //     Roles.createRoleAsync('user')
+  //     Roles.addRolesToParent(['editor'], 'admin')
+  //     Roles.addRolesToParent(['user'], 'editor')
+  //
+  //     assert.isTrue(Roles.isParentOf('admin', 'user'))
+  //     assert.isTrue(Roles.isParentOf('editor', 'user'))
+  //     assert.isTrue(Roles.isParentOf('admin', 'editor'))
+  //
+  //     assert.isTrue(Roles.isParentOf('admin', 'admin'))
+  //     assert.isTrue(Roles.isParentOf('editor', 'editor'))
+  //     assert.isTrue(Roles.isParentOf('user', 'user'))
+  //   })
+  // })
 })
diff --git a/testapp/.meteor/packages b/testapp/.meteor/packages
index 63f32aa28d..45d8f3960a 100644
--- a/testapp/.meteor/packages
+++ b/testapp/.meteor/packages
@@ -4,7 +4,7 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor@1.11.2                  # Shared foundation for all Meteor packages
+meteor@1.11.3                  # Shared foundation for all Meteor packages
 static-html@1.3.2             # Define static page content in .html files
 standard-minifier-css@1.9.2   # CSS minifier run for production mode
 standard-minifier-js@2.8.1    # JS minifier run for production mode
diff --git a/testapp/.meteor/release b/testapp/.meteor/release
index e8cfc7ec4c..6641d0478a 100644
--- a/testapp/.meteor/release
+++ b/testapp/.meteor/release
@@ -1 +1 @@
-METEOR@2.12
+METEOR@2.13.3
diff --git a/testapp/.meteor/versions b/testapp/.meteor/versions
index 24b5002129..e0abc76068 100644
--- a/testapp/.meteor/versions
+++ b/testapp/.meteor/versions
@@ -11,7 +11,7 @@ check@1.3.2
 ddp@1.4.1
 ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-server@2.6.1
+ddp-server@2.6.2
 diff-sequence@1.1.2
 dynamic-import@0.7.3
 ecmascript@0.16.7
@@ -25,14 +25,10 @@ hot-code-push@1.0.4
 hot-module-replacement@0.5.3
 html-tools@1.1.3
 htmljs@1.1.1
-http@1.0.10
 id-map@1.1.1
 inter-process-messaging@0.1.1
 logging@1.3.2
-meteor@1.11.2
-meteortesting:browser-tests@1.4.2
-meteortesting:mocha@2.1.0
-meteortesting:mocha-core@8.0.1
+meteor@1.11.3
 minifier-css@1.6.4
 minifier-js@2.7.5
 modern-browsers@0.1.9
@@ -57,6 +53,5 @@ templating-tools@1.2.2
 tracker@1.3.2
 typescript@4.9.4
 underscore@1.0.13
-url@1.3.2
 webapp@1.13.5
 webapp-hashing@1.1.1

From 3a429bf95c7918716cd8992cd9f0bafa737eeed5 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sun, 24 Sep 2023 16:28:14 +0200
Subject: [PATCH 0441/1140] Finish server tests for async

---
 roles/roles_common.js       |    2 +-
 roles/roles_common_async.js |   47 +-
 roles/tests/serverAsync.js  | 2768 +++++++++++++++++------------------
 3 files changed, 1329 insertions(+), 1488 deletions(-)

diff --git a/roles/roles_common.js b/roles/roles_common.js
index f05d62067d..3dfcefe3a4 100644
--- a/roles/roles_common.js
+++ b/roles/roles_common.js
@@ -706,7 +706,7 @@ Object.assign(Roles, {
    *   - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)
    *   - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)
    *     If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
-   *     result strongly dependant on the internal data structure of this plugin.
+   *     result strongly dependent on the internal data structure of this plugin.
    *
    * Alternatively, it can be a scope name string.
    * @return {Array} Array of user's roles, unsorted.
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index ad9c0fcd85..93d7bec859 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -583,6 +583,21 @@ Object.assign(Roles, {
     }
 
     // This might create duplicates, because we don't have a unique index, but that's all right. In case there are two, withdrawing the role will effectively kill them both.
+    // TODO revisit this
+    /* const res = await Meteor.roleAssignment.upsertAsync(
+      {
+        "user._id": userId,
+        "role._id": roleName,
+        scope: options.scope,
+      },
+      {
+        $setOnInsert: {
+          user: { _id: userId },
+          role: { _id: roleName },
+          scope: options.scope,
+        },
+      }
+    ); */
     const existingAssignment = await Meteor.roleAssignment.findOneAsync({
       'user._id': userId,
       'role._id': roleName,
@@ -608,20 +623,6 @@ Object.assign(Roles, {
         scope: options.scope
       })
     }
-    /* const res = await Meteor.roleAssignment.upsertAsync(
-      {
-        "user._id": userId,
-        "role._id": roleName,
-        scope: options.scope,
-      },
-      {
-        $setOnInsert: {
-          user: { _id: userId },
-          role: { _id: roleName },
-          scope: options.scope,
-        },
-      }
-    ); */
 
     if (insertedId) {
       await Meteor.roleAssignment.updateAsync(
@@ -638,6 +639,7 @@ Object.assign(Roles, {
 
       res = await Meteor.roleAssignment.findOneAsync({ _id: insertedId })
     }
+    res.insertedId = insertedId // For backward compatibility
 
     return res
   },
@@ -876,7 +878,7 @@ Object.assign(Roles, {
    *   - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)
    *   - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)
    *     If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
-   *     result strongly dependant on the internal data structure of this plugin.
+   *     result strongly dependent on the internal data structure of this plugin.
    *
    * Alternatively, it can be a scope name string.
    * @return {Promise<Array>} Array of user's roles, unsorted.
@@ -889,15 +891,12 @@ Object.assign(Roles, {
 
     Roles._checkScopeName(options.scope)
 
-    options = Object.assign(
-      {
-        fullObjects: false,
-        onlyAssigned: false,
-        anyScope: false,
-        onlyScoped: false
-      },
-      options
-    )
+    options = Object.assign({
+      fullObjects: false,
+      onlyAssigned: false,
+      anyScope: false,
+      onlyScoped: false
+    }, options)
 
     if (user && typeof user === 'object') {
       id = user._id
diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index 5b4fda6fd3..9fc3a6ab63 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -126,11 +126,11 @@ describe('roles async', async function () {
   })
 
   it('can\'t create role with empty names', async function () {
-    assert.isRejected(Roles.createRoleAsync(''), /Invalid role name/)
-    assert.isRejected(Roles.createRoleAsync(null), /Invalid role name/)
-    assert.isRejected(Roles.createRoleAsync(' '), /Invalid role name/)
-    assert.isRejected(Roles.createRoleAsync(' foobar'), /Invalid role name/)
-    assert.isRejected(Roles.createRoleAsync(' foobar '), /Invalid role name/)
+    await assert.isRejected(Roles.createRoleAsync(''), /Invalid role name/)
+    await assert.isRejected(Roles.createRoleAsync(null), /Invalid role name/)
+    await assert.isRejected(Roles.createRoleAsync(' '), /Invalid role name/)
+    await assert.isRejected(Roles.createRoleAsync(' foobar'), /Invalid role name/)
+    await assert.isRejected(Roles.createRoleAsync(' foobar '), /Invalid role name/)
   })
 
   it('can\'t use invalid scope names', async function () {
@@ -140,11 +140,11 @@ describe('roles async', async function () {
     await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
     await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
 
-    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ''), /Invalid scope name/)
-    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' '), /Invalid scope name/)
-    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' foobar'), /Invalid scope name/)
-    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' foobar '), /Invalid scope name/)
-    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 42), /Invalid scope name/)
+    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ''), /Invalid scope name/)
+    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' '), /Invalid scope name/)
+    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' foobar'), /Invalid scope name/)
+    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' foobar '), /Invalid scope name/)
+    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 42), /Invalid scope name/)
   })
 
   it('can check if user is in role', async function () {
@@ -183,30 +183,30 @@ describe('roles async', async function () {
     await testUser('eve', ['editor'], { scope: 'scope2' })
   })
 
-  // it('can check if user is in role by scope with global role', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //   Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
-  //   Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
-  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['user'], 'scope1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope2'))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['user']))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['editor']))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['user'], null))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['editor'], null))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['user'], 'scope2'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope1'))
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['admin'], 'scope2'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['admin'], 'scope1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['admin']))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, ['admin'], null))
-  // })
+  it('can check if user is in role by scope with global role', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
+    await Roles.addUsersToRolesAsync(users.eve, ['admin'])
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['user'], 'scope1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope2'))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user']))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor']))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user'], null))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], null))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user'], 'scope2'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope1'))
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin'], 'scope2'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin'], 'scope1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin']))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin'], null))
+  })
 
   it('renaming scopes', async function () {
     await Roles.createRoleAsync('admin')
@@ -226,7 +226,7 @@ describe('roles async', async function () {
     assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope1'))
     assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope2'))
 
-    assert.isRejected(Roles.renameScopeAsync('scope3'), /Invalid scope name/)
+    await assert.isRejected(Roles.renameScopeAsync('scope3'), /Invalid scope name/)
 
     await Roles.renameScopeAsync('scope3', null)
 
@@ -296,7 +296,7 @@ describe('roles async', async function () {
   })
 
   it('can\'t add user to non-existent role', async function () {
-    assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin']), /Role 'admin' does not exist/)
+    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin']), /Role 'admin' does not exist/)
     await Roles.addUsersToRolesAsync(users.eve, ['admin'], { ifExists: true })
   })
 
@@ -308,7 +308,7 @@ describe('roles async', async function () {
   })
 
   it('can\'t set user to non-existent role', async function () {
-    assert.isRejected(Roles.setUserRolesAsync(users.eve, ['admin']), /Role 'admin' does not exist/)
+    await assert.isRejected(Roles.setUserRolesAsync(users.eve, ['admin']), /Role 'admin' does not exist/)
     await Roles.setUserRolesAsync(users.eve, ['admin'], { ifExists: true })
   })
 
@@ -799,452 +799,472 @@ describe('roles async', async function () {
     assert.sameMembers(await Roles.getRolesForUserAsync('1', 'scope1'), [])
   })
 
-  // it('can get all roles for user', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //
-  //   const userId = users.eve
-  //   let userObj
-  //
-  //   // by userId
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
-  //
-  //   // by user object
-  //   userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
-  //
-  //   Roles.addUsersToRolesAsync(userId, ['admin', 'user'])
-  //
-  //   // by userId
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['admin', 'user'])
-  //
-  //   // by user object
-  //   userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['admin', 'user'])
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: null,
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }, {
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'user' }]
-  //   }])
-  // })
-  //
-  // it('can get all roles for user by scope', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //
-  //   const userId = users.eve
-  //   let userObj
-  //
-  //   // by userId
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), [])
-  //
-  //   // by user object
-  //   userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), [])
-  //
-  //   // add roles
-  //   Roles.addUsersToRolesAsync(userId, ['admin', 'user'], 'scope1')
-  //   Roles.addUsersToRolesAsync(userId, ['admin'], 'scope2')
-  //
-  //   // by userId
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['admin', 'user'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope2'), ['admin'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
-  //
-  //   // by user object
-  //   userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['admin', 'user'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope2'), ['admin'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }, {
-  //     role: { _id: 'user' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'user' }]
-  //   }])
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope2',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }, {
-  //     role: { _id: 'user' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'user' }]
-  //   }, {
-  //     role: { _id: 'admin' },
-  //     scope: 'scope2',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  //
-  //   Roles.createRoleAsync('PERMISSION')
-  //   Roles.addRolesToParent('PERMISSION', 'user')
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }, {
-  //     role: { _id: 'user' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-  //   }])
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope2',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope2' }), ['admin'])
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }, {
-  //     role: { _id: 'user' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-  //   }, {
-  //     role: { _id: 'admin' },
-  //     scope: 'scope2',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }, {
-  //     role: { _id: 'user' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-  //   }])
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope2',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }, {
-  //     role: { _id: 'user' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-  //   }, {
-  //     role: { _id: 'admin' },
-  //     scope: 'scope2',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
-  // })
-  //
-  // it('can get only scoped roles for user', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //
-  //   const userId = users.eve
-  //
-  //   // add roles
-  //   Roles.addUsersToRolesAsync(userId, ['user'], 'scope1')
-  //   Roles.addUsersToRolesAsync(userId, ['admin'])
-  //
-  //   Roles.createRoleAsync('PERMISSION')
-  //   Roles.addRolesToParent('PERMISSION', 'user')
-  //
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, scope: 'scope1' }), ['user', 'PERMISSION'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, onlyAssigned: true, scope: 'scope1' }), ['user'])
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: 'scope1',
-  //     user: { _id: userId },
-  //     inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-  //   }])
-  // })
-  //
-  // it('can get all roles for user by scope with periods in name', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.k12.va.us')
-  //
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(users.joe, 'example.k12.va.us'), ['admin'])
-  // })
-  //
-  // it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //
-  //   const userId = users.eve
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-  //   Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], 'scope1')
-  //
-  //   // by userId
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['editor', 'admin', 'user'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['editor'])
-  //
-  //   // by user object
-  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['editor', 'admin', 'user'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['editor'])
-  // })
-  //
-  // it('getRolesForUser should not return null entries if user has no roles for scope', function () {
-  //   Roles.createRoleAsync('editor')
-  //
-  //   const userId = users.eve
-  //   let userObj
-  //
-  //   // by userId
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), [])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
-  //
-  //   // by user object
-  //   userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), [])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-  //
-  //   // by userId
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['editor'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['editor'])
-  //
-  //   // by user object
-  //   userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['editor'])
-  //   assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['editor'])
-  // })
-  //
-  // it('getRolesForUser should not fail during a call of addUsersToRoles', function () {
-  //   Roles.createRoleAsync('editor')
-  //
-  //   const userId = users.eve
-  //   const promises = []
-  //   const interval = setInterval(() => {
-  //     promises.push(Promise.resolve().then(() => { await Roles.getRolesForUserAsync(userId) }))
-  //   }, 0)
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-  //   clearInterval(interval)
-  //
-  //   return Promise.all(promises)
-  // })
-  //
-  // it('returns an empty list of scopes for null as user-id', function () {
-  //   assert.sameMembers(Roles.getScopesForUser(undefined), [])
-  //   assert.sameMembers(Roles.getScopesForUser(null), [])
-  //   assert.sameMembers(Roles.getScopesForUser('foo'), [])
-  //   assert.sameMembers(Roles.getScopesForUser({}), [])
-  //   assert.sameMembers(Roles.getScopesForUser({ _id: 'foo' }), [])
-  // })
-  //
-  // it('can get all scopes for user', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //
-  //   const userId = users.eve
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
-  //   Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], 'scope2')
-  //
-  //   // by userId
-  //   assert.sameMembers(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
-  //
-  //   // by user object
-  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
-  // })
-  //
-  // it('can get all scopes for user by role', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //
-  //   const userId = users.eve
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'scope2')
-  //
-  //   // by userId
-  //   assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
-  //
-  //   // by user object
-  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
-  // })
-  //
-  // it('getScopesForUser returns [] when not using scopes', function () {
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //
-  //   const userId = users.eve
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'])
-  //
-  //   // by userId
-  //   assert.sameMembers(Roles.getScopesForUser(userId), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), [])
-  //
-  //   // by user object
-  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(Roles.getScopesForUser(userObj), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
-  // })
-  //
-  // it('can get all groups for user by role array', function () {
-  //   const userId = users.eve
-  //
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //   Roles.createRoleAsync('moderator')
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], 'group1')
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'group2')
-  //   Roles.addUsersToRolesAsync([users.eve], ['moderator'], 'group3')
-  //
-  //   // by userId, one role
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['group2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
-  //
-  //   // by userId, multiple roles
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
-  //
-  //   // by user object, one role
-  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['group2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
-  //
-  //   // by user object, multiple roles
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
-  // })
-  //
-  // it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //
-  //   const userId = users.eve
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'scope2')
-  //   Roles.addUsersToRolesAsync([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
-  //
-  //   // by userId
-  //   assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-  //
-  //   // by user object
-  //   const userObj = Meteor.users.findOneAsync({ _id: userId })
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
-  //   assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-  // })
-  //
-  // it('can get all users in role', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //
-  //   Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'])
-  //   Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor'])
-  //
-  //   const expected = [users.eve, users.joe]
-  //   const actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-  //
-  //   assert.sameMembers(actual, expected)
-  // })
-  //
-  // it('can get all users in role by scope', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //
-  //   Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'], 'scope1')
-  //   Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
-  //
-  //   let expected = [users.eve, users.joe]
-  //   let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
-  //
-  //   assert.sameMembers(actual, expected)
-  //
-  //   expected = [users.eve, users.joe]
-  //   actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
-  //   assert.sameMembers(actual, expected)
-  //
-  //   expected = [users.eve, users.bob, users.joe]
-  //   actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
-  //   assert.sameMembers(actual, expected)
-  //
-  //   actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-  //   assert.sameMembers(actual, [])
-  // })
-  //
+  it('can get all roles for user', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+
+    const userId = users.eve
+    let userObj
+
+    // by userId
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
+
+    // by user object
+    userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
+
+    await Roles.addUsersToRolesAsync(userId, ['admin', 'user'])
+
+    // by userId
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['admin', 'user'])
+
+    // by user object
+    userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['admin', 'user'])
+
+    const userRoles = await Roles.getRolesForUserAsync(userId, { fullObjects: true })
+    assert.sameDeepMembers(userRoles.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }]
+    }])
+  })
+
+  it('can get all roles for user by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+
+    const userId = users.eve
+    let userObj
+
+    // by userId
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), [])
+
+    // by user object
+    userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), [])
+
+    // add roles
+    await Roles.addUsersToRolesAsync(userId, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(userId, ['admin'], 'scope2')
+
+    // by userId
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['admin', 'user'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope2'), ['admin'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
+
+    // by user object
+    userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['admin', 'user'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope2'), ['admin'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
+
+    const userRoles = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1' })
+    assert.sameDeepMembers(userRoles.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }]
+    }])
+    const userRoles2 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2' })
+    assert.sameDeepMembers(userRoles2.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    const userRoles3 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true })
+    assert.sameDeepMembers(userRoles3.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }]
+    }, {
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    await Roles.createRoleAsync('PERMISSION')
+    await Roles.addRolesToParentAsync('PERMISSION', 'user')
+
+    const userRoles4 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1' })
+    assert.sameDeepMembers(userRoles4.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }])
+    const userRoles5 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2' })
+    assert.sameDeepMembers(userRoles5.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope2' }), ['admin'])
+
+    const userRoles6 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true })
+    assert.sameDeepMembers(userRoles6.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }, {
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
+
+    const userRoles7 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true })
+    assert.sameDeepMembers(userRoles7.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }])
+    const userRoles8 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true })
+    assert.sameDeepMembers(userRoles8.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
+
+    const userRoles9 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true, onlyAssigned: true })
+    assert.sameDeepMembers(userRoles9.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }, {
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }, {
+      role: { _id: 'admin' },
+      scope: 'scope2',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
+  })
+
+  it('can get only scoped roles for user', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+
+    const userId = users.eve
+
+    // add roles
+    await Roles.addUsersToRolesAsync(userId, ['user'], 'scope1')
+    await Roles.addUsersToRolesAsync(userId, ['admin'])
+
+    await Roles.createRoleAsync('PERMISSION')
+    await Roles.addRolesToParentAsync('PERMISSION', 'user')
+
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, scope: 'scope1' }), ['user', 'PERMISSION'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, onlyAssigned: true, scope: 'scope1' }), ['user'])
+    const userRoles = await Roles.getRolesForUserAsync(userId, { onlyScoped: true, fullObjects: true, scope: 'scope1' })
+    assert.sameDeepMembers(userRoles.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: 'scope1',
+      user: { _id: userId },
+      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
+    }])
+  })
+
+  it('can get all roles for user by scope with periods in name', async function () {
+    await Roles.createRoleAsync('admin')
+
+    await Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.k12.va.us')
+
+    assert.sameMembers(await Roles.getRolesForUserAsync(users.joe, 'example.k12.va.us'), ['admin'])
+  })
+
+  it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+
+    const userId = users.eve
+
+    await Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+    await Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], 'scope1')
+
+    // by userId
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['editor', 'admin', 'user'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['editor'])
+
+    // by user object
+    const userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['editor', 'admin', 'user'])
+    assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['editor'])
+  })
+
+  describe('getRolesForUser', function () {
+    it('should not return null entries if user has no roles for scope', async function () {
+      await Roles.createRoleAsync('editor')
+
+      const userId = users.eve
+      let userObj
+
+      // by userId
+      assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), [])
+      assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
+
+      // by user object
+      userObj = await Meteor.users.findOneAsync({ _id: userId })
+      assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), [])
+      assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
+
+      await Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+
+      // by userId
+      assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['editor'])
+      assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['editor'])
+
+      // by user object
+      userObj = await Meteor.users.findOneAsync({ _id: userId })
+      assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['editor'])
+      assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['editor'])
+    })
+
+    it('should not fail during a call of addUsersToRoles', async function () {
+      await Roles.createRoleAsync('editor')
+
+      const userId = users.eve
+      const promises = []
+      const interval = setInterval(() => {
+        promises.push(Promise.resolve().then(async () => {
+          await Roles.getRolesForUserAsync(userId)
+        }))
+      }, 0)
+
+      await Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
+      clearInterval(interval)
+
+      return Promise.all(promises)
+    })
+  })
+
+  it('returns an empty list of scopes for null as user-id', async function () {
+    assert.sameMembers(await Roles.getScopesForUserAsync(undefined), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(null), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync('foo'), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync({}), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync({ _id: 'foo' }), [])
+  })
+
+  it('can get all scopes for user', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+
+    const userId = users.eve
+
+    await Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], 'scope2')
+
+    // by userId
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId), ['scope1', 'scope2'])
+
+    // by user object
+    const userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj), ['scope1', 'scope2'])
+  })
+
+  it('can get all scopes for user by role', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+
+    const userId = users.eve
+
+    await Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'scope2')
+
+    // by userId
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'user'), ['scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'admin'), [])
+
+    // by user object
+    const userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'user'), ['scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'admin'), [])
+  })
+
+  it('getScopesForUser returns [] when not using scopes', async function () {
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+
+    const userId = users.eve
+
+    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'])
+
+    // by userId
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'editor'), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor']), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor', 'user']), [])
+
+    // by user object
+    const userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'editor'), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor']), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor', 'user']), [])
+  })
+
+  it('can get all groups for user by role array', async function () {
+    const userId = users.eve
+
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+    await Roles.createRoleAsync('moderator')
+    await Roles.createRoleAsync('admin')
+
+    await Roles.addUsersToRolesAsync([users.eve], ['editor'], 'group1')
+    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'group2')
+    await Roles.addUsersToRolesAsync([users.eve], ['moderator'], 'group3')
+
+    // by userId, one role
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['user']), ['group2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor']), ['group1', 'group2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['admin']), [])
+
+    // by userId, multiple roles
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor', 'user']), ['group1', 'group2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['user', 'moderator']), ['group2', 'group3'])
+
+    // by user object, one role
+    const userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['user']), ['group2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor']), ['group1', 'group2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['admin']), [])
+
+    // by user object, multiple roles
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor', 'user']), ['group1', 'group2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['user', 'moderator']), ['group2', 'group3'])
+  })
+
+  it('getting all scopes for user does not include GLOBAL_SCOPE', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+
+    const userId = users.eve
+
+    await Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'scope2')
+    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
+
+    // by userId
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'user'), ['scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'admin'), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['user']), ['scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor']), ['scope1', 'scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['admin']), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+
+    // by user object
+    const userObj = await Meteor.users.findOneAsync({ _id: userId })
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'user'), ['scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'editor'), ['scope1', 'scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'admin'), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['user']), ['scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor']), ['scope1', 'scope2'])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['admin']), [])
+    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+  })
+
+  it('can get all users in role', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+
+    await Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'])
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor'])
+
+    const expected = [users.eve, users.joe]
+    const cursor = await Roles.getUsersInRoleAsync('admin')
+    const actual = cursor.fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+  })
+
+  it('can get all users in role by scope', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+
+    await Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
+
+    let expected = [users.eve, users.joe]
+    const cursor1 = await Roles.getUsersInRoleAsync('admin', 'scope1')
+    let actual = cursor1.fetch().map(r => r._id)
+
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve, users.joe]
+    const cursor2 = await Roles.getUsersInRoleAsync('admin', { scope: 'scope1' })
+    actual = cursor2.fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+
+    expected = [users.eve, users.bob, users.joe]
+    const cursor3 = await Roles.getUsersInRoleAsync('admin', { anyScope: true })
+    actual = cursor3.fetch().map(r => r._id)
+    assert.sameMembers(actual, expected)
+
+    const cursor4 = await Roles.getUsersInRoleAsync('admin')
+    actual = cursor4.fetch().map(r => r._id)
+    assert.sameMembers(actual, [])
+  })
+
   // it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
   //   Roles.createRoleAsync('admin')
   //   Roles.createRoleAsync('user')
@@ -1253,22 +1273,22 @@ describe('roles async', async function () {
   //   Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
   //
   //   let expected = [users.eve]
-  //   let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
+  //   let actual = await Roles.getUsersInRoleAsync('admin', 'scope1').fetch().map(r => r._id)
   //
   //   assert.sameMembers(actual, expected)
   //
   //   expected = [users.eve, users.bob, users.joe]
-  //   actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id)
+  //   actual = await Roles.getUsersInRoleAsync('admin', 'scope2').fetch().map(r => r._id)
   //
   //   assert.sameMembers(actual, expected)
   //
   //   expected = [users.eve]
-  //   actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+  //   actual = await Roles.getUsersInRoleAsync('admin').fetch().map(r => r._id)
   //
   //   assert.sameMembers(actual, expected)
   //
   //   expected = [users.eve, users.bob, users.joe]
-  //   actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
+  //   actual = await Roles.getUsersInRoleAsync('admin', { anyScope: true }).fetch().map(r => r._id)
   //
   //   assert.sameMembers(actual, expected)
   // })
@@ -1280,15 +1300,15 @@ describe('roles async', async function () {
   //   Roles.addUsersToRolesAsync([users.bob], ['admin'], 'scope1')
   //
   //   let expected = [users.eve]
-  //   let actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
+  //   let actual = await Roles.getUsersInRoleAsync('admin').fetch().map(r => r._id)
   //   assert.sameMembers(actual, expected)
   //
   //   expected = [users.eve, users.bob]
-  //   actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
+  //   actual = await Roles.getUsersInRoleAsync('admin', { scope: 'scope1' }).fetch().map(r => r._id)
   //   assert.sameMembers(actual, expected)
   //
   //   expected = [users.bob]
-  //   actual = Roles.getUsersInRole('admin', { scope: 'scope1', onlyScoped: true }).fetch().map(r => r._id)
+  //   actual = await Roles.getUsersInRoleAsync('admin', { scope: 'scope1', onlyScoped: true }).fetch().map(r => r._id)
   //   assert.sameMembers(actual, expected)
   // })
 
@@ -1299,983 +1319,805 @@ describe('roles async', async function () {
     await Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'], 'scope1')
     await Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
 
-    const results = await Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
+    const cursor = await Roles.getUsersInRoleAsync('admin', 'scope1', { fields: { username: 0 }, limit: 1 })
+    const results = cursor.fetch()
 
     assert.equal(1, results.length)
     assert.isTrue(hasProp(results[0], '_id'))
     assert.isFalse(hasProp(results[0], 'username'))
   })
 
-  // it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
-  //
-  //   testUser('eve', [], 'scope1')
-  //   testUser('joe', ['admin'], 'scope2')
-  //   testUser('joe', ['admin'], 'scope1')
-  //   testUser('bob', ['admin'], 'scope2')
-  //   testUser('bob', ['admin'], 'scope1')
-  //
-  //   Roles.removeUsersFromRolesAsync(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
-  //
-  //   testUser('eve', [], 'scope1')
-  //   testUser('joe', [], 'scope2')
-  //   testUser('joe', [], 'scope1')
-  //   testUser('bob', ['admin'], 'scope2')
-  //   testUser('bob', ['admin'], 'scope1')
-  // })
-  //
-  // it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], 'scope5')
-  //   Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
-  //
-  //   testUser('eve', [], 'scope1')
-  //   testUser('joe', ['admin'], 'scope5')
-  //   testUser('joe', ['admin'], 'scope2')
-  //   testUser('joe', ['admin'], 'scope1')
-  //   testUser('bob', ['admin'], 'scope5')
-  //   testUser('bob', ['admin'], 'scope2')
-  //   testUser('bob', ['admin'], 'scope1')
-  //
-  //   Roles.removeUsersFromRolesAsync(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
-  //
-  //   testUser('eve', [], 'scope1')
-  //   testUser('joe', ['admin'], 'scope5')
-  //   testUser('joe', [], 'scope2')
-  //   testUser('joe', [], 'scope1')
-  //   testUser('bob', ['admin'], 'scope5')
-  //   testUser('bob', ['admin'], 'scope2')
-  //   testUser('bob', ['admin'], 'scope1')
-  // })
-  //
-  // it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.joe, 'admin', Roles.GLOBAL_SCOPE)
-  //
-  //   testUser('joe', ['admin'])
-  //
-  //   Roles.removeUsersFromRolesAsync(users.joe, 'admin', Roles.GLOBAL_SCOPE)
-  //
-  //   testUser('joe', [])
-  // })
-  //
-  // it('can use \'.\' in scope name', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.com')
-  //   testUser('joe', ['admin'], 'example.com')
-  // })
-  //
-  // it('can use multiple periods in scope name', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.k12.va.us')
-  //   testUser('joe', ['admin'], 'example.k12.va.us')
-  // })
-  //
-  // it('renaming of roles', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //
-  //   await Roles.setUserRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
-  //   await Roles.setUserRolesAsync([users.bob, users.joe], ['user', 'admin'], 'scope2')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'editor', 'scope1'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'editor', 'scope2'))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.joe, 'admin', 'scope1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.joe, 'admin', 'scope2'))
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'user', 'scope1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.bob, 'user', 'scope1'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.joe, 'user', 'scope1'))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user', 'scope2'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.bob, 'user', 'scope2'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.joe, 'user', 'scope2'))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user2', 'scope1'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user2', 'scope2'))
-  //
-  //   Roles.renameRole('user', 'user2')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'editor', 'scope1'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'editor', 'scope2'))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.joe, 'admin', 'scope1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.joe, 'admin', 'scope2'))
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'user2', 'scope1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.bob, 'user2', 'scope1'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.joe, 'user2', 'scope1'))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user2', 'scope2'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.bob, 'user2', 'scope2'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.joe, 'user2', 'scope2'))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user', 'scope1'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'user', 'scope2'))
-  // })
-  //
-  // it('migration without global groups (to v2)', function () {
-  //   assert.isOk(Meteor.roles.insert({ name: 'admin' }))
-  //   assert.isOk(Meteor.roles.insert({ name: 'editor' }))
-  //   assert.isOk(Meteor.roles.insert({ name: 'user' }))
-  //
-  //   assert.isOk(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
-  //   assert.isOk(Meteor.users.update(users.bob, { $set: { roles: [] } }))
-  //   assert.isOk(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
-  //
-  //   Roles._forwardMigrate()
-  //
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: [{
-  //       _id: 'admin',
-  //       scope: null,
-  //       assigned: true
-  //     }, {
-  //       _id: 'editor',
-  //       scope: null,
-  //       assigned: true
-  //     }]
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: []
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: [{
-  //       _id: 'user',
-  //       scope: null,
-  //       assigned: true
-  //     }]
-  //   })
-  //
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-  //     _id: 'admin',
-  //     children: []
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-  //     _id: 'editor',
-  //     children: []
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-  //     _id: 'user',
-  //     children: []
-  //   })
-  //
-  //   Roles._backwardMigrate(null, null, false)
-  //
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: ['admin', 'editor']
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: []
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: ['user']
-  //   })
-  //
-  //   assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-  //     name: 'admin'
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-  //     name: 'editor'
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-  //     name: 'user'
-  //   })
-  // })
-  //
-  // it('migration without global groups (to v3)')
-  //
-  // it('migration with global groups (to v2)', function () {
-  //   assert.isOk(Meteor.roles.insert({ name: 'admin' }))
-  //   assert.isOk(Meteor.roles.insert({ name: 'editor' }))
-  //   assert.isOk(Meteor.roles.insert({ name: 'user' }))
-  //
-  //   assert.isOk(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
-  //   assert.isOk(Meteor.users.update(users.bob, { $set: { roles: { } } }))
-  //   assert.isOk(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
-  //
-  //   Roles._forwardMigrate(null, null, false)
-  //
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: [{
-  //       _id: 'admin',
-  //       scope: null,
-  //       assigned: true
-  //     }, {
-  //       _id: 'editor',
-  //       scope: null,
-  //       assigned: true
-  //     }, {
-  //       _id: 'user',
-  //       scope: 'foo_bla',
-  //       assigned: true
-  //     }]
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: []
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: [{
-  //       _id: 'user',
-  //       scope: null,
-  //       assigned: true
-  //     }, {
-  //       _id: 'user',
-  //       scope: 'foo_bla',
-  //       assigned: true
-  //     }]
-  //   })
-  //
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-  //     _id: 'admin',
-  //     children: []
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-  //     _id: 'editor',
-  //     children: []
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-  //     _id: 'user',
-  //     children: []
-  //   })
-  //
-  //   Roles._backwardMigrate(null, null, true)
-  //
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: {
-  //       __global_roles__: ['admin', 'editor'],
-  //       foo_bla: ['user']
-  //     }
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: {}
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: {
-  //       __global_roles__: ['user'],
-  //       foo_bla: ['user']
-  //     }
-  //   })
-  //
-  //   assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-  //     name: 'admin'
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-  //     name: 'editor'
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-  //     name: 'user'
-  //   })
-  //
-  //   Roles._forwardMigrate(null, null, true)
-  //
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.eve, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: [{
-  //       _id: 'admin',
-  //       scope: null,
-  //       assigned: true
-  //     }, {
-  //       _id: 'editor',
-  //       scope: null,
-  //       assigned: true
-  //     }, {
-  //       _id: 'user',
-  //       scope: 'foo.bla',
-  //       assigned: true
-  //     }]
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.bob, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: []
-  //   })
-  //   assert.deepEqual(Meteor.users.findOneAsync(users.joe, { fields: { roles: 1, _id: 0 } }), {
-  //     roles: [{
-  //       _id: 'user',
-  //       scope: null,
-  //       assigned: true
-  //     }, {
-  //       _id: 'user',
-  //       scope: 'foo.bla',
-  //       assigned: true
-  //     }]
-  //   })
-  //
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-  //     _id: 'admin',
-  //     children: []
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-  //     _id: 'editor',
-  //     children: []
-  //   })
-  //   assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-  //     _id: 'user',
-  //     children: []
-  //   })
-  // })
-  //
-  // it('migration with global groups (to v3)')
-  //
-  // it('_addUserToRole', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-  //
-  //   assert.include(
-  //     Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
-  //     'insertedId'
-  //   )
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  //
-  //   assert.notInclude(
-  //     Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
-  //     'insertedId'
-  //   )
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  // })
-  //
-  // it('_removeUserFromRole', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, 'admin')
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'admin' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'admin' }]
-  //   }])
-  //
-  //   Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-  // })
-  //
-  // it('keep assigned roles', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('ALL_PERMISSIONS')
-  //   Roles.createRoleAsync('VIEW_PERMISSION')
-  //   Roles.createRoleAsync('EDIT_PERMISSION')
-  //   Roles.createRoleAsync('DELETE_PERMISSION')
-  //   Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-  //   Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-  //   Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-  //   Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, ['user'])
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'user' },
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' }
-  //     ]
-  //   }])
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, 'VIEW_PERMISSION')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'user' },
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'VIEW_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'VIEW_PERMISSION' }
-  //     ]
-  //   }])
-  //
-  //   Roles.removeUsersFromRolesAsync(users.eve, 'user')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'VIEW_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'VIEW_PERMISSION' }
-  //     ]
-  //   }])
-  //
-  //   Roles.removeUsersFromRolesAsync(users.eve, 'VIEW_PERMISSION')
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-  // })
-  //
-  // it('adds children of the added role to the assignments', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('ALBUM.ADMIN')
-  //   Roles.createRoleAsync('ALBUM.VIEW')
-  //   Roles.createRoleAsync('TRACK.ADMIN')
-  //   Roles.createRoleAsync('TRACK.VIEW')
-  //
-  //   Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
-  //   Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
-  //
-  //   Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
-  //
-  //   Roles.addRolesToParent('TRACK.ADMIN', 'admin')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
-  // })
-  //
-  // it('removes children of the removed role from the assignments', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('ALBUM.ADMIN')
-  //   Roles.createRoleAsync('ALBUM.VIEW')
-  //   Roles.createRoleAsync('TRACK.ADMIN')
-  //   Roles.createRoleAsync('TRACK.VIEW')
-  //
-  //   Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
-  //   Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
-  //
-  //   Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
-  //   Roles.addRolesToParent('TRACK.ADMIN', 'admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
-  //
-  //   Roles.removeRolesFromParent('TRACK.ADMIN', 'admin')
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
-  // })
-  //
-  // it('modify assigned hierarchical roles', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('ALL_PERMISSIONS')
-  //   Roles.createRoleAsync('VIEW_PERMISSION')
-  //   Roles.createRoleAsync('EDIT_PERMISSION')
-  //   Roles.createRoleAsync('DELETE_PERMISSION')
-  //   Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-  //   Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-  //   Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-  //   Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, ['user'])
-  //   Roles.addUsersToRolesAsync(users.eve, ['ALL_PERMISSIONS'], 'scope')
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'user' },
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'ALL_PERMISSIONS' },
-  //     scope: 'scope',
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' }
-  //     ]
-  //   }])
-  //
-  //   Roles.createRoleAsync('MODERATE_PERMISSION')
-  //
-  //   Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'user' },
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' },
-  //       { _id: 'MODERATE_PERMISSION' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'ALL_PERMISSIONS' },
-  //     scope: 'scope',
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' },
-  //       { _id: 'MODERATE_PERMISSION' }
-  //     ]
-  //   }])
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'user' },
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' },
-  //       { _id: 'MODERATE_PERMISSION' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'ALL_PERMISSIONS' },
-  //     scope: 'scope',
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' },
-  //       { _id: 'MODERATE_PERMISSION' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'admin' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'admin' },
-  //       { _id: 'DELETE_PERMISSION' }
-  //     ]
-  //   }])
-  //
-  //   Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'user' },
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' },
-  //       { _id: 'MODERATE_PERMISSION' },
-  //       { _id: 'DELETE_PERMISSION' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'ALL_PERMISSIONS' },
-  //     scope: 'scope',
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' },
-  //       { _id: 'MODERATE_PERMISSION' },
-  //       { _id: 'DELETE_PERMISSION' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'admin' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'admin' },
-  //       { _id: 'DELETE_PERMISSION' }
-  //     ]
-  //   }])
-  //
-  //   Roles.removeUsersFromRolesAsync(users.eve, ['admin'])
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'user' },
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' },
-  //       { _id: 'MODERATE_PERMISSION' },
-  //       { _id: 'DELETE_PERMISSION' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'ALL_PERMISSIONS' },
-  //     scope: 'scope',
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'ALL_PERMISSIONS' },
-  //       { _id: 'EDIT_PERMISSION' },
-  //       { _id: 'VIEW_PERMISSION' },
-  //       { _id: 'MODERATE_PERMISSION' },
-  //       { _id: 'DELETE_PERMISSION' }
-  //     ]
-  //   }])
-  //
-  //   Roles.deleteRole('ALL_PERMISSIONS')
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'user' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'user' }
-  //     ]
-  //   }])
-  // })
-  //
-  // it('delete role with overlapping hierarchical roles', function () {
-  //   Roles.createRoleAsync('role1')
-  //   Roles.createRoleAsync('role2')
-  //   Roles.createRoleAsync('COMMON_PERMISSION_1')
-  //   Roles.createRoleAsync('COMMON_PERMISSION_2')
-  //   Roles.createRoleAsync('COMMON_PERMISSION_3')
-  //   Roles.createRoleAsync('EXTRA_PERMISSION_ROLE_1')
-  //   Roles.createRoleAsync('EXTRA_PERMISSION_ROLE_2')
-  //
-  //   Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1')
-  //   Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1')
-  //   Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1')
-  //   Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1')
-  //
-  //   Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2')
-  //   Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2')
-  //   Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2')
-  //   Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, 'role1')
-  //   Roles.addUsersToRolesAsync(users.eve, 'role2')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'role1' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'role1' },
-  //       { _id: 'COMMON_PERMISSION_1' },
-  //       { _id: 'COMMON_PERMISSION_2' },
-  //       { _id: 'COMMON_PERMISSION_3' },
-  //       { _id: 'EXTRA_PERMISSION_ROLE_1' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'role2' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'role2' },
-  //       { _id: 'COMMON_PERMISSION_1' },
-  //       { _id: 'COMMON_PERMISSION_2' },
-  //       { _id: 'COMMON_PERMISSION_3' },
-  //       { _id: 'EXTRA_PERMISSION_ROLE_2' }
-  //     ]
-  //   }])
-  //
-  //   Roles.removeUsersFromRolesAsync(users.eve, 'role2')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'role1' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'role1' },
-  //       { _id: 'COMMON_PERMISSION_1' },
-  //       { _id: 'COMMON_PERMISSION_2' },
-  //       { _id: 'COMMON_PERMISSION_3' },
-  //       { _id: 'EXTRA_PERMISSION_ROLE_1' }
-  //     ]
-  //   }])
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, 'role2')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'role1' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'role1' },
-  //       { _id: 'COMMON_PERMISSION_1' },
-  //       { _id: 'COMMON_PERMISSION_2' },
-  //       { _id: 'COMMON_PERMISSION_3' },
-  //       { _id: 'EXTRA_PERMISSION_ROLE_1' }
-  //     ]
-  //   }, {
-  //     role: { _id: 'role2' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'role2' },
-  //       { _id: 'COMMON_PERMISSION_1' },
-  //       { _id: 'COMMON_PERMISSION_2' },
-  //       { _id: 'COMMON_PERMISSION_3' },
-  //       { _id: 'EXTRA_PERMISSION_ROLE_2' }
-  //     ]
-  //   }])
-  //
-  //   Roles.deleteRole('role2')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'role1' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [
-  //       { _id: 'role1' },
-  //       { _id: 'COMMON_PERMISSION_1' },
-  //       { _id: 'COMMON_PERMISSION_2' },
-  //       { _id: 'COMMON_PERMISSION_3' },
-  //       { _id: 'EXTRA_PERMISSION_ROLE_1' }
-  //     ]
-  //   }])
-  // })
-  //
-  // it('set parent on assigned role', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('EDIT_PERMISSION')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'EDIT_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-  //   }])
-  //
-  //   Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'EDIT_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-  //   }])
-  // })
-  //
-  // it('remove parent on assigned role', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('EDIT_PERMISSION')
-  //
-  //   Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'EDIT_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-  //   }])
-  //
-  //   Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'EDIT_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-  //   }])
-  // })
-  //
-  // it('adding and removing extra role parents', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('EDIT_PERMISSION')
-  //
-  //   Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-  //
-  //   Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'EDIT_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-  //   }])
-  //
-  //   Roles.addRolesToParent('EDIT_PERMISSION', 'user')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'EDIT_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-  //   }])
-  //
-  //   Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
-  //
-  //   assert.isTrue(Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'admin'))
-  //
-  //   assert.sameDeepMembers(await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-  //     role: { _id: 'EDIT_PERMISSION' },
-  //     scope: null,
-  //     user: { _id: users.eve },
-  //     inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-  //   }])
-  // })
-  //
-  // it('cyclic roles', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('editor')
-  //   Roles.createRoleAsync('user')
-  //
-  //   Roles.addRolesToParent('editor', 'admin')
-  //   Roles.addRolesToParent('user', 'editor')
-  //
-  //   assert.throws(function () {
-  //     Roles.addRolesToParent('admin', 'user')
-  //   }, /form a cycle/)
-  // })
-  //
-  // it('userIsInRole returns false for unknown roles', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //   Roles.createRoleAsync('editor')
-  //   Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
-  //   Roles.addUsersToRolesAsync(users.eve, ['editor'])
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'unknown'))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, []))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, null))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, undefined))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, 'unknown', { anyScope: true }))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, [], { anyScope: true }))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, null, { anyScope: true }))
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, undefined, { anyScope: true }))
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
-  // })
-  //
-  // it('userIsInRole returns false if user is a function', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.addUsersToRolesAsync(users.eve, ['admin'])
-  //
-  //   assert.isFalse(Roles.userIsInRoleAsync(() => {}, 'admin'))
-  // })
-  //
-  // describe('isParentOf', function () {
-  //   it('returns false for unknown roles', function () {
-  //     Roles.createRoleAsync('admin')
-  //
-  //     assert.isFalse(Roles.isParentOf('admin', 'unknown'))
-  //     assert.isFalse(Roles.isParentOf('admin', null))
-  //     assert.isFalse(Roles.isParentOf('admin', undefined))
-  //
-  //     assert.isFalse(Roles.isParentOf('unknown', 'admin'))
-  //     assert.isFalse(Roles.isParentOf(null, 'admin'))
-  //     assert.isFalse(Roles.isParentOf(undefined, 'admin'))
-  //   })
-  //
-  //   it('returns false if role is not parent of', function () {
-  //     Roles.createRoleAsync('admin')
-  //     Roles.createRoleAsync('editor')
-  //     Roles.createRoleAsync('user')
-  //     Roles.addRolesToParent(['editor'], 'admin')
-  //     Roles.addRolesToParent(['user'], 'editor')
-  //
-  //     assert.isFalse(Roles.isParentOf('user', 'admin'))
-  //     assert.isFalse(Roles.isParentOf('editor', 'admin'))
-  //   })
-  //
-  //   it('returns true if role is parent of the demanded role', function () {
-  //     Roles.createRoleAsync('admin')
-  //     Roles.createRoleAsync('editor')
-  //     Roles.createRoleAsync('user')
-  //     Roles.addRolesToParent(['editor'], 'admin')
-  //     Roles.addRolesToParent(['user'], 'editor')
-  //
-  //     assert.isTrue(Roles.isParentOf('admin', 'user'))
-  //     assert.isTrue(Roles.isParentOf('editor', 'user'))
-  //     assert.isTrue(Roles.isParentOf('admin', 'editor'))
-  //
-  //     assert.isTrue(Roles.isParentOf('admin', 'admin'))
-  //     assert.isTrue(Roles.isParentOf('editor', 'editor'))
-  //     assert.isTrue(Roles.isParentOf('user', 'user'))
-  //   })
-  // })
+  it('can use Roles.GLOBAL_SCOPE to assign blanket roles', async function () {
+    await Roles.createRoleAsync('admin')
+
+    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
+
+    await testUser('eve', [], 'scope1')
+    await testUser('joe', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope1')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('bob', ['admin'], 'scope1')
+
+    await Roles.removeUsersFromRolesAsync(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
+
+    await testUser('eve', [], 'scope1')
+    await testUser('joe', [], 'scope2')
+    await testUser('joe', [], 'scope1')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('bob', ['admin'], 'scope1')
+  })
+
+  it('Roles.GLOBAL_SCOPE is independent of other scopes', async function () {
+    await Roles.createRoleAsync('admin')
+
+    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], 'scope5')
+    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
+
+    await testUser('eve', [], 'scope1')
+    await testUser('joe', ['admin'], 'scope5')
+    await testUser('joe', ['admin'], 'scope2')
+    await testUser('joe', ['admin'], 'scope1')
+    await testUser('bob', ['admin'], 'scope5')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('bob', ['admin'], 'scope1')
+
+    await Roles.removeUsersFromRolesAsync(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
+
+    await testUser('eve', [], 'scope1')
+    await testUser('joe', ['admin'], 'scope5')
+    await testUser('joe', [], 'scope2')
+    await testUser('joe', [], 'scope1')
+    await testUser('bob', ['admin'], 'scope5')
+    await testUser('bob', ['admin'], 'scope2')
+    await testUser('bob', ['admin'], 'scope1')
+  })
+
+  it('Roles.GLOBAL_SCOPE also checked when scope not specified', async function () {
+    await Roles.createRoleAsync('admin')
+
+    await Roles.addUsersToRolesAsync(users.joe, 'admin', Roles.GLOBAL_SCOPE)
+
+    await testUser('joe', ['admin'])
+
+    await Roles.removeUsersFromRolesAsync(users.joe, 'admin', Roles.GLOBAL_SCOPE)
+
+    await testUser('joe', [])
+  })
+
+  it('can use \'.\' in scope name', async function () {
+    await Roles.createRoleAsync('admin')
+
+    await Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.com')
+    await testUser('joe', ['admin'], 'example.com')
+  })
+
+  it('can use multiple periods in scope name', async function () {
+    await Roles.createRoleAsync('admin')
+
+    await Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.k12.va.us')
+    await testUser('joe', ['admin'], 'example.k12.va.us')
+  })
+
+  it('renaming of roles', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('editor')
+
+    await Roles.setUserRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
+    await Roles.setUserRolesAsync([users.bob, users.joe], ['user', 'admin'], 'scope2')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'editor', 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'editor', 'scope2'))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'admin', 'scope1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.joe, 'admin', 'scope2'))
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'user', 'scope1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.bob, 'user', 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'user', 'scope1'))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user', 'scope2'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.bob, 'user', 'scope2'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.joe, 'user', 'scope2'))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user2', 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user2', 'scope2'))
+
+    await Roles.renameRoleAsync('user', 'user2')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'editor', 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'editor', 'scope2'))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'admin', 'scope1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.joe, 'admin', 'scope2'))
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'user2', 'scope1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.bob, 'user2', 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'user2', 'scope1'))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user2', 'scope2'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.bob, 'user2', 'scope2'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.joe, 'user2', 'scope2'))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user', 'scope1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user', 'scope2'))
+  })
+
+  it('_addUserToRole', async function () {
+    await Roles.createRoleAsync('admin')
+
+    const userRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(userRoles.map(obj => { delete obj._id; return obj }), [])
+
+    const roles = await Roles._addUserToRoleAsync(users.eve, 'admin', { scope: null, ifExists: false })
+    assert.hasAnyKeys(roles, 'insertedId')
+
+    const userRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(userRoles2.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    const roles2 = await Roles._addUserToRoleAsync(users.eve, 'admin', { scope: null, ifExists: false })
+    assert.hasAnyKeys(roles2, 'insertedId')
+
+    const roles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(roles3.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+  })
+
+  it('_removeUserFromRole', async function () {
+    await Roles.createRoleAsync('admin')
+
+    await Roles.addUsersToRolesAsync(users.eve, 'admin')
+
+    const rolesForUser = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(rolesForUser.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'admin' }]
+    }])
+
+    Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
+
+    const rolesForUser2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(rolesForUser2.map(obj => { delete obj._id; return obj }), [])
+  })
+
+  it('keep assigned roles', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('ALL_PERMISSIONS')
+    await Roles.createRoleAsync('VIEW_PERMISSION')
+    await Roles.createRoleAsync('EDIT_PERMISSION')
+    await Roles.createRoleAsync('DELETE_PERMISSION')
+    await Roles.addRolesToParentAsync('ALL_PERMISSIONS', 'user')
+    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+    await Roles.addRolesToParentAsync('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+    await Roles.addRolesToParentAsync('DELETE_PERMISSION', 'admin')
+
+    await Roles.addUsersToRolesAsync(users.eve, ['user'])
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+
+    const rolesForUser =  await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(rolesForUser.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }])
+
+    await Roles.addUsersToRolesAsync(users.eve, 'VIEW_PERMISSION')
+
+    assert.eventually.isTrue(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+
+    const rolesForUser2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(rolesForUser2.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'VIEW_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }])
+
+    await Roles.removeUsersFromRolesAsync(users.eve, 'user')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+
+    const rolesForUser3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(rolesForUser3.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'VIEW_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }])
+
+    await Roles.removeUsersFromRolesAsync(users.eve, 'VIEW_PERMISSION')
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+
+    const rolesForUser4 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(rolesForUser4.map(obj => { delete obj._id; return obj }), [])
+  })
+
+  it('adds children of the added role to the assignments', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('ALBUM.ADMIN')
+    await Roles.createRoleAsync('ALBUM.VIEW')
+    await Roles.createRoleAsync('TRACK.ADMIN')
+    await Roles.createRoleAsync('TRACK.VIEW')
+
+    await Roles.addRolesToParentAsync('ALBUM.VIEW', 'ALBUM.ADMIN')
+    await Roles.addRolesToParentAsync('TRACK.VIEW', 'TRACK.ADMIN')
+
+    await Roles.addRolesToParentAsync('ALBUM.ADMIN', 'admin')
+
+    await Roles.addUsersToRolesAsync(users.eve, ['admin'])
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
+
+    await Roles.addRolesToParentAsync('TRACK.ADMIN', 'admin')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
+  })
+
+  it('removes children of the removed role from the assignments', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('ALBUM.ADMIN')
+    await Roles.createRoleAsync('ALBUM.VIEW')
+    await Roles.createRoleAsync('TRACK.ADMIN')
+    await Roles.createRoleAsync('TRACK.VIEW')
+
+    await Roles.addRolesToParentAsync('ALBUM.VIEW', 'ALBUM.ADMIN')
+    await Roles.addRolesToParentAsync('TRACK.VIEW', 'TRACK.ADMIN')
+
+    await Roles.addRolesToParentAsync('ALBUM.ADMIN', 'admin')
+    await Roles.addRolesToParentAsync('TRACK.ADMIN', 'admin')
+
+    await Roles.addUsersToRolesAsync(users.eve, ['admin'])
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
+
+    await Roles.removeRolesFromParentAsync('TRACK.ADMIN', 'admin')
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
+  })
+
+  it('modify assigned hierarchical roles', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('ALL_PERMISSIONS')
+    await Roles.createRoleAsync('VIEW_PERMISSION')
+    await Roles.createRoleAsync('EDIT_PERMISSION')
+    await Roles.createRoleAsync('DELETE_PERMISSION')
+    await Roles.addRolesToParentAsync('ALL_PERMISSIONS', 'user')
+    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'ALL_PERMISSIONS')
+    await Roles.addRolesToParentAsync('VIEW_PERMISSION', 'ALL_PERMISSIONS')
+    await Roles.addRolesToParentAsync('DELETE_PERMISSION', 'admin')
+
+    await Roles.addUsersToRolesAsync(users.eve, ['user'])
+    await Roles.addUsersToRolesAsync(users.eve, ['ALL_PERMISSIONS'], 'scope')
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' }
+      ]
+    }])
+
+    await Roles.createRoleAsync('MODERATE_PERMISSION')
+
+    await Roles.addRolesToParentAsync('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
+    }])
+
+    await Roles.addUsersToRolesAsync(users.eve, ['admin'])
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles3.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'admin' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }])
+
+    await Roles.addRolesToParentAsync('DELETE_PERMISSION', 'ALL_PERMISSIONS')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    const usersRoles4 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles4.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'admin' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'admin' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }])
+
+    await Roles.removeUsersFromRolesAsync(users.eve, ['admin'])
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    const usersRoles5 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles5.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' },
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }, {
+      role: { _id: 'ALL_PERMISSIONS' },
+      scope: 'scope',
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'ALL_PERMISSIONS' },
+        { _id: 'EDIT_PERMISSION' },
+        { _id: 'VIEW_PERMISSION' },
+        { _id: 'MODERATE_PERMISSION' },
+        { _id: 'DELETE_PERMISSION' }
+      ]
+    }])
+
+    await await Roles.deleteRoleAsync('ALL_PERMISSIONS')
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
+
+    const usersRoles6 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles6.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'user' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'user' }
+      ]
+    }])
+  })
+
+  it('delete role with overlapping hierarchical roles', async function () {
+    await Roles.createRoleAsync('role1')
+    await Roles.createRoleAsync('role2')
+    await Roles.createRoleAsync('COMMON_PERMISSION_1')
+    await Roles.createRoleAsync('COMMON_PERMISSION_2')
+    await Roles.createRoleAsync('COMMON_PERMISSION_3')
+    await Roles.createRoleAsync('EXTRA_PERMISSION_ROLE_1')
+    await Roles.createRoleAsync('EXTRA_PERMISSION_ROLE_2')
+
+    await Roles.addRolesToParentAsync('COMMON_PERMISSION_1', 'role1')
+    await Roles.addRolesToParentAsync('COMMON_PERMISSION_2', 'role1')
+    await Roles.addRolesToParentAsync('COMMON_PERMISSION_3', 'role1')
+    await Roles.addRolesToParentAsync('EXTRA_PERMISSION_ROLE_1', 'role1')
+
+    await Roles.addRolesToParentAsync('COMMON_PERMISSION_1', 'role2')
+    await Roles.addRolesToParentAsync('COMMON_PERMISSION_2', 'role2')
+    await Roles.addRolesToParentAsync('COMMON_PERMISSION_3', 'role2')
+    await Roles.addRolesToParentAsync('EXTRA_PERMISSION_ROLE_2', 'role2')
+
+    await Roles.addUsersToRolesAsync(users.eve, 'role1')
+    await Roles.addUsersToRolesAsync(users.eve, 'role2')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
+    }, {
+      role: { _id: 'role2' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role2' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_2' }
+      ]
+    }])
+
+    await Roles.removeUsersFromRolesAsync(users.eve, 'role2')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
+    }])
+
+    await Roles.addUsersToRolesAsync(users.eve, 'role2')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles3.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
+    }, {
+      role: { _id: 'role2' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role2' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_2' }
+      ]
+    }])
+
+    await Roles.deleteRoleAsync('role2')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+
+    const usersRoles4 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles4.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'role1' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [
+        { _id: 'role1' },
+        { _id: 'COMMON_PERMISSION_1' },
+        { _id: 'COMMON_PERMISSION_2' },
+        { _id: 'COMMON_PERMISSION_3' },
+        { _id: 'EXTRA_PERMISSION_ROLE_1' }
+      ]
+    }])
+  })
+
+  it('set parent on assigned role', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('EDIT_PERMISSION')
+
+    await Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+
+    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'admin')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+  })
+
+  it('remove parent on assigned role', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('EDIT_PERMISSION')
+
+    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'admin')
+
+    await Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+
+    await Roles.removeRolesFromParentAsync('EDIT_PERMISSION', 'admin')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+  })
+
+  it('adding and removing extra role parents', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync('EDIT_PERMISSION')
+
+    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'admin')
+
+    await Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+
+    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'user')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+
+    await Roles.removeRolesFromParentAsync('EDIT_PERMISSION', 'user')
+
+    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
+    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+
+    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    assert.sameDeepMembers(usersRoles3.map(obj => { delete obj._id; return obj }), [{
+      role: { _id: 'EDIT_PERMISSION' },
+      scope: null,
+      user: { _id: users.eve },
+      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
+    }])
+  })
+
+  it('cyclic roles', async function () {
+    await Roles.createRoleAsync('admin')
+    await Roles.createRoleAsync('editor')
+    await Roles.createRoleAsync('user')
+
+    await Roles.addRolesToParentAsync('editor', 'admin')
+    await Roles.addRolesToParentAsync('user', 'editor')
+
+    await assert.isRejected(Roles.addRolesToParentAsync('admin', 'user'), /form a cycle/)
+  })
+
+  describe('userIsInRole', function () {
+    it('userIsInRole returns false for unknown roles', async function () {
+      await Roles.createRoleAsync('admin')
+      await Roles.createRoleAsync('user')
+      await Roles.createRoleAsync('editor')
+      await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
+      await Roles.addUsersToRolesAsync(users.eve, ['editor'])
+
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'unknown'))
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, []))
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, null))
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, undefined))
+
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'unknown', { anyScope: true }))
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, [], { anyScope: true }))
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, null, { anyScope: true }))
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, undefined, { anyScope: true }))
+
+      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
+    })
+
+    it('userIsInRole returns false if user is a function', async function () {
+      await Roles.createRoleAsync('admin')
+      await Roles.addUsersToRolesAsync(users.eve, ['admin'])
+
+      assert.isFalse(await Roles.userIsInRoleAsync(() => {}, 'admin'))
+    })
+  })
+
+  describe('isParentOf', function () {
+    it('returns false for unknown roles', async function () {
+      await Roles.createRoleAsync('admin')
+
+      assert.isFalse(await Roles.isParentOfAsync('admin', 'unknown'))
+      assert.isFalse(await Roles.isParentOfAsync('admin', null))
+      assert.isFalse(await Roles.isParentOfAsync('admin', undefined))
+
+      assert.isFalse(await Roles.isParentOfAsync('unknown', 'admin'))
+      assert.isFalse(await Roles.isParentOfAsync(null, 'admin'))
+      assert.isFalse(await Roles.isParentOfAsync(undefined, 'admin'))
+    })
+
+    it('returns false if role is not parent of', async function () {
+      await Roles.createRoleAsync('admin')
+      await Roles.createRoleAsync('editor')
+      await Roles.createRoleAsync('user')
+      await Roles.addRolesToParentAsync(['editor'], 'admin')
+      await Roles.addRolesToParentAsync(['user'], 'editor')
+
+      assert.isFalse(await Roles.isParentOfAsync('user', 'admin'))
+      assert.isFalse(await Roles.isParentOfAsync('editor', 'admin'))
+    })
+
+    it('returns true if role is parent of the demanded role', async function () {
+      await Roles.createRoleAsync('admin')
+      await Roles.createRoleAsync('editor')
+      await Roles.createRoleAsync('user')
+      await Roles.addRolesToParentAsync(['editor'], 'admin')
+      await Roles.addRolesToParentAsync(['user'], 'editor')
+
+      assert.isTrue(await Roles.isParentOfAsync('admin', 'user'))
+      assert.isTrue(await Roles.isParentOfAsync('editor', 'user'))
+      assert.isTrue(await Roles.isParentOfAsync('admin', 'editor'))
+
+      assert.isTrue(await Roles.isParentOfAsync('admin', 'admin'))
+      assert.isTrue(await Roles.isParentOfAsync('editor', 'editor'))
+      assert.isTrue(await Roles.isParentOfAsync('user', 'user'))
+    })
+  })
 })

From 281f019634a45241b2abb34ae602a1f4088e0e82 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sun, 24 Sep 2023 16:31:56 +0200
Subject: [PATCH 0442/1140] Better categorization for migration tests

---
 roles/tests/server.js | 371 +++++++++++++++++++++---------------------
 1 file changed, 188 insertions(+), 183 deletions(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index b3fb854dac..d49750c3b1 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1418,207 +1418,212 @@ describe('roles', function () {
     assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
   })
 
-  it('migration without global groups (to v2)', function () {
-    assert.isOk(Meteor.roles.insert({ name: 'admin' }))
-    assert.isOk(Meteor.roles.insert({ name: 'editor' }))
-    assert.isOk(Meteor.roles.insert({ name: 'user' }))
+  describe('v2 migration', function () {
+    it('migration without global groups (to v2)', function () {
+      assert.isOk(Meteor.roles.insert({ name: 'admin' }))
+      assert.isOk(Meteor.roles.insert({ name: 'editor' }))
+      assert.isOk(Meteor.roles.insert({ name: 'user' }))
 
-    assert.isOk(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
-    assert.isOk(Meteor.users.update(users.bob, { $set: { roles: [] } }))
-    assert.isOk(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
+      assert.isOk(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
+      assert.isOk(Meteor.users.update(users.bob, { $set: { roles: [] } }))
+      assert.isOk(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
 
-    Roles._forwardMigrate()
+      Roles._forwardMigrate()
 
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
+      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+        roles: [{
+          _id: 'admin',
+          scope: null,
+          assigned: true
+        }, {
+          _id: 'editor',
+          scope: null,
+          assigned: true
+        }]
+      })
+      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+        roles: []
+      })
+      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+        roles: [{
+          _id: 'user',
+          scope: null,
+          assigned: true
+        }]
+      })
+
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
         _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
+        children: []
+      })
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
         _id: 'editor',
-        scope: null,
-        assigned: true
-      }]
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: []
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
+        children: []
+      })
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
         _id: 'user',
-        scope: null,
-        assigned: true
-      }]
+        children: []
+      })
+
+      Roles._backwardMigrate(null, null, false)
+
+      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+        roles: ['admin', 'editor']
+      })
+      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+        roles: []
+      })
+      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+        roles: ['user']
+      })
+
+      assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
+        name: 'admin'
+      })
+      assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
+        name: 'editor'
+      })
+      assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
+        name: 'user'
+      })
     })
 
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-      _id: 'admin',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-      _id: 'editor',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-      _id: 'user',
-      children: []
-    })
+    it('migration with global groups (to v2)', function () {
+      assert.isOk(Meteor.roles.insert({ name: 'admin' }))
+      assert.isOk(Meteor.roles.insert({ name: 'editor' }))
+      assert.isOk(Meteor.roles.insert({ name: 'user' }))
 
-    Roles._backwardMigrate(null, null, false)
+      assert.isOk(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
+      assert.isOk(Meteor.users.update(users.bob, { $set: { roles: { } } }))
+      assert.isOk(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
 
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: ['admin', 'editor']
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: []
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: ['user']
-    })
+      Roles._forwardMigrate(null, null, false)
 
-    assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-      name: 'admin'
-    })
-    assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-      name: 'editor'
-    })
-    assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-      name: 'user'
+      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+        roles: [{
+          _id: 'admin',
+          scope: null,
+          assigned: true
+        }, {
+          _id: 'editor',
+          scope: null,
+          assigned: true
+        }, {
+          _id: 'user',
+          scope: 'foo_bla',
+          assigned: true
+        }]
+      })
+      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+        roles: []
+      })
+      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+        roles: [{
+          _id: 'user',
+          scope: null,
+          assigned: true
+        }, {
+          _id: 'user',
+          scope: 'foo_bla',
+          assigned: true
+        }]
+      })
+
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+        _id: 'admin',
+        children: []
+      })
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+        _id: 'editor',
+        children: []
+      })
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+        _id: 'user',
+        children: []
+      })
+
+      Roles._backwardMigrate(null, null, true)
+
+      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+        roles: {
+          __global_roles__: ['admin', 'editor'],
+          foo_bla: ['user']
+        }
+      })
+      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+        roles: {}
+      })
+      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+        roles: {
+          __global_roles__: ['user'],
+          foo_bla: ['user']
+        }
+      })
+
+      assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
+        name: 'admin'
+      })
+      assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
+        name: 'editor'
+      })
+      assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
+        name: 'user'
+      })
+
+      Roles._forwardMigrate(null, null, true)
+
+      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
+        roles: [{
+          _id: 'admin',
+          scope: null,
+          assigned: true
+        }, {
+          _id: 'editor',
+          scope: null,
+          assigned: true
+        }, {
+          _id: 'user',
+          scope: 'foo.bla',
+          assigned: true
+        }]
+      })
+      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
+        roles: []
+      })
+      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
+        roles: [{
+          _id: 'user',
+          scope: null,
+          assigned: true
+        }, {
+          _id: 'user',
+          scope: 'foo.bla',
+          assigned: true
+        }]
+      })
+
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
+        _id: 'admin',
+        children: []
+      })
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
+        _id: 'editor',
+        children: []
+      })
+      assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
+        _id: 'user',
+        children: []
+      })
     })
   })
 
-  it('migration without global groups (to v3)')
 
-  it('migration with global groups (to v2)', function () {
-    assert.isOk(Meteor.roles.insert({ name: 'admin' }))
-    assert.isOk(Meteor.roles.insert({ name: 'editor' }))
-    assert.isOk(Meteor.roles.insert({ name: 'user' }))
+  describe('v3 migration', function () {
+    it('migration without global groups (to v3)')
 
-    assert.isOk(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
-    assert.isOk(Meteor.users.update(users.bob, { $set: { roles: { } } }))
-    assert.isOk(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
-
-    Roles._forwardMigrate(null, null, false)
-
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'editor',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'foo_bla',
-        assigned: true
-      }]
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: []
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'foo_bla',
-        assigned: true
-      }]
-    })
-
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-      _id: 'admin',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-      _id: 'editor',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-      _id: 'user',
-      children: []
-    })
-
-    Roles._backwardMigrate(null, null, true)
-
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: {
-        __global_roles__: ['admin', 'editor'],
-        foo_bla: ['user']
-      }
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: {}
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: {
-        __global_roles__: ['user'],
-        foo_bla: ['user']
-      }
-    })
-
-    assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-      name: 'admin'
-    })
-    assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-      name: 'editor'
-    })
-    assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-      name: 'user'
-    })
-
-    Roles._forwardMigrate(null, null, true)
-
-    assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'admin',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'editor',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'foo.bla',
-        assigned: true
-      }]
-    })
-    assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-      roles: []
-    })
-    assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-      roles: [{
-        _id: 'user',
-        scope: null,
-        assigned: true
-      }, {
-        _id: 'user',
-        scope: 'foo.bla',
-        assigned: true
-      }]
-    })
-
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-      _id: 'admin',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-      _id: 'editor',
-      children: []
-    })
-    assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-      _id: 'user',
-      children: []
-    })
+    it('migration with global groups (to v3)')
   })
 
-  it('migration with global groups (to v3)')
-
   it('_addUserToRole', function () {
     Roles.createRole('admin')
 

From 9a213287271edf2bb18680cd7bcea144c6d3c47e Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Sun, 24 Sep 2023 18:23:40 +0200
Subject: [PATCH 0443/1140] fixing tests

---
 roles/roles_common_async.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 93d7bec859..0e97f799f4 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -692,7 +692,7 @@ Object.assign(Roles, {
     const inheritedRoles = new Set()
     const nestedRoles = new Set([role])
 
-    for (const r in nestedRoles) {
+    for (const r of nestedRoles) {
       const roles = await Meteor.roles
         .find(
           { _id: { $in: r.children.map((r) => r._id) } },

From fb2ecb19a8c2f8677ed64db91d3e75581d0eff17 Mon Sep 17 00:00:00 2001
From: bratelefant <59534030+bratelefant@users.noreply.github.com>
Date: Sun, 24 Sep 2023 18:27:12 +0200
Subject: [PATCH 0444/1140] lint fix

---
 roles/tests/server.js      | 1 -
 roles/tests/serverAsync.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/roles/tests/server.js b/roles/tests/server.js
index d49750c3b1..5ed65b56a4 100644
--- a/roles/tests/server.js
+++ b/roles/tests/server.js
@@ -1617,7 +1617,6 @@ describe('roles', function () {
     })
   })
 
-
   describe('v3 migration', function () {
     it('migration without global groups (to v3)')
 
diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index 9fc3a6ab63..8d118aef84 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -1507,7 +1507,7 @@ describe('roles async', async function () {
 
     assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
 
-    const rolesForUser =  await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
+    const rolesForUser = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
     assert.sameDeepMembers(rolesForUser.map(obj => { delete obj._id; return obj }), [{
       role: { _id: 'user' },
       scope: null,

From c890d44f946e0142c255f67294533b250bd51dd7 Mon Sep 17 00:00:00 2001
From: Timo Frionnet <tfrionnet@gmail.com>
Date: Sun, 24 Sep 2023 21:19:14 +0200
Subject: [PATCH 0445/1140] Updated readme, contributing, security and issue
 templates

---
 .github/CONTRIBUTING.MD                   | 104 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/bug_report.md      |  37 ++++++++
 .github/ISSUE_TEMPLATE/feature_request.md |  24 +++++
 .github/SECURITY.MD                       |  26 ++++++
 README.md                                 |  52 ++++++-----
 5 files changed, 221 insertions(+), 22 deletions(-)
 create mode 100644 .github/CONTRIBUTING.MD
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/SECURITY.MD

diff --git a/.github/CONTRIBUTING.MD b/.github/CONTRIBUTING.MD
new file mode 100644
index 0000000000..de40874feb
--- /dev/null
+++ b/.github/CONTRIBUTING.MD
@@ -0,0 +1,104 @@
+# Contributing to Meteor Roles
+
+Any contribution to this repository is highly appreciated!
+
+## Setup development env
+
+### Clone project and create a new branch to work on
+
+First, clone this repository and create a new branch to work on.
+Branch names should start with a descriptive suffix of their intended outcome, for example:
+
+- `feature-` for features
+- `tests-` for contributions that improve testing
+- `fix-` for general fixes
+- `build-` for contributions that update the build process
+- `ci-` for contributions that improve/update the ci
+
+```shell
+$ git clone git@github.com:Meteor-Community-Packages/meteor-roles.git
+$ cd meteor-roles
+$ git checkout -b fix-some-issue
+```
+
+### Initialize test app
+
+We use a proxy Meteor application to run our tests and handle coverage etc.
+This app contains several npm scripts to provide the complete toolchain that is required
+for your development and testing needs.
+
+The setup is very easy. Go into the `testapp` directory, install dependencies and link
+the package:
+
+```shell
+$ cd testapp
+$ meteor npm install
+$ meteor npm run setup # this is important for the tools to work!
+```
+
+## Development toolchain
+
+The `testapp` comes with some builtin scripts you can utilize during your development.
+They will also be picked up by our CI during pull requests.
+Therefore, it's a good call for you, that if they pass or fail, the CI will do so, too.
+
+**Note: all tools require the npm `setup` script has been executed at least once!**
+
+### Linter
+
+We use `standard` as our linter. You can run either the linter or use it's autofix feature for
+the most common issues:
+
+```shell
+# in testapp
+$ meteor npm run lint # show only outputs
+$ meteor npm run lint:fix # with fixes + outputs
+```
+
+### Tests
+
+We provide three forms of tests: once, watch, coverage
+
+#### Once
+
+Simply runs the test suite once, without coverage collection:
+
+```shell
+$ meteor npm run test
+```
+
+#### Watch
+
+Runs the test suite in watch mode, good to use during active development, where your changes
+are picked up automatically to re-run the tests:
+
+```shell
+$ meteor npm run test:watch
+```
+
+#### Coverage
+
+Runs the test suite once, including coverage report generation.
+Generates an html and json report output.
+
+```shell
+$ meteor npm run test:coverage
+$ meteor npm run report # summary output in console
+```
+
+If you want to watch the HTML output to find (un)covered lines, open
+the file at `testapp/.coverage/index.html` in your browser.
+
+## Open a pull request
+
+If you open a pull request, please make sure the following requirements are met:
+
+- the `lint` script is passing
+- the `test` script is passing
+- your contribution is on point and solves one issue (not multiple)
+- your commit messages are descriptive and informative
+- complex changes are documented in the code with comments or jsDoc-compatible documentation
+
+Please understand, that there will be a review process and your contribution
+might require changes before being merged. This is entirely to ensure quality and is
+never used as a personal offense.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..ad1babd0f6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+<!-- Read a guide on [opening issues](https://opensource.guide/how-to-contribute/#opening-an-issue) -->
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+
+If applicable, add screenshots to help explain your problem.
+
+**Versions (please complete the following information):**
+ - Meteor version: [e.g. 1.8.2]
+ - Browser: [e.g. Firefox, Chrome, Safari]
+ - Version: [e.g. 1.0.0]
+
+**Additional context**
+
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..a294cc207e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+<!-- Read a guide on [opening issues](https://opensource.guide/how-to-contribute/#opening-an-issue) -->
+**Is your feature request related to a problem? Please describe.**
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+
+Add any other context or screenshots about the feature request here.
diff --git a/.github/SECURITY.MD b/.github/SECURITY.MD
new file mode 100644
index 0000000000..a1d376063a
--- /dev/null
+++ b/.github/SECURITY.MD
@@ -0,0 +1,26 @@
+# Security Policy
+
+## Supported Versions
+
+Unless otherwise noted, MCP packages and projects support the latest version of Meteor.
+As of the time of writing this in September 2023 it is Meteor 2.13 and, in general the 2.x series.
+Support for Meteor 1.x is not guaranteed and at best can include Meteor 1.12.1.
+At the present time, we are also preparing to support Meteor 3.0 which is in development.
+
+| Meteor Version | Supported          |
+| -------------- | ------------------ |
+| 3.0            | 🚧                 |
+| > 2.0          | ✅                 |
+| < 1.12         | ❌                 |
+
+## Reporting a Vulnerability
+
+We are not providing support for Meteor itself. See their [SECURITY](https://github.com/meteor/meteor/blob/devel/SECURITY.md) for more information.
+
+Any security concerns should be first raised in the repository of the affected package.
+If you want to report a vulnerability privately, please contact the maintainer of the package directly.
+If you are not sure who that is, you can contact one of the following people, and they will take it from there:
+
+Jan Dvorak
+hello+mcp-security@jandvorak.me
+
diff --git a/README.md b/README.md
index 97424b9d10..87593ef21f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
 meteor-roles v3
 ===============
+[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
+![GitHub](https://img.shields.io/github/license/Meteor-Community-Packages/meteor-roles)
+[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/Meteor-Community-Packages/meteor-roles?label=latest&sort=semver)
+[![](https://img.shields.io/badge/semver-2.0.0-success)](http://semver.org/spec/v2.0.0.html) 
 
 Authorization package for Meteor - compatible with built-in accounts package.
 
@@ -11,17 +16,20 @@ There are also older versions of this package:
 
 <a id="roles-toc" name="roles-toc"></a>
 ### Table of Contents
-* [Contributors](#roles-contributors)
-* [Authorization](#roles-authorization)
-* [Permissions vs roles](#roles-naming)
-* [What are "scopes"?](#roles-scopes)
-* [Changes to default Meteor](#roles-changes)
-* [Installation](#roles-installing)
-* [Migration to 3.0](#roles-migration)
-* [Usage examples](#roles-usage)
-* [Online API docs](#roles-docs)
-* [Example apps](#roles-example-apps)
-* [Running tests](#roles-contributions-development-and-tests)
+- [meteor-roles v3](#meteor-roles-v3)
+    - [Table of Contents](#table-of-contents)
+    - [Contributors](#contributors)
+    - [Authorization](#authorization)
+    - [Permissions vs roles  (or What's in a name...)](#permissions-vs-roles--or-whats-in-a-name)
+    - [What are "scopes"?](#what-are-scopes)
+    - [Changes to default Meteor behavior](#changes-to-default-meteor-behavior)
+    - [Installing](#installing)
+    - [Migration to 3.0](#migration-to-30)
+      - [Changes between 2.x and 3.0](#changes-between-2x-and-30)
+    - [Usage Examples](#usage-examples)
+    - [API Docs](#api-docs)
+    - [Example Apps](#example-apps)
+    - [Contributions, development and tests](#contributions-development-and-tests)
 
 <br />
 
@@ -53,7 +61,7 @@ Thanks to:
 <a id="roles-authorization" name="roles-authorization"></a>
 ### Authorization
 
-This package lets you attach roles to a user which you can then check against later when deciding whether to grant
+This package lets you attach roles to a user, which you can then check against later when deciding whether to grant
 access to Meteor methods or publish data. The core concept is very simple, essentially you are creating an assignment
 of roles to a user and then checking for the existence of those roles later. This package provides helper methods
 to make the process of adding, removing, and verifying those roles easier.
@@ -99,13 +107,13 @@ Roles.addRolesToParent('POST_EDIT', 'user');
 ### What are "scopes"?
 
 Sometimes it is useful to let a user have independent sets of roles. The `roles` package calls these independent
-sets "scopes" for lack of a better term. You can use them to represent various communities inside of your
+sets "scopes" for lack of a better term. You can use them to represent various communities inside your
 application. Or maybe your application supports [multiple tenants](https://en.wikipedia.org/wiki/Multitenancy).
 You can put each of those tenants into their own scope. Alternatively, you can use scopes to represent
 various resources you have.
 
 Users can have both scope roles assigned, and global roles. Global roles are in effect for all scopes.
-But scopes are independent from each other. Users can have one set of roles in scope A and another set
+But scopes are independent of each other. Users can have one set of roles in scope A and another set
 of roles in scope B. Let's go through an example of this using soccer/football teams as scopes.
 
 ```javascript
@@ -116,7 +124,7 @@ Roles.userIsInRole(joesUserId, 'manage-team', 'manchester-united.com'); // true
 Roles.userIsInRole(joesUserId, 'manage-team', 'real-madrid.com'); // false
 ```
 
-In this example we can see that Joe manages Manchester United and plays for Real Madrid. By using scopes, we can
+In this example, we can see that Joe manages Manchester United and plays for Real Madrid. By using scopes, we can
 assign roles independently and make sure that they don't get mixed up between scopes.
 
 Now, let's take a look at how to use the global roles. Say we want to give Joe permission to do something across
@@ -136,7 +144,7 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <a id="roles-changes" name="roles-changes"></a>
 ### Changes to default Meteor behavior
 
-  1. A new collection `Meteor.roleAssignment` contains the information which role has been assigned to which user.
+  1. A new collection `Meteor.roleAssignment` contains the information about which role has been assigned to which user.
   1. A new collection `Meteor.roles` contains a global list of defined role names.
   1. All existing roles are automatically published to the client.
 
@@ -185,7 +193,7 @@ meteor shell
 > Package['alanning:roles'].Roles._forwardMigrate2()
 ```
 
-In case something fails, there is also a script available for rolling back the changes. But be warned that a backward migration takes a magnitude longer than a foward migration. To migrate the database back to the old schema, run `Meteor._backwardMigrate2()` on the server:
+In case something fails, there is also a script available for rolling back the changes. But be warned that a backward migration takes a magnitude longer than a forward migration. To migrate the database back to the old schema, run `Meteor._backwardMigrate2()` on the server:
 
 ```bash
 meteor shell
@@ -197,7 +205,7 @@ meteor shell
 Here is the list of important changes between meteor-roles 2.x and 3.0 to consider when migrating to 3.0:
 
 * Role assignments have been moved from the `users` documents to a separate collection called `role-assignment`, available at `Meteor.roleAssignment`.
-* Role assignments are not published automatically. If you want all your role-assignments to be published automatically please include the following code:
+* Role assignments are not published automatically. If you want all your role-assignments to be published automatically, please include the following code:
 ```js
 Meteor.publish(null, function () {
   if (this.userId) {
@@ -378,7 +386,7 @@ Meteor.methods({
 
 -- **Client** --
 
-Client javascript does not by default have access to all the same Roles functions as the server unless you publish
+Client JavaScript does not by default have access to all the same Roles functions as the server unless you publish
 these role-assignments. In addition, Blaze will have the addition of a `isInRole` handlebars helper which is
 automatically registered by the Roles package.
 
@@ -388,10 +396,10 @@ for latency compensation during Meteor method calls. Roles functions which modif
 called directly, but inside the Meteor methods.
 
 NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends
-all templates, client-side javascript, and published data to the client's browser. This is by design and is a good thing.
+all templates, client-side JavaScript, and published data to the client's browser. This is by design and is a good thing.
 The following example is just sugar to help improve the user experience for normal users. Those interested in seeing
 the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js`
-file. It won't be pretty but it is possible. But this is not a problem as long as the actual data is restricted server-side.
+file. It won't be pretty, but it is possible. But this is not a problem as long as the actual data is restricted server-side.
 
 To check for global roles or when not using scopes:
 
@@ -470,4 +478,4 @@ The `examples` directory contains Meteor apps which show off the following featu
 ### Contributions, development and tests
 
 Please read our [contribution guidelines](./CONTRIBUTING.md),
-which also describe how to set up and run the linter and tests.
+which also describes how to set up and run the linter and tests.

From 206d4576522856c637393a0b4c74c3ea6d717544 Mon Sep 17 00:00:00 2001
From: Timo Frionnet <tfrionnet@gmail.com>
Date: Sun, 24 Sep 2023 21:29:00 +0200
Subject: [PATCH 0446/1140] Updated headers in readme

---
 README.md | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 87593ef21f..222ade9e14 100644
--- a/README.md
+++ b/README.md
@@ -15,27 +15,27 @@ There are also older versions of this package:
 <br />
 
 <a id="roles-toc" name="roles-toc"></a>
-### Table of Contents
+## Table of Contents
 - [meteor-roles v3](#meteor-roles-v3)
-    - [Table of Contents](#table-of-contents)
-    - [Contributors](#contributors)
-    - [Authorization](#authorization)
-    - [Permissions vs roles  (or What's in a name...)](#permissions-vs-roles--or-whats-in-a-name)
-    - [What are "scopes"?](#what-are-scopes)
-    - [Changes to default Meteor behavior](#changes-to-default-meteor-behavior)
-    - [Installing](#installing)
-    - [Migration to 3.0](#migration-to-30)
-      - [Changes between 2.x and 3.0](#changes-between-2x-and-30)
-    - [Usage Examples](#usage-examples)
-    - [API Docs](#api-docs)
-    - [Example Apps](#example-apps)
-    - [Contributions, development and tests](#contributions-development-and-tests)
+  - [Table of Contents](#table-of-contents)
+  - [Contributors](#contributors)
+  - [Authorization](#authorization)
+  - [Permissions vs roles  (or What's in a name...)](#permissions-vs-roles--or-whats-in-a-name)
+  - [What are "scopes"?](#what-are-scopes)
+  - [Changes to default Meteor behavior](#changes-to-default-meteor-behavior)
+  - [Installing](#installing)
+  - [Migration to 3.0](#migration-to-30)
+    - [Changes between 2.x and 3.0](#changes-between-2x-and-30)
+  - [Usage Examples](#usage-examples)
+  - [API Docs](#api-docs)
+  - [Example Apps](#example-apps)
+  - [Contributions, development and tests](#contributions-development-and-tests)
 
 <br />
 
 
 <a id="roles-contributors" name="roles-contributors"></a>
-### Contributors
+## Contributors
 
 Thanks to:
 
@@ -59,7 +59,7 @@ Thanks to:
 
 
 <a id="roles-authorization" name="roles-authorization"></a>
-### Authorization
+## Authorization
 
 This package lets you attach roles to a user, which you can then check against later when deciding whether to grant
 access to Meteor methods or publish data. The core concept is very simple, essentially you are creating an assignment
@@ -69,7 +69,7 @@ to make the process of adding, removing, and verifying those roles easier.
 <br />
 
 <a id="roles-naming" name="roles-naming"></a>
-### Permissions vs roles  (or What's in a name...)
+## Permissions vs roles  (or What's in a name...)
 
 Although the name of this package is `roles`, you can define your **roles**, **scopes** or **permissions** however you like.
 They are essentially just tags that you assign to a user and which you can check upon later.
@@ -104,7 +104,7 @@ Roles.addRolesToParent('POST_EDIT', 'user');
 <br />
 
 <a id="roles-scopes" name="roles-scopes"></a>
-### What are "scopes"?
+## What are "scopes"?
 
 Sometimes it is useful to let a user have independent sets of roles. The `roles` package calls these independent
 sets "scopes" for lack of a better term. You can use them to represent various communities inside your
@@ -142,7 +142,7 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <br />
 
 <a id="roles-changes" name="roles-changes"></a>
-### Changes to default Meteor behavior
+## Changes to default Meteor behavior
 
   1. A new collection `Meteor.roleAssignment` contains the information about which role has been assigned to which user.
   1. A new collection `Meteor.roles` contains a global list of defined role names.
@@ -151,7 +151,7 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <br />
 
 <a id="roles-installing" name="roles-installing"></a>
-### Installing
+## Installing
 
 1. Add one of the built-in accounts packages so the `Meteor.users` collection exists. From a command prompt:
     ```bash
@@ -182,7 +182,7 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <br />
 
 <a id="roles-migration" name="roles-migration"></a>
-### Migration to 3.0
+## Migration to 3.0
 
 If you are currently using this package in a version older than 2.x, please upgrade to 2.0 by running the migration script required there: https://github.com/Meteor-Community-Packages/meteor-roles/tree/v2#migration-to-20
 
@@ -200,7 +200,7 @@ meteor shell
 > Package['alanning:roles'].Roles._backwardMigrate2()
 ```
 
-#### Changes between 2.x and 3.0
+### Changes between 2.x and 3.0
 
 Here is the list of important changes between meteor-roles 2.x and 3.0 to consider when migrating to 3.0:
 
@@ -225,7 +225,7 @@ Meteor.publish(null, function () {
 
 
 <a id="roles-usage" name="roles-usage"></a>
-### Usage Examples
+## Usage Examples
 
 <br />
 
@@ -434,7 +434,7 @@ To check for roles when using scopes:
 
 
 <a id="roles-docs" name="roles-docs"></a>
-### API Docs
+## API Docs
 
 Online API docs found here: https://meteor-community-packages.github.io/meteor-roles/
 
@@ -456,7 +456,7 @@ To serve documentation locally:
 
 
 <a id="roles-example-apps" name="roles-example-apps"></a>
-### Example Apps
+## Example Apps
 
 The `examples` directory contains Meteor apps which show off the following features:
 * Server-side publishing with authorization to secure sensitive data
@@ -475,7 +475,7 @@ The `examples` directory contains Meteor apps which show off the following featu
 
 
 <a id="roles-testing" name="roles-testing"></a>
-### Contributions, development and tests
+## Contributions, development and tests
 
 Please read our [contribution guidelines](./CONTRIBUTING.md),
 which also describes how to set up and run the linter and tests.

From 7be1e7c1cd14f73b90e017db6b0ac5dd5497b4c8 Mon Sep 17 00:00:00 2001
From: Timo Frionnet <tfrionnet@gmail.com>
Date: Mon, 25 Sep 2023 23:35:15 +0200
Subject: [PATCH 0447/1140] Added github code quality badge to readme

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 222ade9e14..05247ecf0b 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@ meteor-roles v3
 [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
 ![GitHub](https://img.shields.io/github/license/Meteor-Community-Packages/meteor-roles)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+[![CodeQL](https://github.com/Meteor-Community-Packages/meteor-roles/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/Meteor-Community-Packages/meteor-roles/actions/workflows/github-code-scanning/codeql)
 ![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/Meteor-Community-Packages/meteor-roles?label=latest&sort=semver)
 [![](https://img.shields.io/badge/semver-2.0.0-success)](http://semver.org/spec/v2.0.0.html) 
 

From c2845979037a5e13358b4e837866fc473c9d5c94 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 26 Sep 2023 14:59:23 +0200
Subject: [PATCH 0448/1140] Adjust GitFlow branch names

---
 CONTRIBUTING.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index de40874feb..9db04a005b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,13 +7,12 @@ Any contribution to this repository is highly appreciated!
 ### Clone project and create a new branch to work on
 
 First, clone this repository and create a new branch to work on.
-Branch names should start with a descriptive suffix of their intended outcome, for example:
+Branch names should follow the GitFlow standard and start with a descriptive prefix of their intended outcome, for example:
 
-- `feature-` for features
-- `tests-` for contributions that improve testing
-- `fix-` for general fixes
-- `build-` for contributions that update the build process
-- `ci-` for contributions that improve/update the ci
+- `feature/` for features
+- `fix/` for general fixes
+
+Then the name of the branch should describe the purpose of the branch and potentially reference the issue number it is solving.
 
 ```shell
 $ git clone git@github.com:Meteor-Community-Packages/meteor-roles.git

From c80f55b7c60550fd1f3cd3b0c6e1b4ef097db2c9 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 26 Sep 2023 15:01:51 +0200
Subject: [PATCH 0449/1140] Adjust things in .github directory

---
 .github/{CONTRIBUTING.MD => CONTRIBUTING.md} | 11 +++++------
 .github/{SECURITY.MD => SECURITY.md}         |  0
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename .github/{CONTRIBUTING.MD => CONTRIBUTING.md} (89%)
 rename .github/{SECURITY.MD => SECURITY.md} (100%)

diff --git a/.github/CONTRIBUTING.MD b/.github/CONTRIBUTING.md
similarity index 89%
rename from .github/CONTRIBUTING.MD
rename to .github/CONTRIBUTING.md
index de40874feb..9db04a005b 100644
--- a/.github/CONTRIBUTING.MD
+++ b/.github/CONTRIBUTING.md
@@ -7,13 +7,12 @@ Any contribution to this repository is highly appreciated!
 ### Clone project and create a new branch to work on
 
 First, clone this repository and create a new branch to work on.
-Branch names should start with a descriptive suffix of their intended outcome, for example:
+Branch names should follow the GitFlow standard and start with a descriptive prefix of their intended outcome, for example:
 
-- `feature-` for features
-- `tests-` for contributions that improve testing
-- `fix-` for general fixes
-- `build-` for contributions that update the build process
-- `ci-` for contributions that improve/update the ci
+- `feature/` for features
+- `fix/` for general fixes
+
+Then the name of the branch should describe the purpose of the branch and potentially reference the issue number it is solving.
 
 ```shell
 $ git clone git@github.com:Meteor-Community-Packages/meteor-roles.git
diff --git a/.github/SECURITY.MD b/.github/SECURITY.md
similarity index 100%
rename from .github/SECURITY.MD
rename to .github/SECURITY.md

From 335636af1ab48f72ace8884e3a26ed17dd730889 Mon Sep 17 00:00:00 2001
From: Timo Frionnet <tfrionnet@gmail.com>
Date: Wed, 27 Sep 2023 11:35:31 +0200
Subject: [PATCH 0450/1140] Fixed inconsistent branch naming in contributing
 docs

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9db04a005b..153f301b10 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -17,7 +17,7 @@ Then the name of the branch should describe the purpose of the branch and potent
 ```shell
 $ git clone git@github.com:Meteor-Community-Packages/meteor-roles.git
 $ cd meteor-roles
-$ git checkout -b fix-some-issue
+$ git checkout -b fix/some-issue
 ```
 
 ### Initialize test app

From e1a9d8b87f134a0ba53f013d2b5a0716c3c92d3a Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 14 Oct 2023 11:01:51 +0200
Subject: [PATCH 0451/1140] Update testapp dependencies

---
 testapp/.meteor/packages  |  2 +-
 testapp/.meteor/release   |  2 +-
 testapp/.meteor/versions  |  4 +--
 testapp/package-lock.json | 55 +++++++++++++++++++++------------------
 testapp/package.json      |  8 +++---
 5 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/testapp/.meteor/packages b/testapp/.meteor/packages
index 63f32aa28d..45d8f3960a 100644
--- a/testapp/.meteor/packages
+++ b/testapp/.meteor/packages
@@ -4,7 +4,7 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor@1.11.2                  # Shared foundation for all Meteor packages
+meteor@1.11.3                  # Shared foundation for all Meteor packages
 static-html@1.3.2             # Define static page content in .html files
 standard-minifier-css@1.9.2   # CSS minifier run for production mode
 standard-minifier-js@2.8.1    # JS minifier run for production mode
diff --git a/testapp/.meteor/release b/testapp/.meteor/release
index e8cfc7ec4c..6641d0478a 100644
--- a/testapp/.meteor/release
+++ b/testapp/.meteor/release
@@ -1 +1 @@
-METEOR@2.12
+METEOR@2.13.3
diff --git a/testapp/.meteor/versions b/testapp/.meteor/versions
index 24b5002129..fa9f2a80c5 100644
--- a/testapp/.meteor/versions
+++ b/testapp/.meteor/versions
@@ -11,7 +11,7 @@ check@1.3.2
 ddp@1.4.1
 ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-server@2.6.1
+ddp-server@2.6.2
 diff-sequence@1.1.2
 dynamic-import@0.7.3
 ecmascript@0.16.7
@@ -29,7 +29,7 @@ http@1.0.10
 id-map@1.1.1
 inter-process-messaging@0.1.1
 logging@1.3.2
-meteor@1.11.2
+meteor@1.11.3
 meteortesting:browser-tests@1.4.2
 meteortesting:mocha@2.1.0
 meteortesting:mocha-core@8.0.1
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 4d42b56eef..839665edc9 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -200,11 +200,11 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
+      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
       "requires": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       }
     },
     "@babel/template": {
@@ -969,18 +969,18 @@
       "dev": true
     },
     "chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
+      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
       "dev": true,
       "requires": {
         "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
         "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "type-detect": "^4.0.8"
       }
     },
     "chalk": {
@@ -995,10 +995,13 @@
       }
     },
     "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.2"
+      }
     },
     "chownr": {
       "version": "1.1.4",
@@ -2231,9 +2234,9 @@
       "dev": true
     },
     "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true
     },
     "get-intrinsic": {
@@ -2978,12 +2981,12 @@
       }
     },
     "loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
       "dev": true,
       "requires": {
-        "get-func-name": "^2.0.0"
+        "get-func-name": "^2.0.1"
       }
     },
     "lru-cache": {
@@ -4408,9 +4411,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
     },
     "regexp.prototype.flags": {
       "version": "1.5.0",
diff --git a/testapp/package.json b/testapp/package.json
index f894d6e5ad..0d2cc3c295 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -11,15 +11,15 @@
     "lint:fix": "standard --fix ../"
   },
   "dependencies": {
-    "@babel/runtime": "^7.17.9",
-    "meteor-node-stubs": "^1.2.1",
+    "@babel/runtime": "^7.23.2",
+    "meteor-node-stubs": "^1.2.5",
     "yuidocjs": "^0.10.2"
   },
   "devDependencies": {
     "babel-plugin-istanbul": "^6.1.1",
-    "chai": "^4.3.7",
+    "chai": "^4.3.10",
     "nyc": "^15.1.0",
-    "puppeteer": "^19.4.0",
+    "puppeteer": "^19.11.1",
     "standard": "^17.1.0"
   },
   "babel": {

From e9506878e8f1fbdca0461a5f6c65c70c33741c1f Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 14 Oct 2023 11:14:08 +0200
Subject: [PATCH 0452/1140] Try client side test async

---
 .github/workflows/testsuite.yml | 2 +-
 package.js                      | 2 +-
 roles/roles_common_async.js     | 2 +-
 roles/tests/clientAsync.js      | 5 ++++-
 testapp/package-lock.json       | 6 +++---
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index aa1ff189dc..ffce9b1b93 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         meteorRelease:
           - '2.8.0'
-          - '2.13'
+          - '2.13.3'
           # Latest version
     steps:
       - name: Checkout code
diff --git a/package.js b/package.js
index f362cf22f3..eef959fdba 100644
--- a/package.js
+++ b/package.js
@@ -44,7 +44,7 @@ Package.onTest(function (api) {
     'meteortesting:mocha@2.1.0'
   ])
 
-  api.versionsFrom('2.3')
+  api.versionsFrom(['2.3', '2.8.1'])
 
   const both = ['client', 'server']
 
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 0e97f799f4..7d3369ca5c 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -313,7 +313,7 @@ Object.assign(Roles, {
     )
 
     // if there was no change, parent role might not exist, or role is
-    // already a subrole; in any case we do not have anything more to do
+    // already a sub-role; in any case we do not have anything more to do
     if (!count) return
 
     await Meteor.roleAssignment.updateAsync(
diff --git a/roles/tests/clientAsync.js b/roles/tests/clientAsync.js
index c931896c4a..0f606b78b4 100644
--- a/roles/tests/clientAsync.js
+++ b/roles/tests/clientAsync.js
@@ -2,7 +2,10 @@
 /* global Roles */
 
 import { Meteor } from 'meteor/meteor'
-import { assert } from 'chai'
+import chai, { assert } from 'chai'
+import chaiAsPromised from 'chai-as-promised'
+
+chai.use(chaiAsPromised)
 
 // To ensure that the files are loaded for coverage
 import '../roles_common'
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 0d1ed7dde9..ca5c8cc28e 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -200,9 +200,9 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz",
-      "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
+      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
       "requires": {
         "regenerator-runtime": "^0.14.0"
       }

From 249eb0b6852ff8f8837d52b0674c49bfb1ee6c68 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 14 Oct 2023 12:26:26 +0200
Subject: [PATCH 0453/1140] Fix lint issues

---
 roles/tests/clientAsync.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/tests/clientAsync.js b/roles/tests/clientAsync.js
index 0f606b78b4..ce1575e47f 100644
--- a/roles/tests/clientAsync.js
+++ b/roles/tests/clientAsync.js
@@ -5,11 +5,11 @@ import { Meteor } from 'meteor/meteor'
 import chai, { assert } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 
-chai.use(chaiAsPromised)
-
 // To ensure that the files are loaded for coverage
 import '../roles_common'
 
+chai.use(chaiAsPromised)
+
 const safeInsert = async (collection, data) => {
   try {
     await collection.insertAsync(data)

From f77cc8a1a203dce8aa8ad617e5bb94340c04a25b Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 16 Oct 2023 17:34:00 +0200
Subject: [PATCH 0454/1140] Update TS definitions

---
 definitions.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/definitions.d.ts b/definitions.d.ts
index bc7b8b10a9..56da7377a8 100644
--- a/definitions.d.ts
+++ b/definitions.d.ts
@@ -357,6 +357,7 @@ declare namespace Roles {
   interface Role {
     _id: string
     name: string
+    children: { _id: string }[]
   }
 
   interface RoleAssignment {
@@ -387,4 +388,5 @@ declare namespace Roles {
 
 declare namespace Meteor {
   var roles: Mongo.Collection<Roles.Role>
+  var roleAssignment: Mongo.Collection<Roles.RoleAssignment>
 }

From 6662f73fac9f0ac302384624bf80ccdcc82a66c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Oct 2023 15:24:15 +0000
Subject: [PATCH 0455/1140] build(deps-dev): bump @babel/traverse from 7.22.8
 to 7.23.2 in /testapp

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.8 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 testapp/package-lock.json | 113 +++++++++++++++++++++++++++++++-------
 1 file changed, 94 insertions(+), 19 deletions(-)

diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index ca5c8cc28e..d996f6f621 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -88,16 +88,6 @@
       "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "dev": true
     },
-    "@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
-      }
-    },
     "@babel/helper-hoist-variables": {
       "version": "7.22.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
@@ -219,21 +209,106 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
-      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/types": "^7.22.5",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.22.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+          "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.22.13",
+            "chalk": "^2.4.2"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.23.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+          "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.23.0",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "@jridgewell/trace-mapping": "^0.3.17",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-environment-visitor": {
+          "version": "7.22.20",
+          "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+          "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+          "dev": true
+        },
+        "@babel/helper-function-name": {
+          "version": "7.23.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+          "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.22.15",
+            "@babel/types": "^7.23.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.22.20",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+          "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.22.20",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+          "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.22.20",
+            "chalk": "^2.4.2",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.23.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+          "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.22.15",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+          "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.22.13",
+            "@babel/parser": "^7.22.15",
+            "@babel/types": "^7.22.15"
+          }
+        },
+        "@babel/types": {
+          "version": "7.23.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+          "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-string-parser": "^7.22.5",
+            "@babel/helper-validator-identifier": "^7.22.20",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/types": {

From c7d7a96a04028b6530926260811d76a6f5da3a01 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 17 Oct 2023 17:31:21 +0200
Subject: [PATCH 0456/1140] Published alanning:roles@3.6.0

---
 .versions         | 22 +++++++++++-----------
 History.md        |  6 ++++++
 package-lock.json |  3 +++
 package.js        |  2 +-
 4 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 package-lock.json

diff --git a/.versions b/.versions
index 06d249bb32..2d09a9df99 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@2.2.8
-alanning:roles@3.5.1
+alanning:roles@3.6.0
 allow-deny@1.1.1
 babel-compiler@7.10.4
 babel-runtime@1.5.1
@@ -12,7 +12,7 @@ ddp@1.4.1
 ddp-client@2.6.1
 ddp-common@1.4.0
 ddp-rate-limiter@1.2.0
-ddp-server@2.6.1
+ddp-server@2.6.2
 diff-sequence@1.1.2
 dynamic-import@0.7.3
 ecmascript@0.16.7
@@ -22,28 +22,28 @@ ecmascript-runtime-server@0.11.0
 ejson@1.1.3
 fetch@0.1.3
 geojson-utils@1.0.11
-http@1.4.2
+http@2.0.0
 id-map@1.1.1
 inter-process-messaging@0.1.1
-lmieulet:meteor-coverage@3.2.0
-lmieulet:meteor-packages-coverage@0.2.0
-local-test:alanning:roles@3.5.1
+lmieulet:meteor-coverage@4.1.0
+lmieulet:meteor-legacy-coverage@0.1.0
+local-test:alanning:roles@3.6.0
 localstorage@1.2.0
 logging@1.3.2
-meteor@1.11.2
-meteortesting:browser-tests@0.1.2
-meteortesting:mocha@0.4.4
+meteor@1.11.3
+meteortesting:browser-tests@1.4.2
+meteortesting:mocha@2.1.0
+meteortesting:mocha-core@8.0.1
 minimongo@1.9.3
 modern-browsers@0.1.9
 modules@0.19.0
 modules-runtime@0.13.1
-mongo@1.16.6
+mongo@1.16.7
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
 npm-mongo@4.16.0
 ordered-dict@1.1.0
-practicalmeteor:mocha-core@1.0.1
 promise@0.12.2
 random@1.2.1
 rate-limit@1.1.1
diff --git a/History.md b/History.md
index 7242730ea9..0586e4b9ab 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v3.6.0
+
+* Added async versions of functions [#361](https://github.com/Meteor-Community-Packages/meteor-roles/pull/361) [#378](https://github.com/Meteor-Community-Packages/meteor-roles/pull/378) [@bratelefant](https://github.com/bratelefant) [@storytellercz](https://github.com/sponsors/StorytellerCZ) [@jankapunkt](https://github.com/sponsors/jankapunkt)
+* Added missing types [#383](https://github.com/Meteor-Community-Packages/meteor-roles/pull/383) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
+* Add complete test suite [#375](https://github.com/Meteor-Community-Packages/meteor-roles/pull/375) [@jankapunkt](https://github.com/sponsors/jankapunkt) [#380](https://github.com/Meteor-Community-Packages/meteor-roles/pull/380) [@bratelefant](https://github.com/bratelefant)
+
 ## v3.5.1
 
 * Fix for index creation functions losing context [#371](https://github.com/Meteor-Community-Packages/meteor-roles/pull/371) [@copleykj](https://github.com/sponsors/copleykj)
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..48e341a095
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}
diff --git a/package.js b/package.js
index eef959fdba..7f3ad4908a 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.5.1',
+  version: '3.6.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From 7bed14385ed1f3133c802344dcabff3888e6e20e Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Mon, 20 Nov 2023 13:35:29 +0200
Subject: [PATCH 0457/1140] [webapp] Fix tests

---
 .../webapp/.npm/package/npm-shrinkwrap.json   | 78 +++++++++++++------
 packages/webapp/webapp_tests.js               |  7 +-
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index a57899427e..bfdde477d2 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -7,9 +7,9 @@
       "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="
     },
     "@types/node": {
-      "version": "18.13.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
-      "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="
+      "version": "20.9.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.2.tgz",
+      "integrity": "sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg=="
     },
     "@vlasky/whomst": {
       "version": "0.1.7",
@@ -32,9 +32,9 @@
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
     },
     "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="
     },
     "compressible": {
       "version": "2.0.18",
@@ -83,6 +83,11 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
     },
+    "define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="
+    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -141,30 +146,45 @@
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
     },
     "get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="
     },
     "get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="
+    },
+    "has-property-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="
+    },
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
     },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
+    "hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="
+    },
     "http-errors": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -190,6 +210,11 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
+    "lodash.has": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
+      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
+    },
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -225,11 +250,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
-    },
     "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -241,9 +261,9 @@
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="
     },
     "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
     },
     "on-finished": {
       "version": "2.3.0",
@@ -312,6 +332,11 @@
         }
       }
     },
+    "set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="
+    },
     "setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
@@ -362,6 +387,11 @@
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
       "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
     },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
diff --git a/packages/webapp/webapp_tests.js b/packages/webapp/webapp_tests.js
index fce54981f1..2555b6a6fb 100644
--- a/packages/webapp/webapp_tests.js
+++ b/packages/webapp/webapp_tests.js
@@ -46,16 +46,15 @@ MockResponse.prototype.getBody = function () {
 
 Tinytest.add("webapp - content-type header", function (test) {
   const staticFiles = WebAppInternals.staticFilesByArch["web.browser"];
+  const staticFilesKeys = Object.keys(staticFiles);
 
-  const cssResource = _.find(
-    _.keys(staticFiles),
+  const cssResource = staticFilesKeys.find(
     function (url) {
       return staticFiles[url].type === "css";
     }
   );
 
-  const jsResource = _.find(
-    _.keys(staticFiles),
+  const jsResource = staticFilesKeys.find(
     function (url) {
       return staticFiles[url].type === "js";
     }

From 3fabfeedf5fe001948d6a6e9e92f2f4ffa697d94 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 18 Dec 2023 17:04:25 +0100
Subject: [PATCH 0458/1140] Types for async functions

---
 definitions.d.ts            | 44 +++++++++++++++++++++++
 roles/roles_common_async.js | 72 ++++++++++++++++++-------------------
 2 files changed, 80 insertions(+), 36 deletions(-)

diff --git a/definitions.d.ts b/definitions.d.ts
index 56da7377a8..22775654a2 100644
--- a/definitions.d.ts
+++ b/definitions.d.ts
@@ -69,6 +69,11 @@ declare namespace Roles {
     roles: string | string[],
     options?: string | { scope?: string; ifExists?: boolean }
   ): void
+  function addUsersToRolesAsync(
+    users: string | string[] | Meteor.User | Meteor.User[],
+    roles: string | string[],
+    options?: string | { scope?: string; ifExists?: boolean }
+  ): Promise<void>
 
   /**
    * Create a new role.
@@ -80,6 +85,7 @@ declare namespace Roles {
    * @return {String} ID of the new role or null.
    */
   function createRole(roleName: string, options?: { unlessExists: boolean }): string
+  function createRoleAsync(roleName: string, options?: { unlessExists: boolean }): Promise<string>
 
   /**
    * Delete an existing role.
@@ -90,6 +96,7 @@ declare namespace Roles {
    * @param {String} roleName Name of role.
    */
   function deleteRole(roleName: string): void
+  function deleteRoleAsync(roleName: string): Promise<void>
 
   /**
    * Rename an existing role.
@@ -99,6 +106,7 @@ declare namespace Roles {
    * @param {String} newName New name of a role.
    */
   function renameRole(oldName: string, newName: string): void
+  function renameRoleAsync(oldName: string, newName: string): Promise<void>
 
   /**
    * Add role parent to roles.
@@ -111,6 +119,7 @@ declare namespace Roles {
    * @param {String} parentName Name of parent role.
    */
   function addRolesToParent(rolesNames: string | string[], parentName: string): void
+  function addRolesToParentAsync(rolesNames: string | string[], parentName: string): Promise<void>
 
   /**
    * Remove role parent from roles.
@@ -123,6 +132,7 @@ declare namespace Roles {
    * @param {String} parentName Name of parent role.
    */
   function removeRolesFromParent(rolesNames: string | string[], parentName: string): void
+  function removeRolesFromParentAsync(rolesNames: string | string[], parentName: string): Promise<void>
 
   /**
    * Retrieve cursor of all existing roles.
@@ -144,6 +154,7 @@ declare namespace Roles {
    * @return {Array} Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted
    */
   function getGroupsForUser(user: string | Meteor.User, role?: string): string[]
+  function getGroupsForUserAsync(user: string | Meteor.User, role?: string): Promise<string[]>
 
   /**
    * Retrieve users scopes, if any.
@@ -155,6 +166,7 @@ declare namespace Roles {
    * @return {Array} Array of user's scopes, unsorted.
    */
   function getScopesForUser(user: string | Meteor.User, roles?: string | string[]): string[]
+  function getScopesForUserAsync(user: string | Meteor.User, roles?: string | string[]): Promise<string[]>
 
   /**
    * Rename a scope.
@@ -166,6 +178,7 @@ declare namespace Roles {
    * @param {String} newName New name of a scope.
    */
   function renameScope(oldName: string, newName: string): void
+  function renameScopeAsync(oldName: string, newName: string): Promise<void>
 
   /**
    * Remove a scope.
@@ -177,6 +190,7 @@ declare namespace Roles {
    *
    */
   function removeScope(name: String): void
+  function removeScopeAsync(name: String): Promise<void>
 
   /**
    * Find out if a role is an ancestor of another role.
@@ -189,6 +203,7 @@ declare namespace Roles {
    * @return {Boolean}
    */
   function isParentOf(parentRoleName: string, childRoleName: string): boolean
+  function isParentOfAsync(parentRoleName: string, childRoleName: string): Promise<boolean>
 
   /**
    * Retrieve user's roles.
@@ -214,6 +229,13 @@ declare namespace Roles {
     onlyAssigned?: boolean;
     fullObjects?: boolean
   }): string[]
+  function getRolesForUserAsync(user: string | Meteor.User, options?: string | {
+    scope?: string;
+    anyScope?: boolean;
+    onlyScoped?: boolean;
+    onlyAssigned?: boolean;
+    fullObjects?: boolean
+  }): Promise<string[]>
 
   /**
    * Retrieve all assignments of a user which are for the target role.
@@ -269,6 +291,11 @@ declare namespace Roles {
     options?: string | { scope?: string; anyScope?: boolean; onlyScoped?: boolean; queryOptions?: QueryOptions },
     queryOptions?: QueryOptions
   ): Mongo.Cursor<Meteor.User>
+  function getUsersInRoleAsync(
+    roles: string | string[],
+    options?: string | { scope?: string; anyScope?: boolean; onlyScoped?: boolean; queryOptions?: QueryOptions },
+    queryOptions?: QueryOptions
+  ): Promise<Mongo.Cursor<Meteor.User>>
 
   /**
    * Remove users from assigned roles.
@@ -292,6 +319,11 @@ declare namespace Roles {
     roles?: string | string[],
     options?: string | { scope?: string; anyScope?: boolean }
   ): void
+  function removeUsersFromRolesAsync(
+    users: string | string[] | Meteor.User | Meteor.User[],
+    roles?: string | string[],
+    options?: string | { scope?: string; anyScope?: boolean }
+  ): Promise<void>
 
   /**
    * Set users' roles.
@@ -319,6 +351,11 @@ declare namespace Roles {
     roles: string | string[],
     options?: string | { scope?: string; anyScope?: boolean; ifExists?: boolean }
   ): void
+  function setUserRolesAsync(
+    users: string | string[] | Meteor.User | Meteor.User[],
+    roles: string | string[],
+    options?: string | { scope?: string; anyScope?: boolean; ifExists?: boolean }
+  ): Promise<void>
 
   /**
    * Check if user has specified roles.
@@ -353,13 +390,20 @@ declare namespace Roles {
     roles: string | string[],
     options?: string | { scope?: string; anyScope?: boolean }
   ): boolean
+  function userIsInRoleAsync(
+    user: string | string[] | Meteor.User | Meteor.User[],
+    roles: string | string[],
+    options?: string | { scope?: string; anyScope?: boolean }
+  ): Promise<boolean>
 
+  // The schema for the roles collection
   interface Role {
     _id: string
     name: string
     children: { _id: string }[]
   }
 
+  // The schema for the role-assignment collection
   interface RoleAssignment {
     _id: string
     user: {
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 7d3369ca5c..6ca1a9f6ef 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -69,7 +69,7 @@ Object.assign(Roles, {
   /**
    * Create a new role.
    *
-   * @method createRole
+   * @method createRoleAsync
    * @param {String} roleName Name of role.
    * @param {Object} [options] Options:
    *   - `unlessExists`: if `true`, exception will not be thrown in the role already exists
@@ -116,7 +116,7 @@ Object.assign(Roles, {
    *
    * If the role is set for any user, it is automatically unset.
    *
-   * @method deleteRole
+   * @method deleteRoleAsync
    * @param {String} roleName Name of role.
    * @returns {Promise}
    * @static
@@ -180,7 +180,7 @@ Object.assign(Roles, {
   /**
    * Rename an existing role.
    *
-   * @method renameRole
+   * @method renameRoleAsync
    * @param {String} oldName Old name of a role.
    * @param {String} newName New name of a role.
    * @returns {Promise}
@@ -255,7 +255,7 @@ Object.assign(Roles, {
    * Previous parents are kept (role can have multiple parents). For users which have the
    * parent role set, new subroles are added automatically.
    *
-   * @method addRolesToParent
+   * @method addRolesToParentAsync
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @returns {Promise}
@@ -271,7 +271,7 @@ Object.assign(Roles, {
   },
 
   /**
-   * @method _addRoleToParent
+   * @method _addRoleToParentAsync
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
    * @returns {Promise}
@@ -340,7 +340,7 @@ Object.assign(Roles, {
    * Other parents are kept (role can have multiple parents). For users which have the
    * parent role set, removed subrole is removed automatically.
    *
-   * @method removeRolesFromParent
+   * @method removeRolesFromParentAsync
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @returns {Promise}
@@ -356,7 +356,7 @@ Object.assign(Roles, {
   },
 
   /**
-   * @method _removeRoleFromParent
+   * @method _removeRoleFromParentAsync
    * @param {String} roleName Name of role.
    * @param {String} parentName Name of parent role.
    * @returns {Promise}
@@ -432,12 +432,12 @@ Object.assign(Roles, {
    * Adds roles to existing roles for each user.
    *
    * @example
-   *     Roles.addUsersToRoles(userId, 'admin')
-   *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
-   *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
-   *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *     Roles.addUsersToRolesAsync(userId, 'admin')
+   *     Roles.addUsersToRolesAsync(userId, ['view-secrets'], 'example.com')
+   *     Roles.addUsersToRolesAsync([user1, user2], ['user','editor'])
+   *     Roles.addUsersToRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
    *
-   * @method addUsersToRoles
+   * @method addUsersToRolesAsync
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
@@ -488,12 +488,12 @@ Object.assign(Roles, {
    * Replaces all existing roles with a new set of roles.
    *
    * @example
-   *     Roles.setUserRoles(userId, 'admin')
-   *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
-   *     Roles.setUserRoles([user1, user2], ['user','editor'])
-   *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+   *     await Roles.setUserRolesAsync(userId, 'admin')
+   *     await Roles.setUserRolesAsync(userId, ['view-secrets'], 'example.com')
+   *     await Roles.setUserRolesAsync([user1, user2], ['user','editor'])
+   *     await Roles.setUserRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
    *
-   * @method setUserRoles
+   * @method setUserRolesAsync
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
@@ -713,11 +713,11 @@ Object.assign(Roles, {
    * Remove users from assigned roles.
    *
    * @example
-   *     Roles.removeUsersFromRoles(userId, 'admin')
-   *     Roles.removeUsersFromRoles([userId, user2], ['editor'])
-   *     Roles.removeUsersFromRoles(userId, ['user'], 'group1')
+   *     await Roles.removeUsersFromRolesAsync(userId, 'admin')
+   *     await Roles.removeUsersFromRolesAsync([userId, user2], ['editor'])
+   *     await Roles.removeUsersFromRolesAsync(userId, ['user'], 'group1')
    *
-   * @method removeUsersFromRoles
+   * @method removeUsersFromRolesAsync
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
    * @param {Object|String} [options] Options:
@@ -792,17 +792,17 @@ Object.assign(Roles, {
    *
    * @example
    *     // global roles
-   *     Roles.userIsInRole(user, 'admin')
-   *     Roles.userIsInRole(user, ['admin','editor'])
-   *     Roles.userIsInRole(userId, 'admin')
-   *     Roles.userIsInRole(userId, ['admin','editor'])
+   *     await Roles.userIsInRoleAsync(user, 'admin')
+   *     await Roles.userIsInRoleAsync(user, ['admin','editor'])
+   *     await Roles.userIsInRoleAsync(userId, 'admin')
+   *     await Roles.userIsInRoleAsync(userId, ['admin','editor'])
    *
    *     // scope roles (global roles are still checked)
-   *     Roles.userIsInRole(user, 'admin', 'group1')
-   *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
-   *     Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})
+   *     await Roles.userIsInRoleAsync(user, 'admin', 'group1')
+   *     await Roles.userIsInRoleAsync(userId, ['admin','editor'], 'group1')
+   *     await Roles.userIsInRoleAsync(userId, ['admin','editor'], {scope: 'group1'})
    *
-   * @method userIsInRole
+   * @method userIsInRoleAsync
    * @param {String|Object} user User ID or an actual user object.
    * @param {Array|String} roles Name of role or an array of roles to check against. If array,
    *                             will return `true` if user is in _any_ role.
@@ -869,7 +869,7 @@ Object.assign(Roles, {
   /**
    * Retrieve user's roles.
    *
-   * @method getRolesForUser
+   * @method getRolesForUserAsync
    * @param {String|Object} user User ID or an actual user object.
    * @param {Object|String} [options] Options:
    *   - `scope`: name of scope to provide roles for; if not specified, global roles are returned
@@ -971,7 +971,7 @@ Object.assign(Roles, {
    *
    * Options:
    *
-   * @method getUsersInRole
+   * @method getUsersInRoleAsync
    * @param {Array|String} roles Name of role or an array of roles. If array, users
    *                             returned will have at least one of the roles
    *                             specified but need not have _all_ roles.
@@ -1095,7 +1095,7 @@ Object.assign(Roles, {
   /**
    * Deprecated. Use `getScopesForUser` instead.
    *
-   * @method getGroupsForUser
+   * @method getGroupsForUserAsync
    * @returns {Promise<Array>}
    * @static
    * @deprecated
@@ -1115,7 +1115,7 @@ Object.assign(Roles, {
   /**
    * Retrieve users scopes, if any.
    *
-   * @method getScopesForUser
+   * @method getScopesForUserAsync
    * @param {String|Object} user User ID or an actual user object.
    * @param {Array|String} [roles] Name of roles to restrict scopes to.
    *
@@ -1158,7 +1158,7 @@ Object.assign(Roles, {
    *
    * Roles assigned with a given scope are changed to be under the new scope.
    *
-   * @method renameScope
+   * @method renameScopeAsync
    * @param {String} oldName Old name of a scope.
    * @param {String} newName New name of a scope.
    * @returns {Promise}
@@ -1192,7 +1192,7 @@ Object.assign(Roles, {
    *
    * Roles assigned with a given scope are removed.
    *
-   * @method removeScope
+   * @method removeScopeAsync
    * @param {String} name The name of a scope.
    * @returns {Promise}
    * @static
@@ -1226,7 +1226,7 @@ Object.assign(Roles, {
    *
    * WARNING: If you check this on the client, please make sure all roles are published.
    *
-   * @method isParentOf
+   * @method isParentOfAsync
    * @param {String} parentRoleName The role you want to research.
    * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
    * @returns {Promise}

From b09445bf95a1fbc306ee09c779ef75cd7716cb8e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 18 Dec 2023 17:25:35 +0100
Subject: [PATCH 0459/1140] Update zodern:types and package version

---
 History.md  | 6 ++++++
 package.js  | 4 ++--
 yuidoc.json | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 0586e4b9ab..cac88de034 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v3.6.1
+
+* Added types for async functions [#386](https://github.com/Meteor-Community-Packages/meteor-roles/pull/386) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
+* Updated docs with async functions [@storytellercz](https://github.com/sponsors/StorytellerCZ)
+* Updated `zodern:types` to v1.0.10
+
 ## v3.6.0
 
 * Added async versions of functions [#361](https://github.com/Meteor-Community-Packages/meteor-roles/pull/361) [#378](https://github.com/Meteor-Community-Packages/meteor-roles/pull/378) [@bratelefant](https://github.com/bratelefant) [@storytellercz](https://github.com/sponsors/StorytellerCZ) [@jankapunkt](https://github.com/sponsors/jankapunkt)
diff --git a/package.js b/package.js
index 7f3ad4908a..da41fa9aea 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.6.0',
+  version: '3.6.1',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
@@ -20,7 +20,7 @@ Package.onUse(function (api) {
     'check'
   ], both)
 
-  api.use('zodern:types@1.0.9')
+  api.use('zodern:types@1.0.10')
 
   api.use(['blaze@2.7.1'], 'client', { weak: true })
 
diff --git a/yuidoc.json b/yuidoc.json
index 18329a2a96..de1aa90872 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: an authorization package for Meteor",
-  "version": "v3.4.0",
+  "version": "v3.6.0",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From d8c6eb63a5f969cdbeb779dce9578dc05a54ec5b Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 22 Dec 2023 00:24:11 +0100
Subject: [PATCH 0460/1140] Update CI & tests deps

---
 .github/workflows/testsuite.yml | 10 +++++-----
 testapp/.meteor/packages        |  8 ++++----
 testapp/.meteor/release         |  2 +-
 testapp/.meteor/versions        | 28 ++++++++++++++--------------
 testapp/package-lock.json       | 18 +++++++++---------
 testapp/package.json            |  6 +++---
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index ffce9b1b93..410363ac45 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16
 
@@ -37,14 +37,14 @@ jobs:
       matrix:
         meteorRelease:
           - '2.8.0'
-          - '2.13.3'
+          - '2.14'
           # Latest version
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16
 
diff --git a/testapp/.meteor/packages b/testapp/.meteor/packages
index 45d8f3960a..0d165be56f 100644
--- a/testapp/.meteor/packages
+++ b/testapp/.meteor/packages
@@ -4,15 +4,15 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor@1.11.3                  # Shared foundation for all Meteor packages
+meteor@1.11.4                  # Shared foundation for all Meteor packages
 static-html@1.3.2             # Define static page content in .html files
 standard-minifier-css@1.9.2   # CSS minifier run for production mode
 standard-minifier-js@2.8.1    # JS minifier run for production mode
 es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.16.7              # Enable ECMAScript2015+ syntax in app code
-typescript@4.9.4              # Enable TypeScript syntax in .ts and .tsx modules
+ecmascript@0.16.8              # Enable ECMAScript2015+ syntax in app code
+typescript@4.9.5              # Enable TypeScript syntax in .ts and .tsx modules
 shell-server@0.5.0            # Server-side component of the `meteor shell` command
-webapp@1.13.5                  # Serves a Meteor app over HTTP
+webapp@1.13.6                  # Serves a Meteor app over HTTP
 server-render@0.4.1           # Support for server-side rendering
 hot-module-replacement@0.5.3  # Rebuilds the client if there is a change on the client without restarting the server
 
diff --git a/testapp/.meteor/release b/testapp/.meteor/release
index 6641d0478a..c500c39d6d 100644
--- a/testapp/.meteor/release
+++ b/testapp/.meteor/release
@@ -1 +1 @@
-METEOR@2.13.3
+METEOR@2.14
diff --git a/testapp/.meteor/versions b/testapp/.meteor/versions
index e0abc76068..00869796c9 100644
--- a/testapp/.meteor/versions
+++ b/testapp/.meteor/versions
@@ -1,9 +1,9 @@
 autoupdate@1.8.0
-babel-compiler@7.10.4
+babel-compiler@7.10.5
 babel-runtime@1.5.1
 base64@1.0.12
 blaze-tools@1.1.3
-boilerplate-generator@1.7.1
+boilerplate-generator@1.7.2
 caching-compiler@1.2.2
 caching-html-compiler@1.2.1
 callback-hook@1.5.1
@@ -11,47 +11,47 @@ check@1.3.2
 ddp@1.4.1
 ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-server@2.6.2
+ddp-server@2.7.0
 diff-sequence@1.1.2
 dynamic-import@0.7.3
-ecmascript@0.16.7
+ecmascript@0.16.8
 ecmascript-runtime@0.8.1
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
 ejson@1.1.3
 es5-shim@4.8.0
-fetch@0.1.3
+fetch@0.1.4
 hot-code-push@1.0.4
 hot-module-replacement@0.5.3
 html-tools@1.1.3
 htmljs@1.1.1
 id-map@1.1.1
 inter-process-messaging@0.1.1
-logging@1.3.2
-meteor@1.11.3
+logging@1.3.3
+meteor@1.11.4
 minifier-css@1.6.4
 minifier-js@2.7.5
-modern-browsers@0.1.9
-modules@0.19.0
+modern-browsers@0.1.10
+modules@0.20.0
 modules-runtime@0.13.1
 modules-runtime-hot@0.14.2
 mongo-id@1.0.8
 promise@0.12.2
 random@1.2.1
-react-fast-refresh@0.2.7
+react-fast-refresh@0.2.8
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.1
 server-render@0.4.1
 shell-server@0.5.0
-socket-stream-client@0.5.1
+socket-stream-client@0.5.2
 spacebars-compiler@1.3.1
 standard-minifier-css@1.9.2
 standard-minifier-js@2.8.1
 static-html@1.3.2
 templating-tools@1.2.2
-tracker@1.3.2
-typescript@4.9.4
+tracker@1.3.3
+typescript@4.9.5
 underscore@1.0.13
-webapp@1.13.5
+webapp@1.13.6
 webapp-hashing@1.1.1
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index d996f6f621..7cb48d5c11 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -190,9 +190,9 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.6.tgz",
+      "integrity": "sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==",
       "requires": {
         "regenerator-runtime": "^0.14.0"
       }
@@ -3134,9 +3134,9 @@
       "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "meteor-node-stubs": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.5.tgz",
-      "integrity": "sha512-FLlOFZx3KnZ5s3yPCK+x58DyX9ewN+oQ12LcpwBXMLtzJ/YyprMQVivd6KIrahZbKJrNenPNUGuDS37WUFg+Mw==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.7.tgz",
+      "integrity": "sha512-20bAFUhEIOD/Cos2nmvhqf2NOKpTf63WVQ+nwuaX2OFj31sU6GL4KkNylkWum8McwsH0LsMr/F+UHhduTX7KRg==",
       "requires": {
         "assert": "^2.0.0",
         "browserify-zlib": "^0.2.0",
@@ -4495,9 +4495,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "regexp.prototype.flags": {
       "version": "1.5.0",
diff --git a/testapp/package.json b/testapp/package.json
index b0227ca50a..b1d84ef219 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -11,9 +11,9 @@
     "lint:fix": "standard --fix ../"
   },
   "dependencies": {
-    "@babel/runtime": "^7.23.2",
-    "meteor-node-stubs": "^1.2.5",
-    "yuidocjs": "^0.10.2"
+    "@babel/runtime": "7.23.6",
+    "meteor-node-stubs": "1.2.7",
+    "yuidocjs": "0.10.2"
   },
   "devDependencies": {
     "babel-plugin-istanbul": "^6.1.1",

From 6301adb06b975b9cbf17cce6b5e5baa2a0f17b85 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 23 Dec 2023 14:45:50 +0100
Subject: [PATCH 0461/1140] Update zodern:types to v1.0.11

---
 History.md          |  2 +-
 package.js          |  2 +-
 roles/versions.json | 95 ---------------------------------------------
 3 files changed, 2 insertions(+), 97 deletions(-)
 delete mode 100644 roles/versions.json

diff --git a/History.md b/History.md
index cac88de034..848b34aa37 100644
--- a/History.md
+++ b/History.md
@@ -4,7 +4,7 @@
 
 * Added types for async functions [#386](https://github.com/Meteor-Community-Packages/meteor-roles/pull/386) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
 * Updated docs with async functions [@storytellercz](https://github.com/sponsors/StorytellerCZ)
-* Updated `zodern:types` to v1.0.10
+* Updated `zodern:types` to v1.0.11
 
 ## v3.6.0
 
diff --git a/package.js b/package.js
index da41fa9aea..ddb8de1886 100644
--- a/package.js
+++ b/package.js
@@ -20,7 +20,7 @@ Package.onUse(function (api) {
     'check'
   ], both)
 
-  api.use('zodern:types@1.0.10')
+  api.use('zodern:types@1.0.11')
 
   api.use(['blaze@2.7.1'], 'client', { weak: true })
 
diff --git a/roles/versions.json b/roles/versions.json
deleted file mode 100644
index 82627b707d..0000000000
--- a/roles/versions.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "dependencies": [
-    [
-      "accounts-base",
-      "1.0.0"
-    ],
-    [
-      "application-configuration",
-      "1.0.0"
-    ],
-    [
-      "binary-heap",
-      "1.0.0"
-    ],
-    [
-      "callback-hook",
-      "1.0.0"
-    ],
-    [
-      "check",
-      "1.0.0"
-    ],
-    [
-      "deps",
-      "1.0.1"
-    ],
-    [
-      "ejson",
-      "1.0.0"
-    ],
-    [
-      "follower-livedata",
-      "1.0.0"
-    ],
-    [
-      "geojson-utils",
-      "1.0.0"
-    ],
-    [
-      "id-map",
-      "1.0.0"
-    ],
-    [
-      "json",
-      "1.0.0"
-    ],
-    [
-      "livedata",
-      "1.0.7"
-    ],
-    [
-      "localstorage",
-      "1.0.0"
-    ],
-    [
-      "logging",
-      "1.0.2"
-    ],
-    [
-      "meteor",
-      "1.0.2"
-    ],
-    [
-      "minimongo",
-      "1.0.1"
-    ],
-    [
-      "mongo-livedata",
-      "1.0.3"
-    ],
-    [
-      "ordered-dict",
-      "1.0.0"
-    ],
-    [
-      "random",
-      "1.0.0"
-    ],
-    [
-      "retry",
-      "1.0.0"
-    ],
-    [
-      "service-configuration",
-      "1.0.0"
-    ],
-    [
-      "underscore",
-      "1.0.0"
-    ]
-  ],
-  "pluginDependencies": [],
-  "toolVersion": "meteor-tool@1.0.16",
-  "format": "1.0"
-}
\ No newline at end of file

From ec1cf17631cb33a9a13fdf04b8e87e1771b24e2c Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 23 Dec 2023 14:47:15 +0100
Subject: [PATCH 0462/1140] Published alanning:roles@3.6.1

---
 .versions | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/.versions b/.versions
index 2d09a9df99..d36014f3e5 100644
--- a/.versions
+++ b/.versions
@@ -1,61 +1,62 @@
-accounts-base@2.2.8
-alanning:roles@3.6.0
+accounts-base@2.2.9
+alanning:roles@3.6.1
 allow-deny@1.1.1
-babel-compiler@7.10.4
+babel-compiler@7.10.5
 babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
-boilerplate-generator@1.7.1
+boilerplate-generator@1.7.2
 callback-hook@1.5.1
 check@1.3.2
 ddp@1.4.1
 ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-rate-limiter@1.2.0
-ddp-server@2.6.2
+ddp-rate-limiter@1.2.1
+ddp-server@2.7.0
 diff-sequence@1.1.2
 dynamic-import@0.7.3
-ecmascript@0.16.7
+ecmascript@0.16.8
 ecmascript-runtime@0.8.1
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
 ejson@1.1.3
-fetch@0.1.3
+fetch@0.1.4
 geojson-utils@1.0.11
 http@2.0.0
 id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@4.1.0
 lmieulet:meteor-legacy-coverage@0.1.0
-local-test:alanning:roles@3.6.0
+local-test:alanning:roles@3.6.1
 localstorage@1.2.0
-logging@1.3.2
-meteor@1.11.3
+logging@1.3.3
+meteor@1.11.4
 meteortesting:browser-tests@1.4.2
 meteortesting:mocha@2.1.0
 meteortesting:mocha-core@8.0.1
 minimongo@1.9.3
-modern-browsers@0.1.9
-modules@0.19.0
+modern-browsers@0.1.10
+modules@0.20.0
 modules-runtime@0.13.1
-mongo@1.16.7
+mongo@1.16.8
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
-npm-mongo@4.16.0
+npm-mongo@4.17.2
 ordered-dict@1.1.0
 promise@0.12.2
 random@1.2.1
 rate-limit@1.1.1
-react-fast-refresh@0.2.7
+react-fast-refresh@0.2.8
 reactive-var@1.0.12
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.1
-socket-stream-client@0.5.1
-tracker@1.3.2
+socket-stream-client@0.5.2
+tracker@1.3.3
+typescript@4.9.5
 underscore@1.0.13
 url@1.3.2
-webapp@1.13.5
+webapp@1.13.6
 webapp-hashing@1.1.1
-zodern:types@1.0.9
+zodern:types@1.0.11

From 79c05c27863b8e89c4326f5782a00b311435ff2e Mon Sep 17 00:00:00 2001
From: Bruce Borrett <oceativa@gmail.com>
Date: Sat, 3 Feb 2024 08:55:41 +0200
Subject: [PATCH 0463/1140] Fixed typescript definitions.

---
 definitions.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/definitions.d.ts b/definitions.d.ts
index 22775654a2..f783854c4a 100644
--- a/definitions.d.ts
+++ b/definitions.d.ts
@@ -430,7 +430,9 @@ declare namespace Roles {
 
 } // module
 
-declare namespace Meteor {
-  var roles: Mongo.Collection<Roles.Role>
-  var roleAssignment: Mongo.Collection<Roles.RoleAssignment>
+declare module 'meteor/meteor' {
+  namespace Meteor {
+    const roles: Mongo.Collection<Roles.Role>
+    const roleAssignment: Mongo.Collection<Roles.RoleAssignment>
+  }
 }

From d1dc80d45b3f2a4b1be4cb825e0135c726bf7e83 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Sat, 3 Feb 2024 20:00:24 +0100
Subject: [PATCH 0464/1140] Published alanning:roles@3.6.2.

---
 .versions  | 4 ++--
 History.md | 4 ++++
 package.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index d36014f3e5..b6e310e1b0 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@2.2.9
-alanning:roles@3.6.1
+alanning:roles@3.6.2
 allow-deny@1.1.1
 babel-compiler@7.10.5
 babel-runtime@1.5.1
@@ -27,7 +27,7 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@4.1.0
 lmieulet:meteor-legacy-coverage@0.1.0
-local-test:alanning:roles@3.6.1
+local-test:alanning:roles@3.6.2
 localstorage@1.2.0
 logging@1.3.3
 meteor@1.11.4
diff --git a/History.md b/History.md
index 848b34aa37..2cc8b6414c 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.6.2
+
+* Fixed TypeScript definition to play nice with Meteor definition [#389](https://github.com/Meteor-Community-Packages/meteor-roles/pull/389) [@bruceborrett](https://github.com/sponsors/bruceborrett)
+
 ## v3.6.1
 
 * Added types for async functions [#386](https://github.com/Meteor-Community-Packages/meteor-roles/pull/386) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
diff --git a/package.js b/package.js
index ddb8de1886..b7b66da830 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.6.1',
+  version: '3.6.2',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From 3641b4561b371d7921f6aaf271abe03621efa431 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 06:29:14 +0000
Subject: [PATCH 0465/1140] build(deps): bump express from 4.18.2 to 4.19.2 in
 /testapp

Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 testapp/package-lock.json | 95 +++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 55 deletions(-)

diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 7cb48d5c11..21bdd2163c 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -884,40 +884,6 @@
         "readable-stream": "^3.4.0"
       }
     },
-    "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "requires": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        }
-      }
-    },
     "boom": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
@@ -1173,11 +1139,6 @@
       "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
       "dev": true
     },
-    "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
-    },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -2031,16 +1992,16 @@
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -2068,6 +2029,30 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "body-parser": {
+          "version": "1.20.2",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+          "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+          "requires": {
+            "bytes": "3.1.2",
+            "content-type": "~1.0.5",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "on-finished": "2.4.1",
+            "qs": "6.11.0",
+            "raw-body": "2.5.2",
+            "type-is": "~1.6.18",
+            "unpipe": "1.0.0"
+          }
+        },
+        "cookie": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+          "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
+        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -2080,6 +2065,17 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "raw-body": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+          "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+          "requires": {
+            "bytes": "3.1.2",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
+          }
         }
       }
     },
@@ -4466,17 +4462,6 @@
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
-    "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",

From d9adc1579f077e245d1ac6e3eeb16e7a6ed0460c Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 16:50:15 +0200
Subject: [PATCH 0466/1140] Export collections

---
 roles/roles_common_async.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 6ca1a9f6ef..b6cf119ace 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -26,12 +26,16 @@ import { Mongo } from 'meteor/mongo'
  *
  * @module Roles
  */
+export const RolesCollection = new Mongo.Collection('roles')
+
 if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection('roles')
+  Meteor.roles = RolesCollection
 }
 
+export const RoleAssignmentCollection = new Mongo.Collection('role-assignment')
+
 if (!Meteor.roleAssignment) {
-  Meteor.roleAssignment = new Mongo.Collection('role-assignment')
+  Meteor.roleAssignment = RoleAssignmentCollection
 }
 
 /**

From ab55827c64dd6be8cbdda98feddd59e10c35dde3 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 16:50:32 +0200
Subject: [PATCH 0467/1140] Sync functions only on client

---
 History.md                                 |    7 +
 definitions.d.ts                           |    5 +
 package.js                                 |    8 +-
 roles/{roles_common.js => roles_client.js} |   12 +-
 roles/roles_server.js                      |  414 +---
 roles/tests/client.js                      |    2 +-
 roles/tests/clientAsync.js                 |    3 +-
 roles/tests/server.js                      | 2281 --------------------
 roles/tests/serverAsync.js                 |    3 +-
 9 files changed, 26 insertions(+), 2709 deletions(-)
 rename roles/{roles_common.js => roles_client.js} (99%)
 delete mode 100644 roles/tests/server.js

diff --git a/History.md b/History.md
index 2cc8b6414c..300ea913d9 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v4.0.0
+
+* BREAKING: Synchronous functions are now available only on client side
+* * BREAKING: Migration functions for past versions are no longer available
+* UI Helpers now use `console.debug` for debugging messages
+* `RolesCollection` and `RoleAssignmentsCollection` can now be exported in addition to being accessed via `Meteor.roles` and `Meteor.roleAssignment`
+
 ## v3.6.2
 
 * Fixed TypeScript definition to play nice with Meteor definition [#389](https://github.com/Meteor-Community-Packages/meteor-roles/pull/389) [@bruceborrett](https://github.com/sponsors/bruceborrett)
diff --git a/definitions.d.ts b/definitions.d.ts
index f783854c4a..d8f4441022 100644
--- a/definitions.d.ts
+++ b/definitions.d.ts
@@ -430,6 +430,11 @@ declare namespace Roles {
 
 } // module
 
+// Exported collections
+declare type RolesCollection = Mongo.Collection<Roles.Role>
+declare type RoleAssignmentsCollection = Mongo.Collection<Roles.RoleAssignment>
+
+// Additions to the Meteor object
 declare module 'meteor/meteor' {
   namespace Meteor {
     const roles: Mongo.Collection<Roles.Role>
diff --git a/package.js b/package.js
index bb5e0fbd13..498bc07514 100644
--- a/package.js
+++ b/package.js
@@ -8,7 +8,7 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['2.8.1', '3.0-alpha.11'])
+  api.versionsFrom(['2.8.1', '3.0-beta.7'])
 
   const both = ['client', 'server']
 
@@ -20,13 +20,13 @@ Package.onUse(function (api) {
     'check'
   ], both)
 
-  api.use('zodern:types@1.0.11')
+  api.use('zodern:types@1.0.13')
 
-  api.use(['blaze@2.7.1'], 'client', { weak: true })
+  api.use(['blaze@2.9.0'], 'client', { weak: true })
 
   api.export('Roles')
 
-  api.addFiles('roles/roles_common.js', both)
+  api.addFiles('roles/roles_client.js', 'client')
   api.addFiles('roles/roles_common_async.js', both)
   api.addFiles('roles/roles_server.js', 'server')
   api.addFiles([
diff --git a/roles/roles_common.js b/roles/roles_client.js
similarity index 99%
rename from roles/roles_common.js
rename to roles/roles_client.js
index 3dfcefe3a4..afb80711fd 100644
--- a/roles/roles_common.js
+++ b/roles/roles_client.js
@@ -1,9 +1,10 @@
-/* global Meteor, Roles, Mongo */
+/* global Meteor, Roles */
+import { Meteor } from 'meteor/meteor'
 
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
- * Roles are accessible throgh `Meteor.roles` collection and documents consist of:
+ * Roles are accessible through `Meteor.roles` collection and documents consist of:
  *  - `_id`: role name
  *  - `children`: list of subdocuments:
  *    - `_id`
@@ -24,13 +25,6 @@
  *
  * @module Roles
  */
-if (!Meteor.roles) {
-  Meteor.roles = new Mongo.Collection('roles')
-}
-
-if (!Meteor.roleAssignment) {
-  Meteor.roleAssignment = new Mongo.Collection('role-assignment')
-}
 
 /**
  * @class Roles
diff --git a/roles/roles_server.js b/roles/roles_server.js
index fdf03794e2..ead157fb26 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,17 +1,7 @@
-/* global Meteor, Roles */
-let indexFnAssignment
-let indexFnRoles
+import { Meteor } from 'meteor/meteor'
 
-if (Meteor.roles.createIndexAsync) {
-  indexFnAssignment = Meteor.roleAssignment.createIndexAsync.bind(Meteor.roleAssignment)
-  indexFnRoles = Meteor.roles.createIndexAsync.bind(Meteor.roles)
-} else if (Meteor.roles.createIndex) {
-  indexFnAssignment = Meteor.roleAssignment.createIndex.bind(Meteor.roleAssignment)
-  indexFnRoles = Meteor.roles.createIndex.bind(Meteor.roles)
-} else {
-  indexFnAssignment = Meteor.roleAssignment._ensureIndex.bind(Meteor.roleAssignment)
-  indexFnRoles = Meteor.roles._ensureIndex.bind(Meteor.roles)
-}
+const indexFnAssignment = Meteor.roleAssignment.createIndexAsync.bind(Meteor.roleAssignment)
+const indexFnRoles = Meteor.roles.createIndexAsync.bind(Meteor.roles)
 
 [
   { 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 },
@@ -41,401 +31,3 @@ Meteor.publish('_roles', function () {
     { fields }
   )
 })
-
-Object.assign(Roles, {
-  /**
-   * @method _isNewRole
-   * @param {Object} role `Meteor.roles` document.
-   * @return {Boolean} Returns `true` if the `role` is in the new format.
-   *                   If it is ambiguous or it is not, returns `false`.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _isNewRole: function (role) {
-    return !('name' in role) && 'children' in role
-  },
-
-  /**
-   * @method _isOldRole
-   * @param {Object} role `Meteor.roles` document.
-   * @return {Boolean} Returns `true` if the `role` is in the old format.
-   *                   If it is ambiguous or it is not, returns `false`.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _isOldRole: function (role) {
-    return 'name' in role && !('children' in role)
-  },
-
-  /**
-   * @method _isNewField
-   * @param {Array} roles `Meteor.users` document `roles` field.
-   * @return {Boolean} Returns `true` if the `roles` field is in the new format.
-   *                   If it is ambiguous or it is not, returns `false`.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _isNewField: function (roles) {
-    return Array.isArray(roles) && typeof roles[0] === 'object'
-  },
-
-  /**
-   * @method _isOldField
-   * @param {Array} roles `Meteor.users` document `roles` field.
-   * @return {Boolean} Returns `true` if the `roles` field is in the old format.
-   *                   If it is ambiguous or it is not, returns `false`.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _isOldField: function (roles) {
-    return (
-      (Array.isArray(roles) && typeof roles[0] === 'string') ||
-      (typeof roles === 'object' && !Array.isArray(roles))
-    )
-  },
-
-  /**
-   * @method _convertToNewRole
-   * @param {Object} oldRole `Meteor.roles` document.
-   * @return {Object} Converted `role` to the new format.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _convertToNewRole: function (oldRole) {
-    if (!(typeof oldRole.name === 'string')) { throw new Error("Role name '" + oldRole.name + "' is not a string.") }
-
-    return {
-      _id: oldRole.name,
-      children: []
-    }
-  },
-
-  /**
-   * @method _convertToOldRole
-   * @param {Object} newRole `Meteor.roles` document.
-   * @return {Object} Converted `role` to the old format.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _convertToOldRole: function (newRole) {
-    if (!(typeof newRole._id === 'string')) { throw new Error("Role name '" + newRole._id + "' is not a string.") }
-
-    return {
-      name: newRole._id
-    }
-  },
-
-  /**
-   * @method _convertToNewField
-   * @param {Array} oldRoles `Meteor.users` document `roles` field in the old format.
-   * @param {Boolean} convertUnderscoresToDots Should we convert underscores to dots in group names.
-   * @return {Array} Converted `roles` to the new format.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _convertToNewField: function (oldRoles, convertUnderscoresToDots) {
-    const roles = []
-    if (Array.isArray(oldRoles)) {
-      oldRoles.forEach(function (role, index) {
-        if (!(typeof role === 'string')) { throw new Error("Role '" + role + "' is not a string.") }
-
-        roles.push({
-          _id: role,
-          scope: null,
-          assigned: true
-        })
-      })
-    } else if (typeof oldRoles === 'object') {
-      Object.entries(oldRoles).forEach(([group, rolesArray]) => {
-        if (group === '__global_roles__') {
-          group = null
-        } else if (convertUnderscoresToDots) {
-          // unescape
-          group = group.replace(/_/g, '.')
-        }
-
-        rolesArray.forEach(function (role) {
-          if (!(typeof role === 'string')) { throw new Error("Role '" + role + "' is not a string.") }
-
-          roles.push({
-            _id: role,
-            scope: group,
-            assigned: true
-          })
-        })
-      })
-    }
-    return roles
-  },
-
-  /**
-   * @method _convertToOldField
-   * @param {Array} newRoles `Meteor.users` document `roles` field in the new format.
-   * @param {Boolean} usingGroups Should we use groups or not.
-   * @return {Array} Converted `roles` to the old format.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _convertToOldField: function (newRoles, usingGroups) {
-    let roles
-
-    if (usingGroups) {
-      roles = {}
-    } else {
-      roles = []
-    }
-
-    newRoles.forEach(function (userRole) {
-      if (!(typeof userRole === 'object')) { throw new Error("Role '" + userRole + "' is not an object.") }
-
-      // We assume that we are converting back a failed migration, so values can only be
-      // what were valid values in 1.0. So no group names starting with $ and no subroles.
-
-      if (userRole.scope) {
-        if (!usingGroups) {
-          throw new Error(
-            "Role '" +
-              userRole._id +
-              "' with scope '" +
-              userRole.scope +
-              "' without enabled groups."
-          )
-        }
-
-        // escape
-        const scope = userRole.scope.replace(/\./g, '_')
-
-        if (scope[0] === '$') { throw new Error("Group name '" + scope + "' start with $.") }
-
-        roles[scope] = roles[scope] || []
-        roles[scope].push(userRole._id)
-      } else {
-        if (usingGroups) {
-          roles.__global_roles__ = roles.__global_roles__ || []
-          roles.__global_roles__.push(userRole._id)
-        } else {
-          roles.push(userRole._id)
-        }
-      }
-    })
-    return roles
-  },
-
-  /**
-   * @method _defaultUpdateUser
-   * @param {Object} user `Meteor.users` document.
-   * @param {Array|Object} roles Value to which user's `roles` field should be set.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _defaultUpdateUser: function (user, roles) {
-    Meteor.users.update(
-      {
-        _id: user._id,
-        // making sure nothing changed in meantime
-        roles: user.roles
-      },
-      {
-        $set: { roles }
-      }
-    )
-  },
-
-  /**
-   * @method _defaultUpdateRole
-   * @param {Object} oldRole Old `Meteor.roles` document.
-   * @param {Object} newRole New `Meteor.roles` document.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _defaultUpdateRole: function (oldRole, newRole) {
-    Meteor.roles.remove(oldRole._id)
-    Meteor.roles.insert(newRole)
-  },
-
-  /**
-   * @method _dropCollectionIndex
-   * @param {Object} collection Collection on which to drop the index.
-   * @param {String} indexName Name of the index to drop.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _dropCollectionIndex: function (collection, indexName) {
-    try {
-      collection._dropIndex(indexName)
-    } catch (e) {
-      const indexNotFound = /index not found/.test(e.message || e.err || e.errmsg)
-
-      if (!indexNotFound) {
-        throw e
-      }
-    }
-  },
-
-  /**
-   * Migrates `Meteor.users` and `Meteor.roles` to the new format.
-   *
-   * @method _forwardMigrate
-   * @param {Function} updateUser Function which updates the user object. Default `_defaultUpdateUser`.
-   * @param {Function} updateRole Function which updates the role object. Default `_defaultUpdateRole`.
-   * @param {Boolean} convertUnderscoresToDots Should we convert underscores to dots in group names.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _forwardMigrate: function (updateUser, updateRole, convertUnderscoresToDots) {
-    updateUser = updateUser || Roles._defaultUpdateUser
-    updateRole = updateRole || Roles._defaultUpdateRole
-
-    Roles._dropCollectionIndex(Meteor.roles, 'name_1')
-
-    Meteor.roles.find().forEach(function (role, index, cursor) {
-      if (!Roles._isNewRole(role)) {
-        updateRole(role, Roles._convertToNewRole(role))
-      }
-    })
-
-    Meteor.users.find().forEach(function (user, index, cursor) {
-      if (!Roles._isNewField(user.roles)) {
-        updateUser(
-          user,
-          Roles._convertToNewField(user.roles, convertUnderscoresToDots)
-        )
-      }
-    })
-  },
-
-  /**
-   * Moves the assignments from `Meteor.users` to `Meteor.roleAssignment`.
-   *
-   * @method _forwardMigrate2
-   * @param {Object} userSelector An opportunity to share the work among instances. It's advisable to do the division based on user-id.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _forwardMigrate2: function (userSelector) {
-    userSelector = userSelector || {}
-    Object.assign(userSelector, { roles: { $ne: null } })
-
-    Meteor.users.find(userSelector).forEach(function (user, index) {
-      user.roles
-        .filter((r) => r.assigned)
-        .forEach((r) => {
-          // Added `ifExists` to make it less error-prone
-          Roles._addUserToRole(user._id, r._id, {
-            scope: r.scope,
-            ifExists: true
-          })
-        })
-
-      Meteor.users.update({ _id: user._id }, { $unset: { roles: '' } })
-    })
-
-    // No need to keep the indexes around
-    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1')
-    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1')
-  },
-
-  /**
-   * Migrates `Meteor.users` and `Meteor.roles` to the old format.
-   *
-   * We assume that we are converting back a failed migration, so values can only be
-   * what were valid values in the old format. So no group names starting with `$` and
-   * no subroles.
-   *
-   * @method _backwardMigrate
-   * @param {Function} updateUser Function which updates the user object. Default `_defaultUpdateUser`.
-   * @param {Function} updateRole Function which updates the role object. Default `_defaultUpdateRole`.
-   * @param {Boolean} usingGroups Should we use groups or not.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _backwardMigrate: function (updateUser, updateRole, usingGroups) {
-    updateUser = updateUser || Roles._defaultUpdateUser
-    updateRole = updateRole || Roles._defaultUpdateRole
-
-    Roles._dropCollectionIndex(Meteor.users, 'roles._id_1_roles.scope_1')
-    Roles._dropCollectionIndex(Meteor.users, 'roles.scope_1')
-
-    Meteor.roles.find().forEach(function (role, index, cursor) {
-      if (!Roles._isOldRole(role)) {
-        updateRole(role, Roles._convertToOldRole(role))
-      }
-    })
-
-    Meteor.users.find().forEach(function (user, index, cursor) {
-      if (!Roles._isOldField(user.roles)) {
-        updateUser(user, Roles._convertToOldField(user.roles, usingGroups))
-      }
-    })
-  },
-
-  /**
-   * Moves the assignments from `Meteor.roleAssignment` back to to `Meteor.users`.
-   *
-   * @method _backwardMigrate2
-   * @param {Object} assignmentSelector An opportunity to share the work among instances. It's advisable to do the division based on user-id.
-   * @for Roles
-   * @private
-   * @static
-   */
-  _backwardMigrate2: function (assignmentSelector) {
-    assignmentSelector = assignmentSelector || {}
-
-    if (Meteor.users.createIndex) {
-      Meteor.users.createIndex({ 'roles._id': 1, 'roles.scope': 1 })
-      Meteor.users.createIndex({ 'roles.scope': 1 })
-    } else {
-      Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
-      Meteor.users._ensureIndex({ 'roles.scope': 1 })
-    }
-
-    Meteor.roleAssignment.find(assignmentSelector).forEach((r) => {
-      const roles = Meteor.users.findOne({ _id: r.user._id }).roles || []
-
-      const currentRole = roles.find(
-        (oldRole) => oldRole._id === r.role._id && oldRole.scope === r.scope
-      )
-      if (currentRole) {
-        currentRole.assigned = true
-      } else {
-        roles.push({
-          _id: r.role._id,
-          scope: r.scope,
-          assigned: true
-        })
-
-        r.inheritedRoles.forEach((inheritedRole) => {
-          const currentInheritedRole = roles.find(
-            (oldRole) =>
-              oldRole._id === inheritedRole._id && oldRole.scope === r.scope
-          )
-
-          if (!currentInheritedRole) {
-            roles.push({
-              _id: inheritedRole._id,
-              scope: r.scope,
-              assigned: false
-            })
-          }
-        })
-      }
-
-      Meteor.users.update({ _id: r.user._id }, { $set: { roles } })
-      Meteor.roleAssignment.remove({ _id: r._id })
-    })
-  }
-})
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 84e8808f3f..317feebc7f 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -5,7 +5,7 @@ import { Meteor } from 'meteor/meteor'
 import { assert } from 'chai'
 
 // To ensure that the files are loaded for coverage
-import '../roles_common'
+import '../roles_client'
 
 const safeInsert = (collection, data) => {
   try {
diff --git a/roles/tests/clientAsync.js b/roles/tests/clientAsync.js
index ce1575e47f..4e00c78cf2 100644
--- a/roles/tests/clientAsync.js
+++ b/roles/tests/clientAsync.js
@@ -6,7 +6,8 @@ import chai, { assert } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 
 // To ensure that the files are loaded for coverage
-import '../roles_common'
+import '../roles_client'
+import '../roles_common_async'
 
 chai.use(chaiAsPromised)
 
diff --git a/roles/tests/server.js b/roles/tests/server.js
deleted file mode 100644
index 5ed65b56a4..0000000000
--- a/roles/tests/server.js
+++ /dev/null
@@ -1,2281 +0,0 @@
-/* eslint-env mocha */
-/* global Roles */
-
-import { Meteor } from 'meteor/meteor'
-import { assert } from 'chai'
-
-// To ensure that the files are loaded for coverage
-import '../roles_server'
-import '../roles_common'
-
-// To allow inserting on the client, needed for testing.
-Meteor.roleAssignment.allow({
-  insert () { return true },
-  update () { return true },
-  remove () { return true }
-})
-
-const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)
-
-describe('roles', function () {
-  let users = {}
-  const roles = ['admin', 'editor', 'user']
-
-  Meteor.publish('_roleAssignments', function () {
-    const loggedInUserId = this.userId
-
-    if (!loggedInUserId) {
-      this.ready()
-      return
-    }
-
-    return Meteor.roleAssignment.find({ _id: loggedInUserId })
-  })
-
-  function addUser (name) {
-    return Meteor.users.insert({ username: name })
-  }
-
-  function testUser (username, expectedRoles, scope) {
-    const userId = users[username]
-    const userObj = Meteor.users.findOne({ _id: userId })
-
-    // check using user ids (makes db calls)
-    _innerTest(userId, username, expectedRoles, scope)
-
-    // check using passed-in user object
-    _innerTest(userObj, username, expectedRoles, scope)
-  }
-
-  function _innerTest (userParam, username, expectedRoles, scope) {
-    // test that user has only the roles expected and no others
-    roles.forEach(function (role) {
-      const expected = expectedRoles.includes(role)
-      const msg = username + ' expected to have \'' + role + '\' role but does not'
-      const nmsg = username + ' had the following un-expected role: ' + role
-
-      if (expected) {
-        assert.isTrue(Roles.userIsInRole(userParam, role, scope), msg)
-      } else {
-        assert.isFalse(Roles.userIsInRole(userParam, role, scope), nmsg)
-      }
-    })
-  }
-
-  beforeEach(function () {
-    Meteor.roles.remove({})
-    Meteor.roleAssignment.remove({})
-    Meteor.users.remove({})
-
-    users = {
-      eve: addUser('eve'),
-      bob: addUser('bob'),
-      joe: addUser('joe')
-    }
-  })
-
-  it('can create and delete roles', function () {
-    const role1Id = Roles.createRole('test1')
-    assert.equal(Meteor.roles.findOne()._id, 'test1')
-    assert.equal(Meteor.roles.findOne(role1Id)._id, 'test1')
-
-    const role2Id = Roles.createRole('test2')
-    assert.equal(Meteor.roles.findOne({ _id: 'test2' })._id, 'test2')
-    assert.equal(Meteor.roles.findOne(role2Id)._id, 'test2')
-
-    assert.equal(Meteor.roles.find().count(), 2)
-
-    Roles.deleteRole('test1')
-    assert.equal(typeof Meteor.roles.findOne({ _id: 'test1' }), 'undefined')
-
-    Roles.deleteRole('test2')
-    assert.equal(typeof Meteor.roles.findOne(), 'undefined')
-  })
-
-  it('can try to remove non-existing roles without crashing', function () {
-    Roles.deleteRole('non-existing-role')
-  })
-
-  it('can\'t create duplicate roles', function () {
-    Roles.createRole('test1')
-    assert.throws(function () { Roles.createRole('test1') })
-    assert.isNull(Roles.createRole('test1', { unlessExists: true }))
-  })
-
-  it('can\'t create role with empty names', function () {
-    assert.throws(function () {
-      Roles.createRole('')
-    }, /Invalid role name/)
-    assert.throws(function () {
-      Roles.createRole(null)
-    }, /Invalid role name/)
-    assert.throws(function () {
-      Roles.createRole(' ')
-    }, /Invalid role name/)
-    assert.throws(function () {
-      Roles.createRole(' foobar')
-    }, /Invalid role name/)
-    assert.throws(function () {
-      Roles.createRole(' foobar ')
-    }, /Invalid role name/)
-  })
-
-  it('can\'t use invalid scope names', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], '')
-    }, /Invalid scope name/)
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' ')
-    }, /Invalid scope name/)
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar')
-    }, /Invalid scope name/)
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], ' foobar ')
-    }, /Invalid scope name/)
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin', 'user'], 42)
-    }, /Invalid scope name/)
-  })
-
-  it('can check if user is in role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-
-    testUser('eve', ['admin', 'user'])
-  })
-
-  it('can check if user is in role by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
-
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin', 'user'], { anyScope: true }))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], { anyScope: true }))
-  })
-
-  it('can check if user is in role by scope through options', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], { scope: 'scope1' })
-    Roles.addUsersToRoles(users.eve, ['editor'], { scope: 'scope2' })
-
-    testUser('eve', ['admin', 'user'], { scope: 'scope1' })
-    testUser('eve', ['editor'], { scope: 'scope2' })
-  })
-
-  it('can check if user is in role by scope with global role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, ['user'], 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['editor'], 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], 'scope2'))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], 'scope1'))
-
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin']))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
-  })
-
-  it('renaming scopes', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-
-    Roles.renameScope('scope1', 'scope3')
-
-    testUser('eve', ['admin', 'user'], 'scope3')
-    testUser('eve', ['editor'], 'scope2')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
-
-    assert.throws(function () {
-      Roles.renameScope('scope3')
-    }, /Invalid scope name/)
-
-    Roles.renameScope('scope3', null)
-
-    testUser('eve', ['admin', 'user', 'editor'], 'scope2')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin']))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['user']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['admin'], null))
-    assert.isTrue(Roles.userIsInRole(users.eve, ['user'], null))
-
-    Roles.renameScope(null, 'scope2')
-
-    testUser('eve', ['admin', 'user', 'editor'], 'scope2')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user']))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['editor'], null))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin'], null))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['user'], null))
-  })
-
-  it('removing scopes', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['editor'], 'scope2')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-
-    Roles.removeScope('scope1')
-
-    testUser('eve', ['editor'], 'scope2')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, ['admin', 'user'], 'scope2'))
-  })
-
-  it('can check if non-existant user is in role', function () {
-    assert.isFalse(Roles.userIsInRole('1', 'admin'))
-  })
-
-  it('can check if null user is in role', function () {
-    assert.isFalse(Roles.userIsInRole(null, 'admin'))
-  })
-
-  it('can check user against several roles at once', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    const user = Meteor.users.findOne({ _id: users.eve })
-
-    // we can check the non-existing role
-    assert.isTrue(Roles.userIsInRole(user, ['editor', 'admin']))
-  })
-
-  it('can\'t add non-existent user to role', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(['1'], ['admin'])
-    assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
-  })
-
-  it('can\'t add user to non-existent role', function () {
-    assert.throws(function () {
-      Roles.addUsersToRoles(users.eve, ['admin'])
-    }, /Role 'admin' does not exist/)
-    Roles.addUsersToRoles(users.eve, ['admin'], { ifExists: true })
-  })
-
-  it('can\'t set non-existent user to role', function () {
-    Roles.createRole('admin')
-
-    Roles.setUserRoles(['1'], ['admin'])
-    assert.equal(Meteor.users.findOne({ _id: '1' }), undefined)
-  })
-
-  it('can\'t set user to non-existent role', function () {
-    assert.throws(function () {
-      Roles.setUserRoles(users.eve, ['admin'])
-    }, /Role 'admin' does not exist/)
-    Roles.setUserRoles(users.eve, ['admin'], { ifExists: true })
-  })
-
-  it('can add individual users to roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', [])
-    testUser('joe', [])
-
-    Roles.addUsersToRoles(users.joe, ['editor', 'user'])
-
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', [])
-    testUser('joe', ['editor', 'user'])
-  })
-
-  it('can add individual users to roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', [], 'scope1')
-    testUser('joe', [], 'scope1')
-
-    testUser('eve', [], 'scope2')
-    testUser('bob', [], 'scope2')
-    testUser('joe', [], 'scope2')
-
-    Roles.addUsersToRoles(users.joe, ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.bob, ['editor', 'user'], 'scope2')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', [], 'scope1')
-    testUser('joe', ['editor', 'user'], 'scope1')
-
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['editor', 'user'], 'scope2')
-    testUser('joe', [], 'scope2')
-  })
-
-  it('can add user to roles via user object', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const eve = Meteor.users.findOne({ _id: users.eve })
-    const bob = Meteor.users.findOne({ _id: users.bob })
-
-    Roles.addUsersToRoles(eve, ['admin', 'user'])
-
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', [])
-    testUser('joe', [])
-
-    Roles.addUsersToRoles(bob, ['editor'])
-
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', ['editor'])
-    testUser('joe', [])
-  })
-
-  it('can add user to roles multiple times', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', [])
-    testUser('joe', [])
-
-    Roles.addUsersToRoles(users.bob, ['admin'])
-    Roles.addUsersToRoles(users.bob, ['editor'])
-
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', ['admin', 'editor'])
-    testUser('joe', [])
-  })
-
-  it('can add user to roles multiple times by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'], 'scope1')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', [], 'scope1')
-    testUser('joe', [], 'scope1')
-
-    Roles.addUsersToRoles(users.bob, ['admin'], 'scope1')
-    Roles.addUsersToRoles(users.bob, ['editor'], 'scope1')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', ['admin', 'editor'], 'scope1')
-    testUser('joe', [], 'scope1')
-  })
-
-  it('can add multiple users to roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'])
-
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', ['admin', 'user'])
-    testUser('joe', [])
-
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'])
-
-    testUser('eve', ['admin', 'user'])
-    testUser('bob', ['admin', 'editor', 'user'])
-    testUser('joe', ['editor', 'user'])
-  })
-
-  it('can add multiple users to roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.addUsersToRoles([users.eve, users.bob], ['admin', 'user'], 'scope1')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', ['admin', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-
-    testUser('eve', [], 'scope2')
-    testUser('bob', [], 'scope2')
-    testUser('joe', [], 'scope2')
-
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor', 'user'], 'scope2')
-
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('bob', ['admin', 'editor', 'user'], 'scope1')
-    testUser('joe', ['editor', 'user'], 'scope1')
-
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['editor', 'user'], 'scope2')
-    testUser('joe', ['editor', 'user'], 'scope2')
-  })
-
-  it('can remove individual users from roles', function () {
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser('eve', ['editor'])
-    testUser('bob', ['editor', 'user'])
-  })
-
-  it('can remove user from roles multiple times', function () {
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser('eve', ['editor'])
-    testUser('bob', ['editor', 'user'])
-
-    // try remove again
-    Roles.removeUsersFromRoles(users.eve, ['user'])
-    testUser('eve', ['editor'])
-  })
-
-  it('can remove users from roles via user object', function () {
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const eve = Meteor.users.findOne({ _id: users.eve })
-    const bob = Meteor.users.findOne({ _id: users.bob })
-
-    // remove user role - one user
-    Roles.addUsersToRoles([eve, bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-    Roles.removeUsersFromRoles(eve, ['user'])
-    testUser('eve', ['editor'])
-    testUser('bob', ['editor', 'user'])
-  })
-
-  it('can remove individual users from roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
-
-    Roles.removeUsersFromRoles(users.eve, ['user'], 'scope1')
-    testUser('eve', ['editor'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
-  })
-
-  it('can remove individual users from roles by scope through options', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], { scope: 'scope1' })
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], { scope: 'scope2' })
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
-
-    Roles.removeUsersFromRoles(users.eve, ['user'], { scope: 'scope1' })
-    testUser('eve', ['editor'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
-  })
-
-  it('can remove multiple users from roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    // remove user role - two users
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-
-    assert.isFalse(Roles.userIsInRole(users.joe, 'admin'))
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin', 'user'])
-    testUser('bob', ['admin', 'user', 'editor'])
-    testUser('joe', ['admin', 'user'])
-    Roles.removeUsersFromRoles([users.bob, users.joe], ['admin'])
-    testUser('bob', ['user', 'editor'])
-    testUser('joe', ['user'])
-  })
-
-  it('can remove multiple users from roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope2')
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
-
-    Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], 'scope1')
-    testUser('eve', ['editor'], 'scope1')
-    testUser('bob', ['editor'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
-
-    Roles.removeUsersFromRoles([users.joe, users.bob], ['admin'], 'scope2')
-    testUser('eve', [], 'scope2')
-    testUser('bob', [], 'scope2')
-    testUser('joe', [], 'scope2')
-  })
-
-  it('can remove multiple users from roles of any scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    // remove user role - one user
-    Roles.addUsersToRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.joe, users.bob], ['user'], 'scope2')
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['user'], 'scope2')
-    testUser('joe', ['user'], 'scope2')
-
-    Roles.removeUsersFromRoles([users.eve, users.bob], ['user'], { anyScope: true })
-    testUser('eve', ['editor'], 'scope1')
-    testUser('bob', ['editor'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', [], 'scope2')
-    testUser('joe', ['user'], 'scope2')
-  })
-
-  it('can set user roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const eve = Meteor.users.findOne({ _id: users.eve })
-    const bob = Meteor.users.findOne({ _id: users.bob })
-
-    Roles.setUserRoles([users.eve, bob], ['editor', 'user'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['editor', 'user'])
-    testUser('joe', [])
-
-    // use addUsersToRoles add some roles
-    Roles.addUsersToRoles([bob, users.joe], ['admin'])
-    testUser('eve', ['editor', 'user'])
-    testUser('bob', ['admin', 'editor', 'user'])
-    testUser('joe', ['admin'])
-
-    Roles.setUserRoles([eve, bob], ['user'])
-    testUser('eve', ['user'])
-    testUser('bob', ['user'])
-    testUser('joe', ['admin'])
-
-    Roles.setUserRoles(bob, 'editor')
-    testUser('eve', ['user'])
-    testUser('bob', ['editor'])
-    testUser('joe', ['admin'])
-
-    Roles.setUserRoles([users.joe, users.bob], [])
-    testUser('eve', ['user'])
-    testUser('bob', [])
-    testUser('joe', [])
-  })
-
-  it('can set user roles by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const eve = Meteor.users.findOne({ _id: users.eve })
-    const bob = Meteor.users.findOne({ _id: users.bob })
-    const joe = Meteor.users.findOne({ _id: users.joe })
-
-    Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.setUserRoles([users.bob, users.joe], ['admin'], 'scope2')
-    testUser('eve', ['editor', 'user'], 'scope1')
-    testUser('bob', ['editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope2')
-
-    // use addUsersToRoles add some roles
-    Roles.addUsersToRoles([users.eve, users.bob], ['admin'], 'scope1')
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor'], 'scope2')
-    testUser('eve', ['admin', 'editor', 'user'], 'scope1')
-    testUser('bob', ['admin', 'editor', 'user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', [], 'scope2')
-    testUser('bob', ['admin', 'editor'], 'scope2')
-    testUser('joe', ['admin', 'editor'], 'scope2')
-
-    Roles.setUserRoles([eve, bob], ['user'], 'scope1')
-    Roles.setUserRoles([eve, joe], ['editor'], 'scope2')
-    testUser('eve', ['user'], 'scope1')
-    testUser('bob', ['user'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-    testUser('bob', ['admin', 'editor'], 'scope2')
-    testUser('joe', ['editor'], 'scope2')
-
-    Roles.setUserRoles(bob, 'editor', 'scope1')
-    testUser('eve', ['user'], 'scope1')
-    testUser('bob', ['editor'], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-    testUser('bob', ['admin', 'editor'], 'scope2')
-    testUser('joe', ['editor'], 'scope2')
-
-    assert.isTrue(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-    assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-
-    Roles.setUserRoles([bob, users.joe], [], 'scope1')
-    testUser('eve', ['user'], 'scope1')
-    testUser('bob', [], 'scope1')
-    testUser('joe', [], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
-    testUser('bob', ['admin', 'editor'], 'scope2')
-    testUser('joe', ['editor'], 'scope2')
-
-    // When roles in a given scope are removed, we do not want any dangling database content for that scope.
-    assert.isFalse(Roles.getRolesForUser(users.bob, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-    assert.isFalse(Roles.getRolesForUser(users.joe, { anyScope: true, fullObjects: true }).map(r => r.scope).includes('scope1'))
-  })
-
-  it('can set user roles by scope including GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-    Roles.createRole('editor')
-
-    const eve = Meteor.users.findOne({ _id: users.eve })
-
-    Roles.addUsersToRoles(eve, 'admin', Roles.GLOBAL_SCOPE)
-    testUser('eve', ['admin'], 'scope1')
-    testUser('eve', ['admin'])
-
-    Roles.setUserRoles(eve, 'editor', Roles.GLOBAL_SCOPE)
-    testUser('eve', ['editor'], 'scope2')
-    testUser('eve', ['editor'])
-  })
-
-  it('can set user roles by scope and anyScope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('editor')
-
-    const eve = Meteor.users.findOne({ _id: users.eve })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-
-    Roles.addUsersToRoles(eve, 'admin')
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    Roles.setUserRoles(eve, 'editor', { anyScope: true, scope: 'scope2' })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'editor' },
-      scope: 'scope2',
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'editor' }]
-    }])
-  })
-
-  it('can get all roles', function () {
-    roles.forEach(function (role) {
-      Roles.createRole(role)
-    })
-
-    // compare roles, sorted alphabetically
-    const expected = roles
-    const actual = Roles.getAllRoles().fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    assert.sameMembers(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
-  })
-
-  it('get an empty list of roles for an empty user', function () {
-    assert.sameMembers(Roles.getRolesForUser(undefined), [])
-    assert.sameMembers(Roles.getRolesForUser(null), [])
-    assert.sameMembers(Roles.getRolesForUser({}), [])
-  })
-
-  it('get an empty list of roles for non-existant user', function () {
-    assert.sameMembers(Roles.getRolesForUser('1'), [])
-    assert.sameMembers(Roles.getRolesForUser('1', 'scope1'), [])
-  })
-
-  it('can get all roles for user', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    const userId = users.eve
-    let userObj
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId), [])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj), [])
-
-    Roles.addUsersToRoles(userId, ['admin', 'user'])
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId), ['admin', 'user'])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj), ['admin', 'user'])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }])
-  })
-
-  it('can get all roles for user by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    const userId = users.eve
-    let userObj
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), [])
-
-    // add roles
-    Roles.addUsersToRoles(userId, ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles(userId, ['admin'], 'scope2')
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope2'), ['admin'])
-    assert.sameMembers(Roles.getRolesForUser(userId), [])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope2'), ['admin'])
-    assert.sameMembers(Roles.getRolesForUser(userObj), [])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    Roles.createRole('PERMISSION')
-    Roles.addRolesToParent('PERMISSION', 'user')
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
-    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2' }), ['admin'])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
-
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { fullObjects: true, anyScope: true, onlyAssigned: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(Roles.getRolesForUser(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
-  })
-
-  it('can get only scoped roles for user', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    const userId = users.eve
-
-    // add roles
-    Roles.addUsersToRoles(userId, ['user'], 'scope1')
-    Roles.addUsersToRoles(userId, ['admin'])
-
-    Roles.createRole('PERMISSION')
-    Roles.addRolesToParent('PERMISSION', 'user')
-
-    assert.sameMembers(Roles.getRolesForUser(userId, { onlyScoped: true, scope: 'scope1' }), ['user', 'PERMISSION'])
-    assert.sameMembers(Roles.getRolesForUser(userId, { onlyScoped: true, onlyAssigned: true, scope: 'scope1' }), ['user'])
-    assert.sameDeepMembers(Roles.getRolesForUser(userId, { onlyScoped: true, fullObjects: true, scope: 'scope1' }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-  })
-
-  it('can get all roles for user by scope with periods in name', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
-
-    assert.sameMembers(Roles.getRolesForUser(users.joe, 'example.k12.va.us'), ['admin'])
-  })
-
-  it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope1')
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['editor', 'admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor', 'admin', 'user'])
-    assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
-  })
-
-  it('getRolesForUser should not return null entries if user has no roles for scope', function () {
-    Roles.createRole('editor')
-
-    const userId = users.eve
-    let userObj
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), [])
-    assert.sameMembers(Roles.getRolesForUser(userId), [])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), [])
-    assert.sameMembers(Roles.getRolesForUser(userObj), [])
-
-    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-
-    // by userId
-    assert.sameMembers(Roles.getRolesForUser(userId, 'scope1'), ['editor'])
-    assert.sameMembers(Roles.getRolesForUser(userId), ['editor'])
-
-    // by user object
-    userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getRolesForUser(userObj, 'scope1'), ['editor'])
-    assert.sameMembers(Roles.getRolesForUser(userObj), ['editor'])
-  })
-
-  it('getRolesForUser should not fail during a call of addUsersToRoles', function () {
-    Roles.createRole('editor')
-
-    const userId = users.eve
-    const promises = []
-    const interval = setInterval(() => {
-      promises.push(Promise.resolve().then(() => { Roles.getRolesForUser(userId) }))
-    }, 0)
-
-    Roles.addUsersToRoles([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-    clearInterval(interval)
-
-    return Promise.all(promises)
-  })
-
-  it('returns an empty list of scopes for null as user-id', function () {
-    assert.sameMembers(Roles.getScopesForUser(undefined), [])
-    assert.sameMembers(Roles.getScopesForUser(null), [])
-    assert.sameMembers(Roles.getScopesForUser('foo'), [])
-    assert.sameMembers(Roles.getScopesForUser({}), [])
-    assert.sameMembers(Roles.getScopesForUser({ _id: 'foo' }), [])
-  })
-
-  it('can get all scopes for user', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'], 'scope2')
-
-    // by userId
-    assert.sameMembers(Roles.getScopesForUser(userId), ['scope1', 'scope2'])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj), ['scope1', 'scope2'])
-  })
-
-  it('can get all scopes for user by role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
-
-    // by userId
-    assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
-  })
-
-  it('getScopesForUser returns [] when not using scopes', function () {
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'])
-
-    // by userId
-    assert.sameMembers(Roles.getScopesForUser(userId), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), [])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), [])
-  })
-
-  it('can get all groups for user by role array', function () {
-    const userId = users.eve
-
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.createRole('moderator')
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles([users.eve], ['editor'], 'group1')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'group2')
-    Roles.addUsersToRoles([users.eve], ['moderator'], 'group3')
-
-    // by userId, one role
-    assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['group2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['group1', 'group2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
-
-    // by userId, multiple roles
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'user']), ['group1', 'group2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'moderator']), ['group2', 'group3'])
-
-    // by user object, one role
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['group2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['group1', 'group2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
-
-    // by user object, multiple roles
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'user']), ['group1', 'group2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'moderator']), ['group2', 'group3'])
-  })
-
-  it('getting all scopes for user does not include GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    const userId = users.eve
-
-    Roles.addUsersToRoles([users.eve], ['editor'], 'scope1')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user'], 'scope2')
-    Roles.addUsersToRoles([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
-
-    // by userId
-    assert.sameMembers(Roles.getScopesForUser(userId, 'user'), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, 'admin'), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['user']), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['editor']), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['admin']), [])
-    assert.sameMembers(Roles.getScopesForUser(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-
-    // by user object
-    const userObj = Meteor.users.findOne({ _id: userId })
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'user'), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, 'admin'), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['user']), ['scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['editor']), ['scope1', 'scope2'])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['admin']), [])
-    assert.sameMembers(Roles.getScopesForUser(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-  })
-
-  it('can get all users in role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'])
-    Roles.addUsersToRoles([users.bob, users.joe], ['editor'])
-
-    const expected = [users.eve, users.joe]
-    const actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-  })
-
-  it('can get all users in role by scope', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-    let expected = [users.eve, users.joe]
-    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.joe]
-    actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.bob, users.joe]
-    actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-
-    actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-    assert.sameMembers(actual, [])
-  })
-
-  it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    Roles.addUsersToRoles([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-    let expected = [users.eve]
-    let actual = Roles.getUsersInRole('admin', 'scope1').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.bob, users.joe]
-    actual = Roles.getUsersInRole('admin', 'scope2').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve]
-    actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.bob, users.joe]
-    actual = Roles.getUsersInRole('admin', { anyScope: true }).fetch().map(r => r._id)
-
-    assert.sameMembers(actual, expected)
-  })
-
-  it('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
-    Roles.addUsersToRoles([users.bob], ['admin'], 'scope1')
-
-    let expected = [users.eve]
-    let actual = Roles.getUsersInRole('admin').fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-
-    expected = [users.eve, users.bob]
-    actual = Roles.getUsersInRole('admin', { scope: 'scope1' }).fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-
-    expected = [users.bob]
-    actual = Roles.getUsersInRole('admin', { scope: 'scope1', onlyScoped: true }).fetch().map(r => r._id)
-    assert.sameMembers(actual, expected)
-  })
-
-  it('can get all users in role by scope and passes through mongo query arguments', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-
-    Roles.addUsersToRoles([users.eve, users.joe], ['admin', 'user'], 'scope1')
-    Roles.addUsersToRoles([users.bob, users.joe], ['admin'], 'scope2')
-
-    const results = Roles.getUsersInRole('admin', 'scope1', { fields: { username: 0 }, limit: 1 }).fetch()
-
-    assert.equal(1, results.length)
-    assert.isTrue(hasProp(results[0], '_id'))
-    assert.isFalse(hasProp(results[0], 'username'))
-  })
-
-  it('can use Roles.GLOBAL_SCOPE to assign blanket roles', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
-
-    testUser('eve', [], 'scope1')
-    testUser('joe', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope1')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('bob', ['admin'], 'scope1')
-
-    Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
-
-    testUser('eve', [], 'scope1')
-    testUser('joe', [], 'scope2')
-    testUser('joe', [], 'scope1')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('bob', ['admin'], 'scope1')
-  })
-
-  it('Roles.GLOBAL_SCOPE is independent of other scopes', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], 'scope5')
-    Roles.addUsersToRoles([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
-
-    testUser('eve', [], 'scope1')
-    testUser('joe', ['admin'], 'scope5')
-    testUser('joe', ['admin'], 'scope2')
-    testUser('joe', ['admin'], 'scope1')
-    testUser('bob', ['admin'], 'scope5')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('bob', ['admin'], 'scope1')
-
-    Roles.removeUsersFromRoles(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
-
-    testUser('eve', [], 'scope1')
-    testUser('joe', ['admin'], 'scope5')
-    testUser('joe', [], 'scope2')
-    testUser('joe', [], 'scope1')
-    testUser('bob', ['admin'], 'scope5')
-    testUser('bob', ['admin'], 'scope2')
-    testUser('bob', ['admin'], 'scope1')
-  })
-
-  it('Roles.GLOBAL_SCOPE also checked when scope not specified', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
-
-    testUser('joe', ['admin'])
-
-    Roles.removeUsersFromRoles(users.joe, 'admin', Roles.GLOBAL_SCOPE)
-
-    testUser('joe', [])
-  })
-
-  it('can use \'.\' in scope name', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.joe, ['admin'], 'example.com')
-    testUser('joe', ['admin'], 'example.com')
-  })
-
-  it('can use multiple periods in scope name', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.joe, ['admin'], 'example.k12.va.us')
-    testUser('joe', ['admin'], 'example.k12.va.us')
-  })
-
-  it('renaming of roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-
-    Roles.setUserRoles([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    Roles.setUserRoles([users.bob, users.joe], ['user', 'admin'], 'scope2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'user', 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.joe, 'user', 'scope1'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.bob, 'user', 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.joe, 'user', 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
-
-    Roles.renameRole('user', 'user2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'editor', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'editor', 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.joe, 'admin', 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.joe, 'admin', 'scope2'))
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'user2', 'scope1'))
-    assert.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.joe, 'user2', 'scope1'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user2', 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.bob, 'user2', 'scope2'))
-    assert.isTrue(Roles.userIsInRole(users.joe, 'user2', 'scope2'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'user', 'scope2'))
-  })
-
-  describe('v2 migration', function () {
-    it('migration without global groups (to v2)', function () {
-      assert.isOk(Meteor.roles.insert({ name: 'admin' }))
-      assert.isOk(Meteor.roles.insert({ name: 'editor' }))
-      assert.isOk(Meteor.roles.insert({ name: 'user' }))
-
-      assert.isOk(Meteor.users.update(users.eve, { $set: { roles: ['admin', 'editor'] } }))
-      assert.isOk(Meteor.users.update(users.bob, { $set: { roles: [] } }))
-      assert.isOk(Meteor.users.update(users.joe, { $set: { roles: ['user'] } }))
-
-      Roles._forwardMigrate()
-
-      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'admin',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'editor',
-          scope: null,
-          assigned: true
-        }]
-      })
-      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: []
-      })
-      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'user',
-          scope: null,
-          assigned: true
-        }]
-      })
-
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-        _id: 'admin',
-        children: []
-      })
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-        _id: 'editor',
-        children: []
-      })
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-        _id: 'user',
-        children: []
-      })
-
-      Roles._backwardMigrate(null, null, false)
-
-      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: ['admin', 'editor']
-      })
-      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: []
-      })
-      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: ['user']
-      })
-
-      assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-        name: 'admin'
-      })
-      assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-        name: 'editor'
-      })
-      assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-        name: 'user'
-      })
-    })
-
-    it('migration with global groups (to v2)', function () {
-      assert.isOk(Meteor.roles.insert({ name: 'admin' }))
-      assert.isOk(Meteor.roles.insert({ name: 'editor' }))
-      assert.isOk(Meteor.roles.insert({ name: 'user' }))
-
-      assert.isOk(Meteor.users.update(users.eve, { $set: { roles: { __global_roles__: ['admin', 'editor'], foo_bla: ['user'] } } }))
-      assert.isOk(Meteor.users.update(users.bob, { $set: { roles: { } } }))
-      assert.isOk(Meteor.users.update(users.joe, { $set: { roles: { __global_roles__: ['user'], foo_bla: ['user'] } } }))
-
-      Roles._forwardMigrate(null, null, false)
-
-      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'admin',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'editor',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'user',
-          scope: 'foo_bla',
-          assigned: true
-        }]
-      })
-      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: []
-      })
-      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'user',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'user',
-          scope: 'foo_bla',
-          assigned: true
-        }]
-      })
-
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-        _id: 'admin',
-        children: []
-      })
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-        _id: 'editor',
-        children: []
-      })
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-        _id: 'user',
-        children: []
-      })
-
-      Roles._backwardMigrate(null, null, true)
-
-      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: {
-          __global_roles__: ['admin', 'editor'],
-          foo_bla: ['user']
-        }
-      })
-      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: {}
-      })
-      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: {
-          __global_roles__: ['user'],
-          foo_bla: ['user']
-        }
-      })
-
-      assert.deepEqual(Meteor.roles.findOne({ name: 'admin' }, { fields: { _id: 0 } }), {
-        name: 'admin'
-      })
-      assert.deepEqual(Meteor.roles.findOne({ name: 'editor' }, { fields: { _id: 0 } }), {
-        name: 'editor'
-      })
-      assert.deepEqual(Meteor.roles.findOne({ name: 'user' }, { fields: { _id: 0 } }), {
-        name: 'user'
-      })
-
-      Roles._forwardMigrate(null, null, true)
-
-      assert.deepEqual(Meteor.users.findOne(users.eve, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'admin',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'editor',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'user',
-          scope: 'foo.bla',
-          assigned: true
-        }]
-      })
-      assert.deepEqual(Meteor.users.findOne(users.bob, { fields: { roles: 1, _id: 0 } }), {
-        roles: []
-      })
-      assert.deepEqual(Meteor.users.findOne(users.joe, { fields: { roles: 1, _id: 0 } }), {
-        roles: [{
-          _id: 'user',
-          scope: null,
-          assigned: true
-        }, {
-          _id: 'user',
-          scope: 'foo.bla',
-          assigned: true
-        }]
-      })
-
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'admin' }), {
-        _id: 'admin',
-        children: []
-      })
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'editor' }), {
-        _id: 'editor',
-        children: []
-      })
-      assert.deepEqual(Meteor.roles.findOne({ _id: 'user' }), {
-        _id: 'user',
-        children: []
-      })
-    })
-  })
-
-  describe('v3 migration', function () {
-    it('migration without global groups (to v3)')
-
-    it('migration with global groups (to v3)')
-  })
-
-  it('_addUserToRole', function () {
-    Roles.createRole('admin')
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-
-    assert.include(
-      Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
-      'insertedId'
-    )
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    assert.notInclude(
-      Object.keys(Roles._addUserToRole(users.eve, 'admin', { scope: null, ifExists: false })),
-      'insertedId'
-    )
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-  })
-
-  it('_removeUserFromRole', function () {
-    Roles.createRole('admin')
-
-    Roles.addUsersToRoles(users.eve, 'admin')
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-  })
-
-  it('keep assigned roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('ALL_PERMISSIONS')
-    Roles.createRole('VIEW_PERMISSION')
-    Roles.createRole('EDIT_PERMISSION')
-    Roles.createRole('DELETE_PERMISSION')
-    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['user'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }])
-
-    Roles.addUsersToRoles(users.eve, 'VIEW_PERMISSION')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'VIEW_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }])
-
-    Roles.removeUsersFromRoles(users.eve, 'user')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'VIEW_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }])
-
-    Roles.removeUsersFromRoles(users.eve, 'VIEW_PERMISSION')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'VIEW_PERMISSION'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [])
-  })
-
-  it('adds children of the added role to the assignments', function () {
-    Roles.createRole('admin')
-    Roles.createRole('ALBUM.ADMIN')
-    Roles.createRole('ALBUM.VIEW')
-    Roles.createRole('TRACK.ADMIN')
-    Roles.createRole('TRACK.VIEW')
-
-    Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
-    Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
-
-    Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
-
-    Roles.addRolesToParent('TRACK.ADMIN', 'admin')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
-  })
-
-  it('removes children of the removed role from the assignments', function () {
-    Roles.createRole('admin')
-    Roles.createRole('ALBUM.ADMIN')
-    Roles.createRole('ALBUM.VIEW')
-    Roles.createRole('TRACK.ADMIN')
-    Roles.createRole('TRACK.VIEW')
-
-    Roles.addRolesToParent('ALBUM.VIEW', 'ALBUM.ADMIN')
-    Roles.addRolesToParent('TRACK.VIEW', 'TRACK.ADMIN')
-
-    Roles.addRolesToParent('ALBUM.ADMIN', 'admin')
-    Roles.addRolesToParent('TRACK.ADMIN', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
-
-    Roles.removeRolesFromParent('TRACK.ADMIN', 'admin')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'TRACK.VIEW'))
-  })
-
-  it('modify assigned hierarchical roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('ALL_PERMISSIONS')
-    Roles.createRole('VIEW_PERMISSION')
-    Roles.createRole('EDIT_PERMISSION')
-    Roles.createRole('DELETE_PERMISSION')
-    Roles.addRolesToParent('ALL_PERMISSIONS', 'user')
-    Roles.addRolesToParent('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-    Roles.addRolesToParent('DELETE_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, ['user'])
-    Roles.addUsersToRoles(users.eve, ['ALL_PERMISSIONS'], 'scope')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
-      ]
-    }])
-
-    Roles.createRole('MODERATE_PERMISSION')
-
-    Roles.addRolesToParent('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
-      ]
-    }])
-
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'admin' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }])
-
-    Roles.addRolesToParent('DELETE_PERMISSION', 'ALL_PERMISSIONS')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'admin' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }])
-
-    Roles.removeUsersFromRoles(users.eve, ['admin'])
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }])
-
-    Roles.deleteRole('ALL_PERMISSIONS')
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'DELETE_PERMISSION', 'scope'))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' }
-      ]
-    }])
-  })
-
-  it('delete role with overlapping hierarchical roles', function () {
-    Roles.createRole('role1')
-    Roles.createRole('role2')
-    Roles.createRole('COMMON_PERMISSION_1')
-    Roles.createRole('COMMON_PERMISSION_2')
-    Roles.createRole('COMMON_PERMISSION_3')
-    Roles.createRole('EXTRA_PERMISSION_ROLE_1')
-    Roles.createRole('EXTRA_PERMISSION_ROLE_2')
-
-    Roles.addRolesToParent('COMMON_PERMISSION_1', 'role1')
-    Roles.addRolesToParent('COMMON_PERMISSION_2', 'role1')
-    Roles.addRolesToParent('COMMON_PERMISSION_3', 'role1')
-    Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_1', 'role1')
-
-    Roles.addRolesToParent('COMMON_PERMISSION_1', 'role2')
-    Roles.addRolesToParent('COMMON_PERMISSION_2', 'role2')
-    Roles.addRolesToParent('COMMON_PERMISSION_3', 'role2')
-    Roles.addRolesToParent('EXTRA_PERMISSION_ROLE_2', 'role2')
-
-    Roles.addUsersToRoles(users.eve, 'role1')
-    Roles.addUsersToRoles(users.eve, 'role2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }, {
-      role: { _id: 'role2' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role2' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_2' }
-      ]
-    }])
-
-    Roles.removeUsersFromRoles(users.eve, 'role2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }])
-
-    Roles.addUsersToRoles(users.eve, 'role2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }, {
-      role: { _id: 'role2' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role2' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_2' }
-      ]
-    }])
-
-    Roles.deleteRole('role2')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }])
-  })
-
-  it('set parent on assigned role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('EDIT_PERMISSION')
-
-    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-
-    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
-
-  it('remove parent on assigned role', function () {
-    Roles.createRole('admin')
-    Roles.createRole('EDIT_PERMISSION')
-
-    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-
-    Roles.removeRolesFromParent('EDIT_PERMISSION', 'admin')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
-
-  it('adding and removing extra role parents', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('EDIT_PERMISSION')
-
-    Roles.addRolesToParent('EDIT_PERMISSION', 'admin')
-
-    Roles.addUsersToRoles(users.eve, 'EDIT_PERMISSION')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-
-    Roles.addRolesToParent('EDIT_PERMISSION', 'user')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-
-    Roles.removeRolesFromParent('EDIT_PERMISSION', 'user')
-
-    assert.isTrue(Roles.userIsInRole(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(Roles.userIsInRole(users.eve, 'admin'))
-
-    assert.sameDeepMembers(Roles.getRolesForUser(users.eve, { anyScope: true, fullObjects: true }).map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
-
-  it('cyclic roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('editor')
-    Roles.createRole('user')
-
-    Roles.addRolesToParent('editor', 'admin')
-    Roles.addRolesToParent('user', 'editor')
-
-    assert.throws(function () {
-      Roles.addRolesToParent('admin', 'user')
-    }, /form a cycle/)
-  })
-
-  it('userIsInRole returns false for unknown roles', function () {
-    Roles.createRole('admin')
-    Roles.createRole('user')
-    Roles.createRole('editor')
-    Roles.addUsersToRoles(users.eve, ['admin', 'user'])
-    Roles.addUsersToRoles(users.eve, ['editor'])
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'unknown'))
-    assert.isFalse(Roles.userIsInRole(users.eve, []))
-    assert.isFalse(Roles.userIsInRole(users.eve, null))
-    assert.isFalse(Roles.userIsInRole(users.eve, undefined))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, 'unknown', { anyScope: true }))
-    assert.isFalse(Roles.userIsInRole(users.eve, [], { anyScope: true }))
-    assert.isFalse(Roles.userIsInRole(users.eve, null, { anyScope: true }))
-    assert.isFalse(Roles.userIsInRole(users.eve, undefined, { anyScope: true }))
-
-    assert.isFalse(Roles.userIsInRole(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
-  })
-
-  it('userIsInRole returns false if user is a function', function () {
-    Roles.createRole('admin')
-    Roles.addUsersToRoles(users.eve, ['admin'])
-
-    assert.isFalse(Roles.userIsInRole(() => {}, 'admin'))
-  })
-
-  describe('isParentOf', function () {
-    it('returns false for unknown roles', function () {
-      Roles.createRole('admin')
-
-      assert.isFalse(Roles.isParentOf('admin', 'unknown'))
-      assert.isFalse(Roles.isParentOf('admin', null))
-      assert.isFalse(Roles.isParentOf('admin', undefined))
-
-      assert.isFalse(Roles.isParentOf('unknown', 'admin'))
-      assert.isFalse(Roles.isParentOf(null, 'admin'))
-      assert.isFalse(Roles.isParentOf(undefined, 'admin'))
-    })
-
-    it('returns false if role is not parent of', function () {
-      Roles.createRole('admin')
-      Roles.createRole('editor')
-      Roles.createRole('user')
-      Roles.addRolesToParent(['editor'], 'admin')
-      Roles.addRolesToParent(['user'], 'editor')
-
-      assert.isFalse(Roles.isParentOf('user', 'admin'))
-      assert.isFalse(Roles.isParentOf('editor', 'admin'))
-    })
-
-    it('returns true if role is parent of the demanded role', function () {
-      Roles.createRole('admin')
-      Roles.createRole('editor')
-      Roles.createRole('user')
-      Roles.addRolesToParent(['editor'], 'admin')
-      Roles.addRolesToParent(['user'], 'editor')
-
-      assert.isTrue(Roles.isParentOf('admin', 'user'))
-      assert.isTrue(Roles.isParentOf('editor', 'user'))
-      assert.isTrue(Roles.isParentOf('admin', 'editor'))
-
-      assert.isTrue(Roles.isParentOf('admin', 'admin'))
-      assert.isTrue(Roles.isParentOf('editor', 'editor'))
-      assert.isTrue(Roles.isParentOf('user', 'user'))
-    })
-  })
-})
diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index 8d118aef84..9c7ac4e536 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -6,8 +6,7 @@ import chai, { assert } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 
 // To ensure that the files are loaded for coverage
-import '../roles_server'
-import '../roles_common'
+import '../roles_common_async'
 
 chai.use(chaiAsPromised)
 

From 5f3485b031c3c9cce79b58d9de958e5911d7120a Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 17:11:44 +0200
Subject: [PATCH 0468/1140] Fix lint tests

---
 roles/roles_client.js | 2 +-
 roles/roles_server.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index afb80711fd..84aeff805e 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -1,4 +1,4 @@
-/* global Meteor, Roles */
+/* global Roles */
 import { Meteor } from 'meteor/meteor'
 
 /**
diff --git a/roles/roles_server.js b/roles/roles_server.js
index ead157fb26..0bf50828f7 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -3,13 +3,14 @@ import { Meteor } from 'meteor/meteor'
 const indexFnAssignment = Meteor.roleAssignment.createIndexAsync.bind(Meteor.roleAssignment)
 const indexFnRoles = Meteor.roles.createIndexAsync.bind(Meteor.roles)
 
-[
+const indexes = [
   { 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 },
   { 'user._id': 1, 'role._id': 1, scope: 1 },
   { 'role._id': 1 },
   { scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }, // Adding userId and roleId might speed up other queries depending on the first index
   { 'inheritedRoles._id': 1 }
-].forEach(index => indexFnAssignment(index))
+]
+indexes.forEach(index => indexFnAssignment(index))
 indexFnRoles({ 'children._id': 1 })
 
 /*

From a5614b99ad1d1184e45a5b1c531cba646c03908f Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 17:14:30 +0200
Subject: [PATCH 0469/1140] Add Meteor 3.0-beta.7 to the test suite

---
 .github/workflows/testsuite.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 410363ac45..1af3a6124a 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -17,15 +17,15 @@ jobs:
       - name: setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: cache dependencies
         uses: actions/cache@v3
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-16-
+            ${{ runner.os }}-node-20-
 
       - run: cd testapp && npm ci && npm run setup && npm run lint
 
@@ -36,8 +36,9 @@ jobs:
     strategy:
       matrix:
         meteorRelease:
-          - '2.8.0'
-          - '2.14'
+          - '2.8.1'
+          - '2.15'
+          - '3.0-beta.7'
           # Latest version
     steps:
       - name: Checkout code
@@ -46,7 +47,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Setup meteor ${{ matrix.meteorRelease }}
         uses: meteorengineer/setup-meteor@v1
@@ -57,8 +58,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-16-
+            ${{ runner.os }}-node-20-
 
       - run: cd testapp && npm ci && npm run setup && npm run test

From ee76581dd0ded02a48e886e3c5ab1fa8911496ff Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 17:15:44 +0200
Subject: [PATCH 0470/1140] Remove sync tests from package.js

---
 package.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.js b/package.js
index 498bc07514..0614addaf1 100644
--- a/package.js
+++ b/package.js
@@ -56,7 +56,6 @@ Package.onTest(function (api) {
     'mongo'
   ], both)
 
-  api.addFiles('roles/tests/server.js', 'server')
   api.addFiles('roles/tests/serverAsync.js', 'server')
   api.addFiles('roles/tests/client.js', 'client')
   api.addFiles('roles/tests/clientAsync.js', 'client')

From d371fedd4180f809f5ebf8b546e21d00027f5bdb Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 17:22:51 +0200
Subject: [PATCH 0471/1140] Fix missing _getParentRoleNames in async common

---
 History.md                  | 2 +-
 roles/roles_common_async.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index 300ea913d9..ba92c4e320 100644
--- a/History.md
+++ b/History.md
@@ -3,7 +3,7 @@
 ## v4.0.0
 
 * BREAKING: Synchronous functions are now available only on client side
-* * BREAKING: Migration functions for past versions are no longer available
+* BREAKING: Migration functions for past versions are no longer available
 * UI Helpers now use `console.debug` for debugging messages
 * `RolesCollection` and `RoleAssignmentsCollection` can now be exported in addition to being accessed via `Meteor.roles` and `Meteor.roleAssignment`
 
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index b6cf119ace..860bf685a5 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -138,7 +138,7 @@ Object.assign(Roles, {
 
     do {
       // For all roles who have it as a dependency ...
-      roles = Roles._getParentRoleNames(
+      roles = await Roles._getParentRoleNamesAsync(
         await Meteor.roles.findOneAsync({ _id: roleName })
       )
 
@@ -652,9 +652,9 @@ Object.assign(Roles, {
    * Returns an array of role names the given role name is a child of.
    *
    * @example
-   *     Roles._getParentRoleNames({ _id: 'admin', children; [] })
+   *     Roles._getParentRoleNamesAsync({ _id: 'admin', children; [] })
    *
-   * @method _getParentRoleNames
+   * @method _getParentRoleNamesAsync
    * @param {object} role The role object
    * @returns {Promise}
    * @private

From 9ea1ea0e88826a4181f5a0ab1af6119da0ab94cb Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 17:27:03 +0200
Subject: [PATCH 0472/1140] _addUserToRole async fix

---
 roles/roles_common_async.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 860bf685a5..141a4a2ace 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -547,7 +547,7 @@ Object.assign(Roles, {
 
       // and then add all
       for (const role of roles) {
-        await Roles._addUserToRole(id, role, options)
+        await Roles._addUserToRoleAsync(id, role, options)
       }
     }
   },
@@ -555,7 +555,7 @@ Object.assign(Roles, {
   /**
    * Add one user to one role.
    *
-   * @method _addUserToRole
+   * @method _addUserToRoleAsync
    * @param {String} userId The user ID.
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:

From 87dd82ba9e92db8927adde3dc5b8c8209fb31ec4 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 17:29:31 +0200
Subject: [PATCH 0473/1140] Fix _removeUserFromRole async version in tests

---
 roles/roles_common_async.js | 2 +-
 roles/tests/serverAsync.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 141a4a2ace..0a16136692 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -763,7 +763,7 @@ Object.assign(Roles, {
   /**
    * Remove one user from one role.
    *
-   * @method _removeUserFromRole
+   * @method _removeUserFromRoleAsync
    * @param {String} userId The user ID.
    * @param {String} roleName Name of the role to add the user to. The role have to exist.
    * @param {Object} options Options:
diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index 9c7ac4e536..47c55cf2d1 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -1484,7 +1484,7 @@ describe('roles async', async function () {
       inheritedRoles: [{ _id: 'admin' }]
     }])
 
-    Roles._removeUserFromRole(users.eve, 'admin', { scope: null })
+    await Roles._removeUserFromRoleAsync(users.eve, 'admin', { scope: null })
 
     const rolesForUser2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
     assert.sameDeepMembers(rolesForUser2.map(obj => { delete obj._id; return obj }), [])

From 8c479ecb7a3ef3067cff67009fedfd2a6e22275d Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 8 Apr 2024 17:42:57 +0200
Subject: [PATCH 0474/1140] Published alanning:roles@4.0.0-alpha.1

---
 .versions | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.versions b/.versions
index b6e310e1b0..3e6c79d16b 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
-accounts-base@2.2.9
-alanning:roles@3.6.2
+accounts-base@2.2.10
+alanning:roles@4.0.0-alpha.1
 allow-deny@1.1.1
 babel-compiler@7.10.5
 babel-runtime@1.5.1
@@ -27,10 +27,10 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@4.1.0
 lmieulet:meteor-legacy-coverage@0.1.0
-local-test:alanning:roles@3.6.2
+local-test:alanning:roles@4.0.0-alpha.1
 localstorage@1.2.0
 logging@1.3.3
-meteor@1.11.4
+meteor@1.11.5
 meteortesting:browser-tests@1.4.2
 meteortesting:mocha@2.1.0
 meteortesting:mocha-core@8.0.1
@@ -55,8 +55,8 @@ routepolicy@1.1.1
 socket-stream-client@0.5.2
 tracker@1.3.3
 typescript@4.9.5
-underscore@1.0.13
+underscore@1.6.0
 url@1.3.2
-webapp@1.13.6
+webapp@1.13.8
 webapp-hashing@1.1.1
-zodern:types@1.0.11
+zodern:types@1.0.13

From 7a6131efc84adfda4bb9a1eb0644a43318304a0e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <jdvorak@literaryuniverse.com>
Date: Sat, 4 May 2024 23:47:59 +0200
Subject: [PATCH 0475/1140] Add missing ddp dependency & update Blaze

---
 History.md | 5 +++++
 package.js | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 2cc8b6414c..d45eb74813 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.6.3
+
+* Added missing dependency on the `ddp` package [@storytellercz](https://github.com/sponsors/StorytellerCZ)
+* Updated Blaze weak dependency to v2.9 [@storytellercz](https://github.com/sponsors/StorytellerCZ)
+
 ## v3.6.2
 
 * Fixed TypeScript definition to play nice with Meteor definition [#389](https://github.com/Meteor-Community-Packages/meteor-roles/pull/389) [@bruceborrett](https://github.com/sponsors/bruceborrett)
diff --git a/package.js b/package.js
index b7b66da830..c450fa0ffc 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.6.2',
+  version: '3.6.3',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
@@ -17,12 +17,13 @@ Package.onUse(function (api) {
     'accounts-base',
     'tracker',
     'mongo',
-    'check'
+    'check',
+    'ddp'
   ], both)
 
   api.use('zodern:types@1.0.11')
 
-  api.use(['blaze@2.7.1'], 'client', { weak: true })
+  api.use(['blaze@2.9.0'], 'client', { weak: true })
 
   api.export('Roles')
 

From ac92c9b6de33916a42f7a44f2406911f3f007905 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <jdvorak@literaryuniverse.com>
Date: Sat, 4 May 2024 23:51:35 +0200
Subject: [PATCH 0476/1140] Add missing ddp dependency

---
 package.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.js b/package.js
index 0614addaf1..e596728baa 100644
--- a/package.js
+++ b/package.js
@@ -17,7 +17,8 @@ Package.onUse(function (api) {
     'accounts-base',
     'tracker',
     'mongo',
-    'check'
+    'check',
+    'ddp'
   ], both)
 
   api.use('zodern:types@1.0.13')

From c70d7878c19dd393dc65cb9e4172c33497a09bae Mon Sep 17 00:00:00 2001
From: Jan Dvorak <jdvorak@literaryuniverse.com>
Date: Sat, 4 May 2024 23:52:01 +0200
Subject: [PATCH 0477/1140] 4.0-alpha.2 release prep

---
 package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.js b/package.js
index e596728baa..7e044fbc3c 100644
--- a/package.js
+++ b/package.js
@@ -2,13 +2,13 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '4.0.0-alpha.1',
+  version: '4.0.0-alpha.2',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['2.8.1', '3.0-beta.7'])
+  api.versionsFrom(['2.8.1', '3.0-rc.0'])
 
   const both = ['client', 'server']
 

From 54130f46b26286c147a1682923c76d88ac423c32 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <jdvorak@literaryuniverse.com>
Date: Sat, 4 May 2024 23:53:29 +0200
Subject: [PATCH 0478/1140] Published alanning:roles@4.0.0-alpha.3

---
 .versions  | 4 ++--
 package.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index 3e6c79d16b..2a70a936e5 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@2.2.10
-alanning:roles@4.0.0-alpha.1
+alanning:roles@4.0.0-alpha.3
 allow-deny@1.1.1
 babel-compiler@7.10.5
 babel-runtime@1.5.1
@@ -27,7 +27,7 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@4.1.0
 lmieulet:meteor-legacy-coverage@0.1.0
-local-test:alanning:roles@4.0.0-alpha.1
+local-test:alanning:roles@4.0.0-alpha.3
 localstorage@1.2.0
 logging@1.3.3
 meteor@1.11.5
diff --git a/package.js b/package.js
index 7e044fbc3c..2ec145c75a 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '4.0.0-alpha.2',
+  version: '4.0.0-alpha.3',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From a29d818aa01d93e1da47445514cdfad281bb29ae Mon Sep 17 00:00:00 2001
From: Jan Dvorak <jdvorak@literaryuniverse.com>
Date: Sat, 4 May 2024 23:58:10 +0200
Subject: [PATCH 0479/1140] Update test suite to use 3.0-rc.0

---
 .github/workflows/testsuite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 1af3a6124a..393f8e6025 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -38,7 +38,7 @@ jobs:
         meteorRelease:
           - '2.8.1'
           - '2.15'
-          - '3.0-beta.7'
+          - '3.0-rc.0'
           # Latest version
     steps:
       - name: Checkout code

From 0a09132828e2affda7b12c651483d23a9a73e98e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <jdvorak@literaryuniverse.com>
Date: Sun, 5 May 2024 10:10:42 +0200
Subject: [PATCH 0480/1140] Published alanning:roles@3.6.3

---
 .versions | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.versions b/.versions
index b6e310e1b0..ecae2125c0 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
-accounts-base@2.2.9
-alanning:roles@3.6.2
+accounts-base@2.2.10
+alanning:roles@3.6.3
 allow-deny@1.1.1
 babel-compiler@7.10.5
 babel-runtime@1.5.1
@@ -27,10 +27,10 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@4.1.0
 lmieulet:meteor-legacy-coverage@0.1.0
-local-test:alanning:roles@3.6.2
+local-test:alanning:roles@3.6.3
 localstorage@1.2.0
 logging@1.3.3
-meteor@1.11.4
+meteor@1.11.5
 meteortesting:browser-tests@1.4.2
 meteortesting:mocha@2.1.0
 meteortesting:mocha-core@8.0.1
@@ -55,8 +55,8 @@ routepolicy@1.1.1
 socket-stream-client@0.5.2
 tracker@1.3.3
 typescript@4.9.5
-underscore@1.0.13
+underscore@1.6.0
 url@1.3.2
-webapp@1.13.6
+webapp@1.13.8
 webapp-hashing@1.1.1
 zodern:types@1.0.11

From 72c343bdbc06a656e0edec356a27625f1e53a7bd Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 6 May 2024 17:39:20 +0200
Subject: [PATCH 0481/1140] Use collections directly internally

---
 roles/roles_client.js       | 84 +++++++++++++++----------------
 roles/roles_common_async.js | 98 ++++++++++++++++++-------------------
 roles/roles_server.js       |  5 +-
 3 files changed, 95 insertions(+), 92 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index 84aeff805e..abe4de70ee 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -1,6 +1,8 @@
 /* global Roles */
 import { Meteor } from 'meteor/meteor'
 
+import { RolesCollection, RoleAssignmentCollection } from './roles_common_async'
+
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
@@ -15,7 +17,7 @@ import { Meteor } from 'meteor/meteor'
  *
  * Example: `{_id: 'admin', children: [{_id: 'editor'}]}`
  *
- * The assignment of a role to a user is stored in a collection, accessible through `Meteor.roleAssignment`.
+ * The assignment of a role to a user is stored in a collection, accessible through `RoleAssignmentCollection`.
  * It's documents consist of
  *  - `_id`: Internal MongoDB id
  *  - `role`: A role object which got assigned. Usually only contains the `_id` property
@@ -63,7 +65,7 @@ Object.assign(Roles, {
       unlessExists: false
     }, options)
 
-    const result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
+    const result = RolesCollection.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
 
     if (!result.insertedId) {
       if (options.unlessExists) return null
@@ -89,16 +91,16 @@ Object.assign(Roles, {
     Roles._checkRoleName(roleName)
 
     // Remove all assignments
-    Meteor.roleAssignment.remove({
+    RoleAssignmentCollection.remove({
       'role._id': roleName
     })
 
     do {
       // For all roles who have it as a dependency ...
-      roles = Roles._getParentRoleNames(Meteor.roles.findOne({ _id: roleName }))
+      roles = Roles._getParentRoleNames(RolesCollection.findOne({ _id: roleName }))
 
-      Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
-        Meteor.roles.update({
+      RolesCollection.find({ _id: { $in: roles } }).fetch().forEach(r => {
+        RolesCollection.update({
           _id: r._id
         }, {
           $pull: {
@@ -108,8 +110,8 @@ Object.assign(Roles, {
           }
         })
 
-        inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
-        Meteor.roleAssignment.update({
+        inheritedRoles = Roles._getInheritedRoleNames(RolesCollection.findOne({ _id: r._id }))
+        RoleAssignmentCollection.update({
           'role._id': r._id
         }, {
           $set: {
@@ -120,7 +122,7 @@ Object.assign(Roles, {
     } while (roles.length > 0)
 
     // And finally remove the role itself
-    Meteor.roles.remove({ _id: roleName })
+    RolesCollection.remove({ _id: roleName })
   },
 
   /**
@@ -139,7 +141,7 @@ Object.assign(Roles, {
 
     if (oldName === newName) return
 
-    const role = Meteor.roles.findOne({ _id: oldName })
+    const role = RolesCollection.findOne({ _id: oldName })
 
     if (!role) {
       throw new Error('Role \'' + oldName + '\' does not exist.')
@@ -147,10 +149,10 @@ Object.assign(Roles, {
 
     role._id = newName
 
-    Meteor.roles.insert(role)
+    RolesCollection.insert(role)
 
     do {
-      count = Meteor.roleAssignment.update({
+      count = RoleAssignmentCollection.update({
         'role._id': oldName
       }, {
         $set: {
@@ -160,7 +162,7 @@ Object.assign(Roles, {
     } while (count > 0)
 
     do {
-      count = Meteor.roleAssignment.update({
+      count = RoleAssignmentCollection.update({
         'inheritedRoles._id': oldName
       }, {
         $set: {
@@ -170,7 +172,7 @@ Object.assign(Roles, {
     } while (count > 0)
 
     do {
-      count = Meteor.roles.update({
+      count = RolesCollection.update({
         'children._id': oldName
       }, {
         $set: {
@@ -179,7 +181,7 @@ Object.assign(Roles, {
       }, { multi: true })
     } while (count > 0)
 
-    Meteor.roles.remove({ _id: oldName })
+      RolesCollection.remove({ _id: oldName })
   },
 
   /**
@@ -214,7 +216,7 @@ Object.assign(Roles, {
     Roles._checkRoleName(parentName)
 
     // query to get role's children
-    const role = Meteor.roles.findOne({ _id: roleName })
+    const role = RolesCollection.findOne({ _id: roleName })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
@@ -225,7 +227,7 @@ Object.assign(Roles, {
       throw new Error('Roles \'' + roleName + '\' and \'' + parentName + '\' would form a cycle.')
     }
 
-    const count = Meteor.roles.update({
+    const count = RolesCollection.update({
       _id: parentName,
       'children._id': {
         $ne: role._id
@@ -242,7 +244,7 @@ Object.assign(Roles, {
     // already a subrole; in any case we do not have anything more to do
     if (!count) return
 
-    Meteor.roleAssignment.update({
+    RoleAssignmentCollection.update({
       'inheritedRoles._id': parentName
     }, {
       $push: {
@@ -284,13 +286,13 @@ Object.assign(Roles, {
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
+    const role = RolesCollection.findOne({ _id: roleName }, { fields: { _id: 1 } })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
     }
 
-    const count = Meteor.roles.update({
+    const count = RolesCollection.update({
       _id: parentName
     }, {
       $pull: {
@@ -305,11 +307,11 @@ Object.assign(Roles, {
     if (!count) return
 
     // For all roles who have had it as a dependency ...
-    const roles = [...Roles._getParentRoleNames(Meteor.roles.findOne({ _id: parentName })), parentName]
+    const roles = [...Roles._getParentRoleNames(RolesCollection.findOne({ _id: parentName })), parentName]
 
-    Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
-      const inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
-      Meteor.roleAssignment.update({
+    RolesCollection.find({ _id: { $in: roles } }).fetch().forEach(r => {
+      const inheritedRoles = Roles._getInheritedRoleNames(RolesCollection.findOne({ _id: r._id }))
+      RoleAssignmentCollection.update({
         'role._id': r._id,
         'inheritedRoles._id': role._id
       }, {
@@ -425,7 +427,7 @@ Object.assign(Roles, {
         selector.scope = options.scope
       }
 
-      Meteor.roleAssignment.remove(selector)
+      RoleAssignmentCollection.remove(selector)
 
       // and then add all
       roles.forEach(function (role) {
@@ -454,7 +456,7 @@ Object.assign(Roles, {
       return
     }
 
-    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
+    const role = RolesCollection.findOne({ _id: roleName }, { fields: { children: 1 } })
 
     if (!role) {
       if (options.ifExists) {
@@ -465,7 +467,7 @@ Object.assign(Roles, {
     }
 
     // This might create duplicates, because we don't have a unique index, but that's all right. In case there are two, withdrawing the role will effectively kill them both.
-    const res = Meteor.roleAssignment.upsert({
+    const res = RoleAssignmentCollection.upsert({
       'user._id': userId,
       'role._id': roleName,
       scope: options.scope
@@ -478,7 +480,7 @@ Object.assign(Roles, {
     })
 
     if (res.insertedId) {
-      Meteor.roleAssignment.update({ _id: res.insertedId }, {
+      RoleAssignmentCollection.update({ _id: res.insertedId }, {
         $set: {
           inheritedRoles: [roleName, ...Roles._getInheritedRoleNames(role)].map(r => ({ _id: r }))
         }
@@ -507,7 +509,7 @@ Object.assign(Roles, {
     const parentRoles = new Set([role._id])
 
     parentRoles.forEach(roleName => {
-      Meteor.roles.find({ 'children._id': roleName }).fetch().forEach(parentRole => {
+      RolesCollection.find({ 'children._id': roleName }).fetch().forEach(parentRole => {
         parentRoles.add(parentRole._id)
       })
     })
@@ -533,7 +535,7 @@ Object.assign(Roles, {
     const nestedRoles = new Set([role])
 
     nestedRoles.forEach(r => {
-      const roles = Meteor.roles.find({ _id: { $in: r.children.map(r => r._id) } }, { fields: { children: 1 } }).fetch()
+      const roles = RolesCollection.find({ _id: { $in: r.children.map(r => r._id) } }, { fields: { children: 1 } }).fetch()
 
       roles.forEach(r2 => {
         inheritedRoles.add(r2._id)
@@ -617,7 +619,7 @@ Object.assign(Roles, {
       selector.scope = options.scope
     }
 
-    Meteor.roleAssignment.remove(selector)
+    RoleAssignmentCollection.remove(selector)
   },
 
   /**
@@ -684,7 +686,7 @@ Object.assign(Roles, {
     return roles.some((roleName) => {
       selector['inheritedRoles._id'] = roleName
 
-      return Meteor.roleAssignment.find(selector, { limit: 1 }).count() > 0
+      return RoleAssignmentCollection.find(selector, { limit: 1 }).count() > 0
     })
   },
 
@@ -748,7 +750,7 @@ Object.assign(Roles, {
       delete filter.fields
     }
 
-    const roles = Meteor.roleAssignment.find(selector, filter).fetch()
+    const roles = RoleAssignmentCollection.find(selector, filter).fetch()
 
     if (options.fullObjects) {
       return roles
@@ -769,14 +771,14 @@ Object.assign(Roles, {
    *
    * @method getAllRoles
    * @param {Object} queryOptions Options which are passed directly
-   *                                through to `Meteor.roles.find(query, options)`.
+   *                                through to `RolesCollection.find(query, options)`.
    * @return {Cursor} Cursor of existing roles.
    * @static
    */
   getAllRoles: function (queryOptions) {
     queryOptions = queryOptions || { sort: { _id: 1 } }
 
-    return Meteor.roles.find({}, queryOptions)
+    return RolesCollection.find({}, queryOptions)
   },
 
   /**
@@ -824,7 +826,7 @@ Object.assign(Roles, {
    *     roles will also be checked
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *   - `queryOptions`: options which are passed directly
-   *     through to `Meteor.roleAssignment.find(query, options)`
+   *     through to `RoleAssignmentCollection.find(query, options)`
    *
    * Alternatively, it can be a scope name string.
    * @return {Cursor} Cursor of user assignments for roles.
@@ -854,7 +856,7 @@ Object.assign(Roles, {
    *
    * Alternatively, it can be a scope name string.
    * @param {Object} [filter] Options which are passed directly
-   *                                through to `Meteor.roleAssignment.find(query, options)`
+   *                                through to `RoleAssignmentCollection.find(query, options)`
    * @return {Object} Cursor to the assignment documents
    * @private
    * @static
@@ -886,7 +888,7 @@ Object.assign(Roles, {
       }
     }
 
-    return Meteor.roleAssignment.find(selector, filter)
+    return RoleAssignmentCollection.find(selector, filter)
   },
 
   /**
@@ -937,7 +939,7 @@ Object.assign(Roles, {
       selector['inheritedRoles._id'] = { $in: roles }
     }
 
-    const scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
+    const scopes = RoleAssignmentCollection.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
 
     return [...new Set(scopes)]
   },
@@ -961,7 +963,7 @@ Object.assign(Roles, {
     if (oldName === newName) return
 
     do {
-      count = Meteor.roleAssignment.update({
+      count = RoleAssignmentCollection.update({
         scope: oldName
       }, {
         $set: {
@@ -983,7 +985,7 @@ Object.assign(Roles, {
   removeScope: function (name) {
     Roles._checkScopeName(name)
 
-    Meteor.roleAssignment.remove({ scope: name })
+    RoleAssignmentCollection.remove({ scope: name })
   },
 
   /**
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 0a16136692..c63c91ef55 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -92,16 +92,16 @@ Object.assign(Roles, {
 
     let insertedId = null
 
-    const existingRole = await Meteor.roles.findOneAsync({ _id: roleName })
+    const existingRole = await RolesCollection.findOneAsync({ _id: roleName })
 
     if (existingRole) {
-      await Meteor.roles.updateAsync(
+      await RolesCollection.updateAsync(
         { _id: roleName },
         { $setOnInsert: { children: [] } }
       )
       return null
     } else {
-      insertedId = await Meteor.roles.insertAsync({
+      insertedId = await RolesCollection.insertAsync({
         _id: roleName,
         children: []
       })
@@ -132,20 +132,20 @@ Object.assign(Roles, {
     Roles._checkRoleName(roleName)
 
     // Remove all assignments
-    await Meteor.roleAssignment.removeAsync({
+    await RoleAssignmentCollection.removeAsync({
       'role._id': roleName
     })
 
     do {
       // For all roles who have it as a dependency ...
       roles = await Roles._getParentRoleNamesAsync(
-        await Meteor.roles.findOneAsync({ _id: roleName })
+        await RolesCollection.findOneAsync({ _id: roleName })
       )
 
-      for (const r of await Meteor.roles
+      for (const r of await RolesCollection
         .find({ _id: { $in: roles } })
         .fetchAsync()) {
-        await Meteor.roles.updateAsync(
+        await RolesCollection.updateAsync(
           {
             _id: r._id
           },
@@ -159,9 +159,9 @@ Object.assign(Roles, {
         )
 
         inheritedRoles = await Roles._getInheritedRoleNamesAsync(
-          await Meteor.roles.findOneAsync({ _id: r._id })
+          await RolesCollection.findOneAsync({ _id: r._id })
         )
-        await Meteor.roleAssignment.updateAsync(
+        await RoleAssignmentCollection.updateAsync(
           {
             'role._id': r._id
           },
@@ -178,7 +178,7 @@ Object.assign(Roles, {
     } while (roles.length > 0)
 
     // And finally remove the role itself
-    await Meteor.roles.removeAsync({ _id: roleName })
+    await RolesCollection.removeAsync({ _id: roleName })
   },
 
   /**
@@ -198,7 +198,7 @@ Object.assign(Roles, {
 
     if (oldName === newName) return
 
-    const role = await Meteor.roles.findOneAsync({ _id: oldName })
+    const role = await RolesCollection.findOneAsync({ _id: oldName })
 
     if (!role) {
       throw new Error("Role '" + oldName + "' does not exist.")
@@ -206,10 +206,10 @@ Object.assign(Roles, {
 
     role._id = newName
 
-    await Meteor.roles.insertAsync(role)
+    await RolesCollection.insertAsync(role)
 
     do {
-      count = await Meteor.roleAssignment.updateAsync(
+      count = await RoleAssignmentCollection.updateAsync(
         {
           'role._id': oldName
         },
@@ -223,7 +223,7 @@ Object.assign(Roles, {
     } while (count > 0)
 
     do {
-      count = await Meteor.roleAssignment.updateAsync(
+      count = await RoleAssignmentCollection.updateAsync(
         {
           'inheritedRoles._id': oldName
         },
@@ -237,7 +237,7 @@ Object.assign(Roles, {
     } while (count > 0)
 
     do {
-      count = await Meteor.roles.updateAsync(
+      count = await RolesCollection.updateAsync(
         {
           'children._id': oldName
         },
@@ -250,7 +250,7 @@ Object.assign(Roles, {
       )
     } while (count > 0)
 
-    await Meteor.roles.removeAsync({ _id: oldName })
+    await RolesCollection.removeAsync({ _id: oldName })
   },
 
   /**
@@ -287,7 +287,7 @@ Object.assign(Roles, {
     Roles._checkRoleName(parentName)
 
     // query to get role's children
-    const role = await Meteor.roles.findOneAsync({ _id: roleName })
+    const role = await RolesCollection.findOneAsync({ _id: roleName })
 
     if (!role) {
       throw new Error("Role '" + roleName + "' does not exist.")
@@ -300,7 +300,7 @@ Object.assign(Roles, {
       )
     }
 
-    const count = await Meteor.roles.updateAsync(
+    const count = await RolesCollection.updateAsync(
       {
         _id: parentName,
         'children._id': {
@@ -320,7 +320,7 @@ Object.assign(Roles, {
     // already a sub-role; in any case we do not have anything more to do
     if (!count) return
 
-    await Meteor.roleAssignment.updateAsync(
+    await RoleAssignmentCollection.updateAsync(
       {
         'inheritedRoles._id': parentName
       },
@@ -373,7 +373,7 @@ Object.assign(Roles, {
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    const role = await Meteor.roles.findOneAsync(
+    const role = await RolesCollection.findOneAsync(
       { _id: roleName },
       { fields: { _id: 1 } }
     )
@@ -382,7 +382,7 @@ Object.assign(Roles, {
       throw new Error("Role '" + roleName + "' does not exist.")
     }
 
-    const count = await Meteor.roles.updateAsync(
+    const count = await RolesCollection.updateAsync(
       {
         _id: parentName
       },
@@ -402,18 +402,18 @@ Object.assign(Roles, {
     // For all roles who have had it as a dependency ...
     const roles = [
       ...(await Roles._getParentRoleNamesAsync(
-        await Meteor.roles.findOneAsync({ _id: parentName })
+        await RolesCollection.findOneAsync({ _id: parentName })
       )),
       parentName
     ]
 
-    for (const r of await Meteor.roles
+    for (const r of await RolesCollection
       .find({ _id: { $in: roles } })
       .fetchAsync()) {
       const inheritedRoles = await Roles._getInheritedRoleNamesAsync(
-        await Meteor.roles.findOneAsync({ _id: r._id })
+        await RolesCollection.findOneAsync({ _id: r._id })
       )
-      await Meteor.roleAssignment.updateAsync(
+      await RoleAssignmentCollection.updateAsync(
         {
           'role._id': r._id,
           'inheritedRoles._id': role._id
@@ -543,7 +543,7 @@ Object.assign(Roles, {
         selector.scope = options.scope
       }
 
-      await Meteor.roleAssignment.removeAsync(selector)
+      await RoleAssignmentCollection.removeAsync(selector)
 
       // and then add all
       for (const role of roles) {
@@ -573,7 +573,7 @@ Object.assign(Roles, {
       return
     }
 
-    const role = await Meteor.roles.findOneAsync(
+    const role = await RolesCollection.findOneAsync(
       { _id: roleName },
       { fields: { children: 1 } }
     )
@@ -588,7 +588,7 @@ Object.assign(Roles, {
 
     // This might create duplicates, because we don't have a unique index, but that's all right. In case there are two, withdrawing the role will effectively kill them both.
     // TODO revisit this
-    /* const res = await Meteor.roleAssignment.upsertAsync(
+    /* const res = await RoleAssignmentCollection.upsertAsync(
       {
         "user._id": userId,
         "role._id": roleName,
@@ -602,7 +602,7 @@ Object.assign(Roles, {
         },
       }
     ); */
-    const existingAssignment = await Meteor.roleAssignment.findOneAsync({
+    const existingAssignment = await RoleAssignmentCollection.findOneAsync({
       'user._id': userId,
       'role._id': roleName,
       scope: options.scope
@@ -611,7 +611,7 @@ Object.assign(Roles, {
     let insertedId
     let res
     if (existingAssignment) {
-      await Meteor.roleAssignment.updateAsync(existingAssignment._id, {
+      await RoleAssignmentCollection.updateAsync(existingAssignment._id, {
         $set: {
           user: { _id: userId },
           role: { _id: roleName },
@@ -619,9 +619,9 @@ Object.assign(Roles, {
         }
       })
 
-      res = await Meteor.roleAssignment.findOneAsync(existingAssignment._id)
+      res = await RoleAssignmentCollection.findOneAsync(existingAssignment._id)
     } else {
-      insertedId = await Meteor.roleAssignment.insertAsync({
+      insertedId = await RoleAssignmentCollection.insertAsync({
         user: { _id: userId },
         role: { _id: roleName },
         scope: options.scope
@@ -629,7 +629,7 @@ Object.assign(Roles, {
     }
 
     if (insertedId) {
-      await Meteor.roleAssignment.updateAsync(
+      await RoleAssignmentCollection.updateAsync(
         { _id: insertedId },
         {
           $set: {
@@ -641,7 +641,7 @@ Object.assign(Roles, {
         }
       )
 
-      res = await Meteor.roleAssignment.findOneAsync({ _id: insertedId })
+      res = await RoleAssignmentCollection.findOneAsync({ _id: insertedId })
     }
     res.insertedId = insertedId // For backward compatibility
 
@@ -668,7 +668,7 @@ Object.assign(Roles, {
     const parentRoles = new Set([role._id])
 
     for (const roleName of parentRoles) {
-      for (const parentRole of await Meteor.roles
+      for (const parentRole of await RolesCollection
         .find({ 'children._id': roleName })
         .fetchAsync()) {
         parentRoles.add(parentRole._id)
@@ -697,7 +697,7 @@ Object.assign(Roles, {
     const nestedRoles = new Set([role])
 
     for (const r of nestedRoles) {
-      const roles = await Meteor.roles
+      const roles = await RolesCollection
         .find(
           { _id: { $in: r.children.map((r) => r._id) } },
           { fields: { children: 1 } }
@@ -788,7 +788,7 @@ Object.assign(Roles, {
       selector.scope = options.scope
     }
 
-    await Meteor.roleAssignment.removeAsync(selector)
+    await RoleAssignmentCollection.removeAsync(selector)
   },
 
   /**
@@ -861,7 +861,7 @@ Object.assign(Roles, {
     const res = await asyncSome(roles, async (roleName) => {
       selector['inheritedRoles._id'] = roleName
       const out =
-        (await Meteor.roleAssignment
+        (await RoleAssignmentCollection
           .find(selector, { limit: 1 })
           .countAsync()) > 0
       return out
@@ -935,7 +935,7 @@ Object.assign(Roles, {
       delete filter.fields
     }
 
-    const roles = await Meteor.roleAssignment.find(selector, filter).fetchAsync()
+    const roles = await RoleAssignmentCollection.find(selector, filter).fetchAsync()
 
     if (options.fullObjects) {
       return roles
@@ -960,14 +960,14 @@ Object.assign(Roles, {
    *
    * @method getAllRoles
    * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to `Meteor.roles.find(query, options)`.
+   *                                through to `RolesCollection.find(query, options)`.
    * @return {Cursor} Cursor of existing roles.
    * @static
    */
   getAllRoles: function (queryOptions) {
     queryOptions = queryOptions || { sort: { _id: 1 } }
 
-    return Meteor.roles.find({}, queryOptions)
+    return RolesCollection.find({}, queryOptions)
   },
 
   /**
@@ -1020,7 +1020,7 @@ Object.assign(Roles, {
    *     roles will also be checked
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    *   - `queryOptions`: options which are passed directly
-   *     through to `Meteor.roleAssignment.find(query, options)`
+   *     through to `RoleAssignmentCollection.find(query, options)`
 
    * Alternatively, it can be a scope name string.
    * @return {Cursor} Cursor of user assignments for roles.
@@ -1053,7 +1053,7 @@ Object.assign(Roles, {
    *
    * Alternatively, it can be a scope name string.
    * @param {Object} [filter] Options which are passed directly
-   *                                through to `Meteor.roleAssignment.find(query, options)`
+   *                                through to `RoleAssignmentCollection.find(query, options)`
    * @return {Object} Cursor to the assignment documents
    * @private
    * @static
@@ -1093,7 +1093,7 @@ Object.assign(Roles, {
       }
     }
 
-    return Meteor.roleAssignment.find(selector, filter)
+    return RoleAssignmentCollection.find(selector, filter)
   },
 
   /**
@@ -1149,7 +1149,7 @@ Object.assign(Roles, {
     }
 
     const scopes = (
-      await Meteor.roleAssignment
+      await RoleAssignmentCollection
         .find(selector, { fields: { scope: 1 } })
         .fetchAsync()
     ).map((obi) => obi.scope)
@@ -1177,7 +1177,7 @@ Object.assign(Roles, {
     if (oldName === newName) return
 
     do {
-      count = await Meteor.roleAssignment.updateAsync(
+      count = await RoleAssignmentCollection.updateAsync(
         {
           scope: oldName
         },
@@ -1204,7 +1204,7 @@ Object.assign(Roles, {
   removeScopeAsync: async function (name) {
     Roles._checkScopeName(name)
 
-    await Meteor.roleAssignment.removeAsync({ scope: name })
+    await RoleAssignmentCollection.removeAsync({ scope: name })
   },
 
   /**
@@ -1256,7 +1256,7 @@ Object.assign(Roles, {
         return true
       }
 
-      const role = await Meteor.roles.findOneAsync({ _id: roleName })
+      const role = await RolesCollection.findOneAsync({ _id: roleName })
 
       // This should not happen, but this is a problem to address at some other time.
       if (!role) continue
@@ -1309,7 +1309,7 @@ Object.assign(Roles, {
   /**
    * Throw an exception if `scopeName` is an invalid scope name.
    *
-   * @method _checkRoleName
+   * @method _checkScopeName
    * @param {String} scopeName A scope name to match against.
    * @private
    * @static
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 0bf50828f7..90c8578517 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor'
+import { RolesCollection, RoleAssignmentCollection } from './roles_common_async'
 
-const indexFnAssignment = Meteor.roleAssignment.createIndexAsync.bind(Meteor.roleAssignment)
-const indexFnRoles = Meteor.roles.createIndexAsync.bind(Meteor.roles)
+const indexFnAssignment = RoleAssignmentCollection.createIndexAsync.bind(RoleAssignmentCollection)
+const indexFnRoles = RolesCollection.createIndexAsync.bind(RolesCollection)
 
 const indexes = [
   { 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 },

From bd27146906a827ca673190cf1b2cae0d96ac6dfd Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 8 Jun 2024 08:24:56 +0200
Subject: [PATCH 0482/1140] Update Blaze dependency & Published
 alanning:roles@4.0.0-alpha.4

---
 .versions         | 22 +++++++++++-----------
 package-lock.json |  5 ++++-
 package.js        |  8 ++++----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.versions b/.versions
index 2a70a936e5..ae82041689 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
-accounts-base@2.2.10
-alanning:roles@4.0.0-alpha.3
+accounts-base@2.2.11
+alanning:roles@4.0.0-alpha.4
 allow-deny@1.1.1
 babel-compiler@7.10.5
 babel-runtime@1.5.1
@@ -7,12 +7,12 @@ base64@1.0.12
 binary-heap@1.0.11
 boilerplate-generator@1.7.2
 callback-hook@1.5.1
-check@1.3.2
+check@1.4.1
 ddp@1.4.1
-ddp-client@2.6.1
-ddp-common@1.4.0
+ddp-client@2.6.2
+ddp-common@1.4.1
 ddp-rate-limiter@1.2.1
-ddp-server@2.7.0
+ddp-server@2.7.1
 diff-sequence@1.1.2
 dynamic-import@0.7.3
 ecmascript@0.16.8
@@ -27,18 +27,18 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@4.1.0
 lmieulet:meteor-legacy-coverage@0.1.0
-local-test:alanning:roles@4.0.0-alpha.3
+local-test:alanning:roles@4.0.0-alpha.4
 localstorage@1.2.0
-logging@1.3.3
+logging@1.3.4
 meteor@1.11.5
 meteortesting:browser-tests@1.4.2
 meteortesting:mocha@2.1.0
 meteortesting:mocha-core@8.0.1
-minimongo@1.9.3
+minimongo@1.9.4
 modern-browsers@0.1.10
 modules@0.20.0
 modules-runtime@0.13.1
-mongo@1.16.8
+mongo@1.16.10
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
@@ -55,7 +55,7 @@ routepolicy@1.1.1
 socket-stream-client@0.5.2
 tracker@1.3.3
 typescript@4.9.5
-underscore@1.6.0
+underscore@1.6.1
 url@1.3.2
 webapp@1.13.8
 webapp-hashing@1.1.1
diff --git a/package-lock.json b/package-lock.json
index 48e341a095..9af4873ba1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,3 +1,6 @@
 {
-  "lockfileVersion": 1
+  "name": "meteor-roles",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
 }
diff --git a/package.js b/package.js
index c45d403c2e..33424f79fd 100644
--- a/package.js
+++ b/package.js
@@ -2,13 +2,13 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '4.0.0-alpha.3',
+  version: '4.0.0-alpha.4',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['2.8.1', '3.0-rc.0'])
+  api.versionsFrom(['2.8.1', '3.0-rc.2'])
 
   const both = ['client', 'server']
 
@@ -23,7 +23,7 @@ Package.onUse(function (api) {
 
   api.use('zodern:types@1.0.13')
 
-  api.use(['blaze@2.9.0'], 'client', { weak: true })
+  api.use(['blaze@2.9.0 || 3.0.0-rc300.2'], 'client', { weak: true })
 
   api.export(['Roles', 'RolesCollection', 'RoleAssignmentCollection'])
 
@@ -45,7 +45,7 @@ Package.onTest(function (api) {
     'meteortesting:mocha@2.1.0'
   ])
 
-  api.versionsFrom('2.8.1')
+  api.versionsFrom(['2.8.1', '3.0-rc.2'])
 
   const both = ['client', 'server']
 

From 560a265f767dac73e2da660c800566575db4e072 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 16 Jul 2024 09:06:39 +0200
Subject: [PATCH 0483/1140] Update for Meteor 3 release

Still waiting for release of Blaze 3 before final release
---
 History.md | 1 +
 package.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index b0c5c9ab79..e32c4458da 100644
--- a/History.md
+++ b/History.md
@@ -6,6 +6,7 @@
 * BREAKING: Migration functions for past versions are no longer available
 * UI Helpers now use `console.debug` for debugging messages
 * `RolesCollection` and `RoleAssignmentsCollection` can now be exported in addition to being accessed via `Meteor.roles` and `Meteor.roleAssignment`
+* Support for Meteor 3
 
 ## v3.6.3
 
diff --git a/package.js b/package.js
index 33424f79fd..2d37588a93 100644
--- a/package.js
+++ b/package.js
@@ -2,13 +2,13 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '4.0.0-alpha.4',
+  version: '4.0.0-rc.1',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['2.8.1', '3.0-rc.2'])
+  api.versionsFrom(['2.8.1', '3.0'])
 
   const both = ['client', 'server']
 
@@ -45,7 +45,7 @@ Package.onTest(function (api) {
     'meteortesting:mocha@2.1.0'
   ])
 
-  api.versionsFrom(['2.8.1', '3.0-rc.2'])
+  api.versionsFrom(['2.8.1', '3.0'])
 
   const both = ['client', 'server']
 

From c5d049cd060a4211e2c2536c70016cf43d3b1dc5 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 22 Jul 2024 15:29:43 +0200
Subject: [PATCH 0484/1140] Published alanning:roles@4.0.0-rc.2

---
 .versions  | 4 ++--
 package.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index ae82041689..bf9c9e5c2e 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@2.2.11
-alanning:roles@4.0.0-alpha.4
+alanning:roles@4.0.0-rc.2
 allow-deny@1.1.1
 babel-compiler@7.10.5
 babel-runtime@1.5.1
@@ -27,7 +27,7 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 lmieulet:meteor-coverage@4.1.0
 lmieulet:meteor-legacy-coverage@0.1.0
-local-test:alanning:roles@4.0.0-alpha.4
+local-test:alanning:roles@4.0.0-rc.2
 localstorage@1.2.0
 logging@1.3.4
 meteor@1.11.5
diff --git a/package.js b/package.js
index 2d37588a93..27511558f0 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '4.0.0-rc.1',
+  version: '4.0.0-rc.2',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From d8aea7c6eb78c56bda06ea7f4e92d51779c81061 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 22 Jul 2024 15:30:30 +0200
Subject: [PATCH 0485/1140] Update to final Blaze 3 release

---
 package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.js b/package.js
index 27511558f0..b9c3e6de48 100644
--- a/package.js
+++ b/package.js
@@ -23,7 +23,7 @@ Package.onUse(function (api) {
 
   api.use('zodern:types@1.0.13')
 
-  api.use(['blaze@2.9.0 || 3.0.0-rc300.2'], 'client', { weak: true })
+  api.use(['blaze@2.9.0 || 3.0.0'], 'client', { weak: true })
 
   api.export(['Roles', 'RolesCollection', 'RoleAssignmentCollection'])
 

From 675c0b314f8e4ebfb05e957c3bc195355818dcd2 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 22 Jul 2024 15:41:54 +0200
Subject: [PATCH 0486/1140] Lint fix

---
 roles/roles_client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index abe4de70ee..b6988ea87d 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -181,7 +181,7 @@ Object.assign(Roles, {
       }, { multi: true })
     } while (count > 0)
 
-      RolesCollection.remove({ _id: oldName })
+    RolesCollection.remove({ _id: oldName })
   },
 
   /**

From 4bb968446405c2d17bcd69e6350c8b478c8b8dab Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 22 Jul 2024 15:42:06 +0200
Subject: [PATCH 0487/1140] Update test suite versions

---
 .github/workflows/testsuite.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 393f8e6025..3bee1b7018 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -37,8 +37,8 @@ jobs:
       matrix:
         meteorRelease:
           - '2.8.1'
-          - '2.15'
-          - '3.0-rc.0'
+          - '2.16'
+          - '3.0'
           # Latest version
     steps:
       - name: Checkout code

From 75355be0009300cdc40f03600a53987aeccd0099 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 22 Jul 2024 18:02:55 +0200
Subject: [PATCH 0488/1140] Replace countAsync with countDocuments in
 userIsInRoleAsync

---
 roles/roles_common_async.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index c63c91ef55..1c8f301481 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -861,9 +861,7 @@ Object.assign(Roles, {
     const res = await asyncSome(roles, async (roleName) => {
       selector['inheritedRoles._id'] = roleName
       const out =
-        (await RoleAssignmentCollection
-          .find(selector, { limit: 1 })
-          .countAsync()) > 0
+        (await RoleAssignmentCollection.countDocuments(selector, { limit: 1 })) > 0
       return out
     })
 

From 036f001a697c82ee3fa65c907667f81be855d541 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 22:50:09 +0000
Subject: [PATCH 0489/1140] Bump actions/cache from 2 to 4

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/meteor-selftest-windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index d78f633ec3..3d1426e44e 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -45,7 +45,7 @@ jobs:
           .\scripts\windows\ci\test.ps1
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             .\dev_bundle

From 2feca06288baf4b0c42a299c76f6722cacdbbd87 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 23 Jul 2024 14:27:22 -0400
Subject: [PATCH 0490/1140] only run windows test on push for devel/v2 and on
 all pull requests

---
 .github/workflows/meteor-selftest-windows.yml | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/meteor-selftest-windows.yml

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
new file mode 100644
index 0000000000..d78f633ec3
--- /dev/null
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -0,0 +1,54 @@
+name: Meteor Selftest Windows
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+  push:
+    branches:
+      - devel
+      - 2.x.x
+
+env:
+  METEOR_PRETTY_OUTPUT: 0
+  SELF_TEST_TOOL_NODE_FLAGS: ' '
+  TOOL_NODE_FLAGS: --expose-gc
+  TIMEOUT_SCALE_FACTOR: 20
+  METEOR_HEADLESS: true
+  SELF_TEST_EXCLUDE: '^NULL-LEAVE-THIS-HERE-NULL$'
+
+jobs:
+  test:
+    runs-on: windows-2019-meteor
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 20.x
+
+      - name: Install dependencies
+        shell: pwsh
+        run: |
+          $env:PATH = "C:\Program Files\7-Zip;$env:PATH"
+          .\scripts\windows\ci\install.ps1
+
+      - name: Run tests
+        shell: pwsh
+        run: |
+          $env:PATH = "C:\Program Files\7-Zip;$env:PATH"
+          .\scripts\windows\ci\test.ps1
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            .\dev_bundle
+            .\.babel-cache
+            .\.meteor
+          key: ${{ runner.os }}-meteor-${{ hashFiles('**/package-lock.json') }}

From 046490f7ff7af5cbbcc4d2d96fd2fae7d9b44167 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 29 Jul 2024 09:27:43 -0400
Subject: [PATCH 0491/1140] add up-to-date windows scripts

---
 scripts/windows/{appveyor => ci}/install.ps1 |  5 ++---
 scripts/windows/{appveyor => ci}/test.ps1    | 17 ++---------------
 2 files changed, 4 insertions(+), 18 deletions(-)
 rename scripts/windows/{appveyor => ci}/install.ps1 (94%)
 rename scripts/windows/{appveyor => ci}/test.ps1 (53%)

diff --git a/scripts/windows/appveyor/install.ps1 b/scripts/windows/ci/install.ps1
similarity index 94%
rename from scripts/windows/appveyor/install.ps1
rename to scripts/windows/ci/install.ps1
index ced6023ad5..77b03a2de0 100644
--- a/scripts/windows/appveyor/install.ps1
+++ b/scripts/windows/ci/install.ps1
@@ -1,4 +1,4 @@
-# Appveyor already sets $PLATFORM to exactly what we don't want, so
+# Appveyor already sets $PLATFORM to exactly what we don't want, so
 # we'll prepend it with 'windows_' if that seems to be the case.
 If ($env:PLATFORM -Match '^x86|x64$') {
   $env:PLATFORM = "windows_${env:PLATFORM}"
@@ -32,9 +32,8 @@ while ($attempt -gt 0 -and -not $success) {
   } else {
     $attempt--
   }
-
 }
 
 If ($LASTEXITCODE -ne 0) {
   throw "Running .\meteor --get-ready failed three times."
-}
+}
\ No newline at end of file
diff --git a/scripts/windows/appveyor/test.ps1 b/scripts/windows/ci/test.ps1
similarity index 53%
rename from scripts/windows/appveyor/test.ps1
rename to scripts/windows/ci/test.ps1
index f8ef08707d..fb813d33fa 100644
--- a/scripts/windows/appveyor/test.ps1
+++ b/scripts/windows/ci/test.ps1
@@ -1,4 +1,4 @@
-# For now, we only have one script.
+# For now, we only have one script.
 $jUnit = Join-Path $env:TEMP 'self-test-junit-0.xml'
 
 $tests = @(
@@ -25,19 +25,6 @@ If ($selfTestExitCode -eq 0) {
   Write-Host "FAILURE! (Exit: $selfTestExitCode)" -ForegroundColor Red
 }
 
-Write-Host "Uploading JUnit test results..." -ForegroundColor Magenta
-$wc = New-Object 'System.Net.WebClient'
-Get-ChildItem $env:TEMP 'self-test-junit-*.xml' | Foreach-Object {
-  Write-Host " - $($_.FullName)" -ForegroundColor Magenta
-  Write-Host "   - as Artifact..." -ForegroundColor Magenta
-  Push-AppveyorArtifact $_.FullName
-  Write-Host "   - as Test Results..." -ForegroundColor Magenta
-  $artifactPostUrl = `
-    "https://ci.appveyor.com/api/testresults/junit/",
-    $env:APPVEYOR_JOB_ID -Join ''
-  $wc.UploadFile($artifactPostUrl, ($_.FullName))
-}
-
 If ($selfTestExitCode -ne 0) {
   Exit $selfTestExitCode
-}
+}
\ No newline at end of file

From 052ba5241cb972bd6a21272447deb6ebd01a42cd Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 29 Jul 2024 09:35:11 -0400
Subject: [PATCH 0492/1140] git reset

---
 .github/workflows/meteor-selftest-windows.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index d78f633ec3..ff6655b02a 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -32,6 +32,12 @@ jobs:
         with:
           node-version: 20.x
 
+      - name: Git Reset Hard
+        shell: pwsh
+        run: |
+          git reset --hard
+          git clean -fdx
+
       - name: Install dependencies
         shell: pwsh
         run: |

From 0ff7948fe2f69f096f365dd98bdcbfc35ef95fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 30 Jul 2024 16:00:14 +0200
Subject: [PATCH 0493/1140] ensure to git reset checkout before updating git
 submodule

---
 scripts/windows/ci/install.ps1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/windows/ci/install.ps1 b/scripts/windows/ci/install.ps1
index 77b03a2de0..6abbda1114 100644
--- a/scripts/windows/ci/install.ps1
+++ b/scripts/windows/ci/install.ps1
@@ -7,6 +7,9 @@ If ($env:PLATFORM -Match '^x86|x64$') {
 $dirCheckout = (Get-Item $PSScriptRoot).parent.parent.parent.FullName
 $meteorBat = Join-Path $dirCheckout 'meteor.bat'
 
+Write-Host "Resetting git checkout..." -ForegroundColor Magenta
+& git.exe -C "$dirCheckout" reset --hard
+
 Write-Host "Updating submodules recursively..." -ForegroundColor Magenta
 # Appveyor suggests -q flag for 'git submodule...' https://goo.gl/4TFAHm
 & git.exe -C "$dirCheckout" submodule -q update --init --recursive
@@ -36,4 +39,4 @@ while ($attempt -gt 0 -and -not $success) {
 
 If ($LASTEXITCODE -ne 0) {
   throw "Running .\meteor --get-ready failed three times."
-}
\ No newline at end of file
+}

From fdb9bcce168047705782a00634d9fd87debe4d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 30 Jul 2024 16:06:23 +0200
Subject: [PATCH 0494/1140] ensure to git reset checkout on all submodules as
 well

---
 scripts/windows/ci/install.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/windows/ci/install.ps1 b/scripts/windows/ci/install.ps1
index 6abbda1114..ecb7c9194c 100644
--- a/scripts/windows/ci/install.ps1
+++ b/scripts/windows/ci/install.ps1
@@ -9,6 +9,7 @@ $meteorBat = Join-Path $dirCheckout 'meteor.bat'
 
 Write-Host "Resetting git checkout..." -ForegroundColor Magenta
 & git.exe -C "$dirCheckout" reset --hard
+& git.exe -C "$dirCheckout" submodule foreach --recursive 'git reset --hard'
 
 Write-Host "Updating submodules recursively..." -ForegroundColor Magenta
 # Appveyor suggests -q flag for 'git submodule...' https://goo.gl/4TFAHm

From ade224551f8014898d3ba2f869551654b50112b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 30 Jul 2024 16:09:02 +0200
Subject: [PATCH 0495/1140] dont need to git reset on the pipeline level

---
 .github/workflows/meteor-selftest-windows.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index ff6655b02a..d78f633ec3 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -32,12 +32,6 @@ jobs:
         with:
           node-version: 20.x
 
-      - name: Git Reset Hard
-        shell: pwsh
-        run: |
-          git reset --hard
-          git clean -fdx
-
       - name: Install dependencies
         shell: pwsh
         run: |

From aad7666f9668263a53c73208fc047058c8f493a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 30 Jul 2024 17:24:26 +0200
Subject: [PATCH 0496/1140] remove app veyor as not needed

---
 appveyor.yml | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index de63e8fd72..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-version: '{build}'
-
-branches:
-  except:
-    - /^dev-bundle-/
-
-skip_branch_with_pr: true
-
-clone_folder: C:\projects\meteor
-image: Visual Studio 2019
-
-environment:
-  METEOR_PRETTY_OUTPUT: 0
-  SELF_TEST_TOOL_NODE_FLAGS: " "
-  TOOL_NODE_FLAGS: --expose-gc
-  TIMEOUT_SCALE_FACTOR: 8
-  METEOR_HEADLESS: true
-  SELF_TEST_EXCLUDE: "^NULL-LEAVE-THIS-HERE-NULL$"
-platform:
-  - x64
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - platform: x64
-
-# We don't need the actual "build", just the tests.
-build: off
-
-install:
-  - ps: C:\projects\meteor\scripts\windows\appveyor\install.ps1
-
-test_script:
-  - ps: C:\projects\meteor\scripts\windows\appveyor\test.ps1
-
-on_failure:
-    - ps: |
-        $npmLogsDir = "$($Env:AppData)\npm-cache\_logs"
-        If (Test-Path "$npmLogsDir") {
-          Get-ChildItem "${npmLogsDir}\*.log" |
-            % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-        }
-
-cache:
-  - dev_bundle -> meteor
-  - .babel-cache -> meteor
-  - .meteor

From 08258246aec317ffe15eb35c8d4c7bee558127fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 12 Aug 2024 16:16:58 +0200
Subject: [PATCH 0497/1140] Fix Meteor.promisify (2.x) (#13291)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix Meteor.promisify and add a test for it (#13284)

This fixes a regression introduced in commit 87f8697941.

Co-authored-by: Nacho Codoñer <igcogi@gmail.com>

* fix syntax check

---------

Co-authored-by: Oleksandr Chekhovskyi <oleksandr.chekhovskyi@favro.com>
Co-authored-by: Leonardo Venturini <leovenbag@gmail.com>
---
 packages/meteor/helpers.js      |  8 +++++---
 packages/meteor/helpers_test.js | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/packages/meteor/helpers.js b/packages/meteor/helpers.js
index 851f1967f2..4a1b802494 100644
--- a/packages/meteor/helpers.js
+++ b/packages/meteor/helpers.js
@@ -86,6 +86,10 @@ Meteor.promisify = function (fn, context, errorFirst) {
   }
 
   return function () {
+    var self = this;
+    var filteredArgs = Array.prototype.slice.call(arguments)
+      .filter(function (i) { return i !== undefined; });
+
     return new Promise(function (resolve, reject) {
       var callback = Meteor.bindEnvironment(function (error, result) {
         var _error = error, _result = result;
@@ -101,11 +105,9 @@ Meteor.promisify = function (fn, context, errorFirst) {
         resolve(_result);
       });
 
-      var filteredArgs = Array.prototype.slice.call(arguments)
-        .filter(function (i) { return i !== undefined; });
       filteredArgs.push(callback);
 
-      return fn.apply(context || this, filteredArgs);
+      return fn.apply(context || self, filteredArgs);
     });
   };
 };
diff --git a/packages/meteor/helpers_test.js b/packages/meteor/helpers_test.js
index 78c968fffb..7e7cf633df 100644
--- a/packages/meteor/helpers_test.js
+++ b/packages/meteor/helpers_test.js
@@ -100,3 +100,29 @@ Tinytest.add("environment - startup", function (test) {
   });
   test.isTrue(called);
 });
+
+Tinytest.addAsync("environment - promisify", function (test, done) {
+  function TestClass(value) {
+    this.value = value;
+  }
+
+  TestClass.prototype.method = function (arg1, arg2, callback) {
+    var value = this.value;
+    setTimeout(function () {
+      callback(null, arg1 + arg2 + value);
+    }, 0);
+  };
+
+  TestClass.prototype.methodAsync = Meteor.promisify(TestClass.prototype.method);
+
+  var instance = new TestClass(5);
+  var asyncMethodWithContext = Meteor.promisify(instance.method, instance);
+
+  Promise.all([
+    instance.methodAsync(1, 2),
+    asyncMethodWithContext(2, 3),
+  ]).then(function (results) {
+    test.equal(results, [8, 10]);
+    done();
+  });
+});

From e355dd03d7f5894da1fd5831282043fe52bb3c5f Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 29 Aug 2024 11:35:30 +0200
Subject: [PATCH 0498/1140] Small modernization

---
 roles/roles_common_async.js | 8 ++++----
 roles/roles_server.js       | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 1c8f301481..c14bdf8a40 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -290,13 +290,13 @@ Object.assign(Roles, {
     const role = await RolesCollection.findOneAsync({ _id: roleName })
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.")
+      throw new Error(`Role '${roleName}' does not exist.`)
     }
 
     // detect cycles
     if ((await Roles._getInheritedRoleNamesAsync(role)).includes(parentName)) {
       throw new Error(
-        "Roles '" + roleName + "' and '" + parentName + "' would form a cycle."
+        `Roles '${roleName}' and '${parentName}' would form a cycle.`
       )
     }
 
@@ -1219,7 +1219,7 @@ Object.assign(Roles, {
       typeof roleName !== 'string' ||
       roleName.trim() !== roleName
     ) {
-      throw new Error("Invalid role name '" + roleName + "'.")
+      throw new Error(`Invalid role name '${roleName}'.`)
     }
   },
 
@@ -1320,7 +1320,7 @@ Object.assign(Roles, {
       typeof scopeName !== 'string' ||
       scopeName.trim() !== scopeName
     ) {
-      throw new Error("Invalid scope name '" + scopeName + "'.")
+      throw new Error(`Invalid scope name '${scopeName}'.`)
     }
   }
 })
diff --git a/roles/roles_server.js b/roles/roles_server.js
index 90c8578517..e06e232736 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -11,7 +11,9 @@ const indexes = [
   { scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }, // Adding userId and roleId might speed up other queries depending on the first index
   { 'inheritedRoles._id': 1 }
 ]
-indexes.forEach(index => indexFnAssignment(index))
+for (const index of indexes) {
+  indexFnAssignment(index)
+}
 indexFnRoles({ 'children._id': 1 })
 
 /*

From 995467bd6f724aa34bcc8b8d1e6efcbcd8c52476 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 29 Aug 2024 12:24:59 +0200
Subject: [PATCH 0499/1140] Revert to using Meteor for collection access

---
 roles/roles_client.js       | 76 +++++++++++++++----------------
 roles/roles_common_async.js | 90 ++++++++++++++++++-------------------
 roles/tests/client.js       |  5 ++-
 3 files changed, 85 insertions(+), 86 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index b6988ea87d..bc04a2372d 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -1,8 +1,6 @@
 /* global Roles */
 import { Meteor } from 'meteor/meteor'
 
-import { RolesCollection, RoleAssignmentCollection } from './roles_common_async'
-
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
@@ -65,7 +63,7 @@ Object.assign(Roles, {
       unlessExists: false
     }, options)
 
-    const result = RolesCollection.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
+    const result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
 
     if (!result.insertedId) {
       if (options.unlessExists) return null
@@ -91,16 +89,16 @@ Object.assign(Roles, {
     Roles._checkRoleName(roleName)
 
     // Remove all assignments
-    RoleAssignmentCollection.remove({
+    Meteor.roleAssignment.remove({
       'role._id': roleName
     })
 
     do {
       // For all roles who have it as a dependency ...
-      roles = Roles._getParentRoleNames(RolesCollection.findOne({ _id: roleName }))
+      roles = Roles._getParentRoleNames(Meteor.roles.findOne({ _id: roleName }))
 
-      RolesCollection.find({ _id: { $in: roles } }).fetch().forEach(r => {
-        RolesCollection.update({
+      Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
+        Meteor.roles.update({
           _id: r._id
         }, {
           $pull: {
@@ -110,8 +108,8 @@ Object.assign(Roles, {
           }
         })
 
-        inheritedRoles = Roles._getInheritedRoleNames(RolesCollection.findOne({ _id: r._id }))
-        RoleAssignmentCollection.update({
+        inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
+        Meteor.roleAssignment.update({
           'role._id': r._id
         }, {
           $set: {
@@ -122,7 +120,7 @@ Object.assign(Roles, {
     } while (roles.length > 0)
 
     // And finally remove the role itself
-    RolesCollection.remove({ _id: roleName })
+    Meteor.roles.remove({ _id: roleName })
   },
 
   /**
@@ -141,7 +139,7 @@ Object.assign(Roles, {
 
     if (oldName === newName) return
 
-    const role = RolesCollection.findOne({ _id: oldName })
+    const role = Meteor.roles.findOne({ _id: oldName })
 
     if (!role) {
       throw new Error('Role \'' + oldName + '\' does not exist.')
@@ -149,10 +147,10 @@ Object.assign(Roles, {
 
     role._id = newName
 
-    RolesCollection.insert(role)
+    Meteor.roles.insert(role)
 
     do {
-      count = RoleAssignmentCollection.update({
+      count = Meteor.roleAssignment.update({
         'role._id': oldName
       }, {
         $set: {
@@ -162,7 +160,7 @@ Object.assign(Roles, {
     } while (count > 0)
 
     do {
-      count = RoleAssignmentCollection.update({
+      count = Meteor.roleAssignment.update({
         'inheritedRoles._id': oldName
       }, {
         $set: {
@@ -172,7 +170,7 @@ Object.assign(Roles, {
     } while (count > 0)
 
     do {
-      count = RolesCollection.update({
+      count = Meteor.roles.update({
         'children._id': oldName
       }, {
         $set: {
@@ -181,7 +179,7 @@ Object.assign(Roles, {
       }, { multi: true })
     } while (count > 0)
 
-    RolesCollection.remove({ _id: oldName })
+    Meteor.roles.remove({ _id: oldName })
   },
 
   /**
@@ -216,7 +214,7 @@ Object.assign(Roles, {
     Roles._checkRoleName(parentName)
 
     // query to get role's children
-    const role = RolesCollection.findOne({ _id: roleName })
+    const role = Meteor.roles.findOne({ _id: roleName })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
@@ -227,7 +225,7 @@ Object.assign(Roles, {
       throw new Error('Roles \'' + roleName + '\' and \'' + parentName + '\' would form a cycle.')
     }
 
-    const count = RolesCollection.update({
+    const count = Meteor.roles.update({
       _id: parentName,
       'children._id': {
         $ne: role._id
@@ -244,7 +242,7 @@ Object.assign(Roles, {
     // already a subrole; in any case we do not have anything more to do
     if (!count) return
 
-    RoleAssignmentCollection.update({
+    Meteor.roleAssignment.update({
       'inheritedRoles._id': parentName
     }, {
       $push: {
@@ -286,13 +284,13 @@ Object.assign(Roles, {
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    const role = RolesCollection.findOne({ _id: roleName }, { fields: { _id: 1 } })
+    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
 
     if (!role) {
       throw new Error('Role \'' + roleName + '\' does not exist.')
     }
 
-    const count = RolesCollection.update({
+    const count = Meteor.roles.update({
       _id: parentName
     }, {
       $pull: {
@@ -307,11 +305,11 @@ Object.assign(Roles, {
     if (!count) return
 
     // For all roles who have had it as a dependency ...
-    const roles = [...Roles._getParentRoleNames(RolesCollection.findOne({ _id: parentName })), parentName]
+    const roles = [...Roles._getParentRoleNames(Meteor.roles.findOne({ _id: parentName })), parentName]
 
-    RolesCollection.find({ _id: { $in: roles } }).fetch().forEach(r => {
-      const inheritedRoles = Roles._getInheritedRoleNames(RolesCollection.findOne({ _id: r._id }))
-      RoleAssignmentCollection.update({
+    Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
+      const inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
+      Meteor.roleAssignment.update({
         'role._id': r._id,
         'inheritedRoles._id': role._id
       }, {
@@ -427,7 +425,7 @@ Object.assign(Roles, {
         selector.scope = options.scope
       }
 
-      RoleAssignmentCollection.remove(selector)
+      Meteor.roleAssignment.remove(selector)
 
       // and then add all
       roles.forEach(function (role) {
@@ -456,7 +454,7 @@ Object.assign(Roles, {
       return
     }
 
-    const role = RolesCollection.findOne({ _id: roleName }, { fields: { children: 1 } })
+    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
 
     if (!role) {
       if (options.ifExists) {
@@ -467,7 +465,7 @@ Object.assign(Roles, {
     }
 
     // This might create duplicates, because we don't have a unique index, but that's all right. In case there are two, withdrawing the role will effectively kill them both.
-    const res = RoleAssignmentCollection.upsert({
+    const res = Meteor.roleAssignment.upsert({
       'user._id': userId,
       'role._id': roleName,
       scope: options.scope
@@ -480,7 +478,7 @@ Object.assign(Roles, {
     })
 
     if (res.insertedId) {
-      RoleAssignmentCollection.update({ _id: res.insertedId }, {
+      Meteor.roleAssignment.update({ _id: res.insertedId }, {
         $set: {
           inheritedRoles: [roleName, ...Roles._getInheritedRoleNames(role)].map(r => ({ _id: r }))
         }
@@ -509,7 +507,7 @@ Object.assign(Roles, {
     const parentRoles = new Set([role._id])
 
     parentRoles.forEach(roleName => {
-      RolesCollection.find({ 'children._id': roleName }).fetch().forEach(parentRole => {
+      Meteor.roles.find({ 'children._id': roleName }).fetch().forEach(parentRole => {
         parentRoles.add(parentRole._id)
       })
     })
@@ -535,7 +533,7 @@ Object.assign(Roles, {
     const nestedRoles = new Set([role])
 
     nestedRoles.forEach(r => {
-      const roles = RolesCollection.find({ _id: { $in: r.children.map(r => r._id) } }, { fields: { children: 1 } }).fetch()
+      const roles = Meteor.roles.find({ _id: { $in: r.children.map(r => r._id) } }, { fields: { children: 1 } }).fetch()
 
       roles.forEach(r2 => {
         inheritedRoles.add(r2._id)
@@ -619,7 +617,7 @@ Object.assign(Roles, {
       selector.scope = options.scope
     }
 
-    RoleAssignmentCollection.remove(selector)
+    Meteor.roleAssignment.remove(selector)
   },
 
   /**
@@ -686,7 +684,7 @@ Object.assign(Roles, {
     return roles.some((roleName) => {
       selector['inheritedRoles._id'] = roleName
 
-      return RoleAssignmentCollection.find(selector, { limit: 1 }).count() > 0
+      return Meteor.roleAssignment.find(selector, { limit: 1 }).count() > 0
     })
   },
 
@@ -750,7 +748,7 @@ Object.assign(Roles, {
       delete filter.fields
     }
 
-    const roles = RoleAssignmentCollection.find(selector, filter).fetch()
+    const roles = Meteor.roleAssignment.find(selector, filter).fetch()
 
     if (options.fullObjects) {
       return roles
@@ -778,7 +776,7 @@ Object.assign(Roles, {
   getAllRoles: function (queryOptions) {
     queryOptions = queryOptions || { sort: { _id: 1 } }
 
-    return RolesCollection.find({}, queryOptions)
+    return Meteor.roles.find({}, queryOptions)
   },
 
   /**
@@ -888,7 +886,7 @@ Object.assign(Roles, {
       }
     }
 
-    return RoleAssignmentCollection.find(selector, filter)
+    return Meteor.roleAssignment.find(selector, filter)
   },
 
   /**
@@ -939,7 +937,7 @@ Object.assign(Roles, {
       selector['inheritedRoles._id'] = { $in: roles }
     }
 
-    const scopes = RoleAssignmentCollection.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
+    const scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi => obi.scope)
 
     return [...new Set(scopes)]
   },
@@ -963,7 +961,7 @@ Object.assign(Roles, {
     if (oldName === newName) return
 
     do {
-      count = RoleAssignmentCollection.update({
+      count = Meteor.roleAssignment.update({
         scope: oldName
       }, {
         $set: {
@@ -985,7 +983,7 @@ Object.assign(Roles, {
   removeScope: function (name) {
     Roles._checkScopeName(name)
 
-    RoleAssignmentCollection.remove({ scope: name })
+    Meteor.roleAssignment.remove({ scope: name })
   },
 
   /**
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index c14bdf8a40..45337feba7 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -92,16 +92,16 @@ Object.assign(Roles, {
 
     let insertedId = null
 
-    const existingRole = await RolesCollection.findOneAsync({ _id: roleName })
+    const existingRole = await Meteor.roles.findOneAsync({ _id: roleName })
 
     if (existingRole) {
-      await RolesCollection.updateAsync(
+      await Meteor.roles.updateAsync(
         { _id: roleName },
         { $setOnInsert: { children: [] } }
       )
       return null
     } else {
-      insertedId = await RolesCollection.insertAsync({
+      insertedId = await Meteor.roles.insertAsync({
         _id: roleName,
         children: []
       })
@@ -132,20 +132,20 @@ Object.assign(Roles, {
     Roles._checkRoleName(roleName)
 
     // Remove all assignments
-    await RoleAssignmentCollection.removeAsync({
+    await Meteor.roleAssignment.removeAsync({
       'role._id': roleName
     })
 
     do {
       // For all roles who have it as a dependency ...
       roles = await Roles._getParentRoleNamesAsync(
-        await RolesCollection.findOneAsync({ _id: roleName })
+        await Meteor.roles.findOneAsync({ _id: roleName })
       )
 
-      for (const r of await RolesCollection
+      for (const r of await Meteor.roles
         .find({ _id: { $in: roles } })
         .fetchAsync()) {
-        await RolesCollection.updateAsync(
+        await Meteor.roles.updateAsync(
           {
             _id: r._id
           },
@@ -159,9 +159,9 @@ Object.assign(Roles, {
         )
 
         inheritedRoles = await Roles._getInheritedRoleNamesAsync(
-          await RolesCollection.findOneAsync({ _id: r._id })
+          await Meteor.roles.findOneAsync({ _id: r._id })
         )
-        await RoleAssignmentCollection.updateAsync(
+        await Meteor.roleAssignment.updateAsync(
           {
             'role._id': r._id
           },
@@ -178,7 +178,7 @@ Object.assign(Roles, {
     } while (roles.length > 0)
 
     // And finally remove the role itself
-    await RolesCollection.removeAsync({ _id: roleName })
+    await Meteor.roles.removeAsync({ _id: roleName })
   },
 
   /**
@@ -198,7 +198,7 @@ Object.assign(Roles, {
 
     if (oldName === newName) return
 
-    const role = await RolesCollection.findOneAsync({ _id: oldName })
+    const role = await Meteor.roles.findOneAsync({ _id: oldName })
 
     if (!role) {
       throw new Error("Role '" + oldName + "' does not exist.")
@@ -206,10 +206,10 @@ Object.assign(Roles, {
 
     role._id = newName
 
-    await RolesCollection.insertAsync(role)
+    await Meteor.roles.insertAsync(role)
 
     do {
-      count = await RoleAssignmentCollection.updateAsync(
+      count = await Meteor.roleAssignment.updateAsync(
         {
           'role._id': oldName
         },
@@ -223,7 +223,7 @@ Object.assign(Roles, {
     } while (count > 0)
 
     do {
-      count = await RoleAssignmentCollection.updateAsync(
+      count = await Meteor.roleAssignment.updateAsync(
         {
           'inheritedRoles._id': oldName
         },
@@ -237,7 +237,7 @@ Object.assign(Roles, {
     } while (count > 0)
 
     do {
-      count = await RolesCollection.updateAsync(
+      count = await Meteor.roles.updateAsync(
         {
           'children._id': oldName
         },
@@ -250,7 +250,7 @@ Object.assign(Roles, {
       )
     } while (count > 0)
 
-    await RolesCollection.removeAsync({ _id: oldName })
+    await Meteor.roles.removeAsync({ _id: oldName })
   },
 
   /**
@@ -287,7 +287,7 @@ Object.assign(Roles, {
     Roles._checkRoleName(parentName)
 
     // query to get role's children
-    const role = await RolesCollection.findOneAsync({ _id: roleName })
+    const role = await Meteor.roles.findOneAsync({ _id: roleName })
 
     if (!role) {
       throw new Error(`Role '${roleName}' does not exist.`)
@@ -300,7 +300,7 @@ Object.assign(Roles, {
       )
     }
 
-    const count = await RolesCollection.updateAsync(
+    const count = await Meteor.roles.updateAsync(
       {
         _id: parentName,
         'children._id': {
@@ -320,7 +320,7 @@ Object.assign(Roles, {
     // already a sub-role; in any case we do not have anything more to do
     if (!count) return
 
-    await RoleAssignmentCollection.updateAsync(
+    await Meteor.roleAssignment.updateAsync(
       {
         'inheritedRoles._id': parentName
       },
@@ -373,16 +373,16 @@ Object.assign(Roles, {
 
     // check for role existence
     // this would not really be needed, but we are trying to match addRolesToParent
-    const role = await RolesCollection.findOneAsync(
+    const role = await Meteor.roles.findOneAsync(
       { _id: roleName },
       { fields: { _id: 1 } }
     )
 
     if (!role) {
-      throw new Error("Role '" + roleName + "' does not exist.")
+      throw new Error(`Role '${roleName}' does not exist.`)
     }
 
-    const count = await RolesCollection.updateAsync(
+    const count = await Meteor.roles.updateAsync(
       {
         _id: parentName
       },
@@ -402,18 +402,18 @@ Object.assign(Roles, {
     // For all roles who have had it as a dependency ...
     const roles = [
       ...(await Roles._getParentRoleNamesAsync(
-        await RolesCollection.findOneAsync({ _id: parentName })
+        await Meteor.roles.findOneAsync({ _id: parentName })
       )),
       parentName
     ]
 
-    for (const r of await RolesCollection
+    for (const r of await Meteor.roles
       .find({ _id: { $in: roles } })
       .fetchAsync()) {
       const inheritedRoles = await Roles._getInheritedRoleNamesAsync(
-        await RolesCollection.findOneAsync({ _id: r._id })
+        await Meteor.roles.findOneAsync({ _id: r._id })
       )
-      await RoleAssignmentCollection.updateAsync(
+      await Meteor.roleAssignment.updateAsync(
         {
           'role._id': r._id,
           'inheritedRoles._id': role._id
@@ -543,7 +543,7 @@ Object.assign(Roles, {
         selector.scope = options.scope
       }
 
-      await RoleAssignmentCollection.removeAsync(selector)
+      await Meteor.roleAssignment.removeAsync(selector)
 
       // and then add all
       for (const role of roles) {
@@ -573,7 +573,7 @@ Object.assign(Roles, {
       return
     }
 
-    const role = await RolesCollection.findOneAsync(
+    const role = await Meteor.roles.findOneAsync(
       { _id: roleName },
       { fields: { children: 1 } }
     )
@@ -602,7 +602,7 @@ Object.assign(Roles, {
         },
       }
     ); */
-    const existingAssignment = await RoleAssignmentCollection.findOneAsync({
+    const existingAssignment = await Meteor.roleAssignment.findOneAsync({
       'user._id': userId,
       'role._id': roleName,
       scope: options.scope
@@ -611,7 +611,7 @@ Object.assign(Roles, {
     let insertedId
     let res
     if (existingAssignment) {
-      await RoleAssignmentCollection.updateAsync(existingAssignment._id, {
+      await Meteor.roleAssignment.updateAsync(existingAssignment._id, {
         $set: {
           user: { _id: userId },
           role: { _id: roleName },
@@ -619,9 +619,9 @@ Object.assign(Roles, {
         }
       })
 
-      res = await RoleAssignmentCollection.findOneAsync(existingAssignment._id)
+      res = await Meteor.roleAssignment.findOneAsync(existingAssignment._id)
     } else {
-      insertedId = await RoleAssignmentCollection.insertAsync({
+      insertedId = await Meteor.roleAssignment.insertAsync({
         user: { _id: userId },
         role: { _id: roleName },
         scope: options.scope
@@ -629,7 +629,7 @@ Object.assign(Roles, {
     }
 
     if (insertedId) {
-      await RoleAssignmentCollection.updateAsync(
+      await Meteor.roleAssignment.updateAsync(
         { _id: insertedId },
         {
           $set: {
@@ -641,7 +641,7 @@ Object.assign(Roles, {
         }
       )
 
-      res = await RoleAssignmentCollection.findOneAsync({ _id: insertedId })
+      res = await Meteor.roleAssignment.findOneAsync({ _id: insertedId })
     }
     res.insertedId = insertedId // For backward compatibility
 
@@ -668,7 +668,7 @@ Object.assign(Roles, {
     const parentRoles = new Set([role._id])
 
     for (const roleName of parentRoles) {
-      for (const parentRole of await RolesCollection
+      for (const parentRole of await Meteor.roles
         .find({ 'children._id': roleName })
         .fetchAsync()) {
         parentRoles.add(parentRole._id)
@@ -697,7 +697,7 @@ Object.assign(Roles, {
     const nestedRoles = new Set([role])
 
     for (const r of nestedRoles) {
-      const roles = await RolesCollection
+      const roles = await Meteor.roles
         .find(
           { _id: { $in: r.children.map((r) => r._id) } },
           { fields: { children: 1 } }
@@ -788,7 +788,7 @@ Object.assign(Roles, {
       selector.scope = options.scope
     }
 
-    await RoleAssignmentCollection.removeAsync(selector)
+    await Meteor.roleAssignment.removeAsync(selector)
   },
 
   /**
@@ -861,7 +861,7 @@ Object.assign(Roles, {
     const res = await asyncSome(roles, async (roleName) => {
       selector['inheritedRoles._id'] = roleName
       const out =
-        (await RoleAssignmentCollection.countDocuments(selector, { limit: 1 })) > 0
+        (await Meteor.roleAssignment.countDocuments(selector, { limit: 1 })) > 0
       return out
     })
 
@@ -933,7 +933,7 @@ Object.assign(Roles, {
       delete filter.fields
     }
 
-    const roles = await RoleAssignmentCollection.find(selector, filter).fetchAsync()
+    const roles = await Meteor.roleAssignment.find(selector, filter).fetchAsync()
 
     if (options.fullObjects) {
       return roles
@@ -965,7 +965,7 @@ Object.assign(Roles, {
   getAllRoles: function (queryOptions) {
     queryOptions = queryOptions || { sort: { _id: 1 } }
 
-    return RolesCollection.find({}, queryOptions)
+    return Meteor.roles.find({}, queryOptions)
   },
 
   /**
@@ -1091,7 +1091,7 @@ Object.assign(Roles, {
       }
     }
 
-    return RoleAssignmentCollection.find(selector, filter)
+    return Meteor.roleAssignment.find(selector, filter)
   },
 
   /**
@@ -1147,7 +1147,7 @@ Object.assign(Roles, {
     }
 
     const scopes = (
-      await RoleAssignmentCollection
+      await Meteor.roleAssignment
         .find(selector, { fields: { scope: 1 } })
         .fetchAsync()
     ).map((obi) => obi.scope)
@@ -1175,7 +1175,7 @@ Object.assign(Roles, {
     if (oldName === newName) return
 
     do {
-      count = await RoleAssignmentCollection.updateAsync(
+      count = await Meteor.roleAssignment.updateAsync(
         {
           scope: oldName
         },
@@ -1202,7 +1202,7 @@ Object.assign(Roles, {
   removeScopeAsync: async function (name) {
     Roles._checkScopeName(name)
 
-    await RoleAssignmentCollection.removeAsync({ scope: name })
+    await Meteor.roleAssignment.removeAsync({ scope: name })
   },
 
   /**
@@ -1254,7 +1254,7 @@ Object.assign(Roles, {
         return true
       }
 
-      const role = await RolesCollection.findOneAsync({ _id: roleName })
+      const role = await Meteor.roles.findOneAsync({ _id: roleName })
 
       // This should not happen, but this is a problem to address at some other time.
       if (!role) continue
diff --git a/roles/tests/client.js b/roles/tests/client.js
index 317feebc7f..d92d3a8964 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -3,6 +3,7 @@
 
 import { Meteor } from 'meteor/meteor'
 import { assert } from 'chai'
+import { Roles } from 'meteor/alanning:roles'
 
 // To ensure that the files are loaded for coverage
 import '../roles_client'
@@ -31,7 +32,7 @@ describe('roles', function () {
     const user = users[username]
 
     // test using user object rather than userId to avoid mocking
-    roles.forEach(function (role) {
+    for (const role of roles) {
       const expected = expectedRoles.includes(role)
       const msg = username + ' expected to have \'' + role + '\' permission but does not'
       const nmsg = username + ' had un-expected permission ' + role
@@ -41,7 +42,7 @@ describe('roles', function () {
       } else {
         assert.isFalse(Roles.userIsInRole(user, role, scope), nmsg)
       }
-    })
+    }
   }
 
   let meteorUserMethod

From a2142fb5abef2c305012b710fa19b434e1420396 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 29 Aug 2024 12:26:33 +0200
Subject: [PATCH 0500/1140] Fix Standard lint issue

---
 roles/tests/client.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/tests/client.js b/roles/tests/client.js
index d92d3a8964..b9be949257 100644
--- a/roles/tests/client.js
+++ b/roles/tests/client.js
@@ -3,7 +3,6 @@
 
 import { Meteor } from 'meteor/meteor'
 import { assert } from 'chai'
-import { Roles } from 'meteor/alanning:roles'
 
 // To ensure that the files are loaded for coverage
 import '../roles_client'

From 4d6a80380e7618f79d91ccf94f0c35cf1ea46b18 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 29 Aug 2024 12:29:21 +0200
Subject: [PATCH 0501/1140] Update testapp to Meteor v2.16

---
 testapp/.meteor/packages  |    4 +-
 testapp/.meteor/release   |    2 +-
 testapp/.meteor/versions  |   18 +-
 testapp/package-lock.json | 1224 +++++++++++++++----------------------
 testapp/package.json      |    8 +-
 5 files changed, 514 insertions(+), 742 deletions(-)

diff --git a/testapp/.meteor/packages b/testapp/.meteor/packages
index 0d165be56f..68b097e11e 100644
--- a/testapp/.meteor/packages
+++ b/testapp/.meteor/packages
@@ -4,7 +4,7 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor@1.11.4                  # Shared foundation for all Meteor packages
+meteor@1.11.5                  # Shared foundation for all Meteor packages
 static-html@1.3.2             # Define static page content in .html files
 standard-minifier-css@1.9.2   # CSS minifier run for production mode
 standard-minifier-js@2.8.1    # JS minifier run for production mode
@@ -12,7 +12,7 @@ es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
 ecmascript@0.16.8              # Enable ECMAScript2015+ syntax in app code
 typescript@4.9.5              # Enable TypeScript syntax in .ts and .tsx modules
 shell-server@0.5.0            # Server-side component of the `meteor shell` command
-webapp@1.13.6                  # Serves a Meteor app over HTTP
+webapp@1.13.8                  # Serves a Meteor app over HTTP
 server-render@0.4.1           # Support for server-side rendering
 hot-module-replacement@0.5.3  # Rebuilds the client if there is a change on the client without restarting the server
 
diff --git a/testapp/.meteor/release b/testapp/.meteor/release
index c500c39d6d..5152abe9d5 100644
--- a/testapp/.meteor/release
+++ b/testapp/.meteor/release
@@ -1 +1 @@
-METEOR@2.14
+METEOR@2.16
diff --git a/testapp/.meteor/versions b/testapp/.meteor/versions
index 00869796c9..3b0f13a41e 100644
--- a/testapp/.meteor/versions
+++ b/testapp/.meteor/versions
@@ -7,11 +7,11 @@ boilerplate-generator@1.7.2
 caching-compiler@1.2.2
 caching-html-compiler@1.2.1
 callback-hook@1.5.1
-check@1.3.2
+check@1.4.1
 ddp@1.4.1
-ddp-client@2.6.1
-ddp-common@1.4.0
-ddp-server@2.7.0
+ddp-client@2.6.2
+ddp-common@1.4.1
+ddp-server@2.7.1
 diff-sequence@1.1.2
 dynamic-import@0.7.3
 ecmascript@0.16.8
@@ -27,10 +27,10 @@ html-tools@1.1.3
 htmljs@1.1.1
 id-map@1.1.1
 inter-process-messaging@0.1.1
-logging@1.3.3
-meteor@1.11.4
+logging@1.3.4
+meteor@1.11.5
 minifier-css@1.6.4
-minifier-js@2.7.5
+minifier-js@2.8.0
 modern-browsers@0.1.10
 modules@0.20.0
 modules-runtime@0.13.1
@@ -52,6 +52,6 @@ static-html@1.3.2
 templating-tools@1.2.2
 tracker@1.3.3
 typescript@4.9.5
-underscore@1.0.13
-webapp@1.13.6
+underscore@1.6.1
+webapp@1.13.8
 webapp-hashing@1.1.1
diff --git a/testapp/package-lock.json b/testapp/package-lock.json
index 21bdd2163c..4788e7339d 100644
--- a/testapp/package-lock.json
+++ b/testapp/package-lock.json
@@ -10,315 +10,208 @@
       "dev": true
     },
     "@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/compat-data": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
-      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.8",
-        "@babel/types": "^7.22.5",
-        "convert-source-map": "^1.7.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
+        "json5": "^2.2.3",
         "semver": "^6.3.1"
       }
     },
     "@babel/generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
-      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.5",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.25.6",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
-      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.5",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       }
     },
-    "@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
-      "dev": true
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
     "@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
       "dev": true
     },
     "@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
       "dev": true
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
       "dev": true
     },
     "@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
       "dev": true
     },
     "@babel/helpers": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
-      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6"
       }
     },
     "@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
-      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
-      "dev": true
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.25.6"
+      }
     },
     "@babel/runtime": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.6.tgz",
-      "integrity": "sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
+      "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
       "requires": {
         "regenerator-runtime": "^0.14.0"
       }
     },
     "@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
       }
     },
     "@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
-        "debug": "^4.1.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.6",
+        "@babel/parser": "^7.25.6",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.22.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-          "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.22.13",
-            "chalk": "^2.4.2"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.23.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-          "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.23.0",
-            "@jridgewell/gen-mapping": "^0.3.2",
-            "@jridgewell/trace-mapping": "^0.3.17",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-environment-visitor": {
-          "version": "7.22.20",
-          "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-          "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-          "dev": true
-        },
-        "@babel/helper-function-name": {
-          "version": "7.23.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-          "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.22.15",
-            "@babel/types": "^7.23.0"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.22.20",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-          "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.22.20",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-          "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.22.20",
-            "chalk": "^2.4.2",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.23.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-          "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.22.15",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-          "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.22.13",
-            "@babel/parser": "^7.22.15",
-            "@babel/types": "^7.22.15"
-          }
-        },
-        "@babel/types": {
-          "version": "7.23.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-          "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-string-parser": "^7.22.5",
-            "@babel/helper-validator-identifier": "^7.22.20",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
       }
     },
     "@babel/types": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
       "dev": true,
       "requires": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -435,50 +328,42 @@
       "dev": true
     },
     "@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
       "requires": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true
     },
     "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "dev": true
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
       "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      },
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": {
-          "version": "1.4.14",
-          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-          "dev": true
-        }
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "@nodelib/fs.scandir": {
@@ -605,16 +490,19 @@
       "dev": true
     },
     "@types/node": {
-      "version": "20.4.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz",
-      "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==",
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz",
+      "integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "requires": {
+        "undici-types": "~6.19.2"
+      }
     },
     "@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -845,21 +733,6 @@
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
-      },
-      "dependencies": {
-        "istanbul-lib-instrument": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-          "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.12.3",
-            "@babel/parser": "^7.14.7",
-            "@istanbuljs/schema": "^0.1.2",
-            "istanbul-lib-coverage": "^3.2.0",
-            "semver": "^6.3.0"
-          }
-        }
       }
     },
     "balanced-match": {
@@ -903,15 +776,15 @@
       }
     },
     "browserslist": {
-      "version": "4.21.10",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001517",
-        "electron-to-chromium": "^1.4.477",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.11"
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
       }
     },
     "buffer": {
@@ -1004,15 +877,15 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001518",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz",
-      "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
+      "version": "1.0.30001653",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz",
+      "integrity": "sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==",
       "dev": true
     },
     "chai": {
-      "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
-      "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz",
+      "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==",
       "dev": true,
       "requires": {
         "assertion-error": "^1.1.0",
@@ -1021,13 +894,13 @@
         "get-func-name": "^2.0.2",
         "loupe": "^2.3.6",
         "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
+        "type-detect": "^4.1.0"
       }
     },
     "chai-as-promised": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
-      "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
+      "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
       "dev": true,
       "requires": {
         "check-error": "^1.0.2"
@@ -1134,9 +1007,9 @@
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
     "convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true
     },
     "cookie-signature": {
@@ -1235,9 +1108,9 @@
       "dev": true
     },
     "deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
       "dev": true,
       "requires": {
         "type-detect": "^4.0.0"
@@ -1305,9 +1178,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "electron-to-chromium": {
-      "version": "1.4.479",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz",
-      "integrity": "sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ==",
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
+      "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
       "dev": true
     },
     "emoji-regex": {
@@ -1429,9 +1302,9 @@
       "dev": true
     },
     "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "dev": true
     },
     "escape-html": {
@@ -2361,6 +2234,20 @@
         "get-intrinsic": "^1.1.1"
       }
     },
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
     "glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -2788,9 +2675,9 @@
       "dev": true
     },
     "istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true
     },
     "istanbul-lib-hook": {
@@ -2803,14 +2690,15 @@
       }
     },
     "istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.5",
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-coverage": "^3.2.0",
         "semver": "^6.3.0"
       }
     },
@@ -2826,6 +2714,14 @@
         "p-map": "^3.0.0",
         "rimraf": "^3.0.0",
         "uuid": "^8.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        }
       }
     },
     "istanbul-lib-report": {
@@ -2845,15 +2741,6 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
         "make-dir": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
@@ -2864,13 +2751,10 @@
           }
         },
         "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+          "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
@@ -2880,12 +2764,6 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
         }
       }
     },
@@ -2901,9 +2779,9 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
-      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",
@@ -3130,81 +3008,99 @@
       "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "meteor-node-stubs": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.7.tgz",
-      "integrity": "sha512-20bAFUhEIOD/Cos2nmvhqf2NOKpTf63WVQ+nwuaX2OFj31sU6GL4KkNylkWum8McwsH0LsMr/F+UHhduTX7KRg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.9.tgz",
+      "integrity": "sha512-EKRezc1/PblYtYiK4BOT3h5geWDo9AFBBSYNamPNh8AC5msUbVCcg8kekzAa7r7JPzBX8nZWaXEQVar4t8q/Hg==",
       "requires": {
-        "assert": "^2.0.0",
+        "@meteorjs/crypto-browserify": "^3.12.1",
+        "assert": "^2.1.0",
         "browserify-zlib": "^0.2.0",
         "buffer": "^5.7.1",
         "console-browserify": "^1.2.0",
         "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.12.0",
-        "domain-browser": "^4.22.0",
+        "domain-browser": "^4.23.0",
         "elliptic": "^6.5.4",
         "events": "^3.3.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
-        "path-browserify": "^1.0.0",
+        "path-browserify": "^1.0.1",
         "process": "^0.11.10",
         "punycode": "^1.4.1",
         "querystring-es3": "^0.2.1",
-        "readable-stream": "^3.6.0",
+        "readable-stream": "^3.6.2",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
         "string_decoder": "^1.3.0",
         "timers-browserify": "^2.0.12",
         "tty-browserify": "0.0.1",
-        "url": "^0.11.0",
-        "util": "^0.12.4",
+        "url": "^0.11.3",
+        "util": "^0.12.5",
         "vm-browserify": "^1.1.2"
       },
       "dependencies": {
+        "@meteorjs/crypto-browserify": {
+          "version": "3.12.1",
+          "requires": {
+            "browserify-cipher": "^1.0.1",
+            "browserify-sign": "^4.2.3",
+            "create-ecdh": "^4.0.4",
+            "create-hash": "^1.2.0",
+            "create-hmac": "^1.1.7",
+            "diffie-hellman": "^5.0.3",
+            "hash-base": "~3.0.4",
+            "inherits": "^2.0.4",
+            "pbkdf2": "^3.1.2",
+            "public-encrypt": "^4.0.3",
+            "randombytes": "^2.1.0",
+            "randomfill": "^1.0.4"
+          },
+          "dependencies": {
+            "hash-base": {
+              "version": "3.0.4",
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            }
+          }
+        },
         "asn1.js": {
-          "version": "5.4.1",
-          "bundled": true,
+          "version": "4.10.1",
           "requires": {
             "bn.js": "^4.0.0",
             "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0",
-            "safer-buffer": "^2.1.0"
+            "minimalistic-assert": "^1.0.0"
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
+              "version": "4.12.0"
             }
           }
         },
         "assert": {
-          "version": "2.0.0",
-          "bundled": true,
+          "version": "2.1.0",
           "requires": {
-            "es6-object-assign": "^1.1.0",
-            "is-nan": "^1.2.1",
-            "object-is": "^1.0.1",
-            "util": "^0.12.0"
+            "call-bind": "^1.0.2",
+            "is-nan": "^1.3.2",
+            "object-is": "^1.1.5",
+            "object.assign": "^4.1.4",
+            "util": "^0.12.5"
           }
         },
         "available-typed-arrays": {
-          "version": "1.0.4",
-          "bundled": true
+          "version": "1.0.5"
         },
         "base64-js": {
-          "version": "1.5.1",
-          "bundled": true
+          "version": "1.5.1"
         },
         "bn.js": {
-          "version": "5.2.0",
-          "bundled": true
+          "version": "5.2.0"
         },
         "brorand": {
-          "version": "1.1.0",
-          "bundled": true
+          "version": "1.1.0"
         },
         "browserify-aes": {
           "version": "1.2.0",
-          "bundled": true,
           "requires": {
             "buffer-xor": "^1.0.3",
             "cipher-base": "^1.0.0",
@@ -3216,7 +3112,6 @@
         },
         "browserify-cipher": {
           "version": "1.0.1",
-          "bundled": true,
           "requires": {
             "browserify-aes": "^1.0.4",
             "browserify-des": "^1.0.0",
@@ -3225,7 +3120,6 @@
         },
         "browserify-des": {
           "version": "1.0.2",
-          "bundled": true,
           "requires": {
             "cipher-base": "^1.0.1",
             "des.js": "^1.0.0",
@@ -3235,91 +3129,123 @@
         },
         "browserify-rsa": {
           "version": "4.1.0",
-          "bundled": true,
           "requires": {
             "bn.js": "^5.0.0",
             "randombytes": "^2.0.1"
           }
         },
         "browserify-sign": {
-          "version": "4.2.1",
-          "bundled": true,
+          "version": "4.2.3",
           "requires": {
-            "bn.js": "^5.1.1",
-            "browserify-rsa": "^4.0.1",
+            "bn.js": "^5.2.1",
+            "browserify-rsa": "^4.1.0",
             "create-hash": "^1.2.0",
             "create-hmac": "^1.1.7",
-            "elliptic": "^6.5.3",
+            "elliptic": "^6.5.5",
+            "hash-base": "~3.0",
             "inherits": "^2.0.4",
-            "parse-asn1": "^5.1.5",
-            "readable-stream": "^3.6.0",
-            "safe-buffer": "^5.2.0"
+            "parse-asn1": "^5.1.7",
+            "readable-stream": "^2.3.8",
+            "safe-buffer": "^5.2.1"
+          },
+          "dependencies": {
+            "bn.js": {
+              "version": "5.2.1"
+            },
+            "hash-base": {
+              "version": "3.0.4",
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.8",
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              },
+              "dependencies": {
+                "safe-buffer": {
+                  "version": "5.1.2"
+                }
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              },
+              "dependencies": {
+                "safe-buffer": {
+                  "version": "5.1.2"
+                }
+              }
+            }
           }
         },
         "browserify-zlib": {
           "version": "0.2.0",
-          "bundled": true,
           "requires": {
             "pako": "~1.0.5"
           }
         },
         "buffer": {
           "version": "5.7.1",
-          "bundled": true,
           "requires": {
             "base64-js": "^1.3.1",
             "ieee754": "^1.1.13"
           }
         },
         "buffer-xor": {
-          "version": "1.0.3",
-          "bundled": true
+          "version": "1.0.3"
         },
         "builtin-status-codes": {
-          "version": "3.0.0",
-          "bundled": true
+          "version": "3.0.0"
         },
         "call-bind": {
-          "version": "1.0.2",
-          "bundled": true,
+          "version": "1.0.5",
           "requires": {
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.0.2"
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.1",
+            "set-function-length": "^1.1.1"
           }
         },
         "cipher-base": {
           "version": "1.0.4",
-          "bundled": true,
           "requires": {
             "inherits": "^2.0.1",
             "safe-buffer": "^5.0.1"
           }
         },
         "console-browserify": {
-          "version": "1.2.0",
-          "bundled": true
+          "version": "1.2.0"
         },
         "constants-browserify": {
-          "version": "1.0.0",
-          "bundled": true
+          "version": "1.0.0"
+        },
+        "core-util-is": {
+          "version": "1.0.3"
         },
         "create-ecdh": {
           "version": "4.0.4",
-          "bundled": true,
           "requires": {
             "bn.js": "^4.1.0",
             "elliptic": "^6.5.3"
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
+              "version": "4.12.0"
             }
           }
         },
         "create-hash": {
           "version": "1.2.0",
-          "bundled": true,
           "requires": {
             "cipher-base": "^1.0.1",
             "inherits": "^2.0.1",
@@ -3330,7 +3256,6 @@
         },
         "create-hmac": {
           "version": "1.1.7",
-          "bundled": true,
           "requires": {
             "cipher-base": "^1.0.3",
             "create-hash": "^1.1.0",
@@ -3340,33 +3265,24 @@
             "sha.js": "^2.4.8"
           }
         },
-        "crypto-browserify": {
-          "version": "3.12.0",
-          "bundled": true,
+        "define-data-property": {
+          "version": "1.1.1",
           "requires": {
-            "browserify-cipher": "^1.0.0",
-            "browserify-sign": "^4.0.0",
-            "create-ecdh": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "create-hmac": "^1.1.0",
-            "diffie-hellman": "^5.0.0",
-            "inherits": "^2.0.1",
-            "pbkdf2": "^3.0.3",
-            "public-encrypt": "^4.0.0",
-            "randombytes": "^2.0.0",
-            "randomfill": "^1.0.3"
+            "get-intrinsic": "^1.2.1",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.0"
           }
         },
         "define-properties": {
-          "version": "1.1.3",
-          "bundled": true,
+          "version": "1.2.1",
           "requires": {
-            "object-keys": "^1.0.12"
+            "define-data-property": "^1.0.1",
+            "has-property-descriptors": "^1.0.0",
+            "object-keys": "^1.1.1"
           }
         },
         "des.js": {
           "version": "1.0.1",
-          "bundled": true,
           "requires": {
             "inherits": "^2.0.1",
             "minimalistic-assert": "^1.0.0"
@@ -3374,7 +3290,6 @@
         },
         "diffie-hellman": {
           "version": "5.0.3",
-          "bundled": true,
           "requires": {
             "bn.js": "^4.1.0",
             "miller-rabin": "^4.0.0",
@@ -3382,18 +3297,15 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
+              "version": "4.12.0"
             }
           }
         },
         "domain-browser": {
-          "version": "4.22.0",
-          "bundled": true
+          "version": "4.23.0"
         },
         "elliptic": {
-          "version": "6.5.4",
-          "bundled": true,
+          "version": "6.5.5",
           "requires": {
             "bn.js": "^4.11.9",
             "brorand": "^1.1.0",
@@ -3405,93 +3317,64 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
+              "version": "4.12.0"
             }
           }
         },
-        "es-abstract": {
-          "version": "1.18.3",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "is-callable": "^1.2.3",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.3",
-            "is-string": "^1.0.6",
-            "object-inspect": "^1.10.3",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "es-to-primitive": {
-          "version": "1.2.1",
-          "bundled": true,
-          "requires": {
-            "is-callable": "^1.1.4",
-            "is-date-object": "^1.0.1",
-            "is-symbol": "^1.0.2"
-          }
-        },
-        "es6-object-assign": {
-          "version": "1.1.0",
-          "bundled": true
-        },
         "events": {
-          "version": "3.3.0",
-          "bundled": true
+          "version": "3.3.0"
         },
         "evp_bytestokey": {
           "version": "1.0.3",
-          "bundled": true,
           "requires": {
             "md5.js": "^1.3.4",
             "safe-buffer": "^5.1.1"
           }
         },
-        "foreach": {
-          "version": "2.0.5",
-          "bundled": true
+        "for-each": {
+          "version": "0.3.3",
+          "requires": {
+            "is-callable": "^1.1.3"
+          }
         },
         "function-bind": {
-          "version": "1.1.1",
-          "bundled": true
+          "version": "1.1.2"
         },
         "get-intrinsic": {
-          "version": "1.1.1",
-          "bundled": true,
+          "version": "1.2.2",
           "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1"
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
           }
         },
-        "has": {
-          "version": "1.0.3",
-          "bundled": true,
-          "requires": {
-            "function-bind": "^1.1.1"
-          }
-        },
-        "has-bigints": {
+        "gopd": {
           "version": "1.0.1",
-          "bundled": true
+          "requires": {
+            "get-intrinsic": "^1.1.3"
+          }
+        },
+        "has-property-descriptors": {
+          "version": "1.0.1",
+          "requires": {
+            "get-intrinsic": "^1.2.2"
+          }
+        },
+        "has-proto": {
+          "version": "1.0.1"
         },
         "has-symbols": {
-          "version": "1.0.2",
-          "bundled": true
+          "version": "1.0.3"
+        },
+        "has-tostringtag": {
+          "version": "1.0.0",
+          "requires": {
+            "has-symbols": "^1.0.2"
+          }
         },
         "hash-base": {
           "version": "3.1.0",
-          "bundled": true,
           "requires": {
             "inherits": "^2.0.4",
             "readable-stream": "^3.6.0",
@@ -3500,15 +3383,19 @@
         },
         "hash.js": {
           "version": "1.1.7",
-          "bundled": true,
           "requires": {
             "inherits": "^2.0.3",
             "minimalistic-assert": "^1.0.1"
           }
         },
+        "hasown": {
+          "version": "2.0.0",
+          "requires": {
+            "function-bind": "^1.1.2"
+          }
+        },
         "hmac-drbg": {
           "version": "1.0.1",
-          "bundled": true,
           "requires": {
             "hash.js": "^1.0.3",
             "minimalistic-assert": "^1.0.0",
@@ -3516,96 +3403,48 @@
           }
         },
         "https-browserify": {
-          "version": "1.0.0",
-          "bundled": true
+          "version": "1.0.0"
         },
         "ieee754": {
-          "version": "1.2.1",
-          "bundled": true
+          "version": "1.2.1"
         },
         "inherits": {
-          "version": "2.0.4",
-          "bundled": true
+          "version": "2.0.4"
         },
         "is-arguments": {
-          "version": "1.1.0",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.0"
-          }
-        },
-        "is-bigint": {
-          "version": "1.0.2",
-          "bundled": true
-        },
-        "is-boolean-object": {
           "version": "1.1.1",
-          "bundled": true,
           "requires": {
-            "call-bind": "^1.0.2"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
         "is-callable": {
-          "version": "1.2.3",
-          "bundled": true
-        },
-        "is-date-object": {
-          "version": "1.0.4",
-          "bundled": true
+          "version": "1.2.7"
         },
         "is-generator-function": {
-          "version": "1.0.9",
-          "bundled": true
+          "version": "1.0.10",
+          "requires": {
+            "has-tostringtag": "^1.0.0"
+          }
         },
         "is-nan": {
           "version": "1.3.2",
-          "bundled": true,
           "requires": {
             "call-bind": "^1.0.0",
             "define-properties": "^1.1.3"
           }
         },
-        "is-negative-zero": {
-          "version": "2.0.1",
-          "bundled": true
-        },
-        "is-number-object": {
-          "version": "1.0.5",
-          "bundled": true
-        },
-        "is-regex": {
-          "version": "1.1.3",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-symbols": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.6",
-          "bundled": true
-        },
-        "is-symbol": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "has-symbols": "^1.0.2"
-          }
-        },
         "is-typed-array": {
-          "version": "1.1.5",
-          "bundled": true,
+          "version": "1.1.12",
           "requires": {
-            "available-typed-arrays": "^1.0.2",
-            "call-bind": "^1.0.2",
-            "es-abstract": "^1.18.0-next.2",
-            "foreach": "^2.0.5",
-            "has-symbols": "^1.0.1"
+            "which-typed-array": "^1.1.11"
           }
         },
+        "isarray": {
+          "version": "1.0.0"
+        },
         "md5.js": {
           "version": "1.3.5",
-          "bundled": true,
           "requires": {
             "hash-base": "^3.0.0",
             "inherits": "^2.0.1",
@@ -3614,78 +3453,75 @@
         },
         "miller-rabin": {
           "version": "4.0.1",
-          "bundled": true,
           "requires": {
             "bn.js": "^4.0.0",
             "brorand": "^1.0.1"
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
+              "version": "4.12.0"
             }
           }
         },
         "minimalistic-assert": {
-          "version": "1.0.1",
-          "bundled": true
+          "version": "1.0.1"
         },
         "minimalistic-crypto-utils": {
-          "version": "1.0.1",
-          "bundled": true
+          "version": "1.0.1"
         },
         "object-inspect": {
-          "version": "1.10.3",
-          "bundled": true
+          "version": "1.13.1"
         },
         "object-is": {
           "version": "1.1.5",
-          "bundled": true,
           "requires": {
             "call-bind": "^1.0.2",
             "define-properties": "^1.1.3"
           }
         },
         "object-keys": {
-          "version": "1.1.1",
-          "bundled": true
+          "version": "1.1.1"
         },
         "object.assign": {
-          "version": "4.1.2",
-          "bundled": true,
+          "version": "4.1.4",
           "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3",
-            "has-symbols": "^1.0.1",
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "has-symbols": "^1.0.3",
             "object-keys": "^1.1.1"
           }
         },
         "os-browserify": {
-          "version": "0.3.0",
-          "bundled": true
+          "version": "0.3.0"
         },
         "pako": {
-          "version": "1.0.11",
-          "bundled": true
+          "version": "1.0.11"
         },
         "parse-asn1": {
-          "version": "5.1.6",
-          "bundled": true,
+          "version": "5.1.7",
           "requires": {
-            "asn1.js": "^5.2.0",
-            "browserify-aes": "^1.0.0",
-            "evp_bytestokey": "^1.0.0",
-            "pbkdf2": "^3.0.3",
-            "safe-buffer": "^5.1.1"
+            "asn1.js": "^4.10.1",
+            "browserify-aes": "^1.2.0",
+            "evp_bytestokey": "^1.0.3",
+            "hash-base": "~3.0",
+            "pbkdf2": "^3.1.2",
+            "safe-buffer": "^5.2.1"
+          },
+          "dependencies": {
+            "hash-base": {
+              "version": "3.0.4",
+              "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+              }
+            }
           }
         },
         "path-browserify": {
-          "version": "1.0.1",
-          "bundled": true
+          "version": "1.0.1"
         },
         "pbkdf2": {
           "version": "3.1.2",
-          "bundled": true,
           "requires": {
             "create-hash": "^1.1.2",
             "create-hmac": "^1.1.4",
@@ -3695,12 +3531,13 @@
           }
         },
         "process": {
-          "version": "0.11.10",
-          "bundled": true
+          "version": "0.11.10"
+        },
+        "process-nextick-args": {
+          "version": "2.0.1"
         },
         "public-encrypt": {
           "version": "4.0.3",
-          "bundled": true,
           "requires": {
             "bn.js": "^4.1.0",
             "browserify-rsa": "^4.0.0",
@@ -3711,41 +3548,37 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0",
-              "bundled": true
+              "version": "4.12.0"
             }
           }
         },
         "punycode": {
-          "version": "1.4.1",
-          "bundled": true
+          "version": "1.4.1"
         },
-        "querystring": {
-          "version": "0.2.0",
-          "bundled": true
+        "qs": {
+          "version": "6.11.2",
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
         },
         "querystring-es3": {
-          "version": "0.2.1",
-          "bundled": true
+          "version": "0.2.1"
         },
         "randombytes": {
           "version": "2.1.0",
-          "bundled": true,
           "requires": {
             "safe-buffer": "^5.1.0"
           }
         },
         "randomfill": {
           "version": "1.0.4",
-          "bundled": true,
           "requires": {
             "randombytes": "^2.0.5",
             "safe-buffer": "^5.1.0"
           }
         },
         "readable-stream": {
-          "version": "3.6.0",
-          "bundled": true,
+          "version": "3.6.2",
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -3754,35 +3587,43 @@
         },
         "ripemd160": {
           "version": "2.0.2",
-          "bundled": true,
           "requires": {
             "hash-base": "^3.0.0",
             "inherits": "^2.0.1"
           }
         },
         "safe-buffer": {
-          "version": "5.2.1",
-          "bundled": true
+          "version": "5.2.1"
         },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true
+        "set-function-length": {
+          "version": "1.1.1",
+          "requires": {
+            "define-data-property": "^1.1.1",
+            "get-intrinsic": "^1.2.1",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.0"
+          }
         },
         "setimmediate": {
-          "version": "1.0.5",
-          "bundled": true
+          "version": "1.0.5"
         },
         "sha.js": {
           "version": "2.4.11",
-          "bundled": true,
           "requires": {
             "inherits": "^2.0.1",
             "safe-buffer": "^5.0.1"
           }
         },
+        "side-channel": {
+          "version": "1.0.4",
+          "requires": {
+            "call-bind": "^1.0.0",
+            "get-intrinsic": "^1.0.2",
+            "object-inspect": "^1.9.0"
+          }
+        },
         "stream-browserify": {
           "version": "3.0.0",
-          "bundled": true,
           "requires": {
             "inherits": "~2.0.4",
             "readable-stream": "^3.5.0"
@@ -3790,7 +3631,6 @@
         },
         "stream-http": {
           "version": "3.2.0",
-          "bundled": true,
           "requires": {
             "builtin-status-codes": "^3.0.0",
             "inherits": "^2.0.4",
@@ -3798,111 +3638,56 @@
             "xtend": "^4.0.2"
           }
         },
-        "string.prototype.trimend": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.4",
-          "bundled": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3"
-          }
-        },
         "string_decoder": {
           "version": "1.3.0",
-          "bundled": true,
           "requires": {
             "safe-buffer": "~5.2.0"
           }
         },
         "timers-browserify": {
           "version": "2.0.12",
-          "bundled": true,
           "requires": {
             "setimmediate": "^1.0.4"
           }
         },
         "tty-browserify": {
-          "version": "0.0.1",
-          "bundled": true
-        },
-        "unbox-primitive": {
-          "version": "1.0.1",
-          "bundled": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has-bigints": "^1.0.1",
-            "has-symbols": "^1.0.2",
-            "which-boxed-primitive": "^1.0.2"
-          }
+          "version": "0.0.1"
         },
         "url": {
-          "version": "0.11.0",
-          "bundled": true,
+          "version": "0.11.3",
           "requires": {
-            "punycode": "1.3.2",
-            "querystring": "0.2.0"
-          },
-          "dependencies": {
-            "punycode": {
-              "version": "1.3.2",
-              "bundled": true
-            }
+            "punycode": "^1.4.1",
+            "qs": "^6.11.2"
           }
         },
         "util": {
-          "version": "0.12.4",
-          "bundled": true,
+          "version": "0.12.5",
           "requires": {
             "inherits": "^2.0.3",
             "is-arguments": "^1.0.4",
             "is-generator-function": "^1.0.7",
             "is-typed-array": "^1.1.3",
-            "safe-buffer": "^5.1.2",
             "which-typed-array": "^1.1.2"
           }
         },
         "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true
+          "version": "1.0.2"
         },
         "vm-browserify": {
-          "version": "1.1.2",
-          "bundled": true
-        },
-        "which-boxed-primitive": {
-          "version": "1.0.2",
-          "bundled": true,
-          "requires": {
-            "is-bigint": "^1.0.1",
-            "is-boolean-object": "^1.1.0",
-            "is-number-object": "^1.0.4",
-            "is-string": "^1.0.5",
-            "is-symbol": "^1.0.3"
-          }
+          "version": "1.1.2"
         },
         "which-typed-array": {
-          "version": "1.1.4",
-          "bundled": true,
+          "version": "1.1.13",
           "requires": {
-            "available-typed-arrays": "^1.0.2",
-            "call-bind": "^1.0.0",
-            "es-abstract": "^1.18.0-next.1",
-            "foreach": "^2.0.5",
-            "function-bind": "^1.1.1",
-            "has-symbols": "^1.0.1",
-            "is-typed-array": "^1.1.3"
+            "available-typed-arrays": "^1.0.5",
+            "call-bind": "^1.0.4",
+            "for-each": "^0.3.3",
+            "gopd": "^1.0.1",
+            "has-tostringtag": "^1.0.0"
           }
         },
         "xtend": {
-          "version": "4.0.2",
-          "bundled": true
+          "version": "4.0.2"
         }
       }
     },
@@ -3991,9 +3776,9 @@
       }
     },
     "node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
       "dev": true
     },
     "node-uuid": {
@@ -4036,18 +3821,22 @@
         "yargs": "^15.0.2"
       },
       "dependencies": {
-        "glob": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+        "convert-source-map": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+          "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+          "dev": true
+        },
+        "istanbul-lib-instrument": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+          "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.1.1",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "@babel/core": "^7.7.5",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.0.0",
+            "semver": "^6.3.0"
           }
         }
       }
@@ -4276,9 +4065,9 @@
       "dev": true
     },
     "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
       "dev": true
     },
     "pify": {
@@ -4767,17 +4556,6 @@
         "rimraf": "^3.0.0",
         "signal-exit": "^3.0.2",
         "which": "^2.0.1"
-      },
-      "dependencies": {
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
       }
     },
     "sprintf-js": {
@@ -4964,22 +4742,6 @@
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
         "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.1.1",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
       }
     },
     "text-table": {
@@ -5067,9 +4829,9 @@
       "optional": true
     },
     "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
       "dev": true
     },
     "type-fest": {
@@ -5170,19 +4932,26 @@
         "through": "^2.3.8"
       }
     },
+    "undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true,
+      "optional": true
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
       "requires": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       }
     },
     "uri-js": {
@@ -5215,12 +4984,6 @@
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true
-    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -5248,6 +5011,15 @@
         "webidl-conversions": "^3.0.0"
       }
     },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
     "which-boxed-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
diff --git a/testapp/package.json b/testapp/package.json
index b1d84ef219..a40f65faf6 100644
--- a/testapp/package.json
+++ b/testapp/package.json
@@ -11,14 +11,14 @@
     "lint:fix": "standard --fix ../"
   },
   "dependencies": {
-    "@babel/runtime": "7.23.6",
-    "meteor-node-stubs": "1.2.7",
+    "@babel/runtime": "7.25.6",
+    "meteor-node-stubs": "1.2.9",
     "yuidocjs": "0.10.2"
   },
   "devDependencies": {
     "babel-plugin-istanbul": "^6.1.1",
-    "chai": "^4.3.10",
-    "chai-as-promised": "^7.1.1",
+    "chai": "^4.5.0",
+    "chai-as-promised": "^7.1.2",
     "nyc": "^15.1.0",
     "puppeteer": "^19.11.1",
     "standard": "^17.1.0"

From c9334f33c5fad928592c8b037c0e0745a432a251 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 29 Aug 2024 12:34:03 +0200
Subject: [PATCH 0502/1140] Published alanning:roles@4.0.0-rc.3

---
 .versions  | 124 +++++++++++++++++++++++++++--------------------------
 package.js |   6 +--
 2 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/.versions b/.versions
index bf9c9e5c2e..bdf8de4abf 100644
--- a/.versions
+++ b/.versions
@@ -1,62 +1,64 @@
-accounts-base@2.2.11
-alanning:roles@4.0.0-rc.2
-allow-deny@1.1.1
-babel-compiler@7.10.5
-babel-runtime@1.5.1
-base64@1.0.12
-binary-heap@1.0.11
-boilerplate-generator@1.7.2
-callback-hook@1.5.1
-check@1.4.1
-ddp@1.4.1
-ddp-client@2.6.2
-ddp-common@1.4.1
-ddp-rate-limiter@1.2.1
-ddp-server@2.7.1
-diff-sequence@1.1.2
-dynamic-import@0.7.3
-ecmascript@0.16.8
-ecmascript-runtime@0.8.1
-ecmascript-runtime-client@0.12.1
-ecmascript-runtime-server@0.11.0
-ejson@1.1.3
-fetch@0.1.4
-geojson-utils@1.0.11
-http@2.0.0
-id-map@1.1.1
-inter-process-messaging@0.1.1
-lmieulet:meteor-coverage@4.1.0
-lmieulet:meteor-legacy-coverage@0.1.0
-local-test:alanning:roles@4.0.0-rc.2
-localstorage@1.2.0
-logging@1.3.4
-meteor@1.11.5
-meteortesting:browser-tests@1.4.2
-meteortesting:mocha@2.1.0
-meteortesting:mocha-core@8.0.1
-minimongo@1.9.4
-modern-browsers@0.1.10
-modules@0.20.0
-modules-runtime@0.13.1
-mongo@1.16.10
-mongo-decimal@0.1.3
-mongo-dev-server@1.1.0
-mongo-id@1.0.8
-npm-mongo@4.17.2
-ordered-dict@1.1.0
-promise@0.12.2
-random@1.2.1
-rate-limit@1.1.1
-react-fast-refresh@0.2.8
-reactive-var@1.0.12
-reload@1.3.1
-retry@1.1.0
-routepolicy@1.1.1
-socket-stream-client@0.5.2
-tracker@1.3.3
-typescript@4.9.5
-underscore@1.6.1
-url@1.3.2
-webapp@1.13.8
-webapp-hashing@1.1.1
+accounts-base@3.0.1
+alanning:roles@4.0.0-rc.3
+allow-deny@2.0.0
+babel-compiler@7.11.0
+babel-runtime@1.5.2
+base64@1.0.13
+binary-heap@1.0.12
+boilerplate-generator@2.0.0
+callback-hook@1.6.0
+check@1.4.2
+core-runtime@1.0.0
+ddp@1.4.2
+ddp-client@3.0.1
+ddp-common@1.4.4
+ddp-rate-limiter@1.2.2
+ddp-server@3.0.1
+diff-sequence@1.1.3
+dynamic-import@0.7.4
+ecmascript@0.16.9
+ecmascript-runtime@0.8.2
+ecmascript-runtime-client@0.12.2
+ecmascript-runtime-server@0.11.1
+ejson@1.1.4
+facts-base@1.0.2
+fetch@0.1.5
+geojson-utils@1.0.12
+http@1.4.4
+id-map@1.2.0
+inter-process-messaging@0.1.2
+lmieulet:meteor-coverage@5.0.0
+lmieulet:meteor-legacy-coverage@0.4.0
+local-test:alanning:roles@4.0.0-rc.3
+localstorage@1.2.1
+logging@1.3.5
+meteor@2.0.1
+meteortesting:browser-tests@1.7.0
+meteortesting:mocha@3.2.0
+meteortesting:mocha-core@8.2.0
+minimongo@2.0.1
+modern-browsers@0.1.11
+modules@0.20.1
+modules-runtime@0.13.2
+mongo@2.0.1
+mongo-decimal@0.1.4-beta300.7
+mongo-dev-server@1.1.1
+mongo-id@1.0.9
+npm-mongo@4.17.4
+ordered-dict@1.2.0
+promise@1.0.0
+random@1.2.2
+rate-limit@1.1.2
+react-fast-refresh@0.2.9
+reactive-var@1.0.13
+reload@1.3.2
+retry@1.1.1
+routepolicy@1.1.2
+socket-stream-client@0.5.3
+tracker@1.3.4
+typescript@5.4.3
+underscore@1.6.4
+url@1.3.3
+webapp@2.0.1
+webapp-hashing@1.1.2
 zodern:types@1.0.13
diff --git a/package.js b/package.js
index b9c3e6de48..981a0dd86d 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '4.0.0-rc.2',
+  version: '4.0.0-rc.3',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
@@ -41,8 +41,8 @@ Package.onTest(function (api) {
   // Add code coverage
   api.use([
     'lmieulet:meteor-legacy-coverage',
-    'lmieulet:meteor-coverage@4.1.0',
-    'meteortesting:mocha@2.1.0'
+    'lmieulet:meteor-coverage@4.1.0 || 5.0.0',
+    'meteortesting:mocha@2.1.0 || 3.0.0'
   ])
 
   api.versionsFrom(['2.8.1', '3.0'])

From 93686e574faee230fcd7caef8c4d9287d22b0ed5 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 30 Aug 2024 14:56:04 +0200
Subject: [PATCH 0503/1140] Update meteortesting:mocha version number

---
 package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.js b/package.js
index 981a0dd86d..7615b7ec0b 100644
--- a/package.js
+++ b/package.js
@@ -42,7 +42,7 @@ Package.onTest(function (api) {
   api.use([
     'lmieulet:meteor-legacy-coverage',
     'lmieulet:meteor-coverage@4.1.0 || 5.0.0',
-    'meteortesting:mocha@2.1.0 || 3.0.0'
+    'meteortesting:mocha@2.1.0 || 3.2.0'
   ])
 
   api.versionsFrom(['2.8.1', '3.0'])

From d136e8c1d8495338af016cd4a34d99fc24ddcc64 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 31 Aug 2024 15:03:42 +0200
Subject: [PATCH 0504/1140] Split testing suite

---
 .github/workflows/testsuite.yml               |   41 +-
 {testapp => testapp2}/.coverage.json          |    0
 {testapp => testapp2}/.gitignore              |    0
 .../.meteor/.finished-upgraders               |    0
 {testapp => testapp2}/.meteor/.gitignore      |    0
 {testapp => testapp2}/.meteor/.id             |    0
 {testapp => testapp2}/.meteor/packages        |    0
 {testapp => testapp2}/.meteor/platforms       |    0
 {testapp => testapp2}/.meteor/release         |    0
 {testapp => testapp2}/.meteor/versions        |    0
 {testapp => testapp2}/package-lock.json       |    0
 {testapp => testapp2}/package.json            |    5 +-
 testapp3/.gitignore                           |    1 +
 testapp3/.meteor/.finished-upgraders          |   19 +
 testapp3/.meteor/.gitignore                   |    1 +
 testapp3/.meteor/.id                          |    7 +
 testapp3/.meteor/packages                     |   19 +
 testapp3/.meteor/platforms                    |    2 +
 testapp3/.meteor/release                      |    1 +
 testapp3/.meteor/versions                     |   70 +
 testapp3/package-lock.json                    | 6883 +++++++++++++++++
 testapp3/package.json                         |   42 +
 22 files changed, 7083 insertions(+), 8 deletions(-)
 rename {testapp => testapp2}/.coverage.json (100%)
 rename {testapp => testapp2}/.gitignore (100%)
 rename {testapp => testapp2}/.meteor/.finished-upgraders (100%)
 rename {testapp => testapp2}/.meteor/.gitignore (100%)
 rename {testapp => testapp2}/.meteor/.id (100%)
 rename {testapp => testapp2}/.meteor/packages (100%)
 rename {testapp => testapp2}/.meteor/platforms (100%)
 rename {testapp => testapp2}/.meteor/release (100%)
 rename {testapp => testapp2}/.meteor/versions (100%)
 rename {testapp => testapp2}/package-lock.json (100%)
 rename {testapp => testapp2}/package.json (95%)
 create mode 100644 testapp3/.gitignore
 create mode 100644 testapp3/.meteor/.finished-upgraders
 create mode 100644 testapp3/.meteor/.gitignore
 create mode 100644 testapp3/.meteor/.id
 create mode 100644 testapp3/.meteor/packages
 create mode 100644 testapp3/.meteor/platforms
 create mode 100644 testapp3/.meteor/release
 create mode 100644 testapp3/.meteor/versions
 create mode 100644 testapp3/package-lock.json
 create mode 100644 testapp3/package.json

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 3bee1b7018..460cd13440 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -29,17 +29,46 @@ jobs:
 
       - run: cd testapp && npm ci && npm run setup && npm run lint
 
-  test:
-    name: Meteor package tests
+  test2:
+    name: Meteor package tests 2.16
     needs: [lint]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         meteorRelease:
-          - '2.8.1'
           - '2.16'
-          - '3.0'
-          # Latest version
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 14
+
+      - name: Setup meteor ${{ matrix.meteorRelease }}
+        uses: meteorengineer/setup-meteor@v1
+        with:
+          meteor-release: ${{ matrix.meteorRelease }}
+
+      - name: cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-14-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-14-
+
+      - run: cd testapp2 && npm ci && npm run setup && npm run test
+
+  test3:
+    name: Meteor package tests 3.0.2
+    needs: [lint]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        meteorRelease:
+          - '3.0.2'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -62,4 +91,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-20-
 
-      - run: cd testapp && npm ci && npm run setup && npm run test
+      - run: cd testapp3 && npm ci && npm run setup && npm run test
diff --git a/testapp/.coverage.json b/testapp2/.coverage.json
similarity index 100%
rename from testapp/.coverage.json
rename to testapp2/.coverage.json
diff --git a/testapp/.gitignore b/testapp2/.gitignore
similarity index 100%
rename from testapp/.gitignore
rename to testapp2/.gitignore
diff --git a/testapp/.meteor/.finished-upgraders b/testapp2/.meteor/.finished-upgraders
similarity index 100%
rename from testapp/.meteor/.finished-upgraders
rename to testapp2/.meteor/.finished-upgraders
diff --git a/testapp/.meteor/.gitignore b/testapp2/.meteor/.gitignore
similarity index 100%
rename from testapp/.meteor/.gitignore
rename to testapp2/.meteor/.gitignore
diff --git a/testapp/.meteor/.id b/testapp2/.meteor/.id
similarity index 100%
rename from testapp/.meteor/.id
rename to testapp2/.meteor/.id
diff --git a/testapp/.meteor/packages b/testapp2/.meteor/packages
similarity index 100%
rename from testapp/.meteor/packages
rename to testapp2/.meteor/packages
diff --git a/testapp/.meteor/platforms b/testapp2/.meteor/platforms
similarity index 100%
rename from testapp/.meteor/platforms
rename to testapp2/.meteor/platforms
diff --git a/testapp/.meteor/release b/testapp2/.meteor/release
similarity index 100%
rename from testapp/.meteor/release
rename to testapp2/.meteor/release
diff --git a/testapp/.meteor/versions b/testapp2/.meteor/versions
similarity index 100%
rename from testapp/.meteor/versions
rename to testapp2/.meteor/versions
diff --git a/testapp/package-lock.json b/testapp2/package-lock.json
similarity index 100%
rename from testapp/package-lock.json
rename to testapp2/package-lock.json
diff --git a/testapp/package.json b/testapp2/package.json
similarity index 95%
rename from testapp/package.json
rename to testapp2/package.json
index a40f65faf6..15d06274a8 100644
--- a/testapp/package.json
+++ b/testapp2/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "testapp",
+  "name": "testapp2",
   "private": true,
   "scripts": {
     "setup": "mkdir -p packages && ln -sfn ../../ ./packages/meteor-roles",
@@ -36,7 +36,8 @@
     "ignore": [
       "**/.meteor/",
       "**/examples/",
-      "**/testapp"
+      "**/testapp2",
+      "**/testapp3"
     ]
   }
 }
diff --git a/testapp3/.gitignore b/testapp3/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/testapp3/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/testapp3/.meteor/.finished-upgraders b/testapp3/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..c07b6ff75a
--- /dev/null
+++ b/testapp3/.meteor/.finished-upgraders
@@ -0,0 +1,19 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/testapp3/.meteor/.gitignore b/testapp3/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/testapp3/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/testapp3/.meteor/.id b/testapp3/.meteor/.id
new file mode 100644
index 0000000000..8dc86b3498
--- /dev/null
+++ b/testapp3/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+rcbgjlqvg8sn.fgbt2fn0eab9
diff --git a/testapp3/.meteor/packages b/testapp3/.meteor/packages
new file mode 100644
index 0000000000..5ad4d989a2
--- /dev/null
+++ b/testapp3/.meteor/packages
@@ -0,0 +1,19 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base@1.5.2             # Packages every Meteor app needs to have
+mobile-experience@1.1.2       # Packages for a great mobile UX
+mongo@2.0.1                   # The database Meteor supports right now
+static-html@1.3.3             # Define static page content in .html files
+reactive-var@1.0.13            # Reactive variable for tracker
+tracker@1.3.4                 # Meteor's client-side reactive programming library
+
+standard-minifier-css@1.9.3   # CSS minifier run for production mode
+standard-minifier-js@3.0.0    # JS minifier run for production mode
+es5-shim@4.8.1                # ECMAScript 5 compatibility for older browsers
+ecmascript@0.16.9              # Enable ECMAScript2015+ syntax in app code
+typescript@5.4.3              # Enable TypeScript syntax in .ts and .tsx modules
+shell-server@0.6.0            # Server-side component of the `meteor shell` command
diff --git a/testapp3/.meteor/platforms b/testapp3/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/testapp3/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/testapp3/.meteor/release b/testapp3/.meteor/release
new file mode 100644
index 0000000000..8b5075d472
--- /dev/null
+++ b/testapp3/.meteor/release
@@ -0,0 +1 @@
+METEOR@3.0.2
diff --git a/testapp3/.meteor/versions b/testapp3/.meteor/versions
new file mode 100644
index 0000000000..272529f735
--- /dev/null
+++ b/testapp3/.meteor/versions
@@ -0,0 +1,70 @@
+allow-deny@2.0.0
+autoupdate@2.0.0
+babel-compiler@7.11.0
+babel-runtime@1.5.2
+base64@1.0.13
+binary-heap@1.0.12
+blaze-tools@2.0.0
+boilerplate-generator@2.0.0
+caching-compiler@2.0.0
+caching-html-compiler@2.0.0
+callback-hook@1.6.0
+check@1.4.2
+core-runtime@1.0.0
+ddp@1.4.2
+ddp-client@3.0.1
+ddp-common@1.4.4
+ddp-server@3.0.1
+diff-sequence@1.1.3
+dynamic-import@0.7.4
+ecmascript@0.16.9
+ecmascript-runtime@0.8.2
+ecmascript-runtime-client@0.12.2
+ecmascript-runtime-server@0.11.1
+ejson@1.1.4
+es5-shim@4.8.1
+facts-base@1.0.2
+fetch@0.1.5
+geojson-utils@1.0.12
+hot-code-push@1.0.5
+html-tools@2.0.0
+htmljs@2.0.1
+id-map@1.2.0
+inter-process-messaging@0.1.2
+launch-screen@2.0.1
+logging@1.3.5
+meteor@2.0.1
+meteor-base@1.5.2
+minifier-css@2.0.0
+minifier-js@3.0.0
+minimongo@2.0.1
+mobile-experience@1.1.2
+mobile-status-bar@1.1.1
+modern-browsers@0.1.11
+modules@0.20.1
+modules-runtime@0.13.2
+mongo@2.0.1
+mongo-decimal@0.1.4-beta300.7
+mongo-dev-server@1.1.1
+mongo-id@1.0.9
+npm-mongo@4.17.4
+ordered-dict@1.2.0
+promise@1.0.0
+random@1.2.2
+react-fast-refresh@0.2.9
+reactive-var@1.0.13
+reload@1.3.2
+retry@1.1.1
+routepolicy@1.1.2
+shell-server@0.6.0
+socket-stream-client@0.5.3
+spacebars-compiler@2.0.0
+standard-minifier-css@1.9.3
+standard-minifier-js@3.0.0
+static-html@1.3.3
+templating-tools@2.0.0
+tracker@1.3.4
+typescript@5.4.3
+underscore@1.6.4
+webapp@2.0.1
+webapp-hashing@1.1.2
diff --git a/testapp3/package-lock.json b/testapp3/package-lock.json
new file mode 100644
index 0000000000..5ad5fe2067
--- /dev/null
+++ b/testapp3/package-lock.json
@@ -0,0 +1,6883 @@
+{
+  "name": "testapp3",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "testapp3",
+      "dependencies": {
+        "@babel/runtime": "^7.25.6",
+        "meteor-node-stubs": "^1.2.9"
+      },
+      "devDependencies": {
+        "babel-plugin-istanbul": "^6.1.1",
+        "chai": "^4.5.0",
+        "chai-as-promised": "^7.1.2",
+        "nyc": "^15.1.0",
+        "puppeteer": "^19.11.1",
+        "standard": "^17.1.0"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.6",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.25.6"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
+      "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.6",
+        "@babel/parser": "^7.25.6",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
+      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
+      "dev": true
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@puppeteer/browsers": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz",
+      "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4.3.4",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "yargs": "17.7.1"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=14.1.0"
+      },
+      "peerDependencies": {
+        "typescript": ">= 4.7.4"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@puppeteer/browsers/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/yargs": {
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "22.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz",
+      "integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/append-transform": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
+      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
+      "dev": true,
+      "dependencies": {
+        "default-require-extensions": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlast": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.tosorted": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/builtins": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
+      "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.0.0"
+      }
+    },
+    "node_modules/builtins/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/caching-transform": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
+      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
+      "dev": true,
+      "dependencies": {
+        "hasha": "^5.0.0",
+        "make-dir": "^3.0.0",
+        "package-hash": "^4.0.0",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001655",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
+      "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
+    },
+    "node_modules/chai": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz",
+      "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.3",
+        "deep-eql": "^4.1.3",
+        "get-func-name": "^2.0.2",
+        "loupe": "^2.3.6",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chai-as-promised": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
+      "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
+      "dev": true,
+      "dependencies": {
+        "check-error": "^1.0.2"
+      },
+      "peerDependencies": {
+        "chai": ">= 2.1.2 < 6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/chromium-bidi": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz",
+      "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==",
+      "dev": true,
+      "dependencies": {
+        "mitt": "3.0.0"
+      },
+      "peerDependencies": {
+        "devtools-protocol": "*"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true
+    },
+    "node_modules/cosmiconfig": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+      "dev": true,
+      "dependencies": {
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/cosmiconfig/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dev": true,
+      "dependencies": {
+        "node-fetch": "2.6.7"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
+      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
+      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/default-require-extensions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
+      "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==",
+      "dev": true,
+      "dependencies": {
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/devtools-protocol": {
+      "version": "0.0.1107588",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
+      "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
+      "dev": true
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.13",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
+      "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
+      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-iterator-helpers": {
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
+      "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.3",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "iterator.prototype": "^1.1.2",
+        "safe-array-concat": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
+      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.0"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^8.0.1",
+        "eslint-plugin-import": "^2.25.2",
+        "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
+        "eslint-plugin-promise": "^6.0.0"
+      }
+    },
+    "node_modules/eslint-config-standard-jsx": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
+      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "peerDependencies": {
+        "eslint": "^8.8.0",
+        "eslint-plugin-react": "^7.28.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.2.tgz",
+      "integrity": "sha512-3XnC5fDyc8M4J2E8pt8pmSVRX2M+5yWMCfI/kDZwauQeFgzQOuhcRBFKjTeJagqgk4sFKxe1mvNVnaWwImx/Tg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-es": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
+      }
+    },
+    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.8.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-n": {
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
+      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
+      "dev": true,
+      "dependencies": {
+        "builtins": "^5.0.1",
+        "eslint-plugin-es": "^4.1.0",
+        "eslint-utils": "^3.0.0",
+        "ignore": "^5.1.1",
+        "is-core-module": "^2.11.0",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.1",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-n/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-promise": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz",
+      "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-react": {
+      "version": "7.35.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz",
+      "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.2",
+        "array.prototype.tosorted": "^1.1.4",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.0.19",
+        "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.8",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.0",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.11",
+        "string.prototype.repeat": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "dev": true
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
+      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/fromentries": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
+      "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasha": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
+      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
+      "dev": true,
+      "dependencies": {
+        "is-stream": "^2.0.0",
+        "type-fest": "^0.8.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "dev": true,
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-async-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
+      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
+      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "dev": true,
+      "dependencies": {
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
+      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
+      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-hook": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
+      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
+      "dev": true,
+      "dependencies": {
+        "append-transform": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-processinfo": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz",
+      "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==",
+      "dev": true,
+      "dependencies": {
+        "archy": "^1.0.0",
+        "cross-spawn": "^7.0.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "p-map": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "uuid": "^8.3.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/iterator.prototype": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
+      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.2.1",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "reflect.getprototypeof": "^1.0.4",
+        "set-function-name": "^2.0.1"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/load-json-file": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
+      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.15",
+        "parse-json": "^4.0.0",
+        "pify": "^4.0.1",
+        "strip-bom": "^3.0.0",
+        "type-fest": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/load-json-file/node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/type-fest": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.1"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meteor-node-stubs": {
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.10.tgz",
+      "integrity": "sha512-zP1AVg8sOATz15yfy11R2VTx+IZFfAOXi8GuZa8tOfeVT1tKaqDooAbFylnIXwpStSu6HRBUhQqHtR06Qr9aEA==",
+      "bundleDependencies": [
+        "@meteorjs/crypto-browserify",
+        "assert",
+        "browserify-zlib",
+        "buffer",
+        "console-browserify",
+        "constants-browserify",
+        "domain-browser",
+        "events",
+        "https-browserify",
+        "os-browserify",
+        "path-browserify",
+        "process",
+        "punycode",
+        "querystring-es3",
+        "readable-stream",
+        "stream-browserify",
+        "stream-http",
+        "string_decoder",
+        "timers-browserify",
+        "tty-browserify",
+        "url",
+        "util",
+        "vm-browserify"
+      ],
+      "dependencies": {
+        "@meteorjs/crypto-browserify": "^3.12.1",
+        "assert": "^2.1.0",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^5.7.1",
+        "console-browserify": "^1.2.0",
+        "constants-browserify": "^1.0.0",
+        "domain-browser": "^4.23.0",
+        "elliptic": "^6.5.7",
+        "events": "^3.3.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "readable-stream": "^3.6.2",
+        "stream-browserify": "^3.0.0",
+        "stream-http": "^3.2.0",
+        "string_decoder": "^1.3.0",
+        "timers-browserify": "^2.0.12",
+        "tty-browserify": "0.0.1",
+        "url": "^0.11.4",
+        "util": "^0.12.5",
+        "vm-browserify": "^1.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/crypto-browserify": {
+      "version": "3.12.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserify-cipher": "^1.0.1",
+        "browserify-sign": "^4.2.3",
+        "create-ecdh": "^4.0.4",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "diffie-hellman": "^5.0.3",
+        "hash-base": "~3.0.4",
+        "inherits": "^2.0.4",
+        "pbkdf2": "^3.1.2",
+        "public-encrypt": "^4.0.3",
+        "randombytes": "^2.1.0",
+        "randomfill": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/@meteorjs/crypto-browserify/node_modules/hash-base": {
+      "version": "3.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/asn1.js": {
+      "version": "4.10.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/assert": {
+      "version": "2.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/base64-js": {
+      "version": "1.5.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/bn.js": {
+      "version": "5.2.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/brorand": {
+      "version": "1.1.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-des": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-sign": {
+      "version": "4.2.3",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.5",
+        "hash-base": "~3.0",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.7",
+        "readable-stream": "^2.3.8",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/bn.js": {
+      "version": "5.2.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/hash-base": {
+      "version": "3.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/buffer": {
+      "version": "5.7.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/call-bind": {
+      "version": "1.0.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/cipher-base": {
+      "version": "1.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/console-browserify": {
+      "version": "1.2.0",
+      "inBundle": true
+    },
+    "node_modules/meteor-node-stubs/node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/core-util-is": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/create-hash": {
+      "version": "1.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/create-hmac": {
+      "version": "1.1.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/define-data-property": {
+      "version": "1.1.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/define-properties": {
+      "version": "1.2.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/des.js": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/domain-browser": {
+      "version": "4.23.0",
+      "inBundle": true,
+      "license": "Artistic-2.0",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/elliptic": {
+      "version": "6.5.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/es-define-property": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/es-errors": {
+      "version": "1.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/events": {
+      "version": "3.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/for-each": {
+      "version": "0.3.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/function-bind": {
+      "version": "1.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/get-intrinsic": {
+      "version": "1.2.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/gopd": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/has-proto": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/hash-base": {
+      "version": "3.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/hash.js": {
+      "version": "1.1.7",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/hasown": {
+      "version": "2.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/https-browserify": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/ieee754": {
+      "version": "1.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "inBundle": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/meteor-node-stubs/node_modules/inherits": {
+      "version": "2.0.4",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-arguments": {
+      "version": "1.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-callable": {
+      "version": "1.2.7",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-nan": {
+      "version": "1.3.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/is-typed-array": {
+      "version": "1.1.12",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "which-typed-array": "^1.1.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/isarray": {
+      "version": "1.0.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/md5.js": {
+      "version": "1.3.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/meteor-node-stubs/node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/object-inspect": {
+      "version": "1.13.2",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/object-is": {
+      "version": "1.1.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/object-keys": {
+      "version": "1.1.1",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/object.assign": {
+      "version": "4.1.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/os-browserify": {
+      "version": "0.3.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/pako": {
+      "version": "1.0.11",
+      "inBundle": true,
+      "license": "(MIT AND Zlib)"
+    },
+    "node_modules/meteor-node-stubs/node_modules/parse-asn1": {
+      "version": "5.1.7",
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "asn1.js": "^4.10.1",
+        "browserify-aes": "^1.2.0",
+        "evp_bytestokey": "^1.0.3",
+        "hash-base": "~3.0",
+        "pbkdf2": "^3.1.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/parse-asn1/node_modules/hash-base": {
+      "version": "3.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/path-browserify": {
+      "version": "1.0.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/process": {
+      "version": "0.11.10",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/punycode": {
+      "version": "1.4.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/qs": {
+      "version": "6.13.0",
+      "inBundle": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "inBundle": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/randombytes": {
+      "version": "2.1.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/randomfill": {
+      "version": "1.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/ripemd160": {
+      "version": "2.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/set-function-length": {
+      "version": "1.2.2",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/setimmediate": {
+      "version": "1.0.5",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/sha.js": {
+      "version": "2.4.11",
+      "inBundle": true,
+      "license": "(MIT AND BSD-3-Clause)",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/side-channel": {
+      "version": "1.0.6",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/stream-browserify": {
+      "version": "3.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "~2.0.4",
+        "readable-stream": "^3.5.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/stream-http": {
+      "version": "3.2.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/timers-browserify": {
+      "version": "2.0.12",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/tty-browserify": {
+      "version": "0.0.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/url": {
+      "version": "0.11.4",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^1.4.1",
+        "qs": "^6.12.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/util": {
+      "version": "0.12.5",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/meteor-node-stubs/node_modules/which-typed-array": {
+      "version": "1.1.13",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.4",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/meteor-node-stubs/node_modules/xtend": {
+      "version": "4.0.2",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mitt": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
+      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
+      "dev": true
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-preload": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
+      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
+      "dev": true,
+      "dependencies": {
+        "process-on-spawn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true
+    },
+    "node_modules/nyc": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
+      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "caching-transform": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "decamelize": "^1.2.0",
+        "find-cache-dir": "^3.2.0",
+        "find-up": "^4.1.0",
+        "foreground-child": "^2.0.0",
+        "get-package-type": "^0.1.0",
+        "glob": "^7.1.6",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-hook": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-processinfo": "^2.0.2",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "make-dir": "^3.0.0",
+        "node-preload": "^0.2.1",
+        "p-map": "^3.0.0",
+        "process-on-spawn": "^1.0.0",
+        "resolve-from": "^5.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "spawn-wrap": "^2.0.0",
+        "test-exclude": "^6.0.0",
+        "yargs": "^15.0.2"
+      },
+      "bin": {
+        "nyc": "bin/nyc.js"
+      },
+      "engines": {
+        "node": ">=8.9"
+      }
+    },
+    "node_modules/nyc/node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/nyc/node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/package-hash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
+      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.15",
+        "hasha": "^5.0.0",
+        "lodash.flattendeep": "^4.4.0",
+        "release-zalgo": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-conf": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
+      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^3.0.0",
+        "load-json-file": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-conf/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/process-on-spawn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
+      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
+      "dev": true,
+      "dependencies": {
+        "fromentries": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/puppeteer": {
+      "version": "19.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz",
+      "integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==",
+      "deprecated": "< 22.8.2 is no longer supported",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@puppeteer/browsers": "0.5.0",
+        "cosmiconfig": "8.1.3",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "puppeteer-core": "19.11.1"
+      }
+    },
+    "node_modules/puppeteer-core": {
+      "version": "19.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz",
+      "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==",
+      "dev": true,
+      "dependencies": {
+        "@puppeteer/browsers": "0.5.0",
+        "chromium-bidi": "0.4.7",
+        "cross-fetch": "3.1.5",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1107588",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "proxy-from-env": "1.1.0",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "ws": "8.13.0"
+      },
+      "engines": {
+        "node": ">=14.14.0"
+      },
+      "peerDependencies": {
+        "typescript": ">= 4.7.4"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/puppeteer-core/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz",
+      "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.1",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "globalthis": "^1.0.3",
+        "which-builtin-type": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/release-zalgo": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
+      "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
+      "dev": true,
+      "dependencies": {
+        "es6-error": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
+      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spawn-wrap": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
+      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^2.0.0",
+        "is-windows": "^1.0.2",
+        "make-dir": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
+      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "eslint": "^8.41.0",
+        "eslint-config-standard": "17.1.0",
+        "eslint-config-standard-jsx": "^11.0.0",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-n": "^15.7.0",
+        "eslint-plugin-promise": "^6.1.1",
+        "eslint-plugin-react": "^7.32.2",
+        "standard-engine": "^15.0.0",
+        "version-guard": "^1.1.1"
+      },
+      "bin": {
+        "standard": "bin/cmd.cjs"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/standard-engine": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
+      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "get-stdin": "^8.0.0",
+        "minimist": "^1.2.6",
+        "pkg-conf": "^3.1.0",
+        "xdg-basedir": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
+      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.7",
+        "regexp.prototype.flags": "^1.5.2",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
+      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
+      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
+      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
+      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
+      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/version-guard": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.2.tgz",
+      "integrity": "sha512-D8d+YxCUpoqtCnQzDxm6SF7DLU3gr2535T4khAtMq4osBahsQnmSxuwXFdrbAdDGG8Uokzfis/jvyeFPdmlc7w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.48"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz",
+      "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==",
+      "dev": true,
+      "dependencies": {
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.0.5",
+        "is-finalizationregistry": "^1.0.2",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.1.4",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "dev": true
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/testapp3/package.json b/testapp3/package.json
new file mode 100644
index 0000000000..5c141e7834
--- /dev/null
+++ b/testapp3/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "testapp3",
+  "private": true,
+  "scripts": {
+    "setup": "mkdir -p packages && ln -sfn ../../ ./packages/meteor-roles",
+    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
+    "report": "nyc report -t .coverage",
+    "lint": "standard ../",
+    "lint:fix": "standard --fix ../"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.25.6",
+    "meteor-node-stubs": "^1.2.9"
+  },
+  "devDependencies": {
+    "babel-plugin-istanbul": "^6.1.1",
+    "chai": "^4.5.0",
+    "chai-as-promised": "^7.1.2",
+    "nyc": "^15.1.0",
+    "puppeteer": "^19.11.1",
+    "standard": "^17.1.0"
+  },
+  "babel": {
+    "env": {
+      "COVERAGE": {
+        "plugins": [
+          "istanbul"
+        ]
+      }
+    }
+  },
+  "standard": {
+    "ignore": [
+      "**/.meteor/",
+      "**/examples/",
+      "**/testapp2",
+      "**/testapp3"
+    ]
+  }
+}

From 82d6f651c719e4a90796184cd3166e137132684d Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 31 Aug 2024 15:05:11 +0200
Subject: [PATCH 0505/1140] Fix lint test

---
 .github/workflows/testsuite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 460cd13440..b67889615b 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -27,7 +27,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-20-
 
-      - run: cd testapp && npm ci && npm run setup && npm run lint
+      - run: cd testapp3 && npm ci && npm run setup && npm run lint
 
   test2:
     name: Meteor package tests 2.16

From 7a7e852c2ca933e11381a4ff449b1ecbe2979951 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sat, 31 Aug 2024 15:14:32 +0200
Subject: [PATCH 0506/1140] Fixed fetch in tests

---
 roles/tests/serverAsync.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index 47c55cf2d1..df22a3efc0 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -780,11 +780,13 @@ describe('roles async', async function () {
 
     // compare roles, sorted alphabetically
     const expected = roles
-    const actual = Roles.getAllRoles().fetch().map(r => r._id)
+    const fetchAll = await Roles.getAllRoles().fetchAsync()
+    const actual = fetchAll.map(r => r._id)
 
     assert.sameMembers(actual, expected)
 
-    assert.sameMembers(Roles.getAllRoles({ sort: { _id: -1 } }).fetch().map(r => r._id), expected.reverse())
+    const fetchSorted = await Roles.getAllRoles({ sort: { _id: -1 } }).fetchAsync()
+    assert.sameMembers(fetchSorted.map(r => r._id), expected.reverse())
   })
 
   it('get an empty list of roles for an empty user', async function () {
@@ -1231,7 +1233,8 @@ describe('roles async', async function () {
 
     const expected = [users.eve, users.joe]
     const cursor = await Roles.getUsersInRoleAsync('admin')
-    const actual = cursor.fetch().map(r => r._id)
+    const fetched = await cursor.fetchAsync()
+    const actual = fetched.map(r => r._id)
 
     assert.sameMembers(actual, expected)
   })
@@ -1245,22 +1248,26 @@ describe('roles async', async function () {
 
     let expected = [users.eve, users.joe]
     const cursor1 = await Roles.getUsersInRoleAsync('admin', 'scope1')
-    let actual = cursor1.fetch().map(r => r._id)
+    const fetched1 = await cursor1.fetchAsync()
+    let actual = fetched1.map(r => r._id)
 
     assert.sameMembers(actual, expected)
 
     expected = [users.eve, users.joe]
     const cursor2 = await Roles.getUsersInRoleAsync('admin', { scope: 'scope1' })
-    actual = cursor2.fetch().map(r => r._id)
+    const fetched2 = await cursor2.fetchAsync()
+    actual = fetched2.map(r => r._id)
     assert.sameMembers(actual, expected)
 
     expected = [users.eve, users.bob, users.joe]
     const cursor3 = await Roles.getUsersInRoleAsync('admin', { anyScope: true })
-    actual = cursor3.fetch().map(r => r._id)
+    const fetched3 = await cursor3.fetchAsync()
+    actual = fetched3.map(r => r._id)
     assert.sameMembers(actual, expected)
 
     const cursor4 = await Roles.getUsersInRoleAsync('admin')
-    actual = cursor4.fetch().map(r => r._id)
+    const fetched4 = await cursor4.fetchAsync()
+    actual = fetched4.map(r => r._id)
     assert.sameMembers(actual, [])
   })
 
@@ -1319,7 +1326,7 @@ describe('roles async', async function () {
     await Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
 
     const cursor = await Roles.getUsersInRoleAsync('admin', 'scope1', { fields: { username: 0 }, limit: 1 })
-    const results = cursor.fetch()
+    const results = await cursor.fetchAsync()
 
     assert.equal(1, results.length)
     assert.isTrue(hasProp(results[0], '_id'))

From ea42be891377656f676e61e10b473746048747f3 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 11:09:13 +0200
Subject: [PATCH 0507/1140] Fix insert issue with async client tests

---
 roles/roles_client.js      | 54 +++++++++++++++++++-------------------
 roles/tests/clientAsync.js |  5 ++--
 roles/tests/serverAsync.js |  5 +++-
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/roles/roles_client.js b/roles/roles_client.js
index bc04a2372d..7291d15402 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -97,7 +97,7 @@ Object.assign(Roles, {
       // For all roles who have it as a dependency ...
       roles = Roles._getParentRoleNames(Meteor.roles.findOne({ _id: roleName }))
 
-      Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
+      for (const r of Meteor.roles.find({ _id: { $in: roles } }).fetch()) {
         Meteor.roles.update({
           _id: r._id
         }, {
@@ -116,7 +116,7 @@ Object.assign(Roles, {
             inheritedRoles: [r._id, ...inheritedRoles].map(r2 => ({ _id: r2 }))
           }
         }, { multi: true })
-      })
+      }
     } while (roles.length > 0)
 
     // And finally remove the role itself
@@ -197,9 +197,9 @@ Object.assign(Roles, {
     // ensure arrays
     if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
 
-    rolesNames.forEach(function (roleName) {
+    for (const roleName of rolesNames) {
       Roles._addRoleToParent(roleName, parentName)
-    })
+    }
   },
 
   /**
@@ -266,9 +266,9 @@ Object.assign(Roles, {
     // ensure arrays
     if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
 
-    rolesNames.forEach(function (roleName) {
+    for (const roleName of rolesNames) {
       Roles._removeRoleFromParent(roleName, parentName)
-    })
+    }
   },
 
   /**
@@ -307,7 +307,7 @@ Object.assign(Roles, {
     // For all roles who have had it as a dependency ...
     const roles = [...Roles._getParentRoleNames(Meteor.roles.findOne({ _id: parentName })), parentName]
 
-    Meteor.roles.find({ _id: { $in: roles } }).fetch().forEach(r => {
+    for (const r of Meteor.roles.find({ _id: { $in: roles } }).fetch()) {
       const inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
       Meteor.roleAssignment.update({
         'role._id': r._id,
@@ -317,7 +317,7 @@ Object.assign(Roles, {
           inheritedRoles: [r._id, ...inheritedRoles].map(r2 => ({ _id: r2 }))
         }
       }, { multi: true })
-    })
+    }
   },
 
   /**
@@ -359,17 +359,17 @@ Object.assign(Roles, {
       ifExists: false
     }, options)
 
-    users.forEach(function (user) {
+    for (const user of users) {
       if (typeof user === 'object') {
         id = user._id
       } else {
         id = user
       }
 
-      roles.forEach(function (role) {
+      for (const role of roles) {
         Roles._addUserToRole(id, role, options)
-      })
-    })
+      }
+    }
   },
 
   /**
@@ -413,7 +413,7 @@ Object.assign(Roles, {
       anyScope: false
     }, options)
 
-    users.forEach(function (user) {
+    for (const user of users) {
       if (typeof user === 'object') {
         id = user._id
       } else {
@@ -428,10 +428,10 @@ Object.assign(Roles, {
       Meteor.roleAssignment.remove(selector)
 
       // and then add all
-      roles.forEach(function (role) {
+      for (const role of roles) {
         Roles._addUserToRole(id, role, options)
-      })
-    })
+      }
+    }
   },
 
   /**
@@ -506,11 +506,11 @@ Object.assign(Roles, {
 
     const parentRoles = new Set([role._id])
 
-    parentRoles.forEach(roleName => {
+    for (const roleName of parentRoles) {
       Meteor.roles.find({ 'children._id': roleName }).fetch().forEach(parentRole => {
         parentRoles.add(parentRole._id)
       })
-    })
+    }
 
     parentRoles.delete(role._id)
 
@@ -532,14 +532,14 @@ Object.assign(Roles, {
     const inheritedRoles = new Set()
     const nestedRoles = new Set([role])
 
-    nestedRoles.forEach(r => {
+    for (const r of nestedRoles) {
       const roles = Meteor.roles.find({ _id: { $in: r.children.map(r => r._id) } }, { fields: { children: 1 } }).fetch()
 
-      roles.forEach(r2 => {
+      for (const r2 of roles) {
         inheritedRoles.add(r2._id)
         nestedRoles.add(r2)
-      })
-    })
+      }
+    }
 
     return [...inheritedRoles]
   },
@@ -574,10 +574,10 @@ Object.assign(Roles, {
 
     Roles._checkScopeName(options.scope)
 
-    users.forEach(function (user) {
-      if (!user) return
+    for (const user of users) {
+      if (!user) continue
 
-      roles.forEach(function (role) {
+      for (const role of roles) {
         let id
         if (typeof user === 'object') {
           id = user._id
@@ -586,8 +586,8 @@ Object.assign(Roles, {
         }
 
         Roles._removeUserFromRole(id, role, options)
-      })
-    })
+      }
+    }
   },
 
   /**
diff --git a/roles/tests/clientAsync.js b/roles/tests/clientAsync.js
index 4e00c78cf2..11d0b3f14c 100644
--- a/roles/tests/clientAsync.js
+++ b/roles/tests/clientAsync.js
@@ -40,10 +40,11 @@ describe('roles async', function () {
       const msg = username + ' expected to have \'' + role + '\' permission but does not'
       const nmsg = username + ' had un-expected permission ' + role
 
+      const result = await Roles.userIsInRoleAsync(user, role, scope)
       if (expected) {
-        assert.isTrue(await Roles.userIsInRoleAsync(user, role, scope), msg)
+        assert.isTrue(result, msg)
       } else {
-        assert.isFalse(await Roles.userIsInRoleAsync(user, role, scope), nmsg)
+        assert.isFalse(result, nmsg)
       }
     }
   }
diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index df22a3efc0..35b069f2b2 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -13,8 +13,11 @@ chai.use(chaiAsPromised)
 // To allow inserting on the client, needed for testing.
 Meteor.roleAssignment.allow({
   insert () { return true },
+  insertAsync () { return true },
   update () { return true },
-  remove () { return true }
+  updateAsync () { return true },
+  remove () { return true },
+  removeAsync () { return true }
 })
 
 const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)

From c46b2e62e784cc6ec76dd3a111b9a5331e578aa4 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 11:41:44 +0200
Subject: [PATCH 0508/1140] Removed deprecated publication of legacy role
 assignments

---
 History.md                    |  1 +
 package.js                    |  3 +--
 roles/client/subscriptions.js | 18 ------------------
 roles/roles_client.js         |  8 ++++++--
 roles/roles_server.js         | 20 --------------------
 roles/tests/clientAsync.js    |  2 +-
 6 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 roles/client/subscriptions.js

diff --git a/History.md b/History.md
index e32c4458da..d427489ebf 100644
--- a/History.md
+++ b/History.md
@@ -4,6 +4,7 @@
 
 * BREAKING: Synchronous functions are now available only on client side
 * BREAKING: Migration functions for past versions are no longer available
+* Removed deprecated publication of legacy role assignments
 * UI Helpers now use `console.debug` for debugging messages
 * `RolesCollection` and `RoleAssignmentsCollection` can now be exported in addition to being accessed via `Meteor.roles` and `Meteor.roleAssignment`
 * Support for Meteor 3
diff --git a/package.js b/package.js
index 7615b7ec0b..3a09a2db58 100644
--- a/package.js
+++ b/package.js
@@ -32,8 +32,7 @@ Package.onUse(function (api) {
   api.addFiles('roles/roles_server.js', 'server')
   api.addFiles([
     'roles/client/debug.js',
-    'roles/client/uiHelpers.js',
-    'roles/client/subscriptions.js'
+    'roles/client/uiHelpers.js'
   ], 'client')
 })
 
diff --git a/roles/client/subscriptions.js b/roles/client/subscriptions.js
deleted file mode 100644
index 76968fc37d..0000000000
--- a/roles/client/subscriptions.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* global Meteor, Roles, Tracker */
-
-/**
- * Subscription handle for the collection of all existing roles.
- *
- * @example
- *
- *     Roles.subscription.ready(); // true if roles have been loaded
- *
- * @property subscription
- * @type Object
- * @for Roles
- * @static
- */
-
-Tracker.autorun(function () {
-  Roles.subscription = Meteor.subscribe('_roles')
-})
diff --git a/roles/roles_client.js b/roles/roles_client.js
index 7291d15402..e0ec9a7fd8 100644
--- a/roles/roles_client.js
+++ b/roles/roles_client.js
@@ -1091,8 +1091,12 @@ Object.assign(Roles, {
   _checkScopeName: function (scopeName) {
     if (scopeName === null) return
 
-    if (!scopeName || typeof scopeName !== 'string' || scopeName.trim() !== scopeName) {
-      throw new Error('Invalid scope name \'' + scopeName + '\'.')
+    if (
+      !scopeName ||
+      typeof scopeName !== 'string' ||
+      scopeName.trim() !== scopeName
+    ) {
+      throw new Error(`Invalid scope name '${scopeName}'.`)
     }
   }
 })
diff --git a/roles/roles_server.js b/roles/roles_server.js
index e06e232736..735dfd9bf4 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -15,23 +15,3 @@ for (const index of indexes) {
   indexFnAssignment(index)
 }
 indexFnRoles({ 'children._id': 1 })
-
-/*
- * Publish logged-in user's roles so client-side checks can work.
- *
- * Use a named publish function so clients can check `ready()` state.
- */
-Meteor.publish('_roles', function () {
-  const loggedInUserId = this.userId
-  const fields = { roles: 1 }
-
-  if (!loggedInUserId) {
-    this.ready()
-    return
-  }
-
-  return Meteor.users.find(
-    { _id: loggedInUserId },
-    { fields }
-  )
-})
diff --git a/roles/tests/clientAsync.js b/roles/tests/clientAsync.js
index 11d0b3f14c..ed365a8e44 100644
--- a/roles/tests/clientAsync.js
+++ b/roles/tests/clientAsync.js
@@ -12,7 +12,7 @@ import '../roles_common_async'
 chai.use(chaiAsPromised)
 
 const safeInsert = async (collection, data) => {
-  try {
+  return await collection.insertAsync(data).catch(e => console.error(e))
     await collection.insertAsync(data)
   } catch (e) {}
 }

From 2a0fb72a66afd1ab9250eb1a31b52d67a2cbb065 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 11:53:52 +0200
Subject: [PATCH 0509/1140] Fix async client tests

Was missing subscription to get the data. Not sure why the sync client tests are able to still run. Maybe the data added persist in minimongo?
---
 roles/roles_server.js      | 1 -
 roles/tests/clientAsync.js | 5 ++---
 roles/tests/serverAsync.js | 5 +++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/roles/roles_server.js b/roles/roles_server.js
index 735dfd9bf4..e5059f8a5d 100644
--- a/roles/roles_server.js
+++ b/roles/roles_server.js
@@ -1,4 +1,3 @@
-import { Meteor } from 'meteor/meteor'
 import { RolesCollection, RoleAssignmentCollection } from './roles_common_async'
 
 const indexFnAssignment = RoleAssignmentCollection.createIndexAsync.bind(RoleAssignmentCollection)
diff --git a/roles/tests/clientAsync.js b/roles/tests/clientAsync.js
index ed365a8e44..f1c28ee1c4 100644
--- a/roles/tests/clientAsync.js
+++ b/roles/tests/clientAsync.js
@@ -13,8 +13,6 @@ chai.use(chaiAsPromised)
 
 const safeInsert = async (collection, data) => {
   return await collection.insertAsync(data).catch(e => console.error(e))
-    await collection.insertAsync(data)
-  } catch (e) {}
 }
 
 describe('roles async', function () {
@@ -40,7 +38,7 @@ describe('roles async', function () {
       const msg = username + ' expected to have \'' + role + '\' permission but does not'
       const nmsg = username + ' had un-expected permission ' + role
 
-      const result = await Roles.userIsInRoleAsync(user, role, scope)
+      const result = await Roles.userIsInRoleAsync(user._id, role, scope)
       if (expected) {
         assert.isTrue(result, msg)
       } else {
@@ -56,6 +54,7 @@ describe('roles async', function () {
     Meteor.user = function () {
       return users.eve
     }
+    Meteor.subscribe('client_assignments')
   })
 
   after(() => {
diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index 35b069f2b2..2e774ea29c 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -10,6 +10,11 @@ import '../roles_common_async'
 
 chai.use(chaiAsPromised)
 
+// Publication for the client tests
+Meteor.publish('client_assignments', async () => {
+  return Meteor.roleAssignment.find()
+})
+
 // To allow inserting on the client, needed for testing.
 Meteor.roleAssignment.allow({
   insert () { return true },

From e0118338b0769d9161027aa4a2479ea7d8dce6b6 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 12:37:02 +0200
Subject: [PATCH 0510/1140] Handle number in _normalizeOptions

---
 .gitignore                  | 2 ++
 roles/roles_common_async.js | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 936ee1e8eb..00e5ba2afa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ docs/
 node_modules/
 .npm/
 .coverage/
+
+examples/react-teams/.meteor/local/build/programs/server/node_modules
diff --git a/roles/roles_common_async.js b/roles/roles_common_async.js
index 45337feba7..11079194d5 100644
--- a/roles/roles_common_async.js
+++ b/roles/roles_common_async.js
@@ -1277,7 +1277,9 @@ Object.assign(Roles, {
   _normalizeOptions: function (options) {
     options = options === undefined ? {} : options
 
-    if (options === null || typeof options === 'string') {
+    // TODO Number will error out on scope validation, we can either error it out here
+    // or make it into a string and hence a valid input.
+    if (options === null || typeof options === 'string' || typeof options === 'number') {
       options = { scope: options }
     }
 

From e792f729fb58ca70e9ff7cfa3281fc6686b4983d Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 13:02:24 +0200
Subject: [PATCH 0511/1140] Fix backward compatibility for allow rules in tests

---
 roles/tests/serverAsync.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index 2e774ea29c..f6efc59f2f 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -16,14 +16,24 @@ Meteor.publish('client_assignments', async () => {
 })
 
 // To allow inserting on the client, needed for testing.
-Meteor.roleAssignment.allow({
-  insert () { return true },
-  insertAsync () { return true },
-  update () { return true },
-  updateAsync () { return true },
-  remove () { return true },
-  removeAsync () { return true }
-})
+if (Meteor.release.split('@')[1][1] === '2') {
+  Meteor.roleAssignment.allow({
+    insert () { return true },
+    update () { return true },
+    remove () { return true }
+  })
+} else {
+  // Meteor 3+
+  Meteor.roleAssignment.allow({
+    insert () { return true },
+    insertAsync () { return true },
+    update () { return true },
+    updateAsync () { return true },
+    remove () { return true },
+    removeAsync () { return true }
+  })
+}
+
 
 const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)
 

From 5ac1f319625b8c02d76219499a46799d4b30cd06 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 13:04:17 +0200
Subject: [PATCH 0512/1140] Quick lint fix

---
 roles/tests/serverAsync.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index f6efc59f2f..b6b1645223 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -34,7 +34,6 @@ if (Meteor.release.split('@')[1][1] === '2') {
   })
 }
 
-
 const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)
 
 describe('roles async', async function () {

From 02e54a95402719037e92e6e25a75bb582dceb565 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 13:10:01 +0200
Subject: [PATCH 0513/1140] Fix typo in Meteor 2 test setup

---
 roles/tests/serverAsync.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/tests/serverAsync.js b/roles/tests/serverAsync.js
index b6b1645223..278cab7e0d 100644
--- a/roles/tests/serverAsync.js
+++ b/roles/tests/serverAsync.js
@@ -16,7 +16,7 @@ Meteor.publish('client_assignments', async () => {
 })
 
 // To allow inserting on the client, needed for testing.
-if (Meteor.release.split('@')[1][1] === '2') {
+if (Meteor.release.split('@')[1][0] === '2') {
   Meteor.roleAssignment.allow({
     insert () { return true },
     update () { return true },

From 4168c12bdae07c895f2c42b83c0ad4dcbfada4e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 11:29:00 +0000
Subject: [PATCH 0514/1140] build(deps): bump ws and puppeteer in /testapp3

Bumps [ws](https://github.com/websockets/ws) to 8.18.0 and updates ancestor dependency [puppeteer](https://github.com/puppeteer/puppeteer). These dependencies need to be updated together.


Updates `ws` from 8.13.0 to 8.18.0
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.13.0...8.18.0)

Updates `puppeteer` from 19.11.1 to 23.3.0
- [Release notes](https://github.com/puppeteer/puppeteer/releases)
- [Changelog](https://github.com/puppeteer/puppeteer/blob/main/release-please-config.json)
- [Commits](https://github.com/puppeteer/puppeteer/compare/puppeteer-v19.11.1...puppeteer-v23.3.0)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
- dependency-name: puppeteer
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 testapp3/package-lock.json | 741 ++++++++++++++++++++++++-------------
 testapp3/package.json      |   2 +-
 2 files changed, 482 insertions(+), 261 deletions(-)

diff --git a/testapp3/package-lock.json b/testapp3/package-lock.json
index 5ad5fe2067..4115f637c7 100644
--- a/testapp3/package-lock.json
+++ b/testapp3/package-lock.json
@@ -14,7 +14,7 @@
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
         "nyc": "^15.1.0",
-        "puppeteer": "^19.11.1",
+        "puppeteer": "^23.3.0",
         "standard": "^17.1.0"
       }
     },
@@ -539,33 +539,25 @@
       }
     },
     "node_modules/@puppeteer/browsers": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz",
-      "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz",
+      "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==",
       "dev": true,
       "dependencies": {
-        "debug": "4.3.4",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "yargs": "17.7.1"
+        "debug": "^4.3.6",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "browsers": "lib/cjs/main-cli.js"
       },
       "engines": {
-        "node": ">=14.1.0"
-      },
-      "peerDependencies": {
-        "typescript": ">= 4.7.4"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "node": ">=18"
       }
     },
     "node_modules/@puppeteer/browsers/node_modules/ansi-styles": {
@@ -615,21 +607,16 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/@puppeteer/browsers/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@puppeteer/browsers/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=10"
       }
     },
     "node_modules/@puppeteer/browsers/node_modules/wrap-ansi": {
@@ -659,9 +646,9 @@
       }
     },
     "node_modules/@puppeteer/browsers/node_modules/yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
       "dependencies": {
         "cliui": "^8.0.1",
@@ -685,6 +672,12 @@
         "node": ">=12"
       }
     },
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+      "dev": true
+    },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -692,9 +685,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.5.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz",
-      "integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==",
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -739,15 +732,15 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dev": true,
       "dependencies": {
-        "debug": "4"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/aggregate-error": {
@@ -986,6 +979,18 @@
         "node": "*"
       }
     },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
@@ -1001,6 +1006,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/b4a": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
+      "dev": true
+    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -1023,6 +1034,53 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-fs": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.3.tgz",
+      "integrity": "sha512-7RYKL+vZVCyAsMLi5SPu7QGauGGT8avnP/HO571ndEuV4MYdGXvLhtW67FuLPeEI8EiIY7zbbRR9x7x7HU0kgw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.2.tgz",
+      "integrity": "sha512-HZoJwzC+rZ9lqEemTMiO0luOePoGYNBgsLLgegKR/cljiJvcDNhDZQkzC+NC5Oh0aHbdBNSOHpghwMuB5tqhjg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "bare-os": "^2.1.0"
+      }
+    },
+    "node_modules/bare-stream": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.2.1.tgz",
+      "integrity": "sha512-YTB47kHwBW9zSG8LD77MIBAAQXjU2WjAkMHeeb7hUplVs6+IoM5I7uEVQNPMB7lj9r8I76UMdoMkGnCodHOLqg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "b4a": "^1.6.6",
+        "streamx": "^2.18.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -1043,15 +1101,13 @@
         }
       ]
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
       "dev": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
     "node_modules/brace-expansion": {
@@ -1278,19 +1334,15 @@
         "node": "*"
       }
     },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
     "node_modules/chromium-bidi": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz",
-      "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz",
+      "integrity": "sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA==",
       "dev": true,
       "dependencies": {
-        "mitt": "3.0.0"
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "10.0.0",
+        "zod": "3.23.8"
       },
       "peerDependencies": {
         "devtools-protocol": "*"
@@ -1350,21 +1402,29 @@
       "dev": true
     },
     "node_modules/cosmiconfig": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
-      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
       "dev": true,
       "dependencies": {
-        "import-fresh": "^3.2.1",
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
         "js-yaml": "^4.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0"
+        "parse-json": "^5.2.0"
       },
       "engines": {
         "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/cosmiconfig/node_modules/argparse": {
@@ -1385,15 +1445,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
-      "dev": true,
-      "dependencies": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -1408,6 +1459,15 @@
         "node": ">= 8"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/data-view-buffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
@@ -1552,10 +1612,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "dev": true,
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/devtools-protocol": {
-      "version": "0.0.1107588",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
-      "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
+      "version": "0.0.1330662",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1330662.tgz",
+      "integrity": "sha512-pzh6YQ8zZfz3iKlCvgzVCu22NdpZ8hNmwU6WnQjNVquh0A9iVosPtNLWDwaWVGyrntQlltPFztTMK5Cg6lfCuw==",
       "dev": true
     },
     "node_modules/doctrine": {
@@ -1591,6 +1665,15 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -1782,6 +1865,27 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
     "node_modules/eslint": {
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
@@ -2485,6 +2589,12 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "dev": true
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -2619,11 +2729,19 @@
         }
       ]
     },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
+    "node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
@@ -2766,6 +2884,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-uri": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
+      "dev": true,
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.2.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -2951,17 +3084,30 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/ieee754": {
@@ -3067,6 +3213,25 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/ip-address/node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
     "node_modules/is-array-buffer": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
@@ -3636,6 +3801,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -3690,6 +3861,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "node_modules/jsx-ast-utils": {
       "version": "3.3.5",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
@@ -5039,15 +5222,9 @@
       }
     },
     "node_modules/mitt": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
-      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
-      "dev": true
-    },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
       "dev": true
     },
     "node_modules/ms": {
@@ -5062,24 +5239,13 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
       "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">= 0.4.0"
       }
     },
     "node_modules/node-preload": {
@@ -5347,6 +5513,38 @@
         "node": ">=6"
       }
     },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.5",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dev": true,
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/package-hash": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
@@ -5425,15 +5623,6 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -5585,6 +5774,34 @@
         "react-is": "^16.13.1"
       }
     },
+    "node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -5611,66 +5828,41 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "19.11.1",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz",
-      "integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==",
-      "deprecated": "< 22.8.2 is no longer supported",
+      "version": "23.3.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.3.0.tgz",
+      "integrity": "sha512-e2jY8cdWSUGsrLxqGm3hIbJq/UIk1uOY8XY7SM51leXkH7shrIyE91lK90Q9byX6tte+cyL3HKqlWBEd6TjWTA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@puppeteer/browsers": "0.5.0",
-        "cosmiconfig": "8.1.3",
-        "https-proxy-agent": "5.0.1",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "puppeteer-core": "19.11.1"
+        "@puppeteer/browsers": "2.4.0",
+        "chromium-bidi": "0.6.5",
+        "cosmiconfig": "^9.0.0",
+        "devtools-protocol": "0.0.1330662",
+        "puppeteer-core": "23.3.0",
+        "typed-query-selector": "^2.12.0"
+      },
+      "bin": {
+        "puppeteer": "lib/cjs/puppeteer/node/cli.js"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/puppeteer-core": {
-      "version": "19.11.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz",
-      "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==",
+      "version": "23.3.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.3.0.tgz",
+      "integrity": "sha512-sB2SsVMFs4gKad5OCdv6w5vocvtEUrRl0zQqSyRPbo/cj1Ktbarmhxy02Zyb9R9HrssBcJDZbkrvBnbaesPyYg==",
       "dev": true,
       "dependencies": {
-        "@puppeteer/browsers": "0.5.0",
-        "chromium-bidi": "0.4.7",
-        "cross-fetch": "3.1.5",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.1107588",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "proxy-from-env": "1.1.0",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.13.0"
+        "@puppeteer/browsers": "2.4.0",
+        "chromium-bidi": "0.6.5",
+        "debug": "^4.3.6",
+        "devtools-protocol": "0.0.1330662",
+        "typed-query-selector": "^2.12.0",
+        "ws": "^8.18.0"
       },
       "engines": {
-        "node": ">=14.14.0"
-      },
-      "peerDependencies": {
-        "typescript": ">= 4.7.4"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/puppeteer-core/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=18"
       }
     },
     "node_modules/queue-microtask": {
@@ -5693,26 +5885,18 @@
         }
       ]
     },
+    "node_modules/queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
+      "dev": true
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "dev": true
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz",
@@ -5889,26 +6073,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/safe-regex-test": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
@@ -6018,6 +6182,44 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6116,13 +6318,18 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+    "node_modules/streamx": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.0.tgz",
+      "integrity": "sha512-ZGd1LhDeGFucr1CUCTBOS58ZhEendd0ttpGT3usTvosS4ntIwKN9LJFp+OeCSprsCPL14BXVRZlHGRY1V9PVzQ==",
       "dev": true,
       "dependencies": {
-        "safe-buffer": "~5.2.0"
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
+      },
+      "optionalDependencies": {
+        "bare-events": "^2.2.0"
       }
     },
     "node_modules/string-width": {
@@ -6282,31 +6489,28 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dev": true,
       "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
       }
     },
     "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
       "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
       }
     },
     "node_modules/test-exclude": {
@@ -6323,6 +6527,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/text-decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
+      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
+      "dev": true,
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -6344,12 +6557,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true
-    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -6383,6 +6590,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -6486,6 +6699,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/typed-query-selector": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
+      "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",
+      "dev": true
+    },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
@@ -6527,6 +6746,15 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
@@ -6566,10 +6794,10 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+    "node_modules/urlpattern-polyfill": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
       "dev": true
     },
     "node_modules/uuid": {
@@ -6590,22 +6818,6 @@
         "node": ">=0.10.48"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -6781,9 +6993,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -6878,6 +7090,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/testapp3/package.json b/testapp3/package.json
index 5c141e7834..d0ab05328e 100644
--- a/testapp3/package.json
+++ b/testapp3/package.json
@@ -19,7 +19,7 @@
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
     "nyc": "^15.1.0",
-    "puppeteer": "^19.11.1",
+    "puppeteer": "^23.3.0",
     "standard": "^17.1.0"
   },
   "babel": {

From 0df80846e3b891e6a63021f4e1daa999b6b11705 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 13:48:49 +0200
Subject: [PATCH 0515/1140] Update README

---
 README.md           | 108 ++++++++++++++++++++++++++++----------------
 testapp3/.gitignore |   5 +-
 2 files changed, 74 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 05247ecf0b..d5e54279ec 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ Authorization package for Meteor - compatible with built-in accounts package.
 There are also older versions of this package:
 * [v1](https://github.com/Meteor-Community-Packages/meteor-roles/tree/v1)
 * [v2](https://github.com/Meteor-Community-Packages/meteor-roles/tree/v2)
+* [v3](https://github.com/Meteor-Community-Packages/meteor-roles/tree/v3)
 
 <br />
 
@@ -40,6 +41,9 @@ There are also older versions of this package:
 
 Thanks to:
 
+  * [@storytellerCZ](https://github.com/sponsors/StorytellerCZ)
+  * [@jankapunkt](https://github.com/sponsors/jankapunkt)
+  * [@alanning](https://github.com/alanning)
   * [@mitar](https://github.com/mitar)
   * [@challett](https://github.com/challett)
   * [@ianserlin](https://github.com/ianserlin)
@@ -53,7 +57,6 @@ Thanks to:
   * [@pascoual](https://github.com/pascoual)
   * [@nickmoylan](https://github.com/nickmoylan)
   * [@mcrider](https://github.com/mcrider)
-  * [@alanning](https://github.com/alanning)
   * [@simonsimcity](https://github.com/simonsimcity)
 
 <br />
@@ -93,13 +96,13 @@ with:
 ```javascript
 import { Roles } from 'meteor/alanning:roles';
 
-Roles.createRole('user');
-Roles.createRole('admin');
-Roles.createRole('USERS_VIEW');
-Roles.createRole('POST_EDIT');
-Roles.addRolesToParent('USERS_VIEW', 'admin');
-Roles.addRolesToParent('POST_EDIT', 'admin');
-Roles.addRolesToParent('POST_EDIT', 'user');
+Roles.createRoleAsync('user');
+Roles.createRoleAsync('admin');
+Roles.createRoleAsync('USERS_VIEW');
+Roles.createRoleAsync('POST_EDIT');
+Roles.addRolesToParentAsync('USERS_VIEW', 'admin');
+Roles.addRolesToParentAsync('POST_EDIT', 'admin');
+Roles.addRolesToParentAsync('POST_EDIT', 'user');
 ```
 
 <br />
@@ -118,11 +121,11 @@ But scopes are independent of each other. Users can have one set of roles in sco
 of roles in scope B. Let's go through an example of this using soccer/football teams as scopes.
 
 ```javascript
-Roles.addUsersToRoles(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com');
-Roles.addUsersToRoles(joesUserId, ['player','goalie'], 'real-madrid.com');
+Roles.addUsersToRolesAsync(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com');
+Roles.addUsersToRolesAsync(joesUserId, ['player','goalie'], 'real-madrid.com');
 
-Roles.userIsInRole(joesUserId, 'manage-team', 'manchester-united.com'); // true
-Roles.userIsInRole(joesUserId, 'manage-team', 'real-madrid.com'); // false
+Roles.userIsInRoleAsync(joesUserId, 'manage-team', 'manchester-united.com'); // true
+Roles.userIsInRoleAsync(joesUserId, 'manage-team', 'real-madrid.com'); // false
 ```
 
 In this example, we can see that Joe manages Manchester United and plays for Real Madrid. By using scopes, we can
@@ -132,9 +135,10 @@ Now, let's take a look at how to use the global roles. Say we want to give Joe p
 all of our scopes. That is what the global roles are for:
 
 ```javascript
-Roles.addUsersToRoles(joesUserId, 'super-admin', null); // Or you could just omit the last argument.
+Roles.addUsersToRolesAsync(joesUserId, 'super-admin', null); // Or you could just omit the last argument.
 
-if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.com')) {
+const isInRole = await Roles.userIsInRoleAsync(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.com')
+if (isInRole) {
   // True! Even though Joe doesn't manage Real Madrid, he has
   // a 'super-admin' global role so this check succeeds.
 }
@@ -183,6 +187,33 @@ if (Roles.userIsInRole(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.
 <br />
 
 <a id="roles-migration" name="roles-migration"></a>
+## Migration to 4.0
+
+If you are currently using this package in a version older than 3.6, please upgrade to 3.6 and follow all the steps described for previous major version upgrades.
+Make sure to stay on 3.x until you have run the migration scripts as those are no longer available in version 4.
+
+Before upgrading to version 4 make sure that all your server side roles call use the async versions of the functions.
+
+Here is a full list of new async functions:
+  * createRoleAsync
+  * deleteRoleAsync
+  * renameRoleAsync
+  * addRolesToParentAsync
+  * removeRolesFromParentAsync
+  * addUsersToRolesAsync
+  * setUserRolesAsync
+  * removeUsersFromRolesAsync
+  * userIsInRoleAsync
+  * getRolesForUserAsync
+  * getUsersInRoleAsync
+  * getGroupsForUserAsync
+  * getScopesForUserAsync
+  * renameScopeAsync
+  * removeScopeAsync
+  * isParentOfAsync
+
+> NOTE: The sync version of these functions are still available on the client.
+
 ## Migration to 3.0
 
 If you are currently using this package in a version older than 2.x, please upgrade to 2.0 by running the migration script required there: https://github.com/Meteor-Community-Packages/meteor-roles/tree/v2#migration-to-20
@@ -246,26 +277,27 @@ var users = [
       {name:"Admin User",email:"admin@example.com",roles:['admin']}
     ];
 
-users.forEach(function (user) {
+for (const user of users) {
   var id;
 
-  id = Accounts.createUser({
+  id = await Accounts.createUserAsync({
     email: user.email,
     password: "apple1",
     profile: { name: user.name }
   });
 
-  if (Meteor.roleAssignment.find({ 'user._id': id }).count() === 0) {
+  const count = await Meteor.roleAssignment.coundDocuments({ 'user._id': id })
+  if (count === 0) {
     import { Roles } from 'meteor/alanning:roles';
     
-    user.roles.forEach(function (role) {
-      Roles.createRole(role, {unlessExists: true});
-    });
+    for (const role of user.roles)  {
+      Roles.createRoleAsync(role, {unlessExists: true});
+    }
     // Need _id of existing user record so this call must come after `Accounts.createUser`.
-    Roles.addUsersToRoles(id, user.roles);
+    Roles.addUsersToRolesAsync(id, user.roles);
   }
 
-});
+}
 ```
 
 <br />
@@ -283,10 +315,11 @@ Check user roles before publishing sensitive data:
 import { Roles } from 'meteor/alanning:roles'
 
 // Give authorized users access to sensitive data by scope
-Meteor.publish('secrets', function (scope) {
+Meteor.publish('secrets', async function (scope) {
   check(scope, String);
 
-  if (Roles.userIsInRole(this.userId, ['view-secrets','admin'], scope)) {
+  const isInRole = await Roles.userIsInRoleAsync(this.userId, ['view-secrets','admin'], scope)
+  if (isInRole) {
     
     return Meteor.secrets.find({scope: scope});
     
@@ -304,12 +337,13 @@ Meteor.publish('secrets', function (scope) {
 
 Prevent non-authorized users from creating new users:
 ```js
-Accounts.validateNewUser(function (user) {
+Accounts.validateNewUser(async function (user) {
   import { Roles } from 'meteor/alanning:roles'
   
   var loggedInUser = Meteor.user();
 
-  if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
+  const isInRole = await Roles.userIsInRoleAsync(loggedInUser, ['admin','manage-users'])
+  if () {
     return true;
   }
 
@@ -332,20 +366,19 @@ Meteor.methods({
    * @param {String} targetUserId ID of user to revoke roles for.
    * @param {String} scope Company to update roles for.
    */
-  revokeUser: function (targetUserId, scope) {
+  revokeUser: async function (targetUserId, scope) {
     check(targetUserId, String);
     check(scope, String);
   
-    var loggedInUser = Meteor.user();
+    const loggedInUser = Meteor.user();
 
-    if (!loggedInUser ||
-        !Roles.userIsInRole(loggedInUser, 
-                            ['manage-users', 'support-staff'], scope)) {
+    const isInRole = await Roles.userIsInRole(loggedInUser, ['manage-users', 'support-staff'], scope);
+    if (!loggedInUser || !isInRole) {
       throw new Meteor.Error('access-denied', "Access denied")
     }
 
     // remove roles for target scope
-    Roles.setUserRoles(targetUserId, [], scope)
+    Roles.setUserRolesAsync(targetUserId, [], scope)
   }
 })
 ```
@@ -365,20 +398,19 @@ Meteor.methods({
    * @param {Array} roles User's new roles.
    * @param {String} scope Company to update roles for.
    */
-  updateRoles: function (targetUserId, roles, scope) {
+  updateRoles: async function (targetUserId, roles, scope) {
     check(targetUserId, String);
     check(roles, [String]);
     check(scope, String);
 
-    var loggedInUser = Meteor.user();
+    const loggedInUser = Meteor.user();
 
-    if (!loggedInUser ||
-        !Roles.userIsInRole(loggedInUser, 
-                            ['manage-users', 'support-staff'], scope)) {
+    const isInRole = await Roles.userIsInRole(loggedInUser, ['manage-users', 'support-staff'], scope);
+    if (!loggedInUser || !isInRole) {
       throw new Meteor.Error('access-denied', "Access denied");
     }
 
-    Roles.setUserRoles(targetUserId, roles, scope);
+    Roles.setUserRolesAsync(targetUserId, roles, scope);
   }
 })
 ```
diff --git a/testapp3/.gitignore b/testapp3/.gitignore
index 40b878db5b..d1f89f83a8 100644
--- a/testapp3/.gitignore
+++ b/testapp3/.gitignore
@@ -1 +1,4 @@
-node_modules/
\ No newline at end of file
+node_modules/
+.npm/
+.coverage/
+packages/

From 8e7395c5865051c90dd97d84da17f15280d78500 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 13:55:35 +0200
Subject: [PATCH 0516/1140] Published alanning:roles@4.0.0

---
 .versions  | 4 ++--
 package.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.versions b/.versions
index bdf8de4abf..2dd420f2f6 100644
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
 accounts-base@3.0.1
-alanning:roles@4.0.0-rc.3
+alanning:roles@4.0.0
 allow-deny@2.0.0
 babel-compiler@7.11.0
 babel-runtime@1.5.2
@@ -29,7 +29,7 @@ id-map@1.2.0
 inter-process-messaging@0.1.2
 lmieulet:meteor-coverage@5.0.0
 lmieulet:meteor-legacy-coverage@0.4.0
-local-test:alanning:roles@4.0.0-rc.3
+local-test:alanning:roles@4.0.0
 localstorage@1.2.1
 logging@1.3.5
 meteor@2.0.1
diff --git a/package.js b/package.js
index 3a09a2db58..684bb2ece8 100644
--- a/package.js
+++ b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '4.0.0-rc.3',
+  version: '4.0.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })

From b161b7e6e9bcc981deed48fa4dfc7de89196973f Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 14:05:30 +0200
Subject: [PATCH 0517/1140] Yuidoc version update

---
 yuidoc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuidoc.json b/yuidoc.json
index de1aa90872..1f509a05ae 100644
--- a/yuidoc.json
+++ b/yuidoc.json
@@ -1,7 +1,7 @@
 {
   "name": "The meteor-roles API",
   "description": "The meteor-roles API: an authorization package for Meteor",
-  "version": "v3.6.0",
+  "version": "v4.0.0",
   "options": {
     "outdir": "./docs",
     "exclude": ".meteor,.build,tests",

From 56bee6ed5ac5e25361a8e2ecadb3bce9af40143b Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 5 Sep 2024 14:13:07 +0200
Subject: [PATCH 0518/1140] Add docs to master for easier management

---
 .gitignore                                   |    1 -
 docs/api.js                                  |   25 +
 docs/assets/css/external-small.png           |  Bin 0 -> 491 bytes
 docs/assets/css/logo.png                     |  Bin 0 -> 7143 bytes
 docs/assets/css/main.css                     |  783 +++
 docs/assets/favicon.ico                      |  Bin 0 -> 5430 bytes
 docs/assets/img/spinner.gif                  |  Bin 0 -> 2685 bytes
 docs/assets/index.html                       |   10 +
 docs/assets/js/api-filter.js                 |   56 +
 docs/assets/js/api-list.js                   |  255 +
 docs/assets/js/api-search.js                 |   98 +
 docs/assets/js/apidocs.js                    |  376 ++
 docs/assets/js/yui-prettify.js               |   17 +
 docs/assets/vendor/prettify/CHANGES.html     |  130 +
 docs/assets/vendor/prettify/COPYING          |  202 +
 docs/assets/vendor/prettify/README.html      |  203 +
 docs/assets/vendor/prettify/prettify-min.css |    1 +
 docs/assets/vendor/prettify/prettify-min.js  |    1 +
 docs/classes/Roles.html                      | 5185 ++++++++++++++++++
 docs/classes/UIHelpers.html                  |  246 +
 docs/classes/index.html                      |   10 +
 docs/data.json                               | 1743 ++++++
 docs/elements/index.html                     |   10 +
 docs/files/index.html                        |   10 +
 docs/files/roles_client_uiHelpers.js.html    |  193 +
 docs/files/roles_roles_client.js.html        | 1206 ++++
 docs/files/roles_roles_common_async.js.html  | 1432 +++++
 docs/index.html                              |  118 +
 docs/modules/Roles.html                      |  152 +
 docs/modules/UIHelpers.html                  |  134 +
 docs/modules/index.html                      |   10 +
 31 files changed, 12606 insertions(+), 1 deletion(-)
 create mode 100644 docs/api.js
 create mode 100644 docs/assets/css/external-small.png
 create mode 100644 docs/assets/css/logo.png
 create mode 100644 docs/assets/css/main.css
 create mode 100644 docs/assets/favicon.ico
 create mode 100644 docs/assets/img/spinner.gif
 create mode 100644 docs/assets/index.html
 create mode 100644 docs/assets/js/api-filter.js
 create mode 100644 docs/assets/js/api-list.js
 create mode 100644 docs/assets/js/api-search.js
 create mode 100644 docs/assets/js/apidocs.js
 create mode 100644 docs/assets/js/yui-prettify.js
 create mode 100644 docs/assets/vendor/prettify/CHANGES.html
 create mode 100644 docs/assets/vendor/prettify/COPYING
 create mode 100644 docs/assets/vendor/prettify/README.html
 create mode 100644 docs/assets/vendor/prettify/prettify-min.css
 create mode 100644 docs/assets/vendor/prettify/prettify-min.js
 create mode 100644 docs/classes/Roles.html
 create mode 100644 docs/classes/UIHelpers.html
 create mode 100644 docs/classes/index.html
 create mode 100644 docs/data.json
 create mode 100644 docs/elements/index.html
 create mode 100644 docs/files/index.html
 create mode 100644 docs/files/roles_client_uiHelpers.js.html
 create mode 100644 docs/files/roles_roles_client.js.html
 create mode 100644 docs/files/roles_roles_common_async.js.html
 create mode 100644 docs/index.html
 create mode 100644 docs/modules/Roles.html
 create mode 100644 docs/modules/UIHelpers.html
 create mode 100644 docs/modules/index.html

diff --git a/.gitignore b/.gitignore
index 00e5ba2afa..31bff41266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ smart.lock
 
 .idea
 .DS_Store
-docs/
 node_modules/
 .npm/
 .coverage/
diff --git a/docs/api.js b/docs/api.js
new file mode 100644
index 0000000000..6aca44ca1b
--- /dev/null
+++ b/docs/api.js
@@ -0,0 +1,25 @@
+YUI.add("yuidoc-meta", function(Y) {
+   Y.YUIDoc = { meta: {
+    "classes": [
+        "Roles",
+        "UIHelpers"
+    ],
+    "modules": [
+        "Roles",
+        "UIHelpers"
+    ],
+    "allModules": [
+        {
+            "displayName": "Roles",
+            "name": "Roles",
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nRoles are accessible through `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: 'admin', children: [{_id: 'editor'}]}`\n\nThe assignment of a role to a user is stored in a collection, accessible through `RoleAssignmentCollection`.\nIt's documents consist of\n - `_id`: Internal MongoDB id\n - `role`: A role object which got assigned. Usually only contains the `_id` property\n - `user`: A user object, usually only contains the `_id` property\n - `scope`: scope name\n - `inheritedRoles`: A list of all the roles objects inherited by the assigned role."
+        },
+        {
+            "displayName": "UIHelpers",
+            "name": "UIHelpers",
+            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
+        }
+    ],
+    "elements": []
+} };
+});
\ No newline at end of file
diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..759a1cdcb5b1697e5be290d98b830e279cd71f3c
GIT binary patch
literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzjY&j7RCwBA{Qv(y10{fofkHsB0W2_v
zUBVFtR#sLp=H=xBVFzYr=KaWuf!;khr%J>Ds{zR1^XE?tfB*h@ASKHAa7wwn{MEbP
z7_^nS7{V*>+A}bS;P%45fB%Ai|Neasi2rl3{=EO;!w318%8Ovl7jArHc=P5Brfr~D
z0AYimtss2w$hlYlfd>7*aO3TNzw875LBK0xAD9Np|A(oEVYnB*eE9~V6wP%78SXuL
z&#-X)Er#`zY#Ce<cQE|@_n*NrZu>)^8hM<t@c%yx7=Qlqo#E+=&kU8xDhyfmhZ%Ci
zB^dtyV`g~#;=9AYe+-T|4Pa;I2jl<${xZmkvoM^x_?{uwM}|RLMTp_`2UZ3)Hogb%
z@2x(7(}2e(%NV%1Med)x^p}B+U4TJPLyAFJUXtPFBQCJ`lT(!p@9(X`oen;~J|q6|
z@wSPb3!@4d7=I%C`v334k56{?0OcisymvtS3)uihSYBXcWaI%-d^i%^A0P&W@^_&6
hzgP_zx|s<ezyP)2!%xqD#*+X5002ovPDHLkV1nUx>>B_8

literal 0
HcmV?d00001

diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c82444af95895d38bea6fe96cc5354a7419f770c
GIT binary patch
literal 7143
zcmV<D8yMt?P)<h;3K|Lk000e1NJLTq008O$003wR0{{R3$TFO-0007@P)t-s&e7N@
zH-gsK-M+%iNMNBuSD%THvDVn#HAarCvc0>%$*Zuu-rwWBz{*f-v)|z5tg^kZw!u0~
zlO{BO($v~UUZfl-b-TdHt+Ku{LW;Gz#LLdsP-?Qy(b!LEv9Y$nGD3^4w7)Dldf3_D
zJWrO?*4r&RfK6$yJ583Wu)WyY-%Vz%($w19+~LmA*u}}wPinH(*xkX!%}!~sxV^_q
zWvjTn#y?b@($(9~(%4OAuF%ri)79J4)!T%UyUx+rOJu8sl)L}{0J*)#+1%l+v%b5(
z$-2JCDmjHHHiIZNf+{$LyTHk>w7$2y#k#-9Co*bXWspKke-IjLOI3=tyTog8ndax{
zfrq4ae4-vPgC91BB`tFuHGU*4aTX$Tqo}$!K#ZHAwT+d%kCd(;EO`|ra<jO@Av=s%
zT#X$ne;+M?9xZ_$DR&tseJVte79)5XEPp6Lj^g9yt+Kr*HG-?Kyx`&Gu(rV@HH5FU
zzalSz-rwW0x5Br(#>vdo#>&#g$k5T#*)~UzNMNGG$Iw7gk2OPn(9+pCNQ5#&jW0in
z)z{oaS)e;kmr-i6&Cu6AQku`v*g;mFMOvZC%+$-y)y>b=P-?Qy(bvn()y&V<(bL+~
z*4sy9r%`FK%+A(LW2@KM-r3sV)YjZXRg-CRr^Cn3%FWfv&D2I&m@7Jl*Vx`kU!g)*
zpG8@r)79HZUZyxolQBJb%gxj~ONT>OpDsFeCOe8YNs=^0kJ8lIJ4}d3U!g`>nmJ6B
zM`)`mIfm5N++Jv*SYn<+U!=do%sozut+B(jxy0Gq;43z8mYcpTHhw)#iiC@_qo>0{
zR-Zgfh)PtJ+S}l{zQ`jmeR_efQE9Tcy~o<z;k>}gP*|BOIfd8Q-zz$WhK2J20000(
zbW%=J`1|?v^!csy@b>TT^5*d9<Ll_|_Tkjm#l~gK(;MZmebTFrYn(xUmwx5Ftj*vt
zpMNE3N<o$zTX9voJWC7{C<OqevyM>!02s4LL_t(|UewoRZyZ+?2H-YQt9;6b2BfI5
zRW-F7#Snw6*j}%_&L5kZMP>#wGc$yl%iO=x_fm#-f~K51vOhn1&pG$*7dH;Dx*ctu
zKYVxP`->O9Iej`9425R?`{&EEXD?j%x~93K-QLyG(|hCi>R_n7j<(h-b?3iIr4otg
z&6~?x+kg`3^XD5+pZ<DJ%4M_J!NI{|qpha7y{oGCbEHDqSzC90X(^qK%oAu7P#2^W
zx&i3QjQ6j?WR_S_rBW^)k2l&b6Y%Fl1+%rOdSGa13DSji9_iNB_BM&sx3WT@K)-TI
zlEE4;6bi}4`VM>5=RkFIHdV(40HxB%Yi*=KpN~p6f?M0SU+ze#$s)4?o6B))A(>1z
z)^v3BoMft__EIbcs5a6liPVKi0|6%8@FC%uyMt2_sf^w#uqfv_TQj&Pk?Lr@lm}Fe
zR5PWn-Q6`VU2#DkTK**`$<!*E*lhJXozC*N&Gw!XMa6j5<@0%Mq!AwJGV0;OA8Dq5
z2BOg|S1|O<DG92SF$`=xskN5N=juDUs!j;C8+mG=kfzh?bV>oe>GgVrbS02TkUMAd
zH!8)+uz@uO%dJT##qOXQFWbA1o$9DP1E;xn>Eca{jj2*!G?l>h>I(fWXJk0lU{!1B
zja3uu4y~&-?LEgyZEFHkFU4KTB8`qs3n_~f9gR?f!B;t1)>|{hw>2@xE-voWx3?S<
zwXKdr4T~4hXmo#{OV^0h=Z!F_YjeB+D6>+p@z#m!H?bNluzh_tWP9XP2NJc4G_gOY
zlLpooXwuk8!ADuyY|R)3wqR);Jyj3wQBqZ?dGRJ9b2_Qdo2F8>lM1pTi;@J^@N_aS
zr?RjDJL;^lcOMn?dTm}K)h}K^_0qul(gMkvJSIY84<toaD3&c@NO`bkE7SV5!BQ*g
zYDddaP_MV1$y-fnVt$WH#YWmi+UufyL(g(>LaJzEl}!Vy3)XLHVp4Z(?Jb8*ZH<XY
z_0ZRVrrqwnIkAz}NT&Nk<S{JTcN|h;RfLsG-_gW=y;Wet4INd7NOjcZO_7SbG~(7u
zcadpe3DSjm9%^X$57|Sg{BZ1BHgTmUUKChZ!>5|B9TK&>Hg6GWDv@&cyZ82VbLvIn
zqJ5WL+nX=59*;-ya4eVdlX?65zj6};J8QG|9s;$kT0qUuqjbMXIz2$7WG6*ws6S08
z6R?tCwYg?!u)3$yyRE<q>ue+X_+Y8sO?jhqNi5!ZK;3SgG%z=y3pF_NY;|G+R$Z`)
z@ro^44y?6xHr!lwkW|N|%2P@x_xnLLNQYuXs$Qux_Y}{BM_?6!wI0}#abPW)_|7cR
zUcPo<)YghqnvT#&Rp~U7`qqe)>?HM~c{K&8LXKjT${CI|3~cFrn;6((oBcqjjwZ`U
zQ#{f=?S1MUim~>Mya{!D)q_+O?i5Erp`?pxYKm9~t$x?}iM4EAPQ%1H+|b_h$<$UA
ziqbwBSft{X5z_q_q<kkaY0&jph7+I0C;^$lM-G&z$w^$U_z)<VsCWU;IFtHe<-uBE
zPoa-Lg^GP-Uc7q<j7;e*Ce>xS7yBK#Yuk5w^X@9Pk(#L3zWC^&ffh-TG(nA*;;fQM
z(!jL*C}IRvYej`ozz(D8yFQ-ksJ4tW)o+r%!0JV&hW5pzf~uIO6iiYQDI`j)Y)<(~
z0<{1l%2{@zfBhV~$ZE6?i9$-I6-BKW+K;0`YI&DNZdH)3EeR>!N&J}~ynQ#zg@UPC
z`8t|HVMIxyw5XGJFQd|eR48%qVuF<v_Aqsh;2UY^`WR|wrMomjf5hC^NvC<HZb-GE
zLP|o-YSW~{$<xFi{Nvb3Y8@1Fiefhnq_7Gqx00gHe^F2}=?M8oknD$2Yb_&9^h0X8
zWzfB9`-+`}P;;7nq)@BG788qeHA}V;3QF3(v<MYW_2<nFj(7&cN{h5^STyewa#%Ik
zKZx4fRPlL~0zpVknL=vVNeK1PYK0*caZVPClSLXQimxNyzDd2+xx)%lbT2X`6-MjM
z(xRz885sfeXH-Lb?|V}nbyh!OqN#pE_l_Y`GN;D&U551bcurP(S7K0E!pDlNUPw!Y
zIC_^+{eJ#LB31SiXqj6_!@z=y6CMfEn!O|Xm*vW>e>T{A-jCX8^$v_iF{Z{jh4jS`
zPha=U4~Bw|SGiLv6&_>?lEj8}ir%Jt9~J$56LMb;g{?cBk-~mDs6g^5{hxBPe~Rk7
z;&^`OOn-4EGky7~W5${2q?6hvX~t<ZM*BjI3mF&{(3LbInt+R0UUqPYaz)riSmoAI
zENoXm$=%f@;ilb!sheyf4Ui3cjY8uUhr1R3m7eE3uY2!qY7aZ>O!&o5zUSrpoaYe}
zH@l$4M{SdOB~2f-tt3G;l~N^?6%Y=IO^Q1%kGiAOPUW&f`d+c`z3>eqWj0@k+KpR6
zjPb&OiyyAWNH>DdP11;NqM}n%k;19F#~(%s>PW;tH~26bRjZU0>4NT`yL)5GAjzvW
z4c=Wk@8~9jP0(shprAZ7>!rQrQ8}qsQb~H1glozmsSs6;)QiniB6({&I$J(jAD4?l
z2z0ygse{Lkp6>X15{lID9|{E8PZ&swtlT%GoqF=C8x;%5q_cde{dD^h5~8B`0aC+O
zVKr?N!j?zfQBKnNOQcNyC9?Onht$=Rd>|^Do$<!E+uGV%zK)Or9R*D#>ty3Q-QC?C
zi+X%G(sw7&(-T}ulW9tRq(Rbez6rky9G^Clx_01LPfx3_;BZnK!=jaHA*-z+?DMaD
z3+k@YYce36=dJhZ=kF0x+Iv3+H;88*uTL6Uj`0&|wCQ(kZJjMAveVO0o*2{yPQ~<-
z6g4>#&*t7b4XFRgLgKQ>vM^HcD?sftAb(G_18P^V!wc2ofn_Q~16V$Kyr{dpvy|rU
z?EIIgDQ2%qdK*a<pM<2a<Mu5wQQ;FIsBM6XEtj9vhKaQ|Ici*>rn8E*he)Q=#`!l9
z^_)Ph?A4T}RK%(k#jCqZq9UogN>L`EDFh|Gj-($lQiiIG)Gt=!tTF+WtBMYAY+Tux
z8A8>OG*=Z+BSpv4Nr4JehM_*tkP=LiVUv!8V@4HJAa8%ci@M8Ir6?&*4j>iIK_$J8
zq>9bwKIvlB66v>n)c0jkRgQ{h?{OEZ9*HIeDvZ*sWQ9m@RLeBO5|y@In>JqyO4P<O
zWj{z8*23Yid-6Q>aw*e*gJYh9LdbcFn*P<@lW6)5&8$Ynp7%<cshTF1emDjp9AF95
zbQ%cdF{VgWOP8o1DY_&Z{v?VjngS!2HH@^+?kz%nM&_>4c;{z71yY78NkP*=(6ns&
zUOzX6h6tVRBvUm_4{73t5xy*r8jUP)RHT&07zh<rNnp!jjTiG*f^t<kE5xRqD(Wt#
zkF-a4*Z=A4)zX>{U}d{({w4Y-tJ|NQCRT{{p-HCd<ams&Qs^=TJ`O`QLDdvRO{%OI
zy45cdSVcvLMA{Jq2L)n@slvhuPuA*-{H`BTQNAYo<Z9{O``I-vs@LYv4CUjaVycWM
znX1Vc1i_SN7n`HP@D!+G(*Pd~o1sou7)DX8T3DqOe3oiL&?4S2jct1b>YiuZRZ5ca
zOHc3RTTm3$WAjne#Vkk)m~^x(FjaM`D2OS-DuJ3rL9zAH1=51WQEdekx-a%#?i&!(
z!x`qPqOfAv{8E*ak^UJqg^-%!4*xcgN}r_Kd~grG)ifKPxEIrzs=Byk!ywkLl&T9{
zO>qhrsE#R7*(|M~omU9!l~YFO**(HS5K<;7O~p&h_qyikAQUQu*XE;7^4*WcrZ9#v
zbgpV#va-8kUaLl0LB-TXLDAB0m=aa08b(sgUJ+bX4vHVaNm!rX&5hw!F-xIJfplKh
zshYim-(17=_1b(CwdaHm76AiW5LeX{c}pxViL5}KOq=H=Duxb%nufli8%|#dRGT$l
z-gP1HTbVQ}Xb3(eUfK(&$XfK~a~7wJSJRJGQg=@p>K+&y5gP@l%(%f+HE7Z@e@lJ@
zs<kj_a8#X8k{T5oL5@1*BoZNtx-X27LQVWqIX$dAp56_p$cl}Z{+%xtpHGqWE9gjr
zS0$;}=Fjx37<{16Z5X1q5!46<1%;5PiKIX^P09#z>TDk<P@zBts%1%5<doSPE}6lC
zl^@Nwa7kx|MDvv$2}y4g($Y2`P^*UaW#j5ViCT?JRov<Vr1bKdP&H}vQ&a+qq~^v3
zv-FxsVA~d`3a4rYrI`3F3zcSYSbO?4v2gh@dzt<CvdCUeI)J1Dl9Zy#^hHq@b<|Qu
zqLHea;E-}H#!+oOnP8|JCfnJ|aLS^plxo^?T1g6+0Pon_H$$xoRwR8i@2*oudf}Q&
zRQc+Gi2Ar^)c{aDT}SB_EWuQ@DWHtWWGU2*jRo8Va?pgOjfw=8sGL)L98Zy|9SJbO
zGg~{c14~xW=FyOvz3StY_pnesK8dC8OxM6vM9dRh;!fD8Do4#K20@@YrfzXm10mH=
zP%RZzX01CUDC((ccETW+b}zVB-di3&s=Vy!y+}GoOnw=kgrc@SbRy9SQj-&WuW55t
zxtI*JG-`rxjVut9gq@J6j>Aw33{}E9{1_wtfWWM^4O7R0KnH=SGPZtyR+6fkvh@9v
zdmSo7^;P9{at51F?#`I1D-I9}W4nOgVU7v~dGiiIy}w~`Qb;&@bkTBewGz}}f!b9F
z31=k3U8BICFq8Zq>$|U%zOyMcPl0sq^Kb7-k9(GKujl%wN7RzEmr>Ol4zql8W}+1e
z`P(_Fm7NO!#898Z_hSjZAqzDg>cRgDDk_C@JkDOjE`*SH@4=r=;F;Bf3eLX_sqDVq
zk$MqGtJYTD$mjEQy@g!gm3TG@UY(eO!Opg}%;jMNoB=olyg>sW1l6M*>_AkFRAg-s
zfC8%_;(>^sfJzLJQ*qdjsEYvL9G0k#G(~DF(wq%FiK`6d()sz<%3M#qSUP*>2H!{2
zayEZvf7kKfR_E)g>)<P2y}mD(IyXF#HjUaAkTtWa5hYC%zj2^wy^z0%3I!UfKSqJX
zwiB(q?P%6qkf5Fj6`{&d@>QSAM#v?I>kZpBDybKBhllhtLOOWsc6m{ew5oNHh+3To
zSO`Mg`=F4E)i;m~{s_y^gy5Hj;REdq)dI`cNKjjQdP6o12dzAax{SZ@A)W^n2(c#h
z^hBI^v=P@EHeeN!dT-)>=$WVVA6Hxu-B<P`Bo(5rovg`2)G^pz8il4VK<#W<nH<R`
zO%ofdVI_<Zii)V@(3zYIU`Zx4+fgDMs%<BtE;*VT)d3lk*=RgQHm$?up2TeDl6p~}
zbIsFxkiGam{U7f1mHQ+l^>z6g*Yg<Fy?{zs*L&C3fAa=pa3{n{uBMR7rTY7B#-iD@
z6NO5ps5m+f`$0Wmx}hnqPYWNeKSV?gtR9xAzFs35AC8TWP2)of<z1JTb?3KSI=VU%
zXo{q_zCu#ZK1ueZ%GP_x$%W;*uIG+45Y$Y|N`G!&O-;>%*K79W`pzC~&oI<vBm$f5
zzPqQ9btxHgY!Zot6?T9WMIDI@$EL>86m>ZU_j;pO%DpC*tgp&PwO-VhOVufm&b_bt
zB(|_n(znXj^{yXEwVA<!u62yH=ImEg*36AFg;WZJP4zdQyww4u4Fq-Rd?5!h<_8Rj
z_WP^3*ciNJ8XrkD9i*hkmp{OJ={U6z%flt#u#LE06aNfnX<5`?J?HVgBzy08dXgu7
z*D4#U^MbW5FO#@%X0QcO8#+JqH#Igk9XW8fqX9KV)c#zKz@};`YoPUB{mI5NXHM47
z9Sh=rc(lr1|Bo=#nEUyEi6s7k=K|f^fxn|n8Af_*kbru&`O@ZBb#=X6Ti4tSq#U+a
zG^h1k(_>)8ByQ;5zrVZVXhSBG>COmLj8ydn07153aBc1F_Vxgx2P^qQaiMCg?|=S7
ztnHhh;MvD7e)5r<l!@wHhsyL_3;Ju$o+YGpjI~;J;#|`JVa;@ASRm-pFDUAHs%oyk
z`cx3=l}0OmWA?6I>35@+e>qKApW69^@0Pam$Do{)iR#^)F-Pd@>RMZCsyhp;AT0d2
zI&pRG_lp^Tm9zlb{m|dRP&sSLUm4_#T;TipG4WI;UdvI-{Tmi!jc?oh#IMnId`~4U
z64m{XkXP!v_nLuJ)fGJ=@5D8Qrlrn?7S7plwEO;vsUz>Owp3uOxev}PRs}h2Yakey
zT}hq8=X=OXYxPlnTzO6GW&P3a|Lcw67F=yJ(mSI4N}Df5{Vy$N|Jqg+#&Q1v{b3+O
zeEFeBDNN?uHf`rd>m|8U@7g$<u%=?l(ik(B(MT-UKw3kQvW>m@j{czj(qk1A6|@RE
zBywpmBOOCaxQPFX&pCPS{oWi-2s7z(lRx0Y_xn8go|AJfiAtI-r7XAFDe74W8>R{0
z-`V)>;%oC%TbHhHG<{KHRN?y}tav-Wd;1@PJb(V|n``x~_hC)oF!8&mUpjYosZNmc
zW4`Ke*Z9;Oo*bPV2{lbzfT&1>5mBEf)Z${&W!AisHP6XuC17nkp1s}7wp!Wdc3gOl
z6G0`;5O(vO#!j}i+iGt6tD7~!C#ShxQ<uK3+nc5fb}TH$QD0Ql=zXkdf);Oj%*RY3
z`%2RFSheaBELgdsG0}27Res#I?RZpGPvLS2I^eWPJVJN`3RXh>$X_AMp7(X`KlXnQ
zw2vs#btS4P=3^#h>XrnRPZiS%X@X-Sl_hJ&rV=44vqoUmmmZz9wn~z!3P~X>nzRq9
zQQ46{6AAUNu@>`T-xs8PbIQNO3KKWNS_$I>6~q3eqq2$pkX2}~7*6!yNIZUZ5RUE;
z6|jlk|1h$B$-g%jh*H4@tdJEZW@RNRu>zH4?ZZm6I7Q96qGQL84}N><VTfwldXV<b
zWo8={*QJlDU=Sxm+G&HXKy?%=Ow0vXW`(dYF^?yl?-&I2fN3{BI+G;oT(Tlr(XZUF
zNo3+~U8%&JLfsIK!=zwkNKIFRi4`bL?F@walyU3fXXGT=sl~;7g~|;J!%2^c(`_lN
zLRH%krCs4LD}*)bsta5Dpfidwb_YbAFsxD$^QEY{+|v58TT$ggS41bIiKwtM)(>ey
zO*cJ9md=WH)mbGcI`$w|FoU8#)+^@2zQs%-S>fV_4QN%nM%OxM*iNgaFK+vBuzH%X
zqEEvfd>qqgP}C{9q}#{7gnF7$(Xaul!i0%2iM{eG=}xQ4IH6bp3)ZNvfMwRBhoI=-
zsFMc!-oQ_)A}!|5kbh$g8>os%3=?A#&-k+?DeCV#z8$c_#JydNI8i%#Xt?)R4@X6%
z>8r(jHIp(IVkcwF3KJtbMe=`=8`iT6uWl((J<A3w!bFeR1XfJlp&5AM0Yf6>1v!hF
zDKug+2^#C}S5tIKQnh_=;gljhccbB0V1=&CtHXx6V(JbB6|h0f|Hd?v2z9PemaL(&
zkk!?rQ`>Xm)iW=?T-s9hZF(G?h!wEivq^xJm3;)(9S$mBpL|G<`C(2f%35^G%qk1C
z$ce$SZe}4>m|g$7)Y)-)tK}gQ_ZOCNk371U?}a!%aR8?tBBJJ$s5h5SmL;o#g|1zb
zxS?3v3qO_Q+B_tkUNN(R)YpVP^5CAo?c?y+y?V@NQ8TmEvMR}{>8h=DoI(kkOKVvo
z<>;h0tS+nQeD{w7boi*KsmZZ@TFmdDrt)QGWo5ytt#zzZ^WiR9z2PG|X~G&kd^g_r
zv3IC2^61#U?&+(hQgyi;TV_@Q)nNl+N!1i}>HK^;z4b@aw|M`*4=dB|KlWcWXS32U
z5C?I=Q(J@tp^bqOQ$)zA5JE(hN-FCIXuw0jn<7Y0UL-C>&<F75bNB|HMa)6zMMe5D
z?v~VX{Wo}PwwovTF_~qCh3QOtS}IyyUJ^#dog}hSpG#2A0E_6P+{6hxy1RV5fBGEk
z93%-Iu_pY)fE8yx+$?DuZB5`V=Az21bjZa?VOR!T{}lE(=7X1PIQ){)DM8mkVW+|l
zH|*(-5Yc~mrBxq^`g)pjd6@jhy0XdnzbErjrgYeU3=4;rgbI0E^*1T1qAOr&Chld0
zU5Bz(!ywXWbJUZlL{~<_L~+--rG^!-g0rL9ylTjCsA1_vJQ7vuI@GY+4RC6N>g1Tz
zu*D^ozUx3(iMgfcXs!iN)vyqj8Wz1yUQTdq)v<kj_kmq-LfC@*kFJya{KfJ3CSGvt
zc1P=d;2J0kh3!MwT-V<ZJ4xJgL)(wEUw!seP-<9|9nhk%Hykg3n0ljjea|AgG7e!2
zx{hgu0&;8CX3Lv_=NJksOG$LfRW)5lGB%?bUTF6N+Y2qrHEOjA44YO=(=c4u5`cEl
dE_aK*`wbys)<9*L9Wej^002ovPDHLkV1mbb3%&pV

literal 0
HcmV?d00001

diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
new file mode 100644
index 0000000000..cdfe209e8d
--- /dev/null
+++ b/docs/assets/css/main.css
@@ -0,0 +1,783 @@
+/*
+Font sizes for all selectors other than the body are given in percentages,
+with 100% equal to 13px. To calculate a font size percentage, multiply the
+desired size in pixels by 7.6923076923.
+
+Here's a quick lookup table:
+
+10px - 76.923%
+11px - 84.615%
+12px - 92.308%
+13px - 100%
+14px - 107.692%
+15px - 115.385%
+16px - 123.077%
+17px - 130.769%
+18px - 138.462%
+19px - 146.154%
+20px - 153.846%
+*/
+
+html {
+    background: #fff;
+    color: #333;
+    overflow-y: scroll;
+}
+
+body {
+    /*font: 13px/1.4 'Lucida Grande', 'Lucida Sans Unicode', 'DejaVu Sans', 'Bitstream Vera Sans', 'Helvetica', 'Arial', sans-serif;*/
+    font: 13px/1.4 'Helvetica', 'Arial', sans-serif;
+    margin: 0;
+    padding: 0;
+}
+
+/* -- Links ----------------------------------------------------------------- */
+a {
+    color: #356de4;
+    text-decoration: none;
+}
+
+.hidden {
+    display: none;
+}
+
+a:hover { text-decoration: underline; }
+
+/* "Jump to Table of Contents" link is shown to assistive tools, but hidden from
+   sight until it's focused. */
+.jump {
+    position: absolute;
+    padding: 3px 6px;
+    left: -99999px;
+    top: 0;
+}
+
+.jump:focus { left: 40%; }
+
+/* -- Paragraphs ------------------------------------------------------------ */
+p { margin: 1.3em 0; }
+dd p, td p { margin-bottom: 0; }
+dd p:first-child, td p:first-child { margin-top: 0; }
+
+/* -- Headings -------------------------------------------------------------- */
+h1, h2, h3, h4, h5, h6 {
+    color: #D98527;/*was #f80*/
+    font-family: 'Trebuchet MS', sans-serif;
+    font-weight: bold;
+    line-height: 1.1;
+    margin: 1.1em 0 0.5em;
+}
+
+h1 {
+    font-size: 184.6%;
+    color: #30418C;
+    margin: 0.75em 0 0.5em;
+}
+
+h2 {
+    font-size: 153.846%;
+    color: #E48A2B;
+}
+
+h3 { font-size: 138.462%; }
+
+h4 {
+    border-bottom: 1px solid #DBDFEA;
+    color: #E48A2B;
+    font-size: 115.385%;
+    font-weight: normal;
+    padding-bottom: 2px;
+}
+
+h5, h6 { font-size: 107.692%; }
+
+/* -- Code and examples ----------------------------------------------------- */
+code, kbd, pre, samp {
+    font-family: Menlo, Monaco, 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+    font-size: 92.308%;
+    line-height: 1.35;
+}
+
+p code, p kbd, p samp, li code {
+    background: #FCFBFA;
+    border: 1px solid #EFEEED;
+    padding: 0 3px;
+}
+
+a code, a kbd, a samp,
+pre code, pre kbd, pre samp,
+table code, table kbd, table samp,
+.intro code, .intro kbd, .intro samp,
+.toc code, .toc kbd, .toc samp {
+    background: none;
+    border: none;
+    padding: 0;
+}
+
+pre.code, pre.terminal, pre.cmd {
+    overflow-x: auto;
+    *overflow-x: scroll;
+    padding: 0.3em 0.6em;
+}
+
+pre.code {
+    background: #FCFBFA;
+    border: 1px solid #EFEEED;
+    border-left-width: 5px;
+}
+
+pre.terminal, pre.cmd {
+    background: #F0EFFC;
+    border: 1px solid #D0CBFB;
+    border-left: 5px solid #D0CBFB;
+}
+
+/* Don't reduce the font size of <code>/<kbd>/<samp> elements inside <pre>
+   blocks. */
+pre code, pre kbd, pre samp { font-size: 100%; }
+
+/* Used to denote text that shouldn't be selectable, such as line numbers or
+   shell prompts. Guess which browser this doesn't work in. */
+.noselect {
+    -moz-user-select: -moz-none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
+    -o-user-select: none;
+    user-select: none;
+}
+
+/* -- Lists ----------------------------------------------------------------- */
+dd { margin: 0.2em 0 0.7em 1em; }
+dl { margin: 1em 0; }
+dt { font-weight: bold; }
+
+/* -- Tables ---------------------------------------------------------------- */
+caption, th { text-align: left; }
+
+table {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+td, th {
+    border: 1px solid #fff;
+    padding: 5px 12px;
+    vertical-align: top;
+}
+
+td { background: #E6E9F5; }
+td dl { margin: 0; }
+td dl dl { margin: 1em 0; }
+td pre:first-child { margin-top: 0; }
+
+th {
+    background: #D2D7E6;/*#97A0BF*/
+    border-bottom: none;
+    border-top: none;
+    color: #000;/*#FFF1D5*/
+    font-family: 'Trebuchet MS', sans-serif;
+    font-weight: bold;
+    line-height: 1.3;
+    white-space: nowrap;
+}
+
+
+/* -- Layout and Content ---------------------------------------------------- */
+#doc {
+    margin: auto;
+    min-width: 1024px;
+}
+
+.content { padding: 0 20px 0 25px; }
+
+.sidebar {
+    padding: 0 15px 0 10px;
+}
+#bd {
+    padding: 7px 0 130px;
+    position: relative;
+    width: 99%;
+}
+
+/* -- Table of Contents ----------------------------------------------------- */
+
+/* The #toc id refers to the single global table of contents, while the .toc
+   class refers to generic TOC lists that could be used throughout the page. */
+
+.toc code, .toc kbd, .toc samp { font-size: 100%; }
+.toc li { font-weight: bold; }
+.toc li li { font-weight: normal; }
+
+/* -- Intro and Example Boxes ----------------------------------------------- */
+/*
+.intro, .example { margin-bottom: 2em; }
+.example {
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: 0 0 5px #bfbfbf;
+    -webkit-box-shadow: 0 0 5px #bfbfbf;
+    box-shadow: 0 0 5px #bfbfbf;
+    padding: 1em;
+}
+.intro {
+    background: none repeat scroll 0 0 #F0F1F8; border: 1px solid #D4D8EB; padding: 0 1em;
+}
+*/
+
+/* -- Other Styles ---------------------------------------------------------- */
+
+/* These are probably YUI-specific, and should be moved out of Selleck's default
+   theme. */
+
+.button {
+    border: 1px solid #dadada;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    color: #444;
+    display: inline-block;
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 92.308%;
+    font-weight: bold;
+    padding: 4px 13px 3px;
+    -moz-text-shadow: 1px 1px 0 #fff;
+    -webkit-text-shadow: 1px 1px 0 #fff;
+    text-shadow: 1px 1px 0 #fff;
+    white-space: nowrap;
+
+    background: #EFEFEF; /* old browsers */
+    background: -moz-linear-gradient(top, #f5f5f5 0%, #efefef 50%, #e5e5e5 51%, #dfdfdf 100%); /* firefox */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(50%,#efefef), color-stop(51%,#e5e5e5), color-stop(100%,#dfdfdf)); /* webkit */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#dfdfdf',GradientType=0 ); /* ie */
+}
+
+.button:hover {
+    border-color: #466899;
+    color: #fff;
+    text-decoration: none;
+    -moz-text-shadow: 1px 1px 0 #222;
+    -webkit-text-shadow: 1px 1px 0 #222;
+    text-shadow: 1px 1px 0 #222;
+
+    background: #6396D8; /* old browsers */
+    background: -moz-linear-gradient(top, #6396D8 0%, #5A83BC 50%, #547AB7 51%, #466899 100%); /* firefox */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#6396D8), color-stop(50%,#5A83BC), color-stop(51%,#547AB7), color-stop(100%,#466899)); /* webkit */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6396D8', endColorstr='#466899',GradientType=0 ); /* ie */
+}
+
+.newwindow { text-align: center; }
+
+.header .version em {
+    display: block;
+    text-align: right;
+}
+
+
+#classdocs .item {
+    border-bottom: 1px solid #466899;
+    margin: 1em 0;
+    padding: 1.5em;
+}
+
+#classdocs .item .params p,
+    #classdocs .item .returns p,{
+    display: inline;
+}
+
+#classdocs .item em code, #classdocs .item em.comment {
+    color: green;
+}
+
+#classdocs .item em.comment a {
+    color: green;
+    text-decoration: underline;
+}
+
+#classdocs .foundat {
+    font-size: 11px;
+    font-style: normal;
+}
+
+.attrs .emits {
+    margin-left: 2em;
+    padding: .5em;
+    border-left: 1px dashed #ccc;
+}
+
+abbr {
+    border-bottom: 1px dashed #ccc;
+    font-size: 80%;
+    cursor: help;
+}
+
+.prettyprint li.L0, 
+.prettyprint li.L1, 
+.prettyprint li.L2, 
+.prettyprint li.L3, 
+.prettyprint li.L5, 
+.prettyprint li.L6, 
+.prettyprint li.L7, 
+.prettyprint li.L8 {
+    list-style: decimal;
+}
+
+ul li p {
+    margin-top: 0;
+}
+
+.method .name {
+    font-size: 110%;
+}
+
+.apidocs .methods .extends .method,
+.apidocs .properties .extends .property,
+.apidocs .attrs .extends .attr,
+.apidocs .events .extends .event {
+    font-weight: bold;
+}
+
+.apidocs .methods .extends .inherited,
+.apidocs .properties .extends .inherited,
+.apidocs .attrs .extends .inherited,
+.apidocs .events .extends .inherited {
+    font-weight: normal;
+}
+
+#hd {
+    background: whiteSmoke;
+    background: -moz-linear-gradient(top,#DCDBD9 0,#F6F5F3 100%);
+    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#DCDBD9),color-stop(100%,#F6F5F3));
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dcdbd9',endColorstr='#F6F5F3',GradientType=0);
+    border-bottom: 1px solid #DFDFDF;
+    padding: 0 15px 1px 20px;
+    margin-bottom: 15px;
+}
+
+#hd img {
+    margin-right: 10px;
+    vertical-align: middle;
+}
+
+
+/* -- API Docs CSS ---------------------------------------------------------- */
+
+/*
+This file is organized so that more generic styles are nearer the top, and more
+specific styles are nearer the bottom of the file. This allows us to take full
+advantage of the cascade to avoid redundant style rules. Please respect this
+convention when making changes.
+*/
+
+/* -- Generic TabView styles ------------------------------------------------ */
+
+/*
+These styles apply to all API doc tabviews. To change styles only for a
+specific tabview, see the other sections below.
+*/
+
+.yui3-js-enabled .apidocs .tabview {
+    visibility: hidden; /* Hide until the TabView finishes rendering. */
+    _visibility: visible;
+}
+
+.apidocs .tabview.yui3-tabview-content { visibility: visible; }
+.apidocs .tabview .yui3-tabview-panel { background: #fff; }
+
+/* -- Generic Content Styles ------------------------------------------------ */
+
+/* Headings */
+h2, h3, h4, h5, h6 {
+    border: none;
+    color: #30418C;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+.link-docs {
+    float: right;
+    font-size: 15px;
+    margin: 4px 4px 6px;
+    padding: 6px 30px 5px;
+}
+
+.apidocs { zoom: 1; }
+
+/* Generic box styles. */
+.apidocs .box {
+    border: 1px solid;
+    border-radius: 3px;
+    margin: 1em 0;
+    padding: 0 1em;
+}
+
+/* A flag is a compact, capsule-like indicator of some kind. It's used to
+   indicate private and protected items, item return types, etc. in an
+   attractive and unobtrusive way. */
+.apidocs .flag {
+    background: #bababa;
+    border-radius: 3px;
+    color: #fff;
+    font-size: 11px;
+    margin: 0 0.5em;
+    padding: 2px 4px 1px;
+}
+
+/* Class/module metadata such as "Uses", "Extends", "Defined in", etc. */
+.apidocs .meta {
+    background: #f9f9f9;
+    border-color: #efefef;
+    color: #555;
+    font-size: 11px;
+    padding: 3px 6px;
+}
+
+.apidocs .meta p { margin: 0; }
+
+/* Deprecation warning. */
+.apidocs .box.deprecated,
+.apidocs .flag.deprecated {
+    background: #fdac9f;
+    border: 1px solid #fd7775;
+}
+
+.apidocs .box.deprecated p { margin: 0.5em 0; }
+.apidocs .flag.deprecated { color: #333; }
+
+/* Module/Class intro description. */
+.apidocs .intro {
+    background: #f0f1f8;
+    border-color: #d4d8eb;
+}
+
+/* Loading spinners. */
+#bd.loading .apidocs,
+#api-list.loading .yui3-tabview-panel {
+    background: #fff url(../img/spinner.gif) no-repeat center 70px;
+    min-height: 150px;
+}
+
+#bd.loading .apidocs .content,
+#api-list.loading .yui3-tabview-panel .apis {
+    display: none;
+}
+
+.apidocs .no-visible-items { color: #666; }
+
+/* Generic inline list. */
+.apidocs ul.inline {
+    display: inline;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
+.apidocs ul.inline li { display: inline; }
+
+/* Comma-separated list. */
+.apidocs ul.commas li:after { content: ','; }
+.apidocs ul.commas li:last-child:after { content: ''; }
+
+/* Keyboard shortcuts. */
+kbd .cmd { font-family: Monaco, Helvetica; }
+
+/* -- Generic Access Level styles ------------------------------------------- */
+.apidocs .item.protected,
+.apidocs .item.private,
+.apidocs .index-item.protected,
+.apidocs .index-item.deprecated,
+.apidocs .index-item.private {
+    display: none;
+}
+
+.show-deprecated .item.deprecated,
+.show-deprecated .index-item.deprecated,
+.show-protected .item.protected,
+.show-protected .index-item.protected,
+.show-private .item.private,
+.show-private .index-item.private {
+    display: block;
+}
+
+.hide-inherited .item.inherited,
+.hide-inherited .index-item.inherited {
+    display: none;
+}
+
+/* -- Generic Item Index styles --------------------------------------------- */
+.apidocs .index { margin: 1.5em 0 3em; }
+
+.apidocs .index h3 {
+    border-bottom: 1px solid #efefef;
+    color: #333;
+    font-size: 13px;
+    margin: 2em 0 0.6em;
+    padding-bottom: 2px;
+}
+
+.apidocs .index .no-visible-items { margin-top: 2em; }
+
+.apidocs .index-list {
+    border-color: #efefef;
+    font-size: 12px;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    -moz-column-count: 4;
+    -moz-column-gap: 10px;
+    -moz-column-width: 170px;
+    -ms-column-count: 4;
+    -ms-column-gap: 10px;
+    -ms-column-width: 170px;
+    -o-column-count: 4;
+    -o-column-gap: 10px;
+    -o-column-width: 170px;
+    -webkit-column-count: 4;
+    -webkit-column-gap: 10px;
+    -webkit-column-width: 170px;
+    column-count: 4;
+    column-gap: 10px;
+    column-width: 170px;
+}
+
+.apidocs .no-columns .index-list {
+    -moz-column-count: 1;
+    -ms-column-count: 1;
+    -o-column-count: 1;
+    -webkit-column-count: 1;
+    column-count: 1;
+}
+
+.apidocs .index-item { white-space: nowrap; }
+
+.apidocs .index-item .flag {
+    background: none;
+    border: none;
+    color: #afafaf;
+    display: inline;
+    margin: 0 0 0 0.2em;
+    padding: 0;
+}
+
+/* -- Generic API item styles ----------------------------------------------- */
+.apidocs .args {
+    display: inline;
+    margin: 0 0.5em;
+}
+
+.apidocs .flag.chainable { background: #46ca3b; }
+.apidocs .flag.protected { background: #9b86fc; }
+.apidocs .flag.private { background: #fd6b1b; }
+.apidocs .flag.async { background: #356de4; }
+.apidocs .flag.required { background: #e60923; }
+
+.apidocs .item {
+    border-bottom: 1px solid #efefef;
+    margin: 1.5em 0 2em;
+    padding-bottom: 2em;
+}
+
+.apidocs .item h4,
+.apidocs .item h5,
+.apidocs .item h6 {
+    color: #333;
+    font-family: inherit;
+    font-size: 100%;
+}
+
+.apidocs .item .description p,
+.apidocs .item pre.code {
+    margin: 1em 0 0;
+}
+
+.apidocs .item .meta {
+    background: none;
+    border: none;
+    padding: 0;
+}
+
+.apidocs .item .name {
+    display: inline;
+    font-size: 14px;
+}
+
+.apidocs .item .type,
+.apidocs .item .type a,
+.apidocs .returns-inline {
+    color: #555;
+}
+
+.apidocs .item .type,
+.apidocs .returns-inline {
+    font-size: 11px;
+    margin: 0 0 0 0;
+}
+
+.apidocs .item .type a { border-bottom: 1px dotted #afafaf; }
+.apidocs .item .type a:hover { border: none; }
+
+/* -- Item Parameter List --------------------------------------------------- */
+.apidocs .params-list {
+    list-style: square;
+    margin: 1em 0 0 2em;
+    padding: 0;
+}
+
+.apidocs .param { margin-bottom: 1em; }
+
+.apidocs .param .type,
+.apidocs .param .type a {
+    color: #666;
+}
+
+.apidocs .param .type {
+    margin: 0 0 0 0.5em;
+    *margin-left: 0.5em;
+}
+
+.apidocs .param-name { font-weight: bold; }
+
+/* -- Item "Emits" block ---------------------------------------------------- */
+.apidocs .item .emits {
+    background: #f9f9f9;
+    border-color: #eaeaea;
+}
+
+/* -- Item "Returns" block -------------------------------------------------- */
+.apidocs .item .returns .type,
+.apidocs .item .returns .type a {
+    font-size: 100%;
+    margin: 0;
+}
+
+/* -- Class Constructor block ----------------------------------------------- */
+.apidocs .constructor .item {
+    border: none;
+    padding-bottom: 0;
+}
+
+/* -- File Source View ------------------------------------------------------ */
+.apidocs .file pre.code,
+#doc .apidocs .file pre.prettyprint {
+    background: inherit;
+    border: none;
+    overflow: visible;
+    padding: 0;
+}
+
+.apidocs .L0,
+.apidocs .L1,
+.apidocs .L2,
+.apidocs .L3,
+.apidocs .L4,
+.apidocs .L5,
+.apidocs .L6,
+.apidocs .L7,
+.apidocs .L8,
+.apidocs .L9 {
+    background: inherit;
+}
+
+/* -- Submodule List -------------------------------------------------------- */
+.apidocs .module-submodule-description {
+    font-size: 12px;
+    margin: 0.3em 0 1em;
+}
+
+.apidocs .module-submodule-description p:first-child { margin-top: 0; }
+
+/* -- Sidebar TabView ------------------------------------------------------- */
+#api-tabview { margin-top: 0.6em; }
+
+#api-tabview-filter,
+#api-tabview-panel {
+    border: 1px solid #dfdfdf;
+}
+
+#api-tabview-filter {
+    border-bottom: none;
+    border-top: none;
+    padding: 0.6em 10px 0 10px;
+}
+
+#api-tabview-panel { border-top: none; }
+#api-filter { width: 97%; }
+
+/* -- Content TabView ------------------------------------------------------- */
+#classdocs .yui3-tabview-panel { border: none; }
+
+/* -- Source File Contents -------------------------------------------------- */
+.prettyprint li.L0,
+.prettyprint li.L1,
+.prettyprint li.L2,
+.prettyprint li.L3,
+.prettyprint li.L5,
+.prettyprint li.L6,
+.prettyprint li.L7,
+.prettyprint li.L8 {
+    list-style: decimal;
+}
+
+/* -- API options ----------------------------------------------------------- */
+#api-options {
+    font-size: 11px;
+    margin-top: 2.2em;
+    position: absolute;
+    right: 1.5em;
+}
+
+/*#api-options label { margin-right: 0.6em; }*/
+
+/* -- API list -------------------------------------------------------------- */
+#api-list {
+    margin-top: 1.5em;
+    *zoom: 1;
+}
+
+.apis {
+    font-size: 12px;
+    line-height: 1.4;
+    list-style: none;
+    margin: 0;
+    padding: 0.5em 0 0.5em 0.4em;
+}
+
+.apis a {
+    border: 1px solid transparent;
+    display: block;
+    margin: 0 0 0 -4px;
+    padding: 1px 4px 0;
+    text-decoration: none;
+    _border: none;
+    _display: inline;
+}
+
+.apis a:hover,
+.apis a:focus {
+    background: #E8EDFC;
+    background: -moz-linear-gradient(top, #e8edfc 0%, #becef7 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E8EDFC), color-stop(100%,#BECEF7));
+    border-color: #AAC0FA;
+    border-radius: 3px;
+    color: #333;
+    outline: none;
+}
+
+.api-list-item a:hover,
+.api-list-item a:focus {
+    font-weight: bold;
+    text-shadow: 1px 1px 1px #fff;
+}
+
+.apis .message { color: #888; }
+.apis .result a { padding: 3px 5px 2px; }
+
+.apis .result .type {
+    right: 4px;
+    top: 7px;
+}
+
+.api-list-item .yui3-highlight {
+    font-weight: bold;
+}
+
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..414ac4fb9e145171ae8f660e51879e18c401e653
GIT binary patch
literal 5430
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

literal 0
HcmV?d00001

diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..44f96ba68c8910d19f49e8365bf589ee4e6991e4
GIT binary patch
literal 2685
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

literal 0
HcmV?d00001

diff --git a/docs/assets/index.html b/docs/assets/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/assets/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
new file mode 100644
index 0000000000..d442e54306
--- /dev/null
+++ b/docs/assets/js/api-filter.js
@@ -0,0 +1,56 @@
+YUI.add('api-filter', function (Y) {
+
+Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {
+    // -- Initializer ----------------------------------------------------------
+    initializer: function () {
+        this._bindUIACBase();
+        this._syncUIACBase();
+    },
+    getDisplayName: function(name) {
+
+        Y.each(Y.YUIDoc.meta.allModules, function(i) {
+            if (i.name === name && i.displayName) {
+                name = i.displayName;
+            }
+        });
+
+        if (this.get('queryType') === 'elements') {
+            name = '&lt;' + name + '&gt;';
+        }
+
+        return name;
+    }
+
+}, {
+    // -- Attributes -----------------------------------------------------------
+    ATTRS: {
+        resultHighlighter: {
+            value: 'phraseMatch'
+        },
+
+        // May be set to "classes", "elements" or "modules".
+        queryType: {
+            value: 'classes'
+        },
+
+        source: {
+            valueFn: function() {
+                var self = this;
+                return function(q) {
+                    var data = Y.YUIDoc.meta[self.get('queryType')],
+                        out = [];
+                    Y.each(data, function(v) {
+                        if (v.toLowerCase().indexOf(q.toLowerCase()) > -1) {
+                            out.push(v);
+                        }
+                    });
+                    return out;
+                };
+            }
+        }
+    }
+});
+
+}, '3.4.0', {requires: [
+    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources'
+]});
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
new file mode 100644
index 0000000000..e8f650d5d5
--- /dev/null
+++ b/docs/assets/js/api-list.js
@@ -0,0 +1,255 @@
+YUI.add('api-list', function (Y) {
+
+var Lang   = Y.Lang,
+    YArray = Y.Array,
+
+    APIList = Y.namespace('APIList'),
+
+    classesNode    = Y.one('#api-classes'),
+    elementsNode   = Y.one('#api-elements'),
+    inputNode      = Y.one('#api-filter'),
+    modulesNode    = Y.one('#api-modules'),
+    tabviewNode    = Y.one('#api-tabview'),
+
+    tabs = APIList.tabs = {},
+
+    filter = APIList.filter = new Y.APIFilter({
+        inputNode : inputNode,
+        maxResults: 1000,
+
+        on: {
+            results: onFilterResults
+        }
+    }),
+
+    search = APIList.search = new Y.APISearch({
+        inputNode : inputNode,
+        maxResults: 100,
+
+        on: {
+            clear  : onSearchClear,
+            results: onSearchResults
+        }
+    }),
+
+    tabview = APIList.tabview = new Y.TabView({
+        srcNode  : tabviewNode,
+        panelNode: '#api-tabview-panel',
+        render   : true,
+
+        on: {
+            selectionChange: onTabSelectionChange
+        }
+    }),
+
+    focusManager = APIList.focusManager = tabviewNode.plug(Y.Plugin.NodeFocusManager, {
+        circular   : true,
+        descendants: '#api-filter, .yui3-tab-panel-selected .api-list-item a, .yui3-tab-panel-selected .result a',
+        keys       : {next: 'down:40', previous: 'down:38'}
+    }).focusManager,
+
+    LIST_ITEM_TEMPLATE =
+        '<li class="api-list-item {typeSingular}">' +
+            '<a href="{rootPath}{typePlural}/{name}.html">{displayName}</a>' +
+        '</li>';
+
+// -- Init ---------------------------------------------------------------------
+
+// Duckpunch FocusManager's key event handling to prevent it from handling key
+// events when a modifier is pressed.
+Y.before(function (e, activeDescendant) {
+    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
+        return new Y.Do.Prevent();
+    }
+}, focusManager, '_focusPrevious', focusManager);
+
+Y.before(function (e, activeDescendant) {
+    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
+        return new Y.Do.Prevent();
+    }
+}, focusManager, '_focusNext', focusManager);
+
+// Create a mapping of tabs in the tabview so we can refer to them easily later.
+tabview.each(function (tab, index) {
+    var name = tab.get('label').toLowerCase();
+
+    tabs[name] = {
+        index: index,
+        name : name,
+        tab  : tab
+    };
+});
+
+// Switch tabs on Ctrl/Cmd-Left/Right arrows.
+tabviewNode.on('key', onTabSwitchKey, 'down:37,39');
+
+// Focus the filter input when the `/` key is pressed.
+Y.one(Y.config.doc).on('key', onSearchKey, 'down:83');
+
+// Keep the Focus Manager up to date.
+inputNode.on('focus', function () {
+    focusManager.set('activeDescendant', inputNode);
+});
+
+// Update all tabview links to resolved URLs.
+tabview.get('panelNode').all('a').each(function (link) {
+    link.setAttribute('href', link.get('href'));
+});
+
+// -- Private Functions --------------------------------------------------------
+function getFilterResultNode() {
+    var queryType = filter.get('queryType');
+    return queryType === 'classes' ? classesNode
+            : queryType === 'elements' ? elementsNode : modulesNode;
+}
+
+// -- Event Handlers -----------------------------------------------------------
+function onFilterResults(e) {
+    var frag         = Y.one(Y.config.doc.createDocumentFragment()),
+        resultNode   = getFilterResultNode(),
+        typePlural   = filter.get('queryType'),
+        typeSingular = typePlural === 'classes' ? 'class' : typePlural === 'elements' ? 'element' : 'module';
+
+    if (e.results.length) {
+        YArray.each(e.results, function (result) {
+            frag.append(Lang.sub(LIST_ITEM_TEMPLATE, {
+                rootPath    : APIList.rootPath,
+                displayName : filter.getDisplayName(result.highlighted),
+                name        : result.text,
+                typePlural  : typePlural,
+                typeSingular: typeSingular
+            }));
+        });
+    } else {
+        frag.append(
+            '<li class="message">' +
+                'No ' + typePlural + ' found.' +
+            '</li>'
+        );
+    }
+
+    resultNode.empty(true);
+    resultNode.append(frag);
+
+    focusManager.refresh();
+}
+
+function onSearchClear(e) {
+
+    focusManager.refresh();
+}
+
+function onSearchKey(e) {
+    var target = e.target;
+
+    if (target.test('input,select,textarea')
+            || target.get('isContentEditable')) {
+        return;
+    }
+
+    e.preventDefault();
+
+    inputNode.focus();
+    focusManager.refresh();
+}
+
+function onSearchResults(e) {
+    var frag = Y.one(Y.config.doc.createDocumentFragment());
+
+    if (e.results.length) {
+        YArray.each(e.results, function (result) {
+            frag.append(result.display);
+        });
+    } else {
+        frag.append(
+            '<li class="message">' +
+                'No results found. Maybe you\'ll have better luck with a ' +
+                'different query?' +
+            '</li>'
+        );
+    }
+
+
+    focusManager.refresh();
+}
+
+function onTabSelectionChange(e) {
+    var tab  = e.newVal,
+        name = tab.get('label').toLowerCase();
+
+    tabs.selected = {
+        index: tab.get('index'),
+        name : name,
+        tab  : tab
+    };
+
+    switch (name) {
+    case 'elements':// fallthru
+    case 'classes': // fallthru
+    case 'modules':
+        filter.setAttrs({
+            minQueryLength: 0,
+            queryType     : name
+        });
+
+        search.set('minQueryLength', -1);
+
+        // Only send a request if this isn't the initially-selected tab.
+        if (e.prevVal) {
+            filter.sendRequest(filter.get('value'));
+        }
+        break;
+
+    case 'everything':
+        filter.set('minQueryLength', -1);
+        search.set('minQueryLength', 1);
+
+        if (search.get('value')) {
+            search.sendRequest(search.get('value'));
+        } else {
+            inputNode.focus();
+        }
+        break;
+
+    default:
+        // WTF? We shouldn't be here!
+        filter.set('minQueryLength', -1);
+        search.set('minQueryLength', -1);
+    }
+
+    if (focusManager) {
+        setTimeout(function () {
+            focusManager.refresh();
+        }, 1);
+    }
+}
+
+function onTabSwitchKey(e) {
+    var currentTabIndex = tabs.selected.index;
+
+    if (!(e.ctrlKey || e.metaKey)) {
+        return;
+    }
+
+    e.preventDefault();
+
+    switch (e.keyCode) {
+    case 37: // left arrow
+        if (currentTabIndex > 0) {
+            tabview.selectChild(currentTabIndex - 1);
+            inputNode.focus();
+        }
+        break;
+
+    case 39: // right arrow
+        if (currentTabIndex < (Y.Object.size(tabs) - 2)) {
+            tabview.selectChild(currentTabIndex + 1);
+            inputNode.focus();
+        }
+        break;
+    }
+}
+
+}, '3.4.0', {requires: [
+    'api-filter', 'api-search', 'event-key', 'node-focusmanager', 'tabview'
+]});
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
new file mode 100644
index 0000000000..175f6a6179
--- /dev/null
+++ b/docs/assets/js/api-search.js
@@ -0,0 +1,98 @@
+YUI.add('api-search', function (Y) {
+
+var Lang   = Y.Lang,
+    Node   = Y.Node,
+    YArray = Y.Array;
+
+Y.APISearch = Y.Base.create('apiSearch', Y.Base, [Y.AutoCompleteBase], {
+    // -- Public Properties ----------------------------------------------------
+    RESULT_TEMPLATE:
+        '<li class="result {resultType}">' +
+            '<a href="{url}">' +
+                '<h3 class="title">{name}</h3>' +
+                '<span class="type">{resultType}</span>' +
+                '<div class="description">{description}</div>' +
+                '<span class="className">{class}</span>' +
+            '</a>' +
+        '</li>',
+
+    // -- Initializer ----------------------------------------------------------
+    initializer: function () {
+        this._bindUIACBase();
+        this._syncUIACBase();
+    },
+
+    // -- Protected Methods ----------------------------------------------------
+    _apiResultFilter: function (query, results) {
+        // Filter components out of the results.
+        return YArray.filter(results, function (result) {
+            return result.raw.resultType === 'component' ? false : result;
+        });
+    },
+
+    _apiResultFormatter: function (query, results) {
+        return YArray.map(results, function (result) {
+            var raw  = Y.merge(result.raw), // create a copy
+                desc = raw.description || '';
+
+            // Convert description to text and truncate it if necessary.
+            desc = Node.create('<div>' + desc + '</div>').get('text');
+
+            if (desc.length > 65) {
+                desc = Y.Escape.html(desc.substr(0, 65)) + ' &hellip;';
+            } else {
+                desc = Y.Escape.html(desc);
+            }
+
+            raw['class'] || (raw['class'] = '');
+            raw.description = desc;
+
+            // Use the highlighted result name.
+            raw.name = result.highlighted;
+
+            return Lang.sub(this.RESULT_TEMPLATE, raw);
+        }, this);
+    },
+
+    _apiTextLocator: function (result) {
+        return result.displayName || result.name;
+    }
+}, {
+    // -- Attributes -----------------------------------------------------------
+    ATTRS: {
+        resultFormatter: {
+            valueFn: function () {
+                return this._apiResultFormatter;
+            }
+        },
+
+        resultFilters: {
+            valueFn: function () {
+                return this._apiResultFilter;
+            }
+        },
+
+        resultHighlighter: {
+            value: 'phraseMatch'
+        },
+
+        resultListLocator: {
+            value: 'data.results'
+        },
+
+        resultTextLocator: {
+            valueFn: function () {
+                return this._apiTextLocator;
+            }
+        },
+
+        source: {
+            value: '/api/v1/search?q={query}&count={maxResults}'
+        }
+    }
+});
+
+}, '3.4.0', {requires: [
+    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources',
+    'escape'
+]});
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
new file mode 100644
index 0000000000..af9ac32209
--- /dev/null
+++ b/docs/assets/js/apidocs.js
@@ -0,0 +1,376 @@
+YUI().use(
+    'yuidoc-meta',
+    'api-list', 'history-hash', 'node-screen', 'node-style', 'pjax',
+function (Y) {
+
+var win          = Y.config.win,
+    localStorage = win.localStorage,
+
+    bdNode = Y.one('#bd'),
+
+    pjax,
+    defaultRoute,
+
+    classTabView,
+    selectedTab;
+
+// Kill pjax functionality unless serving over HTTP.
+if (!Y.getLocation().protocol.match(/^https?\:/)) {
+    Y.Router.html5 = false;
+}
+
+// Create the default route with middleware which enables syntax highlighting
+// on the loaded content.
+defaultRoute = Y.Pjax.defaultRoute.concat(function (req, res, next) {
+    prettyPrint();
+    bdNode.removeClass('loading');
+
+    next();
+});
+
+pjax = new Y.Pjax({
+    container      : '#docs-main',
+    contentSelector: '#docs-main > .content',
+    linkSelector   : '#bd a',
+    titleSelector  : '#xhr-title',
+
+    navigateOnHash: true,
+    root          : '/',
+    routes        : [
+        // -- / ----------------------------------------------------------------
+        {
+            path     : '/(index.html)?',
+            callbacks: defaultRoute
+        },
+
+        // -- /elements/* -------------------------------------------------------
+        {
+            path     : '/elements/:element.html*',
+            callbacks: defaultRoute
+        },
+
+        // -- /classes/* -------------------------------------------------------
+        {
+            path     : '/classes/:class.html*',
+            callbacks: [defaultRoute, 'handleClasses']
+        },
+
+        // -- /files/* ---------------------------------------------------------
+        {
+            path     : '/files/*file',
+            callbacks: [defaultRoute, 'handleFiles']
+        },
+
+        // -- /modules/* -------------------------------------------------------
+        {
+            path     : '/modules/:module.html*',
+            callbacks: defaultRoute
+        }
+    ]
+});
+
+// -- Utility Functions --------------------------------------------------------
+
+pjax.checkVisibility = function (tab) {
+    tab || (tab = selectedTab);
+
+    if (!tab) { return; }
+
+    var panelNode = tab.get('panelNode'),
+        visibleItems;
+
+    // If no items are visible in the tab panel due to the current visibility
+    // settings, display a message to that effect.
+    visibleItems = panelNode.all('.item,.index-item').some(function (itemNode) {
+        if (itemNode.getComputedStyle('display') !== 'none') {
+            return true;
+        }
+    });
+
+    panelNode.all('.no-visible-items').remove();
+
+    if (!visibleItems) {
+        if (Y.one('#index .index-item')) {
+            panelNode.append(
+                '<div class="no-visible-items">' +
+                    '<p>' +
+                    'Some items are not shown due to the current visibility ' +
+                    'settings. Use the checkboxes at the upper right of this ' +
+                    'page to change the visibility settings.' +
+                    '</p>' +
+                '</div>'
+            );
+        } else {
+            panelNode.append(
+                '<div class="no-visible-items">' +
+                    '<p>' +
+                    'This class doesn\'t provide any methods, properties, ' +
+                    'attributes, or events.' +
+                    '</p>' +
+                '</div>'
+            );
+        }
+    }
+
+    // Hide index sections without any visible items.
+    Y.all('.index-section').each(function (section) {
+        var items        = 0,
+            visibleItems = 0;
+
+        section.all('.index-item').each(function (itemNode) {
+            items += 1;
+
+            if (itemNode.getComputedStyle('display') !== 'none') {
+                visibleItems += 1;
+            }
+        });
+
+        section.toggleClass('hidden', !visibleItems);
+        section.toggleClass('no-columns', visibleItems < 4);
+    });
+};
+
+pjax.initClassTabView = function () {
+    if (!Y.all('#classdocs .api-class-tab').size()) {
+        return;
+    }
+
+    if (classTabView) {
+        classTabView.destroy();
+        selectedTab = null;
+    }
+
+    classTabView = new Y.TabView({
+        srcNode: '#classdocs',
+
+        on: {
+            selectionChange: pjax.onTabSelectionChange
+        }
+    });
+
+    pjax.updateTabState();
+    classTabView.render();
+};
+
+pjax.initLineNumbers = function () {
+    var hash      = win.location.hash.substring(1),
+        container = pjax.get('container'),
+        hasLines, node;
+
+    // Add ids for each line number in the file source view.
+    container.all('.linenums>li').each(function (lineNode, index) {
+        lineNode.set('id', 'l' + (index + 1));
+        lineNode.addClass('file-line');
+        hasLines = true;
+    });
+
+    // Scroll to the desired line.
+    if (hasLines && /^l\d+$/.test(hash)) {
+        if ((node = container.getById(hash))) {
+            win.scroll(0, node.getY());
+        }
+    }
+};
+
+pjax.initRoot = function () {
+    var terminators = /^(?:classes|files|elements|modules)$/,
+        parts       = pjax._getPathRoot().split('/'),
+        root        = [],
+        i, len, part;
+
+    for (i = 0, len = parts.length; i < len; i += 1) {
+        part = parts[i];
+
+        if (part.match(terminators)) {
+            // Makes sure the path will end with a "/".
+            root.push('');
+            break;
+        }
+
+        root.push(part);
+    }
+
+    pjax.set('root', root.join('/'));
+};
+
+pjax.updateTabState = function (src) {
+    var hash = win.location.hash.substring(1),
+        defaultTab, node, tab, tabPanel;
+
+    function scrollToNode() {
+        if (node.hasClass('protected')) {
+            Y.one('#api-show-protected').set('checked', true);
+            pjax.updateVisibility();
+        }
+
+        if (node.hasClass('private')) {
+            Y.one('#api-show-private').set('checked', true);
+            pjax.updateVisibility();
+        }
+
+        setTimeout(function () {
+            // For some reason, unless we re-get the node instance here,
+            // getY() always returns 0.
+            var node = Y.one('#classdocs').getById(hash);
+            win.scrollTo(0, node.getY() - 70);
+        }, 1);
+    }
+
+    if (!classTabView) {
+        return;
+    }
+
+    if (src === 'hashchange' && !hash) {
+        defaultTab = 'index';
+    } else {
+        if (localStorage) {
+            defaultTab = localStorage.getItem('tab_' + pjax.getPath()) ||
+                'index';
+        } else {
+            defaultTab = 'index';
+        }
+    }
+
+    if (hash && (node = Y.one('#classdocs').getById(hash))) {
+        if ((tabPanel = node.ancestor('.api-class-tabpanel', true))) {
+            if ((tab = Y.one('#classdocs .api-class-tab.' + tabPanel.get('id')))) {
+                if (classTabView.get('rendered')) {
+                    Y.Widget.getByNode(tab).set('selected', 1);
+                } else {
+                    tab.addClass('yui3-tab-selected');
+                }
+            }
+        }
+
+        // Scroll to the desired element if this is a hash URL.
+        if (node) {
+            if (classTabView.get('rendered')) {
+                scrollToNode();
+            } else {
+                classTabView.once('renderedChange', scrollToNode);
+            }
+        }
+    } else {
+        tab = Y.one('#classdocs .api-class-tab.' + defaultTab);
+
+        // When the `defaultTab` node isn't found, `localStorage` is stale.
+        if (!tab && defaultTab !== 'index') {
+            tab = Y.one('#classdocs .api-class-tab.index');
+        }
+
+        if (classTabView.get('rendered')) {
+            Y.Widget.getByNode(tab).set('selected', 1);
+        } else {
+            tab.addClass('yui3-tab-selected');
+        }
+    }
+};
+
+pjax.updateVisibility = function () {
+    var container = pjax.get('container');
+
+    container.toggleClass('hide-inherited',
+            !Y.one('#api-show-inherited').get('checked'));
+
+    container.toggleClass('show-deprecated',
+            Y.one('#api-show-deprecated').get('checked'));
+
+    container.toggleClass('show-protected',
+            Y.one('#api-show-protected').get('checked'));
+
+    container.toggleClass('show-private',
+            Y.one('#api-show-private').get('checked'));
+
+    pjax.checkVisibility();
+};
+
+// -- Route Handlers -----------------------------------------------------------
+
+pjax.handleClasses = function (req, res, next) {
+    var status = res.ioResponse.status;
+
+    // Handles success and local filesystem XHRs.
+    if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
+        pjax.initClassTabView();
+    }
+
+    next();
+};
+
+pjax.handleFiles = function (req, res, next) {
+    var status = res.ioResponse.status;
+
+    // Handles success and local filesystem XHRs.
+    if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
+        pjax.initLineNumbers();
+    }
+
+    next();
+};
+
+// -- Event Handlers -----------------------------------------------------------
+
+pjax.onNavigate = function (e) {
+    var hash         = e.hash,
+        originTarget = e.originEvent && e.originEvent.target,
+        tab;
+
+    if (hash) {
+        tab = originTarget && originTarget.ancestor('.yui3-tab', true);
+
+        if (hash === win.location.hash) {
+            pjax.updateTabState('hashchange');
+        } else if (!tab) {
+            win.location.hash = hash;
+        }
+
+        e.preventDefault();
+        return;
+    }
+
+    // Only scroll to the top of the page when the URL doesn't have a hash.
+    this.set('scrollToTop', !e.url.match(/#.+$/));
+
+    bdNode.addClass('loading');
+};
+
+pjax.onOptionClick = function (e) {
+    pjax.updateVisibility();
+};
+
+pjax.onTabSelectionChange = function (e) {
+    var tab   = e.newVal,
+        tabId = tab.get('contentBox').getAttribute('href').substring(1);
+
+    selectedTab = tab;
+
+    // If switching from a previous tab (i.e., this is not the default tab),
+    // replace the history entry with a hash URL that will cause this tab to
+    // be selected if the user navigates away and then returns using the back
+    // or forward buttons.
+    if (e.prevVal && localStorage) {
+        localStorage.setItem('tab_' + pjax.getPath(), tabId);
+    }
+
+    pjax.checkVisibility(tab);
+};
+
+// -- Init ---------------------------------------------------------------------
+
+pjax.on('navigate', pjax.onNavigate);
+
+pjax.initRoot();
+pjax.upgrade();
+pjax.initClassTabView();
+pjax.initLineNumbers();
+pjax.updateVisibility();
+
+Y.APIList.rootPath = pjax.get('root');
+
+Y.one('#api-options').delegate('click', pjax.onOptionClick, 'input');
+
+Y.on('hashchange', function (e) {
+    pjax.updateTabState('hashchange');
+}, win);
+
+});
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
new file mode 100644
index 0000000000..18de864953
--- /dev/null
+++ b/docs/assets/js/yui-prettify.js
@@ -0,0 +1,17 @@
+YUI().use('node', function(Y) {
+    var code = Y.all('.prettyprint.linenums');
+    if (code.size()) {
+        code.each(function(c) {
+            var lis = c.all('ol li'),
+                l = 1;
+            lis.each(function(n) {
+                n.prepend('<a name="LINENUM_' + l + '"></a>');
+                l++;
+            });
+        });
+        var h = location.hash;
+        location.hash = '';
+        h = h.replace('LINE_', 'LINENUM_');
+        location.hash = h;
+    }
+});
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
new file mode 100644
index 0000000000..b50b841499
--- /dev/null
+++ b/docs/assets/vendor/prettify/CHANGES.html
@@ -0,0 +1,130 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Change Log</title>
+  </head>
+  <body bgcolor="white">
+    <a style="float:right" href="README.html">README</a>
+
+    <h1>Known Issues</h1>
+    <ul>
+      <li>Perl formatting is really crappy.  Partly because the author is lazy and
+      partly because Perl is
+      <a href="http://www.perlmonks.org/?node_id=663393">hard</a> to parse.
+      <li>On some browsers, <code>&lt;code&gt;</code> elements with newlines in the text
+      which use CSS to specify <code>white-space:pre</code> will have the newlines
+      improperly stripped if the element is not attached to the document at the time
+      the stripping is done.  Also, on IE 6, all newlines will be stripped from
+      <code>&lt;code&gt;</code> elements because of the way IE6 produces
+      <code>innerHTML</code>.  Workaround: use <code>&lt;pre&gt;</code> for code with
+      newlines.
+    </ul>
+
+    <h1>Change Log</h1>
+    <h2>29 March 2007</h2>
+    <ul>
+      <li>Added <a href="tests/prettify_test.html#PHP">tests</a> for PHP support
+        to address 
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=3"
+       >issue 3</a>.
+      <li>Fixed
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=6"
+       >bug</a>: <code>prettyPrintOne</code> was not halting.  This was not
+        reachable through the normal entry point.
+      <li>Fixed
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=4"
+       >bug</a>: recursing into a script block or PHP tag that was not properly
+        closed would not silently drop the content.
+        (<a href="tests/prettify_test.html#issue4">test</a>)
+      <li>Fixed
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=8"
+       >bug</a>: was eating tabs
+        (<a href="tests/prettify_test.html#issue8">test</a>)
+      <li>Fixed entity handling so that the caveat
+        <blockquote>
+          <p>Caveats: please properly escape less-thans.  <tt>x&amp;lt;y</tt>
+          instead of <tt>x&lt;y</tt>, and use <tt>&quot;</tt> instead of 
+          <tt>&amp;quot;</tt> for string delimiters.</p>
+        </blockquote>
+        is no longer applicable.
+      <li>Added noisefree's C#
+      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=4"
+       >patch</a>
+      <li>Added a <a href="http://google-code-prettify.googlecode.com/files/prettify-small.zip">distribution</a> that has comments and
+        whitespace removed to reduce download size from 45.5kB to 12.8kB.
+    </ul>
+    <h2>4 Jul 2008</h2>
+    <ul>
+      <li>Added <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=17">language specific formatters</a> that are triggered by the presence
+      of a <code>lang-&lt;language-file-extension&gt;</code></li>
+      <li>Fixed <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=29">bug</a>: python handling of <code>'''string'''</code>
+      <li>Fixed bug: <code>/</code> in regex <code>[charsets] should not end regex</code>
+    </ul>
+    <h2>5 Jul 2008</h2>
+    <ul>
+      <li>Defined language extensions for Lisp and Lua</code>
+    </ul>
+    <h2>14 Jul 2008</h2>
+    <ul>
+      <li>Language handlers for F#, OCAML, SQL</code>
+      <li>Support for <code>nocode</code> spans to allow embedding of line
+      numbers and code annotations which should not be styled or otherwise
+      affect the tokenization of prettified code.
+      See the issue 22
+      <a href="tests/prettify_test.html#issue22">testcase</a>.</code>
+    </ul>
+    <h2>6 Jan 2009</h2>
+    <ul>
+      <li>Language handlers for Visual Basic, Haskell, CSS, and WikiText</li>
+      <li>Added <tt>.mxml</tt> extension to the markup style handler for
+        Flex <a href="http://en.wikipedia.org/wiki/MXML">MXML files</a>.  See
+        <a
+        href="http://code.google.com/p/google-code-prettify/issues/detail?id=37"
+        >issue 37</a>.
+      <li>Added <tt>.m</tt> extension to the C style handler so that Objective
+        C source files properly highlight.  See
+        <a
+        href="http://code.google.com/p/google-code-prettify/issues/detail?id=58"
+       >issue 58</a>.
+      <li>Changed HTML lexer to use the same embedded source mechanism as the
+        wiki language handler, and changed to use the registered
+        CSS handler for STYLE element content.
+    </ul>
+    <h2>21 May 2009</h2>
+    <ul>
+      <li>Rewrote to improve performance on large files.
+        See <a href="http://mikesamuel.blogspot.com/2009/05/efficient-parsing-in-javascript.html">benchmarks</a>.</li>
+      <li>Fixed bugs with highlighting of Haskell line comments, Lisp
+        number literals, Lua strings, C preprocessor directives,
+        newlines in Wiki code on Windows, and newlines in IE6.</li>
+    </ul>
+    <h2>14 August 2009</h2>
+    <ul>
+      <li>Fixed prettifying of <code>&lt;code&gt;</code> blocks with embedded newlines.
+    </ul>
+    <h2>3 October 2009</h2>
+    <ul>
+      <li>Fixed prettifying of XML/HTML tags that contain uppercase letters.
+    </ul>
+    <h2>19 July 2010</h2>
+    <ul>
+      <li>Added support for line numbers.  Bug
+        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=22"
+         >22</a></li>
+      <li>Added YAML support.  Bug
+        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=123"
+         >123</a></li>
+      <li>Added VHDL support courtesy Le Poussin.</li>
+      <li>IE performance improvements.  Bug
+        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=102"
+         >102</a> courtesy jacobly.</li>
+      <li>A variety of markup formatting fixes courtesy smain and thezbyg.</li>
+      <li>Fixed copy and paste in IE[678].
+      <li>Changed output to use <code>&amp;#160;</code> instead of
+        <code>&amp;nbsp;</code> so that the output works when embedded in XML.
+        Bug
+        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=108"
+         >108</a>.</li>
+    </ul>
+  </body>
+</html>
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/docs/assets/vendor/prettify/COPYING
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
new file mode 100644
index 0000000000..c6fe1a32c3
--- /dev/null
+++ b/docs/assets/vendor/prettify/README.html
@@ -0,0 +1,203 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+  <head>
+    <title>Javascript code prettifier</title>
+
+    <link href="src/prettify.css" type="text/css" rel="stylesheet" />
+
+    <script src="src/prettify.js" type="text/javascript"></script>
+
+    <style type="text/css">
+      body { margin-left: .5in }
+      h1, h2, h3, h4, .footer { margin-left: -.4in; }
+    </style>
+  </head>
+
+  <body onload="prettyPrint()" bgcolor="white">
+    <small style="float: right">Languages : <a href="README-zh-Hans.html">CH</a></small>
+    <h1>Javascript code prettifier</h1>
+
+    <h2>Setup</h2>
+    <ol>
+      <li><a href="http://code.google.com/p/google-code-prettify/downloads/list">Download</a> a distribution
+      <li>Include the script and stylesheets in your document
+        (you will need to make sure the css and js file are on your server, and
+         adjust the paths in the <tt>script</tt> and <tt>link</tt> tag)
+        <pre class="prettyprint">
+&lt;link href="prettify.css" type="text/css" rel="stylesheet" />
+&lt;script type="text/javascript" src="prettify.js">&lt;/script></pre>
+      <li>Add <code class="prettyprint lang-html">onload="prettyPrint()"</code> to your
+      document's body tag.
+      <li>Modify the stylesheet to get the coloring you prefer</li>
+    </ol>
+
+    <h2>Usage</h2>
+    <p>Put code snippets in
+    <tt>&lt;pre class="prettyprint"&gt;...&lt;/pre&gt;</tt>
+    or <tt>&lt;code class="prettyprint"&gt;...&lt;/code&gt;</tt>
+    and it will automatically be pretty printed.
+
+    <table summary="code examples">
+      <tr>
+        <th>The original
+        <th>Prettier
+      <tr>
+        <td><pre style="border: 1px solid #888;padding: 2px"
+             ><a name="voila1"></a>class Voila {
+public:
+  // Voila
+  static const string VOILA = "Voila";
+
+  // will not interfere with embedded <a href="#voila1">tags</a>.
+}</pre>
+
+        <td><pre class="prettyprint"><a name="voila2"></a>class Voila {
+public:
+  // Voila
+  static const string VOILA = "Voila";
+
+  // will not interfere with embedded <a href="#voila2">tags</a>.
+}</pre>
+    </table>
+
+    <h2>FAQ</h2>
+    <h3 id="langs">Which languages does it work for?</h3>
+    <p>The comments in <tt>prettify.js</tt> are authoritative but the lexer
+    should work on a number of languages including C and friends,
+    Java, Python, Bash, SQL, HTML, XML, CSS, Javascript, and Makefiles.
+    It works passably on Ruby, PHP, VB, and Awk and a decent subset of Perl
+    and Ruby, but, because of commenting conventions, doesn't work on
+    Smalltalk, or CAML-like languages.</p>
+
+    <p>LISPy languages are supported via an extension:
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lisp.js"
+     ><code>lang-lisp.js</code></a>.</p>
+    <p>And similarly for
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-css.js"
+     ><code>CSS</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-hs.js"
+     ><code>Haskell</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lua.js"
+     ><code>Lua</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-ml.js"
+     ><code>OCAML, SML, F#</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-vb.js"
+     ><code>Visual Basic</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-sql.js"
+     ><code>SQL</code></a>,
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-proto.js"
+     ><code>Protocol Buffers</code></a>, and
+    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-wiki.js"
+     ><code>WikiText</code></a>..
+
+    <p>If you'd like to add an extension for your favorite language, please
+    look at <tt>src/lang-lisp.js</tt> and file an
+    <a href="http://code.google.com/p/google-code-prettify/issues/list"
+     >issue</a> including your language extension, and a testcase.</p>
+
+    <h3>How do I specify which language my code is in?</h3>
+    <p>You don't need to specify the language since <code>prettyprint()</code>
+    will guess.  You can specify a language by specifying the language extension
+    along with the <code>prettyprint</code> class like so:</p>
+    <pre class="prettyprint lang-html"
+>&lt;pre class=&quot;prettyprint <b>lang-html</b>&quot;&gt;
+  The lang-* class specifies the language file extensions.
+  File extensions supported by default include
+    "bsh", "c", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html",
+    "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh",
+    "xhtml", "xml", "xsl".
+&lt;/pre&gt;</pre>
+
+    <h3>It doesn't work on <tt>&lt;obfuscated code sample&gt;</tt>?</h3>
+    <p>Yes.  Prettifying obfuscated code is like putting lipstick on a pig
+    &mdash; i.e. outside the scope of this tool.</p>
+
+    <h3>Which browsers does it work with?</h3>
+    <p>It's been tested with IE 6, Firefox 1.5 &amp; 2, and Safari 2.0.4.
+    Look at <a href="tests/prettify_test.html">the test page</a> to see if it
+    works in your browser.</p>
+
+    <h3>What's changed?</h3>
+    <p>See the <a href="CHANGES.html">change log</a></p>
+
+    <h3>Why doesn't Prettyprinting of strings work on WordPress?</h3>
+    <p>Apparently wordpress does "smart quoting" which changes close quotes.
+    This causes end quotes to not match up with open quotes.
+    <p>This breaks prettifying as well as copying and pasting of code samples.
+    See
+    <a href="http://wordpress.org/support/topic/125038"
+    >WordPress's help center</a> for info on how to stop smart quoting of code
+    snippets.</p>
+
+    <h3 id="linenums">How do I put line numbers in my code?</h3>
+    <p>You can use the <code>linenums</code> class to turn on line
+    numbering.  If your code doesn't start at line number 1, you can
+    add a colon and a line number to the end of that class as in
+    <code>linenums:52</code>.
+
+    <p>For example
+<pre class="prettyprint">&lt;pre class="prettyprint linenums:<b>4</b>"
+&gt;// This is line 4.
+foo();
+bar();
+baz();
+boo();
+far();
+faz();
+&lt;pre&gt;</pre>
+    produces
+<pre class="prettyprint linenums:4"
+>// This is line 4.
+foo();
+bar();
+baz();
+boo();
+far();
+faz();
+</pre>
+
+    <h3>How do I prevent a portion of markup from being marked as code?</h3>
+    <p>You can use the <code>nocode</code> class to identify a span of markup
+    that is not code.
+<pre class="prettyprint">&lt;pre class=prettyprint&gt;
+int x = foo();  /* This is a comment  &lt;span class="nocode"&gt;This is not code&lt;/span&gt;
+  Continuation of comment */
+int y = bar();
+&lt;/pre&gt;</pre>
+produces
+<pre class="prettyprint">
+int x = foo();  /* This is a comment  <span class="nocode">This is not code</span>
+  Continuation of comment */
+int y = bar();
+</pre>
+
+    <p>For a more complete example see the issue22
+    <a href="tests/prettify_test.html#issue22">testcase</a>.</p>
+
+    <h3>I get an error message "a is not a function" or "opt_whenDone is not a function"</h3>
+    <p>If you are calling <code>prettyPrint</code> via an event handler, wrap it in a function.
+    Instead of doing
+    <blockquote>
+      <code class="prettyprint lang-js"
+       >addEventListener('load', prettyPrint, false);</code>
+    </blockquote>
+    wrap it in a closure like
+    <blockquote>
+      <code class="prettyprint lang-js"
+       >addEventListener('load', function (event) { prettyPrint() }, false);</code>
+    </blockquote>
+    so that the browser does not pass an event object to <code>prettyPrint</code> which
+    will confuse it.
+
+    <br><br><br>
+
+    <div class="footer">
+<!-- Created: Tue Oct  3 17:51:56 PDT 2006 -->
+<!-- hhmts start -->
+Last modified: Wed Jul 19 13:56:00 PST 2010
+<!-- hhmts end -->
+    </div>
+  </body>
+</html>
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
new file mode 100644
index 0000000000..d44b3a2282
--- /dev/null
+++ b/docs/assets/vendor/prettify/prettify-min.css
@@ -0,0 +1 @@
+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
\ No newline at end of file
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
new file mode 100644
index 0000000000..4845d05d4b
--- /dev/null
+++ b/docs/assets/vendor/prettify/prettify-min.js
@@ -0,0 +1 @@
+window.PR_SHOULD_USE_CONTINUATION=true;var prettyPrintOne;var prettyPrint;(function(){var O=window;var j=["break,continue,do,else,for,if,return,while"];var v=[j,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var q=[v,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var m=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var y=[q,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var T=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"];var s="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes";var x=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var t="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var J=[j,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var g=[j,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var I=[j,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var B=[m,T,x,t+J,g,I];var f=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var D="str";var A="kwd";var k="com";var Q="typ";var H="lit";var M="pun";var G="pln";var n="tag";var F="dec";var K="src";var R="atn";var o="atv";var P="nocode";var N="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function l(ab){var af=0;var U=false;var ae=false;for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.ignoreCase){ae=true}else{if(/[a-z]/i.test(ag.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,""))){U=true;ae=false;break}}}var aa={b:8,t:9,n:10,v:11,f:12,r:13};function ad(aj){var ai=aj.charCodeAt(0);if(ai!==92){return ai}var ah=aj.charAt(1);ai=aa[ah];if(ai){return ai}else{if("0"<=ah&&ah<="7"){return parseInt(aj.substring(1),8)}else{if(ah==="u"||ah==="x"){return parseInt(aj.substring(2),16)}else{return aj.charCodeAt(1)}}}}function V(ah){if(ah<32){return(ah<16?"\\x0":"\\x")+ah.toString(16)}var ai=String.fromCharCode(ah);return(ai==="\\"||ai==="-"||ai==="]"||ai==="^")?"\\"+ai:ai}function Z(an){var ar=an.substring(1,an.length-1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}|\\\\x[0-9A-Fa-f]{2}|\\\\[0-3][0-7]{0,2}|\\\\[0-7]{1,2}|\\\\[\\s\\S]|-|[^-\\\\]","g"));var ah=[];var ap=ar[0]==="^";var ao=["["];if(ap){ao.push("^")}for(var at=ap?1:0,al=ar.length;at<al;++at){var aj=ar[at];if(/\\[bdsw]/i.test(aj)){ao.push(aj)}else{var ai=ad(aj);var am;if(at+2<al&&"-"===ar[at+1]){am=ad(ar[at+2]);at+=2}else{am=ai}ah.push([ai,am]);if(!(am<65||ai>122)){if(!(am<65||ai>90)){ah.push([Math.max(65,ai)|32,Math.min(am,90)|32])}if(!(am<97||ai>122)){ah.push([Math.max(97,ai)&~32,Math.min(am,122)&~32])}}}}ah.sort(function(aw,av){return(aw[0]-av[0])||(av[1]-aw[1])});var ak=[];var aq=[];for(var at=0;at<ah.length;++at){var au=ah[at];if(au[0]<=aq[1]+1){aq[1]=Math.max(aq[1],au[1])}else{ak.push(aq=au)}}for(var at=0;at<ak.length;++at){var au=ak[at];ao.push(V(au[0]));if(au[1]>au[0]){if(au[1]+1>au[0]){ao.push("-")}ao.push(V(au[1]))}}ao.push("]");return ao.join("")}function Y(an){var al=an.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var aj=al.length;var ap=[];for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah){if(ah<=ao){ap[ah]=-1}else{al[am]=V(ah)}}}}}for(var am=1;am<ap.length;++am){if(-1===ap[am]){ap[am]=++af}}for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao;if(!ap[ao]){al[am]="(?:"}}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah&&ah<=ao){al[am]="\\"+ap[ah]}}}}for(var am=0;am<aj;++am){if("^"===al[am]&&"^"!==al[am+1]){al[am]=""}}if(an.ignoreCase&&U){for(var am=0;am<aj;++am){var ai=al[am];var ak=ai.charAt(0);if(ai.length>=2&&ak==="["){al[am]=Z(ai)}else{if(ak!=="\\"){al[am]=ai.replace(/[a-zA-Z]/g,function(aq){var ar=aq.charCodeAt(0);return"["+String.fromCharCode(ar&~32,ar|32)+"]"})}}}}return al.join("")}var ac=[];for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.global||ag.multiline){throw new Error(""+ag)}ac.push("(?:"+Y(ag)+")")}return new RegExp(ac.join("|"),ae?"gi":"g")}function b(aa,Y){var W=/(?:^|\s)nocode(?:\s|$)/;var ab=[];var Z=0;var X=[];var V=0;function U(ac){switch(ac.nodeType){case 1:if(W.test(ac.className)){return}for(var af=ac.firstChild;af;af=af.nextSibling){U(af)}var ae=ac.nodeName.toLowerCase();if("br"===ae||"li"===ae){ab[V]="\n";X[V<<1]=Z++;X[(V++<<1)|1]=ac}break;case 3:case 4:var ad=ac.nodeValue;if(ad.length){if(!Y){ad=ad.replace(/[ \t\r\n]+/g," ")}else{ad=ad.replace(/\r\n?/g,"\n")}ab[V]=ad;X[V<<1]=Z;Z+=ad.length;X[(V++<<1)|1]=ac}break}}U(aa);return{sourceCode:ab.join("").replace(/\n$/,""),spans:X}}function C(U,W,Y,V){if(!W){return}var X={sourceCode:W,basePos:U};Y(X);V.push.apply(V,X.decorations)}var w=/\S/;function p(U){var X=undefined;for(var W=U.firstChild;W;W=W.nextSibling){var V=W.nodeType;X=(V===1)?(X?U:W):(V===3)?(w.test(W.nodeValue)?U:X):X}return X===U?undefined:X}function h(W,V){var U={};var X;(function(){var af=W.concat(V);var aj=[];var ai={};for(var ad=0,ab=af.length;ad<ab;++ad){var aa=af[ad];var ae=aa[3];if(ae){for(var ag=ae.length;--ag>=0;){U[ae.charAt(ag)]=aa}}var ah=aa[1];var ac=""+ah;if(!ai.hasOwnProperty(ac)){aj.push(ah);ai[ac]=null}}aj.push(/[\0-\uffff]/);X=l(aj)})();var Z=V.length;var Y=function(aj){var ab=aj.sourceCode,aa=aj.basePos;var af=[aa,G];var ah=0;var ap=ab.match(X)||[];var al={};for(var ag=0,at=ap.length;ag<at;++ag){var ai=ap[ag];var ar=al[ai];var ak=void 0;var ao;if(typeof ar==="string"){ao=false}else{var ac=U[ai.charAt(0)];if(ac){ak=ai.match(ac[1]);ar=ac[0]}else{for(var aq=0;aq<Z;++aq){ac=V[aq];ak=ai.match(ac[1]);if(ak){ar=ac[0];break}}if(!ak){ar=G}}ao=ar.length>=5&&"lang-"===ar.substring(0,5);if(ao&&!(ak&&typeof ak[1]==="string")){ao=false;ar=K}if(!ao){al[ai]=ar}}var ad=ah;ah+=ai.length;if(!ao){af.push(aa+ad,ar)}else{var an=ak[1];var am=ai.indexOf(an);var ae=am+an.length;if(ak[2]){ae=ai.length-ak[2].length;am=ae-an.length}var au=ar.substring(5);C(aa+ad,ai.substring(0,am),Y,af);C(aa+ad+am,an,r(au,an),af);C(aa+ad+ae,ai.substring(ae),Y,af)}}aj.decorations=af};return Y}function i(V){var Y=[],U=[];if(V.tripleQuotedStrings){Y.push([D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(V.multiLineStrings){Y.push([D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{Y.push([D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(V.verbatimStrings){U.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ab=V.hashComments;if(ab){if(V.cStyleComments){if(ab>1){Y.push([k,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{Y.push([k,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}U.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{Y.push([k,/^#[^\r\n]*/,null,"#"])}}if(V.cStyleComments){U.push([k,/^\/\/[^\r\n]*/,null]);U.push([k,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(V.regexLiterals){var aa=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");U.push(["lang-regex",new RegExp("^"+N+"("+aa+")")])}var X=V.types;if(X){U.push([Q,X])}var W=(""+V.keywords).replace(/^ | $/g,"");if(W.length){U.push([A,new RegExp("^(?:"+W.replace(/[\s,]+/g,"|")+")\\b"),null])}Y.push([G,/^\s+/,null," \r\n\t\xA0"]);var Z=/^.[^\s\w\.$@\'\"\`\/\\]*/;U.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[Q,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[G,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[G,/^\\[\s\S]?/,null],[M,Z,null]);return h(Y,U)}var L=i({keywords:B,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function S(W,ah,aa){var V=/(?:^|\s)nocode(?:\s|$)/;var ac=/\r\n?|\n/;var ad=W.ownerDocument;var ag=ad.createElement("li");while(W.firstChild){ag.appendChild(W.firstChild)}var X=[ag];function af(am){switch(am.nodeType){case 1:if(V.test(am.className)){break}if("br"===am.nodeName){ae(am);if(am.parentNode){am.parentNode.removeChild(am)}}else{for(var ao=am.firstChild;ao;ao=ao.nextSibling){af(ao)}}break;case 3:case 4:if(aa){var an=am.nodeValue;var ak=an.match(ac);if(ak){var aj=an.substring(0,ak.index);am.nodeValue=aj;var ai=an.substring(ak.index+ak[0].length);if(ai){var al=am.parentNode;al.insertBefore(ad.createTextNode(ai),am.nextSibling)}ae(am);if(!aj){am.parentNode.removeChild(am)}}}break}}function ae(al){while(!al.nextSibling){al=al.parentNode;if(!al){return}}function aj(am,at){var ar=at?am.cloneNode(false):am;var ap=am.parentNode;if(ap){var aq=aj(ap,1);var ao=am.nextSibling;aq.appendChild(ar);for(var an=ao;an;an=ao){ao=an.nextSibling;aq.appendChild(an)}}return ar}var ai=aj(al.nextSibling,0);for(var ak;(ak=ai.parentNode)&&ak.nodeType===1;){ai=ak}X.push(ai)}for(var Z=0;Z<X.length;++Z){af(X[Z])}if(ah===(ah|0)){X[0].setAttribute("value",ah)}var ab=ad.createElement("ol");ab.className="linenums";var Y=Math.max(0,((ah-1))|0)||0;for(var Z=0,U=X.length;Z<U;++Z){ag=X[Z];ag.className="L"+((Z+Y)%10);if(!ag.firstChild){ag.appendChild(ad.createTextNode("\xA0"))}ab.appendChild(ag)}W.appendChild(ab)}function E(af){var X=/\bMSIE\s(\d+)/.exec(navigator.userAgent);X=X&&+X[1]<=8;var ao=/\n/g;var an=af.sourceCode;var ap=an.length;var Y=0;var ad=af.spans;var V=ad.length;var aj=0;var aa=af.decorations;var ab=aa.length;var ac=0;aa[ab]=ap;var av,at;for(at=av=0;at<ab;){if(aa[at]!==aa[at+2]){aa[av++]=aa[at++];aa[av++]=aa[at++]}else{at+=2}}ab=av;for(at=av=0;at<ab;){var aw=aa[at];var ae=aa[at+1];var Z=at+2;while(Z+2<=ab&&aa[Z+1]===ae){Z+=2}aa[av++]=aw;aa[av++]=ae;at=Z}ab=aa.length=av;var au=af.sourceNode;var ak;if(au){ak=au.style.display;au.style.display="none"}try{var ah=null;while(aj<V){var ai=ad[aj];var U=ad[aj+2]||ap;var ar=aa[ac+2]||ap;var Z=Math.min(U,ar);var am=ad[aj+1];var W;if(am.nodeType!==1&&(W=an.substring(Y,Z))){if(X){W=W.replace(ao,"\r")}am.nodeValue=W;var al=am.ownerDocument;var aq=al.createElement("span");aq.className=aa[ac+1];var ag=am.parentNode;ag.replaceChild(aq,am);aq.appendChild(am);if(Y<U){ad[aj+1]=am=al.createTextNode(an.substring(Z,U));ag.insertBefore(am,aq.nextSibling)}}Y=Z;if(Y>=U){aj+=2}if(Y>=ar){ac+=2}}}finally{if(au){au.style.display=ak}}}var u={};function d(W,X){for(var U=X.length;--U>=0;){var V=X[U];if(!u.hasOwnProperty(V)){u[V]=W}else{if(O.console){console.warn("cannot override language handler %s",V)}}}}function r(V,U){if(!(V&&u.hasOwnProperty(V))){V=/^\s*</.test(U)?"default-markup":"default-code"}return u[V]}d(L,["default-code"]);d(h([],[[G,/^[^<?]+/],[F,/^<!\w[^>]*(?:>|$)/],[k,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[M,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);d(h([[G,/^[\s]+/,null," \t\r\n"],[o,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[n,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[R,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[M,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);d(h([],[[o,/^[\s\S]+/]]),["uq.val"]);d(i({keywords:m,hashComments:true,cStyleComments:true,types:f}),["c","cc","cpp","cxx","cyc","m"]);d(i({keywords:"null,true,false"}),["json"]);d(i({keywords:T,hashComments:true,cStyleComments:true,verbatimStrings:true,types:f}),["cs"]);d(i({keywords:y,cStyleComments:true}),["java"]);d(i({keywords:I,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);d(i({keywords:J,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);d(i({keywords:t,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);d(i({keywords:g,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);d(i({keywords:x,cStyleComments:true,regexLiterals:true}),["js"]);d(i({keywords:s,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);d(h([],[[D,/^[\s\S]+/]]),["regex"]);function e(X){var W=X.langExtension;try{var U=b(X.sourceNode,X.pre);var V=U.sourceCode;X.sourceCode=V;X.spans=U.spans;X.basePos=0;r(W,V)(X);E(X)}catch(Y){if(O.console){console.log(Y&&Y.stack?Y.stack:Y)}}}function z(Y,X,W){var U=document.createElement("pre");U.innerHTML=Y;if(W){S(U,W,true)}var V={langExtension:X,numberLines:W,sourceNode:U,pre:1};e(V);return U.innerHTML}function c(aj){function ab(al){return document.getElementsByTagName(al)}var ah=[ab("pre"),ab("code"),ab("xmp")];var V=[];for(var ae=0;ae<ah.length;++ae){for(var ac=0,Y=ah[ae].length;ac<Y;++ac){V.push(ah[ae][ac])}}ah=null;var Z=Date;if(!Z.now){Z={now:function(){return +(new Date)}}}var aa=0;var U;var af=/\blang(?:uage)?-([\w.]+)(?!\S)/;var ak=/\bprettyprint\b/;var W=/\bprettyprinted\b/;var ag=/pre|xmp/i;var ai=/^code$/i;var ad=/^(?:pre|code|xmp)$/i;function X(){var ar=(O.PR_SHOULD_USE_CONTINUATION?Z.now()+250:Infinity);for(;aa<V.length&&Z.now()<ar;aa++){var at=V[aa];var au=at.className;if(ak.test(au)&&!W.test(au)){var aw=false;for(var ao=at.parentNode;ao;ao=ao.parentNode){var ax=ao.tagName;if(ad.test(ax)&&ao.className&&ak.test(ao.className)){aw=true;break}}if(!aw){at.className+=" prettyprinted";var aq=au.match(af);var am;if(!aq&&(am=p(at))&&ai.test(am.tagName)){aq=am.className.match(af)}if(aq){aq=aq[1]}var ap;if(ag.test(at.tagName)){ap=1}else{var an=at.currentStyle;var al=(an?an.whiteSpace:(document.defaultView&&document.defaultView.getComputedStyle)?document.defaultView.getComputedStyle(at,null).getPropertyValue("white-space"):0);ap=al&&"pre"===al.substring(0,3)}var av=at.className.match(/\blinenums\b(?::(\d+))?/);av=av?av[1]&&av[1].length?+av[1]:true:false;if(av){S(at,av,ap)}U={langExtension:aq,sourceNode:at,numberLines:av,pre:ap};e(U)}}}if(aa<V.length){setTimeout(X,250)}else{if(aj){aj()}}}X()}var a=O.PR={createSimpleLexer:h,registerLangHandler:d,sourceDecorator:i,PR_ATTRIB_NAME:R,PR_ATTRIB_VALUE:o,PR_COMMENT:k,PR_DECLARATION:F,PR_KEYWORD:A,PR_LITERAL:H,PR_NOCODE:P,PR_PLAIN:G,PR_PUNCTUATION:M,PR_SOURCE:K,PR_STRING:D,PR_TAG:n,PR_TYPE:Q,prettyPrintOne:O.prettyPrintOne=z,prettyPrint:O.prettyPrint=c};if(typeof define==="function"&&define.amd){define("google-code-prettify",[],function(){return a})}})();PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_DECLARATION,/^<!\w[^>]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^<script\b[^>]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:<!--|-->)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]);
\ No newline at end of file
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
new file mode 100644
index 0000000000..f1970951d4
--- /dev/null
+++ b/docs/classes/Roles.html
@@ -0,0 +1,5185 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Roles - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="icon" href="../assets/favicon.ico">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v4.0.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+<h1>Roles Class</h1>
+<div class="box meta">
+
+
+        <div class="foundat">
+            Defined in: <a href="../files/roles_roles_common_async.js.html#l41"><code>roles&#x2F;roles_common_async.js:41</code></a>
+        </div>
+
+            Module: <a href="../modules/Roles.html">Roles</a>
+
+</div>
+
+
+<div class="box intro">
+    
+</div>
+
+
+<div id="classdocs" class="tabview">
+    <ul class="api-class-tabs">
+        <li class="api-class-tab index"><a href="#index">Index</a></li>
+
+            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
+            <li class="api-class-tab properties"><a href="#properties">Properties</a></li>
+    </ul>
+
+    <div>
+        <div id="index" class="api-class-tabpanel index">
+            <h2 class="off-left">Item Index</h2>
+
+                <div class="index-section methods">
+                    <h3>Methods</h3>
+
+                    <ul class="index-list methods">
+                            <li class="index-item method private">
+                                <a href="#method__addRoleToParent">_addRoleToParent</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__addRoleToParentAsync">_addRoleToParentAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__addUserToRole">_addUserToRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__addUserToRoleAsync">_addUserToRoleAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__checkRoleName">_checkRoleName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__checkRoleName">_checkRoleName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__checkRoleName">_checkRoleName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__checkScopeName">_checkScopeName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__getInheritedRoleNames">_getInheritedRoleNames</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__getInheritedRoleNames">_getInheritedRoleNames</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__getParentRoleNames">_getParentRoleNames</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__getParentRoleNamesAsync">_getParentRoleNamesAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__getUsersInRoleCursor">_getUsersInRoleCursor</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__getUsersInRoleCursor">_getUsersInRoleCursor</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__normalizeOptions">_normalizeOptions</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__normalizeOptions">_normalizeOptions</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__normalizeScopeName">_normalizeScopeName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__normalizeScopeName">_normalizeScopeName</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__removeRoleFromParent">_removeRoleFromParent</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__removeRoleFromParentAsync">_removeRoleFromParentAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__removeUserFromRole">_removeUserFromRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method private">
+                                <a href="#method__removeUserFromRoleAsync">_removeUserFromRoleAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_addRolesToParent">addRolesToParent</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_addRolesToParentAsync">addRolesToParentAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_addUsersToRoles">addUsersToRoles</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_addUsersToRolesAsync">addUsersToRolesAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_createRole">createRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_createRoleAsync">createRoleAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_deleteRole">deleteRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_deleteRoleAsync">deleteRoleAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getAllRoles">getAllRoles</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getAllRoles">getAllRoles</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method deprecated">
+                                <a href="#method_getGroupsForUser">getGroupsForUser</a>
+
+                                    <span class="flag static">static</span>
+                                    <span class="flag deprecated">deprecated</span>
+                            </li>
+                            <li class="index-item method deprecated">
+                                <a href="#method_getGroupsForUserAsync">getGroupsForUserAsync</a>
+
+                                    <span class="flag static">static</span>
+                                    <span class="flag deprecated">deprecated</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getRolesForUser">getRolesForUser</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getRolesForUserAsync">getRolesForUserAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getScopesForUser">getScopesForUser</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getScopesForUserAsync">getScopesForUserAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getUserAssignmentsForRole">getUserAssignmentsForRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getUserAssignmentsForRole">getUserAssignmentsForRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getUsersInRole">getUsersInRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_getUsersInRoleAsync">getUsersInRoleAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_isParentOf">isParentOf</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_isParentOfAsync">isParentOfAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_removeRolesFromParent">removeRolesFromParent</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_removeRolesFromParentAsync">removeRolesFromParentAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_removeScope">removeScope</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_removeScopeAsync">removeScopeAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_removeUsersFromRoles">removeUsersFromRoles</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_removeUsersFromRolesAsync">removeUsersFromRolesAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_renameRole">renameRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_renameRoleAsync">renameRoleAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_renameScope">renameScope</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_renameScopeAsync">renameScopeAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_setUserRoles">setUserRoles</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_setUserRolesAsync">setUserRolesAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_userIsInRole">userIsInRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                            <li class="index-item method">
+                                <a href="#method_userIsInRoleAsync">userIsInRoleAsync</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                    </ul>
+                </div>
+
+                <div class="index-section properties">
+                    <h3>Properties</h3>
+
+                    <ul class="index-list properties">
+                            <li class="index-item property deprecated">
+                                <a href="#property_GLOBAL_GROUP">GLOBAL_GROUP</a>
+
+                                    <span class="flag static">static</span>
+                                    <span class="flag deprecated">deprecated</span>
+                            </li>
+                            <li class="index-item property deprecated">
+                                <a href="#property_GLOBAL_GROUP">GLOBAL_GROUP</a>
+
+                                    <span class="flag static">static</span>
+                                    <span class="flag deprecated">deprecated</span>
+                            </li>
+                    </ul>
+                </div>
+
+
+        </div>
+
+            <div id="methods" class="api-class-tabpanel">
+                <h2 class="off-left">Methods</h2>
+
+<div id="method__addRoleToParent" class="method item private">
+    <h3 class="name"><code>_addRoleToParent</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l205"><code>roles&#x2F;roles_client.js:205</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__addRoleToParentAsync" class="method item private">
+    <h3 class="name"><code>_addRoleToParentAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l277"><code>roles&#x2F;roles_common_async.js:277</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method__addUserToRole" class="method item private">
+    <h3 class="name"><code>_addUserToRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>userId</code>
+                </li>
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>options</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l437"><code>roles&#x2F;roles_client.js:437</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Add one user to one role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">userId</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The user ID.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of the role to add the user to. The role have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">options</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__addUserToRoleAsync" class="method item private">
+    <h3 class="name"><code>_addUserToRoleAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>userId</code>
+                </li>
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>options</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l555"><code>roles&#x2F;roles_common_async.js:555</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Add one user to one role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">userId</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The user ID.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of the role to add the user to. The role have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">options</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method__checkRoleName" class="method item private">
+    <h3 class="name"><code>_checkRoleName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l989"><code>roles&#x2F;roles_client.js:989</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Throw an exception if <code>roleName</code> is an invalid role name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A role name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__checkRoleName" class="method item private">
+    <h3 class="name"><code>_checkRoleName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>scopeName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l1083"><code>roles&#x2F;roles_client.js:1083</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Throw an exception if <code>scopeName</code> is an invalid scope name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">scopeName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A scope name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__checkRoleName" class="method item private">
+    <h3 class="name"><code>_checkRoleName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1208"><code>roles&#x2F;roles_common_async.js:1208</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Throw an exception if <code>roleName</code> is an invalid role name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A role name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__checkScopeName" class="method item private">
+    <h3 class="name"><code>_checkScopeName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>scopeName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1309"><code>roles&#x2F;roles_common_async.js:1309</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Throw an exception if <code>scopeName</code> is an invalid scope name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">scopeName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A scope name to match against.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__getInheritedRoleNames" class="method item private">
+    <h3 class="name"><code>_getInheritedRoleNames</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>role</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l520"><code>roles&#x2F;roles_client.js:520</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Returns an array of role names the given role name is a parent of.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">role</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>The role object</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles._getInheritedRoleNames({ _id: 'admin', children; [] })</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method__getInheritedRoleNames" class="method item private">
+    <h3 class="name"><code>_getInheritedRoleNames</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>role</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l683"><code>roles&#x2F;roles_common_async.js:683</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Returns an array of role names the given role name is a parent of.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">role</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>The role object</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles._getInheritedRoleNames({ _id: 'admin', children; [] })</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method__getParentRoleNames" class="method item private">
+    <h3 class="name"><code>_getParentRoleNames</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>role</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l491"><code>roles&#x2F;roles_client.js:491</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Returns an array of role names the given role name is a child of.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">role</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>The role object</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles._getParentRoleNames({ _id: 'admin', children; [] })</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method__getParentRoleNamesAsync" class="method item private">
+    <h3 class="name"><code>_getParentRoleNamesAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>role</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l651"><code>roles&#x2F;roles_common_async.js:651</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Returns an array of role names the given role name is a child of.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">role</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>The role object</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles._getParentRoleNamesAsync({ _id: 'admin', children; [] })</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method__getUsersInRoleCursor" class="method item private">
+    <h3 class="name"><code>_getUsersInRoleCursor</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[filter]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l844"><code>roles&#x2F;roles_client.js:844</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles. If array, ids of users are
+returned which have at least one of the roles
+assigned but need not have <em>all</em> roles.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope to restrict roles to; user's global
+roles will also be checked</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[filter]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>RoleAssignmentCollection.find(query, options)</code></p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>Cursor to the assignment documents</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__getUsersInRoleCursor" class="method item private">
+    <h3 class="name"><code>_getUsersInRoleCursor</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[filter]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1041"><code>roles&#x2F;roles_common_async.js:1041</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles. If array, ids of users are
+returned which have at least one of the roles
+assigned but need not have <em>all</em> roles.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope to restrict roles to; user's global
+roles will also be checked</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[filter]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>RoleAssignmentCollection.find(query, options)</code></p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>Cursor to the assignment documents</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__normalizeOptions" class="method item private">
+    <h3 class="name"><code>_normalizeOptions</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>options</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l1044"><code>roles&#x2F;roles_client.js:1044</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Normalize options.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">options</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options to normalize.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>Normalized options.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__normalizeOptions" class="method item private">
+    <h3 class="name"><code>_normalizeOptions</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>options</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Object</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1268"><code>roles&#x2F;roles_common_async.js:1268</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Normalize options.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">options</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options to normalize.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Object</span>:
+                    <p>Normalized options.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__normalizeScopeName" class="method item private">
+    <h3 class="name"><code>_normalizeScopeName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>scopeName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">String</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l1065"><code>roles&#x2F;roles_client.js:1065</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Normalize scope name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">scopeName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A scope name to normalize.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">String</span>:
+                    <p>Normalized scope name.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__normalizeScopeName" class="method item private">
+    <h3 class="name"><code>_normalizeScopeName</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>scopeName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">String</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1291"><code>roles&#x2F;roles_common_async.js:1291</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Normalize scope name.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">scopeName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>A scope name to normalize.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">String</span>:
+                    <p>Normalized scope name.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method__removeRoleFromParent" class="method item private">
+    <h3 class="name"><code>_removeRoleFromParent</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l274"><code>roles&#x2F;roles_client.js:274</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__removeRoleFromParentAsync" class="method item private">
+    <h3 class="name"><code>_removeRoleFromParentAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l362"><code>roles&#x2F;roles_common_async.js:362</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method__removeUserFromRole" class="method item private">
+    <h3 class="name"><code>_removeUserFromRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>userId</code>
+                </li>
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>options</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l593"><code>roles&#x2F;roles_client.js:593</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove one user from one role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">userId</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The user ID.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of the role to add the user to. The role have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">options</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method__removeUserFromRoleAsync" class="method item private">
+    <h3 class="name"><code>_removeUserFromRoleAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>userId</code>
+                </li>
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code>options</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+        <span class="flag private">private</span>
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l763"><code>roles&#x2F;roles_common_async.js:763</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove one user from one role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">userId</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The user ID.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of the role to add the user to. The role have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">options</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_addRolesToParent" class="method item">
+    <h3 class="name"><code>addRolesToParent</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>rolesNames</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l185"><code>roles&#x2F;roles_client.js:185</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Add role parent to roles.</p>
+<p>Previous parents are kept (role can have multiple parents). For users which have the
+parent role set, new subroles are added automatically.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">rolesNames</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of role(s).</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_addRolesToParentAsync" class="method item">
+    <h3 class="name"><code>addRolesToParentAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>rolesNames</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l256"><code>roles&#x2F;roles_common_async.js:256</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Add role parent to roles.</p>
+<p>Previous parents are kept (role can have multiple parents). For users which have the
+parent role set, new subroles are added automatically.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">rolesNames</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of role(s).</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_addUsersToRoles" class="method item">
+    <h3 class="name"><code>addUsersToRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l323"><code>roles&#x2F;roles_client.js:323</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Add users to roles.</p>
+<p>Adds roles to existing roles for each user.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.addUsersToRoles(userId, 'admin')
+Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+Roles.addUsersToRoles([user1, user2], ['user','editor'])
+Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_addUsersToRolesAsync" class="method item">
+    <h3 class="name"><code>addUsersToRolesAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l433"><code>roles&#x2F;roles_common_async.js:433</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Add users to roles.</p>
+<p>Adds roles to existing roles for each user.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+                    <p>Alternatively, it can be a scope name string.</p>
+
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.addUsersToRolesAsync(userId, 'admin')
+Roles.addUsersToRolesAsync(userId, ['view-secrets'], 'example.com')
+Roles.addUsersToRolesAsync([user1, user2], ['user','editor'])
+Roles.addUsersToRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_createRole" class="method item">
+    <h3 class="name"><code>createRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">String</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l49"><code>roles&#x2F;roles_client.js:49</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Create a new role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>unlessExists</code>: if <code>true</code>, exception will not be thrown in the role already exists</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">String</span>:
+                    <p>ID of the new role or null.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_createRoleAsync" class="method item">
+    <h3 class="name"><code>createRoleAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise<String></span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l73"><code>roles&#x2F;roles_common_async.js:73</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Create a new role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>unlessExists</code>: if <code>true</code>, exception will not be thrown in the role already exists</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise<String></span>:
+                    <p>ID of the new role or null.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_deleteRole" class="method item">
+    <h3 class="name"><code>deleteRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l76"><code>roles&#x2F;roles_client.js:76</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Delete an existing role.</p>
+<p>If the role is set for any user, it is automatically unset.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_deleteRoleAsync" class="method item">
+    <h3 class="name"><code>deleteRoleAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l118"><code>roles&#x2F;roles_common_async.js:118</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Delete an existing role.</p>
+<p>If the role is set for any user, it is automatically unset.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getAllRoles" class="method item">
+    <h3 class="name"><code>getAllRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>queryOptions</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l767"><code>roles&#x2F;roles_client.js:767</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve cursor of all existing roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">queryOptions</code>
+                        <span class="type">Object</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>RolesCollection.find(query, options)</code>.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Cursor</span>:
+                    <p>Cursor of existing roles.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getAllRoles" class="method item">
+    <h3 class="name"><code>getAllRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code class="optional">[queryOptions]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l956"><code>roles&#x2F;roles_common_async.js:956</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve cursor of all existing roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name optional">[queryOptions]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>RolesCollection.find(query, options)</code>.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Cursor</span>:
+                    <p>Cursor of existing roles.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getGroupsForUser" class="method item deprecated">
+    <h3 class="name"><code>getGroupsForUser</code></h3>
+
+        <span class="paren">()</span>
+
+
+        <span class="flag deprecated">deprecated</span>
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l892"><code>roles&#x2F;roles_client.js:892</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Deprecated. Use <code>getScopesForUser</code> instead.</p>
+
+    </div>
+
+
+
+
+</div>
+<div id="method_getGroupsForUserAsync" class="method item deprecated">
+    <h3 class="name"><code>getGroupsForUserAsync</code></h3>
+
+        <span class="paren">()</span>
+
+        <span class="returns-inline">
+            <span class="type">Promise<Array></span>
+        </span>
+
+        <span class="flag deprecated">deprecated</span>
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1097"><code>roles&#x2F;roles_common_async.js:1097</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Deprecated. Use <code>getScopesForUser</code> instead.</p>
+
+    </div>
+
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise<Array></span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getRolesForUser" class="method item">
+    <h3 class="name"><code>getRolesForUser</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l691"><code>roles&#x2F;roles_client.js:691</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve user's roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of scope to provide roles for; if not specified, global roles are returned</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> and <code>onlyAssigned</code> options are ignored)</li>
+<li><code>onlyScoped</code>: if set, only roles in the specified scope are returned</li>
+<li><code>onlyAssigned</code>: return only assigned roles and not automatically inferred (like subroles)</li>
+<li><code>fullObjects</code>: return full roles objects (<code>true</code>) or just names (<code>false</code>) (<code>onlyAssigned</code> option is ignored) (default <code>false</code>)
+If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
+result strongly dependent on the internal data structure of this plugin.</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Array</span>:
+                    <p>Array of user's roles, unsorted.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getRolesForUserAsync" class="method item">
+    <h3 class="name"><code>getRolesForUserAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise<Array></span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l871"><code>roles&#x2F;roles_common_async.js:871</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve user's roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of scope to provide roles for; if not specified, global roles are returned</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> and <code>onlyAssigned</code> options are ignored)</li>
+<li><code>onlyScoped</code>: if set, only roles in the specified scope are returned</li>
+<li><code>onlyAssigned</code>: return only assigned roles and not automatically inferred (like subroles)</li>
+<li><code>fullObjects</code>: return full roles objects (<code>true</code>) or just names (<code>false</code>) (<code>onlyAssigned</code> option is ignored) (default <code>false</code>)
+If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
+result strongly dependent on the internal data structure of this plugin.</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise<Array></span>:
+                    <p>Array of user's roles, unsorted.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getScopesForUser" class="method item">
+    <h3 class="name"><code>getScopesForUser</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[roles]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Array</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l908"><code>roles&#x2F;roles_client.js:908</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve users scopes, if any.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[roles]</code>
+                        <span class="type">Array | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Name of roles to restrict scopes to.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Array</span>:
+                    <p>Array of user's scopes, unsorted.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getScopesForUserAsync" class="method item">
+    <h3 class="name"><code>getScopesForUserAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[roles]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise<Array></span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1117"><code>roles&#x2F;roles_common_async.js:1117</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve users scopes, if any.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[roles]</code>
+                        <span class="type">Array | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Name of roles to restrict scopes to.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise<Array></span>:
+                    <p>Array of user's scopes, unsorted.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getUserAssignmentsForRole" class="method item">
+    <h3 class="name"><code>getUserAssignmentsForRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l812"><code>roles&#x2F;roles_client.js:812</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve all assignments of a user which are for the target role.</p>
+<p>Options:</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles. If array, users
+returned will have at least one of the roles
+specified but need not have <em>all</em> roles.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope to restrict roles to; user's global
+roles will also be checked</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+<li><code>queryOptions</code>: options which are passed directly
+through to <code>RoleAssignmentCollection.find(query, options)</code></li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Cursor</span>:
+                    <p>Cursor of user assignments for roles.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getUserAssignmentsForRole" class="method item">
+    <h3 class="name"><code>getUserAssignmentsForRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1006"><code>roles&#x2F;roles_common_async.js:1006</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve all assignments of a user which are for the target role.</p>
+<p>Options:</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles. If array, users
+returned will have at least one of the roles
+specified but need not have <em>all</em> roles.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope to restrict roles to; user's global
+roles will also be checked</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+<li><code>queryOptions</code>: options which are passed directly
+through to <code>RoleAssignmentCollection.find(query, options)</code></li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Cursor</span>:
+                    <p>Cursor of user assignments for roles.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getUsersInRole" class="method item">
+    <h3 class="name"><code>getUsersInRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[queryOptions]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Cursor</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l782"><code>roles&#x2F;roles_client.js:782</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve all users who are in target role.</p>
+<p>Options:</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles. If array, users
+returned will have at least one of the roles
+specified but need not have <em>all</em> roles.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope to restrict roles to; user's global
+roles will also be checked</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+<li><code>onlyScoped</code>: if set, only roles in the specified scope are returned</li>
+<li><code>queryOptions</code>: options which are passed directly
+through to <code>Meteor.users.find(query, options)</code></li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[queryOptions]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>Meteor.users.find(query, options)</code></p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Cursor</span>:
+                    <p>Cursor of users in roles.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_getUsersInRoleAsync" class="method item">
+    <h3 class="name"><code>getUsersInRoleAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[queryOptions]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise<Cursor></span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l971"><code>roles&#x2F;roles_common_async.js:971</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Retrieve all users who are in target role.</p>
+<p>Options:</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles. If array, users
+returned will have at least one of the roles
+specified but need not have <em>all</em> roles.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope to restrict roles to; user's global
+roles will also be checked</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+<li><code>onlyScoped</code>: if set, only roles in the specified scope are returned</li>
+<li><code>queryOptions</code>: options which are passed directly
+through to <code>Meteor.users.find(query, options)</code></li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[queryOptions]</code>
+                        <span class="type">Object</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options which are passed directly
+through to <code>Meteor.users.find(query, options)</code></p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise<Cursor></span>:
+                    <p>Cursor of users in roles.</p>
+
+            </div>
+        </div>
+
+
+</div>
+<div id="method_isParentOf" class="method item">
+    <h3 class="name"><code>isParentOf</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>parentRoleName</code>
+                </li>
+                <li class="arg">
+                        <code>childRoleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l1003"><code>roles&#x2F;roles_client.js:1003</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Find out if a role is an ancestor of another role.</p>
+<p>WARNING: If you check this on the client, please make sure all roles are published.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">parentRoleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The role you want to research.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">childRoleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The role you expect to be among the children of parentRoleName.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_isParentOfAsync" class="method item">
+    <h3 class="name"><code>isParentOfAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>parentRoleName</code>
+                </li>
+                <li class="arg">
+                        <code>childRoleName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1226"><code>roles&#x2F;roles_common_async.js:1226</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Find out if a role is an ancestor of another role.</p>
+<p>WARNING: If you check this on the client, please make sure all roles are published.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">parentRoleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The role you want to research.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">childRoleName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The role you expect to be among the children of parentRoleName.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_removeRolesFromParent" class="method item">
+    <h3 class="name"><code>removeRolesFromParent</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>rolesNames</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l254"><code>roles&#x2F;roles_client.js:254</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove role parent from roles.</p>
+<p>Other parents are kept (role can have multiple parents). For users which have the
+parent role set, removed subrole is removed automatically.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">rolesNames</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of role(s).</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_removeRolesFromParentAsync" class="method item">
+    <h3 class="name"><code>removeRolesFromParentAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>rolesNames</code>
+                </li>
+                <li class="arg">
+                        <code>parentName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l341"><code>roles&#x2F;roles_common_async.js:341</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove role parent from roles.</p>
+<p>Other parents are kept (role can have multiple parents). For users which have the
+parent role set, removed subrole is removed automatically.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">rolesNames</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of role(s).</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">parentName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of parent role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_removeScope" class="method item">
+    <h3 class="name"><code>removeScope</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>name</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l974"><code>roles&#x2F;roles_client.js:974</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove a scope.</p>
+<p>Roles assigned with a given scope are removed.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">name</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The name of a scope.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_removeScopeAsync" class="method item">
+    <h3 class="name"><code>removeScopeAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>name</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1192"><code>roles&#x2F;roles_common_async.js:1192</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove a scope.</p>
+<p>Roles assigned with a given scope are removed.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">name</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>The name of a scope.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_removeUsersFromRoles" class="method item">
+    <h3 class="name"><code>removeUsersFromRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l547"><code>roles&#x2F;roles_client.js:547</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove users from assigned roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to remove users from. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.removeUsersFromRoles(userId, 'admin')
+Roles.removeUsersFromRoles([userId, user2], ['editor'])
+Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_removeUsersFromRolesAsync" class="method item">
+    <h3 class="name"><code>removeUsersFromRolesAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l716"><code>roles&#x2F;roles_common_async.js:716</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Remove users from assigned roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to remove users from. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+                    <p>Alternatively, it can be a scope name string.</p>
+
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>await Roles.removeUsersFromRolesAsync(userId, 'admin')
+await Roles.removeUsersFromRolesAsync([userId, user2], ['editor'])
+await Roles.removeUsersFromRolesAsync(userId, ['user'], 'group1')</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_renameRole" class="method item">
+    <h3 class="name"><code>renameRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldName</code>
+                </li>
+                <li class="arg">
+                        <code>newName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l126"><code>roles&#x2F;roles_client.js:126</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Rename an existing role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Old name of a role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">newName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>New name of a role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_renameRoleAsync" class="method item">
+    <h3 class="name"><code>renameRoleAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldName</code>
+                </li>
+                <li class="arg">
+                        <code>newName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l184"><code>roles&#x2F;roles_common_async.js:184</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Rename an existing role.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Old name of a role.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">newName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>New name of a role.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_renameScope" class="method item">
+    <h3 class="name"><code>renameScope</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldName</code>
+                </li>
+                <li class="arg">
+                        <code>newName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l945"><code>roles&#x2F;roles_client.js:945</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Rename a scope.</p>
+<p>Roles assigned with a given scope are changed to be under the new scope.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Old name of a scope.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">newName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>New name of a scope.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+</div>
+<div id="method_renameScopeAsync" class="method item">
+    <h3 class="name"><code>renameScopeAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>oldName</code>
+                </li>
+                <li class="arg">
+                        <code>newName</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l1158"><code>roles&#x2F;roles_common_async.js:1158</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Rename a scope.</p>
+<p>Roles assigned with a given scope are changed to be under the new scope.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">oldName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Old name of a scope.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">newName</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>New name of a scope.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+            </div>
+        </div>
+
+
+</div>
+<div id="method_setUserRoles" class="method item">
+    <h3 class="name"><code>setUserRoles</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l375"><code>roles&#x2F;roles_client.js:375</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Set users' roles.</p>
+<p>Replaces all existing roles with a new set of roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>anyScope</code>: if <code>true</code>, remove all roles the user has, of any scope, if <code>false</code>, only the one in the same scope</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>Roles.setUserRoles(userId, 'admin')
+Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+Roles.setUserRoles([user1, user2], ['user','editor'])
+Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_setUserRolesAsync" class="method item">
+    <h3 class="name"><code>setUserRolesAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>users</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l489"><code>roles&#x2F;roles_common_async.js:489</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Set users' roles.</p>
+<p>Replaces all existing roles with a new set of roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">users</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
+<li><code>anyScope</code>: if <code>true</code>, remove all roles the user has, of any scope, if <code>false</code>, only the one in the same scope</li>
+<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
+</ul>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise</span>:
+                    <p>Alternatively, it can be a scope name string.</p>
+
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>await Roles.setUserRolesAsync(userId, 'admin')
+await Roles.setUserRolesAsync(userId, ['view-secrets'], 'example.com')
+await Roles.setUserRolesAsync([user1, user2], ['user','editor'])
+await Roles.setUserRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_userIsInRole" class="method item">
+    <h3 class="name"><code>userIsInRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l623"><code>roles&#x2F;roles_client.js:623</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Check if user has specified roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles to check against. If array,
+will return <code>true</code> if user is in <em>any</em> role.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope; if supplied, limits check to just that scope
+the user's global roles will always be checked whether scope is specified or not</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Boolean</span>:
+                    <p><code>true</code> if user is in <em>any</em> of the target roles</p>
+
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>// global roles
+Roles.userIsInRole(user, 'admin')
+Roles.userIsInRole(user, ['admin','editor'])
+Roles.userIsInRole(userId, 'admin')
+Roles.userIsInRole(userId, ['admin','editor'])
+
+// scope roles (global roles are still checked)
+Roles.userIsInRole(user, 'admin', 'group1')
+Roles.userIsInRole(userId, ['admin','editor'], 'group1')
+Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})</code></pre>
+
+            </div>
+        </div>
+</div>
+<div id="method_userIsInRoleAsync" class="method item">
+    <h3 class="name"><code>userIsInRoleAsync</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>user</code>
+                </li>
+                <li class="arg">
+                        <code>roles</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[options]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Promise<Boolean></span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l794"><code>roles&#x2F;roles_common_async.js:794</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>Check if user has specified roles.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">user</code>
+                        <span class="type">String | Object</span>
+
+
+                    <div class="param-description">
+                        <p>User ID or an actual user object.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name">roles</code>
+                        <span class="type">Array | String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or an array of roles to check against. If array,
+will return <code>true</code> if user is in <em>any</em> role.
+Roles do not have to exist.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[options]</code>
+                        <span class="type">Object | String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Options:</p>
+<ul>
+<li><code>scope</code>: name of the scope; if supplied, limits check to just that scope
+the user's global roles will always be checked whether scope is specified or not</li>
+<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
+</ul>
+<p>Alternatively, it can be a scope name string.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Promise<Boolean></span>:
+                    <p><code>true</code> if user is in <em>any</em> of the target roles</p>
+
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>// global roles
+await Roles.userIsInRoleAsync(user, 'admin')
+await Roles.userIsInRoleAsync(user, ['admin','editor'])
+await Roles.userIsInRoleAsync(userId, 'admin')
+await Roles.userIsInRoleAsync(userId, ['admin','editor'])
+
+// scope roles (global roles are still checked)
+await Roles.userIsInRoleAsync(user, 'admin', 'group1')
+await Roles.userIsInRoleAsync(userId, ['admin','editor'], 'group1')
+await Roles.userIsInRoleAsync(userId, ['admin','editor'], {scope: 'group1'})</code></pre>
+
+            </div>
+        </div>
+</div>
+            </div>
+
+            <div id="properties" class="api-class-tabpanel">
+                <h2 class="off-left">Properties</h2>
+
+<div id="property_GLOBAL_GROUP" class="property item deprecated">
+    <h3 class="name"><code>GLOBAL_GROUP</code></h3>
+    <span class="type">Unknown</span>
+
+        <span class="flag deprecated">deprecated</span>
+
+
+
+        <span class="flag static">static</span>
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_client.js.html#l40"><code>roles&#x2F;roles_client.js:40</code></a>
+        </p>
+
+
+    </div>
+
+    <div class="description">
+        <p>Used as a global group (now scope) name. Not used anymore.</p>
+
+    </div>
+
+
+
+</div>
+<div id="property_GLOBAL_GROUP" class="property item deprecated">
+    <h3 class="name"><code>GLOBAL_GROUP</code></h3>
+    <span class="type">Unknown</span>
+
+        <span class="flag deprecated">deprecated</span>
+
+
+
+        <span class="flag static">static</span>
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_roles_common_async.js.html#l64"><code>roles&#x2F;roles_common_async.js:64</code></a>
+        </p>
+
+
+    </div>
+
+    <div class="description">
+        <p>Used as a global group (now scope) name. Not used anymore.</p>
+
+    </div>
+
+
+
+</div>
+            </div>
+
+
+    </div>
+</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
new file mode 100644
index 0000000000..2efd2572d6
--- /dev/null
+++ b/docs/classes/UIHelpers.html
@@ -0,0 +1,246 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>UIHelpers - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="icon" href="../assets/favicon.ico">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v4.0.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+<h1>UIHelpers Class</h1>
+<div class="box meta">
+
+
+
+            Module: <a href="../modules/UIHelpers.html">UIHelpers</a>
+
+</div>
+
+
+<div class="box intro">
+    
+</div>
+
+
+<div id="classdocs" class="tabview">
+    <ul class="api-class-tabs">
+        <li class="api-class-tab index"><a href="#index">Index</a></li>
+
+            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
+    </ul>
+
+    <div>
+        <div id="index" class="api-class-tabpanel index">
+            <h2 class="off-left">Item Index</h2>
+
+                <div class="index-section methods">
+                    <h3>Methods</h3>
+
+                    <ul class="index-list methods">
+                            <li class="index-item method">
+                                <a href="#method_isInRole">isInRole</a>
+
+                                    <span class="flag static">static</span>
+                            </li>
+                    </ul>
+                </div>
+
+
+
+        </div>
+
+            <div id="methods" class="api-class-tabpanel">
+                <h2 class="off-left">Methods</h2>
+
+<div id="method_isInRole" class="method item">
+    <h3 class="name"><code>isInRole</code></h3>
+
+        <div class="args">
+            <span class="paren">(</span><ul class="args-list inline commas">
+                <li class="arg">
+                        <code>role</code>
+                </li>
+                <li class="arg">
+                        <code class="optional">[scope]</code>
+                </li>
+            </ul><span class="paren">)</span>
+        </div>
+
+        <span class="returns-inline">
+            <span class="type">Boolean</span>
+        </span>
+
+
+
+
+        <span class="flag static">static</span>
+
+
+
+    <div class="meta">
+                <p>
+                Defined in
+        <a href="../files/roles_client_uiHelpers.js.html#l23"><code>roles&#x2F;client&#x2F;uiHelpers.js:23</code></a>
+        </p>
+
+
+
+    </div>
+
+    <div class="description">
+        <p>UI helper to check if current user is in at least one
+of the target roles.  For use in client-side templates.</p>
+
+    </div>
+
+        <div class="params">
+            <h4>Parameters:</h4>
+
+            <ul class="params-list">
+                <li class="param">
+                        <code class="param-name">role</code>
+                        <span class="type">String</span>
+
+
+                    <div class="param-description">
+                        <p>Name of role or comma-seperated list of roles.</p>
+
+                    </div>
+
+                </li>
+                <li class="param">
+                        <code class="param-name optional">[scope]</code>
+                        <span class="type">String</span>
+                        <span class="flag optional" title="This parameter is optional.">optional</span>
+
+
+                    <div class="param-description">
+                        <p>Optional, name of scope to check.</p>
+
+                    </div>
+
+                </li>
+            </ul>
+        </div>
+
+        <div class="returns">
+            <h4>Returns:</h4>
+
+            <div class="returns-description">
+                        <span class="type">Boolean</span>:
+                    <p><code>true</code> if current user is in at least one of the target roles.</p>
+
+            </div>
+        </div>
+
+
+        <div class="example">
+            <h4>Example:</h4>
+
+            <div class="example-content">
+                <pre class="code prettyprint"><code>{{#if isInRole 'admin'}}
+{{/if}}
+
+{{#if isInRole 'editor,user'}}
+{{/if}}
+
+{{#if isInRole 'editor,user' 'scope1'}}
+{{/if}}</code></pre>
+
+            </div>
+        </div>
+</div>
+            </div>
+
+
+
+    </div>
+</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/classes/index.html b/docs/classes/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/classes/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/docs/data.json b/docs/data.json
new file mode 100644
index 0000000000..7988adc5bf
--- /dev/null
+++ b/docs/data.json
@@ -0,0 +1,1743 @@
+{
+    "project": {
+        "name": "The meteor-roles API",
+        "description": "The meteor-roles API: an authorization package for Meteor",
+        "version": "v4.0.0"
+    },
+    "files": {
+        "roles/client/uiHelpers.js": {
+            "name": "roles/client/uiHelpers.js",
+            "modules": {
+                "UIHelpers": 1
+            },
+            "classes": {},
+            "fors": {
+                "UIHelpers": 1
+            },
+            "namespaces": {}
+        },
+        "roles/roles_client.js": {
+            "name": "roles/roles_client.js",
+            "modules": {
+                "Roles": 1
+            },
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
+        "roles/roles_common_async.js": {
+            "name": "roles/roles_common_async.js",
+            "modules": {},
+            "classes": {
+                "Roles": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        }
+    },
+    "modules": {
+        "UIHelpers": {
+            "name": "UIHelpers",
+            "submodules": {},
+            "elements": {},
+            "classes": {
+                "UIHelpers": 1
+            },
+            "fors": {
+                "UIHelpers": 1
+            },
+            "namespaces": {},
+            "tag": "module",
+            "file": "roles/client/uiHelpers.js",
+            "line": 3,
+            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
+        },
+        "Roles": {
+            "name": "Roles",
+            "submodules": {},
+            "elements": {},
+            "classes": {
+                "Roles": 1
+            },
+            "fors": {},
+            "namespaces": {},
+            "tag": "module",
+            "file": "roles/roles_common_async.js",
+            "line": 41,
+            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nRoles are accessible through `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: 'admin', children: [{_id: 'editor'}]}`\n\nThe assignment of a role to a user is stored in a collection, accessible through `RoleAssignmentCollection`.\nIt's documents consist of\n - `_id`: Internal MongoDB id\n - `role`: A role object which got assigned. Usually only contains the `_id` property\n - `user`: A user object, usually only contains the `_id` property\n - `scope`: scope name\n - `inheritedRoles`: A list of all the roles objects inherited by the assigned role."
+        }
+    },
+    "classes": {
+        "UIHelpers": {
+            "name": "UIHelpers",
+            "shortname": "UIHelpers",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "UIHelpers",
+            "namespace": ""
+        },
+        "Roles": {
+            "name": "Roles",
+            "shortname": "Roles",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "Roles",
+            "namespace": "",
+            "file": "roles/roles_common_async.js",
+            "line": 41
+        }
+    },
+    "elements": {},
+    "classitems": [
+        {
+            "file": "roles/client/uiHelpers.js",
+            "line": 23,
+            "description": "UI helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
+            "example": [
+                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'scope1'}}\n    {{/if}}"
+            ],
+            "itemtype": "method",
+            "name": "isInRole",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "Name of role or comma-seperated list of roles.",
+                    "type": "String"
+                },
+                {
+                    "name": "scope",
+                    "description": "Optional, name of scope to check.",
+                    "type": "String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "`true` if current user is in at least one of the target roles.",
+                "type": "Boolean"
+            },
+            "static": 1,
+            "class": "UIHelpers",
+            "module": "UIHelpers"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 40,
+            "description": "Used as a global group (now scope) name. Not used anymore.",
+            "itemtype": "property",
+            "name": "GLOBAL_GROUP",
+            "static": 1,
+            "deprecated": true,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 49,
+            "description": "Create a new role.",
+            "itemtype": "method",
+            "name": "createRole",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `unlessExists`: if `true`, exception will not be thrown in the role already exists",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "ID of the new role or null.",
+                "type": "String"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 76,
+            "description": "Delete an existing role.\n\nIf the role is set for any user, it is automatically unset.",
+            "itemtype": "method",
+            "name": "deleteRole",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 126,
+            "description": "Rename an existing role.",
+            "itemtype": "method",
+            "name": "renameRole",
+            "params": [
+                {
+                    "name": "oldName",
+                    "description": "Old name of a role.",
+                    "type": "String"
+                },
+                {
+                    "name": "newName",
+                    "description": "New name of a role.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 185,
+            "description": "Add role parent to roles.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
+            "itemtype": "method",
+            "name": "addRolesToParent",
+            "params": [
+                {
+                    "name": "rolesNames",
+                    "description": "Name(s) of role(s).",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 205,
+            "itemtype": "method",
+            "name": "_addRoleToParent",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 254,
+            "description": "Remove role parent from roles.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
+            "itemtype": "method",
+            "name": "removeRolesFromParent",
+            "params": [
+                {
+                    "name": "rolesNames",
+                    "description": "Name(s) of role(s).",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 274,
+            "itemtype": "method",
+            "name": "_removeRoleFromParent",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 323,
+            "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
+            "example": [
+                "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
+            ],
+            "itemtype": "method",
+            "name": "addUsersToRoles",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles to add users to. Roles have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 375,
+            "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
+            "example": [
+                "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
+            ],
+            "itemtype": "method",
+            "name": "setUserRoles",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles to add users to. Roles have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 437,
+            "description": "Add one user to one role.",
+            "itemtype": "method",
+            "name": "_addUserToRole",
+            "params": [
+                {
+                    "name": "userId",
+                    "description": "The user ID.",
+                    "type": "String"
+                },
+                {
+                    "name": "roleName",
+                    "description": "Name of the role to add the user to. The role have to exist.",
+                    "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist",
+                    "type": "Object"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 491,
+            "description": "Returns an array of role names the given role name is a child of.",
+            "example": [
+                "\n    Roles._getParentRoleNames({ _id: 'admin', children; [] })"
+            ],
+            "itemtype": "method",
+            "name": "_getParentRoleNames",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "The role object",
+                    "type": "Object"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 520,
+            "description": "Returns an array of role names the given role name is a parent of.",
+            "example": [
+                "\n    Roles._getInheritedRoleNames({ _id: 'admin', children; [] })"
+            ],
+            "itemtype": "method",
+            "name": "_getInheritedRoleNames",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "The role object",
+                    "type": "Object"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 547,
+            "description": "Remove users from assigned roles.",
+            "example": [
+                "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
+            ],
+            "itemtype": "method",
+            "name": "removeUsersFromRoles",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles to remove users from. Roles have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 593,
+            "description": "Remove one user from one role.",
+            "itemtype": "method",
+            "name": "_removeUserFromRole",
+            "params": [
+                {
+                    "name": "userId",
+                    "description": "The user ID.",
+                    "type": "String"
+                },
+                {
+                    "name": "roleName",
+                    "description": "Name of the role to add the user to. The role have to exist.",
+                    "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)",
+                    "type": "Object"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 623,
+            "description": "Check if user has specified roles.",
+            "example": [
+                "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // scope roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})"
+            ],
+            "itemtype": "method",
+            "name": "userIsInRole",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or an actual user object.",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles to check against. If array,\n                            will return `true` if user is in _any_ role.\n                            Roles do not have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope; if supplied, limits check to just that scope\n    the user's global roles will always be checked whether scope is specified or not\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "`true` if user is in _any_ of the target roles",
+                "type": "Boolean"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 691,
+            "description": "Retrieve user's roles.",
+            "itemtype": "method",
+            "name": "getRolesForUser",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or an actual user object.",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of scope to provide roles for; if not specified, global roles are returned\n  - `anyScope`: if set, role can be in any scope (`scope` and `onlyAssigned` options are ignored)\n  - `onlyScoped`: if set, only roles in the specified scope are returned\n  - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)\n  - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)\n    If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's\n    result strongly dependent on the internal data structure of this plugin.\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Array of user's roles, unsorted.",
+                "type": "Array"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 767,
+            "description": "Retrieve cursor of all existing roles.",
+            "itemtype": "method",
+            "name": "getAllRoles",
+            "params": [
+                {
+                    "name": "queryOptions",
+                    "description": "Options which are passed directly\n                               through to `RolesCollection.find(query, options)`.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Cursor of existing roles.",
+                "type": "Cursor"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 782,
+            "description": "Retrieve all users who are in target role.\n\nOptions:",
+            "itemtype": "method",
+            "name": "getUsersInRole",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `onlyScoped`: if set, only roles in the specified scope are returned\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                },
+                {
+                    "name": "queryOptions",
+                    "description": "Options which are passed directly\n                               through to `Meteor.users.find(query, options)`",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Cursor of users in roles.",
+                "type": "Cursor"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 812,
+            "description": "Retrieve all assignments of a user which are for the target role.\n\nOptions:",
+            "itemtype": "method",
+            "name": "getUserAssignmentsForRole",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `RoleAssignmentCollection.find(query, options)`\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Cursor of user assignments for roles.",
+                "type": "Cursor"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 844,
+            "itemtype": "method",
+            "name": "_getUsersInRoleCursor",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles. If array, ids of users are\n                            returned which have at least one of the roles\n                            assigned but need not have _all_ roles.\n                            Roles do not have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                },
+                {
+                    "name": "filter",
+                    "description": "Options which are passed directly\n                               through to `RoleAssignmentCollection.find(query, options)`",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Cursor to the assignment documents",
+                "type": "Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 892,
+            "description": "Deprecated. Use `getScopesForUser` instead.",
+            "itemtype": "method",
+            "name": "getGroupsForUser",
+            "static": 1,
+            "deprecated": true,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 908,
+            "description": "Retrieve users scopes, if any.",
+            "itemtype": "method",
+            "name": "getScopesForUser",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or an actual user object.",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name of roles to restrict scopes to.",
+                    "type": "Array|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Array of user's scopes, unsorted.",
+                "type": "Array"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 945,
+            "description": "Rename a scope.\n\nRoles assigned with a given scope are changed to be under the new scope.",
+            "itemtype": "method",
+            "name": "renameScope",
+            "params": [
+                {
+                    "name": "oldName",
+                    "description": "Old name of a scope.",
+                    "type": "String"
+                },
+                {
+                    "name": "newName",
+                    "description": "New name of a scope.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 974,
+            "description": "Remove a scope.\n\nRoles assigned with a given scope are removed.",
+            "itemtype": "method",
+            "name": "removeScope",
+            "params": [
+                {
+                    "name": "name",
+                    "description": "The name of a scope.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 989,
+            "description": "Throw an exception if `roleName` is an invalid role name.",
+            "itemtype": "method",
+            "name": "_checkRoleName",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "A role name to match against.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 1003,
+            "description": "Find out if a role is an ancestor of another role.\n\nWARNING: If you check this on the client, please make sure all roles are published.",
+            "itemtype": "method",
+            "name": "isParentOf",
+            "params": [
+                {
+                    "name": "parentRoleName",
+                    "description": "The role you want to research.",
+                    "type": "String"
+                },
+                {
+                    "name": "childRoleName",
+                    "description": "The role you expect to be among the children of parentRoleName.",
+                    "type": "String"
+                }
+            ],
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 1044,
+            "description": "Normalize options.",
+            "itemtype": "method",
+            "name": "_normalizeOptions",
+            "params": [
+                {
+                    "name": "options",
+                    "description": "Options to normalize.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Normalized options.",
+                "type": "Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 1065,
+            "description": "Normalize scope name.",
+            "itemtype": "method",
+            "name": "_normalizeScopeName",
+            "params": [
+                {
+                    "name": "scopeName",
+                    "description": "A scope name to normalize.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "Normalized scope name.",
+                "type": "String"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_client.js",
+            "line": 1083,
+            "description": "Throw an exception if `scopeName` is an invalid scope name.",
+            "itemtype": "method",
+            "name": "_checkRoleName",
+            "params": [
+                {
+                    "name": "scopeName",
+                    "description": "A scope name to match against.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 50,
+            "description": "Helper, resolves async some",
+            "params": [
+                {
+                    "name": "arr",
+                    "description": "",
+                    "type": "*"
+                },
+                {
+                    "name": "predicate",
+                    "description": "",
+                    "type": "*"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise<Boolean>"
+            },
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 64,
+            "description": "Used as a global group (now scope) name. Not used anymore.",
+            "itemtype": "property",
+            "name": "GLOBAL_GROUP",
+            "static": 1,
+            "deprecated": true,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 73,
+            "description": "Create a new role.",
+            "itemtype": "method",
+            "name": "createRoleAsync",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `unlessExists`: if `true`, exception will not be thrown in the role already exists",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "ID of the new role or null.",
+                "type": "Promise<String>"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 118,
+            "description": "Delete an existing role.\n\nIf the role is set for any user, it is automatically unset.",
+            "itemtype": "method",
+            "name": "deleteRoleAsync",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 184,
+            "description": "Rename an existing role.",
+            "itemtype": "method",
+            "name": "renameRoleAsync",
+            "params": [
+                {
+                    "name": "oldName",
+                    "description": "Old name of a role.",
+                    "type": "String"
+                },
+                {
+                    "name": "newName",
+                    "description": "New name of a role.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 256,
+            "description": "Add role parent to roles.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
+            "itemtype": "method",
+            "name": "addRolesToParentAsync",
+            "params": [
+                {
+                    "name": "rolesNames",
+                    "description": "Name(s) of role(s).",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 277,
+            "itemtype": "method",
+            "name": "_addRoleToParentAsync",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 341,
+            "description": "Remove role parent from roles.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
+            "itemtype": "method",
+            "name": "removeRolesFromParentAsync",
+            "params": [
+                {
+                    "name": "rolesNames",
+                    "description": "Name(s) of role(s).",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 362,
+            "itemtype": "method",
+            "name": "_removeRoleFromParentAsync",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "Name of role.",
+                    "type": "String"
+                },
+                {
+                    "name": "parentName",
+                    "description": "Name of parent role.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 433,
+            "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
+            "example": [
+                "\n    Roles.addUsersToRolesAsync(userId, 'admin')\n    Roles.addUsersToRolesAsync(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRolesAsync([user1, user2], ['user','editor'])\n    Roles.addUsersToRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
+            ],
+            "itemtype": "method",
+            "name": "addUsersToRolesAsync",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles to add users to. Roles have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Alternatively, it can be a scope name string.",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 489,
+            "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
+            "example": [
+                "\n    await Roles.setUserRolesAsync(userId, 'admin')\n    await Roles.setUserRolesAsync(userId, ['view-secrets'], 'example.com')\n    await Roles.setUserRolesAsync([user1, user2], ['user','editor'])\n    await Roles.setUserRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
+            ],
+            "itemtype": "method",
+            "name": "setUserRolesAsync",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles to add users to. Roles have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Alternatively, it can be a scope name string.",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 555,
+            "description": "Add one user to one role.",
+            "itemtype": "method",
+            "name": "_addUserToRoleAsync",
+            "params": [
+                {
+                    "name": "userId",
+                    "description": "The user ID.",
+                    "type": "String"
+                },
+                {
+                    "name": "roleName",
+                    "description": "Name of the role to add the user to. The role have to exist.",
+                    "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 651,
+            "description": "Returns an array of role names the given role name is a child of.",
+            "example": [
+                "\n    Roles._getParentRoleNamesAsync({ _id: 'admin', children; [] })"
+            ],
+            "itemtype": "method",
+            "name": "_getParentRoleNamesAsync",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "The role object",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 683,
+            "description": "Returns an array of role names the given role name is a parent of.",
+            "example": [
+                "\n    Roles._getInheritedRoleNames({ _id: 'admin', children; [] })"
+            ],
+            "itemtype": "method",
+            "name": "_getInheritedRoleNames",
+            "params": [
+                {
+                    "name": "role",
+                    "description": "The role object",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 716,
+            "description": "Remove users from assigned roles.",
+            "example": [
+                "\n    await Roles.removeUsersFromRolesAsync(userId, 'admin')\n    await Roles.removeUsersFromRolesAsync([userId, user2], ['editor'])\n    await Roles.removeUsersFromRolesAsync(userId, ['user'], 'group1')"
+            ],
+            "itemtype": "method",
+            "name": "removeUsersFromRolesAsync",
+            "params": [
+                {
+                    "name": "users",
+                    "description": "User ID(s) or object(s) with an `_id` field.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name(s) of roles to remove users from. Roles have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Alternatively, it can be a scope name string.",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 763,
+            "description": "Remove one user from one role.",
+            "itemtype": "method",
+            "name": "_removeUserFromRoleAsync",
+            "params": [
+                {
+                    "name": "userId",
+                    "description": "The user ID.",
+                    "type": "String"
+                },
+                {
+                    "name": "roleName",
+                    "description": "Name of the role to add the user to. The role have to exist.",
+                    "type": "String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 794,
+            "description": "Check if user has specified roles.",
+            "example": [
+                "\n    // global roles\n    await Roles.userIsInRoleAsync(user, 'admin')\n    await Roles.userIsInRoleAsync(user, ['admin','editor'])\n    await Roles.userIsInRoleAsync(userId, 'admin')\n    await Roles.userIsInRoleAsync(userId, ['admin','editor'])\n\n    // scope roles (global roles are still checked)\n    await Roles.userIsInRoleAsync(user, 'admin', 'group1')\n    await Roles.userIsInRoleAsync(userId, ['admin','editor'], 'group1')\n    await Roles.userIsInRoleAsync(userId, ['admin','editor'], {scope: 'group1'})"
+            ],
+            "itemtype": "method",
+            "name": "userIsInRoleAsync",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or an actual user object.",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles to check against. If array,\n                            will return `true` if user is in _any_ role.\n                            Roles do not have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope; if supplied, limits check to just that scope\n    the user's global roles will always be checked whether scope is specified or not\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "`true` if user is in _any_ of the target roles",
+                "type": "Promise<Boolean>"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 871,
+            "description": "Retrieve user's roles.",
+            "itemtype": "method",
+            "name": "getRolesForUserAsync",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or an actual user object.",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of scope to provide roles for; if not specified, global roles are returned\n  - `anyScope`: if set, role can be in any scope (`scope` and `onlyAssigned` options are ignored)\n  - `onlyScoped`: if set, only roles in the specified scope are returned\n  - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)\n  - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)\n    If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's\n    result strongly dependent on the internal data structure of this plugin.\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Array of user's roles, unsorted.",
+                "type": "Promise<Array>"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 956,
+            "description": "Retrieve cursor of all existing roles.",
+            "itemtype": "method",
+            "name": "getAllRoles",
+            "params": [
+                {
+                    "name": "queryOptions",
+                    "description": "Options which are passed directly\n                               through to `RolesCollection.find(query, options)`.",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Cursor of existing roles.",
+                "type": "Cursor"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 971,
+            "description": "Retrieve all users who are in target role.\n\nOptions:",
+            "itemtype": "method",
+            "name": "getUsersInRoleAsync",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `onlyScoped`: if set, only roles in the specified scope are returned\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                },
+                {
+                    "name": "queryOptions",
+                    "description": "Options which are passed directly\n                               through to `Meteor.users.find(query, options)`",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Cursor of users in roles.",
+                "type": "Promise<Cursor>"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1006,
+            "description": "Retrieve all assignments of a user which are for the target role.\n\nOptions:",
+            "itemtype": "method",
+            "name": "getUserAssignmentsForRole",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `RoleAssignmentCollection.find(query, options)`\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Cursor of user assignments for roles.",
+                "type": "Cursor"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1041,
+            "itemtype": "method",
+            "name": "_getUsersInRoleCursor",
+            "params": [
+                {
+                    "name": "roles",
+                    "description": "Name of role or an array of roles. If array, ids of users are\n                            returned which have at least one of the roles\n                            assigned but need not have _all_ roles.\n                            Roles do not have to exist.",
+                    "type": "Array|String"
+                },
+                {
+                    "name": "options",
+                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
+                    "type": "Object|String",
+                    "optional": true
+                },
+                {
+                    "name": "filter",
+                    "description": "Options which are passed directly\n                               through to `RoleAssignmentCollection.find(query, options)`",
+                    "type": "Object",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Cursor to the assignment documents",
+                "type": "Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1097,
+            "description": "Deprecated. Use `getScopesForUser` instead.",
+            "itemtype": "method",
+            "name": "getGroupsForUserAsync",
+            "return": {
+                "description": "",
+                "type": "Promise<Array>"
+            },
+            "static": 1,
+            "deprecated": true,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1117,
+            "description": "Retrieve users scopes, if any.",
+            "itemtype": "method",
+            "name": "getScopesForUserAsync",
+            "params": [
+                {
+                    "name": "user",
+                    "description": "User ID or an actual user object.",
+                    "type": "String|Object"
+                },
+                {
+                    "name": "roles",
+                    "description": "Name of roles to restrict scopes to.",
+                    "type": "Array|String",
+                    "optional": true
+                }
+            ],
+            "return": {
+                "description": "Array of user's scopes, unsorted.",
+                "type": "Promise<Array>"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1158,
+            "description": "Rename a scope.\n\nRoles assigned with a given scope are changed to be under the new scope.",
+            "itemtype": "method",
+            "name": "renameScopeAsync",
+            "params": [
+                {
+                    "name": "oldName",
+                    "description": "Old name of a scope.",
+                    "type": "String"
+                },
+                {
+                    "name": "newName",
+                    "description": "New name of a scope.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1192,
+            "description": "Remove a scope.\n\nRoles assigned with a given scope are removed.",
+            "itemtype": "method",
+            "name": "removeScopeAsync",
+            "params": [
+                {
+                    "name": "name",
+                    "description": "The name of a scope.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1208,
+            "description": "Throw an exception if `roleName` is an invalid role name.",
+            "itemtype": "method",
+            "name": "_checkRoleName",
+            "params": [
+                {
+                    "name": "roleName",
+                    "description": "A role name to match against.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1226,
+            "description": "Find out if a role is an ancestor of another role.\n\nWARNING: If you check this on the client, please make sure all roles are published.",
+            "itemtype": "method",
+            "name": "isParentOfAsync",
+            "params": [
+                {
+                    "name": "parentRoleName",
+                    "description": "The role you want to research.",
+                    "type": "String"
+                },
+                {
+                    "name": "childRoleName",
+                    "description": "The role you expect to be among the children of parentRoleName.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1268,
+            "description": "Normalize options.",
+            "itemtype": "method",
+            "name": "_normalizeOptions",
+            "params": [
+                {
+                    "name": "options",
+                    "description": "Options to normalize.",
+                    "type": "Object"
+                }
+            ],
+            "return": {
+                "description": "Normalized options.",
+                "type": "Object"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1291,
+            "description": "Normalize scope name.",
+            "itemtype": "method",
+            "name": "_normalizeScopeName",
+            "params": [
+                {
+                    "name": "scopeName",
+                    "description": "A scope name to normalize.",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "Normalized scope name.",
+                "type": "String"
+            },
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        },
+        {
+            "file": "roles/roles_common_async.js",
+            "line": 1309,
+            "description": "Throw an exception if `scopeName` is an invalid scope name.",
+            "itemtype": "method",
+            "name": "_checkScopeName",
+            "params": [
+                {
+                    "name": "scopeName",
+                    "description": "A scope name to match against.",
+                    "type": "String"
+                }
+            ],
+            "access": "private",
+            "tagname": "",
+            "static": 1,
+            "class": "Roles",
+            "module": "Roles"
+        }
+    ],
+    "warnings": [
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:50"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:118"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:184"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:256"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:277"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:341"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:362"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:433"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:489"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:555"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:651"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:683"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:716"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:763"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:1097"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:1158"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:1192"
+        },
+        {
+            "message": "replacing incorrect tag: returns with return",
+            "line": " roles/roles_common_async.js:1226"
+        },
+        {
+            "message": "Missing item type\nHelper, resolves async some",
+            "line": " roles/roles_common_async.js:50"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/docs/elements/index.html b/docs/elements/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/elements/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/docs/files/index.html b/docs/files/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/files/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>
diff --git a/docs/files/roles_client_uiHelpers.js.html b/docs/files/roles_client_uiHelpers.js.html
new file mode 100644
index 0000000000..b1ee4b3c91
--- /dev/null
+++ b/docs/files/roles_client_uiHelpers.js.html
@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>roles/client/uiHelpers.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="icon" href="../assets/favicon.ico">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v4.0.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+<h1 class="file-heading">File: roles/client/uiHelpers.js</h1>
+
+<div class="file">
+    <pre class="code prettyprint linenums">
+/* global Meteor, Roles, Match, Package */
+
+/**
+ * Convenience functions for use on client.
+ *
+ * NOTE: You must restrict user actions on the server-side; any
+ * client-side checks are strictly for convenience and must not be
+ * trusted.
+ *
+ * @module UIHelpers
+ */
+
+// //////////////////////////////////////////////////////////
+// UI helpers
+//
+// Use a semi-private variable rather than declaring UI
+// helpers directly so that we can unit test the helpers.
+// XXX For some reason, the UI helpers are not registered
+// before the tests run.
+//
+Roles._uiHelpers = {
+
+  /**
+   * UI helper to check if current user is in at least one
+   * of the target roles.  For use in client-side templates.
+   *
+   * @example
+   *     {{#if isInRole &#x27;admin&#x27;}}
+   *     {{/if}}
+   *
+   *     {{#if isInRole &#x27;editor,user&#x27;}}
+   *     {{/if}}
+   *
+   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;scope1&#x27;}}
+   *     {{/if}}
+   *
+   * @method isInRole
+   * @param {String} role Name of role or comma-seperated list of roles.
+   * @param {String} [scope] Optional, name of scope to check.
+   * @return {Boolean} &#x60;true&#x60; if current user is in at least one of the target roles.
+   * @static
+   * @for UIHelpers
+   */
+  isInRole: function (role, scope) {
+    const user = Meteor.user()
+    const comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;)
+    let roles
+
+    if (!user) return false
+    if (!Match.test(role, String)) return false
+
+    if (comma !== -1) {
+      roles = role.split(&#x27;,&#x27;).reduce(function (memo, r) {
+        if (!r) {
+          return memo
+        }
+        memo.push(r)
+        return memo
+      }, [])
+    } else {
+      roles = [role]
+    }
+
+    if (Match.test(scope, String)) {
+      return Roles.userIsInRole(user, roles, scope)
+    }
+
+    return Roles.userIsInRole(user, roles)
+  }
+}
+
+// //////////////////////////////////////////////////////////
+// Register UI helpers
+//
+
+if (Roles.debug &amp;&amp; console.debug) {
+  console.debug(&#x27;[roles] Roles.debug =&#x27;, Roles.debug)
+}
+
+if (typeof Package.blaze !== &#x27;undefined&#x27; &amp;&amp;
+    typeof Package.blaze.Blaze !== &#x27;undefined&#x27; &amp;&amp;
+    typeof Package.blaze.Blaze.registerHelper === &#x27;function&#x27;) {
+  Object.entries(Roles._uiHelpers).forEach(([name, func]) =&gt; {
+    if (Roles.debug &amp;&amp; console.debug) {
+      console.debug(&#x27;[roles] registering Blaze helper \&#x27;&#x27; + name + &#x27;\&#x27;&#x27;)
+    }
+    Package.blaze.Blaze.registerHelper(name, func)
+  })
+}
+
+    </pre>
+</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
new file mode 100644
index 0000000000..565e49d294
--- /dev/null
+++ b/docs/files/roles_roles_client.js.html
@@ -0,0 +1,1206 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>roles/roles_client.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="icon" href="../assets/favicon.ico">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v4.0.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+<h1 class="file-heading">File: roles/roles_client.js</h1>
+
+<div class="file">
+    <pre class="code prettyprint linenums">
+/* global Roles */
+import { Meteor } from &#x27;meteor/meteor&#x27;
+
+/**
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
+ *
+ * Roles are accessible through &#x60;Meteor.roles&#x60; collection and documents consist of:
+ *  - &#x60;_id&#x60;: role name
+ *  - &#x60;children&#x60;: list of subdocuments:
+ *    - &#x60;_id&#x60;
+ *
+ * Children list elements are subdocuments so that they can be easier extended in the future or by plugins.
+ *
+ * Roles can have multiple parents and can be children (subroles) of multiple roles.
+ *
+ * Example: &#x60;{_id: &#x27;admin&#x27;, children: [{_id: &#x27;editor&#x27;}]}&#x60;
+ *
+ * The assignment of a role to a user is stored in a collection, accessible through &#x60;RoleAssignmentCollection&#x60;.
+ * It&#x27;s documents consist of
+ *  - &#x60;_id&#x60;: Internal MongoDB id
+ *  - &#x60;role&#x60;: A role object which got assigned. Usually only contains the &#x60;_id&#x60; property
+ *  - &#x60;user&#x60;: A user object, usually only contains the &#x60;_id&#x60; property
+ *  - &#x60;scope&#x60;: scope name
+ *  - &#x60;inheritedRoles&#x60;: A list of all the roles objects inherited by the assigned role.
+ *
+ * @module Roles
+ */
+
+/**
+ * @class Roles
+ */
+if (typeof Roles === &#x27;undefined&#x27;) {
+  Roles = {} // eslint-disable-line no-global-assign
+}
+
+let getGroupsForUserDeprecationWarning = false
+
+Object.assign(Roles, {
+
+  /**
+   * Used as a global group (now scope) name. Not used anymore.
+   *
+   * @property GLOBAL_GROUP
+   * @static
+   * @deprecated
+   */
+  GLOBAL_GROUP: null,
+
+  /**
+   * Create a new role.
+   *
+   * @method createRole
+   * @param {String} roleName Name of role.
+   * @param {Object} [options] Options:
+   *   - &#x60;unlessExists&#x60;: if &#x60;true&#x60;, exception will not be thrown in the role already exists
+   * @return {String} ID of the new role or null.
+   * @static
+   */
+  createRole: function (roleName, options) {
+    Roles._checkRoleName(roleName)
+
+    options = Object.assign({
+      unlessExists: false
+    }, options)
+
+    const result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
+
+    if (!result.insertedId) {
+      if (options.unlessExists) return null
+      throw new Error(&#x27;Role \&#x27;&#x27; + roleName + &#x27;\&#x27; already exists.&#x27;)
+    }
+
+    return result.insertedId
+  },
+
+  /**
+   * Delete an existing role.
+   *
+   * If the role is set for any user, it is automatically unset.
+   *
+   * @method deleteRole
+   * @param {String} roleName Name of role.
+   * @static
+   */
+  deleteRole: function (roleName) {
+    let roles
+    let inheritedRoles
+
+    Roles._checkRoleName(roleName)
+
+    // Remove all assignments
+    Meteor.roleAssignment.remove({
+      &#x27;role._id&#x27;: roleName
+    })
+
+    do {
+      // For all roles who have it as a dependency ...
+      roles = Roles._getParentRoleNames(Meteor.roles.findOne({ _id: roleName }))
+
+      for (const r of Meteor.roles.find({ _id: { $in: roles } }).fetch()) {
+        Meteor.roles.update({
+          _id: r._id
+        }, {
+          $pull: {
+            children: {
+              _id: roleName
+            }
+          }
+        })
+
+        inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
+        Meteor.roleAssignment.update({
+          &#x27;role._id&#x27;: r._id
+        }, {
+          $set: {
+            inheritedRoles: [r._id, ...inheritedRoles].map(r2 =&gt; ({ _id: r2 }))
+          }
+        }, { multi: true })
+      }
+    } while (roles.length &gt; 0)
+
+    // And finally remove the role itself
+    Meteor.roles.remove({ _id: roleName })
+  },
+
+  /**
+   * Rename an existing role.
+   *
+   * @method renameRole
+   * @param {String} oldName Old name of a role.
+   * @param {String} newName New name of a role.
+   * @static
+   */
+  renameRole: function (oldName, newName) {
+    let count
+
+    Roles._checkRoleName(oldName)
+    Roles._checkRoleName(newName)
+
+    if (oldName === newName) return
+
+    const role = Meteor.roles.findOne({ _id: oldName })
+
+    if (!role) {
+      throw new Error(&#x27;Role \&#x27;&#x27; + oldName + &#x27;\&#x27; does not exist.&#x27;)
+    }
+
+    role._id = newName
+
+    Meteor.roles.insert(role)
+
+    do {
+      count = Meteor.roleAssignment.update({
+        &#x27;role._id&#x27;: oldName
+      }, {
+        $set: {
+          &#x27;role._id&#x27;: newName
+        }
+      }, { multi: true })
+    } while (count &gt; 0)
+
+    do {
+      count = Meteor.roleAssignment.update({
+        &#x27;inheritedRoles._id&#x27;: oldName
+      }, {
+        $set: {
+          &#x27;inheritedRoles.$._id&#x27;: newName
+        }
+      }, { multi: true })
+    } while (count &gt; 0)
+
+    do {
+      count = Meteor.roles.update({
+        &#x27;children._id&#x27;: oldName
+      }, {
+        $set: {
+          &#x27;children.$._id&#x27;: newName
+        }
+      }, { multi: true })
+    } while (count &gt; 0)
+
+    Meteor.roles.remove({ _id: oldName })
+  },
+
+  /**
+   * Add role parent to roles.
+   *
+   * Previous parents are kept (role can have multiple parents). For users which have the
+   * parent role set, new subroles are added automatically.
+   *
+   * @method addRolesToParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
+   * @param {String} parentName Name of parent role.
+   * @static
+   */
+  addRolesToParent: function (rolesNames, parentName) {
+    // ensure arrays
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
+
+    for (const roleName of rolesNames) {
+      Roles._addRoleToParent(roleName, parentName)
+    }
+  },
+
+  /**
+   * @method _addRoleToParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @private
+   * @static
+   */
+  _addRoleToParent: function (roleName, parentName) {
+    Roles._checkRoleName(roleName)
+    Roles._checkRoleName(parentName)
+
+    // query to get role&#x27;s children
+    const role = Meteor.roles.findOne({ _id: roleName })
+
+    if (!role) {
+      throw new Error(&#x27;Role \&#x27;&#x27; + roleName + &#x27;\&#x27; does not exist.&#x27;)
+    }
+
+    // detect cycles
+    if (Roles._getInheritedRoleNames(role).includes(parentName)) {
+      throw new Error(&#x27;Roles \&#x27;&#x27; + roleName + &#x27;\&#x27; and \&#x27;&#x27; + parentName + &#x27;\&#x27; would form a cycle.&#x27;)
+    }
+
+    const count = Meteor.roles.update({
+      _id: parentName,
+      &#x27;children._id&#x27;: {
+        $ne: role._id
+      }
+    }, {
+      $push: {
+        children: {
+          _id: role._id
+        }
+      }
+    })
+
+    // if there was no change, parent role might not exist, or role is
+    // already a subrole; in any case we do not have anything more to do
+    if (!count) return
+
+    Meteor.roleAssignment.update({
+      &#x27;inheritedRoles._id&#x27;: parentName
+    }, {
+      $push: {
+        inheritedRoles: { $each: [role._id, ...Roles._getInheritedRoleNames(role)].map(r =&gt; ({ _id: r })) }
+      }
+    }, { multi: true })
+  },
+
+  /**
+   * Remove role parent from roles.
+   *
+   * Other parents are kept (role can have multiple parents). For users which have the
+   * parent role set, removed subrole is removed automatically.
+   *
+   * @method removeRolesFromParent
+   * @param {Array|String} rolesNames Name(s) of role(s).
+   * @param {String} parentName Name of parent role.
+   * @static
+   */
+  removeRolesFromParent: function (rolesNames, parentName) {
+    // ensure arrays
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
+
+    for (const roleName of rolesNames) {
+      Roles._removeRoleFromParent(roleName, parentName)
+    }
+  },
+
+  /**
+   * @method _removeRoleFromParent
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @private
+   * @static
+   */
+  _removeRoleFromParent: function (roleName, parentName) {
+    Roles._checkRoleName(roleName)
+    Roles._checkRoleName(parentName)
+
+    // check for role existence
+    // this would not really be needed, but we are trying to match addRolesToParent
+    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
+
+    if (!role) {
+      throw new Error(&#x27;Role \&#x27;&#x27; + roleName + &#x27;\&#x27; does not exist.&#x27;)
+    }
+
+    const count = Meteor.roles.update({
+      _id: parentName
+    }, {
+      $pull: {
+        children: {
+          _id: role._id
+        }
+      }
+    })
+
+    // if there was no change, parent role might not exist, or role was
+    // already not a subrole; in any case we do not have anything more to do
+    if (!count) return
+
+    // For all roles who have had it as a dependency ...
+    const roles = [...Roles._getParentRoleNames(Meteor.roles.findOne({ _id: parentName })), parentName]
+
+    for (const r of Meteor.roles.find({ _id: { $in: roles } }).fetch()) {
+      const inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
+      Meteor.roleAssignment.update({
+        &#x27;role._id&#x27;: r._id,
+        &#x27;inheritedRoles._id&#x27;: role._id
+      }, {
+        $set: {
+          inheritedRoles: [r._id, ...inheritedRoles].map(r2 =&gt; ({ _id: r2 }))
+        }
+      }, { multi: true })
+    }
+  },
+
+  /**
+   * Add users to roles.
+   *
+   * Adds roles to existing roles for each user.
+   *
+   * @example
+   *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;)
+   *     Roles.addUsersToRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
+   *     Roles.addUsersToRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
+   *     Roles.addUsersToRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
+   *
+   * @method addUsersToRoles
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  addUsersToRoles: function (users, roles, options) {
+    let id
+
+    if (!users) throw new Error(&#x27;Missing \&#x27;users\&#x27; param.&#x27;)
+    if (!roles) throw new Error(&#x27;Missing \&#x27;roles\&#x27; param.&#x27;)
+
+    options = Roles._normalizeOptions(options)
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
+
+    Roles._checkScopeName(options.scope)
+
+    options = Object.assign({
+      ifExists: false
+    }, options)
+
+    for (const user of users) {
+      if (typeof user === &#x27;object&#x27;) {
+        id = user._id
+      } else {
+        id = user
+      }
+
+      for (const role of roles) {
+        Roles._addUserToRole(id, role, options)
+      }
+    }
+  },
+
+  /**
+   * Set users&#x27; roles.
+   *
+   * Replaces all existing roles with a new set of roles.
+   *
+   * @example
+   *     Roles.setUserRoles(userId, &#x27;admin&#x27;)
+   *     Roles.setUserRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
+   *     Roles.setUserRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
+   *     Roles.setUserRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
+   *
+   * @method setUserRoles
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;anyScope&#x60;: if &#x60;true&#x60;, remove all roles the user has, of any scope, if &#x60;false&#x60;, only the one in the same scope
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  setUserRoles: function (users, roles, options) {
+    let id
+
+    if (!users) throw new Error(&#x27;Missing \&#x27;users\&#x27; param.&#x27;)
+    if (!roles) throw new Error(&#x27;Missing \&#x27;roles\&#x27; param.&#x27;)
+
+    options = Roles._normalizeOptions(options)
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
+
+    Roles._checkScopeName(options.scope)
+
+    options = Object.assign({
+      ifExists: false,
+      anyScope: false
+    }, options)
+
+    for (const user of users) {
+      if (typeof user === &#x27;object&#x27;) {
+        id = user._id
+      } else {
+        id = user
+      }
+      // we first clear all roles for the user
+      const selector = { &#x27;user._id&#x27;: id }
+      if (!options.anyScope) {
+        selector.scope = options.scope
+      }
+
+      Meteor.roleAssignment.remove(selector)
+
+      // and then add all
+      for (const role of roles) {
+        Roles._addUserToRole(id, role, options)
+      }
+    }
+  },
+
+  /**
+   * Add one user to one role.
+   *
+   * @method _addUserToRole
+   * @param {String} userId The user ID.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
+   * @private
+   * @static
+   */
+  _addUserToRole: function (userId, roleName, options) {
+    Roles._checkRoleName(roleName)
+    Roles._checkScopeName(options.scope)
+
+    if (!userId) {
+      return
+    }
+
+    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
+
+    if (!role) {
+      if (options.ifExists) {
+        return []
+      } else {
+        throw new Error(&#x27;Role \&#x27;&#x27; + roleName + &#x27;\&#x27; does not exist.&#x27;)
+      }
+    }
+
+    // This might create duplicates, because we don&#x27;t have a unique index, but that&#x27;s all right. In case there are two, withdrawing the role will effectively kill them both.
+    const res = Meteor.roleAssignment.upsert({
+      &#x27;user._id&#x27;: userId,
+      &#x27;role._id&#x27;: roleName,
+      scope: options.scope
+    }, {
+      $setOnInsert: {
+        user: { _id: userId },
+        role: { _id: roleName },
+        scope: options.scope
+      }
+    })
+
+    if (res.insertedId) {
+      Meteor.roleAssignment.update({ _id: res.insertedId }, {
+        $set: {
+          inheritedRoles: [roleName, ...Roles._getInheritedRoleNames(role)].map(r =&gt; ({ _id: r }))
+        }
+      })
+    }
+
+    return res
+  },
+
+  /**
+   * Returns an array of role names the given role name is a child of.
+   *
+   * @example
+   *     Roles._getParentRoleNames({ _id: &#x27;admin&#x27;, children; [] })
+   *
+   * @method _getParentRoleNames
+   * @param {object} role The role object
+   * @private
+   * @static
+   */
+  _getParentRoleNames: function (role) {
+    if (!role) {
+      return []
+    }
+
+    const parentRoles = new Set([role._id])
+
+    for (const roleName of parentRoles) {
+      Meteor.roles.find({ &#x27;children._id&#x27;: roleName }).fetch().forEach(parentRole =&gt; {
+        parentRoles.add(parentRole._id)
+      })
+    }
+
+    parentRoles.delete(role._id)
+
+    return [...parentRoles]
+  },
+
+  /**
+   * Returns an array of role names the given role name is a parent of.
+   *
+   * @example
+   *     Roles._getInheritedRoleNames({ _id: &#x27;admin&#x27;, children; [] })
+   *
+   * @method _getInheritedRoleNames
+   * @param {object} role The role object
+   * @private
+   * @static
+   */
+  _getInheritedRoleNames: function (role) {
+    const inheritedRoles = new Set()
+    const nestedRoles = new Set([role])
+
+    for (const r of nestedRoles) {
+      const roles = Meteor.roles.find({ _id: { $in: r.children.map(r =&gt; r._id) } }, { fields: { children: 1 } }).fetch()
+
+      for (const r2 of roles) {
+        inheritedRoles.add(r2._id)
+        nestedRoles.add(r2)
+      }
+    }
+
+    return [...inheritedRoles]
+  },
+
+  /**
+   * Remove users from assigned roles.
+   *
+   * @example
+   *     Roles.removeUsersFromRoles(userId, &#x27;admin&#x27;)
+   *     Roles.removeUsersFromRoles([userId, user2], [&#x27;editor&#x27;])
+   *     Roles.removeUsersFromRoles(userId, [&#x27;user&#x27;], &#x27;group1&#x27;)
+   *
+   * @method removeUsersFromRoles
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  removeUsersFromRoles: function (users, roles, options) {
+    if (!users) throw new Error(&#x27;Missing \&#x27;users\&#x27; param.&#x27;)
+    if (!roles) throw new Error(&#x27;Missing \&#x27;roles\&#x27; param.&#x27;)
+
+    options = Roles._normalizeOptions(options)
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
+
+    Roles._checkScopeName(options.scope)
+
+    for (const user of users) {
+      if (!user) continue
+
+      for (const role of roles) {
+        let id
+        if (typeof user === &#x27;object&#x27;) {
+          id = user._id
+        } else {
+          id = user
+        }
+
+        Roles._removeUserFromRole(id, role, options)
+      }
+    }
+  },
+
+  /**
+   * Remove one user from one role.
+   *
+   * @method _removeUserFromRole
+   * @param {String} userId The user ID.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   * @private
+   * @static
+   */
+  _removeUserFromRole: function (userId, roleName, options) {
+    Roles._checkRoleName(roleName)
+    Roles._checkScopeName(options.scope)
+
+    if (!userId) return
+
+    const selector = {
+      &#x27;user._id&#x27;: userId,
+      &#x27;role._id&#x27;: roleName
+    }
+
+    if (!options.anyScope) {
+      selector.scope = options.scope
+    }
+
+    Meteor.roleAssignment.remove(selector)
+  },
+
+  /**
+   * Check if user has specified roles.
+   *
+   * @example
+   *     // global roles
+   *     Roles.userIsInRole(user, &#x27;admin&#x27;)
+   *     Roles.userIsInRole(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
+   *     Roles.userIsInRole(userId, &#x27;admin&#x27;)
+   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
+   *
+   *     // scope roles (global roles are still checked)
+   *     Roles.userIsInRole(user, &#x27;admin&#x27;, &#x27;group1&#x27;)
+   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
+   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], {scope: &#x27;group1&#x27;})
+   *
+   * @method userIsInRole
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
+   *                             will return &#x60;true&#x60; if user is in _any_ role.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope; if supplied, limits check to just that scope
+   *     the user&#x27;s global roles will always be checked whether scope is specified or not
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Boolean} &#x60;true&#x60; if user is in _any_ of the target roles
+   * @static
+   */
+  userIsInRole: function (user, roles, options) {
+    let id
+    options = Roles._normalizeOptions(options)
+
+    // ensure array to simplify code
+    if (!Array.isArray(roles)) roles = [roles]
+
+    roles = roles.filter(r =&gt; r != null)
+
+    if (!roles.length) return false
+
+    Roles._checkScopeName(options.scope)
+
+    options = Object.assign({
+      anyScope: false
+    }, options)
+
+    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
+      id = user._id
+    } else {
+      id = user
+    }
+
+    if (!id) return false
+    if (typeof id !== &#x27;string&#x27;) return false
+
+    const selector = { &#x27;user._id&#x27;: id }
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope, null] }
+    }
+
+    return roles.some((roleName) =&gt; {
+      selector[&#x27;inheritedRoles._id&#x27;] = roleName
+
+      return Meteor.roleAssignment.find(selector, { limit: 1 }).count() &gt; 0
+    })
+  },
+
+  /**
+   * Retrieve user&#x27;s roles.
+   *
+   * @method getRolesForUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of scope to provide roles for; if not specified, global roles are returned
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; and &#x60;onlyAssigned&#x60; options are ignored)
+   *   - &#x60;onlyScoped&#x60;: if set, only roles in the specified scope are returned
+   *   - &#x60;onlyAssigned&#x60;: return only assigned roles and not automatically inferred (like subroles)
+   *   - &#x60;fullObjects&#x60;: return full roles objects (&#x60;true&#x60;) or just names (&#x60;false&#x60;) (&#x60;onlyAssigned&#x60; option is ignored) (default &#x60;false&#x60;)
+   *     If you have a use-case for this option, please file a feature-request. You shouldn&#x27;t need to use it as it&#x27;s
+   *     result strongly dependent on the internal data structure of this plugin.
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Array} Array of user&#x27;s roles, unsorted.
+   * @static
+   */
+  getRolesForUser: function (user, options) {
+    let id
+
+    options = Roles._normalizeOptions(options)
+
+    Roles._checkScopeName(options.scope)
+
+    options = Object.assign({
+      fullObjects: false,
+      onlyAssigned: false,
+      anyScope: false,
+      onlyScoped: false
+    }, options)
+
+    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
+      id = user._id
+    } else {
+      id = user
+    }
+
+    if (!id) return []
+
+    const selector = { &#x27;user._id&#x27;: id }
+    const filter = { fields: { &#x27;inheritedRoles._id&#x27;: 1 } }
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope] }
+
+      if (!options.onlyScoped) {
+        selector.scope.$in.push(null)
+      }
+    }
+
+    if (options.onlyAssigned) {
+      delete filter.fields[&#x27;inheritedRoles._id&#x27;]
+      filter.fields[&#x27;role._id&#x27;] = 1
+    }
+
+    if (options.fullObjects) {
+      delete filter.fields
+    }
+
+    const roles = Meteor.roleAssignment.find(selector, filter).fetch()
+
+    if (options.fullObjects) {
+      return roles
+    }
+
+    return [...new Set(roles.reduce((rev, current) =&gt; {
+      if (current.inheritedRoles) {
+        return rev.concat(current.inheritedRoles.map(r =&gt; r._id))
+      } else if (current.role) {
+        rev.push(current.role._id)
+      }
+      return rev
+    }, []))]
+  },
+
+  /**
+   * Retrieve cursor of all existing roles.
+   *
+   * @method getAllRoles
+   * @param {Object} queryOptions Options which are passed directly
+   *                                through to &#x60;RolesCollection.find(query, options)&#x60;.
+   * @return {Cursor} Cursor of existing roles.
+   * @static
+   */
+  getAllRoles: function (queryOptions) {
+    queryOptions = queryOptions || { sort: { _id: 1 } }
+
+    return Meteor.roles.find({}, queryOptions)
+  },
+
+  /**
+   * Retrieve all users who are in target role.
+   *
+   * Options:
+   *
+   * @method getUsersInRole
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
+   *     roles will also be checked
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *   - &#x60;onlyScoped&#x60;: if set, only roles in the specified scope are returned
+   *   - &#x60;queryOptions&#x60;: options which are passed directly
+   *     through to &#x60;Meteor.users.find(query, options)&#x60;
+   *
+   * Alternatively, it can be a scope name string.
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to &#x60;Meteor.users.find(query, options)&#x60;
+   * @return {Cursor} Cursor of users in roles.
+   * @static
+   */
+  getUsersInRole: function (roles, options, queryOptions) {
+    const ids = Roles.getUserAssignmentsForRole(roles, options).fetch().map(a =&gt; a.user._id)
+
+    return Meteor.users.find({ _id: { $in: ids } }, ((options &amp;&amp; options.queryOptions) || queryOptions) || {})
+  },
+
+  /**
+   * Retrieve all assignments of a user which are for the target role.
+   *
+   * Options:
+   *
+   * @method getUserAssignmentsForRole
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
+   *     roles will also be checked
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *   - &#x60;queryOptions&#x60;: options which are passed directly
+   *     through to &#x60;RoleAssignmentCollection.find(query, options)&#x60;
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Cursor} Cursor of user assignments for roles.
+   * @static
+   */
+  getUserAssignmentsForRole: function (roles, options) {
+    options = Roles._normalizeOptions(options)
+
+    options = Object.assign({
+      anyScope: false,
+      queryOptions: {}
+    }, options)
+
+    return Roles._getUsersInRoleCursor(roles, options, options.queryOptions)
+  },
+
+  /**
+   * @method _getUsersInRoleCursor
+   * @param {Array|String} roles Name of role or an array of roles. If array, ids of users are
+   *                             returned which have at least one of the roles
+   *                             assigned but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
+   *     roles will also be checked
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @param {Object} [filter] Options which are passed directly
+   *                                through to &#x60;RoleAssignmentCollection.find(query, options)&#x60;
+   * @return {Object} Cursor to the assignment documents
+   * @private
+   * @static
+   */
+  _getUsersInRoleCursor: function (roles, options, filter) {
+    options = Roles._normalizeOptions(options)
+
+    options = Object.assign({
+      anyScope: false,
+      onlyScoped: false
+    }, options)
+
+    // ensure array to simplify code
+    if (!Array.isArray(roles)) roles = [roles]
+
+    Roles._checkScopeName(options.scope)
+
+    filter = Object.assign({
+      fields: { &#x27;user._id&#x27;: 1 }
+    }, filter)
+
+    const selector = { &#x27;inheritedRoles._id&#x27;: { $in: roles } }
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope] }
+
+      if (!options.onlyScoped) {
+        selector.scope.$in.push(null)
+      }
+    }
+
+    return Meteor.roleAssignment.find(selector, filter)
+  },
+
+  /**
+   * Deprecated. Use &#x60;getScopesForUser&#x60; instead.
+   *
+   * @method getGroupsForUser
+   * @static
+   * @deprecated
+   */
+  getGroupsForUser: function (...args) {
+    if (!getGroupsForUserDeprecationWarning) {
+      getGroupsForUserDeprecationWarning = true
+      console &amp;&amp; console.warn(&#x27;getGroupsForUser has been deprecated. Use getScopesForUser instead.&#x27;)
+    }
+
+    return Roles.getScopesForUser(...args)
+  },
+
+  /**
+   * Retrieve users scopes, if any.
+   *
+   * @method getScopesForUser
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} [roles] Name of roles to restrict scopes to.
+   *
+   * @return {Array} Array of user&#x27;s scopes, unsorted.
+   * @static
+   */
+  getScopesForUser: function (user, roles) {
+    let id
+
+    if (roles &amp;&amp; !Array.isArray(roles)) roles = [roles]
+
+    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
+      id = user._id
+    } else {
+      id = user
+    }
+
+    if (!id) return []
+
+    const selector = {
+      &#x27;user._id&#x27;: id,
+      scope: { $ne: null }
+    }
+
+    if (roles) {
+      selector[&#x27;inheritedRoles._id&#x27;] = { $in: roles }
+    }
+
+    const scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi =&gt; obi.scope)
+
+    return [...new Set(scopes)]
+  },
+
+  /**
+   * Rename a scope.
+   *
+   * Roles assigned with a given scope are changed to be under the new scope.
+   *
+   * @method renameScope
+   * @param {String} oldName Old name of a scope.
+   * @param {String} newName New name of a scope.
+   * @static
+   */
+  renameScope: function (oldName, newName) {
+    let count
+
+    Roles._checkScopeName(oldName)
+    Roles._checkScopeName(newName)
+
+    if (oldName === newName) return
+
+    do {
+      count = Meteor.roleAssignment.update({
+        scope: oldName
+      }, {
+        $set: {
+          scope: newName
+        }
+      }, { multi: true })
+    } while (count &gt; 0)
+  },
+
+  /**
+   * Remove a scope.
+   *
+   * Roles assigned with a given scope are removed.
+   *
+   * @method removeScope
+   * @param {String} name The name of a scope.
+   * @static
+   */
+  removeScope: function (name) {
+    Roles._checkScopeName(name)
+
+    Meteor.roleAssignment.remove({ scope: name })
+  },
+
+  /**
+   * Throw an exception if &#x60;roleName&#x60; is an invalid role name.
+   *
+   * @method _checkRoleName
+   * @param {String} roleName A role name to match against.
+   * @private
+   * @static
+   */
+  _checkRoleName: function (roleName) {
+    if (!roleName || typeof roleName !== &#x27;string&#x27; || roleName.trim() !== roleName) {
+      throw new Error(&#x27;Invalid role name \&#x27;&#x27; + roleName + &#x27;\&#x27;.&#x27;)
+    }
+  },
+
+  /**
+   * Find out if a role is an ancestor of another role.
+   *
+   * WARNING: If you check this on the client, please make sure all roles are published.
+   *
+   * @method isParentOf
+   * @param {String} parentRoleName The role you want to research.
+   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
+   * @static
+   */
+  isParentOf: function (parentRoleName, childRoleName) {
+    if (parentRoleName === childRoleName) {
+      return true
+    }
+
+    if (parentRoleName == null || childRoleName == null) {
+      return false
+    }
+
+    Roles._checkRoleName(parentRoleName)
+    Roles._checkRoleName(childRoleName)
+
+    let rolesToCheck = [parentRoleName]
+    while (rolesToCheck.length !== 0) {
+      const roleName = rolesToCheck.pop()
+
+      if (roleName === childRoleName) {
+        return true
+      }
+
+      const role = Meteor.roles.findOne({ _id: roleName })
+
+      // This should not happen, but this is a problem to address at some other time.
+      if (!role) continue
+
+      rolesToCheck = rolesToCheck.concat(role.children.map(r =&gt; r._id))
+    }
+
+    return false
+  },
+
+  /**
+   * Normalize options.
+   *
+   * @method _normalizeOptions
+   * @param {Object} options Options to normalize.
+   * @return {Object} Normalized options.
+   * @private
+   * @static
+   */
+  _normalizeOptions: function (options) {
+    options = options === undefined ? {} : options
+
+    if (options === null || typeof options === &#x27;string&#x27;) {
+      options = { scope: options }
+    }
+
+    options.scope = Roles._normalizeScopeName(options.scope)
+
+    return options
+  },
+
+  /**
+   * Normalize scope name.
+   *
+   * @method _normalizeScopeName
+   * @param {String} scopeName A scope name to normalize.
+   * @return {String} Normalized scope name.
+   * @private
+   * @static
+   */
+  _normalizeScopeName: function (scopeName) {
+    // map undefined and null to null
+    if (scopeName == null) {
+      return null
+    } else {
+      return scopeName
+    }
+  },
+
+  /**
+   * Throw an exception if &#x60;scopeName&#x60; is an invalid scope name.
+   *
+   * @method _checkRoleName
+   * @param {String} scopeName A scope name to match against.
+   * @private
+   * @static
+   */
+  _checkScopeName: function (scopeName) {
+    if (scopeName === null) return
+
+    if (
+      !scopeName ||
+      typeof scopeName !== &#x27;string&#x27; ||
+      scopeName.trim() !== scopeName
+    ) {
+      throw new Error(&#x60;Invalid scope name &#x27;${scopeName}&#x27;.&#x60;)
+    }
+  }
+})
+
+    </pre>
+</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/files/roles_roles_common_async.js.html b/docs/files/roles_roles_common_async.js.html
new file mode 100644
index 0000000000..9d6b35f865
--- /dev/null
+++ b/docs/files/roles_roles_common_async.js.html
@@ -0,0 +1,1432 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>roles/roles_common_async.js - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="icon" href="../assets/favicon.ico">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v4.0.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+<h1 class="file-heading">File: roles/roles_common_async.js</h1>
+
+<div class="file">
+    <pre class="code prettyprint linenums">
+/* global Roles */
+import { Meteor } from &#x27;meteor/meteor&#x27;
+import { Mongo } from &#x27;meteor/mongo&#x27;
+
+/**
+ * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
+ *
+ * Roles are accessible throgh &#x60;Meteor.roles&#x60; collection and documents consist of:
+ *  - &#x60;_id&#x60;: role name
+ *  - &#x60;children&#x60;: list of subdocuments:
+ *    - &#x60;_id&#x60;
+ *
+ * Children list elements are subdocuments so that they can be easier extended in the future or by plugins.
+ *
+ * Roles can have multiple parents and can be children (subroles) of multiple roles.
+ *
+ * Example: &#x60;{_id: &#x27;admin&#x27;, children: [{_id: &#x27;editor&#x27;}]}&#x60;
+ *
+ * The assignment of a role to a user is stored in a collection, accessible through &#x60;Meteor.roleAssignment&#x60;.
+ * It&#x27;s documents consist of
+ *  - &#x60;_id&#x60;: Internal MongoDB id
+ *  - &#x60;role&#x60;: A role object which got assigned. Usually only contains the &#x60;_id&#x60; property
+ *  - &#x60;user&#x60;: A user object, usually only contains the &#x60;_id&#x60; property
+ *  - &#x60;scope&#x60;: scope name
+ *  - &#x60;inheritedRoles&#x60;: A list of all the roles objects inherited by the assigned role.
+ *
+ * @module Roles
+ */
+export const RolesCollection = new Mongo.Collection(&#x27;roles&#x27;)
+
+if (!Meteor.roles) {
+  Meteor.roles = RolesCollection
+}
+
+export const RoleAssignmentCollection = new Mongo.Collection(&#x27;role-assignment&#x27;)
+
+if (!Meteor.roleAssignment) {
+  Meteor.roleAssignment = RoleAssignmentCollection
+}
+
+/**
+ * @class Roles
+ */
+if (typeof Roles === &#x27;undefined&#x27;) {
+  Roles = {} // eslint-disable-line no-global-assign
+}
+
+let getGroupsForUserDeprecationWarning = false
+
+/**
+ * Helper, resolves async some
+ * @param {*} arr
+ * @param {*} predicate
+ * @returns {Promise&lt;Boolean&gt;}
+ */
+const asyncSome = async (arr, predicate) =&gt; {
+  for (const e of arr) {
+    if (await predicate(e)) return true
+  }
+  return false
+}
+
+Object.assign(Roles, {
+  /**
+   * Used as a global group (now scope) name. Not used anymore.
+   *
+   * @property GLOBAL_GROUP
+   * @static
+   * @deprecated
+   */
+  GLOBAL_GROUP: null,
+
+  /**
+   * Create a new role.
+   *
+   * @method createRoleAsync
+   * @param {String} roleName Name of role.
+   * @param {Object} [options] Options:
+   *   - &#x60;unlessExists&#x60;: if &#x60;true&#x60;, exception will not be thrown in the role already exists
+   * @return {Promise&lt;String&gt;} ID of the new role or null.
+   * @static
+   */
+  createRoleAsync: async function (roleName, options) {
+    Roles._checkRoleName(roleName)
+
+    options = Object.assign(
+      {
+        unlessExists: false
+      },
+      options
+    )
+
+    let insertedId = null
+
+    const existingRole = await Meteor.roles.findOneAsync({ _id: roleName })
+
+    if (existingRole) {
+      await Meteor.roles.updateAsync(
+        { _id: roleName },
+        { $setOnInsert: { children: [] } }
+      )
+      return null
+    } else {
+      insertedId = await Meteor.roles.insertAsync({
+        _id: roleName,
+        children: []
+      })
+    }
+
+    if (!insertedId) {
+      if (options.unlessExists) return null
+      throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; already exists.&quot;)
+    }
+
+    return insertedId
+  },
+
+  /**
+   * Delete an existing role.
+   *
+   * If the role is set for any user, it is automatically unset.
+   *
+   * @method deleteRoleAsync
+   * @param {String} roleName Name of role.
+   * @returns {Promise}
+   * @static
+   */
+  deleteRoleAsync: async function (roleName) {
+    let roles
+    let inheritedRoles
+
+    Roles._checkRoleName(roleName)
+
+    // Remove all assignments
+    await Meteor.roleAssignment.removeAsync({
+      &#x27;role._id&#x27;: roleName
+    })
+
+    do {
+      // For all roles who have it as a dependency ...
+      roles = await Roles._getParentRoleNamesAsync(
+        await Meteor.roles.findOneAsync({ _id: roleName })
+      )
+
+      for (const r of await Meteor.roles
+        .find({ _id: { $in: roles } })
+        .fetchAsync()) {
+        await Meteor.roles.updateAsync(
+          {
+            _id: r._id
+          },
+          {
+            $pull: {
+              children: {
+                _id: roleName
+              }
+            }
+          }
+        )
+
+        inheritedRoles = await Roles._getInheritedRoleNamesAsync(
+          await Meteor.roles.findOneAsync({ _id: r._id })
+        )
+        await Meteor.roleAssignment.updateAsync(
+          {
+            &#x27;role._id&#x27;: r._id
+          },
+          {
+            $set: {
+              inheritedRoles: [r._id, ...inheritedRoles].map((r2) =&gt; ({
+                _id: r2
+              }))
+            }
+          },
+          { multi: true }
+        )
+      }
+    } while (roles.length &gt; 0)
+
+    // And finally remove the role itself
+    await Meteor.roles.removeAsync({ _id: roleName })
+  },
+
+  /**
+   * Rename an existing role.
+   *
+   * @method renameRoleAsync
+   * @param {String} oldName Old name of a role.
+   * @param {String} newName New name of a role.
+   * @returns {Promise}
+   * @static
+   */
+  renameRoleAsync: async function (oldName, newName) {
+    let count
+
+    Roles._checkRoleName(oldName)
+    Roles._checkRoleName(newName)
+
+    if (oldName === newName) return
+
+    const role = await Meteor.roles.findOneAsync({ _id: oldName })
+
+    if (!role) {
+      throw new Error(&quot;Role &#x27;&quot; + oldName + &quot;&#x27; does not exist.&quot;)
+    }
+
+    role._id = newName
+
+    await Meteor.roles.insertAsync(role)
+
+    do {
+      count = await Meteor.roleAssignment.updateAsync(
+        {
+          &#x27;role._id&#x27;: oldName
+        },
+        {
+          $set: {
+            &#x27;role._id&#x27;: newName
+          }
+        },
+        { multi: true }
+      )
+    } while (count &gt; 0)
+
+    do {
+      count = await Meteor.roleAssignment.updateAsync(
+        {
+          &#x27;inheritedRoles._id&#x27;: oldName
+        },
+        {
+          $set: {
+            &#x27;inheritedRoles.$._id&#x27;: newName
+          }
+        },
+        { multi: true }
+      )
+    } while (count &gt; 0)
+
+    do {
+      count = await Meteor.roles.updateAsync(
+        {
+          &#x27;children._id&#x27;: oldName
+        },
+        {
+          $set: {
+            &#x27;children.$._id&#x27;: newName
+          }
+        },
+        { multi: true }
+      )
+    } while (count &gt; 0)
+
+    await Meteor.roles.removeAsync({ _id: oldName })
+  },
+
+  /**
+   * Add role parent to roles.
+   *
+   * Previous parents are kept (role can have multiple parents). For users which have the
+   * parent role set, new subroles are added automatically.
+   *
+   * @method addRolesToParentAsync
+   * @param {Array|String} rolesNames Name(s) of role(s).
+   * @param {String} parentName Name of parent role.
+   * @returns {Promise}
+   * @static
+   */
+  addRolesToParentAsync: async function (rolesNames, parentName) {
+    // ensure arrays
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
+
+    for (const roleName of rolesNames) {
+      await Roles._addRoleToParentAsync(roleName, parentName)
+    }
+  },
+
+  /**
+   * @method _addRoleToParentAsync
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @returns {Promise}
+   * @private
+   * @static
+   */
+  _addRoleToParentAsync: async function (roleName, parentName) {
+    Roles._checkRoleName(roleName)
+    Roles._checkRoleName(parentName)
+
+    // query to get role&#x27;s children
+    const role = await Meteor.roles.findOneAsync({ _id: roleName })
+
+    if (!role) {
+      throw new Error(&#x60;Role &#x27;${roleName}&#x27; does not exist.&#x60;)
+    }
+
+    // detect cycles
+    if ((await Roles._getInheritedRoleNamesAsync(role)).includes(parentName)) {
+      throw new Error(
+        &#x60;Roles &#x27;${roleName}&#x27; and &#x27;${parentName}&#x27; would form a cycle.&#x60;
+      )
+    }
+
+    const count = await Meteor.roles.updateAsync(
+      {
+        _id: parentName,
+        &#x27;children._id&#x27;: {
+          $ne: role._id
+        }
+      },
+      {
+        $push: {
+          children: {
+            _id: role._id
+          }
+        }
+      }
+    )
+
+    // if there was no change, parent role might not exist, or role is
+    // already a sub-role; in any case we do not have anything more to do
+    if (!count) return
+
+    await Meteor.roleAssignment.updateAsync(
+      {
+        &#x27;inheritedRoles._id&#x27;: parentName
+      },
+      {
+        $push: {
+          inheritedRoles: {
+            $each: [
+              role._id,
+              ...(await Roles._getInheritedRoleNamesAsync(role))
+            ].map((r) =&gt; ({ _id: r }))
+          }
+        }
+      },
+      { multi: true }
+    )
+  },
+
+  /**
+   * Remove role parent from roles.
+   *
+   * Other parents are kept (role can have multiple parents). For users which have the
+   * parent role set, removed subrole is removed automatically.
+   *
+   * @method removeRolesFromParentAsync
+   * @param {Array|String} rolesNames Name(s) of role(s).
+   * @param {String} parentName Name of parent role.
+   * @returns {Promise}
+   * @static
+   */
+  removeRolesFromParentAsync: async function (rolesNames, parentName) {
+    // ensure arrays
+    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
+
+    for (const roleName of rolesNames) {
+      await Roles._removeRoleFromParentAsync(roleName, parentName)
+    }
+  },
+
+  /**
+   * @method _removeRoleFromParentAsync
+   * @param {String} roleName Name of role.
+   * @param {String} parentName Name of parent role.
+   * @returns {Promise}
+   * @private
+   * @static
+   */
+  _removeRoleFromParentAsync: async function (roleName, parentName) {
+    Roles._checkRoleName(roleName)
+    Roles._checkRoleName(parentName)
+
+    // check for role existence
+    // this would not really be needed, but we are trying to match addRolesToParent
+    const role = await Meteor.roles.findOneAsync(
+      { _id: roleName },
+      { fields: { _id: 1 } }
+    )
+
+    if (!role) {
+      throw new Error(&#x60;Role &#x27;${roleName}&#x27; does not exist.&#x60;)
+    }
+
+    const count = await Meteor.roles.updateAsync(
+      {
+        _id: parentName
+      },
+      {
+        $pull: {
+          children: {
+            _id: role._id
+          }
+        }
+      }
+    )
+
+    // if there was no change, parent role might not exist, or role was
+    // already not a subrole; in any case we do not have anything more to do
+    if (!count) return
+
+    // For all roles who have had it as a dependency ...
+    const roles = [
+      ...(await Roles._getParentRoleNamesAsync(
+        await Meteor.roles.findOneAsync({ _id: parentName })
+      )),
+      parentName
+    ]
+
+    for (const r of await Meteor.roles
+      .find({ _id: { $in: roles } })
+      .fetchAsync()) {
+      const inheritedRoles = await Roles._getInheritedRoleNamesAsync(
+        await Meteor.roles.findOneAsync({ _id: r._id })
+      )
+      await Meteor.roleAssignment.updateAsync(
+        {
+          &#x27;role._id&#x27;: r._id,
+          &#x27;inheritedRoles._id&#x27;: role._id
+        },
+        {
+          $set: {
+            inheritedRoles: [r._id, ...inheritedRoles].map((r2) =&gt; ({
+              _id: r2
+            }))
+          }
+        },
+        { multi: true }
+      )
+    }
+  },
+
+  /**
+   * Add users to roles.
+   *
+   * Adds roles to existing roles for each user.
+   *
+   * @example
+   *     Roles.addUsersToRolesAsync(userId, &#x27;admin&#x27;)
+   *     Roles.addUsersToRolesAsync(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
+   *     Roles.addUsersToRolesAsync([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
+   *     Roles.addUsersToRolesAsync([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
+   *
+   * @method addUsersToRolesAsync
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
+   * @returns {Promise}
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  addUsersToRolesAsync: async function (users, roles, options) {
+    let id
+
+    if (!users) throw new Error(&quot;Missing &#x27;users&#x27; param.&quot;)
+    if (!roles) throw new Error(&quot;Missing &#x27;roles&#x27; param.&quot;)
+
+    options = Roles._normalizeOptions(options)
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
+
+    Roles._checkScopeName(options.scope)
+
+    options = Object.assign(
+      {
+        ifExists: false
+      },
+      options
+    )
+
+    for (const user of users) {
+      if (typeof user === &#x27;object&#x27;) {
+        id = user._id
+      } else {
+        id = user
+      }
+
+      for (const role of roles) {
+        await Roles._addUserToRoleAsync(id, role, options)
+      }
+    }
+  },
+
+  /**
+   * Set users&#x27; roles.
+   *
+   * Replaces all existing roles with a new set of roles.
+   *
+   * @example
+   *     await Roles.setUserRolesAsync(userId, &#x27;admin&#x27;)
+   *     await Roles.setUserRolesAsync(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
+   *     await Roles.setUserRolesAsync([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
+   *     await Roles.setUserRolesAsync([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
+   *
+   * @method setUserRolesAsync
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;anyScope&#x60;: if &#x60;true&#x60;, remove all roles the user has, of any scope, if &#x60;false&#x60;, only the one in the same scope
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
+   * @returns {Promise}
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  setUserRolesAsync: async function (users, roles, options) {
+    let id
+
+    if (!users) throw new Error(&quot;Missing &#x27;users&#x27; param.&quot;)
+    if (!roles) throw new Error(&quot;Missing &#x27;roles&#x27; param.&quot;)
+
+    options = Roles._normalizeOptions(options)
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
+
+    Roles._checkScopeName(options.scope)
+
+    options = Object.assign(
+      {
+        ifExists: false,
+        anyScope: false
+      },
+      options
+    )
+
+    for (const user of users) {
+      if (typeof user === &#x27;object&#x27;) {
+        id = user._id
+      } else {
+        id = user
+      }
+      // we first clear all roles for the user
+      const selector = { &#x27;user._id&#x27;: id }
+      if (!options.anyScope) {
+        selector.scope = options.scope
+      }
+
+      await Meteor.roleAssignment.removeAsync(selector)
+
+      // and then add all
+      for (const role of roles) {
+        await Roles._addUserToRoleAsync(id, role, options)
+      }
+    }
+  },
+
+  /**
+   * Add one user to one role.
+   *
+   * @method _addUserToRoleAsync
+   * @param {String} userId The user ID.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
+   * @returns {Promise}
+   * @private
+   * @static
+   */
+  _addUserToRoleAsync: async function (userId, roleName, options) {
+    Roles._checkRoleName(roleName)
+    Roles._checkScopeName(options.scope)
+
+    if (!userId) {
+      return
+    }
+
+    const role = await Meteor.roles.findOneAsync(
+      { _id: roleName },
+      { fields: { children: 1 } }
+    )
+
+    if (!role) {
+      if (options.ifExists) {
+        return []
+      } else {
+        throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;)
+      }
+    }
+
+    // This might create duplicates, because we don&#x27;t have a unique index, but that&#x27;s all right. In case there are two, withdrawing the role will effectively kill them both.
+    // TODO revisit this
+    /* const res = await RoleAssignmentCollection.upsertAsync(
+      {
+        &quot;user._id&quot;: userId,
+        &quot;role._id&quot;: roleName,
+        scope: options.scope,
+      },
+      {
+        $setOnInsert: {
+          user: { _id: userId },
+          role: { _id: roleName },
+          scope: options.scope,
+        },
+      }
+    ); */
+    const existingAssignment = await Meteor.roleAssignment.findOneAsync({
+      &#x27;user._id&#x27;: userId,
+      &#x27;role._id&#x27;: roleName,
+      scope: options.scope
+    })
+
+    let insertedId
+    let res
+    if (existingAssignment) {
+      await Meteor.roleAssignment.updateAsync(existingAssignment._id, {
+        $set: {
+          user: { _id: userId },
+          role: { _id: roleName },
+          scope: options.scope
+        }
+      })
+
+      res = await Meteor.roleAssignment.findOneAsync(existingAssignment._id)
+    } else {
+      insertedId = await Meteor.roleAssignment.insertAsync({
+        user: { _id: userId },
+        role: { _id: roleName },
+        scope: options.scope
+      })
+    }
+
+    if (insertedId) {
+      await Meteor.roleAssignment.updateAsync(
+        { _id: insertedId },
+        {
+          $set: {
+            inheritedRoles: [
+              roleName,
+              ...(await Roles._getInheritedRoleNamesAsync(role))
+            ].map((r) =&gt; ({ _id: r }))
+          }
+        }
+      )
+
+      res = await Meteor.roleAssignment.findOneAsync({ _id: insertedId })
+    }
+    res.insertedId = insertedId // For backward compatibility
+
+    return res
+  },
+
+  /**
+   * Returns an array of role names the given role name is a child of.
+   *
+   * @example
+   *     Roles._getParentRoleNamesAsync({ _id: &#x27;admin&#x27;, children; [] })
+   *
+   * @method _getParentRoleNamesAsync
+   * @param {object} role The role object
+   * @returns {Promise}
+   * @private
+   * @static
+   */
+  _getParentRoleNamesAsync: async function (role) {
+    if (!role) {
+      return []
+    }
+
+    const parentRoles = new Set([role._id])
+
+    for (const roleName of parentRoles) {
+      for (const parentRole of await Meteor.roles
+        .find({ &#x27;children._id&#x27;: roleName })
+        .fetchAsync()) {
+        parentRoles.add(parentRole._id)
+      }
+    }
+
+    parentRoles.delete(role._id)
+
+    return [...parentRoles]
+  },
+
+  /**
+   * Returns an array of role names the given role name is a parent of.
+   *
+   * @example
+   *     Roles._getInheritedRoleNames({ _id: &#x27;admin&#x27;, children; [] })
+   *
+   * @method _getInheritedRoleNames
+   * @param {object} role The role object
+   * @returns {Promise}
+   * @private
+   * @static
+   */
+  _getInheritedRoleNamesAsync: async function (role) {
+    const inheritedRoles = new Set()
+    const nestedRoles = new Set([role])
+
+    for (const r of nestedRoles) {
+      const roles = await Meteor.roles
+        .find(
+          { _id: { $in: r.children.map((r) =&gt; r._id) } },
+          { fields: { children: 1 } }
+        )
+        .fetchAsync()
+
+      for (const r2 of roles) {
+        inheritedRoles.add(r2._id)
+        nestedRoles.add(r2)
+      }
+    }
+
+    return [...inheritedRoles]
+  },
+
+  /**
+   * Remove users from assigned roles.
+   *
+   * @example
+   *     await Roles.removeUsersFromRolesAsync(userId, &#x27;admin&#x27;)
+   *     await Roles.removeUsersFromRolesAsync([userId, user2], [&#x27;editor&#x27;])
+   *     await Roles.removeUsersFromRolesAsync(userId, [&#x27;user&#x27;], &#x27;group1&#x27;)
+   *
+   * @method removeUsersFromRolesAsync
+   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
+   * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   * @returns {Promise}
+   *
+   * Alternatively, it can be a scope name string.
+   * @static
+   */
+  removeUsersFromRolesAsync: async function (users, roles, options) {
+    if (!users) throw new Error(&quot;Missing &#x27;users&#x27; param.&quot;)
+    if (!roles) throw new Error(&quot;Missing &#x27;roles&#x27; param.&quot;)
+
+    options = Roles._normalizeOptions(options)
+
+    // ensure arrays
+    if (!Array.isArray(users)) users = [users]
+    if (!Array.isArray(roles)) roles = [roles]
+
+    Roles._checkScopeName(options.scope)
+
+    for (const user of users) {
+      if (!user) return
+
+      for (const role of roles) {
+        let id
+        if (typeof user === &#x27;object&#x27;) {
+          id = user._id
+        } else {
+          id = user
+        }
+
+        await Roles._removeUserFromRoleAsync(id, role, options)
+      }
+    }
+  },
+
+  /**
+   * Remove one user from one role.
+   *
+   * @method _removeUserFromRoleAsync
+   * @param {String} userId The user ID.
+   * @param {String} roleName Name of the role to add the user to. The role have to exist.
+   * @param {Object} options Options:
+   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   * @returns {Promise}
+   * @private
+   * @static
+   */
+  _removeUserFromRoleAsync: async function (userId, roleName, options) {
+    Roles._checkRoleName(roleName)
+    Roles._checkScopeName(options.scope)
+
+    if (!userId) return
+
+    const selector = {
+      &#x27;user._id&#x27;: userId,
+      &#x27;role._id&#x27;: roleName
+    }
+
+    if (!options.anyScope) {
+      selector.scope = options.scope
+    }
+
+    await Meteor.roleAssignment.removeAsync(selector)
+  },
+
+  /**
+   * Check if user has specified roles.
+   *
+   * @example
+   *     // global roles
+   *     await Roles.userIsInRoleAsync(user, &#x27;admin&#x27;)
+   *     await Roles.userIsInRoleAsync(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
+   *     await Roles.userIsInRoleAsync(userId, &#x27;admin&#x27;)
+   *     await Roles.userIsInRoleAsync(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
+   *
+   *     // scope roles (global roles are still checked)
+   *     await Roles.userIsInRoleAsync(user, &#x27;admin&#x27;, &#x27;group1&#x27;)
+   *     await Roles.userIsInRoleAsync(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
+   *     await Roles.userIsInRoleAsync(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], {scope: &#x27;group1&#x27;})
+   *
+   * @method userIsInRoleAsync
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
+   *                             will return &#x60;true&#x60; if user is in _any_ role.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope; if supplied, limits check to just that scope
+   *     the user&#x27;s global roles will always be checked whether scope is specified or not
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Promise&lt;Boolean&gt;} &#x60;true&#x60; if user is in _any_ of the target roles
+   * @static
+   */
+  userIsInRoleAsync: async function (user, roles, options) {
+    let id
+
+    options = Roles._normalizeOptions(options)
+
+    // ensure array to simplify code
+    if (!Array.isArray(roles)) roles = [roles]
+
+    roles = roles.filter((r) =&gt; r != null)
+
+    if (!roles.length) return false
+
+    Roles._checkScopeName(options.scope)
+
+    options = Object.assign(
+      {
+        anyScope: false
+      },
+      options
+    )
+
+    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
+      id = user._id
+    } else {
+      id = user
+    }
+
+    if (!id) return false
+    if (typeof id !== &#x27;string&#x27;) return false
+
+    const selector = {
+      &#x27;user._id&#x27;: id
+    }
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope, null] }
+    }
+
+    const res = await asyncSome(roles, async (roleName) =&gt; {
+      selector[&#x27;inheritedRoles._id&#x27;] = roleName
+      const out =
+        (await Meteor.roleAssignment.countDocuments(selector, { limit: 1 })) &gt; 0
+      return out
+    })
+
+    return res
+  },
+
+  /**
+   * Retrieve user&#x27;s roles.
+   *
+   * @method getRolesForUserAsync
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of scope to provide roles for; if not specified, global roles are returned
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; and &#x60;onlyAssigned&#x60; options are ignored)
+   *   - &#x60;onlyScoped&#x60;: if set, only roles in the specified scope are returned
+   *   - &#x60;onlyAssigned&#x60;: return only assigned roles and not automatically inferred (like subroles)
+   *   - &#x60;fullObjects&#x60;: return full roles objects (&#x60;true&#x60;) or just names (&#x60;false&#x60;) (&#x60;onlyAssigned&#x60; option is ignored) (default &#x60;false&#x60;)
+   *     If you have a use-case for this option, please file a feature-request. You shouldn&#x27;t need to use it as it&#x27;s
+   *     result strongly dependent on the internal data structure of this plugin.
+   *
+   * Alternatively, it can be a scope name string.
+   * @return {Promise&lt;Array&gt;} Array of user&#x27;s roles, unsorted.
+   * @static
+   */
+  getRolesForUserAsync: async function (user, options) {
+    let id
+
+    options = Roles._normalizeOptions(options)
+
+    Roles._checkScopeName(options.scope)
+
+    options = Object.assign({
+      fullObjects: false,
+      onlyAssigned: false,
+      anyScope: false,
+      onlyScoped: false
+    }, options)
+
+    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
+      id = user._id
+    } else {
+      id = user
+    }
+
+    if (!id) return []
+
+    const selector = {
+      &#x27;user._id&#x27;: id
+    }
+
+    const filter = {
+      fields: { &#x27;inheritedRoles._id&#x27;: 1 }
+    }
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope] }
+
+      if (!options.onlyScoped) {
+        selector.scope.$in.push(null)
+      }
+    }
+
+    if (options.onlyAssigned) {
+      delete filter.fields[&#x27;inheritedRoles._id&#x27;]
+      filter.fields[&#x27;role._id&#x27;] = 1
+    }
+
+    if (options.fullObjects) {
+      delete filter.fields
+    }
+
+    const roles = await Meteor.roleAssignment.find(selector, filter).fetchAsync()
+
+    if (options.fullObjects) {
+      return roles
+    }
+
+    return [
+      ...new Set(
+        roles.reduce((rev, current) =&gt; {
+          if (current.inheritedRoles) {
+            return rev.concat(current.inheritedRoles.map((r) =&gt; r._id))
+          } else if (current.role) {
+            rev.push(current.role._id)
+          }
+          return rev
+        }, [])
+      )
+    ]
+  },
+
+  /**
+   * Retrieve cursor of all existing roles.
+   *
+   * @method getAllRoles
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to &#x60;RolesCollection.find(query, options)&#x60;.
+   * @return {Cursor} Cursor of existing roles.
+   * @static
+   */
+  getAllRoles: function (queryOptions) {
+    queryOptions = queryOptions || { sort: { _id: 1 } }
+
+    return Meteor.roles.find({}, queryOptions)
+  },
+
+  /**
+   * Retrieve all users who are in target role.
+   *
+   * Options:
+   *
+   * @method getUsersInRoleAsync
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
+   *     roles will also be checked
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *   - &#x60;onlyScoped&#x60;: if set, only roles in the specified scope are returned
+   *   - &#x60;queryOptions&#x60;: options which are passed directly
+   *     through to &#x60;Meteor.users.find(query, options)&#x60;
+   *
+   * Alternatively, it can be a scope name string.
+   * @param {Object} [queryOptions] Options which are passed directly
+   *                                through to &#x60;Meteor.users.find(query, options)&#x60;
+   * @return {Promise&lt;Cursor&gt;} Cursor of users in roles.
+   * @static
+   */
+  getUsersInRoleAsync: async function (roles, options, queryOptions) {
+    const ids = (
+      await Roles.getUserAssignmentsForRole(roles, options).fetchAsync()
+    ).map((a) =&gt; a.user._id)
+
+    return Meteor.users.find(
+      { _id: { $in: ids } },
+      (options &amp;&amp; options.queryOptions) || queryOptions || {}
+    )
+  },
+
+  /**
+   * Retrieve all assignments of a user which are for the target role.
+   *
+   * Options:
+   *
+   * @method getUserAssignmentsForRole
+   * @param {Array|String} roles Name of role or an array of roles. If array, users
+   *                             returned will have at least one of the roles
+   *                             specified but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
+   *     roles will also be checked
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *   - &#x60;queryOptions&#x60;: options which are passed directly
+   *     through to &#x60;RoleAssignmentCollection.find(query, options)&#x60;
+
+   * Alternatively, it can be a scope name string.
+   * @return {Cursor} Cursor of user assignments for roles.
+   * @static
+   */
+  getUserAssignmentsForRole: function (roles, options) {
+    options = Roles._normalizeOptions(options)
+
+    options = Object.assign(
+      {
+        anyScope: false,
+        queryOptions: {}
+      },
+      options
+    )
+
+    return Roles._getUsersInRoleCursor(roles, options, options.queryOptions)
+  },
+
+  /**
+   * @method _getUsersInRoleCursor
+   * @param {Array|String} roles Name of role or an array of roles. If array, ids of users are
+   *                             returned which have at least one of the roles
+   *                             assigned but need not have _all_ roles.
+   *                             Roles do not have to exist.
+   * @param {Object|String} [options] Options:
+   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
+   *     roles will also be checked
+   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
+   *
+   * Alternatively, it can be a scope name string.
+   * @param {Object} [filter] Options which are passed directly
+   *                                through to &#x60;RoleAssignmentCollection.find(query, options)&#x60;
+   * @return {Object} Cursor to the assignment documents
+   * @private
+   * @static
+   */
+  _getUsersInRoleCursor: function (roles, options, filter) {
+    options = Roles._normalizeOptions(options)
+
+    options = Object.assign(
+      {
+        anyScope: false,
+        onlyScoped: false
+      },
+      options
+    )
+
+    // ensure array to simplify code
+    if (!Array.isArray(roles)) roles = [roles]
+
+    Roles._checkScopeName(options.scope)
+
+    filter = Object.assign(
+      {
+        fields: { &#x27;user._id&#x27;: 1 }
+      },
+      filter
+    )
+
+    const selector = {
+      &#x27;inheritedRoles._id&#x27;: { $in: roles }
+    }
+
+    if (!options.anyScope) {
+      selector.scope = { $in: [options.scope] }
+
+      if (!options.onlyScoped) {
+        selector.scope.$in.push(null)
+      }
+    }
+
+    return Meteor.roleAssignment.find(selector, filter)
+  },
+
+  /**
+   * Deprecated. Use &#x60;getScopesForUser&#x60; instead.
+   *
+   * @method getGroupsForUserAsync
+   * @returns {Promise&lt;Array&gt;}
+   * @static
+   * @deprecated
+   */
+  getGroupsForUserAsync: async function (...args) {
+    if (!getGroupsForUserDeprecationWarning) {
+      getGroupsForUserDeprecationWarning = true
+      console &amp;&amp;
+        console.warn(
+          &#x27;getGroupsForUser has been deprecated. Use getScopesForUser instead.&#x27;
+        )
+    }
+
+    return await Roles.getScopesForUser(...args)
+  },
+
+  /**
+   * Retrieve users scopes, if any.
+   *
+   * @method getScopesForUserAsync
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} [roles] Name of roles to restrict scopes to.
+   *
+   * @return {Promise&lt;Array&gt;} Array of user&#x27;s scopes, unsorted.
+   * @static
+   */
+  getScopesForUserAsync: async function (user, roles) {
+    let id
+
+    if (roles &amp;&amp; !Array.isArray(roles)) roles = [roles]
+
+    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
+      id = user._id
+    } else {
+      id = user
+    }
+
+    if (!id) return []
+
+    const selector = {
+      &#x27;user._id&#x27;: id,
+      scope: { $ne: null }
+    }
+
+    if (roles) {
+      selector[&#x27;inheritedRoles._id&#x27;] = { $in: roles }
+    }
+
+    const scopes = (
+      await Meteor.roleAssignment
+        .find(selector, { fields: { scope: 1 } })
+        .fetchAsync()
+    ).map((obi) =&gt; obi.scope)
+
+    return [...new Set(scopes)]
+  },
+
+  /**
+   * Rename a scope.
+   *
+   * Roles assigned with a given scope are changed to be under the new scope.
+   *
+   * @method renameScopeAsync
+   * @param {String} oldName Old name of a scope.
+   * @param {String} newName New name of a scope.
+   * @returns {Promise}
+   * @static
+   */
+  renameScopeAsync: async function (oldName, newName) {
+    let count
+
+    Roles._checkScopeName(oldName)
+    Roles._checkScopeName(newName)
+
+    if (oldName === newName) return
+
+    do {
+      count = await Meteor.roleAssignment.updateAsync(
+        {
+          scope: oldName
+        },
+        {
+          $set: {
+            scope: newName
+          }
+        },
+        { multi: true }
+      )
+    } while (count &gt; 0)
+  },
+
+  /**
+   * Remove a scope.
+   *
+   * Roles assigned with a given scope are removed.
+   *
+   * @method removeScopeAsync
+   * @param {String} name The name of a scope.
+   * @returns {Promise}
+   * @static
+   */
+  removeScopeAsync: async function (name) {
+    Roles._checkScopeName(name)
+
+    await Meteor.roleAssignment.removeAsync({ scope: name })
+  },
+
+  /**
+   * Throw an exception if &#x60;roleName&#x60; is an invalid role name.
+   *
+   * @method _checkRoleName
+   * @param {String} roleName A role name to match against.
+   * @private
+   * @static
+   */
+  _checkRoleName: function (roleName) {
+    if (
+      !roleName ||
+      typeof roleName !== &#x27;string&#x27; ||
+      roleName.trim() !== roleName
+    ) {
+      throw new Error(&#x60;Invalid role name &#x27;${roleName}&#x27;.&#x60;)
+    }
+  },
+
+  /**
+   * Find out if a role is an ancestor of another role.
+   *
+   * WARNING: If you check this on the client, please make sure all roles are published.
+   *
+   * @method isParentOfAsync
+   * @param {String} parentRoleName The role you want to research.
+   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
+   * @returns {Promise}
+   * @static
+   */
+  isParentOfAsync: async function (parentRoleName, childRoleName) {
+    if (parentRoleName === childRoleName) {
+      return true
+    }
+
+    if (parentRoleName == null || childRoleName == null) {
+      return false
+    }
+
+    Roles._checkRoleName(parentRoleName)
+    Roles._checkRoleName(childRoleName)
+
+    let rolesToCheck = [parentRoleName]
+    while (rolesToCheck.length !== 0) {
+      const roleName = rolesToCheck.pop()
+
+      if (roleName === childRoleName) {
+        return true
+      }
+
+      const role = await Meteor.roles.findOneAsync({ _id: roleName })
+
+      // This should not happen, but this is a problem to address at some other time.
+      if (!role) continue
+
+      rolesToCheck = rolesToCheck.concat(role.children.map((r) =&gt; r._id))
+    }
+
+    return false
+  },
+
+  /**
+   * Normalize options.
+   *
+   * @method _normalizeOptions
+   * @param {Object} options Options to normalize.
+   * @return {Object} Normalized options.
+   * @private
+   * @static
+   */
+  _normalizeOptions: function (options) {
+    options = options === undefined ? {} : options
+
+    // TODO Number will error out on scope validation, we can either error it out here
+    // or make it into a string and hence a valid input.
+    if (options === null || typeof options === &#x27;string&#x27; || typeof options === &#x27;number&#x27;) {
+      options = { scope: options }
+    }
+
+    options.scope = Roles._normalizeScopeName(options.scope)
+
+    return options
+  },
+
+  /**
+   * Normalize scope name.
+   *
+   * @method _normalizeScopeName
+   * @param {String} scopeName A scope name to normalize.
+   * @return {String} Normalized scope name.
+   * @private
+   * @static
+   */
+  _normalizeScopeName: function (scopeName) {
+    // map undefined and null to null
+    if (scopeName == null) {
+      return null
+    } else {
+      return scopeName
+    }
+  },
+
+  /**
+   * Throw an exception if &#x60;scopeName&#x60; is an invalid scope name.
+   *
+   * @method _checkScopeName
+   * @param {String} scopeName A scope name to match against.
+   * @private
+   * @static
+   */
+  _checkScopeName: function (scopeName) {
+    if (scopeName === null) return
+
+    if (
+      !scopeName ||
+      typeof scopeName !== &#x27;string&#x27; ||
+      scopeName.trim() !== scopeName
+    ) {
+      throw new Error(&#x60;Invalid scope name &#x27;${scopeName}&#x27;.&#x60;)
+    }
+  }
+})
+
+    </pre>
+</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/index.html b/docs/index.html
new file mode 100644
index 0000000000..37ac1a398c
--- /dev/null
+++ b/docs/index.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="./assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="./assets/css/main.css" id="site_styles">
+    <link rel="icon" href="./assets/favicon.ico">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+                <h1><img src="./assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v4.0.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="./classes/Roles.html">Roles</a></li>
+                                <li><a href="./classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="./modules/Roles.html">Roles</a></li>
+                                <li><a href="./modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+    <div class="apidocs">
+        <div id="docs-main" class="content">
+            <p>
+            Browse to a module or class using the sidebar to view its API documentation.
+            </p>
+
+            <h2>Keyboard Shortcuts</h2>
+
+            <ul>
+                <li><p>Press <kbd>s</kbd> to focus the API search box.</p></li>
+
+                <li><p>Use <kbd>Up</kbd> and <kbd>Down</kbd> to select classes, modules, and search results.</p></li>
+
+                <li class="mac-only"><p>With the API search box or sidebar focused, use <kbd><span class="cmd">&#x2318;</span>-Left</kbd> or <kbd><span class="cmd">&#x2318;</span>-Right</kbd> to switch sidebar tabs.</p></li>
+
+                <li class="pc-only"><p>With the API search box or sidebar focused, use <kbd>Ctrl+Left</kbd> and <kbd>Ctrl+Right</kbd> to switch sidebar tabs.</p></li>
+            </ul>
+        </div>
+    </div>
+
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="./assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="./assets/js/yui-prettify.js"></script>
+<script src="./assets/../api.js"></script>
+<script src="./assets/js/api-filter.js"></script>
+<script src="./assets/js/api-list.js"></script>
+<script src="./assets/js/api-search.js"></script>
+<script src="./assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
new file mode 100644
index 0000000000..2d49158c2b
--- /dev/null
+++ b/docs/modules/Roles.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Roles - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="icon" href="../assets/favicon.ico">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v4.0.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+<h1>Roles Module</h1>
+<div class="box clearfix meta">
+
+
+        <div class="foundat">
+            Defined in: <a href="../files/roles_roles_common_async.js.html#l41"><code>roles&#x2F;roles_common_async.js:41</code></a>
+        </div>
+
+</div>
+
+
+<div class="box intro">
+    <p>Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.</p>
+<p>Roles are accessible through <code>Meteor.roles</code> collection and documents consist of:</p>
+<ul>
+<li><code>_id</code>: role name</li>
+<li><code>children</code>: list of subdocuments:
+<ul>
+<li><code>_id</code></li>
+</ul>
+</li>
+</ul>
+<p>Children list elements are subdocuments so that they can be easier extended in the future or by plugins.</p>
+<p>Roles can have multiple parents and can be children (subroles) of multiple roles.</p>
+<p>Example: <code>{_id: 'admin', children: [{_id: 'editor'}]}</code></p>
+<p>The assignment of a role to a user is stored in a collection, accessible through <code>RoleAssignmentCollection</code>.
+It's documents consist of</p>
+<ul>
+<li><code>_id</code>: Internal MongoDB id</li>
+<li><code>role</code>: A role object which got assigned. Usually only contains the <code>_id</code> property</li>
+<li><code>user</code>: A user object, usually only contains the <code>_id</code> property</li>
+<li><code>scope</code>: scope name</li>
+<li><code>inheritedRoles</code>: A list of all the roles objects inherited by the assigned role.</li>
+</ul>
+
+</div>
+
+
+<div class="yui3-g">
+    <div class="yui3-u-1-2">
+            <p>This module provides the following classes:</p>
+
+            <ul class="module-classes">
+                <li class="module-class">
+                    <a href="../classes/Roles.html">
+                        Roles
+                    </a>
+                </li>
+            </ul>
+    </div>
+
+
+    <div class="yui3-u-1-2">
+    </div>
+</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/modules/UIHelpers.html b/docs/modules/UIHelpers.html
new file mode 100644
index 0000000000..41aea1413d
--- /dev/null
+++ b/docs/modules/UIHelpers.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>UIHelpers - The meteor-roles API</title>
+    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
+    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
+    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
+    <link rel="icon" href="../assets/favicon.ico">
+    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
+</head>
+<body class="yui3-skin-sam">
+
+<div id="doc">
+    <div id="hd" class="yui3-g header">
+        <div class="yui3-u-3-4">
+                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
+        </div>
+        <div class="yui3-u-1-4 version">
+            <em>API Docs for: v4.0.0</em>
+        </div>
+    </div>
+    <div id="bd" class="yui3-g">
+
+        <div class="yui3-u-1-4">
+            <div id="docs-sidebar" class="sidebar apidocs">
+                <div id="api-list">
+                    <h2 class="off-left">APIs</h2>
+                    <div id="api-tabview" class="tabview">
+                        <ul class="tabs">
+                            <li><a href="#api-classes">Classes</a></li>
+                            <li><a href="#api-modules">Modules</a></li>
+                        </ul>
+                
+                        <div id="api-tabview-filter">
+                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
+                        </div>
+                
+                        <div id="api-tabview-panel">
+                            <ul id="api-classes" class="apis classes">
+                                <li><a href="../classes/Roles.html">Roles</a></li>
+                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                
+                
+                            <ul id="api-modules" class="apis modules">
+                                <li><a href="../modules/Roles.html">Roles</a></li>
+                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="yui3-u-3-4">
+                <div id="api-options">
+                    Show:
+                    <label for="api-show-inherited">
+                        <input type="checkbox" id="api-show-inherited" checked>
+                        Inherited
+                    </label>
+            
+                    <label for="api-show-protected">
+                        <input type="checkbox" id="api-show-protected">
+                        Protected
+                    </label>
+            
+                    <label for="api-show-private">
+                        <input type="checkbox" id="api-show-private">
+                        Private
+                    </label>
+                    <label for="api-show-deprecated">
+                        <input type="checkbox" id="api-show-deprecated">
+                        Deprecated
+                    </label>
+            
+                </div>
+            
+            <div class="apidocs">
+                <div id="docs-main">
+                    <div class="content">
+<h1>UIHelpers Module</h1>
+<div class="box clearfix meta">
+
+
+        <div class="foundat">
+            Defined in: <a href="../files/roles_client_uiHelpers.js.html#l3"><code>roles&#x2F;client&#x2F;uiHelpers.js:3</code></a>
+        </div>
+
+</div>
+
+
+<div class="box intro">
+    <p>Convenience functions for use on client.</p>
+<p>NOTE: You must restrict user actions on the server-side; any
+client-side checks are strictly for convenience and must not be
+trusted.</p>
+
+</div>
+
+
+<div class="yui3-g">
+    <div class="yui3-u-1-2">
+            <p>This module provides the following classes:</p>
+
+            <ul class="module-classes">
+                <li class="module-class">
+                    <a href="../classes/UIHelpers.html">
+                        UIHelpers
+                    </a>
+                </li>
+            </ul>
+    </div>
+
+
+    <div class="yui3-u-1-2">
+    </div>
+</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="../assets/vendor/prettify/prettify-min.js"></script>
+<script>prettyPrint();</script>
+<script src="../assets/js/yui-prettify.js"></script>
+<script src="../assets/../api.js"></script>
+<script src="../assets/js/api-filter.js"></script>
+<script src="../assets/js/api-list.js"></script>
+<script src="../assets/js/api-search.js"></script>
+<script src="../assets/js/apidocs.js"></script>
+</body>
+</html>
diff --git a/docs/modules/index.html b/docs/modules/index.html
new file mode 100644
index 0000000000..487fe15b2a
--- /dev/null
+++ b/docs/modules/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirector</title>
+        <meta http-equiv="refresh" content="0;url=../">
+    </head>
+    <body>
+        <a href="../">Click here to redirect</a>
+    </body>
+</html>

From 67fbd9553916ee856c413ea1ba4cf91802ebc577 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 17 Sep 2024 10:41:49 -0400
Subject: [PATCH 0519/1140] start release-3.1.0 branch

---
 .../generators/changelog/versions/3.1.0.md    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 v3-docs/docs/generators/changelog/versions/3.1.0.md

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
new file mode 100644
index 0000000000..f7d6ce4f7f
--- /dev/null
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -0,0 +1,33 @@
+## v3.1.0, 2024-xx-xx
+
+### Highlights
+
+N/A
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.1.0
+
+```
+
+
+
+#### Meteor Version Release
+
+N/A
+
+#### Special thanks to
+
+N/A

From d12c85dbbfbd53e4cad464a660a44819e24bbdbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 Sep 2024 17:47:31 +0000
Subject: [PATCH 0520/1140] build(deps): bump express from 4.19.2 to 4.21.0 in
 /testapp2

Bumps [express](https://github.com/expressjs/express) from 4.19.2 to 4.21.0.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 testapp2/package-lock.json | 781 ++++++++++++++++++++++++++++---------
 1 file changed, 590 insertions(+), 191 deletions(-)

diff --git a/testapp2/package-lock.json b/testapp2/package-lock.json
index 4788e7339d..240ace24ef 100644
--- a/testapp2/package-lock.json
+++ b/testapp2/package-lock.json
@@ -757,6 +757,93 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "body-parser": {
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "requires": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "call-bind": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+          "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+          "requires": {
+            "es-define-property": "^1.0.0",
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.4",
+            "set-function-length": "^1.2.1"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "get-intrinsic": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+          "requires": {
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "object-inspect": {
+          "version": "1.13.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+          "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="
+        },
+        "qs": {
+          "version": "6.13.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+          "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+          "requires": {
+            "side-channel": "^1.0.6"
+          }
+        },
+        "side-channel": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+          "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+          "requires": {
+            "call-bind": "^1.0.7",
+            "es-errors": "^1.3.0",
+            "get-intrinsic": "^1.2.4",
+            "object-inspect": "^1.13.1"
+          }
+        }
+      }
+    },
     "boom": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
@@ -859,6 +946,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -1012,6 +1100,11 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true
     },
+    "cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
+    },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -1131,6 +1224,16 @@
         "strip-bom": "^4.0.0"
       }
     },
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
+    },
     "define-properties": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
@@ -1189,11 +1292,6 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-    },
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -1264,6 +1362,38 @@
         "which-typed-array": "^1.1.10"
       }
     },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "get-intrinsic": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+          "requires": {
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        }
+      }
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
     "es-set-tostringtag": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
@@ -1865,36 +1995,36 @@
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
+      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -1902,30 +2032,18 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
-        "body-parser": {
-          "version": "1.20.2",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-          "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+        "call-bind": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+          "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
           "requires": {
-            "bytes": "3.1.2",
-            "content-type": "~1.0.5",
-            "debug": "2.6.9",
-            "depd": "2.0.0",
-            "destroy": "1.2.0",
-            "http-errors": "2.0.0",
-            "iconv-lite": "0.4.24",
-            "on-finished": "2.4.1",
-            "qs": "6.11.0",
-            "raw-body": "2.5.2",
-            "type-is": "~1.6.18",
-            "unpipe": "1.0.0"
+            "es-define-property": "^1.0.0",
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.4",
+            "set-function-length": "^1.2.1"
           }
         },
-        "cookie": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-          "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1934,20 +2052,122 @@
             "ms": "2.0.0"
           }
         },
+        "encodeurl": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+          "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
+        },
+        "finalhandler": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+          "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~2.0.0",
+            "escape-html": "~1.0.3",
+            "on-finished": "2.4.1",
+            "parseurl": "~1.3.3",
+            "statuses": "2.0.1",
+            "unpipe": "~1.0.0"
+          }
+        },
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "get-intrinsic": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+          "requires": {
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "merge-descriptors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+          "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
-        "raw-body": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-          "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+        "object-inspect": {
+          "version": "1.13.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+          "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="
+        },
+        "path-to-regexp": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+          "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+        },
+        "qs": {
+          "version": "6.13.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+          "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
           "requires": {
-            "bytes": "3.1.2",
+            "side-channel": "^1.0.6"
+          }
+        },
+        "send": {
+          "version": "0.19.0",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+          "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
             "http-errors": "2.0.0",
-            "iconv-lite": "0.4.24",
-            "unpipe": "1.0.0"
+            "mime": "1.6.0",
+            "ms": "2.1.3",
+            "on-finished": "2.4.1",
+            "range-parser": "~1.2.1",
+            "statuses": "2.0.1"
+          },
+          "dependencies": {
+            "encodeurl": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+              "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+            },
+            "ms": {
+              "version": "2.1.3",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+            }
+          }
+        },
+        "serve-static": {
+          "version": "1.16.2",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+          "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+          "requires": {
+            "encodeurl": "~2.0.0",
+            "escape-html": "~1.0.3",
+            "parseurl": "~1.3.3",
+            "send": "0.19.0"
+          }
+        },
+        "side-channel": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+          "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+          "requires": {
+            "call-bind": "^1.0.7",
+            "es-errors": "^1.3.0",
+            "get-intrinsic": "^1.2.4",
+            "object-inspect": "^1.13.1"
           }
         }
       }
@@ -2009,35 +2229,6 @@
         "flat-cache": "^3.0.4"
       }
     },
-    "finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        }
-      }
-    },
     "find-cache-dir": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
@@ -2276,7 +2467,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
       "requires": {
         "get-intrinsic": "^1.1.3"
       }
@@ -2350,6 +2540,21 @@
         "type-fest": "^0.8.0"
       }
     },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        }
+      }
+    },
     "hawk": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
@@ -3002,11 +3207,6 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
-    },
     "meteor-node-stubs": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.9.tgz",
@@ -3040,6 +3240,8 @@
       "dependencies": {
         "@meteorjs/crypto-browserify": {
           "version": "3.12.1",
+          "resolved": "https://registry.npmjs.org/@meteorjs/crypto-browserify/-/crypto-browserify-3.12.1.tgz",
+          "integrity": "sha512-ku23zGjNb1XJXPSPlt4QCPetc4s/cPrSahhSF11mFeQff5wBuu7QVVn/MusdHh+l3aKl6L1XMLV+OYLXvNDQ6Q==",
           "requires": {
             "browserify-cipher": "^1.0.1",
             "browserify-sign": "^4.2.3",
@@ -3057,6 +3259,8 @@
           "dependencies": {
             "hash-base": {
               "version": "3.0.4",
+              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+              "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
               "requires": {
                 "inherits": "^2.0.1",
                 "safe-buffer": "^5.0.1"
@@ -3066,6 +3270,8 @@
         },
         "asn1.js": {
           "version": "4.10.1",
+          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+          "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
           "requires": {
             "bn.js": "^4.0.0",
             "inherits": "^2.0.1",
@@ -3073,12 +3279,16 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0"
+              "version": "4.12.0",
+              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
             }
           }
         },
         "assert": {
           "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+          "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
           "requires": {
             "call-bind": "^1.0.2",
             "is-nan": "^1.3.2",
@@ -3088,19 +3298,29 @@
           }
         },
         "available-typed-arrays": {
-          "version": "1.0.5"
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+          "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
         },
         "base64-js": {
-          "version": "1.5.1"
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+          "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
         },
         "bn.js": {
-          "version": "5.2.0"
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+          "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
         },
         "brorand": {
-          "version": "1.1.0"
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+          "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
         },
         "browserify-aes": {
           "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+          "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
           "requires": {
             "buffer-xor": "^1.0.3",
             "cipher-base": "^1.0.0",
@@ -3112,6 +3332,8 @@
         },
         "browserify-cipher": {
           "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+          "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
           "requires": {
             "browserify-aes": "^1.0.4",
             "browserify-des": "^1.0.0",
@@ -3120,6 +3342,8 @@
         },
         "browserify-des": {
           "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+          "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
           "requires": {
             "cipher-base": "^1.0.1",
             "des.js": "^1.0.0",
@@ -3129,6 +3353,8 @@
         },
         "browserify-rsa": {
           "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+          "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
           "requires": {
             "bn.js": "^5.0.0",
             "randombytes": "^2.0.1"
@@ -3136,6 +3362,8 @@
         },
         "browserify-sign": {
           "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz",
+          "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
           "requires": {
             "bn.js": "^5.2.1",
             "browserify-rsa": "^4.1.0",
@@ -3150,10 +3378,14 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "5.2.1"
+              "version": "5.2.1",
+              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+              "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
             },
             "hash-base": {
               "version": "3.0.4",
+              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+              "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
               "requires": {
                 "inherits": "^2.0.1",
                 "safe-buffer": "^5.0.1"
@@ -3161,6 +3393,8 @@
             },
             "readable-stream": {
               "version": "2.3.8",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+              "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.3",
@@ -3172,18 +3406,24 @@
               },
               "dependencies": {
                 "safe-buffer": {
-                  "version": "5.1.2"
+                  "version": "5.1.2",
+                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+                  "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
                 }
               }
             },
             "string_decoder": {
               "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
               "requires": {
                 "safe-buffer": "~5.1.0"
               },
               "dependencies": {
                 "safe-buffer": {
-                  "version": "5.1.2"
+                  "version": "5.1.2",
+                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+                  "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
                 }
               }
             }
@@ -3191,25 +3431,35 @@
         },
         "browserify-zlib": {
           "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+          "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
           "requires": {
             "pako": "~1.0.5"
           }
         },
         "buffer": {
           "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
           "requires": {
             "base64-js": "^1.3.1",
             "ieee754": "^1.1.13"
           }
         },
         "buffer-xor": {
-          "version": "1.0.3"
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+          "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
         },
         "builtin-status-codes": {
-          "version": "3.0.0"
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+          "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
         },
         "call-bind": {
           "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+          "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
           "requires": {
             "function-bind": "^1.1.2",
             "get-intrinsic": "^1.2.1",
@@ -3218,34 +3468,48 @@
         },
         "cipher-base": {
           "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+          "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
           "requires": {
             "inherits": "^2.0.1",
             "safe-buffer": "^5.0.1"
           }
         },
         "console-browserify": {
-          "version": "1.2.0"
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+          "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
         },
         "constants-browserify": {
-          "version": "1.0.0"
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+          "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
         },
         "core-util-is": {
-          "version": "1.0.3"
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+          "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
         },
         "create-ecdh": {
           "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+          "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
           "requires": {
             "bn.js": "^4.1.0",
             "elliptic": "^6.5.3"
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0"
+              "version": "4.12.0",
+              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
             }
           }
         },
         "create-hash": {
           "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+          "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
           "requires": {
             "cipher-base": "^1.0.1",
             "inherits": "^2.0.1",
@@ -3256,6 +3520,8 @@
         },
         "create-hmac": {
           "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+          "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
           "requires": {
             "cipher-base": "^1.0.3",
             "create-hash": "^1.1.0",
@@ -3267,6 +3533,8 @@
         },
         "define-data-property": {
           "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+          "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
           "requires": {
             "get-intrinsic": "^1.2.1",
             "gopd": "^1.0.1",
@@ -3275,6 +3543,8 @@
         },
         "define-properties": {
           "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+          "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
           "requires": {
             "define-data-property": "^1.0.1",
             "has-property-descriptors": "^1.0.0",
@@ -3283,6 +3553,8 @@
         },
         "des.js": {
           "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+          "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
           "requires": {
             "inherits": "^2.0.1",
             "minimalistic-assert": "^1.0.0"
@@ -3290,6 +3562,8 @@
         },
         "diffie-hellman": {
           "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+          "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
           "requires": {
             "bn.js": "^4.1.0",
             "miller-rabin": "^4.0.0",
@@ -3297,15 +3571,21 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0"
+              "version": "4.12.0",
+              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
             }
           }
         },
         "domain-browser": {
-          "version": "4.23.0"
+          "version": "4.23.0",
+          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.23.0.tgz",
+          "integrity": "sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA=="
         },
         "elliptic": {
           "version": "6.5.5",
+          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz",
+          "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==",
           "requires": {
             "bn.js": "^4.11.9",
             "brorand": "^1.1.0",
@@ -3317,15 +3597,21 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0"
+              "version": "4.12.0",
+              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
             }
           }
         },
         "events": {
-          "version": "3.3.0"
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+          "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
         },
         "evp_bytestokey": {
           "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+          "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
           "requires": {
             "md5.js": "^1.3.4",
             "safe-buffer": "^5.1.1"
@@ -3333,15 +3619,21 @@
         },
         "for-each": {
           "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+          "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
           "requires": {
             "is-callable": "^1.1.3"
           }
         },
         "function-bind": {
-          "version": "1.1.2"
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
         },
         "get-intrinsic": {
           "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+          "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
           "requires": {
             "function-bind": "^1.1.2",
             "has-proto": "^1.0.1",
@@ -3351,30 +3643,42 @@
         },
         "gopd": {
           "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+          "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
           "requires": {
             "get-intrinsic": "^1.1.3"
           }
         },
         "has-property-descriptors": {
           "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+          "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
           "requires": {
             "get-intrinsic": "^1.2.2"
           }
         },
         "has-proto": {
-          "version": "1.0.1"
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+          "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
         },
         "has-symbols": {
-          "version": "1.0.3"
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
         },
         "has-tostringtag": {
           "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+          "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
           "requires": {
             "has-symbols": "^1.0.2"
           }
         },
         "hash-base": {
           "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+          "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
           "requires": {
             "inherits": "^2.0.4",
             "readable-stream": "^3.6.0",
@@ -3383,6 +3687,8 @@
         },
         "hash.js": {
           "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+          "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
           "requires": {
             "inherits": "^2.0.3",
             "minimalistic-assert": "^1.0.1"
@@ -3390,12 +3696,16 @@
         },
         "hasown": {
           "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+          "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
           "requires": {
             "function-bind": "^1.1.2"
           }
         },
         "hmac-drbg": {
           "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+          "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
           "requires": {
             "hash.js": "^1.0.3",
             "minimalistic-assert": "^1.0.0",
@@ -3403,32 +3713,46 @@
           }
         },
         "https-browserify": {
-          "version": "1.0.0"
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+          "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="
         },
         "ieee754": {
-          "version": "1.2.1"
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+          "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
         },
         "inherits": {
-          "version": "2.0.4"
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
         "is-arguments": {
           "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+          "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
           "requires": {
             "call-bind": "^1.0.2",
             "has-tostringtag": "^1.0.0"
           }
         },
         "is-callable": {
-          "version": "1.2.7"
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+          "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
         },
         "is-generator-function": {
           "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+          "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
           "requires": {
             "has-tostringtag": "^1.0.0"
           }
         },
         "is-nan": {
           "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
+          "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
           "requires": {
             "call-bind": "^1.0.0",
             "define-properties": "^1.1.3"
@@ -3436,15 +3760,21 @@
         },
         "is-typed-array": {
           "version": "1.1.12",
+          "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+          "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
           "requires": {
             "which-typed-array": "^1.1.11"
           }
         },
         "isarray": {
-          "version": "1.0.0"
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
         },
         "md5.js": {
           "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+          "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
           "requires": {
             "hash-base": "^3.0.0",
             "inherits": "^2.0.1",
@@ -3453,37 +3783,53 @@
         },
         "miller-rabin": {
           "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+          "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
           "requires": {
             "bn.js": "^4.0.0",
             "brorand": "^1.0.1"
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0"
+              "version": "4.12.0",
+              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
             }
           }
         },
         "minimalistic-assert": {
-          "version": "1.0.1"
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+          "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
         },
         "minimalistic-crypto-utils": {
-          "version": "1.0.1"
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+          "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
         },
         "object-inspect": {
-          "version": "1.13.1"
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+          "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
         },
         "object-is": {
           "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+          "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
           "requires": {
             "call-bind": "^1.0.2",
             "define-properties": "^1.1.3"
           }
         },
         "object-keys": {
-          "version": "1.1.1"
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
         },
         "object.assign": {
           "version": "4.1.4",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+          "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
           "requires": {
             "call-bind": "^1.0.2",
             "define-properties": "^1.1.4",
@@ -3492,13 +3838,19 @@
           }
         },
         "os-browserify": {
-          "version": "0.3.0"
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+          "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="
         },
         "pako": {
-          "version": "1.0.11"
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+          "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
         },
         "parse-asn1": {
           "version": "5.1.7",
+          "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz",
+          "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
           "requires": {
             "asn1.js": "^4.10.1",
             "browserify-aes": "^1.2.0",
@@ -3510,6 +3862,8 @@
           "dependencies": {
             "hash-base": {
               "version": "3.0.4",
+              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+              "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
               "requires": {
                 "inherits": "^2.0.1",
                 "safe-buffer": "^5.0.1"
@@ -3518,10 +3872,14 @@
           }
         },
         "path-browserify": {
-          "version": "1.0.1"
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+          "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
         },
         "pbkdf2": {
           "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+          "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
           "requires": {
             "create-hash": "^1.1.2",
             "create-hmac": "^1.1.4",
@@ -3531,13 +3889,19 @@
           }
         },
         "process": {
-          "version": "0.11.10"
+          "version": "0.11.10",
+          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+          "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
         },
         "process-nextick-args": {
-          "version": "2.0.1"
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
         },
         "public-encrypt": {
           "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+          "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
           "requires": {
             "bn.js": "^4.1.0",
             "browserify-rsa": "^4.0.0",
@@ -3548,30 +3912,42 @@
           },
           "dependencies": {
             "bn.js": {
-              "version": "4.12.0"
+              "version": "4.12.0",
+              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
             }
           }
         },
         "punycode": {
-          "version": "1.4.1"
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
         },
         "qs": {
           "version": "6.11.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+          "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
           "requires": {
             "side-channel": "^1.0.4"
           }
         },
         "querystring-es3": {
-          "version": "0.2.1"
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+          "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="
         },
         "randombytes": {
           "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+          "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
           "requires": {
             "safe-buffer": "^5.1.0"
           }
         },
         "randomfill": {
           "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+          "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
           "requires": {
             "randombytes": "^2.0.5",
             "safe-buffer": "^5.1.0"
@@ -3579,6 +3955,8 @@
         },
         "readable-stream": {
           "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -3587,16 +3965,22 @@
         },
         "ripemd160": {
           "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+          "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
           "requires": {
             "hash-base": "^3.0.0",
             "inherits": "^2.0.1"
           }
         },
         "safe-buffer": {
-          "version": "5.2.1"
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
         },
         "set-function-length": {
           "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+          "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
           "requires": {
             "define-data-property": "^1.1.1",
             "get-intrinsic": "^1.2.1",
@@ -3605,10 +3989,14 @@
           }
         },
         "setimmediate": {
-          "version": "1.0.5"
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+          "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
         },
         "sha.js": {
           "version": "2.4.11",
+          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+          "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
           "requires": {
             "inherits": "^2.0.1",
             "safe-buffer": "^5.0.1"
@@ -3616,6 +4004,8 @@
         },
         "side-channel": {
           "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+          "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
           "requires": {
             "call-bind": "^1.0.0",
             "get-intrinsic": "^1.0.2",
@@ -3624,6 +4014,8 @@
         },
         "stream-browserify": {
           "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
+          "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
           "requires": {
             "inherits": "~2.0.4",
             "readable-stream": "^3.5.0"
@@ -3631,6 +4023,8 @@
         },
         "stream-http": {
           "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
+          "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
           "requires": {
             "builtin-status-codes": "^3.0.0",
             "inherits": "^2.0.4",
@@ -3640,21 +4034,29 @@
         },
         "string_decoder": {
           "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
           "requires": {
             "safe-buffer": "~5.2.0"
           }
         },
         "timers-browserify": {
           "version": "2.0.12",
+          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+          "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
           "requires": {
             "setimmediate": "^1.0.4"
           }
         },
         "tty-browserify": {
-          "version": "0.0.1"
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+          "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
         },
         "url": {
           "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+          "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
           "requires": {
             "punycode": "^1.4.1",
             "qs": "^6.11.2"
@@ -3662,6 +4064,8 @@
         },
         "util": {
           "version": "0.12.5",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+          "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
           "requires": {
             "inherits": "^2.0.3",
             "is-arguments": "^1.0.4",
@@ -3671,13 +4075,19 @@
           }
         },
         "util-deprecate": {
-          "version": "1.0.2"
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
         },
         "vm-browserify": {
-          "version": "1.1.2"
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+          "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
         },
         "which-typed-array": {
           "version": "1.1.13",
+          "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+          "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
           "requires": {
             "available-typed-arrays": "^1.0.5",
             "call-bind": "^1.0.4",
@@ -3687,7 +4097,9 @@
           }
         },
         "xtend": {
-          "version": "4.0.2"
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+          "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
         }
       }
     },
@@ -3856,7 +4268,8 @@
     "object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true
     },
     "object-keys": {
       "version": "1.1.1",
@@ -4041,11 +4454,6 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
-    },
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -4226,14 +4634,6 @@
         "ws": "8.13.0"
       }
     },
-    "qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
-    },
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -4251,6 +4651,17 @@
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
+    "raw-body": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "requires": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -4434,65 +4845,52 @@
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true
     },
-    "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      }
-    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "dependencies": {
+        "function-bind": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "get-intrinsic": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+          "requires": {
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+          }
+        },
+        "has-property-descriptors": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+          "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+          "requires": {
+            "es-define-property": "^1.0.0"
+          }
+        }
+      }
+    },
     "setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -4517,6 +4915,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",

From 617c03d0183ba0992c21422b4dcac73237d921ec Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 1 Oct 2024 19:19:20 +0200
Subject: [PATCH 0521/1140] Don't prettify docs

---
 testapp2/package.json | 3 ++-
 testapp3/package.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/testapp2/package.json b/testapp2/package.json
index 15d06274a8..1a77cb1cf9 100644
--- a/testapp2/package.json
+++ b/testapp2/package.json
@@ -37,7 +37,8 @@
       "**/.meteor/",
       "**/examples/",
       "**/testapp2",
-      "**/testapp3"
+      "**/testapp3",
+      "**/docs"
     ]
   }
 }
diff --git a/testapp3/package.json b/testapp3/package.json
index d0ab05328e..9094402518 100644
--- a/testapp3/package.json
+++ b/testapp3/package.json
@@ -36,7 +36,8 @@
       "**/.meteor/",
       "**/examples/",
       "**/testapp2",
-      "**/testapp3"
+      "**/testapp3",
+      "**/docs"
     ]
   }
 }

From 35464b2fb28787221df3cf1dfce5739e7668515e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 1 Oct 2024 20:04:00 +0200
Subject: [PATCH 0522/1140] mimic Meteor directory

---
 .coverage.json                                |    6 -
 .github/CONTRIBUTING.md                       |  103 -
 .github/ISSUE_TEMPLATE/bug_report.md          |   37 -
 .github/ISSUE_TEMPLATE/feature_request.md     |   24 -
 .github/SECURITY.md                           |   26 -
 .github/workflows/comment-issue.yml           |   31 -
 .github/workflows/testsuite.yml               |   94 -
 .gitignore                                    |   24 -
 .meteorignore                                 |    4 -
 .versions                                     |   64 -
 CONTRIBUTING.md                               |  103 -
 History.md                                    |   95 -
 LICENSE                                       |    9 -
 README.md                                     |  514 --
 docs/api.js                                   |   25 -
 docs/assets/css/external-small.png            |  Bin 491 -> 0 bytes
 docs/assets/css/logo.png                      |  Bin 7143 -> 0 bytes
 docs/assets/css/main.css                      |  783 --
 docs/assets/favicon.ico                       |  Bin 5430 -> 0 bytes
 docs/assets/img/spinner.gif                   |  Bin 2685 -> 0 bytes
 docs/assets/index.html                        |   10 -
 docs/assets/js/api-filter.js                  |   56 -
 docs/assets/js/api-list.js                    |  255 -
 docs/assets/js/api-search.js                  |   98 -
 docs/assets/js/apidocs.js                     |  376 -
 docs/assets/js/yui-prettify.js                |   17 -
 docs/assets/vendor/prettify/CHANGES.html      |  130 -
 docs/assets/vendor/prettify/COPYING           |  202 -
 docs/assets/vendor/prettify/README.html       |  203 -
 docs/assets/vendor/prettify/prettify-min.css  |    1 -
 docs/assets/vendor/prettify/prettify-min.js   |    1 -
 docs/classes/Roles.html                       | 5185 ------------
 docs/classes/UIHelpers.html                   |  246 -
 docs/classes/index.html                       |   10 -
 docs/data.json                                | 1743 ----
 docs/elements/index.html                      |   10 -
 docs/files/index.html                         |   10 -
 docs/files/roles_client_uiHelpers.js.html     |  193 -
 docs/files/roles_roles_client.js.html         | 1206 ---
 docs/files/roles_roles_common_async.js.html   | 1432 ----
 docs/index.html                               |  118 -
 docs/modules/Roles.html                       |  152 -
 docs/modules/UIHelpers.html                   |  134 -
 docs/modules/index.html                       |   10 -
 .../.meteor/.finished-upgraders               |   12 -
 .../flow-router-advanced/.meteor/.gitignore   |    2 -
 examples/flow-router-advanced/.meteor/.id     |    7 -
 .../flow-router-advanced/.meteor/packages     |   27 -
 .../flow-router-advanced/.meteor/platforms    |    2 -
 examples/flow-router-advanced/.meteor/release |    1 -
 .../flow-router-advanced/.meteor/versions     |   97 -
 examples/flow-router-advanced/README.md       |   14 -
 .../main/client/header.html                   |   39 -
 .../main/client/header.js                     |   34 -
 .../main/client/layouts.js                    |   13 -
 .../main/client/lib/app.js                    |   47 -
 .../main/client/lib/patches.js                |   22 -
 .../main/client/lib/polyfills.js              |    7 -
 .../main/client/main.html                     |   49 -
 .../main/client/mainLayout.html               |   19 -
 .../main/client/noteOfTheDay.html             |    3 -
 .../main/client/noteOfTheDay.js               |    7 -
 .../main/client/publicLayout.html             |    5 -
 .../main/client/routing.js                    |   40 -
 .../main/client/signin.html                   |   15 -
 .../main/client/signin.js                     |   11 -
 .../main/client/style.css                     |   67 -
 .../main/client/t404.html                     |    9 -
 .../main/server/startup/fixtures.js           |   52 -
 .../main/server/startup/publish.js            |    8 -
 .../main/server/startup/validateNewUser.js    |   17 -
 .../manageUsers/client/manage-users.html      |   34 -
 .../manageUsers/client/manage-users.js        |   21 -
 .../manageUsers/client/manageController.html  |    3 -
 .../manageUsers/client/manageController.js    |   16 -
 .../manageUsers/client/routing.js             |   15 -
 .../manageUsers/server/manageUsers.js         |   22 -
 .../flow-router-advanced/package-lock.json    |   20 -
 examples/flow-router-advanced/package.json    |    6 -
 .../packages/alanning:roles                   |    1 -
 .../secrets/client/routing.js                 |   14 -
 .../secrets/client/secrets.html               |   30 -
 .../secrets/client/secrets.js                 |    9 -
 .../secrets/client/secretsController.html     |    3 -
 .../secrets/client/secretsController.js       |   16 -
 .../flow-router-advanced/secrets/model.js     |    5 -
 .../secrets/server/fixtures.js                |   32 -
 .../secrets/server/secrets.js                 |   19 -
 .../flow-router/.meteor/.finished-upgraders   |   12 -
 examples/flow-router/.meteor/.gitignore       |    2 -
 examples/flow-router/.meteor/.id              |    7 -
 examples/flow-router/.meteor/packages         |   27 -
 examples/flow-router/.meteor/platforms        |    2 -
 examples/flow-router/.meteor/release          |    1 -
 examples/flow-router/.meteor/versions         |   97 -
 examples/flow-router/client/client.js         |  124 -
 examples/flow-router/client/example.css       |   67 -
 examples/flow-router/client/example.html      |  112 -
 examples/flow-router/client/layouts.html      |   25 -
 examples/flow-router/client/layouts.js        |   13 -
 examples/flow-router/client/lib/globals.js    |    2 -
 examples/flow-router/client/manage-users.html |   34 -
 examples/flow-router/client/manage-users.js   |   21 -
 examples/flow-router/client/routing.js        |   52 -
 examples/flow-router/client/secrets.html      |   30 -
 examples/flow-router/client/secrets.js        |    9 -
 examples/flow-router/model.js                 |    9 -
 examples/flow-router/package-lock.json        |   20 -
 examples/flow-router/package.json             |    6 -
 examples/flow-router/packages/alanning:roles  |    1 -
 examples/flow-router/server/server.js         |  122 -
 .../iron-router/.meteor/.finished-upgraders   |   12 -
 examples/iron-router/.meteor/.gitignore       |    2 -
 examples/iron-router/.meteor/.id              |    7 -
 examples/iron-router/.meteor/packages         |   26 -
 examples/iron-router/.meteor/platforms        |    2 -
 examples/iron-router/.meteor/release          |    1 -
 examples/iron-router/.meteor/versions         |  101 -
 examples/iron-router/client/client.js         |  132 -
 examples/iron-router/client/example.css       |   67 -
 examples/iron-router/client/example.html      |  122 -
 examples/iron-router/client/lib/globals.js    |    2 -
 examples/iron-router/client/manage-users.html |   34 -
 examples/iron-router/client/manage-users.js   |   21 -
 examples/iron-router/client/routing.js        |   94 -
 examples/iron-router/client/secrets.html      |   30 -
 examples/iron-router/client/secrets.js        |    9 -
 examples/iron-router/model.js                 |    9 -
 examples/iron-router/package-lock.json        |   20 -
 examples/iron-router/package.json             |    6 -
 examples/iron-router/packages/alanning:roles  |    1 -
 examples/iron-router/server/server.js         |  122 -
 package-lock.json                             |    6 -
 package-types.json                            |    3 -
 {roles => packages/roles}/.gitignore          |    0
 {roles => packages/roles}/README.md           |    0
 {roles => packages/roles}/client/debug.js     |    0
 {roles => packages/roles}/client/uiHelpers.js |    0
 .../roles/definitions.d.ts                    |    0
 package.js => packages/roles/package.js       |   22 +-
 {roles => packages/roles}/roles_client.js     |    0
 .../roles}/roles_common_async.js              |    0
 {roles => packages/roles}/roles_server.js     |    2 +-
 {roles => packages/roles}/tests/client.js     |    2 +-
 .../roles}/tests/clientAsync.js               |    4 +-
 .../roles}/tests/serverAsync.js               |    2 +-
 testapp2/.coverage.json                       |    6 -
 testapp2/.gitignore                           |    4 -
 testapp2/.meteor/.finished-upgraders          |   19 -
 testapp2/.meteor/.gitignore                   |    1 -
 testapp2/.meteor/.id                          |    7 -
 testapp2/.meteor/packages                     |   18 -
 testapp2/.meteor/platforms                    |    2 -
 testapp2/.meteor/release                      |    1 -
 testapp2/.meteor/versions                     |   57 -
 testapp2/package-lock.json                    | 5623 -------------
 testapp2/package.json                         |   44 -
 testapp3/.gitignore                           |    4 -
 testapp3/.meteor/.finished-upgraders          |   19 -
 testapp3/.meteor/.gitignore                   |    1 -
 testapp3/.meteor/.id                          |    7 -
 testapp3/.meteor/packages                     |   19 -
 testapp3/.meteor/platforms                    |    2 -
 testapp3/.meteor/release                      |    1 -
 testapp3/.meteor/versions                     |   70 -
 testapp3/package-lock.json                    | 7104 -----------------
 testapp3/package.json                         |   43 -
 yuidoc.json                                   |   10 -
 168 files changed, 15 insertions(+), 29335 deletions(-)
 delete mode 100644 .coverage.json
 delete mode 100644 .github/CONTRIBUTING.md
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 delete mode 100644 .github/SECURITY.md
 delete mode 100644 .github/workflows/comment-issue.yml
 delete mode 100644 .github/workflows/testsuite.yml
 delete mode 100644 .gitignore
 delete mode 100644 .meteorignore
 delete mode 100644 .versions
 delete mode 100644 CONTRIBUTING.md
 delete mode 100644 History.md
 delete mode 100644 LICENSE
 delete mode 100644 README.md
 delete mode 100644 docs/api.js
 delete mode 100644 docs/assets/css/external-small.png
 delete mode 100644 docs/assets/css/logo.png
 delete mode 100644 docs/assets/css/main.css
 delete mode 100644 docs/assets/favicon.ico
 delete mode 100644 docs/assets/img/spinner.gif
 delete mode 100644 docs/assets/index.html
 delete mode 100644 docs/assets/js/api-filter.js
 delete mode 100644 docs/assets/js/api-list.js
 delete mode 100644 docs/assets/js/api-search.js
 delete mode 100644 docs/assets/js/apidocs.js
 delete mode 100644 docs/assets/js/yui-prettify.js
 delete mode 100644 docs/assets/vendor/prettify/CHANGES.html
 delete mode 100644 docs/assets/vendor/prettify/COPYING
 delete mode 100644 docs/assets/vendor/prettify/README.html
 delete mode 100644 docs/assets/vendor/prettify/prettify-min.css
 delete mode 100644 docs/assets/vendor/prettify/prettify-min.js
 delete mode 100644 docs/classes/Roles.html
 delete mode 100644 docs/classes/UIHelpers.html
 delete mode 100644 docs/classes/index.html
 delete mode 100644 docs/data.json
 delete mode 100644 docs/elements/index.html
 delete mode 100644 docs/files/index.html
 delete mode 100644 docs/files/roles_client_uiHelpers.js.html
 delete mode 100644 docs/files/roles_roles_client.js.html
 delete mode 100644 docs/files/roles_roles_common_async.js.html
 delete mode 100644 docs/index.html
 delete mode 100644 docs/modules/Roles.html
 delete mode 100644 docs/modules/UIHelpers.html
 delete mode 100644 docs/modules/index.html
 delete mode 100644 examples/flow-router-advanced/.meteor/.finished-upgraders
 delete mode 100644 examples/flow-router-advanced/.meteor/.gitignore
 delete mode 100644 examples/flow-router-advanced/.meteor/.id
 delete mode 100644 examples/flow-router-advanced/.meteor/packages
 delete mode 100644 examples/flow-router-advanced/.meteor/platforms
 delete mode 100644 examples/flow-router-advanced/.meteor/release
 delete mode 100644 examples/flow-router-advanced/.meteor/versions
 delete mode 100644 examples/flow-router-advanced/README.md
 delete mode 100644 examples/flow-router-advanced/main/client/header.html
 delete mode 100644 examples/flow-router-advanced/main/client/header.js
 delete mode 100644 examples/flow-router-advanced/main/client/layouts.js
 delete mode 100644 examples/flow-router-advanced/main/client/lib/app.js
 delete mode 100644 examples/flow-router-advanced/main/client/lib/patches.js
 delete mode 100644 examples/flow-router-advanced/main/client/lib/polyfills.js
 delete mode 100644 examples/flow-router-advanced/main/client/main.html
 delete mode 100644 examples/flow-router-advanced/main/client/mainLayout.html
 delete mode 100644 examples/flow-router-advanced/main/client/noteOfTheDay.html
 delete mode 100644 examples/flow-router-advanced/main/client/noteOfTheDay.js
 delete mode 100644 examples/flow-router-advanced/main/client/publicLayout.html
 delete mode 100644 examples/flow-router-advanced/main/client/routing.js
 delete mode 100644 examples/flow-router-advanced/main/client/signin.html
 delete mode 100644 examples/flow-router-advanced/main/client/signin.js
 delete mode 100644 examples/flow-router-advanced/main/client/style.css
 delete mode 100644 examples/flow-router-advanced/main/client/t404.html
 delete mode 100644 examples/flow-router-advanced/main/server/startup/fixtures.js
 delete mode 100644 examples/flow-router-advanced/main/server/startup/publish.js
 delete mode 100644 examples/flow-router-advanced/main/server/startup/validateNewUser.js
 delete mode 100644 examples/flow-router-advanced/manageUsers/client/manage-users.html
 delete mode 100644 examples/flow-router-advanced/manageUsers/client/manage-users.js
 delete mode 100644 examples/flow-router-advanced/manageUsers/client/manageController.html
 delete mode 100644 examples/flow-router-advanced/manageUsers/client/manageController.js
 delete mode 100644 examples/flow-router-advanced/manageUsers/client/routing.js
 delete mode 100644 examples/flow-router-advanced/manageUsers/server/manageUsers.js
 delete mode 100644 examples/flow-router-advanced/package-lock.json
 delete mode 100644 examples/flow-router-advanced/package.json
 delete mode 120000 examples/flow-router-advanced/packages/alanning:roles
 delete mode 100644 examples/flow-router-advanced/secrets/client/routing.js
 delete mode 100644 examples/flow-router-advanced/secrets/client/secrets.html
 delete mode 100644 examples/flow-router-advanced/secrets/client/secrets.js
 delete mode 100644 examples/flow-router-advanced/secrets/client/secretsController.html
 delete mode 100644 examples/flow-router-advanced/secrets/client/secretsController.js
 delete mode 100644 examples/flow-router-advanced/secrets/model.js
 delete mode 100644 examples/flow-router-advanced/secrets/server/fixtures.js
 delete mode 100644 examples/flow-router-advanced/secrets/server/secrets.js
 delete mode 100644 examples/flow-router/.meteor/.finished-upgraders
 delete mode 100644 examples/flow-router/.meteor/.gitignore
 delete mode 100644 examples/flow-router/.meteor/.id
 delete mode 100644 examples/flow-router/.meteor/packages
 delete mode 100644 examples/flow-router/.meteor/platforms
 delete mode 100644 examples/flow-router/.meteor/release
 delete mode 100644 examples/flow-router/.meteor/versions
 delete mode 100644 examples/flow-router/client/client.js
 delete mode 100644 examples/flow-router/client/example.css
 delete mode 100644 examples/flow-router/client/example.html
 delete mode 100644 examples/flow-router/client/layouts.html
 delete mode 100644 examples/flow-router/client/layouts.js
 delete mode 100644 examples/flow-router/client/lib/globals.js
 delete mode 100644 examples/flow-router/client/manage-users.html
 delete mode 100644 examples/flow-router/client/manage-users.js
 delete mode 100644 examples/flow-router/client/routing.js
 delete mode 100644 examples/flow-router/client/secrets.html
 delete mode 100644 examples/flow-router/client/secrets.js
 delete mode 100644 examples/flow-router/model.js
 delete mode 100644 examples/flow-router/package-lock.json
 delete mode 100644 examples/flow-router/package.json
 delete mode 120000 examples/flow-router/packages/alanning:roles
 delete mode 100644 examples/flow-router/server/server.js
 delete mode 100644 examples/iron-router/.meteor/.finished-upgraders
 delete mode 100644 examples/iron-router/.meteor/.gitignore
 delete mode 100644 examples/iron-router/.meteor/.id
 delete mode 100644 examples/iron-router/.meteor/packages
 delete mode 100644 examples/iron-router/.meteor/platforms
 delete mode 100644 examples/iron-router/.meteor/release
 delete mode 100644 examples/iron-router/.meteor/versions
 delete mode 100644 examples/iron-router/client/client.js
 delete mode 100644 examples/iron-router/client/example.css
 delete mode 100644 examples/iron-router/client/example.html
 delete mode 100644 examples/iron-router/client/lib/globals.js
 delete mode 100644 examples/iron-router/client/manage-users.html
 delete mode 100644 examples/iron-router/client/manage-users.js
 delete mode 100644 examples/iron-router/client/routing.js
 delete mode 100644 examples/iron-router/client/secrets.html
 delete mode 100644 examples/iron-router/client/secrets.js
 delete mode 100644 examples/iron-router/model.js
 delete mode 100644 examples/iron-router/package-lock.json
 delete mode 100644 examples/iron-router/package.json
 delete mode 120000 examples/iron-router/packages/alanning:roles
 delete mode 100644 examples/iron-router/server/server.js
 delete mode 100644 package-lock.json
 delete mode 100644 package-types.json
 rename {roles => packages/roles}/.gitignore (100%)
 rename {roles => packages/roles}/README.md (100%)
 rename {roles => packages/roles}/client/debug.js (100%)
 rename {roles => packages/roles}/client/uiHelpers.js (100%)
 rename definitions.d.ts => packages/roles/definitions.d.ts (100%)
 rename package.js => packages/roles/package.js (63%)
 rename {roles => packages/roles}/roles_client.js (100%)
 rename {roles => packages/roles}/roles_common_async.js (100%)
 rename {roles => packages/roles}/roles_server.js (86%)
 rename {roles => packages/roles}/tests/client.js (98%)
 rename {roles => packages/roles}/tests/clientAsync.js (97%)
 rename {roles => packages/roles}/tests/serverAsync.js (99%)
 delete mode 100644 testapp2/.coverage.json
 delete mode 100644 testapp2/.gitignore
 delete mode 100644 testapp2/.meteor/.finished-upgraders
 delete mode 100644 testapp2/.meteor/.gitignore
 delete mode 100644 testapp2/.meteor/.id
 delete mode 100644 testapp2/.meteor/packages
 delete mode 100644 testapp2/.meteor/platforms
 delete mode 100644 testapp2/.meteor/release
 delete mode 100644 testapp2/.meteor/versions
 delete mode 100644 testapp2/package-lock.json
 delete mode 100644 testapp2/package.json
 delete mode 100644 testapp3/.gitignore
 delete mode 100644 testapp3/.meteor/.finished-upgraders
 delete mode 100644 testapp3/.meteor/.gitignore
 delete mode 100644 testapp3/.meteor/.id
 delete mode 100644 testapp3/.meteor/packages
 delete mode 100644 testapp3/.meteor/platforms
 delete mode 100644 testapp3/.meteor/release
 delete mode 100644 testapp3/.meteor/versions
 delete mode 100644 testapp3/package-lock.json
 delete mode 100644 testapp3/package.json
 delete mode 100644 yuidoc.json

diff --git a/.coverage.json b/.coverage.json
deleted file mode 100644
index 918fc8889e..0000000000
--- a/.coverage.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "include": [
-    "**/packages/roles/**/*",
-    "**/packages/*alanning_roles.js"
-  ]
-}
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
deleted file mode 100644
index 153f301b10..0000000000
--- a/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# Contributing to Meteor Roles
-
-Any contribution to this repository is highly appreciated!
-
-## Setup development env
-
-### Clone project and create a new branch to work on
-
-First, clone this repository and create a new branch to work on.
-Branch names should follow the GitFlow standard and start with a descriptive prefix of their intended outcome, for example:
-
-- `feature/` for features
-- `fix/` for general fixes
-
-Then the name of the branch should describe the purpose of the branch and potentially reference the issue number it is solving.
-
-```shell
-$ git clone git@github.com:Meteor-Community-Packages/meteor-roles.git
-$ cd meteor-roles
-$ git checkout -b fix/some-issue
-```
-
-### Initialize test app
-
-We use a proxy Meteor application to run our tests and handle coverage etc.
-This app contains several npm scripts to provide the complete toolchain that is required
-for your development and testing needs.
-
-The setup is very easy. Go into the `testapp` directory, install dependencies and link
-the package:
-
-```shell
-$ cd testapp
-$ meteor npm install
-$ meteor npm run setup # this is important for the tools to work!
-```
-
-## Development toolchain
-
-The `testapp` comes with some builtin scripts you can utilize during your development.
-They will also be picked up by our CI during pull requests.
-Therefore, it's a good call for you, that if they pass or fail, the CI will do so, too.
-
-**Note: all tools require the npm `setup` script has been executed at least once!**
-
-### Linter
-
-We use `standard` as our linter. You can run either the linter or use it's autofix feature for
-the most common issues:
-
-```shell
-# in testapp
-$ meteor npm run lint # show only outputs
-$ meteor npm run lint:fix # with fixes + outputs
-```
-
-### Tests
-
-We provide three forms of tests: once, watch, coverage
-
-#### Once
-
-Simply runs the test suite once, without coverage collection:
-
-```shell
-$ meteor npm run test
-```
-
-#### Watch
-
-Runs the test suite in watch mode, good to use during active development, where your changes
-are picked up automatically to re-run the tests:
-
-```shell
-$ meteor npm run test:watch
-```
-
-#### Coverage
-
-Runs the test suite once, including coverage report generation.
-Generates an html and json report output.
-
-```shell
-$ meteor npm run test:coverage
-$ meteor npm run report # summary output in console
-```
-
-If you want to watch the HTML output to find (un)covered lines, open
-the file at `testapp/.coverage/index.html` in your browser.
-
-## Open a pull request
-
-If you open a pull request, please make sure the following requirements are met:
-
-- the `lint` script is passing
-- the `test` script is passing
-- your contribution is on point and solves one issue (not multiple)
-- your commit messages are descriptive and informative
-- complex changes are documented in the code with comments or jsDoc-compatible documentation
-
-Please understand, that there will be a review process and your contribution
-might require changes before being merged. This is entirely to ensure quality and is
-never used as a personal offense.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index ad1babd0f6..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-<!-- Read a guide on [opening issues](https://opensource.guide/how-to-contribute/#opening-an-issue) -->
-**Describe the bug**
-
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-
-If applicable, add screenshots to help explain your problem.
-
-**Versions (please complete the following information):**
- - Meteor version: [e.g. 1.8.2]
- - Browser: [e.g. Firefox, Chrome, Safari]
- - Version: [e.g. 1.0.0]
-
-**Additional context**
-
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index a294cc207e..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-<!-- Read a guide on [opening issues](https://opensource.guide/how-to-contribute/#opening-an-issue) -->
-**Is your feature request related to a problem? Please describe.**
-
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-
-Add any other context or screenshots about the feature request here.
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
deleted file mode 100644
index a1d376063a..0000000000
--- a/.github/SECURITY.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Unless otherwise noted, MCP packages and projects support the latest version of Meteor.
-As of the time of writing this in September 2023 it is Meteor 2.13 and, in general the 2.x series.
-Support for Meteor 1.x is not guaranteed and at best can include Meteor 1.12.1.
-At the present time, we are also preparing to support Meteor 3.0 which is in development.
-
-| Meteor Version | Supported          |
-| -------------- | ------------------ |
-| 3.0            | 🚧                 |
-| > 2.0          | ✅                 |
-| < 1.12         | ❌                 |
-
-## Reporting a Vulnerability
-
-We are not providing support for Meteor itself. See their [SECURITY](https://github.com/meteor/meteor/blob/devel/SECURITY.md) for more information.
-
-Any security concerns should be first raised in the repository of the affected package.
-If you want to report a vulnerability privately, please contact the maintainer of the package directly.
-If you are not sure who that is, you can contact one of the following people, and they will take it from there:
-
-Jan Dvorak
-hello+mcp-security@jandvorak.me
-
diff --git a/.github/workflows/comment-issue.yml b/.github/workflows/comment-issue.yml
deleted file mode 100644
index e654d4f304..0000000000
--- a/.github/workflows/comment-issue.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Add immediate comment on new issues
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  createComment:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create Comment
-        uses: peter-evans/create-or-update-comment@v1.4.2
-        with:
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Thank you for submitting this issue!
-            
-            We, the Members of Meteor Community Packages take every issue seriously.
-            Our goal is to provide long-term lifecycles for packages and keep up
-            with the newest changes in Meteor and the overall NodeJs/JavaScript ecosystem.
-            
-            However, we contribute to these packages mostly in our free time.
-            Therefore, we can't guarantee your issues to be solved within certain time.
-            
-            If you think this issue is trivial to solve, don't hesitate to submit
-            a pull request, too! We will accompany you in the process with reviews and hints
-            on how to get development set up.
-            
-            Please also consider sponsoring the maintainers of the package.
-            If you don't know who is currently maintaining this package, just leave a comment
-            and we'll let you know
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
deleted file mode 100644
index b67889615b..0000000000
--- a/.github/workflows/testsuite.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-# the test suite runs the tests (headless, server+client) for multiple Meteor releases
-name: Test suite
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  lint:
-    name: Javascript standard lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-20-
-
-      - run: cd testapp3 && npm ci && npm run setup && npm run lint
-
-  test2:
-    name: Meteor package tests 2.16
-    needs: [lint]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        meteorRelease:
-          - '2.16'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 14
-
-      - name: Setup meteor ${{ matrix.meteorRelease }}
-        uses: meteorengineer/setup-meteor@v1
-        with:
-          meteor-release: ${{ matrix.meteorRelease }}
-
-      - name: cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-14-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-14-
-
-      - run: cd testapp2 && npm ci && npm run setup && npm run test
-
-  test3:
-    name: Meteor package tests 3.0.2
-    needs: [lint]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        meteorRelease:
-          - '3.0.2'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Setup meteor ${{ matrix.meteorRelease }}
-        uses: meteorengineer/setup-meteor@v1
-        with:
-          meteor-release: ${{ matrix.meteorRelease }}
-
-      - name: cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-20-
-
-      - run: cd testapp3 && npm ci && npm run setup && npm run test
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 31bff41266..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-*.swp
-
-pids
-logs
-results
-
-npm-debug.log
-smart.lock
-
-.idea
-.DS_Store
-node_modules/
-.npm/
-.coverage/
-
-examples/react-teams/.meteor/local/build/programs/server/node_modules
diff --git a/.meteorignore b/.meteorignore
deleted file mode 100644
index e5abd9bb74..0000000000
--- a/.meteorignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/testapp
-/tests
-**/*tests.js
-/examples
diff --git a/.versions b/.versions
deleted file mode 100644
index 2dd420f2f6..0000000000
--- a/.versions
+++ /dev/null
@@ -1,64 +0,0 @@
-accounts-base@3.0.1
-alanning:roles@4.0.0
-allow-deny@2.0.0
-babel-compiler@7.11.0
-babel-runtime@1.5.2
-base64@1.0.13
-binary-heap@1.0.12
-boilerplate-generator@2.0.0
-callback-hook@1.6.0
-check@1.4.2
-core-runtime@1.0.0
-ddp@1.4.2
-ddp-client@3.0.1
-ddp-common@1.4.4
-ddp-rate-limiter@1.2.2
-ddp-server@3.0.1
-diff-sequence@1.1.3
-dynamic-import@0.7.4
-ecmascript@0.16.9
-ecmascript-runtime@0.8.2
-ecmascript-runtime-client@0.12.2
-ecmascript-runtime-server@0.11.1
-ejson@1.1.4
-facts-base@1.0.2
-fetch@0.1.5
-geojson-utils@1.0.12
-http@1.4.4
-id-map@1.2.0
-inter-process-messaging@0.1.2
-lmieulet:meteor-coverage@5.0.0
-lmieulet:meteor-legacy-coverage@0.4.0
-local-test:alanning:roles@4.0.0
-localstorage@1.2.1
-logging@1.3.5
-meteor@2.0.1
-meteortesting:browser-tests@1.7.0
-meteortesting:mocha@3.2.0
-meteortesting:mocha-core@8.2.0
-minimongo@2.0.1
-modern-browsers@0.1.11
-modules@0.20.1
-modules-runtime@0.13.2
-mongo@2.0.1
-mongo-decimal@0.1.4-beta300.7
-mongo-dev-server@1.1.1
-mongo-id@1.0.9
-npm-mongo@4.17.4
-ordered-dict@1.2.0
-promise@1.0.0
-random@1.2.2
-rate-limit@1.1.2
-react-fast-refresh@0.2.9
-reactive-var@1.0.13
-reload@1.3.2
-retry@1.1.1
-routepolicy@1.1.2
-socket-stream-client@0.5.3
-tracker@1.3.4
-typescript@5.4.3
-underscore@1.6.4
-url@1.3.3
-webapp@2.0.1
-webapp-hashing@1.1.2
-zodern:types@1.0.13
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 9db04a005b..0000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# Contributing to Meteor Roles
-
-Any contribution to this repository is highly appreciated!
-
-## Setup development env
-
-### Clone project and create a new branch to work on
-
-First, clone this repository and create a new branch to work on.
-Branch names should follow the GitFlow standard and start with a descriptive prefix of their intended outcome, for example:
-
-- `feature/` for features
-- `fix/` for general fixes
-
-Then the name of the branch should describe the purpose of the branch and potentially reference the issue number it is solving.
-
-```shell
-$ git clone git@github.com:Meteor-Community-Packages/meteor-roles.git
-$ cd meteor-roles
-$ git checkout -b fix-some-issue
-```
-
-### Initialize test app
-
-We use a proxy Meteor application to run our tests and handle coverage etc.
-This app contains several npm scripts to provide the complete toolchain that is required
-for your development and testing needs.
-
-The setup is very easy. Go into the `testapp` directory, install dependencies and link
-the package:
-
-```shell
-$ cd testapp
-$ meteor npm install
-$ meteor npm run setup # this is important for the tools to work!
-```
-
-## Development toolchain
-
-The `testapp` comes with some builtin scripts you can utilize during your development.
-They will also be picked up by our CI during pull requests.
-Therefore, it's a good call for you, that if they pass or fail, the CI will do so, too.
-
-**Note: all tools require the npm `setup` script has been executed at least once!**
-
-### Linter
-
-We use `standard` as our linter. You can run either the linter or use it's autofix feature for
-the most common issues:
-
-```shell
-# in testapp
-$ meteor npm run lint # show only outputs
-$ meteor npm run lint:fix # with fixes + outputs
-```
-
-### Tests
-
-We provide three forms of tests: once, watch, coverage
-
-#### Once
-
-Simply runs the test suite once, without coverage collection:
-
-```shell
-$ meteor npm run test
-```
-
-#### Watch
-
-Runs the test suite in watch mode, good to use during active development, where your changes
-are picked up automatically to re-run the tests:
-
-```shell
-$ meteor npm run test:watch
-```
-
-#### Coverage
-
-Runs the test suite once, including coverage report generation.
-Generates an html and json report output.
-
-```shell
-$ meteor npm run test:coverage
-$ meteor npm run report # summary output in console
-```
-
-If you want to watch the HTML output to find (un)covered lines, open
-the file at `testapp/.coverage/index.html` in your browser.
-
-## Open a pull request
-
-If you open a pull request, please make sure the following requirements are met:
-
-- the `lint` script is passing
-- the `test` script is passing
-- your contribution is on point and solves one issue (not multiple)
-- your commit messages are descriptive and informative
-- complex changes are documented in the code with comments or jsDoc-compatible documentation
-
-Please understand, that there will be a review process and your contribution
-might require changes before being merged. This is entirely to ensure quality and is
-never used as a personal offense.
diff --git a/History.md b/History.md
deleted file mode 100644
index d427489ebf..0000000000
--- a/History.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Changelog
-
-## v4.0.0
-
-* BREAKING: Synchronous functions are now available only on client side
-* BREAKING: Migration functions for past versions are no longer available
-* Removed deprecated publication of legacy role assignments
-* UI Helpers now use `console.debug` for debugging messages
-* `RolesCollection` and `RoleAssignmentsCollection` can now be exported in addition to being accessed via `Meteor.roles` and `Meteor.roleAssignment`
-* Support for Meteor 3
-
-## v3.6.3
-
-* Added missing dependency on the `ddp` package [@storytellercz](https://github.com/sponsors/StorytellerCZ)
-* Updated Blaze weak dependency to v2.9 [@storytellercz](https://github.com/sponsors/StorytellerCZ)
-
-## v3.6.2
-
-* Fixed TypeScript definition to play nice with Meteor definition [#389](https://github.com/Meteor-Community-Packages/meteor-roles/pull/389) [@bruceborrett](https://github.com/sponsors/bruceborrett)
-
-## v3.6.1
-
-* Added types for async functions [#386](https://github.com/Meteor-Community-Packages/meteor-roles/pull/386) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
-* Updated docs with async functions [@storytellercz](https://github.com/sponsors/StorytellerCZ)
-* Updated `zodern:types` to v1.0.11
-
-## v3.6.0
-
-* Added async versions of functions [#361](https://github.com/Meteor-Community-Packages/meteor-roles/pull/361) [#378](https://github.com/Meteor-Community-Packages/meteor-roles/pull/378) [@bratelefant](https://github.com/bratelefant) [@storytellercz](https://github.com/sponsors/StorytellerCZ) [@jankapunkt](https://github.com/sponsors/jankapunkt)
-* Added missing types [#383](https://github.com/Meteor-Community-Packages/meteor-roles/pull/383) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
-* Add complete test suite [#375](https://github.com/Meteor-Community-Packages/meteor-roles/pull/375) [@jankapunkt](https://github.com/sponsors/jankapunkt) [#380](https://github.com/Meteor-Community-Packages/meteor-roles/pull/380) [@bratelefant](https://github.com/bratelefant)
-
-## v3.5.1
-
-* Fix for index creation functions losing context [#371](https://github.com/Meteor-Community-Packages/meteor-roles/pull/371) [@copleykj](https://github.com/sponsors/copleykj)
-
-## v3.5.0
-
-* Bump `blaze` weak dependency to v2.7.1
-* Bring types to the core and update them [#365](https://github.com/Meteor-Community-Packages/meteor-roles/pull/365) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
-* If you use Meteor 2.8+ indexes are now created using the new async method [#366](https://github.com/Meteor-Community-Packages/meteor-roles/pull/366) [@storytellercz](https://github.com/sponsors/StorytellerCZ)
-
-## v3.4.0
-
-* Use the new `createIndex` instead of `_ensureIndex` if available
-
-## v3.3.0
-
-* Update dependencies
-* Made compatible with Meteor 2.3
-
-## v3.2.3
-
-* Update dependencies
-* Update roles_common.js jsdoc documentation [#321](https://github.com/Meteor-Community-Packages/meteor-roles/pull/321)([@kulttuuri](https://github.com/kulttuuri))
-* Function `userIsInRole` should return false if a function is given as user [#324](https://github.com/Meteor-Community-Packages/meteor-roles/pull/324)([@Floriferous](https://github.com/Floriferous))
-
-## v3.2.2
-
-* Fixed fails like `rev.push is not a function` and `number 1 is not iterable (cannot read property Symbol(Symbol.iterator))` calling `Roles.getRolesForUser()`
-
-## v3.2.1_1
-
-* Republish without dev-dependencies
-
-## v3.2.1
-
-* `Roles.getRolesForUser()` should not fail during a call of `Roles.addUsersToRoles()` [#311](https://github.com/Meteor-Community-Packages/meteor-roles/pull/311) ([@ggerber](https://github.com/ggerber))
-
-## v3.2.0
-
-* New option `onlyScope` on getUsersInRole() returning only users having this role in a scoped assignment [#298](https://github.com/Meteor-Community-Packages/meteor-roles/pull/298)
-
-## v3.1.0
-
-* Allow setUserRoles() to replace the roles of all scopes [#294](https://github.com/Meteor-Community-Packages/meteor-roles/pull/294)
-
-## v3.0.0
-
-* Role assignments have been moved from the `users` documents to a separate collection called `role-assignment`, available at `Meteor.roleAssignment`.
-* Role assignments are not published automatically. If you want all your role-assignments to be published automatically please include the following code:
-```js
-Meteor.publish(null, function () {
-  if (this.userId) {
-    return Meteor.roleAssignment.find({ 'user._id': this.userId });
-  } else {
-    this.ready()
-  }
-})
-```
-* [BC] The behavior of `getRolesForUser()` used with the option `fullObjects` changed. [In case you need the old behavior ...](https://github.com/Meteor-Community-Packages/meteor-roles/pull/276/commits/41d2ed493852f21cf508b5b0b76e4f8a09ae8f5c#diff-b2ab7f7879884835e55802c6a35ee27e)
-* Added option `anyScope` to `removeUsersFromRoles()`
-* Add option `onlyScoped` to `getRolesForUser()` to allow limiting the result to only scoped permissions
-* All functions (excepted for those listed above) work with 2.x arguments, but in 3.x accept extra arguments and/or options.
-* Details and reasoning can be found in [#276](https://github.com/Meteor-Community-Packages/meteor-roles/pull/276)
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 06ed2e36b5..0000000000
--- a/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Adrian Lanning <alanning@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index d5e54279ec..0000000000
--- a/README.md
+++ /dev/null
@@ -1,514 +0,0 @@
-meteor-roles v3
-===============
-[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
-![GitHub](https://img.shields.io/github/license/Meteor-Community-Packages/meteor-roles)
-[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
-[![CodeQL](https://github.com/Meteor-Community-Packages/meteor-roles/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/Meteor-Community-Packages/meteor-roles/actions/workflows/github-code-scanning/codeql)
-![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/Meteor-Community-Packages/meteor-roles?label=latest&sort=semver)
-[![](https://img.shields.io/badge/semver-2.0.0-success)](http://semver.org/spec/v2.0.0.html) 
-
-Authorization package for Meteor - compatible with built-in accounts package.
-
-There are also older versions of this package:
-* [v1](https://github.com/Meteor-Community-Packages/meteor-roles/tree/v1)
-* [v2](https://github.com/Meteor-Community-Packages/meteor-roles/tree/v2)
-* [v3](https://github.com/Meteor-Community-Packages/meteor-roles/tree/v3)
-
-<br />
-
-<a id="roles-toc" name="roles-toc"></a>
-## Table of Contents
-- [meteor-roles v3](#meteor-roles-v3)
-  - [Table of Contents](#table-of-contents)
-  - [Contributors](#contributors)
-  - [Authorization](#authorization)
-  - [Permissions vs roles  (or What's in a name...)](#permissions-vs-roles--or-whats-in-a-name)
-  - [What are "scopes"?](#what-are-scopes)
-  - [Changes to default Meteor behavior](#changes-to-default-meteor-behavior)
-  - [Installing](#installing)
-  - [Migration to 3.0](#migration-to-30)
-    - [Changes between 2.x and 3.0](#changes-between-2x-and-30)
-  - [Usage Examples](#usage-examples)
-  - [API Docs](#api-docs)
-  - [Example Apps](#example-apps)
-  - [Contributions, development and tests](#contributions-development-and-tests)
-
-<br />
-
-
-<a id="roles-contributors" name="roles-contributors"></a>
-## Contributors
-
-Thanks to:
-
-  * [@storytellerCZ](https://github.com/sponsors/StorytellerCZ)
-  * [@jankapunkt](https://github.com/sponsors/jankapunkt)
-  * [@alanning](https://github.com/alanning)
-  * [@mitar](https://github.com/mitar)
-  * [@challett](https://github.com/challett)
-  * [@ianserlin](https://github.com/ianserlin)
-  * [@leebenson](https://github.com/leebenson)
-  * [@pward123](https://github.com/pward123)
-  * [@dandv](https://github.com/dandv)
-  * [@aldeed](https://github.com/aldeed)
-  * [@kevb](https://github.com/kevb)
-  * [@zimme](https://github.com/zimme)
-  * [@danieljonce](https://github.com/danieljonce)
-  * [@pascoual](https://github.com/pascoual)
-  * [@nickmoylan](https://github.com/nickmoylan)
-  * [@mcrider](https://github.com/mcrider)
-  * [@simonsimcity](https://github.com/simonsimcity)
-
-<br />
-
-
-<a id="roles-authorization" name="roles-authorization"></a>
-## Authorization
-
-This package lets you attach roles to a user, which you can then check against later when deciding whether to grant
-access to Meteor methods or publish data. The core concept is very simple, essentially you are creating an assignment
-of roles to a user and then checking for the existence of those roles later. This package provides helper methods
-to make the process of adding, removing, and verifying those roles easier.
-
-<br />
-
-<a id="roles-naming" name="roles-naming"></a>
-## Permissions vs roles  (or What's in a name...)
-
-Although the name of this package is `roles`, you can define your **roles**, **scopes** or **permissions** however you like.
-They are essentially just tags that you assign to a user and which you can check upon later.
-
-You can have traditional roles like, `admin` or `webmaster`, or you can assign more granular permissions such
-as, `view-secrets`, `users.view`, or `users.manage`.  Often, more granular is actually better because you are
-able to handle all those pesky edge cases that come up in real-life usage without creating a ton of higher-level
-`roles`.  With the `roles` package, it's all just a role object.
-
-Roles can be put into a **hierarchy**.
-Roles can have multiple parents and can be children (subroles) of multiple roles.
-If a parent role is set to the user, all its descendants are also applying.
-You can use this to create "super roles" aggregating permissions all the way through the bottom of the tree.
-For example, you could name two top-level roles `user` and `admin` and then you could use your second-level roles as permissions and name them `USERS_VIEW`, `POST_EDIT`, and similar.
-Then you could set `admin` role as parent role for `USERS_VIEW` and `POST_EDIT`, while `user` would be parent
-only of the `POST_EDIT` role. You can then assign `user` and `admin` roles to your users. And if you need to
-change permissions later for the whole role, just add or remove children roles. You can create roles from this example
-with:
-
-```javascript
-import { Roles } from 'meteor/alanning:roles';
-
-Roles.createRoleAsync('user');
-Roles.createRoleAsync('admin');
-Roles.createRoleAsync('USERS_VIEW');
-Roles.createRoleAsync('POST_EDIT');
-Roles.addRolesToParentAsync('USERS_VIEW', 'admin');
-Roles.addRolesToParentAsync('POST_EDIT', 'admin');
-Roles.addRolesToParentAsync('POST_EDIT', 'user');
-```
-
-<br />
-
-<a id="roles-scopes" name="roles-scopes"></a>
-## What are "scopes"?
-
-Sometimes it is useful to let a user have independent sets of roles. The `roles` package calls these independent
-sets "scopes" for lack of a better term. You can use them to represent various communities inside your
-application. Or maybe your application supports [multiple tenants](https://en.wikipedia.org/wiki/Multitenancy).
-You can put each of those tenants into their own scope. Alternatively, you can use scopes to represent
-various resources you have.
-
-Users can have both scope roles assigned, and global roles. Global roles are in effect for all scopes.
-But scopes are independent of each other. Users can have one set of roles in scope A and another set
-of roles in scope B. Let's go through an example of this using soccer/football teams as scopes.
-
-```javascript
-Roles.addUsersToRolesAsync(joesUserId, ['manage-team','schedule-game'], 'manchester-united.com');
-Roles.addUsersToRolesAsync(joesUserId, ['player','goalie'], 'real-madrid.com');
-
-Roles.userIsInRoleAsync(joesUserId, 'manage-team', 'manchester-united.com'); // true
-Roles.userIsInRoleAsync(joesUserId, 'manage-team', 'real-madrid.com'); // false
-```
-
-In this example, we can see that Joe manages Manchester United and plays for Real Madrid. By using scopes, we can
-assign roles independently and make sure that they don't get mixed up between scopes.
-
-Now, let's take a look at how to use the global roles. Say we want to give Joe permission to do something across
-all of our scopes. That is what the global roles are for:
-
-```javascript
-Roles.addUsersToRolesAsync(joesUserId, 'super-admin', null); // Or you could just omit the last argument.
-
-const isInRole = await Roles.userIsInRoleAsync(joesUserId, ['manage-team', 'super-admin'], 'real-madrid.com')
-if (isInRole) {
-  // True! Even though Joe doesn't manage Real Madrid, he has
-  // a 'super-admin' global role so this check succeeds.
-}
-```
-
-<br />
-
-<a id="roles-changes" name="roles-changes"></a>
-## Changes to default Meteor behavior
-
-  1. A new collection `Meteor.roleAssignment` contains the information about which role has been assigned to which user.
-  1. A new collection `Meteor.roles` contains a global list of defined role names.
-  1. All existing roles are automatically published to the client.
-
-<br />
-
-<a id="roles-installing" name="roles-installing"></a>
-## Installing
-
-1. Add one of the built-in accounts packages so the `Meteor.users` collection exists. From a command prompt:
-    ```bash
-    meteor add accounts-password
-    ```
-
-1. Add this package to your project. From a command prompt:
-    ```bash
-    meteor add alanning:roles
-    ```
-
-1. Publish the role assignments you need to the client:
-    ```js
-    Meteor.publish(null, function () {
-      if (this.userId) {
-        return Meteor.roleAssignment.find({ 'user._id': this.userId });
-      } else {
-        this.ready()
-      }
-    })
-    ```
-
-1. Run your application:
-    ```bash
-    meteor
-    ```
-
-<br />
-
-<a id="roles-migration" name="roles-migration"></a>
-## Migration to 4.0
-
-If you are currently using this package in a version older than 3.6, please upgrade to 3.6 and follow all the steps described for previous major version upgrades.
-Make sure to stay on 3.x until you have run the migration scripts as those are no longer available in version 4.
-
-Before upgrading to version 4 make sure that all your server side roles call use the async versions of the functions.
-
-Here is a full list of new async functions:
-  * createRoleAsync
-  * deleteRoleAsync
-  * renameRoleAsync
-  * addRolesToParentAsync
-  * removeRolesFromParentAsync
-  * addUsersToRolesAsync
-  * setUserRolesAsync
-  * removeUsersFromRolesAsync
-  * userIsInRoleAsync
-  * getRolesForUserAsync
-  * getUsersInRoleAsync
-  * getGroupsForUserAsync
-  * getScopesForUserAsync
-  * renameScopeAsync
-  * removeScopeAsync
-  * isParentOfAsync
-
-> NOTE: The sync version of these functions are still available on the client.
-
-## Migration to 3.0
-
-If you are currently using this package in a version older than 2.x, please upgrade to 2.0 by running the migration script required there: https://github.com/Meteor-Community-Packages/meteor-roles/tree/v2#migration-to-20
-
-In meteor-roles 3.0, functions are mostly backwards compatible with 2.x, but roles are stored differently in the database. Please take a backup of the `users` collection before migrating. To migrate the database to the new schema, run `Meteor._forwardMigrate2()` on the server:
-
-```bash
-meteor shell
-> Package['alanning:roles'].Roles._forwardMigrate2()
-```
-
-In case something fails, there is also a script available for rolling back the changes. But be warned that a backward migration takes a magnitude longer than a forward migration. To migrate the database back to the old schema, run `Meteor._backwardMigrate2()` on the server:
-
-```bash
-meteor shell
-> Package['alanning:roles'].Roles._backwardMigrate2()
-```
-
-### Changes between 2.x and 3.0
-
-Here is the list of important changes between meteor-roles 2.x and 3.0 to consider when migrating to 3.0:
-
-* Role assignments have been moved from the `users` documents to a separate collection called `role-assignment`, available at `Meteor.roleAssignment`.
-* Role assignments are not published automatically. If you want all your role-assignments to be published automatically, please include the following code:
-```js
-Meteor.publish(null, function () {
-  if (this.userId) {
-    return Meteor.roleAssignment.find({ 'user._id': this.userId });
-  } else {
-    this.ready()
-  }
-})
-```
-* [BC] The behavior of `getRolesForUser()` used with the option `fullObjects` changed. [In case you need the old behavior ...](https://github.com/Meteor-Community-Packages/meteor-roles/pull/276/commits/41d2ed493852f21cf508b5b0b76e4f8a09ae8f5c#diff-b2ab7f7879884835e55802c6a35ee27e)
-* Added option `anyScope` to `removeUsersFromRoles()`
-* Add option `onlyScoped` to `getRolesForUser()` to allow limiting the result to only scoped permissions
-* All functions (excepted for those listed above) work with 2.x arguments, but in 3.x accept extra arguments and/or options.
-* Details and reasoning can be found in [#276](https://github.com/Meteor-Community-Packages/meteor-roles/pull/276)
-
-<br />
-
-
-<a id="roles-usage" name="roles-usage"></a>
-## Usage Examples
-
-<br />
-
-Here are some potential use cases:
-
-<br />
-
--- **Server** --
-
-
-Add users to roles:
-```js
-var users = [
-      {name:"Normal User",email:"normal@example.com",roles:[]},
-      {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
-      {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
-      {name:"Admin User",email:"admin@example.com",roles:['admin']}
-    ];
-
-for (const user of users) {
-  var id;
-
-  id = await Accounts.createUserAsync({
-    email: user.email,
-    password: "apple1",
-    profile: { name: user.name }
-  });
-
-  const count = await Meteor.roleAssignment.coundDocuments({ 'user._id': id })
-  if (count === 0) {
-    import { Roles } from 'meteor/alanning:roles';
-    
-    for (const role of user.roles)  {
-      Roles.createRoleAsync(role, {unlessExists: true});
-    }
-    // Need _id of existing user record so this call must come after `Accounts.createUser`.
-    Roles.addUsersToRolesAsync(id, user.roles);
-  }
-
-}
-```
-
-<br />
-Note that the `Roles.addUsersToRoles` call needs to come _after_ `Accounts.createUser` or else
-the roles package won't be able to find the user record (since it hasn't been created yet).
-You can use `postSignUpHook` to assign roles when using
-[user accounts package](https://github.com/meteor-useraccounts/core).
-This SO answer gives more detail: http://stackoverflow.com/a/22650399/219238
-
-<br />
-
-Check user roles before publishing sensitive data:
-```js
-// server/publish.js
-import { Roles } from 'meteor/alanning:roles'
-
-// Give authorized users access to sensitive data by scope
-Meteor.publish('secrets', async function (scope) {
-  check(scope, String);
-
-  const isInRole = await Roles.userIsInRoleAsync(this.userId, ['view-secrets','admin'], scope)
-  if (isInRole) {
-    
-    return Meteor.secrets.find({scope: scope});
-    
-  } else {
-
-    // user not authorized. do not publish secrets
-    this.stop();
-    return;
-
-  }
-});
-```
-
-<br />
-
-Prevent non-authorized users from creating new users:
-```js
-Accounts.validateNewUser(async function (user) {
-  import { Roles } from 'meteor/alanning:roles'
-  
-  var loggedInUser = Meteor.user();
-
-  const isInRole = await Roles.userIsInRoleAsync(loggedInUser, ['admin','manage-users'])
-  if () {
-    return true;
-  }
-
-  throw new Meteor.Error('unauthorized', "Not authorized to create new users");
-});
-```
-
-<br />
-
-Prevent access to certain functionality, such as deleting a user:
-```js
-// server/userMethods.js
-import { Roles } from 'meteor/alanning:roles'
-
-Meteor.methods({
-  /**
-   * Revokes roles for a user in a specific scope.
-   * 
-   * @method revokeUser
-   * @param {String} targetUserId ID of user to revoke roles for.
-   * @param {String} scope Company to update roles for.
-   */
-  revokeUser: async function (targetUserId, scope) {
-    check(targetUserId, String);
-    check(scope, String);
-  
-    const loggedInUser = Meteor.user();
-
-    const isInRole = await Roles.userIsInRole(loggedInUser, ['manage-users', 'support-staff'], scope);
-    if (!loggedInUser || !isInRole) {
-      throw new Meteor.Error('access-denied', "Access denied")
-    }
-
-    // remove roles for target scope
-    Roles.setUserRolesAsync(targetUserId, [], scope)
-  }
-})
-```
-
-<br />
-
-Manage a user's roles:
-```js
-// server/userMethods.js
-import { Roles } from 'meteor/alanning:roles'
-
-Meteor.methods({
-  /**
-   * Update a user's roles.
-   *
-   * @param {Object} targetUserId Id of user to update.
-   * @param {Array} roles User's new roles.
-   * @param {String} scope Company to update roles for.
-   */
-  updateRoles: async function (targetUserId, roles, scope) {
-    check(targetUserId, String);
-    check(roles, [String]);
-    check(scope, String);
-
-    const loggedInUser = Meteor.user();
-
-    const isInRole = await Roles.userIsInRole(loggedInUser, ['manage-users', 'support-staff'], scope);
-    if (!loggedInUser || !isInRole) {
-      throw new Meteor.Error('access-denied', "Access denied");
-    }
-
-    Roles.setUserRolesAsync(targetUserId, roles, scope);
-  }
-})
-```
-
-<br />
-
--- **Client** --
-
-Client JavaScript does not by default have access to all the same Roles functions as the server unless you publish
-these role-assignments. In addition, Blaze will have the addition of a `isInRole` handlebars helper which is
-automatically registered by the Roles package.
-
-As with all Meteor applications, client-side checks are a convenience, rather than a true security implementation 
-since Meteor bundles the same client-side code to all users. Providing the Roles functions client-side also allows
-for latency compensation during Meteor method calls. Roles functions which modify the database should not be
-called directly, but inside the Meteor methods.
-
-NOTE: Any sensitive data needs to be controlled server-side to prevent unwanted disclosure. To be clear, Meteor sends
-all templates, client-side JavaScript, and published data to the client's browser. This is by design and is a good thing.
-The following example is just sugar to help improve the user experience for normal users. Those interested in seeing
-the 'admin_nav' template in the example below will still be able to do so by manually reading the bundled `client.js`
-file. It won't be pretty, but it is possible. But this is not a problem as long as the actual data is restricted server-side.
-
-To check for global roles or when not using scopes:
-
-```handlebars
-<!-- client/myApp.html -->
-
-<template name="header">
-  ... regular header stuff
-  {{#if isInRole 'admin'}}
-    {{> admin_nav}}  
-  {{/if}}
-  {{#if isInRole 'admin,editor'}}
-    {{> editor_stuff}}
-  {{/if}}
-</template>
-```
-
-To check for roles when using scopes:
-
-```handlebars
-<!-- client/myApp.html -->
-
-<template name="header">
-  ... regular header stuff
-  {{#if isInRole 'admin,editor' 'group1'}}
-    {{> editor_stuff}}  
-  {{/if}}
-</template>
-```
-
-<br />
-
-
-<a id="roles-docs" name="roles-docs"></a>
-## API Docs
-
-Online API docs found here: https://meteor-community-packages.github.io/meteor-roles/
-
-API docs generated using [YUIDoc](https://yui.github.io/yuidoc/)
-
-To re-generate documentation:
-  1. install YUIDoc
-  2. `cd meteor-roles`
-  3. `yuidoc`
-
-To serve documentation locally:
-  1. install YUIDoc
-  2. `cd meteor-roles`
-  3. `yuidoc --server 5000`
-  4. point browser at http://localhost:5000/
-
-
-<br />
-
-
-<a id="roles-example-apps" name="roles-example-apps"></a>
-## Example Apps
-
-The `examples` directory contains Meteor apps which show off the following features:
-* Server-side publishing with authorization to secure sensitive data
-* Client-side navigation with link visibility based on user roles
-* 'Sign-in required' app with up-front login page using `accounts-ui`
-* Client-side routing
-
-  1. `git clone https://github.com/Meteor-Community-Packages/meteor-roles.git`
-  2. choose an example, eg.
-    * `cd meteor-roles/examples/iron-router` or
-    * `cd meteor-roles/examples/flow-router`
-  3. `meteor`
-  4. point browser to `http://localhost:3000`
-
-<br />
-
-
-<a id="roles-testing" name="roles-testing"></a>
-## Contributions, development and tests
-
-Please read our [contribution guidelines](./CONTRIBUTING.md),
-which also describes how to set up and run the linter and tests.
diff --git a/docs/api.js b/docs/api.js
deleted file mode 100644
index 6aca44ca1b..0000000000
--- a/docs/api.js
+++ /dev/null
@@ -1,25 +0,0 @@
-YUI.add("yuidoc-meta", function(Y) {
-   Y.YUIDoc = { meta: {
-    "classes": [
-        "Roles",
-        "UIHelpers"
-    ],
-    "modules": [
-        "Roles",
-        "UIHelpers"
-    ],
-    "allModules": [
-        {
-            "displayName": "Roles",
-            "name": "Roles",
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nRoles are accessible through `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: 'admin', children: [{_id: 'editor'}]}`\n\nThe assignment of a role to a user is stored in a collection, accessible through `RoleAssignmentCollection`.\nIt's documents consist of\n - `_id`: Internal MongoDB id\n - `role`: A role object which got assigned. Usually only contains the `_id` property\n - `user`: A user object, usually only contains the `_id` property\n - `scope`: scope name\n - `inheritedRoles`: A list of all the roles objects inherited by the assigned role."
-        },
-        {
-            "displayName": "UIHelpers",
-            "name": "UIHelpers",
-            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
-        }
-    ],
-    "elements": []
-} };
-});
\ No newline at end of file
diff --git a/docs/assets/css/external-small.png b/docs/assets/css/external-small.png
deleted file mode 100644
index 759a1cdcb5b1697e5be290d98b830e279cd71f3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzjY&j7RCwBA{Qv(y10{fofkHsB0W2_v
zUBVFtR#sLp=H=xBVFzYr=KaWuf!;khr%J>Ds{zR1^XE?tfB*h@ASKHAa7wwn{MEbP
z7_^nS7{V*>+A}bS;P%45fB%Ai|Neasi2rl3{=EO;!w318%8Ovl7jArHc=P5Brfr~D
z0AYimtss2w$hlYlfd>7*aO3TNzw875LBK0xAD9Np|A(oEVYnB*eE9~V6wP%78SXuL
z&#-X)Er#`zY#Ce<cQE|@_n*NrZu>)^8hM<t@c%yx7=Qlqo#E+=&kU8xDhyfmhZ%Ci
zB^dtyV`g~#;=9AYe+-T|4Pa;I2jl<${xZmkvoM^x_?{uwM}|RLMTp_`2UZ3)Hogb%
z@2x(7(}2e(%NV%1Med)x^p}B+U4TJPLyAFJUXtPFBQCJ`lT(!p@9(X`oen;~J|q6|
z@wSPb3!@4d7=I%C`v334k56{?0OcisymvtS3)uihSYBXcWaI%-d^i%^A0P&W@^_&6
hzgP_zx|s<ezyP)2!%xqD#*+X5002ovPDHLkV1nUx>>B_8

diff --git a/docs/assets/css/logo.png b/docs/assets/css/logo.png
deleted file mode 100644
index c82444af95895d38bea6fe96cc5354a7419f770c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7143
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

diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
deleted file mode 100644
index cdfe209e8d..0000000000
--- a/docs/assets/css/main.css
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
-Font sizes for all selectors other than the body are given in percentages,
-with 100% equal to 13px. To calculate a font size percentage, multiply the
-desired size in pixels by 7.6923076923.
-
-Here's a quick lookup table:
-
-10px - 76.923%
-11px - 84.615%
-12px - 92.308%
-13px - 100%
-14px - 107.692%
-15px - 115.385%
-16px - 123.077%
-17px - 130.769%
-18px - 138.462%
-19px - 146.154%
-20px - 153.846%
-*/
-
-html {
-    background: #fff;
-    color: #333;
-    overflow-y: scroll;
-}
-
-body {
-    /*font: 13px/1.4 'Lucida Grande', 'Lucida Sans Unicode', 'DejaVu Sans', 'Bitstream Vera Sans', 'Helvetica', 'Arial', sans-serif;*/
-    font: 13px/1.4 'Helvetica', 'Arial', sans-serif;
-    margin: 0;
-    padding: 0;
-}
-
-/* -- Links ----------------------------------------------------------------- */
-a {
-    color: #356de4;
-    text-decoration: none;
-}
-
-.hidden {
-    display: none;
-}
-
-a:hover { text-decoration: underline; }
-
-/* "Jump to Table of Contents" link is shown to assistive tools, but hidden from
-   sight until it's focused. */
-.jump {
-    position: absolute;
-    padding: 3px 6px;
-    left: -99999px;
-    top: 0;
-}
-
-.jump:focus { left: 40%; }
-
-/* -- Paragraphs ------------------------------------------------------------ */
-p { margin: 1.3em 0; }
-dd p, td p { margin-bottom: 0; }
-dd p:first-child, td p:first-child { margin-top: 0; }
-
-/* -- Headings -------------------------------------------------------------- */
-h1, h2, h3, h4, h5, h6 {
-    color: #D98527;/*was #f80*/
-    font-family: 'Trebuchet MS', sans-serif;
-    font-weight: bold;
-    line-height: 1.1;
-    margin: 1.1em 0 0.5em;
-}
-
-h1 {
-    font-size: 184.6%;
-    color: #30418C;
-    margin: 0.75em 0 0.5em;
-}
-
-h2 {
-    font-size: 153.846%;
-    color: #E48A2B;
-}
-
-h3 { font-size: 138.462%; }
-
-h4 {
-    border-bottom: 1px solid #DBDFEA;
-    color: #E48A2B;
-    font-size: 115.385%;
-    font-weight: normal;
-    padding-bottom: 2px;
-}
-
-h5, h6 { font-size: 107.692%; }
-
-/* -- Code and examples ----------------------------------------------------- */
-code, kbd, pre, samp {
-    font-family: Menlo, Monaco, 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
-    font-size: 92.308%;
-    line-height: 1.35;
-}
-
-p code, p kbd, p samp, li code {
-    background: #FCFBFA;
-    border: 1px solid #EFEEED;
-    padding: 0 3px;
-}
-
-a code, a kbd, a samp,
-pre code, pre kbd, pre samp,
-table code, table kbd, table samp,
-.intro code, .intro kbd, .intro samp,
-.toc code, .toc kbd, .toc samp {
-    background: none;
-    border: none;
-    padding: 0;
-}
-
-pre.code, pre.terminal, pre.cmd {
-    overflow-x: auto;
-    *overflow-x: scroll;
-    padding: 0.3em 0.6em;
-}
-
-pre.code {
-    background: #FCFBFA;
-    border: 1px solid #EFEEED;
-    border-left-width: 5px;
-}
-
-pre.terminal, pre.cmd {
-    background: #F0EFFC;
-    border: 1px solid #D0CBFB;
-    border-left: 5px solid #D0CBFB;
-}
-
-/* Don't reduce the font size of <code>/<kbd>/<samp> elements inside <pre>
-   blocks. */
-pre code, pre kbd, pre samp { font-size: 100%; }
-
-/* Used to denote text that shouldn't be selectable, such as line numbers or
-   shell prompts. Guess which browser this doesn't work in. */
-.noselect {
-    -moz-user-select: -moz-none;
-    -khtml-user-select: none;
-    -webkit-user-select: none;
-    -o-user-select: none;
-    user-select: none;
-}
-
-/* -- Lists ----------------------------------------------------------------- */
-dd { margin: 0.2em 0 0.7em 1em; }
-dl { margin: 1em 0; }
-dt { font-weight: bold; }
-
-/* -- Tables ---------------------------------------------------------------- */
-caption, th { text-align: left; }
-
-table {
-    border-collapse: collapse;
-    width: 100%;
-}
-
-td, th {
-    border: 1px solid #fff;
-    padding: 5px 12px;
-    vertical-align: top;
-}
-
-td { background: #E6E9F5; }
-td dl { margin: 0; }
-td dl dl { margin: 1em 0; }
-td pre:first-child { margin-top: 0; }
-
-th {
-    background: #D2D7E6;/*#97A0BF*/
-    border-bottom: none;
-    border-top: none;
-    color: #000;/*#FFF1D5*/
-    font-family: 'Trebuchet MS', sans-serif;
-    font-weight: bold;
-    line-height: 1.3;
-    white-space: nowrap;
-}
-
-
-/* -- Layout and Content ---------------------------------------------------- */
-#doc {
-    margin: auto;
-    min-width: 1024px;
-}
-
-.content { padding: 0 20px 0 25px; }
-
-.sidebar {
-    padding: 0 15px 0 10px;
-}
-#bd {
-    padding: 7px 0 130px;
-    position: relative;
-    width: 99%;
-}
-
-/* -- Table of Contents ----------------------------------------------------- */
-
-/* The #toc id refers to the single global table of contents, while the .toc
-   class refers to generic TOC lists that could be used throughout the page. */
-
-.toc code, .toc kbd, .toc samp { font-size: 100%; }
-.toc li { font-weight: bold; }
-.toc li li { font-weight: normal; }
-
-/* -- Intro and Example Boxes ----------------------------------------------- */
-/*
-.intro, .example { margin-bottom: 2em; }
-.example {
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    -moz-box-shadow: 0 0 5px #bfbfbf;
-    -webkit-box-shadow: 0 0 5px #bfbfbf;
-    box-shadow: 0 0 5px #bfbfbf;
-    padding: 1em;
-}
-.intro {
-    background: none repeat scroll 0 0 #F0F1F8; border: 1px solid #D4D8EB; padding: 0 1em;
-}
-*/
-
-/* -- Other Styles ---------------------------------------------------------- */
-
-/* These are probably YUI-specific, and should be moved out of Selleck's default
-   theme. */
-
-.button {
-    border: 1px solid #dadada;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    color: #444;
-    display: inline-block;
-    font-family: Helvetica, Arial, sans-serif;
-    font-size: 92.308%;
-    font-weight: bold;
-    padding: 4px 13px 3px;
-    -moz-text-shadow: 1px 1px 0 #fff;
-    -webkit-text-shadow: 1px 1px 0 #fff;
-    text-shadow: 1px 1px 0 #fff;
-    white-space: nowrap;
-
-    background: #EFEFEF; /* old browsers */
-    background: -moz-linear-gradient(top, #f5f5f5 0%, #efefef 50%, #e5e5e5 51%, #dfdfdf 100%); /* firefox */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(50%,#efefef), color-stop(51%,#e5e5e5), color-stop(100%,#dfdfdf)); /* webkit */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#dfdfdf',GradientType=0 ); /* ie */
-}
-
-.button:hover {
-    border-color: #466899;
-    color: #fff;
-    text-decoration: none;
-    -moz-text-shadow: 1px 1px 0 #222;
-    -webkit-text-shadow: 1px 1px 0 #222;
-    text-shadow: 1px 1px 0 #222;
-
-    background: #6396D8; /* old browsers */
-    background: -moz-linear-gradient(top, #6396D8 0%, #5A83BC 50%, #547AB7 51%, #466899 100%); /* firefox */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#6396D8), color-stop(50%,#5A83BC), color-stop(51%,#547AB7), color-stop(100%,#466899)); /* webkit */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6396D8', endColorstr='#466899',GradientType=0 ); /* ie */
-}
-
-.newwindow { text-align: center; }
-
-.header .version em {
-    display: block;
-    text-align: right;
-}
-
-
-#classdocs .item {
-    border-bottom: 1px solid #466899;
-    margin: 1em 0;
-    padding: 1.5em;
-}
-
-#classdocs .item .params p,
-    #classdocs .item .returns p,{
-    display: inline;
-}
-
-#classdocs .item em code, #classdocs .item em.comment {
-    color: green;
-}
-
-#classdocs .item em.comment a {
-    color: green;
-    text-decoration: underline;
-}
-
-#classdocs .foundat {
-    font-size: 11px;
-    font-style: normal;
-}
-
-.attrs .emits {
-    margin-left: 2em;
-    padding: .5em;
-    border-left: 1px dashed #ccc;
-}
-
-abbr {
-    border-bottom: 1px dashed #ccc;
-    font-size: 80%;
-    cursor: help;
-}
-
-.prettyprint li.L0, 
-.prettyprint li.L1, 
-.prettyprint li.L2, 
-.prettyprint li.L3, 
-.prettyprint li.L5, 
-.prettyprint li.L6, 
-.prettyprint li.L7, 
-.prettyprint li.L8 {
-    list-style: decimal;
-}
-
-ul li p {
-    margin-top: 0;
-}
-
-.method .name {
-    font-size: 110%;
-}
-
-.apidocs .methods .extends .method,
-.apidocs .properties .extends .property,
-.apidocs .attrs .extends .attr,
-.apidocs .events .extends .event {
-    font-weight: bold;
-}
-
-.apidocs .methods .extends .inherited,
-.apidocs .properties .extends .inherited,
-.apidocs .attrs .extends .inherited,
-.apidocs .events .extends .inherited {
-    font-weight: normal;
-}
-
-#hd {
-    background: whiteSmoke;
-    background: -moz-linear-gradient(top,#DCDBD9 0,#F6F5F3 100%);
-    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#DCDBD9),color-stop(100%,#F6F5F3));
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dcdbd9',endColorstr='#F6F5F3',GradientType=0);
-    border-bottom: 1px solid #DFDFDF;
-    padding: 0 15px 1px 20px;
-    margin-bottom: 15px;
-}
-
-#hd img {
-    margin-right: 10px;
-    vertical-align: middle;
-}
-
-
-/* -- API Docs CSS ---------------------------------------------------------- */
-
-/*
-This file is organized so that more generic styles are nearer the top, and more
-specific styles are nearer the bottom of the file. This allows us to take full
-advantage of the cascade to avoid redundant style rules. Please respect this
-convention when making changes.
-*/
-
-/* -- Generic TabView styles ------------------------------------------------ */
-
-/*
-These styles apply to all API doc tabviews. To change styles only for a
-specific tabview, see the other sections below.
-*/
-
-.yui3-js-enabled .apidocs .tabview {
-    visibility: hidden; /* Hide until the TabView finishes rendering. */
-    _visibility: visible;
-}
-
-.apidocs .tabview.yui3-tabview-content { visibility: visible; }
-.apidocs .tabview .yui3-tabview-panel { background: #fff; }
-
-/* -- Generic Content Styles ------------------------------------------------ */
-
-/* Headings */
-h2, h3, h4, h5, h6 {
-    border: none;
-    color: #30418C;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-.link-docs {
-    float: right;
-    font-size: 15px;
-    margin: 4px 4px 6px;
-    padding: 6px 30px 5px;
-}
-
-.apidocs { zoom: 1; }
-
-/* Generic box styles. */
-.apidocs .box {
-    border: 1px solid;
-    border-radius: 3px;
-    margin: 1em 0;
-    padding: 0 1em;
-}
-
-/* A flag is a compact, capsule-like indicator of some kind. It's used to
-   indicate private and protected items, item return types, etc. in an
-   attractive and unobtrusive way. */
-.apidocs .flag {
-    background: #bababa;
-    border-radius: 3px;
-    color: #fff;
-    font-size: 11px;
-    margin: 0 0.5em;
-    padding: 2px 4px 1px;
-}
-
-/* Class/module metadata such as "Uses", "Extends", "Defined in", etc. */
-.apidocs .meta {
-    background: #f9f9f9;
-    border-color: #efefef;
-    color: #555;
-    font-size: 11px;
-    padding: 3px 6px;
-}
-
-.apidocs .meta p { margin: 0; }
-
-/* Deprecation warning. */
-.apidocs .box.deprecated,
-.apidocs .flag.deprecated {
-    background: #fdac9f;
-    border: 1px solid #fd7775;
-}
-
-.apidocs .box.deprecated p { margin: 0.5em 0; }
-.apidocs .flag.deprecated { color: #333; }
-
-/* Module/Class intro description. */
-.apidocs .intro {
-    background: #f0f1f8;
-    border-color: #d4d8eb;
-}
-
-/* Loading spinners. */
-#bd.loading .apidocs,
-#api-list.loading .yui3-tabview-panel {
-    background: #fff url(../img/spinner.gif) no-repeat center 70px;
-    min-height: 150px;
-}
-
-#bd.loading .apidocs .content,
-#api-list.loading .yui3-tabview-panel .apis {
-    display: none;
-}
-
-.apidocs .no-visible-items { color: #666; }
-
-/* Generic inline list. */
-.apidocs ul.inline {
-    display: inline;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-.apidocs ul.inline li { display: inline; }
-
-/* Comma-separated list. */
-.apidocs ul.commas li:after { content: ','; }
-.apidocs ul.commas li:last-child:after { content: ''; }
-
-/* Keyboard shortcuts. */
-kbd .cmd { font-family: Monaco, Helvetica; }
-
-/* -- Generic Access Level styles ------------------------------------------- */
-.apidocs .item.protected,
-.apidocs .item.private,
-.apidocs .index-item.protected,
-.apidocs .index-item.deprecated,
-.apidocs .index-item.private {
-    display: none;
-}
-
-.show-deprecated .item.deprecated,
-.show-deprecated .index-item.deprecated,
-.show-protected .item.protected,
-.show-protected .index-item.protected,
-.show-private .item.private,
-.show-private .index-item.private {
-    display: block;
-}
-
-.hide-inherited .item.inherited,
-.hide-inherited .index-item.inherited {
-    display: none;
-}
-
-/* -- Generic Item Index styles --------------------------------------------- */
-.apidocs .index { margin: 1.5em 0 3em; }
-
-.apidocs .index h3 {
-    border-bottom: 1px solid #efefef;
-    color: #333;
-    font-size: 13px;
-    margin: 2em 0 0.6em;
-    padding-bottom: 2px;
-}
-
-.apidocs .index .no-visible-items { margin-top: 2em; }
-
-.apidocs .index-list {
-    border-color: #efefef;
-    font-size: 12px;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    -moz-column-count: 4;
-    -moz-column-gap: 10px;
-    -moz-column-width: 170px;
-    -ms-column-count: 4;
-    -ms-column-gap: 10px;
-    -ms-column-width: 170px;
-    -o-column-count: 4;
-    -o-column-gap: 10px;
-    -o-column-width: 170px;
-    -webkit-column-count: 4;
-    -webkit-column-gap: 10px;
-    -webkit-column-width: 170px;
-    column-count: 4;
-    column-gap: 10px;
-    column-width: 170px;
-}
-
-.apidocs .no-columns .index-list {
-    -moz-column-count: 1;
-    -ms-column-count: 1;
-    -o-column-count: 1;
-    -webkit-column-count: 1;
-    column-count: 1;
-}
-
-.apidocs .index-item { white-space: nowrap; }
-
-.apidocs .index-item .flag {
-    background: none;
-    border: none;
-    color: #afafaf;
-    display: inline;
-    margin: 0 0 0 0.2em;
-    padding: 0;
-}
-
-/* -- Generic API item styles ----------------------------------------------- */
-.apidocs .args {
-    display: inline;
-    margin: 0 0.5em;
-}
-
-.apidocs .flag.chainable { background: #46ca3b; }
-.apidocs .flag.protected { background: #9b86fc; }
-.apidocs .flag.private { background: #fd6b1b; }
-.apidocs .flag.async { background: #356de4; }
-.apidocs .flag.required { background: #e60923; }
-
-.apidocs .item {
-    border-bottom: 1px solid #efefef;
-    margin: 1.5em 0 2em;
-    padding-bottom: 2em;
-}
-
-.apidocs .item h4,
-.apidocs .item h5,
-.apidocs .item h6 {
-    color: #333;
-    font-family: inherit;
-    font-size: 100%;
-}
-
-.apidocs .item .description p,
-.apidocs .item pre.code {
-    margin: 1em 0 0;
-}
-
-.apidocs .item .meta {
-    background: none;
-    border: none;
-    padding: 0;
-}
-
-.apidocs .item .name {
-    display: inline;
-    font-size: 14px;
-}
-
-.apidocs .item .type,
-.apidocs .item .type a,
-.apidocs .returns-inline {
-    color: #555;
-}
-
-.apidocs .item .type,
-.apidocs .returns-inline {
-    font-size: 11px;
-    margin: 0 0 0 0;
-}
-
-.apidocs .item .type a { border-bottom: 1px dotted #afafaf; }
-.apidocs .item .type a:hover { border: none; }
-
-/* -- Item Parameter List --------------------------------------------------- */
-.apidocs .params-list {
-    list-style: square;
-    margin: 1em 0 0 2em;
-    padding: 0;
-}
-
-.apidocs .param { margin-bottom: 1em; }
-
-.apidocs .param .type,
-.apidocs .param .type a {
-    color: #666;
-}
-
-.apidocs .param .type {
-    margin: 0 0 0 0.5em;
-    *margin-left: 0.5em;
-}
-
-.apidocs .param-name { font-weight: bold; }
-
-/* -- Item "Emits" block ---------------------------------------------------- */
-.apidocs .item .emits {
-    background: #f9f9f9;
-    border-color: #eaeaea;
-}
-
-/* -- Item "Returns" block -------------------------------------------------- */
-.apidocs .item .returns .type,
-.apidocs .item .returns .type a {
-    font-size: 100%;
-    margin: 0;
-}
-
-/* -- Class Constructor block ----------------------------------------------- */
-.apidocs .constructor .item {
-    border: none;
-    padding-bottom: 0;
-}
-
-/* -- File Source View ------------------------------------------------------ */
-.apidocs .file pre.code,
-#doc .apidocs .file pre.prettyprint {
-    background: inherit;
-    border: none;
-    overflow: visible;
-    padding: 0;
-}
-
-.apidocs .L0,
-.apidocs .L1,
-.apidocs .L2,
-.apidocs .L3,
-.apidocs .L4,
-.apidocs .L5,
-.apidocs .L6,
-.apidocs .L7,
-.apidocs .L8,
-.apidocs .L9 {
-    background: inherit;
-}
-
-/* -- Submodule List -------------------------------------------------------- */
-.apidocs .module-submodule-description {
-    font-size: 12px;
-    margin: 0.3em 0 1em;
-}
-
-.apidocs .module-submodule-description p:first-child { margin-top: 0; }
-
-/* -- Sidebar TabView ------------------------------------------------------- */
-#api-tabview { margin-top: 0.6em; }
-
-#api-tabview-filter,
-#api-tabview-panel {
-    border: 1px solid #dfdfdf;
-}
-
-#api-tabview-filter {
-    border-bottom: none;
-    border-top: none;
-    padding: 0.6em 10px 0 10px;
-}
-
-#api-tabview-panel { border-top: none; }
-#api-filter { width: 97%; }
-
-/* -- Content TabView ------------------------------------------------------- */
-#classdocs .yui3-tabview-panel { border: none; }
-
-/* -- Source File Contents -------------------------------------------------- */
-.prettyprint li.L0,
-.prettyprint li.L1,
-.prettyprint li.L2,
-.prettyprint li.L3,
-.prettyprint li.L5,
-.prettyprint li.L6,
-.prettyprint li.L7,
-.prettyprint li.L8 {
-    list-style: decimal;
-}
-
-/* -- API options ----------------------------------------------------------- */
-#api-options {
-    font-size: 11px;
-    margin-top: 2.2em;
-    position: absolute;
-    right: 1.5em;
-}
-
-/*#api-options label { margin-right: 0.6em; }*/
-
-/* -- API list -------------------------------------------------------------- */
-#api-list {
-    margin-top: 1.5em;
-    *zoom: 1;
-}
-
-.apis {
-    font-size: 12px;
-    line-height: 1.4;
-    list-style: none;
-    margin: 0;
-    padding: 0.5em 0 0.5em 0.4em;
-}
-
-.apis a {
-    border: 1px solid transparent;
-    display: block;
-    margin: 0 0 0 -4px;
-    padding: 1px 4px 0;
-    text-decoration: none;
-    _border: none;
-    _display: inline;
-}
-
-.apis a:hover,
-.apis a:focus {
-    background: #E8EDFC;
-    background: -moz-linear-gradient(top, #e8edfc 0%, #becef7 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E8EDFC), color-stop(100%,#BECEF7));
-    border-color: #AAC0FA;
-    border-radius: 3px;
-    color: #333;
-    outline: none;
-}
-
-.api-list-item a:hover,
-.api-list-item a:focus {
-    font-weight: bold;
-    text-shadow: 1px 1px 1px #fff;
-}
-
-.apis .message { color: #888; }
-.apis .result a { padding: 3px 5px 2px; }
-
-.apis .result .type {
-    right: 4px;
-    top: 7px;
-}
-
-.api-list-item .yui3-highlight {
-    font-weight: bold;
-}
-
diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico
deleted file mode 100644
index 414ac4fb9e145171ae8f660e51879e18c401e653..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5430
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

diff --git a/docs/assets/img/spinner.gif b/docs/assets/img/spinner.gif
deleted file mode 100644
index 44f96ba68c8910d19f49e8365bf589ee4e6991e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2685
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

diff --git a/docs/assets/index.html b/docs/assets/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/assets/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/docs/assets/js/api-filter.js b/docs/assets/js/api-filter.js
deleted file mode 100644
index d442e54306..0000000000
--- a/docs/assets/js/api-filter.js
+++ /dev/null
@@ -1,56 +0,0 @@
-YUI.add('api-filter', function (Y) {
-
-Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {
-    // -- Initializer ----------------------------------------------------------
-    initializer: function () {
-        this._bindUIACBase();
-        this._syncUIACBase();
-    },
-    getDisplayName: function(name) {
-
-        Y.each(Y.YUIDoc.meta.allModules, function(i) {
-            if (i.name === name && i.displayName) {
-                name = i.displayName;
-            }
-        });
-
-        if (this.get('queryType') === 'elements') {
-            name = '&lt;' + name + '&gt;';
-        }
-
-        return name;
-    }
-
-}, {
-    // -- Attributes -----------------------------------------------------------
-    ATTRS: {
-        resultHighlighter: {
-            value: 'phraseMatch'
-        },
-
-        // May be set to "classes", "elements" or "modules".
-        queryType: {
-            value: 'classes'
-        },
-
-        source: {
-            valueFn: function() {
-                var self = this;
-                return function(q) {
-                    var data = Y.YUIDoc.meta[self.get('queryType')],
-                        out = [];
-                    Y.each(data, function(v) {
-                        if (v.toLowerCase().indexOf(q.toLowerCase()) > -1) {
-                            out.push(v);
-                        }
-                    });
-                    return out;
-                };
-            }
-        }
-    }
-});
-
-}, '3.4.0', {requires: [
-    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources'
-]});
diff --git a/docs/assets/js/api-list.js b/docs/assets/js/api-list.js
deleted file mode 100644
index e8f650d5d5..0000000000
--- a/docs/assets/js/api-list.js
+++ /dev/null
@@ -1,255 +0,0 @@
-YUI.add('api-list', function (Y) {
-
-var Lang   = Y.Lang,
-    YArray = Y.Array,
-
-    APIList = Y.namespace('APIList'),
-
-    classesNode    = Y.one('#api-classes'),
-    elementsNode   = Y.one('#api-elements'),
-    inputNode      = Y.one('#api-filter'),
-    modulesNode    = Y.one('#api-modules'),
-    tabviewNode    = Y.one('#api-tabview'),
-
-    tabs = APIList.tabs = {},
-
-    filter = APIList.filter = new Y.APIFilter({
-        inputNode : inputNode,
-        maxResults: 1000,
-
-        on: {
-            results: onFilterResults
-        }
-    }),
-
-    search = APIList.search = new Y.APISearch({
-        inputNode : inputNode,
-        maxResults: 100,
-
-        on: {
-            clear  : onSearchClear,
-            results: onSearchResults
-        }
-    }),
-
-    tabview = APIList.tabview = new Y.TabView({
-        srcNode  : tabviewNode,
-        panelNode: '#api-tabview-panel',
-        render   : true,
-
-        on: {
-            selectionChange: onTabSelectionChange
-        }
-    }),
-
-    focusManager = APIList.focusManager = tabviewNode.plug(Y.Plugin.NodeFocusManager, {
-        circular   : true,
-        descendants: '#api-filter, .yui3-tab-panel-selected .api-list-item a, .yui3-tab-panel-selected .result a',
-        keys       : {next: 'down:40', previous: 'down:38'}
-    }).focusManager,
-
-    LIST_ITEM_TEMPLATE =
-        '<li class="api-list-item {typeSingular}">' +
-            '<a href="{rootPath}{typePlural}/{name}.html">{displayName}</a>' +
-        '</li>';
-
-// -- Init ---------------------------------------------------------------------
-
-// Duckpunch FocusManager's key event handling to prevent it from handling key
-// events when a modifier is pressed.
-Y.before(function (e, activeDescendant) {
-    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
-        return new Y.Do.Prevent();
-    }
-}, focusManager, '_focusPrevious', focusManager);
-
-Y.before(function (e, activeDescendant) {
-    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
-        return new Y.Do.Prevent();
-    }
-}, focusManager, '_focusNext', focusManager);
-
-// Create a mapping of tabs in the tabview so we can refer to them easily later.
-tabview.each(function (tab, index) {
-    var name = tab.get('label').toLowerCase();
-
-    tabs[name] = {
-        index: index,
-        name : name,
-        tab  : tab
-    };
-});
-
-// Switch tabs on Ctrl/Cmd-Left/Right arrows.
-tabviewNode.on('key', onTabSwitchKey, 'down:37,39');
-
-// Focus the filter input when the `/` key is pressed.
-Y.one(Y.config.doc).on('key', onSearchKey, 'down:83');
-
-// Keep the Focus Manager up to date.
-inputNode.on('focus', function () {
-    focusManager.set('activeDescendant', inputNode);
-});
-
-// Update all tabview links to resolved URLs.
-tabview.get('panelNode').all('a').each(function (link) {
-    link.setAttribute('href', link.get('href'));
-});
-
-// -- Private Functions --------------------------------------------------------
-function getFilterResultNode() {
-    var queryType = filter.get('queryType');
-    return queryType === 'classes' ? classesNode
-            : queryType === 'elements' ? elementsNode : modulesNode;
-}
-
-// -- Event Handlers -----------------------------------------------------------
-function onFilterResults(e) {
-    var frag         = Y.one(Y.config.doc.createDocumentFragment()),
-        resultNode   = getFilterResultNode(),
-        typePlural   = filter.get('queryType'),
-        typeSingular = typePlural === 'classes' ? 'class' : typePlural === 'elements' ? 'element' : 'module';
-
-    if (e.results.length) {
-        YArray.each(e.results, function (result) {
-            frag.append(Lang.sub(LIST_ITEM_TEMPLATE, {
-                rootPath    : APIList.rootPath,
-                displayName : filter.getDisplayName(result.highlighted),
-                name        : result.text,
-                typePlural  : typePlural,
-                typeSingular: typeSingular
-            }));
-        });
-    } else {
-        frag.append(
-            '<li class="message">' +
-                'No ' + typePlural + ' found.' +
-            '</li>'
-        );
-    }
-
-    resultNode.empty(true);
-    resultNode.append(frag);
-
-    focusManager.refresh();
-}
-
-function onSearchClear(e) {
-
-    focusManager.refresh();
-}
-
-function onSearchKey(e) {
-    var target = e.target;
-
-    if (target.test('input,select,textarea')
-            || target.get('isContentEditable')) {
-        return;
-    }
-
-    e.preventDefault();
-
-    inputNode.focus();
-    focusManager.refresh();
-}
-
-function onSearchResults(e) {
-    var frag = Y.one(Y.config.doc.createDocumentFragment());
-
-    if (e.results.length) {
-        YArray.each(e.results, function (result) {
-            frag.append(result.display);
-        });
-    } else {
-        frag.append(
-            '<li class="message">' +
-                'No results found. Maybe you\'ll have better luck with a ' +
-                'different query?' +
-            '</li>'
-        );
-    }
-
-
-    focusManager.refresh();
-}
-
-function onTabSelectionChange(e) {
-    var tab  = e.newVal,
-        name = tab.get('label').toLowerCase();
-
-    tabs.selected = {
-        index: tab.get('index'),
-        name : name,
-        tab  : tab
-    };
-
-    switch (name) {
-    case 'elements':// fallthru
-    case 'classes': // fallthru
-    case 'modules':
-        filter.setAttrs({
-            minQueryLength: 0,
-            queryType     : name
-        });
-
-        search.set('minQueryLength', -1);
-
-        // Only send a request if this isn't the initially-selected tab.
-        if (e.prevVal) {
-            filter.sendRequest(filter.get('value'));
-        }
-        break;
-
-    case 'everything':
-        filter.set('minQueryLength', -1);
-        search.set('minQueryLength', 1);
-
-        if (search.get('value')) {
-            search.sendRequest(search.get('value'));
-        } else {
-            inputNode.focus();
-        }
-        break;
-
-    default:
-        // WTF? We shouldn't be here!
-        filter.set('minQueryLength', -1);
-        search.set('minQueryLength', -1);
-    }
-
-    if (focusManager) {
-        setTimeout(function () {
-            focusManager.refresh();
-        }, 1);
-    }
-}
-
-function onTabSwitchKey(e) {
-    var currentTabIndex = tabs.selected.index;
-
-    if (!(e.ctrlKey || e.metaKey)) {
-        return;
-    }
-
-    e.preventDefault();
-
-    switch (e.keyCode) {
-    case 37: // left arrow
-        if (currentTabIndex > 0) {
-            tabview.selectChild(currentTabIndex - 1);
-            inputNode.focus();
-        }
-        break;
-
-    case 39: // right arrow
-        if (currentTabIndex < (Y.Object.size(tabs) - 2)) {
-            tabview.selectChild(currentTabIndex + 1);
-            inputNode.focus();
-        }
-        break;
-    }
-}
-
-}, '3.4.0', {requires: [
-    'api-filter', 'api-search', 'event-key', 'node-focusmanager', 'tabview'
-]});
diff --git a/docs/assets/js/api-search.js b/docs/assets/js/api-search.js
deleted file mode 100644
index 175f6a6179..0000000000
--- a/docs/assets/js/api-search.js
+++ /dev/null
@@ -1,98 +0,0 @@
-YUI.add('api-search', function (Y) {
-
-var Lang   = Y.Lang,
-    Node   = Y.Node,
-    YArray = Y.Array;
-
-Y.APISearch = Y.Base.create('apiSearch', Y.Base, [Y.AutoCompleteBase], {
-    // -- Public Properties ----------------------------------------------------
-    RESULT_TEMPLATE:
-        '<li class="result {resultType}">' +
-            '<a href="{url}">' +
-                '<h3 class="title">{name}</h3>' +
-                '<span class="type">{resultType}</span>' +
-                '<div class="description">{description}</div>' +
-                '<span class="className">{class}</span>' +
-            '</a>' +
-        '</li>',
-
-    // -- Initializer ----------------------------------------------------------
-    initializer: function () {
-        this._bindUIACBase();
-        this._syncUIACBase();
-    },
-
-    // -- Protected Methods ----------------------------------------------------
-    _apiResultFilter: function (query, results) {
-        // Filter components out of the results.
-        return YArray.filter(results, function (result) {
-            return result.raw.resultType === 'component' ? false : result;
-        });
-    },
-
-    _apiResultFormatter: function (query, results) {
-        return YArray.map(results, function (result) {
-            var raw  = Y.merge(result.raw), // create a copy
-                desc = raw.description || '';
-
-            // Convert description to text and truncate it if necessary.
-            desc = Node.create('<div>' + desc + '</div>').get('text');
-
-            if (desc.length > 65) {
-                desc = Y.Escape.html(desc.substr(0, 65)) + ' &hellip;';
-            } else {
-                desc = Y.Escape.html(desc);
-            }
-
-            raw['class'] || (raw['class'] = '');
-            raw.description = desc;
-
-            // Use the highlighted result name.
-            raw.name = result.highlighted;
-
-            return Lang.sub(this.RESULT_TEMPLATE, raw);
-        }, this);
-    },
-
-    _apiTextLocator: function (result) {
-        return result.displayName || result.name;
-    }
-}, {
-    // -- Attributes -----------------------------------------------------------
-    ATTRS: {
-        resultFormatter: {
-            valueFn: function () {
-                return this._apiResultFormatter;
-            }
-        },
-
-        resultFilters: {
-            valueFn: function () {
-                return this._apiResultFilter;
-            }
-        },
-
-        resultHighlighter: {
-            value: 'phraseMatch'
-        },
-
-        resultListLocator: {
-            value: 'data.results'
-        },
-
-        resultTextLocator: {
-            valueFn: function () {
-                return this._apiTextLocator;
-            }
-        },
-
-        source: {
-            value: '/api/v1/search?q={query}&count={maxResults}'
-        }
-    }
-});
-
-}, '3.4.0', {requires: [
-    'autocomplete-base', 'autocomplete-highlighters', 'autocomplete-sources',
-    'escape'
-]});
diff --git a/docs/assets/js/apidocs.js b/docs/assets/js/apidocs.js
deleted file mode 100644
index af9ac32209..0000000000
--- a/docs/assets/js/apidocs.js
+++ /dev/null
@@ -1,376 +0,0 @@
-YUI().use(
-    'yuidoc-meta',
-    'api-list', 'history-hash', 'node-screen', 'node-style', 'pjax',
-function (Y) {
-
-var win          = Y.config.win,
-    localStorage = win.localStorage,
-
-    bdNode = Y.one('#bd'),
-
-    pjax,
-    defaultRoute,
-
-    classTabView,
-    selectedTab;
-
-// Kill pjax functionality unless serving over HTTP.
-if (!Y.getLocation().protocol.match(/^https?\:/)) {
-    Y.Router.html5 = false;
-}
-
-// Create the default route with middleware which enables syntax highlighting
-// on the loaded content.
-defaultRoute = Y.Pjax.defaultRoute.concat(function (req, res, next) {
-    prettyPrint();
-    bdNode.removeClass('loading');
-
-    next();
-});
-
-pjax = new Y.Pjax({
-    container      : '#docs-main',
-    contentSelector: '#docs-main > .content',
-    linkSelector   : '#bd a',
-    titleSelector  : '#xhr-title',
-
-    navigateOnHash: true,
-    root          : '/',
-    routes        : [
-        // -- / ----------------------------------------------------------------
-        {
-            path     : '/(index.html)?',
-            callbacks: defaultRoute
-        },
-
-        // -- /elements/* -------------------------------------------------------
-        {
-            path     : '/elements/:element.html*',
-            callbacks: defaultRoute
-        },
-
-        // -- /classes/* -------------------------------------------------------
-        {
-            path     : '/classes/:class.html*',
-            callbacks: [defaultRoute, 'handleClasses']
-        },
-
-        // -- /files/* ---------------------------------------------------------
-        {
-            path     : '/files/*file',
-            callbacks: [defaultRoute, 'handleFiles']
-        },
-
-        // -- /modules/* -------------------------------------------------------
-        {
-            path     : '/modules/:module.html*',
-            callbacks: defaultRoute
-        }
-    ]
-});
-
-// -- Utility Functions --------------------------------------------------------
-
-pjax.checkVisibility = function (tab) {
-    tab || (tab = selectedTab);
-
-    if (!tab) { return; }
-
-    var panelNode = tab.get('panelNode'),
-        visibleItems;
-
-    // If no items are visible in the tab panel due to the current visibility
-    // settings, display a message to that effect.
-    visibleItems = panelNode.all('.item,.index-item').some(function (itemNode) {
-        if (itemNode.getComputedStyle('display') !== 'none') {
-            return true;
-        }
-    });
-
-    panelNode.all('.no-visible-items').remove();
-
-    if (!visibleItems) {
-        if (Y.one('#index .index-item')) {
-            panelNode.append(
-                '<div class="no-visible-items">' +
-                    '<p>' +
-                    'Some items are not shown due to the current visibility ' +
-                    'settings. Use the checkboxes at the upper right of this ' +
-                    'page to change the visibility settings.' +
-                    '</p>' +
-                '</div>'
-            );
-        } else {
-            panelNode.append(
-                '<div class="no-visible-items">' +
-                    '<p>' +
-                    'This class doesn\'t provide any methods, properties, ' +
-                    'attributes, or events.' +
-                    '</p>' +
-                '</div>'
-            );
-        }
-    }
-
-    // Hide index sections without any visible items.
-    Y.all('.index-section').each(function (section) {
-        var items        = 0,
-            visibleItems = 0;
-
-        section.all('.index-item').each(function (itemNode) {
-            items += 1;
-
-            if (itemNode.getComputedStyle('display') !== 'none') {
-                visibleItems += 1;
-            }
-        });
-
-        section.toggleClass('hidden', !visibleItems);
-        section.toggleClass('no-columns', visibleItems < 4);
-    });
-};
-
-pjax.initClassTabView = function () {
-    if (!Y.all('#classdocs .api-class-tab').size()) {
-        return;
-    }
-
-    if (classTabView) {
-        classTabView.destroy();
-        selectedTab = null;
-    }
-
-    classTabView = new Y.TabView({
-        srcNode: '#classdocs',
-
-        on: {
-            selectionChange: pjax.onTabSelectionChange
-        }
-    });
-
-    pjax.updateTabState();
-    classTabView.render();
-};
-
-pjax.initLineNumbers = function () {
-    var hash      = win.location.hash.substring(1),
-        container = pjax.get('container'),
-        hasLines, node;
-
-    // Add ids for each line number in the file source view.
-    container.all('.linenums>li').each(function (lineNode, index) {
-        lineNode.set('id', 'l' + (index + 1));
-        lineNode.addClass('file-line');
-        hasLines = true;
-    });
-
-    // Scroll to the desired line.
-    if (hasLines && /^l\d+$/.test(hash)) {
-        if ((node = container.getById(hash))) {
-            win.scroll(0, node.getY());
-        }
-    }
-};
-
-pjax.initRoot = function () {
-    var terminators = /^(?:classes|files|elements|modules)$/,
-        parts       = pjax._getPathRoot().split('/'),
-        root        = [],
-        i, len, part;
-
-    for (i = 0, len = parts.length; i < len; i += 1) {
-        part = parts[i];
-
-        if (part.match(terminators)) {
-            // Makes sure the path will end with a "/".
-            root.push('');
-            break;
-        }
-
-        root.push(part);
-    }
-
-    pjax.set('root', root.join('/'));
-};
-
-pjax.updateTabState = function (src) {
-    var hash = win.location.hash.substring(1),
-        defaultTab, node, tab, tabPanel;
-
-    function scrollToNode() {
-        if (node.hasClass('protected')) {
-            Y.one('#api-show-protected').set('checked', true);
-            pjax.updateVisibility();
-        }
-
-        if (node.hasClass('private')) {
-            Y.one('#api-show-private').set('checked', true);
-            pjax.updateVisibility();
-        }
-
-        setTimeout(function () {
-            // For some reason, unless we re-get the node instance here,
-            // getY() always returns 0.
-            var node = Y.one('#classdocs').getById(hash);
-            win.scrollTo(0, node.getY() - 70);
-        }, 1);
-    }
-
-    if (!classTabView) {
-        return;
-    }
-
-    if (src === 'hashchange' && !hash) {
-        defaultTab = 'index';
-    } else {
-        if (localStorage) {
-            defaultTab = localStorage.getItem('tab_' + pjax.getPath()) ||
-                'index';
-        } else {
-            defaultTab = 'index';
-        }
-    }
-
-    if (hash && (node = Y.one('#classdocs').getById(hash))) {
-        if ((tabPanel = node.ancestor('.api-class-tabpanel', true))) {
-            if ((tab = Y.one('#classdocs .api-class-tab.' + tabPanel.get('id')))) {
-                if (classTabView.get('rendered')) {
-                    Y.Widget.getByNode(tab).set('selected', 1);
-                } else {
-                    tab.addClass('yui3-tab-selected');
-                }
-            }
-        }
-
-        // Scroll to the desired element if this is a hash URL.
-        if (node) {
-            if (classTabView.get('rendered')) {
-                scrollToNode();
-            } else {
-                classTabView.once('renderedChange', scrollToNode);
-            }
-        }
-    } else {
-        tab = Y.one('#classdocs .api-class-tab.' + defaultTab);
-
-        // When the `defaultTab` node isn't found, `localStorage` is stale.
-        if (!tab && defaultTab !== 'index') {
-            tab = Y.one('#classdocs .api-class-tab.index');
-        }
-
-        if (classTabView.get('rendered')) {
-            Y.Widget.getByNode(tab).set('selected', 1);
-        } else {
-            tab.addClass('yui3-tab-selected');
-        }
-    }
-};
-
-pjax.updateVisibility = function () {
-    var container = pjax.get('container');
-
-    container.toggleClass('hide-inherited',
-            !Y.one('#api-show-inherited').get('checked'));
-
-    container.toggleClass('show-deprecated',
-            Y.one('#api-show-deprecated').get('checked'));
-
-    container.toggleClass('show-protected',
-            Y.one('#api-show-protected').get('checked'));
-
-    container.toggleClass('show-private',
-            Y.one('#api-show-private').get('checked'));
-
-    pjax.checkVisibility();
-};
-
-// -- Route Handlers -----------------------------------------------------------
-
-pjax.handleClasses = function (req, res, next) {
-    var status = res.ioResponse.status;
-
-    // Handles success and local filesystem XHRs.
-    if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
-        pjax.initClassTabView();
-    }
-
-    next();
-};
-
-pjax.handleFiles = function (req, res, next) {
-    var status = res.ioResponse.status;
-
-    // Handles success and local filesystem XHRs.
-    if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
-        pjax.initLineNumbers();
-    }
-
-    next();
-};
-
-// -- Event Handlers -----------------------------------------------------------
-
-pjax.onNavigate = function (e) {
-    var hash         = e.hash,
-        originTarget = e.originEvent && e.originEvent.target,
-        tab;
-
-    if (hash) {
-        tab = originTarget && originTarget.ancestor('.yui3-tab', true);
-
-        if (hash === win.location.hash) {
-            pjax.updateTabState('hashchange');
-        } else if (!tab) {
-            win.location.hash = hash;
-        }
-
-        e.preventDefault();
-        return;
-    }
-
-    // Only scroll to the top of the page when the URL doesn't have a hash.
-    this.set('scrollToTop', !e.url.match(/#.+$/));
-
-    bdNode.addClass('loading');
-};
-
-pjax.onOptionClick = function (e) {
-    pjax.updateVisibility();
-};
-
-pjax.onTabSelectionChange = function (e) {
-    var tab   = e.newVal,
-        tabId = tab.get('contentBox').getAttribute('href').substring(1);
-
-    selectedTab = tab;
-
-    // If switching from a previous tab (i.e., this is not the default tab),
-    // replace the history entry with a hash URL that will cause this tab to
-    // be selected if the user navigates away and then returns using the back
-    // or forward buttons.
-    if (e.prevVal && localStorage) {
-        localStorage.setItem('tab_' + pjax.getPath(), tabId);
-    }
-
-    pjax.checkVisibility(tab);
-};
-
-// -- Init ---------------------------------------------------------------------
-
-pjax.on('navigate', pjax.onNavigate);
-
-pjax.initRoot();
-pjax.upgrade();
-pjax.initClassTabView();
-pjax.initLineNumbers();
-pjax.updateVisibility();
-
-Y.APIList.rootPath = pjax.get('root');
-
-Y.one('#api-options').delegate('click', pjax.onOptionClick, 'input');
-
-Y.on('hashchange', function (e) {
-    pjax.updateTabState('hashchange');
-}, win);
-
-});
diff --git a/docs/assets/js/yui-prettify.js b/docs/assets/js/yui-prettify.js
deleted file mode 100644
index 18de864953..0000000000
--- a/docs/assets/js/yui-prettify.js
+++ /dev/null
@@ -1,17 +0,0 @@
-YUI().use('node', function(Y) {
-    var code = Y.all('.prettyprint.linenums');
-    if (code.size()) {
-        code.each(function(c) {
-            var lis = c.all('ol li'),
-                l = 1;
-            lis.each(function(n) {
-                n.prepend('<a name="LINENUM_' + l + '"></a>');
-                l++;
-            });
-        });
-        var h = location.hash;
-        location.hash = '';
-        h = h.replace('LINE_', 'LINENUM_');
-        location.hash = h;
-    }
-});
diff --git a/docs/assets/vendor/prettify/CHANGES.html b/docs/assets/vendor/prettify/CHANGES.html
deleted file mode 100644
index b50b841499..0000000000
--- a/docs/assets/vendor/prettify/CHANGES.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Change Log</title>
-  </head>
-  <body bgcolor="white">
-    <a style="float:right" href="README.html">README</a>
-
-    <h1>Known Issues</h1>
-    <ul>
-      <li>Perl formatting is really crappy.  Partly because the author is lazy and
-      partly because Perl is
-      <a href="http://www.perlmonks.org/?node_id=663393">hard</a> to parse.
-      <li>On some browsers, <code>&lt;code&gt;</code> elements with newlines in the text
-      which use CSS to specify <code>white-space:pre</code> will have the newlines
-      improperly stripped if the element is not attached to the document at the time
-      the stripping is done.  Also, on IE 6, all newlines will be stripped from
-      <code>&lt;code&gt;</code> elements because of the way IE6 produces
-      <code>innerHTML</code>.  Workaround: use <code>&lt;pre&gt;</code> for code with
-      newlines.
-    </ul>
-
-    <h1>Change Log</h1>
-    <h2>29 March 2007</h2>
-    <ul>
-      <li>Added <a href="tests/prettify_test.html#PHP">tests</a> for PHP support
-        to address 
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=3"
-       >issue 3</a>.
-      <li>Fixed
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=6"
-       >bug</a>: <code>prettyPrintOne</code> was not halting.  This was not
-        reachable through the normal entry point.
-      <li>Fixed
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=4"
-       >bug</a>: recursing into a script block or PHP tag that was not properly
-        closed would not silently drop the content.
-        (<a href="tests/prettify_test.html#issue4">test</a>)
-      <li>Fixed
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=8"
-       >bug</a>: was eating tabs
-        (<a href="tests/prettify_test.html#issue8">test</a>)
-      <li>Fixed entity handling so that the caveat
-        <blockquote>
-          <p>Caveats: please properly escape less-thans.  <tt>x&amp;lt;y</tt>
-          instead of <tt>x&lt;y</tt>, and use <tt>&quot;</tt> instead of 
-          <tt>&amp;quot;</tt> for string delimiters.</p>
-        </blockquote>
-        is no longer applicable.
-      <li>Added noisefree's C#
-      <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=4"
-       >patch</a>
-      <li>Added a <a href="http://google-code-prettify.googlecode.com/files/prettify-small.zip">distribution</a> that has comments and
-        whitespace removed to reduce download size from 45.5kB to 12.8kB.
-    </ul>
-    <h2>4 Jul 2008</h2>
-    <ul>
-      <li>Added <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=17">language specific formatters</a> that are triggered by the presence
-      of a <code>lang-&lt;language-file-extension&gt;</code></li>
-      <li>Fixed <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=29">bug</a>: python handling of <code>'''string'''</code>
-      <li>Fixed bug: <code>/</code> in regex <code>[charsets] should not end regex</code>
-    </ul>
-    <h2>5 Jul 2008</h2>
-    <ul>
-      <li>Defined language extensions for Lisp and Lua</code>
-    </ul>
-    <h2>14 Jul 2008</h2>
-    <ul>
-      <li>Language handlers for F#, OCAML, SQL</code>
-      <li>Support for <code>nocode</code> spans to allow embedding of line
-      numbers and code annotations which should not be styled or otherwise
-      affect the tokenization of prettified code.
-      See the issue 22
-      <a href="tests/prettify_test.html#issue22">testcase</a>.</code>
-    </ul>
-    <h2>6 Jan 2009</h2>
-    <ul>
-      <li>Language handlers for Visual Basic, Haskell, CSS, and WikiText</li>
-      <li>Added <tt>.mxml</tt> extension to the markup style handler for
-        Flex <a href="http://en.wikipedia.org/wiki/MXML">MXML files</a>.  See
-        <a
-        href="http://code.google.com/p/google-code-prettify/issues/detail?id=37"
-        >issue 37</a>.
-      <li>Added <tt>.m</tt> extension to the C style handler so that Objective
-        C source files properly highlight.  See
-        <a
-        href="http://code.google.com/p/google-code-prettify/issues/detail?id=58"
-       >issue 58</a>.
-      <li>Changed HTML lexer to use the same embedded source mechanism as the
-        wiki language handler, and changed to use the registered
-        CSS handler for STYLE element content.
-    </ul>
-    <h2>21 May 2009</h2>
-    <ul>
-      <li>Rewrote to improve performance on large files.
-        See <a href="http://mikesamuel.blogspot.com/2009/05/efficient-parsing-in-javascript.html">benchmarks</a>.</li>
-      <li>Fixed bugs with highlighting of Haskell line comments, Lisp
-        number literals, Lua strings, C preprocessor directives,
-        newlines in Wiki code on Windows, and newlines in IE6.</li>
-    </ul>
-    <h2>14 August 2009</h2>
-    <ul>
-      <li>Fixed prettifying of <code>&lt;code&gt;</code> blocks with embedded newlines.
-    </ul>
-    <h2>3 October 2009</h2>
-    <ul>
-      <li>Fixed prettifying of XML/HTML tags that contain uppercase letters.
-    </ul>
-    <h2>19 July 2010</h2>
-    <ul>
-      <li>Added support for line numbers.  Bug
-        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=22"
-         >22</a></li>
-      <li>Added YAML support.  Bug
-        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=123"
-         >123</a></li>
-      <li>Added VHDL support courtesy Le Poussin.</li>
-      <li>IE performance improvements.  Bug
-        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=102"
-         >102</a> courtesy jacobly.</li>
-      <li>A variety of markup formatting fixes courtesy smain and thezbyg.</li>
-      <li>Fixed copy and paste in IE[678].
-      <li>Changed output to use <code>&amp;#160;</code> instead of
-        <code>&amp;nbsp;</code> so that the output works when embedded in XML.
-        Bug
-        <a href="http://code.google.com/p/google-code-prettify/issues/detail?id=108"
-         >108</a>.</li>
-    </ul>
-  </body>
-</html>
diff --git a/docs/assets/vendor/prettify/COPYING b/docs/assets/vendor/prettify/COPYING
deleted file mode 100644
index d645695673..0000000000
--- a/docs/assets/vendor/prettify/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/docs/assets/vendor/prettify/README.html b/docs/assets/vendor/prettify/README.html
deleted file mode 100644
index c6fe1a32c3..0000000000
--- a/docs/assets/vendor/prettify/README.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html>
-  <head>
-    <title>Javascript code prettifier</title>
-
-    <link href="src/prettify.css" type="text/css" rel="stylesheet" />
-
-    <script src="src/prettify.js" type="text/javascript"></script>
-
-    <style type="text/css">
-      body { margin-left: .5in }
-      h1, h2, h3, h4, .footer { margin-left: -.4in; }
-    </style>
-  </head>
-
-  <body onload="prettyPrint()" bgcolor="white">
-    <small style="float: right">Languages : <a href="README-zh-Hans.html">CH</a></small>
-    <h1>Javascript code prettifier</h1>
-
-    <h2>Setup</h2>
-    <ol>
-      <li><a href="http://code.google.com/p/google-code-prettify/downloads/list">Download</a> a distribution
-      <li>Include the script and stylesheets in your document
-        (you will need to make sure the css and js file are on your server, and
-         adjust the paths in the <tt>script</tt> and <tt>link</tt> tag)
-        <pre class="prettyprint">
-&lt;link href="prettify.css" type="text/css" rel="stylesheet" />
-&lt;script type="text/javascript" src="prettify.js">&lt;/script></pre>
-      <li>Add <code class="prettyprint lang-html">onload="prettyPrint()"</code> to your
-      document's body tag.
-      <li>Modify the stylesheet to get the coloring you prefer</li>
-    </ol>
-
-    <h2>Usage</h2>
-    <p>Put code snippets in
-    <tt>&lt;pre class="prettyprint"&gt;...&lt;/pre&gt;</tt>
-    or <tt>&lt;code class="prettyprint"&gt;...&lt;/code&gt;</tt>
-    and it will automatically be pretty printed.
-
-    <table summary="code examples">
-      <tr>
-        <th>The original
-        <th>Prettier
-      <tr>
-        <td><pre style="border: 1px solid #888;padding: 2px"
-             ><a name="voila1"></a>class Voila {
-public:
-  // Voila
-  static const string VOILA = "Voila";
-
-  // will not interfere with embedded <a href="#voila1">tags</a>.
-}</pre>
-
-        <td><pre class="prettyprint"><a name="voila2"></a>class Voila {
-public:
-  // Voila
-  static const string VOILA = "Voila";
-
-  // will not interfere with embedded <a href="#voila2">tags</a>.
-}</pre>
-    </table>
-
-    <h2>FAQ</h2>
-    <h3 id="langs">Which languages does it work for?</h3>
-    <p>The comments in <tt>prettify.js</tt> are authoritative but the lexer
-    should work on a number of languages including C and friends,
-    Java, Python, Bash, SQL, HTML, XML, CSS, Javascript, and Makefiles.
-    It works passably on Ruby, PHP, VB, and Awk and a decent subset of Perl
-    and Ruby, but, because of commenting conventions, doesn't work on
-    Smalltalk, or CAML-like languages.</p>
-
-    <p>LISPy languages are supported via an extension:
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lisp.js"
-     ><code>lang-lisp.js</code></a>.</p>
-    <p>And similarly for
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-css.js"
-     ><code>CSS</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-hs.js"
-     ><code>Haskell</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lua.js"
-     ><code>Lua</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-ml.js"
-     ><code>OCAML, SML, F#</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-vb.js"
-     ><code>Visual Basic</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-sql.js"
-     ><code>SQL</code></a>,
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-proto.js"
-     ><code>Protocol Buffers</code></a>, and
-    <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-wiki.js"
-     ><code>WikiText</code></a>..
-
-    <p>If you'd like to add an extension for your favorite language, please
-    look at <tt>src/lang-lisp.js</tt> and file an
-    <a href="http://code.google.com/p/google-code-prettify/issues/list"
-     >issue</a> including your language extension, and a testcase.</p>
-
-    <h3>How do I specify which language my code is in?</h3>
-    <p>You don't need to specify the language since <code>prettyprint()</code>
-    will guess.  You can specify a language by specifying the language extension
-    along with the <code>prettyprint</code> class like so:</p>
-    <pre class="prettyprint lang-html"
->&lt;pre class=&quot;prettyprint <b>lang-html</b>&quot;&gt;
-  The lang-* class specifies the language file extensions.
-  File extensions supported by default include
-    "bsh", "c", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html",
-    "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh",
-    "xhtml", "xml", "xsl".
-&lt;/pre&gt;</pre>
-
-    <h3>It doesn't work on <tt>&lt;obfuscated code sample&gt;</tt>?</h3>
-    <p>Yes.  Prettifying obfuscated code is like putting lipstick on a pig
-    &mdash; i.e. outside the scope of this tool.</p>
-
-    <h3>Which browsers does it work with?</h3>
-    <p>It's been tested with IE 6, Firefox 1.5 &amp; 2, and Safari 2.0.4.
-    Look at <a href="tests/prettify_test.html">the test page</a> to see if it
-    works in your browser.</p>
-
-    <h3>What's changed?</h3>
-    <p>See the <a href="CHANGES.html">change log</a></p>
-
-    <h3>Why doesn't Prettyprinting of strings work on WordPress?</h3>
-    <p>Apparently wordpress does "smart quoting" which changes close quotes.
-    This causes end quotes to not match up with open quotes.
-    <p>This breaks prettifying as well as copying and pasting of code samples.
-    See
-    <a href="http://wordpress.org/support/topic/125038"
-    >WordPress's help center</a> for info on how to stop smart quoting of code
-    snippets.</p>
-
-    <h3 id="linenums">How do I put line numbers in my code?</h3>
-    <p>You can use the <code>linenums</code> class to turn on line
-    numbering.  If your code doesn't start at line number 1, you can
-    add a colon and a line number to the end of that class as in
-    <code>linenums:52</code>.
-
-    <p>For example
-<pre class="prettyprint">&lt;pre class="prettyprint linenums:<b>4</b>"
-&gt;// This is line 4.
-foo();
-bar();
-baz();
-boo();
-far();
-faz();
-&lt;pre&gt;</pre>
-    produces
-<pre class="prettyprint linenums:4"
->// This is line 4.
-foo();
-bar();
-baz();
-boo();
-far();
-faz();
-</pre>
-
-    <h3>How do I prevent a portion of markup from being marked as code?</h3>
-    <p>You can use the <code>nocode</code> class to identify a span of markup
-    that is not code.
-<pre class="prettyprint">&lt;pre class=prettyprint&gt;
-int x = foo();  /* This is a comment  &lt;span class="nocode"&gt;This is not code&lt;/span&gt;
-  Continuation of comment */
-int y = bar();
-&lt;/pre&gt;</pre>
-produces
-<pre class="prettyprint">
-int x = foo();  /* This is a comment  <span class="nocode">This is not code</span>
-  Continuation of comment */
-int y = bar();
-</pre>
-
-    <p>For a more complete example see the issue22
-    <a href="tests/prettify_test.html#issue22">testcase</a>.</p>
-
-    <h3>I get an error message "a is not a function" or "opt_whenDone is not a function"</h3>
-    <p>If you are calling <code>prettyPrint</code> via an event handler, wrap it in a function.
-    Instead of doing
-    <blockquote>
-      <code class="prettyprint lang-js"
-       >addEventListener('load', prettyPrint, false);</code>
-    </blockquote>
-    wrap it in a closure like
-    <blockquote>
-      <code class="prettyprint lang-js"
-       >addEventListener('load', function (event) { prettyPrint() }, false);</code>
-    </blockquote>
-    so that the browser does not pass an event object to <code>prettyPrint</code> which
-    will confuse it.
-
-    <br><br><br>
-
-    <div class="footer">
-<!-- Created: Tue Oct  3 17:51:56 PDT 2006 -->
-<!-- hhmts start -->
-Last modified: Wed Jul 19 13:56:00 PST 2010
-<!-- hhmts end -->
-    </div>
-  </body>
-</html>
diff --git a/docs/assets/vendor/prettify/prettify-min.css b/docs/assets/vendor/prettify/prettify-min.css
deleted file mode 100644
index d44b3a2282..0000000000
--- a/docs/assets/vendor/prettify/prettify-min.css
+++ /dev/null
@@ -1 +0,0 @@
-.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
\ No newline at end of file
diff --git a/docs/assets/vendor/prettify/prettify-min.js b/docs/assets/vendor/prettify/prettify-min.js
deleted file mode 100644
index 4845d05d4b..0000000000
--- a/docs/assets/vendor/prettify/prettify-min.js
+++ /dev/null
@@ -1 +0,0 @@
-window.PR_SHOULD_USE_CONTINUATION=true;var prettyPrintOne;var prettyPrint;(function(){var O=window;var j=["break,continue,do,else,for,if,return,while"];var v=[j,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var q=[v,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var m=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var y=[q,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var T=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"];var s="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes";var x=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var t="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var J=[j,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var g=[j,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var I=[j,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var B=[m,T,x,t+J,g,I];var f=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var D="str";var A="kwd";var k="com";var Q="typ";var H="lit";var M="pun";var G="pln";var n="tag";var F="dec";var K="src";var R="atn";var o="atv";var P="nocode";var N="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function l(ab){var af=0;var U=false;var ae=false;for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.ignoreCase){ae=true}else{if(/[a-z]/i.test(ag.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,""))){U=true;ae=false;break}}}var aa={b:8,t:9,n:10,v:11,f:12,r:13};function ad(aj){var ai=aj.charCodeAt(0);if(ai!==92){return ai}var ah=aj.charAt(1);ai=aa[ah];if(ai){return ai}else{if("0"<=ah&&ah<="7"){return parseInt(aj.substring(1),8)}else{if(ah==="u"||ah==="x"){return parseInt(aj.substring(2),16)}else{return aj.charCodeAt(1)}}}}function V(ah){if(ah<32){return(ah<16?"\\x0":"\\x")+ah.toString(16)}var ai=String.fromCharCode(ah);return(ai==="\\"||ai==="-"||ai==="]"||ai==="^")?"\\"+ai:ai}function Z(an){var ar=an.substring(1,an.length-1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}|\\\\x[0-9A-Fa-f]{2}|\\\\[0-3][0-7]{0,2}|\\\\[0-7]{1,2}|\\\\[\\s\\S]|-|[^-\\\\]","g"));var ah=[];var ap=ar[0]==="^";var ao=["["];if(ap){ao.push("^")}for(var at=ap?1:0,al=ar.length;at<al;++at){var aj=ar[at];if(/\\[bdsw]/i.test(aj)){ao.push(aj)}else{var ai=ad(aj);var am;if(at+2<al&&"-"===ar[at+1]){am=ad(ar[at+2]);at+=2}else{am=ai}ah.push([ai,am]);if(!(am<65||ai>122)){if(!(am<65||ai>90)){ah.push([Math.max(65,ai)|32,Math.min(am,90)|32])}if(!(am<97||ai>122)){ah.push([Math.max(97,ai)&~32,Math.min(am,122)&~32])}}}}ah.sort(function(aw,av){return(aw[0]-av[0])||(av[1]-aw[1])});var ak=[];var aq=[];for(var at=0;at<ah.length;++at){var au=ah[at];if(au[0]<=aq[1]+1){aq[1]=Math.max(aq[1],au[1])}else{ak.push(aq=au)}}for(var at=0;at<ak.length;++at){var au=ak[at];ao.push(V(au[0]));if(au[1]>au[0]){if(au[1]+1>au[0]){ao.push("-")}ao.push(V(au[1]))}}ao.push("]");return ao.join("")}function Y(an){var al=an.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var aj=al.length;var ap=[];for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah){if(ah<=ao){ap[ah]=-1}else{al[am]=V(ah)}}}}}for(var am=1;am<ap.length;++am){if(-1===ap[am]){ap[am]=++af}}for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao;if(!ap[ao]){al[am]="(?:"}}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah&&ah<=ao){al[am]="\\"+ap[ah]}}}}for(var am=0;am<aj;++am){if("^"===al[am]&&"^"!==al[am+1]){al[am]=""}}if(an.ignoreCase&&U){for(var am=0;am<aj;++am){var ai=al[am];var ak=ai.charAt(0);if(ai.length>=2&&ak==="["){al[am]=Z(ai)}else{if(ak!=="\\"){al[am]=ai.replace(/[a-zA-Z]/g,function(aq){var ar=aq.charCodeAt(0);return"["+String.fromCharCode(ar&~32,ar|32)+"]"})}}}}return al.join("")}var ac=[];for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.global||ag.multiline){throw new Error(""+ag)}ac.push("(?:"+Y(ag)+")")}return new RegExp(ac.join("|"),ae?"gi":"g")}function b(aa,Y){var W=/(?:^|\s)nocode(?:\s|$)/;var ab=[];var Z=0;var X=[];var V=0;function U(ac){switch(ac.nodeType){case 1:if(W.test(ac.className)){return}for(var af=ac.firstChild;af;af=af.nextSibling){U(af)}var ae=ac.nodeName.toLowerCase();if("br"===ae||"li"===ae){ab[V]="\n";X[V<<1]=Z++;X[(V++<<1)|1]=ac}break;case 3:case 4:var ad=ac.nodeValue;if(ad.length){if(!Y){ad=ad.replace(/[ \t\r\n]+/g," ")}else{ad=ad.replace(/\r\n?/g,"\n")}ab[V]=ad;X[V<<1]=Z;Z+=ad.length;X[(V++<<1)|1]=ac}break}}U(aa);return{sourceCode:ab.join("").replace(/\n$/,""),spans:X}}function C(U,W,Y,V){if(!W){return}var X={sourceCode:W,basePos:U};Y(X);V.push.apply(V,X.decorations)}var w=/\S/;function p(U){var X=undefined;for(var W=U.firstChild;W;W=W.nextSibling){var V=W.nodeType;X=(V===1)?(X?U:W):(V===3)?(w.test(W.nodeValue)?U:X):X}return X===U?undefined:X}function h(W,V){var U={};var X;(function(){var af=W.concat(V);var aj=[];var ai={};for(var ad=0,ab=af.length;ad<ab;++ad){var aa=af[ad];var ae=aa[3];if(ae){for(var ag=ae.length;--ag>=0;){U[ae.charAt(ag)]=aa}}var ah=aa[1];var ac=""+ah;if(!ai.hasOwnProperty(ac)){aj.push(ah);ai[ac]=null}}aj.push(/[\0-\uffff]/);X=l(aj)})();var Z=V.length;var Y=function(aj){var ab=aj.sourceCode,aa=aj.basePos;var af=[aa,G];var ah=0;var ap=ab.match(X)||[];var al={};for(var ag=0,at=ap.length;ag<at;++ag){var ai=ap[ag];var ar=al[ai];var ak=void 0;var ao;if(typeof ar==="string"){ao=false}else{var ac=U[ai.charAt(0)];if(ac){ak=ai.match(ac[1]);ar=ac[0]}else{for(var aq=0;aq<Z;++aq){ac=V[aq];ak=ai.match(ac[1]);if(ak){ar=ac[0];break}}if(!ak){ar=G}}ao=ar.length>=5&&"lang-"===ar.substring(0,5);if(ao&&!(ak&&typeof ak[1]==="string")){ao=false;ar=K}if(!ao){al[ai]=ar}}var ad=ah;ah+=ai.length;if(!ao){af.push(aa+ad,ar)}else{var an=ak[1];var am=ai.indexOf(an);var ae=am+an.length;if(ak[2]){ae=ai.length-ak[2].length;am=ae-an.length}var au=ar.substring(5);C(aa+ad,ai.substring(0,am),Y,af);C(aa+ad+am,an,r(au,an),af);C(aa+ad+ae,ai.substring(ae),Y,af)}}aj.decorations=af};return Y}function i(V){var Y=[],U=[];if(V.tripleQuotedStrings){Y.push([D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(V.multiLineStrings){Y.push([D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{Y.push([D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(V.verbatimStrings){U.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ab=V.hashComments;if(ab){if(V.cStyleComments){if(ab>1){Y.push([k,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{Y.push([k,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}U.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{Y.push([k,/^#[^\r\n]*/,null,"#"])}}if(V.cStyleComments){U.push([k,/^\/\/[^\r\n]*/,null]);U.push([k,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(V.regexLiterals){var aa=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");U.push(["lang-regex",new RegExp("^"+N+"("+aa+")")])}var X=V.types;if(X){U.push([Q,X])}var W=(""+V.keywords).replace(/^ | $/g,"");if(W.length){U.push([A,new RegExp("^(?:"+W.replace(/[\s,]+/g,"|")+")\\b"),null])}Y.push([G,/^\s+/,null," \r\n\t\xA0"]);var Z=/^.[^\s\w\.$@\'\"\`\/\\]*/;U.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[Q,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[G,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[G,/^\\[\s\S]?/,null],[M,Z,null]);return h(Y,U)}var L=i({keywords:B,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function S(W,ah,aa){var V=/(?:^|\s)nocode(?:\s|$)/;var ac=/\r\n?|\n/;var ad=W.ownerDocument;var ag=ad.createElement("li");while(W.firstChild){ag.appendChild(W.firstChild)}var X=[ag];function af(am){switch(am.nodeType){case 1:if(V.test(am.className)){break}if("br"===am.nodeName){ae(am);if(am.parentNode){am.parentNode.removeChild(am)}}else{for(var ao=am.firstChild;ao;ao=ao.nextSibling){af(ao)}}break;case 3:case 4:if(aa){var an=am.nodeValue;var ak=an.match(ac);if(ak){var aj=an.substring(0,ak.index);am.nodeValue=aj;var ai=an.substring(ak.index+ak[0].length);if(ai){var al=am.parentNode;al.insertBefore(ad.createTextNode(ai),am.nextSibling)}ae(am);if(!aj){am.parentNode.removeChild(am)}}}break}}function ae(al){while(!al.nextSibling){al=al.parentNode;if(!al){return}}function aj(am,at){var ar=at?am.cloneNode(false):am;var ap=am.parentNode;if(ap){var aq=aj(ap,1);var ao=am.nextSibling;aq.appendChild(ar);for(var an=ao;an;an=ao){ao=an.nextSibling;aq.appendChild(an)}}return ar}var ai=aj(al.nextSibling,0);for(var ak;(ak=ai.parentNode)&&ak.nodeType===1;){ai=ak}X.push(ai)}for(var Z=0;Z<X.length;++Z){af(X[Z])}if(ah===(ah|0)){X[0].setAttribute("value",ah)}var ab=ad.createElement("ol");ab.className="linenums";var Y=Math.max(0,((ah-1))|0)||0;for(var Z=0,U=X.length;Z<U;++Z){ag=X[Z];ag.className="L"+((Z+Y)%10);if(!ag.firstChild){ag.appendChild(ad.createTextNode("\xA0"))}ab.appendChild(ag)}W.appendChild(ab)}function E(af){var X=/\bMSIE\s(\d+)/.exec(navigator.userAgent);X=X&&+X[1]<=8;var ao=/\n/g;var an=af.sourceCode;var ap=an.length;var Y=0;var ad=af.spans;var V=ad.length;var aj=0;var aa=af.decorations;var ab=aa.length;var ac=0;aa[ab]=ap;var av,at;for(at=av=0;at<ab;){if(aa[at]!==aa[at+2]){aa[av++]=aa[at++];aa[av++]=aa[at++]}else{at+=2}}ab=av;for(at=av=0;at<ab;){var aw=aa[at];var ae=aa[at+1];var Z=at+2;while(Z+2<=ab&&aa[Z+1]===ae){Z+=2}aa[av++]=aw;aa[av++]=ae;at=Z}ab=aa.length=av;var au=af.sourceNode;var ak;if(au){ak=au.style.display;au.style.display="none"}try{var ah=null;while(aj<V){var ai=ad[aj];var U=ad[aj+2]||ap;var ar=aa[ac+2]||ap;var Z=Math.min(U,ar);var am=ad[aj+1];var W;if(am.nodeType!==1&&(W=an.substring(Y,Z))){if(X){W=W.replace(ao,"\r")}am.nodeValue=W;var al=am.ownerDocument;var aq=al.createElement("span");aq.className=aa[ac+1];var ag=am.parentNode;ag.replaceChild(aq,am);aq.appendChild(am);if(Y<U){ad[aj+1]=am=al.createTextNode(an.substring(Z,U));ag.insertBefore(am,aq.nextSibling)}}Y=Z;if(Y>=U){aj+=2}if(Y>=ar){ac+=2}}}finally{if(au){au.style.display=ak}}}var u={};function d(W,X){for(var U=X.length;--U>=0;){var V=X[U];if(!u.hasOwnProperty(V)){u[V]=W}else{if(O.console){console.warn("cannot override language handler %s",V)}}}}function r(V,U){if(!(V&&u.hasOwnProperty(V))){V=/^\s*</.test(U)?"default-markup":"default-code"}return u[V]}d(L,["default-code"]);d(h([],[[G,/^[^<?]+/],[F,/^<!\w[^>]*(?:>|$)/],[k,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[M,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);d(h([[G,/^[\s]+/,null," \t\r\n"],[o,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[n,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[R,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[M,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);d(h([],[[o,/^[\s\S]+/]]),["uq.val"]);d(i({keywords:m,hashComments:true,cStyleComments:true,types:f}),["c","cc","cpp","cxx","cyc","m"]);d(i({keywords:"null,true,false"}),["json"]);d(i({keywords:T,hashComments:true,cStyleComments:true,verbatimStrings:true,types:f}),["cs"]);d(i({keywords:y,cStyleComments:true}),["java"]);d(i({keywords:I,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);d(i({keywords:J,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);d(i({keywords:t,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);d(i({keywords:g,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);d(i({keywords:x,cStyleComments:true,regexLiterals:true}),["js"]);d(i({keywords:s,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);d(h([],[[D,/^[\s\S]+/]]),["regex"]);function e(X){var W=X.langExtension;try{var U=b(X.sourceNode,X.pre);var V=U.sourceCode;X.sourceCode=V;X.spans=U.spans;X.basePos=0;r(W,V)(X);E(X)}catch(Y){if(O.console){console.log(Y&&Y.stack?Y.stack:Y)}}}function z(Y,X,W){var U=document.createElement("pre");U.innerHTML=Y;if(W){S(U,W,true)}var V={langExtension:X,numberLines:W,sourceNode:U,pre:1};e(V);return U.innerHTML}function c(aj){function ab(al){return document.getElementsByTagName(al)}var ah=[ab("pre"),ab("code"),ab("xmp")];var V=[];for(var ae=0;ae<ah.length;++ae){for(var ac=0,Y=ah[ae].length;ac<Y;++ac){V.push(ah[ae][ac])}}ah=null;var Z=Date;if(!Z.now){Z={now:function(){return +(new Date)}}}var aa=0;var U;var af=/\blang(?:uage)?-([\w.]+)(?!\S)/;var ak=/\bprettyprint\b/;var W=/\bprettyprinted\b/;var ag=/pre|xmp/i;var ai=/^code$/i;var ad=/^(?:pre|code|xmp)$/i;function X(){var ar=(O.PR_SHOULD_USE_CONTINUATION?Z.now()+250:Infinity);for(;aa<V.length&&Z.now()<ar;aa++){var at=V[aa];var au=at.className;if(ak.test(au)&&!W.test(au)){var aw=false;for(var ao=at.parentNode;ao;ao=ao.parentNode){var ax=ao.tagName;if(ad.test(ax)&&ao.className&&ak.test(ao.className)){aw=true;break}}if(!aw){at.className+=" prettyprinted";var aq=au.match(af);var am;if(!aq&&(am=p(at))&&ai.test(am.tagName)){aq=am.className.match(af)}if(aq){aq=aq[1]}var ap;if(ag.test(at.tagName)){ap=1}else{var an=at.currentStyle;var al=(an?an.whiteSpace:(document.defaultView&&document.defaultView.getComputedStyle)?document.defaultView.getComputedStyle(at,null).getPropertyValue("white-space"):0);ap=al&&"pre"===al.substring(0,3)}var av=at.className.match(/\blinenums\b(?::(\d+))?/);av=av?av[1]&&av[1].length?+av[1]:true:false;if(av){S(at,av,ap)}U={langExtension:aq,sourceNode:at,numberLines:av,pre:ap};e(U)}}}if(aa<V.length){setTimeout(X,250)}else{if(aj){aj()}}}X()}var a=O.PR={createSimpleLexer:h,registerLangHandler:d,sourceDecorator:i,PR_ATTRIB_NAME:R,PR_ATTRIB_VALUE:o,PR_COMMENT:k,PR_DECLARATION:F,PR_KEYWORD:A,PR_LITERAL:H,PR_NOCODE:P,PR_PLAIN:G,PR_PUNCTUATION:M,PR_SOURCE:K,PR_STRING:D,PR_TAG:n,PR_TYPE:Q,prettyPrintOne:O.prettyPrintOne=z,prettyPrint:O.prettyPrint=c};if(typeof define==="function"&&define.amd){define("google-code-prettify",[],function(){return a})}})();PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_DECLARATION,/^<!\w[^>]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^<script\b[^>]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:<!--|-->)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]);
\ No newline at end of file
diff --git a/docs/classes/Roles.html b/docs/classes/Roles.html
deleted file mode 100644
index f1970951d4..0000000000
--- a/docs/classes/Roles.html
+++ /dev/null
@@ -1,5185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Roles - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v4.0.0</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>Roles Class</h1>
-<div class="box meta">
-
-
-        <div class="foundat">
-            Defined in: <a href="../files/roles_roles_common_async.js.html#l41"><code>roles&#x2F;roles_common_async.js:41</code></a>
-        </div>
-
-            Module: <a href="../modules/Roles.html">Roles</a>
-
-</div>
-
-
-<div class="box intro">
-    
-</div>
-
-
-<div id="classdocs" class="tabview">
-    <ul class="api-class-tabs">
-        <li class="api-class-tab index"><a href="#index">Index</a></li>
-
-            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
-            <li class="api-class-tab properties"><a href="#properties">Properties</a></li>
-    </ul>
-
-    <div>
-        <div id="index" class="api-class-tabpanel index">
-            <h2 class="off-left">Item Index</h2>
-
-                <div class="index-section methods">
-                    <h3>Methods</h3>
-
-                    <ul class="index-list methods">
-                            <li class="index-item method private">
-                                <a href="#method__addRoleToParent">_addRoleToParent</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__addRoleToParentAsync">_addRoleToParentAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__addUserToRole">_addUserToRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__addUserToRoleAsync">_addUserToRoleAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__checkRoleName">_checkRoleName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__checkRoleName">_checkRoleName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__checkRoleName">_checkRoleName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__checkScopeName">_checkScopeName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__getInheritedRoleNames">_getInheritedRoleNames</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__getInheritedRoleNames">_getInheritedRoleNames</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__getParentRoleNames">_getParentRoleNames</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__getParentRoleNamesAsync">_getParentRoleNamesAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__getUsersInRoleCursor">_getUsersInRoleCursor</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__getUsersInRoleCursor">_getUsersInRoleCursor</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__normalizeOptions">_normalizeOptions</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__normalizeOptions">_normalizeOptions</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__normalizeScopeName">_normalizeScopeName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__normalizeScopeName">_normalizeScopeName</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__removeRoleFromParent">_removeRoleFromParent</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__removeRoleFromParentAsync">_removeRoleFromParentAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__removeUserFromRole">_removeUserFromRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method private">
-                                <a href="#method__removeUserFromRoleAsync">_removeUserFromRoleAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_addRolesToParent">addRolesToParent</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_addRolesToParentAsync">addRolesToParentAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_addUsersToRoles">addUsersToRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_addUsersToRolesAsync">addUsersToRolesAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_createRole">createRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_createRoleAsync">createRoleAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_deleteRole">deleteRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_deleteRoleAsync">deleteRoleAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getAllRoles">getAllRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getAllRoles">getAllRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method deprecated">
-                                <a href="#method_getGroupsForUser">getGroupsForUser</a>
-
-                                    <span class="flag static">static</span>
-                                    <span class="flag deprecated">deprecated</span>
-                            </li>
-                            <li class="index-item method deprecated">
-                                <a href="#method_getGroupsForUserAsync">getGroupsForUserAsync</a>
-
-                                    <span class="flag static">static</span>
-                                    <span class="flag deprecated">deprecated</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getRolesForUser">getRolesForUser</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getRolesForUserAsync">getRolesForUserAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getScopesForUser">getScopesForUser</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getScopesForUserAsync">getScopesForUserAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getUserAssignmentsForRole">getUserAssignmentsForRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getUserAssignmentsForRole">getUserAssignmentsForRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getUsersInRole">getUsersInRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_getUsersInRoleAsync">getUsersInRoleAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_isParentOf">isParentOf</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_isParentOfAsync">isParentOfAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeRolesFromParent">removeRolesFromParent</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeRolesFromParentAsync">removeRolesFromParentAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeScope">removeScope</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeScopeAsync">removeScopeAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeUsersFromRoles">removeUsersFromRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_removeUsersFromRolesAsync">removeUsersFromRolesAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_renameRole">renameRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_renameRoleAsync">renameRoleAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_renameScope">renameScope</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_renameScopeAsync">renameScopeAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_setUserRoles">setUserRoles</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_setUserRolesAsync">setUserRolesAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_userIsInRole">userIsInRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_userIsInRoleAsync">userIsInRoleAsync</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                    </ul>
-                </div>
-
-                <div class="index-section properties">
-                    <h3>Properties</h3>
-
-                    <ul class="index-list properties">
-                            <li class="index-item property deprecated">
-                                <a href="#property_GLOBAL_GROUP">GLOBAL_GROUP</a>
-
-                                    <span class="flag static">static</span>
-                                    <span class="flag deprecated">deprecated</span>
-                            </li>
-                            <li class="index-item property deprecated">
-                                <a href="#property_GLOBAL_GROUP">GLOBAL_GROUP</a>
-
-                                    <span class="flag static">static</span>
-                                    <span class="flag deprecated">deprecated</span>
-                            </li>
-                    </ul>
-                </div>
-
-
-        </div>
-
-            <div id="methods" class="api-class-tabpanel">
-                <h2 class="off-left">Methods</h2>
-
-<div id="method__addRoleToParent" class="method item private">
-    <h3 class="name"><code>_addRoleToParent</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l205"><code>roles&#x2F;roles_client.js:205</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__addRoleToParentAsync" class="method item private">
-    <h3 class="name"><code>_addRoleToParentAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l277"><code>roles&#x2F;roles_common_async.js:277</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method__addUserToRole" class="method item private">
-    <h3 class="name"><code>_addUserToRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>userId</code>
-                </li>
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l437"><code>roles&#x2F;roles_client.js:437</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add one user to one role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">userId</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The user ID.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of the role to add the user to. The role have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__addUserToRoleAsync" class="method item private">
-    <h3 class="name"><code>_addUserToRoleAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>userId</code>
-                </li>
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l555"><code>roles&#x2F;roles_common_async.js:555</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add one user to one role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">userId</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The user ID.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of the role to add the user to. The role have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method__checkRoleName" class="method item private">
-    <h3 class="name"><code>_checkRoleName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l989"><code>roles&#x2F;roles_client.js:989</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Throw an exception if <code>roleName</code> is an invalid role name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A role name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__checkRoleName" class="method item private">
-    <h3 class="name"><code>_checkRoleName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>scopeName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l1083"><code>roles&#x2F;roles_client.js:1083</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Throw an exception if <code>scopeName</code> is an invalid scope name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">scopeName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A scope name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__checkRoleName" class="method item private">
-    <h3 class="name"><code>_checkRoleName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1208"><code>roles&#x2F;roles_common_async.js:1208</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Throw an exception if <code>roleName</code> is an invalid role name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A role name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__checkScopeName" class="method item private">
-    <h3 class="name"><code>_checkScopeName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>scopeName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1309"><code>roles&#x2F;roles_common_async.js:1309</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Throw an exception if <code>scopeName</code> is an invalid scope name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">scopeName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A scope name to match against.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__getInheritedRoleNames" class="method item private">
-    <h3 class="name"><code>_getInheritedRoleNames</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>role</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l520"><code>roles&#x2F;roles_client.js:520</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Returns an array of role names the given role name is a parent of.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">role</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>The role object</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles._getInheritedRoleNames({ _id: 'admin', children; [] })</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method__getInheritedRoleNames" class="method item private">
-    <h3 class="name"><code>_getInheritedRoleNames</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>role</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l683"><code>roles&#x2F;roles_common_async.js:683</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Returns an array of role names the given role name is a parent of.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">role</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>The role object</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles._getInheritedRoleNames({ _id: 'admin', children; [] })</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method__getParentRoleNames" class="method item private">
-    <h3 class="name"><code>_getParentRoleNames</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>role</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l491"><code>roles&#x2F;roles_client.js:491</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Returns an array of role names the given role name is a child of.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">role</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>The role object</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles._getParentRoleNames({ _id: 'admin', children; [] })</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method__getParentRoleNamesAsync" class="method item private">
-    <h3 class="name"><code>_getParentRoleNamesAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>role</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l651"><code>roles&#x2F;roles_common_async.js:651</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Returns an array of role names the given role name is a child of.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">role</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>The role object</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles._getParentRoleNamesAsync({ _id: 'admin', children; [] })</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method__getUsersInRoleCursor" class="method item private">
-    <h3 class="name"><code>_getUsersInRoleCursor</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[filter]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l844"><code>roles&#x2F;roles_client.js:844</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles. If array, ids of users are
-returned which have at least one of the roles
-assigned but need not have <em>all</em> roles.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope to restrict roles to; user's global
-roles will also be checked</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[filter]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>RoleAssignmentCollection.find(query, options)</code></p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>Cursor to the assignment documents</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__getUsersInRoleCursor" class="method item private">
-    <h3 class="name"><code>_getUsersInRoleCursor</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[filter]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1041"><code>roles&#x2F;roles_common_async.js:1041</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles. If array, ids of users are
-returned which have at least one of the roles
-assigned but need not have <em>all</em> roles.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope to restrict roles to; user's global
-roles will also be checked</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[filter]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>RoleAssignmentCollection.find(query, options)</code></p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>Cursor to the assignment documents</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__normalizeOptions" class="method item private">
-    <h3 class="name"><code>_normalizeOptions</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l1044"><code>roles&#x2F;roles_client.js:1044</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Normalize options.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options to normalize.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>Normalized options.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__normalizeOptions" class="method item private">
-    <h3 class="name"><code>_normalizeOptions</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Object</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1268"><code>roles&#x2F;roles_common_async.js:1268</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Normalize options.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options to normalize.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Object</span>:
-                    <p>Normalized options.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__normalizeScopeName" class="method item private">
-    <h3 class="name"><code>_normalizeScopeName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>scopeName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">String</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l1065"><code>roles&#x2F;roles_client.js:1065</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Normalize scope name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">scopeName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A scope name to normalize.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">String</span>:
-                    <p>Normalized scope name.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__normalizeScopeName" class="method item private">
-    <h3 class="name"><code>_normalizeScopeName</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>scopeName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">String</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1291"><code>roles&#x2F;roles_common_async.js:1291</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Normalize scope name.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">scopeName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>A scope name to normalize.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">String</span>:
-                    <p>Normalized scope name.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method__removeRoleFromParent" class="method item private">
-    <h3 class="name"><code>_removeRoleFromParent</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l274"><code>roles&#x2F;roles_client.js:274</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__removeRoleFromParentAsync" class="method item private">
-    <h3 class="name"><code>_removeRoleFromParentAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l362"><code>roles&#x2F;roles_common_async.js:362</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method__removeUserFromRole" class="method item private">
-    <h3 class="name"><code>_removeUserFromRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>userId</code>
-                </li>
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l593"><code>roles&#x2F;roles_client.js:593</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove one user from one role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">userId</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The user ID.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of the role to add the user to. The role have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method__removeUserFromRoleAsync" class="method item private">
-    <h3 class="name"><code>_removeUserFromRoleAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>userId</code>
-                </li>
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code>options</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-        <span class="flag private">private</span>
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l763"><code>roles&#x2F;roles_common_async.js:763</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove one user from one role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">userId</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The user ID.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of the role to add the user to. The role have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">options</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_addRolesToParent" class="method item">
-    <h3 class="name"><code>addRolesToParent</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>rolesNames</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l185"><code>roles&#x2F;roles_client.js:185</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add role parent to roles.</p>
-<p>Previous parents are kept (role can have multiple parents). For users which have the
-parent role set, new subroles are added automatically.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">rolesNames</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of role(s).</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_addRolesToParentAsync" class="method item">
-    <h3 class="name"><code>addRolesToParentAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>rolesNames</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l256"><code>roles&#x2F;roles_common_async.js:256</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add role parent to roles.</p>
-<p>Previous parents are kept (role can have multiple parents). For users which have the
-parent role set, new subroles are added automatically.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">rolesNames</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of role(s).</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_addUsersToRoles" class="method item">
-    <h3 class="name"><code>addUsersToRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l323"><code>roles&#x2F;roles_client.js:323</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add users to roles.</p>
-<p>Adds roles to existing roles for each user.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.addUsersToRoles(userId, 'admin')
-Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
-Roles.addUsersToRoles([user1, user2], ['user','editor'])
-Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_addUsersToRolesAsync" class="method item">
-    <h3 class="name"><code>addUsersToRolesAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l433"><code>roles&#x2F;roles_common_async.js:433</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Add users to roles.</p>
-<p>Adds roles to existing roles for each user.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-                    <p>Alternatively, it can be a scope name string.</p>
-
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.addUsersToRolesAsync(userId, 'admin')
-Roles.addUsersToRolesAsync(userId, ['view-secrets'], 'example.com')
-Roles.addUsersToRolesAsync([user1, user2], ['user','editor'])
-Roles.addUsersToRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_createRole" class="method item">
-    <h3 class="name"><code>createRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">String</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l49"><code>roles&#x2F;roles_client.js:49</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Create a new role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>unlessExists</code>: if <code>true</code>, exception will not be thrown in the role already exists</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">String</span>:
-                    <p>ID of the new role or null.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_createRoleAsync" class="method item">
-    <h3 class="name"><code>createRoleAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise<String></span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l73"><code>roles&#x2F;roles_common_async.js:73</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Create a new role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>unlessExists</code>: if <code>true</code>, exception will not be thrown in the role already exists</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise<String></span>:
-                    <p>ID of the new role or null.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_deleteRole" class="method item">
-    <h3 class="name"><code>deleteRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l76"><code>roles&#x2F;roles_client.js:76</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Delete an existing role.</p>
-<p>If the role is set for any user, it is automatically unset.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_deleteRoleAsync" class="method item">
-    <h3 class="name"><code>deleteRoleAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l118"><code>roles&#x2F;roles_common_async.js:118</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Delete an existing role.</p>
-<p>If the role is set for any user, it is automatically unset.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getAllRoles" class="method item">
-    <h3 class="name"><code>getAllRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>queryOptions</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l767"><code>roles&#x2F;roles_client.js:767</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve cursor of all existing roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">queryOptions</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>RolesCollection.find(query, options)</code>.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Cursor</span>:
-                    <p>Cursor of existing roles.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getAllRoles" class="method item">
-    <h3 class="name"><code>getAllRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code class="optional">[queryOptions]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l956"><code>roles&#x2F;roles_common_async.js:956</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve cursor of all existing roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name optional">[queryOptions]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>RolesCollection.find(query, options)</code>.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Cursor</span>:
-                    <p>Cursor of existing roles.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getGroupsForUser" class="method item deprecated">
-    <h3 class="name"><code>getGroupsForUser</code></h3>
-
-        <span class="paren">()</span>
-
-
-        <span class="flag deprecated">deprecated</span>
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l892"><code>roles&#x2F;roles_client.js:892</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Deprecated. Use <code>getScopesForUser</code> instead.</p>
-
-    </div>
-
-
-
-
-</div>
-<div id="method_getGroupsForUserAsync" class="method item deprecated">
-    <h3 class="name"><code>getGroupsForUserAsync</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">Promise<Array></span>
-        </span>
-
-        <span class="flag deprecated">deprecated</span>
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1097"><code>roles&#x2F;roles_common_async.js:1097</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Deprecated. Use <code>getScopesForUser</code> instead.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise<Array></span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getRolesForUser" class="method item">
-    <h3 class="name"><code>getRolesForUser</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l691"><code>roles&#x2F;roles_client.js:691</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve user's roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of scope to provide roles for; if not specified, global roles are returned</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> and <code>onlyAssigned</code> options are ignored)</li>
-<li><code>onlyScoped</code>: if set, only roles in the specified scope are returned</li>
-<li><code>onlyAssigned</code>: return only assigned roles and not automatically inferred (like subroles)</li>
-<li><code>fullObjects</code>: return full roles objects (<code>true</code>) or just names (<code>false</code>) (<code>onlyAssigned</code> option is ignored) (default <code>false</code>)
-If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
-result strongly dependent on the internal data structure of this plugin.</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array</span>:
-                    <p>Array of user's roles, unsorted.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getRolesForUserAsync" class="method item">
-    <h3 class="name"><code>getRolesForUserAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise<Array></span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l871"><code>roles&#x2F;roles_common_async.js:871</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve user's roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of scope to provide roles for; if not specified, global roles are returned</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> and <code>onlyAssigned</code> options are ignored)</li>
-<li><code>onlyScoped</code>: if set, only roles in the specified scope are returned</li>
-<li><code>onlyAssigned</code>: return only assigned roles and not automatically inferred (like subroles)</li>
-<li><code>fullObjects</code>: return full roles objects (<code>true</code>) or just names (<code>false</code>) (<code>onlyAssigned</code> option is ignored) (default <code>false</code>)
-If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
-result strongly dependent on the internal data structure of this plugin.</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise<Array></span>:
-                    <p>Array of user's roles, unsorted.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getScopesForUser" class="method item">
-    <h3 class="name"><code>getScopesForUser</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[roles]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Array</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l908"><code>roles&#x2F;roles_client.js:908</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve users scopes, if any.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[roles]</code>
-                        <span class="type">Array | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Name of roles to restrict scopes to.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array</span>:
-                    <p>Array of user's scopes, unsorted.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getScopesForUserAsync" class="method item">
-    <h3 class="name"><code>getScopesForUserAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[roles]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise<Array></span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1117"><code>roles&#x2F;roles_common_async.js:1117</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve users scopes, if any.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[roles]</code>
-                        <span class="type">Array | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Name of roles to restrict scopes to.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise<Array></span>:
-                    <p>Array of user's scopes, unsorted.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getUserAssignmentsForRole" class="method item">
-    <h3 class="name"><code>getUserAssignmentsForRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l812"><code>roles&#x2F;roles_client.js:812</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve all assignments of a user which are for the target role.</p>
-<p>Options:</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles. If array, users
-returned will have at least one of the roles
-specified but need not have <em>all</em> roles.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope to restrict roles to; user's global
-roles will also be checked</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-<li><code>queryOptions</code>: options which are passed directly
-through to <code>RoleAssignmentCollection.find(query, options)</code></li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Cursor</span>:
-                    <p>Cursor of user assignments for roles.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getUserAssignmentsForRole" class="method item">
-    <h3 class="name"><code>getUserAssignmentsForRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1006"><code>roles&#x2F;roles_common_async.js:1006</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve all assignments of a user which are for the target role.</p>
-<p>Options:</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles. If array, users
-returned will have at least one of the roles
-specified but need not have <em>all</em> roles.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope to restrict roles to; user's global
-roles will also be checked</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-<li><code>queryOptions</code>: options which are passed directly
-through to <code>RoleAssignmentCollection.find(query, options)</code></li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Cursor</span>:
-                    <p>Cursor of user assignments for roles.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getUsersInRole" class="method item">
-    <h3 class="name"><code>getUsersInRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[queryOptions]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Cursor</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l782"><code>roles&#x2F;roles_client.js:782</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve all users who are in target role.</p>
-<p>Options:</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles. If array, users
-returned will have at least one of the roles
-specified but need not have <em>all</em> roles.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope to restrict roles to; user's global
-roles will also be checked</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-<li><code>onlyScoped</code>: if set, only roles in the specified scope are returned</li>
-<li><code>queryOptions</code>: options which are passed directly
-through to <code>Meteor.users.find(query, options)</code></li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[queryOptions]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>Meteor.users.find(query, options)</code></p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Cursor</span>:
-                    <p>Cursor of users in roles.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_getUsersInRoleAsync" class="method item">
-    <h3 class="name"><code>getUsersInRoleAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[queryOptions]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise<Cursor></span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l971"><code>roles&#x2F;roles_common_async.js:971</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Retrieve all users who are in target role.</p>
-<p>Options:</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles. If array, users
-returned will have at least one of the roles
-specified but need not have <em>all</em> roles.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope to restrict roles to; user's global
-roles will also be checked</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-<li><code>onlyScoped</code>: if set, only roles in the specified scope are returned</li>
-<li><code>queryOptions</code>: options which are passed directly
-through to <code>Meteor.users.find(query, options)</code></li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[queryOptions]</code>
-                        <span class="type">Object</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options which are passed directly
-through to <code>Meteor.users.find(query, options)</code></p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise<Cursor></span>:
-                    <p>Cursor of users in roles.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_isParentOf" class="method item">
-    <h3 class="name"><code>isParentOf</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>parentRoleName</code>
-                </li>
-                <li class="arg">
-                        <code>childRoleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l1003"><code>roles&#x2F;roles_client.js:1003</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Find out if a role is an ancestor of another role.</p>
-<p>WARNING: If you check this on the client, please make sure all roles are published.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">parentRoleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The role you want to research.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">childRoleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The role you expect to be among the children of parentRoleName.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_isParentOfAsync" class="method item">
-    <h3 class="name"><code>isParentOfAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>parentRoleName</code>
-                </li>
-                <li class="arg">
-                        <code>childRoleName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1226"><code>roles&#x2F;roles_common_async.js:1226</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Find out if a role is an ancestor of another role.</p>
-<p>WARNING: If you check this on the client, please make sure all roles are published.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">parentRoleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The role you want to research.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">childRoleName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The role you expect to be among the children of parentRoleName.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_removeRolesFromParent" class="method item">
-    <h3 class="name"><code>removeRolesFromParent</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>rolesNames</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l254"><code>roles&#x2F;roles_client.js:254</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove role parent from roles.</p>
-<p>Other parents are kept (role can have multiple parents). For users which have the
-parent role set, removed subrole is removed automatically.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">rolesNames</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of role(s).</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_removeRolesFromParentAsync" class="method item">
-    <h3 class="name"><code>removeRolesFromParentAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>rolesNames</code>
-                </li>
-                <li class="arg">
-                        <code>parentName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l341"><code>roles&#x2F;roles_common_async.js:341</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove role parent from roles.</p>
-<p>Other parents are kept (role can have multiple parents). For users which have the
-parent role set, removed subrole is removed automatically.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">rolesNames</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of role(s).</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">parentName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of parent role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_removeScope" class="method item">
-    <h3 class="name"><code>removeScope</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>name</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l974"><code>roles&#x2F;roles_client.js:974</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove a scope.</p>
-<p>Roles assigned with a given scope are removed.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">name</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The name of a scope.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_removeScopeAsync" class="method item">
-    <h3 class="name"><code>removeScopeAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>name</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1192"><code>roles&#x2F;roles_common_async.js:1192</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove a scope.</p>
-<p>Roles assigned with a given scope are removed.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">name</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The name of a scope.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_removeUsersFromRoles" class="method item">
-    <h3 class="name"><code>removeUsersFromRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l547"><code>roles&#x2F;roles_client.js:547</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove users from assigned roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to remove users from. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.removeUsersFromRoles(userId, 'admin')
-Roles.removeUsersFromRoles([userId, user2], ['editor'])
-Roles.removeUsersFromRoles(userId, ['user'], 'group1')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_removeUsersFromRolesAsync" class="method item">
-    <h3 class="name"><code>removeUsersFromRolesAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l716"><code>roles&#x2F;roles_common_async.js:716</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove users from assigned roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to remove users from. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-                    <p>Alternatively, it can be a scope name string.</p>
-
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>await Roles.removeUsersFromRolesAsync(userId, 'admin')
-await Roles.removeUsersFromRolesAsync([userId, user2], ['editor'])
-await Roles.removeUsersFromRolesAsync(userId, ['user'], 'group1')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_renameRole" class="method item">
-    <h3 class="name"><code>renameRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldName</code>
-                </li>
-                <li class="arg">
-                        <code>newName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l126"><code>roles&#x2F;roles_client.js:126</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Rename an existing role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Old name of a role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">newName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>New name of a role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_renameRoleAsync" class="method item">
-    <h3 class="name"><code>renameRoleAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldName</code>
-                </li>
-                <li class="arg">
-                        <code>newName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l184"><code>roles&#x2F;roles_common_async.js:184</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Rename an existing role.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Old name of a role.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">newName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>New name of a role.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_renameScope" class="method item">
-    <h3 class="name"><code>renameScope</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldName</code>
-                </li>
-                <li class="arg">
-                        <code>newName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l945"><code>roles&#x2F;roles_client.js:945</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Rename a scope.</p>
-<p>Roles assigned with a given scope are changed to be under the new scope.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Old name of a scope.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">newName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>New name of a scope.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_renameScopeAsync" class="method item">
-    <h3 class="name"><code>renameScopeAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>oldName</code>
-                </li>
-                <li class="arg">
-                        <code>newName</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l1158"><code>roles&#x2F;roles_common_async.js:1158</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Rename a scope.</p>
-<p>Roles assigned with a given scope are changed to be under the new scope.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">oldName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Old name of a scope.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">newName</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>New name of a scope.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_setUserRoles" class="method item">
-    <h3 class="name"><code>setUserRoles</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l375"><code>roles&#x2F;roles_client.js:375</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Set users' roles.</p>
-<p>Replaces all existing roles with a new set of roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>anyScope</code>: if <code>true</code>, remove all roles the user has, of any scope, if <code>false</code>, only the one in the same scope</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>Roles.setUserRoles(userId, 'admin')
-Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
-Roles.setUserRoles([user1, user2], ['user','editor'])
-Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_setUserRolesAsync" class="method item">
-    <h3 class="name"><code>setUserRolesAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>users</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l489"><code>roles&#x2F;roles_common_async.js:489</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Set users' roles.</p>
-<p>Replaces all existing roles with a new set of roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">users</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>User ID(s) or object(s) with an <code>_id</code> field.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name(s) of roles to add users to. Roles have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope, or <code>null</code> for the global role</li>
-<li><code>anyScope</code>: if <code>true</code>, remove all roles the user has, of any scope, if <code>false</code>, only the one in the same scope</li>
-<li><code>ifExists</code>: if <code>true</code>, do not throw an exception if the role does not exist</li>
-</ul>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise</span>:
-                    <p>Alternatively, it can be a scope name string.</p>
-
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>await Roles.setUserRolesAsync(userId, 'admin')
-await Roles.setUserRolesAsync(userId, ['view-secrets'], 'example.com')
-await Roles.setUserRolesAsync([user1, user2], ['user','editor'])
-await Roles.setUserRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_userIsInRole" class="method item">
-    <h3 class="name"><code>userIsInRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l623"><code>roles&#x2F;roles_client.js:623</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Check if user has specified roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles to check against. If array,
-will return <code>true</code> if user is in <em>any</em> role.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope; if supplied, limits check to just that scope
-the user's global roles will always be checked whether scope is specified or not</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p><code>true</code> if user is in <em>any</em> of the target roles</p>
-
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>// global roles
-Roles.userIsInRole(user, 'admin')
-Roles.userIsInRole(user, ['admin','editor'])
-Roles.userIsInRole(userId, 'admin')
-Roles.userIsInRole(userId, ['admin','editor'])
-
-// scope roles (global roles are still checked)
-Roles.userIsInRole(user, 'admin', 'group1')
-Roles.userIsInRole(userId, ['admin','editor'], 'group1')
-Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})</code></pre>
-
-            </div>
-        </div>
-</div>
-<div id="method_userIsInRoleAsync" class="method item">
-    <h3 class="name"><code>userIsInRoleAsync</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>user</code>
-                </li>
-                <li class="arg">
-                        <code>roles</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[options]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Promise<Boolean></span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l794"><code>roles&#x2F;roles_common_async.js:794</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Check if user has specified roles.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">user</code>
-                        <span class="type">String | Object</span>
-
-
-                    <div class="param-description">
-                        <p>User ID or an actual user object.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">roles</code>
-                        <span class="type">Array | String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or an array of roles to check against. If array,
-will return <code>true</code> if user is in <em>any</em> role.
-Roles do not have to exist.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[options]</code>
-                        <span class="type">Object | String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Options:</p>
-<ul>
-<li><code>scope</code>: name of the scope; if supplied, limits check to just that scope
-the user's global roles will always be checked whether scope is specified or not</li>
-<li><code>anyScope</code>: if set, role can be in any scope (<code>scope</code> option is ignored)</li>
-</ul>
-<p>Alternatively, it can be a scope name string.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Promise<Boolean></span>:
-                    <p><code>true</code> if user is in <em>any</em> of the target roles</p>
-
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>// global roles
-await Roles.userIsInRoleAsync(user, 'admin')
-await Roles.userIsInRoleAsync(user, ['admin','editor'])
-await Roles.userIsInRoleAsync(userId, 'admin')
-await Roles.userIsInRoleAsync(userId, ['admin','editor'])
-
-// scope roles (global roles are still checked)
-await Roles.userIsInRoleAsync(user, 'admin', 'group1')
-await Roles.userIsInRoleAsync(userId, ['admin','editor'], 'group1')
-await Roles.userIsInRoleAsync(userId, ['admin','editor'], {scope: 'group1'})</code></pre>
-
-            </div>
-        </div>
-</div>
-            </div>
-
-            <div id="properties" class="api-class-tabpanel">
-                <h2 class="off-left">Properties</h2>
-
-<div id="property_GLOBAL_GROUP" class="property item deprecated">
-    <h3 class="name"><code>GLOBAL_GROUP</code></h3>
-    <span class="type">Unknown</span>
-
-        <span class="flag deprecated">deprecated</span>
-
-
-
-        <span class="flag static">static</span>
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_client.js.html#l40"><code>roles&#x2F;roles_client.js:40</code></a>
-        </p>
-
-
-    </div>
-
-    <div class="description">
-        <p>Used as a global group (now scope) name. Not used anymore.</p>
-
-    </div>
-
-
-
-</div>
-<div id="property_GLOBAL_GROUP" class="property item deprecated">
-    <h3 class="name"><code>GLOBAL_GROUP</code></h3>
-    <span class="type">Unknown</span>
-
-        <span class="flag deprecated">deprecated</span>
-
-
-
-        <span class="flag static">static</span>
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_roles_common_async.js.html#l64"><code>roles&#x2F;roles_common_async.js:64</code></a>
-        </p>
-
-
-    </div>
-
-    <div class="description">
-        <p>Used as a global group (now scope) name. Not used anymore.</p>
-
-    </div>
-
-
-
-</div>
-            </div>
-
-
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/classes/UIHelpers.html b/docs/classes/UIHelpers.html
deleted file mode 100644
index 2efd2572d6..0000000000
--- a/docs/classes/UIHelpers.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>UIHelpers - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v4.0.0</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>UIHelpers Class</h1>
-<div class="box meta">
-
-
-
-            Module: <a href="../modules/UIHelpers.html">UIHelpers</a>
-
-</div>
-
-
-<div class="box intro">
-    
-</div>
-
-
-<div id="classdocs" class="tabview">
-    <ul class="api-class-tabs">
-        <li class="api-class-tab index"><a href="#index">Index</a></li>
-
-            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
-    </ul>
-
-    <div>
-        <div id="index" class="api-class-tabpanel index">
-            <h2 class="off-left">Item Index</h2>
-
-                <div class="index-section methods">
-                    <h3>Methods</h3>
-
-                    <ul class="index-list methods">
-                            <li class="index-item method">
-                                <a href="#method_isInRole">isInRole</a>
-
-                                    <span class="flag static">static</span>
-                            </li>
-                    </ul>
-                </div>
-
-
-
-        </div>
-
-            <div id="methods" class="api-class-tabpanel">
-                <h2 class="off-left">Methods</h2>
-
-<div id="method_isInRole" class="method item">
-    <h3 class="name"><code>isInRole</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>role</code>
-                </li>
-                <li class="arg">
-                        <code class="optional">[scope]</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-
-
-        <span class="flag static">static</span>
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/roles_client_uiHelpers.js.html#l23"><code>roles&#x2F;client&#x2F;uiHelpers.js:23</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>UI helper to check if current user is in at least one
-of the target roles.  For use in client-side templates.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">role</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>Name of role or comma-seperated list of roles.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name optional">[scope]</code>
-                        <span class="type">String</span>
-                        <span class="flag optional" title="This parameter is optional.">optional</span>
-
-
-                    <div class="param-description">
-                        <p>Optional, name of scope to check.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p><code>true</code> if current user is in at least one of the target roles.</p>
-
-            </div>
-        </div>
-
-
-        <div class="example">
-            <h4>Example:</h4>
-
-            <div class="example-content">
-                <pre class="code prettyprint"><code>{{#if isInRole 'admin'}}
-{{/if}}
-
-{{#if isInRole 'editor,user'}}
-{{/if}}
-
-{{#if isInRole 'editor,user' 'scope1'}}
-{{/if}}</code></pre>
-
-            </div>
-        </div>
-</div>
-            </div>
-
-
-
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/classes/index.html b/docs/classes/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/classes/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/docs/data.json b/docs/data.json
deleted file mode 100644
index 7988adc5bf..0000000000
--- a/docs/data.json
+++ /dev/null
@@ -1,1743 +0,0 @@
-{
-    "project": {
-        "name": "The meteor-roles API",
-        "description": "The meteor-roles API: an authorization package for Meteor",
-        "version": "v4.0.0"
-    },
-    "files": {
-        "roles/client/uiHelpers.js": {
-            "name": "roles/client/uiHelpers.js",
-            "modules": {
-                "UIHelpers": 1
-            },
-            "classes": {},
-            "fors": {
-                "UIHelpers": 1
-            },
-            "namespaces": {}
-        },
-        "roles/roles_client.js": {
-            "name": "roles/roles_client.js",
-            "modules": {
-                "Roles": 1
-            },
-            "classes": {},
-            "fors": {},
-            "namespaces": {}
-        },
-        "roles/roles_common_async.js": {
-            "name": "roles/roles_common_async.js",
-            "modules": {},
-            "classes": {
-                "Roles": 1
-            },
-            "fors": {},
-            "namespaces": {}
-        }
-    },
-    "modules": {
-        "UIHelpers": {
-            "name": "UIHelpers",
-            "submodules": {},
-            "elements": {},
-            "classes": {
-                "UIHelpers": 1
-            },
-            "fors": {
-                "UIHelpers": 1
-            },
-            "namespaces": {},
-            "tag": "module",
-            "file": "roles/client/uiHelpers.js",
-            "line": 3,
-            "description": "Convenience functions for use on client.\n\nNOTE: You must restrict user actions on the server-side; any\nclient-side checks are strictly for convenience and must not be\ntrusted."
-        },
-        "Roles": {
-            "name": "Roles",
-            "submodules": {},
-            "elements": {},
-            "classes": {
-                "Roles": 1
-            },
-            "fors": {},
-            "namespaces": {},
-            "tag": "module",
-            "file": "roles/roles_common_async.js",
-            "line": 41,
-            "description": "Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.\n\nRoles are accessible through `Meteor.roles` collection and documents consist of:\n - `_id`: role name\n - `children`: list of subdocuments:\n   - `_id`\n\nChildren list elements are subdocuments so that they can be easier extended in the future or by plugins.\n\nRoles can have multiple parents and can be children (subroles) of multiple roles.\n\nExample: `{_id: 'admin', children: [{_id: 'editor'}]}`\n\nThe assignment of a role to a user is stored in a collection, accessible through `RoleAssignmentCollection`.\nIt's documents consist of\n - `_id`: Internal MongoDB id\n - `role`: A role object which got assigned. Usually only contains the `_id` property\n - `user`: A user object, usually only contains the `_id` property\n - `scope`: scope name\n - `inheritedRoles`: A list of all the roles objects inherited by the assigned role."
-        }
-    },
-    "classes": {
-        "UIHelpers": {
-            "name": "UIHelpers",
-            "shortname": "UIHelpers",
-            "classitems": [],
-            "plugins": [],
-            "extensions": [],
-            "plugin_for": [],
-            "extension_for": [],
-            "module": "UIHelpers",
-            "namespace": ""
-        },
-        "Roles": {
-            "name": "Roles",
-            "shortname": "Roles",
-            "classitems": [],
-            "plugins": [],
-            "extensions": [],
-            "plugin_for": [],
-            "extension_for": [],
-            "module": "Roles",
-            "namespace": "",
-            "file": "roles/roles_common_async.js",
-            "line": 41
-        }
-    },
-    "elements": {},
-    "classitems": [
-        {
-            "file": "roles/client/uiHelpers.js",
-            "line": 23,
-            "description": "UI helper to check if current user is in at least one\nof the target roles.  For use in client-side templates.",
-            "example": [
-                "\n    {{#if isInRole 'admin'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user'}}\n    {{/if}}\n\n    {{#if isInRole 'editor,user' 'scope1'}}\n    {{/if}}"
-            ],
-            "itemtype": "method",
-            "name": "isInRole",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "Name of role or comma-seperated list of roles.",
-                    "type": "String"
-                },
-                {
-                    "name": "scope",
-                    "description": "Optional, name of scope to check.",
-                    "type": "String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "`true` if current user is in at least one of the target roles.",
-                "type": "Boolean"
-            },
-            "static": 1,
-            "class": "UIHelpers",
-            "module": "UIHelpers"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 40,
-            "description": "Used as a global group (now scope) name. Not used anymore.",
-            "itemtype": "property",
-            "name": "GLOBAL_GROUP",
-            "static": 1,
-            "deprecated": true,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 49,
-            "description": "Create a new role.",
-            "itemtype": "method",
-            "name": "createRole",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `unlessExists`: if `true`, exception will not be thrown in the role already exists",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "ID of the new role or null.",
-                "type": "String"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 76,
-            "description": "Delete an existing role.\n\nIf the role is set for any user, it is automatically unset.",
-            "itemtype": "method",
-            "name": "deleteRole",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 126,
-            "description": "Rename an existing role.",
-            "itemtype": "method",
-            "name": "renameRole",
-            "params": [
-                {
-                    "name": "oldName",
-                    "description": "Old name of a role.",
-                    "type": "String"
-                },
-                {
-                    "name": "newName",
-                    "description": "New name of a role.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 185,
-            "description": "Add role parent to roles.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
-            "itemtype": "method",
-            "name": "addRolesToParent",
-            "params": [
-                {
-                    "name": "rolesNames",
-                    "description": "Name(s) of role(s).",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 205,
-            "itemtype": "method",
-            "name": "_addRoleToParent",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 254,
-            "description": "Remove role parent from roles.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
-            "itemtype": "method",
-            "name": "removeRolesFromParent",
-            "params": [
-                {
-                    "name": "rolesNames",
-                    "description": "Name(s) of role(s).",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 274,
-            "itemtype": "method",
-            "name": "_removeRoleFromParent",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 323,
-            "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
-            "example": [
-                "\n    Roles.addUsersToRoles(userId, 'admin')\n    Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRoles([user1, user2], ['user','editor'])\n    Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
-            ],
-            "itemtype": "method",
-            "name": "addUsersToRoles",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 375,
-            "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
-            "example": [
-                "\n    Roles.setUserRoles(userId, 'admin')\n    Roles.setUserRoles(userId, ['view-secrets'], 'example.com')\n    Roles.setUserRoles([user1, user2], ['user','editor'])\n    Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
-            ],
-            "itemtype": "method",
-            "name": "setUserRoles",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 437,
-            "description": "Add one user to one role.",
-            "itemtype": "method",
-            "name": "_addUserToRole",
-            "params": [
-                {
-                    "name": "userId",
-                    "description": "The user ID.",
-                    "type": "String"
-                },
-                {
-                    "name": "roleName",
-                    "description": "Name of the role to add the user to. The role have to exist.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist",
-                    "type": "Object"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 491,
-            "description": "Returns an array of role names the given role name is a child of.",
-            "example": [
-                "\n    Roles._getParentRoleNames({ _id: 'admin', children; [] })"
-            ],
-            "itemtype": "method",
-            "name": "_getParentRoleNames",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "The role object",
-                    "type": "Object"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 520,
-            "description": "Returns an array of role names the given role name is a parent of.",
-            "example": [
-                "\n    Roles._getInheritedRoleNames({ _id: 'admin', children; [] })"
-            ],
-            "itemtype": "method",
-            "name": "_getInheritedRoleNames",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "The role object",
-                    "type": "Object"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 547,
-            "description": "Remove users from assigned roles.",
-            "example": [
-                "\n    Roles.removeUsersFromRoles(userId, 'admin')\n    Roles.removeUsersFromRoles([userId, user2], ['editor'])\n    Roles.removeUsersFromRoles(userId, ['user'], 'group1')"
-            ],
-            "itemtype": "method",
-            "name": "removeUsersFromRoles",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to remove users from. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 593,
-            "description": "Remove one user from one role.",
-            "itemtype": "method",
-            "name": "_removeUserFromRole",
-            "params": [
-                {
-                    "name": "userId",
-                    "description": "The user ID.",
-                    "type": "String"
-                },
-                {
-                    "name": "roleName",
-                    "description": "Name of the role to add the user to. The role have to exist.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)",
-                    "type": "Object"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 623,
-            "description": "Check if user has specified roles.",
-            "example": [
-                "\n    // global roles\n    Roles.userIsInRole(user, 'admin')\n    Roles.userIsInRole(user, ['admin','editor'])\n    Roles.userIsInRole(userId, 'admin')\n    Roles.userIsInRole(userId, ['admin','editor'])\n\n    // scope roles (global roles are still checked)\n    Roles.userIsInRole(user, 'admin', 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], 'group1')\n    Roles.userIsInRole(userId, ['admin','editor'], {scope: 'group1'})"
-            ],
-            "itemtype": "method",
-            "name": "userIsInRole",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles to check against. If array,\n                            will return `true` if user is in _any_ role.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope; if supplied, limits check to just that scope\n    the user's global roles will always be checked whether scope is specified or not\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "`true` if user is in _any_ of the target roles",
-                "type": "Boolean"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 691,
-            "description": "Retrieve user's roles.",
-            "itemtype": "method",
-            "name": "getRolesForUser",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of scope to provide roles for; if not specified, global roles are returned\n  - `anyScope`: if set, role can be in any scope (`scope` and `onlyAssigned` options are ignored)\n  - `onlyScoped`: if set, only roles in the specified scope are returned\n  - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)\n  - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)\n    If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's\n    result strongly dependent on the internal data structure of this plugin.\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Array of user's roles, unsorted.",
-                "type": "Array"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 767,
-            "description": "Retrieve cursor of all existing roles.",
-            "itemtype": "method",
-            "name": "getAllRoles",
-            "params": [
-                {
-                    "name": "queryOptions",
-                    "description": "Options which are passed directly\n                               through to `RolesCollection.find(query, options)`.",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Cursor of existing roles.",
-                "type": "Cursor"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 782,
-            "description": "Retrieve all users who are in target role.\n\nOptions:",
-            "itemtype": "method",
-            "name": "getUsersInRole",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `onlyScoped`: if set, only roles in the specified scope are returned\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                },
-                {
-                    "name": "queryOptions",
-                    "description": "Options which are passed directly\n                               through to `Meteor.users.find(query, options)`",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor of users in roles.",
-                "type": "Cursor"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 812,
-            "description": "Retrieve all assignments of a user which are for the target role.\n\nOptions:",
-            "itemtype": "method",
-            "name": "getUserAssignmentsForRole",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `RoleAssignmentCollection.find(query, options)`\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor of user assignments for roles.",
-                "type": "Cursor"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 844,
-            "itemtype": "method",
-            "name": "_getUsersInRoleCursor",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles. If array, ids of users are\n                            returned which have at least one of the roles\n                            assigned but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                },
-                {
-                    "name": "filter",
-                    "description": "Options which are passed directly\n                               through to `RoleAssignmentCollection.find(query, options)`",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor to the assignment documents",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 892,
-            "description": "Deprecated. Use `getScopesForUser` instead.",
-            "itemtype": "method",
-            "name": "getGroupsForUser",
-            "static": 1,
-            "deprecated": true,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 908,
-            "description": "Retrieve users scopes, if any.",
-            "itemtype": "method",
-            "name": "getScopesForUser",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name of roles to restrict scopes to.",
-                    "type": "Array|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Array of user's scopes, unsorted.",
-                "type": "Array"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 945,
-            "description": "Rename a scope.\n\nRoles assigned with a given scope are changed to be under the new scope.",
-            "itemtype": "method",
-            "name": "renameScope",
-            "params": [
-                {
-                    "name": "oldName",
-                    "description": "Old name of a scope.",
-                    "type": "String"
-                },
-                {
-                    "name": "newName",
-                    "description": "New name of a scope.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 974,
-            "description": "Remove a scope.\n\nRoles assigned with a given scope are removed.",
-            "itemtype": "method",
-            "name": "removeScope",
-            "params": [
-                {
-                    "name": "name",
-                    "description": "The name of a scope.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 989,
-            "description": "Throw an exception if `roleName` is an invalid role name.",
-            "itemtype": "method",
-            "name": "_checkRoleName",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "A role name to match against.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 1003,
-            "description": "Find out if a role is an ancestor of another role.\n\nWARNING: If you check this on the client, please make sure all roles are published.",
-            "itemtype": "method",
-            "name": "isParentOf",
-            "params": [
-                {
-                    "name": "parentRoleName",
-                    "description": "The role you want to research.",
-                    "type": "String"
-                },
-                {
-                    "name": "childRoleName",
-                    "description": "The role you expect to be among the children of parentRoleName.",
-                    "type": "String"
-                }
-            ],
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 1044,
-            "description": "Normalize options.",
-            "itemtype": "method",
-            "name": "_normalizeOptions",
-            "params": [
-                {
-                    "name": "options",
-                    "description": "Options to normalize.",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Normalized options.",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 1065,
-            "description": "Normalize scope name.",
-            "itemtype": "method",
-            "name": "_normalizeScopeName",
-            "params": [
-                {
-                    "name": "scopeName",
-                    "description": "A scope name to normalize.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "Normalized scope name.",
-                "type": "String"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_client.js",
-            "line": 1083,
-            "description": "Throw an exception if `scopeName` is an invalid scope name.",
-            "itemtype": "method",
-            "name": "_checkRoleName",
-            "params": [
-                {
-                    "name": "scopeName",
-                    "description": "A scope name to match against.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 50,
-            "description": "Helper, resolves async some",
-            "params": [
-                {
-                    "name": "arr",
-                    "description": "",
-                    "type": "*"
-                },
-                {
-                    "name": "predicate",
-                    "description": "",
-                    "type": "*"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise<Boolean>"
-            },
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 64,
-            "description": "Used as a global group (now scope) name. Not used anymore.",
-            "itemtype": "property",
-            "name": "GLOBAL_GROUP",
-            "static": 1,
-            "deprecated": true,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 73,
-            "description": "Create a new role.",
-            "itemtype": "method",
-            "name": "createRoleAsync",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `unlessExists`: if `true`, exception will not be thrown in the role already exists",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "ID of the new role or null.",
-                "type": "Promise<String>"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 118,
-            "description": "Delete an existing role.\n\nIf the role is set for any user, it is automatically unset.",
-            "itemtype": "method",
-            "name": "deleteRoleAsync",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 184,
-            "description": "Rename an existing role.",
-            "itemtype": "method",
-            "name": "renameRoleAsync",
-            "params": [
-                {
-                    "name": "oldName",
-                    "description": "Old name of a role.",
-                    "type": "String"
-                },
-                {
-                    "name": "newName",
-                    "description": "New name of a role.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 256,
-            "description": "Add role parent to roles.\n\nPrevious parents are kept (role can have multiple parents). For users which have the\nparent role set, new subroles are added automatically.",
-            "itemtype": "method",
-            "name": "addRolesToParentAsync",
-            "params": [
-                {
-                    "name": "rolesNames",
-                    "description": "Name(s) of role(s).",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 277,
-            "itemtype": "method",
-            "name": "_addRoleToParentAsync",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 341,
-            "description": "Remove role parent from roles.\n\nOther parents are kept (role can have multiple parents). For users which have the\nparent role set, removed subrole is removed automatically.",
-            "itemtype": "method",
-            "name": "removeRolesFromParentAsync",
-            "params": [
-                {
-                    "name": "rolesNames",
-                    "description": "Name(s) of role(s).",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 362,
-            "itemtype": "method",
-            "name": "_removeRoleFromParentAsync",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "Name of role.",
-                    "type": "String"
-                },
-                {
-                    "name": "parentName",
-                    "description": "Name of parent role.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 433,
-            "description": "Add users to roles.\n\nAdds roles to existing roles for each user.",
-            "example": [
-                "\n    Roles.addUsersToRolesAsync(userId, 'admin')\n    Roles.addUsersToRolesAsync(userId, ['view-secrets'], 'example.com')\n    Roles.addUsersToRolesAsync([user1, user2], ['user','editor'])\n    Roles.addUsersToRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
-            ],
-            "itemtype": "method",
-            "name": "addUsersToRolesAsync",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Alternatively, it can be a scope name string.",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 489,
-            "description": "Set users' roles.\n\nReplaces all existing roles with a new set of roles.",
-            "example": [
-                "\n    await Roles.setUserRolesAsync(userId, 'admin')\n    await Roles.setUserRolesAsync(userId, ['view-secrets'], 'example.com')\n    await Roles.setUserRolesAsync([user1, user2], ['user','editor'])\n    await Roles.setUserRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')"
-            ],
-            "itemtype": "method",
-            "name": "setUserRolesAsync",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to add users to. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Alternatively, it can be a scope name string.",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 555,
-            "description": "Add one user to one role.",
-            "itemtype": "method",
-            "name": "_addUserToRoleAsync",
-            "params": [
-                {
-                    "name": "userId",
-                    "description": "The user ID.",
-                    "type": "String"
-                },
-                {
-                    "name": "roleName",
-                    "description": "Name of the role to add the user to. The role have to exist.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `ifExists`: if `true`, do not throw an exception if the role does not exist",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 651,
-            "description": "Returns an array of role names the given role name is a child of.",
-            "example": [
-                "\n    Roles._getParentRoleNamesAsync({ _id: 'admin', children; [] })"
-            ],
-            "itemtype": "method",
-            "name": "_getParentRoleNamesAsync",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "The role object",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 683,
-            "description": "Returns an array of role names the given role name is a parent of.",
-            "example": [
-                "\n    Roles._getInheritedRoleNames({ _id: 'admin', children; [] })"
-            ],
-            "itemtype": "method",
-            "name": "_getInheritedRoleNames",
-            "params": [
-                {
-                    "name": "role",
-                    "description": "The role object",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 716,
-            "description": "Remove users from assigned roles.",
-            "example": [
-                "\n    await Roles.removeUsersFromRolesAsync(userId, 'admin')\n    await Roles.removeUsersFromRolesAsync([userId, user2], ['editor'])\n    await Roles.removeUsersFromRolesAsync(userId, ['user'], 'group1')"
-            ],
-            "itemtype": "method",
-            "name": "removeUsersFromRolesAsync",
-            "params": [
-                {
-                    "name": "users",
-                    "description": "User ID(s) or object(s) with an `_id` field.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name(s) of roles to remove users from. Roles have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Alternatively, it can be a scope name string.",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 763,
-            "description": "Remove one user from one role.",
-            "itemtype": "method",
-            "name": "_removeUserFromRoleAsync",
-            "params": [
-                {
-                    "name": "userId",
-                    "description": "The user ID.",
-                    "type": "String"
-                },
-                {
-                    "name": "roleName",
-                    "description": "Name of the role to add the user to. The role have to exist.",
-                    "type": "String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope, or `null` for the global role\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 794,
-            "description": "Check if user has specified roles.",
-            "example": [
-                "\n    // global roles\n    await Roles.userIsInRoleAsync(user, 'admin')\n    await Roles.userIsInRoleAsync(user, ['admin','editor'])\n    await Roles.userIsInRoleAsync(userId, 'admin')\n    await Roles.userIsInRoleAsync(userId, ['admin','editor'])\n\n    // scope roles (global roles are still checked)\n    await Roles.userIsInRoleAsync(user, 'admin', 'group1')\n    await Roles.userIsInRoleAsync(userId, ['admin','editor'], 'group1')\n    await Roles.userIsInRoleAsync(userId, ['admin','editor'], {scope: 'group1'})"
-            ],
-            "itemtype": "method",
-            "name": "userIsInRoleAsync",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles to check against. If array,\n                            will return `true` if user is in _any_ role.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope; if supplied, limits check to just that scope\n    the user's global roles will always be checked whether scope is specified or not\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "`true` if user is in _any_ of the target roles",
-                "type": "Promise<Boolean>"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 871,
-            "description": "Retrieve user's roles.",
-            "itemtype": "method",
-            "name": "getRolesForUserAsync",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of scope to provide roles for; if not specified, global roles are returned\n  - `anyScope`: if set, role can be in any scope (`scope` and `onlyAssigned` options are ignored)\n  - `onlyScoped`: if set, only roles in the specified scope are returned\n  - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)\n  - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)\n    If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's\n    result strongly dependent on the internal data structure of this plugin.\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Array of user's roles, unsorted.",
-                "type": "Promise<Array>"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 956,
-            "description": "Retrieve cursor of all existing roles.",
-            "itemtype": "method",
-            "name": "getAllRoles",
-            "params": [
-                {
-                    "name": "queryOptions",
-                    "description": "Options which are passed directly\n                               through to `RolesCollection.find(query, options)`.",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor of existing roles.",
-                "type": "Cursor"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 971,
-            "description": "Retrieve all users who are in target role.\n\nOptions:",
-            "itemtype": "method",
-            "name": "getUsersInRoleAsync",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `onlyScoped`: if set, only roles in the specified scope are returned\n  - `queryOptions`: options which are passed directly\n    through to `Meteor.users.find(query, options)`\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                },
-                {
-                    "name": "queryOptions",
-                    "description": "Options which are passed directly\n                               through to `Meteor.users.find(query, options)`",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor of users in roles.",
-                "type": "Promise<Cursor>"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1006,
-            "description": "Retrieve all assignments of a user which are for the target role.\n\nOptions:",
-            "itemtype": "method",
-            "name": "getUserAssignmentsForRole",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles. If array, users\n                            returned will have at least one of the roles\n                            specified but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n  - `queryOptions`: options which are passed directly\n    through to `RoleAssignmentCollection.find(query, options)`\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor of user assignments for roles.",
-                "type": "Cursor"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1041,
-            "itemtype": "method",
-            "name": "_getUsersInRoleCursor",
-            "params": [
-                {
-                    "name": "roles",
-                    "description": "Name of role or an array of roles. If array, ids of users are\n                            returned which have at least one of the roles\n                            assigned but need not have _all_ roles.\n                            Roles do not have to exist.",
-                    "type": "Array|String"
-                },
-                {
-                    "name": "options",
-                    "description": "Options:\n  - `scope`: name of the scope to restrict roles to; user's global\n    roles will also be checked\n  - `anyScope`: if set, role can be in any scope (`scope` option is ignored)\n\nAlternatively, it can be a scope name string.",
-                    "type": "Object|String",
-                    "optional": true
-                },
-                {
-                    "name": "filter",
-                    "description": "Options which are passed directly\n                               through to `RoleAssignmentCollection.find(query, options)`",
-                    "type": "Object",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Cursor to the assignment documents",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1097,
-            "description": "Deprecated. Use `getScopesForUser` instead.",
-            "itemtype": "method",
-            "name": "getGroupsForUserAsync",
-            "return": {
-                "description": "",
-                "type": "Promise<Array>"
-            },
-            "static": 1,
-            "deprecated": true,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1117,
-            "description": "Retrieve users scopes, if any.",
-            "itemtype": "method",
-            "name": "getScopesForUserAsync",
-            "params": [
-                {
-                    "name": "user",
-                    "description": "User ID or an actual user object.",
-                    "type": "String|Object"
-                },
-                {
-                    "name": "roles",
-                    "description": "Name of roles to restrict scopes to.",
-                    "type": "Array|String",
-                    "optional": true
-                }
-            ],
-            "return": {
-                "description": "Array of user's scopes, unsorted.",
-                "type": "Promise<Array>"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1158,
-            "description": "Rename a scope.\n\nRoles assigned with a given scope are changed to be under the new scope.",
-            "itemtype": "method",
-            "name": "renameScopeAsync",
-            "params": [
-                {
-                    "name": "oldName",
-                    "description": "Old name of a scope.",
-                    "type": "String"
-                },
-                {
-                    "name": "newName",
-                    "description": "New name of a scope.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1192,
-            "description": "Remove a scope.\n\nRoles assigned with a given scope are removed.",
-            "itemtype": "method",
-            "name": "removeScopeAsync",
-            "params": [
-                {
-                    "name": "name",
-                    "description": "The name of a scope.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1208,
-            "description": "Throw an exception if `roleName` is an invalid role name.",
-            "itemtype": "method",
-            "name": "_checkRoleName",
-            "params": [
-                {
-                    "name": "roleName",
-                    "description": "A role name to match against.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1226,
-            "description": "Find out if a role is an ancestor of another role.\n\nWARNING: If you check this on the client, please make sure all roles are published.",
-            "itemtype": "method",
-            "name": "isParentOfAsync",
-            "params": [
-                {
-                    "name": "parentRoleName",
-                    "description": "The role you want to research.",
-                    "type": "String"
-                },
-                {
-                    "name": "childRoleName",
-                    "description": "The role you expect to be among the children of parentRoleName.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "",
-                "type": "Promise"
-            },
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1268,
-            "description": "Normalize options.",
-            "itemtype": "method",
-            "name": "_normalizeOptions",
-            "params": [
-                {
-                    "name": "options",
-                    "description": "Options to normalize.",
-                    "type": "Object"
-                }
-            ],
-            "return": {
-                "description": "Normalized options.",
-                "type": "Object"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1291,
-            "description": "Normalize scope name.",
-            "itemtype": "method",
-            "name": "_normalizeScopeName",
-            "params": [
-                {
-                    "name": "scopeName",
-                    "description": "A scope name to normalize.",
-                    "type": "String"
-                }
-            ],
-            "return": {
-                "description": "Normalized scope name.",
-                "type": "String"
-            },
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        },
-        {
-            "file": "roles/roles_common_async.js",
-            "line": 1309,
-            "description": "Throw an exception if `scopeName` is an invalid scope name.",
-            "itemtype": "method",
-            "name": "_checkScopeName",
-            "params": [
-                {
-                    "name": "scopeName",
-                    "description": "A scope name to match against.",
-                    "type": "String"
-                }
-            ],
-            "access": "private",
-            "tagname": "",
-            "static": 1,
-            "class": "Roles",
-            "module": "Roles"
-        }
-    ],
-    "warnings": [
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:50"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:118"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:184"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:256"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:277"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:341"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:362"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:433"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:489"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:555"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:651"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:683"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:716"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:763"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:1097"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:1158"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:1192"
-        },
-        {
-            "message": "replacing incorrect tag: returns with return",
-            "line": " roles/roles_common_async.js:1226"
-        },
-        {
-            "message": "Missing item type\nHelper, resolves async some",
-            "line": " roles/roles_common_async.js:50"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/docs/elements/index.html b/docs/elements/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/elements/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/docs/files/index.html b/docs/files/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/files/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/docs/files/roles_client_uiHelpers.js.html b/docs/files/roles_client_uiHelpers.js.html
deleted file mode 100644
index b1ee4b3c91..0000000000
--- a/docs/files/roles_client_uiHelpers.js.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>roles/client/uiHelpers.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v4.0.0</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1 class="file-heading">File: roles/client/uiHelpers.js</h1>
-
-<div class="file">
-    <pre class="code prettyprint linenums">
-/* global Meteor, Roles, Match, Package */
-
-/**
- * Convenience functions for use on client.
- *
- * NOTE: You must restrict user actions on the server-side; any
- * client-side checks are strictly for convenience and must not be
- * trusted.
- *
- * @module UIHelpers
- */
-
-// //////////////////////////////////////////////////////////
-// UI helpers
-//
-// Use a semi-private variable rather than declaring UI
-// helpers directly so that we can unit test the helpers.
-// XXX For some reason, the UI helpers are not registered
-// before the tests run.
-//
-Roles._uiHelpers = {
-
-  /**
-   * UI helper to check if current user is in at least one
-   * of the target roles.  For use in client-side templates.
-   *
-   * @example
-   *     {{#if isInRole &#x27;admin&#x27;}}
-   *     {{/if}}
-   *
-   *     {{#if isInRole &#x27;editor,user&#x27;}}
-   *     {{/if}}
-   *
-   *     {{#if isInRole &#x27;editor,user&#x27; &#x27;scope1&#x27;}}
-   *     {{/if}}
-   *
-   * @method isInRole
-   * @param {String} role Name of role or comma-seperated list of roles.
-   * @param {String} [scope] Optional, name of scope to check.
-   * @return {Boolean} &#x60;true&#x60; if current user is in at least one of the target roles.
-   * @static
-   * @for UIHelpers
-   */
-  isInRole: function (role, scope) {
-    const user = Meteor.user()
-    const comma = (role || &#x27;&#x27;).indexOf(&#x27;,&#x27;)
-    let roles
-
-    if (!user) return false
-    if (!Match.test(role, String)) return false
-
-    if (comma !== -1) {
-      roles = role.split(&#x27;,&#x27;).reduce(function (memo, r) {
-        if (!r) {
-          return memo
-        }
-        memo.push(r)
-        return memo
-      }, [])
-    } else {
-      roles = [role]
-    }
-
-    if (Match.test(scope, String)) {
-      return Roles.userIsInRole(user, roles, scope)
-    }
-
-    return Roles.userIsInRole(user, roles)
-  }
-}
-
-// //////////////////////////////////////////////////////////
-// Register UI helpers
-//
-
-if (Roles.debug &amp;&amp; console.debug) {
-  console.debug(&#x27;[roles] Roles.debug =&#x27;, Roles.debug)
-}
-
-if (typeof Package.blaze !== &#x27;undefined&#x27; &amp;&amp;
-    typeof Package.blaze.Blaze !== &#x27;undefined&#x27; &amp;&amp;
-    typeof Package.blaze.Blaze.registerHelper === &#x27;function&#x27;) {
-  Object.entries(Roles._uiHelpers).forEach(([name, func]) =&gt; {
-    if (Roles.debug &amp;&amp; console.debug) {
-      console.debug(&#x27;[roles] registering Blaze helper \&#x27;&#x27; + name + &#x27;\&#x27;&#x27;)
-    }
-    Package.blaze.Blaze.registerHelper(name, func)
-  })
-}
-
-    </pre>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/files/roles_roles_client.js.html b/docs/files/roles_roles_client.js.html
deleted file mode 100644
index 565e49d294..0000000000
--- a/docs/files/roles_roles_client.js.html
+++ /dev/null
@@ -1,1206 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>roles/roles_client.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v4.0.0</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1 class="file-heading">File: roles/roles_client.js</h1>
-
-<div class="file">
-    <pre class="code prettyprint linenums">
-/* global Roles */
-import { Meteor } from &#x27;meteor/meteor&#x27;
-
-/**
- * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
- *
- * Roles are accessible through &#x60;Meteor.roles&#x60; collection and documents consist of:
- *  - &#x60;_id&#x60;: role name
- *  - &#x60;children&#x60;: list of subdocuments:
- *    - &#x60;_id&#x60;
- *
- * Children list elements are subdocuments so that they can be easier extended in the future or by plugins.
- *
- * Roles can have multiple parents and can be children (subroles) of multiple roles.
- *
- * Example: &#x60;{_id: &#x27;admin&#x27;, children: [{_id: &#x27;editor&#x27;}]}&#x60;
- *
- * The assignment of a role to a user is stored in a collection, accessible through &#x60;RoleAssignmentCollection&#x60;.
- * It&#x27;s documents consist of
- *  - &#x60;_id&#x60;: Internal MongoDB id
- *  - &#x60;role&#x60;: A role object which got assigned. Usually only contains the &#x60;_id&#x60; property
- *  - &#x60;user&#x60;: A user object, usually only contains the &#x60;_id&#x60; property
- *  - &#x60;scope&#x60;: scope name
- *  - &#x60;inheritedRoles&#x60;: A list of all the roles objects inherited by the assigned role.
- *
- * @module Roles
- */
-
-/**
- * @class Roles
- */
-if (typeof Roles === &#x27;undefined&#x27;) {
-  Roles = {} // eslint-disable-line no-global-assign
-}
-
-let getGroupsForUserDeprecationWarning = false
-
-Object.assign(Roles, {
-
-  /**
-   * Used as a global group (now scope) name. Not used anymore.
-   *
-   * @property GLOBAL_GROUP
-   * @static
-   * @deprecated
-   */
-  GLOBAL_GROUP: null,
-
-  /**
-   * Create a new role.
-   *
-   * @method createRole
-   * @param {String} roleName Name of role.
-   * @param {Object} [options] Options:
-   *   - &#x60;unlessExists&#x60;: if &#x60;true&#x60;, exception will not be thrown in the role already exists
-   * @return {String} ID of the new role or null.
-   * @static
-   */
-  createRole: function (roleName, options) {
-    Roles._checkRoleName(roleName)
-
-    options = Object.assign({
-      unlessExists: false
-    }, options)
-
-    const result = Meteor.roles.upsert({ _id: roleName }, { $setOnInsert: { children: [] } })
-
-    if (!result.insertedId) {
-      if (options.unlessExists) return null
-      throw new Error(&#x27;Role \&#x27;&#x27; + roleName + &#x27;\&#x27; already exists.&#x27;)
-    }
-
-    return result.insertedId
-  },
-
-  /**
-   * Delete an existing role.
-   *
-   * If the role is set for any user, it is automatically unset.
-   *
-   * @method deleteRole
-   * @param {String} roleName Name of role.
-   * @static
-   */
-  deleteRole: function (roleName) {
-    let roles
-    let inheritedRoles
-
-    Roles._checkRoleName(roleName)
-
-    // Remove all assignments
-    Meteor.roleAssignment.remove({
-      &#x27;role._id&#x27;: roleName
-    })
-
-    do {
-      // For all roles who have it as a dependency ...
-      roles = Roles._getParentRoleNames(Meteor.roles.findOne({ _id: roleName }))
-
-      for (const r of Meteor.roles.find({ _id: { $in: roles } }).fetch()) {
-        Meteor.roles.update({
-          _id: r._id
-        }, {
-          $pull: {
-            children: {
-              _id: roleName
-            }
-          }
-        })
-
-        inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
-        Meteor.roleAssignment.update({
-          &#x27;role._id&#x27;: r._id
-        }, {
-          $set: {
-            inheritedRoles: [r._id, ...inheritedRoles].map(r2 =&gt; ({ _id: r2 }))
-          }
-        }, { multi: true })
-      }
-    } while (roles.length &gt; 0)
-
-    // And finally remove the role itself
-    Meteor.roles.remove({ _id: roleName })
-  },
-
-  /**
-   * Rename an existing role.
-   *
-   * @method renameRole
-   * @param {String} oldName Old name of a role.
-   * @param {String} newName New name of a role.
-   * @static
-   */
-  renameRole: function (oldName, newName) {
-    let count
-
-    Roles._checkRoleName(oldName)
-    Roles._checkRoleName(newName)
-
-    if (oldName === newName) return
-
-    const role = Meteor.roles.findOne({ _id: oldName })
-
-    if (!role) {
-      throw new Error(&#x27;Role \&#x27;&#x27; + oldName + &#x27;\&#x27; does not exist.&#x27;)
-    }
-
-    role._id = newName
-
-    Meteor.roles.insert(role)
-
-    do {
-      count = Meteor.roleAssignment.update({
-        &#x27;role._id&#x27;: oldName
-      }, {
-        $set: {
-          &#x27;role._id&#x27;: newName
-        }
-      }, { multi: true })
-    } while (count &gt; 0)
-
-    do {
-      count = Meteor.roleAssignment.update({
-        &#x27;inheritedRoles._id&#x27;: oldName
-      }, {
-        $set: {
-          &#x27;inheritedRoles.$._id&#x27;: newName
-        }
-      }, { multi: true })
-    } while (count &gt; 0)
-
-    do {
-      count = Meteor.roles.update({
-        &#x27;children._id&#x27;: oldName
-      }, {
-        $set: {
-          &#x27;children.$._id&#x27;: newName
-        }
-      }, { multi: true })
-    } while (count &gt; 0)
-
-    Meteor.roles.remove({ _id: oldName })
-  },
-
-  /**
-   * Add role parent to roles.
-   *
-   * Previous parents are kept (role can have multiple parents). For users which have the
-   * parent role set, new subroles are added automatically.
-   *
-   * @method addRolesToParent
-   * @param {Array|String} rolesNames Name(s) of role(s).
-   * @param {String} parentName Name of parent role.
-   * @static
-   */
-  addRolesToParent: function (rolesNames, parentName) {
-    // ensure arrays
-    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
-
-    for (const roleName of rolesNames) {
-      Roles._addRoleToParent(roleName, parentName)
-    }
-  },
-
-  /**
-   * @method _addRoleToParent
-   * @param {String} roleName Name of role.
-   * @param {String} parentName Name of parent role.
-   * @private
-   * @static
-   */
-  _addRoleToParent: function (roleName, parentName) {
-    Roles._checkRoleName(roleName)
-    Roles._checkRoleName(parentName)
-
-    // query to get role&#x27;s children
-    const role = Meteor.roles.findOne({ _id: roleName })
-
-    if (!role) {
-      throw new Error(&#x27;Role \&#x27;&#x27; + roleName + &#x27;\&#x27; does not exist.&#x27;)
-    }
-
-    // detect cycles
-    if (Roles._getInheritedRoleNames(role).includes(parentName)) {
-      throw new Error(&#x27;Roles \&#x27;&#x27; + roleName + &#x27;\&#x27; and \&#x27;&#x27; + parentName + &#x27;\&#x27; would form a cycle.&#x27;)
-    }
-
-    const count = Meteor.roles.update({
-      _id: parentName,
-      &#x27;children._id&#x27;: {
-        $ne: role._id
-      }
-    }, {
-      $push: {
-        children: {
-          _id: role._id
-        }
-      }
-    })
-
-    // if there was no change, parent role might not exist, or role is
-    // already a subrole; in any case we do not have anything more to do
-    if (!count) return
-
-    Meteor.roleAssignment.update({
-      &#x27;inheritedRoles._id&#x27;: parentName
-    }, {
-      $push: {
-        inheritedRoles: { $each: [role._id, ...Roles._getInheritedRoleNames(role)].map(r =&gt; ({ _id: r })) }
-      }
-    }, { multi: true })
-  },
-
-  /**
-   * Remove role parent from roles.
-   *
-   * Other parents are kept (role can have multiple parents). For users which have the
-   * parent role set, removed subrole is removed automatically.
-   *
-   * @method removeRolesFromParent
-   * @param {Array|String} rolesNames Name(s) of role(s).
-   * @param {String} parentName Name of parent role.
-   * @static
-   */
-  removeRolesFromParent: function (rolesNames, parentName) {
-    // ensure arrays
-    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
-
-    for (const roleName of rolesNames) {
-      Roles._removeRoleFromParent(roleName, parentName)
-    }
-  },
-
-  /**
-   * @method _removeRoleFromParent
-   * @param {String} roleName Name of role.
-   * @param {String} parentName Name of parent role.
-   * @private
-   * @static
-   */
-  _removeRoleFromParent: function (roleName, parentName) {
-    Roles._checkRoleName(roleName)
-    Roles._checkRoleName(parentName)
-
-    // check for role existence
-    // this would not really be needed, but we are trying to match addRolesToParent
-    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { _id: 1 } })
-
-    if (!role) {
-      throw new Error(&#x27;Role \&#x27;&#x27; + roleName + &#x27;\&#x27; does not exist.&#x27;)
-    }
-
-    const count = Meteor.roles.update({
-      _id: parentName
-    }, {
-      $pull: {
-        children: {
-          _id: role._id
-        }
-      }
-    })
-
-    // if there was no change, parent role might not exist, or role was
-    // already not a subrole; in any case we do not have anything more to do
-    if (!count) return
-
-    // For all roles who have had it as a dependency ...
-    const roles = [...Roles._getParentRoleNames(Meteor.roles.findOne({ _id: parentName })), parentName]
-
-    for (const r of Meteor.roles.find({ _id: { $in: roles } }).fetch()) {
-      const inheritedRoles = Roles._getInheritedRoleNames(Meteor.roles.findOne({ _id: r._id }))
-      Meteor.roleAssignment.update({
-        &#x27;role._id&#x27;: r._id,
-        &#x27;inheritedRoles._id&#x27;: role._id
-      }, {
-        $set: {
-          inheritedRoles: [r._id, ...inheritedRoles].map(r2 =&gt; ({ _id: r2 }))
-        }
-      }, { multi: true })
-    }
-  },
-
-  /**
-   * Add users to roles.
-   *
-   * Adds roles to existing roles for each user.
-   *
-   * @example
-   *     Roles.addUsersToRoles(userId, &#x27;admin&#x27;)
-   *     Roles.addUsersToRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
-   *     Roles.addUsersToRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
-   *     Roles.addUsersToRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
-   *
-   * @method addUsersToRoles
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  addUsersToRoles: function (users, roles, options) {
-    let id
-
-    if (!users) throw new Error(&#x27;Missing \&#x27;users\&#x27; param.&#x27;)
-    if (!roles) throw new Error(&#x27;Missing \&#x27;roles\&#x27; param.&#x27;)
-
-    options = Roles._normalizeOptions(options)
-
-    // ensure arrays
-    if (!Array.isArray(users)) users = [users]
-    if (!Array.isArray(roles)) roles = [roles]
-
-    Roles._checkScopeName(options.scope)
-
-    options = Object.assign({
-      ifExists: false
-    }, options)
-
-    for (const user of users) {
-      if (typeof user === &#x27;object&#x27;) {
-        id = user._id
-      } else {
-        id = user
-      }
-
-      for (const role of roles) {
-        Roles._addUserToRole(id, role, options)
-      }
-    }
-  },
-
-  /**
-   * Set users&#x27; roles.
-   *
-   * Replaces all existing roles with a new set of roles.
-   *
-   * @example
-   *     Roles.setUserRoles(userId, &#x27;admin&#x27;)
-   *     Roles.setUserRoles(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
-   *     Roles.setUserRoles([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
-   *     Roles.setUserRoles([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
-   *
-   * @method setUserRoles
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;anyScope&#x60;: if &#x60;true&#x60;, remove all roles the user has, of any scope, if &#x60;false&#x60;, only the one in the same scope
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  setUserRoles: function (users, roles, options) {
-    let id
-
-    if (!users) throw new Error(&#x27;Missing \&#x27;users\&#x27; param.&#x27;)
-    if (!roles) throw new Error(&#x27;Missing \&#x27;roles\&#x27; param.&#x27;)
-
-    options = Roles._normalizeOptions(options)
-
-    // ensure arrays
-    if (!Array.isArray(users)) users = [users]
-    if (!Array.isArray(roles)) roles = [roles]
-
-    Roles._checkScopeName(options.scope)
-
-    options = Object.assign({
-      ifExists: false,
-      anyScope: false
-    }, options)
-
-    for (const user of users) {
-      if (typeof user === &#x27;object&#x27;) {
-        id = user._id
-      } else {
-        id = user
-      }
-      // we first clear all roles for the user
-      const selector = { &#x27;user._id&#x27;: id }
-      if (!options.anyScope) {
-        selector.scope = options.scope
-      }
-
-      Meteor.roleAssignment.remove(selector)
-
-      // and then add all
-      for (const role of roles) {
-        Roles._addUserToRole(id, role, options)
-      }
-    }
-  },
-
-  /**
-   * Add one user to one role.
-   *
-   * @method _addUserToRole
-   * @param {String} userId The user ID.
-   * @param {String} roleName Name of the role to add the user to. The role have to exist.
-   * @param {Object} options Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   * @private
-   * @static
-   */
-  _addUserToRole: function (userId, roleName, options) {
-    Roles._checkRoleName(roleName)
-    Roles._checkScopeName(options.scope)
-
-    if (!userId) {
-      return
-    }
-
-    const role = Meteor.roles.findOne({ _id: roleName }, { fields: { children: 1 } })
-
-    if (!role) {
-      if (options.ifExists) {
-        return []
-      } else {
-        throw new Error(&#x27;Role \&#x27;&#x27; + roleName + &#x27;\&#x27; does not exist.&#x27;)
-      }
-    }
-
-    // This might create duplicates, because we don&#x27;t have a unique index, but that&#x27;s all right. In case there are two, withdrawing the role will effectively kill them both.
-    const res = Meteor.roleAssignment.upsert({
-      &#x27;user._id&#x27;: userId,
-      &#x27;role._id&#x27;: roleName,
-      scope: options.scope
-    }, {
-      $setOnInsert: {
-        user: { _id: userId },
-        role: { _id: roleName },
-        scope: options.scope
-      }
-    })
-
-    if (res.insertedId) {
-      Meteor.roleAssignment.update({ _id: res.insertedId }, {
-        $set: {
-          inheritedRoles: [roleName, ...Roles._getInheritedRoleNames(role)].map(r =&gt; ({ _id: r }))
-        }
-      })
-    }
-
-    return res
-  },
-
-  /**
-   * Returns an array of role names the given role name is a child of.
-   *
-   * @example
-   *     Roles._getParentRoleNames({ _id: &#x27;admin&#x27;, children; [] })
-   *
-   * @method _getParentRoleNames
-   * @param {object} role The role object
-   * @private
-   * @static
-   */
-  _getParentRoleNames: function (role) {
-    if (!role) {
-      return []
-    }
-
-    const parentRoles = new Set([role._id])
-
-    for (const roleName of parentRoles) {
-      Meteor.roles.find({ &#x27;children._id&#x27;: roleName }).fetch().forEach(parentRole =&gt; {
-        parentRoles.add(parentRole._id)
-      })
-    }
-
-    parentRoles.delete(role._id)
-
-    return [...parentRoles]
-  },
-
-  /**
-   * Returns an array of role names the given role name is a parent of.
-   *
-   * @example
-   *     Roles._getInheritedRoleNames({ _id: &#x27;admin&#x27;, children; [] })
-   *
-   * @method _getInheritedRoleNames
-   * @param {object} role The role object
-   * @private
-   * @static
-   */
-  _getInheritedRoleNames: function (role) {
-    const inheritedRoles = new Set()
-    const nestedRoles = new Set([role])
-
-    for (const r of nestedRoles) {
-      const roles = Meteor.roles.find({ _id: { $in: r.children.map(r =&gt; r._id) } }, { fields: { children: 1 } }).fetch()
-
-      for (const r2 of roles) {
-        inheritedRoles.add(r2._id)
-        nestedRoles.add(r2)
-      }
-    }
-
-    return [...inheritedRoles]
-  },
-
-  /**
-   * Remove users from assigned roles.
-   *
-   * @example
-   *     Roles.removeUsersFromRoles(userId, &#x27;admin&#x27;)
-   *     Roles.removeUsersFromRoles([userId, user2], [&#x27;editor&#x27;])
-   *     Roles.removeUsersFromRoles(userId, [&#x27;user&#x27;], &#x27;group1&#x27;)
-   *
-   * @method removeUsersFromRoles
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  removeUsersFromRoles: function (users, roles, options) {
-    if (!users) throw new Error(&#x27;Missing \&#x27;users\&#x27; param.&#x27;)
-    if (!roles) throw new Error(&#x27;Missing \&#x27;roles\&#x27; param.&#x27;)
-
-    options = Roles._normalizeOptions(options)
-
-    // ensure arrays
-    if (!Array.isArray(users)) users = [users]
-    if (!Array.isArray(roles)) roles = [roles]
-
-    Roles._checkScopeName(options.scope)
-
-    for (const user of users) {
-      if (!user) continue
-
-      for (const role of roles) {
-        let id
-        if (typeof user === &#x27;object&#x27;) {
-          id = user._id
-        } else {
-          id = user
-        }
-
-        Roles._removeUserFromRole(id, role, options)
-      }
-    }
-  },
-
-  /**
-   * Remove one user from one role.
-   *
-   * @method _removeUserFromRole
-   * @param {String} userId The user ID.
-   * @param {String} roleName Name of the role to add the user to. The role have to exist.
-   * @param {Object} options Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   * @private
-   * @static
-   */
-  _removeUserFromRole: function (userId, roleName, options) {
-    Roles._checkRoleName(roleName)
-    Roles._checkScopeName(options.scope)
-
-    if (!userId) return
-
-    const selector = {
-      &#x27;user._id&#x27;: userId,
-      &#x27;role._id&#x27;: roleName
-    }
-
-    if (!options.anyScope) {
-      selector.scope = options.scope
-    }
-
-    Meteor.roleAssignment.remove(selector)
-  },
-
-  /**
-   * Check if user has specified roles.
-   *
-   * @example
-   *     // global roles
-   *     Roles.userIsInRole(user, &#x27;admin&#x27;)
-   *     Roles.userIsInRole(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
-   *     Roles.userIsInRole(userId, &#x27;admin&#x27;)
-   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
-   *
-   *     // scope roles (global roles are still checked)
-   *     Roles.userIsInRole(user, &#x27;admin&#x27;, &#x27;group1&#x27;)
-   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
-   *     Roles.userIsInRole(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], {scope: &#x27;group1&#x27;})
-   *
-   * @method userIsInRole
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
-   *                             will return &#x60;true&#x60; if user is in _any_ role.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope; if supplied, limits check to just that scope
-   *     the user&#x27;s global roles will always be checked whether scope is specified or not
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *
-   * Alternatively, it can be a scope name string.
-   * @return {Boolean} &#x60;true&#x60; if user is in _any_ of the target roles
-   * @static
-   */
-  userIsInRole: function (user, roles, options) {
-    let id
-    options = Roles._normalizeOptions(options)
-
-    // ensure array to simplify code
-    if (!Array.isArray(roles)) roles = [roles]
-
-    roles = roles.filter(r =&gt; r != null)
-
-    if (!roles.length) return false
-
-    Roles._checkScopeName(options.scope)
-
-    options = Object.assign({
-      anyScope: false
-    }, options)
-
-    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
-      id = user._id
-    } else {
-      id = user
-    }
-
-    if (!id) return false
-    if (typeof id !== &#x27;string&#x27;) return false
-
-    const selector = { &#x27;user._id&#x27;: id }
-
-    if (!options.anyScope) {
-      selector.scope = { $in: [options.scope, null] }
-    }
-
-    return roles.some((roleName) =&gt; {
-      selector[&#x27;inheritedRoles._id&#x27;] = roleName
-
-      return Meteor.roleAssignment.find(selector, { limit: 1 }).count() &gt; 0
-    })
-  },
-
-  /**
-   * Retrieve user&#x27;s roles.
-   *
-   * @method getRolesForUser
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of scope to provide roles for; if not specified, global roles are returned
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; and &#x60;onlyAssigned&#x60; options are ignored)
-   *   - &#x60;onlyScoped&#x60;: if set, only roles in the specified scope are returned
-   *   - &#x60;onlyAssigned&#x60;: return only assigned roles and not automatically inferred (like subroles)
-   *   - &#x60;fullObjects&#x60;: return full roles objects (&#x60;true&#x60;) or just names (&#x60;false&#x60;) (&#x60;onlyAssigned&#x60; option is ignored) (default &#x60;false&#x60;)
-   *     If you have a use-case for this option, please file a feature-request. You shouldn&#x27;t need to use it as it&#x27;s
-   *     result strongly dependent on the internal data structure of this plugin.
-   *
-   * Alternatively, it can be a scope name string.
-   * @return {Array} Array of user&#x27;s roles, unsorted.
-   * @static
-   */
-  getRolesForUser: function (user, options) {
-    let id
-
-    options = Roles._normalizeOptions(options)
-
-    Roles._checkScopeName(options.scope)
-
-    options = Object.assign({
-      fullObjects: false,
-      onlyAssigned: false,
-      anyScope: false,
-      onlyScoped: false
-    }, options)
-
-    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
-      id = user._id
-    } else {
-      id = user
-    }
-
-    if (!id) return []
-
-    const selector = { &#x27;user._id&#x27;: id }
-    const filter = { fields: { &#x27;inheritedRoles._id&#x27;: 1 } }
-
-    if (!options.anyScope) {
-      selector.scope = { $in: [options.scope] }
-
-      if (!options.onlyScoped) {
-        selector.scope.$in.push(null)
-      }
-    }
-
-    if (options.onlyAssigned) {
-      delete filter.fields[&#x27;inheritedRoles._id&#x27;]
-      filter.fields[&#x27;role._id&#x27;] = 1
-    }
-
-    if (options.fullObjects) {
-      delete filter.fields
-    }
-
-    const roles = Meteor.roleAssignment.find(selector, filter).fetch()
-
-    if (options.fullObjects) {
-      return roles
-    }
-
-    return [...new Set(roles.reduce((rev, current) =&gt; {
-      if (current.inheritedRoles) {
-        return rev.concat(current.inheritedRoles.map(r =&gt; r._id))
-      } else if (current.role) {
-        rev.push(current.role._id)
-      }
-      return rev
-    }, []))]
-  },
-
-  /**
-   * Retrieve cursor of all existing roles.
-   *
-   * @method getAllRoles
-   * @param {Object} queryOptions Options which are passed directly
-   *                                through to &#x60;RolesCollection.find(query, options)&#x60;.
-   * @return {Cursor} Cursor of existing roles.
-   * @static
-   */
-  getAllRoles: function (queryOptions) {
-    queryOptions = queryOptions || { sort: { _id: 1 } }
-
-    return Meteor.roles.find({}, queryOptions)
-  },
-
-  /**
-   * Retrieve all users who are in target role.
-   *
-   * Options:
-   *
-   * @method getUsersInRole
-   * @param {Array|String} roles Name of role or an array of roles. If array, users
-   *                             returned will have at least one of the roles
-   *                             specified but need not have _all_ roles.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
-   *     roles will also be checked
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *   - &#x60;onlyScoped&#x60;: if set, only roles in the specified scope are returned
-   *   - &#x60;queryOptions&#x60;: options which are passed directly
-   *     through to &#x60;Meteor.users.find(query, options)&#x60;
-   *
-   * Alternatively, it can be a scope name string.
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to &#x60;Meteor.users.find(query, options)&#x60;
-   * @return {Cursor} Cursor of users in roles.
-   * @static
-   */
-  getUsersInRole: function (roles, options, queryOptions) {
-    const ids = Roles.getUserAssignmentsForRole(roles, options).fetch().map(a =&gt; a.user._id)
-
-    return Meteor.users.find({ _id: { $in: ids } }, ((options &amp;&amp; options.queryOptions) || queryOptions) || {})
-  },
-
-  /**
-   * Retrieve all assignments of a user which are for the target role.
-   *
-   * Options:
-   *
-   * @method getUserAssignmentsForRole
-   * @param {Array|String} roles Name of role or an array of roles. If array, users
-   *                             returned will have at least one of the roles
-   *                             specified but need not have _all_ roles.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
-   *     roles will also be checked
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *   - &#x60;queryOptions&#x60;: options which are passed directly
-   *     through to &#x60;RoleAssignmentCollection.find(query, options)&#x60;
-   *
-   * Alternatively, it can be a scope name string.
-   * @return {Cursor} Cursor of user assignments for roles.
-   * @static
-   */
-  getUserAssignmentsForRole: function (roles, options) {
-    options = Roles._normalizeOptions(options)
-
-    options = Object.assign({
-      anyScope: false,
-      queryOptions: {}
-    }, options)
-
-    return Roles._getUsersInRoleCursor(roles, options, options.queryOptions)
-  },
-
-  /**
-   * @method _getUsersInRoleCursor
-   * @param {Array|String} roles Name of role or an array of roles. If array, ids of users are
-   *                             returned which have at least one of the roles
-   *                             assigned but need not have _all_ roles.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
-   *     roles will also be checked
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *
-   * Alternatively, it can be a scope name string.
-   * @param {Object} [filter] Options which are passed directly
-   *                                through to &#x60;RoleAssignmentCollection.find(query, options)&#x60;
-   * @return {Object} Cursor to the assignment documents
-   * @private
-   * @static
-   */
-  _getUsersInRoleCursor: function (roles, options, filter) {
-    options = Roles._normalizeOptions(options)
-
-    options = Object.assign({
-      anyScope: false,
-      onlyScoped: false
-    }, options)
-
-    // ensure array to simplify code
-    if (!Array.isArray(roles)) roles = [roles]
-
-    Roles._checkScopeName(options.scope)
-
-    filter = Object.assign({
-      fields: { &#x27;user._id&#x27;: 1 }
-    }, filter)
-
-    const selector = { &#x27;inheritedRoles._id&#x27;: { $in: roles } }
-
-    if (!options.anyScope) {
-      selector.scope = { $in: [options.scope] }
-
-      if (!options.onlyScoped) {
-        selector.scope.$in.push(null)
-      }
-    }
-
-    return Meteor.roleAssignment.find(selector, filter)
-  },
-
-  /**
-   * Deprecated. Use &#x60;getScopesForUser&#x60; instead.
-   *
-   * @method getGroupsForUser
-   * @static
-   * @deprecated
-   */
-  getGroupsForUser: function (...args) {
-    if (!getGroupsForUserDeprecationWarning) {
-      getGroupsForUserDeprecationWarning = true
-      console &amp;&amp; console.warn(&#x27;getGroupsForUser has been deprecated. Use getScopesForUser instead.&#x27;)
-    }
-
-    return Roles.getScopesForUser(...args)
-  },
-
-  /**
-   * Retrieve users scopes, if any.
-   *
-   * @method getScopesForUser
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} [roles] Name of roles to restrict scopes to.
-   *
-   * @return {Array} Array of user&#x27;s scopes, unsorted.
-   * @static
-   */
-  getScopesForUser: function (user, roles) {
-    let id
-
-    if (roles &amp;&amp; !Array.isArray(roles)) roles = [roles]
-
-    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
-      id = user._id
-    } else {
-      id = user
-    }
-
-    if (!id) return []
-
-    const selector = {
-      &#x27;user._id&#x27;: id,
-      scope: { $ne: null }
-    }
-
-    if (roles) {
-      selector[&#x27;inheritedRoles._id&#x27;] = { $in: roles }
-    }
-
-    const scopes = Meteor.roleAssignment.find(selector, { fields: { scope: 1 } }).fetch().map(obi =&gt; obi.scope)
-
-    return [...new Set(scopes)]
-  },
-
-  /**
-   * Rename a scope.
-   *
-   * Roles assigned with a given scope are changed to be under the new scope.
-   *
-   * @method renameScope
-   * @param {String} oldName Old name of a scope.
-   * @param {String} newName New name of a scope.
-   * @static
-   */
-  renameScope: function (oldName, newName) {
-    let count
-
-    Roles._checkScopeName(oldName)
-    Roles._checkScopeName(newName)
-
-    if (oldName === newName) return
-
-    do {
-      count = Meteor.roleAssignment.update({
-        scope: oldName
-      }, {
-        $set: {
-          scope: newName
-        }
-      }, { multi: true })
-    } while (count &gt; 0)
-  },
-
-  /**
-   * Remove a scope.
-   *
-   * Roles assigned with a given scope are removed.
-   *
-   * @method removeScope
-   * @param {String} name The name of a scope.
-   * @static
-   */
-  removeScope: function (name) {
-    Roles._checkScopeName(name)
-
-    Meteor.roleAssignment.remove({ scope: name })
-  },
-
-  /**
-   * Throw an exception if &#x60;roleName&#x60; is an invalid role name.
-   *
-   * @method _checkRoleName
-   * @param {String} roleName A role name to match against.
-   * @private
-   * @static
-   */
-  _checkRoleName: function (roleName) {
-    if (!roleName || typeof roleName !== &#x27;string&#x27; || roleName.trim() !== roleName) {
-      throw new Error(&#x27;Invalid role name \&#x27;&#x27; + roleName + &#x27;\&#x27;.&#x27;)
-    }
-  },
-
-  /**
-   * Find out if a role is an ancestor of another role.
-   *
-   * WARNING: If you check this on the client, please make sure all roles are published.
-   *
-   * @method isParentOf
-   * @param {String} parentRoleName The role you want to research.
-   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
-   * @static
-   */
-  isParentOf: function (parentRoleName, childRoleName) {
-    if (parentRoleName === childRoleName) {
-      return true
-    }
-
-    if (parentRoleName == null || childRoleName == null) {
-      return false
-    }
-
-    Roles._checkRoleName(parentRoleName)
-    Roles._checkRoleName(childRoleName)
-
-    let rolesToCheck = [parentRoleName]
-    while (rolesToCheck.length !== 0) {
-      const roleName = rolesToCheck.pop()
-
-      if (roleName === childRoleName) {
-        return true
-      }
-
-      const role = Meteor.roles.findOne({ _id: roleName })
-
-      // This should not happen, but this is a problem to address at some other time.
-      if (!role) continue
-
-      rolesToCheck = rolesToCheck.concat(role.children.map(r =&gt; r._id))
-    }
-
-    return false
-  },
-
-  /**
-   * Normalize options.
-   *
-   * @method _normalizeOptions
-   * @param {Object} options Options to normalize.
-   * @return {Object} Normalized options.
-   * @private
-   * @static
-   */
-  _normalizeOptions: function (options) {
-    options = options === undefined ? {} : options
-
-    if (options === null || typeof options === &#x27;string&#x27;) {
-      options = { scope: options }
-    }
-
-    options.scope = Roles._normalizeScopeName(options.scope)
-
-    return options
-  },
-
-  /**
-   * Normalize scope name.
-   *
-   * @method _normalizeScopeName
-   * @param {String} scopeName A scope name to normalize.
-   * @return {String} Normalized scope name.
-   * @private
-   * @static
-   */
-  _normalizeScopeName: function (scopeName) {
-    // map undefined and null to null
-    if (scopeName == null) {
-      return null
-    } else {
-      return scopeName
-    }
-  },
-
-  /**
-   * Throw an exception if &#x60;scopeName&#x60; is an invalid scope name.
-   *
-   * @method _checkRoleName
-   * @param {String} scopeName A scope name to match against.
-   * @private
-   * @static
-   */
-  _checkScopeName: function (scopeName) {
-    if (scopeName === null) return
-
-    if (
-      !scopeName ||
-      typeof scopeName !== &#x27;string&#x27; ||
-      scopeName.trim() !== scopeName
-    ) {
-      throw new Error(&#x60;Invalid scope name &#x27;${scopeName}&#x27;.&#x60;)
-    }
-  }
-})
-
-    </pre>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/files/roles_roles_common_async.js.html b/docs/files/roles_roles_common_async.js.html
deleted file mode 100644
index 9d6b35f865..0000000000
--- a/docs/files/roles_roles_common_async.js.html
+++ /dev/null
@@ -1,1432 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>roles/roles_common_async.js - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v4.0.0</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1 class="file-heading">File: roles/roles_common_async.js</h1>
-
-<div class="file">
-    <pre class="code prettyprint linenums">
-/* global Roles */
-import { Meteor } from &#x27;meteor/meteor&#x27;
-import { Mongo } from &#x27;meteor/mongo&#x27;
-
-/**
- * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
- *
- * Roles are accessible throgh &#x60;Meteor.roles&#x60; collection and documents consist of:
- *  - &#x60;_id&#x60;: role name
- *  - &#x60;children&#x60;: list of subdocuments:
- *    - &#x60;_id&#x60;
- *
- * Children list elements are subdocuments so that they can be easier extended in the future or by plugins.
- *
- * Roles can have multiple parents and can be children (subroles) of multiple roles.
- *
- * Example: &#x60;{_id: &#x27;admin&#x27;, children: [{_id: &#x27;editor&#x27;}]}&#x60;
- *
- * The assignment of a role to a user is stored in a collection, accessible through &#x60;Meteor.roleAssignment&#x60;.
- * It&#x27;s documents consist of
- *  - &#x60;_id&#x60;: Internal MongoDB id
- *  - &#x60;role&#x60;: A role object which got assigned. Usually only contains the &#x60;_id&#x60; property
- *  - &#x60;user&#x60;: A user object, usually only contains the &#x60;_id&#x60; property
- *  - &#x60;scope&#x60;: scope name
- *  - &#x60;inheritedRoles&#x60;: A list of all the roles objects inherited by the assigned role.
- *
- * @module Roles
- */
-export const RolesCollection = new Mongo.Collection(&#x27;roles&#x27;)
-
-if (!Meteor.roles) {
-  Meteor.roles = RolesCollection
-}
-
-export const RoleAssignmentCollection = new Mongo.Collection(&#x27;role-assignment&#x27;)
-
-if (!Meteor.roleAssignment) {
-  Meteor.roleAssignment = RoleAssignmentCollection
-}
-
-/**
- * @class Roles
- */
-if (typeof Roles === &#x27;undefined&#x27;) {
-  Roles = {} // eslint-disable-line no-global-assign
-}
-
-let getGroupsForUserDeprecationWarning = false
-
-/**
- * Helper, resolves async some
- * @param {*} arr
- * @param {*} predicate
- * @returns {Promise&lt;Boolean&gt;}
- */
-const asyncSome = async (arr, predicate) =&gt; {
-  for (const e of arr) {
-    if (await predicate(e)) return true
-  }
-  return false
-}
-
-Object.assign(Roles, {
-  /**
-   * Used as a global group (now scope) name. Not used anymore.
-   *
-   * @property GLOBAL_GROUP
-   * @static
-   * @deprecated
-   */
-  GLOBAL_GROUP: null,
-
-  /**
-   * Create a new role.
-   *
-   * @method createRoleAsync
-   * @param {String} roleName Name of role.
-   * @param {Object} [options] Options:
-   *   - &#x60;unlessExists&#x60;: if &#x60;true&#x60;, exception will not be thrown in the role already exists
-   * @return {Promise&lt;String&gt;} ID of the new role or null.
-   * @static
-   */
-  createRoleAsync: async function (roleName, options) {
-    Roles._checkRoleName(roleName)
-
-    options = Object.assign(
-      {
-        unlessExists: false
-      },
-      options
-    )
-
-    let insertedId = null
-
-    const existingRole = await Meteor.roles.findOneAsync({ _id: roleName })
-
-    if (existingRole) {
-      await Meteor.roles.updateAsync(
-        { _id: roleName },
-        { $setOnInsert: { children: [] } }
-      )
-      return null
-    } else {
-      insertedId = await Meteor.roles.insertAsync({
-        _id: roleName,
-        children: []
-      })
-    }
-
-    if (!insertedId) {
-      if (options.unlessExists) return null
-      throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; already exists.&quot;)
-    }
-
-    return insertedId
-  },
-
-  /**
-   * Delete an existing role.
-   *
-   * If the role is set for any user, it is automatically unset.
-   *
-   * @method deleteRoleAsync
-   * @param {String} roleName Name of role.
-   * @returns {Promise}
-   * @static
-   */
-  deleteRoleAsync: async function (roleName) {
-    let roles
-    let inheritedRoles
-
-    Roles._checkRoleName(roleName)
-
-    // Remove all assignments
-    await Meteor.roleAssignment.removeAsync({
-      &#x27;role._id&#x27;: roleName
-    })
-
-    do {
-      // For all roles who have it as a dependency ...
-      roles = await Roles._getParentRoleNamesAsync(
-        await Meteor.roles.findOneAsync({ _id: roleName })
-      )
-
-      for (const r of await Meteor.roles
-        .find({ _id: { $in: roles } })
-        .fetchAsync()) {
-        await Meteor.roles.updateAsync(
-          {
-            _id: r._id
-          },
-          {
-            $pull: {
-              children: {
-                _id: roleName
-              }
-            }
-          }
-        )
-
-        inheritedRoles = await Roles._getInheritedRoleNamesAsync(
-          await Meteor.roles.findOneAsync({ _id: r._id })
-        )
-        await Meteor.roleAssignment.updateAsync(
-          {
-            &#x27;role._id&#x27;: r._id
-          },
-          {
-            $set: {
-              inheritedRoles: [r._id, ...inheritedRoles].map((r2) =&gt; ({
-                _id: r2
-              }))
-            }
-          },
-          { multi: true }
-        )
-      }
-    } while (roles.length &gt; 0)
-
-    // And finally remove the role itself
-    await Meteor.roles.removeAsync({ _id: roleName })
-  },
-
-  /**
-   * Rename an existing role.
-   *
-   * @method renameRoleAsync
-   * @param {String} oldName Old name of a role.
-   * @param {String} newName New name of a role.
-   * @returns {Promise}
-   * @static
-   */
-  renameRoleAsync: async function (oldName, newName) {
-    let count
-
-    Roles._checkRoleName(oldName)
-    Roles._checkRoleName(newName)
-
-    if (oldName === newName) return
-
-    const role = await Meteor.roles.findOneAsync({ _id: oldName })
-
-    if (!role) {
-      throw new Error(&quot;Role &#x27;&quot; + oldName + &quot;&#x27; does not exist.&quot;)
-    }
-
-    role._id = newName
-
-    await Meteor.roles.insertAsync(role)
-
-    do {
-      count = await Meteor.roleAssignment.updateAsync(
-        {
-          &#x27;role._id&#x27;: oldName
-        },
-        {
-          $set: {
-            &#x27;role._id&#x27;: newName
-          }
-        },
-        { multi: true }
-      )
-    } while (count &gt; 0)
-
-    do {
-      count = await Meteor.roleAssignment.updateAsync(
-        {
-          &#x27;inheritedRoles._id&#x27;: oldName
-        },
-        {
-          $set: {
-            &#x27;inheritedRoles.$._id&#x27;: newName
-          }
-        },
-        { multi: true }
-      )
-    } while (count &gt; 0)
-
-    do {
-      count = await Meteor.roles.updateAsync(
-        {
-          &#x27;children._id&#x27;: oldName
-        },
-        {
-          $set: {
-            &#x27;children.$._id&#x27;: newName
-          }
-        },
-        { multi: true }
-      )
-    } while (count &gt; 0)
-
-    await Meteor.roles.removeAsync({ _id: oldName })
-  },
-
-  /**
-   * Add role parent to roles.
-   *
-   * Previous parents are kept (role can have multiple parents). For users which have the
-   * parent role set, new subroles are added automatically.
-   *
-   * @method addRolesToParentAsync
-   * @param {Array|String} rolesNames Name(s) of role(s).
-   * @param {String} parentName Name of parent role.
-   * @returns {Promise}
-   * @static
-   */
-  addRolesToParentAsync: async function (rolesNames, parentName) {
-    // ensure arrays
-    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
-
-    for (const roleName of rolesNames) {
-      await Roles._addRoleToParentAsync(roleName, parentName)
-    }
-  },
-
-  /**
-   * @method _addRoleToParentAsync
-   * @param {String} roleName Name of role.
-   * @param {String} parentName Name of parent role.
-   * @returns {Promise}
-   * @private
-   * @static
-   */
-  _addRoleToParentAsync: async function (roleName, parentName) {
-    Roles._checkRoleName(roleName)
-    Roles._checkRoleName(parentName)
-
-    // query to get role&#x27;s children
-    const role = await Meteor.roles.findOneAsync({ _id: roleName })
-
-    if (!role) {
-      throw new Error(&#x60;Role &#x27;${roleName}&#x27; does not exist.&#x60;)
-    }
-
-    // detect cycles
-    if ((await Roles._getInheritedRoleNamesAsync(role)).includes(parentName)) {
-      throw new Error(
-        &#x60;Roles &#x27;${roleName}&#x27; and &#x27;${parentName}&#x27; would form a cycle.&#x60;
-      )
-    }
-
-    const count = await Meteor.roles.updateAsync(
-      {
-        _id: parentName,
-        &#x27;children._id&#x27;: {
-          $ne: role._id
-        }
-      },
-      {
-        $push: {
-          children: {
-            _id: role._id
-          }
-        }
-      }
-    )
-
-    // if there was no change, parent role might not exist, or role is
-    // already a sub-role; in any case we do not have anything more to do
-    if (!count) return
-
-    await Meteor.roleAssignment.updateAsync(
-      {
-        &#x27;inheritedRoles._id&#x27;: parentName
-      },
-      {
-        $push: {
-          inheritedRoles: {
-            $each: [
-              role._id,
-              ...(await Roles._getInheritedRoleNamesAsync(role))
-            ].map((r) =&gt; ({ _id: r }))
-          }
-        }
-      },
-      { multi: true }
-    )
-  },
-
-  /**
-   * Remove role parent from roles.
-   *
-   * Other parents are kept (role can have multiple parents). For users which have the
-   * parent role set, removed subrole is removed automatically.
-   *
-   * @method removeRolesFromParentAsync
-   * @param {Array|String} rolesNames Name(s) of role(s).
-   * @param {String} parentName Name of parent role.
-   * @returns {Promise}
-   * @static
-   */
-  removeRolesFromParentAsync: async function (rolesNames, parentName) {
-    // ensure arrays
-    if (!Array.isArray(rolesNames)) rolesNames = [rolesNames]
-
-    for (const roleName of rolesNames) {
-      await Roles._removeRoleFromParentAsync(roleName, parentName)
-    }
-  },
-
-  /**
-   * @method _removeRoleFromParentAsync
-   * @param {String} roleName Name of role.
-   * @param {String} parentName Name of parent role.
-   * @returns {Promise}
-   * @private
-   * @static
-   */
-  _removeRoleFromParentAsync: async function (roleName, parentName) {
-    Roles._checkRoleName(roleName)
-    Roles._checkRoleName(parentName)
-
-    // check for role existence
-    // this would not really be needed, but we are trying to match addRolesToParent
-    const role = await Meteor.roles.findOneAsync(
-      { _id: roleName },
-      { fields: { _id: 1 } }
-    )
-
-    if (!role) {
-      throw new Error(&#x60;Role &#x27;${roleName}&#x27; does not exist.&#x60;)
-    }
-
-    const count = await Meteor.roles.updateAsync(
-      {
-        _id: parentName
-      },
-      {
-        $pull: {
-          children: {
-            _id: role._id
-          }
-        }
-      }
-    )
-
-    // if there was no change, parent role might not exist, or role was
-    // already not a subrole; in any case we do not have anything more to do
-    if (!count) return
-
-    // For all roles who have had it as a dependency ...
-    const roles = [
-      ...(await Roles._getParentRoleNamesAsync(
-        await Meteor.roles.findOneAsync({ _id: parentName })
-      )),
-      parentName
-    ]
-
-    for (const r of await Meteor.roles
-      .find({ _id: { $in: roles } })
-      .fetchAsync()) {
-      const inheritedRoles = await Roles._getInheritedRoleNamesAsync(
-        await Meteor.roles.findOneAsync({ _id: r._id })
-      )
-      await Meteor.roleAssignment.updateAsync(
-        {
-          &#x27;role._id&#x27;: r._id,
-          &#x27;inheritedRoles._id&#x27;: role._id
-        },
-        {
-          $set: {
-            inheritedRoles: [r._id, ...inheritedRoles].map((r2) =&gt; ({
-              _id: r2
-            }))
-          }
-        },
-        { multi: true }
-      )
-    }
-  },
-
-  /**
-   * Add users to roles.
-   *
-   * Adds roles to existing roles for each user.
-   *
-   * @example
-   *     Roles.addUsersToRolesAsync(userId, &#x27;admin&#x27;)
-   *     Roles.addUsersToRolesAsync(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
-   *     Roles.addUsersToRolesAsync([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
-   *     Roles.addUsersToRolesAsync([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
-   *
-   * @method addUsersToRolesAsync
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   * @returns {Promise}
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  addUsersToRolesAsync: async function (users, roles, options) {
-    let id
-
-    if (!users) throw new Error(&quot;Missing &#x27;users&#x27; param.&quot;)
-    if (!roles) throw new Error(&quot;Missing &#x27;roles&#x27; param.&quot;)
-
-    options = Roles._normalizeOptions(options)
-
-    // ensure arrays
-    if (!Array.isArray(users)) users = [users]
-    if (!Array.isArray(roles)) roles = [roles]
-
-    Roles._checkScopeName(options.scope)
-
-    options = Object.assign(
-      {
-        ifExists: false
-      },
-      options
-    )
-
-    for (const user of users) {
-      if (typeof user === &#x27;object&#x27;) {
-        id = user._id
-      } else {
-        id = user
-      }
-
-      for (const role of roles) {
-        await Roles._addUserToRoleAsync(id, role, options)
-      }
-    }
-  },
-
-  /**
-   * Set users&#x27; roles.
-   *
-   * Replaces all existing roles with a new set of roles.
-   *
-   * @example
-   *     await Roles.setUserRolesAsync(userId, &#x27;admin&#x27;)
-   *     await Roles.setUserRolesAsync(userId, [&#x27;view-secrets&#x27;], &#x27;example.com&#x27;)
-   *     await Roles.setUserRolesAsync([user1, user2], [&#x27;user&#x27;,&#x27;editor&#x27;])
-   *     await Roles.setUserRolesAsync([user1, user2], [&#x27;glorious-admin&#x27;, &#x27;perform-action&#x27;], &#x27;example.org&#x27;)
-   *
-   * @method setUserRolesAsync
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;anyScope&#x60;: if &#x60;true&#x60;, remove all roles the user has, of any scope, if &#x60;false&#x60;, only the one in the same scope
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   * @returns {Promise}
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  setUserRolesAsync: async function (users, roles, options) {
-    let id
-
-    if (!users) throw new Error(&quot;Missing &#x27;users&#x27; param.&quot;)
-    if (!roles) throw new Error(&quot;Missing &#x27;roles&#x27; param.&quot;)
-
-    options = Roles._normalizeOptions(options)
-
-    // ensure arrays
-    if (!Array.isArray(users)) users = [users]
-    if (!Array.isArray(roles)) roles = [roles]
-
-    Roles._checkScopeName(options.scope)
-
-    options = Object.assign(
-      {
-        ifExists: false,
-        anyScope: false
-      },
-      options
-    )
-
-    for (const user of users) {
-      if (typeof user === &#x27;object&#x27;) {
-        id = user._id
-      } else {
-        id = user
-      }
-      // we first clear all roles for the user
-      const selector = { &#x27;user._id&#x27;: id }
-      if (!options.anyScope) {
-        selector.scope = options.scope
-      }
-
-      await Meteor.roleAssignment.removeAsync(selector)
-
-      // and then add all
-      for (const role of roles) {
-        await Roles._addUserToRoleAsync(id, role, options)
-      }
-    }
-  },
-
-  /**
-   * Add one user to one role.
-   *
-   * @method _addUserToRoleAsync
-   * @param {String} userId The user ID.
-   * @param {String} roleName Name of the role to add the user to. The role have to exist.
-   * @param {Object} options Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;ifExists&#x60;: if &#x60;true&#x60;, do not throw an exception if the role does not exist
-   * @returns {Promise}
-   * @private
-   * @static
-   */
-  _addUserToRoleAsync: async function (userId, roleName, options) {
-    Roles._checkRoleName(roleName)
-    Roles._checkScopeName(options.scope)
-
-    if (!userId) {
-      return
-    }
-
-    const role = await Meteor.roles.findOneAsync(
-      { _id: roleName },
-      { fields: { children: 1 } }
-    )
-
-    if (!role) {
-      if (options.ifExists) {
-        return []
-      } else {
-        throw new Error(&quot;Role &#x27;&quot; + roleName + &quot;&#x27; does not exist.&quot;)
-      }
-    }
-
-    // This might create duplicates, because we don&#x27;t have a unique index, but that&#x27;s all right. In case there are two, withdrawing the role will effectively kill them both.
-    // TODO revisit this
-    /* const res = await RoleAssignmentCollection.upsertAsync(
-      {
-        &quot;user._id&quot;: userId,
-        &quot;role._id&quot;: roleName,
-        scope: options.scope,
-      },
-      {
-        $setOnInsert: {
-          user: { _id: userId },
-          role: { _id: roleName },
-          scope: options.scope,
-        },
-      }
-    ); */
-    const existingAssignment = await Meteor.roleAssignment.findOneAsync({
-      &#x27;user._id&#x27;: userId,
-      &#x27;role._id&#x27;: roleName,
-      scope: options.scope
-    })
-
-    let insertedId
-    let res
-    if (existingAssignment) {
-      await Meteor.roleAssignment.updateAsync(existingAssignment._id, {
-        $set: {
-          user: { _id: userId },
-          role: { _id: roleName },
-          scope: options.scope
-        }
-      })
-
-      res = await Meteor.roleAssignment.findOneAsync(existingAssignment._id)
-    } else {
-      insertedId = await Meteor.roleAssignment.insertAsync({
-        user: { _id: userId },
-        role: { _id: roleName },
-        scope: options.scope
-      })
-    }
-
-    if (insertedId) {
-      await Meteor.roleAssignment.updateAsync(
-        { _id: insertedId },
-        {
-          $set: {
-            inheritedRoles: [
-              roleName,
-              ...(await Roles._getInheritedRoleNamesAsync(role))
-            ].map((r) =&gt; ({ _id: r }))
-          }
-        }
-      )
-
-      res = await Meteor.roleAssignment.findOneAsync({ _id: insertedId })
-    }
-    res.insertedId = insertedId // For backward compatibility
-
-    return res
-  },
-
-  /**
-   * Returns an array of role names the given role name is a child of.
-   *
-   * @example
-   *     Roles._getParentRoleNamesAsync({ _id: &#x27;admin&#x27;, children; [] })
-   *
-   * @method _getParentRoleNamesAsync
-   * @param {object} role The role object
-   * @returns {Promise}
-   * @private
-   * @static
-   */
-  _getParentRoleNamesAsync: async function (role) {
-    if (!role) {
-      return []
-    }
-
-    const parentRoles = new Set([role._id])
-
-    for (const roleName of parentRoles) {
-      for (const parentRole of await Meteor.roles
-        .find({ &#x27;children._id&#x27;: roleName })
-        .fetchAsync()) {
-        parentRoles.add(parentRole._id)
-      }
-    }
-
-    parentRoles.delete(role._id)
-
-    return [...parentRoles]
-  },
-
-  /**
-   * Returns an array of role names the given role name is a parent of.
-   *
-   * @example
-   *     Roles._getInheritedRoleNames({ _id: &#x27;admin&#x27;, children; [] })
-   *
-   * @method _getInheritedRoleNames
-   * @param {object} role The role object
-   * @returns {Promise}
-   * @private
-   * @static
-   */
-  _getInheritedRoleNamesAsync: async function (role) {
-    const inheritedRoles = new Set()
-    const nestedRoles = new Set([role])
-
-    for (const r of nestedRoles) {
-      const roles = await Meteor.roles
-        .find(
-          { _id: { $in: r.children.map((r) =&gt; r._id) } },
-          { fields: { children: 1 } }
-        )
-        .fetchAsync()
-
-      for (const r2 of roles) {
-        inheritedRoles.add(r2._id)
-        nestedRoles.add(r2)
-      }
-    }
-
-    return [...inheritedRoles]
-  },
-
-  /**
-   * Remove users from assigned roles.
-   *
-   * @example
-   *     await Roles.removeUsersFromRolesAsync(userId, &#x27;admin&#x27;)
-   *     await Roles.removeUsersFromRolesAsync([userId, user2], [&#x27;editor&#x27;])
-   *     await Roles.removeUsersFromRolesAsync(userId, [&#x27;user&#x27;], &#x27;group1&#x27;)
-   *
-   * @method removeUsersFromRolesAsync
-   * @param {Array|String} users User ID(s) or object(s) with an &#x60;_id&#x60; field.
-   * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   * @returns {Promise}
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
-   */
-  removeUsersFromRolesAsync: async function (users, roles, options) {
-    if (!users) throw new Error(&quot;Missing &#x27;users&#x27; param.&quot;)
-    if (!roles) throw new Error(&quot;Missing &#x27;roles&#x27; param.&quot;)
-
-    options = Roles._normalizeOptions(options)
-
-    // ensure arrays
-    if (!Array.isArray(users)) users = [users]
-    if (!Array.isArray(roles)) roles = [roles]
-
-    Roles._checkScopeName(options.scope)
-
-    for (const user of users) {
-      if (!user) return
-
-      for (const role of roles) {
-        let id
-        if (typeof user === &#x27;object&#x27;) {
-          id = user._id
-        } else {
-          id = user
-        }
-
-        await Roles._removeUserFromRoleAsync(id, role, options)
-      }
-    }
-  },
-
-  /**
-   * Remove one user from one role.
-   *
-   * @method _removeUserFromRoleAsync
-   * @param {String} userId The user ID.
-   * @param {String} roleName Name of the role to add the user to. The role have to exist.
-   * @param {Object} options Options:
-   *   - &#x60;scope&#x60;: name of the scope, or &#x60;null&#x60; for the global role
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   * @returns {Promise}
-   * @private
-   * @static
-   */
-  _removeUserFromRoleAsync: async function (userId, roleName, options) {
-    Roles._checkRoleName(roleName)
-    Roles._checkScopeName(options.scope)
-
-    if (!userId) return
-
-    const selector = {
-      &#x27;user._id&#x27;: userId,
-      &#x27;role._id&#x27;: roleName
-    }
-
-    if (!options.anyScope) {
-      selector.scope = options.scope
-    }
-
-    await Meteor.roleAssignment.removeAsync(selector)
-  },
-
-  /**
-   * Check if user has specified roles.
-   *
-   * @example
-   *     // global roles
-   *     await Roles.userIsInRoleAsync(user, &#x27;admin&#x27;)
-   *     await Roles.userIsInRoleAsync(user, [&#x27;admin&#x27;,&#x27;editor&#x27;])
-   *     await Roles.userIsInRoleAsync(userId, &#x27;admin&#x27;)
-   *     await Roles.userIsInRoleAsync(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;])
-   *
-   *     // scope roles (global roles are still checked)
-   *     await Roles.userIsInRoleAsync(user, &#x27;admin&#x27;, &#x27;group1&#x27;)
-   *     await Roles.userIsInRoleAsync(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], &#x27;group1&#x27;)
-   *     await Roles.userIsInRoleAsync(userId, [&#x27;admin&#x27;,&#x27;editor&#x27;], {scope: &#x27;group1&#x27;})
-   *
-   * @method userIsInRoleAsync
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} roles Name of role or an array of roles to check against. If array,
-   *                             will return &#x60;true&#x60; if user is in _any_ role.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope; if supplied, limits check to just that scope
-   *     the user&#x27;s global roles will always be checked whether scope is specified or not
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *
-   * Alternatively, it can be a scope name string.
-   * @return {Promise&lt;Boolean&gt;} &#x60;true&#x60; if user is in _any_ of the target roles
-   * @static
-   */
-  userIsInRoleAsync: async function (user, roles, options) {
-    let id
-
-    options = Roles._normalizeOptions(options)
-
-    // ensure array to simplify code
-    if (!Array.isArray(roles)) roles = [roles]
-
-    roles = roles.filter((r) =&gt; r != null)
-
-    if (!roles.length) return false
-
-    Roles._checkScopeName(options.scope)
-
-    options = Object.assign(
-      {
-        anyScope: false
-      },
-      options
-    )
-
-    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
-      id = user._id
-    } else {
-      id = user
-    }
-
-    if (!id) return false
-    if (typeof id !== &#x27;string&#x27;) return false
-
-    const selector = {
-      &#x27;user._id&#x27;: id
-    }
-
-    if (!options.anyScope) {
-      selector.scope = { $in: [options.scope, null] }
-    }
-
-    const res = await asyncSome(roles, async (roleName) =&gt; {
-      selector[&#x27;inheritedRoles._id&#x27;] = roleName
-      const out =
-        (await Meteor.roleAssignment.countDocuments(selector, { limit: 1 })) &gt; 0
-      return out
-    })
-
-    return res
-  },
-
-  /**
-   * Retrieve user&#x27;s roles.
-   *
-   * @method getRolesForUserAsync
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of scope to provide roles for; if not specified, global roles are returned
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; and &#x60;onlyAssigned&#x60; options are ignored)
-   *   - &#x60;onlyScoped&#x60;: if set, only roles in the specified scope are returned
-   *   - &#x60;onlyAssigned&#x60;: return only assigned roles and not automatically inferred (like subroles)
-   *   - &#x60;fullObjects&#x60;: return full roles objects (&#x60;true&#x60;) or just names (&#x60;false&#x60;) (&#x60;onlyAssigned&#x60; option is ignored) (default &#x60;false&#x60;)
-   *     If you have a use-case for this option, please file a feature-request. You shouldn&#x27;t need to use it as it&#x27;s
-   *     result strongly dependent on the internal data structure of this plugin.
-   *
-   * Alternatively, it can be a scope name string.
-   * @return {Promise&lt;Array&gt;} Array of user&#x27;s roles, unsorted.
-   * @static
-   */
-  getRolesForUserAsync: async function (user, options) {
-    let id
-
-    options = Roles._normalizeOptions(options)
-
-    Roles._checkScopeName(options.scope)
-
-    options = Object.assign({
-      fullObjects: false,
-      onlyAssigned: false,
-      anyScope: false,
-      onlyScoped: false
-    }, options)
-
-    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
-      id = user._id
-    } else {
-      id = user
-    }
-
-    if (!id) return []
-
-    const selector = {
-      &#x27;user._id&#x27;: id
-    }
-
-    const filter = {
-      fields: { &#x27;inheritedRoles._id&#x27;: 1 }
-    }
-
-    if (!options.anyScope) {
-      selector.scope = { $in: [options.scope] }
-
-      if (!options.onlyScoped) {
-        selector.scope.$in.push(null)
-      }
-    }
-
-    if (options.onlyAssigned) {
-      delete filter.fields[&#x27;inheritedRoles._id&#x27;]
-      filter.fields[&#x27;role._id&#x27;] = 1
-    }
-
-    if (options.fullObjects) {
-      delete filter.fields
-    }
-
-    const roles = await Meteor.roleAssignment.find(selector, filter).fetchAsync()
-
-    if (options.fullObjects) {
-      return roles
-    }
-
-    return [
-      ...new Set(
-        roles.reduce((rev, current) =&gt; {
-          if (current.inheritedRoles) {
-            return rev.concat(current.inheritedRoles.map((r) =&gt; r._id))
-          } else if (current.role) {
-            rev.push(current.role._id)
-          }
-          return rev
-        }, [])
-      )
-    ]
-  },
-
-  /**
-   * Retrieve cursor of all existing roles.
-   *
-   * @method getAllRoles
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to &#x60;RolesCollection.find(query, options)&#x60;.
-   * @return {Cursor} Cursor of existing roles.
-   * @static
-   */
-  getAllRoles: function (queryOptions) {
-    queryOptions = queryOptions || { sort: { _id: 1 } }
-
-    return Meteor.roles.find({}, queryOptions)
-  },
-
-  /**
-   * Retrieve all users who are in target role.
-   *
-   * Options:
-   *
-   * @method getUsersInRoleAsync
-   * @param {Array|String} roles Name of role or an array of roles. If array, users
-   *                             returned will have at least one of the roles
-   *                             specified but need not have _all_ roles.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
-   *     roles will also be checked
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *   - &#x60;onlyScoped&#x60;: if set, only roles in the specified scope are returned
-   *   - &#x60;queryOptions&#x60;: options which are passed directly
-   *     through to &#x60;Meteor.users.find(query, options)&#x60;
-   *
-   * Alternatively, it can be a scope name string.
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to &#x60;Meteor.users.find(query, options)&#x60;
-   * @return {Promise&lt;Cursor&gt;} Cursor of users in roles.
-   * @static
-   */
-  getUsersInRoleAsync: async function (roles, options, queryOptions) {
-    const ids = (
-      await Roles.getUserAssignmentsForRole(roles, options).fetchAsync()
-    ).map((a) =&gt; a.user._id)
-
-    return Meteor.users.find(
-      { _id: { $in: ids } },
-      (options &amp;&amp; options.queryOptions) || queryOptions || {}
-    )
-  },
-
-  /**
-   * Retrieve all assignments of a user which are for the target role.
-   *
-   * Options:
-   *
-   * @method getUserAssignmentsForRole
-   * @param {Array|String} roles Name of role or an array of roles. If array, users
-   *                             returned will have at least one of the roles
-   *                             specified but need not have _all_ roles.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
-   *     roles will also be checked
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *   - &#x60;queryOptions&#x60;: options which are passed directly
-   *     through to &#x60;RoleAssignmentCollection.find(query, options)&#x60;
-
-   * Alternatively, it can be a scope name string.
-   * @return {Cursor} Cursor of user assignments for roles.
-   * @static
-   */
-  getUserAssignmentsForRole: function (roles, options) {
-    options = Roles._normalizeOptions(options)
-
-    options = Object.assign(
-      {
-        anyScope: false,
-        queryOptions: {}
-      },
-      options
-    )
-
-    return Roles._getUsersInRoleCursor(roles, options, options.queryOptions)
-  },
-
-  /**
-   * @method _getUsersInRoleCursor
-   * @param {Array|String} roles Name of role or an array of roles. If array, ids of users are
-   *                             returned which have at least one of the roles
-   *                             assigned but need not have _all_ roles.
-   *                             Roles do not have to exist.
-   * @param {Object|String} [options] Options:
-   *   - &#x60;scope&#x60;: name of the scope to restrict roles to; user&#x27;s global
-   *     roles will also be checked
-   *   - &#x60;anyScope&#x60;: if set, role can be in any scope (&#x60;scope&#x60; option is ignored)
-   *
-   * Alternatively, it can be a scope name string.
-   * @param {Object} [filter] Options which are passed directly
-   *                                through to &#x60;RoleAssignmentCollection.find(query, options)&#x60;
-   * @return {Object} Cursor to the assignment documents
-   * @private
-   * @static
-   */
-  _getUsersInRoleCursor: function (roles, options, filter) {
-    options = Roles._normalizeOptions(options)
-
-    options = Object.assign(
-      {
-        anyScope: false,
-        onlyScoped: false
-      },
-      options
-    )
-
-    // ensure array to simplify code
-    if (!Array.isArray(roles)) roles = [roles]
-
-    Roles._checkScopeName(options.scope)
-
-    filter = Object.assign(
-      {
-        fields: { &#x27;user._id&#x27;: 1 }
-      },
-      filter
-    )
-
-    const selector = {
-      &#x27;inheritedRoles._id&#x27;: { $in: roles }
-    }
-
-    if (!options.anyScope) {
-      selector.scope = { $in: [options.scope] }
-
-      if (!options.onlyScoped) {
-        selector.scope.$in.push(null)
-      }
-    }
-
-    return Meteor.roleAssignment.find(selector, filter)
-  },
-
-  /**
-   * Deprecated. Use &#x60;getScopesForUser&#x60; instead.
-   *
-   * @method getGroupsForUserAsync
-   * @returns {Promise&lt;Array&gt;}
-   * @static
-   * @deprecated
-   */
-  getGroupsForUserAsync: async function (...args) {
-    if (!getGroupsForUserDeprecationWarning) {
-      getGroupsForUserDeprecationWarning = true
-      console &amp;&amp;
-        console.warn(
-          &#x27;getGroupsForUser has been deprecated. Use getScopesForUser instead.&#x27;
-        )
-    }
-
-    return await Roles.getScopesForUser(...args)
-  },
-
-  /**
-   * Retrieve users scopes, if any.
-   *
-   * @method getScopesForUserAsync
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} [roles] Name of roles to restrict scopes to.
-   *
-   * @return {Promise&lt;Array&gt;} Array of user&#x27;s scopes, unsorted.
-   * @static
-   */
-  getScopesForUserAsync: async function (user, roles) {
-    let id
-
-    if (roles &amp;&amp; !Array.isArray(roles)) roles = [roles]
-
-    if (user &amp;&amp; typeof user === &#x27;object&#x27;) {
-      id = user._id
-    } else {
-      id = user
-    }
-
-    if (!id) return []
-
-    const selector = {
-      &#x27;user._id&#x27;: id,
-      scope: { $ne: null }
-    }
-
-    if (roles) {
-      selector[&#x27;inheritedRoles._id&#x27;] = { $in: roles }
-    }
-
-    const scopes = (
-      await Meteor.roleAssignment
-        .find(selector, { fields: { scope: 1 } })
-        .fetchAsync()
-    ).map((obi) =&gt; obi.scope)
-
-    return [...new Set(scopes)]
-  },
-
-  /**
-   * Rename a scope.
-   *
-   * Roles assigned with a given scope are changed to be under the new scope.
-   *
-   * @method renameScopeAsync
-   * @param {String} oldName Old name of a scope.
-   * @param {String} newName New name of a scope.
-   * @returns {Promise}
-   * @static
-   */
-  renameScopeAsync: async function (oldName, newName) {
-    let count
-
-    Roles._checkScopeName(oldName)
-    Roles._checkScopeName(newName)
-
-    if (oldName === newName) return
-
-    do {
-      count = await Meteor.roleAssignment.updateAsync(
-        {
-          scope: oldName
-        },
-        {
-          $set: {
-            scope: newName
-          }
-        },
-        { multi: true }
-      )
-    } while (count &gt; 0)
-  },
-
-  /**
-   * Remove a scope.
-   *
-   * Roles assigned with a given scope are removed.
-   *
-   * @method removeScopeAsync
-   * @param {String} name The name of a scope.
-   * @returns {Promise}
-   * @static
-   */
-  removeScopeAsync: async function (name) {
-    Roles._checkScopeName(name)
-
-    await Meteor.roleAssignment.removeAsync({ scope: name })
-  },
-
-  /**
-   * Throw an exception if &#x60;roleName&#x60; is an invalid role name.
-   *
-   * @method _checkRoleName
-   * @param {String} roleName A role name to match against.
-   * @private
-   * @static
-   */
-  _checkRoleName: function (roleName) {
-    if (
-      !roleName ||
-      typeof roleName !== &#x27;string&#x27; ||
-      roleName.trim() !== roleName
-    ) {
-      throw new Error(&#x60;Invalid role name &#x27;${roleName}&#x27;.&#x60;)
-    }
-  },
-
-  /**
-   * Find out if a role is an ancestor of another role.
-   *
-   * WARNING: If you check this on the client, please make sure all roles are published.
-   *
-   * @method isParentOfAsync
-   * @param {String} parentRoleName The role you want to research.
-   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
-   * @returns {Promise}
-   * @static
-   */
-  isParentOfAsync: async function (parentRoleName, childRoleName) {
-    if (parentRoleName === childRoleName) {
-      return true
-    }
-
-    if (parentRoleName == null || childRoleName == null) {
-      return false
-    }
-
-    Roles._checkRoleName(parentRoleName)
-    Roles._checkRoleName(childRoleName)
-
-    let rolesToCheck = [parentRoleName]
-    while (rolesToCheck.length !== 0) {
-      const roleName = rolesToCheck.pop()
-
-      if (roleName === childRoleName) {
-        return true
-      }
-
-      const role = await Meteor.roles.findOneAsync({ _id: roleName })
-
-      // This should not happen, but this is a problem to address at some other time.
-      if (!role) continue
-
-      rolesToCheck = rolesToCheck.concat(role.children.map((r) =&gt; r._id))
-    }
-
-    return false
-  },
-
-  /**
-   * Normalize options.
-   *
-   * @method _normalizeOptions
-   * @param {Object} options Options to normalize.
-   * @return {Object} Normalized options.
-   * @private
-   * @static
-   */
-  _normalizeOptions: function (options) {
-    options = options === undefined ? {} : options
-
-    // TODO Number will error out on scope validation, we can either error it out here
-    // or make it into a string and hence a valid input.
-    if (options === null || typeof options === &#x27;string&#x27; || typeof options === &#x27;number&#x27;) {
-      options = { scope: options }
-    }
-
-    options.scope = Roles._normalizeScopeName(options.scope)
-
-    return options
-  },
-
-  /**
-   * Normalize scope name.
-   *
-   * @method _normalizeScopeName
-   * @param {String} scopeName A scope name to normalize.
-   * @return {String} Normalized scope name.
-   * @private
-   * @static
-   */
-  _normalizeScopeName: function (scopeName) {
-    // map undefined and null to null
-    if (scopeName == null) {
-      return null
-    } else {
-      return scopeName
-    }
-  },
-
-  /**
-   * Throw an exception if &#x60;scopeName&#x60; is an invalid scope name.
-   *
-   * @method _checkScopeName
-   * @param {String} scopeName A scope name to match against.
-   * @private
-   * @static
-   */
-  _checkScopeName: function (scopeName) {
-    if (scopeName === null) return
-
-    if (
-      !scopeName ||
-      typeof scopeName !== &#x27;string&#x27; ||
-      scopeName.trim() !== scopeName
-    ) {
-      throw new Error(&#x60;Invalid scope name &#x27;${scopeName}&#x27;.&#x60;)
-    }
-  }
-})
-
-    </pre>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/index.html b/docs/index.html
deleted file mode 100644
index 37ac1a398c..0000000000
--- a/docs/index.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="./assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="./assets/css/main.css" id="site_styles">
-    <link rel="icon" href="./assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="./assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v4.0.0</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="./classes/Roles.html">Roles</a></li>
-                                <li><a href="./classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="./modules/Roles.html">Roles</a></li>
-                                <li><a href="./modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-    <div class="apidocs">
-        <div id="docs-main" class="content">
-            <p>
-            Browse to a module or class using the sidebar to view its API documentation.
-            </p>
-
-            <h2>Keyboard Shortcuts</h2>
-
-            <ul>
-                <li><p>Press <kbd>s</kbd> to focus the API search box.</p></li>
-
-                <li><p>Use <kbd>Up</kbd> and <kbd>Down</kbd> to select classes, modules, and search results.</p></li>
-
-                <li class="mac-only"><p>With the API search box or sidebar focused, use <kbd><span class="cmd">&#x2318;</span>-Left</kbd> or <kbd><span class="cmd">&#x2318;</span>-Right</kbd> to switch sidebar tabs.</p></li>
-
-                <li class="pc-only"><p>With the API search box or sidebar focused, use <kbd>Ctrl+Left</kbd> and <kbd>Ctrl+Right</kbd> to switch sidebar tabs.</p></li>
-            </ul>
-        </div>
-    </div>
-
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="./assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="./assets/js/yui-prettify.js"></script>
-<script src="./assets/../api.js"></script>
-<script src="./assets/js/api-filter.js"></script>
-<script src="./assets/js/api-list.js"></script>
-<script src="./assets/js/api-search.js"></script>
-<script src="./assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/modules/Roles.html b/docs/modules/Roles.html
deleted file mode 100644
index 2d49158c2b..0000000000
--- a/docs/modules/Roles.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Roles - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v4.0.0</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>Roles Module</h1>
-<div class="box clearfix meta">
-
-
-        <div class="foundat">
-            Defined in: <a href="../files/roles_roles_common_async.js.html#l41"><code>roles&#x2F;roles_common_async.js:41</code></a>
-        </div>
-
-</div>
-
-
-<div class="box intro">
-    <p>Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.</p>
-<p>Roles are accessible through <code>Meteor.roles</code> collection and documents consist of:</p>
-<ul>
-<li><code>_id</code>: role name</li>
-<li><code>children</code>: list of subdocuments:
-<ul>
-<li><code>_id</code></li>
-</ul>
-</li>
-</ul>
-<p>Children list elements are subdocuments so that they can be easier extended in the future or by plugins.</p>
-<p>Roles can have multiple parents and can be children (subroles) of multiple roles.</p>
-<p>Example: <code>{_id: 'admin', children: [{_id: 'editor'}]}</code></p>
-<p>The assignment of a role to a user is stored in a collection, accessible through <code>RoleAssignmentCollection</code>.
-It's documents consist of</p>
-<ul>
-<li><code>_id</code>: Internal MongoDB id</li>
-<li><code>role</code>: A role object which got assigned. Usually only contains the <code>_id</code> property</li>
-<li><code>user</code>: A user object, usually only contains the <code>_id</code> property</li>
-<li><code>scope</code>: scope name</li>
-<li><code>inheritedRoles</code>: A list of all the roles objects inherited by the assigned role.</li>
-</ul>
-
-</div>
-
-
-<div class="yui3-g">
-    <div class="yui3-u-1-2">
-            <p>This module provides the following classes:</p>
-
-            <ul class="module-classes">
-                <li class="module-class">
-                    <a href="../classes/Roles.html">
-                        Roles
-                    </a>
-                </li>
-            </ul>
-    </div>
-
-
-    <div class="yui3-u-1-2">
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/modules/UIHelpers.html b/docs/modules/UIHelpers.html
deleted file mode 100644
index 41aea1413d..0000000000
--- a/docs/modules/UIHelpers.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>UIHelpers - The meteor-roles API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="The meteor-roles API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: v4.0.0</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/Roles.html">Roles</a></li>
-                                <li><a href="../classes/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/Roles.html">Roles</a></li>
-                                <li><a href="../modules/UIHelpers.html">UIHelpers</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>UIHelpers Module</h1>
-<div class="box clearfix meta">
-
-
-        <div class="foundat">
-            Defined in: <a href="../files/roles_client_uiHelpers.js.html#l3"><code>roles&#x2F;client&#x2F;uiHelpers.js:3</code></a>
-        </div>
-
-</div>
-
-
-<div class="box intro">
-    <p>Convenience functions for use on client.</p>
-<p>NOTE: You must restrict user actions on the server-side; any
-client-side checks are strictly for convenience and must not be
-trusted.</p>
-
-</div>
-
-
-<div class="yui3-g">
-    <div class="yui3-u-1-2">
-            <p>This module provides the following classes:</p>
-
-            <ul class="module-classes">
-                <li class="module-class">
-                    <a href="../classes/UIHelpers.html">
-                        UIHelpers
-                    </a>
-                </li>
-            </ul>
-    </div>
-
-
-    <div class="yui3-u-1-2">
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>
diff --git a/docs/modules/index.html b/docs/modules/index.html
deleted file mode 100644
index 487fe15b2a..0000000000
--- a/docs/modules/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Redirector</title>
-        <meta http-equiv="refresh" content="0;url=../">
-    </head>
-    <body>
-        <a href="../">Click here to redirect</a>
-    </body>
-</html>
diff --git a/examples/flow-router-advanced/.meteor/.finished-upgraders b/examples/flow-router-advanced/.meteor/.finished-upgraders
deleted file mode 100644
index 61ee313230..0000000000
--- a/examples/flow-router-advanced/.meteor/.finished-upgraders
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file contains information which helps Meteor properly upgrade your
-# app when you run 'meteor update'. You should check it into version control
-# with your project.
-
-notices-for-0.9.0
-notices-for-0.9.1
-0.9.4-platform-file
-notices-for-facebook-graph-api-2
-1.2.0-standard-minifiers-package
-1.2.0-meteor-platform-split
-1.2.0-cordova-changes
-1.2.0-breaking-changes
diff --git a/examples/flow-router-advanced/.meteor/.gitignore b/examples/flow-router-advanced/.meteor/.gitignore
deleted file mode 100644
index 08150d000c..0000000000
--- a/examples/flow-router-advanced/.meteor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-local
-meteorite
diff --git a/examples/flow-router-advanced/.meteor/.id b/examples/flow-router-advanced/.meteor/.id
deleted file mode 100644
index acd117ac05..0000000000
--- a/examples/flow-router-advanced/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-12nu3d71gkxofl123c8jf
diff --git a/examples/flow-router-advanced/.meteor/packages b/examples/flow-router-advanced/.meteor/packages
deleted file mode 100644
index 1b853507f0..0000000000
--- a/examples/flow-router-advanced/.meteor/packages
+++ /dev/null
@@ -1,27 +0,0 @@
-# Meteor packages used by this project, one per line.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-accounts-password
-accounts-ui
-bootstrap
-spiderable
-alanning:roles
-kadira:flow-router
-kadira:blaze-layout
-alanning:trace
-standard-minifiers
-meteor-base
-mobile-experience
-mongo
-blaze-html-templates
-session
-jquery
-tracker
-logging
-reload
-random
-ejson
-spacebars
-check
diff --git a/examples/flow-router-advanced/.meteor/platforms b/examples/flow-router-advanced/.meteor/platforms
deleted file mode 100644
index 8a3a35f9f6..0000000000
--- a/examples/flow-router-advanced/.meteor/platforms
+++ /dev/null
@@ -1,2 +0,0 @@
-browser
-server
diff --git a/examples/flow-router-advanced/.meteor/release b/examples/flow-router-advanced/.meteor/release
deleted file mode 100644
index 97064e1993..0000000000
--- a/examples/flow-router-advanced/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-METEOR@1.8.1
diff --git a/examples/flow-router-advanced/.meteor/versions b/examples/flow-router-advanced/.meteor/versions
deleted file mode 100644
index df592bd5d9..0000000000
--- a/examples/flow-router-advanced/.meteor/versions
+++ /dev/null
@@ -1,97 +0,0 @@
-accounts-base@1.4.3
-accounts-password@1.5.1
-accounts-ui@1.3.1
-accounts-ui-unstyled@1.4.2
-alanning:roles@3.0.0
-alanning:trace@0.0.2
-allow-deny@1.1.0
-autoupdate@1.6.0
-babel-compiler@7.3.4
-babel-runtime@1.3.0
-base64@1.0.11
-binary-heap@1.0.11
-blaze@2.3.3
-blaze-html-templates@1.0.1
-blaze-tools@1.0.10
-boilerplate-generator@1.6.0
-bootstrap@1.0.1
-caching-compiler@1.2.1
-caching-html-compiler@1.0.6
-callback-hook@1.1.0
-check@1.3.1
-coffeescript@1.0.11
-cosmos:browserify@0.9.3
-ddp@1.4.0
-ddp-client@2.3.3
-ddp-common@1.4.0
-ddp-rate-limiter@1.0.7
-ddp-server@2.3.0
-deps@1.0.12
-diff-sequence@1.1.1
-dynamic-import@0.5.1
-ecmascript@0.12.4
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.8.0
-ecmascript-runtime-server@0.7.1
-ejson@1.1.0
-email@1.2.3
-es5-shim@4.8.0
-fetch@0.1.1
-geojson-utils@1.0.10
-hot-code-push@1.0.4
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.1.0
-inter-process-messaging@0.1.0
-jquery@1.11.9
-kadira:blaze-layout@2.3.0
-kadira:flow-router@2.10.0
-launch-screen@1.1.1
-less@2.8.0
-livedata@1.0.18
-localstorage@1.2.0
-logging@1.1.20
-meteor@1.9.3
-meteor-base@1.4.0
-minifier-css@1.4.2
-minifier-js@2.4.1
-minimongo@1.4.5
-mobile-experience@1.0.5
-mobile-status-bar@1.0.14
-modern-browsers@0.1.4
-modules@0.13.0
-modules-runtime@0.10.3
-mongo@1.6.2
-mongo-decimal@0.1.1
-mongo-dev-server@1.1.0
-mongo-id@1.0.7
-npm-bcrypt@0.9.3
-npm-mongo@3.1.2
-observe-sequence@1.0.16
-ordered-dict@1.1.0
-promise@0.11.2
-random@1.1.0
-rate-limit@1.0.9
-reactive-dict@1.3.0
-reactive-var@1.0.11
-reload@1.3.0
-retry@1.1.0
-routepolicy@1.1.0
-service-configuration@1.0.11
-session@1.2.0
-sha@1.0.9
-socket-stream-client@0.2.2
-spacebars@1.0.12
-spacebars-compiler@1.1.1
-spiderable@1.0.9
-srp@1.0.12
-standard-minifier-css@1.5.3
-standard-minifier-js@2.4.1
-standard-minifiers@1.1.0
-templating@1.2.14
-templating-tools@1.1.1
-tracker@1.2.0
-ui@1.0.8
-underscore@1.0.10
-webapp@1.7.3
-webapp-hashing@1.0.9
diff --git a/examples/flow-router-advanced/README.md b/examples/flow-router-advanced/README.md
deleted file mode 100644
index f4e8d48e6f..0000000000
--- a/examples/flow-router-advanced/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Flow Router Authorization - Advanced
-
-This example illustrates a pattern for reuse of template-based authorization.  
-
-Slides for related talk available here: http://slides.com/alanning55/a-pattern-for-flowrouter-auth#/
-
-
-Features:
-
-* Modular directory structure - different sections of the application are split out into separate directories
-* Re-usable, nestable templates for handling authorization (dubbed "auth controllers")
-* Authentication handled by the app's main layout.
-
-NOTE: The app structure and reusable, template-based authorization pattern is not unique to FlowRouter.  It can also be used with IronRouter.
diff --git a/examples/flow-router-advanced/main/client/header.html b/examples/flow-router-advanced/main/client/header.html
deleted file mode 100644
index caaa45a51b..0000000000
--- a/examples/flow-router-advanced/main/client/header.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<template name="header">
-  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </a>
-        <a class="brand" href="/">Roles Example App</a>
-
-        {{#if currentUser}}
-        <div class="nav-collapse collapse">
-          <ul class="nav">
-
-            <li><a href="/start">Start Page</a></li>
-
-            {{#if isInRole 'admin,secrets'}}
-            <li><a href="/secrets">Secrets</a></li>
-            {{/if}}
-
-            <li class="dropdown pull-right">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                {{#if isInRole 'admin,manage-users'}}
-                <li><a href="/manageUsers">Manage Users</a></li>
-                {{/if}}
-                <li><a class="signout" href="/signout">Sign out</a></li>
-              </ul>
-            </li>
-
-          </ul>
-        </div>
-        {{/if}}
-
-      </div>
-    </div>
-  </div>
-</template>
diff --git a/examples/flow-router-advanced/main/client/header.js b/examples/flow-router-advanced/main/client/header.js
deleted file mode 100644
index 2abff9391b..0000000000
--- a/examples/flow-router-advanced/main/client/header.js
+++ /dev/null
@@ -1,34 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Header
-//
-Template.header.events({
-  // template data, if any, is available in 'this'
-  'click .btn-navbar' : openCloseNav
-})
-
-Template.header.helpers({
-  displayName: function () {
-    return App.displayName()
-  }
-})
-
-
-
-
-// insta-open/close nav rather than animate collapse.
-// this improves UX on mobile devices
-function openCloseNav (e) {
-  // Select .nav-collapse within same .navbar as current button
-  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
-
-  if (nav.height() != 0) {
-    // If it has a height, hide it
-    nav.height(0);
-  } else {
-    // If it's collapsed, show it
-    nav.height('auto');
-  }
-}
diff --git a/examples/flow-router-advanced/main/client/layouts.js b/examples/flow-router-advanced/main/client/layouts.js
deleted file mode 100644
index f77746b83a..0000000000
--- a/examples/flow-router-advanced/main/client/layouts.js
+++ /dev/null
@@ -1,13 +0,0 @@
-Template.mainLayout.helpers({
-  notVerified: function () {
-    var user = Meteor.user()
-
-    return !emailVerified(user)
-  }
-})
-
-function emailVerified (user) {
-  return user.emails.some(function (email) {
-    return email.verified
-  })
-}
diff --git a/examples/flow-router-advanced/main/client/lib/app.js b/examples/flow-router-advanced/main/client/lib/app.js
deleted file mode 100644
index 1c5b7902f6..0000000000
--- a/examples/flow-router-advanced/main/client/lib/app.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// The application
-App = {}
-
-"use strict"
-
-Object.assign(App, {
-
-  // Separate routing package details from general app code.
-  navigateTo: function (path) {
-    // ...over-ridden in routing.js
-  },
-
-  signout: function () {
-    console.log('logging out...');
-    Meteor.logout(function () {
-      console.log('...done');
-      App.navigateTo('/');
-    });
-  },
-
-  displayName: function (user) {
-    var name;
-
-    if (!user) {
-      user = Meteor.user();
-    }
-
-    if (!user) return "<missing user>";
-
-    if (user.profile) {
-      name = user.profile.name;
-    }
-
-    if ('string' === typeof name) {
-      name = name.trim();
-    } else {
-      name = null;
-    }
-
-    if (!name && user.emails && user.emails.length > 0) {
-      name = user.emails[0].address;
-    }
-
-    return name || "<missing name>";
-  }
-
-})
diff --git a/examples/flow-router-advanced/main/client/lib/patches.js b/examples/flow-router-advanced/main/client/lib/patches.js
deleted file mode 100644
index 2a75faff6f..0000000000
--- a/examples/flow-router-advanced/main/client/lib/patches.js
+++ /dev/null
@@ -1,22 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Patches
-//
-
-// stubs for IE
-if (!window.console) {
-  window.console = {}
-}
-if (!window.console.log) {
-  window.console.log = function (msg) {
-    $('#log').append('<br /><p>' + msg + '</p>')
-  };
-}
-
-// fix bootstrap dropdown unclickable issue on iOS
-// https://github.com/twitter/bootstrap/issues/4550
-$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
-    e.stopPropagation();
-});
diff --git a/examples/flow-router-advanced/main/client/lib/polyfills.js b/examples/flow-router-advanced/main/client/lib/polyfills.js
deleted file mode 100644
index ca91978e06..0000000000
--- a/examples/flow-router-advanced/main/client/lib/polyfills.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-if(typeof String.prototype.trim !== 'function') {
-  String.prototype.trim = function() {
-    return this.replace(/^\s+|\s+$/g, ''); 
-  }
-}
diff --git a/examples/flow-router-advanced/main/client/main.html b/examples/flow-router-advanced/main/client/main.html
deleted file mode 100644
index 9018a14b58..0000000000
--- a/examples/flow-router-advanced/main/client/main.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<head>
-  <title>example-app</title>
-</head>
-
-<body>
-</body>
-
-
-<template name="loading">
-  <h1>Loading...</h1>
-</template>
-
-<template name="awaiting-verification">
-  <h1>Awaiting email verification...</h1>
-</template>
-
-<template name="invalid-access">
-  <h3>403 Forbidden - Invalid Access</h3>
-</template>
-
-<template name="start">
-  <div class="page row">
-    <div class="offset4 span8">
-
-      <p class="note">All logged-in users will see this page in their header nav.</p>
-
-      <h2>Start Page</h2>
-
-      {{> noteOfTheDay}}
-
-      <div>
-        <p>This application is an example app for the <a href="https://github.com/Meteor-Community-Packages/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
-      </div>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="securityNote">
-  <div class="security-note">
-    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
-    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
-    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
-    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
-    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
-    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
-  </div>
-</template>
diff --git a/examples/flow-router-advanced/main/client/mainLayout.html b/examples/flow-router-advanced/main/client/mainLayout.html
deleted file mode 100644
index 47b7d7a96f..0000000000
--- a/examples/flow-router-advanced/main/client/mainLayout.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<template name="mainLayout">
-  {{> header}}
-
-  {{#if currentUser}}
-    {{#if notVerified}}
-      {{> awaitingVerification}}
-    {{else}}
-      {{> Template.dynamic template=content}}
-    {{/if}}
-  {{else}}
-    {{#if loggingIn}}
-      {{> loading}}
-    {{else}}
-      {{> signin}}
-    {{/if}}
-  {{/if}}
-
-  <div id="log"></div>
-</template>
diff --git a/examples/flow-router-advanced/main/client/noteOfTheDay.html b/examples/flow-router-advanced/main/client/noteOfTheDay.html
deleted file mode 100644
index 3308580029..0000000000
--- a/examples/flow-router-advanced/main/client/noteOfTheDay.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="noteOfTheDay">
-  <p>Note of the day: {{note}}</p>
-</template>
diff --git a/examples/flow-router-advanced/main/client/noteOfTheDay.js b/examples/flow-router-advanced/main/client/noteOfTheDay.js
deleted file mode 100644
index 0279780cc2..0000000000
--- a/examples/flow-router-advanced/main/client/noteOfTheDay.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict"
-
-Template.noteOfTheDay.helpers({
-  note: function () {
-    return "Greetings " + App.displayName() + "!"
-  }
-})
diff --git a/examples/flow-router-advanced/main/client/publicLayout.html b/examples/flow-router-advanced/main/client/publicLayout.html
deleted file mode 100644
index 02b50a0da2..0000000000
--- a/examples/flow-router-advanced/main/client/publicLayout.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<template name="publicLayout">
-  {{> Template.dynamic template=content}}
-
-  <div id="log"></div>
-</template>
diff --git a/examples/flow-router-advanced/main/client/routing.js b/examples/flow-router-advanced/main/client/routing.js
deleted file mode 100644
index a21ca6ef50..0000000000
--- a/examples/flow-router-advanced/main/client/routing.js
+++ /dev/null
@@ -1,40 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Routing
-//
-
-// override with router-specific navigate method
-App.navigateTo = function (path) {
-  FlowRouter.go(path)
-}
-
-
-FlowRouter.notFound = {
-  action: function () {
-    BlazeLayout.render("publicLayout", {content: "t404"})
-  }
-}
-
-FlowRouter.route('/', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'start'})
-  }
-})
-
-FlowRouter.route('/start', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'start'})
-  }
-})
-
-FlowRouter.route('/signin', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'signin'})
-  }
-})
-
-FlowRouter.route('/signout', {
-    action: App.signout
-})
diff --git a/examples/flow-router-advanced/main/client/signin.html b/examples/flow-router-advanced/main/client/signin.html
deleted file mode 100644
index 35a2a46c69..0000000000
--- a/examples/flow-router-advanced/main/client/signin.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<template name="signin">
-  <div class="signin">
-    <div class="login-form">
-      <h1>Sign In</h1>
-      {{> loginButtons}}
-    </div>
-
-    <div class="example-users">
-      <p>Normal User: normal@example.com | apple1</p>
-      <p>View Secrets: view@example.com | apple1</p>
-      <p>Manage Users: manage@example.com | apple1</p>
-      <p>Admin User: admin@example.com | apple1</p>
-    </div>
-  </div>
-</template>
diff --git a/examples/flow-router-advanced/main/client/signin.js b/examples/flow-router-advanced/main/client/signin.js
deleted file mode 100644
index 3dbbf9baac..0000000000
--- a/examples/flow-router-advanced/main/client/signin.js
+++ /dev/null
@@ -1,11 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Signin
-//
-
-Template.signin.onRendered(function () {
-  // auto-trigger accounts-ui login form dropdown
-  Accounts._loginButtonsSession.set('dropdownVisible', true);
-})
diff --git a/examples/flow-router-advanced/main/client/style.css b/examples/flow-router-advanced/main/client/style.css
deleted file mode 100644
index a7674b04dd..0000000000
--- a/examples/flow-router-advanced/main/client/style.css
+++ /dev/null
@@ -1,67 +0,0 @@
-@media (min-width: 980px) {
-  /* wide devices - full navbar */ 
-
-  /* push down content under fixed navbar */
-  body {
-    padding-top:60px;
-    padding-bottom:40px;
-    }
-
-}
-
-
-/**
- * front-and-center signin form
- */
-.signin {
-  width:100%;
-  text-align:center;
-}
-.signin .login-form {
-  width:200px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-}
-.signin .login-form {
-}
-.signin .login-close-text {
-  display:none;
-}
-.signin #login-buttons {
-}
-.signin .additional-link-container {
-  display:none;
-}
-.signin .example-users {
-  width:350px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-  top:15em;
-  left:3em;
-}
-
-/**
- * header
- */
-#err .close {
-  float:none;
-  margin-left:1em;
-}
-
-/**
- * note of the day
- */
-.note {
-  margin:1em 0em;
-  padding:1em;
-  border:1px solid #ccc;
-}
-
-/**
- * security-note
- */
-.security-note {
-  margin-top:10em;
-}
diff --git a/examples/flow-router-advanced/main/client/t404.html b/examples/flow-router-advanced/main/client/t404.html
deleted file mode 100644
index e65e778fe7..0000000000
--- a/examples/flow-router-advanced/main/client/t404.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<template name="t404">
-  <div class="row">
-    <div class="offset4 span8">
-      <h3>404 - Not found</h3>
-
-      <p>The page you requested either could not be found or your account does not have permission to access it.</p>
-    </div>
-  </div>
-</template>
diff --git a/examples/flow-router-advanced/main/server/startup/fixtures.js b/examples/flow-router-advanced/main/server/startup/fixtures.js
deleted file mode 100644
index 5f78d21c1f..0000000000
--- a/examples/flow-router-advanced/main/server/startup/fixtures.js
+++ /dev/null
@@ -1,52 +0,0 @@
-"use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Startup Fixtures
-//
-
-Meteor.startup(function () {
-
-  createUsers()
-
-});
-
-
-function createUsers () {
-  var users
-
-  if (Meteor.users.find().fetch().length === 0) {
-
-    console.log('Creating users: ');
-
-    users = [
-      {name:"Normal User",email:"normal@example.com",roles:[]},
-      {name:"View-Secrets User",email:"view@example.com",roles:['secrets']},
-      {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
-      {name:"Admin User",email:"admin@example.com",roles:['admin']}
-    ];
-
-    users.forEach(function (userData) {
-      var id
-
-      console.log(userData);
-
-      id = Accounts.createUser({
-        email: userData.email,
-        password: "apple1",
-        profile: { name: userData.name }
-      });
-
-      // email verification
-      Meteor.users.update({_id: id},
-                          {$set:{'emails.0.verified': true}});
-
-      userData.roles.forEach(function (role) {
-        Roles.createRole(role, {unlessExists: true});
-      });
-
-      Roles.addUsersToRoles(id, userData.roles);
-
-    });
-  }
-}
diff --git a/examples/flow-router-advanced/main/server/startup/publish.js b/examples/flow-router-advanced/main/server/startup/publish.js
deleted file mode 100644
index 6fc34f067e..0000000000
--- a/examples/flow-router-advanced/main/server/startup/publish.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Publish all role-assignments
-Meteor.publish(null, function () {
-  if (this.userId) {
-    return Meteor.roleAssignment.find({ 'user._id': this.userId });
-  } else {
-    this.ready();
-  }
-});
diff --git a/examples/flow-router-advanced/main/server/startup/validateNewUser.js b/examples/flow-router-advanced/main/server/startup/validateNewUser.js
deleted file mode 100644
index 0d72321a6a..0000000000
--- a/examples/flow-router-advanced/main/server/startup/validateNewUser.js
+++ /dev/null
@@ -1,17 +0,0 @@
-"use strict"
-
-////////////////////////////////////////////////////////////////////
-// Prevent non-authorized users from creating new users
-//
-
-Meteor.startup(function () {
-
-  Accounts.validateNewUser(function (user) {
-    if (Roles.userIsInRole(Meteor.userId(), ['admin','manage-users'])) {
-      return true;
-    }
-
-    throw new Meteor.Error('unauthorized', "Not authorized to create new users");
-  });
-
-})
diff --git a/examples/flow-router-advanced/manageUsers/client/manage-users.html b/examples/flow-router-advanced/manageUsers/client/manage-users.html
deleted file mode 100644
index 000175204e..0000000000
--- a/examples/flow-router-advanced/manageUsers/client/manage-users.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<template name="manageUsers">
-  <div class="manage-users row">
-    <div class="offset4 span8">
-
-      <p class="note">
-        Only Admins and those with the 'manage-users' role
-        will see this page in their nav menu.
-      </p>
-
-      <h2>Manage Users</h2>
-
-      <br />
-
-      <h3>Current Users</h3>
-
-      {{#if Template.subscriptionsReady}}
-        <!-- This is displayed when all data is ready. -->
-        {{> userList}}
-      {{else}}
-        Loading...
-      {{/if}}
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="userList">
-  <ul>
-    {{#each users}}
-    <li>{{email}} - Roles: {{roles}}</li>
-    {{/each}}
-  </ul>
-</template>
diff --git a/examples/flow-router-advanced/manageUsers/client/manage-users.js b/examples/flow-router-advanced/manageUsers/client/manage-users.js
deleted file mode 100644
index d846154d13..0000000000
--- a/examples/flow-router-advanced/manageUsers/client/manage-users.js
+++ /dev/null
@@ -1,21 +0,0 @@
-Template.manageUsers.onCreated(function () {
-  this.subscribe("users")
-})
-
-Template.userList.helpers({
-  users: function () {
-    return Meteor.users.find()
-  },
-  email: function () {
-    return this.emails[0].address
-  },
-  roles: function () {
-    var roles = Roles.getRolesForUser(this)
-
-    if (!roles.length) {
-      return '<none>'
-    }
-
-    return roles.join(',')
-  }
-})
diff --git a/examples/flow-router-advanced/manageUsers/client/manageController.html b/examples/flow-router-advanced/manageUsers/client/manageController.html
deleted file mode 100644
index 48b515e9ac..0000000000
--- a/examples/flow-router-advanced/manageUsers/client/manageController.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="manageController">
-  {{> Template.dynamic template=target}}
-</template>
diff --git a/examples/flow-router-advanced/manageUsers/client/manageController.js b/examples/flow-router-advanced/manageUsers/client/manageController.js
deleted file mode 100644
index 8ed0c762ff..0000000000
--- a/examples/flow-router-advanced/manageUsers/client/manageController.js
+++ /dev/null
@@ -1,16 +0,0 @@
-"use strict"
-
-//////////////////////////////////////////////////////////////////////
-// manageController
-//
-Template.manageController.helpers({
-  target: function () {
-    var loggedInUserId = Meteor.userId()
-
-    if (!Roles.userIsInRole(loggedInUserId, ['manage-users', 'admin'])) {
-      return 't404'
-    } else {
-      return this.targetTemplate
-    }
-  }
-})
diff --git a/examples/flow-router-advanced/manageUsers/client/routing.js b/examples/flow-router-advanced/manageUsers/client/routing.js
deleted file mode 100644
index 469c1943ba..0000000000
--- a/examples/flow-router-advanced/manageUsers/client/routing.js
+++ /dev/null
@@ -1,15 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Routing for Manage Users
-//
-// Authentication is handled in mainLayout.
-// Authorization is handled in manageController and can be reused for any route.
-//
-FlowRouter.route('/manageUsers', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'manageController',
-                                      targetTemplate: 'manageUsers'})
-  }
-})
diff --git a/examples/flow-router-advanced/manageUsers/server/manageUsers.js b/examples/flow-router-advanced/manageUsers/server/manageUsers.js
deleted file mode 100644
index 51eb067d36..0000000000
--- a/examples/flow-router-advanced/manageUsers/server/manageUsers.js
+++ /dev/null
@@ -1,22 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Publish
-//
-
-
-// Authorized users can manage user accounts
-Meteor.publish("users", function () {
-
-  if (Roles.userIsInRole(this.userId, ["admin","manage-users"])) {
-    console.log('publishing users', this.userId)
-    return [
-      Meteor.roleAssignment.find({}),
-      Meteor.users.find({}, {fields: {emails: 1, profile: 1}})
-    ];
-  } 
-
-  this.stop()
-  return
-})
diff --git a/examples/flow-router-advanced/package-lock.json b/examples/flow-router-advanced/package-lock.json
deleted file mode 100644
index 4a9996270f..0000000000
--- a/examples/flow-router-advanced/package-lock.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "flow-router-advanced",
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz",
-      "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==",
-      "requires": {
-        "regenerator-runtime": "^0.13.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
-    }
-  }
-}
diff --git a/examples/flow-router-advanced/package.json b/examples/flow-router-advanced/package.json
deleted file mode 100644
index 5ac4ef54a8..0000000000
--- a/examples/flow-router-advanced/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "flow-router-advanced",
-  "dependencies": {
-    "@babel/runtime": "^7.7.2"
-  }
-}
diff --git a/examples/flow-router-advanced/packages/alanning:roles b/examples/flow-router-advanced/packages/alanning:roles
deleted file mode 120000
index a8a4f8c212..0000000000
--- a/examples/flow-router-advanced/packages/alanning:roles
+++ /dev/null
@@ -1 +0,0 @@
-../../..
\ No newline at end of file
diff --git a/examples/flow-router-advanced/secrets/client/routing.js b/examples/flow-router-advanced/secrets/client/routing.js
deleted file mode 100644
index c477404bac..0000000000
--- a/examples/flow-router-advanced/secrets/client/routing.js
+++ /dev/null
@@ -1,14 +0,0 @@
-"use strict"
-
-////////////////////////////////////////////////////////////////////
-// Routing for Secrets
-//
-// Authentication is handled in mainLayout.
-// Authorization is handled in secretsController and can be reused for any route.
-//
-FlowRouter.route('/secrets', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'secretsController',
-                                      targetTemplate: 'secrets'})
-  }
-})
diff --git a/examples/flow-router-advanced/secrets/client/secrets.html b/examples/flow-router-advanced/secrets/client/secrets.html
deleted file mode 100644
index c7c1ddcc6d..0000000000
--- a/examples/flow-router-advanced/secrets/client/secrets.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<template name="secrets">
-  <div class="secrets row">
-    <div class="offset4 span8">
-
-      <p class="note">
-        Only Admins and those with the 'secrets'
-        role will see this page in their header nav.
-      </p>
-
-      <h2>Secrets!</h2>
-
-      {{#if Template.subscriptionsReady}}
-        <!-- This is displayed when all data is ready. -->
-        {{> secretList}}
-      {{else}}
-        Loading...
-      {{/if}}
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="secretList">
-  <ul>
-  {{#each secrets}}
-    <li><p>{{secret}}</p></li>
-  {{/each}}
-  </ul>
-</template>
diff --git a/examples/flow-router-advanced/secrets/client/secrets.js b/examples/flow-router-advanced/secrets/client/secrets.js
deleted file mode 100644
index dc1da2c604..0000000000
--- a/examples/flow-router-advanced/secrets/client/secrets.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Template.secrets.onCreated(function () {
-  this.subscribe("secrets")
-})
-
-Template.secretList.helpers({
-  secrets: function () {
-    return Meteor.secrets.find()
-  }
-})
diff --git a/examples/flow-router-advanced/secrets/client/secretsController.html b/examples/flow-router-advanced/secrets/client/secretsController.html
deleted file mode 100644
index 5d4c772352..0000000000
--- a/examples/flow-router-advanced/secrets/client/secretsController.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="secretsController">
-  {{> Template.dynamic template=target}}
-</template>
diff --git a/examples/flow-router-advanced/secrets/client/secretsController.js b/examples/flow-router-advanced/secrets/client/secretsController.js
deleted file mode 100644
index 4d88ca4995..0000000000
--- a/examples/flow-router-advanced/secrets/client/secretsController.js
+++ /dev/null
@@ -1,16 +0,0 @@
-"use strict"
-
-//////////////////////////////////////////////////////////////////////
-// secretsController
-//
-Template.secretsController.helpers({
-  target: function () {
-    var loggedInUserId = Meteor.userId()
-
-    if (!Roles.userIsInRole(loggedInUserId, ['secrets', 'admin'])) {
-      return 't404'
-    } else {
-      return this.targetTemplate
-    }
-  }
-})
diff --git a/examples/flow-router-advanced/secrets/model.js b/examples/flow-router-advanced/secrets/model.js
deleted file mode 100644
index 78f205d2f8..0000000000
--- a/examples/flow-router-advanced/secrets/model.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-// run on both the server and the client
-
-Meteor.secrets = new Meteor.Collection('secrets');
diff --git a/examples/flow-router-advanced/secrets/server/fixtures.js b/examples/flow-router-advanced/secrets/server/fixtures.js
deleted file mode 100644
index 47f163b2f3..0000000000
--- a/examples/flow-router-advanced/secrets/server/fixtures.js
+++ /dev/null
@@ -1,32 +0,0 @@
-"use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Startup Fixtures for Secrets
-//
-
-Meteor.startup(function () {
-
-  createSecrets()
-
-});
-
-
-function createSecrets () {
-  var secrets
-
-  if (Meteor.secrets.find().fetch().length === 0) {
-    console.log('Creating secrets: ');
-
-    secrets = [
-      {secret:"ec2 password: apple2"},
-      {secret:"domain registration pw: apple3"}
-    ]
-
-    secrets.forEach(function (secret) {
-      console.log(secret)
-
-      Meteor.secrets.insert(secret);
-    })
-  }
-}
diff --git a/examples/flow-router-advanced/secrets/server/secrets.js b/examples/flow-router-advanced/secrets/server/secrets.js
deleted file mode 100644
index e68728321e..0000000000
--- a/examples/flow-router-advanced/secrets/server/secrets.js
+++ /dev/null
@@ -1,19 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Publish
-//
-
-
-// Authorized users can view secrets
-Meteor.publish("secrets", function () {
-
-  if (Roles.userIsInRole(this.userId, ["admin","secrets"])) {
-    console.log('publishing secrets', this.userId)
-    return Meteor.secrets.find()
-  }
-
-  this.stop()
-  return
-})
diff --git a/examples/flow-router/.meteor/.finished-upgraders b/examples/flow-router/.meteor/.finished-upgraders
deleted file mode 100644
index 61ee313230..0000000000
--- a/examples/flow-router/.meteor/.finished-upgraders
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file contains information which helps Meteor properly upgrade your
-# app when you run 'meteor update'. You should check it into version control
-# with your project.
-
-notices-for-0.9.0
-notices-for-0.9.1
-0.9.4-platform-file
-notices-for-facebook-graph-api-2
-1.2.0-standard-minifiers-package
-1.2.0-meteor-platform-split
-1.2.0-cordova-changes
-1.2.0-breaking-changes
diff --git a/examples/flow-router/.meteor/.gitignore b/examples/flow-router/.meteor/.gitignore
deleted file mode 100644
index 08150d000c..0000000000
--- a/examples/flow-router/.meteor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-local
-meteorite
diff --git a/examples/flow-router/.meteor/.id b/examples/flow-router/.meteor/.id
deleted file mode 100644
index acd117ac05..0000000000
--- a/examples/flow-router/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-12nu3d71gkxofl123c8jf
diff --git a/examples/flow-router/.meteor/packages b/examples/flow-router/.meteor/packages
deleted file mode 100644
index 1b853507f0..0000000000
--- a/examples/flow-router/.meteor/packages
+++ /dev/null
@@ -1,27 +0,0 @@
-# Meteor packages used by this project, one per line.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-accounts-password
-accounts-ui
-bootstrap
-spiderable
-alanning:roles
-kadira:flow-router
-kadira:blaze-layout
-alanning:trace
-standard-minifiers
-meteor-base
-mobile-experience
-mongo
-blaze-html-templates
-session
-jquery
-tracker
-logging
-reload
-random
-ejson
-spacebars
-check
diff --git a/examples/flow-router/.meteor/platforms b/examples/flow-router/.meteor/platforms
deleted file mode 100644
index 8a3a35f9f6..0000000000
--- a/examples/flow-router/.meteor/platforms
+++ /dev/null
@@ -1,2 +0,0 @@
-browser
-server
diff --git a/examples/flow-router/.meteor/release b/examples/flow-router/.meteor/release
deleted file mode 100644
index 97064e1993..0000000000
--- a/examples/flow-router/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-METEOR@1.8.1
diff --git a/examples/flow-router/.meteor/versions b/examples/flow-router/.meteor/versions
deleted file mode 100644
index df592bd5d9..0000000000
--- a/examples/flow-router/.meteor/versions
+++ /dev/null
@@ -1,97 +0,0 @@
-accounts-base@1.4.3
-accounts-password@1.5.1
-accounts-ui@1.3.1
-accounts-ui-unstyled@1.4.2
-alanning:roles@3.0.0
-alanning:trace@0.0.2
-allow-deny@1.1.0
-autoupdate@1.6.0
-babel-compiler@7.3.4
-babel-runtime@1.3.0
-base64@1.0.11
-binary-heap@1.0.11
-blaze@2.3.3
-blaze-html-templates@1.0.1
-blaze-tools@1.0.10
-boilerplate-generator@1.6.0
-bootstrap@1.0.1
-caching-compiler@1.2.1
-caching-html-compiler@1.0.6
-callback-hook@1.1.0
-check@1.3.1
-coffeescript@1.0.11
-cosmos:browserify@0.9.3
-ddp@1.4.0
-ddp-client@2.3.3
-ddp-common@1.4.0
-ddp-rate-limiter@1.0.7
-ddp-server@2.3.0
-deps@1.0.12
-diff-sequence@1.1.1
-dynamic-import@0.5.1
-ecmascript@0.12.4
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.8.0
-ecmascript-runtime-server@0.7.1
-ejson@1.1.0
-email@1.2.3
-es5-shim@4.8.0
-fetch@0.1.1
-geojson-utils@1.0.10
-hot-code-push@1.0.4
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.1.0
-inter-process-messaging@0.1.0
-jquery@1.11.9
-kadira:blaze-layout@2.3.0
-kadira:flow-router@2.10.0
-launch-screen@1.1.1
-less@2.8.0
-livedata@1.0.18
-localstorage@1.2.0
-logging@1.1.20
-meteor@1.9.3
-meteor-base@1.4.0
-minifier-css@1.4.2
-minifier-js@2.4.1
-minimongo@1.4.5
-mobile-experience@1.0.5
-mobile-status-bar@1.0.14
-modern-browsers@0.1.4
-modules@0.13.0
-modules-runtime@0.10.3
-mongo@1.6.2
-mongo-decimal@0.1.1
-mongo-dev-server@1.1.0
-mongo-id@1.0.7
-npm-bcrypt@0.9.3
-npm-mongo@3.1.2
-observe-sequence@1.0.16
-ordered-dict@1.1.0
-promise@0.11.2
-random@1.1.0
-rate-limit@1.0.9
-reactive-dict@1.3.0
-reactive-var@1.0.11
-reload@1.3.0
-retry@1.1.0
-routepolicy@1.1.0
-service-configuration@1.0.11
-session@1.2.0
-sha@1.0.9
-socket-stream-client@0.2.2
-spacebars@1.0.12
-spacebars-compiler@1.1.1
-spiderable@1.0.9
-srp@1.0.12
-standard-minifier-css@1.5.3
-standard-minifier-js@2.4.1
-standard-minifiers@1.1.0
-templating@1.2.14
-templating-tools@1.1.1
-tracker@1.2.0
-ui@1.0.8
-underscore@1.0.10
-webapp@1.7.3
-webapp-hashing@1.0.9
diff --git a/examples/flow-router/client/client.js b/examples/flow-router/client/client.js
deleted file mode 100644
index 9a4bed80f4..0000000000
--- a/examples/flow-router/client/client.js
+++ /dev/null
@@ -1,124 +0,0 @@
-"use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Routing stub
-//
-// Separate routing package details from general app code.
-Meteor.navigateTo = function (path) {
-  // ...over-ridden in routing.js
-};
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// App.signout
-//
-App.signout = function () {
-  console.log('logging out...');
-  Meteor.logout(function () {
-    console.log('...done');
-    Meteor.navigateTo('/');
-  });
-};
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Patches
-//
-
-// stubs for IE
-if (!window.console) {
-  window.console = {}
-}
-if (!window.console.log) {
-  window.console.log = function (msg) {
-    $('#log').append('<br /><p>' + msg + '</p>')
-  };
-}
-
-// fix bootstrap dropdown unclickable issue on iOS
-// https://github.com/twitter/bootstrap/issues/4550
-$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
-    e.stopPropagation();
-});
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Templates
-//
-
-Template.signin.rendered = function () {
-  // auto-trigger accounts-ui login form dropdown
-  Accounts._loginButtonsSession.set('dropdownVisible', true);
-};
-
-Template.header.events({
-  // template data, if any, is available in 'this'
-  'click .btn-navbar' : openCloseNav
-});
-Template.header.helpers({
-  displayName: function () {
-    return displayName();
-  }
-});
-
-Template.noteOfTheDay.helpers({
-  note: function () {
-    return "Greetings " + displayName() + "!";
-  }
-});
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Misc helper functions
-//
-
-function displayName (user) {
-  var name;
-
-  if (!user) {
-    user = Meteor.user();
-  }
-
-  if (!user) return "<missing user>";
-
-  if (user.profile) {
-    name = user.profile.name;
-  }
-
-  if ('string' === typeof name) {
-    name = name.trim();
-  } else {
-    name = null;
-  }
-
-  if (!name && user.emails && user.emails.length > 0) {
-    name = user.emails[0].address;
-  }
-
-  return name || "<missing name>";
-}
-
-
-// insta-open/close nav rather than animate collapse.
-// this improves UX on mobile devices
-function openCloseNav (e) {
-  // Select .nav-collapse within same .navbar as current button
-  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
-
-  if (nav.height() != 0) {
-    // If it has a height, hide it
-    nav.height(0);
-  } else {
-    // If it's collapsed, show it
-    nav.height('auto');
-  }
-}
diff --git a/examples/flow-router/client/example.css b/examples/flow-router/client/example.css
deleted file mode 100644
index a7674b04dd..0000000000
--- a/examples/flow-router/client/example.css
+++ /dev/null
@@ -1,67 +0,0 @@
-@media (min-width: 980px) {
-  /* wide devices - full navbar */ 
-
-  /* push down content under fixed navbar */
-  body {
-    padding-top:60px;
-    padding-bottom:40px;
-    }
-
-}
-
-
-/**
- * front-and-center signin form
- */
-.signin {
-  width:100%;
-  text-align:center;
-}
-.signin .login-form {
-  width:200px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-}
-.signin .login-form {
-}
-.signin .login-close-text {
-  display:none;
-}
-.signin #login-buttons {
-}
-.signin .additional-link-container {
-  display:none;
-}
-.signin .example-users {
-  width:350px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-  top:15em;
-  left:3em;
-}
-
-/**
- * header
- */
-#err .close {
-  float:none;
-  margin-left:1em;
-}
-
-/**
- * note of the day
- */
-.note {
-  margin:1em 0em;
-  padding:1em;
-  border:1px solid #ccc;
-}
-
-/**
- * security-note
- */
-.security-note {
-  margin-top:10em;
-}
diff --git a/examples/flow-router/client/example.html b/examples/flow-router/client/example.html
deleted file mode 100644
index 41c4a741e8..0000000000
--- a/examples/flow-router/client/example.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<head>
-  <title>example-app</title>
-</head>
-
-<body>
-</body>
-
-<template name="signin">
-  <div class="signin">
-    <div class="login-form">
-      <h1>Sign In</h1>
-      {{> loginButtons}}
-    </div>
-
-    <div class="example-users">
-      <p>Normal User: normal@example.com | apple1</p>
-      <p>View Secrets: view@example.com | apple1</p>
-      <p>Manage Users: manage@example.com | apple1</p>
-      <p>Admin User: admin@example.com | apple1</p>
-    </div>
-  </div>
-</template>
-
-<template name="loading">
-  <h1>Loading...</h1>
-</template>
-
-<template name="awaiting-verification">
-  <h1>Awaiting email verification...</h1>
-</template>
-
-<template name="not_found">
-  <h3>404 - Not found</h3>
-</template>
-
-<template name="invalid-access">
-  <h3>403 Forbidden - Invalid Access</h3>
-</template>
-
-<template name="header">
-  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </a>
-        <a class="brand" href="/">Roles Example App</a>
-
-        {{#if currentUser}}
-        <div class="nav-collapse collapse">
-          <ul class="nav">
-
-            <li><a href="/start">Start Page</a></li>
-
-            {{#if isInRole 'admin,view-secrets'}}
-            <li><a href="/secrets">Secrets</a></li>
-            {{/if}}
-
-            <li class="dropdown pull-right">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                {{#if isInRole 'admin,manage-users'}}
-                <li><a href="/manageUsers">Manage Users</a></li>
-                {{/if}}
-                <li><a class="signout" href="/signout">Sign out</a></li>
-              </ul>
-            </li>
-
-          </ul>
-        </div>
-        {{/if}}
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<template name="noteOfTheDay">
-<p>Note of the day: {{note}}</p>
-</template>
-
-<template name="start">
-  <div class="page row">
-    <div class="offset4 span8">
-
-      <p class="note">All logged-in users will see this page in their header nav.</p>
-
-      <h2>Start Page</h2>
-
-      {{> noteOfTheDay}}
-
-      <div>
-        <p>This application is an example app for the <a href="https://github.com/Meteor-Community-Packages/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
-      </div>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="securityNote">
-  <div class="security-note">
-    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
-    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
-    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
-    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
-    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
-    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
-  </div>
-</template>
diff --git a/examples/flow-router/client/layouts.html b/examples/flow-router/client/layouts.html
deleted file mode 100644
index ed583e9877..0000000000
--- a/examples/flow-router/client/layouts.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<template name="mainLayout">
-  {{> header}}
-
-  {{#if currentUser}}
-    {{#if notVerified}}
-      {{> awaitingVerification}}
-    {{else}}
-      {{> Template.dynamic template=content}}
-    {{/if}}
-  {{else}}
-    {{#if loggingIn}}
-      {{> loading}}
-    {{else}}
-      {{> signin}}
-    {{/if}}
-  {{/if}}
-
-  <div id="log"></div>
-</template>
-
-<template name="noHeaderLayout">
-  {{> Template.dynamic template=content}}
-
-  <div id="log"></div>
-</template>
diff --git a/examples/flow-router/client/layouts.js b/examples/flow-router/client/layouts.js
deleted file mode 100644
index f77746b83a..0000000000
--- a/examples/flow-router/client/layouts.js
+++ /dev/null
@@ -1,13 +0,0 @@
-Template.mainLayout.helpers({
-  notVerified: function () {
-    var user = Meteor.user()
-
-    return !emailVerified(user)
-  }
-})
-
-function emailVerified (user) {
-  return user.emails.some(function (email) {
-    return email.verified
-  })
-}
diff --git a/examples/flow-router/client/lib/globals.js b/examples/flow-router/client/lib/globals.js
deleted file mode 100644
index 443d048ba8..0000000000
--- a/examples/flow-router/client/lib/globals.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// The application
-App = {};
diff --git a/examples/flow-router/client/manage-users.html b/examples/flow-router/client/manage-users.html
deleted file mode 100644
index 000175204e..0000000000
--- a/examples/flow-router/client/manage-users.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<template name="manageUsers">
-  <div class="manage-users row">
-    <div class="offset4 span8">
-
-      <p class="note">
-        Only Admins and those with the 'manage-users' role
-        will see this page in their nav menu.
-      </p>
-
-      <h2>Manage Users</h2>
-
-      <br />
-
-      <h3>Current Users</h3>
-
-      {{#if Template.subscriptionsReady}}
-        <!-- This is displayed when all data is ready. -->
-        {{> userList}}
-      {{else}}
-        Loading...
-      {{/if}}
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="userList">
-  <ul>
-    {{#each users}}
-    <li>{{email}} - Roles: {{roles}}</li>
-    {{/each}}
-  </ul>
-</template>
diff --git a/examples/flow-router/client/manage-users.js b/examples/flow-router/client/manage-users.js
deleted file mode 100644
index d846154d13..0000000000
--- a/examples/flow-router/client/manage-users.js
+++ /dev/null
@@ -1,21 +0,0 @@
-Template.manageUsers.onCreated(function () {
-  this.subscribe("users")
-})
-
-Template.userList.helpers({
-  users: function () {
-    return Meteor.users.find()
-  },
-  email: function () {
-    return this.emails[0].address
-  },
-  roles: function () {
-    var roles = Roles.getRolesForUser(this)
-
-    if (!roles.length) {
-      return '<none>'
-    }
-
-    return roles.join(',')
-  }
-})
diff --git a/examples/flow-router/client/routing.js b/examples/flow-router/client/routing.js
deleted file mode 100644
index 500b3b33c6..0000000000
--- a/examples/flow-router/client/routing.js
+++ /dev/null
@@ -1,52 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Routing
-//
-
-// override with mini-pages navigate method
-Meteor.navigateTo = function (path) {
-  FlowRouter.go(path)
-}
-
-
-FlowRouter.notFound = {
-  action: function () {
-    BlazeLayout.render("noHeaderLayout", {content: "not_found"})
-  }
-}
-
-FlowRouter.route('/', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'start'})
-  }
-})
-
-FlowRouter.route('/start', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'start'})
-  }
-})
-
-FlowRouter.route('/signin', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'signin'})
-  }
-})
-
-FlowRouter.route('/secrets', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'secrets'})
-  }
-})
-
-FlowRouter.route('/manageUsers', {
-  action: function () {
-    BlazeLayout.render('mainLayout', {content: 'manageUsers'})
-  }
-})
-
-FlowRouter.route('/signout', {
-    action: App.signout
-})
diff --git a/examples/flow-router/client/secrets.html b/examples/flow-router/client/secrets.html
deleted file mode 100644
index fb0c65feba..0000000000
--- a/examples/flow-router/client/secrets.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<template name="secrets">
-  <div class="secrets row">
-    <div class="offset4 span8">
-
-      <p class="note">
-        Only Admins and those with the 'view-secrets'
-        role will see this page in their header nav.
-      </p>
-
-      <h2>Secrets!</h2>
-
-      {{#if Template.subscriptionsReady}}
-        <!-- This is displayed when all data is ready. -->
-        {{> secretList}}
-      {{else}}
-        Loading...
-      {{/if}}
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="secretList">
-  <ul>
-  {{#each secrets}}
-    <li><p>{{secret}}</p></li>
-  {{/each}}
-  </ul>
-</template>
diff --git a/examples/flow-router/client/secrets.js b/examples/flow-router/client/secrets.js
deleted file mode 100644
index dc1da2c604..0000000000
--- a/examples/flow-router/client/secrets.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Template.secrets.onCreated(function () {
-  this.subscribe("secrets")
-})
-
-Template.secretList.helpers({
-  secrets: function () {
-    return Meteor.secrets.find()
-  }
-})
diff --git a/examples/flow-router/model.js b/examples/flow-router/model.js
deleted file mode 100644
index be8a6c57f7..0000000000
--- a/examples/flow-router/model.js
+++ /dev/null
@@ -1,9 +0,0 @@
-;(function () {
-
-  "use strict";
-
-// run on both the server and the client
-
-Meteor.secrets = new Meteor.Collection('secrets');
-
-}());
diff --git a/examples/flow-router/package-lock.json b/examples/flow-router/package-lock.json
deleted file mode 100644
index b6bcd6bbab..0000000000
--- a/examples/flow-router/package-lock.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "flow-router",
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz",
-      "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==",
-      "requires": {
-        "regenerator-runtime": "^0.13.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
-    }
-  }
-}
diff --git a/examples/flow-router/package.json b/examples/flow-router/package.json
deleted file mode 100644
index d79c6aa859..0000000000
--- a/examples/flow-router/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "flow-router",
-  "dependencies": {
-    "@babel/runtime": "^7.7.2"
-  }
-}
diff --git a/examples/flow-router/packages/alanning:roles b/examples/flow-router/packages/alanning:roles
deleted file mode 120000
index a8a4f8c212..0000000000
--- a/examples/flow-router/packages/alanning:roles
+++ /dev/null
@@ -1 +0,0 @@
-../../..
\ No newline at end of file
diff --git a/examples/flow-router/server/server.js b/examples/flow-router/server/server.js
deleted file mode 100644
index 7ad399f4cc..0000000000
--- a/examples/flow-router/server/server.js
+++ /dev/null
@@ -1,122 +0,0 @@
-;(function () {
-
-  "use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Startup
-//
-
-Meteor.startup(function () {
-
-  ////////////////////////////////////////////////////////////////////
-  // Create Test Secrets
-  //
-
-  if (Meteor.secrets.find().fetch().length === 0) {
-    Meteor.secrets.insert({secret:"ec2 password: apple2"});
-    Meteor.secrets.insert({secret:"domain registration pw: apple3"});
-  }
-
-
-  ////////////////////////////////////////////////////////////////////
-  // Create Test Users
-  //
-
-  if (Meteor.users.find().fetch().length === 0) {
-
-    console.log('Creating users: ');
-
-    var users = [
-        {name:"Normal User",email:"normal@example.com",roles:[]},
-        {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
-        {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
-        {name:"Admin User",email:"admin@example.com",roles:['admin']}
-      ];
-
-    users.forEach(function (userData) {
-      var id,
-          user;
-
-      console.log(userData);
-
-      id = Accounts.createUser({
-        email: userData.email,
-        password: "apple1",
-        profile: { name: userData.name }
-      });
-
-      // email verification
-      Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
-
-      userData.roles.forEach(function (role) {
-        Roles.createRole(role, {unlessExists: true});
-      });
-
-      Roles.addUsersToRoles(id, userData.roles);
-
-    });
-  }
-
-
-
-  ////////////////////////////////////////////////////////////////////
-  // Prevent non-authorized users from creating new users
-  //
-
-  Accounts.validateNewUser(function (user) {
-    var loggedInUser = Meteor.user();
-
-    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
-      return true;
-    }
-
-    throw new Meteor.Error('unauthorized', "Not authorized to create new users");
-  });
-
-});
-
-
-////////////////////////////////////////////////////////////////////
-// Publish
-//
-
-// Publish all role-assignments
-Meteor.publish(null, function () {
-  if (this.userId) {
-    return Meteor.roleAssignment.find({ 'user._id': this.userId });
-  } else {
-    this.ready();
-  }
-});
-
-// Authorized users can view secrets
-Meteor.publish("secrets", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
-    console.log('publishing secrets', this.userId);
-    return Meteor.secrets.find();
-  }
-
-  this.stop();
-  return;
-});
-
-// Authorized users can manage user accounts
-Meteor.publish("users", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","manage-users"])) {
-    console.log('publishing users', this.userId);
-    return [
-      Meteor.roleAssignment.find({}),
-      Meteor.users.find({}, {fields: {emails: 1, profile: 1}})
-    ];
-  }
-
-  this.stop();
-  return;
-});
-
-}());
diff --git a/examples/iron-router/.meteor/.finished-upgraders b/examples/iron-router/.meteor/.finished-upgraders
deleted file mode 100644
index 61ee313230..0000000000
--- a/examples/iron-router/.meteor/.finished-upgraders
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file contains information which helps Meteor properly upgrade your
-# app when you run 'meteor update'. You should check it into version control
-# with your project.
-
-notices-for-0.9.0
-notices-for-0.9.1
-0.9.4-platform-file
-notices-for-facebook-graph-api-2
-1.2.0-standard-minifiers-package
-1.2.0-meteor-platform-split
-1.2.0-cordova-changes
-1.2.0-breaking-changes
diff --git a/examples/iron-router/.meteor/.gitignore b/examples/iron-router/.meteor/.gitignore
deleted file mode 100644
index 08150d000c..0000000000
--- a/examples/iron-router/.meteor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-local
-meteorite
diff --git a/examples/iron-router/.meteor/.id b/examples/iron-router/.meteor/.id
deleted file mode 100644
index acd117ac05..0000000000
--- a/examples/iron-router/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-12nu3d71gkxofl123c8jf
diff --git a/examples/iron-router/.meteor/packages b/examples/iron-router/.meteor/packages
deleted file mode 100644
index eb9a78626a..0000000000
--- a/examples/iron-router/.meteor/packages
+++ /dev/null
@@ -1,26 +0,0 @@
-# Meteor packages used by this project, one per line.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-accounts-password
-accounts-ui
-bootstrap
-spiderable
-alanning:roles
-iron:router
-alanning:trace
-standard-minifiers
-meteor-base
-mobile-experience
-mongo
-blaze-html-templates
-session
-jquery
-tracker
-logging
-reload
-random
-ejson
-spacebars
-check
diff --git a/examples/iron-router/.meteor/platforms b/examples/iron-router/.meteor/platforms
deleted file mode 100644
index 8a3a35f9f6..0000000000
--- a/examples/iron-router/.meteor/platforms
+++ /dev/null
@@ -1,2 +0,0 @@
-browser
-server
diff --git a/examples/iron-router/.meteor/release b/examples/iron-router/.meteor/release
deleted file mode 100644
index 97064e1993..0000000000
--- a/examples/iron-router/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-METEOR@1.8.1
diff --git a/examples/iron-router/.meteor/versions b/examples/iron-router/.meteor/versions
deleted file mode 100644
index 2cfb894bb5..0000000000
--- a/examples/iron-router/.meteor/versions
+++ /dev/null
@@ -1,101 +0,0 @@
-accounts-base@1.4.3
-accounts-password@1.5.1
-accounts-ui@1.3.1
-accounts-ui-unstyled@1.4.2
-alanning:roles@3.0.0
-alanning:trace@0.0.2
-allow-deny@1.1.0
-autoupdate@1.6.0
-babel-compiler@7.3.4
-babel-runtime@1.3.0
-base64@1.0.11
-binary-heap@1.0.11
-blaze@2.3.3
-blaze-html-templates@1.0.1
-blaze-tools@1.0.10
-boilerplate-generator@1.6.0
-bootstrap@1.0.1
-caching-compiler@1.2.1
-caching-html-compiler@1.0.6
-callback-hook@1.1.0
-check@1.3.1
-ddp@1.4.0
-ddp-client@2.3.3
-ddp-common@1.4.0
-ddp-rate-limiter@1.0.7
-ddp-server@2.3.0
-deps@1.0.12
-diff-sequence@1.1.1
-dynamic-import@0.5.1
-ecmascript@0.12.4
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.8.0
-ecmascript-runtime-server@0.7.1
-ejson@1.1.0
-email@1.2.3
-es5-shim@4.8.0
-fetch@0.1.1
-geojson-utils@1.0.10
-hot-code-push@1.0.4
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.1.0
-inter-process-messaging@0.1.0
-iron:controller@1.0.12
-iron:core@1.0.11
-iron:dynamic-template@1.0.12
-iron:layout@1.0.12
-iron:location@1.0.11
-iron:middleware-stack@1.0.11
-iron:router@1.0.12
-iron:url@1.0.11
-jquery@1.11.9
-launch-screen@1.1.1
-less@2.8.0
-livedata@1.0.18
-localstorage@1.2.0
-logging@1.1.20
-meteor@1.9.3
-meteor-base@1.4.0
-minifier-css@1.4.2
-minifier-js@2.4.1
-minimongo@1.4.5
-mobile-experience@1.0.5
-mobile-status-bar@1.0.14
-modern-browsers@0.1.4
-modules@0.13.0
-modules-runtime@0.10.3
-mongo@1.6.2
-mongo-decimal@0.1.1
-mongo-dev-server@1.1.0
-mongo-id@1.0.7
-npm-bcrypt@0.9.3
-npm-mongo@3.1.2
-observe-sequence@1.0.16
-ordered-dict@1.1.0
-promise@0.11.2
-random@1.1.0
-rate-limit@1.0.9
-reactive-dict@1.3.0
-reactive-var@1.0.11
-reload@1.3.0
-retry@1.1.0
-routepolicy@1.1.0
-service-configuration@1.0.11
-session@1.2.0
-sha@1.0.9
-socket-stream-client@0.2.2
-spacebars@1.0.12
-spacebars-compiler@1.1.1
-spiderable@1.0.9
-srp@1.0.12
-standard-minifier-css@1.5.3
-standard-minifier-js@2.4.1
-standard-minifiers@1.1.0
-templating@1.2.14
-templating-tools@1.1.1
-tracker@1.2.0
-ui@1.0.8
-underscore@1.0.10
-webapp@1.7.3
-webapp-hashing@1.0.9
diff --git a/examples/iron-router/client/client.js b/examples/iron-router/client/client.js
deleted file mode 100644
index 3ca78a0ded..0000000000
--- a/examples/iron-router/client/client.js
+++ /dev/null
@@ -1,132 +0,0 @@
-"use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Routing stub
-//
-// Separate routing package details from general app code.
-Meteor.navigateTo = function (path) {
-  // ...over-ridden in routing.js
-};
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// App.signout
-//
-App.signout = function () {
-  console.log('logging out...');
-  Meteor.logout(function () {
-    console.log('...done');
-    Meteor.navigateTo('/');
-  });
-};
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Patches
-//
-
-// stubs for IE
-if (!window.console) {
-  window.console = {}
-}
-if (!window.console.log) {
-  window.console.log = function (msg) {
-    $('#log').append('<br /><p>' + msg + '</p>')
-  };
-}
-
-// fix bootstrap dropdown unclickable issue on iOS
-// https://github.com/twitter/bootstrap/issues/4550
-$(document).on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) {
-    e.stopPropagation();
-});
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Subscriptions
-//
-
-// NOTE: Subscriptions are handled at the template level.
-
-
-
-////////////////////////////////////////////////////////////////////
-// Templates
-//
-
-Template.signin.rendered = function () {
-  // auto-trigger accounts-ui login form dropdown
-  Accounts._loginButtonsSession.set('dropdownVisible', true);
-};
-
-Template.header.events({
-  // template data, if any, is available in 'this'
-  'click .btn-navbar' : openCloseNav
-});
-Template.header.helpers({
-  displayName: function () {
-    return displayName();
-  }
-});
-
-Template.noteOfTheDay.helpers({
-  note: function () {
-    return "Greetings " + displayName() + "!";
-  }
-});
-
-
-
-
-////////////////////////////////////////////////////////////////////
-// Misc helper functions
-//
-
-function displayName (user) {
-  var name;
-
-  if (!user) {
-    user = Meteor.user();
-  }
-
-  if (!user) return "<missing user>";
-
-  if (user.profile) {
-    name = user.profile.name;
-  }
-
-  if ('string' === typeof name) {
-    name = name.trim();
-  } else {
-    name = null;
-  }
-
-  if (!name && user.emails && user.emails.length > 0) {
-    name = user.emails[0].address;
-  }
-
-  return name || "<missing name>";
-}
-
-
-// insta-open/close nav rather than animate collapse.
-// this improves UX on mobile devices
-function openCloseNav (e) {
-  // Select .nav-collapse within same .navbar as current button
-  var nav = $(e.target).closest('.navbar').find('.nav-collapse');
-
-  if (nav.height() != 0) {
-    // If it has a height, hide it
-    nav.height(0);
-  } else {
-    // If it's collapsed, show it
-    nav.height('auto');
-  }
-}
diff --git a/examples/iron-router/client/example.css b/examples/iron-router/client/example.css
deleted file mode 100644
index a7674b04dd..0000000000
--- a/examples/iron-router/client/example.css
+++ /dev/null
@@ -1,67 +0,0 @@
-@media (min-width: 980px) {
-  /* wide devices - full navbar */ 
-
-  /* push down content under fixed navbar */
-  body {
-    padding-top:60px;
-    padding-bottom:40px;
-    }
-
-}
-
-
-/**
- * front-and-center signin form
- */
-.signin {
-  width:100%;
-  text-align:center;
-}
-.signin .login-form {
-  width:200px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-}
-.signin .login-form {
-}
-.signin .login-close-text {
-  display:none;
-}
-.signin #login-buttons {
-}
-.signin .additional-link-container {
-  display:none;
-}
-.signin .example-users {
-  width:350px;
-  margin: 0 auto;
-  position:relative;
-  text-align:left;
-  top:15em;
-  left:3em;
-}
-
-/**
- * header
- */
-#err .close {
-  float:none;
-  margin-left:1em;
-}
-
-/**
- * note of the day
- */
-.note {
-  margin:1em 0em;
-  padding:1em;
-  border:1px solid #ccc;
-}
-
-/**
- * security-note
- */
-.security-note {
-  margin-top:10em;
-}
diff --git a/examples/iron-router/client/example.html b/examples/iron-router/client/example.html
deleted file mode 100644
index 0e63c0a72a..0000000000
--- a/examples/iron-router/client/example.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<head>
-  <title>example-app</title>
-</head>
-
-<body>
-</body>
-
-<template name="layout">
-  {{> header}}
-
-  {{> yield}}
-
-  <div id="log"></div>
-</template>
-
-<template name="layout_no_header">
-  {{> yield}}
-
-  <div id="log"></div>
-</template>
-
-<template name="signin">
-  <div class="signin">
-    <div class="login-form">
-      <h1>Sign In</h1>
-      {{> loginButtons}}
-    </div>
-
-    <div class="example-users">
-      <p>Normal User: normal@example.com | apple1</p>
-      <p>View Secrets: view@example.com | apple1</p>
-      <p>Manage Users: manage@example.com | apple1</p>
-      <p>Admin User: admin@example.com | apple1</p>
-    </div>
-  </div>
-</template>
-
-<template name="loading">
-  <h1>Loading...</h1>
-</template>
-
-<template name="awaiting-verification">
-  <h1>Awaiting email verification...</h1>
-</template>
-
-<template name="not_found">
-  <h3>404 - Not found</h3>
-</template>
-
-<template name="invalid-access">
-  <h3>403 Forbidden - Invalid Access</h3>
-</template>
-
-<template name="header">
-  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container">
-        <a class="btn btn-navbar">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </a>
-        <a class="brand" href="/">Roles Example App</a>
-        <div class="nav-collapse collapse">
-          <ul class="nav">
-
-            <li><a href="/start">Start Page</a></li>
-
-            {{#if isInRole 'admin,view-secrets'}}
-            <li><a href="/secrets">Secrets</a></li>
-            {{/if}}
-
-            <li class="dropdown pull-right">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{displayName}}<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                {{#if isInRole 'admin,manage-users'}}
-                <li><a href="/manageUsers">Manage Users</a></li>
-                {{/if}}
-                <li><a class="signout" href="/signout">Sign out</a></li>
-              </ul>
-            </li>
-
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<template name="noteOfTheDay">
-<p>Note of the day: {{note}}</p>
-</template>
-
-<template name="start">
-  <div class="page row">
-    <div class="offset4 span8">
-
-      <p class="note">All logged-in users will see this page in their header nav.</p>
-
-      <h2>Start Page</h2>
-
-      {{> noteOfTheDay}}
-
-      <div>
-        <p>This application is an example app for the <a href="https://github.com/Meteor-Community-Packages/meteor-roles"><em>meteor-roles</em></a> smart package.</p>
-      </div>
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="securityNote">
-  <div class="security-note">
-    <p>SECURITY NOTE: It is important to distinguish between templates and data since, like all Meteor applications, every template is sent to all connected clients whereas data can be selectively published server-side.</p>
-    <p>This is currently how Meteor is designed to work and is not a problem as long as you are aware that the raw template content is not actually 'secure'. Anyone can see any template by manually looking through the bundled client.js file. It won't be very pretty but it is possible. So for now don't put sensitive information in templates!</p>
-    <p>You can see this in action by manually going to '/secrets'.  Unauthorized users will still be able to see the page but the secret data will not be displayed.  In a production system, you should add a Roles check to your Router's definition of the 'secrets' route but even then the raw template data is still sent to the user's browser.</p>
-    <p>There is a <a href="https://trello.com/c/Lz07fBAm" target="_blank">feature card</a> on the Meteor team's Road Map which covers both server-side rendering and serving templates on-demand to the client so once that lands, the security restrictions may not need to be so tight.</p>
-    <p>Sensitive data needs to be restricted on the server-side and only published to the client if the currently logged-in user has the proper permissions. See server.js for an example.</p>
-    <p>To test server-side publishing rules, in your browser console try, 'Meteor.secrets.findOne()'. Unauthorized users will see 'undefined'.</p>
-  </div>
-</template>
diff --git a/examples/iron-router/client/lib/globals.js b/examples/iron-router/client/lib/globals.js
deleted file mode 100644
index 443d048ba8..0000000000
--- a/examples/iron-router/client/lib/globals.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// The application
-App = {};
diff --git a/examples/iron-router/client/manage-users.html b/examples/iron-router/client/manage-users.html
deleted file mode 100644
index 000175204e..0000000000
--- a/examples/iron-router/client/manage-users.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<template name="manageUsers">
-  <div class="manage-users row">
-    <div class="offset4 span8">
-
-      <p class="note">
-        Only Admins and those with the 'manage-users' role
-        will see this page in their nav menu.
-      </p>
-
-      <h2>Manage Users</h2>
-
-      <br />
-
-      <h3>Current Users</h3>
-
-      {{#if Template.subscriptionsReady}}
-        <!-- This is displayed when all data is ready. -->
-        {{> userList}}
-      {{else}}
-        Loading...
-      {{/if}}
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="userList">
-  <ul>
-    {{#each users}}
-    <li>{{email}} - Roles: {{roles}}</li>
-    {{/each}}
-  </ul>
-</template>
diff --git a/examples/iron-router/client/manage-users.js b/examples/iron-router/client/manage-users.js
deleted file mode 100644
index d846154d13..0000000000
--- a/examples/iron-router/client/manage-users.js
+++ /dev/null
@@ -1,21 +0,0 @@
-Template.manageUsers.onCreated(function () {
-  this.subscribe("users")
-})
-
-Template.userList.helpers({
-  users: function () {
-    return Meteor.users.find()
-  },
-  email: function () {
-    return this.emails[0].address
-  },
-  roles: function () {
-    var roles = Roles.getRolesForUser(this)
-
-    if (!roles.length) {
-      return '<none>'
-    }
-
-    return roles.join(',')
-  }
-})
diff --git a/examples/iron-router/client/routing.js b/examples/iron-router/client/routing.js
deleted file mode 100644
index 8b9b72b4ab..0000000000
--- a/examples/iron-router/client/routing.js
+++ /dev/null
@@ -1,94 +0,0 @@
-"use strict"
-
-
-////////////////////////////////////////////////////////////////////
-// Routing
-//
-
-// override with mini-pages navigate method
-Meteor.navigateTo = function (path) {
-  Router.go(path)
-}
-
-function emailVerified (user) {
-  return user.emails.some(function (email) {
-    return email.verified
-  })
-}
-
-var filters = {
-
-  /**
-   * ensure user is logged in and
-   * email verified
-   */
-  authenticate: function () {
-    var user
-
-    if (Meteor.loggingIn()) {
-
-      console.log('[authenticate filter] loading')
-      this.layout('layout_no_header')
-      this.render('loading')
-
-    } else {
-
-      user = Meteor.user()
-
-      if (!user) {
-        console.log('[authenticate filter] signin')
-        this.layout('layout_no_header')
-        this.render('signin')
-        return
-      }
-
-      if (!emailVerified(user)) {
-        console.log('[authenticate filter] awaiting-verification')
-        this.layout('layout')
-        this.render('awaiting-verification')
-        return
-      }
-
-      console.log('[authenticate filter] done')
-      this.layout('layout')
-
-      this.next()
-    }
-  },  // end authenticate
-
-  /**
-   * nop used to illustrate multiple filters
-   * use-case
-   */
-  testFilter: function () {
-    console.log('[test filter]')
-    this.next()
-  }
-
-}  // end filters
-
-
-Router.configure({
-  layout: 'layout',
-  loadingTemplate: 'loading',
-  notFoundTemplate: 'not_found'
-})
-
-
-Router.route('/', {
-  template: 'start',
-  before: [filters.authenticate, filters.testFilter]
-})
-Router.route('/start', {
-  before: [filters.authenticate, filters.testFilter]
-})
-
-Router.route('/secrets', {
-  before: filters.authenticate
-})
-Router.route('/manageUsers', {
-  before: filters.authenticate
-})
-
-Router.route('/signin')
-Router.route('/signout', App.signout)
diff --git a/examples/iron-router/client/secrets.html b/examples/iron-router/client/secrets.html
deleted file mode 100644
index fb0c65feba..0000000000
--- a/examples/iron-router/client/secrets.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<template name="secrets">
-  <div class="secrets row">
-    <div class="offset4 span8">
-
-      <p class="note">
-        Only Admins and those with the 'view-secrets'
-        role will see this page in their header nav.
-      </p>
-
-      <h2>Secrets!</h2>
-
-      {{#if Template.subscriptionsReady}}
-        <!-- This is displayed when all data is ready. -->
-        {{> secretList}}
-      {{else}}
-        Loading...
-      {{/if}}
-
-      {{> securityNote}}
-    </div>
-  </div>
-</template>
-
-<template name="secretList">
-  <ul>
-  {{#each secrets}}
-    <li><p>{{secret}}</p></li>
-  {{/each}}
-  </ul>
-</template>
diff --git a/examples/iron-router/client/secrets.js b/examples/iron-router/client/secrets.js
deleted file mode 100644
index dc1da2c604..0000000000
--- a/examples/iron-router/client/secrets.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Template.secrets.onCreated(function () {
-  this.subscribe("secrets")
-})
-
-Template.secretList.helpers({
-  secrets: function () {
-    return Meteor.secrets.find()
-  }
-})
diff --git a/examples/iron-router/model.js b/examples/iron-router/model.js
deleted file mode 100644
index be8a6c57f7..0000000000
--- a/examples/iron-router/model.js
+++ /dev/null
@@ -1,9 +0,0 @@
-;(function () {
-
-  "use strict";
-
-// run on both the server and the client
-
-Meteor.secrets = new Meteor.Collection('secrets');
-
-}());
diff --git a/examples/iron-router/package-lock.json b/examples/iron-router/package-lock.json
deleted file mode 100644
index a6030f11df..0000000000
--- a/examples/iron-router/package-lock.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "iron-router",
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz",
-      "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==",
-      "requires": {
-        "regenerator-runtime": "^0.13.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
-    }
-  }
-}
diff --git a/examples/iron-router/package.json b/examples/iron-router/package.json
deleted file mode 100644
index fe29949d08..0000000000
--- a/examples/iron-router/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "iron-router",
-  "dependencies": {
-    "@babel/runtime": "^7.7.2"
-  }
-}
diff --git a/examples/iron-router/packages/alanning:roles b/examples/iron-router/packages/alanning:roles
deleted file mode 120000
index a8a4f8c212..0000000000
--- a/examples/iron-router/packages/alanning:roles
+++ /dev/null
@@ -1 +0,0 @@
-../../..
\ No newline at end of file
diff --git a/examples/iron-router/server/server.js b/examples/iron-router/server/server.js
deleted file mode 100644
index 09bedaf70a..0000000000
--- a/examples/iron-router/server/server.js
+++ /dev/null
@@ -1,122 +0,0 @@
-;(function () {
-
-  "use strict";
-
-
-////////////////////////////////////////////////////////////////////
-// Startup
-//
-
-Meteor.startup(function () {
-
-  ////////////////////////////////////////////////////////////////////
-  // Create Test Secrets
-  //
-
-  if (Meteor.secrets.find().fetch().length === 0) {
-    Meteor.secrets.insert({secret:"ec2 password: apple2"});
-    Meteor.secrets.insert({secret:"domain registration pw: apple3"});
-  }
-
-
-  ////////////////////////////////////////////////////////////////////
-  // Create Test Users
-  //
-
-  if (Meteor.users.find().fetch().length === 0) {
-
-    console.log('Creating users: ');
-
-    var users = [
-        {name:"Normal User",email:"normal@example.com",roles:[]},
-        {name:"View-Secrets User",email:"view@example.com",roles:['view-secrets']},
-        {name:"Manage-Users User",email:"manage@example.com",roles:['manage-users']},
-        {name:"Admin User",email:"admin@example.com",roles:['admin']}
-      ];
-
-      users.forEach(function (userData) {
-      var id,
-          user;
-
-      console.log(userData);
-
-      id = Accounts.createUser({
-        email: userData.email,
-        password: "apple1",
-        profile: { name: userData.name }
-      });
-
-      // email verification
-      Meteor.users.update({_id: id}, {$set:{'emails.0.verified': true}});
-
-      userData.roles.forEach(function (role) {
-        Roles.createRole(role, {unlessExists: true});
-      });
-
-      Roles.addUsersToRoles(id, userData.roles);
-
-    });
-  }
-
-
-
-  ////////////////////////////////////////////////////////////////////
-  // Prevent non-authorized users from creating new users
-  //
-
-  Accounts.validateNewUser(function (user) {
-    var loggedInUser = Meteor.user();
-
-    if (Roles.userIsInRole(loggedInUser, ['admin','manage-users'])) {
-      return true;
-    }
-
-    throw new Meteor.Error('unauthorized', "Not authorized to create new users");
-  });
-
-});
-
-
-////////////////////////////////////////////////////////////////////
-// Publish
-//
-
-// Publish all role-assignments
-Meteor.publish(null, function () {
-  if (this.userId) {
-    return Meteor.roleAssignment.find({ 'user._id': this.userId });
-  } else {
-    this.ready();
-  }
-});
-
-// Authorized users can view secrets
-Meteor.publish("secrets", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","view-secrets"])) {
-    console.log('publishing secrets', this.userId);
-    return Meteor.secrets.find();
-  }
-
-  this.stop();
-  return;
-});
-
-// Authorized users can manage user accounts
-Meteor.publish("users", function () {
-  var user = Meteor.users.findOne({_id:this.userId});
-
-  if (Roles.userIsInRole(user, ["admin","manage-users"])) {
-    console.log('publishing users', this.userId);
-    return [
-      Meteor.roleAssignment.find({}),
-      Meteor.users.find({}, {fields: {emails: 1, profile: 1}})
-    ];
-  }
-
-  this.stop();
-  return;
-});
-
-}());
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 9af4873ba1..0000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "meteor-roles",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}
diff --git a/package-types.json b/package-types.json
deleted file mode 100644
index 7838991b97..0000000000
--- a/package-types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "typesEntry": "definitions.d.ts"
-}
diff --git a/roles/.gitignore b/packages/roles/.gitignore
similarity index 100%
rename from roles/.gitignore
rename to packages/roles/.gitignore
diff --git a/roles/README.md b/packages/roles/README.md
similarity index 100%
rename from roles/README.md
rename to packages/roles/README.md
diff --git a/roles/client/debug.js b/packages/roles/client/debug.js
similarity index 100%
rename from roles/client/debug.js
rename to packages/roles/client/debug.js
diff --git a/roles/client/uiHelpers.js b/packages/roles/client/uiHelpers.js
similarity index 100%
rename from roles/client/uiHelpers.js
rename to packages/roles/client/uiHelpers.js
diff --git a/definitions.d.ts b/packages/roles/definitions.d.ts
similarity index 100%
rename from definitions.d.ts
rename to packages/roles/definitions.d.ts
diff --git a/package.js b/packages/roles/package.js
similarity index 63%
rename from package.js
rename to packages/roles/package.js
index 684bb2ece8..36ed70b7bf 100644
--- a/package.js
+++ b/packages/roles/package.js
@@ -2,13 +2,11 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '4.0.0',
-  git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
-  name: 'alanning:roles'
+  version: '1.0.0',
+  name: 'roles'
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['2.8.1', '3.0'])
 
   const both = ['client', 'server']
 
@@ -27,12 +25,12 @@ Package.onUse(function (api) {
 
   api.export(['Roles', 'RolesCollection', 'RoleAssignmentCollection'])
 
-  api.addFiles('roles/roles_client.js', 'client')
-  api.addFiles('roles/roles_common_async.js', both)
-  api.addFiles('roles/roles_server.js', 'server')
+  api.addFiles('roles_client.js', 'client')
+  api.addFiles('roles_common_async.js', both)
+  api.addFiles('roles_server.js', 'server')
   api.addFiles([
-    'roles/client/debug.js',
-    'roles/client/uiHelpers.js'
+    'client/debug.js',
+    'client/uiHelpers.js'
   ], 'client')
 })
 
@@ -56,7 +54,7 @@ Package.onTest(function (api) {
     'mongo'
   ], both)
 
-  api.addFiles('roles/tests/serverAsync.js', 'server')
-  api.addFiles('roles/tests/client.js', 'client')
-  api.addFiles('roles/tests/clientAsync.js', 'client')
+  api.addFiles('tests/serverAsync.js', 'server')
+  api.addFiles('tests/client.js', 'client')
+  api.addFiles('tests/clientAsync.js', 'client')
 })
diff --git a/roles/roles_client.js b/packages/roles/roles_client.js
similarity index 100%
rename from roles/roles_client.js
rename to packages/roles/roles_client.js
diff --git a/roles/roles_common_async.js b/packages/roles/roles_common_async.js
similarity index 100%
rename from roles/roles_common_async.js
rename to packages/roles/roles_common_async.js
diff --git a/roles/roles_server.js b/packages/roles/roles_server.js
similarity index 86%
rename from roles/roles_server.js
rename to packages/roles/roles_server.js
index e5059f8a5d..451d8c8db9 100644
--- a/roles/roles_server.js
+++ b/packages/roles/roles_server.js
@@ -1,4 +1,4 @@
-import { RolesCollection, RoleAssignmentCollection } from './roles_common_async'
+import { RolesCollection, RoleAssignmentCollection } from 'packages/roles/roles_common_async'
 
 const indexFnAssignment = RoleAssignmentCollection.createIndexAsync.bind(RoleAssignmentCollection)
 const indexFnRoles = RolesCollection.createIndexAsync.bind(RolesCollection)
diff --git a/roles/tests/client.js b/packages/roles/tests/client.js
similarity index 98%
rename from roles/tests/client.js
rename to packages/roles/tests/client.js
index b9be949257..f8ef4e2e52 100644
--- a/roles/tests/client.js
+++ b/packages/roles/tests/client.js
@@ -5,7 +5,7 @@ import { Meteor } from 'meteor/meteor'
 import { assert } from 'chai'
 
 // To ensure that the files are loaded for coverage
-import '../roles_client'
+import 'packages/roles/roles_client'
 
 const safeInsert = (collection, data) => {
   try {
diff --git a/roles/tests/clientAsync.js b/packages/roles/tests/clientAsync.js
similarity index 97%
rename from roles/tests/clientAsync.js
rename to packages/roles/tests/clientAsync.js
index f1c28ee1c4..6df81cbaf4 100644
--- a/roles/tests/clientAsync.js
+++ b/packages/roles/tests/clientAsync.js
@@ -6,8 +6,8 @@ import chai, { assert } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 
 // To ensure that the files are loaded for coverage
-import '../roles_client'
-import '../roles_common_async'
+import 'packages/roles/roles_client'
+import 'packages/roles/roles_common_async'
 
 chai.use(chaiAsPromised)
 
diff --git a/roles/tests/serverAsync.js b/packages/roles/tests/serverAsync.js
similarity index 99%
rename from roles/tests/serverAsync.js
rename to packages/roles/tests/serverAsync.js
index 278cab7e0d..a381fc896a 100644
--- a/roles/tests/serverAsync.js
+++ b/packages/roles/tests/serverAsync.js
@@ -6,7 +6,7 @@ import chai, { assert } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 
 // To ensure that the files are loaded for coverage
-import '../roles_common_async'
+import 'packages/roles/roles_common_async'
 
 chai.use(chaiAsPromised)
 
diff --git a/testapp2/.coverage.json b/testapp2/.coverage.json
deleted file mode 100644
index 918fc8889e..0000000000
--- a/testapp2/.coverage.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "include": [
-    "**/packages/roles/**/*",
-    "**/packages/*alanning_roles.js"
-  ]
-}
diff --git a/testapp2/.gitignore b/testapp2/.gitignore
deleted file mode 100644
index d1f89f83a8..0000000000
--- a/testapp2/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-.npm/
-.coverage/
-packages/
diff --git a/testapp2/.meteor/.finished-upgraders b/testapp2/.meteor/.finished-upgraders
deleted file mode 100644
index c07b6ff75a..0000000000
--- a/testapp2/.meteor/.finished-upgraders
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file contains information which helps Meteor properly upgrade your
-# app when you run 'meteor update'. You should check it into version control
-# with your project.
-
-notices-for-0.9.0
-notices-for-0.9.1
-0.9.4-platform-file
-notices-for-facebook-graph-api-2
-1.2.0-standard-minifiers-package
-1.2.0-meteor-platform-split
-1.2.0-cordova-changes
-1.2.0-breaking-changes
-1.3.0-split-minifiers-package
-1.4.0-remove-old-dev-bundle-link
-1.4.1-add-shell-server-package
-1.4.3-split-account-service-packages
-1.5-add-dynamic-import-package
-1.7-split-underscore-from-meteor-base
-1.8.3-split-jquery-from-blaze
diff --git a/testapp2/.meteor/.gitignore b/testapp2/.meteor/.gitignore
deleted file mode 100644
index 4083037423..0000000000
--- a/testapp2/.meteor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/testapp2/.meteor/.id b/testapp2/.meteor/.id
deleted file mode 100644
index 404dd7470a..0000000000
--- a/testapp2/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-uffl2v6ap9ck.g2922xjmnljm
diff --git a/testapp2/.meteor/packages b/testapp2/.meteor/packages
deleted file mode 100644
index 68b097e11e..0000000000
--- a/testapp2/.meteor/packages
+++ /dev/null
@@ -1,18 +0,0 @@
-# Meteor packages used by this project, one per line.
-# Check this file (and the other files in this directory) into your repository.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-meteor@1.11.5                  # Shared foundation for all Meteor packages
-static-html@1.3.2             # Define static page content in .html files
-standard-minifier-css@1.9.2   # CSS minifier run for production mode
-standard-minifier-js@2.8.1    # JS minifier run for production mode
-es5-shim@4.8.0                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.16.8              # Enable ECMAScript2015+ syntax in app code
-typescript@4.9.5              # Enable TypeScript syntax in .ts and .tsx modules
-shell-server@0.5.0            # Server-side component of the `meteor shell` command
-webapp@1.13.8                  # Serves a Meteor app over HTTP
-server-render@0.4.1           # Support for server-side rendering
-hot-module-replacement@0.5.3  # Rebuilds the client if there is a change on the client without restarting the server
-
diff --git a/testapp2/.meteor/platforms b/testapp2/.meteor/platforms
deleted file mode 100644
index efeba1b50c..0000000000
--- a/testapp2/.meteor/platforms
+++ /dev/null
@@ -1,2 +0,0 @@
-server
-browser
diff --git a/testapp2/.meteor/release b/testapp2/.meteor/release
deleted file mode 100644
index 5152abe9d5..0000000000
--- a/testapp2/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-METEOR@2.16
diff --git a/testapp2/.meteor/versions b/testapp2/.meteor/versions
deleted file mode 100644
index 3b0f13a41e..0000000000
--- a/testapp2/.meteor/versions
+++ /dev/null
@@ -1,57 +0,0 @@
-autoupdate@1.8.0
-babel-compiler@7.10.5
-babel-runtime@1.5.1
-base64@1.0.12
-blaze-tools@1.1.3
-boilerplate-generator@1.7.2
-caching-compiler@1.2.2
-caching-html-compiler@1.2.1
-callback-hook@1.5.1
-check@1.4.1
-ddp@1.4.1
-ddp-client@2.6.2
-ddp-common@1.4.1
-ddp-server@2.7.1
-diff-sequence@1.1.2
-dynamic-import@0.7.3
-ecmascript@0.16.8
-ecmascript-runtime@0.8.1
-ecmascript-runtime-client@0.12.1
-ecmascript-runtime-server@0.11.0
-ejson@1.1.3
-es5-shim@4.8.0
-fetch@0.1.4
-hot-code-push@1.0.4
-hot-module-replacement@0.5.3
-html-tools@1.1.3
-htmljs@1.1.1
-id-map@1.1.1
-inter-process-messaging@0.1.1
-logging@1.3.4
-meteor@1.11.5
-minifier-css@1.6.4
-minifier-js@2.8.0
-modern-browsers@0.1.10
-modules@0.20.0
-modules-runtime@0.13.1
-modules-runtime-hot@0.14.2
-mongo-id@1.0.8
-promise@0.12.2
-random@1.2.1
-react-fast-refresh@0.2.8
-reload@1.3.1
-retry@1.1.0
-routepolicy@1.1.1
-server-render@0.4.1
-shell-server@0.5.0
-socket-stream-client@0.5.2
-spacebars-compiler@1.3.1
-standard-minifier-css@1.9.2
-standard-minifier-js@2.8.1
-static-html@1.3.2
-templating-tools@1.2.2
-tracker@1.3.3
-typescript@4.9.5
-underscore@1.6.1
-webapp@1.13.8
-webapp-hashing@1.1.1
diff --git a/testapp2/package-lock.json b/testapp2/package-lock.json
deleted file mode 100644
index 240ace24ef..0000000000
--- a/testapp2/package-lock.json
+++ /dev/null
@@ -1,5623 +0,0 @@
-{
-  "name": "testapp",
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true
-    },
-    "@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.24.7",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
-      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dev": true,
-      "requires": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/generator": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
-      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.25.6",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
-      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.2"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
-      "dev": true
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
-      "dev": true
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-      "dev": true
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
-      "dev": true
-    },
-    "@babel/helpers": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
-      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
-      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.25.6"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
-      "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
-      "requires": {
-        "regenerator-runtime": "^0.14.0"
-      }
-    },
-    "@babel/template": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.25.0",
-        "@babel/types": "^7.25.0"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
-      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.6",
-        "@babel/parser": "^7.25.6",
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
-      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
-      "dev": true
-    },
-    "@eslint/eslintrc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
-      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
-        }
-      }
-    },
-    "@eslint/js": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
-      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
-      "dev": true
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      }
-    },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true
-    },
-    "@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@puppeteer/browsers": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz",
-      "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==",
-      "dev": true,
-      "requires": {
-        "debug": "4.3.4",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "yargs": "17.7.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "cliui": {
-          "version": "8.0.1",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.1",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "17.7.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-          "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^8.0.1",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "21.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-          "dev": true
-        }
-      }
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "22.5.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.1.tgz",
-      "integrity": "sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "undici-types": "~6.19.2"
-      }
-    },
-    "@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      }
-    },
-    "acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "requires": {
-        "debug": "4"
-      }
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "append-transform": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
-      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
-      "dev": true,
-      "requires": {
-        "default-require-extensions": "^3.0.0"
-      }
-    },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
-      }
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-    },
-    "array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array.prototype.findlastindex": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
-      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
-      }
-    },
-    "asn1": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-      "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
-      "optional": true
-    },
-    "assert-plus": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-      "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
-      "optional": true
-    },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-      "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
-      "optional": true
-    },
-    "babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
-      "requires": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.13.0",
-        "raw-body": "2.5.2",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "call-bind": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-          "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-          "requires": {
-            "es-define-property": "^1.0.0",
-            "es-errors": "^1.3.0",
-            "function-bind": "^1.1.2",
-            "get-intrinsic": "^1.2.4",
-            "set-function-length": "^1.2.1"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "function-bind": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-        },
-        "get-intrinsic": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-          "requires": {
-            "es-errors": "^1.3.0",
-            "function-bind": "^1.1.2",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "hasown": "^2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        },
-        "object-inspect": {
-          "version": "1.13.2",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-          "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="
-        },
-        "qs": {
-          "version": "6.13.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-          "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-          "requires": {
-            "side-channel": "^1.0.6"
-          }
-        },
-        "side-channel": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-          "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-          "requires": {
-            "call-bind": "^1.0.7",
-            "es-errors": "^1.3.0",
-            "get-intrinsic": "^1.2.4",
-            "object-inspect": "^1.13.1"
-          }
-        }
-      }
-    },
-    "boom": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
-      "integrity": "sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==",
-      "optional": true,
-      "requires": {
-        "hoek": "0.9.x"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "browserslist": {
-      "version": "4.23.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001646",
-        "electron-to-chromium": "^1.5.4",
-        "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
-      }
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true
-    },
-    "builtins": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-      "dev": true,
-      "requires": {
-        "semver": "^7.0.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-    },
-    "caching-transform": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
-      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
-      "dev": true,
-      "requires": {
-        "hasha": "^5.0.0",
-        "make-dir": "^3.0.0",
-        "package-hash": "^4.0.0",
-        "write-file-atomic": "^3.0.0"
-      }
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001653",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz",
-      "integrity": "sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==",
-      "dev": true
-    },
-    "chai": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz",
-      "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.1.0"
-      }
-    },
-    "chai-as-promised": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
-      "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
-      "dev": true,
-      "requires": {
-        "check-error": "^1.0.2"
-      }
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "check-error": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
-      "dev": true,
-      "requires": {
-        "get-func-name": "^2.0.2"
-      }
-    },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "chromium-bidi": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz",
-      "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==",
-      "dev": true,
-      "requires": {
-        "mitt": "3.0.0"
-      }
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-      "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
-      "optional": true,
-      "requires": {
-        "delayed-stream": "0.0.5"
-      }
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "requires": {
-        "safe-buffer": "5.2.1"
-      }
-    },
-    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
-    },
-    "convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-    },
-    "cosmiconfig": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
-      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
-      "dev": true,
-      "requires": {
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        }
-      }
-    },
-    "cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
-      "dev": true,
-      "requires": {
-        "node-fetch": "2.6.7"
-      }
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "dependencies": {
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "cryptiles": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
-      "integrity": "sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==",
-      "optional": true,
-      "requires": {
-        "boom": "0.4.x"
-      }
-    },
-    "ctype": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-      "integrity": "sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==",
-      "optional": true
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true
-    },
-    "deep-eql": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
-      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
-      "dev": true,
-      "requires": {
-        "type-detect": "^4.0.0"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "default-require-extensions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
-      "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==",
-      "dev": true,
-      "requires": {
-        "strip-bom": "^4.0.0"
-      }
-    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      }
-    },
-    "define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-      "dev": true,
-      "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-      "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
-      "optional": true
-    },
-    "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-    },
-    "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-    },
-    "devtools-protocol": {
-      "version": "0.0.1107588",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
-      "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
-      "dev": true
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "electron-to-chromium": {
-      "version": "1.5.13",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
-      "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
-      }
-    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "requires": {
-        "get-intrinsic": "^1.2.4"
-      },
-      "dependencies": {
-        "function-bind": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-        },
-        "get-intrinsic": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-          "requires": {
-            "es-errors": "^1.3.0",
-            "function-bind": "^1.1.2",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "hasown": "^2.0.0"
-          }
-        }
-      }
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
-    },
-    "es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
-    },
-    "escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
-      "dev": true
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true
-    },
-    "eslint": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
-      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
-      "dev": true,
-      "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.1",
-        "@eslint/js": "^8.46.0",
-        "@humanwhocodes/config-array": "^0.11.10",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.2",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "levn": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^5.0.0"
-          }
-        },
-        "optionator": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-          "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-          "dev": true,
-          "requires": {
-            "@aashutoshrathi/word-wrap": "^1.2.3",
-            "deep-is": "^0.1.3",
-            "fast-levenshtein": "^2.0.6",
-            "levn": "^0.4.1",
-            "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0"
-          }
-        },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^3.0.2"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-check": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "^1.2.1"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-config-standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
-      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
-      "dev": true
-    },
-    "eslint-config-standard-jsx": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
-      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==",
-      "dev": true
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
-      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-es": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
-      "dev": true,
-      "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "dependencies": {
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
-      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.findlastindex": "^1.2.2",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.8.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.12.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.6",
-        "object.groupby": "^1.0.0",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.3",
-        "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "resolve": {
-          "version": "1.22.3",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
-          "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.12.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-n": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
-      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
-      "dev": true,
-      "requires": {
-        "builtins": "^5.0.1",
-        "eslint-plugin-es": "^4.1.0",
-        "eslint-utils": "^3.0.0",
-        "ignore": "^5.1.1",
-        "is-core-module": "^2.11.0",
-        "minimatch": "^3.1.2",
-        "resolve": "^1.22.1",
-        "semver": "^7.3.8"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "resolve": {
-          "version": "1.22.2",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-          "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.11.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-promise": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
-      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==",
-      "dev": true
-    },
-    "eslint-plugin-react": {
-      "version": "7.33.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
-      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.8"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "resolve": {
-          "version": "2.0.0-next.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-      "dev": true
-    },
-    "espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      }
-    },
-    "estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
-    },
-    "express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
-      "requires": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.6.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "call-bind": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-          "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-          "requires": {
-            "es-define-property": "^1.0.0",
-            "es-errors": "^1.3.0",
-            "function-bind": "^1.1.2",
-            "get-intrinsic": "^1.2.4",
-            "set-function-length": "^1.2.1"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "encodeurl": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-          "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
-        },
-        "finalhandler": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-          "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
-          "requires": {
-            "debug": "2.6.9",
-            "encodeurl": "~2.0.0",
-            "escape-html": "~1.0.3",
-            "on-finished": "2.4.1",
-            "parseurl": "~1.3.3",
-            "statuses": "2.0.1",
-            "unpipe": "~1.0.0"
-          }
-        },
-        "function-bind": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-        },
-        "get-intrinsic": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-          "requires": {
-            "es-errors": "^1.3.0",
-            "function-bind": "^1.1.2",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "hasown": "^2.0.0"
-          }
-        },
-        "merge-descriptors": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-          "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        },
-        "object-inspect": {
-          "version": "1.13.2",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-          "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="
-        },
-        "path-to-regexp": {
-          "version": "0.1.10",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-          "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
-        },
-        "qs": {
-          "version": "6.13.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-          "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-          "requires": {
-            "side-channel": "^1.0.6"
-          }
-        },
-        "send": {
-          "version": "0.19.0",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-          "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "2.0.0",
-            "destroy": "1.2.0",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "2.0.0",
-            "mime": "1.6.0",
-            "ms": "2.1.3",
-            "on-finished": "2.4.1",
-            "range-parser": "~1.2.1",
-            "statuses": "2.0.1"
-          },
-          "dependencies": {
-            "encodeurl": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-              "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-            },
-            "ms": {
-              "version": "2.1.3",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-            }
-          }
-        },
-        "serve-static": {
-          "version": "1.16.2",
-          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-          "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-          "requires": {
-            "encodeurl": "~2.0.0",
-            "escape-html": "~1.0.3",
-            "parseurl": "~1.3.3",
-            "send": "0.19.0"
-          }
-        },
-        "side-channel": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-          "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-          "requires": {
-            "call-bind": "^1.0.7",
-            "es-errors": "^1.3.0",
-            "get-intrinsic": "^1.2.4",
-            "object-inspect": "^1.13.1"
-          }
-        }
-      }
-    },
-    "extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "requires": {
-        "@types/yauzl": "^2.9.1",
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      }
-    },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "foreground-child": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "forever-agent": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-      "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A=="
-    },
-    "form-data": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
-      "optional": true,
-      "requires": {
-        "async": "~0.9.0",
-        "combined-stream": "~0.0.4",
-        "mime": "~1.2.11"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
-          "optional": true
-        },
-        "mime": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
-          "optional": true
-        }
-      }
-    },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
-    },
-    "fromentries": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
-      "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
-      "dev": true
-    },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
-      }
-    },
-    "get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true
-    },
-    "get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.3"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true
-    },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "hasha": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-      "dev": true,
-      "requires": {
-        "is-stream": "^2.0.0",
-        "type-fest": "^0.8.0"
-      }
-    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "requires": {
-        "function-bind": "^1.1.2"
-      },
-      "dependencies": {
-        "function-bind": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-        }
-      }
-    },
-    "hawk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-      "integrity": "sha512-am8sVA2bCJIw8fuuVcKvmmNnGFUGW8spTkVtj2fXTEZVkfN42bwFZFtDem57eFi+NSxurJB8EQ7Jd3uCHLn8Vw==",
-      "optional": true,
-      "requires": {
-        "boom": "0.4.x",
-        "cryptiles": "0.2.x",
-        "hoek": "0.9.x",
-        "sntp": "0.2.x"
-      }
-    },
-    "hoek": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-      "integrity": "sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==",
-      "optional": true
-    },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "requires": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      }
-    },
-    "http-signature": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-      "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
-      "optional": true,
-      "requires": {
-        "asn1": "0.1.11",
-        "assert-plus": "^0.1.5",
-        "ctype": "0.5.3"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
-        }
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-    },
-    "is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true
-    },
-    "is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
-      "dev": true,
-      "requires": {
-        "which-typed-array": "^1.1.11"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "istanbul-lib-coverage": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "dev": true
-    },
-    "istanbul-lib-hook": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
-      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
-      "dev": true,
-      "requires": {
-        "append-transform": "^2.0.0"
-      }
-    },
-    "istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      }
-    },
-    "istanbul-lib-processinfo": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz",
-      "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==",
-      "dev": true,
-      "requires": {
-        "archy": "^1.0.0",
-        "cross-spawn": "^7.0.3",
-        "istanbul-lib-coverage": "^3.2.0",
-        "p-map": "^3.0.0",
-        "rimraf": "^3.0.0",
-        "uuid": "^8.3.2"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "make-dir": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-          "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-          "dev": true,
-          "requires": {
-            "semver": "^7.5.3"
-          }
-        },
-        "semver": {
-          "version": "7.6.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dev": true,
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
-    },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true
-    },
-    "jsx-ast-utils": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      }
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "linkify-it": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-      "integrity": "sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg==",
-      "requires": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "load-json-file": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-          "dev": true
-        },
-        "type-fest": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
-          "dev": true
-        }
-      }
-    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
-    "lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "loupe": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
-      "dev": true,
-      "requires": {
-        "get-func-name": "^2.0.1"
-      }
-    },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.0.0"
-      }
-    },
-    "markdown-it": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
-      "integrity": "sha512-Rl8dHHeLuAh3E72OPY0tY7CLvlxgHiLhlshIYswAAabAg4YDBLa6e/LTgNkkxBO2K61ESzoquPQFMw/iMrT1PA==",
-      "requires": {
-        "argparse": "~1.0.2",
-        "entities": "~1.1.1",
-        "linkify-it": "~1.2.0",
-        "mdurl": "~1.0.0",
-        "uc.micro": "^1.0.0"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-          "requires": {
-            "sprintf-js": "~1.0.2"
-          }
-        }
-      }
-    },
-    "mdn-links": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/mdn-links/-/mdn-links-0.1.0.tgz",
-      "integrity": "sha512-m+gI2Hrgro1O0SwqHd9cFkqN8VGzP56eprB63gxu6z9EFQDMeaR083wcNqMVADIbgiMP/TOCCe0ZIXHLBv2tUg=="
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
-    },
-    "meteor-node-stubs": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.9.tgz",
-      "integrity": "sha512-EKRezc1/PblYtYiK4BOT3h5geWDo9AFBBSYNamPNh8AC5msUbVCcg8kekzAa7r7JPzBX8nZWaXEQVar4t8q/Hg==",
-      "requires": {
-        "@meteorjs/crypto-browserify": "^3.12.1",
-        "assert": "^2.1.0",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^5.7.1",
-        "console-browserify": "^1.2.0",
-        "constants-browserify": "^1.0.0",
-        "domain-browser": "^4.23.0",
-        "elliptic": "^6.5.4",
-        "events": "^3.3.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "^1.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.4.1",
-        "querystring-es3": "^0.2.1",
-        "readable-stream": "^3.6.2",
-        "stream-browserify": "^3.0.0",
-        "stream-http": "^3.2.0",
-        "string_decoder": "^1.3.0",
-        "timers-browserify": "^2.0.12",
-        "tty-browserify": "0.0.1",
-        "url": "^0.11.3",
-        "util": "^0.12.5",
-        "vm-browserify": "^1.1.2"
-      },
-      "dependencies": {
-        "@meteorjs/crypto-browserify": {
-          "version": "3.12.1",
-          "resolved": "https://registry.npmjs.org/@meteorjs/crypto-browserify/-/crypto-browserify-3.12.1.tgz",
-          "integrity": "sha512-ku23zGjNb1XJXPSPlt4QCPetc4s/cPrSahhSF11mFeQff5wBuu7QVVn/MusdHh+l3aKl6L1XMLV+OYLXvNDQ6Q==",
-          "requires": {
-            "browserify-cipher": "^1.0.1",
-            "browserify-sign": "^4.2.3",
-            "create-ecdh": "^4.0.4",
-            "create-hash": "^1.2.0",
-            "create-hmac": "^1.1.7",
-            "diffie-hellman": "^5.0.3",
-            "hash-base": "~3.0.4",
-            "inherits": "^2.0.4",
-            "pbkdf2": "^3.1.2",
-            "public-encrypt": "^4.0.3",
-            "randombytes": "^2.1.0",
-            "randomfill": "^1.0.4"
-          },
-          "dependencies": {
-            "hash-base": {
-              "version": "3.0.4",
-              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-              "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
-              "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-              }
-            }
-          }
-        },
-        "asn1.js": {
-          "version": "4.10.1",
-          "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-          "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-          "requires": {
-            "bn.js": "^4.0.0",
-            "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-            }
-          }
-        },
-        "assert": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
-          "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "is-nan": "^1.3.2",
-            "object-is": "^1.1.5",
-            "object.assign": "^4.1.4",
-            "util": "^0.12.5"
-          }
-        },
-        "available-typed-arrays": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-          "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
-        },
-        "base64-js": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-          "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-        },
-        "bn.js": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-          "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
-        },
-        "brorand": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-          "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
-        },
-        "browserify-aes": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-          "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-          "requires": {
-            "buffer-xor": "^1.0.3",
-            "cipher-base": "^1.0.0",
-            "create-hash": "^1.1.0",
-            "evp_bytestokey": "^1.0.3",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "browserify-cipher": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-          "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-          "requires": {
-            "browserify-aes": "^1.0.4",
-            "browserify-des": "^1.0.0",
-            "evp_bytestokey": "^1.0.0"
-          }
-        },
-        "browserify-des": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-          "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-          "requires": {
-            "cipher-base": "^1.0.1",
-            "des.js": "^1.0.0",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          }
-        },
-        "browserify-rsa": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-          "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-          "requires": {
-            "bn.js": "^5.0.0",
-            "randombytes": "^2.0.1"
-          }
-        },
-        "browserify-sign": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz",
-          "integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
-          "requires": {
-            "bn.js": "^5.2.1",
-            "browserify-rsa": "^4.1.0",
-            "create-hash": "^1.2.0",
-            "create-hmac": "^1.1.7",
-            "elliptic": "^6.5.5",
-            "hash-base": "~3.0",
-            "inherits": "^2.0.4",
-            "parse-asn1": "^5.1.7",
-            "readable-stream": "^2.3.8",
-            "safe-buffer": "^5.2.1"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "5.2.1",
-              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-              "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
-            },
-            "hash-base": {
-              "version": "3.0.4",
-              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-              "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
-              "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-              }
-            },
-            "readable-stream": {
-              "version": "2.3.8",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-              "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              },
-              "dependencies": {
-                "safe-buffer": {
-                  "version": "5.1.2",
-                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                  "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-                }
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              },
-              "dependencies": {
-                "safe-buffer": {
-                  "version": "5.1.2",
-                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                  "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-                }
-              }
-            }
-          }
-        },
-        "browserify-zlib": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-          "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-          "requires": {
-            "pako": "~1.0.5"
-          }
-        },
-        "buffer": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-          "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-          }
-        },
-        "buffer-xor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-          "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
-        },
-        "builtin-status-codes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-          "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
-        },
-        "call-bind": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-          "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
-          "requires": {
-            "function-bind": "^1.1.2",
-            "get-intrinsic": "^1.2.1",
-            "set-function-length": "^1.1.1"
-          }
-        },
-        "cipher-base": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-          "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-          "requires": {
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "console-browserify": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-          "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
-        },
-        "constants-browserify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-          "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
-        },
-        "core-util-is": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-          "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-        },
-        "create-ecdh": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-          "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-          "requires": {
-            "bn.js": "^4.1.0",
-            "elliptic": "^6.5.3"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-            }
-          }
-        },
-        "create-hash": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-          "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-          "requires": {
-            "cipher-base": "^1.0.1",
-            "inherits": "^2.0.1",
-            "md5.js": "^1.3.4",
-            "ripemd160": "^2.0.1",
-            "sha.js": "^2.4.0"
-          }
-        },
-        "create-hmac": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-          "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-          "requires": {
-            "cipher-base": "^1.0.3",
-            "create-hash": "^1.1.0",
-            "inherits": "^2.0.1",
-            "ripemd160": "^2.0.0",
-            "safe-buffer": "^5.0.1",
-            "sha.js": "^2.4.8"
-          }
-        },
-        "define-data-property": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-          "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
-          "requires": {
-            "get-intrinsic": "^1.2.1",
-            "gopd": "^1.0.1",
-            "has-property-descriptors": "^1.0.0"
-          }
-        },
-        "define-properties": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-          "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-          "requires": {
-            "define-data-property": "^1.0.1",
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "des.js": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-          "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-          "requires": {
-            "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0"
-          }
-        },
-        "diffie-hellman": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-          "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-          "requires": {
-            "bn.js": "^4.1.0",
-            "miller-rabin": "^4.0.0",
-            "randombytes": "^2.0.0"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-            }
-          }
-        },
-        "domain-browser": {
-          "version": "4.23.0",
-          "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.23.0.tgz",
-          "integrity": "sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA=="
-        },
-        "elliptic": {
-          "version": "6.5.5",
-          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz",
-          "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==",
-          "requires": {
-            "bn.js": "^4.11.9",
-            "brorand": "^1.1.0",
-            "hash.js": "^1.0.0",
-            "hmac-drbg": "^1.0.1",
-            "inherits": "^2.0.4",
-            "minimalistic-assert": "^1.0.1",
-            "minimalistic-crypto-utils": "^1.0.1"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-            }
-          }
-        },
-        "events": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-          "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
-        },
-        "evp_bytestokey": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-          "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-          "requires": {
-            "md5.js": "^1.3.4",
-            "safe-buffer": "^5.1.1"
-          }
-        },
-        "for-each": {
-          "version": "0.3.3",
-          "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-          "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-          "requires": {
-            "is-callable": "^1.1.3"
-          }
-        },
-        "function-bind": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-        },
-        "get-intrinsic": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-          "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
-          "requires": {
-            "function-bind": "^1.1.2",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "hasown": "^2.0.0"
-          }
-        },
-        "gopd": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-          "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-          "requires": {
-            "get-intrinsic": "^1.1.3"
-          }
-        },
-        "has-property-descriptors": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-          "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
-          "requires": {
-            "get-intrinsic": "^1.2.2"
-          }
-        },
-        "has-proto": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-          "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        },
-        "has-tostringtag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-          "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-          "requires": {
-            "has-symbols": "^1.0.2"
-          }
-        },
-        "hash-base": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-          "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.6.0",
-            "safe-buffer": "^5.2.0"
-          }
-        },
-        "hash.js": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-          "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "minimalistic-assert": "^1.0.1"
-          }
-        },
-        "hasown": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-          "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
-          "requires": {
-            "function-bind": "^1.1.2"
-          }
-        },
-        "hmac-drbg": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-          "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-          "requires": {
-            "hash.js": "^1.0.3",
-            "minimalistic-assert": "^1.0.0",
-            "minimalistic-crypto-utils": "^1.0.1"
-          }
-        },
-        "https-browserify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-          "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="
-        },
-        "ieee754": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-          "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        },
-        "is-arguments": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-          "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-          "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-        },
-        "is-generator-function": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-          "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-nan": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-          "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
-          "requires": {
-            "call-bind": "^1.0.0",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "is-typed-array": {
-          "version": "1.1.12",
-          "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-          "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
-          "requires": {
-            "which-typed-array": "^1.1.11"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-        },
-        "md5.js": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-          "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-          "requires": {
-            "hash-base": "^3.0.0",
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          }
-        },
-        "miller-rabin": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-          "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-          "requires": {
-            "bn.js": "^4.0.0",
-            "brorand": "^1.0.1"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-            }
-          }
-        },
-        "minimalistic-assert": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-          "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-        },
-        "minimalistic-crypto-utils": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-          "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
-        },
-        "object-inspect": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-          "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
-        },
-        "object-is": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-          "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3"
-          }
-        },
-        "object-keys": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-          "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-        },
-        "object.assign": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-          "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "has-symbols": "^1.0.3",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "os-browserify": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-          "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="
-        },
-        "pako": {
-          "version": "1.0.11",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-          "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
-        },
-        "parse-asn1": {
-          "version": "5.1.7",
-          "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz",
-          "integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
-          "requires": {
-            "asn1.js": "^4.10.1",
-            "browserify-aes": "^1.2.0",
-            "evp_bytestokey": "^1.0.3",
-            "hash-base": "~3.0",
-            "pbkdf2": "^3.1.2",
-            "safe-buffer": "^5.2.1"
-          },
-          "dependencies": {
-            "hash-base": {
-              "version": "3.0.4",
-              "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-              "integrity": "sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==",
-              "requires": {
-                "inherits": "^2.0.1",
-                "safe-buffer": "^5.0.1"
-              }
-            }
-          }
-        },
-        "path-browserify": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-          "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
-        },
-        "pbkdf2": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-          "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-          "requires": {
-            "create-hash": "^1.1.2",
-            "create-hmac": "^1.1.4",
-            "ripemd160": "^2.0.1",
-            "safe-buffer": "^5.0.1",
-            "sha.js": "^2.4.8"
-          }
-        },
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
-        },
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-        },
-        "public-encrypt": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-          "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-          "requires": {
-            "bn.js": "^4.1.0",
-            "browserify-rsa": "^4.0.0",
-            "create-hash": "^1.1.0",
-            "parse-asn1": "^5.0.0",
-            "randombytes": "^2.0.1",
-            "safe-buffer": "^5.1.2"
-          },
-          "dependencies": {
-            "bn.js": {
-              "version": "4.12.0",
-              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-              "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-            }
-          }
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
-        },
-        "qs": {
-          "version": "6.11.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-          "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
-          "requires": {
-            "side-channel": "^1.0.4"
-          }
-        },
-        "querystring-es3": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-          "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="
-        },
-        "randombytes": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-          "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-          "requires": {
-            "safe-buffer": "^5.1.0"
-          }
-        },
-        "randomfill": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-          "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-          "requires": {
-            "randombytes": "^2.0.5",
-            "safe-buffer": "^5.1.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "ripemd160": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-          "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-          "requires": {
-            "hash-base": "^3.0.0",
-            "inherits": "^2.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "set-function-length": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-          "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
-          "requires": {
-            "define-data-property": "^1.1.1",
-            "get-intrinsic": "^1.2.1",
-            "gopd": "^1.0.1",
-            "has-property-descriptors": "^1.0.0"
-          }
-        },
-        "setimmediate": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-          "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
-        },
-        "sha.js": {
-          "version": "2.4.11",
-          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-          "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-          "requires": {
-            "inherits": "^2.0.1",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "side-channel": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-          "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-          "requires": {
-            "call-bind": "^1.0.0",
-            "get-intrinsic": "^1.0.2",
-            "object-inspect": "^1.9.0"
-          }
-        },
-        "stream-browserify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
-          "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
-          "requires": {
-            "inherits": "~2.0.4",
-            "readable-stream": "^3.5.0"
-          }
-        },
-        "stream-http": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
-          "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
-          "requires": {
-            "builtin-status-codes": "^3.0.0",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.6.0",
-            "xtend": "^4.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          }
-        },
-        "timers-browserify": {
-          "version": "2.0.12",
-          "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-          "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-          "requires": {
-            "setimmediate": "^1.0.4"
-          }
-        },
-        "tty-browserify": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
-          "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
-        },
-        "url": {
-          "version": "0.11.3",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
-          "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
-          "requires": {
-            "punycode": "^1.4.1",
-            "qs": "^6.11.2"
-          }
-        },
-        "util": {
-          "version": "0.12.5",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-          "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "is-arguments": "^1.0.4",
-            "is-generator-function": "^1.0.7",
-            "is-typed-array": "^1.1.3",
-            "which-typed-array": "^1.1.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-        },
-        "vm-browserify": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-          "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
-        },
-        "which-typed-array": {
-          "version": "1.1.13",
-          "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-          "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
-          "requires": {
-            "available-typed-arrays": "^1.0.5",
-            "call-bind": "^1.0.4",
-            "for-each": "^0.3.3",
-            "gopd": "^1.0.1",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "xtend": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-          "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-        }
-      }
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true
-    },
-    "mitt": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
-      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
-      "dev": true
-    },
-    "mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "dev": true
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-    },
-    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dev": true,
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "node-preload": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
-      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
-      "dev": true,
-      "requires": {
-        "process-on-spawn": "^1.0.0"
-      }
-    },
-    "node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
-      "dev": true
-    },
-    "node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA=="
-    },
-    "nyc": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
-      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
-      "dev": true,
-      "requires": {
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "caching-transform": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "decamelize": "^1.2.0",
-        "find-cache-dir": "^3.2.0",
-        "find-up": "^4.1.0",
-        "foreground-child": "^2.0.0",
-        "get-package-type": "^0.1.0",
-        "glob": "^7.1.6",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-hook": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.0",
-        "istanbul-lib-processinfo": "^2.0.2",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.2",
-        "make-dir": "^3.0.0",
-        "node-preload": "^0.2.1",
-        "p-map": "^3.0.0",
-        "process-on-spawn": "^1.0.0",
-        "resolve-from": "^5.0.0",
-        "rimraf": "^3.0.0",
-        "signal-exit": "^3.0.2",
-        "spawn-wrap": "^2.0.0",
-        "test-exclude": "^6.0.0",
-        "yargs": "^15.0.2"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-          "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-          "dev": true
-        },
-        "istanbul-lib-instrument": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-          "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.7.5",
-            "@istanbuljs/schema": "^0.1.2",
-            "istanbul-lib-coverage": "^3.0.0",
-            "semver": "^6.3.0"
-          }
-        }
-      }
-    },
-    "oauth-sign": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-      "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
-      "optional": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
-    },
-    "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.groupby": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
-      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
-        "get-intrinsic": "^1.2.1"
-      }
-    },
-    "object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-      "dev": true,
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "package-hash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
-      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "hasha": "^5.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "release-zalgo": "^1.0.0"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
-    },
-    "picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "dev": true
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true
-    },
-    "pkg-conf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
-      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-          "dev": true
-        }
-      }
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.0.0"
-      }
-    },
-    "process-on-spawn": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
-      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
-      "dev": true,
-      "requires": {
-        "fromentries": "^1.2.0"
-      }
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
-    "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "requires": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      }
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
-    },
-    "psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "optional": true
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
-    },
-    "puppeteer": {
-      "version": "19.11.1",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz",
-      "integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==",
-      "dev": true,
-      "requires": {
-        "@puppeteer/browsers": "0.5.0",
-        "cosmiconfig": "8.1.3",
-        "https-proxy-agent": "5.0.1",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "puppeteer-core": "19.11.1"
-      }
-    },
-    "puppeteer-core": {
-      "version": "19.11.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz",
-      "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==",
-      "dev": true,
-      "requires": {
-        "@puppeteer/browsers": "0.5.0",
-        "chromium-bidi": "0.4.7",
-        "cross-fetch": "3.1.5",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.1107588",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "proxy-from-env": "1.1.0",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.13.0"
-      }
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "optional": true
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-      "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
-    },
-    "readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
-    },
-    "regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true
-    },
-    "release-zalgo": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-      "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
-      "dev": true,
-      "requires": {
-        "es6-error": "^4.0.1"
-      }
-    },
-    "request": {
-      "version": "2.40.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
-      "integrity": "sha512-waNoGB4Z7bPn+lgqPk7l7hhze4Vd68jKccnwLeS7vr9GMxz0iWQbYTbBNWzfIk87Urx7V44pu29qjF/omej+Fw==",
-      "requires": {
-        "aws-sign2": "~0.5.0",
-        "forever-agent": "~0.5.0",
-        "form-data": "~0.1.0",
-        "hawk": "1.1.1",
-        "http-signature": "~0.10.0",
-        "json-stringify-safe": "~5.0.0",
-        "mime-types": "~1.0.1",
-        "node-uuid": "~1.4.0",
-        "oauth-sign": "~0.3.0",
-        "qs": "~1.0.0",
-        "stringstream": "~0.0.4",
-        "tough-cookie": ">=0.12.0",
-        "tunnel-agent": "~0.4.0"
-      },
-      "dependencies": {
-        "mime-types": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
-          "integrity": "sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw=="
-        },
-        "qs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
-          "integrity": "sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg=="
-        }
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "optional": true
-    },
-    "resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.1.1",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
-    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "requires": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "dependencies": {
-        "function-bind": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-          "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-        },
-        "get-intrinsic": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-          "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-          "requires": {
-            "es-errors": "^1.3.0",
-            "function-bind": "^1.1.2",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "hasown": "^2.0.0"
-          }
-        },
-        "has-property-descriptors": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-          "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-          "requires": {
-            "es-define-property": "^1.0.0"
-          }
-        }
-      }
-    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "sntp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-      "integrity": "sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==",
-      "optional": true,
-      "requires": {
-        "hoek": "0.9.x"
-      }
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
-    },
-    "spawn-wrap": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
-      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
-      "dev": true,
-      "requires": {
-        "foreground-child": "^2.0.0",
-        "is-windows": "^1.0.2",
-        "make-dir": "^3.0.0",
-        "rimraf": "^3.0.0",
-        "signal-exit": "^3.0.2",
-        "which": "^2.0.1"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-    },
-    "standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
-      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
-      "dev": true,
-      "requires": {
-        "eslint": "^8.41.0",
-        "eslint-config-standard": "17.1.0",
-        "eslint-config-standard-jsx": "^11.0.0",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^15.7.0",
-        "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-react": "^7.32.2",
-        "standard-engine": "^15.0.0",
-        "version-guard": "^1.1.1"
-      }
-    },
-    "standard-engine": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
-      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^8.0.0",
-        "minimist": "^1.2.6",
-        "pkg-conf": "^3.1.0",
-        "xdg-basedir": "^4.0.0"
-      }
-    },
-    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      }
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-      "optional": true
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "dev": true,
-      "requires": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
-    "tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "requires": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      }
-    },
-    "test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "requires": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-    },
-    "tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "optional": true,
-      "requires": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "dependencies": {
-        "universalify": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-          "optional": true
-        }
-      }
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true
-    },
-    "tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-          "dev": true
-        }
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
-      "optional": true
-    },
-    "type-detect": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
-      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
-      "dev": true
-    },
-    "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      }
-    },
-    "typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      }
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "dev": true,
-      "optional": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
-    },
-    "update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
-      "dev": true,
-      "requires": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "optional": true,
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
-    },
-    "version-guard": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz",
-      "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ==",
-      "dev": true
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-module": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
-    },
-    "which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-      "dev": true
-    },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true
-    },
-    "y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
-      "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      }
-    },
-    "yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    },
-    "yui": {
-      "version": "3.18.1",
-      "resolved": "https://registry.npmjs.org/yui/-/yui-3.18.1.tgz",
-      "integrity": "sha512-M4/mHnq5uGvpwKEpRBh3SclL70cpDEus9LNGnrK5ZBzp4HOoueY7EkXfgtRBd+9VOQHWlFukXL2udHE53N4Wqw==",
-      "requires": {
-        "request": "~2.40.0"
-      }
-    },
-    "yuidocjs": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/yuidocjs/-/yuidocjs-0.10.2.tgz",
-      "integrity": "sha512-g0ZrXsaCmQL9zsvkgD+RxWDsMNkHne5tK72iWYodro9JQlfKxePcV1dwbGhKMy/fl1XCIW3R3erZudohU+PcEw==",
-      "requires": {
-        "express": "^4.13.1",
-        "graceful-fs": "^4.1.2",
-        "markdown-it": "^4.3.0",
-        "mdn-links": "^0.1.0",
-        "minimatch": "^3.0.2",
-        "rimraf": "^2.4.1",
-        "yui": "^3.18.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.1.1",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/testapp2/package.json b/testapp2/package.json
deleted file mode 100644
index 1a77cb1cf9..0000000000
--- a/testapp2/package.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "name": "testapp2",
-  "private": true,
-  "scripts": {
-    "setup": "mkdir -p packages && ln -sfn ../../ ./packages/meteor-roles",
-    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
-    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/meteor-roles",
-    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
-    "report": "nyc report -t .coverage",
-    "lint": "standard ../",
-    "lint:fix": "standard --fix ../"
-  },
-  "dependencies": {
-    "@babel/runtime": "7.25.6",
-    "meteor-node-stubs": "1.2.9",
-    "yuidocjs": "0.10.2"
-  },
-  "devDependencies": {
-    "babel-plugin-istanbul": "^6.1.1",
-    "chai": "^4.5.0",
-    "chai-as-promised": "^7.1.2",
-    "nyc": "^15.1.0",
-    "puppeteer": "^19.11.1",
-    "standard": "^17.1.0"
-  },
-  "babel": {
-    "env": {
-      "COVERAGE": {
-        "plugins": [
-          "istanbul"
-        ]
-      }
-    }
-  },
-  "standard": {
-    "ignore": [
-      "**/.meteor/",
-      "**/examples/",
-      "**/testapp2",
-      "**/testapp3",
-      "**/docs"
-    ]
-  }
-}
diff --git a/testapp3/.gitignore b/testapp3/.gitignore
deleted file mode 100644
index d1f89f83a8..0000000000
--- a/testapp3/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-.npm/
-.coverage/
-packages/
diff --git a/testapp3/.meteor/.finished-upgraders b/testapp3/.meteor/.finished-upgraders
deleted file mode 100644
index c07b6ff75a..0000000000
--- a/testapp3/.meteor/.finished-upgraders
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file contains information which helps Meteor properly upgrade your
-# app when you run 'meteor update'. You should check it into version control
-# with your project.
-
-notices-for-0.9.0
-notices-for-0.9.1
-0.9.4-platform-file
-notices-for-facebook-graph-api-2
-1.2.0-standard-minifiers-package
-1.2.0-meteor-platform-split
-1.2.0-cordova-changes
-1.2.0-breaking-changes
-1.3.0-split-minifiers-package
-1.4.0-remove-old-dev-bundle-link
-1.4.1-add-shell-server-package
-1.4.3-split-account-service-packages
-1.5-add-dynamic-import-package
-1.7-split-underscore-from-meteor-base
-1.8.3-split-jquery-from-blaze
diff --git a/testapp3/.meteor/.gitignore b/testapp3/.meteor/.gitignore
deleted file mode 100644
index 4083037423..0000000000
--- a/testapp3/.meteor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/testapp3/.meteor/.id b/testapp3/.meteor/.id
deleted file mode 100644
index 8dc86b3498..0000000000
--- a/testapp3/.meteor/.id
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file contains a token that is unique to your project.
-# Check it into your repository along with the rest of this directory.
-# It can be used for purposes such as:
-#   - ensuring you don't accidentally deploy one app on top of another
-#   - providing package authors with aggregated statistics
-
-rcbgjlqvg8sn.fgbt2fn0eab9
diff --git a/testapp3/.meteor/packages b/testapp3/.meteor/packages
deleted file mode 100644
index 5ad4d989a2..0000000000
--- a/testapp3/.meteor/packages
+++ /dev/null
@@ -1,19 +0,0 @@
-# Meteor packages used by this project, one per line.
-# Check this file (and the other files in this directory) into your repository.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-meteor-base@1.5.2             # Packages every Meteor app needs to have
-mobile-experience@1.1.2       # Packages for a great mobile UX
-mongo@2.0.1                   # The database Meteor supports right now
-static-html@1.3.3             # Define static page content in .html files
-reactive-var@1.0.13            # Reactive variable for tracker
-tracker@1.3.4                 # Meteor's client-side reactive programming library
-
-standard-minifier-css@1.9.3   # CSS minifier run for production mode
-standard-minifier-js@3.0.0    # JS minifier run for production mode
-es5-shim@4.8.1                # ECMAScript 5 compatibility for older browsers
-ecmascript@0.16.9              # Enable ECMAScript2015+ syntax in app code
-typescript@5.4.3              # Enable TypeScript syntax in .ts and .tsx modules
-shell-server@0.6.0            # Server-side component of the `meteor shell` command
diff --git a/testapp3/.meteor/platforms b/testapp3/.meteor/platforms
deleted file mode 100644
index efeba1b50c..0000000000
--- a/testapp3/.meteor/platforms
+++ /dev/null
@@ -1,2 +0,0 @@
-server
-browser
diff --git a/testapp3/.meteor/release b/testapp3/.meteor/release
deleted file mode 100644
index 8b5075d472..0000000000
--- a/testapp3/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-METEOR@3.0.2
diff --git a/testapp3/.meteor/versions b/testapp3/.meteor/versions
deleted file mode 100644
index 272529f735..0000000000
--- a/testapp3/.meteor/versions
+++ /dev/null
@@ -1,70 +0,0 @@
-allow-deny@2.0.0
-autoupdate@2.0.0
-babel-compiler@7.11.0
-babel-runtime@1.5.2
-base64@1.0.13
-binary-heap@1.0.12
-blaze-tools@2.0.0
-boilerplate-generator@2.0.0
-caching-compiler@2.0.0
-caching-html-compiler@2.0.0
-callback-hook@1.6.0
-check@1.4.2
-core-runtime@1.0.0
-ddp@1.4.2
-ddp-client@3.0.1
-ddp-common@1.4.4
-ddp-server@3.0.1
-diff-sequence@1.1.3
-dynamic-import@0.7.4
-ecmascript@0.16.9
-ecmascript-runtime@0.8.2
-ecmascript-runtime-client@0.12.2
-ecmascript-runtime-server@0.11.1
-ejson@1.1.4
-es5-shim@4.8.1
-facts-base@1.0.2
-fetch@0.1.5
-geojson-utils@1.0.12
-hot-code-push@1.0.5
-html-tools@2.0.0
-htmljs@2.0.1
-id-map@1.2.0
-inter-process-messaging@0.1.2
-launch-screen@2.0.1
-logging@1.3.5
-meteor@2.0.1
-meteor-base@1.5.2
-minifier-css@2.0.0
-minifier-js@3.0.0
-minimongo@2.0.1
-mobile-experience@1.1.2
-mobile-status-bar@1.1.1
-modern-browsers@0.1.11
-modules@0.20.1
-modules-runtime@0.13.2
-mongo@2.0.1
-mongo-decimal@0.1.4-beta300.7
-mongo-dev-server@1.1.1
-mongo-id@1.0.9
-npm-mongo@4.17.4
-ordered-dict@1.2.0
-promise@1.0.0
-random@1.2.2
-react-fast-refresh@0.2.9
-reactive-var@1.0.13
-reload@1.3.2
-retry@1.1.1
-routepolicy@1.1.2
-shell-server@0.6.0
-socket-stream-client@0.5.3
-spacebars-compiler@2.0.0
-standard-minifier-css@1.9.3
-standard-minifier-js@3.0.0
-static-html@1.3.3
-templating-tools@2.0.0
-tracker@1.3.4
-typescript@5.4.3
-underscore@1.6.4
-webapp@2.0.1
-webapp-hashing@1.1.2
diff --git a/testapp3/package-lock.json b/testapp3/package-lock.json
deleted file mode 100644
index 4115f637c7..0000000000
--- a/testapp3/package-lock.json
+++ /dev/null
@@ -1,7104 +0,0 @@
-{
-  "name": "testapp3",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "testapp3",
-      "dependencies": {
-        "@babel/runtime": "^7.25.6",
-        "meteor-node-stubs": "^1.2.9"
-      },
-      "devDependencies": {
-        "babel-plugin-istanbul": "^6.1.1",
-        "chai": "^4.5.0",
-        "chai-as-promised": "^7.1.2",
-        "nyc": "^15.1.0",
-        "puppeteer": "^23.3.0",
-        "standard": "^17.1.0"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.24.7",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
-      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
-      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.25.6",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
-      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
-      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
-      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
-      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.25.6"
-      },
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
-      "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.25.0",
-        "@babel/types": "^7.25.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
-      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.6",
-        "@babel/parser": "^7.25.6",
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
-      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
-      "dev": true,
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "deprecated": "Use @eslint/config-array instead",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@puppeteer/browsers": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz",
-      "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.6",
-        "extract-zip": "^2.0.1",
-        "progress": "^2.0.3",
-        "proxy-agent": "^6.4.0",
-        "semver": "^7.6.3",
-        "tar-fs": "^3.0.6",
-        "unbzip2-stream": "^1.4.3",
-        "yargs": "^17.7.2"
-      },
-      "bin": {
-        "browsers": "lib/cjs/main-cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@puppeteer/browsers/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@tootallnate/quickjs-emscripten": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
-      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
-      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "undici-types": "~6.19.2"
-      }
-    },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/append-transform": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
-      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
-      "dev": true,
-      "dependencies": {
-        "default-require-extensions": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.findlast": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
-      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
-      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.tosorted": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
-      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.3",
-        "es-errors": "^1.3.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ast-types": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
-      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
-      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
-      "dev": true,
-      "dependencies": {
-        "possible-typed-array-names": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/b4a": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
-      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
-      "dev": true
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/bare-events": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
-      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/bare-fs": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.3.tgz",
-      "integrity": "sha512-7RYKL+vZVCyAsMLi5SPu7QGauGGT8avnP/HO571ndEuV4MYdGXvLhtW67FuLPeEI8EiIY7zbbRR9x7x7HU0kgw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "bare-events": "^2.0.0",
-        "bare-path": "^2.0.0",
-        "bare-stream": "^2.0.0"
-      }
-    },
-    "node_modules/bare-os": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.2.tgz",
-      "integrity": "sha512-HZoJwzC+rZ9lqEemTMiO0luOePoGYNBgsLLgegKR/cljiJvcDNhDZQkzC+NC5Oh0aHbdBNSOHpghwMuB5tqhjg==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/bare-path": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
-      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "bare-os": "^2.1.0"
-      }
-    },
-    "node_modules/bare-stream": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.2.1.tgz",
-      "integrity": "sha512-YTB47kHwBW9zSG8LD77MIBAAQXjU2WjAkMHeeb7hUplVs6+IoM5I7uEVQNPMB7lj9r8I76UMdoMkGnCodHOLqg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "b4a": "^1.6.6",
-        "streamx": "^2.18.0"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/basic-ftp": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
-      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.23.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001646",
-        "electron-to-chromium": "^1.5.4",
-        "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/builtins": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
-      "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.0.0"
-      }
-    },
-    "node_modules/builtins/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/caching-transform": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
-      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
-      "dev": true,
-      "dependencies": {
-        "hasha": "^5.0.0",
-        "make-dir": "^3.0.0",
-        "package-hash": "^4.0.0",
-        "write-file-atomic": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001655",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
-      "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/chai": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz",
-      "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==",
-      "dev": true,
-      "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chai-as-promised": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
-      "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
-      "dev": true,
-      "dependencies": {
-        "check-error": "^1.0.2"
-      },
-      "peerDependencies": {
-        "chai": ">= 2.1.2 < 6"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-error": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.2"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/chromium-bidi": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz",
-      "integrity": "sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA==",
-      "dev": true,
-      "dependencies": {
-        "mitt": "3.0.1",
-        "urlpattern-polyfill": "10.0.0",
-        "zod": "3.23.8"
-      },
-      "peerDependencies": {
-        "devtools-protocol": "*"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-      "dev": true,
-      "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/cosmiconfig/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/data-uri-to-buffer": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
-      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/deep-eql": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
-      "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/default-require-extensions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
-      "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==",
-      "dev": true,
-      "dependencies": {
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/degenerator": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
-      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
-      "dev": true,
-      "dependencies": {
-        "ast-types": "^0.13.4",
-        "escodegen": "^2.1.0",
-        "esprima": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/devtools-protocol": {
-      "version": "0.0.1330662",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1330662.tgz",
-      "integrity": "sha512-pzh6YQ8zZfz3iKlCvgzVCu22NdpZ8hNmwU6WnQjNVquh0A9iVosPtNLWDwaWVGyrntQlltPFztTMK5Cg6lfCuw==",
-      "dev": true
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.5.13",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
-      "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
-        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
-        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-iterator-helpers": {
-      "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
-      "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.3",
-        "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.3",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "globalthis": "^1.0.3",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.7",
-        "iterator.prototype": "^1.1.2",
-        "safe-array-concat": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
-    },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
-      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^8.0.1",
-        "eslint-plugin-import": "^2.25.2",
-        "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
-        "eslint-plugin-promise": "^6.0.0"
-      }
-    },
-    "node_modules/eslint-config-standard-jsx": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
-      "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peerDependencies": {
-        "eslint": "^8.8.0",
-        "eslint-plugin-react": "^7.28.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.13.0",
-        "resolve": "^1.22.4"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.2.tgz",
-      "integrity": "sha512-3XnC5fDyc8M4J2E8pt8pmSVRX2M+5yWMCfI/kDZwauQeFgzQOuhcRBFKjTeJagqgk4sFKxe1mvNVnaWwImx/Tg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-es": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
-      "dev": true,
-      "dependencies": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
-      }
-    },
-    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
-      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
-        "semver": "^6.3.1",
-        "tsconfig-paths": "^3.15.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-n": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
-      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
-      "dev": true,
-      "dependencies": {
-        "builtins": "^5.0.1",
-        "eslint-plugin-es": "^4.1.0",
-        "eslint-utils": "^3.0.0",
-        "ignore": "^5.1.1",
-        "is-core-module": "^2.11.0",
-        "minimatch": "^3.1.2",
-        "resolve": "^1.22.1",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">=12.22.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-n/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-promise": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz",
-      "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.35.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz",
-      "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.8",
-        "array.prototype.findlast": "^1.2.5",
-        "array.prototype.flatmap": "^1.3.2",
-        "array.prototype.tosorted": "^1.1.4",
-        "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.19",
-        "estraverse": "^5.3.0",
-        "hasown": "^2.0.2",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.8",
-        "object.fromentries": "^2.0.8",
-        "object.values": "^1.2.0",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.5",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.11",
-        "string.prototype.repeat": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.5",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
-      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/eslint/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-fifo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
-    },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "node_modules/foreground-child": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/fromentries": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
-      "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.5",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-uri": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
-      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
-      "dev": true,
-      "dependencies": {
-        "basic-ftp": "^5.0.2",
-        "data-uri-to-buffer": "^6.0.2",
-        "debug": "^4.3.4",
-        "fs-extra": "^11.2.0"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasha": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-      "dev": true,
-      "dependencies": {
-        "is-stream": "^2.0.0",
-        "type-fest": "^0.8.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
-      "dev": true,
-      "dependencies": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/ip-address/node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "dev": true
-    },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-async-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
-      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
-      "dev": true,
-      "dependencies": {
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-finalizationregistry": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
-      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
-      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-set": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
-      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
-      "dev": true,
-      "dependencies": {
-        "which-typed-array": "^1.1.14"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
-    },
-    "node_modules/is-weakmap": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
-      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakset": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
-      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-hook": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
-      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
-      "dev": true,
-      "dependencies": {
-        "append-transform": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-processinfo": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz",
-      "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==",
-      "dev": true,
-      "dependencies": {
-        "archy": "^1.0.0",
-        "cross-spawn": "^7.0.3",
-        "istanbul-lib-coverage": "^3.2.0",
-        "p-map": "^3.0.0",
-        "rimraf": "^3.0.0",
-        "uuid": "^8.3.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dev": true,
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/iterator.prototype": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
-      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "reflect.getprototypeof": "^1.0.4",
-        "set-function-name": "^2.0.1"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "dev": true
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/load-json-file": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/type-fest": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/loupe": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.1"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meteor-node-stubs": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.10.tgz",
-      "integrity": "sha512-zP1AVg8sOATz15yfy11R2VTx+IZFfAOXi8GuZa8tOfeVT1tKaqDooAbFylnIXwpStSu6HRBUhQqHtR06Qr9aEA==",
-      "bundleDependencies": [
-        "@meteorjs/crypto-browserify",
-        "assert",
-        "browserify-zlib",
-        "buffer",
-        "console-browserify",
-        "constants-browserify",
-        "domain-browser",
-        "events",
-        "https-browserify",
-        "os-browserify",
-        "path-browserify",
-        "process",
-        "punycode",
-        "querystring-es3",
-        "readable-stream",
-        "stream-browserify",
-        "stream-http",
-        "string_decoder",
-        "timers-browserify",
-        "tty-browserify",
-        "url",
-        "util",
-        "vm-browserify"
-      ],
-      "dependencies": {
-        "@meteorjs/crypto-browserify": "^3.12.1",
-        "assert": "^2.1.0",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^5.7.1",
-        "console-browserify": "^1.2.0",
-        "constants-browserify": "^1.0.0",
-        "domain-browser": "^4.23.0",
-        "elliptic": "^6.5.7",
-        "events": "^3.3.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "^1.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.4.1",
-        "querystring-es3": "^0.2.1",
-        "readable-stream": "^3.6.2",
-        "stream-browserify": "^3.0.0",
-        "stream-http": "^3.2.0",
-        "string_decoder": "^1.3.0",
-        "timers-browserify": "^2.0.12",
-        "tty-browserify": "0.0.1",
-        "url": "^0.11.4",
-        "util": "^0.12.5",
-        "vm-browserify": "^1.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/crypto-browserify": {
-      "version": "3.12.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "browserify-cipher": "^1.0.1",
-        "browserify-sign": "^4.2.3",
-        "create-ecdh": "^4.0.4",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "diffie-hellman": "^5.0.3",
-        "hash-base": "~3.0.4",
-        "inherits": "^2.0.4",
-        "pbkdf2": "^3.1.2",
-        "public-encrypt": "^4.0.3",
-        "randombytes": "^2.1.0",
-        "randomfill": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/@meteorjs/crypto-browserify/node_modules/hash-base": {
-      "version": "3.0.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/asn1.js": {
-      "version": "4.10.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/assert": {
-      "version": "2.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-nan": "^1.3.2",
-        "object-is": "^1.1.5",
-        "object.assign": "^4.1.4",
-        "util": "^0.12.5"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/base64-js": {
-      "version": "1.5.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/bn.js": {
-      "version": "5.2.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/brorand": {
-      "version": "1.1.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-des": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-sign": {
-      "version": "4.2.3",
-      "inBundle": true,
-      "license": "ISC",
-      "dependencies": {
-        "bn.js": "^5.2.1",
-        "browserify-rsa": "^4.1.0",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.5",
-        "hash-base": "~3.0",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.7",
-        "readable-stream": "^2.3.8",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/bn.js": {
-      "version": "5.2.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/hash-base": {
-      "version": "3.0.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/readable-stream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-sign/node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/buffer": {
-      "version": "5.7.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/call-bind": {
-      "version": "1.0.7",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/cipher-base": {
-      "version": "1.0.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/console-browserify": {
-      "version": "1.2.0",
-      "inBundle": true
-    },
-    "node_modules/meteor-node-stubs/node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/core-util-is": {
-      "version": "1.0.3",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/create-hash": {
-      "version": "1.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/create-hmac": {
-      "version": "1.1.7",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/define-data-property": {
-      "version": "1.1.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/define-properties": {
-      "version": "1.2.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/des.js": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/domain-browser": {
-      "version": "4.23.0",
-      "inBundle": true,
-      "license": "Artistic-2.0",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/elliptic": {
-      "version": "6.5.7",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/es-define-property": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/es-errors": {
-      "version": "1.3.0",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/events": {
-      "version": "3.3.0",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/for-each": {
-      "version": "0.3.3",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/function-bind": {
-      "version": "1.1.2",
-      "inBundle": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/gopd": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/has-proto": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/hash-base": {
-      "version": "3.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/hash.js": {
-      "version": "1.1.7",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/hasown": {
-      "version": "2.0.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/https-browserify": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/ieee754": {
-      "version": "1.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "inBundle": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/meteor-node-stubs/node_modules/inherits": {
-      "version": "2.0.4",
-      "inBundle": true,
-      "license": "ISC"
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-arguments": {
-      "version": "1.1.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-callable": {
-      "version": "1.2.7",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-nan": {
-      "version": "1.3.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "which-typed-array": "^1.1.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/isarray": {
-      "version": "1.0.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/md5.js": {
-      "version": "1.3.5",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "ISC"
-    },
-    "node_modules/meteor-node-stubs/node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/object-inspect": {
-      "version": "1.13.2",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/object-is": {
-      "version": "1.1.5",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/object-keys": {
-      "version": "1.1.1",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/object.assign": {
-      "version": "4.1.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/os-browserify": {
-      "version": "0.3.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/pako": {
-      "version": "1.0.11",
-      "inBundle": true,
-      "license": "(MIT AND Zlib)"
-    },
-    "node_modules/meteor-node-stubs/node_modules/parse-asn1": {
-      "version": "5.1.7",
-      "inBundle": true,
-      "license": "ISC",
-      "dependencies": {
-        "asn1.js": "^4.10.1",
-        "browserify-aes": "^1.2.0",
-        "evp_bytestokey": "^1.0.3",
-        "hash-base": "~3.0",
-        "pbkdf2": "^3.1.2",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/parse-asn1/node_modules/hash-base": {
-      "version": "3.0.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/path-browserify": {
-      "version": "1.0.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/process": {
-      "version": "0.11.10",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/punycode": {
-      "version": "1.4.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/qs": {
-      "version": "6.13.0",
-      "inBundle": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "side-channel": "^1.0.6"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "inBundle": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/randombytes": {
-      "version": "2.1.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/randomfill": {
-      "version": "1.0.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/ripemd160": {
-      "version": "2.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/set-function-length": {
-      "version": "1.2.2",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/setimmediate": {
-      "version": "1.0.5",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/sha.js": {
-      "version": "2.4.11",
-      "inBundle": true,
-      "license": "(MIT AND BSD-3-Clause)",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/side-channel": {
-      "version": "1.0.6",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/stream-browserify": {
-      "version": "3.0.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "~2.0.4",
-        "readable-stream": "^3.5.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/stream-http": {
-      "version": "3.2.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/string_decoder": {
-      "version": "1.3.0",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/tty-browserify": {
-      "version": "0.0.1",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/url": {
-      "version": "0.11.4",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^1.4.1",
-        "qs": "^6.12.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/util": {
-      "version": "0.12.5",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "inBundle": true,
-      "license": "MIT"
-    },
-    "node_modules/meteor-node-stubs/node_modules/which-typed-array": {
-      "version": "1.1.13",
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/meteor-node-stubs/node_modules/xtend": {
-      "version": "4.0.2",
-      "inBundle": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/mitt": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
-      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
-      "dev": true
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/netmask": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
-      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/node-preload": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
-      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
-      "dev": true,
-      "dependencies": {
-        "process-on-spawn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
-      "dev": true
-    },
-    "node_modules/nyc": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
-      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
-      "dev": true,
-      "dependencies": {
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "caching-transform": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "decamelize": "^1.2.0",
-        "find-cache-dir": "^3.2.0",
-        "find-up": "^4.1.0",
-        "foreground-child": "^2.0.0",
-        "get-package-type": "^0.1.0",
-        "glob": "^7.1.6",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-hook": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.0",
-        "istanbul-lib-processinfo": "^2.0.2",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.2",
-        "make-dir": "^3.0.0",
-        "node-preload": "^0.2.1",
-        "p-map": "^3.0.0",
-        "process-on-spawn": "^1.0.0",
-        "resolve-from": "^5.0.0",
-        "rimraf": "^3.0.0",
-        "signal-exit": "^3.0.2",
-        "spawn-wrap": "^2.0.0",
-        "test-exclude": "^6.0.0",
-        "yargs": "^15.0.2"
-      },
-      "bin": {
-        "nyc": "bin/nyc.js"
-      },
-      "engines": {
-        "node": ">=8.9"
-      }
-    },
-    "node_modules/nyc/node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
-    },
-    "node_modules/nyc/node_modules/istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.7.5",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
-      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.fromentries": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
-      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.groupby": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
-      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
-      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.5"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pac-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/quickjs-emscripten": "^0.23.0",
-        "agent-base": "^7.0.2",
-        "debug": "^4.3.4",
-        "get-uri": "^6.0.1",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.5",
-        "pac-resolver": "^7.0.1",
-        "socks-proxy-agent": "^8.0.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/pac-resolver": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
-      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
-      "dev": true,
-      "dependencies": {
-        "degenerator": "^5.0.0",
-        "netmask": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/package-hash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
-      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.15",
-        "hasha": "^5.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "release-zalgo": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "dev": true
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
-      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-conf/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/possible-typed-array-names": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/process-on-spawn": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
-      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
-      "dev": true,
-      "dependencies": {
-        "fromentries": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/proxy-agent": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
-      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "^4.3.4",
-        "http-proxy-agent": "^7.0.1",
-        "https-proxy-agent": "^7.0.3",
-        "lru-cache": "^7.14.1",
-        "pac-proxy-agent": "^7.0.1",
-        "proxy-from-env": "^1.1.0",
-        "socks-proxy-agent": "^8.0.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/puppeteer": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.3.0.tgz",
-      "integrity": "sha512-e2jY8cdWSUGsrLxqGm3hIbJq/UIk1uOY8XY7SM51leXkH7shrIyE91lK90Q9byX6tte+cyL3HKqlWBEd6TjWTA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "@puppeteer/browsers": "2.4.0",
-        "chromium-bidi": "0.6.5",
-        "cosmiconfig": "^9.0.0",
-        "devtools-protocol": "0.0.1330662",
-        "puppeteer-core": "23.3.0",
-        "typed-query-selector": "^2.12.0"
-      },
-      "bin": {
-        "puppeteer": "lib/cjs/puppeteer/node/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/puppeteer-core": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.3.0.tgz",
-      "integrity": "sha512-sB2SsVMFs4gKad5OCdv6w5vocvtEUrRl0zQqSyRPbo/cj1Ktbarmhxy02Zyb9R9HrssBcJDZbkrvBnbaesPyYg==",
-      "dev": true,
-      "dependencies": {
-        "@puppeteer/browsers": "2.4.0",
-        "chromium-bidi": "0.6.5",
-        "debug": "^4.3.6",
-        "devtools-protocol": "0.0.1330662",
-        "typed-query-selector": "^2.12.0",
-        "ws": "^8.18.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-      "dev": true
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
-    },
-    "node_modules/reflect.getprototypeof": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz",
-      "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.1",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "globalthis": "^1.0.3",
-        "which-builtin-type": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.6",
-        "define-properties": "^1.2.1",
-        "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/release-zalgo": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-      "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
-      "dev": true,
-      "dependencies": {
-        "es6-error": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
-    },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/set-function-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
-      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
-      "dev": true,
-      "dependencies": {
-        "ip-address": "^9.0.5",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^7.1.1",
-        "debug": "^4.3.4",
-        "socks": "^2.8.3"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/spawn-wrap": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
-      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^2.0.0",
-        "is-windows": "^1.0.2",
-        "make-dir": "^3.0.0",
-        "rimraf": "^3.0.0",
-        "signal-exit": "^3.0.2",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
-    "node_modules/standard": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz",
-      "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "eslint": "^8.41.0",
-        "eslint-config-standard": "17.1.0",
-        "eslint-config-standard-jsx": "^11.0.0",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^15.7.0",
-        "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-react": "^7.32.2",
-        "standard-engine": "^15.0.0",
-        "version-guard": "^1.1.1"
-      },
-      "bin": {
-        "standard": "bin/cmd.cjs"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/standard-engine": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz",
-      "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "get-stdin": "^8.0.0",
-        "minimist": "^1.2.6",
-        "pkg-conf": "^3.1.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/streamx": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.20.0.tgz",
-      "integrity": "sha512-ZGd1LhDeGFucr1CUCTBOS58ZhEendd0ttpGT3usTvosS4ntIwKN9LJFp+OeCSprsCPL14BXVRZlHGRY1V9PVzQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-fifo": "^1.3.2",
-        "queue-tick": "^1.0.1",
-        "text-decoder": "^1.1.0"
-      },
-      "optionalDependencies": {
-        "bare-events": "^2.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
-      "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.7",
-        "regexp.prototype.flags": "^1.5.2",
-        "set-function-name": "^2.0.2",
-        "side-channel": "^1.0.6"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.repeat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
-      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
-      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/tar-fs": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
-      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0",
-        "tar-stream": "^3.1.5"
-      },
-      "optionalDependencies": {
-        "bare-fs": "^2.1.1",
-        "bare-path": "^2.1.0"
-      }
-    },
-    "node_modules/tar-stream": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
-      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
-      "dev": true,
-      "dependencies": {
-        "b4a": "^1.6.4",
-        "fast-fifo": "^1.2.0",
-        "streamx": "^2.15.0"
-      }
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/text-decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
-      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
-      "dev": true,
-      "dependencies": {
-        "b4a": "^1.6.4"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
-      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
-      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-query-selector": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
-      "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",
-      "dev": true
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/urlpattern-polyfill": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
-      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
-      "dev": true
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/version-guard": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.2.tgz",
-      "integrity": "sha512-D8d+YxCUpoqtCnQzDxm6SF7DLU3gr2535T4khAtMq4osBahsQnmSxuwXFdrbAdDGG8Uokzfis/jvyeFPdmlc7w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.48"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-builtin-type": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz",
-      "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==",
-      "dev": true,
-      "dependencies": {
-        "function.prototype.name": "^1.1.6",
-        "has-tostringtag": "^1.0.2",
-        "is-async-function": "^2.0.0",
-        "is-date-object": "^1.0.5",
-        "is-finalizationregistry": "^1.0.2",
-        "is-generator-function": "^1.0.10",
-        "is-regex": "^1.1.4",
-        "is-weakref": "^1.0.2",
-        "isarray": "^2.0.5",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.2",
-        "which-typed-array": "^1.1.15"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-collection": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
-      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
-      "dev": true,
-      "dependencies": {
-        "is-map": "^2.0.3",
-        "is-set": "^2.0.3",
-        "is-weakmap": "^2.0.2",
-        "is-weakset": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
-      "dev": true
-    },
-    "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dev": true,
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zod": {
-      "version": "3.23.8",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
-      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    }
-  }
-}
diff --git a/testapp3/package.json b/testapp3/package.json
deleted file mode 100644
index 9094402518..0000000000
--- a/testapp3/package.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "testapp3",
-  "private": true,
-  "scripts": {
-    "setup": "mkdir -p packages && ln -sfn ../../ ./packages/meteor-roles",
-    "test": "TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
-    "test:watch": "TEST_BROWSER_DRIVER=puppeteer TEST_WATCH=1 meteor test-packages --raw-logs --driver-package meteortesting:mocha ./packages/meteor-roles",
-    "test:coverage": "TEST_BROWSER_DRIVER=puppeteer TEST_CLIENT=1 TEST_SERVER=1 COVERAGE=1 COVERAGE_OUT_JSON=1 COVERAGE_OUT_HTML=1 COVERAGE_APP_FOLDER=$(pwd)/ meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ./packages/meteor-roles",
-    "report": "nyc report -t .coverage",
-    "lint": "standard ../",
-    "lint:fix": "standard --fix ../"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.25.6",
-    "meteor-node-stubs": "^1.2.9"
-  },
-  "devDependencies": {
-    "babel-plugin-istanbul": "^6.1.1",
-    "chai": "^4.5.0",
-    "chai-as-promised": "^7.1.2",
-    "nyc": "^15.1.0",
-    "puppeteer": "^23.3.0",
-    "standard": "^17.1.0"
-  },
-  "babel": {
-    "env": {
-      "COVERAGE": {
-        "plugins": [
-          "istanbul"
-        ]
-      }
-    }
-  },
-  "standard": {
-    "ignore": [
-      "**/.meteor/",
-      "**/examples/",
-      "**/testapp2",
-      "**/testapp3",
-      "**/docs"
-    ]
-  }
-}
diff --git a/yuidoc.json b/yuidoc.json
deleted file mode 100644
index 1f509a05ae..0000000000
--- a/yuidoc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "The meteor-roles API",
-  "description": "The meteor-roles API: an authorization package for Meteor",
-  "version": "v4.0.0",
-  "options": {
-    "outdir": "./docs",
-    "exclude": ".meteor,.build,tests",
-    "paths": ["roles/", "roles/client/"]
-  }
-}

From 7411809e5cc3ea9f0c9f256bf06963e94ad53ebc Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 1 Oct 2024 20:33:57 +0200
Subject: [PATCH 0523/1140] Node v22.9.0

---
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 4 ++--
 scripts/dev-bundle-tool-package.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meteor b/meteor
index 47016dc625..1dc0a1582e 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=20.17.0.6
+BUNDLE_VERSION=22.9.0.0
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index ef59103451..ebe4139111 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,10 +5,10 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=20.17.0
+NODE_VERSION=22.9.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
-NPM_VERSION=10.8.2
+NPM_VERSION=10.8.3
 
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index ea944379b7..45d7d30d3f 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -10,7 +10,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.8.2",
+    npm: "10.8.3",
     "node-gyp": "9.4.0",
     "@mapbox/node-pre-gyp": "1.0.11",
     typescript: "5.4.5",

From 39160eef28e1bb3fef3e899f0db9209eaf3f1e1d Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 1 Oct 2024 20:37:00 +0200
Subject: [PATCH 0524/1140] Update workflows

---
 .github/workflows/check-code-style.yml         | 2 +-
 .github/workflows/check-syntax.yml             | 2 +-
 .github/workflows/meteor-selftest-windows.yml  | 2 +-
 .github/workflows/npm-eslint-plugin-meteor.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check-code-style.yml b/.github/workflows/check-code-style.yml
index 5b7dbbac4c..8b24944b3f 100644
--- a/.github/workflows/check-code-style.yml
+++ b/.github/workflows/check-code-style.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - run: npm ci
       - name: Run ESLint@8
         run: npx eslint@8 "./npm-packages/meteor-installer/**/*.js"
diff --git a/.github/workflows/check-syntax.yml b/.github/workflows/check-syntax.yml
index 1f9f151c94..90aa5285bd 100644
--- a/.github/workflows/check-syntax.yml
+++ b/.github/workflows/check-syntax.yml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - run: cd scripts/admin/check-legacy-syntax && npm ci
       - name: Check syntax
         run: cd scripts/admin/check-legacy-syntax && node check-syntax.js
diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index d78f633ec3..80e1b64166 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 20.x
+          node-version: 22.x
 
       - name: Install dependencies
         shell: pwsh
diff --git a/.github/workflows/npm-eslint-plugin-meteor.yml b/.github/workflows/npm-eslint-plugin-meteor.yml
index 29a72f0005..ff51a2e847 100644
--- a/.github/workflows/npm-eslint-plugin-meteor.yml
+++ b/.github/workflows/npm-eslint-plugin-meteor.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
           cache: npm
       - run: npm ci
       - run: npm test

From 5477de75799ad4e355114989d54068c5754d4e36 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 1 Oct 2024 20:39:44 +0200
Subject: [PATCH 0525/1140] Update Travis and CircleCI

Except the images
---
 .circleci/config.yml | 2 +-
 .travis.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62b5e0a3aa..3396ca95a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -178,7 +178,7 @@ jobs:
           command: |
             eval $PRE_TEST_COMMANDS;
             cd dev_bundle/lib
-            ../../meteor npm install @types/node@20.10.5 --save-dev
+            ../../meteor npm install @types/node@22.7.4 --save-dev
             # Ensure that meteor/tools has no TypeScript errors.
             ../../meteor npm install -g typescript
             cd ../../
diff --git a/.travis.yml b/.travis.yml
index 4d9997a4d7..48ff56225d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "20.15.1"
+  - "22.9.0"
 cache:
   directories:
     - ".meteor"

From 354048d52196933f0b5246c1677ba767d846506b Mon Sep 17 00:00:00 2001
From: sebastiandion <swd7104@gmail.com>
Date: Wed, 2 Oct 2024 13:52:01 -0400
Subject: [PATCH 0526/1140] Fixed issue with Firefox IOS not being marked as
 modern browser (#13126)

---
 .../changelog/versions/0-before-2.10.md       |  1 +
 docs/history.md                               |  1 +
 package-lock.json                             |  3 +-
 package.json                                  |  2 +-
 .../ecmascript-runtime-client/versions.js     |  1 +
 packages/fetch/server.js                      |  1 +
 packages/modern-browsers/modern.js            | 64 ++++++++++---------
 7 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/docs/generators/changelog/versions/0-before-2.10.md b/docs/generators/changelog/versions/0-before-2.10.md
index 1774e87739..54c856eaa8 100644
--- a/docs/generators/changelog/versions/0-before-2.10.md
+++ b/docs/generators/changelog/versions/0-before-2.10.md
@@ -2935,6 +2935,7 @@ N/A
   setMinimumBrowserVersions({
     chrome: 49,
     firefox: 45,
+    firefoxIOS: 100,
     edge: 12,
     ie: Infinity, // Sorry, IE11.
     mobile_safari: [9, 2], // 9.2.0+
diff --git a/docs/history.md b/docs/history.md
index 5f9df5f8d7..e206711c49 100644
--- a/docs/history.md
+++ b/docs/history.md
@@ -4651,6 +4651,7 @@ N/A
   setMinimumBrowserVersions({
     chrome: 49,
     firefox: 45,
+    firefoxIOS: 100,
     edge: 12,
     ie: Infinity, // Sorry, IE11.
     mobile_safari: [9, 2], // 9.2.0+
diff --git a/package-lock.json b/package-lock.json
index 1ca8bd21d9..6aa4dd436a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-react": "^7.32.2",
         "eslint-plugin-react-hooks": "^4.6.0",
-        "prettier": "^2.8.6",
+        "prettier": "^2.8.8",
         "typescript": "^5.4.5"
       }
     },
@@ -4236,6 +4236,7 @@
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
       "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
diff --git a/package.json b/package.json
index 16de72f280..537923f54d 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "prettier": "^2.8.6",
+    "prettier": "^2.8.8",
     "typescript": "^5.4.5"
   },
   "jshintConfig": {
diff --git a/packages/ecmascript-runtime-client/versions.js b/packages/ecmascript-runtime-client/versions.js
index 003034a645..9f28a29cf7 100644
--- a/packages/ecmascript-runtime-client/versions.js
+++ b/packages/ecmascript-runtime-client/versions.js
@@ -9,6 +9,7 @@ setMinimumBrowserVersions({
   // (pre-Edge) from the modern classification. #9818 #9839
   ie: 12,
   firefox: 45,
+  firefoxIOS: 100,
   mobileSafari: 10,
   opera: 38,
   safari: 10,
diff --git a/packages/fetch/server.js b/packages/fetch/server.js
index 69cab03b4b..c64eab74b8 100644
--- a/packages/fetch/server.js
+++ b/packages/fetch/server.js
@@ -12,6 +12,7 @@ setMinimumBrowserVersions({
   chrome: 42,
   edge: 14,
   firefox: 39,
+  firefoxIOS: 100,
   mobile_safari: [10, 3],
   opera: 29,
   safari: [10, 1],
diff --git a/packages/modern-browsers/modern.js b/packages/modern-browsers/modern.js
index 19ff2734ae..3aac20f592 100644
--- a/packages/modern-browsers/modern.js
+++ b/packages/modern-browsers/modern.js
@@ -6,9 +6,9 @@ const hasOwn = Object.prototype.hasOwnProperty;
 const browserAliases = {
   chrome: [
     // chromeMobile*, per https://github.com/meteor/meteor/pull/9793,
-    'chromeMobile',
-    'chromeMobileIOS',
-    'chromeMobileWebView',
+    "chromeMobile",
+    "chromeMobileIOS",
+    "chromeMobileWebView",
 
     // The major version number of Chromium and Headless Chrome track with the
     // releases of Chrome Dev, Canary and Stable, so we should be okay to
@@ -18,24 +18,24 @@ const browserAliases = {
     // Chromium is particularly important to list here since, unlike macOS
     // builds, Linux builds list Chromium in the userAgent along with Chrome:
     //   e.g. Chromium/70.0.3538.77 Chrome/70.0.3538.77
-    'chromium',
-    'headlesschrome',
+    "chromium",
+    "headlesschrome",
   ],
 
-  // If a call to setMinimumBrowserVersions specifies Edge 12 as a minimum
+  // If a call to  specifies Edge 12 as a minimum
   // version, that means no version of Internet Explorer pre-Edge should
   // be classified as modern. This edge:["ie"] alias effectively enforces
   // that logic, because there is no IE12. #9818 #9839
-  edge: ['ie'],
+  edge: ["ie"],
 
-  firefox: ['firefoxMobile'],
+  firefox: ["firefoxMobile"],
 
   // The webapp package converts browser names to camel case, so
   // mobile_safari and mobileSafari should be synonymous.
-  mobile_safari: ['mobileSafari', 'mobileSafariUI', 'mobileSafariUI/WKWebView'],
+  mobile_safari: ["mobileSafari", "mobileSafariUI", "mobileSafariUI/WKWebView"],
 
   // Embedded WebViews on iPads will be reported as Apple Mail
-  safari: ['appleMail'],
+  safari: ["appleMail"],
 };
 
 // Expand the given minimum versions by reusing chrome versions for
@@ -43,16 +43,16 @@ const browserAliases = {
 function applyAliases(versions) {
   const lowerCaseVersions = Object.create(null);
 
-  Object.keys(versions).forEach(browser => {
+  Object.keys(versions).forEach((browser) => {
     lowerCaseVersions[browser.toLowerCase()] = versions[browser];
   });
 
-  Object.keys(browserAliases).forEach(original => {
+  Object.keys(browserAliases).forEach((original) => {
     const aliases = browserAliases[original];
     original = original.toLowerCase();
 
     if (hasOwn.call(lowerCaseVersions, original)) {
-      aliases.forEach(alias => {
+      aliases.forEach((alias) => {
         alias = alias.toLowerCase();
         if (!hasOwn.call(lowerCaseVersions, alias)) {
           lowerCaseVersions[alias] = lowerCaseVersions[original];
@@ -72,7 +72,7 @@ function applyAliases(versions) {
 // "modern" according to all requested version constraints.
 function isModern(browser) {
   const lowerCaseName =
-    browser && typeof browser.name === 'string' && browser.name.toLowerCase();
+    browser && typeof browser.name === "string" && browser.name.toLowerCase();
 
   return (
     !!lowerCaseName &&
@@ -92,7 +92,7 @@ function isModern(browser) {
 function setMinimumBrowserVersions(versions, source) {
   const lowerCaseVersions = applyAliases(versions);
 
-  Object.keys(lowerCaseVersions).forEach(lowerCaseName => {
+  Object.keys(lowerCaseVersions).forEach((lowerCaseName) => {
     const version = lowerCaseVersions[lowerCaseName];
 
     if (
@@ -104,7 +104,7 @@ function setMinimumBrowserVersions(versions, source) {
 
     minimumVersions[lowerCaseName] = {
       version: copy(version),
-      source: source || getCaller('setMinimumBrowserVersions'),
+      source: source || getCaller("setMinimumBrowserVersions"),
     };
   });
 }
@@ -112,7 +112,7 @@ function setMinimumBrowserVersions(versions, source) {
 function getCaller(calleeName) {
   const error = new Error();
   Error.captureStackTrace(error);
-  const lines = error.stack.split('\n');
+  const lines = error.stack.split("\n");
   let caller;
   lines.some((line, i) => {
     if (line.indexOf(calleeName) >= 0) {
@@ -123,24 +123,26 @@ function getCaller(calleeName) {
   return caller;
 }
 
-function getMinimumBrowserVersions() { return minimumVersions; }
+function getMinimumBrowserVersions() {
+  return minimumVersions;
+}
 
 Object.assign(exports, {
   isModern,
   setMinimumBrowserVersions,
   getMinimumBrowserVersions,
   calculateHashOfMinimumVersions() {
-    const { createHash } = require('crypto');
-    return createHash('sha1')
+    const { createHash } = require("crypto");
+    return createHash("sha1")
       .update(JSON.stringify(minimumVersions))
-      .digest('hex');
+      .digest("hex");
   },
 });
 
 // For making defensive copies of [major, minor, ...] version arrays, so
 // they don't change unexpectedly.
 function copy(version) {
-  if (typeof version === 'number') {
+  if (typeof version === "number") {
     return version;
   }
 
@@ -156,8 +158,8 @@ function greaterThanOrEqualTo(a, b) {
 }
 
 function greaterThan(a, b) {
-  const as = typeof a === 'number' ? [a] : a;
-  const bs = typeof b === 'number' ? [b] : b;
+  const as = typeof a === "number" ? [a] : a;
+  const bs = typeof b === "number" ? [b] : b;
   const maxLen = Math.max(as.length, bs.length);
 
   for (let i = 0; i < maxLen; ++i) {
@@ -177,7 +179,7 @@ function greaterThan(a, b) {
 }
 
 function makeSource(feature) {
-  return module.id + ' (' + feature + ')';
+  return module.id + " (" + feature + ")";
 }
 
 setMinimumBrowserVersions(
@@ -185,6 +187,7 @@ setMinimumBrowserVersions(
     chrome: 49,
     edge: 12,
     firefox: 45,
+    firefoxIOS: 100,
     mobileSafari: [9, 2],
     opera: 36,
     safari: 9,
@@ -192,7 +195,7 @@ setMinimumBrowserVersions(
     // https://github.com/Kilian/electron-to-chromium/blob/master/full-versions.js
     electron: 1,
   },
-  makeSource('classes')
+  makeSource("classes")
 );
 
 setMinimumBrowserVersions(
@@ -200,6 +203,7 @@ setMinimumBrowserVersions(
     chrome: 39,
     edge: 13,
     firefox: 26,
+    firefoxIOS: 100,
     mobileSafari: 10,
     opera: 26,
     safari: 10,
@@ -207,7 +211,7 @@ setMinimumBrowserVersions(
     phantomjs: Infinity,
     electron: [0, 20],
   },
-  makeSource('generator functions')
+  makeSource("generator functions")
 );
 
 setMinimumBrowserVersions(
@@ -215,12 +219,13 @@ setMinimumBrowserVersions(
     chrome: 41,
     edge: 13,
     firefox: 34,
+    firefoxIOS: 100,
     mobileSafari: [9, 2],
     opera: 29,
     safari: [9, 1],
     electron: [0, 24],
   },
-  makeSource('template literals')
+  makeSource("template literals")
 );
 
 setMinimumBrowserVersions(
@@ -228,10 +233,11 @@ setMinimumBrowserVersions(
     chrome: 38,
     edge: 12,
     firefox: 36,
+    firefoxIOS: 100,
     mobileSafari: 9,
     opera: 25,
     safari: 9,
     electron: [0, 20],
   },
-  makeSource('symbols')
+  makeSource("symbols")
 );

From e13b7b0c86500b5579c96e3b56260905d8b91f1c Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 7 Oct 2024 17:47:12 +0200
Subject: [PATCH 0527/1140] Create docs for modern-browsers #13226

---
 packages/modern-browsers/modern.js       |  74 +++++++++----
 v3-docs/docs/.vitepress/config.mts       |   4 +
 v3-docs/docs/api/packages-listing.md     |   2 +
 v3-docs/docs/history.md                  |  90 ++++++++++++++++
 v3-docs/docs/package-lock.json           | 126 +++++++++++++----------
 v3-docs/docs/package.json                |   6 +-
 v3-docs/docs/packages/modern-browsers.md |  19 ++++
 7 files changed, 242 insertions(+), 79 deletions(-)
 create mode 100644 v3-docs/docs/packages/modern-browsers.md

diff --git a/packages/modern-browsers/modern.js b/packages/modern-browsers/modern.js
index 19ff2734ae..5b737654a7 100644
--- a/packages/modern-browsers/modern.js
+++ b/packages/modern-browsers/modern.js
@@ -38,28 +38,32 @@ const browserAliases = {
   safari: ['appleMail'],
 };
 
-// Expand the given minimum versions by reusing chrome versions for
-// chromeMobile (according to browserAliases above).
+/**
+ * Expand the given minimum versions by reusing chrome versions for
+ * chromeMobile (according to browserAliases above).
+ * @param versions {object}
+ * @return {any}
+ */
 function applyAliases(versions) {
   const lowerCaseVersions = Object.create(null);
 
-  Object.keys(versions).forEach(browser => {
+  for (const browser of Object.keys(versions)) {
     lowerCaseVersions[browser.toLowerCase()] = versions[browser];
-  });
+  }
 
-  Object.keys(browserAliases).forEach(original => {
+  for (let original of Object.keys(browserAliases)) {
     const aliases = browserAliases[original];
     original = original.toLowerCase();
 
     if (hasOwn.call(lowerCaseVersions, original)) {
-      aliases.forEach(alias => {
+      for (let alias of aliases) {
         alias = alias.toLowerCase();
         if (!hasOwn.call(lowerCaseVersions, alias)) {
           lowerCaseVersions[alias] = lowerCaseVersions[original];
         }
-      });
+      }
     }
-  });
+  }
 
   return lowerCaseVersions;
 }
@@ -67,9 +71,15 @@ function applyAliases(versions) {
 // TODO Should it be possible for callers to setMinimumBrowserVersions to
 // forbid any version of a particular browser?
 
-// Given a { name, major, minor, patch } object like the one provided by
-// webapp via request.browser, return true if that browser qualifies as
-// "modern" according to all requested version constraints.
+/**
+ * @name ModernBrowsers.isModern
+ * @summary Given a { name, major, minor, patch } object like the one provided by
+ * webapp via request.browser, return true if that browser qualifies as
+ * "modern" according to all requested version constraints.
+ * @locus server
+ * @param [browser] {object} { name: string, major: number, minor?: number, patch?: number }
+ * @return {boolean}
+ */
 function isModern(browser) {
   const lowerCaseName =
     browser && typeof browser.name === 'string' && browser.name.toLowerCase();
@@ -84,29 +94,44 @@ function isModern(browser) {
   );
 }
 
-// Any package that depends on the modern-browsers package can call this
-// function to communicate its expectations for the minimum browser
-// versions that qualify as "modern." The final decision between
-// web.browser.legacy and web.browser will be based on the maximum of all
-// requested minimum versions for each browser.
+/**
+ * @name ModernBrowsers.setMinimumBrowserVersions
+ * @summary Any package that depends on the modern-browsers package can call this
+ * function to communicate its expectations for the minimum browser
+ * versions that qualify as "modern." The final decision between
+ * web.browser.legacy and web.browser builds will be based on the maximum of all
+ * requested minimum versions for each browser.
+ * @locus server
+ * @param versions {object} Name of the browser engine and minimum version for at which it is considered modern. For example: {
+ *   chrome: 49,
+ *   edge: 12,
+ *   ie: 12,
+ *   firefox: 45,
+ *   mobileSafari: 10,
+ *   opera: 38,
+ *   safari: 10,
+ *   electron: [1, 6],
+ * }
+ * @param source {function} Name of the capability that requires these minimums.
+ */
 function setMinimumBrowserVersions(versions, source) {
   const lowerCaseVersions = applyAliases(versions);
 
-  Object.keys(lowerCaseVersions).forEach(lowerCaseName => {
+  for (const lowerCaseName of Object.keys(lowerCaseVersions)) {
     const version = lowerCaseVersions[lowerCaseName];
 
     if (
       hasOwn.call(minimumVersions, lowerCaseName) &&
       !greaterThan(version, minimumVersions[lowerCaseName].version)
     ) {
-      return;
+      continue;
     }
 
     minimumVersions[lowerCaseName] = {
       version: copy(version),
       source: source || getCaller('setMinimumBrowserVersions'),
     };
-  });
+  }
 }
 
 function getCaller(calleeName) {
@@ -123,12 +148,23 @@ function getCaller(calleeName) {
   return caller;
 }
 
+/**
+ * @name ModernBrowsers.getMinimumBrowserVersions
+ * @summary Returns an object that lists supported browser engines and their minimum versions to be considered modern for Meteor.
+ * @locus server
+ * @return {object}
+ */
 function getMinimumBrowserVersions() { return minimumVersions; }
 
 Object.assign(exports, {
   isModern,
   setMinimumBrowserVersions,
   getMinimumBrowserVersions,
+  /**
+   * @name ModernBrowsers.calculateHashOfMinimumVersions
+   * @summary Creates a hash of the object of minimum browser versions.
+   * @return {string}
+   */
   calculateHashOfMinimumVersions() {
     const { createHash } = require('crypto');
     return createHash('sha1')
diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 653f1b3b21..396641001f 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -317,6 +317,10 @@ export default defineConfig({
             text: "markdown",
             link: "/packages/markdown",
           },
+          {
+            text: "modern-browsers",
+            link: "/packages/modern-browsers",
+          },
           {
             text: "modules",
             link: "/packages/modules",
diff --git a/v3-docs/docs/api/packages-listing.md b/v3-docs/docs/api/packages-listing.md
index f6f064191a..3dcb5ca193 100644
--- a/v3-docs/docs/api/packages-listing.md
+++ b/v3-docs/docs/api/packages-listing.md
@@ -106,6 +106,7 @@
 ### [mongo-dev-server](https://github.com/meteor/meteor/tree/devel/packages/mongo-dev-server) {#mongo-dev-server}
 ### [mongo-id](https://github.com/meteor/meteor/tree/devel/packages/mongo-id) {#mongo-id}
 ### [mongo-livedata](https://github.com/meteor/meteor/tree/devel/packages/mongo-livedata) {#mongo-livedata}
+### [npm-bcrypt](https://github.com/meteor/meteor/tree/devel/packages/npm-bcrypt) {#npm-bcrypt}
 ### [npm-mongo](https://github.com/meteor/meteor/tree/devel/packages/npm-mongo) {#npm-mongo}
 ### [oauth](https://github.com/meteor/meteor/tree/devel/packages/oauth) {#oauth}
 ### [oauth-encryption](https://github.com/meteor/meteor/tree/devel/packages/oauth-encryption) {#oauth-encryption}
@@ -134,6 +135,7 @@
 ### [standard-minifier-js](https://github.com/meteor/meteor/tree/devel/packages/standard-minifier-js) {#standard-minifier-js}
 ### [standard-minifiers](https://github.com/meteor/meteor/tree/devel/packages/standard-minifiers) {#standard-minifiers}
 ### [static-html](https://github.com/meteor/meteor/tree/devel/packages/static-html) {#static-html}
+### [static-html-tools](https://github.com/meteor/meteor/tree/devel/packages/static-html-tools) {#static-html-tools}
 ### [test-helpers](https://github.com/meteor/meteor/tree/devel/packages/test-helpers) {#test-helpers}
 ### [test-in-browser](https://github.com/meteor/meteor/tree/devel/packages/test-in-browser) {#test-in-browser}
 ### [test-in-console](https://github.com/meteor/meteor/tree/devel/packages/test-in-console) {#test-in-console}
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index fb537c579f..aba723ccb2 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -12,6 +12,96 @@ This is a complete history of changes for Meteor releases.
 
 
 
+## v3.0.4, 2024-09-xx
+
+### Highlights
+
+N/A
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.0.4
+
+```
+
+#### Meteor Version Release
+
+N/A
+
+#### Special thanks to
+N/A
+## v3.0.3, 2024-09-11
+
+### Highlights
+
+- Fixed `Meteor.userId` only being invoked with `bindEnvironment`.
+- Updated to Node `20.17.x`.
+- Fixed an issue where `meteor --open` opens the browser before the app is started.
+- Investigated and addressed the error when installing the `jam:method` package.
+- Improved the message for new available versions when running an app.
+- Updated the documentation link inside `install.sh`.
+- Resolved the issue where subscriptions stopped after a parameter change.
+- Added MongoDB connection telemetry.
+- Bumped the `email` package to prevent update errors.
+- Cordova package updates
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+- Some internal changes to how async contexts are handled, ensuring better performance and garbage collection.
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.0.3
+
+```
+
+If you've had your Meteor installation for over a year, we suggest reinstalling it to avoid any package installation issues. You can do this by running a few quick commands:
+
+```bash
+npx meteor uninstall // or rm -rf ~/.meteor
+npx meteor
+```
+
+
+
+#### Meteor Version Release
+
+* `Bumped packages`:
+  - accounts-base@3.0.2
+  - accounts-password@3.0.2
+  - email@3.1.0
+  - mongo@2.0.2
+
+
+#### Special thanks to
+
+- [@ayewo](https://github.com/ayewo).
+- [@denihs](https://github.com/denihs).
+- [@harryadel](https://github.com/harryadel).
+- [@kbarr1212](https://github.com/kbarr1212).
+- [@leonardoventurini](https://github.com/leonardoventurini).
+- [@nachocodoner](https://github.com/nachocodoner).
+
 ## v3.0.2, 2024-08-14
 
 ### Highlights
diff --git a/v3-docs/docs/package-lock.json b/v3-docs/docs/package-lock.json
index 55d9e175c4..2888dc0256 100644
--- a/v3-docs/docs/package-lock.json
+++ b/v3-docs/docs/package-lock.json
@@ -5,12 +5,12 @@
   "packages": {
     "": {
       "dependencies": {
-        "vue-collapsed": "^1.3.0"
+        "vue-collapsed": "^1.3.4"
       },
       "devDependencies": {
         "canonical-json": "^0.0.4",
-        "jsdoc": "^4.0.2",
-        "vitepress": "1.0.1"
+        "jsdoc": "^4.0.3",
+        "vitepress": "1.0.2"
       }
     },
     "node_modules/@algolia/autocomplete-core": {
@@ -824,10 +824,11 @@
       "dev": true
     },
     "node_modules/@types/linkify-it": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
-      "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
-      "dev": true
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/markdown-it": {
       "version": "13.0.7",
@@ -840,10 +841,11 @@
       }
     },
     "node_modules/@types/mdurl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
-      "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.20",
@@ -1345,21 +1347,22 @@
       }
     },
     "node_modules/jsdoc": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
-      "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.3.tgz",
+      "integrity": "sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/parser": "^7.20.15",
         "@jsdoc/salty": "^0.2.1",
-        "@types/markdown-it": "^12.2.3",
+        "@types/markdown-it": "^14.1.1",
         "bluebird": "^3.7.2",
         "catharsis": "^0.9.0",
         "escape-string-regexp": "^2.0.0",
         "js2xmlparser": "^4.0.2",
         "klaw": "^3.0.0",
-        "markdown-it": "^12.3.2",
-        "markdown-it-anchor": "^8.4.1",
+        "markdown-it": "^14.1.0",
+        "markdown-it-anchor": "^8.6.7",
         "marked": "^4.0.10",
         "mkdirp": "^1.0.4",
         "requizzle": "^0.2.3",
@@ -1374,13 +1377,14 @@
       }
     },
     "node_modules/jsdoc/node_modules/@types/markdown-it": {
-      "version": "12.2.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
       }
     },
     "node_modules/klaw": {
@@ -1393,12 +1397,13 @@
       }
     },
     "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
       }
     },
     "node_modules/lodash": {
@@ -1426,19 +1431,21 @@
       "dev": true
     },
     "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
       },
       "bin": {
-        "markdown-it": "bin/markdown-it.js"
+        "markdown-it": "bin/markdown-it.mjs"
       }
     },
     "node_modules/markdown-it-anchor": {
@@ -1451,15 +1458,6 @@
         "markdown-it": "*"
       }
     },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/marked": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
@@ -1473,10 +1471,11 @@
       }
     },
     "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/minisearch": {
       "version": "6.3.0",
@@ -1570,6 +1569,16 @@
         "url": "https://opencollective.com/preact"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/requizzle": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
@@ -1670,10 +1679,11 @@
       "dev": true
     },
     "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/underscore": {
       "version": "1.13.6",
@@ -1737,10 +1747,11 @@
       }
     },
     "node_modules/vitepress": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.1.tgz",
-      "integrity": "sha512-eNr5pOBppYUUjEhv8S0S2t9Tv95LQ6mMeHj6ivaGwfHxpov70Vduuwl/QQMDRznKDSaP0WKV7a82Pb4JVOaqEw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.2.tgz",
+      "integrity": "sha512-bEj9yTEdWyewJFOhEREZF+mXuAgOq27etuJZT6DZSp+J3XpQstXMJc5piSVwhZBtuj8OfA0iXy+jdP1c71KMYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@docsearch/css": "^3.6.0",
         "@docsearch/js": "^3.6.0",
@@ -1796,9 +1807,10 @@
       }
     },
     "node_modules/vue-collapsed": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/vue-collapsed/-/vue-collapsed-1.3.0.tgz",
-      "integrity": "sha512-d2qwv0fj4aaoekI+6x1RgxpoK0s5K8HLj70E+dWxIKkgzADcZ9kUrnXRazgIz9ETYkKOi6j2CWv/8+rS8Kr3LQ=="
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/vue-collapsed/-/vue-collapsed-1.3.4.tgz",
+      "integrity": "sha512-W92b+QT3n5iTrfrH6kyvx3TsriYPfy/Ymsb6DaanjeMkJYMdVl1S4wzKRYVDsxWQPDxiC+5m+UwPwT/8YAYodA==",
+      "license": "MIT"
     },
     "node_modules/xmlcreate": {
       "version": "2.0.4",
diff --git a/v3-docs/docs/package.json b/v3-docs/docs/package.json
index 748ffdba66..704e9b6cb1 100644
--- a/v3-docs/docs/package.json
+++ b/v3-docs/docs/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "canonical-json": "^0.0.4",
-    "jsdoc": "^4.0.2",
-    "vitepress": "1.0.1"
+    "jsdoc": "^4.0.3",
+    "vitepress": "1.0.2"
   },
   "dependencies": {
-    "vue-collapsed": "^1.3.0"
+    "vue-collapsed": "^1.3.4"
   }
 }
diff --git a/v3-docs/docs/packages/modern-browsers.md b/v3-docs/docs/packages/modern-browsers.md
new file mode 100644
index 0000000000..ae8d39d85d
--- /dev/null
+++ b/v3-docs/docs/packages/modern-browsers.md
@@ -0,0 +1,19 @@
+# Modern-browsers
+
+
+API for defining the boundary between modern and legacy JavaScript clients.
+
+You can use this package to define the minimum browser versions for which
+a browser engine will be considered modern. All browsers that do not meet
+the threshold will receive the legacy bundle. This way you can easily keep
+on using modern features that you need.
+
+You can read more about this in [Meteor 1.7 announcement blog](https://blog.meteor.com/meteor-1-7-and-the-evergreen-dream-a8c1270b0901).
+
+<ApiBox name="ModernBrowsers.isModern" />
+
+<ApiBox name="ModernBrowsers.setMinimumBrowserVersions" />
+
+<ApiBox name="ModernBrowsers.getMinimumBrowserVersions" />
+
+<ApiBox name="ModernBrowsers.calculateHashOfMinimumVersions" />

From b4489b79582190145b8f9008242db438278fbb81 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 8 Oct 2024 14:57:21 -0400
Subject: [PATCH 0528/1140] remove bindEnvironment from code hotspots

---
 packages/meteor/async_helpers.js |  5 +----
 packages/mongo/mongo_driver.js   | 22 +---------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/packages/meteor/async_helpers.js b/packages/meteor/async_helpers.js
index fc1175d9c0..6bcb8a38ed 100644
--- a/packages/meteor/async_helpers.js
+++ b/packages/meteor/async_helpers.js
@@ -133,10 +133,7 @@ Object.assign(AsynchronousQueue.prototype, {
     );
 
     const handle = {
-      task: Meteor.bindEnvironment(task, function (e) {
-        Meteor._debug('Exception from task', e);
-        throw e;
-      }),
+      task,
       name: task.name,
       resolver,
     };
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 69d9b86f7b..feff2edd7b 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -338,10 +338,6 @@ var writeCallback = function (write, refresh, callback) {
   };
 };
 
-var bindEnvironmentForWrite = function (callback) {
-  return Meteor.bindEnvironment(callback, "Mongo write");
-};
-
 MongoConnection.prototype.insertAsync = async function (collection_name, document) {
   const self = this;
 
@@ -967,24 +963,8 @@ Cursor.prototype.observeAsync = function (callbacks) {
 
 Cursor.prototype.observeChanges = function (callbacks, options = {}) {
   var self = this;
-  var methods = [
-    'addedAt',
-    'added',
-    'changedAt',
-    'changed',
-    'removedAt',
-    'removed',
-    'movedTo'
-  ];
-  var ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
 
-  let exceptionName = callbacks._fromObserve ? 'observe' : 'observeChanges';
-  exceptionName += ' callback';
-  methods.forEach(function (method) {
-    if (callbacks[method] && typeof callbacks[method] == "function") {
-      callbacks[method] = Meteor.bindEnvironment(callbacks[method], method + exceptionName);
-    }
-  });
+  var ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
 
   return self._mongo._observeChanges(
     self._cursorDescription, ordered, callbacks, options.nonMutatingCallbacks);

From b77d36a11d25c036586fbd60401dd0d63a1228d0 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Wed, 9 Oct 2024 08:48:39 +0200
Subject: [PATCH 0529/1140] Revert Travis Node version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 48ff56225d..4d9997a4d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "22.9.0"
+  - "20.15.1"
 cache:
   directories:
     - ".meteor"

From 71bcdc9cf6f13507f3b6773dc8e71582c0f2972f Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 9 Oct 2024 08:27:19 -0400
Subject: [PATCH 0530/1140] remove bindEnvironment

---
 packages/mongo/oplog_tailing.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/mongo/oplog_tailing.js b/packages/mongo/oplog_tailing.js
index 6dc86f28c7..3e29bdd322 100644
--- a/packages/mongo/oplog_tailing.js
+++ b/packages/mongo/oplog_tailing.js
@@ -105,12 +105,6 @@ Object.assign(OplogHandle.prototype, {
     // Calling onOplogEntry requires us to wait for the tailing to be ready.
     await self._readyPromise;
 
-    var originalCallback = callback;
-    callback = Meteor.bindEnvironment(function (notification) {
-      originalCallback(notification);
-    }, function (err) {
-      Meteor._debug("Error in oplog callback", err);
-    });
     var listenHandle = self._crossbar.listen(trigger, callback);
     return {
       stop: async function () {

From f41dbe94c6711a3180a98302345920b142c78262 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 9 Oct 2024 08:39:47 -0400
Subject: [PATCH 0531/1140] extract observe handle

---
 packages/mongo/mongo_driver.js      |  1 +
 packages/mongo/observe_handle.ts    | 37 +++++++++++++++++++++++++++++
 packages/mongo/observe_multiplex.js | 29 ----------------------
 3 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 packages/mongo/observe_handle.ts

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index feff2edd7b..645c0f6e74 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -23,6 +23,7 @@ import {
   getAsyncMethodName
 } from "meteor/minimongo/constants";
 import { Meteor } from "meteor/meteor";
+import { ObserveHandle } from './observe_handle';
 
 MongoInternals = {};
 
diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
new file mode 100644
index 0000000000..f157c43c6d
--- /dev/null
+++ b/packages/mongo/observe_handle.ts
@@ -0,0 +1,37 @@
+let nextObserveHandleId = 1;
+
+// When the callbacks do not mutate the arguments, we can skip a lot of data clones
+export class ObserveHandle {
+    _stopped: boolean;
+    _id: number;
+    _multiplexer: any;
+    nonMutatingCallbacks: boolean;
+
+    constructor(multiplexer: any, callbacks: any, nonMutatingCallbacks: boolean) {
+        this._multiplexer = multiplexer;
+
+        multiplexer.callbackNames().forEach((name) => {
+            if (callbacks[name]) {
+                this['_' + name] = callbacks[name];
+            } else if (name === "addedBefore" && callbacks.added) {
+                this._addedBefore = async function (id, fields, before) {
+                    await callbacks.added(id, fields);
+                };
+            }
+        });
+
+        this._stopped = false;
+        this._id = nextObserveHandleId++;
+        this.nonMutatingCallbacks = nonMutatingCallbacks;
+    }
+
+    async stop() {
+        if (this._stopped) return;
+        this._stopped = true;
+        await this._multiplexer.removeHandle(this._id);
+    }
+
+    _addedBefore(id: any, fields: any, before: any) {
+        throw new Error("Method not implemented.");
+    }
+}
\ No newline at end of file
diff --git a/packages/mongo/observe_multiplex.js b/packages/mongo/observe_multiplex.js
index 35c150bf9c..ebcdc150b2 100644
--- a/packages/mongo/observe_multiplex.js
+++ b/packages/mongo/observe_multiplex.js
@@ -1,7 +1,6 @@
 import has from 'lodash.has'; 
 import isEmpty from 'lodash.isempty';
 
-let nextObserveHandleId = 1;
 
 ObserveMultiplexer = class {
   constructor({ ordered, onStop = () => {} } = {}) {
@@ -205,31 +204,3 @@ ObserveMultiplexer = class {
   }
 };
 
-// When the callbacks do not mutate the arguments, we can skip a lot of data clones
-ObserveHandle = class {
-  constructor(multiplexer, callbacks, nonMutatingCallbacks = false) {
-    this._multiplexer = multiplexer;
-    multiplexer.callbackNames().forEach((name) => {
-      if (callbacks[name]) {
-        this['_' + name] = callbacks[name];
-      } else if (name === "addedBefore" && callbacks.added) {
-        // Special case: if you specify "added" and "movedBefore", you get an
-        // ordered observe where for some reason you don't get ordering data on
-        // the adds.  I dunno, we wrote tests for it, there must have been a
-        // reason.
-        this._addedBefore = async function (id, fields, before) {
-          await callbacks.added(id, fields);
-        };
-      }
-    });
-    this._stopped = false;
-    this._id = nextObserveHandleId++;
-    this.nonMutatingCallbacks = nonMutatingCallbacks;
-  }
-
-  async stop() {
-    if (this._stopped) return;
-    this._stopped = true;
-    await this._multiplexer.removeHandle(this._id);
-  }
-};
\ No newline at end of file

From 3ed3ac6190c4fd2e897c4619945ea0d6f59472c7 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 9 Oct 2024 08:58:19 -0400
Subject: [PATCH 0532/1140] add typescript

---
 packages/mongo/package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 3775964d2a..40125b037c 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -42,6 +42,7 @@ Package.onUse(function (api) {
     "mongo-id",
     "check",
     "ecmascript",
+    "typescript",
     "mongo-dev-server",
     "logging",
   ]);

From 161176cb9147b75846241467e3bfd448166c964a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 9 Oct 2024 08:58:31 -0400
Subject: [PATCH 0533/1140] shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json          |  20 ++
 .../.npm/package/npm-shrinkwrap.json          | 180 +++++++++---------
 .../webapp/.npm/package/npm-shrinkwrap.json   |   6 +-
 3 files changed, 113 insertions(+), 93 deletions(-)

diff --git a/packages/ddp-server/.npm/package/npm-shrinkwrap.json b/packages/ddp-server/.npm/package/npm-shrinkwrap.json
index 5ecef99729..f7fd53b35e 100644
--- a/packages/ddp-server/.npm/package/npm-shrinkwrap.json
+++ b/packages/ddp-server/.npm/package/npm-shrinkwrap.json
@@ -11,6 +11,26 @@
       "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
       "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
     },
+    "lodash.isempty": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
+      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
+    },
+    "lodash.isobject": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
+    },
+    "lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
+    },
+    "lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
+    },
     "permessage-deflate": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.7.tgz",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index e5cb7e27f5..ad08cb6eb3 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,114 +56,114 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.658.1.tgz",
-      "integrity": "sha512-MCYLKmNy0FlNT9TvXfOxj0jh+ZQq+G9qEy/VZqu3JsQSgiFvFRdzgzcbQ9gQx7fZrDC/TPdABOTh483zI4cu9g=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.666.0.tgz",
+      "integrity": "sha512-TirQ6hJksC6M2Cwi7rIZS2tP4s3OHDdU4Md/mksMkLT9lkzT8sNLU0DwVO5FlWcwtKmC3gLbIDa+Hqe5CpRDNA=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.658.1.tgz",
-      "integrity": "sha512-lOuaBtqPTYGn6xpXlQF4LsNDsQ8Ij2kOdnk+i69Kp6yS76TYvtUuukyLL5kx8zE1c8WbYtxj9y8VNw9/6uKl7Q=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.666.0.tgz",
+      "integrity": "sha512-+h5Xk64dM4on1MwjTYxlwtI8ilytU7zjTVRzMAYOysmH71Bc8YsLOfonFHvzhF/AXpKJu3f1BhM65S0tasPcrw=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.658.1.tgz",
-      "integrity": "sha512-RGcZAI3qEA05JszPKwa0cAyp8rnS1nUvs0Sqw4hqLNQ1kD7b7V6CPjRXe7EFQqCOMvM4kGqx0+cEEVTOmBsFLw=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.666.0.tgz",
+      "integrity": "sha512-mW//v5EvHMU2SulW1FqmjJJPDNhzySRb/YUU+jq9AFDIYUdjF6j6wM+iavCW/4gLqOct0RT7B62z8jqyHkUCEQ=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.658.1.tgz",
-      "integrity": "sha512-yw9hc5blTnbT1V6mR7Cx9HGc9KQpcLQ1QXj8rntiJi6tIYu3aFNVEyy81JHL7NsuBSeQulJTvHO3y6r3O0sfRg=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.666.0.tgz",
+      "integrity": "sha512-tw8yxcxvaj0d/A4YJXIh3mISzsQe8rThIVKvpyhEdl1lEoz81skCccX5u3gHajciSdga/V0DxhBbsO+eE1bZkw=="
     },
     "@aws-sdk/core": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.658.1.tgz",
-      "integrity": "sha512-vJVMoMcSKXK2gBRSu9Ywwv6wQ7tXH8VL1fqB1uVxgCqBZ3IHfqNn4zvpMPWrwgO2/3wv7XFyikGQ5ypPTCw4jA=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.666.0.tgz",
+      "integrity": "sha512-jxNjs0sAVX+CWwoa4kHUENLHuBwjT1EILBoctmQoiIb1v5KpKwZnSByHTpvUkFmbuwWQPEnJkJCqzIHjEmjisA=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.658.1.tgz",
-      "integrity": "sha512-JY4rZ4e2emL7PNHCU7F/BQV8PpQGEBZLkEoPD55RO4CitaIhlVZRpUCGLih+0Hw4MOnTUqJdfQBM+qZk6G+Now=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.666.0.tgz",
+      "integrity": "sha512-JkqJPSqN5XLEicW4gRtd5DTyg0xD0yIvc7+gWXGJq0crNM8IJB9lbG+q3xBkXSbmcrHQyuD74F+ZGjLxmTQBEQ=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.654.0.tgz",
-      "integrity": "sha512-kogsx3Ql81JouHS7DkheCDU9MYAvK0AokxjcshDveGmf7BbgbWCA8Fnb9wjQyNDaOXNvkZu8Z8rgkX91z324/w=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.664.0.tgz",
+      "integrity": "sha512-95rE+9Voaco0nmKJrXqfJAxSSkSWqlBy76zomiZrUrv7YuijQtHCW8jte6v6UHAFAaBzgFsY7QqBxs15u9SM7g=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.658.1.tgz",
-      "integrity": "sha512-4ubkJjEVCZflxkZnV1JDQv8P2pburxk1LrEp55telfJRzXrnowzBKwuV2ED0QMNC448g2B3VCaffS+Ct7c4IWQ=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.666.0.tgz",
+      "integrity": "sha512-j1Cob+tYmJ/m9agSsFPdAhLfILBqZzolF17XJvmEzQC2edltQ6NR0Wd09GQvtiAFZy7gn1l40bKuxX6Tq5U6XQ=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.658.1.tgz",
-      "integrity": "sha512-2uwOamQg5ppwfegwen1ddPu5HM3/IBSnaGlaKLFhltkdtZ0jiqTZWUtX2V+4Q+buLnT0hQvLS/frQ+7QUam+0Q=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.666.0.tgz",
+      "integrity": "sha512-u09aUZJQNK8zVAKJKEOQ2mLsv39YxR20US00/WAPNW9sMWWhl4raT97tsalOUc6ZTHOEqHHmEVZXuscINnkaww=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.658.1.tgz",
-      "integrity": "sha512-XwxW6N+uPXPYAuyq+GfOEdfL/MZGAlCSfB5gEWtLBFmFbikhmEuqfWtI6CD60OwudCUOh6argd21BsJf8o1SJA=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.666.0.tgz",
+      "integrity": "sha512-C43L9kxAb2lvIZ+eKVuyX9xYrkpg+Zyq0fLasK1wekC6M/Qj/uqE1KFz9ddDE8Dv1HwiE+UZk5psM0KatQpPGQ=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.654.0.tgz",
-      "integrity": "sha512-PmQoo8sZ9Q2Ow8OMzK++Z9lI7MsRUG7sNq3E72DVA215dhtTICTDQwGlXH2AAmIp7n+G9LLRds+4wo2ehG4mkg=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.664.0.tgz",
+      "integrity": "sha512-sQicIw/qWTsmMw8EUQNJXdrWV5SXaZc2zGdCQsQxhR6wwNO2/rZ5JmzdcwUADmleBVyPYk3KGLhcofF/qXT2Ng=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.658.1.tgz",
-      "integrity": "sha512-YOagVEsZEk9DmgJEBg+4MBXrPcw/tYas0VQ5OVBqC5XHNbi2OBGJqgmjVPesuu393E7W0VQxtJFDS00O1ewQgA=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.666.0.tgz",
+      "integrity": "sha512-aaa5Ig8hI7lSh1CSQP0oaLvjylz6+3mKUgdvw69zv0MdX3TUZiQRDCsfqK0P3VNsj/QSvBytSjuNDuSaYcACJg=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.654.0.tgz",
-      "integrity": "sha512-6a2g9gMtZToqSu+CusjNK5zvbLJahQ9di7buO3iXgbizXpLXU1rnawCpWxwslMpT5fLgMSKDnKDrr6wdEk7jSw=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.664.0.tgz",
+      "integrity": "sha512-10ltP1BfSKRJVXd8Yr5oLbo+VSDskWbps0X3szSsxTk0Dju1xvkz7hoIjylWLvtGbvQ+yb2pmsJYKCudW/4DJg=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.658.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.658.1.tgz",
-      "integrity": "sha512-lfXA6kZS6GHyi/67EbfrKdLoqHR6j7G35eFwaqxyNkfMhNBpAF0eZK3SYiwnzdR9+Wb/enTFawYiFbG5R+dQzA=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.666.0.tgz",
+      "integrity": "sha512-BtkxznPF8a8vUCEiTasHhLUjsgkm7Sc0mxZeOY+NtGMfQaJxx/q/tj5bFmtMNmdcbiEcxUV6bybb6qdN1PM/jg=="
     },
     "@aws-sdk/middleware-host-header": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.654.0.tgz",
-      "integrity": "sha512-rxGgVHWKp8U2ubMv+t+vlIk7QYUaRCHaVpmUlJv0Wv6Q0KeO9a42T9FxHphjOTlCGQOLcjCreL9CF8Qhtb4mdQ=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.664.0.tgz",
+      "integrity": "sha512-4tCXJ+DZWTq38eLmFgnEmO8X4jfWpgPbWoCyVYpRHCPHq6xbrU65gfwS9jGx25L4YdEce641ChI9TKLryuUgRA=="
     },
     "@aws-sdk/middleware-logger": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.654.0.tgz",
-      "integrity": "sha512-OQYb+nWlmASyXfRb989pwkJ9EVUMP1CrKn2eyTk3usl20JZmKo2Vjis6I0tLUkMSxMhnBJJlQKyWkRpD/u1FVg=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.664.0.tgz",
+      "integrity": "sha512-eNykMqQuv7eg9pAcaLro44fscIe1VkFfhm+gYnlxd+PH6xqapRki1E68VHehnIptnVBdqnWfEqLUSLGm9suqhg=="
     },
     "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.654.0.tgz",
-      "integrity": "sha512-gKSomgltKVmsT8sC6W7CrADZ4GHwX9epk3GcH6QhebVO3LA9LRbkL3TwOPUXakxxOLLUTYdOZLIOtFf7iH00lg=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.664.0.tgz",
+      "integrity": "sha512-jq27WMZhm+dY8BWZ9Ipy3eXtZj0lJzpaKQE3A3tH5AOIlUV/gqrmnJ9CdqVVef4EJsq9Yil4ZzQjKKmPsxveQg=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.654.0.tgz",
-      "integrity": "sha512-liCcqPAyRsr53cy2tYu4qeH4MMN0eh9g6k56XzI5xd4SghXH5YWh4qOYAlQ8T66ZV4nPMtD8GLtLXGzsH8moFg=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.666.0.tgz",
+      "integrity": "sha512-d8XJ103SGCMsFIKEowpOaZr0W8AkLNd+3CS7W95yb6YmN7lcNGL54RtTSy3m8YJI6W2jXftPFN2oLG4K3aywVQ=="
     },
     "@aws-sdk/region-config-resolver": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.654.0.tgz",
-      "integrity": "sha512-ydGOrXJxj3x0sJhsXyTmvJVLAE0xxuTWFJihTl67RtaO7VRNtd82I3P3bwoMMaDn5WpmV5mPo8fEUDRlBm3fPg=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.664.0.tgz",
+      "integrity": "sha512-o/B8dg8K+9714RGYPgMxZgAChPe/MTSMkf/eHXTUFHNik5i1HgVKfac22njV2iictGy/6GhpFsKa1OWNYAkcUg=="
     },
     "@aws-sdk/token-providers": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.654.0.tgz",
-      "integrity": "sha512-D8GeJYmvbfWkQDtTB4owmIobSMexZel0fOoetwvgCQ/7L8VPph3Q2bn1TRRIXvH7wdt6DcDxA3tKMHPBkT3GlA=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.664.0.tgz",
+      "integrity": "sha512-dBAvXW2/6bAxidvKARFxyCY2uCynYBKRFN00NhS1T5ggxm3sUnuTpWw1DTjl02CVPkacBOocZf10h8pQbHSK8w=="
     },
     "@aws-sdk/types": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.654.0.tgz",
-      "integrity": "sha512-VWvbED3SV+10QJIcmU/PKjsKilsTV16d1I7/on4bvD/jo1qGeMXqLDBSen3ks/tuvXZF/mFc7ZW/W2DiLVtO7A=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.664.0.tgz",
+      "integrity": "sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw=="
     },
     "@aws-sdk/util-endpoints": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.654.0.tgz",
-      "integrity": "sha512-i902fcBknHs0Irgdpi62+QMvzxE+bczvILXigYrlHL4+PiEnlMVpni5L5W1qCkNZXf8AaMrSBuR1NZAGp6UOUw=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.664.0.tgz",
+      "integrity": "sha512-KrXoHz6zmAahVHkyWMRT+P6xJaxItgmklxEDrT+npsUB4d5C/lhw16Crcp9TDi828fiZK3GYKRAmmNhvmzvBNg=="
     },
     "@aws-sdk/util-locate-window": {
       "version": "3.568.0",
@@ -171,14 +171,14 @@
       "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.654.0.tgz",
-      "integrity": "sha512-ykYAJqvnxLt7wfrqya28wuH3/7NdrwzfiFd7NqEVQf7dXVxL5RPEpD7DxjcyQo3DsHvvdUvGZVaQhozycn1pzA=="
+      "version": "3.664.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.664.0.tgz",
+      "integrity": "sha512-c/PV3+f1ss4PpskHbcOxTZ6fntV2oXy/xcDR9nW+kVaz5cM1G702gF0rvGLKPqoBwkj2rWGe6KZvEBeLzynTUQ=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.654.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.654.0.tgz",
-      "integrity": "sha512-a0ojjdBN6pqv6gB4H/QPPSfhs7mFtlVwnmKCM/QrTaFzN0U810PJ1BST3lBx5sa23I5jWHGaoFY+5q65C3clLQ=="
+      "version": "3.666.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.666.0.tgz",
+      "integrity": "sha512-DzbOMcAqrn51Z0fz5FvofaYmQA+sOJKO2cb8zQrix3TkzsTw1vRLo/cgQUJuJRGptbQCe1gnj7+21Gd5hpU6Ag=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
@@ -196,9 +196,9 @@
       "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg=="
     },
     "@smithy/core": {
-      "version": "2.4.7",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.7.tgz",
-      "integrity": "sha512-goqMjX+IoVEnHZjYuzu8xwoZjoteMiLXsPHuXPBkWsGwu0o9c3nTjqkUlP1Ez/V8E501aOU7CJ3INk8mQcW2gw=="
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
+      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA=="
     },
     "@smithy/credential-provider-imds": {
       "version": "3.2.4",
@@ -236,9 +236,9 @@
       "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ=="
     },
     "@smithy/middleware-retry": {
-      "version": "3.0.22",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.22.tgz",
-      "integrity": "sha512-svEN7O2Tf7BoaBkPzX/8AE2Bv7p16d9/ulFAD1Gmn5g19iMqNk1WIkMxAY7SpB9/tVtUwKx0NaIsBRl88gumZA=="
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
+      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A=="
     },
     "@smithy/middleware-serde": {
       "version": "3.0.7",
@@ -296,9 +296,9 @@
       "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ=="
     },
     "@smithy/smithy-client": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.3.6.tgz",
-      "integrity": "sha512-qdH+mvDHgq1ss6mocyIl2/VjlWXew7pGwZQydwYJczEc22HZyX3k8yVPV9aZsbYbssHPvMDRA5rfBDrjQUbIIw=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
+      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ=="
     },
     "@smithy/types": {
       "version": "3.5.0",
@@ -336,14 +336,14 @@
       "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="
     },
     "@smithy/util-defaults-mode-browser": {
-      "version": "3.0.22",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.22.tgz",
-      "integrity": "sha512-WKzUxNsOun5ETwEOrvooXeI1mZ8tjDTOcN4oruELWHhEYDgQYWwxZupURVyovcv+h5DyQT/DzK5nm4ZoR/Tw5Q=="
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
+      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw=="
     },
     "@smithy/util-defaults-mode-node": {
-      "version": "3.0.22",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.22.tgz",
-      "integrity": "sha512-hUsciOmAq8fsGwqg4+pJfNRmrhfqMH4Y9UeGcgeUl88kPAoYANFATJqCND+O4nUvwp5TzsYwGpqpcBKyA8LUUg=="
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
+      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg=="
     },
     "@smithy/util-endpoints": {
       "version": "2.1.3",
@@ -381,9 +381,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.7.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
-      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg=="
+      "version": "22.7.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index e961a96f40..0de30108ab 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
     },
     "@types/node": {
-      "version": "22.7.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
-      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg=="
+      "version": "22.7.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
     },
     "@types/qs": {
       "version": "6.9.16",

From c0dc794071ef51d521aac613a8e8161e77d289fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 9 Oct 2024 17:09:02 +0200
Subject: [PATCH 0534/1140] add a new test to prepare express migration

---
 packages/webapp/webapp_tests.js | 52 ++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/packages/webapp/webapp_tests.js b/packages/webapp/webapp_tests.js
index 86c1f5aa0a..eea55d54fe 100644
--- a/packages/webapp/webapp_tests.js
+++ b/packages/webapp/webapp_tests.js
@@ -341,7 +341,7 @@ __meteor_runtime_config__.WEBAPP_TEST_B = '</script>';
 
 Tinytest.add("webapp - npm modules", function (test) {
   // Make sure the version number looks like a version number.
-  test.matches(WebAppInternals.NpmModules.express.version, /^4\.(\d+)\.(\d+)/);
+  test.matches(WebAppInternals.NpmModules.express.version, /^5\.(\d+)\.(\d+)/);
   test.equal(typeof(WebAppInternals.NpmModules.express.module), 'function');
 });
 
@@ -364,3 +364,53 @@ Tinytest.addAsync(
     test.isTrue(/__meteor_runtime_config__ = (.*customKey[^"].*customValue.*)/.test(html));
   }
 );
+
+Tinytest.addAsync("webapp - parse url queries", async function (test) {
+  WebApp.handlers.get("/queries", async (req, res) => {
+    res.json(req.query);
+  });
+
+  const queriesTestCases = [
+    'planet=Mars',
+    'galaxy=Andromeda&star=Betelgeuse',
+    'spacecraft=Voyager%202',
+    'meteor=Perseid&meteor=Leonid',
+    'astronaut[name]=Neil&astronaut[mission]=Apollo%2011',
+    'galaxy[name]=Milky%20Way&galaxy[diameter]=105700',
+    'constellation[name]=Orion&constellation[stars][]=Betelgeuse&constellation[stars][]=Rigel',
+    'galaxy[name]=Andromeda&galaxy[age]=10&meteors[]=Perseid&meteors[]=Geminid',
+    'astronaut[name]=Buzz&astronaut[missions][first]=Apollo%2011&astronaut[missions][second]=Apollo%2022',
+    'spacecraft[]=Voyager&spacecraft[]=Pioneer&spacecraft[0][type]=orbiter',
+    'comet=Halley&status=active%20comet',
+    'planet=&galaxy='
+  ];
+  const queryResults = [
+    { planet: 'Mars' },
+    { galaxy: 'Andromeda', star: 'Betelgeuse' },
+    { spacecraft: 'Voyager 2' },
+    { meteor: ['Perseid', 'Leonid'] },
+    { astronaut: { name: 'Neil', mission: 'Apollo 11' } },
+    { galaxy: { name: 'Milky Way', diameter: '105700' } },
+    { constellation: { name: 'Orion', stars: ['Betelgeuse', 'Rigel'] } },
+    {
+      galaxy: { name: 'Andromeda', age: '10' },
+      meteors: ['Perseid', 'Geminid']
+    },
+    {
+      astronaut: {
+        name: 'Buzz',
+        missions: { first: 'Apollo 11', second: 'Apollo 22' }
+      }
+    },
+    { spacecraft: ['Voyager', 'Pioneer', { type: 'orbiter' }] },
+    { comet: 'Halley', status: 'active comet' },
+    { planet: '', galaxy: '' }
+  ];
+  let i = 0;
+  for await (const queriesTestCase of queriesTestCases) {
+    const resp = await asyncGet(`${Meteor.absoluteUrl()}/queries?${queriesTestCase}`);
+    const queryParsed = JSON.parse(resp.content);
+    test.equal(queryParsed, queryResults[i]);
+    i++;
+  }
+});

From a3b8649bf0ccd303d348f4c116e61f802e95e9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 9 Oct 2024 17:10:13 +0200
Subject: [PATCH 0535/1140] revert

---
 packages/webapp/webapp_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/webapp_tests.js b/packages/webapp/webapp_tests.js
index eea55d54fe..9f07449e23 100644
--- a/packages/webapp/webapp_tests.js
+++ b/packages/webapp/webapp_tests.js
@@ -341,7 +341,7 @@ __meteor_runtime_config__.WEBAPP_TEST_B = '</script>';
 
 Tinytest.add("webapp - npm modules", function (test) {
   // Make sure the version number looks like a version number.
-  test.matches(WebAppInternals.NpmModules.express.version, /^5\.(\d+)\.(\d+)/);
+  test.matches(WebAppInternals.NpmModules.express.version, /^4\.(\d+)\.(\d+)/);
   test.equal(typeof(WebAppInternals.NpmModules.express.module), 'function');
 });
 

From cfcc3da4271805752b73911f474fa7fd3be31e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 9 Oct 2024 17:24:36 +0200
Subject: [PATCH 0536/1140] upgrade to express 5

---
 packages/webapp/package.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 6fd3bbc885..56887a8b23 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -5,8 +5,8 @@ Package.describe({
 
 Npm.depends({
   "cookie-parser": "1.4.6",
-  express: "4.21.0",
-  "@types/express": "4.17.21",
+  express: "5.0.1",
+  "@types/express": "5.0.0",
   compression: "1.7.4",
   errorhandler: "1.5.1",
   parseurl: "1.3.3",
@@ -14,7 +14,6 @@ Npm.depends({
   "stream-to-string": "1.2.1",
   qs: "6.13.0",
   "useragent-ng": "2.4.3",
-  "@types/connect": "3.4.38",
   "tmp": "0.2.3",
 });
 

From f56801a160c5374ce97b08dbeb2e102b7200f876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 9 Oct 2024 17:25:04 +0200
Subject: [PATCH 0537/1140] configure default query parser to adapt the
 breaking change

---
 packages/webapp/webapp_server.js | 11 +----------
 packages/webapp/webapp_tests.js  |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index af75c32ebe..46fdeb36e1 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -29,6 +29,7 @@ const createExpressApp = () => {
   // these headers come from these docs: https://expressjs.com/en/api.html#app.settings.table
   app.set('x-powered-by', false);
   app.set('etag', false);
+  app.set('query parser', qs.parse);
   return app;
 }
 export const WebApp = {};
@@ -1081,16 +1082,6 @@ async function runWebAppServer() {
     res.end();
   });
 
-  // Parse the query string into res.query. Used by oauth_server, but it's
-  // generally pretty handy..
-  //
-  // Do this before the next middleware destroys req.url if a path prefix
-  // is set to close #10111.
-  app.use(function(request, response, next) {
-    request.query = qs.parse(parseUrl(request.url).query);
-    next();
-  });
-
   function getPathParts(path) {
     const parts = path.split('/');
     while (parts[0] === '') parts.shift();
diff --git a/packages/webapp/webapp_tests.js b/packages/webapp/webapp_tests.js
index 9f07449e23..eea55d54fe 100644
--- a/packages/webapp/webapp_tests.js
+++ b/packages/webapp/webapp_tests.js
@@ -341,7 +341,7 @@ __meteor_runtime_config__.WEBAPP_TEST_B = '</script>';
 
 Tinytest.add("webapp - npm modules", function (test) {
   // Make sure the version number looks like a version number.
-  test.matches(WebAppInternals.NpmModules.express.version, /^4\.(\d+)\.(\d+)/);
+  test.matches(WebAppInternals.NpmModules.express.version, /^5\.(\d+)\.(\d+)/);
   test.equal(typeof(WebAppInternals.NpmModules.express.module), 'function');
 });
 

From f942b9aa6ed330eb92dcb8df38b171e8b63d6731 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Thu, 10 Oct 2024 09:23:17 +0200
Subject: [PATCH 0538/1140] Typescript v5.6.3

---
 .../eslint-plugin-meteor/scripts/dev-bundle-tool-package.js     | 2 +-
 packages/typescript/package.js                                  | 2 +-
 scripts/dev-bundle-tool-package.js                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js b/npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js
index 09adbc5e91..3b7b26ed0a 100644
--- a/npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js
+++ b/npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js
@@ -14,7 +14,7 @@ var packageJson = {
     pacote: "https://github.com/meteor/pacote/tarball/a81b0324686e85d22c7688c47629d4009000e8b8",
     "node-gyp": "9.4.0",
     "@mapbox/node-pre-gyp": "1.0.11",
-    typescript: "5.4.5",
+    typescript: "5.6.3",
     "@meteorjs/babel": "7.19.0-beta.3",
     "@meteorjs/reify": "0.24.0",
     // So that Babel can emit require("@babel/runtime/helpers/...") calls.
diff --git a/packages/typescript/package.js b/packages/typescript/package.js
index 0e93a37a43..ea41a3604a 100644
--- a/packages/typescript/package.js
+++ b/packages/typescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'typescript',
-  version: '5.4.3',
+  version: '5.6.3',
   summary:
     'Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files',
   documentation: 'README.md',
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 45d7d30d3f..3ea1b510f8 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -13,7 +13,7 @@ var packageJson = {
     npm: "10.8.3",
     "node-gyp": "9.4.0",
     "@mapbox/node-pre-gyp": "1.0.11",
-    typescript: "5.4.5",
+    typescript: "5.6.3",
     "@meteorjs/babel": "7.20.0-beta.5",
     // Keep the versions of these packages consistent with the versions
     // found in dev-bundle-server-package.js.

From cdb1bc80ce36d673bb256c6714aaa88c5bb2a053 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 10 Oct 2024 17:05:14 -0400
Subject: [PATCH 0539/1140] update bundle version

---
 meteor                                        |   2 +-
 .../modules/.npm/package/npm-shrinkwrap.json  |   6 +-
 .../.npm/package/npm-shrinkwrap.json          | 330 +++++++++---------
 .../webapp/.npm/package/npm-shrinkwrap.json   |  12 +-
 4 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/meteor b/meteor
index 1dc0a1582e..196a6b19b9 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.9.0.0
+BUNDLE_VERSION=22.9.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index c8ea6ff2a8..bc2441bf5d 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -7,9 +7,9 @@
       "integrity": "sha512-NN0E7fURAY9XrtgkmP1XqV6fMSwKHIjENOE6V5AqWXU0wynLlXb+l5NhMC72hYwbtT73R9E35dDR1lqBKQSFdg=="
     },
     "@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "acorn": {
       "version": "8.12.1",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index ddc1a42f21..eed1518a5b 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,114 +56,114 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.645.0.tgz",
-      "integrity": "sha512-nBfWDzWBQI1NCHYqBAmiifhdnLRxQYozaq6OjTuRcALjYJbOdFV7t0w9FWGISOq1OnM7r8UdCXlr2bzdyU0tJA=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.669.0.tgz",
+      "integrity": "sha512-oqcUpziuvBtx4IUVj4XIxbRpdhw5rRh7M/AQLpPEDRiaWpJJzKagmK1UrUpNIEibdWmrMLxAiU/t3uAM5mXhvA=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.645.0.tgz",
-      "integrity": "sha512-2rc8TjnsNddOeKQ/pfNN7deNvGLXAeKeYtHtGDAiM2qfTKxd2sNcAsZ+JCDLyshuD4xLM5fpUyR0X8As9EAouQ=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.669.0.tgz",
+      "integrity": "sha512-WNpfNYIHzehLv98F+KolJglXNjJOTbOvIbSZ2XAnebVLmXCWeEEd1r4dIH0oI2dHtLbQ/h3uqaeQhsVQjLAxpw=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.645.0.tgz",
-      "integrity": "sha512-X9ULtdk3cO+1ysurEkJ1MSnu6U00qodXx+IVual+1jXX4RYY1WmQmfo7uDKf6FFkz7wW1DAqU+GJIBNQr0YH8A=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.669.0.tgz",
+      "integrity": "sha512-E7uYOS3Axhe36Zeq6iLC9kjF1mMEyCQ4fXud11h22rbjq7PFUtN2Omekrch37eUx3BFj1jMePnuTnT98t5LWnw=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.645.0.tgz",
-      "integrity": "sha512-6azXYtvtnAsPf2ShN9vKynIYVcJOpo6IoVmoMAVgNaBJyllP+s/RORzranYZzckqfmrudSxtct4rVapjLWuAMg=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.669.0.tgz",
+      "integrity": "sha512-1XdOBtHKCVxVkEDiy+oktJNSsySj3ADyh58KpHaqgvCQKV3vmfkr0YO5dG4kqq+TflNwdfl1YgMuOUiCulOWeQ=="
     },
     "@aws-sdk/core": {
-      "version": "3.635.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.635.0.tgz",
-      "integrity": "sha512-i1x/E/sgA+liUE1XJ7rj1dhyXpAKO1UKFUcTTHXok2ARjWTvszHnSXMOsB77aPbmn0fUp1JTx2kHUAZ1LVt5Bg=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz",
+      "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.645.0.tgz",
-      "integrity": "sha512-Z4By/90TaYQZO1dPR1udYhegFiOlSWnZsJOYSAk4Gdny26Tqb78xVLw9R/33CzFblXC4WVSt4gizXTQ/sYyHNg=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.669.0.tgz",
+      "integrity": "sha512-bf3O2fRY04LNLNPfhLbc90FZRr1K2/4y72v8MVth4gedOEplK7o47/ssS3XZyLvY5FOlaG8wXOoFs/vEHjGBUA=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.620.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.620.1.tgz",
-      "integrity": "sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz",
+      "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.635.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.635.0.tgz",
-      "integrity": "sha512-iJyRgEjOCQlBMXqtwPLIKYc7Bsc6nqjrZybdMDenPDa+kmLg7xh8LxHsu9088e+2/wtLicE34FsJJIfzu3L82g=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz",
+      "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.645.0.tgz",
-      "integrity": "sha512-LlZW0qwUwNlTaAIDCNpLbPsyXvS42pRIwF92fgtCQedmdnpN3XRUC6hcwSYI7Xru3GGKp3RnceOvsdOaRJORsw=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.669.0.tgz",
+      "integrity": "sha512-YHhfH7w29BmMPnOK0BrBhEy2IRFRSRGSCyz3jtqpG883CZ2Lxan/AzaJDfKRdz350KPgbMMBwbPkIrqNIsg8iw=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.645.0.tgz",
-      "integrity": "sha512-eGFFuNvLeXjCJf5OCIuSEflxUowmK+bCS+lK4M8ofsYOEGAivdx7C0UPxNjHpvM8wKd8vpMl5phTeS9BWX5jMQ=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.669.0.tgz",
+      "integrity": "sha512-O506azQcq6N1gnDX870MXXL9LHlhX0k6BlLMM6IDClxVDnlNkK3+n2cAEKSy8HwZJcRlekcsKz/AS2CxjPY+fg=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.620.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.620.1.tgz",
-      "integrity": "sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz",
+      "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.645.0.tgz",
-      "integrity": "sha512-d6XuChAl5NCsCrUexc6AFb4efPmb9+66iwPylKG+iMTMYgO1ackfy1Q2/f35jdn0jolkPkzKsVyfzsEVoID6ew=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.669.0.tgz",
+      "integrity": "sha512-HvpMJQ8xZuEGjadARVOfORPZx4U23PC5Jf6Fj+/NWK4VxEXhvf8J037fvGp3xRds5wUeuBBbhWX+Cbt0lbLCwQ=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.621.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.621.0.tgz",
-      "integrity": "sha512-w7ASSyfNvcx7+bYGep3VBgC3K6vEdLmlpjT7nSIHxxQf+WSdvy+HynwJosrpZax0sK5q0D1Jpn/5q+r5lwwW6w=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz",
+      "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.645.0.tgz",
-      "integrity": "sha512-6g9qMngrMCvHNsxmh/1urnWKrvaa2fv55b3bYwPxwJCYAvg/xc7bV8YHL7GS2rJpACG707k9G86DTW+Hab8bJA=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.669.0.tgz",
+      "integrity": "sha512-gRdtpQdLlnH0DpNoil1NPqKg//oD+IMN3MtBAIurpVL1mcTHhvRbVbHwhHytQT+8HBkcBReWdVa/yqPQ513oyQ=="
     },
     "@aws-sdk/middleware-host-header": {
-      "version": "3.620.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.620.0.tgz",
-      "integrity": "sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
+      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w=="
     },
     "@aws-sdk/middleware-logger": {
-      "version": "3.609.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz",
-      "integrity": "sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
+      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA=="
     },
     "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.620.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.620.0.tgz",
-      "integrity": "sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
+      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.645.0.tgz",
-      "integrity": "sha512-NpTAtqWK+49lRuxfz7st9for80r4NriCMK0RfdJSoPFVntjsSQiQ7+2nW2XL05uVY633e9DvCAw8YatX3zd1mw=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz",
+      "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ=="
     },
     "@aws-sdk/region-config-resolver": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz",
-      "integrity": "sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
+      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg=="
     },
     "@aws-sdk/token-providers": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz",
-      "integrity": "sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
+      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg=="
     },
     "@aws-sdk/types": {
-      "version": "3.609.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
-      "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
+      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg=="
     },
     "@aws-sdk/util-endpoints": {
-      "version": "3.645.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.645.0.tgz",
-      "integrity": "sha512-Oe+xaU4ic4PB1k3pb5VTC1/MWES13IlgpaQw01bVHGfwP6Yv6zZOxizRzca2Y3E+AyR+nKD7vXtHRY+w3bi4bg=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
+      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA=="
     },
     "@aws-sdk/util-locate-window": {
       "version": "3.568.0",
@@ -171,14 +171,14 @@
       "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.609.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz",
-      "integrity": "sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA=="
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.667.0.tgz",
+      "integrity": "sha512-y1pKlNzNpxzddM0QSnfIfIbi3Z9LTag1VDjYyZRbEGGSVip2J00qKsET+979nRezWMyJgw5GPBQR3Y+rN+jh0Q=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.614.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz",
-      "integrity": "sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA=="
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz",
+      "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
@@ -186,39 +186,39 @@
       "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
     },
     "@smithy/abort-controller": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.2.tgz",
-      "integrity": "sha512-b5g+PNujlfqIib9BjkNB108NyO5aZM/RXjfOCXRCqXQ1oPnIkfvdORrztbGgCZdPe/BN/MKDlrGA7PafKPM2jw=="
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz",
+      "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg=="
     },
     "@smithy/config-resolver": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.6.tgz",
-      "integrity": "sha512-j7HuVNoRd8EhcFp0MzcUb4fG40C7BcyshH+fAd3Jhd8bINNFvEQYBrZoS/SK6Pun9WPlfoI8uuU2SMz8DsEGlA=="
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz",
+      "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg=="
     },
     "@smithy/core": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.1.tgz",
-      "integrity": "sha512-7cts7/Oni7aCHebHGiBeWoz5z+vmH+Vx2Z/UW3XtXMslcxI3PEwBZxNinepwZjixS3n12fPc247PHWmjU7ndsQ=="
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
+      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA=="
     },
     "@smithy/credential-provider-imds": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.1.tgz",
-      "integrity": "sha512-4z/oTWpRF2TqQI3aCM89/PWu3kim58XU4kOCTtuTJnoaS4KT95cPWMxbQfTN2vzcOe96SOKO8QouQW/+ESB1fQ=="
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz",
+      "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w=="
     },
     "@smithy/fetch-http-handler": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.5.tgz",
-      "integrity": "sha512-DjRtGmK8pKQMIo9+JlAKUt14Z448bg8nAN04yKIvlrrpmpRSG57s5d2Y83npks1r4gPtTRNbAFdQCoj9l3P2KQ=="
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz",
+      "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A=="
     },
     "@smithy/hash-node": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.4.tgz",
-      "integrity": "sha512-6FgTVqEfCr9z/7+Em8BwSkJKA2y3krf1em134x3yr2NHWVCo2KYI8tcA53cjeO47y41jwF84ntsEE0Pe6pNKlg=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz",
+      "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw=="
     },
     "@smithy/invalid-dependency": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.4.tgz",
-      "integrity": "sha512-MJBUrojC4SEXi9aJcnNOE3oNAuYNphgCGFXscaCj2TA/59BTcXhzHACP8jnnEU3n4yir/NSLKzxqez0T4x4tjA=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz",
+      "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA=="
     },
     "@smithy/is-array-buffer": {
       "version": "3.0.0",
@@ -226,89 +226,89 @@
       "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="
     },
     "@smithy/middleware-content-length": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.6.tgz",
-      "integrity": "sha512-AFyHCfe8rumkJkz+hCOVJmBagNBj05KypyDwDElA4TgMSA4eYDZRjVePFZuyABrJZFDc7uVj3dpFIDCEhf59SA=="
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz",
+      "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA=="
     },
     "@smithy/middleware-endpoint": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.1.tgz",
-      "integrity": "sha512-Irv+soW8NKluAtFSEsF8O3iGyLxa5oOevJb/e1yNacV9H7JP/yHyJuKST5YY2ORS1+W34VR8EuUrOF+K29Pl4g=="
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz",
+      "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ=="
     },
     "@smithy/middleware-retry": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.16.tgz",
-      "integrity": "sha512-08kI36p1yB4CWO3Qi+UQxjzobt8iQJpnruF0K5BkbZmA/N/sJ51A1JJGJ36GgcbFyPfWw2FU48S5ZoqXt0h0jw=="
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
+      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A=="
     },
     "@smithy/middleware-serde": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.4.tgz",
-      "integrity": "sha512-1lPDB2O6IJ50Ucxgn7XrvZXbbuI48HmPCcMTuSoXT1lDzuTUfIuBjgAjpD8YLVMfnrjdepi/q45556LA51Pubw=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz",
+      "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g=="
     },
     "@smithy/middleware-stack": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.4.tgz",
-      "integrity": "sha512-sLMRjtMCqtVcrOqaOZ10SUnlFE25BSlmLsi4bRSGFD7dgR54eqBjfqkVkPBQyrKBortfGM0+2DJoUPcGECR+nQ=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz",
+      "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA=="
     },
     "@smithy/node-config-provider": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.5.tgz",
-      "integrity": "sha512-dq/oR3/LxgCgizVk7in7FGTm0w9a3qM4mg3IIXLTCHeW3fV+ipssSvBZ2bvEx1+asfQJTyCnVLeYf7JKfd9v3Q=="
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz",
+      "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q=="
     },
     "@smithy/node-http-handler": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.0.tgz",
-      "integrity": "sha512-5TFqaABbiY7uJMKbqR4OARjwI/l4TRoysDJ75pLpVQyO3EcmeloKYwDGyCtgB9WJniFx3BMkmGCB9+j+QiB+Ww=="
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz",
+      "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ=="
     },
     "@smithy/property-provider": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.4.tgz",
-      "integrity": "sha512-BmhefQbfkSl9DeU0/e6k9N4sT5bya5etv2epvqLUz3eGyfRBhtQq60nDkc1WPp4c+KWrzK721cUc/3y0f2psPQ=="
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz",
+      "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw=="
     },
     "@smithy/protocol-http": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.1.tgz",
-      "integrity": "sha512-Fm5+8LkeIus83Y8jTL1XHsBGP8sPvE1rEVyKf/87kbOPTbzEDMcgOlzcmYXat2h+nC3wwPtRy8hFqtJS71+Wow=="
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz",
+      "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ=="
     },
     "@smithy/querystring-builder": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.4.tgz",
-      "integrity": "sha512-NEoPAsZPdpfVbF98qm8i5k1XMaRKeEnO47CaL5ja6Y1Z2DgJdwIJuJkTJypKm/IKfp8gc0uimIFLwhml8+/pAw=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz",
+      "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw=="
     },
     "@smithy/querystring-parser": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.4.tgz",
-      "integrity": "sha512-7CHPXffFcakFzhO0OZs/rn6fXlTHrSDdLhIT6/JIk1u2bvwguTL3fMCc1+CfcbXA7TOhjWXu3TcB1EGMqJQwHg=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz",
+      "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA=="
     },
     "@smithy/service-error-classification": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.4.tgz",
-      "integrity": "sha512-KciDHHKFVTb9A1KlJHBt2F26PBaDtoE23uTZy5qRvPzHPqrooXFi6fmx98lJb3Jl38PuUTqIuCUmmY3pacuMBQ=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz",
+      "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA=="
     },
     "@smithy/shared-ini-file-loader": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.5.tgz",
-      "integrity": "sha512-6jxsJ4NOmY5Du4FD0enYegNJl4zTSuKLiChIMqIkh+LapxiP7lmz5lYUNLE9/4cvA65mbBmtdzZ8yxmcqM5igg=="
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz",
+      "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw=="
     },
     "@smithy/signature-v4": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.1.1.tgz",
-      "integrity": "sha512-SH9J9be81TMBNGCmjhrgMWu4YSpQ3uP1L06u/K9SDrE2YibUix1qxedPCxEQu02At0P0SrYDjvz+y91vLG0KRQ=="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz",
+      "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ=="
     },
     "@smithy/smithy-client": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.3.0.tgz",
-      "integrity": "sha512-H32nVo8tIX82kB0xI2LBrIcj8jx/3/ITotNLbeG1UL0b3b440YPR/hUvqjFJiaB24pQrMjRbU8CugqH5sV0hkw=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
+      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ=="
     },
     "@smithy/types": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.4.0.tgz",
-      "integrity": "sha512-0shOWSg/pnFXPcsSU8ZbaJ4JBHZJPPzLCJxafJvbMVFo9l1w81CqpgUqjlKGNHVrVB7fhIs+WS82JDTyzaLyLA=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz",
+      "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q=="
     },
     "@smithy/url-parser": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.4.tgz",
-      "integrity": "sha512-XdXfObA8WrloavJYtDuzoDhJAYc5rOt+FirFmKBRKaihu7QtU/METAxJgSo7uMK6hUkx0vFnqxV75urtRaLkLg=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz",
+      "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA=="
     },
     "@smithy/util-base64": {
       "version": "3.0.0",
@@ -336,19 +336,19 @@
       "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="
     },
     "@smithy/util-defaults-mode-browser": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.16.tgz",
-      "integrity": "sha512-Os8ddfNBe7hmc5UMWZxygIHCyAqY0aWR8Wnp/aKbti3f8Df/r0J9ttMZIxeMjsFgtVjEryB0q7SGcwBsHk8WEw=="
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
+      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw=="
     },
     "@smithy/util-defaults-mode-node": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.16.tgz",
-      "integrity": "sha512-rNhFIYRtrOrrhRlj6RL8jWA6/dcwrbGYAmy8+OAHjjzQ6zdzUBB1P+3IuJAgwWN6Y5GxI+mVXlM/pOjaoIgHow=="
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
+      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg=="
     },
     "@smithy/util-endpoints": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.0.tgz",
-      "integrity": "sha512-ilS7/0jcbS2ELdg0fM/4GVvOiuk8/U3bIFXUW25xE1Vh1Ol4DP6vVHQKqM40rCMizCLmJ9UxK+NeJrKlhI3HVA=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz",
+      "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw=="
     },
     "@smithy/util-hex-encoding": {
       "version": "3.0.0",
@@ -356,19 +356,19 @@
       "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="
     },
     "@smithy/util-middleware": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.4.tgz",
-      "integrity": "sha512-uSXHTBhstb1c4nHdmQEdkNMv9LiRNaJ/lWV2U/GO+5F236YFpdPw+hyWI9Zc0Rp9XKzwD9kVZvhZmEgp0UCVnA=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz",
+      "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA=="
     },
     "@smithy/util-retry": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.4.tgz",
-      "integrity": "sha512-JJr6g0tO1qO2tCQyK+n3J18r34ZpvatlFN5ULcLranFIBZPxqoivb77EPyNTVwTGMEvvq2qMnyjm4jMIxjdLFg=="
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz",
+      "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug=="
     },
     "@smithy/util-stream": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.4.tgz",
-      "integrity": "sha512-txU3EIDLhrBZdGfon6E9V6sZz/irYnKFMblz4TLVjyq8hObNHNS2n9a2t7GIrl7d85zgEPhwLE0gANpZsvpsKg=="
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz",
+      "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ=="
     },
     "@smithy/util-uri-escape": {
       "version": "3.0.0",
@@ -381,9 +381,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
-      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg=="
+      "version": "22.7.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index fb17db06c6..5fa2089e37 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -17,9 +17,9 @@
       "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ=="
     },
     "@types/express-serve-static-core": {
-      "version": "4.19.5",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
-      "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg=="
+      "version": "4.19.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A=="
     },
     "@types/http-errors": {
       "version": "2.0.4",
@@ -32,9 +32,9 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
     },
     "@types/node": {
-      "version": "22.5.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz",
-      "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA=="
+      "version": "22.7.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
     },
     "@types/qs": {
       "version": "6.9.16",

From ade98862ab62aa12fa3fd3d5c8413b99a963b636 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 11 Oct 2024 14:47:19 -0400
Subject: [PATCH 0540/1140] use exit for preventing als overhead

---
 packages/meteor/asl-helpers.js |  2 +-
 packages/minimongo/cursor.js   | 41 ++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/meteor/asl-helpers.js b/packages/meteor/asl-helpers.js
index 6cfaacf239..fdf8022153 100644
--- a/packages/meteor/asl-helpers.js
+++ b/packages/meteor/asl-helpers.js
@@ -38,7 +38,7 @@ function updateAslStore(key, value) {
 
 function runFresh(fn) {
   var als = getAsl();
-  return als.run({}, fn);
+  return als.exit(fn);
 }
 
 Meteor._getAsl = getAsl;
diff --git a/packages/minimongo/cursor.js b/packages/minimongo/cursor.js
index bfdecc49f8..16e477d8d5 100644
--- a/packages/minimongo/cursor.js
+++ b/packages/minimongo/cursor.js
@@ -489,30 +489,33 @@ export default class Cursor {
         distances = new LocalCollection._IdMap();
       }
     }
-    this.collection._docs.forEach((doc, id) => {
-      const matchResult = this.matcher.documentMatches(doc);
-      if (matchResult.result) {
-        if (options.ordered) {
-          results.push(doc);
 
-          if (distances && matchResult.distance !== undefined) {
-            distances.set(id, matchResult.distance);
+    Meteor._runFresh(() => {
+      this.collection._docs.forEach((doc, id) => {
+        const matchResult = this.matcher.documentMatches(doc);
+        if (matchResult.result) {
+          if (options.ordered) {
+            results.push(doc);
+
+            if (distances && matchResult.distance !== undefined) {
+              distances.set(id, matchResult.distance);
+            }
+          } else {
+            results.set(id, doc);
           }
-        } else {
-          results.set(id, doc);
         }
-      }
 
-      // Override to ensure all docs are matched if ignoring skip & limit
-      if (!applySkipLimit) {
-        return true;
-      }
+        // Override to ensure all docs are matched if ignoring skip & limit
+        if (!applySkipLimit) {
+          return true;
+        }
 
-      // Fast path for limited unsorted queries.
-      // XXX 'length' check here seems wrong for ordered
-      return (
-        !this.limit || this.skip || this.sorter || results.length !== this.limit
-      );
+        // Fast path for limited unsorted queries.
+        // XXX 'length' check here seems wrong for ordered
+        return (
+          !this.limit || this.skip || this.sorter || results.length !== this.limit
+        );
+      });
     });
 
     if (!options.ordered) {

From bad17a5ab56110f83b85a39eccc8467cb7d69b61 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 14 Oct 2024 19:45:02 -0400
Subject: [PATCH 0541/1140] refactor multiplexer to typescript

---
 package-lock.json                   | 2181 +++++++++++++++++++++++++++
 package.json                        |    2 +
 packages/mongo/mongo_driver.js      |    1 +
 packages/mongo/observe_handle.ts    |   63 +-
 packages/mongo/observe_multiplex.js |  206 ---
 packages/mongo/observe_multiplex.ts |  176 +++
 packages/mongo/package.js           |    2 +-
 tsconfig.json                       |   24 +
 8 files changed, 2421 insertions(+), 234 deletions(-)
 delete mode 100644 packages/mongo/observe_multiplex.js
 create mode 100644 packages/mongo/observe_multiplex.ts
 create mode 100644 tsconfig.json

diff --git a/package-lock.json b/package-lock.json
index 1ca8bd21d9..40e6d86a31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,8 @@
         "@babel/eslint-parser": "^7.21.3",
         "@babel/eslint-plugin": "^7.19.1",
         "@babel/preset-react": "^7.18.6",
+        "@types/lodash.isempty": "^4.4.9",
+        "@types/meteor": "^2.9.8",
         "@types/node": "^18.16.18",
         "@typescript-eslint/eslint-plugin": "^5.56.0",
         "@typescript-eslint/parser": "^5.56.0",
@@ -51,6 +53,955 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@aws-crypto/sha256-browser": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
+      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-js": "^5.2.0",
+        "@aws-crypto/supports-web-crypto": "^5.2.0",
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "@aws-sdk/util-locate-window": "^3.0.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/is-array-buffer": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-crypto/sha256-js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
+      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-js/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-crypto/supports-web-crypto": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-crypto/util": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "^3.222.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/is-array-buffer": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/client-cognito-identity": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz",
+      "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/client-sso-oidc": "3.670.0",
+        "@aws-sdk/client-sts": "3.670.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-node": "3.670.0",
+        "@aws-sdk/middleware-host-header": "3.667.0",
+        "@aws-sdk/middleware-logger": "3.667.0",
+        "@aws-sdk/middleware-recursion-detection": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/region-config-resolver": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/util-user-agent-browser": "3.670.0",
+        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/core": "^2.4.8",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/hash-node": "^3.0.7",
+        "@smithy/invalid-dependency": "^3.0.7",
+        "@smithy/middleware-content-length": "^3.0.9",
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.23",
+        "@smithy/util-defaults-mode-node": "^3.0.23",
+        "@smithy/util-endpoints": "^2.1.3",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-cognito-identity/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/client-sso": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz",
+      "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/middleware-host-header": "3.667.0",
+        "@aws-sdk/middleware-logger": "3.667.0",
+        "@aws-sdk/middleware-recursion-detection": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/region-config-resolver": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/util-user-agent-browser": "3.670.0",
+        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/core": "^2.4.8",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/hash-node": "^3.0.7",
+        "@smithy/invalid-dependency": "^3.0.7",
+        "@smithy/middleware-content-length": "^3.0.9",
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.23",
+        "@smithy/util-defaults-mode-node": "^3.0.23",
+        "@smithy/util-endpoints": "^2.1.3",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso-oidc": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz",
+      "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-node": "3.670.0",
+        "@aws-sdk/middleware-host-header": "3.667.0",
+        "@aws-sdk/middleware-logger": "3.667.0",
+        "@aws-sdk/middleware-recursion-detection": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/region-config-resolver": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/util-user-agent-browser": "3.670.0",
+        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/core": "^2.4.8",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/hash-node": "^3.0.7",
+        "@smithy/invalid-dependency": "^3.0.7",
+        "@smithy/middleware-content-length": "^3.0.9",
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.23",
+        "@smithy/util-defaults-mode-node": "^3.0.23",
+        "@smithy/util-endpoints": "^2.1.3",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.670.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso-oidc/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/client-sso/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/client-sts": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz",
+      "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/client-sso-oidc": "3.670.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-node": "3.670.0",
+        "@aws-sdk/middleware-host-header": "3.667.0",
+        "@aws-sdk/middleware-logger": "3.667.0",
+        "@aws-sdk/middleware-recursion-detection": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/region-config-resolver": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/util-user-agent-browser": "3.670.0",
+        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/core": "^2.4.8",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/hash-node": "^3.0.7",
+        "@smithy/invalid-dependency": "^3.0.7",
+        "@smithy/middleware-content-length": "^3.0.9",
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.23",
+        "@smithy/util-defaults-mode-node": "^3.0.23",
+        "@smithy/util-endpoints": "^2.1.3",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sts/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/core": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz",
+      "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/core": "^2.4.8",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/signature-v4": "^4.2.0",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "fast-xml-parser": "4.4.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/core/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-cognito-identity": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz",
+      "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/client-cognito-identity": "3.670.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-cognito-identity/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-env": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz",
+      "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-env/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-http": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz",
+      "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-stream": "^3.1.9",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-http/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-ini": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz",
+      "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-env": "3.667.0",
+        "@aws-sdk/credential-provider-http": "3.667.0",
+        "@aws-sdk/credential-provider-process": "3.667.0",
+        "@aws-sdk/credential-provider-sso": "3.670.0",
+        "@aws-sdk/credential-provider-web-identity": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/credential-provider-imds": "^3.2.4",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.670.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-ini/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-node": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz",
+      "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/credential-provider-env": "3.667.0",
+        "@aws-sdk/credential-provider-http": "3.667.0",
+        "@aws-sdk/credential-provider-ini": "3.670.0",
+        "@aws-sdk/credential-provider-process": "3.667.0",
+        "@aws-sdk/credential-provider-sso": "3.670.0",
+        "@aws-sdk/credential-provider-web-identity": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/credential-provider-imds": "^3.2.4",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-process": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz",
+      "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-process/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-sso": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz",
+      "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/client-sso": "3.670.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/token-providers": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-sso/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-web-identity": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz",
+      "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.667.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-providers": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz",
+      "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/client-cognito-identity": "3.670.0",
+        "@aws-sdk/client-sso": "3.670.0",
+        "@aws-sdk/client-sts": "3.670.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-cognito-identity": "3.670.0",
+        "@aws-sdk/credential-provider-env": "3.667.0",
+        "@aws-sdk/credential-provider-http": "3.667.0",
+        "@aws-sdk/credential-provider-ini": "3.670.0",
+        "@aws-sdk/credential-provider-node": "3.670.0",
+        "@aws-sdk/credential-provider-process": "3.667.0",
+        "@aws-sdk/credential-provider-sso": "3.670.0",
+        "@aws-sdk/credential-provider-web-identity": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/credential-provider-imds": "^3.2.4",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-providers/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/middleware-host-header": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
+      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-host-header/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/middleware-logger": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
+      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-logger/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/middleware-recursion-detection": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
+      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/middleware-user-agent": {
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz",
+      "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@smithy/core": "^2.4.8",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-user-agent/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/region-config-resolver": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
+      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/region-config-resolver/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/token-providers": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
+      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sso-oidc": "^3.667.0"
+      }
+    },
+    "node_modules/@aws-sdk/token-providers/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/types": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
+      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/types/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
+      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-endpoints": "^2.1.3",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/util-endpoints/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/util-locate-window": {
+      "version": "3.568.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
+      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/util-locate-window/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/util-user-agent-browser": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz",
+      "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/types": "^3.5.0",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-sdk/util-user-agent-browser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/util-user-agent-node": {
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz",
+      "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "aws-crt": ">=1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "aws-crt": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@aws-sdk/util-user-agent-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/@babel/compat-data": {
       "version": "7.23.5",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
@@ -1027,6 +1978,16 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@mongodb-js/saslprep": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
+      "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "sparse-bitfield": "^3.0.3"
+      }
+    },
     "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -1084,6 +2045,882 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@smithy/abort-controller": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz",
+      "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/abort-controller/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/config-resolver": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz",
+      "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/config-resolver/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/core": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
+      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/core/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/credential-provider-imds": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz",
+      "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/credential-provider-imds/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/fetch-http-handler": {
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz",
+      "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/querystring-builder": "^3.0.7",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-base64": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/fetch-http-handler/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/hash-node": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz",
+      "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/hash-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/invalid-dependency": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz",
+      "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/invalid-dependency/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/is-array-buffer/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-content-length": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz",
+      "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-content-length/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-endpoint": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz",
+      "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-middleware": "^3.0.7",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-endpoint/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-retry": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
+      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/service-error-classification": "^3.0.7",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "tslib": "^2.6.2",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-retry/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-serde": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz",
+      "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-serde/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-stack": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz",
+      "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-stack/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/node-config-provider": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz",
+      "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/node-config-provider/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/node-http-handler": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz",
+      "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/abort-controller": "^3.1.5",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/querystring-builder": "^3.0.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/node-http-handler/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/property-provider": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz",
+      "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/property-provider/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/protocol-http": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz",
+      "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/protocol-http/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/querystring-builder": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz",
+      "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-uri-escape": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/querystring-builder/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/querystring-parser": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz",
+      "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/querystring-parser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/service-error-classification": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz",
+      "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/shared-ini-file-loader": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz",
+      "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/shared-ini-file-loader/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/signature-v4": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz",
+      "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-uri-escape": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/signature-v4/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/smithy-client": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
+      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-stream": "^3.1.9",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/smithy-client/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/types": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz",
+      "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/types/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/url-parser": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz",
+      "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/querystring-parser": "^3.0.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/url-parser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-base64": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz",
+      "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-base64/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-body-length-browser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz",
+      "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/util-body-length-browser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-body-length-node": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz",
+      "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-body-length-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-buffer-from/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-config-provider": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz",
+      "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-config-provider/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-defaults-mode-browser": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
+      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@smithy/util-defaults-mode-browser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-defaults-mode-node": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
+      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/credential-provider-imds": "^3.2.4",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@smithy/util-defaults-mode-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-endpoints": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz",
+      "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-endpoints/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-hex-encoding": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz",
+      "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-hex-encoding/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-middleware": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz",
+      "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-middleware/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-retry": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz",
+      "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/service-error-classification": "^3.0.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-retry/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-stream": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz",
+      "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-stream/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-uri-escape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
+      "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-uri-escape/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-utf8/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/jquery": {
+      "version": "3.5.31",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.31.tgz",
+      "integrity": "sha512-rf/iB+cPJ/YZfMwr+FVuQbm7IaWC4y3FVYfVDxRGqmUCFjjPII0HWaP0vTPJGp6m4o13AXySCcMbWfrWtBFAKw==",
+      "dev": true,
+      "dependencies": {
+        "@types/sizzle": "*"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -1096,6 +2933,36 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "node_modules/@types/lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==",
+      "dev": true
+    },
+    "node_modules/@types/lodash.isempty": {
+      "version": "4.4.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash.isempty/-/lodash.isempty-4.4.9.tgz",
+      "integrity": "sha512-DPSFfnT2JmZiAWNWOU8IRZws/Ha6zyGF5m06TydfsY+0dVoQqby2J61Na2QU4YtwiZ+moC6cJS6zWYBJq4wBVw==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/meteor": {
+      "version": "2.9.8",
+      "resolved": "https://registry.npmjs.org/@types/meteor/-/meteor-2.9.8.tgz",
+      "integrity": "sha512-p96s1lMqtwt0hz50yokQJA+V9BQzNMLJfahwlbbfXKwbI/OMNCKhRfnxiiNROXAF080zctJlEcpjmv0YG7ztkA==",
+      "dev": true,
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/jquery": "*",
+        "@types/node": "*",
+        "@types/nodemailer": "*",
+        "@types/react": "*",
+        "@types/underscore": "*",
+        "mongodb": "^4.3.1"
+      }
+    },
     "node_modules/@types/node": {
       "version": "18.19.3",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz",
@@ -1105,12 +2972,65 @@
         "undici-types": "~5.26.4"
       }
     },
+    "node_modules/@types/nodemailer": {
+      "version": "6.4.16",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.16.tgz",
+      "integrity": "sha512-uz6hN6Pp0upXMcilM61CoKyjT7sskBoOWpptkjjJp8jIMlTdc3xG01U7proKkXzruMS4hS0zqtHNkNPFB20rKQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/prop-types": {
+      "version": "15.7.13",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz",
+      "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==",
+      "dev": true
+    },
+    "node_modules/@types/react": {
+      "version": "18.3.11",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz",
+      "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/prop-types": "*",
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/@types/semver": {
       "version": "7.5.6",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
       "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+      "dev": true
+    },
+    "node_modules/@types/underscore": {
+      "version": "1.11.15",
+      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.11.15.tgz",
+      "integrity": "sha512-HP38xE+GuWGlbSRq9WrZkousaQ7dragtZCruBVMi0oX1migFZavZ3OROKHSkNp/9ouq82zrWtZpg18jFnVN96g==",
+      "dev": true
+    },
+    "node_modules/@types/webidl-conversions": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
+      "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==",
+      "dev": true
+    },
+    "node_modules/@types/whatwg-url": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz",
+      "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/webidl-conversions": "*"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
@@ -1807,6 +3727,33 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bowser": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
+      "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1849,6 +3796,42 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
+    "node_modules/bson": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz",
+      "integrity": "sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
@@ -1952,6 +3935,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "dev": true
+    },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -3062,6 +5051,29 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "node_modules/fast-xml-parser": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+      "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
     "node_modules/fastq": {
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
@@ -3376,6 +5388,26 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/ignore": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
@@ -3441,6 +5473,19 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/is-array-buffer": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
@@ -3821,6 +5866,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -3936,6 +5987,13 @@
         "loose-envify": "cli.js"
       }
     },
+    "node_modules/memory-pager": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
+      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -3966,6 +6024,34 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/mongodb": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.17.2.tgz",
+      "integrity": "sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==",
+      "dev": true,
+      "dependencies": {
+        "bson": "^4.7.2",
+        "mongodb-connection-string-url": "^2.6.0",
+        "socks": "^2.7.1"
+      },
+      "engines": {
+        "node": ">=12.9.0"
+      },
+      "optionalDependencies": {
+        "@aws-sdk/credential-providers": "^3.186.0",
+        "@mongodb-js/saslprep": "^1.1.0"
+      }
+    },
+    "node_modules/mongodb-connection-string-url": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz",
+      "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/whatwg-url": "^8.2.1",
+        "whatwg-url": "^11.0.0"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -4548,6 +6634,46 @@
         "node": ">=8"
       }
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/sparse-bitfield": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
+      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "memory-pager": "^1.0.2"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.11",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
@@ -4656,6 +6782,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -4695,6 +6828,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -4886,6 +7031,42 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/package.json b/package.json
index 16de72f280..eb65503e11 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,8 @@
     "@babel/eslint-parser": "^7.21.3",
     "@babel/eslint-plugin": "^7.19.1",
     "@babel/preset-react": "^7.18.6",
+    "@types/lodash.isempty": "^4.4.9",
+    "@types/meteor": "^2.9.8",
     "@types/node": "^18.16.18",
     "@typescript-eslint/eslint-plugin": "^5.56.0",
     "@typescript-eslint/parser": "^5.56.0",
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 645c0f6e74..60ee67b857 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -24,6 +24,7 @@ import {
 } from "meteor/minimongo/constants";
 import { Meteor } from "meteor/meteor";
 import { ObserveHandle } from './observe_handle';
+import { ObserveMultiplexer } from './observe_multiplex';
 
 MongoInternals = {};
 
diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index f157c43c6d..418ea8e701 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -1,37 +1,46 @@
+import { ObserveHandleCallback, ObserveMultiplexer } from './observe_multiplex';
+
 let nextObserveHandleId = 1;
 
+export type ObserveHandleCallbackInternal = '_added' | '_addedBefore' | '_changed' | '_movedBefore' | '_removed';
+
 // When the callbacks do not mutate the arguments, we can skip a lot of data clones
 export class ObserveHandle {
-    _stopped: boolean;
-    _id: number;
-    _multiplexer: any;
-    nonMutatingCallbacks: boolean;
+  _id: number;
+  _multiplexer: ObserveMultiplexer;
+  nonMutatingCallbacks: boolean;
+  _stopped: boolean;
 
-    constructor(multiplexer: any, callbacks: any, nonMutatingCallbacks: boolean) {
-        this._multiplexer = multiplexer;
+  _added?: (...args: any[]) => void;
+  _addedBefore?: (...args: any[]) => void;
+  _changed?: (...args: any[]) => void;
+  _movedBefore?: (...args: any[]) => void;
+  _removed?: (...args: any[]) => void;
 
-        multiplexer.callbackNames().forEach((name) => {
-            if (callbacks[name]) {
-                this['_' + name] = callbacks[name];
-            } else if (name === "addedBefore" && callbacks.added) {
-                this._addedBefore = async function (id, fields, before) {
-                    await callbacks.added(id, fields);
-                };
-            }
-        });
+  constructor(multiplexer: any, callbacks: Record<ObserveHandleCallback, any>, nonMutatingCallbacks: boolean) {
+    this._multiplexer = multiplexer;
 
-        this._stopped = false;
-        this._id = nextObserveHandleId++;
-        this.nonMutatingCallbacks = nonMutatingCallbacks;
-    }
+    multiplexer.callbackNames().forEach((name: ObserveHandleCallback) => {
+      if (callbacks[name]) {
+        this[`_${name}` as ObserveHandleCallbackInternal] = callbacks[name];
+        return;
+      }
 
-    async stop() {
-        if (this._stopped) return;
-        this._stopped = true;
-        await this._multiplexer.removeHandle(this._id);
-    }
+      if (name === "addedBefore" && callbacks.added) {
+        this._addedBefore = async function (id, fields, before) {
+          await callbacks.added(id, fields);
+        };
+      }
+    });
 
-    _addedBefore(id: any, fields: any, before: any) {
-        throw new Error("Method not implemented.");
-    }
+    this._stopped = false;
+    this._id = nextObserveHandleId++;
+    this.nonMutatingCallbacks = nonMutatingCallbacks;
+  }
+
+  async stop() {
+    if (this._stopped) return;
+    this._stopped = true;
+    await this._multiplexer.removeHandle(this._id);
+  }
 }
\ No newline at end of file
diff --git a/packages/mongo/observe_multiplex.js b/packages/mongo/observe_multiplex.js
deleted file mode 100644
index ebcdc150b2..0000000000
--- a/packages/mongo/observe_multiplex.js
+++ /dev/null
@@ -1,206 +0,0 @@
-import has from 'lodash.has'; 
-import isEmpty from 'lodash.isempty';
-
-
-ObserveMultiplexer = class {
-  constructor({ ordered, onStop = () => {} } = {}) {
-    if (ordered === undefined) throw Error("must specify ordered");
-
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-        "mongo-livedata", "observe-multiplexers", 1);
-
-    this._ordered = ordered;
-    this._onStop = onStop;
-    this._queue = new Meteor._AsynchronousQueue();
-    this._handles = {};
-    this._resolver = null;
-    this._readyPromise = new Promise(r => this._resolver = r).then(() => this._isReady = true);
-    this._cache = new LocalCollection._CachingChangeObserver({
-      ordered});
-    // Number of addHandleAndSendInitialAdds tasks scheduled but not yet
-    // running. removeHandle uses this to know if it's time to call the onStop
-    // callback.
-    this._addHandleTasksScheduledButNotPerformed = 0;
-
-    const self = this;
-    this.callbackNames().forEach(callbackName => {
-      this[callbackName] = function(/* ... */) {
-        self._applyCallback(callbackName, _.toArray(arguments));
-      };
-    });
-  }
-
-  addHandleAndSendInitialAdds(handle) {
-    return this._addHandleAndSendInitialAdds(handle);
-  }
-
-  async _addHandleAndSendInitialAdds(handle) {
-    ++this._addHandleTasksScheduledButNotPerformed;
-
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-        "mongo-livedata", "observe-handles", 1);
-
-    const self = this;
-    await this._queue.runTask(async function () {
-      self._handles[handle._id] = handle;
-      // Send out whatever adds we have so far (whether the
-      // multiplexer is ready).
-      await self._sendAdds(handle);
-      --self._addHandleTasksScheduledButNotPerformed;
-    });
-    await this._readyPromise;
-  }
-
-  // Remove an observe handle. If it was the last observe handle, call the
-  // onStop callback; you cannot add any more observe handles after this.
-  //
-  // This is not synchronized with polls and handle additions: this means that
-  // you can safely call it from within an observe callback, but it also means
-  // that we have to be careful when we iterate over _handles.
-  async removeHandle(id) {
-    // This should not be possible: you can only call removeHandle by having
-    // access to the ObserveHandle, which isn't returned to user code until the
-    // multiplex is ready.
-    if (!this._ready())
-      throw new Error("Can't remove handles until the multiplex is ready");
-
-    delete this._handles[id];
-
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-        "mongo-livedata", "observe-handles", -1);
-
-    if (isEmpty(this._handles) &&
-        this._addHandleTasksScheduledButNotPerformed === 0) {
-      await this._stop();
-    }
-  }
-  async _stop(options) {
-    options = options || {};
-
-    // It shouldn't be possible for us to stop when all our handles still
-    // haven't been returned from observeChanges!
-    if (! this._ready() && ! options.fromQueryError)
-      throw Error("surprising _stop: not ready");
-
-    // Call stop callback (which kills the underlying process which sends us
-    // callbacks and removes us from the connection's dictionary).
-    await this._onStop();
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-        "mongo-livedata", "observe-multiplexers", -1);
-
-    // Cause future addHandleAndSendInitialAdds calls to throw (but the onStop
-    // callback should make our connection forget about us).
-    this._handles = null;
-  }
-
-  // Allows all addHandleAndSendInitialAdds calls to return, once all preceding
-  // adds have been processed. Does not block.
-  async ready() {
-    const self = this;
-    this._queue.queueTask(function () {
-      if (self._ready())
-        throw Error("can't make ObserveMultiplex ready twice!");
-
-      if (!self._resolver) {
-        throw new Error("Missing resolver");
-      }
-
-      self._resolver();
-      self._isReady = true;
-    });
-  }
-
-  // If trying to execute the query results in an error, call this. This is
-  // intended for permanent errors, not transient network errors that could be
-  // fixed. It should only be called before ready(), because if you called ready
-  // that meant that you managed to run the query once. It will stop this
-  // ObserveMultiplex and cause addHandleAndSendInitialAdds calls (and thus
-  // observeChanges calls) to throw the error.
-  async queryError(err) {
-    var self = this;
-    await this._queue.runTask(function () {
-      if (self._ready())
-        throw Error("can't claim query has an error after it worked!");
-      self._stop({fromQueryError: true});
-      throw err;
-    });
-  }
-
-  // Calls "cb" once the effects of all "ready", "addHandleAndSendInitialAdds"
-  // and observe callbacks which came before this call have been propagated to
-  // all handles. "ready" must have already been called on this multiplexer.
-  async onFlush(cb) {
-    var self = this;
-    await this._queue.queueTask(async function () {
-      if (!self._ready())
-        throw Error("only call onFlush on a multiplexer that will be ready");
-      await cb();
-    });
-  }
-  callbackNames() {
-    if (this._ordered)
-      return ["addedBefore", "changed", "movedBefore", "removed"];
-    else
-      return ["added", "changed", "removed"];
-  }
-  _ready() {
-    return !!this._isReady;
-  }
-  _applyCallback(callbackName, args) {
-    const self = this;
-    this._queue.queueTask(async function () {
-      // If we stopped in the meantime, do nothing.
-      if (!self._handles)
-        return;
-
-      // First, apply the change to the cache.
-      await self._cache.applyChange[callbackName].apply(null, args);
-      // If we haven't finished the initial adds, then we should only be getting
-      // adds.
-      if (!self._ready() &&
-          (callbackName !== 'added' && callbackName !== 'addedBefore')) {
-        throw new Error("Got " + callbackName + " during initial adds");
-      }
-
-      // Now multiplex the callbacks out to all observe handles. It's OK if
-      // these calls yield; since we're inside a task, no other use of our queue
-      // can continue until these are done. (But we do have to be careful to not
-      // use a handle that got removed, because removeHandle does not use the
-      // queue; thus, we iterate over an array of keys that we control.)
-      for (const handleId of Object.keys(self._handles)) {
-        var handle = self._handles && self._handles[handleId];
-        if (!handle) return;
-        var callback = handle['_' + callbackName];
-        // clone arguments so that callbacks can mutate their arguments
-
-        callback &&
-          (await callback.apply(
-            null,
-            handle.nonMutatingCallbacks ? args : EJSON.clone(args)
-          ));
-      }
-    });
-  }
-
-  // Sends initial adds to a handle. It should only be called from within a task
-  // (the task that is processing the addHandleAndSendInitialAdds call). It
-  // synchronously invokes the handle's added or addedBefore; there's no need to
-  // flush the queue afterwards to ensure that the callbacks get out.
-  async _sendAdds(handle) {
-    var add = this._ordered ? handle._addedBefore : handle._added;
-    if (!add)
-      return;
-    // note: docs may be an _IdMap or an OrderedDict
-    await this._cache.docs.forEachAsync(async (doc, id) => {
-      if (!has(this._handles, handle._id))
-        throw Error("handle got removed before sending initial adds!");
-      const { _id, ...fields } = handle.nonMutatingCallbacks ? doc
-          : EJSON.clone(doc);
-      if (this._ordered)
-        await add(id, fields, null); // we're going in order, so add at end
-      else
-        await add(id, fields);
-    });
-  }
-};
-
diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
new file mode 100644
index 0000000000..875a38d9d3
--- /dev/null
+++ b/packages/mongo/observe_multiplex.ts
@@ -0,0 +1,176 @@
+import { ObserveHandle } from './observe_handle';
+import isEmpty from 'lodash.isempty';
+
+interface ObserveMultiplexerOptions {
+  ordered: boolean;
+  onStop?: () => void;
+}
+
+export type ObserveHandleCallback = 'added' | 'addedBefore' | 'changed' | 'movedBefore' | 'removed';
+
+export class ObserveMultiplexer {
+  private readonly _ordered: boolean;
+  private readonly _onStop: () => void;
+  private _queue: any;
+  private _handles: { [key: string]: ObserveHandle };
+  private _resolver: ((value?: unknown) => void) | null;
+  private readonly _readyPromise: Promise<boolean | void>;
+  private _isReady: boolean;
+  private _cache: any;
+  private _addHandleTasksScheduledButNotPerformed: number;
+
+  constructor({ ordered, onStop = () => {} }: ObserveMultiplexerOptions) {
+    if (ordered === undefined) throw Error("must specify ordered");
+
+    // @ts-ignore
+    Package['facts-base'] && Package['facts-base']
+        .Facts.incrementServerFact("mongo-livedata", "observe-multiplexers", 1);
+
+    this._ordered = ordered;
+    this._onStop = onStop;
+    // @ts-ignore
+    this._queue = new Meteor._AsynchronousQueue();
+    this._handles = {};
+    this._resolver = null;
+    this._isReady = false;
+    this._readyPromise = new Promise(r => this._resolver = r).then(() => this._isReady = true);
+    // @ts-ignore
+    this._cache = new LocalCollection._CachingChangeObserver({ ordered });
+    this._addHandleTasksScheduledButNotPerformed = 0;
+
+    this.callbackNames().forEach(callbackName => {
+      (this as any)[callbackName] = (...args: any[]) => {
+        this._applyCallback(callbackName, args);
+      };
+    });
+  }
+
+  addHandleAndSendInitialAdds(handle: ObserveHandle): Promise<void> {
+    return this._addHandleAndSendInitialAdds(handle);
+  }
+
+  async _addHandleAndSendInitialAdds(handle: ObserveHandle): Promise<void> {
+    ++this._addHandleTasksScheduledButNotPerformed;
+
+    // @ts-ignore
+    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
+      "mongo-livedata", "observe-handles", 1);
+
+    await this._queue.runTask(async () => {
+      this._handles[handle._id] = handle;
+      await this._sendAdds(handle);
+      --this._addHandleTasksScheduledButNotPerformed;
+    });
+    await this._readyPromise;
+  }
+
+  async removeHandle(id: number): Promise<void> {
+    if (!this._ready())
+      throw new Error("Can't remove handles until the multiplex is ready");
+
+    delete this._handles[id];
+
+    // @ts-ignore
+    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
+      "mongo-livedata", "observe-handles", -1);
+
+    if (isEmpty(this._handles) &&
+      this._addHandleTasksScheduledButNotPerformed === 0) {
+      await this._stop();
+    }
+  }
+
+  async _stop(options: { fromQueryError?: boolean } = {}): Promise<void> {
+    if (!this._ready() && !options.fromQueryError)
+      throw Error("surprising _stop: not ready");
+
+    await this._onStop();
+
+    // @ts-ignore
+    Package['facts-base'] && Package['facts-base']
+        .Facts.incrementServerFact("mongo-livedata", "observe-multiplexers", -1);
+
+    this._handles = {};
+  }
+
+  async ready(): Promise<void> {
+    await this._queue.queueTask(() => {
+      if (this._ready())
+        throw Error("can't make ObserveMultiplex ready twice!");
+
+      if (!this._resolver) {
+        throw new Error("Missing resolver");
+      }
+
+      this._resolver();
+      this._isReady = true;
+    });
+  }
+
+  async queryError(err: Error): Promise<void> {
+    await this._queue.runTask(() => {
+      if (this._ready())
+        throw Error("can't claim query has an error after it worked!");
+      this._stop({ fromQueryError: true });
+      throw err;
+    });
+  }
+
+  async onFlush(cb: () => void): Promise<void> {
+    await this._queue.queueTask(async () => {
+      if (!this._ready())
+        throw Error("only call onFlush on a multiplexer that will be ready");
+      await cb();
+    });
+  }
+
+  callbackNames(): ObserveHandleCallback[] {
+    return this._ordered
+      ? ["addedBefore", "changed", "movedBefore", "removed"]
+      : ["added", "changed", "removed"];
+  }
+
+  _ready(): boolean {
+    return !!this._isReady;
+  }
+
+  _applyCallback(callbackName: string, args: any[]): void {
+    this._queue.queueTask(async () => {
+      if (!this._handles) return;
+
+      await this._cache.applyChange[callbackName].apply(null, args);
+      if (!this._ready() &&
+        (callbackName !== 'added' && callbackName !== 'addedBefore')) {
+        throw new Error(`Got ${callbackName} during initial adds`);
+      }
+
+      for (const handleId of Object.keys(this._handles)) {
+        const handle = this._handles && this._handles[handleId];
+        if (!handle) return;
+        const callback = (handle as any)[`_${callbackName}`];
+        callback && (await callback.apply(
+          null,
+          handle.nonMutatingCallbacks ? args : EJSON.clone(args)
+        ));
+      }
+    });
+  }
+
+  async _sendAdds(handle: ObserveHandle): Promise<void> {
+    const add = this._ordered ? handle._addedBefore : handle._added;
+
+    if (!add) return;
+
+    await this._cache.docs.forEachAsync(async (doc: any, id: string) => {
+      if (!(handle._id in this._handles))
+        throw Error("handle got removed before sending initial adds!");
+
+      const { _id, ...fields } = handle.nonMutatingCallbacks ? doc : EJSON.clone(doc);
+
+      if (this._ordered)
+        await add(id, fields, null);
+      else
+        await add(id, fields);
+    });
+  }
+}
\ No newline at end of file
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 40125b037c..2babd85ac7 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -88,7 +88,7 @@ Package.onUse(function (api) {
     [
       "mongo_driver.js",
       "oplog_tailing.js",
-      "observe_multiplex.js",
+      "observe_multiplex.ts",
       "doc_fetcher.js",
       "polling_observe_driver.js",
       "oplog_observe_driver.js",
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000..62b3d0ced7
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "module": "commonjs",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "typeRoots": [
+      "./node_modules/@types",
+      "./types"
+    ]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "types/**/*.d.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
\ No newline at end of file

From 5f581ad324b0da3e470ba72d35340bbab9390755 Mon Sep 17 00:00:00 2001
From: Gywem <igcogi@gmail.com>
Date: Wed, 16 Oct 2024 17:04:36 +0200
Subject: [PATCH 0542/1140] ensure cordova package.json is installed after full
 appending

---
 tools/cordova/project.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/cordova/project.js b/tools/cordova/project.js
index a5abc55a52..b6830ac394 100644
--- a/tools/cordova/project.js
+++ b/tools/cordova/project.js
@@ -11,6 +11,7 @@ import { Profile } from '../tool-env/profile';
 import buildmessage from '../utils/buildmessage.js';
 import main from '../cli/main.js';
 import { execFileAsync } from '../utils/processes';
+var meteorNpm = require('../isobuild/meteor-npm');
 
 import { cordova as cordova_lib, events as cordova_events, CordovaError }
   from 'cordova-lib';
@@ -492,6 +493,8 @@ to Cordova project`, async () => {
         files.pathJoin(self.projectRoot, "package.json"),
         JSON.stringify(packageJsonObj, null, 2) + "\n"
       );
+
+      await meteorNpm.runNpmCommand(["install"], self.projectRoot);
     });
   }
 

From c03737c67bcf691d16aed0549133bfd732585315 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 16 Oct 2024 14:44:34 -0400
Subject: [PATCH 0543/1140] bump to stable version

---
 packages/deprecated/http/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/deprecated/http/package.js b/packages/deprecated/http/package.js
index 405387d200..b19ac4248e 100644
--- a/packages/deprecated/http/package.js
+++ b/packages/deprecated/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '3.0.0-beta300.7',
+  version: '3.0.0',
   deprecated: 'Please use the fetch package'
 });
 

From 197ca30128a9517b25b368d878ed023413571d66 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Wed, 16 Oct 2024 17:02:50 -0400
Subject: [PATCH 0544/1140] bump bundle version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 196a6b19b9..79dae95006 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.9.0.1
+BUNDLE_VERSION=22.9.0.2
 
 
 # OS Check. Put here because here is where we download the precompiled

From 505f112505a3eb5fde085ef247ab01370d216cf1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 8 Oct 2024 14:57:21 -0400
Subject: [PATCH 0545/1140] remove bindEnvironment from code hotspots

---
 packages/meteor/async_helpers.js |  5 +----
 packages/mongo/mongo_driver.js   | 22 +---------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/packages/meteor/async_helpers.js b/packages/meteor/async_helpers.js
index fc1175d9c0..6bcb8a38ed 100644
--- a/packages/meteor/async_helpers.js
+++ b/packages/meteor/async_helpers.js
@@ -133,10 +133,7 @@ Object.assign(AsynchronousQueue.prototype, {
     );
 
     const handle = {
-      task: Meteor.bindEnvironment(task, function (e) {
-        Meteor._debug('Exception from task', e);
-        throw e;
-      }),
+      task,
       name: task.name,
       resolver,
     };
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 69d9b86f7b..feff2edd7b 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -338,10 +338,6 @@ var writeCallback = function (write, refresh, callback) {
   };
 };
 
-var bindEnvironmentForWrite = function (callback) {
-  return Meteor.bindEnvironment(callback, "Mongo write");
-};
-
 MongoConnection.prototype.insertAsync = async function (collection_name, document) {
   const self = this;
 
@@ -967,24 +963,8 @@ Cursor.prototype.observeAsync = function (callbacks) {
 
 Cursor.prototype.observeChanges = function (callbacks, options = {}) {
   var self = this;
-  var methods = [
-    'addedAt',
-    'added',
-    'changedAt',
-    'changed',
-    'removedAt',
-    'removed',
-    'movedTo'
-  ];
-  var ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
 
-  let exceptionName = callbacks._fromObserve ? 'observe' : 'observeChanges';
-  exceptionName += ' callback';
-  methods.forEach(function (method) {
-    if (callbacks[method] && typeof callbacks[method] == "function") {
-      callbacks[method] = Meteor.bindEnvironment(callbacks[method], method + exceptionName);
-    }
-  });
+  var ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
 
   return self._mongo._observeChanges(
     self._cursorDescription, ordered, callbacks, options.nonMutatingCallbacks);

From 1c0af5b6a513cd7004099ab38c69d56c8242471e Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 9 Oct 2024 08:27:19 -0400
Subject: [PATCH 0546/1140] remove bindEnvironment

---
 packages/mongo/oplog_tailing.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/mongo/oplog_tailing.js b/packages/mongo/oplog_tailing.js
index 6dc86f28c7..3e29bdd322 100644
--- a/packages/mongo/oplog_tailing.js
+++ b/packages/mongo/oplog_tailing.js
@@ -105,12 +105,6 @@ Object.assign(OplogHandle.prototype, {
     // Calling onOplogEntry requires us to wait for the tailing to be ready.
     await self._readyPromise;
 
-    var originalCallback = callback;
-    callback = Meteor.bindEnvironment(function (notification) {
-      originalCallback(notification);
-    }, function (err) {
-      Meteor._debug("Error in oplog callback", err);
-    });
     var listenHandle = self._crossbar.listen(trigger, callback);
     return {
       stop: async function () {

From 83630b141ccd30e4082c43733223221e84ac1c1f Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 9 Oct 2024 08:39:47 -0400
Subject: [PATCH 0547/1140] extract observe handle

---
 packages/mongo/mongo_driver.js      |  1 +
 packages/mongo/observe_handle.ts    | 37 +++++++++++++++++++++++++++++
 packages/mongo/observe_multiplex.js | 29 ----------------------
 3 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 packages/mongo/observe_handle.ts

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index feff2edd7b..645c0f6e74 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -23,6 +23,7 @@ import {
   getAsyncMethodName
 } from "meteor/minimongo/constants";
 import { Meteor } from "meteor/meteor";
+import { ObserveHandle } from './observe_handle';
 
 MongoInternals = {};
 
diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
new file mode 100644
index 0000000000..f157c43c6d
--- /dev/null
+++ b/packages/mongo/observe_handle.ts
@@ -0,0 +1,37 @@
+let nextObserveHandleId = 1;
+
+// When the callbacks do not mutate the arguments, we can skip a lot of data clones
+export class ObserveHandle {
+    _stopped: boolean;
+    _id: number;
+    _multiplexer: any;
+    nonMutatingCallbacks: boolean;
+
+    constructor(multiplexer: any, callbacks: any, nonMutatingCallbacks: boolean) {
+        this._multiplexer = multiplexer;
+
+        multiplexer.callbackNames().forEach((name) => {
+            if (callbacks[name]) {
+                this['_' + name] = callbacks[name];
+            } else if (name === "addedBefore" && callbacks.added) {
+                this._addedBefore = async function (id, fields, before) {
+                    await callbacks.added(id, fields);
+                };
+            }
+        });
+
+        this._stopped = false;
+        this._id = nextObserveHandleId++;
+        this.nonMutatingCallbacks = nonMutatingCallbacks;
+    }
+
+    async stop() {
+        if (this._stopped) return;
+        this._stopped = true;
+        await this._multiplexer.removeHandle(this._id);
+    }
+
+    _addedBefore(id: any, fields: any, before: any) {
+        throw new Error("Method not implemented.");
+    }
+}
\ No newline at end of file
diff --git a/packages/mongo/observe_multiplex.js b/packages/mongo/observe_multiplex.js
index 35c150bf9c..ebcdc150b2 100644
--- a/packages/mongo/observe_multiplex.js
+++ b/packages/mongo/observe_multiplex.js
@@ -1,7 +1,6 @@
 import has from 'lodash.has'; 
 import isEmpty from 'lodash.isempty';
 
-let nextObserveHandleId = 1;
 
 ObserveMultiplexer = class {
   constructor({ ordered, onStop = () => {} } = {}) {
@@ -205,31 +204,3 @@ ObserveMultiplexer = class {
   }
 };
 
-// When the callbacks do not mutate the arguments, we can skip a lot of data clones
-ObserveHandle = class {
-  constructor(multiplexer, callbacks, nonMutatingCallbacks = false) {
-    this._multiplexer = multiplexer;
-    multiplexer.callbackNames().forEach((name) => {
-      if (callbacks[name]) {
-        this['_' + name] = callbacks[name];
-      } else if (name === "addedBefore" && callbacks.added) {
-        // Special case: if you specify "added" and "movedBefore", you get an
-        // ordered observe where for some reason you don't get ordering data on
-        // the adds.  I dunno, we wrote tests for it, there must have been a
-        // reason.
-        this._addedBefore = async function (id, fields, before) {
-          await callbacks.added(id, fields);
-        };
-      }
-    });
-    this._stopped = false;
-    this._id = nextObserveHandleId++;
-    this.nonMutatingCallbacks = nonMutatingCallbacks;
-  }
-
-  async stop() {
-    if (this._stopped) return;
-    this._stopped = true;
-    await this._multiplexer.removeHandle(this._id);
-  }
-};
\ No newline at end of file

From 9d0df6c43e425837606d266eb670e01d89d595e7 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 9 Oct 2024 08:58:19 -0400
Subject: [PATCH 0548/1140] add typescript

---
 packages/mongo/package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 3775964d2a..40125b037c 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -42,6 +42,7 @@ Package.onUse(function (api) {
     "mongo-id",
     "check",
     "ecmascript",
+    "typescript",
     "mongo-dev-server",
     "logging",
   ]);

From 6ce185a6c42b622131a8ccf2b74903978b13cec2 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 11 Oct 2024 14:47:19 -0400
Subject: [PATCH 0549/1140] use exit for preventing als overhead

---
 packages/meteor/asl-helpers.js |  2 +-
 packages/minimongo/cursor.js   | 41 ++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/meteor/asl-helpers.js b/packages/meteor/asl-helpers.js
index 6cfaacf239..fdf8022153 100644
--- a/packages/meteor/asl-helpers.js
+++ b/packages/meteor/asl-helpers.js
@@ -38,7 +38,7 @@ function updateAslStore(key, value) {
 
 function runFresh(fn) {
   var als = getAsl();
-  return als.run({}, fn);
+  return als.exit(fn);
 }
 
 Meteor._getAsl = getAsl;
diff --git a/packages/minimongo/cursor.js b/packages/minimongo/cursor.js
index bfdecc49f8..16e477d8d5 100644
--- a/packages/minimongo/cursor.js
+++ b/packages/minimongo/cursor.js
@@ -489,30 +489,33 @@ export default class Cursor {
         distances = new LocalCollection._IdMap();
       }
     }
-    this.collection._docs.forEach((doc, id) => {
-      const matchResult = this.matcher.documentMatches(doc);
-      if (matchResult.result) {
-        if (options.ordered) {
-          results.push(doc);
 
-          if (distances && matchResult.distance !== undefined) {
-            distances.set(id, matchResult.distance);
+    Meteor._runFresh(() => {
+      this.collection._docs.forEach((doc, id) => {
+        const matchResult = this.matcher.documentMatches(doc);
+        if (matchResult.result) {
+          if (options.ordered) {
+            results.push(doc);
+
+            if (distances && matchResult.distance !== undefined) {
+              distances.set(id, matchResult.distance);
+            }
+          } else {
+            results.set(id, doc);
           }
-        } else {
-          results.set(id, doc);
         }
-      }
 
-      // Override to ensure all docs are matched if ignoring skip & limit
-      if (!applySkipLimit) {
-        return true;
-      }
+        // Override to ensure all docs are matched if ignoring skip & limit
+        if (!applySkipLimit) {
+          return true;
+        }
 
-      // Fast path for limited unsorted queries.
-      // XXX 'length' check here seems wrong for ordered
-      return (
-        !this.limit || this.skip || this.sorter || results.length !== this.limit
-      );
+        // Fast path for limited unsorted queries.
+        // XXX 'length' check here seems wrong for ordered
+        return (
+          !this.limit || this.skip || this.sorter || results.length !== this.limit
+        );
+      });
     });
 
     if (!options.ordered) {

From 2def9d779bfc59b40782b3a7f2b6c8aa51821159 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 14 Oct 2024 19:45:02 -0400
Subject: [PATCH 0550/1140] refactor multiplexer to typescript

---
 package-lock.json                   | 2181 +++++++++++++++++++++++++++
 package.json                        |    2 +
 packages/mongo/mongo_driver.js      |    1 +
 packages/mongo/observe_handle.ts    |   63 +-
 packages/mongo/observe_multiplex.js |  206 ---
 packages/mongo/observe_multiplex.ts |  176 +++
 packages/mongo/package.js           |    2 +-
 tsconfig.json                       |   24 +
 8 files changed, 2421 insertions(+), 234 deletions(-)
 delete mode 100644 packages/mongo/observe_multiplex.js
 create mode 100644 packages/mongo/observe_multiplex.ts
 create mode 100644 tsconfig.json

diff --git a/package-lock.json b/package-lock.json
index 1ca8bd21d9..40e6d86a31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,8 @@
         "@babel/eslint-parser": "^7.21.3",
         "@babel/eslint-plugin": "^7.19.1",
         "@babel/preset-react": "^7.18.6",
+        "@types/lodash.isempty": "^4.4.9",
+        "@types/meteor": "^2.9.8",
         "@types/node": "^18.16.18",
         "@typescript-eslint/eslint-plugin": "^5.56.0",
         "@typescript-eslint/parser": "^5.56.0",
@@ -51,6 +53,955 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@aws-crypto/sha256-browser": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
+      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-js": "^5.2.0",
+        "@aws-crypto/supports-web-crypto": "^5.2.0",
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "@aws-sdk/util-locate-window": "^3.0.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/is-array-buffer": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-crypto/sha256-js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
+      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/util": "^5.2.0",
+        "@aws-sdk/types": "^3.222.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/sha256-js/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-crypto/supports-web-crypto": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-crypto/util": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "^3.222.0",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/is-array-buffer": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@aws-crypto/util/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/client-cognito-identity": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz",
+      "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/client-sso-oidc": "3.670.0",
+        "@aws-sdk/client-sts": "3.670.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-node": "3.670.0",
+        "@aws-sdk/middleware-host-header": "3.667.0",
+        "@aws-sdk/middleware-logger": "3.667.0",
+        "@aws-sdk/middleware-recursion-detection": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/region-config-resolver": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/util-user-agent-browser": "3.670.0",
+        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/core": "^2.4.8",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/hash-node": "^3.0.7",
+        "@smithy/invalid-dependency": "^3.0.7",
+        "@smithy/middleware-content-length": "^3.0.9",
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.23",
+        "@smithy/util-defaults-mode-node": "^3.0.23",
+        "@smithy/util-endpoints": "^2.1.3",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-cognito-identity/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/client-sso": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz",
+      "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/middleware-host-header": "3.667.0",
+        "@aws-sdk/middleware-logger": "3.667.0",
+        "@aws-sdk/middleware-recursion-detection": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/region-config-resolver": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/util-user-agent-browser": "3.670.0",
+        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/core": "^2.4.8",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/hash-node": "^3.0.7",
+        "@smithy/invalid-dependency": "^3.0.7",
+        "@smithy/middleware-content-length": "^3.0.9",
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.23",
+        "@smithy/util-defaults-mode-node": "^3.0.23",
+        "@smithy/util-endpoints": "^2.1.3",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso-oidc": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz",
+      "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-node": "3.670.0",
+        "@aws-sdk/middleware-host-header": "3.667.0",
+        "@aws-sdk/middleware-logger": "3.667.0",
+        "@aws-sdk/middleware-recursion-detection": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/region-config-resolver": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/util-user-agent-browser": "3.670.0",
+        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/core": "^2.4.8",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/hash-node": "^3.0.7",
+        "@smithy/invalid-dependency": "^3.0.7",
+        "@smithy/middleware-content-length": "^3.0.9",
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.23",
+        "@smithy/util-defaults-mode-node": "^3.0.23",
+        "@smithy/util-endpoints": "^2.1.3",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.670.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso-oidc/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/client-sso/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/client-sts": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz",
+      "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/client-sso-oidc": "3.670.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-node": "3.670.0",
+        "@aws-sdk/middleware-host-header": "3.667.0",
+        "@aws-sdk/middleware-logger": "3.667.0",
+        "@aws-sdk/middleware-recursion-detection": "3.667.0",
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/region-config-resolver": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@aws-sdk/util-user-agent-browser": "3.670.0",
+        "@aws-sdk/util-user-agent-node": "3.669.0",
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/core": "^2.4.8",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/hash-node": "^3.0.7",
+        "@smithy/invalid-dependency": "^3.0.7",
+        "@smithy/middleware-content-length": "^3.0.9",
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-body-length-node": "^3.0.0",
+        "@smithy/util-defaults-mode-browser": "^3.0.23",
+        "@smithy/util-defaults-mode-node": "^3.0.23",
+        "@smithy/util-endpoints": "^2.1.3",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sts/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/core": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz",
+      "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/core": "^2.4.8",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/signature-v4": "^4.2.0",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "fast-xml-parser": "4.4.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/core/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-cognito-identity": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz",
+      "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/client-cognito-identity": "3.670.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-cognito-identity/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-env": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz",
+      "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-env/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-http": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz",
+      "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-stream": "^3.1.9",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-http/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-ini": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz",
+      "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-env": "3.667.0",
+        "@aws-sdk/credential-provider-http": "3.667.0",
+        "@aws-sdk/credential-provider-process": "3.667.0",
+        "@aws-sdk/credential-provider-sso": "3.670.0",
+        "@aws-sdk/credential-provider-web-identity": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/credential-provider-imds": "^3.2.4",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.670.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-ini/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-node": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz",
+      "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/credential-provider-env": "3.667.0",
+        "@aws-sdk/credential-provider-http": "3.667.0",
+        "@aws-sdk/credential-provider-ini": "3.670.0",
+        "@aws-sdk/credential-provider-process": "3.667.0",
+        "@aws-sdk/credential-provider-sso": "3.670.0",
+        "@aws-sdk/credential-provider-web-identity": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/credential-provider-imds": "^3.2.4",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-process": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz",
+      "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-process/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-sso": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz",
+      "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/client-sso": "3.670.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/token-providers": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-sso/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-provider-web-identity": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz",
+      "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sts": "^3.667.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/credential-providers": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz",
+      "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/client-cognito-identity": "3.670.0",
+        "@aws-sdk/client-sso": "3.670.0",
+        "@aws-sdk/client-sts": "3.670.0",
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/credential-provider-cognito-identity": "3.670.0",
+        "@aws-sdk/credential-provider-env": "3.667.0",
+        "@aws-sdk/credential-provider-http": "3.667.0",
+        "@aws-sdk/credential-provider-ini": "3.670.0",
+        "@aws-sdk/credential-provider-node": "3.670.0",
+        "@aws-sdk/credential-provider-process": "3.667.0",
+        "@aws-sdk/credential-provider-sso": "3.670.0",
+        "@aws-sdk/credential-provider-web-identity": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/credential-provider-imds": "^3.2.4",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-providers/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/middleware-host-header": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
+      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-host-header/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/middleware-logger": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
+      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-logger/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/middleware-recursion-detection": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
+      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/middleware-user-agent": {
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz",
+      "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/core": "3.667.0",
+        "@aws-sdk/types": "3.667.0",
+        "@aws-sdk/util-endpoints": "3.667.0",
+        "@smithy/core": "^2.4.8",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-user-agent/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/region-config-resolver": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
+      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/region-config-resolver/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/token-providers": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
+      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/client-sso-oidc": "^3.667.0"
+      }
+    },
+    "node_modules/@aws-sdk/token-providers/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/types": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
+      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/types/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.667.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
+      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-endpoints": "^2.1.3",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/util-endpoints/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/util-locate-window": {
+      "version": "3.568.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
+      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/util-locate-window/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/util-user-agent-browser": {
+      "version": "3.670.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz",
+      "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/types": "^3.5.0",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-sdk/util-user-agent-browser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@aws-sdk/util-user-agent-node": {
+      "version": "3.669.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz",
+      "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@aws-sdk/middleware-user-agent": "3.669.0",
+        "@aws-sdk/types": "3.667.0",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "aws-crt": ">=1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "aws-crt": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@aws-sdk/util-user-agent-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/@babel/compat-data": {
       "version": "7.23.5",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
@@ -1027,6 +1978,16 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@mongodb-js/saslprep": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
+      "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "sparse-bitfield": "^3.0.3"
+      }
+    },
     "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -1084,6 +2045,882 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@smithy/abort-controller": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz",
+      "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/abort-controller/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/config-resolver": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz",
+      "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-config-provider": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/config-resolver/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/core": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
+      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-retry": "^3.0.23",
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-body-length-browser": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/core/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/credential-provider-imds": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz",
+      "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/credential-provider-imds/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/fetch-http-handler": {
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz",
+      "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/querystring-builder": "^3.0.7",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-base64": "^3.0.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/fetch-http-handler/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/hash-node": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz",
+      "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/hash-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/invalid-dependency": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz",
+      "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/invalid-dependency/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/is-array-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/is-array-buffer/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-content-length": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz",
+      "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-content-length/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-endpoint": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz",
+      "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/middleware-serde": "^3.0.7",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "@smithy/url-parser": "^3.0.7",
+        "@smithy/util-middleware": "^3.0.7",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-endpoint/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-retry": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
+      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/service-error-classification": "^3.0.7",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-retry": "^3.0.7",
+        "tslib": "^2.6.2",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-retry/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-serde": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz",
+      "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-serde/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/middleware-stack": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz",
+      "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/middleware-stack/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/node-config-provider": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz",
+      "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/shared-ini-file-loader": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/node-config-provider/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/node-http-handler": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz",
+      "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/abort-controller": "^3.1.5",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/querystring-builder": "^3.0.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/node-http-handler/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/property-provider": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz",
+      "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/property-provider/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/protocol-http": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz",
+      "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/protocol-http/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/querystring-builder": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz",
+      "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-uri-escape": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/querystring-builder/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/querystring-parser": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz",
+      "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/querystring-parser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/service-error-classification": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz",
+      "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/shared-ini-file-loader": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz",
+      "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/shared-ini-file-loader/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/signature-v4": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz",
+      "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "@smithy/util-middleware": "^3.0.7",
+        "@smithy/util-uri-escape": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/signature-v4/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/smithy-client": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
+      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/middleware-endpoint": "^3.1.4",
+        "@smithy/middleware-stack": "^3.0.7",
+        "@smithy/protocol-http": "^4.1.4",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-stream": "^3.1.9",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/smithy-client/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/types": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz",
+      "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/types/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/url-parser": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz",
+      "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/querystring-parser": "^3.0.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/url-parser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-base64": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz",
+      "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-base64/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-body-length-browser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz",
+      "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@smithy/util-body-length-browser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-body-length-node": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz",
+      "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-body-length-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-buffer-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/is-array-buffer": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-buffer-from/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-config-provider": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz",
+      "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-config-provider/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-defaults-mode-browser": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
+      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@smithy/util-defaults-mode-browser/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-defaults-mode-node": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
+      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/config-resolver": "^3.0.9",
+        "@smithy/credential-provider-imds": "^3.2.4",
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/property-provider": "^3.1.7",
+        "@smithy/smithy-client": "^3.4.0",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@smithy/util-defaults-mode-node/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-endpoints": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz",
+      "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/node-config-provider": "^3.1.8",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-endpoints/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-hex-encoding": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz",
+      "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-hex-encoding/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-middleware": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz",
+      "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-middleware/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-retry": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz",
+      "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/service-error-classification": "^3.0.7",
+        "@smithy/types": "^3.5.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-retry/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-stream": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz",
+      "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/fetch-http-handler": "^3.2.9",
+        "@smithy/node-http-handler": "^3.2.4",
+        "@smithy/types": "^3.5.0",
+        "@smithy/util-base64": "^3.0.0",
+        "@smithy/util-buffer-from": "^3.0.0",
+        "@smithy/util-hex-encoding": "^3.0.0",
+        "@smithy/util-utf8": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-stream/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-uri-escape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
+      "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-uri-escape/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@smithy/util-utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@smithy/util-buffer-from": "^3.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@smithy/util-utf8/node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/jquery": {
+      "version": "3.5.31",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.31.tgz",
+      "integrity": "sha512-rf/iB+cPJ/YZfMwr+FVuQbm7IaWC4y3FVYfVDxRGqmUCFjjPII0HWaP0vTPJGp6m4o13AXySCcMbWfrWtBFAKw==",
+      "dev": true,
+      "dependencies": {
+        "@types/sizzle": "*"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -1096,6 +2933,36 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "node_modules/@types/lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==",
+      "dev": true
+    },
+    "node_modules/@types/lodash.isempty": {
+      "version": "4.4.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash.isempty/-/lodash.isempty-4.4.9.tgz",
+      "integrity": "sha512-DPSFfnT2JmZiAWNWOU8IRZws/Ha6zyGF5m06TydfsY+0dVoQqby2J61Na2QU4YtwiZ+moC6cJS6zWYBJq4wBVw==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/meteor": {
+      "version": "2.9.8",
+      "resolved": "https://registry.npmjs.org/@types/meteor/-/meteor-2.9.8.tgz",
+      "integrity": "sha512-p96s1lMqtwt0hz50yokQJA+V9BQzNMLJfahwlbbfXKwbI/OMNCKhRfnxiiNROXAF080zctJlEcpjmv0YG7ztkA==",
+      "dev": true,
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/jquery": "*",
+        "@types/node": "*",
+        "@types/nodemailer": "*",
+        "@types/react": "*",
+        "@types/underscore": "*",
+        "mongodb": "^4.3.1"
+      }
+    },
     "node_modules/@types/node": {
       "version": "18.19.3",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz",
@@ -1105,12 +2972,65 @@
         "undici-types": "~5.26.4"
       }
     },
+    "node_modules/@types/nodemailer": {
+      "version": "6.4.16",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.16.tgz",
+      "integrity": "sha512-uz6hN6Pp0upXMcilM61CoKyjT7sskBoOWpptkjjJp8jIMlTdc3xG01U7proKkXzruMS4hS0zqtHNkNPFB20rKQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/prop-types": {
+      "version": "15.7.13",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz",
+      "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==",
+      "dev": true
+    },
+    "node_modules/@types/react": {
+      "version": "18.3.11",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz",
+      "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/prop-types": "*",
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/@types/semver": {
       "version": "7.5.6",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
       "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+      "dev": true
+    },
+    "node_modules/@types/underscore": {
+      "version": "1.11.15",
+      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.11.15.tgz",
+      "integrity": "sha512-HP38xE+GuWGlbSRq9WrZkousaQ7dragtZCruBVMi0oX1migFZavZ3OROKHSkNp/9ouq82zrWtZpg18jFnVN96g==",
+      "dev": true
+    },
+    "node_modules/@types/webidl-conversions": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
+      "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==",
+      "dev": true
+    },
+    "node_modules/@types/whatwg-url": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz",
+      "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/webidl-conversions": "*"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
@@ -1807,6 +3727,33 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bowser": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
+      "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1849,6 +3796,42 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
+    "node_modules/bson": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz",
+      "integrity": "sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
@@ -1952,6 +3935,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "dev": true
+    },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -3062,6 +5051,29 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "node_modules/fast-xml-parser": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+      "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
     "node_modules/fastq": {
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
@@ -3376,6 +5388,26 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/ignore": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
@@ -3441,6 +5473,19 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/is-array-buffer": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
@@ -3821,6 +5866,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "dev": true
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -3936,6 +5987,13 @@
         "loose-envify": "cli.js"
       }
     },
+    "node_modules/memory-pager": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
+      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -3966,6 +6024,34 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/mongodb": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.17.2.tgz",
+      "integrity": "sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==",
+      "dev": true,
+      "dependencies": {
+        "bson": "^4.7.2",
+        "mongodb-connection-string-url": "^2.6.0",
+        "socks": "^2.7.1"
+      },
+      "engines": {
+        "node": ">=12.9.0"
+      },
+      "optionalDependencies": {
+        "@aws-sdk/credential-providers": "^3.186.0",
+        "@mongodb-js/saslprep": "^1.1.0"
+      }
+    },
+    "node_modules/mongodb-connection-string-url": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz",
+      "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/whatwg-url": "^8.2.1",
+        "whatwg-url": "^11.0.0"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -4548,6 +6634,46 @@
         "node": ">=8"
       }
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dev": true,
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/sparse-bitfield": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
+      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "memory-pager": "^1.0.2"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true
+    },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.11",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
@@ -4656,6 +6782,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -4695,6 +6828,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
@@ -4886,6 +7031,42 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/package.json b/package.json
index 16de72f280..eb65503e11 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,8 @@
     "@babel/eslint-parser": "^7.21.3",
     "@babel/eslint-plugin": "^7.19.1",
     "@babel/preset-react": "^7.18.6",
+    "@types/lodash.isempty": "^4.4.9",
+    "@types/meteor": "^2.9.8",
     "@types/node": "^18.16.18",
     "@typescript-eslint/eslint-plugin": "^5.56.0",
     "@typescript-eslint/parser": "^5.56.0",
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 645c0f6e74..60ee67b857 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -24,6 +24,7 @@ import {
 } from "meteor/minimongo/constants";
 import { Meteor } from "meteor/meteor";
 import { ObserveHandle } from './observe_handle';
+import { ObserveMultiplexer } from './observe_multiplex';
 
 MongoInternals = {};
 
diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index f157c43c6d..418ea8e701 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -1,37 +1,46 @@
+import { ObserveHandleCallback, ObserveMultiplexer } from './observe_multiplex';
+
 let nextObserveHandleId = 1;
 
+export type ObserveHandleCallbackInternal = '_added' | '_addedBefore' | '_changed' | '_movedBefore' | '_removed';
+
 // When the callbacks do not mutate the arguments, we can skip a lot of data clones
 export class ObserveHandle {
-    _stopped: boolean;
-    _id: number;
-    _multiplexer: any;
-    nonMutatingCallbacks: boolean;
+  _id: number;
+  _multiplexer: ObserveMultiplexer;
+  nonMutatingCallbacks: boolean;
+  _stopped: boolean;
 
-    constructor(multiplexer: any, callbacks: any, nonMutatingCallbacks: boolean) {
-        this._multiplexer = multiplexer;
+  _added?: (...args: any[]) => void;
+  _addedBefore?: (...args: any[]) => void;
+  _changed?: (...args: any[]) => void;
+  _movedBefore?: (...args: any[]) => void;
+  _removed?: (...args: any[]) => void;
 
-        multiplexer.callbackNames().forEach((name) => {
-            if (callbacks[name]) {
-                this['_' + name] = callbacks[name];
-            } else if (name === "addedBefore" && callbacks.added) {
-                this._addedBefore = async function (id, fields, before) {
-                    await callbacks.added(id, fields);
-                };
-            }
-        });
+  constructor(multiplexer: any, callbacks: Record<ObserveHandleCallback, any>, nonMutatingCallbacks: boolean) {
+    this._multiplexer = multiplexer;
 
-        this._stopped = false;
-        this._id = nextObserveHandleId++;
-        this.nonMutatingCallbacks = nonMutatingCallbacks;
-    }
+    multiplexer.callbackNames().forEach((name: ObserveHandleCallback) => {
+      if (callbacks[name]) {
+        this[`_${name}` as ObserveHandleCallbackInternal] = callbacks[name];
+        return;
+      }
 
-    async stop() {
-        if (this._stopped) return;
-        this._stopped = true;
-        await this._multiplexer.removeHandle(this._id);
-    }
+      if (name === "addedBefore" && callbacks.added) {
+        this._addedBefore = async function (id, fields, before) {
+          await callbacks.added(id, fields);
+        };
+      }
+    });
 
-    _addedBefore(id: any, fields: any, before: any) {
-        throw new Error("Method not implemented.");
-    }
+    this._stopped = false;
+    this._id = nextObserveHandleId++;
+    this.nonMutatingCallbacks = nonMutatingCallbacks;
+  }
+
+  async stop() {
+    if (this._stopped) return;
+    this._stopped = true;
+    await this._multiplexer.removeHandle(this._id);
+  }
 }
\ No newline at end of file
diff --git a/packages/mongo/observe_multiplex.js b/packages/mongo/observe_multiplex.js
deleted file mode 100644
index ebcdc150b2..0000000000
--- a/packages/mongo/observe_multiplex.js
+++ /dev/null
@@ -1,206 +0,0 @@
-import has from 'lodash.has'; 
-import isEmpty from 'lodash.isempty';
-
-
-ObserveMultiplexer = class {
-  constructor({ ordered, onStop = () => {} } = {}) {
-    if (ordered === undefined) throw Error("must specify ordered");
-
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-        "mongo-livedata", "observe-multiplexers", 1);
-
-    this._ordered = ordered;
-    this._onStop = onStop;
-    this._queue = new Meteor._AsynchronousQueue();
-    this._handles = {};
-    this._resolver = null;
-    this._readyPromise = new Promise(r => this._resolver = r).then(() => this._isReady = true);
-    this._cache = new LocalCollection._CachingChangeObserver({
-      ordered});
-    // Number of addHandleAndSendInitialAdds tasks scheduled but not yet
-    // running. removeHandle uses this to know if it's time to call the onStop
-    // callback.
-    this._addHandleTasksScheduledButNotPerformed = 0;
-
-    const self = this;
-    this.callbackNames().forEach(callbackName => {
-      this[callbackName] = function(/* ... */) {
-        self._applyCallback(callbackName, _.toArray(arguments));
-      };
-    });
-  }
-
-  addHandleAndSendInitialAdds(handle) {
-    return this._addHandleAndSendInitialAdds(handle);
-  }
-
-  async _addHandleAndSendInitialAdds(handle) {
-    ++this._addHandleTasksScheduledButNotPerformed;
-
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-        "mongo-livedata", "observe-handles", 1);
-
-    const self = this;
-    await this._queue.runTask(async function () {
-      self._handles[handle._id] = handle;
-      // Send out whatever adds we have so far (whether the
-      // multiplexer is ready).
-      await self._sendAdds(handle);
-      --self._addHandleTasksScheduledButNotPerformed;
-    });
-    await this._readyPromise;
-  }
-
-  // Remove an observe handle. If it was the last observe handle, call the
-  // onStop callback; you cannot add any more observe handles after this.
-  //
-  // This is not synchronized with polls and handle additions: this means that
-  // you can safely call it from within an observe callback, but it also means
-  // that we have to be careful when we iterate over _handles.
-  async removeHandle(id) {
-    // This should not be possible: you can only call removeHandle by having
-    // access to the ObserveHandle, which isn't returned to user code until the
-    // multiplex is ready.
-    if (!this._ready())
-      throw new Error("Can't remove handles until the multiplex is ready");
-
-    delete this._handles[id];
-
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-        "mongo-livedata", "observe-handles", -1);
-
-    if (isEmpty(this._handles) &&
-        this._addHandleTasksScheduledButNotPerformed === 0) {
-      await this._stop();
-    }
-  }
-  async _stop(options) {
-    options = options || {};
-
-    // It shouldn't be possible for us to stop when all our handles still
-    // haven't been returned from observeChanges!
-    if (! this._ready() && ! options.fromQueryError)
-      throw Error("surprising _stop: not ready");
-
-    // Call stop callback (which kills the underlying process which sends us
-    // callbacks and removes us from the connection's dictionary).
-    await this._onStop();
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-        "mongo-livedata", "observe-multiplexers", -1);
-
-    // Cause future addHandleAndSendInitialAdds calls to throw (but the onStop
-    // callback should make our connection forget about us).
-    this._handles = null;
-  }
-
-  // Allows all addHandleAndSendInitialAdds calls to return, once all preceding
-  // adds have been processed. Does not block.
-  async ready() {
-    const self = this;
-    this._queue.queueTask(function () {
-      if (self._ready())
-        throw Error("can't make ObserveMultiplex ready twice!");
-
-      if (!self._resolver) {
-        throw new Error("Missing resolver");
-      }
-
-      self._resolver();
-      self._isReady = true;
-    });
-  }
-
-  // If trying to execute the query results in an error, call this. This is
-  // intended for permanent errors, not transient network errors that could be
-  // fixed. It should only be called before ready(), because if you called ready
-  // that meant that you managed to run the query once. It will stop this
-  // ObserveMultiplex and cause addHandleAndSendInitialAdds calls (and thus
-  // observeChanges calls) to throw the error.
-  async queryError(err) {
-    var self = this;
-    await this._queue.runTask(function () {
-      if (self._ready())
-        throw Error("can't claim query has an error after it worked!");
-      self._stop({fromQueryError: true});
-      throw err;
-    });
-  }
-
-  // Calls "cb" once the effects of all "ready", "addHandleAndSendInitialAdds"
-  // and observe callbacks which came before this call have been propagated to
-  // all handles. "ready" must have already been called on this multiplexer.
-  async onFlush(cb) {
-    var self = this;
-    await this._queue.queueTask(async function () {
-      if (!self._ready())
-        throw Error("only call onFlush on a multiplexer that will be ready");
-      await cb();
-    });
-  }
-  callbackNames() {
-    if (this._ordered)
-      return ["addedBefore", "changed", "movedBefore", "removed"];
-    else
-      return ["added", "changed", "removed"];
-  }
-  _ready() {
-    return !!this._isReady;
-  }
-  _applyCallback(callbackName, args) {
-    const self = this;
-    this._queue.queueTask(async function () {
-      // If we stopped in the meantime, do nothing.
-      if (!self._handles)
-        return;
-
-      // First, apply the change to the cache.
-      await self._cache.applyChange[callbackName].apply(null, args);
-      // If we haven't finished the initial adds, then we should only be getting
-      // adds.
-      if (!self._ready() &&
-          (callbackName !== 'added' && callbackName !== 'addedBefore')) {
-        throw new Error("Got " + callbackName + " during initial adds");
-      }
-
-      // Now multiplex the callbacks out to all observe handles. It's OK if
-      // these calls yield; since we're inside a task, no other use of our queue
-      // can continue until these are done. (But we do have to be careful to not
-      // use a handle that got removed, because removeHandle does not use the
-      // queue; thus, we iterate over an array of keys that we control.)
-      for (const handleId of Object.keys(self._handles)) {
-        var handle = self._handles && self._handles[handleId];
-        if (!handle) return;
-        var callback = handle['_' + callbackName];
-        // clone arguments so that callbacks can mutate their arguments
-
-        callback &&
-          (await callback.apply(
-            null,
-            handle.nonMutatingCallbacks ? args : EJSON.clone(args)
-          ));
-      }
-    });
-  }
-
-  // Sends initial adds to a handle. It should only be called from within a task
-  // (the task that is processing the addHandleAndSendInitialAdds call). It
-  // synchronously invokes the handle's added or addedBefore; there's no need to
-  // flush the queue afterwards to ensure that the callbacks get out.
-  async _sendAdds(handle) {
-    var add = this._ordered ? handle._addedBefore : handle._added;
-    if (!add)
-      return;
-    // note: docs may be an _IdMap or an OrderedDict
-    await this._cache.docs.forEachAsync(async (doc, id) => {
-      if (!has(this._handles, handle._id))
-        throw Error("handle got removed before sending initial adds!");
-      const { _id, ...fields } = handle.nonMutatingCallbacks ? doc
-          : EJSON.clone(doc);
-      if (this._ordered)
-        await add(id, fields, null); // we're going in order, so add at end
-      else
-        await add(id, fields);
-    });
-  }
-};
-
diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
new file mode 100644
index 0000000000..875a38d9d3
--- /dev/null
+++ b/packages/mongo/observe_multiplex.ts
@@ -0,0 +1,176 @@
+import { ObserveHandle } from './observe_handle';
+import isEmpty from 'lodash.isempty';
+
+interface ObserveMultiplexerOptions {
+  ordered: boolean;
+  onStop?: () => void;
+}
+
+export type ObserveHandleCallback = 'added' | 'addedBefore' | 'changed' | 'movedBefore' | 'removed';
+
+export class ObserveMultiplexer {
+  private readonly _ordered: boolean;
+  private readonly _onStop: () => void;
+  private _queue: any;
+  private _handles: { [key: string]: ObserveHandle };
+  private _resolver: ((value?: unknown) => void) | null;
+  private readonly _readyPromise: Promise<boolean | void>;
+  private _isReady: boolean;
+  private _cache: any;
+  private _addHandleTasksScheduledButNotPerformed: number;
+
+  constructor({ ordered, onStop = () => {} }: ObserveMultiplexerOptions) {
+    if (ordered === undefined) throw Error("must specify ordered");
+
+    // @ts-ignore
+    Package['facts-base'] && Package['facts-base']
+        .Facts.incrementServerFact("mongo-livedata", "observe-multiplexers", 1);
+
+    this._ordered = ordered;
+    this._onStop = onStop;
+    // @ts-ignore
+    this._queue = new Meteor._AsynchronousQueue();
+    this._handles = {};
+    this._resolver = null;
+    this._isReady = false;
+    this._readyPromise = new Promise(r => this._resolver = r).then(() => this._isReady = true);
+    // @ts-ignore
+    this._cache = new LocalCollection._CachingChangeObserver({ ordered });
+    this._addHandleTasksScheduledButNotPerformed = 0;
+
+    this.callbackNames().forEach(callbackName => {
+      (this as any)[callbackName] = (...args: any[]) => {
+        this._applyCallback(callbackName, args);
+      };
+    });
+  }
+
+  addHandleAndSendInitialAdds(handle: ObserveHandle): Promise<void> {
+    return this._addHandleAndSendInitialAdds(handle);
+  }
+
+  async _addHandleAndSendInitialAdds(handle: ObserveHandle): Promise<void> {
+    ++this._addHandleTasksScheduledButNotPerformed;
+
+    // @ts-ignore
+    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
+      "mongo-livedata", "observe-handles", 1);
+
+    await this._queue.runTask(async () => {
+      this._handles[handle._id] = handle;
+      await this._sendAdds(handle);
+      --this._addHandleTasksScheduledButNotPerformed;
+    });
+    await this._readyPromise;
+  }
+
+  async removeHandle(id: number): Promise<void> {
+    if (!this._ready())
+      throw new Error("Can't remove handles until the multiplex is ready");
+
+    delete this._handles[id];
+
+    // @ts-ignore
+    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
+      "mongo-livedata", "observe-handles", -1);
+
+    if (isEmpty(this._handles) &&
+      this._addHandleTasksScheduledButNotPerformed === 0) {
+      await this._stop();
+    }
+  }
+
+  async _stop(options: { fromQueryError?: boolean } = {}): Promise<void> {
+    if (!this._ready() && !options.fromQueryError)
+      throw Error("surprising _stop: not ready");
+
+    await this._onStop();
+
+    // @ts-ignore
+    Package['facts-base'] && Package['facts-base']
+        .Facts.incrementServerFact("mongo-livedata", "observe-multiplexers", -1);
+
+    this._handles = {};
+  }
+
+  async ready(): Promise<void> {
+    await this._queue.queueTask(() => {
+      if (this._ready())
+        throw Error("can't make ObserveMultiplex ready twice!");
+
+      if (!this._resolver) {
+        throw new Error("Missing resolver");
+      }
+
+      this._resolver();
+      this._isReady = true;
+    });
+  }
+
+  async queryError(err: Error): Promise<void> {
+    await this._queue.runTask(() => {
+      if (this._ready())
+        throw Error("can't claim query has an error after it worked!");
+      this._stop({ fromQueryError: true });
+      throw err;
+    });
+  }
+
+  async onFlush(cb: () => void): Promise<void> {
+    await this._queue.queueTask(async () => {
+      if (!this._ready())
+        throw Error("only call onFlush on a multiplexer that will be ready");
+      await cb();
+    });
+  }
+
+  callbackNames(): ObserveHandleCallback[] {
+    return this._ordered
+      ? ["addedBefore", "changed", "movedBefore", "removed"]
+      : ["added", "changed", "removed"];
+  }
+
+  _ready(): boolean {
+    return !!this._isReady;
+  }
+
+  _applyCallback(callbackName: string, args: any[]): void {
+    this._queue.queueTask(async () => {
+      if (!this._handles) return;
+
+      await this._cache.applyChange[callbackName].apply(null, args);
+      if (!this._ready() &&
+        (callbackName !== 'added' && callbackName !== 'addedBefore')) {
+        throw new Error(`Got ${callbackName} during initial adds`);
+      }
+
+      for (const handleId of Object.keys(this._handles)) {
+        const handle = this._handles && this._handles[handleId];
+        if (!handle) return;
+        const callback = (handle as any)[`_${callbackName}`];
+        callback && (await callback.apply(
+          null,
+          handle.nonMutatingCallbacks ? args : EJSON.clone(args)
+        ));
+      }
+    });
+  }
+
+  async _sendAdds(handle: ObserveHandle): Promise<void> {
+    const add = this._ordered ? handle._addedBefore : handle._added;
+
+    if (!add) return;
+
+    await this._cache.docs.forEachAsync(async (doc: any, id: string) => {
+      if (!(handle._id in this._handles))
+        throw Error("handle got removed before sending initial adds!");
+
+      const { _id, ...fields } = handle.nonMutatingCallbacks ? doc : EJSON.clone(doc);
+
+      if (this._ordered)
+        await add(id, fields, null);
+      else
+        await add(id, fields);
+    });
+  }
+}
\ No newline at end of file
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 40125b037c..2babd85ac7 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -88,7 +88,7 @@ Package.onUse(function (api) {
     [
       "mongo_driver.js",
       "oplog_tailing.js",
-      "observe_multiplex.js",
+      "observe_multiplex.ts",
       "doc_fetcher.js",
       "polling_observe_driver.js",
       "oplog_observe_driver.js",
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000..62b3d0ced7
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "module": "commonjs",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "typeRoots": [
+      "./node_modules/@types",
+      "./types"
+    ]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "types/**/*.d.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
\ No newline at end of file

From 669c8c442086764f7574844305324a8a9be90e34 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Thu, 17 Oct 2024 17:12:33 +0300
Subject: [PATCH 0551/1140] Remove underscore from syntax check

---
 scripts/admin/check-legacy-syntax/check-syntax.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/admin/check-legacy-syntax/check-syntax.js b/scripts/admin/check-legacy-syntax/check-syntax.js
index 09fd3acd3a..66fb4fd815 100644
--- a/scripts/admin/check-legacy-syntax/check-syntax.js
+++ b/scripts/admin/check-legacy-syntax/check-syntax.js
@@ -118,7 +118,6 @@ const packages = {
   typescript: {
     serverFiles: ["plugin.js"],
   },
-  underscore: {},
   url: {},
 };
 

From c9609135602ba12dd82a3353de48e2a28bbdf898 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Thu, 17 Oct 2024 17:14:39 +0300
Subject: [PATCH 0552/1140] Remove underscore from v3 docs

---
 v3-docs/docs/packages/underscore.md | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 v3-docs/docs/packages/underscore.md

diff --git a/v3-docs/docs/packages/underscore.md b/v3-docs/docs/packages/underscore.md
deleted file mode 100644
index b82b2cb28b..0000000000
--- a/v3-docs/docs/packages/underscore.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Underscore
-
-[Underscore](http://underscorejs.org/) is a utility-belt library for
-JavaScript that provides support for functional programming. It is
-invaluable for writing clear, concise JavaScript in a functional style.
-
-The `underscore` package defines the `_` namespace on both the client
-and the server.
-
-::: warning
-We have slightly modified the way Underscore differentiates between
-objects and arrays in [collection functions](http://underscorejs.org/#each).
-The original Underscore logic is to treat any object with a numeric `length`
-property as an array (which helps it work properly on
-[`NodeList`s](https://developer.mozilla.org/en-US/docs/Web/API/NodeList)).
-In Meteor's version of Underscore, objects with a numeric `length` property
-are treated as objects if they have no prototype (specifically, if
-`x.constructor === Object`.
-:::

From 4ce0130f13df6c9bee77e64840fee2401312b11f Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Thu, 17 Oct 2024 17:42:09 +0300
Subject: [PATCH 0553/1140] Remove underscore from redirects and listings

---
 docs/_config.yml           | 3 ---
 docs/jsdoc/jsdoc-conf.json | 1 -
 2 files changed, 4 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 0556242aac..6834fe8ced 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -88,7 +88,6 @@ sidebar_categories:
     - packages/server-render
     - packages/spacebars
     - packages/standard-minifier-css
-    - packages/underscore
     - packages/url
     - packages/webapp
     - packages/packages-listing
@@ -393,7 +392,6 @@ redirects:
   /#/full/oauth-encryption: 'packages/oauth-encryption.html'
   /#/full/random: 'packages/random.html'
   /#/full/spiderable: 'packages/spiderable.html'
-  /#/full/underscore: 'packages/underscore.html'
   /#/full/webapp: 'packages/webapp.html'
   '#meteor_isclient': 'api/core.html#Meteor-isClient'
   '#meteor_isserver': 'api/core.html#Meteor-isServer'
@@ -669,6 +667,5 @@ redirects:
   '#oauth-encryption': 'packages/oauth-encryption.html'
   '#random': 'packages/random.html'
   '#spiderable': 'packages/spiderable.html'
-  '#underscore': 'packages/underscore.html'
   '#webapp': 'packages/webapp.html'
   '#pkg_spacebars': 'packages/spacebars.html'
diff --git a/docs/jsdoc/jsdoc-conf.json b/docs/jsdoc/jsdoc-conf.json
index 82ed30dd10..4fd2956fc1 100644
--- a/docs/jsdoc/jsdoc-conf.json
+++ b/docs/jsdoc/jsdoc-conf.json
@@ -4,7 +4,6 @@
       "packages/ddp/sockjs-0.3.4.js",
       "packages/test-in-browser/diff_match_patch_uncompressed.js",
       "packages/jquery/jquery.js",
-      "packages/underscore/underscore.js",
       "packages/json/json2.js",
       "packages/minimongo/minimongo_tests.js",
       "tools/node_modules",

From cdd04d66112f4bd5c13fc7874b0ebc127355accd Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Thu, 17 Oct 2024 17:45:03 +0300
Subject: [PATCH 0554/1140] Replace underscore usage with native utilities

---
 scripts/admin/bump-all-version-numbers.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/scripts/admin/bump-all-version-numbers.js b/scripts/admin/bump-all-version-numbers.js
index 915c999296..a4e45f0d12 100644
--- a/scripts/admin/bump-all-version-numbers.js
+++ b/scripts/admin/bump-all-version-numbers.js
@@ -1,21 +1,20 @@
 // run as node scripts/admin/bump-all-version-numbers.js <packageNames>
 
-var fs = require("fs");
-var _ = require("../../packages/underscore/underscore.js")._;
+const fs = require("fs");
 
-var packageNames = _.rest(process.argv, 2);
+const packageNames = process.argv.slice(2);
 
-_.each(packageNames, function (name) {
+packageNames.forEach(name => {
   // name = "packages/" + name + "/package.js";
 
-  var content = fs.readFileSync(name, {encoding: "utf-8"});
+  const content = fs.readFileSync(name, {encoding: "utf-8"});
 
-  var match = content.match(/\d+\.\d+\.\d+-winr.\d+/);
+  const match = content.match(/\d+\.\d+\.\d+-winr.\d+/);
   if (match) {
-    var versionNumber = match[0];
-    var s = versionNumber.split(".");
-    s[3] = (parseInt(s[3], 10) + 1);
-    var incremented = s.join(".");
+    const versionNumber = match[0];
+    const s = versionNumber.split(".");
+    s[3] = (parseInt(s[3], 10) + 1).toString();
+    const incremented = s.join(".");
 
     content = content.replace(versionNumber, incremented);
     console.log(match[0], match[1], incremented);

From e9b5df575472d2afdf5d2efbd8fc71a0557f3315 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Thu, 17 Oct 2024 18:02:36 +0300
Subject: [PATCH 0555/1140] Remove underscore dependecy from mongo package

---
 packages/mongo/package.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 3775964d2a..7f7352229f 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -51,7 +51,6 @@ Package.onUse(function (api) {
   api.use("mongo-decimal", "server");
   //api.use('emitter-promise', 'server');
 
-  api.use("underscore", "server");
 
   // Binary Heap data structure is used to optimize oplog observe driver
   // performance.

From 83a14a2078217280134776e2edfa3047d0fff80a Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Thu, 17 Oct 2024 19:13:28 +0300
Subject: [PATCH 0556/1140] Replace underscore usage in mongo package

---
 packages/mongo/mongo_driver.js             | 9 +++++----
 packages/mongo/observe_multiplex.js        | 2 +-
 packages/mongo/oplog_observe_driver.js     | 2 +-
 packages/mongo/polling_observe_driver.js   | 2 +-
 packages/mongo/remote_collection_driver.js | 6 ++----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 69d9b86f7b..e47d5b5ecd 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -1099,7 +1099,7 @@ class AsynchronousCursor {
       if (!doc) return null;
       doc = replaceTypes(doc, replaceMongoAtomWithMeteor);
 
-      if (!this._cursorDescription.options.tailable && _.has(doc, '_id')) {
+      if (!this._cursorDescription.options.tailable && doc._id) {
         // Did Mongo give us duplicate documents in the same cursor? If so,
         // ignore this one. (Do this before the transform, since transform might
         // return some unrelated value.) We don't do this for tailable cursors,
@@ -1174,7 +1174,8 @@ class AsynchronousCursor {
   }
 
   fetch() {
-    return this.map(_.identity);
+    var self = this;
+    return self.map(x => x);
   }
 
   /**
@@ -1634,9 +1635,9 @@ forEachTrigger = async function (cursorDescription, triggerCallback) {
     cursorDescription.selector);
   if (specificIds) {
     for (const id of specificIds) {
-      await triggerCallback(_.extend({id: id}, key));
+      await triggerCallback(Object.assign({id: id}, key));
     }
-    await triggerCallback(_.extend({dropCollection: true, id: null}, key));
+    await triggerCallback(Object.assign({dropCollection: true, id: null}, key));
   } else {
     await triggerCallback(key);
   }
diff --git a/packages/mongo/observe_multiplex.js b/packages/mongo/observe_multiplex.js
index 35c150bf9c..80fb8b4145 100644
--- a/packages/mongo/observe_multiplex.js
+++ b/packages/mongo/observe_multiplex.js
@@ -26,7 +26,7 @@ ObserveMultiplexer = class {
     const self = this;
     this.callbackNames().forEach(callbackName => {
       this[callbackName] = function(/* ... */) {
-        self._applyCallback(callbackName, _.toArray(arguments));
+        self._applyCallback(callbackName, [...arguments]);
       };
     });
   }
diff --git a/packages/mongo/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js
index 3e13047ba3..bbe634273b 100644
--- a/packages/mongo/oplog_observe_driver.js
+++ b/packages/mongo/oplog_observe_driver.js
@@ -118,7 +118,7 @@ OplogObserveDriver = function (options) {
 
  };
 
-_.extend(OplogObserveDriver.prototype, {
+Object.assign(OplogObserveDriver.prototype, {
   _init: async function() {
     const self = this;
 
diff --git a/packages/mongo/polling_observe_driver.js b/packages/mongo/polling_observe_driver.js
index 6b4172cd95..426d5ed3d3 100644
--- a/packages/mongo/polling_observe_driver.js
+++ b/packages/mongo/polling_observe_driver.js
@@ -43,7 +43,7 @@ PollingObserveDriver = function (options) {
   
 };
 
-_.extend(PollingObserveDriver.prototype, {
+Object.assign(PollingObserveDriver.prototype, {
   _init: async function () {
     const self = this;
     const options = self._options;
diff --git a/packages/mongo/remote_collection_driver.js b/packages/mongo/remote_collection_driver.js
index d8c794abff..e239424e45 100644
--- a/packages/mongo/remote_collection_driver.js
+++ b/packages/mongo/remote_collection_driver.js
@@ -47,11 +47,9 @@ Object.assign(MongoInternals.RemoteCollectionDriver.prototype, {
     });
 
     CLIENT_ONLY_METHODS.forEach(function (m) {
-      ret[m] = _.bind(self.mongo[m], self.mongo, name);
-
       ret[m] = function (...args) {
         throw new Error(
-          `${m} +  is not available on the server. Please use ${getAsyncMethodName(
+          `${m} is not available on the server. Please use ${getAsyncMethodName(
             m
           )}() instead.`
         );
@@ -88,4 +86,4 @@ MongoInternals.defaultRemoteCollectionDriver = once(function () {
   });
 
   return driver;
-});
\ No newline at end of file
+});

From a9e15e53673444b8e2efd5bf9c8fddad4ec99890 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 17 Oct 2024 12:20:08 -0400
Subject: [PATCH 0557/1140] break down into smaller files and refactor some to
 typescript

---
 packages/mongo/asynchronous_cursor.js         |  155 ++
 packages/mongo/cursor.js                      |  147 ++
 packages/mongo/cursor_description.ts          |   23 +
 packages/mongo/mongo_common.js                |  149 ++
 packages/mongo/mongo_connection.js            |  936 ++++++++++
 packages/mongo/mongo_driver.js                | 1616 +----------------
 packages/mongo/oplog_observe_driver.js        |   14 +-
 packages/mongo/oplog_tailing.js               |  432 -----
 packages/mongo/oplog_tailing.ts               |  394 ++++
 packages/mongo/package.js                     |    2 +-
 packages/mongo/polling_observe_driver.js      |    5 +-
 packages/mongo/remote_collection_driver.js    |    7 +-
 .../webapp/.npm/package/npm-shrinkwrap.json   |   11 +-
 13 files changed, 1833 insertions(+), 2058 deletions(-)
 create mode 100644 packages/mongo/asynchronous_cursor.js
 create mode 100644 packages/mongo/cursor.js
 create mode 100644 packages/mongo/cursor_description.ts
 create mode 100644 packages/mongo/mongo_common.js
 create mode 100644 packages/mongo/mongo_connection.js
 delete mode 100644 packages/mongo/oplog_tailing.js
 create mode 100644 packages/mongo/oplog_tailing.ts

diff --git a/packages/mongo/asynchronous_cursor.js b/packages/mongo/asynchronous_cursor.js
new file mode 100644
index 0000000000..d18dba5faf
--- /dev/null
+++ b/packages/mongo/asynchronous_cursor.js
@@ -0,0 +1,155 @@
+import LocalCollection from 'meteor/minimongo/local_collection';
+import { replaceMongoAtomWithMeteor, replaceTypes } from './mongo_common';
+
+/**
+ * This is just a light wrapper for the cursor. The goal here is to ensure compatibility even if
+ * there are breaking changes on the MongoDB driver.
+ *
+ * @constructor
+ */
+export class AsynchronousCursor {
+  constructor(dbCursor, cursorDescription, options) {
+    this._dbCursor = dbCursor;
+    this._cursorDescription = cursorDescription;
+
+    this._selfForIteration = options.selfForIteration || this;
+    if (options.useTransform && cursorDescription.options.transform) {
+      this._transform = LocalCollection.wrapTransform(
+        cursorDescription.options.transform);
+    } else {
+      this._transform = null;
+    }
+
+    this._visitedIds = new LocalCollection._IdMap;
+  }
+
+  [Symbol.asyncIterator]() {
+    var cursor = this;
+    return {
+      async next() {
+        const value = await cursor._nextObjectPromise();
+        return { done: !value, value };
+      },
+    };
+  }
+
+  // Returns a Promise for the next object from the underlying cursor (before
+  // the Mongo->Meteor type replacement).
+  async _rawNextObjectPromise() {
+    try {
+      return this._dbCursor.next();
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  // Returns a Promise for the next object from the cursor, skipping those whose
+  // IDs we've already seen and replacing Mongo atoms with Meteor atoms.
+  async _nextObjectPromise () {
+    while (true) {
+      var doc = await this._rawNextObjectPromise();
+
+      if (!doc) return null;
+      doc = replaceTypes(doc, replaceMongoAtomWithMeteor);
+
+      if (!this._cursorDescription.options.tailable && _.has(doc, '_id')) {
+        // Did Mongo give us duplicate documents in the same cursor? If so,
+        // ignore this one. (Do this before the transform, since transform might
+        // return some unrelated value.) We don't do this for tailable cursors,
+        // because we want to maintain O(1) memory usage. And if there isn't _id
+        // for some reason (maybe it's the oplog), then we don't do this either.
+        // (Be careful to do this for falsey but existing _id, though.)
+        if (this._visitedIds.has(doc._id)) continue;
+        this._visitedIds.set(doc._id, true);
+      }
+
+      if (this._transform)
+        doc = this._transform(doc);
+
+      return doc;
+    }
+  }
+
+  // Returns a promise which is resolved with the next object (like with
+  // _nextObjectPromise) or rejected if the cursor doesn't return within
+  // timeoutMS ms.
+  _nextObjectPromiseWithTimeout(timeoutMS) {
+    if (!timeoutMS) {
+      return this._nextObjectPromise();
+    }
+    const nextObjectPromise = this._nextObjectPromise();
+    const timeoutErr = new Error('Client-side timeout waiting for next object');
+    const timeoutPromise = new Promise((resolve, reject) => {
+      setTimeout(() => {
+        reject(timeoutErr);
+      }, timeoutMS);
+    });
+    return Promise.race([nextObjectPromise, timeoutPromise])
+      .catch((err) => {
+        if (err === timeoutErr) {
+          this.close();
+        }
+        throw err;
+      });
+  }
+
+  async forEach(callback, thisArg) {
+    // Get back to the beginning.
+    this._rewind();
+
+    let idx = 0;
+    while (true) {
+      const doc = await this._nextObjectPromise();
+      if (!doc) return;
+      await callback.call(thisArg, doc, idx++, this._selfForIteration);
+    }
+  }
+
+  async map(callback, thisArg) {
+    const results = [];
+    await this.forEach(async (doc, index) => {
+      results.push(await callback.call(thisArg, doc, index, this._selfForIteration));
+    });
+
+    return results;
+  }
+
+  _rewind() {
+    // known to be synchronous
+    this._dbCursor.rewind();
+
+    this._visitedIds = new LocalCollection._IdMap;
+  }
+
+  // Mostly usable for tailable cursors.
+  close() {
+    this._dbCursor.close();
+  }
+
+  fetch() {
+    return this.map(_.identity);
+  }
+
+  /**
+   * FIXME: (node:34680) [MONGODB DRIVER] Warning: cursor.count is deprecated and will be
+   *  removed in the next major version, please use `collection.estimatedDocumentCount` or
+   *  `collection.countDocuments` instead.
+   */
+  count() {
+    return this._dbCursor.count();
+  }
+
+  // This method is NOT wrapped in Cursor.
+  async getRawObjects(ordered) {
+    var self = this;
+    if (ordered) {
+      return self.fetch();
+    } else {
+      var results = new LocalCollection._IdMap;
+      await self.forEach(function (doc) {
+        results.set(doc._id, doc);
+      });
+      return results;
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/mongo/cursor.js b/packages/mongo/cursor.js
new file mode 100644
index 0000000000..cc6826c616
--- /dev/null
+++ b/packages/mongo/cursor.js
@@ -0,0 +1,147 @@
+// CURSORS
+
+// There are several classes which relate to cursors:
+//
+// CursorDescription represents the arguments used to construct a cursor:
+// collectionName, selector, and (find) options.  Because it is used as a key
+// for cursor de-dup, everything in it should either be JSON-stringifiable or
+// not affect observeChanges output (eg, options.transform functions are not
+// stringifiable but do not affect observeChanges).
+//
+// SynchronousCursor is a wrapper around a MongoDB cursor
+// which includes fully-synchronous versions of forEach, etc.
+//
+// Cursor is the cursor object returned from find(), which implements the
+// documented Mongo.Collection cursor API.  It wraps a CursorDescription and a
+// SynchronousCursor (lazily: it doesn't contact Mongo until you call a method
+// like fetch or forEach on it).
+//
+// ObserveHandle is the "observe handle" returned from observeChanges. It has a
+// reference to an ObserveMultiplexer.
+//
+// ObserveMultiplexer allows multiple identical ObserveHandles to be driven by a
+// single observe driver.
+//
+// There are two "observe drivers" which drive ObserveMultiplexers:
+//   - PollingObserveDriver caches the results of a query and reruns it when
+//     necessary.
+//   - OplogObserveDriver follows the Mongo operation log to directly observe
+//     database changes.
+// Both implementations follow the same simple interface: when you create them,
+// they start sending observeChanges callbacks (and a ready() invocation) to
+// their ObserveMultiplexer, and you stop them by calling their stop() method.
+
+import { ASYNC_CURSOR_METHODS, getAsyncMethodName } from 'meteor/minimongo/constants';
+import { replaceMeteorAtomWithMongo, replaceTypes } from './mongo_common';
+import LocalCollection from 'meteor/minimongo/local_collection';
+
+export const Cursor = function (mongo, cursorDescription) {
+  var self = this;
+
+  self._mongo = mongo;
+  self._cursorDescription = cursorDescription;
+  self._synchronousCursor = null;
+};
+
+Cursor.prototype.countAsync = async function () {
+  const collection = this._mongo.rawCollection(this._cursorDescription.collectionName);
+  return await collection.countDocuments(
+    replaceTypes(this._cursorDescription.selector, replaceMeteorAtomWithMongo),
+    replaceTypes(this._cursorDescription.options, replaceMeteorAtomWithMongo),
+  );
+};
+
+Cursor.prototype.count = function () {
+  throw new Error(
+    "count() is not available on the server. Please use countAsync() instead."
+  );
+};
+
+[...ASYNC_CURSOR_METHODS, Symbol.iterator, Symbol.asyncIterator].forEach(methodName => {
+  // count is handled specially since we don't want to create a cursor.
+  // it is still included in ASYNC_CURSOR_METHODS because we still want an async version of it to exist.
+  if (methodName === 'count') {
+    return
+  }
+  Cursor.prototype[methodName] = function (...args) {
+    const cursor = setupAsynchronousCursor(this, methodName);
+    return cursor[methodName](...args);
+  };
+
+  // These methods are handled separately.
+  if (methodName === Symbol.iterator || methodName === Symbol.asyncIterator) {
+    return;
+  }
+
+  const methodNameAsync = getAsyncMethodName(methodName);
+  Cursor.prototype[methodNameAsync] = function (...args) {
+    try {
+      return Promise.resolve(this[methodName](...args));
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  };
+});
+
+Cursor.prototype.getTransform = function () {
+  return this._cursorDescription.options.transform;
+};
+
+// When you call Meteor.publish() with a function that returns a Cursor, we need
+// to transmute it into the equivalent subscription.  This is the function that
+// does that.
+Cursor.prototype._publishCursor = function (sub) {
+  var self = this;
+  var collection = self._cursorDescription.collectionName;
+  return Mongo.Collection._publishCursor(self, sub, collection);
+};
+
+// Used to guarantee that publish functions return at most one cursor per
+// collection. Private, because we might later have cursors that include
+// documents from multiple collections somehow.
+Cursor.prototype._getCollectionName = function () {
+  var self = this;
+  return self._cursorDescription.collectionName;
+};
+
+Cursor.prototype.observe = function (callbacks) {
+  var self = this;
+  return LocalCollection._observeFromObserveChanges(self, callbacks);
+};
+
+Cursor.prototype.observeAsync = function (callbacks) {
+  return new Promise(resolve => resolve(this.observe(callbacks)));
+};
+
+Cursor.prototype.observeChanges = function (callbacks, options = {}) {
+  var self = this;
+
+  var ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
+
+  return self._mongo._observeChanges(
+    self._cursorDescription, ordered, callbacks, options.nonMutatingCallbacks);
+};
+
+Cursor.prototype.observeChangesAsync = async function (callbacks, options = {}) {
+  return this.observeChanges(callbacks, options);
+};
+
+function setupAsynchronousCursor(cursor, method) {
+  // You can only observe a tailable cursor.
+  if (cursor._cursorDescription.options.tailable)
+    throw new Error('Cannot call ' + method + ' on a tailable cursor');
+
+  if (!cursor._synchronousCursor) {
+    cursor._synchronousCursor = cursor._mongo._createAsynchronousCursor(
+      cursor._cursorDescription,
+      {
+        // Make sure that the "cursor" argument to forEach/map callbacks is the
+        // Cursor, not the SynchronousCursor.
+        selfForIteration: cursor,
+        useTransform: true,
+      }
+    );
+  }
+
+  return cursor._synchronousCursor;
+}
\ No newline at end of file
diff --git a/packages/mongo/cursor_description.ts b/packages/mongo/cursor_description.ts
new file mode 100644
index 0000000000..3efa18b56f
--- /dev/null
+++ b/packages/mongo/cursor_description.ts
@@ -0,0 +1,23 @@
+interface CursorOptions {
+  limit?: number;
+  skip?: number;
+  sort?: Record<string, 1 | -1>;
+  fields?: Record<string, 1 | 0>;
+  projection?: Record<string, 1 | 0>;
+  disableOplog?: boolean;
+  _disableOplog?: boolean;
+  tailable?: boolean;
+}
+
+export class CursorDescription {
+  collectionName: string;
+  selector: Record<string, any>;
+  options: CursorOptions;
+
+  constructor(collectionName: string, selector: any, options?: CursorOptions) {
+    this.collectionName = collectionName;
+    // @ts-ignore
+    this.selector = Mongo.Collection._rewriteSelector(selector);
+    this.options = options || {};
+  }
+}
\ No newline at end of file
diff --git a/packages/mongo/mongo_common.js b/packages/mongo/mongo_common.js
new file mode 100644
index 0000000000..53e037e86e
--- /dev/null
+++ b/packages/mongo/mongo_common.js
@@ -0,0 +1,149 @@
+/** @type {import('mongodb')} */
+export const MongoDB = NpmModuleMongodb;
+
+// The write methods block until the database has confirmed the write (it may
+// not be replicated or stable on disk, but one server has confirmed it) if no
+// callback is provided. If a callback is provided, then they call the callback
+// when the write is confirmed. They return nothing on success, and raise an
+// exception on failure.
+//
+// After making a write (with insert, update, remove), observers are
+// notified asynchronously. If you want to receive a callback once all
+// of the observer notifications have landed for your write, do the
+// writes inside a write fence (set DDPServer._CurrentWriteFence to a new
+// _WriteFence, and then set a callback on the write fence.)
+//
+// Since our execution environment is single-threaded, this is
+// well-defined -- a write "has been made" if it's returned, and an
+// observer "has been notified" if its callback has returned.
+
+export const writeCallback = function (write, refresh, callback) {
+  return function (err, result) {
+    if (! err) {
+      // XXX We don't have to run this on error, right?
+      try {
+        refresh();
+      } catch (refreshErr) {
+        if (callback) {
+          callback(refreshErr);
+          return;
+        } else {
+          throw refreshErr;
+        }
+      }
+    }
+    write.committed();
+    if (callback) {
+      callback(err, result);
+    } else if (err) {
+      throw err;
+    }
+  };
+};
+
+
+export const transformResult = function (driverResult) {
+  var meteorResult = { numberAffected: 0 };
+  if (driverResult) {
+    var mongoResult = driverResult.result;
+    // On updates with upsert:true, the inserted values come as a list of
+    // upserted values -- even with options.multi, when the upsert does insert,
+    // it only inserts one element.
+    if (mongoResult.upsertedCount) {
+      meteorResult.numberAffected = mongoResult.upsertedCount;
+
+      if (mongoResult.upsertedId) {
+        meteorResult.insertedId = mongoResult.upsertedId;
+      }
+    } else {
+      // n was used before Mongo 5.0, in Mongo 5.0 we are not receiving this n
+      // field and so we are using modifiedCount instead
+      meteorResult.numberAffected = mongoResult.n || mongoResult.matchedCount || mongoResult.modifiedCount;
+    }
+  }
+
+  return meteorResult;
+};
+
+export const replaceMeteorAtomWithMongo = function (document) {
+  if (EJSON.isBinary(document)) {
+    // This does more copies than we'd like, but is necessary because
+    // MongoDB.BSON only looks like it takes a Uint8Array (and doesn't actually
+    // serialize it correctly).
+    return new MongoDB.Binary(Buffer.from(document));
+  }
+  if (document instanceof MongoDB.Binary) {
+    return document;
+  }
+  if (document instanceof Mongo.ObjectID) {
+    return new MongoDB.ObjectID(document.toHexString());
+  }
+  if (document instanceof MongoDB.Timestamp) {
+    // For now, the Meteor representation of a Mongo timestamp type (not a date!
+    // this is a weird internal thing used in the oplog!) is the same as the
+    // Mongo representation. We need to do this explicitly or else we would do a
+    // structural clone and lose the prototype.
+    return document;
+  }
+  if (document instanceof Decimal) {
+    return MongoDB.Decimal128.fromString(document.toString());
+  }
+  if (EJSON._isCustomType(document)) {
+    return replaceNames(makeMongoLegal, EJSON.toJSONValue(document));
+  }
+  // It is not ordinarily possible to stick dollar-sign keys into mongo
+  // so we don't bother checking for things that need escaping at this time.
+  return undefined;
+};
+
+export const replaceTypes = function (document, atomTransformer) {
+  if (typeof document !== 'object' || document === null)
+    return document;
+
+  var replacedTopLevelAtom = atomTransformer(document);
+  if (replacedTopLevelAtom !== undefined)
+    return replacedTopLevelAtom;
+
+  var ret = document;
+  Object.entries(document).forEach(function ([key, val]) {
+    var valReplaced = replaceTypes(val, atomTransformer);
+    if (val !== valReplaced) {
+      // Lazy clone. Shallow copy.
+      if (ret === document)
+        ret = clone(document);
+      ret[key] = valReplaced;
+    }
+  });
+  return ret;
+};
+
+export const replaceMongoAtomWithMeteor = function (document) {
+  if (document instanceof MongoDB.Binary) {
+    // for backwards compatibility
+    if (document.sub_type !== 0) {
+      return document;
+    }
+    var buffer = document.value(true);
+    return new Uint8Array(buffer);
+  }
+  if (document instanceof MongoDB.ObjectID) {
+    return new Mongo.ObjectID(document.toHexString());
+  }
+  if (document instanceof MongoDB.Decimal128) {
+    return Decimal(document.toString());
+  }
+  if (document["EJSON$type"] && document["EJSON$value"] && Object.keys(document).length === 2) {
+    return EJSON.fromJSONValue(replaceNames(unmakeMongoLegal, document));
+  }
+  if (document instanceof MongoDB.Timestamp) {
+    // For now, the Meteor representation of a Mongo timestamp type (not a date!
+    // this is a weird internal thing used in the oplog!) is the same as the
+    // Mongo representation. We need to do this explicitly or else we would do a
+    // structural clone and lose the prototype.
+    return document;
+  }
+  return undefined;
+};
+
+const makeMongoLegal = name => "EJSON" + name;
+const unmakeMongoLegal = name => name.substr(5);
\ No newline at end of file
diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
new file mode 100644
index 0000000000..5db1b2f458
--- /dev/null
+++ b/packages/mongo/mongo_connection.js
@@ -0,0 +1,936 @@
+import { Meteor } from 'meteor/meteor';
+import path from 'path';
+import { DocFetcher } from './doc_fetcher';
+import { ObserveMultiplexer } from './observe_multiplex';
+import { ObserveHandle } from './observe_handle';
+import { OPLOG_COLLECTION, OplogHandle } from './oplog_tailing';
+import { CLIENT_ONLY_METHODS, getAsyncMethodName } from 'meteor/minimongo/constants';
+import { OplogObserveDriver } from './oplog_observe_driver';
+import { PollingObserveDriver } from './polling_observe_driver';
+import { replaceMeteorAtomWithMongo, replaceTypes, transformResult } from './mongo_common';
+import { AsynchronousCursor } from './asynchronous_cursor';
+import { MongoDB } from './mongo_common';
+import { Cursor } from './cursor';
+import { CursorDescription } from './cursor_description';
+
+const FILE_ASSET_SUFFIX = 'Asset';
+const ASSETS_FOLDER = 'assets';
+const APP_FOLDER = 'app';
+
+const oplogCollectionWarnings = [];
+
+export const MongoConnection = function (url, options) {
+  var self = this;
+  options = options || {};
+  self._observeMultiplexers = {};
+  self._onFailoverHook = new Hook;
+
+  const userOptions = {
+    ...(Mongo._connectionOptions || {}),
+    ...(Meteor.settings?.packages?.mongo?.options || {})
+  };
+
+  var mongoOptions = Object.assign({
+    ignoreUndefined: true,
+  }, userOptions);
+
+
+
+  // Internally the oplog connections specify their own maxPoolSize
+  // which we don't want to overwrite with any user defined value
+  if ('maxPoolSize' in options) {
+    // If we just set this for "server", replSet will override it. If we just
+    // set it for replSet, it will be ignored if we're not using a replSet.
+    mongoOptions.maxPoolSize = options.maxPoolSize;
+  }
+  if ('minPoolSize' in options) {
+    mongoOptions.minPoolSize = options.minPoolSize;
+  }
+
+  // Transform options like "tlsCAFileAsset": "filename.pem" into
+  // "tlsCAFile": "/<fullpath>/filename.pem"
+  Object.entries(mongoOptions || {})
+    .filter(([key]) => key && key.endsWith(FILE_ASSET_SUFFIX))
+    .forEach(([key, value]) => {
+      const optionName = key.replace(FILE_ASSET_SUFFIX, '');
+      mongoOptions[optionName] = path.join(Assets.getServerDir(),
+        ASSETS_FOLDER, APP_FOLDER, value);
+      delete mongoOptions[key];
+    });
+
+  self.db = null;
+  self._oplogHandle = null;
+  self._docFetcher = null;
+
+  mongoOptions.driverInfo = {
+    name: 'Meteor',
+    version: Meteor.release
+  }
+
+  self.client = new MongoDB.MongoClient(url, mongoOptions);
+  self.db = self.client.db();
+
+  self.client.on('serverDescriptionChanged', Meteor.bindEnvironment(event => {
+    // When the connection is no longer against the primary node, execute all
+    // failover hooks. This is important for the driver as it has to re-pool the
+    // query when it happens.
+    if (
+      event.previousDescription.type !== 'RSPrimary' &&
+      event.newDescription.type === 'RSPrimary'
+    ) {
+      self._onFailoverHook.each(callback => {
+        callback();
+        return true;
+      });
+    }
+  }));
+
+  if (options.oplogUrl && ! Package['disable-oplog']) {
+    self._oplogHandle = new OplogHandle(options.oplogUrl, self.db.databaseName);
+    self._docFetcher = new DocFetcher(self);
+  }
+
+};
+
+MongoConnection.prototype._close = async function() {
+  var self = this;
+
+  if (! self.db)
+    throw Error("close called before Connection created?");
+
+  // XXX probably untested
+  var oplogHandle = self._oplogHandle;
+  self._oplogHandle = null;
+  if (oplogHandle)
+    await oplogHandle.stop();
+
+  // Use Future.wrap so that errors get thrown. This happens to
+  // work even outside a fiber since the 'close' method is not
+  // actually asynchronous.
+  await self.client.close();
+};
+
+MongoConnection.prototype.close = function () {
+  return this._close();
+};
+
+MongoConnection.prototype._setOplogHandle = function(oplogHandle) {
+  this._oplogHandle = oplogHandle;
+  return this;
+};
+
+// Returns the Mongo Collection object; may yield.
+MongoConnection.prototype.rawCollection = function (collectionName) {
+  var self = this;
+
+  if (! self.db)
+    throw Error("rawCollection called before Connection created?");
+
+  return self.db.collection(collectionName);
+};
+
+MongoConnection.prototype.createCappedCollectionAsync = async function (
+  collectionName, byteSize, maxDocuments) {
+  var self = this;
+
+  if (! self.db)
+    throw Error("createCappedCollectionAsync called before Connection created?");
+
+
+  await self.db.createCollection(collectionName,
+    { capped: true, size: byteSize, max: maxDocuments });
+};
+
+// This should be called synchronously with a write, to create a
+// transaction on the current write fence, if any. After we can read
+// the write, and after observers have been notified (or at least,
+// after the observer notifiers have added themselves to the write
+// fence), you should call 'committed()' on the object returned.
+MongoConnection.prototype._maybeBeginWrite = function () {
+  const fence = DDPServer._getCurrentFence();
+  if (fence) {
+    return fence.beginWrite();
+  } else {
+    return {committed: function () {}};
+  }
+};
+
+// Internal interface: adds a callback which is called when the Mongo primary
+// changes. Returns a stop handle.
+MongoConnection.prototype._onFailover = function (callback) {
+  return this._onFailoverHook.register(callback);
+};
+
+MongoConnection.prototype.insertAsync = async function (collection_name, document) {
+  const self = this;
+
+  if (collection_name === "___meteor_failure_test_collection") {
+    const e = new Error("Failure test");
+    e._expectedByTest = true;
+    throw e;
+  }
+
+  if (!(LocalCollection._isPlainObject(document) &&
+    !EJSON._isCustomType(document))) {
+    throw new Error("Only plain objects may be inserted into MongoDB");
+  }
+
+  var write = self._maybeBeginWrite();
+  var refresh = async function () {
+    await Meteor.refresh({collection: collection_name, id: document._id });
+  };
+  return self.rawCollection(collection_name).insertOne(
+    replaceTypes(document, replaceMeteorAtomWithMongo),
+    {
+      safe: true,
+    }
+  ).then(async ({insertedId}) => {
+    await refresh();
+    await write.committed();
+    return insertedId;
+  }).catch(async e => {
+    await write.committed();
+    throw e;
+  });
+};
+
+
+// Cause queries that may be affected by the selector to poll in this write
+// fence.
+MongoConnection.prototype._refresh = async function (collectionName, selector) {
+  var refreshKey = {collection: collectionName};
+  // If we know which documents we're removing, don't poll queries that are
+  // specific to other documents. (Note that multiple notifications here should
+  // not cause multiple polls, since all our listener is doing is enqueueing a
+  // poll.)
+  var specificIds = LocalCollection._idsMatchedBySelector(selector);
+  if (specificIds) {
+    for (const id of specificIds) {
+      await Meteor.refresh(Object.assign({id: id}, refreshKey));
+    };
+  } else {
+    await Meteor.refresh(refreshKey);
+  }
+};
+
+MongoConnection.prototype.removeAsync = async function (collection_name, selector) {
+  var self = this;
+
+  if (collection_name === "___meteor_failure_test_collection") {
+    var e = new Error("Failure test");
+    e._expectedByTest = true;
+    throw e;
+  }
+
+  var write = self._maybeBeginWrite();
+  var refresh = async function () {
+    await self._refresh(collection_name, selector);
+  };
+
+  return self.rawCollection(collection_name)
+    .deleteMany(replaceTypes(selector, replaceMeteorAtomWithMongo), {
+      safe: true,
+    })
+    .then(async ({ deletedCount }) => {
+      await refresh();
+      await write.committed();
+      return transformResult({ result : {modifiedCount : deletedCount} }).numberAffected;
+    }).catch(async (err) => {
+      await write.committed();
+      throw err;
+    });
+};
+
+MongoConnection.prototype.dropCollectionAsync = async function(collectionName) {
+  var self = this;
+
+
+  var write = self._maybeBeginWrite();
+  var refresh = function() {
+    return Meteor.refresh({
+      collection: collectionName,
+      id: null,
+      dropCollection: true,
+    });
+  };
+
+  return self
+    .rawCollection(collectionName)
+    .drop()
+    .then(async result => {
+      await refresh();
+      await write.committed();
+      return result;
+    })
+    .catch(async e => {
+      await write.committed();
+      throw e;
+    });
+};
+
+// For testing only.  Slightly better than `c.rawDatabase().dropDatabase()`
+// because it lets the test's fence wait for it to be complete.
+MongoConnection.prototype.dropDatabaseAsync = async function () {
+  var self = this;
+
+  var write = self._maybeBeginWrite();
+  var refresh = async function () {
+    await Meteor.refresh({ dropDatabase: true });
+  };
+
+  try {
+    await self.db._dropDatabase();
+    await refresh();
+    await write.committed();
+  } catch (e) {
+    await write.committed();
+    throw e;
+  }
+};
+
+MongoConnection.prototype.updateAsync = async function (collection_name, selector, mod, options) {
+  var self = this;
+
+  if (collection_name === "___meteor_failure_test_collection") {
+    var e = new Error("Failure test");
+    e._expectedByTest = true;
+    throw e;
+  }
+
+  // explicit safety check. null and undefined can crash the mongo
+  // driver. Although the node driver and minimongo do 'support'
+  // non-object modifier in that they don't crash, they are not
+  // meaningful operations and do not do anything. Defensively throw an
+  // error here.
+  if (!mod || typeof mod !== 'object') {
+    const error = new Error("Invalid modifier. Modifier must be an object.");
+
+    throw error;
+  }
+
+  if (!(LocalCollection._isPlainObject(mod) && !EJSON._isCustomType(mod))) {
+    const error = new Error(
+      "Only plain objects may be used as replacement" +
+      " documents in MongoDB");
+
+    throw error;
+  }
+
+  if (!options) options = {};
+
+  var write = self._maybeBeginWrite();
+  var refresh = async function () {
+    await self._refresh(collection_name, selector);
+  };
+
+  var collection = self.rawCollection(collection_name);
+  var mongoOpts = {safe: true};
+  // Add support for filtered positional operator
+  if (options.arrayFilters !== undefined) mongoOpts.arrayFilters = options.arrayFilters;
+  // explictly enumerate options that minimongo supports
+  if (options.upsert) mongoOpts.upsert = true;
+  if (options.multi) mongoOpts.multi = true;
+  // Lets you get a more more full result from MongoDB. Use with caution:
+  // might not work with C.upsert (as opposed to C.update({upsert:true}) or
+  // with simulated upsert.
+  if (options.fullResult) mongoOpts.fullResult = true;
+
+  var mongoSelector = replaceTypes(selector, replaceMeteorAtomWithMongo);
+  var mongoMod = replaceTypes(mod, replaceMeteorAtomWithMongo);
+
+  var isModify = LocalCollection._isModificationMod(mongoMod);
+
+  if (options._forbidReplace && !isModify) {
+    var err = new Error("Invalid modifier. Replacements are forbidden.");
+    throw err;
+  }
+
+  // We've already run replaceTypes/replaceMeteorAtomWithMongo on
+  // selector and mod.  We assume it doesn't matter, as far as
+  // the behavior of modifiers is concerned, whether `_modify`
+  // is run on EJSON or on mongo-converted EJSON.
+
+  // Run this code up front so that it fails fast if someone uses
+  // a Mongo update operator we don't support.
+  let knownId;
+  if (options.upsert) {
+    try {
+      let newDoc = LocalCollection._createUpsertDocument(selector, mod);
+      knownId = newDoc._id;
+    } catch (err) {
+      throw err;
+    }
+  }
+  if (options.upsert &&
+    ! isModify &&
+    ! knownId &&
+    options.insertedId &&
+    ! (options.insertedId instanceof Mongo.ObjectID &&
+      options.generatedId)) {
+    // In case of an upsert with a replacement, where there is no _id defined
+    // in either the query or the replacement doc, mongo will generate an id itself.
+    // Therefore we need this special strategy if we want to control the id ourselves.
+
+    // We don't need to do this when:
+    // - This is not a replacement, so we can add an _id to $setOnInsert
+    // - The id is defined by query or mod we can just add it to the replacement doc
+    // - The user did not specify any id preference and the id is a Mongo ObjectId,
+    //     then we can just let Mongo generate the id
+    return await simulateUpsertWithInsertedId(collection, mongoSelector, mongoMod, options)
+      .then(async result => {
+        await refresh();
+        await write.committed();
+        if (result && ! options._returnObject) {
+          return result.numberAffected;
+        } else {
+          return result;
+        }
+      });
+  } else {
+    if (options.upsert && !knownId && options.insertedId && isModify) {
+      if (!mongoMod.hasOwnProperty('$setOnInsert')) {
+        mongoMod.$setOnInsert = {};
+      }
+      knownId = options.insertedId;
+      Object.assign(mongoMod.$setOnInsert, replaceTypes({_id: options.insertedId}, replaceMeteorAtomWithMongo));
+    }
+
+    const strings = Object.keys(mongoMod).filter((key) => !key.startsWith("$"));
+    let updateMethod = strings.length > 0 ? 'replaceOne' : 'updateMany';
+    updateMethod =
+      updateMethod === 'updateMany' && !mongoOpts.multi
+        ? 'updateOne'
+        : updateMethod;
+    return collection[updateMethod]
+      .bind(collection)(mongoSelector, mongoMod, mongoOpts)
+      .then(async result => {
+        var meteorResult = transformResult({result});
+        if (meteorResult && options._returnObject) {
+          // If this was an upsertAsync() call, and we ended up
+          // inserting a new doc and we know its id, then
+          // return that id as well.
+          if (options.upsert && meteorResult.insertedId) {
+            if (knownId) {
+              meteorResult.insertedId = knownId;
+            } else if (meteorResult.insertedId instanceof MongoDB.ObjectID) {
+              meteorResult.insertedId = new Mongo.ObjectID(meteorResult.insertedId.toHexString());
+            }
+          }
+          await refresh();
+          await write.committed();
+          return meteorResult;
+        } else {
+          await refresh();
+          await write.committed();
+          return meteorResult.numberAffected;
+        }
+      }).catch(async (err) => {
+        await write.committed();
+        throw err;
+      });
+  }
+};
+
+// exposed for testing
+MongoConnection._isCannotChangeIdError = function (err) {
+
+  // Mongo 3.2.* returns error as next Object:
+  // {name: String, code: Number, errmsg: String}
+  // Older Mongo returns:
+  // {name: String, code: Number, err: String}
+  var error = err.errmsg || err.err;
+
+  // We don't use the error code here
+  // because the error code we observed it producing (16837) appears to be
+  // a far more generic error code based on examining the source.
+  if (error.indexOf('The _id field cannot be changed') === 0
+    || error.indexOf("the (immutable) field '_id' was found to have been altered to _id") !== -1) {
+    return true;
+  }
+
+  return false;
+};
+
+// XXX MongoConnection.upsertAsync() does not return the id of the inserted document
+// unless you set it explicitly in the selector or modifier (as a replacement
+// doc).
+MongoConnection.prototype.upsertAsync = async function (collectionName, selector, mod, options) {
+  var self = this;
+
+
+
+  if (typeof options === "function" && ! callback) {
+    callback = options;
+    options = {};
+  }
+
+  return self.updateAsync(collectionName, selector, mod,
+    Object.assign({}, options, {
+      upsert: true,
+      _returnObject: true
+    }));
+};
+
+MongoConnection.prototype.find = function (collectionName, selector, options) {
+  var self = this;
+
+  if (arguments.length === 1)
+    selector = {};
+
+  return new Cursor(
+    self, new CursorDescription(collectionName, selector, options));
+};
+
+MongoConnection.prototype.findOneAsync = async function (collection_name, selector, options) {
+  var self = this;
+  if (arguments.length === 1) {
+    selector = {};
+  }
+
+  options = options || {};
+  options.limit = 1;
+
+  const results = await self.find(collection_name, selector, options).fetch();
+
+  return results[0];
+};
+
+// We'll actually design an index API later. For now, we just pass through to
+// Mongo's, but make it synchronous.
+MongoConnection.prototype.createIndexAsync = async function (collectionName, index,
+                                                             options) {
+  var self = this;
+
+  // We expect this function to be called at startup, not from within a method,
+  // so we don't interact with the write fence.
+  var collection = self.rawCollection(collectionName);
+  await collection.createIndex(index, options);
+};
+
+// just to be consistent with the other methods
+MongoConnection.prototype.createIndex =
+  MongoConnection.prototype.createIndexAsync;
+
+MongoConnection.prototype.countDocuments = function (collectionName, ...args) {
+  args = args.map(arg => replaceTypes(arg, replaceMeteorAtomWithMongo));
+  const collection = this.rawCollection(collectionName);
+  return collection.countDocuments(...args);
+};
+
+MongoConnection.prototype.estimatedDocumentCount = function (collectionName, ...args) {
+  args = args.map(arg => replaceTypes(arg, replaceMeteorAtomWithMongo));
+  const collection = this.rawCollection(collectionName);
+  return collection.estimatedDocumentCount(...args);
+};
+
+MongoConnection.prototype.ensureIndexAsync = MongoConnection.prototype.createIndexAsync;
+
+MongoConnection.prototype.dropIndexAsync = async function (collectionName, index) {
+  var self = this;
+
+
+  // This function is only used by test code, not within a method, so we don't
+  // interact with the write fence.
+  var collection = self.rawCollection(collectionName);
+  var indexName =  await collection.dropIndex(index);
+};
+
+
+CLIENT_ONLY_METHODS.forEach(function (m) {
+  MongoConnection.prototype[m] = function () {
+    throw new Error(
+      `${m} +  is not available on the server. Please use ${getAsyncMethodName(
+        m
+      )}() instead.`
+    );
+  };
+});
+
+
+var NUM_OPTIMISTIC_TRIES = 3;
+
+
+
+var simulateUpsertWithInsertedId = async function (collection, selector, mod, options) {
+  // STRATEGY: First try doing an upsert with a generated ID.
+  // If this throws an error about changing the ID on an existing document
+  // then without affecting the database, we know we should probably try
+  // an update without the generated ID. If it affected 0 documents,
+  // then without affecting the database, we the document that first
+  // gave the error is probably removed and we need to try an insert again
+  // We go back to step one and repeat.
+  // Like all "optimistic write" schemes, we rely on the fact that it's
+  // unlikely our writes will continue to be interfered with under normal
+  // circumstances (though sufficiently heavy contention with writers
+  // disagreeing on the existence of an object will cause writes to fail
+  // in theory).
+
+  var insertedId = options.insertedId; // must exist
+  var mongoOptsForUpdate = {
+    safe: true,
+    multi: options.multi
+  };
+  var mongoOptsForInsert = {
+    safe: true,
+    upsert: true
+  };
+
+  var replacementWithId = Object.assign(
+    replaceTypes({_id: insertedId}, replaceMeteorAtomWithMongo),
+    mod);
+
+  var tries = NUM_OPTIMISTIC_TRIES;
+
+  var doUpdate = async function () {
+    tries--;
+    if (! tries) {
+      throw new Error("Upsert failed after " + NUM_OPTIMISTIC_TRIES + " tries.");
+    } else {
+      let method = collection.updateMany;
+      if(!Object.keys(mod).some(key => key.startsWith("$"))){
+        method = collection.replaceOne.bind(collection);
+      }
+      return method(
+        selector,
+        mod,
+        mongoOptsForUpdate).then(result => {
+        if (result && (result.modifiedCount || result.upsertedCount)) {
+          return {
+            numberAffected: result.modifiedCount || result.upsertedCount,
+            insertedId: result.upsertedId || undefined,
+          };
+        } else {
+          return doConditionalInsert();
+        }
+      });
+    }
+  };
+
+  var doConditionalInsert = function() {
+    return collection.replaceOne(selector, replacementWithId, mongoOptsForInsert)
+      .then(result => ({
+        numberAffected: result.upsertedCount,
+        insertedId: result.upsertedId,
+      })).catch(err => {
+        if (MongoConnection._isCannotChangeIdError(err)) {
+          return doUpdate();
+        } else {
+          throw err;
+        }
+      });
+
+  };
+  return doUpdate();
+};
+
+// observeChanges for tailable cursors on capped collections.
+//
+// Some differences from normal cursors:
+//   - Will never produce anything other than 'added' or 'addedBefore'. If you
+//     do update a document that has already been produced, this will not notice
+//     it.
+//   - If you disconnect and reconnect from Mongo, it will essentially restart
+//     the query, which will lead to duplicate results. This is pretty bad,
+//     but if you include a field called 'ts' which is inserted as
+//     new MongoInternals.MongoTimestamp(0, 0) (which is initialized to the
+//     current Mongo-style timestamp), we'll be able to find the place to
+//     restart properly. (This field is specifically understood by Mongo with an
+//     optimization which allows it to find the right place to start without
+//     an index on ts. It's how the oplog works.)
+//   - No callbacks are triggered synchronously with the call (there's no
+//     differentiation between "initial data" and "later changes"; everything
+//     that matches the query gets sent asynchronously).
+//   - De-duplication is not implemented.
+//   - Does not yet interact with the write fence. Probably, this should work by
+//     ignoring removes (which don't work on capped collections) and updates
+//     (which don't affect tailable cursors), and just keeping track of the ID
+//     of the inserted object, and closing the write fence once you get to that
+//     ID (or timestamp?).  This doesn't work well if the document doesn't match
+//     the query, though.  On the other hand, the write fence can close
+//     immediately if it does not match the query. So if we trust minimongo
+//     enough to accurately evaluate the query against the write fence, we
+//     should be able to do this...  Of course, minimongo doesn't even support
+//     Mongo Timestamps yet.
+MongoConnection.prototype._observeChangesTailable = function (
+  cursorDescription, ordered, callbacks) {
+  var self = this;
+
+  // Tailable cursors only ever call added/addedBefore callbacks, so it's an
+  // error if you didn't provide them.
+  if ((ordered && !callbacks.addedBefore) ||
+    (!ordered && !callbacks.added)) {
+    throw new Error("Can't observe an " + (ordered ? "ordered" : "unordered")
+      + " tailable cursor without a "
+      + (ordered ? "addedBefore" : "added") + " callback");
+  }
+
+  return self.tail(cursorDescription, function (doc) {
+    var id = doc._id;
+    delete doc._id;
+    // The ts is an implementation detail. Hide it.
+    delete doc.ts;
+    if (ordered) {
+      callbacks.addedBefore(id, doc, null);
+    } else {
+      callbacks.added(id, doc);
+    }
+  });
+};
+
+MongoConnection.prototype._createAsynchronousCursor = function(
+  cursorDescription, options = {}) {
+  var self = this;
+  const { selfForIteration, useTransform } = options;
+  options = { selfForIteration, useTransform };
+
+  var collection = self.rawCollection(cursorDescription.collectionName);
+  var cursorOptions = cursorDescription.options;
+  var mongoOptions = {
+    sort: cursorOptions.sort,
+    limit: cursorOptions.limit,
+    skip: cursorOptions.skip,
+    projection: cursorOptions.fields || cursorOptions.projection,
+    readPreference: cursorOptions.readPreference,
+  };
+
+  // Do we want a tailable cursor (which only works on capped collections)?
+  if (cursorOptions.tailable) {
+    mongoOptions.numberOfRetries = -1;
+  }
+
+  var dbCursor = collection.find(
+    replaceTypes(cursorDescription.selector, replaceMeteorAtomWithMongo),
+    mongoOptions);
+
+  // Do we want a tailable cursor (which only works on capped collections)?
+  if (cursorOptions.tailable) {
+    // We want a tailable cursor...
+    dbCursor.addCursorFlag("tailable", true)
+    // ... and for the server to wait a bit if any getMore has no data (rather
+    // than making us put the relevant sleeps in the client)...
+    dbCursor.addCursorFlag("awaitData", true)
+
+    // And if this is on the oplog collection and the cursor specifies a 'ts',
+    // then set the undocumented oplog replay flag, which does a special scan to
+    // find the first document (instead of creating an index on ts). This is a
+    // very hard-coded Mongo flag which only works on the oplog collection and
+    // only works with the ts field.
+    if (cursorDescription.collectionName === OPLOG_COLLECTION &&
+      cursorDescription.selector.ts) {
+      dbCursor.addCursorFlag("oplogReplay", true)
+    }
+  }
+
+  if (typeof cursorOptions.maxTimeMs !== 'undefined') {
+    dbCursor = dbCursor.maxTimeMS(cursorOptions.maxTimeMs);
+  }
+  if (typeof cursorOptions.hint !== 'undefined') {
+    dbCursor = dbCursor.hint(cursorOptions.hint);
+  }
+
+  return new AsynchronousCursor(dbCursor, cursorDescription, options, collection);
+};
+
+// Tails the cursor described by cursorDescription, most likely on the
+// oplog. Calls docCallback with each document found. Ignores errors and just
+// restarts the tail on error.
+//
+// If timeoutMS is set, then if we don't get a new document every timeoutMS,
+// kill and restart the cursor. This is primarily a workaround for #8598.
+MongoConnection.prototype.tail = function (cursorDescription, docCallback, timeoutMS) {
+  var self = this;
+  if (!cursorDescription.options.tailable)
+    throw new Error("Can only tail a tailable cursor");
+
+  var cursor = self._createAsynchronousCursor(cursorDescription);
+
+  var stopped = false;
+  var lastTS;
+
+  Meteor.defer(async function loop() {
+    var doc = null;
+    while (true) {
+      if (stopped)
+        return;
+      try {
+        doc = await cursor._nextObjectPromiseWithTimeout(timeoutMS);
+      } catch (err) {
+        // There's no good way to figure out if this was actually an error from
+        // Mongo, or just client-side (including our own timeout error). Ah
+        // well. But either way, we need to retry the cursor (unless the failure
+        // was because the observe got stopped).
+        doc = null;
+      }
+      // Since we awaited a promise above, we need to check again to see if
+      // we've been stopped before calling the callback.
+      if (stopped)
+        return;
+      if (doc) {
+        // If a tailable cursor contains a "ts" field, use it to recreate the
+        // cursor on error. ("ts" is a standard that Mongo uses internally for
+        // the oplog, and there's a special flag that lets you do binary search
+        // on it instead of needing to use an index.)
+        lastTS = doc.ts;
+        docCallback(doc);
+      } else {
+        var newSelector = Object.assign({}, cursorDescription.selector);
+        if (lastTS) {
+          newSelector.ts = {$gt: lastTS};
+        }
+        cursor = self._createAsynchronousCursor(new CursorDescription(
+          cursorDescription.collectionName,
+          newSelector,
+          cursorDescription.options));
+        // Mongo failover takes many seconds.  Retry in a bit.  (Without this
+        // setTimeout, we peg the CPU at 100% and never notice the actual
+        // failover.
+        setTimeout(loop, 100);
+        break;
+      }
+    }
+  });
+
+  return {
+    stop: function () {
+      stopped = true;
+      cursor.close();
+    }
+  };
+};
+
+Object.assign(MongoConnection.prototype, {
+  _observeChanges: async function (
+    cursorDescription, ordered, callbacks, nonMutatingCallbacks) {
+    var self = this;
+    const collectionName = cursorDescription.collectionName;
+
+    if (cursorDescription.options.tailable) {
+      return self._observeChangesTailable(cursorDescription, ordered, callbacks);
+    }
+
+    // You may not filter out _id when observing changes, because the id is a core
+    // part of the observeChanges API.
+    const fieldsOptions = cursorDescription.options.projection || cursorDescription.options.fields;
+    if (fieldsOptions &&
+      (fieldsOptions._id === 0 ||
+        fieldsOptions._id === false)) {
+      throw Error("You may not observe a cursor with {fields: {_id: 0}}");
+    }
+
+    var observeKey = EJSON.stringify(
+      Object.assign({ordered: ordered}, cursorDescription));
+
+    var multiplexer, observeDriver;
+    var firstHandle = false;
+
+    // Find a matching ObserveMultiplexer, or create a new one. This next block is
+    // guaranteed to not yield (and it doesn't call anything that can observe a
+    // new query), so no other calls to this function can interleave with it.
+    if (observeKey in self._observeMultiplexers) {
+      multiplexer = self._observeMultiplexers[observeKey];
+    } else {
+      firstHandle = true;
+      // Create a new ObserveMultiplexer.
+      multiplexer = new ObserveMultiplexer({
+        ordered: ordered,
+        onStop: function () {
+          delete self._observeMultiplexers[observeKey];
+          return observeDriver.stop();
+        }
+      });
+    }
+
+    var observeHandle = new ObserveHandle(multiplexer,
+      callbacks,
+      nonMutatingCallbacks,
+    );
+
+    const oplogOptions = self?._oplogHandle?._oplogOptions || {};
+    const { includeCollections, excludeCollections } = oplogOptions;
+    if (firstHandle) {
+      var matcher, sorter;
+      var canUseOplog = [
+        function () {
+          // At a bare minimum, using the oplog requires us to have an oplog, to
+          // want unordered callbacks, and to not want a callback on the polls
+          // that won't happen.
+          return self._oplogHandle && !ordered &&
+            !callbacks._testOnlyPollCallback;
+        },
+        function () {
+          // We also need to check, if the collection of this Cursor is actually being "watched" by the Oplog handle
+          // if not, we have to fallback to long polling
+          if (excludeCollections?.length && excludeCollections.includes(collectionName)) {
+            if (!oplogCollectionWarnings.includes(collectionName)) {
+              console.warn(`Meteor.settings.packages.mongo.oplogExcludeCollections includes the collection ${collectionName} - your subscriptions will only use long polling!`);
+              oplogCollectionWarnings.push(collectionName); // we only want to show the warnings once per collection!
+            }
+            return false;
+          }
+          if (includeCollections?.length && !includeCollections.includes(collectionName)) {
+            if (!oplogCollectionWarnings.includes(collectionName)) {
+              console.warn(`Meteor.settings.packages.mongo.oplogIncludeCollections does not include the collection ${collectionName} - your subscriptions will only use long polling!`);
+              oplogCollectionWarnings.push(collectionName); // we only want to show the warnings once per collection!
+            }
+            return false;
+          }
+          return true;
+        },
+        function () {
+          // We need to be able to compile the selector. Fall back to polling for
+          // some newfangled $selector that minimongo doesn't support yet.
+          try {
+            matcher = new Minimongo.Matcher(cursorDescription.selector);
+            return true;
+          } catch (e) {
+            // XXX make all compilation errors MinimongoError or something
+            //     so that this doesn't ignore unrelated exceptions
+            return false;
+          }
+        },
+        function () {
+          // ... and the selector itself needs to support oplog.
+          return OplogObserveDriver.cursorSupported(cursorDescription, matcher);
+        },
+        function () {
+          // And we need to be able to compile the sort, if any.  eg, can't be
+          // {$natural: 1}.
+          if (!cursorDescription.options.sort)
+            return true;
+          try {
+            sorter = new Minimongo.Sorter(cursorDescription.options.sort);
+            return true;
+          } catch (e) {
+            // XXX make all compilation errors MinimongoError or something
+            //     so that this doesn't ignore unrelated exceptions
+            return false;
+          }
+        }
+      ].every(f => f());  // invoke each function and check if all return true
+
+      var driverClass = canUseOplog ? OplogObserveDriver : PollingObserveDriver;
+      observeDriver = new driverClass({
+        cursorDescription: cursorDescription,
+        mongoHandle: self,
+        multiplexer: multiplexer,
+        ordered: ordered,
+        matcher: matcher,  // ignored by polling
+        sorter: sorter,  // ignored by polling
+        _testOnlyPollCallback: callbacks._testOnlyPollCallback
+      });
+
+      if (observeDriver._init) {
+        await observeDriver._init();
+      }
+
+      // This field is only set for use in tests.
+      multiplexer._observeDriver = observeDriver;
+    }
+    self._observeMultiplexers[observeKey] = multiplexer;
+    // Blocks until the initial adds have been sent.
+    await multiplexer.addHandleAndSendInitialAdds(observeHandle);
+
+    return observeHandle;
+  },
+
+});
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 60ee67b857..bb60eaee7b 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -1,32 +1,9 @@
-import has from 'lodash.has';
-import identity from 'lodash.identity';
-import clone from 'lodash.clone';
+import { OplogHandle } from './oplog_tailing';
+import { MongoConnection } from './mongo_connection';
+import { OplogObserveDriver } from './oplog_observe_driver';
+import { MongoDB } from './mongo_common';
 
-/**
- * Provide a synchronous Collection API using fibers, backed by
- * MongoDB.  This is only for use on the server, and mostly identical
- * to the client API.
- *
- * NOTE: the public API methods must be run within a fiber. If you call
- * these outside of a fiber they will explode!
- */
-
-const path = require("path");
-const util = require("util");
-
-/** @type {import('mongodb')} */
-var MongoDB = NpmModuleMongodb;
-import { DocFetcher } from "./doc_fetcher.js";
-import {
-  ASYNC_CURSOR_METHODS,
-  CLIENT_ONLY_METHODS,
-  getAsyncMethodName
-} from "meteor/minimongo/constants";
-import { Meteor } from "meteor/meteor";
-import { ObserveHandle } from './observe_handle';
-import { ObserveMultiplexer } from './observe_multiplex';
-
-MongoInternals = {};
+MongoInternals = global.MongoInternals = {};
 
 MongoInternals.__packageName = 'mongo';
 
@@ -43,9 +20,11 @@ MongoInternals.NpmModules = {
 // XXX COMPAT WITH 1.0.3.2
 MongoInternals.NpmModule = MongoDB;
 
-const FILE_ASSET_SUFFIX = 'Asset';
-const ASSETS_FOLDER = 'assets';
-const APP_FOLDER = 'app';
+MongoInternals.OplogHandle = OplogHandle;
+
+MongoInternals.Connection = MongoConnection;
+
+MongoInternals.OplogObserveDriver = OplogObserveDriver;
 
 // This is used to add or remove EJSON from the beginning of everything nested
 // inside an EJSON custom type. It should only be called on pure JSON!
@@ -71,1530 +50,13 @@ MongoDB.Timestamp.prototype.clone = function () {
   return this;
 };
 
-var makeMongoLegal = function (name) { return "EJSON" + name; };
-var unmakeMongoLegal = function (name) { return name.substr(5); };
-
-var replaceMongoAtomWithMeteor = function (document) {
-  if (document instanceof MongoDB.Binary) {
-    // for backwards compatibility
-    if (document.sub_type !== 0) {
-      return document;
-    }
-    var buffer = document.value(true);
-    return new Uint8Array(buffer);
-  }
-  if (document instanceof MongoDB.ObjectID) {
-    return new Mongo.ObjectID(document.toHexString());
-  }
-  if (document instanceof MongoDB.Decimal128) {
-    return Decimal(document.toString());
-  }
-  if (document["EJSON$type"] && document["EJSON$value"] && Object.keys(document).length === 2) {
-    return EJSON.fromJSONValue(replaceNames(unmakeMongoLegal, document));
-  }
-  if (document instanceof MongoDB.Timestamp) {
-    // For now, the Meteor representation of a Mongo timestamp type (not a date!
-    // this is a weird internal thing used in the oplog!) is the same as the
-    // Mongo representation. We need to do this explicitly or else we would do a
-    // structural clone and lose the prototype.
-    return document;
-  }
-  return undefined;
-};
-
-var replaceMeteorAtomWithMongo = function (document) {
-  if (EJSON.isBinary(document)) {
-    // This does more copies than we'd like, but is necessary because
-    // MongoDB.BSON only looks like it takes a Uint8Array (and doesn't actually
-    // serialize it correctly).
-    return new MongoDB.Binary(Buffer.from(document));
-  }
-  if (document instanceof MongoDB.Binary) {
-     return document;
-  }
-  if (document instanceof Mongo.ObjectID) {
-    return new MongoDB.ObjectID(document.toHexString());
-  }
-  if (document instanceof MongoDB.Timestamp) {
-    // For now, the Meteor representation of a Mongo timestamp type (not a date!
-    // this is a weird internal thing used in the oplog!) is the same as the
-    // Mongo representation. We need to do this explicitly or else we would do a
-    // structural clone and lose the prototype.
-    return document;
-  }
-  if (document instanceof Decimal) {
-    return MongoDB.Decimal128.fromString(document.toString());
-  }
-  if (EJSON._isCustomType(document)) {
-    return replaceNames(makeMongoLegal, EJSON.toJSONValue(document));
-  }
-  // It is not ordinarily possible to stick dollar-sign keys into mongo
-  // so we don't bother checking for things that need escaping at this time.
-  return undefined;
-};
-
-var replaceTypes = function (document, atomTransformer) {
-  if (typeof document !== 'object' || document === null)
-    return document;
-
-  var replacedTopLevelAtom = atomTransformer(document);
-  if (replacedTopLevelAtom !== undefined)
-    return replacedTopLevelAtom;
-
-  var ret = document;
-  Object.entries(document).forEach(function ([key, val]) {
-    var valReplaced = replaceTypes(val, atomTransformer);
-    if (val !== valReplaced) {
-      // Lazy clone. Shallow copy.
-      if (ret === document)
-        ret = clone(document);
-      ret[key] = valReplaced;
-    }
-  });
-  return ret;
-};
-
-
-MongoConnection = function (url, options) {
-  var self = this;
-  options = options || {};
-  self._observeMultiplexers = {};
-  self._onFailoverHook = new Hook;
-
-  const userOptions = {
-    ...(Mongo._connectionOptions || {}),
-    ...(Meteor.settings?.packages?.mongo?.options || {})
-  };
-
-  var mongoOptions = Object.assign({
-    ignoreUndefined: true,
-  }, userOptions);
-
-
-
-  // Internally the oplog connections specify their own maxPoolSize
-  // which we don't want to overwrite with any user defined value
-  if (has(options, 'maxPoolSize')) {
-    // If we just set this for "server", replSet will override it. If we just
-    // set it for replSet, it will be ignored if we're not using a replSet.
-    mongoOptions.maxPoolSize = options.maxPoolSize;
-  }
-  if (has(options, 'minPoolSize')) {
-    mongoOptions.minPoolSize = options.minPoolSize;
-  }
-
-  // Transform options like "tlsCAFileAsset": "filename.pem" into
-  // "tlsCAFile": "/<fullpath>/filename.pem"
-  Object.entries(mongoOptions || {})
-    .filter(([key]) => key && key.endsWith(FILE_ASSET_SUFFIX))
-    .forEach(([key, value]) => {
-      const optionName = key.replace(FILE_ASSET_SUFFIX, '');
-      mongoOptions[optionName] = path.join(Assets.getServerDir(),
-        ASSETS_FOLDER, APP_FOLDER, value);
-      delete mongoOptions[key];
-    });
-
-  self.db = null;
-  self._oplogHandle = null;
-  self._docFetcher = null;
-
-  mongoOptions.driverInfo = {
-    name: 'Meteor',
-    version: Meteor.release
-  }
-  
-  self.client = new MongoDB.MongoClient(url, mongoOptions);
-  self.db = self.client.db();
-
-  self.client.on('serverDescriptionChanged', Meteor.bindEnvironment(event => {
-    // When the connection is no longer against the primary node, execute all
-    // failover hooks. This is important for the driver as it has to re-pool the
-    // query when it happens.
-    if (
-      event.previousDescription.type !== 'RSPrimary' &&
-      event.newDescription.type === 'RSPrimary'
-    ) {
-      self._onFailoverHook.each(callback => {
-        callback();
-        return true;
-      });
-    }
-  }));
-
-  if (options.oplogUrl && ! Package['disable-oplog']) {
-    self._oplogHandle = new OplogHandle(options.oplogUrl, self.db.databaseName);
-    self._docFetcher = new DocFetcher(self);
-  }
-
-};
-
-MongoConnection.prototype._close = async function() {
-  var self = this;
-
-  if (! self.db)
-    throw Error("close called before Connection created?");
-
-  // XXX probably untested
-  var oplogHandle = self._oplogHandle;
-  self._oplogHandle = null;
-  if (oplogHandle)
-    await oplogHandle.stop();
-
-  // Use Future.wrap so that errors get thrown. This happens to
-  // work even outside a fiber since the 'close' method is not
-  // actually asynchronous.
-  await self.client.close();
-};
-
-MongoConnection.prototype.close = function () {
-  return this._close();
-};
-
-MongoConnection.prototype._setOplogHandle = function(oplogHandle) {
-  this._oplogHandle = oplogHandle;
-  return this;
-};
-
-// Returns the Mongo Collection object; may yield.
-MongoConnection.prototype.rawCollection = function (collectionName) {
-  var self = this;
-
-  if (! self.db)
-    throw Error("rawCollection called before Connection created?");
-
-  return self.db.collection(collectionName);
-};
-
-MongoConnection.prototype.createCappedCollectionAsync = async function (
-    collectionName, byteSize, maxDocuments) {
-  var self = this;
-
-  if (! self.db)
-    throw Error("createCappedCollectionAsync called before Connection created?");
-
-
-  await self.db.createCollection(collectionName,
-    { capped: true, size: byteSize, max: maxDocuments });
-};
-
-// This should be called synchronously with a write, to create a
-// transaction on the current write fence, if any. After we can read
-// the write, and after observers have been notified (or at least,
-// after the observer notifiers have added themselves to the write
-// fence), you should call 'committed()' on the object returned.
-MongoConnection.prototype._maybeBeginWrite = function () {
-  const fence = DDPServer._getCurrentFence();
-  if (fence) {
-    return fence.beginWrite();
-  } else {
-    return {committed: function () {}};
-  }
-};
-
-// Internal interface: adds a callback which is called when the Mongo primary
-// changes. Returns a stop handle.
-MongoConnection.prototype._onFailover = function (callback) {
-  return this._onFailoverHook.register(callback);
-};
-
-
-//////////// Public API //////////
-
-// The write methods block until the database has confirmed the write (it may
-// not be replicated or stable on disk, but one server has confirmed it) if no
-// callback is provided. If a callback is provided, then they call the callback
-// when the write is confirmed. They return nothing on success, and raise an
-// exception on failure.
-//
-// After making a write (with insert, update, remove), observers are
-// notified asynchronously. If you want to receive a callback once all
-// of the observer notifications have landed for your write, do the
-// writes inside a write fence (set DDPServer._CurrentWriteFence to a new
-// _WriteFence, and then set a callback on the write fence.)
-//
-// Since our execution environment is single-threaded, this is
-// well-defined -- a write "has been made" if it's returned, and an
-// observer "has been notified" if its callback has returned.
-
-var writeCallback = function (write, refresh, callback) {
-  return function (err, result) {
-    if (! err) {
-      // XXX We don't have to run this on error, right?
-      try {
-        refresh();
-      } catch (refreshErr) {
-        if (callback) {
-          callback(refreshErr);
-          return;
-        } else {
-          throw refreshErr;
-        }
-      }
-    }
-    write.committed();
-    if (callback) {
-      callback(err, result);
-    } else if (err) {
-      throw err;
-    }
-  };
-};
-
-MongoConnection.prototype.insertAsync = async function (collection_name, document) {
-  const self = this;
-
-  if (collection_name === "___meteor_failure_test_collection") {
-    const e = new Error("Failure test");
-    e._expectedByTest = true;
-    throw e;
-  }
-
-  if (!(LocalCollection._isPlainObject(document) &&
-        !EJSON._isCustomType(document))) {
-    throw new Error("Only plain objects may be inserted into MongoDB");
-  }
-
-  var write = self._maybeBeginWrite();
-  var refresh = async function () {
-    await Meteor.refresh({collection: collection_name, id: document._id });
-  };
-  return self.rawCollection(collection_name).insertOne(
-    replaceTypes(document, replaceMeteorAtomWithMongo),
-    {
-      safe: true,
-    }
-  ).then(async ({insertedId}) => {
-    await refresh();
-    await write.committed();
-    return insertedId;
-  }).catch(async e => {
-    await write.committed();
-    throw e;
-  });
-};
-
-
-// Cause queries that may be affected by the selector to poll in this write
-// fence.
-MongoConnection.prototype._refresh = async function (collectionName, selector) {
-  var refreshKey = {collection: collectionName};
-  // If we know which documents we're removing, don't poll queries that are
-  // specific to other documents. (Note that multiple notifications here should
-  // not cause multiple polls, since all our listener is doing is enqueueing a
-  // poll.)
-  var specificIds = LocalCollection._idsMatchedBySelector(selector);
-  if (specificIds) {
-    for (const id of specificIds) {
-      await Meteor.refresh(Object.assign({id: id}, refreshKey));
-    };
-  } else {
-    await Meteor.refresh(refreshKey);
-  }
-};
-
-MongoConnection.prototype.removeAsync = async function (collection_name, selector) {
-  var self = this;
-
-  if (collection_name === "___meteor_failure_test_collection") {
-    var e = new Error("Failure test");
-    e._expectedByTest = true;
-    throw e;
-  }
-
-  var write = self._maybeBeginWrite();
-  var refresh = async function () {
-    await self._refresh(collection_name, selector);
-  };
-
-  return self.rawCollection(collection_name)
-    .deleteMany(replaceTypes(selector, replaceMeteorAtomWithMongo), {
-      safe: true,
-    })
-    .then(async ({ deletedCount }) => {
-      await refresh();
-      await write.committed();
-      return transformResult({ result : {modifiedCount : deletedCount} }).numberAffected;
-    }).catch(async (err) => {
-        await write.committed();
-        throw err;
-    });
-};
-
-MongoConnection.prototype.dropCollectionAsync = async function(collectionName) {
-  var self = this;
-
-
-  var write = self._maybeBeginWrite();
-  var refresh = function() {
-    return Meteor.refresh({
-      collection: collectionName,
-      id: null,
-      dropCollection: true,
-    });
-  };
-
-  return self
-    .rawCollection(collectionName)
-    .drop()
-    .then(async result => {
-      await refresh();
-      await write.committed();
-      return result;
-    })
-    .catch(async e => {
-      await write.committed();
-      throw e;
-    });
-};
-
-// For testing only.  Slightly better than `c.rawDatabase().dropDatabase()`
-// because it lets the test's fence wait for it to be complete.
-MongoConnection.prototype.dropDatabaseAsync = async function () {
-  var self = this;
-
-  var write = self._maybeBeginWrite();
-  var refresh = async function () {
-    await Meteor.refresh({ dropDatabase: true });
-  };
-
-  try {
-    await self.db._dropDatabase();
-    await refresh();
-    await write.committed();
-  } catch (e) {
-    await write.committed();
-    throw e;
-  }
-};
-
-MongoConnection.prototype.updateAsync = async function (collection_name, selector, mod, options) {
-  var self = this;
-
-  if (collection_name === "___meteor_failure_test_collection") {
-    var e = new Error("Failure test");
-    e._expectedByTest = true;
-    throw e;
-  }
-
-  // explicit safety check. null and undefined can crash the mongo
-  // driver. Although the node driver and minimongo do 'support'
-  // non-object modifier in that they don't crash, they are not
-  // meaningful operations and do not do anything. Defensively throw an
-  // error here.
-  if (!mod || typeof mod !== 'object') {
-    const error = new Error("Invalid modifier. Modifier must be an object.");
-
-    throw error;
-  }
-
-  if (!(LocalCollection._isPlainObject(mod) && !EJSON._isCustomType(mod))) {
-    const error = new Error(
-        "Only plain objects may be used as replacement" +
-        " documents in MongoDB");
-
-    throw error;
-  }
-
-  if (!options) options = {};
-
-  var write = self._maybeBeginWrite();
-  var refresh = async function () {
-    await self._refresh(collection_name, selector);
-  };
-
-  var collection = self.rawCollection(collection_name);
-  var mongoOpts = {safe: true};
-  // Add support for filtered positional operator
-  if (options.arrayFilters !== undefined) mongoOpts.arrayFilters = options.arrayFilters;
-  // explictly enumerate options that minimongo supports
-  if (options.upsert) mongoOpts.upsert = true;
-  if (options.multi) mongoOpts.multi = true;
-  // Lets you get a more more full result from MongoDB. Use with caution:
-  // might not work with C.upsert (as opposed to C.update({upsert:true}) or
-  // with simulated upsert.
-  if (options.fullResult) mongoOpts.fullResult = true;
-
-  var mongoSelector = replaceTypes(selector, replaceMeteorAtomWithMongo);
-  var mongoMod = replaceTypes(mod, replaceMeteorAtomWithMongo);
-
-  var isModify = LocalCollection._isModificationMod(mongoMod);
-
-  if (options._forbidReplace && !isModify) {
-    var err = new Error("Invalid modifier. Replacements are forbidden.");
-    throw err;
-  }
-
-  // We've already run replaceTypes/replaceMeteorAtomWithMongo on
-  // selector and mod.  We assume it doesn't matter, as far as
-  // the behavior of modifiers is concerned, whether `_modify`
-  // is run on EJSON or on mongo-converted EJSON.
-
-  // Run this code up front so that it fails fast if someone uses
-  // a Mongo update operator we don't support.
-  let knownId;
-  if (options.upsert) {
-    try {
-      let newDoc = LocalCollection._createUpsertDocument(selector, mod);
-      knownId = newDoc._id;
-    } catch (err) {
-      throw err;
-    }
-  }
-  if (options.upsert &&
-      ! isModify &&
-      ! knownId &&
-      options.insertedId &&
-      ! (options.insertedId instanceof Mongo.ObjectID &&
-         options.generatedId)) {
-    // In case of an upsert with a replacement, where there is no _id defined
-    // in either the query or the replacement doc, mongo will generate an id itself.
-    // Therefore we need this special strategy if we want to control the id ourselves.
-
-    // We don't need to do this when:
-    // - This is not a replacement, so we can add an _id to $setOnInsert
-    // - The id is defined by query or mod we can just add it to the replacement doc
-    // - The user did not specify any id preference and the id is a Mongo ObjectId,
-    //     then we can just let Mongo generate the id
-    return await simulateUpsertWithInsertedId(collection, mongoSelector, mongoMod, options)
-        .then(async result => {
-          await refresh();
-          await write.committed();
-          if (result && ! options._returnObject) {
-            return result.numberAffected;
-          } else {
-            return result;
-          }
-        });
-  } else {
-    if (options.upsert && !knownId && options.insertedId && isModify) {
-      if (!mongoMod.hasOwnProperty('$setOnInsert')) {
-        mongoMod.$setOnInsert = {};
-      }
-      knownId = options.insertedId;
-      Object.assign(mongoMod.$setOnInsert, replaceTypes({_id: options.insertedId}, replaceMeteorAtomWithMongo));
-    }
-
-    const strings = Object.keys(mongoMod).filter((key) => !key.startsWith("$"));
-    let updateMethod = strings.length > 0 ? 'replaceOne' : 'updateMany';
-    updateMethod =
-        updateMethod === 'updateMany' && !mongoOpts.multi
-            ? 'updateOne'
-            : updateMethod;
-    return collection[updateMethod]
-        .bind(collection)(mongoSelector, mongoMod, mongoOpts)
-        .then(async result => {
-          var meteorResult = transformResult({result});
-          if (meteorResult && options._returnObject) {
-            // If this was an upsertAsync() call, and we ended up
-            // inserting a new doc and we know its id, then
-            // return that id as well.
-            if (options.upsert && meteorResult.insertedId) {
-              if (knownId) {
-                meteorResult.insertedId = knownId;
-              } else if (meteorResult.insertedId instanceof MongoDB.ObjectID) {
-                meteorResult.insertedId = new Mongo.ObjectID(meteorResult.insertedId.toHexString());
-              }
-            }
-            await refresh();
-            await write.committed();
-            return meteorResult;
-          } else {
-            await refresh();
-            await write.committed();
-            return meteorResult.numberAffected;
-          }
-        }).catch(async (err) => {
-          await write.committed();
-          throw err;
-        });
-  }
-};
-
-var transformResult = function (driverResult) {
-  var meteorResult = { numberAffected: 0 };
-  if (driverResult) {
-    var mongoResult = driverResult.result;
-    // On updates with upsert:true, the inserted values come as a list of
-    // upserted values -- even with options.multi, when the upsert does insert,
-    // it only inserts one element.
-    if (mongoResult.upsertedCount) {
-      meteorResult.numberAffected = mongoResult.upsertedCount;
-
-      if (mongoResult.upsertedId) {
-        meteorResult.insertedId = mongoResult.upsertedId;
-      }
-    } else {
-      // n was used before Mongo 5.0, in Mongo 5.0 we are not receiving this n
-      // field and so we are using modifiedCount instead
-      meteorResult.numberAffected = mongoResult.n || mongoResult.matchedCount || mongoResult.modifiedCount;
-    }
-  }
-
-  return meteorResult;
-};
-
-
-var NUM_OPTIMISTIC_TRIES = 3;
-
-// exposed for testing
-MongoConnection._isCannotChangeIdError = function (err) {
-
-  // Mongo 3.2.* returns error as next Object:
-  // {name: String, code: Number, errmsg: String}
-  // Older Mongo returns:
-  // {name: String, code: Number, err: String}
-  var error = err.errmsg || err.err;
-
-  // We don't use the error code here
-  // because the error code we observed it producing (16837) appears to be
-  // a far more generic error code based on examining the source.
-  if (error.indexOf('The _id field cannot be changed') === 0
-    || error.indexOf("the (immutable) field '_id' was found to have been altered to _id") !== -1) {
-    return true;
-  }
-
-  return false;
-};
-
-var simulateUpsertWithInsertedId = async function (collection, selector, mod, options) {
-  // STRATEGY: First try doing an upsert with a generated ID.
-  // If this throws an error about changing the ID on an existing document
-  // then without affecting the database, we know we should probably try
-  // an update without the generated ID. If it affected 0 documents,
-  // then without affecting the database, we the document that first
-  // gave the error is probably removed and we need to try an insert again
-  // We go back to step one and repeat.
-  // Like all "optimistic write" schemes, we rely on the fact that it's
-  // unlikely our writes will continue to be interfered with under normal
-  // circumstances (though sufficiently heavy contention with writers
-  // disagreeing on the existence of an object will cause writes to fail
-  // in theory).
-
-  var insertedId = options.insertedId; // must exist
-  var mongoOptsForUpdate = {
-    safe: true,
-    multi: options.multi
-  };
-  var mongoOptsForInsert = {
-    safe: true,
-    upsert: true
-  };
-
-  var replacementWithId = Object.assign(
-    replaceTypes({_id: insertedId}, replaceMeteorAtomWithMongo),
-    mod);
-
-  var tries = NUM_OPTIMISTIC_TRIES;
-
-  var doUpdate = async function () {
-    tries--;
-    if (! tries) {
-      throw new Error("Upsert failed after " + NUM_OPTIMISTIC_TRIES + " tries.");
-    } else {
-      let method = collection.updateMany;
-      if(!Object.keys(mod).some(key => key.startsWith("$"))){
-        method = collection.replaceOne.bind(collection);
-      }
-      return method(
-        selector,
-        mod,
-        mongoOptsForUpdate).then(result => {
-        if (result && (result.modifiedCount || result.upsertedCount)) {
-          return {
-            numberAffected: result.modifiedCount || result.upsertedCount,
-            insertedId: result.upsertedId || undefined,
-          };
-        } else {
-          return doConditionalInsert();
-        }
-      });
-    }
-  };
-
-  var doConditionalInsert = function() {
-    return collection.replaceOne(selector, replacementWithId, mongoOptsForInsert)
-        .then(result => ({
-            numberAffected: result.upsertedCount,
-            insertedId: result.upsertedId,
-          })).catch(err => {
-        if (MongoConnection._isCannotChangeIdError(err)) {
-          return doUpdate();
-        } else {
-          throw err;
-        }
-      });
-
-  };
-  return doUpdate();
-};
-
-
-// XXX MongoConnection.upsertAsync() does not return the id of the inserted document
-// unless you set it explicitly in the selector or modifier (as a replacement
-// doc).
-MongoConnection.prototype.upsertAsync = async function (collectionName, selector, mod, options) {
-  var self = this;
-
-
-
-  if (typeof options === "function" && ! callback) {
-    callback = options;
-    options = {};
-  }
-
-  return self.updateAsync(collectionName, selector, mod,
-                     Object.assign({}, options, {
-                       upsert: true,
-                       _returnObject: true
-                     }));
-};
-
-MongoConnection.prototype.find = function (collectionName, selector, options) {
-  var self = this;
-
-  if (arguments.length === 1)
-    selector = {};
-
-  return new Cursor(
-    self, new CursorDescription(collectionName, selector, options));
-};
-
-MongoConnection.prototype.findOneAsync = async function (collection_name, selector, options) {
-  var self = this;
-  if (arguments.length === 1) {
-    selector = {};
-  }
-
-  options = options || {};
-  options.limit = 1;
-
-  const results = await self.find(collection_name, selector, options).fetch();
-
-  return results[0];
-};
-
-// We'll actually design an index API later. For now, we just pass through to
-// Mongo's, but make it synchronous.
-MongoConnection.prototype.createIndexAsync = async function (collectionName, index,
-                                                   options) {
-  var self = this;
-
-  // We expect this function to be called at startup, not from within a method,
-  // so we don't interact with the write fence.
-  var collection = self.rawCollection(collectionName);
-  await collection.createIndex(index, options);
-};
-
-// just to be consistent with the other methods
-MongoConnection.prototype.createIndex =
-  MongoConnection.prototype.createIndexAsync;
-
-MongoConnection.prototype.countDocuments = function (collectionName, ...args) {
-  args = args.map(arg => replaceTypes(arg, replaceMeteorAtomWithMongo));
-  const collection = this.rawCollection(collectionName);
-  return collection.countDocuments(...args);
-};
-
-MongoConnection.prototype.estimatedDocumentCount = function (collectionName, ...args) {
-  args = args.map(arg => replaceTypes(arg, replaceMeteorAtomWithMongo));
-  const collection = this.rawCollection(collectionName);
-  return collection.estimatedDocumentCount(...args);
-};
-
-MongoConnection.prototype.ensureIndexAsync = MongoConnection.prototype.createIndexAsync;
-
-MongoConnection.prototype.dropIndexAsync = async function (collectionName, index) {
-  var self = this;
-
-
-  // This function is only used by test code, not within a method, so we don't
-  // interact with the write fence.
-  var collection = self.rawCollection(collectionName);
-  var indexName =  await collection.dropIndex(index);
-};
-
-
-CLIENT_ONLY_METHODS.forEach(function (m) {
-  MongoConnection.prototype[m] = function () {
-    throw new Error(
-      `${m} +  is not available on the server. Please use ${getAsyncMethodName(
-        m
-      )}() instead.`
-    );
-  };
-});
-
-// CURSORS
-
-// There are several classes which relate to cursors:
-//
-// CursorDescription represents the arguments used to construct a cursor:
-// collectionName, selector, and (find) options.  Because it is used as a key
-// for cursor de-dup, everything in it should either be JSON-stringifiable or
-// not affect observeChanges output (eg, options.transform functions are not
-// stringifiable but do not affect observeChanges).
-//
-// SynchronousCursor is a wrapper around a MongoDB cursor
-// which includes fully-synchronous versions of forEach, etc.
-//
-// Cursor is the cursor object returned from find(), which implements the
-// documented Mongo.Collection cursor API.  It wraps a CursorDescription and a
-// SynchronousCursor (lazily: it doesn't contact Mongo until you call a method
-// like fetch or forEach on it).
-//
-// ObserveHandle is the "observe handle" returned from observeChanges. It has a
-// reference to an ObserveMultiplexer.
-//
-// ObserveMultiplexer allows multiple identical ObserveHandles to be driven by a
-// single observe driver.
-//
-// There are two "observe drivers" which drive ObserveMultiplexers:
-//   - PollingObserveDriver caches the results of a query and reruns it when
-//     necessary.
-//   - OplogObserveDriver follows the Mongo operation log to directly observe
-//     database changes.
-// Both implementations follow the same simple interface: when you create them,
-// they start sending observeChanges callbacks (and a ready() invocation) to
-// their ObserveMultiplexer, and you stop them by calling their stop() method.
-
-CursorDescription = function (collectionName, selector, options) {
-  var self = this;
-  self.collectionName = collectionName;
-  self.selector = Mongo.Collection._rewriteSelector(selector);
-  self.options = options || {};
-};
-
-Cursor = function (mongo, cursorDescription) {
-  var self = this;
-
-  self._mongo = mongo;
-  self._cursorDescription = cursorDescription;
-  self._synchronousCursor = null;
-};
-
-function setupSynchronousCursor(cursor, method) {
-  // You can only observe a tailable cursor.
-  if (cursor._cursorDescription.options.tailable)
-    throw new Error('Cannot call ' + method + ' on a tailable cursor');
-
-  if (!cursor._synchronousCursor) {
-    cursor._synchronousCursor = cursor._mongo._createSynchronousCursor(
-      cursor._cursorDescription,
-      {
-        // Make sure that the "cursor" argument to forEach/map callbacks is the
-        // Cursor, not the SynchronousCursor.
-        selfForIteration: cursor,
-        useTransform: true,
-      }
-    );
-  }
-
-  return cursor._synchronousCursor;
-}
-
-
-Cursor.prototype.countAsync = async function () {
-  const collection = this._mongo.rawCollection(this._cursorDescription.collectionName);
-  return await collection.countDocuments(
-    replaceTypes(this._cursorDescription.selector, replaceMeteorAtomWithMongo),
-    replaceTypes(this._cursorDescription.options, replaceMeteorAtomWithMongo),
-  );
-};
-
-Cursor.prototype.count = function () {
-  throw new Error(
-    "count() is not available on the server. Please use countAsync() instead."
-  );
-};
-
-[...ASYNC_CURSOR_METHODS, Symbol.iterator, Symbol.asyncIterator].forEach(methodName => {
-  // count is handled specially since we don't want to create a cursor.
-  // it is still included in ASYNC_CURSOR_METHODS because we still want an async version of it to exist.
-  if (methodName === 'count') {
-    return
-  }
-  Cursor.prototype[methodName] = function (...args) {
-    const cursor = setupSynchronousCursor(this, methodName);
-    return cursor[methodName](...args);
-  };
-
-  // These methods are handled separately.
-  if (methodName === Symbol.iterator || methodName === Symbol.asyncIterator) {
-    return;
-  }
-
-  const methodNameAsync = getAsyncMethodName(methodName);
-  Cursor.prototype[methodNameAsync] = function (...args) {
-    try {
-      return Promise.resolve(this[methodName](...args));
-    } catch (error) {
-      return Promise.reject(error);
-    }
-  };
-});
-
-Cursor.prototype.getTransform = function () {
-  return this._cursorDescription.options.transform;
-};
-
-// When you call Meteor.publish() with a function that returns a Cursor, we need
-// to transmute it into the equivalent subscription.  This is the function that
-// does that.
-Cursor.prototype._publishCursor = function (sub) {
-  var self = this;
-  var collection = self._cursorDescription.collectionName;
-  return Mongo.Collection._publishCursor(self, sub, collection);
-};
-
-// Used to guarantee that publish functions return at most one cursor per
-// collection. Private, because we might later have cursors that include
-// documents from multiple collections somehow.
-Cursor.prototype._getCollectionName = function () {
-  var self = this;
-  return self._cursorDescription.collectionName;
-};
-
-Cursor.prototype.observe = function (callbacks) {
-  var self = this;
-  return LocalCollection._observeFromObserveChanges(self, callbacks);
-};
-
-Cursor.prototype.observeAsync = function (callbacks) {
-  return new Promise(resolve => resolve(this.observe(callbacks)));
-};
-
-Cursor.prototype.observeChanges = function (callbacks, options = {}) {
-  var self = this;
-
-  var ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
-
-  return self._mongo._observeChanges(
-    self._cursorDescription, ordered, callbacks, options.nonMutatingCallbacks);
-};
-
-Cursor.prototype.observeChangesAsync = async function (callbacks, options = {}) {
-  return this.observeChanges(callbacks, options);
-};
-
-MongoConnection.prototype._createSynchronousCursor = function(
-    cursorDescription, options = {}) {
-  var self = this;
-  const { selfForIteration, useTransform } = options; 
-  options = { selfForIteration, useTransform };
-
-  var collection = self.rawCollection(cursorDescription.collectionName);
-  var cursorOptions = cursorDescription.options;
-  var mongoOptions = {
-    sort: cursorOptions.sort,
-    limit: cursorOptions.limit,
-    skip: cursorOptions.skip,
-    projection: cursorOptions.fields || cursorOptions.projection,
-    readPreference: cursorOptions.readPreference,
-  };
-
-  // Do we want a tailable cursor (which only works on capped collections)?
-  if (cursorOptions.tailable) {
-    mongoOptions.numberOfRetries = -1;
-  }
-
-  var dbCursor = collection.find(
-    replaceTypes(cursorDescription.selector, replaceMeteorAtomWithMongo),
-    mongoOptions);
-
-  // Do we want a tailable cursor (which only works on capped collections)?
-  if (cursorOptions.tailable) {
-    // We want a tailable cursor...
-    dbCursor.addCursorFlag("tailable", true)
-    // ... and for the server to wait a bit if any getMore has no data (rather
-    // than making us put the relevant sleeps in the client)...
-    dbCursor.addCursorFlag("awaitData", true)
-
-    // And if this is on the oplog collection and the cursor specifies a 'ts',
-    // then set the undocumented oplog replay flag, which does a special scan to
-    // find the first document (instead of creating an index on ts). This is a
-    // very hard-coded Mongo flag which only works on the oplog collection and
-    // only works with the ts field.
-    if (cursorDescription.collectionName === OPLOG_COLLECTION &&
-        cursorDescription.selector.ts) {
-      dbCursor.addCursorFlag("oplogReplay", true)
-    }
-  }
-
-  if (typeof cursorOptions.maxTimeMs !== 'undefined') {
-    dbCursor = dbCursor.maxTimeMS(cursorOptions.maxTimeMs);
-  }
-  if (typeof cursorOptions.hint !== 'undefined') {
-    dbCursor = dbCursor.hint(cursorOptions.hint);
-  }
-
-  return new AsynchronousCursor(dbCursor, cursorDescription, options, collection);
-};
-
-/**
- * This is just a light wrapper for the cursor. The goal here is to ensure compatibility even if
- * there are breaking changes on the MongoDB driver.
- *
- * @constructor
- */
-class AsynchronousCursor {
-  constructor(dbCursor, cursorDescription, options) {
-    this._dbCursor = dbCursor;
-    this._cursorDescription = cursorDescription;
-
-    this._selfForIteration = options.selfForIteration || this;
-    if (options.useTransform && cursorDescription.options.transform) {
-      this._transform = LocalCollection.wrapTransform(
-          cursorDescription.options.transform);
-    } else {
-      this._transform = null;
-    }
-
-    this._visitedIds = new LocalCollection._IdMap;
-  }
-
-  [Symbol.asyncIterator]() {
-    var cursor = this;
-    return {
-      async next() {
-        const value = await cursor._nextObjectPromise();
-        return { done: !value, value };
-      },
-    };
-  }
-
-  // Returns a Promise for the next object from the underlying cursor (before
-  // the Mongo->Meteor type replacement).
-  async _rawNextObjectPromise() {
-    try {
-      return this._dbCursor.next();
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  // Returns a Promise for the next object from the cursor, skipping those whose
-  // IDs we've already seen and replacing Mongo atoms with Meteor atoms.
-  async _nextObjectPromise () {
-    while (true) {
-      var doc = await this._rawNextObjectPromise();
-
-      if (!doc) return null;
-      doc = replaceTypes(doc, replaceMongoAtomWithMeteor);
-
-      if (!this._cursorDescription.options.tailable && _.has(doc, '_id')) {
-        // Did Mongo give us duplicate documents in the same cursor? If so,
-        // ignore this one. (Do this before the transform, since transform might
-        // return some unrelated value.) We don't do this for tailable cursors,
-        // because we want to maintain O(1) memory usage. And if there isn't _id
-        // for some reason (maybe it's the oplog), then we don't do this either.
-        // (Be careful to do this for falsey but existing _id, though.)
-        if (this._visitedIds.has(doc._id)) continue;
-        this._visitedIds.set(doc._id, true);
-      }
-
-      if (this._transform)
-        doc = this._transform(doc);
-
-      return doc;
-    }
-  }
-
-  // Returns a promise which is resolved with the next object (like with
-  // _nextObjectPromise) or rejected if the cursor doesn't return within
-  // timeoutMS ms.
-  _nextObjectPromiseWithTimeout(timeoutMS) {
-    if (!timeoutMS) {
-      return this._nextObjectPromise();
-    }
-    const nextObjectPromise = this._nextObjectPromise();
-    const timeoutErr = new Error('Client-side timeout waiting for next object');
-    const timeoutPromise = new Promise((resolve, reject) => {
-      setTimeout(() => {
-        reject(timeoutErr);
-      }, timeoutMS);
-    });
-    return Promise.race([nextObjectPromise, timeoutPromise])
-        .catch((err) => {
-          if (err === timeoutErr) {
-            this.close();
-          }
-          throw err;
-        });
-  }
-
-  async forEach(callback, thisArg) {
-    // Get back to the beginning.
-    this._rewind();
-
-    let idx = 0;
-    while (true) {
-      const doc = await this._nextObjectPromise();
-      if (!doc) return;
-      await callback.call(thisArg, doc, idx++, this._selfForIteration);
-    }
-  }
-
-  async map(callback, thisArg) {
-    const results = [];
-    await this.forEach(async (doc, index) => {
-      results.push(await callback.call(thisArg, doc, index, this._selfForIteration));
-    });
-
-    return results;
-  }
-
-  _rewind() {
-    // known to be synchronous
-    this._dbCursor.rewind();
-
-    this._visitedIds = new LocalCollection._IdMap;
-  }
-
-  // Mostly usable for tailable cursors.
-  close() {
-    this._dbCursor.close();
-  }
-
-  fetch() {
-    return this.map(_.identity);
-  }
-
-  /**
-   * FIXME: (node:34680) [MONGODB DRIVER] Warning: cursor.count is deprecated and will be
-   *  removed in the next major version, please use `collection.estimatedDocumentCount` or
-   *  `collection.countDocuments` instead.
-   */
-  count() {
-    return this._dbCursor.count();
-  }
-
-  // This method is NOT wrapped in Cursor.
-  async getRawObjects(ordered) {
-    var self = this;
-    if (ordered) {
-      return self.fetch();
-    } else {
-      var results = new LocalCollection._IdMap;
-      await self.forEach(function (doc) {
-        results.set(doc._id, doc);
-      });
-      return results;
-    }
-  }
-}
-
-var SynchronousCursor = function (dbCursor, cursorDescription, options, collection) {
-  var self = this;
-  const { selfForIteration, useTransform } = options; 
-  options = { selfForIteration, useTransform };
-
-  self._dbCursor = dbCursor;
-  self._cursorDescription = cursorDescription;
-  // The "self" argument passed to forEach/map callbacks. If we're wrapped
-  // inside a user-visible Cursor, we want to provide the outer cursor!
-  self._selfForIteration = options.selfForIteration || self;
-  if (options.useTransform && cursorDescription.options.transform) {
-    self._transform = LocalCollection.wrapTransform(
-      cursorDescription.options.transform);
-  } else {
-    self._transform = null;
-  }
-
-  self._synchronousCount = Future.wrap(
-    collection.countDocuments.bind(
-      collection,
-      replaceTypes(cursorDescription.selector, replaceMeteorAtomWithMongo),
-      replaceTypes(cursorDescription.options, replaceMeteorAtomWithMongo),
-    )
-  );
-  self._visitedIds = new LocalCollection._IdMap;
-};
-
-Object.assign(SynchronousCursor.prototype, {
-  // Returns a Promise for the next object from the underlying cursor (before
-  // the Mongo->Meteor type replacement).
-  _rawNextObjectPromise: function () {
-    const self = this;
-    return new Promise((resolve, reject) => {
-      self._dbCursor.next((err, doc) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(doc);
-        }
-      });
-    });
-  },
-
-  // Returns a Promise for the next object from the cursor, skipping those whose
-  // IDs we've already seen and replacing Mongo atoms with Meteor atoms.
-  _nextObjectPromise: async function () {
-    var self = this;
-
-    while (true) {
-      var doc = await self._rawNextObjectPromise();
-
-      if (!doc) return null;
-      doc = replaceTypes(doc, replaceMongoAtomWithMeteor);
-
-      if (!self._cursorDescription.options.tailable && has(doc, '_id')) {
-        // Did Mongo give us duplicate documents in the same cursor? If so,
-        // ignore this one. (Do this before the transform, since transform might
-        // return some unrelated value.) We don't do this for tailable cursors,
-        // because we want to maintain O(1) memory usage. And if there isn't _id
-        // for some reason (maybe it's the oplog), then we don't do this either.
-        // (Be careful to do this for falsey but existing _id, though.)
-        if (self._visitedIds.has(doc._id)) continue;
-        self._visitedIds.set(doc._id, true);
-      }
-
-      if (self._transform)
-        doc = self._transform(doc);
-
-      return doc;
-    }
-  },
-
-  // Returns a promise which is resolved with the next object (like with
-  // _nextObjectPromise) or rejected if the cursor doesn't return within
-  // timeoutMS ms.
-  _nextObjectPromiseWithTimeout: function (timeoutMS) {
-    const self = this;
-    if (!timeoutMS) {
-      return self._nextObjectPromise();
-    }
-    const nextObjectPromise = self._nextObjectPromise();
-    const timeoutErr = new Error('Client-side timeout waiting for next object');
-    const timeoutPromise = new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        reject(timeoutErr);
-      }, timeoutMS);
-    });
-    return Promise.race([nextObjectPromise, timeoutPromise])
-      .catch((err) => {
-        if (err === timeoutErr) {
-          self.close();
-        }
-        throw err;
-      });
-  },
-
-  _nextObject: function () {
-    var self = this;
-    return self._nextObjectPromise().await();
-  },
-
-  forEach: function (callback, thisArg) {
-    var self = this;
-    const wrappedFn = Meteor.wrapFn(callback);
-
-    // Get back to the beginning.
-    self._rewind();
-
-    // We implement the loop ourself instead of using self._dbCursor.each,
-    // because "each" will call its callback outside of a fiber which makes it
-    // much more complex to make this function synchronous.
-    var index = 0;
-    while (true) {
-      var doc = self._nextObject();
-      if (!doc) return;
-      wrappedFn.call(thisArg, doc, index++, self._selfForIteration);
-    }
-  },
-
-  // XXX Allow overlapping callback executions if callback yields.
-  map: function (callback, thisArg) {
-    var self = this;
-    const wrappedFn = Meteor.wrapFn(callback);
-    var res = [];
-    self.forEach(function (doc, index) {
-      res.push(wrappedFn.call(thisArg, doc, index, self._selfForIteration));
-    });
-    return res;
-  },
-
-  _rewind: function () {
-    var self = this;
-
-    // known to be synchronous
-    self._dbCursor.rewind();
-
-    self._visitedIds = new LocalCollection._IdMap;
-  },
-
-  // Mostly usable for tailable cursors.
-  close: function () {
-    var self = this;
-
-    self._dbCursor.close();
-  },
-
-  fetch: function () {
-    var self = this;
-    return self.map(identity);
-  },
-
-  count: function () {
-    var self = this;
-    return self._synchronousCount().wait();
-  },
-
-  // This method is NOT wrapped in Cursor.
-  getRawObjects: function (ordered) {
-    var self = this;
-    if (ordered) {
-      return self.fetch();
-    } else {
-      var results = new LocalCollection._IdMap;
-      self.forEach(function (doc) {
-        results.set(doc._id, doc);
-      });
-      return results;
-    }
-  }
-});
-
-SynchronousCursor.prototype[Symbol.iterator] = function () {
-  var self = this;
-
-  // Get back to the beginning.
-  self._rewind();
-
-  return {
-    next() {
-      const doc = self._nextObject();
-      return doc ? {
-        value: doc
-      } : {
-        done: true
-      };
-    }
-  };
-};
-
-SynchronousCursor.prototype[Symbol.asyncIterator] = function () {
-  const syncResult = this[Symbol.iterator]();
-  return {
-    async next() {
-      return Promise.resolve(syncResult.next());
-    }
-  };
-}
-
-// Tails the cursor described by cursorDescription, most likely on the
-// oplog. Calls docCallback with each document found. Ignores errors and just
-// restarts the tail on error.
-//
-// If timeoutMS is set, then if we don't get a new document every timeoutMS,
-// kill and restart the cursor. This is primarily a workaround for #8598.
-MongoConnection.prototype.tail = function (cursorDescription, docCallback, timeoutMS) {
-  var self = this;
-  if (!cursorDescription.options.tailable)
-    throw new Error("Can only tail a tailable cursor");
-
-  var cursor = self._createSynchronousCursor(cursorDescription);
-
-  var stopped = false;
-  var lastTS;
-
-  Meteor.defer(async function loop() {
-    var doc = null;
-    while (true) {
-      if (stopped)
-        return;
-      try {
-        doc = await cursor._nextObjectPromiseWithTimeout(timeoutMS);
-      } catch (err) {
-        // There's no good way to figure out if this was actually an error from
-        // Mongo, or just client-side (including our own timeout error). Ah
-        // well. But either way, we need to retry the cursor (unless the failure
-        // was because the observe got stopped).
-        doc = null;
-      }
-      // Since we awaited a promise above, we need to check again to see if
-      // we've been stopped before calling the callback.
-      if (stopped)
-        return;
-      if (doc) {
-        // If a tailable cursor contains a "ts" field, use it to recreate the
-        // cursor on error. ("ts" is a standard that Mongo uses internally for
-        // the oplog, and there's a special flag that lets you do binary search
-        // on it instead of needing to use an index.)
-        lastTS = doc.ts;
-        docCallback(doc);
-      } else {
-        var newSelector = Object.assign({}, cursorDescription.selector);
-        if (lastTS) {
-          newSelector.ts = {$gt: lastTS};
-        }
-        cursor = self._createSynchronousCursor(new CursorDescription(
-          cursorDescription.collectionName,
-          newSelector,
-          cursorDescription.options));
-        // Mongo failover takes many seconds.  Retry in a bit.  (Without this
-        // setTimeout, we peg the CPU at 100% and never notice the actual
-        // failover.
-        setTimeout(loop, 100);
-        break;
-      }
-    }
-  });
-
-  return {
-    stop: function () {
-      stopped = true;
-      cursor.close();
-    }
-  };
-};
-
-const oplogCollectionWarnings = [];
-
-Object.assign(MongoConnection.prototype, {
-  _observeChanges: async function (
-      cursorDescription, ordered, callbacks, nonMutatingCallbacks) {
-    var self = this;
-    const collectionName = cursorDescription.collectionName;
-
-    if (cursorDescription.options.tailable) {
-      return self._observeChangesTailable(cursorDescription, ordered, callbacks);
-    }
-
-    // You may not filter out _id when observing changes, because the id is a core
-    // part of the observeChanges API.
-    const fieldsOptions = cursorDescription.options.projection || cursorDescription.options.fields;
-    if (fieldsOptions &&
-        (fieldsOptions._id === 0 ||
-            fieldsOptions._id === false)) {
-      throw Error("You may not observe a cursor with {fields: {_id: 0}}");
-    }
-
-  var observeKey = EJSON.stringify(
-    Object.assign({ordered: ordered}, cursorDescription));
-
-    var multiplexer, observeDriver;
-    var firstHandle = false;
-
-    // Find a matching ObserveMultiplexer, or create a new one. This next block is
-    // guaranteed to not yield (and it doesn't call anything that can observe a
-    // new query), so no other calls to this function can interleave with it.
-    if (has(self._observeMultiplexers, observeKey)) {
-      multiplexer = self._observeMultiplexers[observeKey];
-    } else {
-      firstHandle = true;
-      // Create a new ObserveMultiplexer.
-      multiplexer = new ObserveMultiplexer({
-        ordered: ordered,
-        onStop: function () {
-          delete self._observeMultiplexers[observeKey];
-          return observeDriver.stop();
-        }
-      });
-    }
-
-    var observeHandle = new ObserveHandle(multiplexer,
-        callbacks,
-        nonMutatingCallbacks,
-    );
-
-    const oplogOptions = self?._oplogHandle?._oplogOptions || {};
-  const { includeCollections, excludeCollections } = oplogOptions;
-  if (firstHandle) {
-      var matcher, sorter;
-    var canUseOplog = [
-        function () {
-          // At a bare minimum, using the oplog requires us to have an oplog, to
-          // want unordered callbacks, and to not want a callback on the polls
-          // that won't happen.
-          return self._oplogHandle && !ordered &&
-            !callbacks._testOnlyPollCallback;
-  },
-      function () {
-        // We also need to check, if the collection of this Cursor is actually being "watched" by the Oplog handle
-        // if not, we have to fallback to long polling
-        if (excludeCollections?.length && excludeCollections.includes(collectionName)) {
-          if (!oplogCollectionWarnings.includes(collectionName)) {
-            console.warn(`Meteor.settings.packages.mongo.oplogExcludeCollections includes the collection ${collectionName} - your subscriptions will only use long polling!`);
-            oplogCollectionWarnings.push(collectionName); // we only want to show the warnings once per collection!
-          }
-          return false;
-        }
-        if (includeCollections?.length && !includeCollections.includes(collectionName)) {
-          if (!oplogCollectionWarnings.includes(collectionName)) {
-            console.warn(`Meteor.settings.packages.mongo.oplogIncludeCollections does not include the collection ${collectionName} - your subscriptions will only use long polling!`);
-            oplogCollectionWarnings.push(collectionName); // we only want to show the warnings once per collection!
-          }
-          return false;
-        }
-        return true;
-      },
-      function () {
-        // We need to be able to compile the selector. Fall back to polling for
-        // some newfangled $selector that minimongo doesn't support yet.
-        try {
-          matcher = new Minimongo.Matcher(cursorDescription.selector);
-          return true;
-        } catch (e) {
-          // XXX make all compilation errors MinimongoError or something
-          //     so that this doesn't ignore unrelated exceptions
-          return false;
-        }
-      },
-      function () {
-        // ... and the selector itself needs to support oplog.
-        return OplogObserveDriver.cursorSupported(cursorDescription, matcher);
-      },
-      function () {
-        // And we need to be able to compile the sort, if any.  eg, can't be
-        // {$natural: 1}.
-        if (!cursorDescription.options.sort)
-          return true;
-        try {
-          sorter = new Minimongo.Sorter(cursorDescription.options.sort);
-          return true;
-        } catch (e) {
-          // XXX make all compilation errors MinimongoError or something
-          //     so that this doesn't ignore unrelated exceptions
-          return false;
-        }
-      }
-    ].every(f => f());  // invoke each function and check if all return true
-
-    var driverClass = canUseOplog ? OplogObserveDriver : PollingObserveDriver;
-    observeDriver = new driverClass({
-      cursorDescription: cursorDescription,
-      mongoHandle: self,
-      multiplexer: multiplexer,
-      ordered: ordered,
-      matcher: matcher,  // ignored by polling
-      sorter: sorter,  // ignored by polling
-      _testOnlyPollCallback: callbacks._testOnlyPollCallback
-});
-
-    if (observeDriver._init) {
-      await observeDriver._init();
-    }
-
-    // This field is only set for use in tests.
-    multiplexer._observeDriver = observeDriver;
-  }
-  self._observeMultiplexers[observeKey] = multiplexer;
-  // Blocks until the initial adds have been sent.
-  await multiplexer.addHandleAndSendInitialAdds(observeHandle);
-
-  return observeHandle;
-},
-
-});
-
-
 // Listen for the invalidation messages that will trigger us to poll the
 // database for changes. If this selector specifies specific IDs, specify them
 // here, so that updates to different specific IDs don't cause us to poll.
 // listenCallback is the same kind of (notification, complete) callback passed
 // to InvalidationCrossbar.listen.
 
-listenAll = async function (cursorDescription, listenCallback) {
+export const listenAll = async function (cursorDescription, listenCallback) {
   const listeners = [];
   await forEachTrigger(cursorDescription, function (trigger) {
     listeners.push(DDPServer._InvalidationCrossbar.listen(
@@ -1610,7 +72,7 @@ listenAll = async function (cursorDescription, listenCallback) {
   };
 };
 
-forEachTrigger = async function (cursorDescription, triggerCallback) {
+export const forEachTrigger = async function (cursorDescription, triggerCallback) {
   const key = {collection: cursorDescription.collectionName};
   const specificIds = LocalCollection._idsMatchedBySelector(
     cursorDescription.selector);
@@ -1626,63 +88,9 @@ forEachTrigger = async function (cursorDescription, triggerCallback) {
   await triggerCallback({ dropDatabase: true });
 };
 
-// observeChanges for tailable cursors on capped collections.
-//
-// Some differences from normal cursors:
-//   - Will never produce anything other than 'added' or 'addedBefore'. If you
-//     do update a document that has already been produced, this will not notice
-//     it.
-//   - If you disconnect and reconnect from Mongo, it will essentially restart
-//     the query, which will lead to duplicate results. This is pretty bad,
-//     but if you include a field called 'ts' which is inserted as
-//     new MongoInternals.MongoTimestamp(0, 0) (which is initialized to the
-//     current Mongo-style timestamp), we'll be able to find the place to
-//     restart properly. (This field is specifically understood by Mongo with an
-//     optimization which allows it to find the right place to start without
-//     an index on ts. It's how the oplog works.)
-//   - No callbacks are triggered synchronously with the call (there's no
-//     differentiation between "initial data" and "later changes"; everything
-//     that matches the query gets sent asynchronously).
-//   - De-duplication is not implemented.
-//   - Does not yet interact with the write fence. Probably, this should work by
-//     ignoring removes (which don't work on capped collections) and updates
-//     (which don't affect tailable cursors), and just keeping track of the ID
-//     of the inserted object, and closing the write fence once you get to that
-//     ID (or timestamp?).  This doesn't work well if the document doesn't match
-//     the query, though.  On the other hand, the write fence can close
-//     immediately if it does not match the query. So if we trust minimongo
-//     enough to accurately evaluate the query against the write fence, we
-//     should be able to do this...  Of course, minimongo doesn't even support
-//     Mongo Timestamps yet.
-MongoConnection.prototype._observeChangesTailable = function (
-    cursorDescription, ordered, callbacks) {
-  var self = this;
 
-  // Tailable cursors only ever call added/addedBefore callbacks, so it's an
-  // error if you didn't provide them.
-  if ((ordered && !callbacks.addedBefore) ||
-      (!ordered && !callbacks.added)) {
-    throw new Error("Can't observe an " + (ordered ? "ordered" : "unordered")
-                    + " tailable cursor without a "
-                    + (ordered ? "addedBefore" : "added") + " callback");
-  }
-
-  return self.tail(cursorDescription, function (doc) {
-    var id = doc._id;
-    delete doc._id;
-    // The ts is an implementation detail. Hide it.
-    delete doc.ts;
-    if (ordered) {
-      callbacks.addedBefore(id, doc, null);
-    } else {
-      callbacks.added(id, doc);
-    }
-  });
-};
 
 // XXX We probably need to find a better way to expose this. Right now
 // it's only used by tests, but in fact you need it in normal
 // operation to interact with capped collections.
 MongoInternals.MongoTimestamp = MongoDB.Timestamp;
-
-MongoInternals.Connection = MongoConnection;
\ No newline at end of file
diff --git a/packages/mongo/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js
index 3e13047ba3..0edd862ebf 100644
--- a/packages/mongo/oplog_observe_driver.js
+++ b/packages/mongo/oplog_observe_driver.js
@@ -2,6 +2,11 @@ import has from 'lodash.has';
 import isEmpty from 'lodash.isempty';
 import { oplogV2V1Converter } from "./oplog_v2_converter";
 import { check, Match } from 'meteor/check';
+import { CursorDescription } from './cursor_description';
+import { forEachTrigger, listenAll } from './mongo_driver';
+import { Cursor } from './cursor';
+import LocalCollection from 'meteor/minimongo/local_collection';
+import { idForOp } from './oplog_tailing';
 
 var PHASE = {
   QUERYING: "QUERYING",
@@ -30,7 +35,7 @@ var currentId = 0;
 // same simple interface: constructing it starts sending observeChanges
 // callbacks (and a ready() invocation) to the ObserveMultiplexer, and you stop
 // it by calling the stop() method.
-OplogObserveDriver = function (options) {
+export const OplogObserveDriver = function (options) {
   const self = this;
   self._usesOplog = true;  // tests look at this
 
@@ -113,9 +118,6 @@ OplogObserveDriver = function (options) {
 
   self._requeryWhenDoneThisQuery = false;
   self._writesToCommitWhenWeReachSteady = [];
-
-
-
  };
 
 _.extend(OplogObserveDriver.prototype, {
@@ -1051,6 +1053,4 @@ var modifierCanBeDirectlyApplied = function (modifier) {
       return !/EJSON\$/.test(field);
     });
   });
-};
-
-MongoInternals.OplogObserveDriver = OplogObserveDriver;
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/packages/mongo/oplog_tailing.js b/packages/mongo/oplog_tailing.js
deleted file mode 100644
index 3e29bdd322..0000000000
--- a/packages/mongo/oplog_tailing.js
+++ /dev/null
@@ -1,432 +0,0 @@
-import isEmpty from 'lodash.isempty';
-import has from 'lodash.has';
-
-import { NpmModuleMongodb } from "meteor/npm-mongo";
-const { Long } = NpmModuleMongodb;
-
-OPLOG_COLLECTION = 'oplog.rs';
-
-var TOO_FAR_BEHIND = process.env.METEOR_OPLOG_TOO_FAR_BEHIND || 2000;
-var TAIL_TIMEOUT = +process.env.METEOR_OPLOG_TAIL_TIMEOUT || 30000;
-
-idForOp = function (op) {
-  if (op.op === 'd')
-    return op.o._id;
-  else if (op.op === 'i')
-    return op.o._id;
-  else if (op.op === 'u')
-    return op.o2._id;
-  else if (op.op === 'c')
-    throw Error("Operator 'c' doesn't supply an object with id: " +
-                EJSON.stringify(op));
-  else
-    throw Error("Unknown op: " + EJSON.stringify(op));
-};
-
-OplogHandle = function (oplogUrl, dbName) {
-  var self = this;
-  self._oplogUrl = oplogUrl;
-  self._dbName = dbName;
-
-  self._oplogLastEntryConnection = null;
-  self._oplogTailConnection = null;
-  self._oplogOptions = null;
-  self._stopped = false;
-  self._tailHandle = null;
-  self._readyPromiseResolver = null;
-  self._readyPromise = new Promise(r => self._readyPromiseResolver = r);
-  self._crossbar = new DDPServer._Crossbar({
-    factPackage: "mongo-livedata", factName: "oplog-watchers"
-  });
-  self._baseOplogSelector = {
-    ns: new RegExp("^(?:" + [
-      Meteor._escapeRegExp(self._dbName + "."),
-      Meteor._escapeRegExp("admin.$cmd"),
-    ].join("|") + ")"),
-
-    $or: [
-      { op: { $in: ['i', 'u', 'd'] } },
-      // drop collection
-      { op: 'c', 'o.drop': { $exists: true } },
-      { op: 'c', 'o.dropDatabase': 1 },
-      { op: 'c', 'o.applyOps': { $exists: true } },
-    ]
-  };
-
-  // Data structures to support waitUntilCaughtUp(). Each oplog entry has a
-  // MongoTimestamp object on it (which is not the same as a Date --- it's a
-  // combination of time and an incrementing counter; see
-  // http://docs.mongodb.org/manual/reference/bson-types/#timestamps).
-  //
-  // _catchingUpFutures is an array of {ts: MongoTimestamp, future: Future}
-  // objects, sorted by ascending timestamp. _lastProcessedTS is the
-  // MongoTimestamp of the last oplog entry we've processed.
-  //
-  // Each time we call waitUntilCaughtUp, we take a peek at the final oplog
-  // entry in the db.  If we've already processed it (ie, it is not greater than
-  // _lastProcessedTS), waitUntilCaughtUp immediately returns. Otherwise,
-  // waitUntilCaughtUp makes a new Future and inserts it along with the final
-  // timestamp entry that it read, into _catchingUpFutures. waitUntilCaughtUp
-  // then waits on that future, which is resolved once _lastProcessedTS is
-  // incremented to be past its timestamp by the worker fiber.
-  //
-  // XXX use a priority queue or something else that's faster than an array
-  self._catchingUpResolvers = [];
-  self._lastProcessedTS = null;
-
-  self._onSkippedEntriesHook = new Hook({
-    debugPrintExceptions: "onSkippedEntries callback"
-  });
-
-  self._entryQueue = new Meteor._DoubleEndedQueue();
-  self._workerActive = false;
-
-  self._startTrailingPromise = self._startTailing();
-  //TODO[fibers] Why wait?
-};
-
-MongoInternals.OplogHandle = OplogHandle;
-
-Object.assign(OplogHandle.prototype, {
-  stop: async function () {
-    var self = this;
-    if (self._stopped)
-      return;
-    self._stopped = true;
-    if (self._tailHandle)
-      await self._tailHandle.stop();
-    // XXX should close connections too
-  },
-  _onOplogEntry: async function(trigger, callback) {
-    var self = this;
-    if (self._stopped)
-      throw new Error("Called onOplogEntry on stopped handle!");
-
-    // Calling onOplogEntry requires us to wait for the tailing to be ready.
-    await self._readyPromise;
-
-    var listenHandle = self._crossbar.listen(trigger, callback);
-    return {
-      stop: async function () {
-        await listenHandle.stop();
-      }
-    };
-  },
-  onOplogEntry: function (trigger, callback) {
-    return this._onOplogEntry(trigger, callback);
-  },
-  // Register a callback to be invoked any time we skip oplog entries (eg,
-  // because we are too far behind).
-  onSkippedEntries: function (callback) {
-    var self = this;
-    if (self._stopped)
-      throw new Error("Called onSkippedEntries on stopped handle!");
-    return self._onSkippedEntriesHook.register(callback);
-  },
-
-  async _waitUntilCaughtUp() {
-    var self = this;
-    if (self._stopped)
-      throw new Error("Called waitUntilCaughtUp on stopped handle!");
-
-    // Calling waitUntilCaughtUp requries us to wait for the oplog connection to
-    // be ready.
-    await self._readyPromise;
-    var lastEntry;
-
-    while (!self._stopped) {
-      // We need to make the selector at least as restrictive as the actual
-      // tailing selector (ie, we need to specify the DB name) or else we might
-      // find a TS that won't show up in the actual tail stream.
-      try {
-        lastEntry = await self._oplogLastEntryConnection.findOneAsync(
-          OPLOG_COLLECTION,
-          self._baseOplogSelector,
-          { projection: { ts: 1 }, sort: { $natural: -1 } }
-        );
-        break;
-      } catch (e) {
-        // During failover (eg) if we get an exception we should log and retry
-        // instead of crashing.
-        Meteor._debug("Got exception while reading last entry", e);
-        await Meteor._sleepForMs(100);
-      }
-    }
-
-    if (self._stopped)
-      return;
-
-    if (!lastEntry) {
-      // Really, nothing in the oplog? Well, we've processed everything.
-      return;
-    }
-
-    var ts = lastEntry.ts;
-    if (!ts)
-      throw Error("oplog entry without ts: " + EJSON.stringify(lastEntry));
-
-    if (self._lastProcessedTS && ts.lessThanOrEqual(self._lastProcessedTS)) {
-      // We've already caught up to here.
-      return;
-    }
-
-
-    // Insert the future into our list. Almost always, this will be at the end,
-    // but it's conceivable that if we fail over from one primary to another,
-    // the oplog entries we see will go backwards.
-    var insertAfter = self._catchingUpResolvers.length;
-    while (insertAfter - 1 > 0 && self._catchingUpResolvers[insertAfter - 1].ts.greaterThan(ts)) {
-      insertAfter--;
-    }
-    let promiseResolver = null;
-    const promiseToAwait = new Promise(r => promiseResolver = r);
-    self._catchingUpResolvers.splice(insertAfter, 0, {ts: ts, resolver: promiseResolver});
-    await promiseToAwait;
-  },
-
-  // Calls `callback` once the oplog has been processed up to a point that is
-  // roughly "now": specifically, once we've processed all ops that are
-  // currently visible.
-  // XXX become convinced that this is actually safe even if oplogConnection
-  // is some kind of pool
-  waitUntilCaughtUp: async function () {
-    return this._waitUntilCaughtUp();
-  },
-
-  _startTailing: async function () {
-    var self = this;
-    // First, make sure that we're talking to the local database.
-    var mongodbUri = Npm.require('mongodb-uri');
-    if (mongodbUri.parse(self._oplogUrl).database !== 'local') {
-      throw Error("$MONGO_OPLOG_URL must be set to the 'local' database of " +
-          "a Mongo replica set");
-    }
-
-    // We make two separate connections to Mongo. The Node Mongo driver
-    // implements a naive round-robin connection pool: each "connection" is a
-    // pool of several (5 by default) TCP connections, and each request is
-    // rotated through the pools. Tailable cursor queries block on the server
-    // until there is some data to return (or until a few seconds have
-    // passed). So if the connection pool used for tailing cursors is the same
-    // pool used for other queries, the other queries will be delayed by seconds
-    // 1/5 of the time.
-    //
-    // The tail connection will only ever be running a single tail command, so
-    // it only needs to make one underlying TCP connection.
-    self._oplogTailConnection = new MongoConnection(
-        self._oplogUrl, {maxPoolSize: 1, minPoolSize: 1});
-    // XXX better docs, but: it's to get monotonic results
-    // XXX is it safe to say "if there's an in flight query, just use its
-    //     results"? I don't think so but should consider that
-    self._oplogLastEntryConnection = new MongoConnection(
-        self._oplogUrl, {maxPoolSize: 1, minPoolSize: 1});
-
-
-    // Now, make sure that there actually is a repl set here. If not, oplog
-    // tailing won't ever find anything!
-    // More on the isMasterDoc
-    // https://docs.mongodb.com/manual/reference/command/isMaster/
-    const isMasterDoc = await new Promise(function (resolve, reject) {
-      self._oplogLastEntryConnection.db
-        .admin()
-        .command({ ismaster: 1 }, function (err, result) {
-          if (err) reject(err);
-          else resolve(result);
-        });
-    });
-
-    if (!(isMasterDoc && isMasterDoc.setName)) {
-      throw Error("$MONGO_OPLOG_URL must be set to the 'local' database of " +
-          "a Mongo replica set");
-    }
-
-    // Find the last oplog entry.
-    var lastOplogEntry = await self._oplogLastEntryConnection.findOneAsync(
-      OPLOG_COLLECTION,
-      {},
-      { sort: { $natural: -1 }, projection: { ts: 1 } }
-    );
-
-    var oplogSelector = Object.assign({}, self._baseOplogSelector);
-    if (lastOplogEntry) {
-      // Start after the last entry that currently exists.
-      oplogSelector.ts = {$gt: lastOplogEntry.ts};
-      // If there are any calls to callWhenProcessedLatest before any other
-      // oplog entries show up, allow callWhenProcessedLatest to call its
-      // callback immediately.
-      self._lastProcessedTS = lastOplogEntry.ts;
-    }
-
-    // These 2 settings allow you to either only watch certain collections (oplogIncludeCollections), or exclude some collections you don't want to watch for oplog updates (oplogExcludeCollections)
-    // Usage:
-    // settings.json = {
-    //   "packages": {
-    //     "mongo": {
-    //       "oplogExcludeCollections": ["products", "prices"] // This would exclude both collections "products" and "prices" from any oplog tailing. 
-    //                                                            Beware! This means, that no subscriptions on these 2 collections will update anymore!
-    //     }
-    //   }
-    // }
-    const includeCollections = Meteor.settings?.packages?.mongo?.oplogIncludeCollections;
-    const excludeCollections = Meteor.settings?.packages?.mongo?.oplogExcludeCollections;
-    if (includeCollections?.length && excludeCollections?.length) {
-      throw new Error("Can't use both mongo oplog settings oplogIncludeCollections and oplogExcludeCollections at the same time.");
-    }
-    if (excludeCollections?.length) {
-      oplogSelector.ns = {
-        $regex: oplogSelector.ns,
-        $nin: excludeCollections.map((collName) => `${self._dbName}.${collName}`)
-      }
-      self._oplogOptions = { excludeCollections };
-    }
-    else if (includeCollections?.length) {
-      oplogSelector = { $and: [
-        { $or: [
-          { ns: /^admin\.\$cmd/ },
-          { ns: { $in: includeCollections.map((collName) => `${self._dbName}.${collName}`) } }
-        ] },
-        { $or: oplogSelector.$or }, // the initial $or to select only certain operations (op)
-        { ts: oplogSelector.ts }
-      ] };
-      self._oplogOptions = { includeCollections };
-    }
-
-    var cursorDescription = new CursorDescription(
-        OPLOG_COLLECTION, oplogSelector, {tailable: true});
-
-    // Start tailing the oplog.
-    //
-    // We restart the low-level oplog query every 30 seconds if we didn't get a
-    // doc. This is a workaround for #8598: the Node Mongo driver has at least
-    // one bug that can lead to query callbacks never getting called (even with
-    // an error) when leadership failover occur.
-    self._tailHandle = self._oplogTailConnection.tail(
-        cursorDescription,
-        function (doc) {
-          self._entryQueue.push(doc);
-          self._maybeStartWorker();
-        },
-        TAIL_TIMEOUT
-    );
-
-    self._readyPromiseResolver();
-  },
-
-  _maybeStartWorker: function () {
-    var self = this;
-    if (self._workerActive) return;
-    self._workerActive = true;
-
-    Meteor.defer(async function () {
-      // May be called recursively in case of transactions.
-      async function handleDoc(doc) {
-        if (doc.ns === "admin.$cmd") {
-          if (doc.o.applyOps) {
-            // This was a successful transaction, so we need to apply the
-            // operations that were involved.
-            let nextTimestamp = doc.ts;
-            for (const op of doc.o.applyOps) {
-              // See https://github.com/meteor/meteor/issues/10420.
-              if (!op.ts) {
-                op.ts = nextTimestamp;
-                nextTimestamp = nextTimestamp.add(Long.ONE);
-              }
-              await handleDoc(op);
-            }
-            return;
-          }
-          throw new Error("Unknown command " + EJSON.stringify(doc));
-        }
-
-        const trigger = {
-          dropCollection: false,
-          dropDatabase: false,
-          op: doc,
-        };
-
-        if (typeof doc.ns === "string" &&
-            doc.ns.startsWith(self._dbName + ".")) {
-          trigger.collection = doc.ns.slice(self._dbName.length + 1);
-        }
-
-        // Is it a special command and the collection name is hidden
-        // somewhere in operator?
-        if (trigger.collection === "$cmd") {
-          if (doc.o.dropDatabase) {
-            delete trigger.collection;
-            trigger.dropDatabase = true;
-          } else if (has(doc.o, "drop")) {
-            trigger.collection = doc.o.drop;
-            trigger.dropCollection = true;
-            trigger.id = null;
-          } else if ("create" in doc.o && "idIndex" in doc.o) {
-            // A collection got implicitly created within a transaction. There's
-            // no need to do anything about it.
-          } else {
-            throw Error("Unknown command " + EJSON.stringify(doc));
-          }
-
-        } else {
-          // All other ops have an id.
-          trigger.id = idForOp(doc);
-        }
-
-        await self._crossbar.fire(trigger);
-      }
-
-      try {
-        while (! self._stopped &&
-               ! self._entryQueue.isEmpty()) {
-          // Are we too far behind? Just tell our observers that they need to
-          // repoll, and drop our queue.
-          if (self._entryQueue.length > TOO_FAR_BEHIND) {
-            var lastEntry = self._entryQueue.pop();
-            self._entryQueue.clear();
-
-            self._onSkippedEntriesHook.each(function (callback) {
-              callback();
-              return true;
-            });
-
-            // Free any waitUntilCaughtUp() calls that were waiting for us to
-            // pass something that we just skipped.
-            self._setLastProcessedTS(lastEntry.ts);
-            continue;
-          }
-
-          const doc = self._entryQueue.shift();
-
-          // Fire trigger(s) for this doc.
-          await handleDoc(doc);
-
-          // Now that we've processed this operation, process pending
-          // sequencers.
-          if (doc.ts) {
-            self._setLastProcessedTS(doc.ts);
-          } else {
-            throw Error("oplog entry without ts: " + EJSON.stringify(doc));
-          }
-        }
-      } finally {
-        self._workerActive = false;
-      }
-    });
-  },
-
-  _setLastProcessedTS: function (ts) {
-    var self = this;
-    self._lastProcessedTS = ts;
-    while (!isEmpty(self._catchingUpResolvers) && self._catchingUpResolvers[0].ts.lessThanOrEqual(self._lastProcessedTS)) {
-      var sequencer = self._catchingUpResolvers.shift();
-      sequencer.resolver();
-    }
-  },
-
-  //Methods used on tests to dinamically change TOO_FAR_BEHIND
-  _defineTooFarBehind: function(value) {
-    TOO_FAR_BEHIND = value;
-  },
-  _resetTooFarBehind: function() {
-    TOO_FAR_BEHIND = process.env.METEOR_OPLOG_TOO_FAR_BEHIND || 2000;
-  }
-});
\ No newline at end of file
diff --git a/packages/mongo/oplog_tailing.ts b/packages/mongo/oplog_tailing.ts
new file mode 100644
index 0000000000..293be2851e
--- /dev/null
+++ b/packages/mongo/oplog_tailing.ts
@@ -0,0 +1,394 @@
+import isEmpty from 'lodash.isempty';
+import { Meteor } from 'meteor/meteor';
+import { CursorDescription } from './cursor_description';
+import { MongoConnection } from './mongo_connection';
+
+export const OPLOG_COLLECTION = 'oplog.rs';
+
+let TOO_FAR_BEHIND = +(process.env.METEOR_OPLOG_TOO_FAR_BEHIND || 2000);
+const TAIL_TIMEOUT = +(process.env.METEOR_OPLOG_TAIL_TIMEOUT || 30000);
+
+interface OplogEntry {
+  op: string;
+  o: any;
+  o2?: any;
+  ts: any;
+  ns: string;
+}
+
+interface CatchingUpResolver {
+  ts: any;
+  resolver: () => void;
+}
+
+interface OplogTrigger {
+  dropCollection: boolean;
+  dropDatabase: boolean;
+  op: OplogEntry;
+  collection?: string;
+  id?: string | null;
+}
+
+export class OplogHandle {
+  private _oplogUrl: string;
+  private _dbName: string;
+  private _oplogLastEntryConnection: MongoConnection | null;
+  private _oplogTailConnection: MongoConnection | null;
+  private _oplogOptions: { excludeCollections?: string[]; includeCollections?: string[] } | null;
+  private _stopped: boolean;
+  private _tailHandle: any;
+  private _readyPromiseResolver: (() => void) | null;
+  private _readyPromise: Promise<void>;
+  private _crossbar: any;
+  private _baseOplogSelector: any;
+  private _catchingUpResolvers: CatchingUpResolver[];
+  private _lastProcessedTS: any;
+  private _onSkippedEntriesHook: any;
+  private _entryQueue: any;
+  private _workerActive: boolean;
+  private _startTrailingPromise: Promise<void>;
+
+  constructor(oplogUrl: string, dbName: string) {
+    this._oplogUrl = oplogUrl;
+    this._dbName = dbName;
+
+    this._oplogLastEntryConnection = null;
+    this._oplogTailConnection = null;
+    this._oplogOptions = null;
+    this._stopped = false;
+    this._tailHandle = null;
+    this._readyPromiseResolver = null;
+    this._readyPromise = new Promise(r => this._readyPromiseResolver = r);
+    this._crossbar = new DDPServer._Crossbar({
+      factPackage: "mongo-livedata", factName: "oplog-watchers"
+    });
+    this._baseOplogSelector = {
+      ns: new RegExp("^(?:" + [
+        // @ts-ignore
+        Meteor._escapeRegExp(this._dbName + "."),
+        // @ts-ignore
+        Meteor._escapeRegExp("admin.$cmd"),
+      ].join("|") + ")"),
+
+      $or: [
+        { op: { $in: ['i', 'u', 'd'] } },
+        { op: 'c', 'o.drop': { $exists: true } },
+        { op: 'c', 'o.dropDatabase': 1 },
+        { op: 'c', 'o.applyOps': { $exists: true } },
+      ]
+    };
+
+    this._catchingUpResolvers = [];
+    this._lastProcessedTS = null;
+
+    this._onSkippedEntriesHook = new Hook({
+      debugPrintExceptions: "onSkippedEntries callback"
+    });
+
+    // @ts-ignore
+    this._entryQueue = new Meteor._DoubleEndedQueue();
+    this._workerActive = false;
+
+    this._startTrailingPromise = this._startTailing();
+  }
+
+  async stop(): Promise<void> {
+    if (this._stopped) return;
+    this._stopped = true;
+    if (this._tailHandle) {
+      await this._tailHandle.stop();
+    }
+  }
+
+  async _onOplogEntry(trigger: OplogTrigger, callback: Function): Promise<{ stop: () => Promise<void> }> {
+    if (this._stopped) {
+      throw new Error("Called onOplogEntry on stopped handle!");
+    }
+
+    await this._readyPromise;
+
+    const listenHandle = this._crossbar.listen(trigger, callback);
+    return {
+      stop: async function () {
+        await listenHandle.stop();
+      }
+    };
+  }
+
+  onOplogEntry(trigger: OplogTrigger, callback: Function): Promise<{ stop: () => Promise<void> }> {
+    return this._onOplogEntry(trigger, callback);
+  }
+
+  onSkippedEntries(callback: Function): { stop: () => void } {
+    if (this._stopped) {
+      throw new Error("Called onSkippedEntries on stopped handle!");
+    }
+    return this._onSkippedEntriesHook.register(callback);
+  }
+
+  async _waitUntilCaughtUp(): Promise<void> {
+    if (this._stopped) {
+      throw new Error("Called waitUntilCaughtUp on stopped handle!");
+    }
+
+    await this._readyPromise;
+
+    let lastEntry: OplogEntry | null = null;
+
+    while (!this._stopped) {
+      try {
+        lastEntry = await this._oplogLastEntryConnection!.findOneAsync(
+          OPLOG_COLLECTION,
+          this._baseOplogSelector,
+          { projection: { ts: 1 }, sort: { $natural: -1 } }
+        );
+        break;
+      } catch (e) {
+        Meteor._debug("Got exception while reading last entry", e);
+        // @ts-ignore
+        await Meteor._sleepForMs(100);
+      }
+    }
+
+    if (this._stopped) return;
+
+    if (!lastEntry) return;
+
+    const ts = lastEntry.ts;
+    if (!ts) {
+      throw Error("oplog entry without ts: " + JSON.stringify(lastEntry));
+    }
+
+    if (this._lastProcessedTS && ts.lessThanOrEqual(this._lastProcessedTS)) {
+      return;
+    }
+
+    let insertAfter = this._catchingUpResolvers.length;
+    while (insertAfter - 1 > 0 && this._catchingUpResolvers[insertAfter - 1].ts.greaterThan(ts)) {
+      insertAfter--;
+    }
+    let promiseResolver: (() => void) | null = null;
+    const promiseToAwait = new Promise<void>(r => promiseResolver = r);
+    this._catchingUpResolvers.splice(insertAfter, 0, { ts, resolver: promiseResolver! });
+    await promiseToAwait;
+  }
+
+  async waitUntilCaughtUp(): Promise<void> {
+    return this._waitUntilCaughtUp();
+  }
+
+  async _startTailing(): Promise<void> {
+    const mongodbUri = require('mongodb-uri');
+    if (mongodbUri.parse(this._oplogUrl).database !== 'local') {
+      throw new Error("$MONGO_OPLOG_URL must be set to the 'local' database of a Mongo replica set");
+    }
+
+    this._oplogTailConnection = new MongoConnection(
+      this._oplogUrl, { maxPoolSize: 1, minPoolSize: 1 }
+    );
+    this._oplogLastEntryConnection = new MongoConnection(
+      this._oplogUrl, { maxPoolSize: 1, minPoolSize: 1 }
+    );
+
+    try {
+      const isMasterDoc = await new Promise<any>((resolve, reject) => {
+        this._oplogLastEntryConnection!.db
+          .admin()
+          .command({ ismaster: 1 }, (err: Error | null, result: any) => {
+            if (err) reject(err);
+            else resolve(result);
+          });
+      });
+
+      if (!(isMasterDoc && isMasterDoc.setName)) {
+        throw new Error("$MONGO_OPLOG_URL must be set to the 'local' database of a Mongo replica set");
+      }
+
+      const lastOplogEntry = await this._oplogLastEntryConnection.findOneAsync(
+        OPLOG_COLLECTION,
+        {},
+        { sort: { $natural: -1 }, projection: { ts: 1 } }
+      );
+
+      let oplogSelector: any = { ...this._baseOplogSelector };
+      if (lastOplogEntry) {
+        oplogSelector.ts = { $gt: lastOplogEntry.ts };
+        this._lastProcessedTS = lastOplogEntry.ts;
+      }
+
+      const includeCollections = Meteor.settings?.packages?.mongo?.oplogIncludeCollections;
+      const excludeCollections = Meteor.settings?.packages?.mongo?.oplogExcludeCollections;
+
+      if (includeCollections?.length && excludeCollections?.length) {
+        throw new Error("Can't use both mongo oplog settings oplogIncludeCollections and oplogExcludeCollections at the same time.");
+      }
+
+      if (excludeCollections?.length) {
+        oplogSelector.ns = {
+          $regex: oplogSelector.ns,
+          $nin: excludeCollections.map((collName: string) => `${this._dbName}.${collName}`)
+        };
+        this._oplogOptions = { excludeCollections };
+      } else if (includeCollections?.length) {
+        oplogSelector = {
+          $and: [
+            {
+              $or: [
+                { ns: /^admin\.\$cmd/ },
+                { ns: { $in: includeCollections.map((collName: string) => `${this._dbName}.${collName}`) } }
+              ]
+            },
+            { $or: oplogSelector.$or },
+            { ts: oplogSelector.ts }
+          ]
+        };
+        this._oplogOptions = { includeCollections };
+      }
+
+      const cursorDescription = new CursorDescription(
+        OPLOG_COLLECTION,
+        oplogSelector,
+        { tailable: true }
+      );
+
+      this._tailHandle = this._oplogTailConnection.tail(
+        cursorDescription,
+        (doc: any) => {
+          this._entryQueue.push(doc);
+          this._maybeStartWorker();
+        },
+        TAIL_TIMEOUT
+      );
+
+      this._readyPromiseResolver!();
+    } catch (error) {
+      console.error('Error in _startTailing:', error);
+      throw error;
+    }
+  }
+
+  private _maybeStartWorker(): void {
+    if (this._workerActive) return;
+    this._workerActive = true;
+
+    Meteor.defer(async () => {
+      // May be called recursively in case of transactions.
+      const handleDoc = async (doc: OplogEntry): Promise<void> => {
+        if (doc.ns === "admin.$cmd") {
+          if (doc.o.applyOps) {
+            // This was a successful transaction, so we need to apply the
+            // operations that were involved.
+            let nextTimestamp = doc.ts;
+            for (const op of doc.o.applyOps) {
+              // See https://github.com/meteor/meteor/issues/10420.
+              if (!op.ts) {
+                op.ts = nextTimestamp;
+                nextTimestamp = nextTimestamp.add(Long.ONE);
+              }
+              await handleDoc(op);
+            }
+            return;
+          }
+          throw new Error("Unknown command " + JSON.stringify(doc));
+        }
+
+        const trigger: OplogTrigger = {
+          dropCollection: false,
+          dropDatabase: false,
+          op: doc,
+        };
+
+        if (typeof doc.ns === "string" && doc.ns.startsWith(this._dbName + ".")) {
+          trigger.collection = doc.ns.slice(this._dbName.length + 1);
+        }
+
+        // Is it a special command and the collection name is hidden
+        // somewhere in operator?
+        if (trigger.collection === "$cmd") {
+          if (doc.o.dropDatabase) {
+            delete trigger.collection;
+            trigger.dropDatabase = true;
+          } else if ("drop" in doc.o) {
+            trigger.collection = doc.o.drop;
+            trigger.dropCollection = true;
+            trigger.id = null;
+          } else if ("create" in doc.o && "idIndex" in doc.o) {
+            // A collection got implicitly created within a transaction. There's
+            // no need to do anything about it.
+          } else {
+            throw Error("Unknown command " + JSON.stringify(doc));
+          }
+        } else {
+          // All other ops have an id.
+          trigger.id = idForOp(doc);
+        }
+
+        await this._crossbar.fire(trigger);
+      };
+
+      try {
+        while (!this._stopped && !this._entryQueue.isEmpty()) {
+          // Are we too far behind? Just tell our observers that they need to
+          // repoll, and drop our queue.
+          if (this._entryQueue.length > TOO_FAR_BEHIND) {
+            const lastEntry = this._entryQueue.pop();
+            this._entryQueue.clear();
+
+            this._onSkippedEntriesHook.each((callback: Function) => {
+              callback();
+              return true;
+            });
+
+            // Free any waitUntilCaughtUp() calls that were waiting for us to
+            // pass something that we just skipped.
+            this._setLastProcessedTS(lastEntry.ts);
+            continue;
+          }
+
+          const doc = this._entryQueue.shift();
+
+          // Fire trigger(s) for this doc.
+          await handleDoc(doc);
+
+          // Now that we've processed this operation, process pending
+          // sequencers.
+          if (doc.ts) {
+            this._setLastProcessedTS(doc.ts);
+          } else {
+            throw Error("oplog entry without ts: " + JSON.stringify(doc));
+          }
+        }
+      } finally {
+        this._workerActive = false;
+      }
+    });
+  }
+
+  _setLastProcessedTS(ts: any): void {
+    this._lastProcessedTS = ts;
+    while (!isEmpty(this._catchingUpResolvers) && this._catchingUpResolvers[0].ts.lessThanOrEqual(this._lastProcessedTS)) {
+      const sequencer = this._catchingUpResolvers.shift()!;
+      sequencer.resolver();
+    }
+  }
+
+  _defineTooFarBehind(value: number): void {
+    TOO_FAR_BEHIND = value;
+  }
+
+  _resetTooFarBehind(): void {
+    TOO_FAR_BEHIND = +(process.env.METEOR_OPLOG_TOO_FAR_BEHIND || 2000);
+  }
+}
+
+export function idForOp(op: OplogEntry): string {
+  if (op.op === 'd' || op.op === 'i') {
+    return op.o._id;
+  } else if (op.op === 'u') {
+    return op.o2._id;
+  } else if (op.op === 'c') {
+    throw Error("Operator 'c' doesn't supply an object with id: " + JSON.stringify(op));
+  } else {
+    throw Error("Unknown op: " + JSON.stringify(op));
+  }
+}
\ No newline at end of file
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 2babd85ac7..bdedaa4c0c 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -87,7 +87,7 @@ Package.onUse(function (api) {
   api.addFiles(
     [
       "mongo_driver.js",
-      "oplog_tailing.js",
+      "oplog_tailing.ts",
       "observe_multiplex.ts",
       "doc_fetcher.js",
       "polling_observe_driver.js",
diff --git a/packages/mongo/polling_observe_driver.js b/packages/mongo/polling_observe_driver.js
index 6b4172cd95..e7c3758c73 100644
--- a/packages/mongo/polling_observe_driver.js
+++ b/packages/mongo/polling_observe_driver.js
@@ -1,9 +1,10 @@
 import throttle from 'lodash.throttle';
+import { listenAll } from './mongo_driver';
 
 var POLLING_THROTTLE_MS = +process.env.METEOR_POLLING_THROTTLE_MS || 50;
 var POLLING_INTERVAL_MS = +process.env.METEOR_POLLING_INTERVAL_MS || 10 * 1000;
 
-PollingObserveDriver = function (options) {
+export const PollingObserveDriver = function (options) {
   const self = this;
   self._options = options;
 
@@ -14,7 +15,7 @@ PollingObserveDriver = function (options) {
   self._stopCallbacks = [];
   self._stopped = false;
 
-  self._cursor = self._mongoHandle._createSynchronousCursor(
+  self._cursor = self._mongoHandle._createAsynchronousCursor(
     self._cursorDescription);
 
   // previous results snapshot.  on each poll cycle, diffs against
diff --git a/packages/mongo/remote_collection_driver.js b/packages/mongo/remote_collection_driver.js
index d8c794abff..5537e80e2f 100644
--- a/packages/mongo/remote_collection_driver.js
+++ b/packages/mongo/remote_collection_driver.js
@@ -4,11 +4,10 @@ import {
   getAsyncMethodName,
   CLIENT_ONLY_METHODS
 } from "meteor/minimongo/constants";
+import { MongoConnection } from './mongo_connection';
 
-MongoInternals.RemoteCollectionDriver = function (
-  mongo_url, options) {
-  var self = this;
-  self.mongo = new MongoConnection(mongo_url, options);
+MongoInternals.RemoteCollectionDriver = function (mongo_url, options) {
+  this.mongo = new MongoConnection(mongo_url, options);
 };
 
 const REMOTE_COLLECTION_METHODS = [
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index 39ebcd33bb..e904107de5 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
     },
     "@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
+      "version": "22.7.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
+      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
     },
     "@types/qs": {
       "version": "6.9.16",
@@ -514,11 +514,6 @@
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
       "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
     },
-    "undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",

From 11cbe26e45bf36da00e4901eb7a848467d9833f1 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Thu, 17 Oct 2024 21:03:08 +0300
Subject: [PATCH 0558/1140] Replace underscore in runapp file

---
 tools/runners/run-app.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index 9f5bb79ecd..bd76e05317 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -1,4 +1,3 @@
-var _ = require('underscore');
 var files = require('../fs/files');
 var watch = require('../fs/watch');
 var bundler = require('../isobuild/bundler.js');
@@ -19,7 +18,7 @@ var bashParse = function (s) {
   if (s.search("\"") !== -1 || s.search("'") !== -1) {
     throw new Error("Meteor cannot currently handle quoted SERVER_NODE_OPTIONS");
   }
-  return _.without(s.split(/\s+/), '');
+  return s.split(/\s+/).filter(Boolean);
 };
 
 var getNodeOptionsFromEnvironment = function () {
@@ -238,7 +237,7 @@ Object.assign(AppProcess.prototype, {
       files.pathJoin(self.bundlePath, 'main.js'));
 
     // Setting options
-    var opts = _.clone(self.nodeOptions);
+    var opts = JSON.parse(JSON.stringify(self.nodeOptions));
 
     if (self.inspect) {
       // Always use --inspect rather than --inspect-brk, even when

From 320148007fcea6b1eed4a060fb156af78625a66c Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Thu, 17 Oct 2024 21:27:38 +0300
Subject: [PATCH 0559/1140] Remove underscore from test-apps

---
 .../apps/compiler-plugin-static-html-error/.meteor/packages      | 1 -
 tools/tests/apps/compiler-plugin-static-html/.meteor/packages    | 1 -
 tools/tests/apps/extra-packages-option/.meteor/packages          | 1 -
 tools/tests/apps/modules/.meteor/packages                        | 1 -
 4 files changed, 4 deletions(-)

diff --git a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/packages b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/packages
index a049f97cef..aa8a211d5f 100644
--- a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/packages
+++ b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/packages
@@ -8,4 +8,3 @@ standard-minifier-css
 standard-minifier-js
 shell-server
 dynamic-import
-underscore
diff --git a/tools/tests/apps/compiler-plugin-static-html/.meteor/packages b/tools/tests/apps/compiler-plugin-static-html/.meteor/packages
index a049f97cef..aa8a211d5f 100644
--- a/tools/tests/apps/compiler-plugin-static-html/.meteor/packages
+++ b/tools/tests/apps/compiler-plugin-static-html/.meteor/packages
@@ -8,4 +8,3 @@ standard-minifier-css
 standard-minifier-js
 shell-server
 dynamic-import
-underscore
diff --git a/tools/tests/apps/extra-packages-option/.meteor/packages b/tools/tests/apps/extra-packages-option/.meteor/packages
index eafeae86c3..556e8e155a 100644
--- a/tools/tests/apps/extra-packages-option/.meteor/packages
+++ b/tools/tests/apps/extra-packages-option/.meteor/packages
@@ -4,5 +4,4 @@
 # but you can also edit it by hand.
 
 meteor-base
-underscore
 extra-package-2@=0.0.1
diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index 7612fb6ccc..d2ef381859 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -23,7 +23,6 @@ client-only-ecmascript
 modules-test-plugin
 shell-server@0.6.0-beta300.6
 dynamic-import@0.7.4-beta300.6
-underscore@1.0.14-beta300.6
 import-local-json-module
 dummy-compiler
 typescript@5.3.3-beta300.6

From 29b6b2b25e4cd9f1057f91337c82065e11d772df Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 14:43:02 -0400
Subject: [PATCH 0560/1140] changes to the script that generates the windows
 dev-bundle to be more verbose

---
 scripts/generate-dev-bundle.ps1 | 323 +++-----------------------------
 1 file changed, 30 insertions(+), 293 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 2223d04b06..7bc315a780 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -5,6 +5,7 @@ Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform
 
 $PYTHON_VERSION = "3.9.5" # For node-gyp
+Write-Host "Running 'du' command to check disk usage" -ForegroundColor Magenta
 & cmd /c 'du 2>&1'
 
 $dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
@@ -31,7 +32,8 @@ $system7zip = "C:\Program Files\7-zip\7z.exe"
 # Required for downloading MongoDB via HTTPS
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
-# Since we reuse the same temp directory, cleanup from previous failed runs.
+# Cleanup from previous failed runs.
+Write-Host "Cleaning up previous dev bundle directory: $DIR" -ForegroundColor Magenta
 Remove-DirectoryRecursively $DIR
 
 # Some commonly used paths in this script.
@@ -44,11 +46,12 @@ $dirTemp = Join-Path $DIR 'temp'
 $dirNpmCache = Join-Path $dirTemp 'npm-cache'
 
 # Build our directory framework.
-New-Item -ItemType Directory -Force -Path $DIR | Out-Null
-New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
-New-Item -ItemType Directory -Force -Path $dirBin | Out-Null
-New-Item -ItemType Directory -Force -Path $dirLib | Out-Null
-New-Item -ItemType Directory -Force -Path $dirServerLib | Out-Null
+Write-Host "Creating directory structure..." -ForegroundColor Magenta
+New-Item -ItemType Directory -Force -Path $DIR -Verbose | Out-Null
+New-Item -ItemType Directory -Force -Path $dirTemp -Verbose | Out-Null
+New-Item -ItemType Directory -Force -Path $dirBin -Verbose | Out-Null
+New-Item -ItemType Directory -Force -Path $dirLib -Verbose | Out-Null
+New-Item -ItemType Directory -Force -Path $dirServerLib -Verbose | Out-Null
 
 $webclient = New-Object System.Net.WebClient
 $shell = New-Object -com shell.application
@@ -82,23 +85,18 @@ Function Add-7ZipTool {
 }
 
 Function Add-Python {
-  # On Windows we provide a reliable version of python.exe for use by
-  # node-gyp (the tool that rebuilds binary node modules).
-  # This self-hosted 7z is created by archiving the result of running the
-  # Python MSI installer (from python.org), targeted at a temp directory, and
-  # only including: "Python" and "Utility Scripts". Then, 7z the temp directory.
-  $pythonUrl = "https://s3.amazonaws.com/com.meteor.static/windows-python/",
-    "$PLATFORM/python-${PYTHON_VERSION}.7z" -Join ''
+  Write-Host "Downloading and installing Python..." -ForegroundColor Magenta
+  $pythonUrl = "https://s3.amazonaws.com/com.meteor.static/windows-python/", "$PLATFORM/python-${PYTHON_VERSION}.7z" -Join ''
   $pythonArchive = Join-Path $dirTemp 'python.7z'
 
   $webclient.DownloadFile($pythonUrl, $pythonArchive)
-
   Expand-7zToDirectory $pythonArchive $DIR
 
   $pythonDir = Join-Path $DIR 'python'
   $pythonExe = Join-Path $pythonDir 'python.exe'
 
-  # Make sure the version is right, when python is called.
+  # Validate Python version
+  Write-Host "Validating Python version..." -ForegroundColor Magenta
   if (!(cmd /c python.exe --version '2>&1' -Eq "Python ${PYTHON_VERSION}")) {
     throw "Python was not the version we expected it to be ($PYTHON_VERSION)"
   }
@@ -109,6 +107,7 @@ Function Add-Python {
 }
 
 Function Add-NodeAndNpm {
+  Write-Host "Downloading and installing Node.js..." -ForegroundColor Magenta
   if ("${NODE_VERSION}" -match "-rc\.\d+$") {
     $nodeUrlBase = 'https://nodejs.org/download/rc'
   } else {
@@ -116,152 +115,34 @@ Function Add-NodeAndNpm {
   }
 
   $nodeArchitecture = 'win-x64'
-
-  # Various variables which are used as part of directory paths and
-  # inside Node release and header archives.
   $nodeVersionSegment = "v${NODE_VERSION}"
-  $nodeNameVersionSegment = "node-${nodeVersionSegment}"
-  $nodeNameSegment = "${nodeNameVersionSegment}-${nodeArchitecture}"
-
-  # The URL for the Node 7z archive, which includes its shipped version of npm.
-  $nodeUrl = $nodeUrlBase, $nodeVersionSegment,
-    "${nodeNameSegment}.7z" -Join '/'
+  $nodeNameSegment = "node-${nodeVersionSegment}-${nodeArchitecture}"
+  $nodeUrl = $nodeUrlBase, $nodeVersionSegment, "${nodeNameSegment}.7z" -Join '/'
 
   $archiveNode = Join-Path $dirTemp 'node.7z'
   Write-Host "Downloading Node.js from ${nodeUrl}" -ForegroundColor Magenta
   $webclient.DownloadFile($nodeUrl, $archiveNode)
 
-  Write-Host "Extracting Node 7z file..." -ForegroundColor Magenta
+  Write-Host "Extracting Node.js 7z file..." -ForegroundColor Magenta
   & "$system7zip" x $archiveNode -o"$dirTemp" | Out-Null
 
-  # This will be the location of the extracted Node tarball.
-  $dirTempNode = Join-Path $dirTemp $nodeNameSegment
-
-  # Delete the no longer necessary Node archive.
+  # Remove the no longer necessary Node archive.
   Remove-Item $archiveNode
 
-  $tempNodeExe = Join-Path $dirTempNode 'node.exe'
-  $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
-
-  # Get additional values we'll need to fetch to complete this release.
-  $nodeProcessRelease = @{
-    headersUrl = & "$tempNodeExe" -p 'process.release.headersUrl'
-    libUrl = & "$tempNodeExe" -p 'process.release.libUrl'
-  }
-
-  if (!($nodeProcessRelease.headersUrl -And $nodeProcessRelease.libUrl)) {
-    throw "No 'headersUrl' or 'libUrl' in Node.js's 'process.release' output."
-  }
-
-  $nodeHeadersTarGz = Join-Path $dirTemp 'node-headers.tar.gz'
-  Write-Host "Downloading Node headers from $($nodeProcessRelease.headersUrl)" `
-    -ForegroundColor Magenta
-  $webclient.DownloadFile($nodeProcessRelease.headersUrl, $nodeHeadersTarGz)
-
-  $dirTempNodeHeaders = Join-Path $dirTemp 'node-headers'
-  if (!(Expand-TarGzToDirectory $nodeHeadersTarGz $dirTempNodeHeaders)) {
-    throw "Couldn't extract Node headers."
-  }
-
-  # Move the extracted include directory to the Node dir.
-  $dirTempNodeHeadersInclude = `
-    Join-Path $dirTempNodeHeaders $nodeNameVersionSegment |
-    Join-Path -ChildPath 'include'
-  Move-Item $dirTempNodeHeadersInclude $dirTempNode
-  $dirTempNodeHeadersInclude = Join-Path $dirTempNode 'include'
-
-  # The node.lib goes into a \Release directory.
-  $dirNodeRelease = Join-Path $dirTempNode 'Release'
-  New-Item -ItemType Directory -Force -Path $dirNodeRelease | Out-Null
-
-  Write-Host "Downloading node.lib from $($nodeProcessRelease.libUrl)" `
-    -ForegroundColor Magenta
-  $nodeLibTarget = Join-Path $dirNodeRelease 'node.lib'
-  $webclient.DownloadFile($nodeProcessRelease.libUrl, $nodeLibTarget)
-
-  #
-  # We should now have a fully functionaly local Node with headers to use.
-  #
-
-  # Let's install the npm version we really want.
+  # Install npm with verbose logging
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
-      Write-Debug
+  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save --verbose --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION}
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."
   }
 
-  # After finishing up with our Node, let's put it in its final home
-  # and abandon this local npm directory.
-
-  # Move exe and cmd files to the \bin directory.
-  Move-Item $(Join-Path $dirTempNode '*.exe') $dirBin
-  # Move-Item $(Join-Path $dirTempNode '*.cmd') $dirBin
-  Move-Item $dirTempNodeHeadersInclude $DIR
-  Move-Item $dirNodeRelease $DIR
-
-  $finalNodeExe = Join-Path $dirBin 'node.exe'
-  $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
-
-  # Uses process.execPath to infer dev_bundle\bin, npm location, &c.
-  & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
-
-  # We use our own npm.cmd.
-  Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
-
-  Remove-DirectoryRecursively $dirTempNodeHeaders
-  Remove-DirectoryRecursively $dirTempNode
-
-  return New-Object -Type PSObject -Prop $(@{
-    node = $finalNodeExe
-    npm = $finalNpmCmd
-  })
+  # Rest of the Node installation process...
 }
 
 Function Add-Mongo {
-  # Mongo >= 3.4 no longer supports 32-bit (x86) architectures, so we package
-  # the latest 3.2 version of Mongo for those builds and >= 3.4 for x64.
-  $mongo_filenames = @{
-    windows_x64 = "mongodb-windows-x86_64-${MONGO_VERSION_64BIT}"
-  }
-
-  # the folder inside the zip still uses win32
-  $mongo_zip_filenames = @{
-    windows_x64 = "mongodb-win32-x86_64-windows-${MONGO_VERSION_64BIT}"
-  }
-
-  $previousCwd = $PWD
-
-  cd "$DIR"
-  mkdir "$DIR\mongodb"
-  mkdir "$DIR\mongodb\bin"
-  $mongo_name = $mongo_filenames.Item($PLATFORM)
-  $mongo_zip_name = $mongo_zip_filenames.Item($PLATFORM)
-  $mongo_link = "https://fastdl.mongodb.org/windows/${mongo_name}.zip"
-  $mongo_zip = "$DIR\mongodb\mongo.zip"
-
-  Write-Host "Downloading Mongo from ${mongo_link}..." -ForegroundColor Magenta
-  $webclient.DownloadFile($mongo_link, $mongo_zip)
-
-  Write-Host "Extracting Mongo ${mongo_zip}..." -ForegroundColor Magenta
-  $zip = $shell.NameSpace($mongo_zip)
-  foreach($item in $zip.items()) {
-    $shell.Namespace("$DIR\mongodb").copyhere($item, 0x14) # 0x10 - overwrite, 0x4 - no dialog
-  }
-
-  Write-Host "Putting MongoDB mongod.exe in mongodb\bin" -ForegroundColor Magenta
-  cp "$DIR\mongodb\$mongo_zip_name\bin\mongod.exe" $DIR\mongodb\bin
-  Write-Host "Putting MongoDB mongos.exe in mongodb\bin" -ForegroundColor Magenta
-  cp "$DIR\mongodb\$mongo_zip_name\bin\mongos.exe" $DIR\mongodb\bin
-
-  Write-Host "Removing the old Mongo zip..." -ForegroundColor Magenta
-  rm -Recurse -Force $mongo_zip
-  Write-Host "Removing the old Mongo directory..." -ForegroundColor Magenta
-  rm -Recurse -Force "$DIR\mongodb\$mongo_zip_name"
-
-  cd "$previousCwd"
+  Write-Host "Downloading and installing MongoDB..." -ForegroundColor Magenta
+  # MongoDB download and installation steps...
 }
 
 Function Add-NpmModulesFromJsBundleFile {
@@ -275,170 +156,26 @@ Function Add-NpmModulesFromJsBundleFile {
     [bool]$Shrinkwrap = $False
   )
 
-  $previousCwd = $PWD
-
-  If (!(Test-Path $SourceJs)) {
-    throw "Couldn't find the source: $SourceJs"
-  }
-
-  New-Item -ItemType Directory -Force -Path $Destination | Out-Null
-
-  cd "$Destination"
-
-  Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
-    -ForegroundColor Magenta
-  & "$($Commands.node)" $SourceJs |
-    Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
-
-  # No bin-links because historically, they weren't used anyway.
-  & "$($Commands.npm)" install
+  Write-Host "Installing npm modules from ${SourceJs}..." -ForegroundColor Magenta
+  & "$($Commands.node)" $SourceJs -Verbose
+  & "$($Commands.npm)" install --verbose
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."
   }
-
-  # As of npm@5, this just renames `package-lock.json` to `npm-shrinkwrap.json`.
-  if ($Shrinkwrap -eq $True) {
-    & "$($Commands.npm)" shrinkwrap
-    if ($LASTEXITCODE -ne 0) {
-      throw "Couldn't make shrinkwrap."
-    }
-  }
-
-  cd node_modules
-
-  cd "$previousCwd"
 }
 
-# Install the global 7zip application, if necessary.
+# Install global 7-zip if not already present.
 if (!(Test-Path "$system7zip")) {
-  Write-Host "Installing 7-zip since not found at ${system7zip}" `
-    -ForegroundColor Magenta
+  Write-Host "Installing 7-zip since not found at ${system7zip}" -ForegroundColor Magenta
   Invoke-Install7ZipApplication
 }
 
-# Download and install 7zip command-line tool into \bin
+# Run the steps with added verbosity and progress logging
 Add-7ZipTool
-
-# Download and install Mongo binaries into \bin
 Add-Mongo
-
-# Add Python to \bin, and use it for Node Gyp.
 $env:PYTHON = Add-Python
-
-# Set additional options for node-gyp
-$env:GYP_MSVS_VERSION = "2015"
-$env:npm_config_nodedir = "$DIR"
-$env:npm_config_cache = "$dirNpmCache"
-
-# Allow running $dirBin commands like node and npm.
-$env:PATH = "$env:PATH;$dirBin"
-
-# Install Node.js and npm and get their paths to use from here on.
 $toolCmds = Add-NodeAndNpm
 
-"Location of node.exe:"
-& Get-Command node | Select-Object -ExpandProperty Definition
+Write-Host "Finished building the dev bundle!" -ForegroundColor Green
 
-"Node process.versions:"
-& node -p 'process.versions'
-
-"Location of npm.cmd:"
-& Get-Command npm | Select-Object -ExpandProperty Definition
-
-"Npm 'version':"
-& npm version
-
-npm config set loglevel error
-
-#
-# Install the npms for the 'server'.
-#
-$npmServerArgs = @{
-  sourceJs = "${dirCheckout}\scripts\dev-bundle-server-package.js"
-  destination = $dirServerLib
-  commands = $toolCmds
-  shrinkwrap = $True
-}
-Add-NpmModulesFromJsBundleFile @npmServerArgs
-
-# These are used by the Meteor tool bundler and written to the Meteor build.
-# For information, see the 'ServerTarget' class in tools/isobuild/bundler.js,
-# and look for 'serverPkgJson' and 'npm-shrinkwrap.json'
-mkdir -Force "${DIR}\etc"
-Move-Item $(Join-Path $dirServerLib 'package.json') "${DIR}\etc\"
-Move-Item $(Join-Path $dirServerLib 'npm-shrinkwrap.json') "${DIR}\etc\"
-
-#
-# Install the npms for the 'tool'.
-#
-$npmToolArgs = @{
-  sourceJs = "${dirCheckout}\scripts\dev-bundle-tool-package.js"
-  destination = $dirLib
-  commands = $toolCmds
-}
-Add-NpmModulesFromJsBundleFile @npmToolArgs
-
-# Leaving these probably doesn't hurt, but are removed for consistency w/ Unix.
-Remove-Item $(Join-Path $dirLib 'package.json')
-Remove-Item $(Join-Path $dirLib 'package-lock.json')
-
-Write-Host "Done writing node_modules build(s)..." -ForegroundColor Magenta
-
-Write-Host "Removing temp scratch $dirTemp" -ForegroundColor Magenta
-Remove-DirectoryRecursively $dirTemp
-
-# mark the version
-Write-Host "Writing out the bundle version..." -ForegroundColor Magenta
-echo "${BUNDLE_VERSION}" | Out-File $(Join-Path $DIR '.bundle_version.txt') -Encoding ascii
-
-$devBundleName = "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}"
-$dirBundlePreArchive = Join-Path $dirCheckout $devBundleName
-$devBundleTmpTar = Join-Path $dirCheckout "dev_bundle.tar"
-$devBundleTarGz = Join-Path $dirCheckout "${devBundleName}.tar.gz"
-
-# Cleanup from previous builds, if there are things in our way.
-Remove-DirectoryRecursively $dirBundlePreArchive
-If (Test-Path $devBundleTmpTar) {
-  Remove-Item -Force $devBundleTmpTar
-}
-If (Test-Path $devBundleTarGz) {
-  Remove-Item -Force $devBundleTarGz
-}
-
-# Get out of this directory, before we rename it.
-cd "$DIR\.."
-
-# rename the folder with the devbundle
-Write-Host "Renaming to $dirBundlePreArchive" -ForegroundColor Magenta
-Rename-Item "$DIR" $dirBundlePreArchive
-
-Write-Host "Compressing $dirBundlePreArchive to $devBundleTmpTar"
-& "$system7zip" a -ttar $devBundleTmpTar $dirBundlePreArchive
-if ($LASTEXITCODE -ne 0) {
-  throw "Failure while building $devBundleTmpTar"
-}
-
-if ((Get-Item $devBundleTmpTar).length -lt 50mb) {
-  throw "Dev bundle .tar is <50mb. If this is correct, update this message!"
-}
-
-Write-Host "Compressing $devBundleTmpTar into $devBundleTarGz" `
-  -ForegroundColor Magenta
-& "$system7zip" a -tgzip $devBundleTarGz $devBundleTmpTar
-if ($LASTEXITCODE -ne 0) {
-  throw "Failure while building $devBundleTarGz"
-}
-
-if ((Get-Item $devBundleTarGz).length -lt 30mb) {
-  throw "Dev bundle .tar.gz is <30mb. If this is correct, update this message!"
-}
-
-Write-Host "Removing $devBundleTmpTar" -ForegroundColor Magenta
-Remove-Item -Force $devBundleTmpTar
-
-Write-Host "Removing the '$devBundleName' temp directory." `
-  -ForegroundColor Magenta
-Remove-DirectoryRecursively $dirBundlePreArchive
-
-Write-Host "Done building Dev Bundle!" -ForegroundColor Green
 Exit 0

From 6c47e8ad7942569abfe32dc33e66e4ac59be8385 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 15:05:49 -0400
Subject: [PATCH 0561/1140] Revert "changes to the script that generates the
 windows dev-bundle to be more verbose"

This reverts commit 29b6b2b25e4cd9f1057f91337c82065e11d772df.
---
 scripts/generate-dev-bundle.ps1 | 323 +++++++++++++++++++++++++++++---
 1 file changed, 293 insertions(+), 30 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 7bc315a780..2223d04b06 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -5,7 +5,6 @@ Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform
 
 $PYTHON_VERSION = "3.9.5" # For node-gyp
-Write-Host "Running 'du' command to check disk usage" -ForegroundColor Magenta
 & cmd /c 'du 2>&1'
 
 $dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
@@ -32,8 +31,7 @@ $system7zip = "C:\Program Files\7-zip\7z.exe"
 # Required for downloading MongoDB via HTTPS
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
-# Cleanup from previous failed runs.
-Write-Host "Cleaning up previous dev bundle directory: $DIR" -ForegroundColor Magenta
+# Since we reuse the same temp directory, cleanup from previous failed runs.
 Remove-DirectoryRecursively $DIR
 
 # Some commonly used paths in this script.
@@ -46,12 +44,11 @@ $dirTemp = Join-Path $DIR 'temp'
 $dirNpmCache = Join-Path $dirTemp 'npm-cache'
 
 # Build our directory framework.
-Write-Host "Creating directory structure..." -ForegroundColor Magenta
-New-Item -ItemType Directory -Force -Path $DIR -Verbose | Out-Null
-New-Item -ItemType Directory -Force -Path $dirTemp -Verbose | Out-Null
-New-Item -ItemType Directory -Force -Path $dirBin -Verbose | Out-Null
-New-Item -ItemType Directory -Force -Path $dirLib -Verbose | Out-Null
-New-Item -ItemType Directory -Force -Path $dirServerLib -Verbose | Out-Null
+New-Item -ItemType Directory -Force -Path $DIR | Out-Null
+New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
+New-Item -ItemType Directory -Force -Path $dirBin | Out-Null
+New-Item -ItemType Directory -Force -Path $dirLib | Out-Null
+New-Item -ItemType Directory -Force -Path $dirServerLib | Out-Null
 
 $webclient = New-Object System.Net.WebClient
 $shell = New-Object -com shell.application
@@ -85,18 +82,23 @@ Function Add-7ZipTool {
 }
 
 Function Add-Python {
-  Write-Host "Downloading and installing Python..." -ForegroundColor Magenta
-  $pythonUrl = "https://s3.amazonaws.com/com.meteor.static/windows-python/", "$PLATFORM/python-${PYTHON_VERSION}.7z" -Join ''
+  # On Windows we provide a reliable version of python.exe for use by
+  # node-gyp (the tool that rebuilds binary node modules).
+  # This self-hosted 7z is created by archiving the result of running the
+  # Python MSI installer (from python.org), targeted at a temp directory, and
+  # only including: "Python" and "Utility Scripts". Then, 7z the temp directory.
+  $pythonUrl = "https://s3.amazonaws.com/com.meteor.static/windows-python/",
+    "$PLATFORM/python-${PYTHON_VERSION}.7z" -Join ''
   $pythonArchive = Join-Path $dirTemp 'python.7z'
 
   $webclient.DownloadFile($pythonUrl, $pythonArchive)
+
   Expand-7zToDirectory $pythonArchive $DIR
 
   $pythonDir = Join-Path $DIR 'python'
   $pythonExe = Join-Path $pythonDir 'python.exe'
 
-  # Validate Python version
-  Write-Host "Validating Python version..." -ForegroundColor Magenta
+  # Make sure the version is right, when python is called.
   if (!(cmd /c python.exe --version '2>&1' -Eq "Python ${PYTHON_VERSION}")) {
     throw "Python was not the version we expected it to be ($PYTHON_VERSION)"
   }
@@ -107,7 +109,6 @@ Function Add-Python {
 }
 
 Function Add-NodeAndNpm {
-  Write-Host "Downloading and installing Node.js..." -ForegroundColor Magenta
   if ("${NODE_VERSION}" -match "-rc\.\d+$") {
     $nodeUrlBase = 'https://nodejs.org/download/rc'
   } else {
@@ -115,34 +116,152 @@ Function Add-NodeAndNpm {
   }
 
   $nodeArchitecture = 'win-x64'
+
+  # Various variables which are used as part of directory paths and
+  # inside Node release and header archives.
   $nodeVersionSegment = "v${NODE_VERSION}"
-  $nodeNameSegment = "node-${nodeVersionSegment}-${nodeArchitecture}"
-  $nodeUrl = $nodeUrlBase, $nodeVersionSegment, "${nodeNameSegment}.7z" -Join '/'
+  $nodeNameVersionSegment = "node-${nodeVersionSegment}"
+  $nodeNameSegment = "${nodeNameVersionSegment}-${nodeArchitecture}"
+
+  # The URL for the Node 7z archive, which includes its shipped version of npm.
+  $nodeUrl = $nodeUrlBase, $nodeVersionSegment,
+    "${nodeNameSegment}.7z" -Join '/'
 
   $archiveNode = Join-Path $dirTemp 'node.7z'
   Write-Host "Downloading Node.js from ${nodeUrl}" -ForegroundColor Magenta
   $webclient.DownloadFile($nodeUrl, $archiveNode)
 
-  Write-Host "Extracting Node.js 7z file..." -ForegroundColor Magenta
+  Write-Host "Extracting Node 7z file..." -ForegroundColor Magenta
   & "$system7zip" x $archiveNode -o"$dirTemp" | Out-Null
 
-  # Remove the no longer necessary Node archive.
+  # This will be the location of the extracted Node tarball.
+  $dirTempNode = Join-Path $dirTemp $nodeNameSegment
+
+  # Delete the no longer necessary Node archive.
   Remove-Item $archiveNode
 
-  # Install npm with verbose logging
+  $tempNodeExe = Join-Path $dirTempNode 'node.exe'
+  $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
+
+  # Get additional values we'll need to fetch to complete this release.
+  $nodeProcessRelease = @{
+    headersUrl = & "$tempNodeExe" -p 'process.release.headersUrl'
+    libUrl = & "$tempNodeExe" -p 'process.release.libUrl'
+  }
+
+  if (!($nodeProcessRelease.headersUrl -And $nodeProcessRelease.libUrl)) {
+    throw "No 'headersUrl' or 'libUrl' in Node.js's 'process.release' output."
+  }
+
+  $nodeHeadersTarGz = Join-Path $dirTemp 'node-headers.tar.gz'
+  Write-Host "Downloading Node headers from $($nodeProcessRelease.headersUrl)" `
+    -ForegroundColor Magenta
+  $webclient.DownloadFile($nodeProcessRelease.headersUrl, $nodeHeadersTarGz)
+
+  $dirTempNodeHeaders = Join-Path $dirTemp 'node-headers'
+  if (!(Expand-TarGzToDirectory $nodeHeadersTarGz $dirTempNodeHeaders)) {
+    throw "Couldn't extract Node headers."
+  }
+
+  # Move the extracted include directory to the Node dir.
+  $dirTempNodeHeadersInclude = `
+    Join-Path $dirTempNodeHeaders $nodeNameVersionSegment |
+    Join-Path -ChildPath 'include'
+  Move-Item $dirTempNodeHeadersInclude $dirTempNode
+  $dirTempNodeHeadersInclude = Join-Path $dirTempNode 'include'
+
+  # The node.lib goes into a \Release directory.
+  $dirNodeRelease = Join-Path $dirTempNode 'Release'
+  New-Item -ItemType Directory -Force -Path $dirNodeRelease | Out-Null
+
+  Write-Host "Downloading node.lib from $($nodeProcessRelease.libUrl)" `
+    -ForegroundColor Magenta
+  $nodeLibTarget = Join-Path $dirNodeRelease 'node.lib'
+  $webclient.DownloadFile($nodeProcessRelease.libUrl, $nodeLibTarget)
+
+  #
+  # We should now have a fully functionaly local Node with headers to use.
+  #
+
+  # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save --verbose --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION}
+  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
+      Write-Debug
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."
   }
 
-  # Rest of the Node installation process...
+  # After finishing up with our Node, let's put it in its final home
+  # and abandon this local npm directory.
+
+  # Move exe and cmd files to the \bin directory.
+  Move-Item $(Join-Path $dirTempNode '*.exe') $dirBin
+  # Move-Item $(Join-Path $dirTempNode '*.cmd') $dirBin
+  Move-Item $dirTempNodeHeadersInclude $DIR
+  Move-Item $dirNodeRelease $DIR
+
+  $finalNodeExe = Join-Path $dirBin 'node.exe'
+  $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
+
+  # Uses process.execPath to infer dev_bundle\bin, npm location, &c.
+  & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
+
+  # We use our own npm.cmd.
+  Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
+
+  Remove-DirectoryRecursively $dirTempNodeHeaders
+  Remove-DirectoryRecursively $dirTempNode
+
+  return New-Object -Type PSObject -Prop $(@{
+    node = $finalNodeExe
+    npm = $finalNpmCmd
+  })
 }
 
 Function Add-Mongo {
-  Write-Host "Downloading and installing MongoDB..." -ForegroundColor Magenta
-  # MongoDB download and installation steps...
+  # Mongo >= 3.4 no longer supports 32-bit (x86) architectures, so we package
+  # the latest 3.2 version of Mongo for those builds and >= 3.4 for x64.
+  $mongo_filenames = @{
+    windows_x64 = "mongodb-windows-x86_64-${MONGO_VERSION_64BIT}"
+  }
+
+  # the folder inside the zip still uses win32
+  $mongo_zip_filenames = @{
+    windows_x64 = "mongodb-win32-x86_64-windows-${MONGO_VERSION_64BIT}"
+  }
+
+  $previousCwd = $PWD
+
+  cd "$DIR"
+  mkdir "$DIR\mongodb"
+  mkdir "$DIR\mongodb\bin"
+  $mongo_name = $mongo_filenames.Item($PLATFORM)
+  $mongo_zip_name = $mongo_zip_filenames.Item($PLATFORM)
+  $mongo_link = "https://fastdl.mongodb.org/windows/${mongo_name}.zip"
+  $mongo_zip = "$DIR\mongodb\mongo.zip"
+
+  Write-Host "Downloading Mongo from ${mongo_link}..." -ForegroundColor Magenta
+  $webclient.DownloadFile($mongo_link, $mongo_zip)
+
+  Write-Host "Extracting Mongo ${mongo_zip}..." -ForegroundColor Magenta
+  $zip = $shell.NameSpace($mongo_zip)
+  foreach($item in $zip.items()) {
+    $shell.Namespace("$DIR\mongodb").copyhere($item, 0x14) # 0x10 - overwrite, 0x4 - no dialog
+  }
+
+  Write-Host "Putting MongoDB mongod.exe in mongodb\bin" -ForegroundColor Magenta
+  cp "$DIR\mongodb\$mongo_zip_name\bin\mongod.exe" $DIR\mongodb\bin
+  Write-Host "Putting MongoDB mongos.exe in mongodb\bin" -ForegroundColor Magenta
+  cp "$DIR\mongodb\$mongo_zip_name\bin\mongos.exe" $DIR\mongodb\bin
+
+  Write-Host "Removing the old Mongo zip..." -ForegroundColor Magenta
+  rm -Recurse -Force $mongo_zip
+  Write-Host "Removing the old Mongo directory..." -ForegroundColor Magenta
+  rm -Recurse -Force "$DIR\mongodb\$mongo_zip_name"
+
+  cd "$previousCwd"
 }
 
 Function Add-NpmModulesFromJsBundleFile {
@@ -156,26 +275,170 @@ Function Add-NpmModulesFromJsBundleFile {
     [bool]$Shrinkwrap = $False
   )
 
-  Write-Host "Installing npm modules from ${SourceJs}..." -ForegroundColor Magenta
-  & "$($Commands.node)" $SourceJs -Verbose
-  & "$($Commands.npm)" install --verbose
+  $previousCwd = $PWD
+
+  If (!(Test-Path $SourceJs)) {
+    throw "Couldn't find the source: $SourceJs"
+  }
+
+  New-Item -ItemType Directory -Force -Path $Destination | Out-Null
+
+  cd "$Destination"
+
+  Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
+    -ForegroundColor Magenta
+  & "$($Commands.node)" $SourceJs |
+    Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
+
+  # No bin-links because historically, they weren't used anyway.
+  & "$($Commands.npm)" install
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."
   }
+
+  # As of npm@5, this just renames `package-lock.json` to `npm-shrinkwrap.json`.
+  if ($Shrinkwrap -eq $True) {
+    & "$($Commands.npm)" shrinkwrap
+    if ($LASTEXITCODE -ne 0) {
+      throw "Couldn't make shrinkwrap."
+    }
+  }
+
+  cd node_modules
+
+  cd "$previousCwd"
 }
 
-# Install global 7-zip if not already present.
+# Install the global 7zip application, if necessary.
 if (!(Test-Path "$system7zip")) {
-  Write-Host "Installing 7-zip since not found at ${system7zip}" -ForegroundColor Magenta
+  Write-Host "Installing 7-zip since not found at ${system7zip}" `
+    -ForegroundColor Magenta
   Invoke-Install7ZipApplication
 }
 
-# Run the steps with added verbosity and progress logging
+# Download and install 7zip command-line tool into \bin
 Add-7ZipTool
+
+# Download and install Mongo binaries into \bin
 Add-Mongo
+
+# Add Python to \bin, and use it for Node Gyp.
 $env:PYTHON = Add-Python
+
+# Set additional options for node-gyp
+$env:GYP_MSVS_VERSION = "2015"
+$env:npm_config_nodedir = "$DIR"
+$env:npm_config_cache = "$dirNpmCache"
+
+# Allow running $dirBin commands like node and npm.
+$env:PATH = "$env:PATH;$dirBin"
+
+# Install Node.js and npm and get their paths to use from here on.
 $toolCmds = Add-NodeAndNpm
 
-Write-Host "Finished building the dev bundle!" -ForegroundColor Green
+"Location of node.exe:"
+& Get-Command node | Select-Object -ExpandProperty Definition
 
+"Node process.versions:"
+& node -p 'process.versions'
+
+"Location of npm.cmd:"
+& Get-Command npm | Select-Object -ExpandProperty Definition
+
+"Npm 'version':"
+& npm version
+
+npm config set loglevel error
+
+#
+# Install the npms for the 'server'.
+#
+$npmServerArgs = @{
+  sourceJs = "${dirCheckout}\scripts\dev-bundle-server-package.js"
+  destination = $dirServerLib
+  commands = $toolCmds
+  shrinkwrap = $True
+}
+Add-NpmModulesFromJsBundleFile @npmServerArgs
+
+# These are used by the Meteor tool bundler and written to the Meteor build.
+# For information, see the 'ServerTarget' class in tools/isobuild/bundler.js,
+# and look for 'serverPkgJson' and 'npm-shrinkwrap.json'
+mkdir -Force "${DIR}\etc"
+Move-Item $(Join-Path $dirServerLib 'package.json') "${DIR}\etc\"
+Move-Item $(Join-Path $dirServerLib 'npm-shrinkwrap.json') "${DIR}\etc\"
+
+#
+# Install the npms for the 'tool'.
+#
+$npmToolArgs = @{
+  sourceJs = "${dirCheckout}\scripts\dev-bundle-tool-package.js"
+  destination = $dirLib
+  commands = $toolCmds
+}
+Add-NpmModulesFromJsBundleFile @npmToolArgs
+
+# Leaving these probably doesn't hurt, but are removed for consistency w/ Unix.
+Remove-Item $(Join-Path $dirLib 'package.json')
+Remove-Item $(Join-Path $dirLib 'package-lock.json')
+
+Write-Host "Done writing node_modules build(s)..." -ForegroundColor Magenta
+
+Write-Host "Removing temp scratch $dirTemp" -ForegroundColor Magenta
+Remove-DirectoryRecursively $dirTemp
+
+# mark the version
+Write-Host "Writing out the bundle version..." -ForegroundColor Magenta
+echo "${BUNDLE_VERSION}" | Out-File $(Join-Path $DIR '.bundle_version.txt') -Encoding ascii
+
+$devBundleName = "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}"
+$dirBundlePreArchive = Join-Path $dirCheckout $devBundleName
+$devBundleTmpTar = Join-Path $dirCheckout "dev_bundle.tar"
+$devBundleTarGz = Join-Path $dirCheckout "${devBundleName}.tar.gz"
+
+# Cleanup from previous builds, if there are things in our way.
+Remove-DirectoryRecursively $dirBundlePreArchive
+If (Test-Path $devBundleTmpTar) {
+  Remove-Item -Force $devBundleTmpTar
+}
+If (Test-Path $devBundleTarGz) {
+  Remove-Item -Force $devBundleTarGz
+}
+
+# Get out of this directory, before we rename it.
+cd "$DIR\.."
+
+# rename the folder with the devbundle
+Write-Host "Renaming to $dirBundlePreArchive" -ForegroundColor Magenta
+Rename-Item "$DIR" $dirBundlePreArchive
+
+Write-Host "Compressing $dirBundlePreArchive to $devBundleTmpTar"
+& "$system7zip" a -ttar $devBundleTmpTar $dirBundlePreArchive
+if ($LASTEXITCODE -ne 0) {
+  throw "Failure while building $devBundleTmpTar"
+}
+
+if ((Get-Item $devBundleTmpTar).length -lt 50mb) {
+  throw "Dev bundle .tar is <50mb. If this is correct, update this message!"
+}
+
+Write-Host "Compressing $devBundleTmpTar into $devBundleTarGz" `
+  -ForegroundColor Magenta
+& "$system7zip" a -tgzip $devBundleTarGz $devBundleTmpTar
+if ($LASTEXITCODE -ne 0) {
+  throw "Failure while building $devBundleTarGz"
+}
+
+if ((Get-Item $devBundleTarGz).length -lt 30mb) {
+  throw "Dev bundle .tar.gz is <30mb. If this is correct, update this message!"
+}
+
+Write-Host "Removing $devBundleTmpTar" -ForegroundColor Magenta
+Remove-Item -Force $devBundleTmpTar
+
+Write-Host "Removing the '$devBundleName' temp directory." `
+  -ForegroundColor Magenta
+Remove-DirectoryRecursively $dirBundlePreArchive
+
+Write-Host "Done building Dev Bundle!" -ForegroundColor Green
 Exit 0

From 83e7268c8f2219a7bc481a3fa689548045f77519 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 15:58:01 -0400
Subject: [PATCH 0562/1140] add some logs

---
 scripts/generate-dev-bundle.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 2223d04b06..440fbabc7b 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -289,9 +289,10 @@ Function Add-NpmModulesFromJsBundleFile {
     -ForegroundColor Magenta
   & "$($Commands.node)" $SourceJs |
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
-
+  Write-Host "Done running Commands.node" -ForegroundColor Magenta
   # No bin-links because historically, they weren't used anyway.
   & "$($Commands.npm)" install
+  Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."
   }
@@ -303,7 +304,7 @@ Function Add-NpmModulesFromJsBundleFile {
       throw "Couldn't make shrinkwrap."
     }
   }
-
+  Write-Host "cd node_modules" -ForegroundColor Magenta
   cd node_modules
 
   cd "$previousCwd"

From 0b4af41e84e718be7c825ea09c26df4dbd94a29e Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 16:10:09 -0400
Subject: [PATCH 0563/1140] add --verbose to npm install command

---
 scripts/generate-dev-bundle.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 440fbabc7b..3ba27535f6 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -291,7 +291,8 @@ Function Add-NpmModulesFromJsBundleFile {
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
   Write-Host "Done running Commands.node" -ForegroundColor Magenta
   # No bin-links because historically, they weren't used anyway.
-  & "$($Commands.npm)" install
+  Write-Host "Run Commands.npm" -ForegroundColor Magenta
+  & "$($Commands.npm)" install --verbose
   Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."

From 68f3ca5edb2a7cf5efb70d858c7ebe44191b953b Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 16:12:31 -0400
Subject: [PATCH 0564/1140] output npm path

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 3ba27535f6..4cdfe7ee18 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -291,7 +291,7 @@ Function Add-NpmModulesFromJsBundleFile {
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
   Write-Host "Done running Commands.node" -ForegroundColor Magenta
   # No bin-links because historically, they weren't used anyway.
-  Write-Host "Run Commands.npm" -ForegroundColor Magenta
+  Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
   & "$($Commands.npm)" install --verbose
   Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {

From 23b4c8ad61a087b1b2e606693c2ecad88e881d71 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 16:18:00 -0400
Subject: [PATCH 0565/1140] using where npm to see where npm is actually
 installed

---
 scripts/generate-dev-bundle.ps1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 4cdfe7ee18..c230b63036 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -287,11 +287,15 @@ Function Add-NpmModulesFromJsBundleFile {
 
   Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
     -ForegroundColor Magenta
+
+  Write-Host "Run Commands.node path: $($Commands.npm)" -ForegroundColor Magenta
   & "$($Commands.node)" $SourceJs |
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
   Write-Host "Done running Commands.node" -ForegroundColor Magenta
   # No bin-links because historically, they weren't used anyway.
+
   Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
+  where npm
   & "$($Commands.npm)" install --verbose
   Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {

From 56669f74c185d217e3c8bc14a81807b9ae734a40 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 16:22:43 -0400
Subject: [PATCH 0566/1140] using where npm to see where npm is actually
 installed

---
 scripts/generate-dev-bundle.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index c230b63036..e7700948f7 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -288,14 +288,14 @@ Function Add-NpmModulesFromJsBundleFile {
   Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
     -ForegroundColor Magenta
 
-  Write-Host "Run Commands.node path: $($Commands.npm)" -ForegroundColor Magenta
+  Write-Host "Run Commands.node path: $($Commands.node)" -ForegroundColor Magenta
   & "$($Commands.node)" $SourceJs |
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
   Write-Host "Done running Commands.node" -ForegroundColor Magenta
   # No bin-links because historically, they weren't used anyway.
 
   Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
-  where npm
+  Write-Host where npm
   & "$($Commands.npm)" install --verbose
   Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {

From 98a0e3660da597268cd24ee966bee7e26977ee37 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 16:27:11 -0400
Subject: [PATCH 0567/1140] using where npm

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index e7700948f7..35f8016c50 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -295,7 +295,7 @@ Function Add-NpmModulesFromJsBundleFile {
   # No bin-links because historically, they weren't used anyway.
 
   Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
-  Write-Host where npm
+  Write-Host "$(where npm)"
   & "$($Commands.npm)" install --verbose
   Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {

From f0939e9be3d990245679aed7eefebf590984f48a Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 17 Oct 2024 16:29:26 -0400
Subject: [PATCH 0568/1140] --loglevel verbose

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 35f8016c50..08767dac9d 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -296,7 +296,7 @@ Function Add-NpmModulesFromJsBundleFile {
 
   Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
   Write-Host "$(where npm)"
-  & "$($Commands.npm)" install --verbose
+  & "$($Commands.npm)" install --loglevel verbose
   Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."

From 2f9c11631cf659dc7a07022ba1ed76311718f937 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 18 Oct 2024 10:11:55 +0200
Subject: [PATCH 0569/1140] #13413 Pass extra to Accounts.urls.loginToken

---
 packages/accounts-passwordless/passwordless_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-passwordless/passwordless_server.js b/packages/accounts-passwordless/passwordless_server.js
index 33925be23a..1ef908612c 100644
--- a/packages/accounts-passwordless/passwordless_server.js
+++ b/packages/accounts-passwordless/passwordless_server.js
@@ -220,7 +220,7 @@ Meteor.methods({
  */
 Accounts.sendLoginTokenEmail = async ({ userId, sequence, email, extra = {} }) => {
   const user = await getUserById(userId);
-  const url = Accounts.urls.loginToken(email, sequence);
+  const url = Accounts.urls.loginToken(email, sequence, extra);
   const options = await Accounts.generateOptionsForEmail(
     email,
     user,

From cc2d696e88acfca596a160892ee5778017f79c4d Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Fri, 18 Oct 2024 10:16:56 +0200
Subject: [PATCH 0570/1140] Node.js 22.10.0

---
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meteor b/meteor
index 79dae95006..f41aeb2dee 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.9.0.2
+BUNDLE_VERSION=22.10.0.0
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index ebe4139111..c5f7ad6dad 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.9.0
+NODE_VERSION=22.10.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.8.3

From 457ff50e02ccfa47a8a854d08bd0006dd717961f Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 18 Oct 2024 07:15:36 -0400
Subject: [PATCH 0571/1140] prevent generating dots which are not allowed in
 package names

---
 tools/utils/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/utils/utils.js b/tools/utils/utils.js
index 8ccd4f5b5a..54bbfe0b31 100644
--- a/tools/utils/utils.js
+++ b/tools/utils/utils.js
@@ -202,7 +202,7 @@ exports.sleepMs = function (ms) {
 // Return a short, high entropy string without too many funny
 // characters in it.
 exports.randomToken = function () {
-  return (Math.random() * 0x100000000 + 1).toString(36);
+  return (Math.random() * 0x100000000 + 1).toString(36).replace('.', '');
 };
 
 // Like utils.randomToken, except a legal variable name, i.e. the first

From 6f8b9f7900564ff9fc5ba46a4c3c060aa1bf2838 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 18 Oct 2024 08:50:06 -0400
Subject: [PATCH 0572/1140] remove lodash

---
 packages/webapp/package.js       | 1 -
 packages/webapp/webapp_server.js | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index d225d066db..9d5c36a641 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -13,7 +13,6 @@ Npm.depends({
   send: "1.1.0",
   "stream-to-string": "1.2.1",
   qs: "6.13.0",
-  'lodash.has': '4.5.2',
   "useragent-ng": "2.4.3",
   "tmp": "0.2.3",
 });
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 5b3ef24edf..5849c90642 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -19,7 +19,6 @@ import {
 } from './socket_file.js';
 import cluster from 'cluster';
 import { execSync } from 'child_process';
-import has from 'lodash.has';
 
 var SHORT_SOCKET_TIMEOUT = 5 * 1000;
 var LONG_SOCKET_TIMEOUT = 120 * 1000;
@@ -622,7 +621,7 @@ WebAppInternals.staticFilesMiddleware = async function(
   };
 
   if (
-    has(additionalStaticJs, pathname) &&
+    pathname in additionalStaticJs &&
     !WebAppInternals.inlineScriptsAllowed()
   ) {
     serveStaticJs(additionalStaticJs[pathname]);

From 24d7a8dc3e053ecf24bba9bca95e59f0f40d1d73 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 18 Oct 2024 09:51:17 -0400
Subject: [PATCH 0573/1140] fix test-helpers

---
 packages/test-helpers/async_multi.js          | 18 +++++++++---------
 packages/test-helpers/callback_logger.js      | 19 ++++++++-----------
 packages/test-helpers/connection_server.js    |  4 +---
 packages/test-helpers/package.js              |  6 ------
 .../test-helpers/try_all_permutations_test.js |  2 +-
 5 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/packages/test-helpers/async_multi.js b/packages/test-helpers/async_multi.js
index 1286508fde..c9c09ac66e 100644
--- a/packages/test-helpers/async_multi.js
+++ b/packages/test-helpers/async_multi.js
@@ -53,31 +53,31 @@ var ExpectationManager = function (test, onComplete) {
 };
 
 Object.assign(ExpectationManager.prototype, {
-  expect: function (...args) {
+  expect: function (/* arguments */) {
     var self = this;
 
-    if (typeof args[0] === "function")
-      var expected = args[0];
+    if (typeof arguments[0] === "function")
+      var expected = arguments[0];
     else
-      var expected = args;
+      var expected = Array.from(arguments);
 
     if (self.closed)
       throw new Error("Too late to add more expectations to the test");
     self.outstanding++;
 
-    return async function (...args) {
+    return async function (/* arguments */) {
       if (self.dead)
         return;
 
       if (typeof expected === "function") {
         try {
-          await expected.apply({}, args);
+          await expected.apply({}, arguments);
         } catch (e) {
           if (self.cancel())
             self.test.exception(e);
         }
       } else {
-        self.test.equal(args, expected);
+        self.test.equal(Array.from(arguments), expected);
       }
 
       self.outstanding--;
@@ -115,12 +115,12 @@ testAsyncMulti = function (name, funcs, { isOnly = false } = {}) {
 
   const addFunction = isOnly ? Tinytest.onlyAsync : Tinytest.addAsync;
   addFunction(name, function (test, onComplete) {
-    var remaining = Object.assign({}, funcs);
+    var remaining = [...funcs]
     var context = {};
     var i = 0;
 
     var runNext = function () {
-      var func = Object.values(remaining).shift();
+      var func = remaining.shift();
       if (!func) {
         delete test.extraDetails.asyncBlock;
         onComplete();
diff --git a/packages/test-helpers/callback_logger.js b/packages/test-helpers/callback_logger.js
index 2f98cbe8de..299edf94e6 100644
--- a/packages/test-helpers/callback_logger.js
+++ b/packages/test-helpers/callback_logger.js
@@ -1,6 +1,3 @@
-import isEmpty from 'lodash.isempty';
-import isEqual from 'lodash.isequal';
-
 // This file allows you to write tests that expect certain callbacks to be
 // called in certain orders, or optionally in groups where the order does not
 // matter.  It can be set up in either a synchronous manner, so that each
@@ -24,11 +21,9 @@ var CallbackLogger = function (test, callbackNames) {
   var self = this;
   self._log = [];
   self._test = test;
-  self._yielded = false;
   callbackNames.forEach(function (callbackName) {
-    self[callbackName] = function () {
-      var args = Array.from(arguments);
-      self._log.push({callback: callbackName, args: args});
+    self[callbackName] = function (...args) {
+      self._log.push({ callback: callbackName, args });
     };
   });
 };
@@ -36,7 +31,7 @@ var CallbackLogger = function (test, callbackNames) {
 CallbackLogger.prototype.expectResult = async function (callbackName, args) {
   var self = this;
   await self._waitForLengthOrTimeout(1);
-  if (isEmpty(self._log)) {
+  if (self._log.length === 0) {
     self._test.fail(["Expected callback " + callbackName + " got none"]);
     return;
   }
@@ -78,13 +73,15 @@ CallbackLogger.prototype.expectResultUnordered = async function (list) {
 
   await self._waitForLengthOrTimeout(list.length);
 
-  list = [...list]; // shallow copy.
+  list = [...list];
+
   var i = list.length;
+
   while (i > 0) {
     var found = false;
     var dequeued = self._log.shift();
     for (var j = 0; j < list.length; j++) {
-      if (isEqual(list[j], dequeued)) {
+      if (list[j] === dequeued) {
         list.splice(j, 1);
         found = true;
         break;
@@ -114,4 +111,4 @@ CallbackLogger.prototype.expectNoResult = async function (fn) {
   await self._waitForLengthOrTimeout(0);
 
   self._expectNoResultImpl();
-};
\ No newline at end of file
+};
diff --git a/packages/test-helpers/connection_server.js b/packages/test-helpers/connection_server.js
index ffb15ad5bc..255bfed03d 100644
--- a/packages/test-helpers/connection_server.js
+++ b/packages/test-helpers/connection_server.js
@@ -1,5 +1,3 @@
-import isString from 'lodash.isstring';
-
 // Establish a connection from the server to the server, and wait
 // until the client side of the connection has received the session
 // id.  On success call `succeeded` with two arguments, the client
@@ -15,7 +13,7 @@ makeTestConnection = function (test, succeeded, failed) {
 
   // Add incoming connections to `serverConns`.
   var onConnectionHandle = Meteor.onConnection(function (serverConn) {
-    test.isTrue(isString(serverConn.id), "connection handle id exists and is a string");
+    test.isTrue(typeof serverConn.id === 'string', "connection handle id exists and is a string");
     if (serverConns[serverConn.id]) {
       test.fail("onConnection callback called multiple times for same session id");
       failed();
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index bb7f296c60..e8680d12ad 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -3,12 +3,6 @@ Package.describe({
   version: "2.0.1",
 });
 
-Npm.depends({
-  'lodash.isequal': '4.5.0',
-  'lodash.isempty': '4.4.0',
-  'lodash.isstring': '4.0.1'
-});
-
 Package.onUse(function (api) {
   api.use([
     "ecmascript",
diff --git a/packages/test-helpers/try_all_permutations_test.js b/packages/test-helpers/try_all_permutations_test.js
index 4c9b451fff..91378b1bf8 100644
--- a/packages/test-helpers/try_all_permutations_test.js
+++ b/packages/test-helpers/try_all_permutations_test.js
@@ -61,7 +61,7 @@ Tinytest.add("test-helpers - try_all_permutations", function (test) {
     var seen = {};
 
     for (var i = 0; i < n; i++)
-      fs.push(function (x) { seq += x + "_"; }.bind(null, i));
+      fs.push((function (x) { seq += x + "_"; }).bind(null, i));
     try_all_permutations(
       function () {seq = "";},
       fs,

From cbeb51fd203369585941450e4dc589eaf3fd935a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 18 Oct 2024 09:52:06 -0400
Subject: [PATCH 0574/1140] adjust test-in-console

---
 .envrc                                        |  4 ++
 packages/test-in-console/package.js           |  8 +--
 packages/test-in-console/phantomRunner.js     | 69 -------------------
 ...puppeteerRunner.js => puppeteer_runner.js} | 11 ++-
 packages/test-in-console/reporter.js          | 13 +---
 packages/test-in-console/run.sh               | 25 ++-----
 6 files changed, 25 insertions(+), 105 deletions(-)
 delete mode 100644 packages/test-in-console/phantomRunner.js
 rename packages/test-in-console/{puppeteerRunner.js => puppeteer_runner.js} (94%)

diff --git a/.envrc b/.envrc
index a60b67f960..47ab5b6410 100644
--- a/.envrc
+++ b/.envrc
@@ -27,6 +27,10 @@ function @test-self {
   @meteor self-test "$@"
 }
 
+function @test-in-console {
+  "$ROOT_DIR/packages/test-in-console/run.sh" "$@"
+}
+
 function @check-syntax {
   node "$ROOT_DIR/scripts/admin/check-legacy-syntax/check-syntax.js"
 }
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 810f07e1f3..c2e880562a 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -4,7 +4,9 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-  api.use(['tinytest', 'random', 'ejson', 'check']);
+  api.versionsFrom('3.0.1');
+
+  api.use(['tinytest', 'random', 'ejson', 'check', 'ecmascript']);
   api.use('fetch', 'server');
 
   api.export('TEST_STATUS', 'client');
@@ -13,9 +15,7 @@ Package.onUse(function(api) {
 
   api.addFiles(['reporter.js'], 'server');
 
-  // This is to be run by phantomjs, not as part of normal package code.
-  api.addAssets('phantomRunner.js', 'server');
-  api.addAssets('puppeteerRunner.js', 'server');
+  api.addAssets('puppeteer_runner.js', 'server');
 
   api.export('runTests');
 });
diff --git a/packages/test-in-console/phantomRunner.js b/packages/test-in-console/phantomRunner.js
deleted file mode 100644
index 43fc0b8c47..0000000000
--- a/packages/test-in-console/phantomRunner.js
+++ /dev/null
@@ -1,69 +0,0 @@
-var createPage = require('webpage').create;
-var system = require('system');
-var platform = system.args[1] || 'local';
-var platformUrl = system.env.URL + platform;
-var testUrls = [
-  // Additional application URLs can be added here to re-run tests in
-  // PhantomJS with different query parameter-based configurations.
-  platformUrl
-];
-
-function runNextUrl() {
-  var url = testUrls.shift();
-  if (!url) {
-    phantom.exit(0);
-    return;
-  }
-
-  console.log('Running Meteor tests in PhantomJS... ' + url);
-
-  var page = createPage();
-
-  page.onConsoleMessage = function(message) {
-    console.log(message);
-  };
-
-  page.open(url);
-
-  function poll() {
-    if (isDone(page)) {
-      var failCount = getFailCount(page);
-      if (failCount > 0) {
-        phantom.exit(1);
-      } else {
-        page.close();
-        setTimeout(runNextUrl, 1000);
-      }
-    } else {
-      setTimeout(poll, 1000);
-    }
-  }
-
-  poll();
-}
-
-function isDone(page) {
-  return page.evaluate(function() {
-    if (typeof TEST_STATUS !== 'undefined') {
-      return TEST_STATUS.DONE;
-    }
-
-    return typeof DONE !== 'undefined' && DONE;
-  });
-}
-
-function getFailCount(page) {
-  return page.evaluate(function() {
-    if (typeof TEST_STATUS !== 'undefined') {
-      return TEST_STATUS.FAILURES;
-    }
-
-    if (typeof FAILURES === 'undefined') {
-      return 1;
-    }
-
-    return 0;
-  });
-}
-
-runNextUrl();
diff --git a/packages/test-in-console/puppeteerRunner.js b/packages/test-in-console/puppeteer_runner.js
similarity index 94%
rename from packages/test-in-console/puppeteerRunner.js
rename to packages/test-in-console/puppeteer_runner.js
index d0a59ae9c9..7299fe66f8 100644
--- a/packages/test-in-console/puppeteerRunner.js
+++ b/packages/test-in-console/puppeteer_runner.js
@@ -5,6 +5,10 @@ let testNumber = 0;
 async function runNextUrl(browser) {
   const page = await browser.newPage();
 
+  page.on('console', msg => {
+    console.log('PAGE LOG:', msg.text());
+  });
+
   page.on('console', async msg => {
     // this is a way to make sure the travis does not timeout
     // if the test is running for too long without any output to the console (10 minutes)
@@ -21,6 +25,8 @@ async function runNextUrl(browser) {
       const currentServerTest =
        await page.evaluate(async () => await __Tinytest._getCurrentRunningTestOnServer());
 
+      console.log({ currentClientTest, currentServerTest })
+
       if (currentServerTest !== '') {
         console.log(`Currently running on the server test: ${ currentServerTest }`);
         return;
@@ -58,7 +64,7 @@ async function runNextUrl(browser) {
     }
   }
 
-  poll();
+  await poll();
 }
 
 /**
@@ -130,9 +136,10 @@ async function runTests() {
       '--disable-setuid-sandbox',
       '--disable-web-security',
     ],
+    headless: "new",
   });
   console.log(`Using version: ${await browser.version()}`);
-  runNextUrl(browser);
+  await runNextUrl(browser)
 }
 
 runTests().catch((e) =>
diff --git a/packages/test-in-console/reporter.js b/packages/test-in-console/reporter.js
index 099e43a81c..7fb49b28ce 100644
--- a/packages/test-in-console/reporter.js
+++ b/packages/test-in-console/reporter.js
@@ -1,14 +1,7 @@
-// A hacky way to extract the phantom runner script from the package.
-if (process.env.WRITE_RUNNER_JS) {
-  Npm.require('fs').writeFileSync(
-    process.env.WRITE_RUNNER_JS, Buffer.from(Assets.getBinary('runner.js')));
-}
+let url = null;
 
-var url =  null;
-if (Meteor.settings &&
-    Meteor.settings.public &&
-    Meteor.settings.public.runId &&
-    Meteor.settings.public.reportTo) {
+if (Meteor.settings?.public?.runId &&
+    Meteor.settings?.public?.reportTo) {
   url = Meteor.settings.public.reportTo +
       "/report/" +
       Meteor.settings.public.runId;
diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh
index 38012a605d..9a6231d209 100755
--- a/packages/test-in-console/run.sh
+++ b/packages/test-in-console/run.sh
@@ -8,36 +8,21 @@
 cd $(dirname $0)/../..
 export METEOR_HOME=`pwd`
 
-export phantom=$phantom
-
-# only install dependencies if required
-if [ "$phantom" = true ]
-then
-    # Just in case these packages haven't been installed elsewhere.
-    ./meteor npm install -g phantomjs-prebuilt browserstack-webdriver
-else
-    # Installs into dev_bundle/lib/node_modules/puppeteer.
-    ./meteor npm install -g puppeteer@20.4.0
-fi
+# Installs into dev_bundle/lib/node_modules/puppeteer.
+./meteor npm install -g puppeteer@20.4.0
 
 export PATH=$METEOR_HOME:$PATH
-# synchronously get the dev bundle and NPM modules if they're not there.
-./meteor --help || exit 1
 
 export URL='http://127.0.0.1:4096/'
 export METEOR_PACKAGE_DIRS='packages/deprecated'
 
-exec 3< <(meteor test-packages --driver-package test-in-console -p 4096 --exclude ${TEST_PACKAGES_EXCLUDE:-''} $1)
+exec 3< <(./meteor test-packages --driver-package test-in-console -p 4096 --exclude ${TEST_PACKAGES_EXCLUDE:-''} $1)
 EXEC_PID=$!
+trap "pkill -TERM -P $EXEC_PID; exit 1" SIGINT
 
 sed '/test-in-console listening$/q' <&3
 
-if [ "$phantom" = true ]
-then
-    ./dev_bundle/bin/phantomjs "$METEOR_HOME/packages/test-in-console/phantomRunner.js"
-else
-    node "$METEOR_HOME/packages/test-in-console/puppeteerRunner.js"
-fi
+node --trace-warnings "$METEOR_HOME/packages/test-in-console/puppeteer_runner.js"
 
 STATUS=$?
 

From 4d39ba67c740337832c29ac96cc3e2edc57e87a5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 18 Oct 2024 09:52:25 -0400
Subject: [PATCH 0575/1140] shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json           | 12 ++++++------
 .../compileStylusBatch/npm-shrinkwrap.json     | 18 +++++++++---------
 .../email/.npm/package/npm-shrinkwrap.json     |  6 +++---
 .../webapp/.npm/package/npm-shrinkwrap.json    | 11 +++--------
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
index ebacac28ad..64d0411523 100644
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
+      "version": "22.7.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
+      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
     },
     "@types/notp": {
       "version": "2.0.5",
@@ -32,9 +32,9 @@
       "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA=="
     },
     "tslib": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
+      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA=="
     },
     "undici-types": {
       "version": "6.19.8",
diff --git a/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json b/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
index 4bc9ce2a15..1fe92eee26 100644
--- a/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
+++ b/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-fKSWtyNQTclfi1A+s2KU91/r1mfANG1ZibxTdCwJGfV1J9UwcV22plFOm0wkaq4WzqW87zxiAkyp2Ho1Wn1NnA=="
     },
     "caniuse-db": {
-      "version": "1.0.30001640",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001640.tgz",
-      "integrity": "sha512-K8/5iWoH/NULlqJz/iaopQJraQCHGcFGvs8dmTpAH7GyvoQu2Xq8ht3jq2c+wNck4bgQu/PHu2GN2mJfUj9qtw=="
+      "version": "1.0.30001669",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001669.tgz",
+      "integrity": "sha512-GK+G6CnRZ7IY2J2H3bcm9kshwHcJ4ZWDC5u9WaIh7DQAAHHeuxIPtaZd15GMTmGvGbDx/u1AcQs3MYur9Tem7A=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -47,9 +47,9 @@
       "integrity": "sha512-OI38lO4JQQX2GSisTqwiSFxiWNmLajXdW4tCCxAuiwGKjusHALQadSHBSxGlU8lrFp47IkLuU2AfSYz31qpETQ=="
     },
     "debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg=="
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="
     },
     "fs.realpath": {
       "version": "1.0.0",
@@ -97,9 +97,9 @@
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
     },
     "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "multi-stage-sourcemap": {
       "version": "0.2.1",
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index fcc8fd64c8..68404a03da 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
+      "version": "22.7.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
+      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
     },
     "@types/nodemailer": {
       "version": "6.4.14",
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index 39ebcd33bb..e904107de5 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
     },
     "@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
+      "version": "22.7.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
+      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
     },
     "@types/qs": {
       "version": "6.9.16",
@@ -514,11 +514,6 @@
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
       "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
     },
-    "undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",

From 6112f87102a7147df74b05f86c333c534791be8a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 18 Oct 2024 09:55:21 -0400
Subject: [PATCH 0576/1140] cleanup

---
 packages/test-in-console/puppeteer_runner.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/test-in-console/puppeteer_runner.js b/packages/test-in-console/puppeteer_runner.js
index 7299fe66f8..0ad644d070 100644
--- a/packages/test-in-console/puppeteer_runner.js
+++ b/packages/test-in-console/puppeteer_runner.js
@@ -5,9 +5,9 @@ let testNumber = 0;
 async function runNextUrl(browser) {
   const page = await browser.newPage();
 
-  page.on('console', msg => {
-    console.log('PAGE LOG:', msg.text());
-  });
+  // page.on('console', msg => {
+  //   console.log('PAGE LOG:', msg.text());
+  // });
 
   page.on('console', async msg => {
     // this is a way to make sure the travis does not timeout
@@ -25,8 +25,6 @@ async function runNextUrl(browser) {
       const currentServerTest =
        await page.evaluate(async () => await __Tinytest._getCurrentRunningTestOnServer());
 
-      console.log({ currentClientTest, currentServerTest })
-
       if (currentServerTest !== '') {
         console.log(`Currently running on the server test: ${ currentServerTest }`);
         return;

From bb4ca37afde8ce149599718aa19cd01298e7a521 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 18 Oct 2024 09:56:25 -0400
Subject: [PATCH 0577/1140] cannot use it here

---
 packages/test-in-console/package.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index c2e880562a..04a0729eb2 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -4,8 +4,6 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-  api.versionsFrom('3.0.1');
-
   api.use(['tinytest', 'random', 'ejson', 'check', 'ecmascript']);
   api.use('fetch', 'server');
 

From 268a7b6762e8e23e679191756bbbbb59eb60db4b Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Fri, 18 Oct 2024 10:14:40 -0400
Subject: [PATCH 0578/1140] cat content from npm script

---
 scripts/generate-dev-bundle.ps1 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 08767dac9d..9591c0f189 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -294,9 +294,15 @@ Function Add-NpmModulesFromJsBundleFile {
   Write-Host "Done running Commands.node" -ForegroundColor Magenta
   # No bin-links because historically, they weren't used anyway.
 
+
+  Get-Content "$($Commands.npm)"
+
   Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
-  Write-Host "$(where npm)"
-  & "$($Commands.npm)" install --loglevel verbose
+
+  & "$($Commands.npm)" install 2>&1 | Out-File -FilePath $(Join-Path $Destination 'npm-install.log') -Encoding ascii
+
+  Get-Content "$(Join-Path $Destination 'npm-install.log')"
+
   Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."

From 3bcd35af87b07fd4747235d5283c8fb1e72f7595 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Fri, 18 Oct 2024 16:23:56 -0400
Subject: [PATCH 0579/1140] try to run npm directly

---
 scripts/generate-dev-bundle.ps1 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 4720f3d040..a3e7052d65 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -299,9 +299,7 @@ Function Add-NpmModulesFromJsBundleFile {
 
   Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
 
-  & "$($Commands.npm)" install 2>&1 | Out-File -FilePath $(Join-Path $Destination 'npm-install.log') -Encoding ascii
-
-  Get-Content "$(Join-Path $Destination 'npm-install.log')"
+  & npm install
 
   Write-Host "Done running Commands.npm" -ForegroundColor Magenta
   if ($LASTEXITCODE -ne 0) {

From 7ffbfdb7cb52e5ed561809310e5145a10740768d Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Fri, 18 Oct 2024 16:28:25 -0400
Subject: [PATCH 0580/1140] try to get content from package.json

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index a3e7052d65..bd27faf7de 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -295,7 +295,7 @@ Function Add-NpmModulesFromJsBundleFile {
   # No bin-links because historically, they weren't used anyway.
 
 
-  Get-Content "$($Commands.npm)"
+  Get-Content "$(Join-Path $Destination 'package.json')"
 
   Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
 

From 7090b5b3ecf86e1ec2322cae81e07428fbb1ecab Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Fri, 18 Oct 2024 17:07:11 -0400
Subject: [PATCH 0581/1140] - try to install npm essentials - update npm -
 update node-gyp

---
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/dev-bundle-tool-package.js | 4 ++--
 scripts/generate-dev-bundle.ps1    | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index c5f7ad6dad..a5a8d81b8b 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -8,7 +8,7 @@ ARCH=$(uname -m)
 NODE_VERSION=22.10.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
-NPM_VERSION=10.8.3
+NPM_VERSION=10.9.0
 
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 8c428e6342..8d49a8e712 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -10,8 +10,8 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.8.3",
-    "node-gyp": "9.4.0",
+    npm: "10.9.0",
+    "node-gyp": "10.2.0",
     "@mapbox/node-pre-gyp": "1.0.11",
     typescript: "5.6.3",
     "@meteorjs/babel": "7.20.0",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index bd27faf7de..a36361b729 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -360,6 +360,9 @@ $toolCmds = Add-NodeAndNpm
 
 npm config set loglevel error
 
+Write-Host "Install Windows essentials: $($Commands.npm)" -ForegroundColor Magenta
+& npm install --global --production windows-build-tools
+
 #
 # Install the npms for the 'server'.
 #

From e30a64a96dbc1e3e1748573ad9c6ee007f1e32dd Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Fri, 18 Oct 2024 17:11:41 -0400
Subject: [PATCH 0582/1140] - set npm verbose

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index a36361b729..a0ed785dd7 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -358,7 +358,7 @@ $toolCmds = Add-NodeAndNpm
 "Npm 'version':"
 & npm version
 
-npm config set loglevel error
+npm config set loglevel verbose
 
 Write-Host "Install Windows essentials: $($Commands.npm)" -ForegroundColor Magenta
 & npm install --global --production windows-build-tools

From e3b5cdd71af7b762fae999268073e4b4dabb22b3 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Sun, 20 Oct 2024 15:57:10 +0300
Subject: [PATCH 0583/1140] Remove underscore import assertion

---
 tools/tests/apps/modules/tests.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/tests/apps/modules/tests.js b/tools/tests/apps/modules/tests.js
index e3230b7a8f..0e2635d3ee 100644
--- a/tools/tests/apps/modules/tests.js
+++ b/tools/tests/apps/modules/tests.js
@@ -436,7 +436,6 @@ describe("Meteor packages", () => {
   });
 
   it("should be importable", () => {
-    assert.strictEqual(require("meteor/underscore")._, _);
 
     const Blaze = require("meteor/blaze").Blaze;
     assert.strictEqual(typeof Blaze, "object");

From 5c11763385d1b6fab282bc57363b675c246aa653 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 08:43:58 -0400
Subject: [PATCH 0584/1140] replace travis with github workflow

---
 .../workflows/test-deprecated-packages.yml    | 40 +++++++++++++++++++
 .travis.yml                                   | 32 ---------------
 2 files changed, 40 insertions(+), 32 deletions(-)
 create mode 100644 .github/workflows/test-deprecated-packages.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
new file mode 100644
index 0000000000..c5722582ad
--- /dev/null
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -0,0 +1,40 @@
+name: Test Deprecated Packages
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    env:
+      PUPPETEER_DOWNLOAD_PATH: ~/.npm/chromium
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.15.1
+
+      - name: Cache Node.js modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.npm
+            .meteor
+            .babel-cache
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run tests
+        run: ./packages/test-in-console/run.sh
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4d9997a4d7..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-language: node_js
-os: linux
-dist: jammy
-sudo: required
-services: xvfb
-node_js:
-  - "20.15.1"
-cache:
-  directories:
-    - ".meteor"
-    - ".babel-cache"
-script:
-  - travis_retry ./packages/test-in-console/run.sh
-env:
-  global:
-    - CXX=g++-12
-    - phantom=false
-    - PUPPETEER_DOWNLOAD_PATH=~/.npm/chromium
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-12
-      - libnss3
-
-before_install:
-  - cat /etc/apt/sources.list
-  - python3 --version
-  - echo "deb http://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee -a /etc/apt/sources.list
-  - sudo apt-get update
-  - sudo apt-get install -y libnss3

From bcfaa06f03f52a170469ac863ac16473a3877f73 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 08:47:40 -0400
Subject: [PATCH 0585/1140] add chromium

---
 .github/workflows/test-deprecated-packages.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index c5722582ad..9bdee3b6ff 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -10,13 +10,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    env:
-      PUPPETEER_DOWNLOAD_PATH: ~/.npm/chromium
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Install Chromium
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y chromium-browser
+
+      - name: Set PUPPETEER_EXECUTABLE_PATH
+        run: echo "PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser" >> $GITHUB_ENV
+
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:

From 5d676fb9f2b7f81edfe58a6014e7612024c7ffc1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:03:41 -0400
Subject: [PATCH 0586/1140] try this

---
 .github/workflows/test-deprecated-packages.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index 9bdee3b6ff..d1a0c402e6 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -8,20 +8,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+
+    env:
+      PUPPETEER_DOWNLOAD_PATH: .npm/chromium
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Install Chromium
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y chromium-browser
-
-      - name: Set PUPPETEER_EXECUTABLE_PATH
-        run: echo "PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser" >> $GITHUB_ENV
-
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:

From ae0afae9e486416b6e022da5a8d3f5d4f0673db9 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:06:24 -0400
Subject: [PATCH 0587/1140] needs to be absolute

---
 .github/workflows/test-deprecated-packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index d1a0c402e6..b16ee7177a 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     env:
-      PUPPETEER_DOWNLOAD_PATH: .npm/chromium
+      PUPPETEER_DOWNLOAD_PATH: /home/runner/.npm/chromium
 
     steps:
       - name: Checkout code

From 64f272241abad525be048921b097fe808c36103b Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:08:59 -0400
Subject: [PATCH 0588/1140] cancel previous runs on new pushes

---
 .github/workflows/meteor-selftest-windows.yml  | 3 +++
 .github/workflows/test-deprecated-packages.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index d78f633ec3..187b20be0f 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -22,6 +22,9 @@ env:
 jobs:
   test:
     runs-on: windows-2019-meteor
+    concurrency:
+      group: ${{ github.head_ref }}
+      cancel-in-progress: true
 
     steps:
       - name: Checkout code
diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index b16ee7177a..3463fdea19 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -9,6 +9,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-20.04
+    concurrency:
+      group: ${{ github.head_ref }}
+      cancel-in-progress: true
 
     env:
       PUPPETEER_DOWNLOAD_PATH: /home/runner/.npm/chromium

From f46d9059adb9d3abdda7f48a33d2309d80411d05 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:17:46 -0400
Subject: [PATCH 0589/1140] fix test

---
 packages/test-helpers/callback_logger.js | 4 +++-
 packages/test-helpers/package.js         | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/test-helpers/callback_logger.js b/packages/test-helpers/callback_logger.js
index 299edf94e6..0cac2c825c 100644
--- a/packages/test-helpers/callback_logger.js
+++ b/packages/test-helpers/callback_logger.js
@@ -1,3 +1,5 @@
+import isEqual from 'lodash.isequal';
+
 // This file allows you to write tests that expect certain callbacks to be
 // called in certain orders, or optionally in groups where the order does not
 // matter.  It can be set up in either a synchronous manner, so that each
@@ -81,7 +83,7 @@ CallbackLogger.prototype.expectResultUnordered = async function (list) {
     var found = false;
     var dequeued = self._log.shift();
     for (var j = 0; j < list.length; j++) {
-      if (list[j] === dequeued) {
+      if (isEqual(list[j], dequeued)) {
         list.splice(j, 1);
         found = true;
         break;
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index e8680d12ad..8eea18c3f9 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -3,6 +3,10 @@ Package.describe({
   version: "2.0.1",
 });
 
+Npm.depends({
+  'lodash.isequal': '4.5.0',
+})
+
 Package.onUse(function (api) {
   api.use([
     "ecmascript",

From 7a83d69b34abf083acbb85c72006059dd3a9c7ce Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:18:53 -0400
Subject: [PATCH 0590/1140] install deps

---
 .github/workflows/test-deprecated-packages.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index 3463fdea19..b5d8aa839b 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -17,6 +17,9 @@ jobs:
       PUPPETEER_DOWNLOAD_PATH: /home/runner/.npm/chromium
 
     steps:
+      - name: Update and install dependencies
+        run: sudo apt-get update && sudo apt-get install -y libnss3 g++-12
+
       - name: Checkout code
         uses: actions/checkout@v3
 

From c6354d8604ef17d0d4220030224b330c01daf8bc Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:22:23 -0400
Subject: [PATCH 0591/1140] adjust group

---
 .github/workflows/meteor-selftest-windows.yml  | 2 +-
 .github/workflows/test-deprecated-packages.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index 187b20be0f..2935532c1b 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -23,7 +23,7 @@ jobs:
   test:
     runs-on: windows-2019-meteor
     concurrency:
-      group: ${{ github.head_ref }}
+      group: ${{ github.head_ref }}-meteor-selftest-windows
       cancel-in-progress: true
 
     steps:
diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index b5d8aa839b..8d033b91aa 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     concurrency:
-      group: ${{ github.head_ref }}
+      group: ${{ github.head_ref }}-test-deprecated-packages
       cancel-in-progress: true
 
     env:

From b593ef42fa99525cdb2ebbdb58bb160a392936c7 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:36:04 -0400
Subject: [PATCH 0592/1140] use latest

---
 .github/workflows/test-deprecated-packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index 8d033b91aa..d3d1cf29a9 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     concurrency:
       group: ${{ github.head_ref }}-test-deprecated-packages
       cancel-in-progress: true

From ad9ea2a533cded596ee433a5d7fc7b4eb4aa6fa1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:45:28 -0400
Subject: [PATCH 0593/1140] set timeout and add dev_bundle to cache

---
 .github/workflows/test-deprecated-packages.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index d3d1cf29a9..e19be07913 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -12,6 +12,7 @@ jobs:
     concurrency:
       group: ${{ github.head_ref }}-test-deprecated-packages
       cancel-in-progress: true
+    timeout-minutes: 60
 
     env:
       PUPPETEER_DOWNLOAD_PATH: /home/runner/.npm/chromium
@@ -35,7 +36,9 @@ jobs:
             ~/.npm
             .meteor
             .babel-cache
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+            dev_bundle
+            /home/runner/.npm/chromium
+          key: ${{ runner.os }}-node-${{ hashFiles('meteor', '**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 

From 230a3c2eb3236047728562d38f37577033983661 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 21 Oct 2024 09:53:18 -0400
Subject: [PATCH 0594/1140] add travis ci back until we figure out how the
 github workflow should work

---
 .../workflows/test-deprecated-packages.yml    | 13 +++++---
 .travis.yml                                   | 32 +++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.github/workflows/test-deprecated-packages.yml b/.github/workflows/test-deprecated-packages.yml
index e19be07913..e4ed12fe92 100644
--- a/.github/workflows/test-deprecated-packages.yml
+++ b/.github/workflows/test-deprecated-packages.yml
@@ -1,10 +1,13 @@
 name: Test Deprecated Packages
 
-on:
-  push:
-    branches:
-      - main
-  pull_request:
+# Disabled until we figure out how to fix the error from puppeteer
+# Runs on Travis CI for now
+#
+#on:
+#  push:
+#    branches:
+#      - main
+#  pull_request:
 
 jobs:
   build:
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..4d9997a4d7
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,32 @@
+language: node_js
+os: linux
+dist: jammy
+sudo: required
+services: xvfb
+node_js:
+  - "20.15.1"
+cache:
+  directories:
+    - ".meteor"
+    - ".babel-cache"
+script:
+  - travis_retry ./packages/test-in-console/run.sh
+env:
+  global:
+    - CXX=g++-12
+    - phantom=false
+    - PUPPETEER_DOWNLOAD_PATH=~/.npm/chromium
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-12
+      - libnss3
+
+before_install:
+  - cat /etc/apt/sources.list
+  - python3 --version
+  - echo "deb http://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee -a /etc/apt/sources.list
+  - sudo apt-get update
+  - sudo apt-get install -y libnss3

From b5c845a7c4b7184a693d9c465ec1935916ce4ff5 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 10:05:53 -0400
Subject: [PATCH 0595/1140] - stop trying to install windows-tool

---
 scripts/generate-dev-bundle.ps1 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index a0ed785dd7..fd7b0df05c 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -360,9 +360,6 @@ $toolCmds = Add-NodeAndNpm
 
 npm config set loglevel verbose
 
-Write-Host "Install Windows essentials: $($Commands.npm)" -ForegroundColor Magenta
-& npm install --global --production windows-build-tools
-
 #
 # Install the npms for the 'server'.
 #

From 94f8a61f0bf3206c705e5c0fc69f625671b7b6f3 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 16:18:19 -0400
Subject: [PATCH 0596/1140] - try to try catch error

---
 scripts/generate-dev-bundle.ps1 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index fd7b0df05c..132f6ec357 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -182,13 +182,16 @@ Function Add-NodeAndNpm {
   #
   # We should now have a fully functionaly local Node with headers to use.
   #
-
+  try {
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
     --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
       Write-Debug
-
+   } catch {
+      Write-Error $_.Exception.Message
+      exit 1
+    }
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."
   }

From 06477991817b534191c3927ac19ecee28ca5864e Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 16:21:26 -0400
Subject: [PATCH 0597/1140] - try to try catch error with write-host

---
 scripts/generate-dev-bundle.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 132f6ec357..c61052ccaa 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -189,7 +189,8 @@ Function Add-NodeAndNpm {
     --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
       Write-Debug
    } catch {
-      Write-Error $_.Exception.Message
+      Write-Host $_.Exception.Message
+      Write-Host $_.Exception
       exit 1
     }
   if ($LASTEXITCODE -ne 0) {

From e47679bb985aaaaadd4d98a00335a09c42d23aab Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 16:24:34 -0400
Subject: [PATCH 0598/1140] - set loglevel to error

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index c61052ccaa..a1bea42fff 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -362,7 +362,7 @@ $toolCmds = Add-NodeAndNpm
 "Npm 'version':"
 & npm version
 
-npm config set loglevel verbose
+npm config set loglevel error
 
 #
 # Install the npms for the 'server'.

From 9c174676c9366b0559ed419b11d8b9adfa396322 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 16:28:37 -0400
Subject: [PATCH 0599/1140] - revert changes

---
 scripts/generate-dev-bundle.ps1 | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index a1bea42fff..2223d04b06 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -182,17 +182,13 @@ Function Add-NodeAndNpm {
   #
   # We should now have a fully functionaly local Node with headers to use.
   #
-  try {
+
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
     --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
       Write-Debug
-   } catch {
-      Write-Host $_.Exception.Message
-      Write-Host $_.Exception
-      exit 1
-    }
+
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."
   }
@@ -291,21 +287,11 @@ Function Add-NpmModulesFromJsBundleFile {
 
   Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
     -ForegroundColor Magenta
-
-  Write-Host "Run Commands.node path: $($Commands.node)" -ForegroundColor Magenta
   & "$($Commands.node)" $SourceJs |
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
-  Write-Host "Done running Commands.node" -ForegroundColor Magenta
+
   # No bin-links because historically, they weren't used anyway.
-
-
-  Get-Content "$(Join-Path $Destination 'package.json')"
-
-  Write-Host "Run Commands.npm path: $($Commands.npm)" -ForegroundColor Magenta
-
-  & npm install
-
-  Write-Host "Done running Commands.npm" -ForegroundColor Magenta
+  & "$($Commands.npm)" install
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."
   }
@@ -317,7 +303,7 @@ Function Add-NpmModulesFromJsBundleFile {
       throw "Couldn't make shrinkwrap."
     }
   }
-  Write-Host "cd node_modules" -ForegroundColor Magenta
+
   cd node_modules
 
   cd "$previousCwd"
@@ -392,6 +378,10 @@ $npmToolArgs = @{
 }
 Add-NpmModulesFromJsBundleFile @npmToolArgs
 
+# Leaving these probably doesn't hurt, but are removed for consistency w/ Unix.
+Remove-Item $(Join-Path $dirLib 'package.json')
+Remove-Item $(Join-Path $dirLib 'package-lock.json')
+
 Write-Host "Done writing node_modules build(s)..." -ForegroundColor Magenta
 
 Write-Host "Removing temp scratch $dirTemp" -ForegroundColor Magenta

From 88c527d849f714bcbab5c7d2259fec48d3177fee Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 16:38:25 -0400
Subject: [PATCH 0600/1140] - try to use nvm to install node and npm

---
 scripts/generate-dev-bundle.ps1 | 101 +++++++-------------------------
 1 file changed, 21 insertions(+), 80 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 2223d04b06..9a6cfc4eb2 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -109,98 +109,42 @@ Function Add-Python {
 }
 
 Function Add-NodeAndNpm {
-  if ("${NODE_VERSION}" -match "-rc\.\d+$") {
-    $nodeUrlBase = 'https://nodejs.org/download/rc'
-  } else {
-    $nodeUrlBase = 'https://nodejs.org/dist'
+  # Ensure NVM is installed
+  if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
+    throw "NVM is not installed. Please install NVM before running this script."
   }
 
-  $nodeArchitecture = 'win-x64'
+  Write-Host "Installing Node.js ${NODE_VERSION} using NVM..." -ForegroundColor Magenta
+  nvm install $NODE_VERSION
 
-  # Various variables which are used as part of directory paths and
-  # inside Node release and header archives.
-  $nodeVersionSegment = "v${NODE_VERSION}"
-  $nodeNameVersionSegment = "node-${nodeVersionSegment}"
-  $nodeNameSegment = "${nodeNameVersionSegment}-${nodeArchitecture}"
-
-  # The URL for the Node 7z archive, which includes its shipped version of npm.
-  $nodeUrl = $nodeUrlBase, $nodeVersionSegment,
-    "${nodeNameSegment}.7z" -Join '/'
-
-  $archiveNode = Join-Path $dirTemp 'node.7z'
-  Write-Host "Downloading Node.js from ${nodeUrl}" -ForegroundColor Magenta
-  $webclient.DownloadFile($nodeUrl, $archiveNode)
-
-  Write-Host "Extracting Node 7z file..." -ForegroundColor Magenta
-  & "$system7zip" x $archiveNode -o"$dirTemp" | Out-Null
-
-  # This will be the location of the extracted Node tarball.
-  $dirTempNode = Join-Path $dirTemp $nodeNameSegment
-
-  # Delete the no longer necessary Node archive.
-  Remove-Item $archiveNode
-
-  $tempNodeExe = Join-Path $dirTempNode 'node.exe'
-  $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
-
-  # Get additional values we'll need to fetch to complete this release.
-  $nodeProcessRelease = @{
-    headersUrl = & "$tempNodeExe" -p 'process.release.headersUrl'
-    libUrl = & "$tempNodeExe" -p 'process.release.libUrl'
+  if ($LASTEXITCODE -ne 0) {
+    throw "Failed to install Node.js ${NODE_VERSION} using NVM."
   }
 
-  if (!($nodeProcessRelease.headersUrl -And $nodeProcessRelease.libUrl)) {
-    throw "No 'headersUrl' or 'libUrl' in Node.js's 'process.release' output."
+  Write-Host "Setting Node.js ${NODE_VERSION} as the current version..." -ForegroundColor Magenta
+  nvm use $NODE_VERSION
+
+  if ($LASTEXITCODE -ne 0) {
+    throw "Failed to set Node.js ${NODE_VERSION} as the current version."
   }
 
-  $nodeHeadersTarGz = Join-Path $dirTemp 'node-headers.tar.gz'
-  Write-Host "Downloading Node headers from $($nodeProcessRelease.headersUrl)" `
-    -ForegroundColor Magenta
-  $webclient.DownloadFile($nodeProcessRelease.headersUrl, $nodeHeadersTarGz)
+  $nodeExePath = (Get-Command node).Source
+  $npmExePath = (Get-Command npm).Source
 
-  $dirTempNodeHeaders = Join-Path $dirTemp 'node-headers'
-  if (!(Expand-TarGzToDirectory $nodeHeadersTarGz $dirTempNodeHeaders)) {
-    throw "Couldn't extract Node headers."
-  }
-
-  # Move the extracted include directory to the Node dir.
-  $dirTempNodeHeadersInclude = `
-    Join-Path $dirTempNodeHeaders $nodeNameVersionSegment |
-    Join-Path -ChildPath 'include'
-  Move-Item $dirTempNodeHeadersInclude $dirTempNode
-  $dirTempNodeHeadersInclude = Join-Path $dirTempNode 'include'
-
-  # The node.lib goes into a \Release directory.
-  $dirNodeRelease = Join-Path $dirTempNode 'Release'
-  New-Item -ItemType Directory -Force -Path $dirNodeRelease | Out-Null
-
-  Write-Host "Downloading node.lib from $($nodeProcessRelease.libUrl)" `
-    -ForegroundColor Magenta
-  $nodeLibTarget = Join-Path $dirNodeRelease 'node.lib'
-  $webclient.DownloadFile($nodeProcessRelease.libUrl, $nodeLibTarget)
-
-  #
-  # We should now have a fully functionaly local Node with headers to use.
-  #
-
-  # Let's install the npm version we really want.
+  # Install the specific npm version we want
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
-      Write-Debug
+  & $npmExePath install -g npm@$NPM_VERSION
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."
   }
 
-  # After finishing up with our Node, let's put it in its final home
-  # and abandon this local npm directory.
+  # Refresh npm path after installation
+  $npmExePath = (Get-Command npm).Source
 
-  # Move exe and cmd files to the \bin directory.
-  Move-Item $(Join-Path $dirTempNode '*.exe') $dirBin
-  # Move-Item $(Join-Path $dirTempNode '*.cmd') $dirBin
-  Move-Item $dirTempNodeHeadersInclude $DIR
-  Move-Item $dirNodeRelease $DIR
+  # Copy Node.js and npm to the bundle directory
+  Copy-Item $nodeExePath $dirBin
+  Copy-Item $npmExePath $dirBin
 
   $finalNodeExe = Join-Path $dirBin 'node.exe'
   $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
@@ -211,9 +155,6 @@ Function Add-NodeAndNpm {
   # We use our own npm.cmd.
   Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
 
-  Remove-DirectoryRecursively $dirTempNodeHeaders
-  Remove-DirectoryRecursively $dirTempNode
-
   return New-Object -Type PSObject -Prop $(@{
     node = $finalNodeExe
     npm = $finalNpmCmd

From cb46a2d4527879d06460b2ba50ed85c9cda7e5f1 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 16:51:09 -0400
Subject: [PATCH 0601/1140] - if don't find nvm, installed it

---
 scripts/generate-dev-bundle.ps1 | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 9a6cfc4eb2..d04df608d6 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -111,7 +111,30 @@ Function Add-Python {
 Function Add-NodeAndNpm {
   # Ensure NVM is installed
   if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
-    throw "NVM is not installed. Please install NVM before running this script."
+    Write-Host "NVM is not installed. Installing NVM..." -ForegroundColor Magenta
+
+    # NVM for Windows installation
+    $nvmUrl = "https://github.com/coreybutler/nvm-windows/releases/download/1.1.10/nvm-setup.exe"
+    $nvmInstaller = Join-Path $dirTemp "nvm-setup.exe"
+
+    # Download NVM installer
+    $webclient.DownloadFile($nvmUrl, $nvmInstaller)
+
+    # Run NVM installer silently
+    Start-Process -FilePath $nvmInstaller -Args "/SILENT /NORESTART" -Wait
+
+    # Remove the installer
+    Remove-Item $nvmInstaller
+
+    # Refresh environment variables
+    $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
+
+    # Verify NVM installation
+    if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
+      throw "Failed to install NVM. Please install it manually and try again."
+    }
+
+    Write-Host "NVM installed successfully." -ForegroundColor Green
   }
 
   Write-Host "Installing Node.js ${NODE_VERSION} using NVM..." -ForegroundColor Magenta

From deef079f704d67f74644dcc7178419bf34dac6a3 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 16:55:57 -0400
Subject: [PATCH 0602/1140] - log error about why is failing

---
 scripts/generate-dev-bundle.ps1 | 46 +++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index d04df608d6..8ed5db09be 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -111,31 +111,43 @@ Function Add-Python {
 Function Add-NodeAndNpm {
   # Ensure NVM is installed
   if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
-    Write-Host "NVM is not installed. Installing NVM..." -ForegroundColor Magenta
+      Write-Host "NVM is not installed. Installing NVM..." -ForegroundColor Magenta
 
-    # NVM for Windows installation
-    $nvmUrl = "https://github.com/coreybutler/nvm-windows/releases/download/1.1.10/nvm-setup.exe"
-    $nvmInstaller = Join-Path $dirTemp "nvm-setup.exe"
+      # NVM for Windows installation
+      $nvmUrl = "https://github.com/coreybutler/nvm-windows/releases/download/1.1.10/nvm-setup.exe"
+      $nvmInstaller = Join-Path $dirTemp "nvm-setup.exe"
 
-    # Download NVM installer
-    $webclient.DownloadFile($nvmUrl, $nvmInstaller)
+      try {
+        # Download NVM installer
+        $webclient.DownloadFile($nvmUrl, $nvmInstaller)
 
-    # Run NVM installer silently
-    Start-Process -FilePath $nvmInstaller -Args "/SILENT /NORESTART" -Wait
+        # Run NVM installer silently and capture output
+        $installOutput = & $nvmInstaller /SILENT /NORESTART 2>&1
 
-    # Remove the installer
-    Remove-Item $nvmInstaller
+        # Remove the installer
+        Remove-Item $nvmInstaller
 
-    # Refresh environment variables
-    $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
+        # Refresh environment variables
+        $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
 
-    # Verify NVM installation
-    if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
-      throw "Failed to install NVM. Please install it manually and try again."
+        # Verify NVM installation
+        if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
+          throw "NVM command not found after installation."
+        }
+
+        Write-Host "NVM installed successfully." -ForegroundColor Green
+      }
+      catch {
+        Write-Host "Failed to install NVM. Error details:" -ForegroundColor Red
+        Write-Host $_.Exception.Message -ForegroundColor Red
+        if ($installOutput) {
+          Write-Host "Installer output:" -ForegroundColor Red
+          Write-Host $installOutput -ForegroundColor Red
+        }
+        throw "NVM installation failed. Please install it manually and try again."
+      }
     }
 
-    Write-Host "NVM installed successfully." -ForegroundColor Green
-  }
 
   Write-Host "Installing Node.js ${NODE_VERSION} using NVM..." -ForegroundColor Magenta
   nvm install $NODE_VERSION

From 4cf29a0e2a3a97eb175f845cde3dc4fe2fd91e2a Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:00:04 -0400
Subject: [PATCH 0603/1140] - try to get access into the tmp folder

---
 scripts/generate-dev-bundle.ps1 | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 8ed5db09be..801379e602 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -113,11 +113,21 @@ Function Add-NodeAndNpm {
   if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
       Write-Host "NVM is not installed. Installing NVM..." -ForegroundColor Magenta
 
-      # NVM for Windows installation
-      $nvmUrl = "https://github.com/coreybutler/nvm-windows/releases/download/1.1.10/nvm-setup.exe"
-      $nvmInstaller = Join-Path $dirTemp "nvm-setup.exe"
+      # Create a new temporary folder with explicit permissions
+      $tempFolderName = "MeteorNVMInstall_" + [System.Guid]::NewGuid().ToString()
+      $tempFolder = Join-Path $env:TEMP $tempFolderName
 
       try {
+        New-Item -ItemType Directory -Path $tempFolder | Out-Null
+        $acl = Get-Acl $tempFolder
+        $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule($env:USERNAME, "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow")
+        $acl.SetAccessRule($accessRule)
+        Set-Acl $tempFolder $acl
+
+        # NVM for Windows installation
+        $nvmUrl = "https://github.com/coreybutler/nvm-windows/releases/download/1.1.10/nvm-setup.exe"
+        $nvmInstaller = Join-Path $tempFolder "nvm-setup.exe"
+
         # Download NVM installer
         $webclient.DownloadFile($nvmUrl, $nvmInstaller)
 
@@ -146,6 +156,12 @@ Function Add-NodeAndNpm {
         }
         throw "NVM installation failed. Please install it manually and try again."
       }
+      finally {
+        # Clean up the temporary folder
+        if (Test-Path $tempFolder) {
+          Remove-Item -Recurse -Force $tempFolder
+        }
+      }
     }
 
 

From 00bfe72643e41b5c078b5d99483c927965b6b909 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:02:09 -0400
Subject: [PATCH 0604/1140] - change access groups

---
 scripts/generate-dev-bundle.ps1 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 801379e602..df8146f4fd 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -120,8 +120,14 @@ Function Add-NodeAndNpm {
       try {
         New-Item -ItemType Directory -Path $tempFolder | Out-Null
         $acl = Get-Acl $tempFolder
-        $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule($env:USERNAME, "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow")
-        $acl.SetAccessRule($accessRule)
+        $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule(
+          "Everyone",
+          "FullControl",
+          "ContainerInherit,ObjectInherit",
+          "None",
+          "Allow"
+        )
+        $acl.AddAccessRule($accessRule)
         Set-Acl $tempFolder $acl
 
         # NVM for Windows installation
@@ -129,9 +135,11 @@ Function Add-NodeAndNpm {
         $nvmInstaller = Join-Path $tempFolder "nvm-setup.exe"
 
         # Download NVM installer
+        Write-Host "Downloading NVM installer..." -ForegroundColor Magenta
         $webclient.DownloadFile($nvmUrl, $nvmInstaller)
 
         # Run NVM installer silently and capture output
+        Write-Host "Running NVM installer..." -ForegroundColor Magenta
         $installOutput = & $nvmInstaller /SILENT /NORESTART 2>&1
 
         # Remove the installer

From d97fe64e5243a25414ad4ef2f8c3802ea9211412 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:04:10 -0400
Subject: [PATCH 0605/1140] - try another way of getting access

---
 scripts/generate-dev-bundle.ps1 | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index df8146f4fd..1653c3c3a2 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -113,37 +113,31 @@ Function Add-NodeAndNpm {
   if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
       Write-Host "NVM is not installed. Installing NVM..." -ForegroundColor Magenta
 
-      # Create a new temporary folder with explicit permissions
+      # Create a new temporary folder in the user's home directory
       $tempFolderName = "MeteorNVMInstall_" + [System.Guid]::NewGuid().ToString()
-      $tempFolder = Join-Path $env:TEMP $tempFolderName
+      $tempFolder = Join-Path $env:USERPROFILE $tempFolderName
 
       try {
         New-Item -ItemType Directory -Path $tempFolder | Out-Null
-        $acl = Get-Acl $tempFolder
-        $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule(
-          "Everyone",
-          "FullControl",
-          "ContainerInherit,ObjectInherit",
-          "None",
-          "Allow"
-        )
-        $acl.AddAccessRule($accessRule)
-        Set-Acl $tempFolder $acl
 
         # NVM for Windows installation
         $nvmUrl = "https://github.com/coreybutler/nvm-windows/releases/download/1.1.10/nvm-setup.exe"
         $nvmInstaller = Join-Path $tempFolder "nvm-setup.exe"
 
         # Download NVM installer
-        Write-Host "Downloading NVM installer..." -ForegroundColor Magenta
+        Write-Host "Downloading NVM installer to $nvmInstaller..." -ForegroundColor Magenta
         $webclient.DownloadFile($nvmUrl, $nvmInstaller)
 
+        if (!(Test-Path $nvmInstaller)) {
+          throw "Failed to download NVM installer."
+        }
+
         # Run NVM installer silently and capture output
         Write-Host "Running NVM installer..." -ForegroundColor Magenta
         $installOutput = & $nvmInstaller /SILENT /NORESTART 2>&1
 
         # Remove the installer
-        Remove-Item $nvmInstaller
+        Remove-Item $nvmInstaller -Force
 
         # Refresh environment variables
         $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")

From 1ca4a253926d0832a4506a7a3f14708955383039 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:06:21 -0400
Subject: [PATCH 0606/1140] - revert changes

---
 scripts/generate-dev-bundle.ps1 | 158 +++++++++++++++++---------------
 1 file changed, 82 insertions(+), 76 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 1653c3c3a2..2223d04b06 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -109,95 +109,98 @@ Function Add-Python {
 }
 
 Function Add-NodeAndNpm {
-  # Ensure NVM is installed
-  if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
-      Write-Host "NVM is not installed. Installing NVM..." -ForegroundColor Magenta
-
-      # Create a new temporary folder in the user's home directory
-      $tempFolderName = "MeteorNVMInstall_" + [System.Guid]::NewGuid().ToString()
-      $tempFolder = Join-Path $env:USERPROFILE $tempFolderName
-
-      try {
-        New-Item -ItemType Directory -Path $tempFolder | Out-Null
-
-        # NVM for Windows installation
-        $nvmUrl = "https://github.com/coreybutler/nvm-windows/releases/download/1.1.10/nvm-setup.exe"
-        $nvmInstaller = Join-Path $tempFolder "nvm-setup.exe"
-
-        # Download NVM installer
-        Write-Host "Downloading NVM installer to $nvmInstaller..." -ForegroundColor Magenta
-        $webclient.DownloadFile($nvmUrl, $nvmInstaller)
-
-        if (!(Test-Path $nvmInstaller)) {
-          throw "Failed to download NVM installer."
-        }
-
-        # Run NVM installer silently and capture output
-        Write-Host "Running NVM installer..." -ForegroundColor Magenta
-        $installOutput = & $nvmInstaller /SILENT /NORESTART 2>&1
-
-        # Remove the installer
-        Remove-Item $nvmInstaller -Force
-
-        # Refresh environment variables
-        $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
-
-        # Verify NVM installation
-        if (!(Get-Command nvm -ErrorAction SilentlyContinue)) {
-          throw "NVM command not found after installation."
-        }
-
-        Write-Host "NVM installed successfully." -ForegroundColor Green
-      }
-      catch {
-        Write-Host "Failed to install NVM. Error details:" -ForegroundColor Red
-        Write-Host $_.Exception.Message -ForegroundColor Red
-        if ($installOutput) {
-          Write-Host "Installer output:" -ForegroundColor Red
-          Write-Host $installOutput -ForegroundColor Red
-        }
-        throw "NVM installation failed. Please install it manually and try again."
-      }
-      finally {
-        # Clean up the temporary folder
-        if (Test-Path $tempFolder) {
-          Remove-Item -Recurse -Force $tempFolder
-        }
-      }
-    }
-
-
-  Write-Host "Installing Node.js ${NODE_VERSION} using NVM..." -ForegroundColor Magenta
-  nvm install $NODE_VERSION
-
-  if ($LASTEXITCODE -ne 0) {
-    throw "Failed to install Node.js ${NODE_VERSION} using NVM."
+  if ("${NODE_VERSION}" -match "-rc\.\d+$") {
+    $nodeUrlBase = 'https://nodejs.org/download/rc'
+  } else {
+    $nodeUrlBase = 'https://nodejs.org/dist'
   }
 
-  Write-Host "Setting Node.js ${NODE_VERSION} as the current version..." -ForegroundColor Magenta
-  nvm use $NODE_VERSION
+  $nodeArchitecture = 'win-x64'
 
-  if ($LASTEXITCODE -ne 0) {
-    throw "Failed to set Node.js ${NODE_VERSION} as the current version."
+  # Various variables which are used as part of directory paths and
+  # inside Node release and header archives.
+  $nodeVersionSegment = "v${NODE_VERSION}"
+  $nodeNameVersionSegment = "node-${nodeVersionSegment}"
+  $nodeNameSegment = "${nodeNameVersionSegment}-${nodeArchitecture}"
+
+  # The URL for the Node 7z archive, which includes its shipped version of npm.
+  $nodeUrl = $nodeUrlBase, $nodeVersionSegment,
+    "${nodeNameSegment}.7z" -Join '/'
+
+  $archiveNode = Join-Path $dirTemp 'node.7z'
+  Write-Host "Downloading Node.js from ${nodeUrl}" -ForegroundColor Magenta
+  $webclient.DownloadFile($nodeUrl, $archiveNode)
+
+  Write-Host "Extracting Node 7z file..." -ForegroundColor Magenta
+  & "$system7zip" x $archiveNode -o"$dirTemp" | Out-Null
+
+  # This will be the location of the extracted Node tarball.
+  $dirTempNode = Join-Path $dirTemp $nodeNameSegment
+
+  # Delete the no longer necessary Node archive.
+  Remove-Item $archiveNode
+
+  $tempNodeExe = Join-Path $dirTempNode 'node.exe'
+  $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
+
+  # Get additional values we'll need to fetch to complete this release.
+  $nodeProcessRelease = @{
+    headersUrl = & "$tempNodeExe" -p 'process.release.headersUrl'
+    libUrl = & "$tempNodeExe" -p 'process.release.libUrl'
   }
 
-  $nodeExePath = (Get-Command node).Source
-  $npmExePath = (Get-Command npm).Source
+  if (!($nodeProcessRelease.headersUrl -And $nodeProcessRelease.libUrl)) {
+    throw "No 'headersUrl' or 'libUrl' in Node.js's 'process.release' output."
+  }
 
-  # Install the specific npm version we want
+  $nodeHeadersTarGz = Join-Path $dirTemp 'node-headers.tar.gz'
+  Write-Host "Downloading Node headers from $($nodeProcessRelease.headersUrl)" `
+    -ForegroundColor Magenta
+  $webclient.DownloadFile($nodeProcessRelease.headersUrl, $nodeHeadersTarGz)
+
+  $dirTempNodeHeaders = Join-Path $dirTemp 'node-headers'
+  if (!(Expand-TarGzToDirectory $nodeHeadersTarGz $dirTempNodeHeaders)) {
+    throw "Couldn't extract Node headers."
+  }
+
+  # Move the extracted include directory to the Node dir.
+  $dirTempNodeHeadersInclude = `
+    Join-Path $dirTempNodeHeaders $nodeNameVersionSegment |
+    Join-Path -ChildPath 'include'
+  Move-Item $dirTempNodeHeadersInclude $dirTempNode
+  $dirTempNodeHeadersInclude = Join-Path $dirTempNode 'include'
+
+  # The node.lib goes into a \Release directory.
+  $dirNodeRelease = Join-Path $dirTempNode 'Release'
+  New-Item -ItemType Directory -Force -Path $dirNodeRelease | Out-Null
+
+  Write-Host "Downloading node.lib from $($nodeProcessRelease.libUrl)" `
+    -ForegroundColor Magenta
+  $nodeLibTarget = Join-Path $dirNodeRelease 'node.lib'
+  $webclient.DownloadFile($nodeProcessRelease.libUrl, $nodeLibTarget)
+
+  #
+  # We should now have a fully functionaly local Node with headers to use.
+  #
+
+  # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  & $npmExePath install -g npm@$NPM_VERSION
+  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
+      Write-Debug
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."
   }
 
-  # Refresh npm path after installation
-  $npmExePath = (Get-Command npm).Source
+  # After finishing up with our Node, let's put it in its final home
+  # and abandon this local npm directory.
 
-  # Copy Node.js and npm to the bundle directory
-  Copy-Item $nodeExePath $dirBin
-  Copy-Item $npmExePath $dirBin
+  # Move exe and cmd files to the \bin directory.
+  Move-Item $(Join-Path $dirTempNode '*.exe') $dirBin
+  # Move-Item $(Join-Path $dirTempNode '*.cmd') $dirBin
+  Move-Item $dirTempNodeHeadersInclude $DIR
+  Move-Item $dirNodeRelease $DIR
 
   $finalNodeExe = Join-Path $dirBin 'node.exe'
   $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
@@ -208,6 +211,9 @@ Function Add-NodeAndNpm {
   # We use our own npm.cmd.
   Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
 
+  Remove-DirectoryRecursively $dirTempNodeHeaders
+  Remove-DirectoryRecursively $dirTempNode
+
   return New-Object -Type PSObject -Prop $(@{
     node = $finalNodeExe
     npm = $finalNpmCmd

From e06ffeebf9e36b9802e8b506c60d4d81caa6f7ea Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:08:52 -0400
Subject: [PATCH 0607/1140] - try to log the install error

---
 scripts/generate-dev-bundle.ps1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 2223d04b06..c053fd3f0b 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,14 +185,16 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
-      Write-Debug
+  $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+      --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
 
   if ($LASTEXITCODE -ne 0) {
+    Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Red
+    Write-Host $npmOutput -ForegroundColor Red
     throw "Couldn't install npm@${NPM_VERSION}."
   }
 
+
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From f9b352d66ab6d9391f15aa2837802f8736734015 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:11:21 -0400
Subject: [PATCH 0608/1140] - try to get more logs the install error

---
 scripts/generate-dev-bundle.ps1 | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index c053fd3f0b..efbc589409 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,14 +185,19 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-      --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
+    $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+        --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
 
-  if ($LASTEXITCODE -ne 0) {
-    Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Red
-    Write-Host $npmOutput -ForegroundColor Red
-    throw "Couldn't install npm@${NPM_VERSION}."
-  }
+    if ($LASTEXITCODE -ne 0) {
+      Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Red
+      Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Red
+      Write-Host "Error details:" -ForegroundColor Red
+      $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Red }
+      Write-Host "Current working directory: $PWD" -ForegroundColor Yellow
+      Write-Host "Content of $dirLib:" -ForegroundColor Yellow
+      Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Yellow }
+      throw "Couldn't install npm@${NPM_VERSION}. See error details above."
+    }
 
 
   # After finishing up with our Node, let's put it in its final home

From 3b64d1e935f0dce362aa08ec56d6028b61757520 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:12:40 -0400
Subject: [PATCH 0609/1140] - fix indentation

---
 scripts/generate-dev-bundle.ps1 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index efbc589409..4df7f7a4d3 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,19 +185,19 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-    $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+  $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
         --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
 
-    if ($LASTEXITCODE -ne 0) {
-      Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Red
-      Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Red
-      Write-Host "Error details:" -ForegroundColor Red
-      $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Red }
-      Write-Host "Current working directory: $PWD" -ForegroundColor Yellow
-      Write-Host "Content of $dirLib:" -ForegroundColor Yellow
-      Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Yellow }
-      throw "Couldn't install npm@${NPM_VERSION}. See error details above."
-    }
+  if ($LASTEXITCODE -ne 0) {
+    Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Red
+    Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Red
+    Write-Host "Error details:" -ForegroundColor Red
+    $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Red }
+    Write-Host "Current working directory: $PWD" -ForegroundColor Yellow
+    Write-Host "Content of $dirLib:" -ForegroundColor Yellow
+    Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Yellow }
+    throw "Couldn't install npm@${NPM_VERSION}. See error details above."
+  }
 
 
   # After finishing up with our Node, let's put it in its final home

From c691d18379feb7ca5dd7fff7271f2f6575e08d56 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:18:07 -0400
Subject: [PATCH 0610/1140] - ADD MORE LOGS

---
 scripts/generate-dev-bundle.ps1 | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 4df7f7a4d3..202065c208 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,23 +1,36 @@
 $ErrorActionPreference = "Stop"
 $DebugPreference = "Continue"
 
+Write-Debug "Script started"
+
 Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform
 
+Write-Debug "Platform: $PLATFORM"
+
 $PYTHON_VERSION = "3.9.5" # For node-gyp
 & cmd /c 'du 2>&1'
 
+Write-Debug "Python Version: $PYTHON_VERSION"
+
 $dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
 $shCommon = Join-Path $PSScriptRoot 'build-dev-bundle-common.sh'
 
+Write-Debug "dirCheckout: $dirCheckout"
+Write-Debug "shCommon: $shCommon"
+
 $tempSrcNode = Join-Path $(Join-Path $dirCheckout 'temp_build_src') 'node.7z'
 
 # This will be the temporary directory we build the dev bundle in.
 $DIR = Join-Path $dirCheckout 'gdbXXX'
 
+Write-Debug "DIR: $DIR"
+
 # extract the bundle version from the meteor bash script
 $BUNDLE_VERSION = Read-VariableFromShellScript "${dirCheckout}\meteor" 'BUNDLE_VERSION'
 
+Write-Debug "BUNDLE_VERSION: $BUNDLE_VERSION"
+
 # extract the major package versions from the build-dev-bundle-common script.
 $MONGO_VERSION_64BIT = Read-VariableFromShellScript $shCommon 'MONGO_VERSION_64BIT'
 
@@ -25,15 +38,25 @@ $NPM_VERSION = Read-VariableFromShellScript $shCommon 'NPM_VERSION'
 
 $NODE_VERSION = Read-VariableFromShellScript $shCommon 'NODE_VERSION'
 
+Write-Debug "MONGO_VERSION_64BIT: $MONGO_VERSION_64BIT"
+Write-Debug "NPM_VERSION: $NPM_VERSION"
+Write-Debug "NODE_VERSION: $NODE_VERSION"
+
 # 7-zip path.
 $system7zip = "C:\Program Files\7-zip\7z.exe"
 
+Write-Debug "system7zip: $system7zip"
+
 # Required for downloading MongoDB via HTTPS
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
+Write-Debug "SecurityProtocol set"
+
 # Since we reuse the same temp directory, cleanup from previous failed runs.
 Remove-DirectoryRecursively $DIR
 
+Write-Debug "Removed directory: $DIR"
+
 # Some commonly used paths in this script.
 $dirBin = Join-Path $DIR 'bin'
 $dirLib = Join-Path $DIR 'lib'
@@ -43,6 +66,8 @@ $dirTemp = Join-Path $DIR 'temp'
 # Use a cache just for this build.
 $dirNpmCache = Join-Path $dirTemp 'npm-cache'
 
+Write-Debug "Paths set up"
+
 # Build our directory framework.
 New-Item -ItemType Directory -Force -Path $DIR | Out-Null
 New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
@@ -50,9 +75,13 @@ New-Item -ItemType Directory -Force -Path $dirBin | Out-Null
 New-Item -ItemType Directory -Force -Path $dirLib | Out-Null
 New-Item -ItemType Directory -Force -Path $dirServerLib | Out-Null
 
+Write-Debug "Directories created"
+
 $webclient = New-Object System.Net.WebClient
 $shell = New-Object -com shell.application
 
+Write-Debug "WebClient and Shell objects created"
+
 Function Invoke-Install7ZipApplication {
   Write-Host "Downloading 7-zip..." -ForegroundColor Magenta
   $7zMsiPath = Join-Path $dirTemp '7z.msi'

From 317fb8fbab27cf98c41efb8da79f97ed16ed4be1 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:19:15 -0400
Subject: [PATCH 0611/1140] - revert changes

---
 scripts/generate-dev-bundle.ps1 | 44 +++------------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 202065c208..2223d04b06 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,36 +1,23 @@
 $ErrorActionPreference = "Stop"
 $DebugPreference = "Continue"
 
-Write-Debug "Script started"
-
 Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform
 
-Write-Debug "Platform: $PLATFORM"
-
 $PYTHON_VERSION = "3.9.5" # For node-gyp
 & cmd /c 'du 2>&1'
 
-Write-Debug "Python Version: $PYTHON_VERSION"
-
 $dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
 $shCommon = Join-Path $PSScriptRoot 'build-dev-bundle-common.sh'
 
-Write-Debug "dirCheckout: $dirCheckout"
-Write-Debug "shCommon: $shCommon"
-
 $tempSrcNode = Join-Path $(Join-Path $dirCheckout 'temp_build_src') 'node.7z'
 
 # This will be the temporary directory we build the dev bundle in.
 $DIR = Join-Path $dirCheckout 'gdbXXX'
 
-Write-Debug "DIR: $DIR"
-
 # extract the bundle version from the meteor bash script
 $BUNDLE_VERSION = Read-VariableFromShellScript "${dirCheckout}\meteor" 'BUNDLE_VERSION'
 
-Write-Debug "BUNDLE_VERSION: $BUNDLE_VERSION"
-
 # extract the major package versions from the build-dev-bundle-common script.
 $MONGO_VERSION_64BIT = Read-VariableFromShellScript $shCommon 'MONGO_VERSION_64BIT'
 
@@ -38,25 +25,15 @@ $NPM_VERSION = Read-VariableFromShellScript $shCommon 'NPM_VERSION'
 
 $NODE_VERSION = Read-VariableFromShellScript $shCommon 'NODE_VERSION'
 
-Write-Debug "MONGO_VERSION_64BIT: $MONGO_VERSION_64BIT"
-Write-Debug "NPM_VERSION: $NPM_VERSION"
-Write-Debug "NODE_VERSION: $NODE_VERSION"
-
 # 7-zip path.
 $system7zip = "C:\Program Files\7-zip\7z.exe"
 
-Write-Debug "system7zip: $system7zip"
-
 # Required for downloading MongoDB via HTTPS
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
-Write-Debug "SecurityProtocol set"
-
 # Since we reuse the same temp directory, cleanup from previous failed runs.
 Remove-DirectoryRecursively $DIR
 
-Write-Debug "Removed directory: $DIR"
-
 # Some commonly used paths in this script.
 $dirBin = Join-Path $DIR 'bin'
 $dirLib = Join-Path $DIR 'lib'
@@ -66,8 +43,6 @@ $dirTemp = Join-Path $DIR 'temp'
 # Use a cache just for this build.
 $dirNpmCache = Join-Path $dirTemp 'npm-cache'
 
-Write-Debug "Paths set up"
-
 # Build our directory framework.
 New-Item -ItemType Directory -Force -Path $DIR | Out-Null
 New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
@@ -75,13 +50,9 @@ New-Item -ItemType Directory -Force -Path $dirBin | Out-Null
 New-Item -ItemType Directory -Force -Path $dirLib | Out-Null
 New-Item -ItemType Directory -Force -Path $dirServerLib | Out-Null
 
-Write-Debug "Directories created"
-
 $webclient = New-Object System.Net.WebClient
 $shell = New-Object -com shell.application
 
-Write-Debug "WebClient and Shell objects created"
-
 Function Invoke-Install7ZipApplication {
   Write-Host "Downloading 7-zip..." -ForegroundColor Magenta
   $7zMsiPath = Join-Path $dirTemp '7z.msi'
@@ -214,21 +185,14 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-        --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
+  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
+      Write-Debug
 
   if ($LASTEXITCODE -ne 0) {
-    Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Red
-    Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Red
-    Write-Host "Error details:" -ForegroundColor Red
-    $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Red }
-    Write-Host "Current working directory: $PWD" -ForegroundColor Yellow
-    Write-Host "Content of $dirLib:" -ForegroundColor Yellow
-    Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Yellow }
-    throw "Couldn't install npm@${NPM_VERSION}. See error details above."
+    throw "Couldn't install npm@${NPM_VERSION}."
   }
 
-
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From ff9b186392af77fbd600e3475d16f6d0551202ea Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:20:58 -0400
Subject: [PATCH 0612/1140] - try to get logs from npm install

---
 scripts/generate-dev-bundle.ps1 | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 2223d04b06..22680e87f1 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,14 +185,34 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
-      Write-Debug
 
-  if ($LASTEXITCODE -ne 0) {
-    throw "Couldn't install npm@${NPM_VERSION}."
+  $npmOutput = $null
+  $npmError = $null
+
+  try {
+      $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+          --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
+
+      if ($LASTEXITCODE -ne 0) {
+          throw "npm installation exited with code $LASTEXITCODE"
+      }
+  } catch {
+      $npmError = $_
+  } finally {
+      Write-Host "npm installation output:" -ForegroundColor Cyan
+      $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Cyan }
+
+      if ($npmError) {
+          Write-Host "Error during npm installation:" -ForegroundColor Red
+          Write-Host $npmError.Exception.Message -ForegroundColor Red
+          Write-Host "StackTrace:" -ForegroundColor Red
+          Write-Host $npmError.ScriptStackTrace -ForegroundColor Red
+          throw "Couldn't install npm@${NPM_VERSION}. See error details above."
+      }
   }
 
+  Write-Host "npm installation completed successfully." -ForegroundColor Green
+
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From e65628168cceeaf877a1be62793009c47ed5c362 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:23:34 -0400
Subject: [PATCH 0613/1140] - add more information to the logs

---
 scripts/generate-dev-bundle.ps1 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 22680e87f1..609e97f383 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -190,8 +190,15 @@ Function Add-NodeAndNpm {
   $npmError = $null
 
   try {
+      Write-Host "Current directory: $PWD" -ForegroundColor Yellow
+      Write-Host "tempNpmCmd: $tempNpmCmd" -ForegroundColor Yellow
+      Write-Host "dirLib: $dirLib" -ForegroundColor Yellow
+      Write-Host "dirNpmCache: $dirNpmCache" -ForegroundColor Yellow
+      Write-Host "dirTempNode: $dirTempNode" -ForegroundColor Yellow
+
+      $env:NODE_DEBUG = "npm"
       $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-          --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
+          --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} --verbose 2>&1
 
       if ($LASTEXITCODE -ne 0) {
           throw "npm installation exited with code $LASTEXITCODE"
@@ -207,6 +214,13 @@ Function Add-NodeAndNpm {
           Write-Host $npmError.Exception.Message -ForegroundColor Red
           Write-Host "StackTrace:" -ForegroundColor Red
           Write-Host $npmError.ScriptStackTrace -ForegroundColor Red
+
+          Write-Host "Environment variables:" -ForegroundColor Yellow
+          Get-ChildItem Env: | ForEach-Object { Write-Host "$($_.Name): $($_.Value)" -ForegroundColor Yellow }
+
+          Write-Host "Content of $dirLib:" -ForegroundColor Yellow
+          Get-ChildItem $dirLib -Recurse | ForEach-Object { Write-Host $_.FullName -ForegroundColor Yellow }
+
           throw "Couldn't install npm@${NPM_VERSION}. See error details above."
       }
   }

From de7f868bf16972ef505236d3729a6ff227ff268d Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 21 Oct 2024 17:27:03 -0400
Subject: [PATCH 0614/1140] - try to try catch everything

---
 scripts/generate-dev-bundle.ps1 | 707 ++++++++++++--------------------
 1 file changed, 251 insertions(+), 456 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 609e97f383..95baaa6849 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,478 +1,273 @@
 $ErrorActionPreference = "Stop"
 $DebugPreference = "Continue"
+$VerbosePreference = "Continue"
 
-Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
-$PLATFORM = Get-MeteorPlatform
+Write-Host "Script started" -ForegroundColor Green
 
-$PYTHON_VERSION = "3.9.5" # For node-gyp
-& cmd /c 'du 2>&1'
+try {
+    Write-Host "Importing module" -ForegroundColor Yellow
+    Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 
-$dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
-$shCommon = Join-Path $PSScriptRoot 'build-dev-bundle-common.sh'
+    Write-Host "Getting Meteor platform" -ForegroundColor Yellow
+    $PLATFORM = Get-MeteorPlatform
+    Write-Host "Platform: $PLATFORM" -ForegroundColor Yellow
 
-$tempSrcNode = Join-Path $(Join-Path $dirCheckout 'temp_build_src') 'node.7z'
+    $PYTHON_VERSION = "3.9.5" # For node-gyp
+    Write-Host "Python Version: $PYTHON_VERSION" -ForegroundColor Yellow
 
-# This will be the temporary directory we build the dev bundle in.
-$DIR = Join-Path $dirCheckout 'gdbXXX'
+    Write-Host "Running 'du' command" -ForegroundColor Yellow
+    & cmd /c 'du 2>&1'
 
-# extract the bundle version from the meteor bash script
-$BUNDLE_VERSION = Read-VariableFromShellScript "${dirCheckout}\meteor" 'BUNDLE_VERSION'
+    Write-Host "Setting up directories" -ForegroundColor Yellow
+    $dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
+    $shCommon = Join-Path $PSScriptRoot 'build-dev-bundle-common.sh'
+    $tempSrcNode = Join-Path $(Join-Path $dirCheckout 'temp_build_src') 'node.7z'
+    $DIR = Join-Path $dirCheckout 'gdbXXX'
 
-# extract the major package versions from the build-dev-bundle-common script.
-$MONGO_VERSION_64BIT = Read-VariableFromShellScript $shCommon 'MONGO_VERSION_64BIT'
+    Write-Host "Reading variables from shell scripts" -ForegroundColor Yellow
+    $BUNDLE_VERSION = Read-VariableFromShellScript "${dirCheckout}\meteor" 'BUNDLE_VERSION'
+    $MONGO_VERSION_64BIT = Read-VariableFromShellScript $shCommon 'MONGO_VERSION_64BIT'
+    $NPM_VERSION = Read-VariableFromShellScript $shCommon 'NPM_VERSION'
+    $NODE_VERSION = Read-VariableFromShellScript $shCommon 'NODE_VERSION'
 
-$NPM_VERSION = Read-VariableFromShellScript $shCommon 'NPM_VERSION'
+    Write-Host "Setting up 7-zip" -ForegroundColor Yellow
+    $system7zip = "C:\Program Files\7-zip\7z.exe"
 
-$NODE_VERSION = Read-VariableFromShellScript $shCommon 'NODE_VERSION'
+    Write-Host "Setting SecurityProtocol" -ForegroundColor Yellow
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
-# 7-zip path.
-$system7zip = "C:\Program Files\7-zip\7z.exe"
+    Write-Host "Removing directory: $DIR" -ForegroundColor Yellow
+    Remove-DirectoryRecursively $DIR
 
-# Required for downloading MongoDB via HTTPS
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+    Write-Host "Setting up paths" -ForegroundColor Yellow
+    $dirBin = Join-Path $DIR 'bin'
+    $dirLib = Join-Path $DIR 'lib'
+    $dirServerLib = Join-Path $DIR 'server-lib'
+    $dirTemp = Join-Path $DIR 'temp'
+    $dirNpmCache = Join-Path $dirTemp 'npm-cache'
 
-# Since we reuse the same temp directory, cleanup from previous failed runs.
-Remove-DirectoryRecursively $DIR
+    Write-Host "Creating directories" -ForegroundColor Yellow
+    New-Item -ItemType Directory -Force -Path $DIR | Out-Null
+    New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
+    New-Item -ItemType Directory -Force -Path $dirBin | Out-Null
+    New-Item -ItemType Directory -Force -Path $dirLib | Out-Null
+    New-Item -ItemType Directory -Force -Path $dirServerLib | Out-Null
 
-# Some commonly used paths in this script.
-$dirBin = Join-Path $DIR 'bin'
-$dirLib = Join-Path $DIR 'lib'
-$dirServerLib = Join-Path $DIR 'server-lib'
-$dirTemp = Join-Path $DIR 'temp'
+    Write-Host "Creating WebClient and Shell objects" -ForegroundColor Yellow
+    $webclient = New-Object System.Net.WebClient
+    $shell = New-Object -com shell.application
 
-# Use a cache just for this build.
-$dirNpmCache = Join-Path $dirTemp 'npm-cache'
+    Function Invoke-Install7ZipApplication {
+        Write-Host "Downloading 7-zip..." -ForegroundColor Magenta
+        $7zMsiPath = Join-Path $dirTemp '7z.msi'
+        $webclient.DownloadFile("https://www.7-zip.org/a/7z1604.msi", $7zMsiPath)
 
-# Build our directory framework.
-New-Item -ItemType Directory -Force -Path $DIR | Out-Null
-New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
-New-Item -ItemType Directory -Force -Path $dirBin | Out-Null
-New-Item -ItemType Directory -Force -Path $dirLib | Out-Null
-New-Item -ItemType Directory -Force -Path $dirServerLib | Out-Null
+        Write-Host "Installing 7-zip system-wide..." -ForegroundColor Magenta
+        & "msiexec.exe" /i $7zMsiPath /quiet /qn /norestart | Out-Null
 
-$webclient = New-Object System.Net.WebClient
-$shell = New-Object -com shell.application
-
-Function Invoke-Install7ZipApplication {
-  Write-Host "Downloading 7-zip..." -ForegroundColor Magenta
-  $7zMsiPath = Join-Path $dirTemp '7z.msi'
-  # 32-bit, right now.  But this does not go in the bundle.
-  $webclient.DownloadFile("https://www.7-zip.org/a/7z1604.msi", $7zMsiPath)
-
-  Write-Host "Installing 7-zip system-wide..." -ForegroundColor Magenta
-  & "msiexec.exe" /i $7zMsiPath /quiet /qn /norestart | Out-Null
-
-  # Cleanup.
-  Remove-Item $7zMsiPath
-}
-
-Function Add-7ZipTool {
-  Write-Host "Downloading 7-zip 'extra'..." -ForegroundColor Magenta
-  $extraArchive = Join-Path $dirTemp 'extra.7z'
-  $webclient.DownloadFile("https://www.7-zip.org/a/7z1604-extra.7z", $extraArchive)
-
-  $pathToExtract = 'x64/7za.exe'
-
-  Write-Host 'Placing 7za.exe from extra.7z in \bin...' -ForegroundColor Magenta
-  & "$system7zip" e $extraArchive -o"$dirTemp" $pathToExtract | Out-Null
-  Move-Item $(Join-Path $dirTemp '7za.exe') $(Join-Path $dirBin "7z.exe")
-
-  # Cleanup
-  Remove-Item $extraArchive
-}
-
-Function Add-Python {
-  # On Windows we provide a reliable version of python.exe for use by
-  # node-gyp (the tool that rebuilds binary node modules).
-  # This self-hosted 7z is created by archiving the result of running the
-  # Python MSI installer (from python.org), targeted at a temp directory, and
-  # only including: "Python" and "Utility Scripts". Then, 7z the temp directory.
-  $pythonUrl = "https://s3.amazonaws.com/com.meteor.static/windows-python/",
-    "$PLATFORM/python-${PYTHON_VERSION}.7z" -Join ''
-  $pythonArchive = Join-Path $dirTemp 'python.7z'
-
-  $webclient.DownloadFile($pythonUrl, $pythonArchive)
-
-  Expand-7zToDirectory $pythonArchive $DIR
-
-  $pythonDir = Join-Path $DIR 'python'
-  $pythonExe = Join-Path $pythonDir 'python.exe'
-
-  # Make sure the version is right, when python is called.
-  if (!(cmd /c python.exe --version '2>&1' -Eq "Python ${PYTHON_VERSION}")) {
-    throw "Python was not the version we expected it to be ($PYTHON_VERSION)"
-  }
-
-  Remove-Item $pythonArchive
-
-  "$pythonExe"
-}
-
-Function Add-NodeAndNpm {
-  if ("${NODE_VERSION}" -match "-rc\.\d+$") {
-    $nodeUrlBase = 'https://nodejs.org/download/rc'
-  } else {
-    $nodeUrlBase = 'https://nodejs.org/dist'
-  }
-
-  $nodeArchitecture = 'win-x64'
-
-  # Various variables which are used as part of directory paths and
-  # inside Node release and header archives.
-  $nodeVersionSegment = "v${NODE_VERSION}"
-  $nodeNameVersionSegment = "node-${nodeVersionSegment}"
-  $nodeNameSegment = "${nodeNameVersionSegment}-${nodeArchitecture}"
-
-  # The URL for the Node 7z archive, which includes its shipped version of npm.
-  $nodeUrl = $nodeUrlBase, $nodeVersionSegment,
-    "${nodeNameSegment}.7z" -Join '/'
-
-  $archiveNode = Join-Path $dirTemp 'node.7z'
-  Write-Host "Downloading Node.js from ${nodeUrl}" -ForegroundColor Magenta
-  $webclient.DownloadFile($nodeUrl, $archiveNode)
-
-  Write-Host "Extracting Node 7z file..." -ForegroundColor Magenta
-  & "$system7zip" x $archiveNode -o"$dirTemp" | Out-Null
-
-  # This will be the location of the extracted Node tarball.
-  $dirTempNode = Join-Path $dirTemp $nodeNameSegment
-
-  # Delete the no longer necessary Node archive.
-  Remove-Item $archiveNode
-
-  $tempNodeExe = Join-Path $dirTempNode 'node.exe'
-  $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
-
-  # Get additional values we'll need to fetch to complete this release.
-  $nodeProcessRelease = @{
-    headersUrl = & "$tempNodeExe" -p 'process.release.headersUrl'
-    libUrl = & "$tempNodeExe" -p 'process.release.libUrl'
-  }
-
-  if (!($nodeProcessRelease.headersUrl -And $nodeProcessRelease.libUrl)) {
-    throw "No 'headersUrl' or 'libUrl' in Node.js's 'process.release' output."
-  }
-
-  $nodeHeadersTarGz = Join-Path $dirTemp 'node-headers.tar.gz'
-  Write-Host "Downloading Node headers from $($nodeProcessRelease.headersUrl)" `
-    -ForegroundColor Magenta
-  $webclient.DownloadFile($nodeProcessRelease.headersUrl, $nodeHeadersTarGz)
-
-  $dirTempNodeHeaders = Join-Path $dirTemp 'node-headers'
-  if (!(Expand-TarGzToDirectory $nodeHeadersTarGz $dirTempNodeHeaders)) {
-    throw "Couldn't extract Node headers."
-  }
-
-  # Move the extracted include directory to the Node dir.
-  $dirTempNodeHeadersInclude = `
-    Join-Path $dirTempNodeHeaders $nodeNameVersionSegment |
-    Join-Path -ChildPath 'include'
-  Move-Item $dirTempNodeHeadersInclude $dirTempNode
-  $dirTempNodeHeadersInclude = Join-Path $dirTempNode 'include'
-
-  # The node.lib goes into a \Release directory.
-  $dirNodeRelease = Join-Path $dirTempNode 'Release'
-  New-Item -ItemType Directory -Force -Path $dirNodeRelease | Out-Null
-
-  Write-Host "Downloading node.lib from $($nodeProcessRelease.libUrl)" `
-    -ForegroundColor Magenta
-  $nodeLibTarget = Join-Path $dirNodeRelease 'node.lib'
-  $webclient.DownloadFile($nodeProcessRelease.libUrl, $nodeLibTarget)
-
-  #
-  # We should now have a fully functionaly local Node with headers to use.
-  #
-
-  # Let's install the npm version we really want.
-  Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-
-  $npmOutput = $null
-  $npmError = $null
-
-  try {
-      Write-Host "Current directory: $PWD" -ForegroundColor Yellow
-      Write-Host "tempNpmCmd: $tempNpmCmd" -ForegroundColor Yellow
-      Write-Host "dirLib: $dirLib" -ForegroundColor Yellow
-      Write-Host "dirNpmCache: $dirNpmCache" -ForegroundColor Yellow
-      Write-Host "dirTempNode: $dirTempNode" -ForegroundColor Yellow
-
-      $env:NODE_DEBUG = "npm"
-      $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-          --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} --verbose 2>&1
-
-      if ($LASTEXITCODE -ne 0) {
-          throw "npm installation exited with code $LASTEXITCODE"
-      }
-  } catch {
-      $npmError = $_
-  } finally {
-      Write-Host "npm installation output:" -ForegroundColor Cyan
-      $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Cyan }
-
-      if ($npmError) {
-          Write-Host "Error during npm installation:" -ForegroundColor Red
-          Write-Host $npmError.Exception.Message -ForegroundColor Red
-          Write-Host "StackTrace:" -ForegroundColor Red
-          Write-Host $npmError.ScriptStackTrace -ForegroundColor Red
-
-          Write-Host "Environment variables:" -ForegroundColor Yellow
-          Get-ChildItem Env: | ForEach-Object { Write-Host "$($_.Name): $($_.Value)" -ForegroundColor Yellow }
-
-          Write-Host "Content of $dirLib:" -ForegroundColor Yellow
-          Get-ChildItem $dirLib -Recurse | ForEach-Object { Write-Host $_.FullName -ForegroundColor Yellow }
-
-          throw "Couldn't install npm@${NPM_VERSION}. See error details above."
-      }
-  }
-
-  Write-Host "npm installation completed successfully." -ForegroundColor Green
-
-  # After finishing up with our Node, let's put it in its final home
-  # and abandon this local npm directory.
-
-  # Move exe and cmd files to the \bin directory.
-  Move-Item $(Join-Path $dirTempNode '*.exe') $dirBin
-  # Move-Item $(Join-Path $dirTempNode '*.cmd') $dirBin
-  Move-Item $dirTempNodeHeadersInclude $DIR
-  Move-Item $dirNodeRelease $DIR
-
-  $finalNodeExe = Join-Path $dirBin 'node.exe'
-  $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
-
-  # Uses process.execPath to infer dev_bundle\bin, npm location, &c.
-  & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
-
-  # We use our own npm.cmd.
-  Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
-
-  Remove-DirectoryRecursively $dirTempNodeHeaders
-  Remove-DirectoryRecursively $dirTempNode
-
-  return New-Object -Type PSObject -Prop $(@{
-    node = $finalNodeExe
-    npm = $finalNpmCmd
-  })
-}
-
-Function Add-Mongo {
-  # Mongo >= 3.4 no longer supports 32-bit (x86) architectures, so we package
-  # the latest 3.2 version of Mongo for those builds and >= 3.4 for x64.
-  $mongo_filenames = @{
-    windows_x64 = "mongodb-windows-x86_64-${MONGO_VERSION_64BIT}"
-  }
-
-  # the folder inside the zip still uses win32
-  $mongo_zip_filenames = @{
-    windows_x64 = "mongodb-win32-x86_64-windows-${MONGO_VERSION_64BIT}"
-  }
-
-  $previousCwd = $PWD
-
-  cd "$DIR"
-  mkdir "$DIR\mongodb"
-  mkdir "$DIR\mongodb\bin"
-  $mongo_name = $mongo_filenames.Item($PLATFORM)
-  $mongo_zip_name = $mongo_zip_filenames.Item($PLATFORM)
-  $mongo_link = "https://fastdl.mongodb.org/windows/${mongo_name}.zip"
-  $mongo_zip = "$DIR\mongodb\mongo.zip"
-
-  Write-Host "Downloading Mongo from ${mongo_link}..." -ForegroundColor Magenta
-  $webclient.DownloadFile($mongo_link, $mongo_zip)
-
-  Write-Host "Extracting Mongo ${mongo_zip}..." -ForegroundColor Magenta
-  $zip = $shell.NameSpace($mongo_zip)
-  foreach($item in $zip.items()) {
-    $shell.Namespace("$DIR\mongodb").copyhere($item, 0x14) # 0x10 - overwrite, 0x4 - no dialog
-  }
-
-  Write-Host "Putting MongoDB mongod.exe in mongodb\bin" -ForegroundColor Magenta
-  cp "$DIR\mongodb\$mongo_zip_name\bin\mongod.exe" $DIR\mongodb\bin
-  Write-Host "Putting MongoDB mongos.exe in mongodb\bin" -ForegroundColor Magenta
-  cp "$DIR\mongodb\$mongo_zip_name\bin\mongos.exe" $DIR\mongodb\bin
-
-  Write-Host "Removing the old Mongo zip..." -ForegroundColor Magenta
-  rm -Recurse -Force $mongo_zip
-  Write-Host "Removing the old Mongo directory..." -ForegroundColor Magenta
-  rm -Recurse -Force "$DIR\mongodb\$mongo_zip_name"
-
-  cd "$previousCwd"
-}
-
-Function Add-NpmModulesFromJsBundleFile {
-  Param (
-    [Parameter(Mandatory=$True, Position=0)]
-    [string]$SourceJs,
-    [Parameter(Mandatory=$True, Position=1)]
-    [string]$Destination,
-    [Parameter(Mandatory=$True)]
-    $Commands,
-    [bool]$Shrinkwrap = $False
-  )
-
-  $previousCwd = $PWD
-
-  If (!(Test-Path $SourceJs)) {
-    throw "Couldn't find the source: $SourceJs"
-  }
-
-  New-Item -ItemType Directory -Force -Path $Destination | Out-Null
-
-  cd "$Destination"
-
-  Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
-    -ForegroundColor Magenta
-  & "$($Commands.node)" $SourceJs |
-    Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
-
-  # No bin-links because historically, they weren't used anyway.
-  & "$($Commands.npm)" install
-  if ($LASTEXITCODE -ne 0) {
-    throw "Couldn't install npm packages."
-  }
-
-  # As of npm@5, this just renames `package-lock.json` to `npm-shrinkwrap.json`.
-  if ($Shrinkwrap -eq $True) {
-    & "$($Commands.npm)" shrinkwrap
-    if ($LASTEXITCODE -ne 0) {
-      throw "Couldn't make shrinkwrap."
+        Remove-Item $7zMsiPath
     }
-  }
 
-  cd node_modules
+    Function Add-7ZipTool {
+        Write-Host "Downloading 7-zip 'extra'..." -ForegroundColor Magenta
+        $extraArchive = Join-Path $dirTemp 'extra.7z'
+        $webclient.DownloadFile("https://www.7-zip.org/a/7z1604-extra.7z", $extraArchive)
 
-  cd "$previousCwd"
+        $pathToExtract = 'x64/7za.exe'
+
+        Write-Host 'Placing 7za.exe from extra.7z in \bin...' -ForegroundColor Magenta
+        & "$system7zip" e $extraArchive -o"$dirTemp" $pathToExtract | Out-Null
+        Move-Item $(Join-Path $dirTemp '7za.exe') $(Join-Path $dirBin "7z.exe")
+
+        Remove-Item $extraArchive
+    }
+
+    Function Add-Python {
+        $pythonUrl = "https://s3.amazonaws.com/com.meteor.static/windows-python/",
+            "$PLATFORM/python-${PYTHON_VERSION}.7z" -Join ''
+        $pythonArchive = Join-Path $dirTemp 'python.7z'
+
+        $webclient.DownloadFile($pythonUrl, $pythonArchive)
+
+        Expand-7zToDirectory $pythonArchive $DIR
+
+        $pythonDir = Join-Path $DIR 'python'
+        $pythonExe = Join-Path $pythonDir 'python.exe'
+
+        if (!(cmd /c python.exe --version '2>&1' -Eq "Python ${PYTHON_VERSION}")) {
+            throw "Python was not the version we expected it to be ($PYTHON_VERSION)"
+        }
+
+        Remove-Item $pythonArchive
+
+        "$pythonExe"
+    }
+
+    Function Add-NodeAndNpm {
+        if ("${NODE_VERSION}" -match "-rc\.\d+$") {
+            $nodeUrlBase = 'https://nodejs.org/download/rc'
+        } else {
+            $nodeUrlBase = 'https://nodejs.org/dist'
+        }
+
+        $nodeArchitecture = 'win-x64'
+        $nodeVersionSegment = "v${NODE_VERSION}"
+        $nodeNameVersionSegment = "node-${nodeVersionSegment}"
+        $nodeNameSegment = "${nodeNameVersionSegment}-${nodeArchitecture}"
+        $nodeUrl = $nodeUrlBase, $nodeVersionSegment, "${nodeNameSegment}.7z" -Join '/'
+
+        $archiveNode = Join-Path $dirTemp 'node.7z'
+        Write-Host "Downloading Node.js from ${nodeUrl}" -ForegroundColor Magenta
+        $webclient.DownloadFile($nodeUrl, $archiveNode)
+
+        Write-Host "Extracting Node 7z file..." -ForegroundColor Magenta
+        & "$system7zip" x $archiveNode -o"$dirTemp" | Out-Null
+
+        $dirTempNode = Join-Path $dirTemp $nodeNameSegment
+        Remove-Item $archiveNode
+
+        $tempNodeExe = Join-Path $dirTempNode 'node.exe'
+        $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
+
+        $nodeProcessRelease = @{
+            headersUrl = & "$tempNodeExe" -p 'process.release.headersUrl'
+            libUrl = & "$tempNodeExe" -p 'process.release.libUrl'
+        }
+
+        if (!($nodeProcessRelease.headersUrl -And $nodeProcessRelease.libUrl)) {
+            throw "No 'headersUrl' or 'libUrl' in Node.js's 'process.release' output."
+        }
+
+        $nodeHeadersTarGz = Join-Path $dirTemp 'node-headers.tar.gz'
+        Write-Host "Downloading Node headers from $($nodeProcessRelease.headersUrl)" -ForegroundColor Magenta
+        $webclient.DownloadFile($nodeProcessRelease.headersUrl, $nodeHeadersTarGz)
+
+        $dirTempNodeHeaders = Join-Path $dirTemp 'node-headers'
+        if (!(Expand-TarGzToDirectory $nodeHeadersTarGz $dirTempNodeHeaders)) {
+            throw "Couldn't extract Node headers."
+        }
+
+        $dirTempNodeHeadersInclude = Join-Path $dirTempNodeHeaders $nodeNameVersionSegment | Join-Path -ChildPath 'include'
+        Move-Item $dirTempNodeHeadersInclude $dirTempNode
+        $dirTempNodeHeadersInclude = Join-Path $dirTempNode 'include'
+
+        $dirNodeRelease = Join-Path $dirTempNode 'Release'
+        New-Item -ItemType Directory -Force -Path $dirNodeRelease | Out-Null
+
+        Write-Host "Downloading node.lib from $($nodeProcessRelease.libUrl)" -ForegroundColor Magenta
+        $nodeLibTarget = Join-Path $dirNodeRelease 'node.lib'
+        $webclient.DownloadFile($nodeProcessRelease.libUrl, $nodeLibTarget)
+
+        Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
+
+        $npmOutput = $null
+        $npmError = $null
+
+        try {
+            Write-Host "Current directory: $PWD" -ForegroundColor Yellow
+            Write-Host "tempNpmCmd: $tempNpmCmd" -ForegroundColor Yellow
+            Write-Host "dirLib: $dirLib" -ForegroundColor Yellow
+            Write-Host "dirNpmCache: $dirNpmCache" -ForegroundColor Yellow
+            Write-Host "dirTempNode: $dirTempNode" -ForegroundColor Yellow
+
+            $env:NODE_DEBUG = "npm"
+            $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+                --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} --verbose 2>&1
+
+            if ($LASTEXITCODE -ne 0) {
+                throw "npm installation exited with code $LASTEXITCODE"
+            }
+        } catch {
+            $npmError = $_
+        } finally {
+            Write-Host "npm installation output:" -ForegroundColor Cyan
+            $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Cyan }
+
+            if ($npmError) {
+                Write-Host "Error during npm installation:" -ForegroundColor Red
+                Write-Host $npmError.Exception.Message -ForegroundColor Red
+                Write-Host "StackTrace:" -ForegroundColor Red
+                Write-Host $npmError.ScriptStackTrace -ForegroundColor Red
+
+                Write-Host "Environment variables:" -ForegroundColor Yellow
+                Get-ChildItem Env: | ForEach-Object { Write-Host "$($_.Name): $($_.Value)" -ForegroundColor Yellow }
+
+                Write-Host "Content of $dirLib:" -ForegroundColor Yellow
+                Get-ChildItem $dirLib -Recurse | ForEach-Object { Write-Host $_.FullName -ForegroundColor Yellow }
+
+                throw "Couldn't install npm@${NPM_VERSION}. See error details above."
+            }
+        }
+
+        Write-Host "npm installation completed successfully." -ForegroundColor Green
+
+        Move-Item $(Join-Path $dirTempNode '*.exe') $dirBin
+        Move-Item $dirTempNodeHeadersInclude $DIR
+        Move-Item $dirNodeRelease $DIR
+
+        $finalNodeExe = Join-Path $dirBin 'node.exe'
+        $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
+
+        & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
+
+        Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
+
+        Remove-DirectoryRecursively $dirTempNodeHeaders
+        Remove-DirectoryRecursively $dirTempNode
+
+        return New-Object -Type PSObject -Prop $(@{
+            node = $finalNodeExe
+            npm = $finalNpmCmd
+        })
+    }
+
+    # Install the global 7zip application, if necessary.
+    if (!(Test-Path "$system7zip")) {
+        Write-Host "Installing 7-zip since not found at ${system7zip}" -ForegroundColor Magenta
+        Invoke-Install7ZipApplication
+    }
+
+    # Download and install 7zip command-line tool into \bin
+    Add-7ZipTool
+
+    # Download and install Mongo binaries into \bin
+    Add-Mongo
+
+    # Add Python to \bin, and use it for Node Gyp.
+    $env:PYTHON = Add-Python
+
+    # Set additional options for node-gyp
+    $env:GYP_MSVS_VERSION = "2015"
+    $env:npm_config_nodedir = "$DIR"
+    $env:npm_config_cache = "$dirNpmCache"
+
+    # Allow running $dirBin commands like node and npm.
+    $env:PATH = "$env:PATH;$dirBin"
+
+    # Install Node.js and npm and get their paths to use from here on.
+    $toolCmds = Add-NodeAndNpm
+
+    "Location of node.exe:"
+    & Get-Command node | Select-Object -ExpandProperty Definition
+
+    "Node process.versions:"
+    & node -p 'process.versions'
+
+    "Location of npm.cmd:"
+    & Get-Command npm | Select-Object -ExpandProperty Definition
+
+    "Npm 'version':"
+    & npm version
+
+    npm config set loglevel error
+
+    # ... rest of your script ...
+
+    Write-Host "Script completed successfully" -ForegroundColor Green
+} catch {
+    Write-Host "An error occurred:" -ForegroundColor Red
+    Write-Host $_.Exception.Message -ForegroundColor Red
+    Write-Host "Stack Trace:" -ForegroundColor Red
+    Write-Host $_.ScriptStackTrace -ForegroundColor Red
+    exit 1
 }
-
-# Install the global 7zip application, if necessary.
-if (!(Test-Path "$system7zip")) {
-  Write-Host "Installing 7-zip since not found at ${system7zip}" `
-    -ForegroundColor Magenta
-  Invoke-Install7ZipApplication
-}
-
-# Download and install 7zip command-line tool into \bin
-Add-7ZipTool
-
-# Download and install Mongo binaries into \bin
-Add-Mongo
-
-# Add Python to \bin, and use it for Node Gyp.
-$env:PYTHON = Add-Python
-
-# Set additional options for node-gyp
-$env:GYP_MSVS_VERSION = "2015"
-$env:npm_config_nodedir = "$DIR"
-$env:npm_config_cache = "$dirNpmCache"
-
-# Allow running $dirBin commands like node and npm.
-$env:PATH = "$env:PATH;$dirBin"
-
-# Install Node.js and npm and get their paths to use from here on.
-$toolCmds = Add-NodeAndNpm
-
-"Location of node.exe:"
-& Get-Command node | Select-Object -ExpandProperty Definition
-
-"Node process.versions:"
-& node -p 'process.versions'
-
-"Location of npm.cmd:"
-& Get-Command npm | Select-Object -ExpandProperty Definition
-
-"Npm 'version':"
-& npm version
-
-npm config set loglevel error
-
-#
-# Install the npms for the 'server'.
-#
-$npmServerArgs = @{
-  sourceJs = "${dirCheckout}\scripts\dev-bundle-server-package.js"
-  destination = $dirServerLib
-  commands = $toolCmds
-  shrinkwrap = $True
-}
-Add-NpmModulesFromJsBundleFile @npmServerArgs
-
-# These are used by the Meteor tool bundler and written to the Meteor build.
-# For information, see the 'ServerTarget' class in tools/isobuild/bundler.js,
-# and look for 'serverPkgJson' and 'npm-shrinkwrap.json'
-mkdir -Force "${DIR}\etc"
-Move-Item $(Join-Path $dirServerLib 'package.json') "${DIR}\etc\"
-Move-Item $(Join-Path $dirServerLib 'npm-shrinkwrap.json') "${DIR}\etc\"
-
-#
-# Install the npms for the 'tool'.
-#
-$npmToolArgs = @{
-  sourceJs = "${dirCheckout}\scripts\dev-bundle-tool-package.js"
-  destination = $dirLib
-  commands = $toolCmds
-}
-Add-NpmModulesFromJsBundleFile @npmToolArgs
-
-# Leaving these probably doesn't hurt, but are removed for consistency w/ Unix.
-Remove-Item $(Join-Path $dirLib 'package.json')
-Remove-Item $(Join-Path $dirLib 'package-lock.json')
-
-Write-Host "Done writing node_modules build(s)..." -ForegroundColor Magenta
-
-Write-Host "Removing temp scratch $dirTemp" -ForegroundColor Magenta
-Remove-DirectoryRecursively $dirTemp
-
-# mark the version
-Write-Host "Writing out the bundle version..." -ForegroundColor Magenta
-echo "${BUNDLE_VERSION}" | Out-File $(Join-Path $DIR '.bundle_version.txt') -Encoding ascii
-
-$devBundleName = "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}"
-$dirBundlePreArchive = Join-Path $dirCheckout $devBundleName
-$devBundleTmpTar = Join-Path $dirCheckout "dev_bundle.tar"
-$devBundleTarGz = Join-Path $dirCheckout "${devBundleName}.tar.gz"
-
-# Cleanup from previous builds, if there are things in our way.
-Remove-DirectoryRecursively $dirBundlePreArchive
-If (Test-Path $devBundleTmpTar) {
-  Remove-Item -Force $devBundleTmpTar
-}
-If (Test-Path $devBundleTarGz) {
-  Remove-Item -Force $devBundleTarGz
-}
-
-# Get out of this directory, before we rename it.
-cd "$DIR\.."
-
-# rename the folder with the devbundle
-Write-Host "Renaming to $dirBundlePreArchive" -ForegroundColor Magenta
-Rename-Item "$DIR" $dirBundlePreArchive
-
-Write-Host "Compressing $dirBundlePreArchive to $devBundleTmpTar"
-& "$system7zip" a -ttar $devBundleTmpTar $dirBundlePreArchive
-if ($LASTEXITCODE -ne 0) {
-  throw "Failure while building $devBundleTmpTar"
-}
-
-if ((Get-Item $devBundleTmpTar).length -lt 50mb) {
-  throw "Dev bundle .tar is <50mb. If this is correct, update this message!"
-}
-
-Write-Host "Compressing $devBundleTmpTar into $devBundleTarGz" `
-  -ForegroundColor Magenta
-& "$system7zip" a -tgzip $devBundleTarGz $devBundleTmpTar
-if ($LASTEXITCODE -ne 0) {
-  throw "Failure while building $devBundleTarGz"
-}
-
-if ((Get-Item $devBundleTarGz).length -lt 30mb) {
-  throw "Dev bundle .tar.gz is <30mb. If this is correct, update this message!"
-}
-
-Write-Host "Removing $devBundleTmpTar" -ForegroundColor Magenta
-Remove-Item -Force $devBundleTmpTar
-
-Write-Host "Removing the '$devBundleName' temp directory." `
-  -ForegroundColor Magenta
-Remove-DirectoryRecursively $dirBundlePreArchive
-
-Write-Host "Done building Dev Bundle!" -ForegroundColor Green
-Exit 0

From a0b4c9ab034dc3baff52b53c3b9c821f0114df3b Mon Sep 17 00:00:00 2001
From: zodern <zodern@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:02:59 -0500
Subject: [PATCH 0615/1140] Simplify dynamics on nodejs

---
 packages/meteor/dynamics_nodejs.js | 108 ++++++++++-------------------
 1 file changed, 35 insertions(+), 73 deletions(-)

diff --git a/packages/meteor/dynamics_nodejs.js b/packages/meteor/dynamics_nodejs.js
index 1e3f2b287a..aa83ae548b 100644
--- a/packages/meteor/dynamics_nodejs.js
+++ b/packages/meteor/dynamics_nodejs.js
@@ -2,10 +2,6 @@
 let nextSlot = 0;
 let callAsyncMethodRunning = false;
 
-const CURRENT_VALUE_KEY_NAME = "currentValue";
-const UPPER_CALL_DYNAMICS_KEY_NAME = "upperCallDynamics";
-
-const SLOT_CALL_KEY = "slotCall";
 /**
  * @memberOf Meteor
  * @summary Constructor for EnvironmentVariable
@@ -26,12 +22,11 @@ class EnvironmentVariableAsync {
    * @returns {any} The current value of the variable, or `undefined` if no
    */
   get() {
-    if (this.slot !== Meteor._getValueFromAslStore(SLOT_CALL_KEY)) {
-      const dynamics = Meteor._getValueFromAslStore(UPPER_CALL_DYNAMICS_KEY_NAME) || {};
+    let store = Meteor._getAslStore();
 
-      return dynamics[this.slot];
+    if (store && store.dynamics) {
+      return store.dynamics[this.slot];
     }
-    return Meteor._getValueFromAslStore(CURRENT_VALUE_KEY_NAME);
   }
 
   getOrNullIfOutsideFiber() {
@@ -48,48 +43,31 @@ class EnvironmentVariableAsync {
    * @returns {Promise<any>} The return value of the function
    */
   withValue(value, func, options = {}) {
-    const self = this;
-    const slotCall = self.slot;
-    const dynamics = Object.assign(
-      {},
-      Meteor._getValueFromAslStore(UPPER_CALL_DYNAMICS_KEY_NAME) || {}
-    );
+    let store = Meteor._getAslStore();
+    let dynamics = store && store.dynamics ? store.dynamics.slice() : [];
+    dynamics[this.slot] = value;
 
-    if (slotCall != null) {
-      dynamics[slotCall] = value;
+    let newStore = { dynamics: dynamics };
+
+    if (options) {
+      Object.assign(newStore, options);
     }
 
-    return Meteor._runAsync(
-      function () {
-        Meteor._updateAslStore(CURRENT_VALUE_KEY_NAME, value);
-        Meteor._updateAslStore(UPPER_CALL_DYNAMICS_KEY_NAME, dynamics);
-        return func();
-      },
-      self,
-      Object.assign(
-        {
-          callId: `${this.slot}-${Math.random()}`,
-          [SLOT_CALL_KEY]: this.slot,
-        },
-        options,
-      ),
-    );
+    return Meteor._getAsl().run(newStore, func);
   }
 
-  _set(context) {
-    const _meteor_dynamics =
-      Meteor._getValueFromAslStore("_meteor_dynamics") || [];
-    _meteor_dynamics[this.slot] = context;
+  _set(value) {
+    const dynamics = Meteor._getValueFromAslStore('dynamics') || [];
+    dynamics[this.slot] = value;
   }
 
   _setNewContextAndGetCurrent(value) {
-    let _meteor_dynamics = Meteor._getValueFromAslStore("_meteor_dynamics");
-    if (!_meteor_dynamics) {
-      _meteor_dynamics = [];
-    }
+    const dynamics = Meteor._getValueFromAslStore('dynamics') || [];
+    
+    const saved = dynamics[this.slot];
+    
+    dynamics[this.slot] = value;
 
-    const saved = _meteor_dynamics[this.slot];
-    this._set(value);
     return saved;
   }
 
@@ -145,8 +123,8 @@ Meteor.EnvironmentVariable = EnvironmentVariableAsync;
  * @return {Function} The wrapped function
  */
 Meteor.bindEnvironment = (func, onException, _this) => {
-  const dynamics = Meteor._getValueFromAslStore(CURRENT_VALUE_KEY_NAME);
-  const currentSlot = Meteor._getValueFromAslStore(SLOT_CALL_KEY);
+  let store = Meteor._getAsl().getStore();
+  let dynamics = store && store.dynamics ? store.dynamics.slice() : [];
 
   if (!onException || typeof onException === "string") {
     var description = onException || "callback of async function";
@@ -162,37 +140,21 @@ Meteor.bindEnvironment = (func, onException, _this) => {
   return function (/* arguments */) {
     var args = Array.prototype.slice.call(arguments);
 
-    var runWithEnvironment = function () {
-      return Meteor._runAsync(
-        () => {
-          let ret;
-          try {
-            if (currentSlot) {
-              Meteor._updateAslStore(CURRENT_VALUE_KEY_NAME, dynamics);
-            }
-            ret = func.apply(_this, args);
+    return Meteor._getAsl().run({
+      dynamics: dynamics
+    }, function () {
+      let ret;
+      try {
+        ret = func.apply(_this, args);
 
-            // Using this strategy to be consistent between client and server and stop always returning a promise from the server
-            if (Meteor._isPromise(ret)) {
-              ret = ret.catch(onException);
-            }
-          } catch (e) {
-            onException(e);
-          }
-          return ret;
-        },
-        _this,
-        {
-          callId: `bindEnvironment-${Math.random()}`,
-          [SLOT_CALL_KEY]: currentSlot,
+        // Using this strategy to be consistent between client and server and stop always returning a promise from the server
+        if (Meteor._isPromise(ret)) {
+          ret = ret.catch(onException);
         }
-      );
-    };
-
-    if (Meteor._getAslStore()) {
-      return runWithEnvironment();
-    }
-
-    return Meteor._getAsl().run({}, runWithEnvironment);
+      } catch (e) {
+        onException(e);
+      }
+      return ret;
+    });
   };
 };

From d83735d855d870a43c0452463bf93ba28a29783c Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 09:48:00 -0400
Subject: [PATCH 0616/1140] - revert changes

---
 scripts/generate-dev-bundle.ps1 | 673 ++++++++++++++++++++------------
 1 file changed, 422 insertions(+), 251 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 95baaa6849..2223d04b06 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,273 +1,444 @@
 $ErrorActionPreference = "Stop"
 $DebugPreference = "Continue"
-$VerbosePreference = "Continue"
 
-Write-Host "Script started" -ForegroundColor Green
+Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
+$PLATFORM = Get-MeteorPlatform
 
-try {
-    Write-Host "Importing module" -ForegroundColor Yellow
-    Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
+$PYTHON_VERSION = "3.9.5" # For node-gyp
+& cmd /c 'du 2>&1'
 
-    Write-Host "Getting Meteor platform" -ForegroundColor Yellow
-    $PLATFORM = Get-MeteorPlatform
-    Write-Host "Platform: $PLATFORM" -ForegroundColor Yellow
+$dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
+$shCommon = Join-Path $PSScriptRoot 'build-dev-bundle-common.sh'
 
-    $PYTHON_VERSION = "3.9.5" # For node-gyp
-    Write-Host "Python Version: $PYTHON_VERSION" -ForegroundColor Yellow
+$tempSrcNode = Join-Path $(Join-Path $dirCheckout 'temp_build_src') 'node.7z'
 
-    Write-Host "Running 'du' command" -ForegroundColor Yellow
-    & cmd /c 'du 2>&1'
+# This will be the temporary directory we build the dev bundle in.
+$DIR = Join-Path $dirCheckout 'gdbXXX'
 
-    Write-Host "Setting up directories" -ForegroundColor Yellow
-    $dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
-    $shCommon = Join-Path $PSScriptRoot 'build-dev-bundle-common.sh'
-    $tempSrcNode = Join-Path $(Join-Path $dirCheckout 'temp_build_src') 'node.7z'
-    $DIR = Join-Path $dirCheckout 'gdbXXX'
+# extract the bundle version from the meteor bash script
+$BUNDLE_VERSION = Read-VariableFromShellScript "${dirCheckout}\meteor" 'BUNDLE_VERSION'
 
-    Write-Host "Reading variables from shell scripts" -ForegroundColor Yellow
-    $BUNDLE_VERSION = Read-VariableFromShellScript "${dirCheckout}\meteor" 'BUNDLE_VERSION'
-    $MONGO_VERSION_64BIT = Read-VariableFromShellScript $shCommon 'MONGO_VERSION_64BIT'
-    $NPM_VERSION = Read-VariableFromShellScript $shCommon 'NPM_VERSION'
-    $NODE_VERSION = Read-VariableFromShellScript $shCommon 'NODE_VERSION'
+# extract the major package versions from the build-dev-bundle-common script.
+$MONGO_VERSION_64BIT = Read-VariableFromShellScript $shCommon 'MONGO_VERSION_64BIT'
 
-    Write-Host "Setting up 7-zip" -ForegroundColor Yellow
-    $system7zip = "C:\Program Files\7-zip\7z.exe"
+$NPM_VERSION = Read-VariableFromShellScript $shCommon 'NPM_VERSION'
 
-    Write-Host "Setting SecurityProtocol" -ForegroundColor Yellow
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$NODE_VERSION = Read-VariableFromShellScript $shCommon 'NODE_VERSION'
 
-    Write-Host "Removing directory: $DIR" -ForegroundColor Yellow
-    Remove-DirectoryRecursively $DIR
+# 7-zip path.
+$system7zip = "C:\Program Files\7-zip\7z.exe"
 
-    Write-Host "Setting up paths" -ForegroundColor Yellow
-    $dirBin = Join-Path $DIR 'bin'
-    $dirLib = Join-Path $DIR 'lib'
-    $dirServerLib = Join-Path $DIR 'server-lib'
-    $dirTemp = Join-Path $DIR 'temp'
-    $dirNpmCache = Join-Path $dirTemp 'npm-cache'
+# Required for downloading MongoDB via HTTPS
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
-    Write-Host "Creating directories" -ForegroundColor Yellow
-    New-Item -ItemType Directory -Force -Path $DIR | Out-Null
-    New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
-    New-Item -ItemType Directory -Force -Path $dirBin | Out-Null
-    New-Item -ItemType Directory -Force -Path $dirLib | Out-Null
-    New-Item -ItemType Directory -Force -Path $dirServerLib | Out-Null
+# Since we reuse the same temp directory, cleanup from previous failed runs.
+Remove-DirectoryRecursively $DIR
 
-    Write-Host "Creating WebClient and Shell objects" -ForegroundColor Yellow
-    $webclient = New-Object System.Net.WebClient
-    $shell = New-Object -com shell.application
+# Some commonly used paths in this script.
+$dirBin = Join-Path $DIR 'bin'
+$dirLib = Join-Path $DIR 'lib'
+$dirServerLib = Join-Path $DIR 'server-lib'
+$dirTemp = Join-Path $DIR 'temp'
 
-    Function Invoke-Install7ZipApplication {
-        Write-Host "Downloading 7-zip..." -ForegroundColor Magenta
-        $7zMsiPath = Join-Path $dirTemp '7z.msi'
-        $webclient.DownloadFile("https://www.7-zip.org/a/7z1604.msi", $7zMsiPath)
+# Use a cache just for this build.
+$dirNpmCache = Join-Path $dirTemp 'npm-cache'
 
-        Write-Host "Installing 7-zip system-wide..." -ForegroundColor Magenta
-        & "msiexec.exe" /i $7zMsiPath /quiet /qn /norestart | Out-Null
+# Build our directory framework.
+New-Item -ItemType Directory -Force -Path $DIR | Out-Null
+New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
+New-Item -ItemType Directory -Force -Path $dirBin | Out-Null
+New-Item -ItemType Directory -Force -Path $dirLib | Out-Null
+New-Item -ItemType Directory -Force -Path $dirServerLib | Out-Null
 
-        Remove-Item $7zMsiPath
-    }
+$webclient = New-Object System.Net.WebClient
+$shell = New-Object -com shell.application
 
-    Function Add-7ZipTool {
-        Write-Host "Downloading 7-zip 'extra'..." -ForegroundColor Magenta
-        $extraArchive = Join-Path $dirTemp 'extra.7z'
-        $webclient.DownloadFile("https://www.7-zip.org/a/7z1604-extra.7z", $extraArchive)
+Function Invoke-Install7ZipApplication {
+  Write-Host "Downloading 7-zip..." -ForegroundColor Magenta
+  $7zMsiPath = Join-Path $dirTemp '7z.msi'
+  # 32-bit, right now.  But this does not go in the bundle.
+  $webclient.DownloadFile("https://www.7-zip.org/a/7z1604.msi", $7zMsiPath)
 
-        $pathToExtract = 'x64/7za.exe'
+  Write-Host "Installing 7-zip system-wide..." -ForegroundColor Magenta
+  & "msiexec.exe" /i $7zMsiPath /quiet /qn /norestart | Out-Null
 
-        Write-Host 'Placing 7za.exe from extra.7z in \bin...' -ForegroundColor Magenta
-        & "$system7zip" e $extraArchive -o"$dirTemp" $pathToExtract | Out-Null
-        Move-Item $(Join-Path $dirTemp '7za.exe') $(Join-Path $dirBin "7z.exe")
-
-        Remove-Item $extraArchive
-    }
-
-    Function Add-Python {
-        $pythonUrl = "https://s3.amazonaws.com/com.meteor.static/windows-python/",
-            "$PLATFORM/python-${PYTHON_VERSION}.7z" -Join ''
-        $pythonArchive = Join-Path $dirTemp 'python.7z'
-
-        $webclient.DownloadFile($pythonUrl, $pythonArchive)
-
-        Expand-7zToDirectory $pythonArchive $DIR
-
-        $pythonDir = Join-Path $DIR 'python'
-        $pythonExe = Join-Path $pythonDir 'python.exe'
-
-        if (!(cmd /c python.exe --version '2>&1' -Eq "Python ${PYTHON_VERSION}")) {
-            throw "Python was not the version we expected it to be ($PYTHON_VERSION)"
-        }
-
-        Remove-Item $pythonArchive
-
-        "$pythonExe"
-    }
-
-    Function Add-NodeAndNpm {
-        if ("${NODE_VERSION}" -match "-rc\.\d+$") {
-            $nodeUrlBase = 'https://nodejs.org/download/rc'
-        } else {
-            $nodeUrlBase = 'https://nodejs.org/dist'
-        }
-
-        $nodeArchitecture = 'win-x64'
-        $nodeVersionSegment = "v${NODE_VERSION}"
-        $nodeNameVersionSegment = "node-${nodeVersionSegment}"
-        $nodeNameSegment = "${nodeNameVersionSegment}-${nodeArchitecture}"
-        $nodeUrl = $nodeUrlBase, $nodeVersionSegment, "${nodeNameSegment}.7z" -Join '/'
-
-        $archiveNode = Join-Path $dirTemp 'node.7z'
-        Write-Host "Downloading Node.js from ${nodeUrl}" -ForegroundColor Magenta
-        $webclient.DownloadFile($nodeUrl, $archiveNode)
-
-        Write-Host "Extracting Node 7z file..." -ForegroundColor Magenta
-        & "$system7zip" x $archiveNode -o"$dirTemp" | Out-Null
-
-        $dirTempNode = Join-Path $dirTemp $nodeNameSegment
-        Remove-Item $archiveNode
-
-        $tempNodeExe = Join-Path $dirTempNode 'node.exe'
-        $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
-
-        $nodeProcessRelease = @{
-            headersUrl = & "$tempNodeExe" -p 'process.release.headersUrl'
-            libUrl = & "$tempNodeExe" -p 'process.release.libUrl'
-        }
-
-        if (!($nodeProcessRelease.headersUrl -And $nodeProcessRelease.libUrl)) {
-            throw "No 'headersUrl' or 'libUrl' in Node.js's 'process.release' output."
-        }
-
-        $nodeHeadersTarGz = Join-Path $dirTemp 'node-headers.tar.gz'
-        Write-Host "Downloading Node headers from $($nodeProcessRelease.headersUrl)" -ForegroundColor Magenta
-        $webclient.DownloadFile($nodeProcessRelease.headersUrl, $nodeHeadersTarGz)
-
-        $dirTempNodeHeaders = Join-Path $dirTemp 'node-headers'
-        if (!(Expand-TarGzToDirectory $nodeHeadersTarGz $dirTempNodeHeaders)) {
-            throw "Couldn't extract Node headers."
-        }
-
-        $dirTempNodeHeadersInclude = Join-Path $dirTempNodeHeaders $nodeNameVersionSegment | Join-Path -ChildPath 'include'
-        Move-Item $dirTempNodeHeadersInclude $dirTempNode
-        $dirTempNodeHeadersInclude = Join-Path $dirTempNode 'include'
-
-        $dirNodeRelease = Join-Path $dirTempNode 'Release'
-        New-Item -ItemType Directory -Force -Path $dirNodeRelease | Out-Null
-
-        Write-Host "Downloading node.lib from $($nodeProcessRelease.libUrl)" -ForegroundColor Magenta
-        $nodeLibTarget = Join-Path $dirNodeRelease 'node.lib'
-        $webclient.DownloadFile($nodeProcessRelease.libUrl, $nodeLibTarget)
-
-        Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-
-        $npmOutput = $null
-        $npmError = $null
-
-        try {
-            Write-Host "Current directory: $PWD" -ForegroundColor Yellow
-            Write-Host "tempNpmCmd: $tempNpmCmd" -ForegroundColor Yellow
-            Write-Host "dirLib: $dirLib" -ForegroundColor Yellow
-            Write-Host "dirNpmCache: $dirNpmCache" -ForegroundColor Yellow
-            Write-Host "dirTempNode: $dirTempNode" -ForegroundColor Yellow
-
-            $env:NODE_DEBUG = "npm"
-            $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-                --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} --verbose 2>&1
-
-            if ($LASTEXITCODE -ne 0) {
-                throw "npm installation exited with code $LASTEXITCODE"
-            }
-        } catch {
-            $npmError = $_
-        } finally {
-            Write-Host "npm installation output:" -ForegroundColor Cyan
-            $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Cyan }
-
-            if ($npmError) {
-                Write-Host "Error during npm installation:" -ForegroundColor Red
-                Write-Host $npmError.Exception.Message -ForegroundColor Red
-                Write-Host "StackTrace:" -ForegroundColor Red
-                Write-Host $npmError.ScriptStackTrace -ForegroundColor Red
-
-                Write-Host "Environment variables:" -ForegroundColor Yellow
-                Get-ChildItem Env: | ForEach-Object { Write-Host "$($_.Name): $($_.Value)" -ForegroundColor Yellow }
-
-                Write-Host "Content of $dirLib:" -ForegroundColor Yellow
-                Get-ChildItem $dirLib -Recurse | ForEach-Object { Write-Host $_.FullName -ForegroundColor Yellow }
-
-                throw "Couldn't install npm@${NPM_VERSION}. See error details above."
-            }
-        }
-
-        Write-Host "npm installation completed successfully." -ForegroundColor Green
-
-        Move-Item $(Join-Path $dirTempNode '*.exe') $dirBin
-        Move-Item $dirTempNodeHeadersInclude $DIR
-        Move-Item $dirNodeRelease $DIR
-
-        $finalNodeExe = Join-Path $dirBin 'node.exe'
-        $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
-
-        & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
-
-        Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
-
-        Remove-DirectoryRecursively $dirTempNodeHeaders
-        Remove-DirectoryRecursively $dirTempNode
-
-        return New-Object -Type PSObject -Prop $(@{
-            node = $finalNodeExe
-            npm = $finalNpmCmd
-        })
-    }
-
-    # Install the global 7zip application, if necessary.
-    if (!(Test-Path "$system7zip")) {
-        Write-Host "Installing 7-zip since not found at ${system7zip}" -ForegroundColor Magenta
-        Invoke-Install7ZipApplication
-    }
-
-    # Download and install 7zip command-line tool into \bin
-    Add-7ZipTool
-
-    # Download and install Mongo binaries into \bin
-    Add-Mongo
-
-    # Add Python to \bin, and use it for Node Gyp.
-    $env:PYTHON = Add-Python
-
-    # Set additional options for node-gyp
-    $env:GYP_MSVS_VERSION = "2015"
-    $env:npm_config_nodedir = "$DIR"
-    $env:npm_config_cache = "$dirNpmCache"
-
-    # Allow running $dirBin commands like node and npm.
-    $env:PATH = "$env:PATH;$dirBin"
-
-    # Install Node.js and npm and get their paths to use from here on.
-    $toolCmds = Add-NodeAndNpm
-
-    "Location of node.exe:"
-    & Get-Command node | Select-Object -ExpandProperty Definition
-
-    "Node process.versions:"
-    & node -p 'process.versions'
-
-    "Location of npm.cmd:"
-    & Get-Command npm | Select-Object -ExpandProperty Definition
-
-    "Npm 'version':"
-    & npm version
-
-    npm config set loglevel error
-
-    # ... rest of your script ...
-
-    Write-Host "Script completed successfully" -ForegroundColor Green
-} catch {
-    Write-Host "An error occurred:" -ForegroundColor Red
-    Write-Host $_.Exception.Message -ForegroundColor Red
-    Write-Host "Stack Trace:" -ForegroundColor Red
-    Write-Host $_.ScriptStackTrace -ForegroundColor Red
-    exit 1
+  # Cleanup.
+  Remove-Item $7zMsiPath
 }
+
+Function Add-7ZipTool {
+  Write-Host "Downloading 7-zip 'extra'..." -ForegroundColor Magenta
+  $extraArchive = Join-Path $dirTemp 'extra.7z'
+  $webclient.DownloadFile("https://www.7-zip.org/a/7z1604-extra.7z", $extraArchive)
+
+  $pathToExtract = 'x64/7za.exe'
+
+  Write-Host 'Placing 7za.exe from extra.7z in \bin...' -ForegroundColor Magenta
+  & "$system7zip" e $extraArchive -o"$dirTemp" $pathToExtract | Out-Null
+  Move-Item $(Join-Path $dirTemp '7za.exe') $(Join-Path $dirBin "7z.exe")
+
+  # Cleanup
+  Remove-Item $extraArchive
+}
+
+Function Add-Python {
+  # On Windows we provide a reliable version of python.exe for use by
+  # node-gyp (the tool that rebuilds binary node modules).
+  # This self-hosted 7z is created by archiving the result of running the
+  # Python MSI installer (from python.org), targeted at a temp directory, and
+  # only including: "Python" and "Utility Scripts". Then, 7z the temp directory.
+  $pythonUrl = "https://s3.amazonaws.com/com.meteor.static/windows-python/",
+    "$PLATFORM/python-${PYTHON_VERSION}.7z" -Join ''
+  $pythonArchive = Join-Path $dirTemp 'python.7z'
+
+  $webclient.DownloadFile($pythonUrl, $pythonArchive)
+
+  Expand-7zToDirectory $pythonArchive $DIR
+
+  $pythonDir = Join-Path $DIR 'python'
+  $pythonExe = Join-Path $pythonDir 'python.exe'
+
+  # Make sure the version is right, when python is called.
+  if (!(cmd /c python.exe --version '2>&1' -Eq "Python ${PYTHON_VERSION}")) {
+    throw "Python was not the version we expected it to be ($PYTHON_VERSION)"
+  }
+
+  Remove-Item $pythonArchive
+
+  "$pythonExe"
+}
+
+Function Add-NodeAndNpm {
+  if ("${NODE_VERSION}" -match "-rc\.\d+$") {
+    $nodeUrlBase = 'https://nodejs.org/download/rc'
+  } else {
+    $nodeUrlBase = 'https://nodejs.org/dist'
+  }
+
+  $nodeArchitecture = 'win-x64'
+
+  # Various variables which are used as part of directory paths and
+  # inside Node release and header archives.
+  $nodeVersionSegment = "v${NODE_VERSION}"
+  $nodeNameVersionSegment = "node-${nodeVersionSegment}"
+  $nodeNameSegment = "${nodeNameVersionSegment}-${nodeArchitecture}"
+
+  # The URL for the Node 7z archive, which includes its shipped version of npm.
+  $nodeUrl = $nodeUrlBase, $nodeVersionSegment,
+    "${nodeNameSegment}.7z" -Join '/'
+
+  $archiveNode = Join-Path $dirTemp 'node.7z'
+  Write-Host "Downloading Node.js from ${nodeUrl}" -ForegroundColor Magenta
+  $webclient.DownloadFile($nodeUrl, $archiveNode)
+
+  Write-Host "Extracting Node 7z file..." -ForegroundColor Magenta
+  & "$system7zip" x $archiveNode -o"$dirTemp" | Out-Null
+
+  # This will be the location of the extracted Node tarball.
+  $dirTempNode = Join-Path $dirTemp $nodeNameSegment
+
+  # Delete the no longer necessary Node archive.
+  Remove-Item $archiveNode
+
+  $tempNodeExe = Join-Path $dirTempNode 'node.exe'
+  $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
+
+  # Get additional values we'll need to fetch to complete this release.
+  $nodeProcessRelease = @{
+    headersUrl = & "$tempNodeExe" -p 'process.release.headersUrl'
+    libUrl = & "$tempNodeExe" -p 'process.release.libUrl'
+  }
+
+  if (!($nodeProcessRelease.headersUrl -And $nodeProcessRelease.libUrl)) {
+    throw "No 'headersUrl' or 'libUrl' in Node.js's 'process.release' output."
+  }
+
+  $nodeHeadersTarGz = Join-Path $dirTemp 'node-headers.tar.gz'
+  Write-Host "Downloading Node headers from $($nodeProcessRelease.headersUrl)" `
+    -ForegroundColor Magenta
+  $webclient.DownloadFile($nodeProcessRelease.headersUrl, $nodeHeadersTarGz)
+
+  $dirTempNodeHeaders = Join-Path $dirTemp 'node-headers'
+  if (!(Expand-TarGzToDirectory $nodeHeadersTarGz $dirTempNodeHeaders)) {
+    throw "Couldn't extract Node headers."
+  }
+
+  # Move the extracted include directory to the Node dir.
+  $dirTempNodeHeadersInclude = `
+    Join-Path $dirTempNodeHeaders $nodeNameVersionSegment |
+    Join-Path -ChildPath 'include'
+  Move-Item $dirTempNodeHeadersInclude $dirTempNode
+  $dirTempNodeHeadersInclude = Join-Path $dirTempNode 'include'
+
+  # The node.lib goes into a \Release directory.
+  $dirNodeRelease = Join-Path $dirTempNode 'Release'
+  New-Item -ItemType Directory -Force -Path $dirNodeRelease | Out-Null
+
+  Write-Host "Downloading node.lib from $($nodeProcessRelease.libUrl)" `
+    -ForegroundColor Magenta
+  $nodeLibTarget = Join-Path $dirNodeRelease 'node.lib'
+  $webclient.DownloadFile($nodeProcessRelease.libUrl, $nodeLibTarget)
+
+  #
+  # We should now have a fully functionaly local Node with headers to use.
+  #
+
+  # Let's install the npm version we really want.
+  Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
+  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
+      Write-Debug
+
+  if ($LASTEXITCODE -ne 0) {
+    throw "Couldn't install npm@${NPM_VERSION}."
+  }
+
+  # After finishing up with our Node, let's put it in its final home
+  # and abandon this local npm directory.
+
+  # Move exe and cmd files to the \bin directory.
+  Move-Item $(Join-Path $dirTempNode '*.exe') $dirBin
+  # Move-Item $(Join-Path $dirTempNode '*.cmd') $dirBin
+  Move-Item $dirTempNodeHeadersInclude $DIR
+  Move-Item $dirNodeRelease $DIR
+
+  $finalNodeExe = Join-Path $dirBin 'node.exe'
+  $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
+
+  # Uses process.execPath to infer dev_bundle\bin, npm location, &c.
+  & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
+
+  # We use our own npm.cmd.
+  Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
+
+  Remove-DirectoryRecursively $dirTempNodeHeaders
+  Remove-DirectoryRecursively $dirTempNode
+
+  return New-Object -Type PSObject -Prop $(@{
+    node = $finalNodeExe
+    npm = $finalNpmCmd
+  })
+}
+
+Function Add-Mongo {
+  # Mongo >= 3.4 no longer supports 32-bit (x86) architectures, so we package
+  # the latest 3.2 version of Mongo for those builds and >= 3.4 for x64.
+  $mongo_filenames = @{
+    windows_x64 = "mongodb-windows-x86_64-${MONGO_VERSION_64BIT}"
+  }
+
+  # the folder inside the zip still uses win32
+  $mongo_zip_filenames = @{
+    windows_x64 = "mongodb-win32-x86_64-windows-${MONGO_VERSION_64BIT}"
+  }
+
+  $previousCwd = $PWD
+
+  cd "$DIR"
+  mkdir "$DIR\mongodb"
+  mkdir "$DIR\mongodb\bin"
+  $mongo_name = $mongo_filenames.Item($PLATFORM)
+  $mongo_zip_name = $mongo_zip_filenames.Item($PLATFORM)
+  $mongo_link = "https://fastdl.mongodb.org/windows/${mongo_name}.zip"
+  $mongo_zip = "$DIR\mongodb\mongo.zip"
+
+  Write-Host "Downloading Mongo from ${mongo_link}..." -ForegroundColor Magenta
+  $webclient.DownloadFile($mongo_link, $mongo_zip)
+
+  Write-Host "Extracting Mongo ${mongo_zip}..." -ForegroundColor Magenta
+  $zip = $shell.NameSpace($mongo_zip)
+  foreach($item in $zip.items()) {
+    $shell.Namespace("$DIR\mongodb").copyhere($item, 0x14) # 0x10 - overwrite, 0x4 - no dialog
+  }
+
+  Write-Host "Putting MongoDB mongod.exe in mongodb\bin" -ForegroundColor Magenta
+  cp "$DIR\mongodb\$mongo_zip_name\bin\mongod.exe" $DIR\mongodb\bin
+  Write-Host "Putting MongoDB mongos.exe in mongodb\bin" -ForegroundColor Magenta
+  cp "$DIR\mongodb\$mongo_zip_name\bin\mongos.exe" $DIR\mongodb\bin
+
+  Write-Host "Removing the old Mongo zip..." -ForegroundColor Magenta
+  rm -Recurse -Force $mongo_zip
+  Write-Host "Removing the old Mongo directory..." -ForegroundColor Magenta
+  rm -Recurse -Force "$DIR\mongodb\$mongo_zip_name"
+
+  cd "$previousCwd"
+}
+
+Function Add-NpmModulesFromJsBundleFile {
+  Param (
+    [Parameter(Mandatory=$True, Position=0)]
+    [string]$SourceJs,
+    [Parameter(Mandatory=$True, Position=1)]
+    [string]$Destination,
+    [Parameter(Mandatory=$True)]
+    $Commands,
+    [bool]$Shrinkwrap = $False
+  )
+
+  $previousCwd = $PWD
+
+  If (!(Test-Path $SourceJs)) {
+    throw "Couldn't find the source: $SourceJs"
+  }
+
+  New-Item -ItemType Directory -Force -Path $Destination | Out-Null
+
+  cd "$Destination"
+
+  Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
+    -ForegroundColor Magenta
+  & "$($Commands.node)" $SourceJs |
+    Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
+
+  # No bin-links because historically, they weren't used anyway.
+  & "$($Commands.npm)" install
+  if ($LASTEXITCODE -ne 0) {
+    throw "Couldn't install npm packages."
+  }
+
+  # As of npm@5, this just renames `package-lock.json` to `npm-shrinkwrap.json`.
+  if ($Shrinkwrap -eq $True) {
+    & "$($Commands.npm)" shrinkwrap
+    if ($LASTEXITCODE -ne 0) {
+      throw "Couldn't make shrinkwrap."
+    }
+  }
+
+  cd node_modules
+
+  cd "$previousCwd"
+}
+
+# Install the global 7zip application, if necessary.
+if (!(Test-Path "$system7zip")) {
+  Write-Host "Installing 7-zip since not found at ${system7zip}" `
+    -ForegroundColor Magenta
+  Invoke-Install7ZipApplication
+}
+
+# Download and install 7zip command-line tool into \bin
+Add-7ZipTool
+
+# Download and install Mongo binaries into \bin
+Add-Mongo
+
+# Add Python to \bin, and use it for Node Gyp.
+$env:PYTHON = Add-Python
+
+# Set additional options for node-gyp
+$env:GYP_MSVS_VERSION = "2015"
+$env:npm_config_nodedir = "$DIR"
+$env:npm_config_cache = "$dirNpmCache"
+
+# Allow running $dirBin commands like node and npm.
+$env:PATH = "$env:PATH;$dirBin"
+
+# Install Node.js and npm and get their paths to use from here on.
+$toolCmds = Add-NodeAndNpm
+
+"Location of node.exe:"
+& Get-Command node | Select-Object -ExpandProperty Definition
+
+"Node process.versions:"
+& node -p 'process.versions'
+
+"Location of npm.cmd:"
+& Get-Command npm | Select-Object -ExpandProperty Definition
+
+"Npm 'version':"
+& npm version
+
+npm config set loglevel error
+
+#
+# Install the npms for the 'server'.
+#
+$npmServerArgs = @{
+  sourceJs = "${dirCheckout}\scripts\dev-bundle-server-package.js"
+  destination = $dirServerLib
+  commands = $toolCmds
+  shrinkwrap = $True
+}
+Add-NpmModulesFromJsBundleFile @npmServerArgs
+
+# These are used by the Meteor tool bundler and written to the Meteor build.
+# For information, see the 'ServerTarget' class in tools/isobuild/bundler.js,
+# and look for 'serverPkgJson' and 'npm-shrinkwrap.json'
+mkdir -Force "${DIR}\etc"
+Move-Item $(Join-Path $dirServerLib 'package.json') "${DIR}\etc\"
+Move-Item $(Join-Path $dirServerLib 'npm-shrinkwrap.json') "${DIR}\etc\"
+
+#
+# Install the npms for the 'tool'.
+#
+$npmToolArgs = @{
+  sourceJs = "${dirCheckout}\scripts\dev-bundle-tool-package.js"
+  destination = $dirLib
+  commands = $toolCmds
+}
+Add-NpmModulesFromJsBundleFile @npmToolArgs
+
+# Leaving these probably doesn't hurt, but are removed for consistency w/ Unix.
+Remove-Item $(Join-Path $dirLib 'package.json')
+Remove-Item $(Join-Path $dirLib 'package-lock.json')
+
+Write-Host "Done writing node_modules build(s)..." -ForegroundColor Magenta
+
+Write-Host "Removing temp scratch $dirTemp" -ForegroundColor Magenta
+Remove-DirectoryRecursively $dirTemp
+
+# mark the version
+Write-Host "Writing out the bundle version..." -ForegroundColor Magenta
+echo "${BUNDLE_VERSION}" | Out-File $(Join-Path $DIR '.bundle_version.txt') -Encoding ascii
+
+$devBundleName = "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}"
+$dirBundlePreArchive = Join-Path $dirCheckout $devBundleName
+$devBundleTmpTar = Join-Path $dirCheckout "dev_bundle.tar"
+$devBundleTarGz = Join-Path $dirCheckout "${devBundleName}.tar.gz"
+
+# Cleanup from previous builds, if there are things in our way.
+Remove-DirectoryRecursively $dirBundlePreArchive
+If (Test-Path $devBundleTmpTar) {
+  Remove-Item -Force $devBundleTmpTar
+}
+If (Test-Path $devBundleTarGz) {
+  Remove-Item -Force $devBundleTarGz
+}
+
+# Get out of this directory, before we rename it.
+cd "$DIR\.."
+
+# rename the folder with the devbundle
+Write-Host "Renaming to $dirBundlePreArchive" -ForegroundColor Magenta
+Rename-Item "$DIR" $dirBundlePreArchive
+
+Write-Host "Compressing $dirBundlePreArchive to $devBundleTmpTar"
+& "$system7zip" a -ttar $devBundleTmpTar $dirBundlePreArchive
+if ($LASTEXITCODE -ne 0) {
+  throw "Failure while building $devBundleTmpTar"
+}
+
+if ((Get-Item $devBundleTmpTar).length -lt 50mb) {
+  throw "Dev bundle .tar is <50mb. If this is correct, update this message!"
+}
+
+Write-Host "Compressing $devBundleTmpTar into $devBundleTarGz" `
+  -ForegroundColor Magenta
+& "$system7zip" a -tgzip $devBundleTarGz $devBundleTmpTar
+if ($LASTEXITCODE -ne 0) {
+  throw "Failure while building $devBundleTarGz"
+}
+
+if ((Get-Item $devBundleTarGz).length -lt 30mb) {
+  throw "Dev bundle .tar.gz is <30mb. If this is correct, update this message!"
+}
+
+Write-Host "Removing $devBundleTmpTar" -ForegroundColor Magenta
+Remove-Item -Force $devBundleTmpTar
+
+Write-Host "Removing the '$devBundleName' temp directory." `
+  -ForegroundColor Magenta
+Remove-DirectoryRecursively $dirBundlePreArchive
+
+Write-Host "Done building Dev Bundle!" -ForegroundColor Green
+Exit 0

From 9255efdd7605d1bf8e689bc30589fe39013a3527 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 09:51:50 -0400
Subject: [PATCH 0617/1140] - try to get more logs

---
 scripts/generate-dev-bundle.ps1 | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 2223d04b06..a41a0a60f4 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,6 +1,13 @@
+# At the beginning of the script
 $ErrorActionPreference = "Stop"
+$VerbosePreference = "Continue"
 $DebugPreference = "Continue"
 
+# Redirect all streams to stdout
+$PSDefaultParameterValues['*:ErrorAction'] = 'Continue'
+$PSDefaultParameterValues['*:WarningAction'] = 'Continue'
+$PSDefaultParameterValues['*:InformationAction'] = 'Continue'
+
 Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform
 
@@ -184,14 +191,20 @@ Function Add-NodeAndNpm {
   #
 
   # Let's install the npm version we really want.
-  Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
-      Write-Debug
+    Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
+    $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+        --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
 
-  if ($LASTEXITCODE -ne 0) {
-    throw "Couldn't install npm@${NPM_VERSION}."
-  }
+    if ($LASTEXITCODE -ne 0) {
+      Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Magenta
+      Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Magenta
+      Write-Host "Error details:" -ForegroundColor Magenta
+      $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Magenta }
+      Write-Host "Current working directory: $PWD" -ForegroundColor Magenta
+      Write-Host "Content of ${dirLib}:" -ForegroundColor Magenta
+      Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Magenta }
+      throw "Couldn't install npm@${NPM_VERSION}. See error details above."
+    }
 
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.

From f0579eb0514c450e87647cf42efdc9be8784f3f9 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 10:49:46 -0400
Subject: [PATCH 0618/1140] - bump bundle version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index f41aeb2dee..af837529d1 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.10.0.0
+BUNDLE_VERSION=22.10.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled

From d14c0d840c97bc05efa540178c3245e45d5fc605 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 11:12:05 -0400
Subject: [PATCH 0619/1140] - downgrade npm version

---
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/dev-bundle-tool-package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index a5a8d81b8b..c5f7ad6dad 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -8,7 +8,7 @@ ARCH=$(uname -m)
 NODE_VERSION=22.10.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
-NPM_VERSION=10.9.0
+NPM_VERSION=10.8.3
 
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 8d49a8e712..b24f632538 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -10,7 +10,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.9.0",
+    npm: "10.8.3",
     "node-gyp": "10.2.0",
     "@mapbox/node-pre-gyp": "1.0.11",
     typescript: "5.6.3",

From 543215df3aea14c944871f141468efb1ee2daf72 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 22 Oct 2024 13:00:25 -0400
Subject: [PATCH 0620/1140] fix undefined error

---
 packages/mongo/oplog_tailing.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/mongo/oplog_tailing.ts b/packages/mongo/oplog_tailing.ts
index 293be2851e..749da15f8f 100644
--- a/packages/mongo/oplog_tailing.ts
+++ b/packages/mongo/oplog_tailing.ts
@@ -3,6 +3,9 @@ import { Meteor } from 'meteor/meteor';
 import { CursorDescription } from './cursor_description';
 import { MongoConnection } from './mongo_connection';
 
+import { NpmModuleMongodb } from "meteor/npm-mongo";
+const { Long } = NpmModuleMongodb;
+
 export const OPLOG_COLLECTION = 'oplog.rs';
 
 let TOO_FAR_BEHIND = +(process.env.METEOR_OPLOG_TOO_FAR_BEHIND || 2000);

From 61f31b19f04e77260cd6b928f8d130dc50e227d1 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 13:16:31 -0400
Subject: [PATCH 0621/1140] - remove anything related with cache

---
 .../modules/.npm/package/npm-shrinkwrap.json  |   6 +-
 .../.npm/package/npm-shrinkwrap.json          | 247 +++++++++---------
 scripts/generate-dev-bundle.ps1               |   6 +-
 3 files changed, 131 insertions(+), 128 deletions(-)

diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 5d60955420..b94d58ccbd 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -12,9 +12,9 @@
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
     },
     "estree-walker": {
       "version": "2.0.2",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index cff9dcf76d..3fbece822d 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,24 +56,24 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.675.0.tgz",
+      "integrity": "sha512-KgYweyJyEa1UADd8p0JMDz+8OIbxcYDCCy7wdhlQ4GBDzJtEUYNeqQ+C+FNRkAafanYHlLBTHA8fyD1EDlQ3Tw=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz",
-      "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.675.0.tgz",
+      "integrity": "sha512-2goBCEr4acZJ1YJ69eWPTsIfZUbO7enog+lBA5kZShDiwovqzwYSHSlf6OGz4ETs2xT1n7n+QfKY0p+TluTfEw=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz",
-      "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.675.0.tgz",
+      "integrity": "sha512-4kEcaa2P/BFz+xy5tagbtzM08gbjHXyYqW+n6SJuUFK7N6bZNnA4cu1hVgHcqOqk8Dbwv7fiseGT0x3Hhqjwqg=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz",
-      "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.675.0.tgz",
+      "integrity": "sha512-zgjyR4GyuONeDGJBKNt9lFJ8HfDX7rpxZZVR7LSXr9lUkjf6vUGgD2k/K4UAoOTWCKKCor6TA562ezGlA8su6Q=="
     },
     "@aws-sdk/core": {
       "version": "3.667.0",
@@ -81,9 +81,9 @@
       "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.675.0.tgz",
+      "integrity": "sha512-iH9YEDXewcLDuWC9Q4nBwQJN+y0+JLTgJO07Qy5QMgjrTuXMhxPPkShNmdEfCrlJMUuBlN2saVmfbnAMaOJnFQ=="
     },
     "@aws-sdk/credential-provider-env": {
       "version": "3.667.0",
@@ -96,14 +96,14 @@
       "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz",
-      "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.675.0.tgz",
+      "integrity": "sha512-kCBlC6grpbpCvgowk9T4JHZxJ88VfN0r77bDZClcadFRAKQ8UHyO02zhgFCfUdnU1lNv1mr3ngEcGN7XzJlYWA=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz",
-      "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.675.0.tgz",
+      "integrity": "sha512-VO1WVZCDmAYu4sY/6qIBzdm5vJTxLhWKJWvL5kVFfSe8WiNNoHlTqYYUK9vAm/JYpIgFLTefPbIc5W4MK7o6Pg=="
     },
     "@aws-sdk/credential-provider-process": {
       "version": "3.667.0",
@@ -111,9 +111,9 @@
       "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz",
-      "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.675.0.tgz",
+      "integrity": "sha512-p/EE2c0ebSgRhg1Fe1OH2+xNl7j1P4DTc7kZy1mX1NJ72fkqnGgBuf1vk5J9RmiRpbauPNMlm+xohjkGS7iodA=="
     },
     "@aws-sdk/credential-provider-web-identity": {
       "version": "3.667.0",
@@ -121,9 +121,9 @@
       "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz",
-      "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.675.0.tgz",
+      "integrity": "sha512-gaUPTiBX9SliPHYlOJnW7mEmHlZp/j7mMGtyx2pSK3Qt+t7d3sObILGt+p6zl7QewUFOwDav1AsLS3U9V6VAYQ=="
     },
     "@aws-sdk/middleware-host-header": {
       "version": "3.667.0",
@@ -171,9 +171,9 @@
       "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz",
-      "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz",
+      "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
     },
     "@aws-sdk/util-user-agent-node": {
       "version": "3.669.0",
@@ -186,24 +186,24 @@
       "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
     },
     "@smithy/abort-controller": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz",
-      "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg=="
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.6.tgz",
+      "integrity": "sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ=="
     },
     "@smithy/config-resolver": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz",
-      "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.10.tgz",
+      "integrity": "sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw=="
     },
     "@smithy/core": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
-      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.1.tgz",
+      "integrity": "sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg=="
     },
     "@smithy/credential-provider-imds": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz",
-      "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w=="
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz",
+      "integrity": "sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg=="
     },
     "@smithy/fetch-http-handler": {
       "version": "3.2.9",
@@ -211,14 +211,14 @@
       "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A=="
     },
     "@smithy/hash-node": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz",
-      "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.8.tgz",
+      "integrity": "sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng=="
     },
     "@smithy/invalid-dependency": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz",
-      "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz",
+      "integrity": "sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q=="
     },
     "@smithy/is-array-buffer": {
       "version": "3.0.0",
@@ -226,89 +226,89 @@
       "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="
     },
     "@smithy/middleware-content-length": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz",
-      "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz",
+      "integrity": "sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg=="
     },
     "@smithy/middleware-endpoint": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz",
-      "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz",
+      "integrity": "sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA=="
     },
     "@smithy/middleware-retry": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
-      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz",
+      "integrity": "sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg=="
     },
     "@smithy/middleware-serde": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz",
-      "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz",
+      "integrity": "sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA=="
     },
     "@smithy/middleware-stack": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz",
-      "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz",
+      "integrity": "sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA=="
     },
     "@smithy/node-config-provider": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz",
-      "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q=="
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz",
+      "integrity": "sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew=="
     },
     "@smithy/node-http-handler": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz",
-      "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ=="
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz",
+      "integrity": "sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w=="
     },
     "@smithy/property-provider": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz",
-      "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw=="
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.8.tgz",
+      "integrity": "sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA=="
     },
     "@smithy/protocol-http": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz",
-      "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ=="
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.5.tgz",
+      "integrity": "sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg=="
     },
     "@smithy/querystring-builder": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz",
-      "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz",
+      "integrity": "sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA=="
     },
     "@smithy/querystring-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz",
-      "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz",
+      "integrity": "sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg=="
     },
     "@smithy/service-error-classification": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz",
-      "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz",
+      "integrity": "sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g=="
     },
     "@smithy/shared-ini-file-loader": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz",
-      "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw=="
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz",
+      "integrity": "sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA=="
     },
     "@smithy/signature-v4": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz",
-      "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.1.tgz",
+      "integrity": "sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg=="
     },
     "@smithy/smithy-client": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
-      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ=="
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.2.tgz",
+      "integrity": "sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA=="
     },
     "@smithy/types": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz",
-      "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.6.0.tgz",
+      "integrity": "sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w=="
     },
     "@smithy/url-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz",
-      "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.8.tgz",
+      "integrity": "sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg=="
     },
     "@smithy/util-base64": {
       "version": "3.0.0",
@@ -336,19 +336,19 @@
       "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="
     },
     "@smithy/util-defaults-mode-browser": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
-      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz",
+      "integrity": "sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA=="
     },
     "@smithy/util-defaults-mode-node": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
-      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz",
+      "integrity": "sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g=="
     },
     "@smithy/util-endpoints": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz",
-      "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw=="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz",
+      "integrity": "sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ=="
     },
     "@smithy/util-hex-encoding": {
       "version": "3.0.0",
@@ -356,19 +356,26 @@
       "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="
     },
     "@smithy/util-middleware": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz",
-      "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.8.tgz",
+      "integrity": "sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA=="
     },
     "@smithy/util-retry": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz",
-      "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.8.tgz",
+      "integrity": "sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow=="
     },
     "@smithy/util-stream": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz",
-      "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.2.1.tgz",
+      "integrity": "sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==",
+      "dependencies": {
+        "@smithy/fetch-http-handler": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz",
+          "integrity": "sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g=="
+        }
+      }
     },
     "@smithy/util-uri-escape": {
       "version": "3.0.0",
@@ -381,9 +388,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.8.tgz",
+      "integrity": "sha512-a922jJy31vqR5sk+kAdIENJjHblqcZ4RmERviFsER4WJcEONqxKcjNOlk0q7OUfrF5sddT+vng070cdfMlrPLg=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index a41a0a60f4..cb0ed05a77 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -47,9 +47,6 @@ $dirLib = Join-Path $DIR 'lib'
 $dirServerLib = Join-Path $DIR 'server-lib'
 $dirTemp = Join-Path $DIR 'temp'
 
-# Use a cache just for this build.
-$dirNpmCache = Join-Path $dirTemp 'npm-cache'
-
 # Build our directory framework.
 New-Item -ItemType Directory -Force -Path $DIR | Out-Null
 New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
@@ -193,7 +190,7 @@ Function Add-NodeAndNpm {
   # Let's install the npm version we really want.
     Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
     $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-        --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
+        --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
 
     if ($LASTEXITCODE -ne 0) {
       Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Magenta
@@ -341,7 +338,6 @@ $env:PYTHON = Add-Python
 # Set additional options for node-gyp
 $env:GYP_MSVS_VERSION = "2015"
 $env:npm_config_nodedir = "$DIR"
-$env:npm_config_cache = "$dirNpmCache"
 
 # Allow running $dirBin commands like node and npm.
 $env:PATH = "$env:PATH;$dirBin"

From 85d738a85357bf766db7f4ba628228a890c6a493 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 14:29:52 -0400
Subject: [PATCH 0622/1140] assume error and out put everything

---
 scripts/generate-dev-bundle.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index cb0ed05a77..cc0f692cca 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -192,7 +192,7 @@ Function Add-NodeAndNpm {
     $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
         --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
 
-    if ($LASTEXITCODE -ne 0) {
+
       Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Magenta
       Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Magenta
       Write-Host "Error details:" -ForegroundColor Magenta
@@ -201,7 +201,7 @@ Function Add-NodeAndNpm {
       Write-Host "Content of ${dirLib}:" -ForegroundColor Magenta
       Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Magenta }
       throw "Couldn't install npm@${NPM_VERSION}. See error details above."
-    }
+
 
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.

From 9f921ba7e0538bb60715050a2218ff5dc0635b22 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 14:35:59 -0400
Subject: [PATCH 0623/1140] try different approach to get error message

---
 scripts/generate-dev-bundle.ps1 | 39 +++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index cc0f692cca..ba82f25c23 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -188,20 +188,37 @@ Function Add-NodeAndNpm {
   #
 
   # Let's install the npm version we really want.
-    Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-    $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-        --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
+    try {
+        Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
 
+        # Capture all output from the npm install command
+        $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+                    --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
 
-      Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Magenta
-      Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Magenta
-      Write-Host "Error details:" -ForegroundColor Magenta
-      $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Magenta }
-      Write-Host "Current working directory: $PWD" -ForegroundColor Magenta
-      Write-Host "Content of ${dirLib}:" -ForegroundColor Magenta
-      Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Magenta }
-      throw "Couldn't install npm@${NPM_VERSION}. See error details above."
+        # Output the result of npm install for debugging
+        Write-Host "After run" -ForegroundColor Magenta
 
+        # Check if the last command (npm install) returned an error
+        if ($LASTEXITCODE -ne 0) {
+            Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Magenta
+            Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Magenta
+            Write-Host "Error details:" -ForegroundColor Magenta
+            $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Magenta }
+            Write-Host "Current working directory: $PWD" -ForegroundColor Magenta
+            Write-Host "Content of ${dirLib}:" -ForegroundColor Magenta
+            Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Magenta }
+
+            throw "Couldn't install npm@${NPM_VERSION}. See error details above."
+        }
+
+    } catch {
+        Write-Host "An unexpected error occurred during npm installation." -ForegroundColor Red
+        Write-Host $_.Exception.Message -ForegroundColor Red
+        Write-Host $_.ScriptStackTrace -ForegroundColor Red
+
+        # Optionally, rethrow the exception to exit the script
+        throw $_
+    }
 
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.

From 9a69e6d9a283c296f86ae0fd4ace18d2677475b7 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 14:39:16 -0400
Subject: [PATCH 0624/1140] try to catch all the logs

---
 scripts/generate-dev-bundle.ps1 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index ba82f25c23..2bca2859cb 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -191,9 +191,9 @@ Function Add-NodeAndNpm {
     try {
         Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
 
-        # Capture all output from the npm install command
+        # Capture all output from the npm install command, including verbose logging
         $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-                    --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1
+                    --nodedir="$dirTempNode" npm@${NPM_VERSION} --loglevel verbose 2>&1
 
         # Output the result of npm install for debugging
         Write-Host "After run" -ForegroundColor Magenta
@@ -208,6 +208,9 @@ Function Add-NodeAndNpm {
             Write-Host "Content of ${dirLib}:" -ForegroundColor Magenta
             Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Magenta }
 
+            # Write output to a log file for further analysis
+            $npmOutput | Out-File -FilePath "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install.log" -Append
+
             throw "Couldn't install npm@${NPM_VERSION}. See error details above."
         }
 
@@ -216,10 +219,15 @@ Function Add-NodeAndNpm {
         Write-Host $_.Exception.Message -ForegroundColor Red
         Write-Host $_.ScriptStackTrace -ForegroundColor Red
 
+        # Write the error details to a log file for further analysis
+        $npmOutput | Out-File -FilePath "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install.log" -Append
+        $_ | Out-File -FilePath "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install-error.log" -Append
+
         # Optionally, rethrow the exception to exit the script
         throw $_
     }
 
+
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From 6e8e3ff04e26a976c7b0b1cea63dbbae6e4c2750 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 14:45:42 -0400
Subject: [PATCH 0625/1140] add more information to the logs

---
 scripts/generate-dev-bundle.ps1 | 68 ++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 2bca2859cb..cf5389f232 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -188,44 +188,52 @@ Function Add-NodeAndNpm {
   #
 
   # Let's install the npm version we really want.
-    try {
-        Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
+  try {
+      # Prepare paths for log files
+      $logFilePath = "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install.log"
+      $errorLogFilePath = "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install-error.log"
 
-        # Capture all output from the npm install command, including verbose logging
-        $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-                    --nodedir="$dirTempNode" npm@${NPM_VERSION} --loglevel verbose 2>&1
+      # Start logging
+      Write-Host "Starting npm installation..." -ForegroundColor Magenta
+      "Log for npm installation" | Out-File -FilePath $logFilePath
 
-        # Output the result of npm install for debugging
-        Write-Host "After run" -ForegroundColor Magenta
+      # Run npm install and capture both stdout and stderr
+      $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1 | Tee-Object -FilePath $logFilePath
 
-        # Check if the last command (npm install) returned an error
-        if ($LASTEXITCODE -ne 0) {
-            Write-Host "Error installing npm@${NPM_VERSION}:" -ForegroundColor Magenta
-            Write-Host "Last Exit Code: $LASTEXITCODE" -ForegroundColor Magenta
-            Write-Host "Error details:" -ForegroundColor Magenta
-            $npmOutput | ForEach-Object { Write-Host $_ -ForegroundColor Magenta }
-            Write-Host "Current working directory: $PWD" -ForegroundColor Magenta
-            Write-Host "Content of ${dirLib}:" -ForegroundColor Magenta
-            Get-ChildItem $dirLib | ForEach-Object { Write-Host $_.Name -ForegroundColor Magenta }
+      # Output for debugging purposes
+      Write-Host "After npm install command" -ForegroundColor Magenta
 
-            # Write output to a log file for further analysis
-            $npmOutput | Out-File -FilePath "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install.log" -Append
+      # Check if the last command failed and log all details
+      if ($LASTEXITCODE -ne 0) {
+          Write-Host "npm installation failed with exit code $LASTEXITCODE" -ForegroundColor Red
 
-            throw "Couldn't install npm@${NPM_VERSION}. See error details above."
-        }
+          # Log the error details in a dedicated error log file
+          "npm installation failed with exit code $LASTEXITCODE" | Out-File -FilePath $errorLogFilePath -Append
+          "Captured output:" | Out-File -FilePath $errorLogFilePath -Append
+          $npmOutput | Out-File -FilePath $errorLogFilePath -Append
 
-    } catch {
-        Write-Host "An unexpected error occurred during npm installation." -ForegroundColor Red
-        Write-Host $_.Exception.Message -ForegroundColor Red
-        Write-Host $_.ScriptStackTrace -ForegroundColor Red
+          # Throw an error to stop the script execution
+          throw "npm installation failed. Check logs for details."
+      }
 
-        # Write the error details to a log file for further analysis
-        $npmOutput | Out-File -FilePath "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install.log" -Append
-        $_ | Out-File -FilePath "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install-error.log" -Append
+  } catch {
+      # Catch unexpected errors and log everything
+      Write-Host "An unexpected error occurred during npm installation." -ForegroundColor Red
+      Write-Host $_.Exception.Message -ForegroundColor Red
+      Write-Host $_.ScriptStackTrace -ForegroundColor Red
+
+      # Write the error to both stdout and log files for further analysis
+      $_.Exception.Message | Out-File -FilePath $errorLogFilePath -Append
+      $_.ScriptStackTrace | Out-File -FilePath $errorLogFilePath -Append
+
+      # Rethrow the exception to exit the script
+      throw $_
+  } finally {
+      # Ensure final log entry even if the script fails
+      Write-Host "npm installation process finished." -ForegroundColor Yellow
+      "npm installation process finished" | Out-File -FilePath $logFilePath -Append
+  }
 
-        # Optionally, rethrow the exception to exit the script
-        throw $_
-    }
 
 
   # After finishing up with our Node, let's put it in its final home

From 90d85c9997911fa3f83d1ada3a3ae286b8861d9f Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 14:49:09 -0400
Subject: [PATCH 0626/1140] try to directly access npm errors

---
 scripts/generate-dev-bundle.ps1 | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index cf5389f232..67aa9ab4ab 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -197,22 +197,22 @@ Function Add-NodeAndNpm {
       Write-Host "Starting npm installation..." -ForegroundColor Magenta
       "Log for npm installation" | Out-File -FilePath $logFilePath
 
-      # Run npm install and capture both stdout and stderr
-      $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1 | Tee-Object -FilePath $logFilePath
+      # Run npm install and capture both stdout and stderr with real-time logging
+      $npmProcess = Start-Process -FilePath "$tempNpmCmd" `
+                                  -ArgumentList "install --prefix=$dirLib --no-bin-links --save --nodedir=$dirTempNode npm@$NPM_VERSION --loglevel verbose" `
+                                  -RedirectStandardOutput $logFilePath `
+                                  -RedirectStandardError $errorLogFilePath `
+                                  -NoNewWindow -PassThru
 
-      # Output for debugging purposes
-      Write-Host "After npm install command" -ForegroundColor Magenta
+      # Wait for npm process to exit
+      $npmProcess.WaitForExit()
 
-      # Check if the last command failed and log all details
-      if ($LASTEXITCODE -ne 0) {
-          Write-Host "npm installation failed with exit code $LASTEXITCODE" -ForegroundColor Red
+      # Check if npm process failed
+      if ($npmProcess.ExitCode -ne 0) {
+          Write-Host "npm installation failed with exit code $($npmProcess.ExitCode)" -ForegroundColor Red
+          "npm installation failed with exit code $($npmProcess.ExitCode)" | Out-File -FilePath $errorLogFilePath -Append
 
-          # Log the error details in a dedicated error log file
-          "npm installation failed with exit code $LASTEXITCODE" | Out-File -FilePath $errorLogFilePath -Append
-          "Captured output:" | Out-File -FilePath $errorLogFilePath -Append
-          $npmOutput | Out-File -FilePath $errorLogFilePath -Append
-
-          # Throw an error to stop the script execution
+          # Throw error to stop execution
           throw "npm installation failed. Check logs for details."
       }
 
@@ -236,6 +236,7 @@ Function Add-NodeAndNpm {
 
 
 
+
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From a7433911df9c985facc96b9217e5d1fbe04d3cc2 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 14:53:24 -0400
Subject: [PATCH 0627/1140] fail when code not 0

---
 scripts/generate-dev-bundle.ps1 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 67aa9ab4ab..37ad4bfcc8 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -216,6 +216,10 @@ Function Add-NodeAndNpm {
           throw "npm installation failed. Check logs for details."
       }
 
+      # Log the success to avoid confusion
+      Write-Host "npm installation completed successfully." -ForegroundColor Green
+      "npm installation completed successfully." | Out-File -FilePath $logFilePath -Append
+
   } catch {
       # Catch unexpected errors and log everything
       Write-Host "An unexpected error occurred during npm installation." -ForegroundColor Red
@@ -234,9 +238,6 @@ Function Add-NodeAndNpm {
       "npm installation process finished" | Out-File -FilePath $logFilePath -Append
   }
 
-
-
-
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From a9c3fc2325d9051bf902af118c88b6e341c922b5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 22 Oct 2024 14:56:24 -0400
Subject: [PATCH 0628/1140] fix tests not running

---
 packages/mongo/mongo_common.js     | 2 ++
 packages/mongo/mongo_connection.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/mongo/mongo_common.js b/packages/mongo/mongo_common.js
index 53e037e86e..f689725094 100644
--- a/packages/mongo/mongo_common.js
+++ b/packages/mongo/mongo_common.js
@@ -1,3 +1,5 @@
+import clone from 'lodash.clone'
+
 /** @type {import('mongodb')} */
 export const MongoDB = NpmModuleMongodb;
 
diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
index 5db1b2f458..bd28301218 100644
--- a/packages/mongo/mongo_connection.js
+++ b/packages/mongo/mongo_connection.js
@@ -755,6 +755,8 @@ MongoConnection.prototype.tail = function (cursorDescription, docCallback, timeo
       try {
         doc = await cursor._nextObjectPromiseWithTimeout(timeoutMS);
       } catch (err) {
+        // We should not ignore errors here unless we want to spend a lot of time debugging
+        console.error(err);
         // There's no good way to figure out if this was actually an error from
         // Mongo, or just client-side (including our own timeout error). Ah
         // well. But either way, we need to retry the cursor (unless the failure

From 73a39796a44431cbe0f7299f937bdeb01adf6122 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 14:56:34 -0400
Subject: [PATCH 0629/1140] fail when code not 0

---
 scripts/generate-dev-bundle.ps1 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 37ad4bfcc8..42ba51efd1 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -208,18 +208,15 @@ Function Add-NodeAndNpm {
       $npmProcess.WaitForExit()
 
       # Check if npm process failed
-      if ($npmProcess.ExitCode -ne 0) {
+      if ($npmProcess.ExitCode -eq 0) {
+          Write-Host "npm installation completed successfully." -ForegroundColor Green
+          "npm installation completed successfully." | Out-File -FilePath $logFilePath -Append
+      } else {
           Write-Host "npm installation failed with exit code $($npmProcess.ExitCode)" -ForegroundColor Red
           "npm installation failed with exit code $($npmProcess.ExitCode)" | Out-File -FilePath $errorLogFilePath -Append
-
-          # Throw error to stop execution
           throw "npm installation failed. Check logs for details."
       }
 
-      # Log the success to avoid confusion
-      Write-Host "npm installation completed successfully." -ForegroundColor Green
-      "npm installation completed successfully." | Out-File -FilePath $logFilePath -Append
-
   } catch {
       # Catch unexpected errors and log everything
       Write-Host "An unexpected error occurred during npm installation." -ForegroundColor Red
@@ -238,6 +235,7 @@ Function Add-NodeAndNpm {
       "npm installation process finished" | Out-File -FilePath $logFilePath -Append
   }
 
+
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From d89a7ef026c5464b61a27e14c3428a49328df4a4 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 22 Oct 2024 14:59:24 -0400
Subject: [PATCH 0630/1140] add timeout

---
 packages/mongo/oplog_tailing.ts | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/mongo/oplog_tailing.ts b/packages/mongo/oplog_tailing.ts
index 749da15f8f..624f0f1d97 100644
--- a/packages/mongo/oplog_tailing.ts
+++ b/packages/mongo/oplog_tailing.ts
@@ -50,11 +50,13 @@ export class OplogHandle {
   private _entryQueue: any;
   private _workerActive: boolean;
   private _startTrailingPromise: Promise<void>;
+  private _resolveTimeout: any;
 
   constructor(oplogUrl: string, dbName: string) {
     this._oplogUrl = oplogUrl;
     this._dbName = dbName;
 
+    this._resolveTimeout = null;
     this._oplogLastEntryConnection = null;
     this._oplogTailConnection = null;
     this._oplogOptions = null;
@@ -140,7 +142,7 @@ export class OplogHandle {
 
     while (!this._stopped) {
       try {
-        lastEntry = await this._oplogLastEntryConnection!.findOneAsync(
+        lastEntry = await this._oplogLastEntryConnection.findOneAsync(
           OPLOG_COLLECTION,
           this._baseOplogSelector,
           { projection: { ts: 1 }, sort: { $natural: -1 } }
@@ -149,7 +151,7 @@ export class OplogHandle {
       } catch (e) {
         Meteor._debug("Got exception while reading last entry", e);
         // @ts-ignore
-        await Meteor._sleepForMs(100);
+        await Meteor.sleep(100);
       }
     }
 
@@ -167,13 +169,26 @@ export class OplogHandle {
     }
 
     let insertAfter = this._catchingUpResolvers.length;
+
     while (insertAfter - 1 > 0 && this._catchingUpResolvers[insertAfter - 1].ts.greaterThan(ts)) {
       insertAfter--;
     }
-    let promiseResolver: (() => void) | null = null;
-    const promiseToAwait = new Promise<void>(r => promiseResolver = r);
+
+    let promiseResolver = null;
+
+    const promiseToAwait = new Promise(r => promiseResolver = r);
+
+    clearTimeout(this._resolveTimeout);
+
+    this._resolveTimeout = setTimeout(() => {
+      console.error("Meteor: oplog catching up took too long", { ts });
+    }, 10000);
+
     this._catchingUpResolvers.splice(insertAfter, 0, { ts, resolver: promiseResolver! });
+
     await promiseToAwait;
+
+    clearTimeout(this._resolveTimeout);
   }
 
   async waitUntilCaughtUp(): Promise<void> {

From 3793b4a17450436af34b0bb6f8ac54d869e6097f Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:00:12 -0400
Subject: [PATCH 0631/1140] Capture ExitCode Immediately

---
 scripts/generate-dev-bundle.ps1 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 42ba51efd1..8372d67ae4 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -207,13 +207,17 @@ Function Add-NodeAndNpm {
       # Wait for npm process to exit
       $npmProcess.WaitForExit()
 
-      # Check if npm process failed
-      if ($npmProcess.ExitCode -eq 0) {
+      # Capture exit code immediately after the process finishes
+      $exitCode = $npmProcess.ExitCode
+      Write-Host "npm process exited with code $exitCode" -ForegroundColor Green
+
+      # Explicitly check if the exit code is zero (success)
+      if ($exitCode -eq 0) {
           Write-Host "npm installation completed successfully." -ForegroundColor Green
           "npm installation completed successfully." | Out-File -FilePath $logFilePath -Append
       } else {
-          Write-Host "npm installation failed with exit code $($npmProcess.ExitCode)" -ForegroundColor Red
-          "npm installation failed with exit code $($npmProcess.ExitCode)" | Out-File -FilePath $errorLogFilePath -Append
+          Write-Host "npm installation failed with exit code $exitCode" -ForegroundColor Red
+          "npm installation failed with exit code $exitCode" | Out-File -FilePath $errorLogFilePath -Append
           throw "npm installation failed. Check logs for details."
       }
 
@@ -236,6 +240,7 @@ Function Add-NodeAndNpm {
   }
 
 
+
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From fdbbce9b85d688db438e63632ef854023522b0c0 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:04:26 -0400
Subject: [PATCH 0632/1140] Direct Command Execution with &

---
 scripts/generate-dev-bundle.ps1 | 37 +++++++++++++++------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 8372d67ae4..4880ae98cb 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -189,7 +189,7 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   try {
-      # Prepare paths for log files
+      # Define paths for logs
       $logFilePath = "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install.log"
       $errorLogFilePath = "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install-error.log"
 
@@ -197,50 +197,47 @@ Function Add-NodeAndNpm {
       Write-Host "Starting npm installation..." -ForegroundColor Magenta
       "Log for npm installation" | Out-File -FilePath $logFilePath
 
-      # Run npm install and capture both stdout and stderr with real-time logging
-      $npmProcess = Start-Process -FilePath "$tempNpmCmd" `
-                                  -ArgumentList "install --prefix=$dirLib --no-bin-links --save --nodedir=$dirTempNode npm@$NPM_VERSION --loglevel verbose" `
-                                  -RedirectStandardOutput $logFilePath `
-                                  -RedirectStandardError $errorLogFilePath `
-                                  -NoNewWindow -PassThru
+      # Run npm install and capture both stdout and stderr
+      $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+                  --nodedir="$dirTempNode" npm@${NPM_VERSION} --loglevel verbose 2>&1
 
-      # Wait for npm process to exit
-      $npmProcess.WaitForExit()
+      # Write the output to the log file
+      $npmOutput | Out-File -FilePath $logFilePath -Append
 
-      # Capture exit code immediately after the process finishes
-      $exitCode = $npmProcess.ExitCode
-      Write-Host "npm process exited with code $exitCode" -ForegroundColor Green
+      # Output the captured logs to the console for feedback
+      Write-Host $npmOutput -ForegroundColor Green
 
-      # Explicitly check if the exit code is zero (success)
-      if ($exitCode -eq 0) {
+      # Check if npm command was successful
+      if ($LASTEXITCODE -eq 0) {
           Write-Host "npm installation completed successfully." -ForegroundColor Green
           "npm installation completed successfully." | Out-File -FilePath $logFilePath -Append
       } else {
-          Write-Host "npm installation failed with exit code $exitCode" -ForegroundColor Red
-          "npm installation failed with exit code $exitCode" | Out-File -FilePath $errorLogFilePath -Append
+          Write-Host "npm installation failed with exit code $LASTEXITCODE" -ForegroundColor Red
+          "npm installation failed with exit code $LASTEXITCODE" | Out-File -FilePath $errorLogFilePath -Append
           throw "npm installation failed. Check logs for details."
       }
 
   } catch {
-      # Catch unexpected errors and log everything
+      # Catch any unexpected errors and log them
       Write-Host "An unexpected error occurred during npm installation." -ForegroundColor Red
       Write-Host $_.Exception.Message -ForegroundColor Red
       Write-Host $_.ScriptStackTrace -ForegroundColor Red
 
-      # Write the error to both stdout and log files for further analysis
+      # Log the error details
       $_.Exception.Message | Out-File -FilePath $errorLogFilePath -Append
       $_.ScriptStackTrace | Out-File -FilePath $errorLogFilePath -Append
 
-      # Rethrow the exception to exit the script
+      # Exit with failure
       throw $_
   } finally {
-      # Ensure final log entry even if the script fails
+      # Final log entry regardless of success or failure
       Write-Host "npm installation process finished." -ForegroundColor Yellow
       "npm installation process finished" | Out-File -FilePath $logFilePath -Append
   }
 
 
 
+
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 

From 35c26f3475e0cb689a62127a3fa0dad5c0913754 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:10:31 -0400
Subject: [PATCH 0633/1140] using cmd.exe to install npm

---
 scripts/generate-dev-bundle.ps1 | 62 +++++----------------------------
 1 file changed, 8 insertions(+), 54 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 4880ae98cb..c59df70487 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,13 +1,6 @@
-# At the beginning of the script
 $ErrorActionPreference = "Stop"
-$VerbosePreference = "Continue"
 $DebugPreference = "Continue"
 
-# Redirect all streams to stdout
-$PSDefaultParameterValues['*:ErrorAction'] = 'Continue'
-$PSDefaultParameterValues['*:WarningAction'] = 'Continue'
-$PSDefaultParameterValues['*:InformationAction'] = 'Continue'
-
 Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform
 
@@ -47,6 +40,9 @@ $dirLib = Join-Path $DIR 'lib'
 $dirServerLib = Join-Path $DIR 'server-lib'
 $dirTemp = Join-Path $DIR 'temp'
 
+# Use a cache just for this build.
+$dirNpmCache = Join-Path $dirTemp 'npm-cache'
+
 # Build our directory framework.
 New-Item -ItemType Directory -Force -Path $DIR | Out-Null
 New-Item -ItemType Directory -Force -Path $dirTemp | Out-Null
@@ -188,56 +184,13 @@ Function Add-NodeAndNpm {
   #
 
   # Let's install the npm version we really want.
-  try {
-      # Define paths for logs
-      $logFilePath = "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install.log"
-      $errorLogFilePath = "C:\Users\Administrator\actions-runner\_work\meteor-release-bot\meteor-release-bot\npm-install-error.log"
+  Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
+  cmd.exe /c "$tempNpmCmd install --prefix=$dirLib --no-bin-links --save --cache=$dirNpmCache --nodedir=$dirTempNode npm@$NPM_VERSION"
 
-      # Start logging
-      Write-Host "Starting npm installation..." -ForegroundColor Magenta
-      "Log for npm installation" | Out-File -FilePath $logFilePath
-
-      # Run npm install and capture both stdout and stderr
-      $npmOutput = & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-                  --nodedir="$dirTempNode" npm@${NPM_VERSION} --loglevel verbose 2>&1
-
-      # Write the output to the log file
-      $npmOutput | Out-File -FilePath $logFilePath -Append
-
-      # Output the captured logs to the console for feedback
-      Write-Host $npmOutput -ForegroundColor Green
-
-      # Check if npm command was successful
-      if ($LASTEXITCODE -eq 0) {
-          Write-Host "npm installation completed successfully." -ForegroundColor Green
-          "npm installation completed successfully." | Out-File -FilePath $logFilePath -Append
-      } else {
-          Write-Host "npm installation failed with exit code $LASTEXITCODE" -ForegroundColor Red
-          "npm installation failed with exit code $LASTEXITCODE" | Out-File -FilePath $errorLogFilePath -Append
-          throw "npm installation failed. Check logs for details."
-      }
-
-  } catch {
-      # Catch any unexpected errors and log them
-      Write-Host "An unexpected error occurred during npm installation." -ForegroundColor Red
-      Write-Host $_.Exception.Message -ForegroundColor Red
-      Write-Host $_.ScriptStackTrace -ForegroundColor Red
-
-      # Log the error details
-      $_.Exception.Message | Out-File -FilePath $errorLogFilePath -Append
-      $_.ScriptStackTrace | Out-File -FilePath $errorLogFilePath -Append
-
-      # Exit with failure
-      throw $_
-  } finally {
-      # Final log entry regardless of success or failure
-      Write-Host "npm installation process finished." -ForegroundColor Yellow
-      "npm installation process finished" | Out-File -FilePath $logFilePath -Append
+  if ($LASTEXITCODE -ne 0) {
+    throw "Couldn't install npm@${NPM_VERSION}."
   }
 
-
-
-
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.
 
@@ -373,6 +326,7 @@ $env:PYTHON = Add-Python
 # Set additional options for node-gyp
 $env:GYP_MSVS_VERSION = "2015"
 $env:npm_config_nodedir = "$DIR"
+$env:npm_config_cache = "$dirNpmCache"
 
 # Allow running $dirBin commands like node and npm.
 $env:PATH = "$env:PATH;$dirBin"

From 8a2e699fd4bc5f4766e32a6c46a2fd0f68edcbf4 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:16:11 -0400
Subject: [PATCH 0634/1140] log the shell I'm working with

---
 scripts/generate-dev-bundle.ps1 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index c59df70487..228dc82f3c 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,6 +185,12 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
+  if ($PSVersionTable) {
+      "You are running PowerShell with version: $($PSVersionTable.PSVersion)" | Out-File -FilePath shellinfo.log
+  } else {
+      "You are running cmd.exe or another shell." | Out-File -FilePath shellinfo.log
+      ver | Out-File -FilePath shellinfo.log -Append
+  }
   cmd.exe /c "$tempNpmCmd install --prefix=$dirLib --no-bin-links --save --cache=$dirNpmCache --nodedir=$dirTempNode npm@$NPM_VERSION"
 
   if ($LASTEXITCODE -ne 0) {

From 4d92ad43e06a437b72b1e5438b5471ca720f3a1f Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:19:08 -0400
Subject: [PATCH 0635/1140] log the shell I'm working with

---
 scripts/generate-dev-bundle.ps1 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 228dc82f3c..48b78bc22b 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -186,16 +186,12 @@ Function Add-NodeAndNpm {
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
   if ($PSVersionTable) {
-      "You are running PowerShell with version: $($PSVersionTable.PSVersion)" | Out-File -FilePath shellinfo.log
+      Write-Host "You are running PowerShell with version: $($PSVersionTable.PSVersion)"
   } else {
-      "You are running cmd.exe or another shell." | Out-File -FilePath shellinfo.log
-      ver | Out-File -FilePath shellinfo.log -Append
+      Write-Host "You are running cmd.exe or another shell."
+      ver | Write-Host
   }
-  cmd.exe /c "$tempNpmCmd install --prefix=$dirLib --no-bin-links --save --cache=$dirNpmCache --nodedir=$dirTempNode npm@$NPM_VERSION"
 
-  if ($LASTEXITCODE -ne 0) {
-    throw "Couldn't install npm@${NPM_VERSION}."
-  }
 
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.

From 87a08d5f998ded144c80f4987980b8f7f5f6f32d Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:24:15 -0400
Subject: [PATCH 0636/1140] log my user level

---
 scripts/generate-dev-bundle.ps1 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 48b78bc22b..7fbcca6e99 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,13 +185,18 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  if ($PSVersionTable) {
-      Write-Host "You are running PowerShell with version: $($PSVersionTable.PSVersion)"
+  if (([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
+      Write-Host "You are running as an Administrator."
   } else {
-      Write-Host "You are running cmd.exe or another shell."
-      ver | Write-Host
+      Write-Host "You are running as a Standard User."
   }
+  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
+      Write-Debug
 
+  if ($LASTEXITCODE -ne 0) {
+    throw "Couldn't install npm@${NPM_VERSION}."
+  }
 
   # After finishing up with our Node, let's put it in its final home
   # and abandon this local npm directory.

From 01b2349ec4f06ed7644ceb47ac2b8f4aa831c123 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:37:31 -0400
Subject: [PATCH 0637/1140] print location

---
 scripts/generate-dev-bundle.ps1 | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 7fbcca6e99..8966620f5a 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,11 +185,7 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  if (([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-      Write-Host "You are running as an Administrator."
-  } else {
-      Write-Host "You are running as a Standard User."
-  }
+  Get-Location
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
     --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
       Write-Debug

From 55cca66ddd1db42b5db7ac2c62615121e3157676 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:39:41 -0400
Subject: [PATCH 0638/1140] print location

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 8966620f5a..3c68a32e91 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,7 +185,7 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  Get-Location
+
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
     --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
       Write-Debug

From 1e66173e0249eafed0bc0e022c2c638622c3ccc5 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:44:18 -0400
Subject: [PATCH 0639/1140] print location

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 3c68a32e91..8966620f5a 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,7 +185,7 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-
+  Get-Location
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
     --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
       Write-Debug

From cbd6c00df87ae9765f207e6a3018cbb191d9427b Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:46:21 -0400
Subject: [PATCH 0640/1140] print location

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 8966620f5a..2a097c1e5b 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,7 +185,7 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  Get-Location
+  Write-Host Get-Location
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
     --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
       Write-Debug

From 954d81f05b8a81a21098f9077f37050496468122 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 22 Oct 2024 15:48:27 -0400
Subject: [PATCH 0641/1140] print location

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 2a097c1e5b..dbb9ba31fd 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -185,7 +185,7 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-  Write-Host Get-Location
+  Write-Host (Get-Location)
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
     --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
       Write-Debug

From be5f6c0434a15f0f9c9efdbe28f2dc3d60b2ec05 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 07:31:58 -0400
Subject: [PATCH 0642/1140] fix undefined function

---
 packages/mongo/mongo_common.js | 16 +++++++++++++++-
 packages/mongo/mongo_driver.js | 14 +-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/mongo/mongo_common.js b/packages/mongo/mongo_common.js
index f689725094..df3da556b9 100644
--- a/packages/mongo/mongo_common.js
+++ b/packages/mongo/mongo_common.js
@@ -148,4 +148,18 @@ export const replaceMongoAtomWithMeteor = function (document) {
 };
 
 const makeMongoLegal = name => "EJSON" + name;
-const unmakeMongoLegal = name => name.substr(5);
\ No newline at end of file
+const unmakeMongoLegal = name => name.substr(5);
+
+export function replaceNames(filter, thing) {
+  if (typeof thing === "object" && thing !== null) {
+    if (Array.isArray(thing)) {
+      return thing.map(replaceNames.bind(null, filter));
+    }
+    var ret = {};
+    Object.entries(thing).forEach(function ([key, value]) {
+      ret[filter(key)] = replaceNames(filter, value);
+    });
+    return ret;
+  }
+  return thing;
+}
\ No newline at end of file
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index bb60eaee7b..9d036c7759 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -28,19 +28,7 @@ MongoInternals.OplogObserveDriver = OplogObserveDriver;
 
 // This is used to add or remove EJSON from the beginning of everything nested
 // inside an EJSON custom type. It should only be called on pure JSON!
-var replaceNames = function (filter, thing) {
-  if (typeof thing === "object" && thing !== null) {
-    if (Array.isArray(thing)) {
-      return thing.map(replaceNames.bind(null, filter));
-    }
-    var ret = {};
-    Object.entries(thing).forEach(function ([key, value]) {
-      ret[filter(key)] = replaceNames(filter, value);
-    });
-    return ret;
-  }
-  return thing;
-};
+
 
 // Ensure that EJSON.clone keeps a Timestamp as a Timestamp (instead of just
 // doing a structural clone).

From cf5377742cdd90cb80f21c55583109734282ee29 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 07:54:27 -0400
Subject: [PATCH 0643/1140] set _handles to null after stopping

---
 packages/mongo/observe_multiplex.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index 875a38d9d3..08ec4a628d 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -12,7 +12,7 @@ export class ObserveMultiplexer {
   private readonly _ordered: boolean;
   private readonly _onStop: () => void;
   private _queue: any;
-  private _handles: { [key: string]: ObserveHandle };
+  private _handles: { [key: string]: ObserveHandle } | null;
   private _resolver: ((value?: unknown) => void) | null;
   private readonly _readyPromise: Promise<boolean | void>;
   private _isReady: boolean;
@@ -57,7 +57,7 @@ export class ObserveMultiplexer {
       "mongo-livedata", "observe-handles", 1);
 
     await this._queue.runTask(async () => {
-      this._handles[handle._id] = handle;
+      this._handles![handle._id] = handle;
       await this._sendAdds(handle);
       --this._addHandleTasksScheduledButNotPerformed;
     });
@@ -68,7 +68,7 @@ export class ObserveMultiplexer {
     if (!this._ready())
       throw new Error("Can't remove handles until the multiplex is ready");
 
-    delete this._handles[id];
+    delete this._handles![id];
 
     // @ts-ignore
     Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
@@ -90,7 +90,7 @@ export class ObserveMultiplexer {
     Package['facts-base'] && Package['facts-base']
         .Facts.incrementServerFact("mongo-livedata", "observe-multiplexers", -1);
 
-    this._handles = {};
+    this._handles = null;
   }
 
   async ready(): Promise<void> {
@@ -162,7 +162,7 @@ export class ObserveMultiplexer {
     if (!add) return;
 
     await this._cache.docs.forEachAsync(async (doc: any, id: string) => {
-      if (!(handle._id in this._handles))
+      if (!(handle._id in this._handles!))
         throw Error("handle got removed before sending initial adds!");
 
       const { _id, ...fields } = handle.nonMutatingCallbacks ? doc : EJSON.clone(doc);

From d6ce52143224799546401aecb8a210ca203292b8 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 07:54:47 -0400
Subject: [PATCH 0644/1140] cleanup collections before starting tests

---
 packages/mongo/package.js            |  2 +-
 packages/tinytest/tinytest_server.js | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index bdedaa4c0c..59e3ac2efe 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -109,7 +109,7 @@ Package.onTest(function (api) {
   api.use('ecmascript');
   api.use('npm-mongo', 'server');
   api.use(['tinytest', 'test-helpers', 'ejson', 'random',
-           'ddp', 'base64']);
+           'ddp', 'base64', 'typescript']);
   // XXX test order dependency: the allow_tests "partial allow" test
   // fails if it is run before mongo_livedata_tests.
   api.addFiles("mongo_livedata_tests.js", ["client", "server"]);
diff --git a/packages/tinytest/tinytest_server.js b/packages/tinytest/tinytest_server.js
index fa51723879..22a781a4c5 100644
--- a/packages/tinytest/tinytest_server.js
+++ b/packages/tinytest/tinytest_server.js
@@ -12,7 +12,7 @@ export { Tinytest };
 const handlesForRun = new Map;
 const reportsForRun = new Map;
 
-Meteor.publish(ServerTestResultsSubscription, function (runId) {
+Meteor.publish(ServerTestResultsSubscription, async function (runId) {
   check(runId, String);
 
   if (! handlesForRun.has(runId)) {
@@ -36,9 +36,16 @@ Meteor.publish(ServerTestResultsSubscription, function (runId) {
 });
 
 Meteor.methods({
-  'tinytest/run'(runId, pathPrefix) {
+  async 'tinytest/run'(runId, pathPrefix) {
     check(runId, String);
     check(pathPrefix, Match.Optional([String]));
+
+    const collections = await MongoInternals.defaultRemoteCollectionDriver().mongo.db.collections();
+
+    for (const collection of collections) {
+      await collection.drop();
+    }
+
     this.unblock();
 
     reportsForRun.set(runId, Object.create(null));
@@ -84,4 +91,4 @@ Meteor.methods({
     handlesForRun.delete(runId);
     reportsForRun.delete(runId);
   }
-});
+});
\ No newline at end of file

From 93bfc5d1c519ea7b590940fe5c801baebc3a756a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 08:08:11 -0400
Subject: [PATCH 0645/1140] fix environment variable tests

---
 packages/meteor/async_helpers.js        |  5 ++++-
 packages/mongo/mongo_livedata_tests.js  |  5 +++--
 packages/mongo/observe_changes_tests.js |  1 +
 packages/mongo/oplog_tailing.ts         | 17 +++++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/packages/meteor/async_helpers.js b/packages/meteor/async_helpers.js
index 6bcb8a38ed..3d3d92dd79 100644
--- a/packages/meteor/async_helpers.js
+++ b/packages/meteor/async_helpers.js
@@ -54,7 +54,10 @@ Object.assign(AsynchronousQueue.prototype, {
   queueTask(task) {
     const self = this;
     self._taskHandles.push({
-      task: task,
+      task: Meteor.bindEnvironment(task, function (e) {
+        Meteor._debug('Exception from task', e);
+        throw e;
+      }),
       name: task.name
     });
     self._scheduleRun();
diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js
index 1c2e4fb53b..13d868b6ec 100644
--- a/packages/mongo/mongo_livedata_tests.js
+++ b/packages/mongo/mongo_livedata_tests.js
@@ -1,6 +1,6 @@
-import isEmpty from 'lodash.isempty';
 import isObject from 'lodash.isobject';
 import times from 'lodash.times';
+import { ObserveMultiplexer } from './observe_multiplex';
 
 // This is a magic collection that fails its writes on the server when
 // the selector (or inserted document) contains fail: true.
@@ -911,9 +911,10 @@ EJSON.addType("dog", function (o) { return new Dog(o.name, o.color, o.actions);}
         test.length(o2.output, 0);
         // White-box: ObserveMultiplexer has nulled its _handles so you can't
         // accidentally join to it.
-        test.isNull(observeMultiplexer._handles);
+        test.isNull(observeMultiplexer._handles, '_handles should be null');
         // Start yet another handle on the same query.
         var o3 = await observer();
+
         // Initial adds.
         test.length(o3.output, 2);
         test.include([docId1, docId2], o3.output[0].added);
diff --git a/packages/mongo/observe_changes_tests.js b/packages/mongo/observe_changes_tests.js
index 22235fdfad..7678e91950 100644
--- a/packages/mongo/observe_changes_tests.js
+++ b/packages/mongo/observe_changes_tests.js
@@ -585,6 +585,7 @@ if (Meteor.isServer) {
       const promise = new Promise(r => callOnFinish = r);
 
       var environmentVariable = new Meteor.EnvironmentVariable();
+
       await environmentVariable.withValue(true, async function() {
         var handle = await c
           .find({}, { fields: { 'type.name': 1 } })
diff --git a/packages/mongo/oplog_tailing.ts b/packages/mongo/oplog_tailing.ts
index 624f0f1d97..fe99db2833 100644
--- a/packages/mongo/oplog_tailing.ts
+++ b/packages/mongo/oplog_tailing.ts
@@ -112,6 +112,23 @@ export class OplogHandle {
 
     await this._readyPromise;
 
+    const originalCallback = callback;
+
+    /**
+     * This depends on AsynchronousQueue tasks being wrapped in `bindEnvironment` too.
+     *
+     * @todo Check after we simplify the `bindEnvironment` implementation if we can remove the second wrap.
+     */
+    callback = Meteor.bindEnvironment(
+      function (notification: any) {
+        originalCallback(notification);
+      },
+      // @ts-ignore
+      function (err) {
+        Meteor._debug("Error in oplog callback", err);
+      }
+    );
+
     const listenHandle = this._crossbar.listen(trigger, callback);
     return {
       stop: async function () {

From 252a91cd19b121dac7032f9c200fe4683fee03c5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 08:09:35 -0400
Subject: [PATCH 0646/1140] update shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 .../email/.npm/package/npm-shrinkwrap.json    |   6 +-
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 .../modules/.npm/package/npm-shrinkwrap.json  |   6 +-
 .../.npm/package/npm-shrinkwrap.json          | 289 +++++++++---------
 .../webapp/.npm/package/npm-shrinkwrap.json   |  11 +-
 6 files changed, 163 insertions(+), 161 deletions(-)

diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
index 64d0411523..231870d16f 100644
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
     },
     "@types/notp": {
       "version": "2.0.5",
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index 68404a03da..5aecda5383 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
     },
     "@types/nodemailer": {
       "version": "6.4.14",
diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
index 7bac16f061..5eedf0b09e 100644
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="
     },
     "acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
     },
     "buffer-from": {
       "version": "1.1.2",
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 5d60955420..b94d58ccbd 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -12,9 +12,9 @@
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
     },
     "estree-walker": {
       "version": "2.0.2",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index cff9dcf76d..6c5b66a97b 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,74 +56,74 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.677.0.tgz",
+      "integrity": "sha512-wGhbHAZGa5VeVLCyAfhyFWXl+JfsHSgSl0eodH6xqKoR60LTDJZbBgQZizUwSj8EoSzsglBvgPLYZaLfXTKM/g=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz",
-      "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.677.0.tgz",
+      "integrity": "sha512-/y6EskFhOa2w9VwXaXoyOrGeBjnOj/72wsxDOslS908qH+nf7m40pBK6e/iBelg04vlx0gqhlbfK8hLbaT6KHA=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz",
-      "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.677.0.tgz",
+      "integrity": "sha512-2zgZkRIU7DsnUVOy+9bjfJ0IYMzi9ONWXQt/WqMa7HOnj4RfenfpipyhHYxGZR5kmehgv53EI79yvUu+SAfGNg=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz",
-      "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.677.0.tgz",
+      "integrity": "sha512-N5fs1GLSthnwrs44b4IJI//dcShuIT42g4pM8FCUJZwbrWn9Sp9F876R1mvb8A9TAy2S4qCXi7TkHS0REnuicQ=="
     },
     "@aws-sdk/core": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz",
-      "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.677.0.tgz",
+      "integrity": "sha512-5auvc1wmXmd7u9Y9nM95Ia+VX7J2FiZLuADitHqE4mHPH9riDgOY+uK/yM+UKr+lfq4zKiZQG7i8cfabZlCY8g=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.677.0.tgz",
+      "integrity": "sha512-ODw8MKhT41KLpKlGIH1yFO2FIOCAW3Nnn2uCu1eAm807aI0OK31ntUNrY+GFzXX7ixv+KFoiJu3ih+w+Oxw5gA=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz",
-      "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.677.0.tgz",
+      "integrity": "sha512-0ctcqKzclr9TiNIkB8I+YRogjWH/4mLWQGv/bgb8ElHqph+rPy4pOubj1Ax01sbs7XdwDaImjBYV5xXE+BEsYw=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz",
-      "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.677.0.tgz",
+      "integrity": "sha512-c4TnShdzk37dhL1HGGzZ2PDKIIEmo1IbT/4y5hSRdNc8Z8fu6spE5GoeVsv6p/HdSGPS7XTy6aOFCMCk4AeIzQ=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz",
-      "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.677.0.tgz",
+      "integrity": "sha512-hW+oHj5zplPLzTk74LG+gZVOKQnmBPyRIbwg3uZWr23xfOxh/Osu9Wq8qwgu2+UyFHr+6/DRFjZJ6avNA2jpKw=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz",
-      "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.677.0.tgz",
+      "integrity": "sha512-DwFriiDx2SSdj7VhRv/0fm8UIK7isy+WZAlqUdZ9xDsX4x1AD5KwMv9AwGhJrMuTjnPSxRSwjt23S7ZXwUfhdw=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz",
-      "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.677.0.tgz",
+      "integrity": "sha512-pBqHjIFvHBJb2NOsVqdIHWcOzXDoNXBokxTvMggb3WYML6ixwrH7kpd1CAzegeQlvZD4SCcRoy3ahv5rbuR+og=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz",
-      "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.677.0.tgz",
+      "integrity": "sha512-OkRP3z8yI22t9LS9At5fYr6RN7zKSDiGgeyjEnrqiGHOWGPMJN2GKa8IAFC4dgXt4Nm/EfmEW7UweiqzEKJKOA=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz",
-      "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.677.0.tgz",
+      "integrity": "sha512-yjuI6hSt1rLFqBQiNKx/nF75Ao72xR8ybqKztzebtFNCrYl8oXVkRiigg5XKNCDmelsx1lcU9IcSiuPHzlGtUQ=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz",
-      "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.677.0.tgz",
+      "integrity": "sha512-fUEDkRI2GuN+p9xyZewlRQC2vFXjxPOoQGugQTmOawTxVUYkFpssg4ID0HUtkKuJYHjaoD2bCyKvOcnL1JU6AA=="
     },
     "@aws-sdk/middleware-host-header": {
       "version": "3.667.0",
@@ -141,9 +141,9 @@
       "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.669.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz",
-      "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.677.0.tgz",
+      "integrity": "sha512-A3gzUsTsvyv/JCmD0p2fkbiOyp+tpAiAADDwzi+eYeyzH4xzqnrzSkGk5KSb58uUQo27eeBzRXHd46d0u+sMrQ=="
     },
     "@aws-sdk/region-config-resolver": {
       "version": "3.667.0",
@@ -171,14 +171,14 @@
       "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz",
-      "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz",
+      "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.669.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz",
-      "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.677.0.tgz",
+      "integrity": "sha512-gFhL0zVY/um0Eu2aWil82pjWaZL4yBmOnjz0+RDz18okFBHaz1Om8o/H+1Vvj+xsnuDYV4ezVMyAaXVtTcYOnw=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
@@ -186,24 +186,24 @@
       "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
     },
     "@smithy/abort-controller": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz",
-      "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg=="
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.6.tgz",
+      "integrity": "sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ=="
     },
     "@smithy/config-resolver": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz",
-      "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.10.tgz",
+      "integrity": "sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw=="
     },
     "@smithy/core": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
-      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.1.tgz",
+      "integrity": "sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg=="
     },
     "@smithy/credential-provider-imds": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz",
-      "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w=="
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz",
+      "integrity": "sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg=="
     },
     "@smithy/fetch-http-handler": {
       "version": "3.2.9",
@@ -211,14 +211,14 @@
       "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A=="
     },
     "@smithy/hash-node": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz",
-      "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.8.tgz",
+      "integrity": "sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng=="
     },
     "@smithy/invalid-dependency": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz",
-      "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz",
+      "integrity": "sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q=="
     },
     "@smithy/is-array-buffer": {
       "version": "3.0.0",
@@ -226,89 +226,89 @@
       "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="
     },
     "@smithy/middleware-content-length": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz",
-      "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz",
+      "integrity": "sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg=="
     },
     "@smithy/middleware-endpoint": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz",
-      "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz",
+      "integrity": "sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA=="
     },
     "@smithy/middleware-retry": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
-      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz",
+      "integrity": "sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg=="
     },
     "@smithy/middleware-serde": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz",
-      "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz",
+      "integrity": "sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA=="
     },
     "@smithy/middleware-stack": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz",
-      "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz",
+      "integrity": "sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA=="
     },
     "@smithy/node-config-provider": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz",
-      "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q=="
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz",
+      "integrity": "sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew=="
     },
     "@smithy/node-http-handler": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz",
-      "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ=="
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz",
+      "integrity": "sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w=="
     },
     "@smithy/property-provider": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz",
-      "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw=="
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.8.tgz",
+      "integrity": "sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA=="
     },
     "@smithy/protocol-http": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz",
-      "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ=="
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.5.tgz",
+      "integrity": "sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg=="
     },
     "@smithy/querystring-builder": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz",
-      "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz",
+      "integrity": "sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA=="
     },
     "@smithy/querystring-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz",
-      "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz",
+      "integrity": "sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg=="
     },
     "@smithy/service-error-classification": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz",
-      "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz",
+      "integrity": "sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g=="
     },
     "@smithy/shared-ini-file-loader": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz",
-      "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw=="
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz",
+      "integrity": "sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA=="
     },
     "@smithy/signature-v4": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz",
-      "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.1.tgz",
+      "integrity": "sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg=="
     },
     "@smithy/smithy-client": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
-      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ=="
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.2.tgz",
+      "integrity": "sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA=="
     },
     "@smithy/types": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz",
-      "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.6.0.tgz",
+      "integrity": "sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w=="
     },
     "@smithy/url-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz",
-      "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.8.tgz",
+      "integrity": "sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg=="
     },
     "@smithy/util-base64": {
       "version": "3.0.0",
@@ -336,19 +336,19 @@
       "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="
     },
     "@smithy/util-defaults-mode-browser": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
-      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz",
+      "integrity": "sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA=="
     },
     "@smithy/util-defaults-mode-node": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
-      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz",
+      "integrity": "sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g=="
     },
     "@smithy/util-endpoints": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz",
-      "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw=="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz",
+      "integrity": "sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ=="
     },
     "@smithy/util-hex-encoding": {
       "version": "3.0.0",
@@ -356,19 +356,26 @@
       "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="
     },
     "@smithy/util-middleware": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz",
-      "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.8.tgz",
+      "integrity": "sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA=="
     },
     "@smithy/util-retry": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz",
-      "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.8.tgz",
+      "integrity": "sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow=="
     },
     "@smithy/util-stream": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz",
-      "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.2.1.tgz",
+      "integrity": "sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==",
+      "dependencies": {
+        "@smithy/fetch-http-handler": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz",
+          "integrity": "sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g=="
+        }
+      }
     },
     "@smithy/util-uri-escape": {
       "version": "3.0.0",
@@ -381,9 +388,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index e904107de5..aa70093779 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
     },
     "@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
     },
     "@types/qs": {
       "version": "6.9.16",
@@ -294,11 +294,6 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    },
     "lru-cache": {
       "version": "7.18.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",

From bc3f469571a07f41b2afdb4ef7a0517f6cb4ce51 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 09:01:52 -0400
Subject: [PATCH 0647/1140] fix data population

---
 .../ddp-client/test/livedata_test_service.js  | 63 ++++++++++---------
 packages/tinytest/tinytest_server.js          |  2 +-
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/packages/ddp-client/test/livedata_test_service.js b/packages/ddp-client/test/livedata_test_service.js
index bc6e31b2e1..56886ff384 100644
--- a/packages/ddp-client/test/livedata_test_service.js
+++ b/packages/ddp-client/test/livedata_test_service.js
@@ -334,38 +334,41 @@ if (Meteor.isServer) {
 One = new Mongo.Collection('collectionOne');
 Two = new Mongo.Collection('collectionTwo');
 
-Meteor.startup(async () => {
-  if (Meteor.isServer) {
-    await One.removeAsync({});
-    await One.insertAsync({ name: 'value1' });
-    await One.insertAsync({ name: 'value2' });
+async function populateDatabase() {
+  await One.removeAsync({});
+  await One.insertAsync({ name: 'value1' });
+  await One.insertAsync({ name: 'value2' });
 
-    await Two.removeAsync({});
-    await Two.insertAsync({ name: 'value3' });
-    await Two.insertAsync({ name: 'value4' });
-    await Two.insertAsync({ name: 'value5' });
+  await Two.removeAsync({});
+  await Two.insertAsync({ name: 'value3' });
+  await Two.insertAsync({ name: 'value4' });
+  await Two.insertAsync({ name: 'value5' });
+}
 
-    Meteor.publish('multiPublish', function(options) {
-      // See below to see what options are accepted.
-      check(options, Object);
-      if (options.normal) {
-        return [One.find(), Two.find()];
-      } else if (options.dup) {
-        // Suppress the log of the expected internal error.
-        Meteor._suppress_log(1);
-        return [
-          One.find(),
-          One.find({ name: 'value2' }), // multiple cursors for one collection - error
-          Two.find(),
-        ];
-      } else if (options.notCursor) {
-        // Suppress the log of the expected internal error.
-        Meteor._suppress_log(1);
-        return [One.find(), 'not a cursor', Two.find()];
-      } else throw 'unexpected options';
-    });
-  }
-});
+if (Meteor.isServer) {
+  Meteor.publish('multiPublish', async function (options) {
+    // See below to see what options are accepted.
+    check(options, Object);
+
+    await populateDatabase();
+
+    if (options.normal) {
+      return [One.find(), Two.find()];
+    } else if (options.dup) {
+      // Suppress the log of the expected internal error.
+      Meteor._suppress_log(1);
+      return [
+        One.find(),
+        One.find({ name: 'value2' }), // multiple cursors for one collection - error
+        Two.find(),
+      ];
+    } else if (options.notCursor) {
+      // Suppress the log of the expected internal error.
+      Meteor._suppress_log(1);
+      return [One.find(), 'not a cursor', Two.find()];
+    } else throw 'unexpected options';
+  });
+}
 
 /// Helper for "livedata - result by value"
 const resultByValueArrays = Object.create(null);
diff --git a/packages/tinytest/tinytest_server.js b/packages/tinytest/tinytest_server.js
index 22a781a4c5..4c514c1059 100644
--- a/packages/tinytest/tinytest_server.js
+++ b/packages/tinytest/tinytest_server.js
@@ -43,7 +43,7 @@ Meteor.methods({
     const collections = await MongoInternals.defaultRemoteCollectionDriver().mongo.db.collections();
 
     for (const collection of collections) {
-      await collection.drop();
+      await collection.deleteMany({});
     }
 
     this.unblock();

From 316ae51742e6acf624c5a01c7a0a0aee50584cb9 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 09:42:37 -0400
Subject: [PATCH 0648/1140] prevent context from tinytest to trickle down to
 actual test

---
 packages/tinytest/tinytest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tinytest/tinytest.js b/packages/tinytest/tinytest.js
index 73be02c9f8..afa1391207 100644
--- a/packages/tinytest/tinytest.js
+++ b/packages/tinytest/tinytest.js
@@ -435,7 +435,7 @@ export class TestCase {
         stop_at_offset
       );
 
-      const result = this.func(results, resolve);
+      const result = Meteor._runFresh(() => this.func(results, resolve));
       if (result && typeof result.then === "function") {
         return result.then(resolve, reject);
       }

From 5a9a659bd1ed96e8d95765a6cd5995e193850bd1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 12:26:20 -0400
Subject: [PATCH 0649/1140] update reify

---
 packages/modules/package.js          | 2 +-
 scripts/dev-bundle-server-package.js | 2 +-
 scripts/dev-bundle-tool-package.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/modules/package.js b/packages/modules/package.js
index dde3e50903..383dafa0a3 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  "@meteorjs/reify": "0.25.3",
+  "@meteorjs/reify": "0.25.4",
   "meteor-babel-helpers": "0.0.3",
 });
 
diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index f7a4cc12f3..ef92f51625 100644
--- a/scripts/dev-bundle-server-package.js
+++ b/scripts/dev-bundle-server-package.js
@@ -11,7 +11,7 @@ var packageJson = {
     // Keep the versions of these packages consistent with the versions
     // found in dev-bundle-tool-package.js.
     promise: "8.3.0",
-    "@meteorjs/reify": "0.25.3",
+    "@meteorjs/reify": "0.25.4",
     "@babel/parser": "7.25.0",
     "lru-cache": "6.0.0",
     underscore: "1.13.7",
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 2faa32bcdf..edae608539 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -17,7 +17,7 @@ var packageJson = {
     "@meteorjs/babel": "7.20.0",
     // Keep the versions of these packages consistent with the versions
     // found in dev-bundle-server-package.js.
-    "@meteorjs/reify": "0.25.3",
+    "@meteorjs/reify": "0.25.4",
     // So that Babel can emit require("@babel/runtime/helpers/...") calls.
     "@babel/runtime": "7.25.0",
     // For backwards compatibility with isopackets that still depend on

From acda6cff514de980948a551756f916104a109031 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 12:28:09 -0400
Subject: [PATCH 0650/1140] update reify

---
 npm-packages/meteor-babel/package-lock.json | 20 ++++++++++----------
 npm-packages/meteor-babel/package.json      |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/npm-packages/meteor-babel/package-lock.json b/npm-packages/meteor-babel/package-lock.json
index 692c92bdac..3ded2f7c42 100644
--- a/npm-packages/meteor-babel/package-lock.json
+++ b/npm-packages/meteor-babel/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/babel",
-  "version": "7.20.0",
+  "version": "7.20.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -786,9 +786,9 @@
       }
     },
     "@meteorjs/reify": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@meteorjs/reify/-/reify-0.25.3.tgz",
-      "integrity": "sha512-OVtWOLNvonGwA9Uowzp18q6L2Z3V/kPItS1bNyJMryfXFnosM2O0Hm3pYcxRfP36/0tc1BCiV3dA8yrr8RgMUA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@meteorjs/reify/-/reify-0.25.4.tgz",
+      "integrity": "sha512-/HwynJK85QtS2Rm26M9TS8aEMnqVJ2TIzJNJTGAQz+G6cTYmJGWaU4nFH96oxiDIBbnT6Y3TfX92HDuS9TtNRg==",
       "requires": {
         "acorn": "^8.8.1",
         "magic-string": "^0.25.3",
@@ -804,14 +804,14 @@
       }
     },
     "@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
     },
     "ansi-colors": {
       "version": "3.2.3",
diff --git a/npm-packages/meteor-babel/package.json b/npm-packages/meteor-babel/package.json
index ec06ff484c..24771f96c0 100644
--- a/npm-packages/meteor-babel/package.json
+++ b/npm-packages/meteor-babel/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@meteorjs/babel",
   "author": "Meteor <dev@meteor.com>",
-  "version": "7.20.0",
+  "version": "7.20.1",
   "license": "MIT",
   "type": "commonjs",
   "description": "Babel wrapper package for use with Meteor",
@@ -42,7 +42,7 @@
     "@babel/template": "^7.16.7",
     "@babel/traverse": "^7.17.0",
     "@babel/types": "^7.17.0",
-    "@meteorjs/reify": "0.25.3",
+    "@meteorjs/reify": "0.25.4",
     "babel-preset-meteor": "^7.10.0",
     "babel-preset-minify": "^0.5.1",
     "convert-source-map": "^1.6.0",

From 34f06f0b89ed3b304e7c786f72f8ae09e3b2bbbf Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 12:39:09 -0400
Subject: [PATCH 0651/1140] update meteor babel versions

---
 packages/babel-compiler/package.js | 2 +-
 scripts/dev-bundle-tool-package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 54c1ca804e..340fd173a7 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -5,7 +5,7 @@ Package.describe({
 });
 
 Npm.depends({
-  '@meteorjs/babel': '7.20.0',
+  '@meteorjs/babel': '7.20.1',
   'json5': '2.1.1',
   'semver': '7.3.8'
 });
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index edae608539..8abcf61887 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,7 +14,7 @@ var packageJson = {
     "node-gyp": "9.4.0",
     "@mapbox/node-pre-gyp": "1.0.11",
     typescript: "5.6.2",
-    "@meteorjs/babel": "7.20.0",
+    "@meteorjs/babel": "7.20.1",
     // Keep the versions of these packages consistent with the versions
     // found in dev-bundle-server-package.js.
     "@meteorjs/reify": "0.25.4",

From b19cd3e0b5eaff79fd8ef62d20482d51d9c2befb Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 12:39:29 -0400
Subject: [PATCH 0652/1140] update shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 .../modules/.npm/package/npm-shrinkwrap.json  |  12 +-
 .../.npm/package/npm-shrinkwrap.json          | 289 +++++++++---------
 .../webapp/.npm/package/npm-shrinkwrap.json   |  11 +-
 4 files changed, 160 insertions(+), 158 deletions(-)

diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
index 7bac16f061..5eedf0b09e 100644
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="
     },
     "acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
     },
     "buffer-from": {
       "version": "1.1.2",
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 5d60955420..7c1a6396d6 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@meteorjs/reify": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@meteorjs/reify/-/reify-0.25.3.tgz",
-      "integrity": "sha512-OVtWOLNvonGwA9Uowzp18q6L2Z3V/kPItS1bNyJMryfXFnosM2O0Hm3pYcxRfP36/0tc1BCiV3dA8yrr8RgMUA=="
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@meteorjs/reify/-/reify-0.25.4.tgz",
+      "integrity": "sha512-/HwynJK85QtS2Rm26M9TS8aEMnqVJ2TIzJNJTGAQz+G6cTYmJGWaU4nFH96oxiDIBbnT6Y3TfX92HDuS9TtNRg=="
     },
     "@types/estree": {
       "version": "1.0.6",
@@ -12,9 +12,9 @@
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
     },
     "estree-walker": {
       "version": "2.0.2",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index cff9dcf76d..6c5b66a97b 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,74 +56,74 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.677.0.tgz",
+      "integrity": "sha512-wGhbHAZGa5VeVLCyAfhyFWXl+JfsHSgSl0eodH6xqKoR60LTDJZbBgQZizUwSj8EoSzsglBvgPLYZaLfXTKM/g=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz",
-      "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.677.0.tgz",
+      "integrity": "sha512-/y6EskFhOa2w9VwXaXoyOrGeBjnOj/72wsxDOslS908qH+nf7m40pBK6e/iBelg04vlx0gqhlbfK8hLbaT6KHA=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz",
-      "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.677.0.tgz",
+      "integrity": "sha512-2zgZkRIU7DsnUVOy+9bjfJ0IYMzi9ONWXQt/WqMa7HOnj4RfenfpipyhHYxGZR5kmehgv53EI79yvUu+SAfGNg=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz",
-      "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.677.0.tgz",
+      "integrity": "sha512-N5fs1GLSthnwrs44b4IJI//dcShuIT42g4pM8FCUJZwbrWn9Sp9F876R1mvb8A9TAy2S4qCXi7TkHS0REnuicQ=="
     },
     "@aws-sdk/core": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz",
-      "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.677.0.tgz",
+      "integrity": "sha512-5auvc1wmXmd7u9Y9nM95Ia+VX7J2FiZLuADitHqE4mHPH9riDgOY+uK/yM+UKr+lfq4zKiZQG7i8cfabZlCY8g=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.677.0.tgz",
+      "integrity": "sha512-ODw8MKhT41KLpKlGIH1yFO2FIOCAW3Nnn2uCu1eAm807aI0OK31ntUNrY+GFzXX7ixv+KFoiJu3ih+w+Oxw5gA=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz",
-      "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.677.0.tgz",
+      "integrity": "sha512-0ctcqKzclr9TiNIkB8I+YRogjWH/4mLWQGv/bgb8ElHqph+rPy4pOubj1Ax01sbs7XdwDaImjBYV5xXE+BEsYw=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz",
-      "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.677.0.tgz",
+      "integrity": "sha512-c4TnShdzk37dhL1HGGzZ2PDKIIEmo1IbT/4y5hSRdNc8Z8fu6spE5GoeVsv6p/HdSGPS7XTy6aOFCMCk4AeIzQ=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz",
-      "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.677.0.tgz",
+      "integrity": "sha512-hW+oHj5zplPLzTk74LG+gZVOKQnmBPyRIbwg3uZWr23xfOxh/Osu9Wq8qwgu2+UyFHr+6/DRFjZJ6avNA2jpKw=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz",
-      "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.677.0.tgz",
+      "integrity": "sha512-DwFriiDx2SSdj7VhRv/0fm8UIK7isy+WZAlqUdZ9xDsX4x1AD5KwMv9AwGhJrMuTjnPSxRSwjt23S7ZXwUfhdw=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz",
-      "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.677.0.tgz",
+      "integrity": "sha512-pBqHjIFvHBJb2NOsVqdIHWcOzXDoNXBokxTvMggb3WYML6ixwrH7kpd1CAzegeQlvZD4SCcRoy3ahv5rbuR+og=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz",
-      "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.677.0.tgz",
+      "integrity": "sha512-OkRP3z8yI22t9LS9At5fYr6RN7zKSDiGgeyjEnrqiGHOWGPMJN2GKa8IAFC4dgXt4Nm/EfmEW7UweiqzEKJKOA=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz",
-      "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.677.0.tgz",
+      "integrity": "sha512-yjuI6hSt1rLFqBQiNKx/nF75Ao72xR8ybqKztzebtFNCrYl8oXVkRiigg5XKNCDmelsx1lcU9IcSiuPHzlGtUQ=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz",
-      "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.677.0.tgz",
+      "integrity": "sha512-fUEDkRI2GuN+p9xyZewlRQC2vFXjxPOoQGugQTmOawTxVUYkFpssg4ID0HUtkKuJYHjaoD2bCyKvOcnL1JU6AA=="
     },
     "@aws-sdk/middleware-host-header": {
       "version": "3.667.0",
@@ -141,9 +141,9 @@
       "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.669.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz",
-      "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.677.0.tgz",
+      "integrity": "sha512-A3gzUsTsvyv/JCmD0p2fkbiOyp+tpAiAADDwzi+eYeyzH4xzqnrzSkGk5KSb58uUQo27eeBzRXHd46d0u+sMrQ=="
     },
     "@aws-sdk/region-config-resolver": {
       "version": "3.667.0",
@@ -171,14 +171,14 @@
       "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz",
-      "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A=="
+      "version": "3.675.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz",
+      "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.669.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz",
-      "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA=="
+      "version": "3.677.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.677.0.tgz",
+      "integrity": "sha512-gFhL0zVY/um0Eu2aWil82pjWaZL4yBmOnjz0+RDz18okFBHaz1Om8o/H+1Vvj+xsnuDYV4ezVMyAaXVtTcYOnw=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
@@ -186,24 +186,24 @@
       "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
     },
     "@smithy/abort-controller": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz",
-      "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg=="
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.6.tgz",
+      "integrity": "sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ=="
     },
     "@smithy/config-resolver": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz",
-      "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.10.tgz",
+      "integrity": "sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw=="
     },
     "@smithy/core": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
-      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.1.tgz",
+      "integrity": "sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg=="
     },
     "@smithy/credential-provider-imds": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz",
-      "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w=="
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz",
+      "integrity": "sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg=="
     },
     "@smithy/fetch-http-handler": {
       "version": "3.2.9",
@@ -211,14 +211,14 @@
       "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A=="
     },
     "@smithy/hash-node": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz",
-      "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.8.tgz",
+      "integrity": "sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng=="
     },
     "@smithy/invalid-dependency": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz",
-      "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz",
+      "integrity": "sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q=="
     },
     "@smithy/is-array-buffer": {
       "version": "3.0.0",
@@ -226,89 +226,89 @@
       "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="
     },
     "@smithy/middleware-content-length": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz",
-      "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz",
+      "integrity": "sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg=="
     },
     "@smithy/middleware-endpoint": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz",
-      "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz",
+      "integrity": "sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA=="
     },
     "@smithy/middleware-retry": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
-      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz",
+      "integrity": "sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg=="
     },
     "@smithy/middleware-serde": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz",
-      "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz",
+      "integrity": "sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA=="
     },
     "@smithy/middleware-stack": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz",
-      "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz",
+      "integrity": "sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA=="
     },
     "@smithy/node-config-provider": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz",
-      "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q=="
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz",
+      "integrity": "sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew=="
     },
     "@smithy/node-http-handler": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz",
-      "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ=="
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz",
+      "integrity": "sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w=="
     },
     "@smithy/property-provider": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz",
-      "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw=="
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.8.tgz",
+      "integrity": "sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA=="
     },
     "@smithy/protocol-http": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz",
-      "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ=="
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.5.tgz",
+      "integrity": "sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg=="
     },
     "@smithy/querystring-builder": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz",
-      "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz",
+      "integrity": "sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA=="
     },
     "@smithy/querystring-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz",
-      "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz",
+      "integrity": "sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg=="
     },
     "@smithy/service-error-classification": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz",
-      "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz",
+      "integrity": "sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g=="
     },
     "@smithy/shared-ini-file-loader": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz",
-      "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw=="
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz",
+      "integrity": "sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA=="
     },
     "@smithy/signature-v4": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz",
-      "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.1.tgz",
+      "integrity": "sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg=="
     },
     "@smithy/smithy-client": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
-      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ=="
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.2.tgz",
+      "integrity": "sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA=="
     },
     "@smithy/types": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz",
-      "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.6.0.tgz",
+      "integrity": "sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w=="
     },
     "@smithy/url-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz",
-      "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.8.tgz",
+      "integrity": "sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg=="
     },
     "@smithy/util-base64": {
       "version": "3.0.0",
@@ -336,19 +336,19 @@
       "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="
     },
     "@smithy/util-defaults-mode-browser": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
-      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz",
+      "integrity": "sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA=="
     },
     "@smithy/util-defaults-mode-node": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
-      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg=="
+      "version": "3.0.25",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz",
+      "integrity": "sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g=="
     },
     "@smithy/util-endpoints": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz",
-      "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw=="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz",
+      "integrity": "sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ=="
     },
     "@smithy/util-hex-encoding": {
       "version": "3.0.0",
@@ -356,19 +356,26 @@
       "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="
     },
     "@smithy/util-middleware": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz",
-      "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.8.tgz",
+      "integrity": "sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA=="
     },
     "@smithy/util-retry": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz",
-      "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.8.tgz",
+      "integrity": "sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow=="
     },
     "@smithy/util-stream": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz",
-      "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.2.1.tgz",
+      "integrity": "sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==",
+      "dependencies": {
+        "@smithy/fetch-http-handler": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz",
+          "integrity": "sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g=="
+        }
+      }
     },
     "@smithy/util-uri-escape": {
       "version": "3.0.0",
@@ -381,9 +388,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index e904107de5..aa70093779 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
     },
     "@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
     },
     "@types/qs": {
       "version": "6.9.16",
@@ -294,11 +294,6 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    },
     "lru-cache": {
       "version": "7.18.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",

From 3ac1dadf455923d846503914a86a57fcdd74c013 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:32:49 -0400
Subject: [PATCH 0653/1140] log stuff

---
 scripts/generate-dev-bundle.ps1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index dbb9ba31fd..379998662a 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -183,6 +183,10 @@ Function Add-NodeAndNpm {
   # We should now have a fully functionaly local Node with headers to use.
   #
 
+  Get-ChildItem $dirTempNode
+  Get-Content $tempNpmCmd
+
+
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
   Write-Host (Get-Location)

From 567d7969be221fa4ce92305b813d4917b6d1c7b2 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:36:42 -0400
Subject: [PATCH 0654/1140] fix command

---
 scripts/generate-dev-bundle.ps1 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 379998662a..133c2baca0 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -183,9 +183,8 @@ Function Add-NodeAndNpm {
   # We should now have a fully functionaly local Node with headers to use.
   #
 
-  Get-ChildItem $dirTempNode
-  Get-Content $tempNpmCmd
-
+  Write-Host (Get-ChildItem $dirTempNode)
+  Write-Host (Get-Content $tempNpmCmd)
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta

From df16325591020a6d607653a3b90b73b394f53e25 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:39:27 -0400
Subject: [PATCH 0655/1140] use ps1

---
 scripts/generate-dev-bundle.ps1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 133c2baca0..9ca171243b 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -141,7 +141,7 @@ Function Add-NodeAndNpm {
   Remove-Item $archiveNode
 
   $tempNodeExe = Join-Path $dirTempNode 'node.exe'
-  $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
+  $tempNpmCmd = Join-Path $dirTempNode 'npm.ps1'
 
   # Get additional values we'll need to fetch to complete this release.
   $nodeProcessRelease = @{
@@ -207,13 +207,13 @@ Function Add-NodeAndNpm {
   Move-Item $dirNodeRelease $DIR
 
   $finalNodeExe = Join-Path $dirBin 'node.exe'
-  $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
+  $finalNpmCmd = Join-Path $dirBin 'npm.ps1'
 
   # Uses process.execPath to infer dev_bundle\bin, npm location, &c.
   & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
 
-  # We use our own npm.cmd.
-  Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
+  # We use our own npm.ps1.
+  Copy-Item "${dirCheckout}\scripts\npm.ps1" $finalNpmCmd
 
   Remove-DirectoryRecursively $dirTempNodeHeaders
   Remove-DirectoryRecursively $dirTempNode
@@ -346,7 +346,7 @@ $toolCmds = Add-NodeAndNpm
 "Node process.versions:"
 & node -p 'process.versions'
 
-"Location of npm.cmd:"
+"Location of npm.ps1:"
 & Get-Command npm | Select-Object -ExpandProperty Definition
 
 "Npm 'version':"

From f21f4519f9b525e9f664209047c4b2fe26c55f01 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:42:17 -0400
Subject: [PATCH 0656/1140] remove pipe

---
 scripts/generate-dev-bundle.ps1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 9ca171243b..3a5aa37887 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -190,8 +190,7 @@ Function Add-NodeAndNpm {
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
   Write-Host (Get-Location)
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
-      Write-Debug
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION}
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."

From 301a657d9f121ab8d19a7f8390a9b6bcc3ecb198 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:45:08 -0400
Subject: [PATCH 0657/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 3a5aa37887..333dbc2a9f 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -188,9 +188,13 @@ Function Add-NodeAndNpm {
 
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
+
+  "$tempNpmCmd" --version | Write-Host
+
   Write-Host (Get-Location)
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION}
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
+      Write-Host
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."

From 01e4cc441570ac6d3b162f4b14a461f818d6ec8d Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:47:11 -0400
Subject: [PATCH 0658/1140] try that

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 333dbc2a9f..490cd8a37d 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -189,7 +189,7 @@ Function Add-NodeAndNpm {
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
 
-  "$tempNpmCmd" --version | Write-Host
+  & "$tempNpmCmd" --version | Write-Host
 
   Write-Host (Get-Location)
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `

From eec31ff5d3e73532fd87645c6cd3ab2524877aff Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:50:03 -0400
Subject: [PATCH 0659/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 490cd8a37d..21918de816 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -189,7 +189,7 @@ Function Add-NodeAndNpm {
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
 
-  & "$tempNpmCmd" --version | Write-Host
+  & "$tempNpmCmd" --version 2>&1 | Write-Host
 
   Write-Host (Get-Location)
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `

From b7047e7a7196f0d3471e87261065d6e7b2729887 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:50:33 -0400
Subject: [PATCH 0660/1140] change debug preference

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 21918de816..01f8e2a2e5 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,4 +1,4 @@
-$ErrorActionPreference = "Stop"
+$ErrorActionPreference = "Continue"
 $DebugPreference = "Continue"
 
 Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"

From 12de0b9fed27e96a8500a53c7fb3154e514de5c9 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:52:47 -0400
Subject: [PATCH 0661/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 01f8e2a2e5..1021418e51 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -189,7 +189,7 @@ Function Add-NodeAndNpm {
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
 
-  & "$tempNpmCmd" --version 2>&1 | Write-Host
+  & "$tempNpmCmd" --version 2>&1
 
   Write-Host (Get-Location)
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `

From b1e7f5846dfdd01a5f03fe35de1bf1e940170286 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:57:47 -0400
Subject: [PATCH 0662/1140] try that

---
 scripts/generate-dev-bundle.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 1021418e51..8876357d3e 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -189,11 +189,11 @@ Function Add-NodeAndNpm {
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
 
-  & "$tempNpmCmd" --version 2>&1
+  Write-Host (& "$tempNpmCmd" --version 2>&1)
 
   Write-Host (Get-Location)
   & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} |
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" |
       Write-Host
 
   if ($LASTEXITCODE -ne 0) {

From 5fb3d568247f6801b95fcb1badc59179e15c72f1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 13:59:39 -0400
Subject: [PATCH 0663/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 8876357d3e..a78ed49df3 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -192,9 +192,9 @@ Function Add-NodeAndNpm {
   Write-Host (& "$tempNpmCmd" --version 2>&1)
 
   Write-Host (Get-Location)
-  & "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" |
-      Write-Host
+
+  Write-Host (& "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION})
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."

From f648200c83e888b581f34665eb41687848e34eb7 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:00:16 -0400
Subject: [PATCH 0664/1140] try that

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index a78ed49df3..ed0f51200c 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -194,7 +194,7 @@ Function Add-NodeAndNpm {
   Write-Host (Get-Location)
 
   Write-Host (& "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION})
+    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1)
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."

From 5dc68b682024e95b634e11e640f4ef6ed6a29cec Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:04:16 -0400
Subject: [PATCH 0665/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index ed0f51200c..b56ff0c27e 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -215,8 +215,8 @@ Function Add-NodeAndNpm {
   # Uses process.execPath to infer dev_bundle\bin, npm location, &c.
   & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
 
-  # We use our own npm.ps1.
-  Copy-Item "${dirCheckout}\scripts\npm.ps1" $finalNpmCmd
+  # We use our own npm.cmd.
+  Copy-Item "${dirCheckout}\scripts\npm.cmd" $finalNpmCmd
 
   Remove-DirectoryRecursively $dirTempNodeHeaders
   Remove-DirectoryRecursively $dirTempNode

From 05b953dba6c32ea48a7e3207992d82441a3e95a6 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:05:57 -0400
Subject: [PATCH 0666/1140] try that

---
 scripts/generate-dev-bundle.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index b56ff0c27e..f62b4fa133 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -141,7 +141,7 @@ Function Add-NodeAndNpm {
   Remove-Item $archiveNode
 
   $tempNodeExe = Join-Path $dirTempNode 'node.exe'
-  $tempNpmCmd = Join-Path $dirTempNode 'npm.ps1'
+  $tempNpmCmd = Join-Path $dirTempNode 'npm.cmd'
 
   # Get additional values we'll need to fetch to complete this release.
   $nodeProcessRelease = @{
@@ -210,7 +210,7 @@ Function Add-NodeAndNpm {
   Move-Item $dirNodeRelease $DIR
 
   $finalNodeExe = Join-Path $dirBin 'node.exe'
-  $finalNpmCmd = Join-Path $dirBin 'npm.ps1'
+  $finalNpmCmd = Join-Path $dirBin 'npm.cmd'
 
   # Uses process.execPath to infer dev_bundle\bin, npm location, &c.
   & "$finalNodeExe" "${dirCheckout}\scripts\windows\link-npm-bin-commands.js"
@@ -349,7 +349,7 @@ $toolCmds = Add-NodeAndNpm
 "Node process.versions:"
 & node -p 'process.versions'
 
-"Location of npm.ps1:"
+"Location of npm.cmd:"
 & Get-Command npm | Select-Object -ExpandProperty Definition
 
 "Npm 'version':"

From 2d5ceb1fb4c65e053f6fefa7c3702ac2418e2923 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:07:29 -0400
Subject: [PATCH 0667/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index f62b4fa133..4f11c14cad 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -353,7 +353,7 @@ $toolCmds = Add-NodeAndNpm
 & Get-Command npm | Select-Object -ExpandProperty Definition
 
 "Npm 'version':"
-& npm version
+Write-Host (& npm version 2>&1)
 
 npm config set loglevel error
 

From 1a3264552579c0944c2c796ec45da9209ac55a67 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:15:59 -0400
Subject: [PATCH 0668/1140] try that

---
 scripts/generate-dev-bundle.ps1 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 4f11c14cad..4ffaeb0d22 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -344,18 +344,16 @@ $env:PATH = "$env:PATH;$dirBin"
 $toolCmds = Add-NodeAndNpm
 
 "Location of node.exe:"
-& Get-Command node | Select-Object -ExpandProperty Definition
+Get-Command node | Select-Object -ExpandProperty Definition
 
 "Node process.versions:"
-& node -p 'process.versions'
+node -p 'process.versions'
 
 "Location of npm.cmd:"
-& Get-Command npm | Select-Object -ExpandProperty Definition
+Get-Command npm | Select-Object -ExpandProperty Definition
 
 "Npm 'version':"
-Write-Host (& npm version 2>&1)
-
-npm config set loglevel error
+Write-Host (npm version 2>&1)
 
 #
 # Install the npms for the 'server'.
@@ -366,12 +364,13 @@ $npmServerArgs = @{
   commands = $toolCmds
   shrinkwrap = $True
 }
+
 Add-NpmModulesFromJsBundleFile @npmServerArgs
 
 # These are used by the Meteor tool bundler and written to the Meteor build.
 # For information, see the 'ServerTarget' class in tools/isobuild/bundler.js,
 # and look for 'serverPkgJson' and 'npm-shrinkwrap.json'
-mkdir -Force "${DIR}\etc"
+Write-Host (mkdir -Force "${DIR}\etc" 2>&1)
 Move-Item $(Join-Path $dirServerLib 'package.json') "${DIR}\etc\"
 Move-Item $(Join-Path $dirServerLib 'npm-shrinkwrap.json') "${DIR}\etc\"
 

From 1e8420eb9eb0c73dfde79f3fea86b0769cc4c96c Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:17:33 -0400
Subject: [PATCH 0669/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 4ffaeb0d22..d7dfecb940 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -343,6 +343,8 @@ $env:PATH = "$env:PATH;$dirBin"
 # Install Node.js and npm and get their paths to use from here on.
 $toolCmds = Add-NodeAndNpm
 
+npm config set loglevel warn
+
 "Location of node.exe:"
 Get-Command node | Select-Object -ExpandProperty Definition
 

From aa44d83aaf28b037088a47873ab38cf735b1046a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:19:16 -0400
Subject: [PATCH 0670/1140] there is no du

---
 scripts/generate-dev-bundle.ps1 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index d7dfecb940..f8b7572941 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -5,7 +5,6 @@ Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform
 
 $PYTHON_VERSION = "3.9.5" # For node-gyp
-& cmd /c 'du 2>&1'
 
 $dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
 $shCommon = Join-Path $PSScriptRoot 'build-dev-bundle-common.sh'

From d3815fb48494db3d0f02bf57eadfbe08088cb622 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:23:42 -0400
Subject: [PATCH 0671/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index f8b7572941..d718006317 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -293,11 +293,15 @@ Function Add-NpmModulesFromJsBundleFile {
 
   Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
     -ForegroundColor Magenta
+
+  Write-Host (& "$($Commands.node)" $SourceJs)
+
   & "$($Commands.node)" $SourceJs |
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
 
   # No bin-links because historically, they weren't used anyway.
-  & "$($Commands.npm)" install
+  & "$($Commands.npm)" install 2>&1
+
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."
   }

From 907b91b70f11815c4b88c740fa4b27d5724ee873 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:28:04 -0400
Subject: [PATCH 0672/1140] try that

---
 scripts/generate-dev-bundle.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index d718006317..1107d3ff1f 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,5 +1,6 @@
 $ErrorActionPreference = "Continue"
 $DebugPreference = "Continue"
+$WarningPreference = "Continue"
 
 Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform

From a4f4122bc69dc2a04afe1336c0da3367645f82d1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:31:47 -0400
Subject: [PATCH 0673/1140] try that

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 1107d3ff1f..c11b7e66bb 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,6 +1,6 @@
 $ErrorActionPreference = "Continue"
 $DebugPreference = "Continue"
-$WarningPreference = "Continue"
+$WarningPreference = "SilentlyContinue"
 
 Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform

From cc3ce4ba2937024d0bb4c0b5b11b847b51523ab0 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 14:34:49 -0400
Subject: [PATCH 0674/1140] try this

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index c11b7e66bb..9090b6a44d 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -301,7 +301,7 @@ Function Add-NpmModulesFromJsBundleFile {
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
 
   # No bin-links because historically, they weren't used anyway.
-  & "$($Commands.npm)" install 2>&1
+  Write-Host (& "$($Commands.npm)" install 2>&1)
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."

From 6065c2d23f37d5bcafa017b854e21bb730b19c71 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 07:54:47 -0400
Subject: [PATCH 0675/1140] cleanup collections before starting tests

---
 packages/tinytest/tinytest_server.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/tinytest/tinytest_server.js b/packages/tinytest/tinytest_server.js
index fa51723879..22a781a4c5 100644
--- a/packages/tinytest/tinytest_server.js
+++ b/packages/tinytest/tinytest_server.js
@@ -12,7 +12,7 @@ export { Tinytest };
 const handlesForRun = new Map;
 const reportsForRun = new Map;
 
-Meteor.publish(ServerTestResultsSubscription, function (runId) {
+Meteor.publish(ServerTestResultsSubscription, async function (runId) {
   check(runId, String);
 
   if (! handlesForRun.has(runId)) {
@@ -36,9 +36,16 @@ Meteor.publish(ServerTestResultsSubscription, function (runId) {
 });
 
 Meteor.methods({
-  'tinytest/run'(runId, pathPrefix) {
+  async 'tinytest/run'(runId, pathPrefix) {
     check(runId, String);
     check(pathPrefix, Match.Optional([String]));
+
+    const collections = await MongoInternals.defaultRemoteCollectionDriver().mongo.db.collections();
+
+    for (const collection of collections) {
+      await collection.drop();
+    }
+
     this.unblock();
 
     reportsForRun.set(runId, Object.create(null));
@@ -84,4 +91,4 @@ Meteor.methods({
     handlesForRun.delete(runId);
     reportsForRun.delete(runId);
   }
-});
+});
\ No newline at end of file

From db5041fb6823c0b83028c08193309fc2c65ac2fa Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 09:01:52 -0400
Subject: [PATCH 0676/1140] fix data population

---
 .../ddp-client/test/livedata_test_service.js  | 63 ++++++++++---------
 packages/tinytest/tinytest_server.js          |  2 +-
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/packages/ddp-client/test/livedata_test_service.js b/packages/ddp-client/test/livedata_test_service.js
index bc6e31b2e1..56886ff384 100644
--- a/packages/ddp-client/test/livedata_test_service.js
+++ b/packages/ddp-client/test/livedata_test_service.js
@@ -334,38 +334,41 @@ if (Meteor.isServer) {
 One = new Mongo.Collection('collectionOne');
 Two = new Mongo.Collection('collectionTwo');
 
-Meteor.startup(async () => {
-  if (Meteor.isServer) {
-    await One.removeAsync({});
-    await One.insertAsync({ name: 'value1' });
-    await One.insertAsync({ name: 'value2' });
+async function populateDatabase() {
+  await One.removeAsync({});
+  await One.insertAsync({ name: 'value1' });
+  await One.insertAsync({ name: 'value2' });
 
-    await Two.removeAsync({});
-    await Two.insertAsync({ name: 'value3' });
-    await Two.insertAsync({ name: 'value4' });
-    await Two.insertAsync({ name: 'value5' });
+  await Two.removeAsync({});
+  await Two.insertAsync({ name: 'value3' });
+  await Two.insertAsync({ name: 'value4' });
+  await Two.insertAsync({ name: 'value5' });
+}
 
-    Meteor.publish('multiPublish', function(options) {
-      // See below to see what options are accepted.
-      check(options, Object);
-      if (options.normal) {
-        return [One.find(), Two.find()];
-      } else if (options.dup) {
-        // Suppress the log of the expected internal error.
-        Meteor._suppress_log(1);
-        return [
-          One.find(),
-          One.find({ name: 'value2' }), // multiple cursors for one collection - error
-          Two.find(),
-        ];
-      } else if (options.notCursor) {
-        // Suppress the log of the expected internal error.
-        Meteor._suppress_log(1);
-        return [One.find(), 'not a cursor', Two.find()];
-      } else throw 'unexpected options';
-    });
-  }
-});
+if (Meteor.isServer) {
+  Meteor.publish('multiPublish', async function (options) {
+    // See below to see what options are accepted.
+    check(options, Object);
+
+    await populateDatabase();
+
+    if (options.normal) {
+      return [One.find(), Two.find()];
+    } else if (options.dup) {
+      // Suppress the log of the expected internal error.
+      Meteor._suppress_log(1);
+      return [
+        One.find(),
+        One.find({ name: 'value2' }), // multiple cursors for one collection - error
+        Two.find(),
+      ];
+    } else if (options.notCursor) {
+      // Suppress the log of the expected internal error.
+      Meteor._suppress_log(1);
+      return [One.find(), 'not a cursor', Two.find()];
+    } else throw 'unexpected options';
+  });
+}
 
 /// Helper for "livedata - result by value"
 const resultByValueArrays = Object.create(null);
diff --git a/packages/tinytest/tinytest_server.js b/packages/tinytest/tinytest_server.js
index 22a781a4c5..4c514c1059 100644
--- a/packages/tinytest/tinytest_server.js
+++ b/packages/tinytest/tinytest_server.js
@@ -43,7 +43,7 @@ Meteor.methods({
     const collections = await MongoInternals.defaultRemoteCollectionDriver().mongo.db.collections();
 
     for (const collection of collections) {
-      await collection.drop();
+      await collection.deleteMany({});
     }
 
     this.unblock();

From d9692c8b5eba0ab540efff8cce804609a0571826 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 23 Oct 2024 09:42:37 -0400
Subject: [PATCH 0677/1140] prevent context from tinytest to trickle down to
 actual test

---
 packages/tinytest/tinytest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tinytest/tinytest.js b/packages/tinytest/tinytest.js
index 73be02c9f8..afa1391207 100644
--- a/packages/tinytest/tinytest.js
+++ b/packages/tinytest/tinytest.js
@@ -435,7 +435,7 @@ export class TestCase {
         stop_at_offset
       );
 
-      const result = this.func(results, resolve);
+      const result = Meteor._runFresh(() => this.func(results, resolve));
       if (result && typeof result.then === "function") {
         return result.then(resolve, reject);
       }

From 401940d65229a21d57c24652e3b08b6c25650f9b Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 24 Oct 2024 07:56:06 -0400
Subject: [PATCH 0678/1140] add test

---
 packages/meteor/dynamics_test.js | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/packages/meteor/dynamics_test.js b/packages/meteor/dynamics_test.js
index e33a28ad97..2c33177705 100644
--- a/packages/meteor/dynamics_test.js
+++ b/packages/meteor/dynamics_test.js
@@ -183,6 +183,53 @@ Tinytest.addAsync("environment - bare bindEnvironment",
  * This won't work on the client due to the absence of ALS/AH
  */
 if (Meteor.isServer) {
+  Tinytest.addAsync("environment - defer and environment variables", async function (test) {
+    const varA = new Meteor.EnvironmentVariable("a");
+    const varB = new Meteor.EnvironmentVariable("b");
+
+    let deferOnly = null;
+
+    varA.withValue(1, () => {
+      varB.withValue(2, () => {
+        Meteor.defer(() => {
+          console.log('Defer', varA.get(), varB.get());
+
+          deferOnly = [varA.get(), varB.get()];
+        });
+      });
+    });
+
+    let deferWithBindEnv = null;
+
+    varA.withValue(1, () => {
+      varB.withValue(2, () => {
+        Meteor.defer(
+          Meteor.bindEnvironment(() => {
+            console.log('Defer + Bind', varA.get(), varB.get());
+
+            deferWithBindEnv = [varA.get(), varB.get()];
+          })
+        );
+      });
+    });
+
+    let raw = null;
+
+    varA.withValue(1, () => {
+      varB.withValue(2, () => {
+        console.log('Raw:', varA.get(), varB.get());
+
+        raw = [varA.get(), varB.get()];
+      });
+    });
+
+    await Meteor.sleep(100);
+
+    test.equal(deferOnly, [1, 2]);
+    test.equal(deferWithBindEnv, [1, 2]);
+    test.equal(raw, [1, 2]);
+  })
+
   Tinytest.addAsync('environment - preserve ev value async/await', async function (test) {
     let val1 = null;
     let val2 = null;

From 5056521adf2aeefdf8f430eb1839ed634df5419b Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 24 Oct 2024 07:56:20 -0400
Subject: [PATCH 0679/1140] shrinkwrap

---
 packages/accounts-2fa/.npm/package/npm-shrinkwrap.json | 6 +++---
 packages/email/.npm/package/npm-shrinkwrap.json        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
index 64d0411523..231870d16f 100644
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
     },
     "@types/notp": {
       "version": "2.0.5",
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index 68404a03da..5aecda5383 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
     },
     "@types/nodemailer": {
       "version": "6.4.14",

From 986ffcc789d9af4c2f688fe8bdf92350ba33eedd Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 24 Oct 2024 08:06:18 -0400
Subject: [PATCH 0680/1140] fix exception crashing test server

---
 packages/email/email_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/email/email_tests.js b/packages/email/email_tests.js
index 05cfde3414..1decde3438 100644
--- a/packages/email/email_tests.js
+++ b/packages/email/email_tests.js
@@ -18,7 +18,7 @@ TEST_CASES.forEach(({ title, options, testCalls }) => {
           testCall(test, stream);
         });
       });
-      Promise.all(allPromises).then(() => resolver());
+      Promise.all(allPromises).then(() => resolver()).catch(console.error);
     });
     await promise;
   });

From b7ad15e77dd49c85a20ca85b5c48eea1fdf999be Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 24 Oct 2024 10:33:37 -0400
Subject: [PATCH 0681/1140] change npm version reset generate-dev-bundle.ps1

---
 meteor                             |  2 +-
 scripts/build-dev-bundle-common.sh |  2 +-
 scripts/dev-bundle-tool-package.js |  2 +-
 scripts/generate-dev-bundle.ps1    | 35 ++++++++++--------------------
 4 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/meteor b/meteor
index af837529d1..980a2f39f3 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.10.0.1
+BUNDLE_VERSION=22.10.0.2
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index c5f7ad6dad..a5a8d81b8b 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -8,7 +8,7 @@ ARCH=$(uname -m)
 NODE_VERSION=22.10.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
-NPM_VERSION=10.8.3
+NPM_VERSION=10.9.0
 
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index b24f632538..8d49a8e712 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -10,7 +10,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.8.3",
+    npm: "10.9.0",
     "node-gyp": "10.2.0",
     "@mapbox/node-pre-gyp": "1.0.11",
     typescript: "5.6.3",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 9090b6a44d..bd7d5b11c1 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -1,11 +1,11 @@
-$ErrorActionPreference = "Continue"
+$ErrorActionPreference = "Stop"
 $DebugPreference = "Continue"
-$WarningPreference = "SilentlyContinue"
 
 Import-Module -Force "$PSScriptRoot\windows\dev-bundle-lib.psm1"
 $PLATFORM = Get-MeteorPlatform
 
 $PYTHON_VERSION = "3.9.5" # For node-gyp
+& cmd /c 'du 2>&1'
 
 $dirCheckout = (Get-Item $PSScriptRoot).parent.FullName
 $shCommon = Join-Path $PSScriptRoot 'build-dev-bundle-common.sh'
@@ -183,18 +183,10 @@ Function Add-NodeAndNpm {
   # We should now have a fully functionaly local Node with headers to use.
   #
 
-  Write-Host (Get-ChildItem $dirTempNode)
-  Write-Host (Get-Content $tempNpmCmd)
-
   # Let's install the npm version we really want.
   Write-Host "Installing npm@${NPM_VERSION}..." -ForegroundColor Magenta
-
-  Write-Host (& "$tempNpmCmd" --version 2>&1)
-
-  Write-Host (Get-Location)
-
   Write-Host (& "$tempNpmCmd" install --prefix="$dirLib" --no-bin-links --save `
-    --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1)
+      --cache="$dirNpmCache" --nodedir="$dirTempNode" npm@${NPM_VERSION} 2>&1)
 
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm@${NPM_VERSION}."
@@ -294,15 +286,11 @@ Function Add-NpmModulesFromJsBundleFile {
 
   Write-Host "Writing 'package.json' from ${SourceJs} to ${Destination}" `
     -ForegroundColor Magenta
-
-  Write-Host (& "$($Commands.node)" $SourceJs)
-
   & "$($Commands.node)" $SourceJs |
     Out-File -FilePath $(Join-Path $Destination 'package.json') -Encoding ascii
 
   # No bin-links because historically, they weren't used anyway.
-  Write-Host (& "$($Commands.npm)" install 2>&1)
-
+  & "$($Commands.npm)" install
   if ($LASTEXITCODE -ne 0) {
     throw "Couldn't install npm packages."
   }
@@ -347,19 +335,19 @@ $env:PATH = "$env:PATH;$dirBin"
 # Install Node.js and npm and get their paths to use from here on.
 $toolCmds = Add-NodeAndNpm
 
-npm config set loglevel warn
-
 "Location of node.exe:"
-Get-Command node | Select-Object -ExpandProperty Definition
+& Get-Command node | Select-Object -ExpandProperty Definition
 
 "Node process.versions:"
-node -p 'process.versions'
+& node -p 'process.versions'
 
 "Location of npm.cmd:"
-Get-Command npm | Select-Object -ExpandProperty Definition
+& Get-Command npm | Select-Object -ExpandProperty Definition
 
 "Npm 'version':"
-Write-Host (npm version 2>&1)
+& npm version
+
+npm config set loglevel error
 
 #
 # Install the npms for the 'server'.
@@ -370,13 +358,12 @@ $npmServerArgs = @{
   commands = $toolCmds
   shrinkwrap = $True
 }
-
 Add-NpmModulesFromJsBundleFile @npmServerArgs
 
 # These are used by the Meteor tool bundler and written to the Meteor build.
 # For information, see the 'ServerTarget' class in tools/isobuild/bundler.js,
 # and look for 'serverPkgJson' and 'npm-shrinkwrap.json'
-Write-Host (mkdir -Force "${DIR}\etc" 2>&1)
+mkdir -Force "${DIR}\etc"
 Move-Item $(Join-Path $dirServerLib 'package.json') "${DIR}\etc\"
 Move-Item $(Join-Path $dirServerLib 'npm-shrinkwrap.json') "${DIR}\etc\"
 

From 8a339d19e07c51bf8ee5acbf2c7e40c2212d6794 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 24 Oct 2024 10:37:09 -0400
Subject: [PATCH 0682/1140] bump BUNDLE_VERSION

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 980a2f39f3..1255cd98f7 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.10.0.2
+BUNDLE_VERSION=22.10.0.3
 
 
 # OS Check. Put here because here is where we download the precompiled

From 72d97338e80631eb012e3da14dbaca80d13eda8f Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 24 Oct 2024 11:04:20 -0400
Subject: [PATCH 0683/1140] stop removing package json

---
 scripts/generate-dev-bundle.ps1 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index bd7d5b11c1..f96509b205 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -377,10 +377,6 @@ $npmToolArgs = @{
 }
 Add-NpmModulesFromJsBundleFile @npmToolArgs
 
-# Leaving these probably doesn't hurt, but are removed for consistency w/ Unix.
-Remove-Item $(Join-Path $dirLib 'package.json')
-Remove-Item $(Join-Path $dirLib 'package-lock.json')
-
 Write-Host "Done writing node_modules build(s)..." -ForegroundColor Magenta
 
 Write-Host "Removing temp scratch $dirTemp" -ForegroundColor Magenta

From 78abdfbbe1c5376ab6b566836ebd2d3e986e06c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Oct 2024 17:28:07 +0200
Subject: [PATCH 0684/1140] upgrade mongo driver 5

---
 packages/npm-mongo/package.js |  2 +-
 tools/runners/run-mongo.js    | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index ed72c6995a..90ae96463d 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -8,7 +8,7 @@ Package.describe({
 });
 
 Npm.depends({
-  mongodb: "4.17.2",
+  mongodb: "5.0.0",
 });
 
 Package.onUse(function (api) {
diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index ea319eb0de..b3e397e156 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -448,11 +448,13 @@ var launchMongo = async function(options) {
   var yieldingMethod = async function(object, methodName, ...args) {
     return await Promise.race([
       stopPromise,
-      new Promise((resolve, reject) => {
-        object[methodName](...args, (err, res) => {
-          err ? reject(err) : resolve(res);
-        });
-      }),
+      (async () => {
+        try {
+          return await object[methodName](...args);
+        } catch (e) {
+          throw e;
+        }
+      })(),
     ]);
   };
 

From f77ef7305d568c1f7698c69bde993a1b11381565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Oct 2024 17:52:13 +0200
Subject: [PATCH 0685/1140] simplify

---
 tools/runners/run-mongo.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index b3e397e156..f96a126562 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -448,13 +448,7 @@ var launchMongo = async function(options) {
   var yieldingMethod = async function(object, methodName, ...args) {
     return await Promise.race([
       stopPromise,
-      (async () => {
-        try {
-          return await object[methodName](...args);
-        } catch (e) {
-          throw e;
-        }
-      })(),
+      object[methodName](...args),
     ]);
   };
 

From 48611c5e3d25f98ec6bdbdce639af6fa4a6787a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 24 Oct 2024 18:25:07 +0200
Subject: [PATCH 0686/1140] use proper mongoid since old format completely
 removed from deprecation

---
 packages/mongo/mongo_common.js     | 6 +++---
 packages/mongo/mongo_connection.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/mongo/mongo_common.js b/packages/mongo/mongo_common.js
index df3da556b9..9e1c95a768 100644
--- a/packages/mongo/mongo_common.js
+++ b/packages/mongo/mongo_common.js
@@ -78,7 +78,7 @@ export const replaceMeteorAtomWithMongo = function (document) {
     return document;
   }
   if (document instanceof Mongo.ObjectID) {
-    return new MongoDB.ObjectID(document.toHexString());
+    return new MongoDB.ObjectId(document.toHexString());
   }
   if (document instanceof MongoDB.Timestamp) {
     // For now, the Meteor representation of a Mongo timestamp type (not a date!
@@ -128,7 +128,7 @@ export const replaceMongoAtomWithMeteor = function (document) {
     var buffer = document.value(true);
     return new Uint8Array(buffer);
   }
-  if (document instanceof MongoDB.ObjectID) {
+  if (document instanceof MongoDB.ObjectId) {
     return new Mongo.ObjectID(document.toHexString());
   }
   if (document instanceof MongoDB.Decimal128) {
@@ -162,4 +162,4 @@ export function replaceNames(filter, thing) {
     return ret;
   }
   return thing;
-}
\ No newline at end of file
+}
diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
index bd28301218..47e0f91f75 100644
--- a/packages/mongo/mongo_connection.js
+++ b/packages/mongo/mongo_connection.js
@@ -412,7 +412,7 @@ MongoConnection.prototype.updateAsync = async function (collection_name, selecto
           if (options.upsert && meteorResult.insertedId) {
             if (knownId) {
               meteorResult.insertedId = knownId;
-            } else if (meteorResult.insertedId instanceof MongoDB.ObjectID) {
+            } else if (meteorResult.insertedId instanceof MongoDB.ObjectId) {
               meteorResult.insertedId = new Mongo.ObjectID(meteorResult.insertedId.toHexString());
             }
           }

From f969ab9bb4d23a78b574df06be3ce8baae714afe Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 25 Oct 2024 09:44:46 -0400
Subject: [PATCH 0687/1140] fix unsetting method invocation

---
 packages/ddp-server/livedata_server.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index a79d0febf2..cd7a24094c 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -1794,7 +1794,6 @@ Object.assign(Server.prototype, {
     const options = args[0]?.hasOwnProperty('returnStubValue')
       ? args.shift()
       : {};
-    DDP._CurrentMethodInvocation._set();
     DDP._CurrentMethodInvocation._setCallAsyncMethodRunning(true);
     const promise = new Promise((resolve, reject) => {
       DDP._CurrentCallAsyncInvocation._set({ name, hasCallAsyncParent: true });

From b0056152898ee0a606d39c4e7e40453a3e9178d3 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 25 Oct 2024 09:55:07 -0400
Subject: [PATCH 0688/1140] add sleep

---
 packages/meteor/async_helpers.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/meteor/async_helpers.js b/packages/meteor/async_helpers.js
index fc1175d9c0..4d7a9be8ba 100644
--- a/packages/meteor/async_helpers.js
+++ b/packages/meteor/async_helpers.js
@@ -171,3 +171,5 @@ const _sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 Meteor._sleepForMs = function (ms) {
   return _sleep(ms);
 };
+
+Meteor.sleep = _sleep;
\ No newline at end of file

From e7996a15736a6b6ff31087e79b62a3eab216be1c Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 25 Oct 2024 15:49:48 -0400
Subject: [PATCH 0689/1140] upgrade rimraf

---
 .../meteor-node-stubs/package-lock.json       | 509 +++++++++++++++---
 npm-packages/meteor-node-stubs/package.json   |   2 +-
 .../meteor-node-stubs/scripts/build-deps.js   |  24 +-
 3 files changed, 458 insertions(+), 77 deletions(-)

diff --git a/npm-packages/meteor-node-stubs/package-lock.json b/npm-packages/meteor-node-stubs/package-lock.json
index 4fba62f619..5aaceb662e 100644
--- a/npm-packages/meteor-node-stubs/package-lock.json
+++ b/npm-packages/meteor-node-stubs/package-lock.json
@@ -60,7 +60,24 @@
         "vm-browserify": "^1.1.2"
       },
       "devDependencies": {
-        "rimraf": "^2.7.1"
+        "rimraf": "^5.0.10"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/@meteorjs/crypto-browserify": {
@@ -102,6 +119,40 @@
         "node": ">=4"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/asn1.js": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
@@ -177,13 +228,12 @@
       "inBundle": true
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/brorand": {
@@ -390,10 +440,22 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/console-browserify": {
@@ -457,6 +519,20 @@
         "sha.js": "^2.4.8"
       }
     },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/define-data-property": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
@@ -531,6 +607,12 @@
         "url": "https://bevry.me/fund"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "node_modules/elliptic": {
       "version": "6.5.7",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
@@ -553,6 +635,12 @@
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "inBundle": true
     },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
     "node_modules/es-define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
@@ -604,11 +692,21 @@
         "is-callable": "^1.1.3"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
@@ -640,20 +738,20 @@
       }
     },
     "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": "*"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -796,16 +894,6 @@
       ],
       "inBundle": true
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -840,6 +928,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-generator-function": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
@@ -892,6 +989,33 @@
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "inBundle": true
     },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
     "node_modules/md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -935,15 +1059,27 @@
       "inBundle": true
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/object-inspect": {
@@ -1002,21 +1138,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
     "node_modules/os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
       "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
       "inBundle": true
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true
+    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -1059,13 +1192,29 @@
       "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
       "inBundle": true
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/pbkdf2": {
@@ -1184,15 +1333,18 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
       "dev": true,
       "dependencies": {
-        "glob": "^7.1.3"
+        "glob": "^10.3.7"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/ripemd160": {
@@ -1262,6 +1414,27 @@
         "sha.js": "bin.js"
       }
     },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
@@ -1281,6 +1454,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/stream-browserify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
@@ -1312,6 +1497,102 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/timers-browserify": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
@@ -1369,6 +1650,21 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
       "inBundle": true
     },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/which-typed-array": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
@@ -1388,12 +1684,97 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index 2068c222c4..f273654023 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -62,7 +62,7 @@
     "vm-browserify"
   ],
   "devDependencies": {
-    "rimraf": "^2.7.1"
+    "rimraf": "^5.0.10"
   },
   "repository": {
     "type": "git",
diff --git a/npm-packages/meteor-node-stubs/scripts/build-deps.js b/npm-packages/meteor-node-stubs/scripts/build-deps.js
index e85d8d7c1f..7c6808f6ec 100644
--- a/npm-packages/meteor-node-stubs/scripts/build-deps.js
+++ b/npm-packages/meteor-node-stubs/scripts/build-deps.js
@@ -2,6 +2,7 @@ var fs = require("fs");
 var path = require("path");
 var depsDir = path.join(__dirname, "..", "deps");
 var map = require("../map.json");
+var rr = require("rimraf");
 
 // Each file in the `deps` directory expresses the dependencies of a stub.
 // For example, `deps/http.js` calls `require("http-browserify")` to
@@ -14,16 +15,15 @@ var map = require("../map.json");
 // bundled. Note that these modules should not be `require`d at runtime,
 // but merely scanned at bundling time.
 
-fs.mkdir(depsDir, function () {
-  require("rimraf")("deps/*.js", function (error) {
-    if (error) throw error;
-    Object.keys(map).forEach(function (id) {
-      fs.writeFileSync(
-        path.join(depsDir, id + ".js"),
-        typeof map[id] === "string"
-          ? "require(" + JSON.stringify(map[id]) + ");\n"
-          : ""
-      );
-    });
-  });
+rr.rimrafSync(depsDir);
+
+fs.mkdirSync(depsDir);
+
+Object.keys(map).forEach(function (id) {
+  fs.writeFileSync(
+    path.join(depsDir, id + ".js"),
+    typeof map[id] === "string"
+      ? "require(" + JSON.stringify(map[id]) + ");\n"
+      : ""
+  );
 });

From 873c68966b2603df7deeb6eef5e7e658bfaca5fa Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 09:07:32 -0400
Subject: [PATCH 0690/1140] remove underscore

---
 packages/mongo/asynchronous_cursor.js | 4 ++--
 packages/mongo/package.js             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/mongo/asynchronous_cursor.js b/packages/mongo/asynchronous_cursor.js
index d18dba5faf..355a096ecf 100644
--- a/packages/mongo/asynchronous_cursor.js
+++ b/packages/mongo/asynchronous_cursor.js
@@ -52,7 +52,7 @@ export class AsynchronousCursor {
       if (!doc) return null;
       doc = replaceTypes(doc, replaceMongoAtomWithMeteor);
 
-      if (!this._cursorDescription.options.tailable && _.has(doc, '_id')) {
+      if (!this._cursorDescription.options.tailable && '_id' in doc) {
         // Did Mongo give us duplicate documents in the same cursor? If so,
         // ignore this one. (Do this before the transform, since transform might
         // return some unrelated value.) We don't do this for tailable cursors,
@@ -127,7 +127,7 @@ export class AsynchronousCursor {
   }
 
   fetch() {
-    return this.map(_.identity);
+    return this.map(doc => doc);
   }
 
   /**
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 43a4d6f816..d6f813024b 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -19,7 +19,6 @@ Npm.depends({
   "lodash.has": "4.5.2",
   "lodash.throttle": "4.1.1",
   "lodash.once": "4.1.1",
-  "lodash.identity": "3.0.0",
   "lodash.isobject": "3.0.2",
   "lodash.clone": "4.5.0"
 });

From f9dc467b5835e72ade1e83ebb0c10d051bdf0e0c Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 09:12:57 -0400
Subject: [PATCH 0691/1140] fix file added back

---
 packages/mongo/observe_multiplex.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 packages/mongo/observe_multiplex.js

diff --git a/packages/mongo/observe_multiplex.js b/packages/mongo/observe_multiplex.js
deleted file mode 100644
index e69de29bb2..0000000000

From 2060b41c5b6db27196e06ae403d82ec81c311d3e Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 09:46:53 -0400
Subject: [PATCH 0692/1140] refactor cursor to typescript

---
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 .../email/.npm/package/npm-shrinkwrap.json    |   6 +-
 packages/mongo/asynchronous_cursor.js         |   2 +-
 packages/mongo/cursor.js                      | 147 ------------------
 packages/mongo/cursor.ts                      | 125 +++++++++++++++
 packages/mongo/cursor_description.ts          |   9 ++
 packages/mongo/observe_handle.ts              |   6 +-
 packages/mongo/observe_multiplex.ts           |   6 +
 packages/mongo/oplog_observe_driver.js        |  20 ++-
 packages/mongo/package.js                     |   5 +
 packages/mongo/polling_observe_driver.js      |  10 ++
 packages/mongo/types.ts                       |   6 +
 12 files changed, 188 insertions(+), 160 deletions(-)
 delete mode 100644 packages/mongo/cursor.js
 create mode 100644 packages/mongo/cursor.ts
 create mode 100644 packages/mongo/types.ts

diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
index 231870d16f..17d5ae8af2 100644
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
-      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
+      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg=="
     },
     "@types/notp": {
       "version": "2.0.5",
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index 5aecda5383..662abdbb5a 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
-      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
+      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg=="
     },
     "@types/nodemailer": {
       "version": "6.4.14",
diff --git a/packages/mongo/asynchronous_cursor.js b/packages/mongo/asynchronous_cursor.js
index 355a096ecf..4e51ebdde1 100644
--- a/packages/mongo/asynchronous_cursor.js
+++ b/packages/mongo/asynchronous_cursor.js
@@ -5,7 +5,7 @@ import { replaceMongoAtomWithMeteor, replaceTypes } from './mongo_common';
  * This is just a light wrapper for the cursor. The goal here is to ensure compatibility even if
  * there are breaking changes on the MongoDB driver.
  *
- * @constructor
+ * This is an internal implementation detail and is created lazily by the main Cursor class.
  */
 export class AsynchronousCursor {
   constructor(dbCursor, cursorDescription, options) {
diff --git a/packages/mongo/cursor.js b/packages/mongo/cursor.js
deleted file mode 100644
index cc6826c616..0000000000
--- a/packages/mongo/cursor.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// CURSORS
-
-// There are several classes which relate to cursors:
-//
-// CursorDescription represents the arguments used to construct a cursor:
-// collectionName, selector, and (find) options.  Because it is used as a key
-// for cursor de-dup, everything in it should either be JSON-stringifiable or
-// not affect observeChanges output (eg, options.transform functions are not
-// stringifiable but do not affect observeChanges).
-//
-// SynchronousCursor is a wrapper around a MongoDB cursor
-// which includes fully-synchronous versions of forEach, etc.
-//
-// Cursor is the cursor object returned from find(), which implements the
-// documented Mongo.Collection cursor API.  It wraps a CursorDescription and a
-// SynchronousCursor (lazily: it doesn't contact Mongo until you call a method
-// like fetch or forEach on it).
-//
-// ObserveHandle is the "observe handle" returned from observeChanges. It has a
-// reference to an ObserveMultiplexer.
-//
-// ObserveMultiplexer allows multiple identical ObserveHandles to be driven by a
-// single observe driver.
-//
-// There are two "observe drivers" which drive ObserveMultiplexers:
-//   - PollingObserveDriver caches the results of a query and reruns it when
-//     necessary.
-//   - OplogObserveDriver follows the Mongo operation log to directly observe
-//     database changes.
-// Both implementations follow the same simple interface: when you create them,
-// they start sending observeChanges callbacks (and a ready() invocation) to
-// their ObserveMultiplexer, and you stop them by calling their stop() method.
-
-import { ASYNC_CURSOR_METHODS, getAsyncMethodName } from 'meteor/minimongo/constants';
-import { replaceMeteorAtomWithMongo, replaceTypes } from './mongo_common';
-import LocalCollection from 'meteor/minimongo/local_collection';
-
-export const Cursor = function (mongo, cursorDescription) {
-  var self = this;
-
-  self._mongo = mongo;
-  self._cursorDescription = cursorDescription;
-  self._synchronousCursor = null;
-};
-
-Cursor.prototype.countAsync = async function () {
-  const collection = this._mongo.rawCollection(this._cursorDescription.collectionName);
-  return await collection.countDocuments(
-    replaceTypes(this._cursorDescription.selector, replaceMeteorAtomWithMongo),
-    replaceTypes(this._cursorDescription.options, replaceMeteorAtomWithMongo),
-  );
-};
-
-Cursor.prototype.count = function () {
-  throw new Error(
-    "count() is not available on the server. Please use countAsync() instead."
-  );
-};
-
-[...ASYNC_CURSOR_METHODS, Symbol.iterator, Symbol.asyncIterator].forEach(methodName => {
-  // count is handled specially since we don't want to create a cursor.
-  // it is still included in ASYNC_CURSOR_METHODS because we still want an async version of it to exist.
-  if (methodName === 'count') {
-    return
-  }
-  Cursor.prototype[methodName] = function (...args) {
-    const cursor = setupAsynchronousCursor(this, methodName);
-    return cursor[methodName](...args);
-  };
-
-  // These methods are handled separately.
-  if (methodName === Symbol.iterator || methodName === Symbol.asyncIterator) {
-    return;
-  }
-
-  const methodNameAsync = getAsyncMethodName(methodName);
-  Cursor.prototype[methodNameAsync] = function (...args) {
-    try {
-      return Promise.resolve(this[methodName](...args));
-    } catch (error) {
-      return Promise.reject(error);
-    }
-  };
-});
-
-Cursor.prototype.getTransform = function () {
-  return this._cursorDescription.options.transform;
-};
-
-// When you call Meteor.publish() with a function that returns a Cursor, we need
-// to transmute it into the equivalent subscription.  This is the function that
-// does that.
-Cursor.prototype._publishCursor = function (sub) {
-  var self = this;
-  var collection = self._cursorDescription.collectionName;
-  return Mongo.Collection._publishCursor(self, sub, collection);
-};
-
-// Used to guarantee that publish functions return at most one cursor per
-// collection. Private, because we might later have cursors that include
-// documents from multiple collections somehow.
-Cursor.prototype._getCollectionName = function () {
-  var self = this;
-  return self._cursorDescription.collectionName;
-};
-
-Cursor.prototype.observe = function (callbacks) {
-  var self = this;
-  return LocalCollection._observeFromObserveChanges(self, callbacks);
-};
-
-Cursor.prototype.observeAsync = function (callbacks) {
-  return new Promise(resolve => resolve(this.observe(callbacks)));
-};
-
-Cursor.prototype.observeChanges = function (callbacks, options = {}) {
-  var self = this;
-
-  var ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
-
-  return self._mongo._observeChanges(
-    self._cursorDescription, ordered, callbacks, options.nonMutatingCallbacks);
-};
-
-Cursor.prototype.observeChangesAsync = async function (callbacks, options = {}) {
-  return this.observeChanges(callbacks, options);
-};
-
-function setupAsynchronousCursor(cursor, method) {
-  // You can only observe a tailable cursor.
-  if (cursor._cursorDescription.options.tailable)
-    throw new Error('Cannot call ' + method + ' on a tailable cursor');
-
-  if (!cursor._synchronousCursor) {
-    cursor._synchronousCursor = cursor._mongo._createAsynchronousCursor(
-      cursor._cursorDescription,
-      {
-        // Make sure that the "cursor" argument to forEach/map callbacks is the
-        // Cursor, not the SynchronousCursor.
-        selfForIteration: cursor,
-        useTransform: true,
-      }
-    );
-  }
-
-  return cursor._synchronousCursor;
-}
\ No newline at end of file
diff --git a/packages/mongo/cursor.ts b/packages/mongo/cursor.ts
new file mode 100644
index 0000000000..b6013aa869
--- /dev/null
+++ b/packages/mongo/cursor.ts
@@ -0,0 +1,125 @@
+import { ASYNC_CURSOR_METHODS, getAsyncMethodName } from 'meteor/minimongo/constants';
+import { replaceMeteorAtomWithMongo, replaceTypes } from './mongo_common';
+import LocalCollection from 'meteor/minimongo/local_collection';
+import { CursorDescription } from './cursor_description';
+import { ObserveCallbacks } from './types';
+
+interface MongoInterface {
+  rawCollection: (collectionName: string) => any;
+  _createAsynchronousCursor: (cursorDescription: CursorDescription, options: CursorOptions) => any;
+  _observeChanges: (cursorDescription: CursorDescription, ordered: boolean, callbacks: any, nonMutatingCallbacks?: boolean) => any;
+}
+
+interface CursorOptions {
+  selfForIteration: Cursor;
+  useTransform: boolean;
+}
+
+/**
+ * @class Cursor
+ *
+ * The main cursor object returned from find(), implementing the documented
+ * Mongo.Collection cursor API.
+ *
+ * Wraps a CursorDescription and lazily creates an AsynchronousCursor
+ * (only contacts MongoDB when methods like fetch or forEach are called).
+ */
+export class Cursor {
+  public _mongo: MongoInterface;
+  public _cursorDescription: CursorDescription;
+  public _synchronousCursor: any | null;
+
+  constructor(mongo: MongoInterface, cursorDescription: CursorDescription) {
+    this._mongo = mongo;
+    this._cursorDescription = cursorDescription;
+    this._synchronousCursor = null;
+  }
+
+  async countAsync(): Promise<number> {
+    const collection = this._mongo.rawCollection(this._cursorDescription.collectionName);
+    return await collection.countDocuments(
+      replaceTypes(this._cursorDescription.selector, replaceMeteorAtomWithMongo),
+      replaceTypes(this._cursorDescription.options, replaceMeteorAtomWithMongo),
+    );
+  }
+
+  count(): never {
+    throw new Error(
+      "count() is not available on the server. Please use countAsync() instead."
+    );
+  }
+
+  getTransform(): ((doc: any) => any) | undefined {
+    return this._cursorDescription.options.transform;
+  }
+
+  _publishCursor(sub: any): any {
+    const collection = this._cursorDescription.collectionName;
+    return Mongo.Collection._publishCursor(this, sub, collection);
+  }
+
+  _getCollectionName(): string {
+    return this._cursorDescription.collectionName;
+  }
+
+  observe(callbacks: ObserveCallbacks): any {
+    return LocalCollection._observeFromObserveChanges(this, callbacks);
+  }
+
+  async observeAsync(callbacks: ObserveCallbacks): Promise<any> {
+    return new Promise(resolve => resolve(this.observe(callbacks)));
+  }
+
+  observeChanges(callbacks: ObserveCallbacks, options: { nonMutatingCallbacks?: boolean } = {}): any {
+    const ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
+    return this._mongo._observeChanges(
+      this._cursorDescription,
+      ordered,
+      callbacks,
+      options.nonMutatingCallbacks
+    );
+  }
+
+  async observeChangesAsync(callbacks: ObserveCallbacks, options: { nonMutatingCallbacks?: boolean } = {}): Promise<any> {
+    return this.observeChanges(callbacks, options);
+  }
+}
+
+// Add cursor methods dynamically
+[...ASYNC_CURSOR_METHODS, Symbol.iterator, Symbol.asyncIterator].forEach(methodName => {
+  if (methodName === 'count') return;
+
+  (Cursor.prototype as any)[methodName] = function(this: Cursor, ...args: any[]): any {
+    const cursor = setupAsynchronousCursor(this, methodName);
+    return cursor[methodName](...args);
+  };
+
+  if (methodName === Symbol.iterator || methodName === Symbol.asyncIterator) return;
+
+  const methodNameAsync = getAsyncMethodName(methodName);
+  (Cursor.prototype as any)[methodNameAsync] = function(this: Cursor, ...args: any[]): Promise<any> {
+    try {
+      return Promise.resolve(this[methodName](...args));
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  };
+});
+
+function setupAsynchronousCursor(cursor: Cursor, method: string | symbol): any {
+  if (cursor._cursorDescription.options.tailable) {
+    throw new Error(`Cannot call ${String(method)} on a tailable cursor`);
+  }
+
+  if (!cursor._synchronousCursor) {
+    cursor._synchronousCursor = cursor._mongo._createAsynchronousCursor(
+      cursor._cursorDescription,
+      {
+        selfForIteration: cursor,
+        useTransform: true,
+      }
+    );
+  }
+
+  return cursor._synchronousCursor;
+}
\ No newline at end of file
diff --git a/packages/mongo/cursor_description.ts b/packages/mongo/cursor_description.ts
index 3efa18b56f..4a5e873828 100644
--- a/packages/mongo/cursor_description.ts
+++ b/packages/mongo/cursor_description.ts
@@ -7,8 +7,17 @@ interface CursorOptions {
   disableOplog?: boolean;
   _disableOplog?: boolean;
   tailable?: boolean;
+  transform?: (doc: any) => any;
 }
 
+/**
+ * Represents the arguments used to construct a cursor.
+ * Used as a key for cursor de-duplication.
+ *
+ * All properties must be either:
+ * - JSON-stringifiable, or
+ * - Not affect observeChanges output (e.g., options.transform functions)
+ */
 export class CursorDescription {
   collectionName: string;
   selector: Record<string, any>;
diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index 418ea8e701..b2d1924088 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -4,7 +4,11 @@ let nextObserveHandleId = 1;
 
 export type ObserveHandleCallbackInternal = '_added' | '_addedBefore' | '_changed' | '_movedBefore' | '_removed';
 
-// When the callbacks do not mutate the arguments, we can skip a lot of data clones
+/**
+ * The "observe handle" returned from observeChanges.
+ * Contains a reference to an ObserveMultiplexer.
+ * Used to stop observation and clean up resources.
+ */
 export class ObserveHandle {
   _id: number;
   _multiplexer: ObserveMultiplexer;
diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index 08ec4a628d..559c983ab1 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -8,6 +8,12 @@ interface ObserveMultiplexerOptions {
 
 export type ObserveHandleCallback = 'added' | 'addedBefore' | 'changed' | 'movedBefore' | 'removed';
 
+/**
+ * Allows multiple identical ObserveHandles to be driven by a single observe driver.
+ *
+ * This optimization ensures that multiple identical observations
+ * don't result in duplicate database queries.
+ */
 export class ObserveMultiplexer {
   private readonly _ordered: boolean;
   private readonly _onStop: () => void;
diff --git a/packages/mongo/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js
index c9724c4b7e..c857a14f48 100644
--- a/packages/mongo/oplog_observe_driver.js
+++ b/packages/mongo/oplog_observe_driver.js
@@ -30,11 +30,21 @@ var finishIfNeedToPollQuery = function (f) {
 
 var currentId = 0;
 
-// OplogObserveDriver is an alternative to PollingObserveDriver which follows
-// the Mongo operation log instead of just re-polling the query. It obeys the
-// same simple interface: constructing it starts sending observeChanges
-// callbacks (and a ready() invocation) to the ObserveMultiplexer, and you stop
-// it by calling the stop() method.
+/**
+ * @class OplogObserveDriver
+ * An alternative to PollingObserveDriver which follows the MongoDB operation log
+ * instead of re-polling the query.
+ *
+ * Characteristics:
+ * - Follows the MongoDB operation log
+ * - Directly observes database changes
+ * - More efficient than polling for most use cases
+ * - Requires access to MongoDB oplog
+ *
+ * Interface:
+ * - Construction initiates observeChanges callbacks and ready() invocation to the ObserveMultiplexer
+ * - Observation can be terminated via the stop() method
+ */
 export const OplogObserveDriver = function (options) {
   const self = this;
   self._usesOplog = true;  // tests look at this
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index d6f813024b..05f996fcf8 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -91,6 +91,11 @@ Package.onUse(function (api) {
       "polling_observe_driver.js",
       "oplog_observe_driver.js",
       "oplog_v2_converter.js",
+      "cursor_description.js",
+      "mongo_connection.js",
+      "mongo_common.js",
+      "asynchronous_cursor.js",
+      "cursor.js",
     ],
     "server"
   );
diff --git a/packages/mongo/polling_observe_driver.js b/packages/mongo/polling_observe_driver.js
index 8615e6930e..aff2463426 100644
--- a/packages/mongo/polling_observe_driver.js
+++ b/packages/mongo/polling_observe_driver.js
@@ -4,6 +4,16 @@ import { listenAll } from './mongo_driver';
 var POLLING_THROTTLE_MS = +process.env.METEOR_POLLING_THROTTLE_MS || 50;
 var POLLING_INTERVAL_MS = +process.env.METEOR_POLLING_INTERVAL_MS || 10 * 1000;
 
+/**
+ * @class PollingObserveDriver
+ *
+ * One of two observe driver implementations.
+ *
+ * Characteristics:
+ * - Caches the results of a query
+ * - Reruns the query when necessary
+ * - Suitable for cases where oplog tailing is not available or practical
+ */
 export const PollingObserveDriver = function (options) {
   const self = this;
   self._options = options;
diff --git a/packages/mongo/types.ts b/packages/mongo/types.ts
new file mode 100644
index 0000000000..8db460d597
--- /dev/null
+++ b/packages/mongo/types.ts
@@ -0,0 +1,6 @@
+export interface ObserveCallbacks {
+  added?: (document: any) => void;
+  changed?: (newDocument: any, oldDocument: any) => void;
+  removed?: (oldDocument: any) => void;
+  [key: string]: any;
+}
\ No newline at end of file

From 7f9d192fbf18722644b9ff30fa122232c0c8eaaf Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 09:52:55 -0400
Subject: [PATCH 0693/1140] rename extensions

---
 packages/mongo/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 05f996fcf8..d427e89320 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -91,11 +91,11 @@ Package.onUse(function (api) {
       "polling_observe_driver.js",
       "oplog_observe_driver.js",
       "oplog_v2_converter.js",
-      "cursor_description.js",
+      "cursor_description.ts",
       "mongo_connection.js",
       "mongo_common.js",
       "asynchronous_cursor.js",
-      "cursor.js",
+      "cursor.ts",
     ],
     "server"
   );

From 04c542aa2be3e2cf3714f9337a81752bf9f81f99 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 09:58:18 -0400
Subject: [PATCH 0694/1140] move tests

---
 packages/mongo/package.js                      | 18 +++++++++---------
 packages/mongo/{ => tests}/allow_tests.js      |  0
 .../{ => tests}/collection_async_tests.js      |  0
 packages/mongo/{ => tests}/collection_tests.js |  0
 .../mongo/{ => tests}/doc_fetcher_tests.js     |  2 +-
 .../mongo/{ => tests}/mongo_livedata_tests.js  |  2 +-
 .../mongo/{ => tests}/observe_changes_tests.js |  0
 packages/mongo/{ => tests}/oplog_tests.js      |  0
 .../{ => tests}/oplog_v2_converter_tests.js    |  2 +-
 .../{ => tests}/upsert_compatibility_test.js   |  0
 10 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/mongo/{ => tests}/allow_tests.js (100%)
 rename packages/mongo/{ => tests}/collection_async_tests.js (100%)
 rename packages/mongo/{ => tests}/collection_tests.js (100%)
 rename packages/mongo/{ => tests}/doc_fetcher_tests.js (96%)
 rename packages/mongo/{ => tests}/mongo_livedata_tests.js (99%)
 rename packages/mongo/{ => tests}/observe_changes_tests.js (100%)
 rename packages/mongo/{ => tests}/oplog_tests.js (100%)
 rename packages/mongo/{ => tests}/oplog_v2_converter_tests.js (98%)
 rename packages/mongo/{ => tests}/upsert_compatibility_test.js (100%)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index d427e89320..26562fa790 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -115,13 +115,13 @@ Package.onTest(function (api) {
            'ddp', 'base64', 'typescript']);
   // XXX test order dependency: the allow_tests "partial allow" test
   // fails if it is run before mongo_livedata_tests.
-  api.addFiles("mongo_livedata_tests.js", ["client", "server"]);
-  api.addFiles("upsert_compatibility_test.js", "server");
-  api.addFiles("allow_tests.js", ["client", "server"]);
-  api.addFiles("collection_tests.js", ["client", "server"]);
-  api.addFiles("collection_async_tests.js", ["client", "server"]);
-  api.addFiles("observe_changes_tests.js", ["client", "server"]);
-  api.addFiles("oplog_tests.js", "server");
-  api.addFiles("oplog_v2_converter_tests.js", "server");
-  api.addFiles("doc_fetcher_tests.js", "server");
+  api.addFiles("tests/mongo_livedata_tests.js", ["client", "server"]);
+  api.addFiles("tests/upsert_compatibility_test.js", "server");
+  api.addFiles("tests/allow_tests.js", ["client", "server"]);
+  api.addFiles("tests/collection_tests.js", ["client", "server"]);
+  api.addFiles("tests/collection_async_tests.js", ["client", "server"]);
+  api.addFiles("tests/observe_changes_tests.js", ["client", "server"]);
+  api.addFiles("tests/oplog_tests.js", "server");
+  api.addFiles("tests/oplog_v2_converter_tests.js", "server");
+  api.addFiles("tests/doc_fetcher_tests.js", "server");
 });
diff --git a/packages/mongo/allow_tests.js b/packages/mongo/tests/allow_tests.js
similarity index 100%
rename from packages/mongo/allow_tests.js
rename to packages/mongo/tests/allow_tests.js
diff --git a/packages/mongo/collection_async_tests.js b/packages/mongo/tests/collection_async_tests.js
similarity index 100%
rename from packages/mongo/collection_async_tests.js
rename to packages/mongo/tests/collection_async_tests.js
diff --git a/packages/mongo/collection_tests.js b/packages/mongo/tests/collection_tests.js
similarity index 100%
rename from packages/mongo/collection_tests.js
rename to packages/mongo/tests/collection_tests.js
diff --git a/packages/mongo/doc_fetcher_tests.js b/packages/mongo/tests/doc_fetcher_tests.js
similarity index 96%
rename from packages/mongo/doc_fetcher_tests.js
rename to packages/mongo/tests/doc_fetcher_tests.js
index 0a68752467..af6dee5c1e 100644
--- a/packages/mongo/doc_fetcher_tests.js
+++ b/packages/mongo/tests/doc_fetcher_tests.js
@@ -1,4 +1,4 @@
-import { DocFetcher } from './doc_fetcher.js';
+import { DocFetcher } from '../doc_fetcher.js';
 
 testAsyncMulti('mongo-livedata - doc fetcher', [
   async function(test, expect) {
diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
similarity index 99%
rename from packages/mongo/mongo_livedata_tests.js
rename to packages/mongo/tests/mongo_livedata_tests.js
index 13d868b6ec..5e9fc0a636 100644
--- a/packages/mongo/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -1,6 +1,6 @@
 import isObject from 'lodash.isobject';
 import times from 'lodash.times';
-import { ObserveMultiplexer } from './observe_multiplex';
+import { ObserveMultiplexer } from '../observe_multiplex';
 
 // This is a magic collection that fails its writes on the server when
 // the selector (or inserted document) contains fail: true.
diff --git a/packages/mongo/observe_changes_tests.js b/packages/mongo/tests/observe_changes_tests.js
similarity index 100%
rename from packages/mongo/observe_changes_tests.js
rename to packages/mongo/tests/observe_changes_tests.js
diff --git a/packages/mongo/oplog_tests.js b/packages/mongo/tests/oplog_tests.js
similarity index 100%
rename from packages/mongo/oplog_tests.js
rename to packages/mongo/tests/oplog_tests.js
diff --git a/packages/mongo/oplog_v2_converter_tests.js b/packages/mongo/tests/oplog_v2_converter_tests.js
similarity index 98%
rename from packages/mongo/oplog_v2_converter_tests.js
rename to packages/mongo/tests/oplog_v2_converter_tests.js
index 89c95c5587..1c0d3a015b 100644
--- a/packages/mongo/oplog_v2_converter_tests.js
+++ b/packages/mongo/tests/oplog_v2_converter_tests.js
@@ -1,4 +1,4 @@
-import { oplogV2V1Converter } from './oplog_v2_converter';
+import { oplogV2V1Converter } from '../oplog_v2_converter';
 
 const cases = [
   [
diff --git a/packages/mongo/upsert_compatibility_test.js b/packages/mongo/tests/upsert_compatibility_test.js
similarity index 100%
rename from packages/mongo/upsert_compatibility_test.js
rename to packages/mongo/tests/upsert_compatibility_test.js

From cf85b4822c58c7ccde41a28cd464f490f63d3d85 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 10:07:29 -0400
Subject: [PATCH 0695/1140] adjust types

---
 packages/mongo/cursor.ts | 20 ++++++++++----------
 packages/mongo/types.ts  | 26 +++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/packages/mongo/cursor.ts b/packages/mongo/cursor.ts
index b6013aa869..5ac110aa8a 100644
--- a/packages/mongo/cursor.ts
+++ b/packages/mongo/cursor.ts
@@ -2,7 +2,7 @@ import { ASYNC_CURSOR_METHODS, getAsyncMethodName } from 'meteor/minimongo/const
 import { replaceMeteorAtomWithMongo, replaceTypes } from './mongo_common';
 import LocalCollection from 'meteor/minimongo/local_collection';
 import { CursorDescription } from './cursor_description';
-import { ObserveCallbacks } from './types';
+import { ObserveCallbacks, ObserveChangesCallbacks } from './types';
 
 interface MongoInterface {
   rawCollection: (collectionName: string) => any;
@@ -11,7 +11,7 @@ interface MongoInterface {
 }
 
 interface CursorOptions {
-  selfForIteration: Cursor;
+  selfForIteration: Cursor<any>;
   useTransform: boolean;
 }
 
@@ -24,7 +24,7 @@ interface CursorOptions {
  * Wraps a CursorDescription and lazily creates an AsynchronousCursor
  * (only contacts MongoDB when methods like fetch or forEach are called).
  */
-export class Cursor {
+export class Cursor<T, U = T> {
   public _mongo: MongoInterface;
   public _cursorDescription: CursorDescription;
   public _synchronousCursor: any | null;
@@ -62,15 +62,15 @@ export class Cursor {
     return this._cursorDescription.collectionName;
   }
 
-  observe(callbacks: ObserveCallbacks): any {
+  observe(callbacks: ObserveCallbacks<U>): any {
     return LocalCollection._observeFromObserveChanges(this, callbacks);
   }
 
-  async observeAsync(callbacks: ObserveCallbacks): Promise<any> {
+  async observeAsync(callbacks: ObserveCallbacks<U>): Promise<any> {
     return new Promise(resolve => resolve(this.observe(callbacks)));
   }
 
-  observeChanges(callbacks: ObserveCallbacks, options: { nonMutatingCallbacks?: boolean } = {}): any {
+  observeChanges(callbacks: ObserveChangesCallbacks<U>, options: { nonMutatingCallbacks?: boolean } = {}): any {
     const ordered = LocalCollection._observeChangesCallbacksAreOrdered(callbacks);
     return this._mongo._observeChanges(
       this._cursorDescription,
@@ -80,7 +80,7 @@ export class Cursor {
     );
   }
 
-  async observeChangesAsync(callbacks: ObserveCallbacks, options: { nonMutatingCallbacks?: boolean } = {}): Promise<any> {
+  async observeChangesAsync(callbacks: ObserveChangesCallbacks<U>, options: { nonMutatingCallbacks?: boolean } = {}): Promise<any> {
     return this.observeChanges(callbacks, options);
   }
 }
@@ -89,7 +89,7 @@ export class Cursor {
 [...ASYNC_CURSOR_METHODS, Symbol.iterator, Symbol.asyncIterator].forEach(methodName => {
   if (methodName === 'count') return;
 
-  (Cursor.prototype as any)[methodName] = function(this: Cursor, ...args: any[]): any {
+  (Cursor.prototype as any)[methodName] = function(this: Cursor<any>, ...args: any[]): any {
     const cursor = setupAsynchronousCursor(this, methodName);
     return cursor[methodName](...args);
   };
@@ -97,7 +97,7 @@ export class Cursor {
   if (methodName === Symbol.iterator || methodName === Symbol.asyncIterator) return;
 
   const methodNameAsync = getAsyncMethodName(methodName);
-  (Cursor.prototype as any)[methodNameAsync] = function(this: Cursor, ...args: any[]): Promise<any> {
+  (Cursor.prototype as any)[methodNameAsync] = function(this: Cursor<any>, ...args: any[]): Promise<any> {
     try {
       return Promise.resolve(this[methodName](...args));
     } catch (error) {
@@ -106,7 +106,7 @@ export class Cursor {
   };
 });
 
-function setupAsynchronousCursor(cursor: Cursor, method: string | symbol): any {
+function setupAsynchronousCursor(cursor: Cursor<any>, method: string | symbol): any {
   if (cursor._cursorDescription.options.tailable) {
     throw new Error(`Cannot call ${String(method)} on a tailable cursor`);
   }
diff --git a/packages/mongo/types.ts b/packages/mongo/types.ts
index 8db460d597..588630924e 100644
--- a/packages/mongo/types.ts
+++ b/packages/mongo/types.ts
@@ -1,6 +1,22 @@
-export interface ObserveCallbacks {
-  added?: (document: any) => void;
-  changed?: (newDocument: any, oldDocument: any) => void;
-  removed?: (oldDocument: any) => void;
-  [key: string]: any;
+export interface ObserveCallbacks<T> {
+  added?(document: T): void;
+  addedAt?(document: T, atIndex: number, before: T | null): void;
+  changed?(newDocument: T, oldDocument: T): void;
+  changedAt?(newDocument: T, oldDocument: T, indexAt: number): void;
+  removed?(oldDocument: T): void;
+  removedAt?(oldDocument: T, atIndex: number): void;
+  movedTo?(
+    document: T,
+    fromIndex: number,
+    toIndex: number,
+    before: T | null
+  ): void;
+}
+
+export interface ObserveChangesCallbacks<T> {
+  added?(id: string, fields: Partial<T>): void;
+  addedBefore?(id: string, fields: Partial<T>, before: T | null): void;
+  changed?(id: string, fields: Partial<T>): void;
+  movedBefore?(id: string, before: T | null): void;
+  removed?(id: string): void;
 }
\ No newline at end of file

From d9786532ee2543fead125aef16eec56f23c1a77b Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 10:18:10 -0400
Subject: [PATCH 0696/1140] prevent timeout errors from reaching console

---
 packages/mongo/asynchronous_cursor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mongo/asynchronous_cursor.js b/packages/mongo/asynchronous_cursor.js
index 4e51ebdde1..e40491f983 100644
--- a/packages/mongo/asynchronous_cursor.js
+++ b/packages/mongo/asynchronous_cursor.js
@@ -88,6 +88,7 @@ export class AsynchronousCursor {
       .catch((err) => {
         if (err === timeoutErr) {
           this.close();
+          return;
         }
         throw err;
       });

From c1e29e68c8922f261fd13c254d74f3711c225e48 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 10:27:42 -0400
Subject: [PATCH 0697/1140] bump version

---
 npm-packages/meteor-node-stubs/package-lock.json | 4 ++--
 npm-packages/meteor-node-stubs/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/npm-packages/meteor-node-stubs/package-lock.json b/npm-packages/meteor-node-stubs/package-lock.json
index 5aaceb662e..5eb08555a7 100644
--- a/npm-packages/meteor-node-stubs/package-lock.json
+++ b/npm-packages/meteor-node-stubs/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor-node-stubs",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor-node-stubs",
-      "version": "1.2.10",
+      "version": "1.2.11",
       "bundleDependencies": [
         "@meteorjs/crypto-browserify",
         "assert",
diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index f273654023..ca2a123d44 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -2,7 +2,7 @@
   "name": "meteor-node-stubs",
   "author": "Ben Newman <ben@meteor.com>",
   "description": "Stub implementations of Node built-in modules, a la Browserify",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "main": "index.js",
   "license": "MIT",
   "homepage": "https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-node-stubs/README.md",

From f40eac3dc78e3055881809bd1ef36e6c8efd3f52 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 28 Oct 2024 11:53:33 -0400
Subject: [PATCH 0698/1140] - fix for punycode warning - bump BUNDLE_VERSION

---
 meteor                                        |   2 +-
 .../.npm/package/npm-shrinkwrap.json          | 102 +++++++++---------
 scripts/dev-bundle-tool-package.js            |   1 +
 tools/index.js                                |  39 ++++---
 tools/module-alias-setup.js                   |  39 +++++++
 5 files changed, 114 insertions(+), 69 deletions(-)
 create mode 100644 tools/module-alias-setup.js

diff --git a/meteor b/meteor
index 1255cd98f7..ab1a946258 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.10.0.3
+BUNDLE_VERSION=22.10.0.4
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 6c5b66a97b..08e50b8ebe 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,74 +56,74 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.677.0.tgz",
-      "integrity": "sha512-wGhbHAZGa5VeVLCyAfhyFWXl+JfsHSgSl0eodH6xqKoR60LTDJZbBgQZizUwSj8EoSzsglBvgPLYZaLfXTKM/g=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.678.0.tgz",
+      "integrity": "sha512-cSIWC9q3GBFjTzqTZTOHILxWln9YQGce3o7Jx1m4XCN16ITRiliFgiw3rbAc1H1vtYy4LfvymhC55iU80jB+4A=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.677.0.tgz",
-      "integrity": "sha512-/y6EskFhOa2w9VwXaXoyOrGeBjnOj/72wsxDOslS908qH+nf7m40pBK6e/iBelg04vlx0gqhlbfK8hLbaT6KHA=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.678.0.tgz",
+      "integrity": "sha512-5Fg2BkR1En8iBbiZ18STvLDGPK9Re5MyCmX+hfIhQzPsEf1FRkAkOluEXX79aBva8iWn2oCD/xKBUku4x3eusw=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.677.0.tgz",
-      "integrity": "sha512-2zgZkRIU7DsnUVOy+9bjfJ0IYMzi9ONWXQt/WqMa7HOnj4RfenfpipyhHYxGZR5kmehgv53EI79yvUu+SAfGNg=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.678.0.tgz",
+      "integrity": "sha512-sgj9Y4zGiwLePLDjqhGoghoZgseh88JkKkwWH558IIte/cf/ix7ezOvptnA0WUlI5Z/329LtkN6O8TRqSJ7MWw=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.677.0.tgz",
-      "integrity": "sha512-N5fs1GLSthnwrs44b4IJI//dcShuIT42g4pM8FCUJZwbrWn9Sp9F876R1mvb8A9TAy2S4qCXi7TkHS0REnuicQ=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.678.0.tgz",
+      "integrity": "sha512-oRtDnbqIuTbBq0xd7XlaugDA41EqRFzWLpPNr4uwkH8L7xwtIByfJG/qXx2OtOiFFasAhMWJLu/DDqWZyp819A=="
     },
     "@aws-sdk/core": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.677.0.tgz",
-      "integrity": "sha512-5auvc1wmXmd7u9Y9nM95Ia+VX7J2FiZLuADitHqE4mHPH9riDgOY+uK/yM+UKr+lfq4zKiZQG7i8cfabZlCY8g=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.678.0.tgz",
+      "integrity": "sha512-ZTzybFZqSaPQymgRkTl08vk6xilaxr8LnJOc0h3KhcHLK4TJmdOcxqPpa6QxrBKcn2rmxzGiPRbAHLGI+BIxBw=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.677.0.tgz",
-      "integrity": "sha512-ODw8MKhT41KLpKlGIH1yFO2FIOCAW3Nnn2uCu1eAm807aI0OK31ntUNrY+GFzXX7ixv+KFoiJu3ih+w+Oxw5gA=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.678.0.tgz",
+      "integrity": "sha512-t9bgu2Kc0H8FdQsSrkIJ42vis0CaVxUlA0wmmNyh268ZZyT9lKXUmf91QIhWbZ1zHx8Ek2u301xusoIaj4mLHA=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.677.0.tgz",
-      "integrity": "sha512-0ctcqKzclr9TiNIkB8I+YRogjWH/4mLWQGv/bgb8ElHqph+rPy4pOubj1Ax01sbs7XdwDaImjBYV5xXE+BEsYw=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.678.0.tgz",
+      "integrity": "sha512-29uhXAB7uJqHtvJ2U3pi1YkMfv0WefW9EmSMoFAunjudXXBVktwTlWg0lyCM+KHrGKLkQyfs5UF/A9IelS8tdQ=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.677.0.tgz",
-      "integrity": "sha512-c4TnShdzk37dhL1HGGzZ2PDKIIEmo1IbT/4y5hSRdNc8Z8fu6spE5GoeVsv6p/HdSGPS7XTy6aOFCMCk4AeIzQ=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.678.0.tgz",
+      "integrity": "sha512-EvpmP0nc7ddRp0qwJOSu0uBXa+MMk4+OLlyEJcdaHnZI4/BoyVWr5fJUD5eQYZk11LZPZSvnsliYXWwLyVNXHQ=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.677.0.tgz",
-      "integrity": "sha512-hW+oHj5zplPLzTk74LG+gZVOKQnmBPyRIbwg3uZWr23xfOxh/Osu9Wq8qwgu2+UyFHr+6/DRFjZJ6avNA2jpKw=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.678.0.tgz",
+      "integrity": "sha512-8kHy7V5rRO73EpBCUclykP9T/QIBVi0SkQsc88ZRxpdh59/JY2N6DT5khMTzrz9+Vvlw3FDMJN4AI/qWjJHhdw=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.677.0.tgz",
-      "integrity": "sha512-DwFriiDx2SSdj7VhRv/0fm8UIK7isy+WZAlqUdZ9xDsX4x1AD5KwMv9AwGhJrMuTjnPSxRSwjt23S7ZXwUfhdw=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.678.0.tgz",
+      "integrity": "sha512-KGRBVD/oNr/aD+Wy5zc5AjfeSv5b4ahAu5eAUbOz+eGjGpGgrMtjY+R2rDY/3i3wFj9/DvOIfFGeZQMwtDzIuA=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.677.0.tgz",
-      "integrity": "sha512-pBqHjIFvHBJb2NOsVqdIHWcOzXDoNXBokxTvMggb3WYML6ixwrH7kpd1CAzegeQlvZD4SCcRoy3ahv5rbuR+og=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.678.0.tgz",
+      "integrity": "sha512-5TpzzHKwPOvUJig0bvTt+brtXfLPaSVLwea9re+XGrS5T6Hz65IaX2RL6uY1GQ0UVOqgwQ5nAti1WOfBoSJ5BA=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.677.0.tgz",
-      "integrity": "sha512-OkRP3z8yI22t9LS9At5fYr6RN7zKSDiGgeyjEnrqiGHOWGPMJN2GKa8IAFC4dgXt4Nm/EfmEW7UweiqzEKJKOA=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.678.0.tgz",
+      "integrity": "sha512-PXydLUsLYd1rkhZ7zwf0613u5sofxIEhh7C1QGP1MSY3L1jt8bu7pZIcMzubfvmaGZI5k84aHhhjQEiAJUxIMg=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.677.0.tgz",
-      "integrity": "sha512-yjuI6hSt1rLFqBQiNKx/nF75Ao72xR8ybqKztzebtFNCrYl8oXVkRiigg5XKNCDmelsx1lcU9IcSiuPHzlGtUQ=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.678.0.tgz",
+      "integrity": "sha512-fcYZjTTFcef99l+BhcEAhHS4tEK1kE6Xj5Zz5lT4tFA07BkQt3d6kUKRVVfJnsbcHH4RDBUCnLhU8HPfc/kvjA=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.677.0.tgz",
-      "integrity": "sha512-fUEDkRI2GuN+p9xyZewlRQC2vFXjxPOoQGugQTmOawTxVUYkFpssg4ID0HUtkKuJYHjaoD2bCyKvOcnL1JU6AA=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.678.0.tgz",
+      "integrity": "sha512-cF6IvQI1Jf5nJrK/Q7y3yFSQ8hv6MQ1g7HmZNo1tZTkywhfB3/zKcIFe6YftQul/s6RGHotXC2fr8jDkYQFDSQ=="
     },
     "@aws-sdk/middleware-host-header": {
       "version": "3.667.0",
@@ -141,9 +141,9 @@
       "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.677.0.tgz",
-      "integrity": "sha512-A3gzUsTsvyv/JCmD0p2fkbiOyp+tpAiAADDwzi+eYeyzH4xzqnrzSkGk5KSb58uUQo27eeBzRXHd46d0u+sMrQ=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.678.0.tgz",
+      "integrity": "sha512-tg9cC5COgGP0cznD2ys9kxPtVeKUygPZshDWXLAfA/cH/4m2ZUBvoEVv1SxkIbvOjnPwa976rdPLQUwRZvsL0g=="
     },
     "@aws-sdk/region-config-resolver": {
       "version": "3.667.0",
@@ -166,9 +166,9 @@
       "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA=="
     },
     "@aws-sdk/util-locate-window": {
-      "version": "3.568.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
-      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz",
+      "integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA=="
     },
     "@aws-sdk/util-user-agent-browser": {
       "version": "3.675.0",
@@ -176,9 +176,9 @@
       "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.677.0.tgz",
-      "integrity": "sha512-gFhL0zVY/um0Eu2aWil82pjWaZL4yBmOnjz0+RDz18okFBHaz1Om8o/H+1Vvj+xsnuDYV4ezVMyAaXVtTcYOnw=="
+      "version": "3.678.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.678.0.tgz",
+      "integrity": "sha512-bKRemCdHMPAlEYE9KuQiMQG9/b4n8C+9DlJAL/X00Q7Zvm9Gv6h0+i5EZ+Xx8sbHq5oUv9a4W4tb+nkUZ0ltpw=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index ddaea69a84..8c5632939b 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -11,6 +11,7 @@ var packageJson = {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
     npm: "10.9.0",
+    "module-alias": "2.2.3",
     "node-gyp": "10.2.0",
     "@mapbox/node-pre-gyp": "1.0.11",
     typescript: "5.6.3",
diff --git a/tools/index.js b/tools/index.js
index cbb86ac7d1..26b786bb9e 100644
--- a/tools/index.js
+++ b/tools/index.js
@@ -1,23 +1,28 @@
-const { getChildProcess } = require('./cli/dev-bundle-bin-commands')
+const { getChildProcess } = require("./cli/dev-bundle-bin-commands");
+const { setupAlias } = require("./module-alias-setup");
 
-getChildProcess({ isFirstTry: true }).then((child) => {
-  if (! child) {
-    // Use process.nextTick here to prevent the Promise from swallowing
-    // errors from the rest of the setup code.
-    process.nextTick(continueSetup);
-  }
-  // If we spawned a process to handle a dev_bundle/bin command like
-  // `meteor npm` or `meteor node`, then don't run any other tool code.
-}, (error) => {
-  process.nextTick(function () {
-    throw error;
-  });
-});
+getChildProcess({ isFirstTry: true })
+  .then(setupAlias)
+  .then(
+    (child) => {
+      if (!child) {
+        // Use process.nextTick here to prevent the Promise from swallowing
+        // errors from the rest of the setup code.
+        process.nextTick(continueSetup);
+      }
+      // If we spawned a process to handle a dev_bundle/bin command like
+      // `meteor npm` or `meteor node`, then don't run any other tool code.
+    },
+    (error) => {
+      process.nextTick(function () {
+        throw error;
+      });
+    }
+  );
 
 function continueSetup() {
   // Set up the Babel transpiler
-  require('./tool-env/install-babel');
+  require("./tool-env/install-babel");
   // Run the Meteor command line tool
-  require('./cli/main');
+  require("./cli/main");
 }
-
diff --git a/tools/module-alias-setup.js b/tools/module-alias-setup.js
new file mode 100644
index 0000000000..be07159bb2
--- /dev/null
+++ b/tools/module-alias-setup.js
@@ -0,0 +1,39 @@
+const path = require("path");
+const moduleAlias = require("module-alias");
+const { getDevBundleDir } = require("./cli/dev-bundle");
+
+moduleAlias.addAlias("punycode", "punycode/");
+
+/*
+* A warning was introduced in Node 22:
+*
+* "The `punycode` module is deprecated. Please use a userland alternative instead."
+*
+* The problem is that punycode is deeply integrated in the Node system. It's not a
+* simple direct dependency.
+*
+* Check these issues for more details:
+* https://github.com/mathiasbynens/punycode.js/issues/137
+* https://stackoverflow.com/questions/68774489/punycode-is-deprecated-in-npm-what-should-i-replace-it-with/78946745
+*
+* This warning was, besides being annoying, breaking our tests.
+*
+* The solution below uses module-alias to "change" the punycode's name.
+*/
+async function setupPunycodeAlias() {
+  const devBundleDir = await getDevBundleDir();
+  const nodeModulesPath = path.join(devBundleDir, "lib", "node_modules");
+  process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS || ""} -r ${path.join(
+    nodeModulesPath,
+    "module-alias",
+    "register"
+  )}`;
+}
+
+async function setupAlias() {
+  return setupPunycodeAlias();
+}
+
+module.exports = {
+  setupAlias,
+};

From b0146a85fc083779f35af33f4418814a0a06f7c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 28 Oct 2024 17:22:29 +0100
Subject: [PATCH 0699/1140] add mongo-legacy to ensure compatibility and
 incremental migration

---
 packages/npm-mongo/package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 90ae96463d..e7be287866 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -9,6 +9,7 @@ Package.describe({
 
 Npm.depends({
   mongodb: "5.0.0",
+  "mongodb-legacy": "5.0.0"
 });
 
 Package.onUse(function (api) {

From 895967ddbd2993082bcd606e638b7d341daff207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 28 Oct 2024 17:22:29 +0100
Subject: [PATCH 0700/1140] add mongo-legacy to ensure compatibility and
 incremental migration

---
 packages/npm-mongo/package.js | 1 +
 packages/npm-mongo/wrapper.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 90ae96463d..e7be287866 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -9,6 +9,7 @@ Package.describe({
 
 Npm.depends({
   mongodb: "5.0.0",
+  "mongodb-legacy": "5.0.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/npm-mongo/wrapper.js b/packages/npm-mongo/wrapper.js
index e341493895..f7e7c23b08 100644
--- a/packages/npm-mongo/wrapper.js
+++ b/packages/npm-mongo/wrapper.js
@@ -3,7 +3,7 @@ try {
   // Silence deprecation warnings introduced in a patch update to mongodb:
   // https://github.com/meteor/meteor/pull/9942#discussion_r218564879
   process.noDeprecation = true;
-  NpmModuleMongodb = Npm.require('mongodb');
+  NpmModuleMongodb = Npm.require('mongodb-legacy');
 } finally {
   process.noDeprecation = oldNoDeprecationValue;
 }

From b857a88cb99abd068f36ea366003541968941a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 28 Oct 2024 18:02:06 +0100
Subject: [PATCH 0701/1140] fix version test

---
 packages/mongo/mongo_livedata_tests.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js
index 13d868b6ec..f1fa7b1e32 100644
--- a/packages/mongo/mongo_livedata_tests.js
+++ b/packages/mongo/mongo_livedata_tests.js
@@ -3961,7 +3961,7 @@ Meteor.isServer &&
 Meteor.isServer &&
   Tinytest.add('mongo-livedata - npm modules', function(test) {
     // Make sure the version number looks like a version number.
-    test.matches(MongoInternals.NpmModules.mongodb.version, /^4\.(\d+)\.(\d+)/);
+    test.matches(MongoInternals.NpmModules.mongodb.version, /^5\.(\d+)\.(\d+)/);
     test.equal(typeof MongoInternals.NpmModules.mongodb.module, 'object');
     test.equal(
       typeof MongoInternals.NpmModules.mongodb.module.ObjectID,
@@ -4509,4 +4509,4 @@ Tinytest.addAsync(
       }
     }
   },
-);
\ No newline at end of file
+);

From ae93277546cd68cb3f7cca9260a3f4db38e44e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 28 Oct 2024 18:02:22 +0100
Subject: [PATCH 0702/1140] fix api breaking change with timestamps

---
 packages/mongo/observe_changes_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/observe_changes_tests.js b/packages/mongo/observe_changes_tests.js
index 7678e91950..0fe94d2ebf 100644
--- a/packages/mongo/observe_changes_tests.js
+++ b/packages/mongo/observe_changes_tests.js
@@ -478,7 +478,7 @@ if (Meteor.isServer) {
       self.expects = [];
       self.insert = async function(fields) {
         return coll.insertAsync(
-          Object.assign({ ts: new MongoInternals.MongoTimestamp(0, 0) }, fields)
+          Object.assign({ ts: new MongoInternals.MongoTimestamp({ t: 0, i: 0 }) }, fields)
         );
       };
 

From 0b56044ff58488c1a02f8742ec070cdc377f02ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 28 Oct 2024 18:03:13 +0100
Subject: [PATCH 0703/1140] fix test

---
 packages/mongo/mongo_livedata_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js
index f1fa7b1e32..7ad2a3c5de 100644
--- a/packages/mongo/mongo_livedata_tests.js
+++ b/packages/mongo/mongo_livedata_tests.js
@@ -3964,7 +3964,7 @@ Meteor.isServer &&
     test.matches(MongoInternals.NpmModules.mongodb.version, /^5\.(\d+)\.(\d+)/);
     test.equal(typeof MongoInternals.NpmModules.mongodb.module, 'object');
     test.equal(
-      typeof MongoInternals.NpmModules.mongodb.module.ObjectID,
+      typeof MongoInternals.NpmModules.mongodb.module.ObjectId,
       'function'
     );
 

From c62a8be6a1dca65a8d13a8dfbe2ee1cce4a7cf05 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 28 Oct 2024 13:34:30 -0400
Subject: [PATCH 0704/1140] eliminate source of extra microtasks

---
 packages/mongo/cursor.ts                   | 7 ++-----
 packages/mongo/remote_collection_driver.js | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/mongo/cursor.ts b/packages/mongo/cursor.ts
index 5ac110aa8a..aec0b7eb2a 100644
--- a/packages/mongo/cursor.ts
+++ b/packages/mongo/cursor.ts
@@ -97,12 +97,9 @@ export class Cursor<T, U = T> {
   if (methodName === Symbol.iterator || methodName === Symbol.asyncIterator) return;
 
   const methodNameAsync = getAsyncMethodName(methodName);
+
   (Cursor.prototype as any)[methodNameAsync] = function(this: Cursor<any>, ...args: any[]): Promise<any> {
-    try {
-      return Promise.resolve(this[methodName](...args));
-    } catch (error) {
-      return Promise.reject(error);
-    }
+    return this[methodName](...args);
   };
 });
 
diff --git a/packages/mongo/remote_collection_driver.js b/packages/mongo/remote_collection_driver.js
index f4b4684e8c..2b1131d14f 100644
--- a/packages/mongo/remote_collection_driver.js
+++ b/packages/mongo/remote_collection_driver.js
@@ -31,17 +31,14 @@ Object.assign(MongoInternals.RemoteCollectionDriver.prototype, {
   open: function (name) {
     var self = this;
     var ret = {};
+
     REMOTE_COLLECTION_METHODS.forEach(function (m) {
       ret[m] = self.mongo[m].bind(self.mongo, name);
 
       if (!ASYNC_COLLECTION_METHODS.includes(m)) return;
       const asyncMethodName = getAsyncMethodName(m);
       ret[asyncMethodName] = function (...args) {
-        try {
-          return Promise.resolve(ret[m](...args));
-        } catch (error) {
-          return Promise.reject(error);
-        }
+        return ret[m](...args);
       };
     });
 

From 84c0cca7dbd254a33c67f03e908835d266c3e807 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 29 Oct 2024 08:35:48 -0400
Subject: [PATCH 0705/1140] refactor to typescript

---
 packages/mongo/package.js                |   2 +-
 packages/mongo/polling_observe_driver.js | 244 -----------------------
 packages/mongo/polling_observe_driver.ts | 201 +++++++++++++++++++
 3 files changed, 202 insertions(+), 245 deletions(-)
 delete mode 100644 packages/mongo/polling_observe_driver.js
 create mode 100644 packages/mongo/polling_observe_driver.ts

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 26562fa790..8b10c46813 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -88,7 +88,7 @@ Package.onUse(function (api) {
       "oplog_tailing.ts",
       "observe_multiplex.ts",
       "doc_fetcher.js",
-      "polling_observe_driver.js",
+      "polling_observe_driver.ts",
       "oplog_observe_driver.js",
       "oplog_v2_converter.js",
       "cursor_description.ts",
diff --git a/packages/mongo/polling_observe_driver.js b/packages/mongo/polling_observe_driver.js
deleted file mode 100644
index aff2463426..0000000000
--- a/packages/mongo/polling_observe_driver.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import throttle from 'lodash.throttle';
-import { listenAll } from './mongo_driver';
-
-var POLLING_THROTTLE_MS = +process.env.METEOR_POLLING_THROTTLE_MS || 50;
-var POLLING_INTERVAL_MS = +process.env.METEOR_POLLING_INTERVAL_MS || 10 * 1000;
-
-/**
- * @class PollingObserveDriver
- *
- * One of two observe driver implementations.
- *
- * Characteristics:
- * - Caches the results of a query
- * - Reruns the query when necessary
- * - Suitable for cases where oplog tailing is not available or practical
- */
-export const PollingObserveDriver = function (options) {
-  const self = this;
-  self._options = options;
-
-  self._cursorDescription = options.cursorDescription;
-  self._mongoHandle = options.mongoHandle;
-  self._ordered = options.ordered;
-  self._multiplexer = options.multiplexer;
-  self._stopCallbacks = [];
-  self._stopped = false;
-
-  self._cursor = self._mongoHandle._createAsynchronousCursor(
-    self._cursorDescription);
-
-  // previous results snapshot.  on each poll cycle, diffs against
-  // results drives the callbacks.
-  self._results = null;
-
-  // The number of _pollMongo calls that have been added to self._taskQueue but
-  // have not started running. Used to make sure we never schedule more than one
-  // _pollMongo (other than possibly the one that is currently running). It's
-  // also used by _suspendPolling to pretend there's a poll scheduled. Usually,
-  // it's either 0 (for "no polls scheduled other than maybe one currently
-  // running") or 1 (for "a poll scheduled that isn't running yet"), but it can
-  // also be 2 if incremented by _suspendPolling.
-  self._pollsScheduledButNotStarted = 0;
-  self._pendingWrites = []; // people to notify when polling completes
-
-  // Make sure to create a separately throttled function for each
-  // PollingObserveDriver object.
-  self._ensurePollIsScheduled = throttle(
-    self._unthrottledEnsurePollIsScheduled,
-    self._cursorDescription.options.pollingThrottleMs || POLLING_THROTTLE_MS /* ms */);
-
-  // XXX figure out if we still need a queue
-  self._taskQueue = new Meteor._AsynchronousQueue();
-
-  
-};
-
-Object.assign(PollingObserveDriver.prototype, {
-  _init: async function () {
-    const self = this;
-    const options = self._options;
-    const listenersHandle = await listenAll(
-      self._cursorDescription, function (notification) {
-        // When someone does a transaction that might affect us, schedule a poll
-        // of the database. If that transaction happens inside of a write fence,
-        // block the fence until we've polled and notified observers.
-        const fence = DDPServer._getCurrentFence();
-        if (fence)
-          self._pendingWrites.push(fence.beginWrite());
-        // Ensure a poll is scheduled... but if we already know that one is,
-        // don't hit the throttled _ensurePollIsScheduled function (which might
-        // lead to us calling it unnecessarily in <pollingThrottleMs> ms).
-        if (self._pollsScheduledButNotStarted === 0)
-          self._ensurePollIsScheduled();
-      }
-    );
-    self._stopCallbacks.push(async function () { await listenersHandle.stop(); });
-  
-    // every once and a while, poll even if we don't think we're dirty, for
-    // eventual consistency with database writes from outside the Meteor
-    // universe.
-    //
-    // For testing, there's an undocumented callback argument to observeChanges
-    // which disables time-based polling and gets called at the beginning of each
-    // poll.
-    if (options._testOnlyPollCallback) {
-      self._testOnlyPollCallback = options._testOnlyPollCallback;
-    } else {
-      const pollingInterval =
-            self._cursorDescription.options.pollingIntervalMs ||
-            self._cursorDescription.options._pollingInterval || // COMPAT with 1.2
-            POLLING_INTERVAL_MS;
-      const intervalHandle = Meteor.setInterval(
-        self._ensurePollIsScheduled.bind(self), pollingInterval);
-      self._stopCallbacks.push(function () {
-        Meteor.clearInterval(intervalHandle);
-      });
-    }
-    
-    // Make sure we actually poll soon!
-    await this._unthrottledEnsurePollIsScheduled();
-
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-      "mongo-livedata", "observe-drivers-polling", 1);
-},
-// This is always called through _.throttle (except once at startup).
-_unthrottledEnsurePollIsScheduled: async function () {
-    var self = this;
-    if (self._pollsScheduledButNotStarted > 0)
-      return;
-    ++self._pollsScheduledButNotStarted;
-    await self._taskQueue.runTask(async function () {
-      await self._pollMongo();
-    });
-  },
-
-  // test-only interface for controlling polling.
-  //
-  // _suspendPolling blocks until any currently running and scheduled polls are
-  // done, and prevents any further polls from being scheduled. (new
-  // ObserveHandles can be added and receive their initial added callbacks,
-  // though.)
-  //
-  // _resumePolling immediately polls, and allows further polls to occur.
-  _suspendPolling: function() {
-    var self = this;
-    // Pretend that there's another poll scheduled (which will prevent
-    // _ensurePollIsScheduled from queueing any more polls).
-    ++self._pollsScheduledButNotStarted;
-    // Now block until all currently running or scheduled polls are done.
-    self._taskQueue.runTask(function() {});
-
-    // Confirm that there is only one "poll" (the fake one we're pretending to
-    // have) scheduled.
-    if (self._pollsScheduledButNotStarted !== 1)
-      throw new Error("_pollsScheduledButNotStarted is " +
-                      self._pollsScheduledButNotStarted);
-  },
-  _resumePolling: async function() {
-    var self = this;
-    // We should be in the same state as in the end of _suspendPolling.
-    if (self._pollsScheduledButNotStarted !== 1)
-      throw new Error("_pollsScheduledButNotStarted is " +
-                      self._pollsScheduledButNotStarted);
-    // Run a poll synchronously (which will counteract the
-    // ++_pollsScheduledButNotStarted from _suspendPolling).
-    await self._taskQueue.runTask(async function () {
-      await self._pollMongo();
-    });
-  },
-
-  async _pollMongo() {
-    var self = this;
-    --self._pollsScheduledButNotStarted;
-
-    if (self._stopped)
-      return;
-
-    var first = false;
-    var newResults;
-    var oldResults = self._results;
-    if (!oldResults) {
-      first = true;
-      // XXX maybe use OrderedDict instead?
-      oldResults = self._ordered ? [] : new LocalCollection._IdMap;
-    }
-
-    self._testOnlyPollCallback && self._testOnlyPollCallback();
-
-    // Save the list of pending writes which this round will commit.
-    var writesForCycle = self._pendingWrites;
-    self._pendingWrites = [];
-
-    // Get the new query results. (This yields.)
-    try {
-      newResults = await self._cursor.getRawObjects(self._ordered);
-    } catch (e) {
-      if (first && typeof(e.code) === 'number') {
-        // This is an error document sent to us by mongod, not a connection
-        // error generated by the client. And we've never seen this query work
-        // successfully. Probably it's a bad selector or something, so we should
-        // NOT retry. Instead, we should halt the observe (which ends up calling
-        // `stop` on us).
-        await self._multiplexer.queryError(
-            new Error(
-                "Exception while polling query " +
-                JSON.stringify(self._cursorDescription) + ": " + e.message));
-      }
-
-      // getRawObjects can throw if we're having trouble talking to the
-      // database.  That's fine --- we will repoll later anyway. But we should
-      // make sure not to lose track of this cycle's writes.
-      // (It also can throw if there's just something invalid about this query;
-      // unfortunately the ObserveDriver API doesn't provide a good way to
-      // "cancel" the observe from the inside in this case.
-      Array.prototype.push.apply(self._pendingWrites, writesForCycle);
-      Meteor._debug("Exception while polling query " +
-          JSON.stringify(self._cursorDescription), e);
-      return;
-    }
-
-    // Run diffs.
-    if (!self._stopped) {
-      LocalCollection._diffQueryChanges(
-          self._ordered, oldResults, newResults, self._multiplexer);
-    }
-
-    // Signals the multiplexer to allow all observeChanges calls that share this
-    // multiplexer to return. (This happens asynchronously, via the
-    // multiplexer's queue.)
-    if (first)
-      self._multiplexer.ready();
-
-    // Replace self._results atomically.  (This assignment is what makes `first`
-    // stay through on the next cycle, so we've waited until after we've
-    // committed to ready-ing the multiplexer.)
-    self._results = newResults;
-
-    // Once the ObserveMultiplexer has processed everything we've done in this
-    // round, mark all the writes which existed before this call as
-    // commmitted. (If new writes have shown up in the meantime, there'll
-    // already be another _pollMongo task scheduled.)
-    await self._multiplexer.onFlush(async function () {
-      for (const w of writesForCycle) {
-        await w.committed();
-      }
-    });
-  },
-
-  stop: function () {
-    var self = this;
-    self._stopped = true;
-    const stopCallbacksCaller = async function(c) {
-      await c();
-    };
-
-    self._stopCallbacks.forEach(stopCallbacksCaller);
-    // Release any write fences that are waiting on us.
-    self._pendingWrites.forEach(async function (w) {
-      await w.committed();
-    });
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-      "mongo-livedata", "observe-drivers-polling", -1);
-  }
-});
\ No newline at end of file
diff --git a/packages/mongo/polling_observe_driver.ts b/packages/mongo/polling_observe_driver.ts
new file mode 100644
index 0000000000..7ff81665c5
--- /dev/null
+++ b/packages/mongo/polling_observe_driver.ts
@@ -0,0 +1,201 @@
+import throttle from 'lodash.throttle';
+import { listenAll } from './mongo_driver';
+import { ObserveMultiplexer } from './observe_multiplex';
+
+interface PollingObserveDriverOptions {
+  cursorDescription: any;
+  mongoHandle: any;
+  ordered: boolean;
+  multiplexer: ObserveMultiplexer;
+  _testOnlyPollCallback?: () => void;
+}
+
+const POLLING_THROTTLE_MS = +(process.env.METEOR_POLLING_THROTTLE_MS || '') || 50;
+const POLLING_INTERVAL_MS = +(process.env.METEOR_POLLING_INTERVAL_MS || '') || 10 * 1000;
+
+/**
+ * @class PollingObserveDriver
+ *
+ * One of two observe driver implementations.
+ *
+ * Characteristics:
+ * - Caches the results of a query
+ * - Reruns the query when necessary
+ * - Suitable for cases where oplog tailing is not available or practical
+ */
+export class PollingObserveDriver {
+  private _options: PollingObserveDriverOptions;
+  private _cursorDescription: any;
+  private _mongoHandle: any;
+  private _ordered: boolean;
+  private _multiplexer: any;
+  private _stopCallbacks: Array<() => Promise<void>>;
+  private _stopped: boolean;
+  private _cursor: any;
+  private _results: any;
+  private _pollsScheduledButNotStarted: number;
+  private _pendingWrites: any[];
+  private _ensurePollIsScheduled: Function;
+  private _taskQueue: any;
+  private _testOnlyPollCallback?: () => void;
+
+  constructor(options: PollingObserveDriverOptions) {
+    this._options = options;
+    this._cursorDescription = options.cursorDescription;
+    this._mongoHandle = options.mongoHandle;
+    this._ordered = options.ordered;
+    this._multiplexer = options.multiplexer;
+    this._stopCallbacks = [];
+    this._stopped = false;
+
+    this._cursor = this._mongoHandle._createAsynchronousCursor(
+      this._cursorDescription);
+
+    this._results = null;
+    this._pollsScheduledButNotStarted = 0;
+    this._pendingWrites = [];
+
+    this._ensurePollIsScheduled = throttle(
+      this._unthrottledEnsurePollIsScheduled.bind(this),
+      this._cursorDescription.options.pollingThrottleMs || POLLING_THROTTLE_MS
+    );
+
+    this._taskQueue = new (Meteor as any)._AsynchronousQueue();
+  }
+
+  async _init(): Promise<void> {
+    const options = this._options;
+    const listenersHandle = await listenAll(
+      this._cursorDescription,
+      (notification: any) => {
+        const fence = (DDPServer as any)._getCurrentFence();
+        if (fence) {
+          this._pendingWrites.push(fence.beginWrite());
+        }
+        if (this._pollsScheduledButNotStarted === 0) {
+          this._ensurePollIsScheduled();
+        }
+      }
+    );
+
+    this._stopCallbacks.push(async () => { await listenersHandle.stop(); });
+
+    if (options._testOnlyPollCallback) {
+      this._testOnlyPollCallback = options._testOnlyPollCallback;
+    } else {
+      const pollingInterval =
+        this._cursorDescription.options.pollingIntervalMs ||
+        this._cursorDescription.options._pollingInterval ||
+        POLLING_INTERVAL_MS;
+
+      const intervalHandle = Meteor.setInterval(
+        this._ensurePollIsScheduled.bind(this),
+        pollingInterval
+      );
+
+      this._stopCallbacks.push(() => {
+        Meteor.clearInterval(intervalHandle);
+      });
+    }
+
+    await this._unthrottledEnsurePollIsScheduled();
+
+    (Package['facts-base'] as any)?.Facts.incrementServerFact(
+      "mongo-livedata", "observe-drivers-polling", 1);
+  }
+
+  async _unthrottledEnsurePollIsScheduled(): Promise<void> {
+    if (this._pollsScheduledButNotStarted > 0) return;
+    ++this._pollsScheduledButNotStarted;
+    await this._taskQueue.runTask(async () => {
+      await this._pollMongo();
+    });
+  }
+
+  _suspendPolling(): void {
+    ++this._pollsScheduledButNotStarted;
+    this._taskQueue.runTask(() => {});
+
+    if (this._pollsScheduledButNotStarted !== 1) {
+      throw new Error(`_pollsScheduledButNotStarted is ${this._pollsScheduledButNotStarted}`);
+    }
+  }
+
+  async _resumePolling(): Promise<void> {
+    if (this._pollsScheduledButNotStarted !== 1) {
+      throw new Error(`_pollsScheduledButNotStarted is ${this._pollsScheduledButNotStarted}`);
+    }
+    await this._taskQueue.runTask(async () => {
+      await this._pollMongo();
+    });
+  }
+
+  async _pollMongo(): Promise<void> {
+    --this._pollsScheduledButNotStarted;
+
+    if (this._stopped) return;
+
+    let first = false;
+    let newResults;
+    let oldResults = this._results;
+
+    if (!oldResults) {
+      first = true;
+      oldResults = this._ordered ? [] : new (LocalCollection as any)._IdMap;
+    }
+
+    this._testOnlyPollCallback?.();
+
+    const writesForCycle = this._pendingWrites;
+    this._pendingWrites = [];
+
+    try {
+      newResults = await this._cursor.getRawObjects(this._ordered);
+    } catch (e: any) {
+      if (first && typeof(e.code) === 'number') {
+        await this._multiplexer.queryError(
+          new Error(
+            `Exception while polling query ${
+              JSON.stringify(this._cursorDescription)
+            }: ${e.message}`
+          )
+        );
+      }
+
+      Array.prototype.push.apply(this._pendingWrites, writesForCycle);
+      Meteor._debug(`Exception while polling query ${
+        JSON.stringify(this._cursorDescription)}`, e);
+      return;
+    }
+
+    if (!this._stopped) {
+      (LocalCollection as any)._diffQueryChanges(
+        this._ordered, oldResults, newResults, this._multiplexer);
+    }
+
+    if (first) this._multiplexer.ready();
+
+    this._results = newResults;
+
+    await this._multiplexer.onFlush(async () => {
+      for (const w of writesForCycle) {
+        await w.committed();
+      }
+    });
+  }
+
+  async stop(): Promise<void> {
+    this._stopped = true;
+
+    for (const callback of this._stopCallbacks) {
+      await callback();
+    }
+
+    for (const w of this._pendingWrites) {
+      await w.committed();
+    }
+
+    (Package['facts-base'] as any)?.Facts.incrementServerFact(
+      "mongo-livedata", "observe-drivers-polling", -1);
+  }
+}
\ No newline at end of file

From ca8219b1caf156ee2f108e8cfd347e26d40bb4c8 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 29 Oct 2024 08:44:25 -0400
Subject: [PATCH 0706/1140] refactor to typescript

---
 packages/mongo/package.js                  |   2 +-
 packages/mongo/remote_collection_driver.js |  85 --------------
 packages/mongo/remote_collection_driver.ts | 130 +++++++++++++++++++++
 3 files changed, 131 insertions(+), 86 deletions(-)
 delete mode 100644 packages/mongo/remote_collection_driver.js
 create mode 100644 packages/mongo/remote_collection_driver.ts

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 8b10c46813..e4a855421d 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -100,7 +100,7 @@ Package.onUse(function (api) {
     "server"
   );
   api.addFiles("local_collection_driver.js", ["client", "server"]);
-  api.addFiles("remote_collection_driver.js", "server");
+  api.addFiles("remote_collection_driver.ts", "server");
   api.addFiles("collection.js", ["client", "server"]);
   api.addFiles("connection_options.js", "server");
   api.addAssets("mongo.d.ts", "server");
diff --git a/packages/mongo/remote_collection_driver.js b/packages/mongo/remote_collection_driver.js
deleted file mode 100644
index 2b1131d14f..0000000000
--- a/packages/mongo/remote_collection_driver.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import once from 'lodash.once';
-import {
-  ASYNC_COLLECTION_METHODS,
-  getAsyncMethodName,
-  CLIENT_ONLY_METHODS
-} from "meteor/minimongo/constants";
-import { MongoConnection } from './mongo_connection';
-
-MongoInternals.RemoteCollectionDriver = function (mongo_url, options) {
-  this.mongo = new MongoConnection(mongo_url, options);
-};
-
-const REMOTE_COLLECTION_METHODS = [
-  'createCappedCollectionAsync',
-  'dropIndexAsync',
-  'ensureIndexAsync',
-  'createIndexAsync',
-  'countDocuments',
-  'dropCollectionAsync',
-  'estimatedDocumentCount',
-  'find',
-  'findOneAsync',
-  'insertAsync',
-  'rawCollection',
-  'removeAsync',
-  'updateAsync',
-  'upsertAsync',
-];
-
-Object.assign(MongoInternals.RemoteCollectionDriver.prototype, {
-  open: function (name) {
-    var self = this;
-    var ret = {};
-
-    REMOTE_COLLECTION_METHODS.forEach(function (m) {
-      ret[m] = self.mongo[m].bind(self.mongo, name);
-
-      if (!ASYNC_COLLECTION_METHODS.includes(m)) return;
-      const asyncMethodName = getAsyncMethodName(m);
-      ret[asyncMethodName] = function (...args) {
-        return ret[m](...args);
-      };
-    });
-
-    CLIENT_ONLY_METHODS.forEach(function (m) {
-      ret[m] = function (...args) {
-        throw new Error(
-          `${m} is not available on the server. Please use ${getAsyncMethodName(
-            m
-          )}() instead.`
-        );
-      };
-    });
-    return ret;
-  },
-});
-
-
-// Create the singleton RemoteCollectionDriver only on demand, so we
-// only require Mongo configuration if it's actually used (eg, not if
-// you're only trying to receive data from a remote DDP server.)
-MongoInternals.defaultRemoteCollectionDriver = once(function () {
-  var connectionOptions = {};
-
-  var mongoUrl = process.env.MONGO_URL;
-
-  if (process.env.MONGO_OPLOG_URL) {
-    connectionOptions.oplogUrl = process.env.MONGO_OPLOG_URL;
-  }
-
-  if (! mongoUrl)
-    throw new Error("MONGO_URL must be set in environment");
-
-  const driver = new MongoInternals.RemoteCollectionDriver(mongoUrl, connectionOptions);
-  // As many deployment tools, including Meteor Up, send requests to the app in
-  // order to confirm that the deployment finished successfully, it's required
-  // to know about a database connection problem before the app starts. Doing so
-  // in a `Meteor.startup` is fine, as the `WebApp` handles requests only after
-  // all are finished.
-  Meteor.startup(async () => {
-    await driver.mongo.client.connect();
-  });
-
-  return driver;
-});
diff --git a/packages/mongo/remote_collection_driver.ts b/packages/mongo/remote_collection_driver.ts
new file mode 100644
index 0000000000..636b93522f
--- /dev/null
+++ b/packages/mongo/remote_collection_driver.ts
@@ -0,0 +1,130 @@
+import once from 'lodash.once';
+import {
+  ASYNC_COLLECTION_METHODS,
+  getAsyncMethodName,
+  CLIENT_ONLY_METHODS
+} from "meteor/minimongo/constants";
+import { MongoConnection } from './mongo_connection';
+
+// Define interfaces and types
+interface IConnectionOptions {
+  oplogUrl?: string;
+  [key: string]: unknown;  // Changed from 'any' to 'unknown' for better type safety
+}
+
+interface IMongoInternals {
+  RemoteCollectionDriver: typeof RemoteCollectionDriver;
+  defaultRemoteCollectionDriver: () => RemoteCollectionDriver;
+}
+
+// More specific typing for collection methods
+type MongoMethodFunction = (...args: unknown[]) => unknown;
+interface ICollectionMethods {
+  [key: string]: MongoMethodFunction;
+}
+
+// Type for MongoConnection
+interface IMongoClient {
+  connect: () => Promise<void>;
+}
+
+interface IMongoConnection {
+  client: IMongoClient;
+  [key: string]: MongoMethodFunction | IMongoClient;
+}
+
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv {
+      MONGO_URL: string;
+      MONGO_OPLOG_URL?: string;
+    }
+  }
+
+  const MongoInternals: IMongoInternals;
+  const Meteor: {
+    startup: (callback: () => Promise<void>) => void;
+  };
+}
+
+class RemoteCollectionDriver {
+  private readonly mongo: MongoConnection;
+
+  private static readonly REMOTE_COLLECTION_METHODS = [
+    'createCappedCollectionAsync',
+    'dropIndexAsync',
+    'ensureIndexAsync',
+    'createIndexAsync',
+    'countDocuments',
+    'dropCollectionAsync',
+    'estimatedDocumentCount',
+    'find',
+    'findOneAsync',
+    'insertAsync',
+    'rawCollection',
+    'removeAsync',
+    'updateAsync',
+    'upsertAsync',
+  ] as const;
+
+  constructor(mongoUrl: string, options: IConnectionOptions) {
+    this.mongo = new MongoConnection(mongoUrl, options);
+  }
+
+  public open(name: string): ICollectionMethods {
+    const ret: ICollectionMethods = {};
+
+    // Handle remote collection methods
+    RemoteCollectionDriver.REMOTE_COLLECTION_METHODS.forEach((method) => {
+      // Type assertion needed because we know these methods exist on MongoConnection
+      const mongoMethod = this.mongo[method] as MongoMethodFunction;
+      ret[method] = mongoMethod.bind(this.mongo, name);
+
+      if (!ASYNC_COLLECTION_METHODS.includes(method)) return;
+
+      const asyncMethodName = getAsyncMethodName(method);
+      ret[asyncMethodName] = (...args: unknown[]) => ret[method](...args);
+    });
+
+    // Handle client-only methods
+    CLIENT_ONLY_METHODS.forEach((method) => {
+      ret[method] = (...args: unknown[]): never => {
+        throw new Error(
+          `${method} is not available on the server. Please use ${getAsyncMethodName(
+            method
+          )}() instead.`
+        );
+      };
+    });
+
+    return ret;
+  }
+}
+
+// Assign the class to MongoInternals
+MongoInternals.RemoteCollectionDriver = RemoteCollectionDriver;
+
+// Create the singleton RemoteCollectionDriver only on demand
+MongoInternals.defaultRemoteCollectionDriver = once((): RemoteCollectionDriver => {
+  const connectionOptions: IConnectionOptions = {};
+  const mongoUrl = process.env.MONGO_URL;
+
+  if (!mongoUrl) {
+    throw new Error("MONGO_URL must be set in environment");
+  }
+
+  if (process.env.MONGO_OPLOG_URL) {
+    connectionOptions.oplogUrl = process.env.MONGO_OPLOG_URL;
+  }
+
+  const driver = new RemoteCollectionDriver(mongoUrl, connectionOptions);
+
+  // Initialize database connection on startup
+  Meteor.startup(async (): Promise<void> => {
+    await driver.mongo.client.connect();
+  });
+
+  return driver;
+});
+
+export { RemoteCollectionDriver, IConnectionOptions, ICollectionMethods };
\ No newline at end of file

From c98c86836e76522af158e91257bd296255aa7022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 14:54:02 +0100
Subject: [PATCH 0707/1140] prepare to migrate callbacks

---
 packages/npm-mongo/package.js | 3 +--
 packages/npm-mongo/wrapper.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index e7be287866..022ab71304 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -8,8 +8,7 @@ Package.describe({
 });
 
 Npm.depends({
-  mongodb: "5.0.0",
-  "mongodb-legacy": "5.0.0"
+  mongodb: "5.0.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/npm-mongo/wrapper.js b/packages/npm-mongo/wrapper.js
index f7e7c23b08..e341493895 100644
--- a/packages/npm-mongo/wrapper.js
+++ b/packages/npm-mongo/wrapper.js
@@ -3,7 +3,7 @@ try {
   // Silence deprecation warnings introduced in a patch update to mongodb:
   // https://github.com/meteor/meteor/pull/9942#discussion_r218564879
   process.noDeprecation = true;
-  NpmModuleMongodb = Npm.require('mongodb-legacy');
+  NpmModuleMongodb = Npm.require('mongodb');
 } finally {
   process.noDeprecation = oldNoDeprecationValue;
 }

From 9a9241b03118a86dc4420993a7ccba89709a0b76 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 29 Oct 2024 09:51:13 -0400
Subject: [PATCH 0708/1140] split collection

---
 packages/mongo/{ => collection}/collection.js | 563 +-----------------
 packages/mongo/collection/methods_async.js    | 209 +++++++
 packages/mongo/collection/methods_sync.js     | 346 +++++++++++
 ...ction_options.js => connection_options.ts} |   0
 packages/mongo/package.js                     |   4 +-
 5 files changed, 568 insertions(+), 554 deletions(-)
 rename packages/mongo/{ => collection}/collection.js (54%)
 create mode 100644 packages/mongo/collection/methods_async.js
 create mode 100644 packages/mongo/collection/methods_sync.js
 rename packages/mongo/{connection_options.js => connection_options.ts} (100%)

diff --git a/packages/mongo/collection.js b/packages/mongo/collection/collection.js
similarity index 54%
rename from packages/mongo/collection.js
rename to packages/mongo/collection/collection.js
index 06bc59ae35..87878de2f1 100644
--- a/packages/mongo/collection.js
+++ b/packages/mongo/collection/collection.js
@@ -1,11 +1,6 @@
-// options.connection, if given, is a LivedataClient or LivedataServer
-// XXX presently there is no way to destroy/clean up a Collection
-import {
-  ASYNC_COLLECTION_METHODS,
-  getAsyncMethodName,
-} from 'meteor/minimongo/constants';
-
-import { normalizeProjection } from "./mongo_utils";
+import { normalizeProjection } from "../mongo_utils";
+import { AsyncMethods } from './methods_async';
+import { SyncMethods } from './methods_sync';
 
 /**
  * @summary Namespace for MongoDB-related items
@@ -111,7 +106,7 @@ Mongo.Collection = function Collection(name, options) {
     ) {
       options._driver = MongoInternals.defaultRemoteCollectionDriver();
     } else {
-      const { LocalCollectionDriver } = require('./local_collection_driver.js');
+      const { LocalCollectionDriver } = require('../local_collection_driver.js');
       options._driver = LocalCollectionDriver;
     }
   }
@@ -487,82 +482,9 @@ Object.assign(Mongo.Collection.prototype, {
     }
   },
 
-  /**
-   * @summary Find the documents in a collection that match the selector.
-   * @locus Anywhere
-   * @method find
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} [selector] A query describing the documents to find
-   * @param {Object} [options]
-   * @param {MongoSortSpecifier} options.sort Sort order (default: natural order)
-   * @param {Number} options.skip Number of results to skip at the beginning
-   * @param {Number} options.limit Maximum number of results to return
-   * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
-   * @param {Boolean} options.reactive (Client only) Default `true`; pass `false` to disable reactivity
-   * @param {Function} options.transform Overrides `transform` on the  [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation.
-   * @param {Boolean} options.disableOplog (Server only) Pass true to disable oplog-tailing on this query. This affects the way server processes calls to `observe` on this query. Disabling the oplog can be useful when working with data that updates in large batches.
-   * @param {Number} options.pollingIntervalMs (Server only) When oplog is disabled (through the use of `disableOplog` or when otherwise not available), the frequency (in milliseconds) of how often to poll this query when observing on the server. Defaults to 10000ms (10 seconds).
-   * @param {Number} options.pollingThrottleMs (Server only) When oplog is disabled (through the use of `disableOplog` or when otherwise not available), the minimum time (in milliseconds) to allow between re-polling when observing on the server. Increasing this will save CPU and mongo load at the expense of slower updates to users. Decreasing this is not recommended. Defaults to 50ms.
-   * @param {Number} options.maxTimeMs (Server only) If set, instructs MongoDB to set a time limit for this cursor's operations. If the operation reaches the specified time limit (in milliseconds) without the having been completed, an exception will be thrown. Useful to prevent an (accidental or malicious) unoptimized query from causing a full collection scan that would disrupt other database users, at the expense of needing to handle the resulting error.
-   * @param {String|Object} options.hint (Server only) Overrides MongoDB's default index selection and query optimization process. Specify an index to force its use, either by its name or index specification. You can also specify `{ $natural : 1 }` to force a forwards collection scan, or `{ $natural : -1 }` for a reverse collection scan. Setting this is only recommended for advanced users.
-   * @param {String} options.readPreference (Server only) Specifies a custom MongoDB [`readPreference`](https://docs.mongodb.com/manual/core/read-preference) for this particular cursor. Possible values are `primary`, `primaryPreferred`, `secondary`, `secondaryPreferred` and `nearest`.
-   * @returns {Mongo.Cursor}
-   */
-  find(...args) {
-    // Collection.find() (return all docs) behaves differently
-    // from Collection.find(undefined) (return 0 docs).  so be
-    // careful about the length of arguments.
-    return this._collection.find(
-      this._getFindSelector(args),
-      this._getFindOptions(args)
-    );
-  },
 
-  /**
-   * @summary Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
-   * @locus Anywhere
-   * @method findOneAsync
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} [selector] A query describing the documents to find
-   * @param {Object} [options]
-   * @param {MongoSortSpecifier} options.sort Sort order (default: natural order)
-   * @param {Number} options.skip Number of results to skip at the beginning
-   * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
-   * @param {Boolean} options.reactive (Client only) Default true; pass false to disable reactivity
-   * @param {Function} options.transform Overrides `transform` on the [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation.
-   * @param {String} options.readPreference (Server only) Specifies a custom MongoDB [`readPreference`](https://docs.mongodb.com/manual/core/read-preference) for fetching the document. Possible values are `primary`, `primaryPreferred`, `secondary`, `secondaryPreferred` and `nearest`.
-   * @returns {Object}
-   */
-  findOneAsync(...args) {
-    return this._collection.findOneAsync(
-      this._getFindSelector(args),
-      this._getFindOptions(args)
-    );
-  },
-  /**
-   * @summary Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
-   * @locus Anywhere
-   * @method findOne
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} [selector] A query describing the documents to find
-   * @param {Object} [options]
-   * @param {MongoSortSpecifier} options.sort Sort order (default: natural order)
-   * @param {Number} options.skip Number of results to skip at the beginning
-   * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
-   * @param {Boolean} options.reactive (Client only) Default true; pass false to disable reactivity
-   * @param {Function} options.transform Overrides `transform` on the [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation.
-   * @param {String} options.readPreference (Server only) Specifies a custom MongoDB [`readPreference`](https://docs.mongodb.com/manual/core/read-preference) for fetching the document. Possible values are `primary`, `primaryPreferred`, `secondary`, `secondaryPreferred` and `nearest`.
-   * @returns {Object}
-   */
-  findOne(...args) {
-    return this._collection.findOne(
-      this._getFindSelector(args),
-      this._getFindOptions(args)
-    );
-  },
+
+
 });
 
 Object.assign(Mongo.Collection, {
@@ -620,402 +542,10 @@ Object.assign(Mongo.Collection, {
   },
 });
 
+Object.assign(Mongo.Collection.prototype, SyncMethods);
+Object.assign(Mongo.Collection.prototype, AsyncMethods);
+
 Object.assign(Mongo.Collection.prototype, {
-  // 'insert' immediately returns the inserted document's new _id.
-  // The others return values immediately if you are in a stub, an in-memory
-  // unmanaged collection, or a mongo-backed collection and you don't pass a
-  // callback. 'update' and 'remove' return the number of affected
-  // documents. 'upsert' returns an object with keys 'numberAffected' and, if an
-  // insert happened, 'insertedId'.
-  //
-  // Otherwise, the semantics are exactly like other methods: they take
-  // a callback as an optional last argument; if no callback is
-  // provided, they block until the operation is complete, and throw an
-  // exception if it fails; if a callback is provided, then they don't
-  // necessarily block, and they call the callback when they finish with error and
-  // result arguments.  (The insert method provides the document ID as its result;
-  // update and remove provide the number of affected docs as the result; upsert
-  // provides an object with numberAffected and maybe insertedId.)
-  //
-  // On the client, blocking is impossible, so if a callback
-  // isn't provided, they just return immediately and any error
-  // information is lost.
-  //
-  // There's one more tweak. On the client, if you don't provide a
-  // callback, then if there is an error, a message will be logged with
-  // Meteor._debug.
-  //
-  // The intent (though this is actually determined by the underlying
-  // drivers) is that the operations should be done synchronously, not
-  // generating their result until the database has acknowledged
-  // them. In the future maybe we should provide a flag to turn this
-  // off.
-
-  _insert(doc, callback) {
-    // Make sure we were passed a document to insert
-    if (!doc) {
-      throw new Error('insert requires an argument');
-    }
-
-
-    // Make a shallow clone of the document, preserving its prototype.
-    doc = Object.create(
-      Object.getPrototypeOf(doc),
-      Object.getOwnPropertyDescriptors(doc)
-    );
-
-    if ('_id' in doc) {
-      if (
-        !doc._id ||
-        !(typeof doc._id === 'string' || doc._id instanceof Mongo.ObjectID)
-      ) {
-        throw new Error(
-          'Meteor requires document _id fields to be non-empty strings or ObjectIDs'
-        );
-      }
-    } else {
-      let generateId = true;
-
-      // Don't generate the id if we're the client and the 'outermost' call
-      // This optimization saves us passing both the randomSeed and the id
-      // Passing both is redundant.
-      if (this._isRemoteCollection()) {
-        const enclosing = DDP._CurrentMethodInvocation.get();
-        if (!enclosing) {
-          generateId = false;
-        }
-      }
-
-      if (generateId) {
-        doc._id = this._makeNewID();
-      }
-    }
-
-
-    // On inserts, always return the id that we generated; on all other
-    // operations, just return the result from the collection.
-    var chooseReturnValueFromCollectionResult = function(result) {
-      if (Meteor._isPromise(result)) return result;
-
-      if (doc._id) {
-        return doc._id;
-      }
-
-      // XXX what is this for??
-      // It's some iteraction between the callback to _callMutatorMethod and
-      // the return value conversion
-      doc._id = result;
-
-      return result;
-    };
-
-    const wrappedCallback = wrapCallback(
-      callback,
-      chooseReturnValueFromCollectionResult
-    );
-
-    if (this._isRemoteCollection()) {
-      const result = this._callMutatorMethod('insert', [doc], wrappedCallback);
-      return chooseReturnValueFromCollectionResult(result);
-    }
-
-    // it's my collection.  descend into the collection object
-    // and propagate any exception.
-    try {
-      // If the user provided a callback and the collection implements this
-      // operation asynchronously, then queryRet will be undefined, and the
-      // result will be returned through the callback instead.
-      let result;
-      if (!!wrappedCallback) {
-        this._collection.insert(doc, wrappedCallback);
-      } else {
-        // If we don't have the callback, we assume the user is using the promise.
-        // We can't just pass this._collection.insert to the promisify because it would lose the context.
-        result = this._collection.insert(doc);
-      }
-
-      return chooseReturnValueFromCollectionResult(result);
-    } catch (e) {
-      if (callback) {
-        callback(e);
-        return null;
-      }
-      throw e;
-    }
-  },
-
-  /**
-   * @summary Insert a document in the collection.  Returns its unique _id.
-   * @locus Anywhere
-   * @method  insert
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {Object} doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
-   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the _id as the second.
-   */
-  insert(doc, callback) {
-    return this._insert(doc, callback);
-  },
-
-  _insertAsync(doc, options = {}) {
-    // Make sure we were passed a document to insert
-    if (!doc) {
-      throw new Error('insert requires an argument');
-    }
-
-    // Make a shallow clone of the document, preserving its prototype.
-    doc = Object.create(
-        Object.getPrototypeOf(doc),
-        Object.getOwnPropertyDescriptors(doc)
-    );
-
-    if ('_id' in doc) {
-      if (
-          !doc._id ||
-          !(typeof doc._id === 'string' || doc._id instanceof Mongo.ObjectID)
-      ) {
-        throw new Error(
-            'Meteor requires document _id fields to be non-empty strings or ObjectIDs'
-        );
-      }
-    } else {
-      let generateId = true;
-
-      // Don't generate the id if we're the client and the 'outermost' call
-      // This optimization saves us passing both the randomSeed and the id
-      // Passing both is redundant.
-      if (this._isRemoteCollection()) {
-        const enclosing = DDP._CurrentMethodInvocation.get();
-        if (!enclosing) {
-          generateId = false;
-        }
-      }
-
-      if (generateId) {
-        doc._id = this._makeNewID();
-      }
-    }
-
-    // On inserts, always return the id that we generated; on all other
-    // operations, just return the result from the collection.
-    var chooseReturnValueFromCollectionResult = function(result) {
-      if (Meteor._isPromise(result)) return result;
-
-      if (doc._id) {
-        return doc._id;
-      }
-
-      // XXX what is this for??
-      // It's some iteraction between the callback to _callMutatorMethod and
-      // the return value conversion
-      doc._id = result;
-
-      return result;
-    };
-
-    if (this._isRemoteCollection()) {
-      const promise = this._callMutatorMethodAsync('insertAsync', [doc], options);
-      promise.then(chooseReturnValueFromCollectionResult);
-      promise.stubPromise = promise.stubPromise.then(chooseReturnValueFromCollectionResult);
-      promise.serverPromise = promise.serverPromise.then(chooseReturnValueFromCollectionResult);
-      return promise;
-    }
-
-    // it's my collection.  descend into the collection object
-    // and propagate any exception.
-    return this._collection.insertAsync(doc)
-      .then(chooseReturnValueFromCollectionResult);
-  },
-
-  /**
-   * @summary Insert a document in the collection.  Returns a promise that will return the document's unique _id when solved.
-   * @locus Anywhere
-   * @method  insert
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {Object} doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
-   */
-  insertAsync(doc, options) {
-    return this._insertAsync(doc, options);
-  },
-
-  /**
-   * @summary Modify one or more documents in the collection. Returns the number of matched documents.
-   * @locus Anywhere
-   * @method update
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} selector Specifies which documents to modify
-   * @param {MongoModifier} modifier Specifies how to modify the documents
-   * @param {Object} [options]
-   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
-   * @param {Boolean} options.upsert True to insert a document if no matching documents are found.
-   * @param {Array} options.arrayFilters Optional. Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to modify in an array field.
-   */
-  updateAsync(selector, modifier, ...optionsAndCallback) {
-
-    // We've already popped off the callback, so we are left with an array
-    // of one or zero items
-    const options = { ...(optionsAndCallback[0] || null) };
-    let insertedId;
-    if (options && options.upsert) {
-      // set `insertedId` if absent.  `insertedId` is a Meteor extension.
-      if (options.insertedId) {
-        if (
-          !(
-            typeof options.insertedId === 'string' ||
-            options.insertedId instanceof Mongo.ObjectID
-          )
-        )
-          throw new Error('insertedId must be string or ObjectID');
-        insertedId = options.insertedId;
-      } else if (!selector || !selector._id) {
-        insertedId = this._makeNewID();
-        options.generatedId = true;
-        options.insertedId = insertedId;
-      }
-    }
-
-    selector = Mongo.Collection._rewriteSelector(selector, {
-      fallbackId: insertedId,
-    });
-
-    if (this._isRemoteCollection()) {
-      const args = [selector, modifier, options];
-
-      return this._callMutatorMethodAsync('updateAsync', args, options);
-    }
-
-    // it's my collection.  descend into the collection object
-    // and propagate any exception.
-      // If the user provided a callback and the collection implements this
-      // operation asynchronously, then queryRet will be undefined, and the
-      // result will be returned through the callback instead.
-
-    return this._collection.updateAsync(
-      selector,
-      modifier,
-      options
-    );
-  },
-
-  /**
-   * @summary Asynchronously modifies one or more documents in the collection. Returns the number of matched documents.
-   * @locus Anywhere
-   * @method update
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} selector Specifies which documents to modify
-   * @param {MongoModifier} modifier Specifies how to modify the documents
-   * @param {Object} [options]
-   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
-   * @param {Boolean} options.upsert True to insert a document if no matching documents are found.
-   * @param {Array} options.arrayFilters Optional. Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to modify in an array field.
-   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
-   */
-  update(selector, modifier, ...optionsAndCallback) {
-    const callback = popCallbackFromArgs(optionsAndCallback);
-
-    // We've already popped off the callback, so we are left with an array
-    // of one or zero items
-    const options = { ...(optionsAndCallback[0] || null) };
-    let insertedId;
-    if (options && options.upsert) {
-      // set `insertedId` if absent.  `insertedId` is a Meteor extension.
-      if (options.insertedId) {
-        if (
-          !(
-            typeof options.insertedId === 'string' ||
-            options.insertedId instanceof Mongo.ObjectID
-          )
-        )
-          throw new Error('insertedId must be string or ObjectID');
-        insertedId = options.insertedId;
-      } else if (!selector || !selector._id) {
-        insertedId = this._makeNewID();
-        options.generatedId = true;
-        options.insertedId = insertedId;
-      }
-    }
-
-    selector = Mongo.Collection._rewriteSelector(selector, {
-      fallbackId: insertedId,
-    });
-
-    const wrappedCallback = wrapCallback(callback);
-
-    if (this._isRemoteCollection()) {
-      const args = [selector, modifier, options];
-      return this._callMutatorMethod('update', args, callback);
-    }
-
-    // it's my collection.  descend into the collection object
-    // and propagate any exception.
-    // If the user provided a callback and the collection implements this
-    // operation asynchronously, then queryRet will be undefined, and the
-    // result will be returned through the callback instead.
-    //console.log({callback, options, selector, modifier, coll: this._collection});
-    try {
-      // If the user provided a callback and the collection implements this
-      // operation asynchronously, then queryRet will be undefined, and the
-      // result will be returned through the callback instead.
-      return this._collection.update(
-        selector,
-        modifier,
-        options,
-        wrappedCallback
-      );
-    } catch (e) {
-      if (callback) {
-        callback(e);
-        return null;
-      }
-      throw e;
-    }
-  },
-
-  /**
-   * @summary Asynchronously removes documents from the collection.
-   * @locus Anywhere
-   * @method remove
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} selector Specifies which documents to remove
-   */
-  removeAsync(selector, options = {}) {
-    selector = Mongo.Collection._rewriteSelector(selector);
-
-    if (this._isRemoteCollection()) {
-      return this._callMutatorMethodAsync('removeAsync', [selector], options);
-    }
-
-    // it's my collection.  descend into the collection1 object
-    // and propagate any exception.
-    return this._collection.removeAsync(selector);
-  },
-
-  /**
-   * @summary Remove documents from the collection
-   * @locus Anywhere
-   * @method remove
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} selector Specifies which documents to remove
-   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
-   */
-  remove(selector, callback) {
-    selector = Mongo.Collection._rewriteSelector(selector);
-
-    if (this._isRemoteCollection()) {
-      return this._callMutatorMethod('remove', [selector], callback);
-    }
-
-
-    // it's my collection.  descend into the collection1 object
-    // and propagate any exception.
-    return this._collection.remove(selector);
-  },
-
 
   // Determine if this collection is simply a minimongo representation of a real
   // database on another server
@@ -1024,56 +554,10 @@ Object.assign(Mongo.Collection.prototype, {
     return this._connection && this._connection !== Meteor.server;
   },
 
-  /**
-   * @summary Asynchronously modifies one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified)  and `insertedId` (the unique _id of the document that was inserted, if any).
-   * @locus Anywhere
-   * @method upsert
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} selector Specifies which documents to modify
-   * @param {MongoModifier} modifier Specifies how to modify the documents
-   * @param {Object} [options]
-   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
-   */
-    async upsertAsync(selector, modifier, options) {
-      return this.updateAsync(
-        selector,
-        modifier,
-        {
-          ...options,
-          _returnObject: true,
-          upsert: true,
-        });
-    },
 
 
-  /**
-   * @summary Asynchronously modifies one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified)  and `insertedId` (the unique _id of the document that was inserted, if any).
-   * @locus Anywhere
-   * @method upsert
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} selector Specifies which documents to modify
-   * @param {MongoModifier} modifier Specifies how to modify the documents
-   * @param {Object} [options]
-   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
-   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
-   */
-  upsert(selector, modifier, options, callback) {
-    if (!callback && typeof options === 'function') {
-      callback = options;
-      options = {};
-    }
 
-    return this.update(
-      selector,
-      modifier,
-      {
-        ...options,
-        _returnObject: true,
-        upsert: true,
-      });
-  },
+
 
   // We'll actually design an index API later. For now, we just pass through to
   // Mongo's, but make it synchronous.
@@ -1232,21 +716,7 @@ Object.assign(Mongo, {
   _collections: new Map(),
 })
 
-// Convert the callback to not return a result if there is an error
-function wrapCallback(callback, convertResult) {
-  return (
-    callback &&
-    function(error, result) {
-      if (error) {
-        callback(error);
-      } else if (typeof convertResult === 'function') {
-        callback(error, convertResult(result));
-      } else {
-        callback(error, result);
-      }
-    }
-  );
-}
+
 
 /**
  * @summary Create a Mongo-style `ObjectID`.  If you don't specify a `hexString`, the `ObjectID` will be generated randomly (not using MongoDB's ID construction rules).
@@ -1281,14 +751,3 @@ Meteor.Collection = Mongo.Collection;
 // Allow deny stuff is now in the allow-deny package
 Object.assign(Mongo.Collection.prototype, AllowDeny.CollectionPrototype);
 
-function popCallbackFromArgs(args) {
-  // Pull off any callback (or perhaps a 'callback' variable that was passed
-  // in undefined, like how 'upsert' does it).
-  if (
-    args.length &&
-    (args[args.length - 1] === undefined ||
-      args[args.length - 1] instanceof Function)
-  ) {
-    return args.pop();
-  }
-}
diff --git a/packages/mongo/collection/methods_async.js b/packages/mongo/collection/methods_async.js
new file mode 100644
index 0000000000..75e8295699
--- /dev/null
+++ b/packages/mongo/collection/methods_async.js
@@ -0,0 +1,209 @@
+export const AsyncMethods = {
+  /**
+   * @summary Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
+   * @locus Anywhere
+   * @method findOneAsync
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} [selector] A query describing the documents to find
+   * @param {Object} [options]
+   * @param {MongoSortSpecifier} options.sort Sort order (default: natural order)
+   * @param {Number} options.skip Number of results to skip at the beginning
+   * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
+   * @param {Boolean} options.reactive (Client only) Default true; pass false to disable reactivity
+   * @param {Function} options.transform Overrides `transform` on the [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation.
+   * @param {String} options.readPreference (Server only) Specifies a custom MongoDB [`readPreference`](https://docs.mongodb.com/manual/core/read-preference) for fetching the document. Possible values are `primary`, `primaryPreferred`, `secondary`, `secondaryPreferred` and `nearest`.
+   * @returns {Object}
+   */
+  findOneAsync(...args) {
+    return this._collection.findOneAsync(
+      this._getFindSelector(args),
+      this._getFindOptions(args)
+    );
+  },
+
+  _insertAsync(doc, options = {}) {
+    // Make sure we were passed a document to insert
+    if (!doc) {
+      throw new Error('insert requires an argument');
+    }
+
+    // Make a shallow clone of the document, preserving its prototype.
+    doc = Object.create(
+      Object.getPrototypeOf(doc),
+      Object.getOwnPropertyDescriptors(doc)
+    );
+
+    if ('_id' in doc) {
+      if (
+        !doc._id ||
+        !(typeof doc._id === 'string' || doc._id instanceof Mongo.ObjectID)
+      ) {
+        throw new Error(
+          'Meteor requires document _id fields to be non-empty strings or ObjectIDs'
+        );
+      }
+    } else {
+      let generateId = true;
+
+      // Don't generate the id if we're the client and the 'outermost' call
+      // This optimization saves us passing both the randomSeed and the id
+      // Passing both is redundant.
+      if (this._isRemoteCollection()) {
+        const enclosing = DDP._CurrentMethodInvocation.get();
+        if (!enclosing) {
+          generateId = false;
+        }
+      }
+
+      if (generateId) {
+        doc._id = this._makeNewID();
+      }
+    }
+
+    // On inserts, always return the id that we generated; on all other
+    // operations, just return the result from the collection.
+    var chooseReturnValueFromCollectionResult = function(result) {
+      if (Meteor._isPromise(result)) return result;
+
+      if (doc._id) {
+        return doc._id;
+      }
+
+      // XXX what is this for??
+      // It's some iteraction between the callback to _callMutatorMethod and
+      // the return value conversion
+      doc._id = result;
+
+      return result;
+    };
+
+    if (this._isRemoteCollection()) {
+      const promise = this._callMutatorMethodAsync('insertAsync', [doc], options);
+      promise.then(chooseReturnValueFromCollectionResult);
+      promise.stubPromise = promise.stubPromise.then(chooseReturnValueFromCollectionResult);
+      promise.serverPromise = promise.serverPromise.then(chooseReturnValueFromCollectionResult);
+      return promise;
+    }
+
+    // it's my collection.  descend into the collection object
+    // and propagate any exception.
+    return this._collection.insertAsync(doc)
+      .then(chooseReturnValueFromCollectionResult);
+  },
+
+  /**
+   * @summary Insert a document in the collection.  Returns a promise that will return the document's unique _id when solved.
+   * @locus Anywhere
+   * @method  insert
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {Object} doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
+   */
+  insertAsync(doc, options) {
+    return this._insertAsync(doc, options);
+  },
+
+
+  /**
+   * @summary Modify one or more documents in the collection. Returns the number of matched documents.
+   * @locus Anywhere
+   * @method update
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to modify
+   * @param {MongoModifier} modifier Specifies how to modify the documents
+   * @param {Object} [options]
+   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
+   * @param {Boolean} options.upsert True to insert a document if no matching documents are found.
+   * @param {Array} options.arrayFilters Optional. Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to modify in an array field.
+   */
+  updateAsync(selector, modifier, ...optionsAndCallback) {
+
+    // We've already popped off the callback, so we are left with an array
+    // of one or zero items
+    const options = { ...(optionsAndCallback[0] || null) };
+    let insertedId;
+    if (options && options.upsert) {
+      // set `insertedId` if absent.  `insertedId` is a Meteor extension.
+      if (options.insertedId) {
+        if (
+          !(
+            typeof options.insertedId === 'string' ||
+            options.insertedId instanceof Mongo.ObjectID
+          )
+        )
+          throw new Error('insertedId must be string or ObjectID');
+        insertedId = options.insertedId;
+      } else if (!selector || !selector._id) {
+        insertedId = this._makeNewID();
+        options.generatedId = true;
+        options.insertedId = insertedId;
+      }
+    }
+
+    selector = Mongo.Collection._rewriteSelector(selector, {
+      fallbackId: insertedId,
+    });
+
+    if (this._isRemoteCollection()) {
+      const args = [selector, modifier, options];
+
+      return this._callMutatorMethodAsync('updateAsync', args, options);
+    }
+
+    // it's my collection.  descend into the collection object
+    // and propagate any exception.
+    // If the user provided a callback and the collection implements this
+    // operation asynchronously, then queryRet will be undefined, and the
+    // result will be returned through the callback instead.
+
+    return this._collection.updateAsync(
+      selector,
+      modifier,
+      options
+    );
+  },
+
+  /**
+   * @summary Asynchronously removes documents from the collection.
+   * @locus Anywhere
+   * @method remove
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to remove
+   */
+  removeAsync(selector, options = {}) {
+    selector = Mongo.Collection._rewriteSelector(selector);
+
+    if (this._isRemoteCollection()) {
+      return this._callMutatorMethodAsync('removeAsync', [selector], options);
+    }
+
+    // it's my collection.  descend into the collection1 object
+    // and propagate any exception.
+    return this._collection.removeAsync(selector);
+  },
+
+  /**
+   * @summary Asynchronously modifies one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified)  and `insertedId` (the unique _id of the document that was inserted, if any).
+   * @locus Anywhere
+   * @method upsert
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to modify
+   * @param {MongoModifier} modifier Specifies how to modify the documents
+   * @param {Object} [options]
+   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
+   */
+  async upsertAsync(selector, modifier, options) {
+    return this.updateAsync(
+      selector,
+      modifier,
+      {
+        ...options,
+        _returnObject: true,
+        upsert: true,
+      });
+  },
+}
\ No newline at end of file
diff --git a/packages/mongo/collection/methods_sync.js b/packages/mongo/collection/methods_sync.js
new file mode 100644
index 0000000000..8685f13ec1
--- /dev/null
+++ b/packages/mongo/collection/methods_sync.js
@@ -0,0 +1,346 @@
+export const SyncMethods = {
+  /**
+   * @summary Find the documents in a collection that match the selector.
+   * @locus Anywhere
+   * @method find
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} [selector] A query describing the documents to find
+   * @param {Object} [options]
+   * @param {MongoSortSpecifier} options.sort Sort order (default: natural order)
+   * @param {Number} options.skip Number of results to skip at the beginning
+   * @param {Number} options.limit Maximum number of results to return
+   * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
+   * @param {Boolean} options.reactive (Client only) Default `true`; pass `false` to disable reactivity
+   * @param {Function} options.transform Overrides `transform` on the  [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation.
+   * @param {Boolean} options.disableOplog (Server only) Pass true to disable oplog-tailing on this query. This affects the way server processes calls to `observe` on this query. Disabling the oplog can be useful when working with data that updates in large batches.
+   * @param {Number} options.pollingIntervalMs (Server only) When oplog is disabled (through the use of `disableOplog` or when otherwise not available), the frequency (in milliseconds) of how often to poll this query when observing on the server. Defaults to 10000ms (10 seconds).
+   * @param {Number} options.pollingThrottleMs (Server only) When oplog is disabled (through the use of `disableOplog` or when otherwise not available), the minimum time (in milliseconds) to allow between re-polling when observing on the server. Increasing this will save CPU and mongo load at the expense of slower updates to users. Decreasing this is not recommended. Defaults to 50ms.
+   * @param {Number} options.maxTimeMs (Server only) If set, instructs MongoDB to set a time limit for this cursor's operations. If the operation reaches the specified time limit (in milliseconds) without the having been completed, an exception will be thrown. Useful to prevent an (accidental or malicious) unoptimized query from causing a full collection scan that would disrupt other database users, at the expense of needing to handle the resulting error.
+   * @param {String|Object} options.hint (Server only) Overrides MongoDB's default index selection and query optimization process. Specify an index to force its use, either by its name or index specification. You can also specify `{ $natural : 1 }` to force a forwards collection scan, or `{ $natural : -1 }` for a reverse collection scan. Setting this is only recommended for advanced users.
+   * @param {String} options.readPreference (Server only) Specifies a custom MongoDB [`readPreference`](https://docs.mongodb.com/manual/core/read-preference) for this particular cursor. Possible values are `primary`, `primaryPreferred`, `secondary`, `secondaryPreferred` and `nearest`.
+   * @returns {Mongo.Cursor}
+   */
+  find(...args) {
+    // Collection.find() (return all docs) behaves differently
+    // from Collection.find(undefined) (return 0 docs).  so be
+    // careful about the length of arguments.
+    return this._collection.find(
+      this._getFindSelector(args),
+      this._getFindOptions(args)
+    );
+  },
+
+  /**
+   * @summary Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
+   * @locus Anywhere
+   * @method findOne
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} [selector] A query describing the documents to find
+   * @param {Object} [options]
+   * @param {MongoSortSpecifier} options.sort Sort order (default: natural order)
+   * @param {Number} options.skip Number of results to skip at the beginning
+   * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
+   * @param {Boolean} options.reactive (Client only) Default true; pass false to disable reactivity
+   * @param {Function} options.transform Overrides `transform` on the [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation.
+   * @param {String} options.readPreference (Server only) Specifies a custom MongoDB [`readPreference`](https://docs.mongodb.com/manual/core/read-preference) for fetching the document. Possible values are `primary`, `primaryPreferred`, `secondary`, `secondaryPreferred` and `nearest`.
+   * @returns {Object}
+   */
+  findOne(...args) {
+    return this._collection.findOne(
+      this._getFindSelector(args),
+      this._getFindOptions(args)
+    );
+  },
+
+
+  // 'insert' immediately returns the inserted document's new _id.
+  // The others return values immediately if you are in a stub, an in-memory
+  // unmanaged collection, or a mongo-backed collection and you don't pass a
+  // callback. 'update' and 'remove' return the number of affected
+  // documents. 'upsert' returns an object with keys 'numberAffected' and, if an
+  // insert happened, 'insertedId'.
+  //
+  // Otherwise, the semantics are exactly like other methods: they take
+  // a callback as an optional last argument; if no callback is
+  // provided, they block until the operation is complete, and throw an
+  // exception if it fails; if a callback is provided, then they don't
+  // necessarily block, and they call the callback when they finish with error and
+  // result arguments.  (The insert method provides the document ID as its result;
+  // update and remove provide the number of affected docs as the result; upsert
+  // provides an object with numberAffected and maybe insertedId.)
+  //
+  // On the client, blocking is impossible, so if a callback
+  // isn't provided, they just return immediately and any error
+  // information is lost.
+  //
+  // There's one more tweak. On the client, if you don't provide a
+  // callback, then if there is an error, a message will be logged with
+  // Meteor._debug.
+  //
+  // The intent (though this is actually determined by the underlying
+  // drivers) is that the operations should be done synchronously, not
+  // generating their result until the database has acknowledged
+  // them. In the future maybe we should provide a flag to turn this
+  // off.
+
+  _insert(doc, callback) {
+    // Make sure we were passed a document to insert
+    if (!doc) {
+      throw new Error('insert requires an argument');
+    }
+
+
+    // Make a shallow clone of the document, preserving its prototype.
+    doc = Object.create(
+      Object.getPrototypeOf(doc),
+      Object.getOwnPropertyDescriptors(doc)
+    );
+
+    if ('_id' in doc) {
+      if (
+        !doc._id ||
+        !(typeof doc._id === 'string' || doc._id instanceof Mongo.ObjectID)
+      ) {
+        throw new Error(
+          'Meteor requires document _id fields to be non-empty strings or ObjectIDs'
+        );
+      }
+    } else {
+      let generateId = true;
+
+      // Don't generate the id if we're the client and the 'outermost' call
+      // This optimization saves us passing both the randomSeed and the id
+      // Passing both is redundant.
+      if (this._isRemoteCollection()) {
+        const enclosing = DDP._CurrentMethodInvocation.get();
+        if (!enclosing) {
+          generateId = false;
+        }
+      }
+
+      if (generateId) {
+        doc._id = this._makeNewID();
+      }
+    }
+
+
+    // On inserts, always return the id that we generated; on all other
+    // operations, just return the result from the collection.
+    var chooseReturnValueFromCollectionResult = function(result) {
+      if (Meteor._isPromise(result)) return result;
+
+      if (doc._id) {
+        return doc._id;
+      }
+
+      // XXX what is this for??
+      // It's some iteraction between the callback to _callMutatorMethod and
+      // the return value conversion
+      doc._id = result;
+
+      return result;
+    };
+
+    const wrappedCallback = wrapCallback(
+      callback,
+      chooseReturnValueFromCollectionResult
+    );
+
+    if (this._isRemoteCollection()) {
+      const result = this._callMutatorMethod('insert', [doc], wrappedCallback);
+      return chooseReturnValueFromCollectionResult(result);
+    }
+
+    // it's my collection.  descend into the collection object
+    // and propagate any exception.
+    try {
+      // If the user provided a callback and the collection implements this
+      // operation asynchronously, then queryRet will be undefined, and the
+      // result will be returned through the callback instead.
+      let result;
+      if (!!wrappedCallback) {
+        this._collection.insert(doc, wrappedCallback);
+      } else {
+        // If we don't have the callback, we assume the user is using the promise.
+        // We can't just pass this._collection.insert to the promisify because it would lose the context.
+        result = this._collection.insert(doc);
+      }
+
+      return chooseReturnValueFromCollectionResult(result);
+    } catch (e) {
+      if (callback) {
+        callback(e);
+        return null;
+      }
+      throw e;
+    }
+  },
+
+  /**
+   * @summary Insert a document in the collection.  Returns its unique _id.
+   * @locus Anywhere
+   * @method  insert
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {Object} doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
+   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the _id as the second.
+   */
+  insert(doc, callback) {
+    return this._insert(doc, callback);
+  },
+
+  /**
+   * @summary Asynchronously modifies one or more documents in the collection. Returns the number of matched documents.
+   * @locus Anywhere
+   * @method update
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to modify
+   * @param {MongoModifier} modifier Specifies how to modify the documents
+   * @param {Object} [options]
+   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
+   * @param {Boolean} options.upsert True to insert a document if no matching documents are found.
+   * @param {Array} options.arrayFilters Optional. Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to modify in an array field.
+   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+   */
+  update(selector, modifier, ...optionsAndCallback) {
+    const callback = popCallbackFromArgs(optionsAndCallback);
+
+    // We've already popped off the callback, so we are left with an array
+    // of one or zero items
+    const options = { ...(optionsAndCallback[0] || null) };
+    let insertedId;
+    if (options && options.upsert) {
+      // set `insertedId` if absent.  `insertedId` is a Meteor extension.
+      if (options.insertedId) {
+        if (
+          !(
+            typeof options.insertedId === 'string' ||
+            options.insertedId instanceof Mongo.ObjectID
+          )
+        )
+          throw new Error('insertedId must be string or ObjectID');
+        insertedId = options.insertedId;
+      } else if (!selector || !selector._id) {
+        insertedId = this._makeNewID();
+        options.generatedId = true;
+        options.insertedId = insertedId;
+      }
+    }
+
+    selector = Mongo.Collection._rewriteSelector(selector, {
+      fallbackId: insertedId,
+    });
+
+    const wrappedCallback = wrapCallback(callback);
+
+    if (this._isRemoteCollection()) {
+      const args = [selector, modifier, options];
+      return this._callMutatorMethod('update', args, callback);
+    }
+
+    // it's my collection.  descend into the collection object
+    // and propagate any exception.
+    // If the user provided a callback and the collection implements this
+    // operation asynchronously, then queryRet will be undefined, and the
+    // result will be returned through the callback instead.
+    //console.log({callback, options, selector, modifier, coll: this._collection});
+    try {
+      // If the user provided a callback and the collection implements this
+      // operation asynchronously, then queryRet will be undefined, and the
+      // result will be returned through the callback instead.
+      return this._collection.update(
+        selector,
+        modifier,
+        options,
+        wrappedCallback
+      );
+    } catch (e) {
+      if (callback) {
+        callback(e);
+        return null;
+      }
+      throw e;
+    }
+  },
+
+  /**
+   * @summary Remove documents from the collection
+   * @locus Anywhere
+   * @method remove
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to remove
+   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+   */
+  remove(selector, callback) {
+    selector = Mongo.Collection._rewriteSelector(selector);
+
+    if (this._isRemoteCollection()) {
+      return this._callMutatorMethod('remove', [selector], callback);
+    }
+
+
+    // it's my collection.  descend into the collection1 object
+    // and propagate any exception.
+    return this._collection.remove(selector);
+  },
+
+  /**
+   * @summary Asynchronously modifies one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified)  and `insertedId` (the unique _id of the document that was inserted, if any).
+   * @locus Anywhere
+   * @method upsert
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to modify
+   * @param {MongoModifier} modifier Specifies how to modify the documents
+   * @param {Object} [options]
+   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
+   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+   */
+  upsert(selector, modifier, options, callback) {
+    if (!callback && typeof options === 'function') {
+      callback = options;
+      options = {};
+    }
+
+    return this.update(
+      selector,
+      modifier,
+      {
+        ...options,
+        _returnObject: true,
+        upsert: true,
+      });
+  },
+}
+
+// Convert the callback to not return a result if there is an error
+function wrapCallback(callback, convertResult) {
+  return (
+    callback &&
+    function(error, result) {
+      if (error) {
+        callback(error);
+      } else if (typeof convertResult === 'function') {
+        callback(error, convertResult(result));
+      } else {
+        callback(error, result);
+      }
+    }
+  );
+}
+
+function popCallbackFromArgs(args) {
+  // Pull off any callback (or perhaps a 'callback' variable that was passed
+  // in undefined, like how 'upsert' does it).
+  if (
+    args.length &&
+    (args[args.length - 1] === undefined ||
+      args[args.length - 1] instanceof Function)
+  ) {
+    return args.pop();
+  }
+}
diff --git a/packages/mongo/connection_options.js b/packages/mongo/connection_options.ts
similarity index 100%
rename from packages/mongo/connection_options.js
rename to packages/mongo/connection_options.ts
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index e4a855421d..1356ad0756 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -101,8 +101,8 @@ Package.onUse(function (api) {
   );
   api.addFiles("local_collection_driver.js", ["client", "server"]);
   api.addFiles("remote_collection_driver.ts", "server");
-  api.addFiles("collection.js", ["client", "server"]);
-  api.addFiles("connection_options.js", "server");
+  api.addFiles("collection/collection.js", ["client", "server"]);
+  api.addFiles("connection_options.ts", "server");
   api.addAssets("mongo.d.ts", "server");
 });
 

From 1695b2312b6d5f12f83159706c0c3efd1e4fccbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 15:45:15 +0100
Subject: [PATCH 0709/1140] adapt callback to promise that block tests

---
 packages/mongo/tests/observe_changes_tests.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mongo/tests/observe_changes_tests.js b/packages/mongo/tests/observe_changes_tests.js
index 0fe94d2ebf..8974bd7b22 100644
--- a/packages/mongo/tests/observe_changes_tests.js
+++ b/packages/mongo/tests/observe_changes_tests.js
@@ -495,6 +495,7 @@ if (Meteor.isServer) {
       self.handle = await cursor.observeChanges({
         added: function(id, fields) {
           self.xs.push(fields.x);
+          console.log('self.expects.length', self.expects);
           test.notEqual(self.expects.length, 0);
           self.expects.pop()();
         },

From ac103bad1fedfc0f7c38c65770ccb3cc2a5fc6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 15:45:32 +0100
Subject: [PATCH 0710/1140] adapt callback to promise that block tests

---
 packages/mongo/oplog_tailing.ts | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/mongo/oplog_tailing.ts b/packages/mongo/oplog_tailing.ts
index fe99db2833..440339fa6f 100644
--- a/packages/mongo/oplog_tailing.ts
+++ b/packages/mongo/oplog_tailing.ts
@@ -226,14 +226,9 @@ export class OplogHandle {
     );
 
     try {
-      const isMasterDoc = await new Promise<any>((resolve, reject) => {
-        this._oplogLastEntryConnection!.db
-          .admin()
-          .command({ ismaster: 1 }, (err: Error | null, result: any) => {
-            if (err) reject(err);
-            else resolve(result);
-          });
-      });
+      const isMasterDoc = await this._oplogLastEntryConnection!.db
+        .admin()
+        .command({ ismaster: 1 });
 
       if (!(isMasterDoc && isMasterDoc.setName)) {
         throw new Error("$MONGO_OPLOG_URL must be set to the 'local' database of a Mongo replica set");
@@ -426,4 +421,4 @@ export function idForOp(op: OplogEntry): string {
   } else {
     throw Error("Unknown op: " + JSON.stringify(op));
   }
-}
\ No newline at end of file
+}

From fc808d90ff16ec18e574e60089ce702b7f988b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 15:49:21 +0100
Subject: [PATCH 0711/1140] clean console

---
 packages/mongo/tests/observe_changes_tests.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/mongo/tests/observe_changes_tests.js b/packages/mongo/tests/observe_changes_tests.js
index 8974bd7b22..0fe94d2ebf 100644
--- a/packages/mongo/tests/observe_changes_tests.js
+++ b/packages/mongo/tests/observe_changes_tests.js
@@ -495,7 +495,6 @@ if (Meteor.isServer) {
       self.handle = await cursor.observeChanges({
         added: function(id, fields) {
           self.xs.push(fields.x);
-          console.log('self.expects.length', self.expects);
           test.notEqual(self.expects.length, 0);
           self.expects.pop()();
         },

From c653cd952c02aefc0f02446961b139ca04bff305 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 29 Oct 2024 10:50:34 -0400
Subject: [PATCH 0712/1140] shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json          | 449 +-----------------
 1 file changed, 14 insertions(+), 435 deletions(-)

diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 6c5b66a97b..85a00eddab 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -1,396 +1,10 @@
 {
   "lockfileVersion": 4,
   "dependencies": {
-    "@aws-crypto/sha256-browser": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
-      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
-      "dependencies": {
-        "@smithy/is-array-buffer": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
-          "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="
-        },
-        "@smithy/util-buffer-from": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
-          "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="
-        },
-        "@smithy/util-utf8": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-          "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="
-        }
-      }
-    },
-    "@aws-crypto/sha256-js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
-      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA=="
-    },
-    "@aws-crypto/supports-web-crypto": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
-      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg=="
-    },
-    "@aws-crypto/util": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
-      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
-      "dependencies": {
-        "@smithy/is-array-buffer": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
-          "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="
-        },
-        "@smithy/util-buffer-from": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
-          "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="
-        },
-        "@smithy/util-utf8": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-          "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="
-        }
-      }
-    },
-    "@aws-sdk/client-cognito-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.677.0.tgz",
-      "integrity": "sha512-wGhbHAZGa5VeVLCyAfhyFWXl+JfsHSgSl0eodH6xqKoR60LTDJZbBgQZizUwSj8EoSzsglBvgPLYZaLfXTKM/g=="
-    },
-    "@aws-sdk/client-sso": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.677.0.tgz",
-      "integrity": "sha512-/y6EskFhOa2w9VwXaXoyOrGeBjnOj/72wsxDOslS908qH+nf7m40pBK6e/iBelg04vlx0gqhlbfK8hLbaT6KHA=="
-    },
-    "@aws-sdk/client-sso-oidc": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.677.0.tgz",
-      "integrity": "sha512-2zgZkRIU7DsnUVOy+9bjfJ0IYMzi9ONWXQt/WqMa7HOnj4RfenfpipyhHYxGZR5kmehgv53EI79yvUu+SAfGNg=="
-    },
-    "@aws-sdk/client-sts": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.677.0.tgz",
-      "integrity": "sha512-N5fs1GLSthnwrs44b4IJI//dcShuIT42g4pM8FCUJZwbrWn9Sp9F876R1mvb8A9TAy2S4qCXi7TkHS0REnuicQ=="
-    },
-    "@aws-sdk/core": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.677.0.tgz",
-      "integrity": "sha512-5auvc1wmXmd7u9Y9nM95Ia+VX7J2FiZLuADitHqE4mHPH9riDgOY+uK/yM+UKr+lfq4zKiZQG7i8cfabZlCY8g=="
-    },
-    "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.677.0.tgz",
-      "integrity": "sha512-ODw8MKhT41KLpKlGIH1yFO2FIOCAW3Nnn2uCu1eAm807aI0OK31ntUNrY+GFzXX7ixv+KFoiJu3ih+w+Oxw5gA=="
-    },
-    "@aws-sdk/credential-provider-env": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.677.0.tgz",
-      "integrity": "sha512-0ctcqKzclr9TiNIkB8I+YRogjWH/4mLWQGv/bgb8ElHqph+rPy4pOubj1Ax01sbs7XdwDaImjBYV5xXE+BEsYw=="
-    },
-    "@aws-sdk/credential-provider-http": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.677.0.tgz",
-      "integrity": "sha512-c4TnShdzk37dhL1HGGzZ2PDKIIEmo1IbT/4y5hSRdNc8Z8fu6spE5GoeVsv6p/HdSGPS7XTy6aOFCMCk4AeIzQ=="
-    },
-    "@aws-sdk/credential-provider-ini": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.677.0.tgz",
-      "integrity": "sha512-hW+oHj5zplPLzTk74LG+gZVOKQnmBPyRIbwg3uZWr23xfOxh/Osu9Wq8qwgu2+UyFHr+6/DRFjZJ6avNA2jpKw=="
-    },
-    "@aws-sdk/credential-provider-node": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.677.0.tgz",
-      "integrity": "sha512-DwFriiDx2SSdj7VhRv/0fm8UIK7isy+WZAlqUdZ9xDsX4x1AD5KwMv9AwGhJrMuTjnPSxRSwjt23S7ZXwUfhdw=="
-    },
-    "@aws-sdk/credential-provider-process": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.677.0.tgz",
-      "integrity": "sha512-pBqHjIFvHBJb2NOsVqdIHWcOzXDoNXBokxTvMggb3WYML6ixwrH7kpd1CAzegeQlvZD4SCcRoy3ahv5rbuR+og=="
-    },
-    "@aws-sdk/credential-provider-sso": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.677.0.tgz",
-      "integrity": "sha512-OkRP3z8yI22t9LS9At5fYr6RN7zKSDiGgeyjEnrqiGHOWGPMJN2GKa8IAFC4dgXt4Nm/EfmEW7UweiqzEKJKOA=="
-    },
-    "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.677.0.tgz",
-      "integrity": "sha512-yjuI6hSt1rLFqBQiNKx/nF75Ao72xR8ybqKztzebtFNCrYl8oXVkRiigg5XKNCDmelsx1lcU9IcSiuPHzlGtUQ=="
-    },
-    "@aws-sdk/credential-providers": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.677.0.tgz",
-      "integrity": "sha512-fUEDkRI2GuN+p9xyZewlRQC2vFXjxPOoQGugQTmOawTxVUYkFpssg4ID0HUtkKuJYHjaoD2bCyKvOcnL1JU6AA=="
-    },
-    "@aws-sdk/middleware-host-header": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
-      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w=="
-    },
-    "@aws-sdk/middleware-logger": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
-      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA=="
-    },
-    "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
-      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
-    },
-    "@aws-sdk/middleware-user-agent": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.677.0.tgz",
-      "integrity": "sha512-A3gzUsTsvyv/JCmD0p2fkbiOyp+tpAiAADDwzi+eYeyzH4xzqnrzSkGk5KSb58uUQo27eeBzRXHd46d0u+sMrQ=="
-    },
-    "@aws-sdk/region-config-resolver": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
-      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg=="
-    },
-    "@aws-sdk/token-providers": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
-      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg=="
-    },
-    "@aws-sdk/types": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
-      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg=="
-    },
-    "@aws-sdk/util-endpoints": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
-      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA=="
-    },
-    "@aws-sdk/util-locate-window": {
-      "version": "3.568.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
-      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
-    },
-    "@aws-sdk/util-user-agent-browser": {
-      "version": "3.675.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz",
-      "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
-    },
-    "@aws-sdk/util-user-agent-node": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.677.0.tgz",
-      "integrity": "sha512-gFhL0zVY/um0Eu2aWil82pjWaZL4yBmOnjz0+RDz18okFBHaz1Om8o/H+1Vvj+xsnuDYV4ezVMyAaXVtTcYOnw=="
-    },
-    "@mongodb-js/saslprep": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
-      "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
-    },
-    "@smithy/abort-controller": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.6.tgz",
-      "integrity": "sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ=="
-    },
-    "@smithy/config-resolver": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.10.tgz",
-      "integrity": "sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw=="
-    },
-    "@smithy/core": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.1.tgz",
-      "integrity": "sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg=="
-    },
-    "@smithy/credential-provider-imds": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz",
-      "integrity": "sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg=="
-    },
-    "@smithy/fetch-http-handler": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz",
-      "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A=="
-    },
-    "@smithy/hash-node": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.8.tgz",
-      "integrity": "sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng=="
-    },
-    "@smithy/invalid-dependency": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz",
-      "integrity": "sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q=="
-    },
-    "@smithy/is-array-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
-      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="
-    },
-    "@smithy/middleware-content-length": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz",
-      "integrity": "sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg=="
-    },
-    "@smithy/middleware-endpoint": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz",
-      "integrity": "sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA=="
-    },
-    "@smithy/middleware-retry": {
-      "version": "3.0.25",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz",
-      "integrity": "sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg=="
-    },
-    "@smithy/middleware-serde": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz",
-      "integrity": "sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA=="
-    },
-    "@smithy/middleware-stack": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz",
-      "integrity": "sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA=="
-    },
-    "@smithy/node-config-provider": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz",
-      "integrity": "sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew=="
-    },
-    "@smithy/node-http-handler": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz",
-      "integrity": "sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w=="
-    },
-    "@smithy/property-provider": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.8.tgz",
-      "integrity": "sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA=="
-    },
-    "@smithy/protocol-http": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.5.tgz",
-      "integrity": "sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg=="
-    },
-    "@smithy/querystring-builder": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz",
-      "integrity": "sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA=="
-    },
-    "@smithy/querystring-parser": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz",
-      "integrity": "sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg=="
-    },
-    "@smithy/service-error-classification": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz",
-      "integrity": "sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g=="
-    },
-    "@smithy/shared-ini-file-loader": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz",
-      "integrity": "sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA=="
-    },
-    "@smithy/signature-v4": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.1.tgz",
-      "integrity": "sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg=="
-    },
-    "@smithy/smithy-client": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.2.tgz",
-      "integrity": "sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA=="
-    },
-    "@smithy/types": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.6.0.tgz",
-      "integrity": "sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w=="
-    },
-    "@smithy/url-parser": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.8.tgz",
-      "integrity": "sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg=="
-    },
-    "@smithy/util-base64": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz",
-      "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ=="
-    },
-    "@smithy/util-body-length-browser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz",
-      "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ=="
-    },
-    "@smithy/util-body-length-node": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz",
-      "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA=="
-    },
-    "@smithy/util-buffer-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
-      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA=="
-    },
-    "@smithy/util-config-provider": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz",
-      "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="
-    },
-    "@smithy/util-defaults-mode-browser": {
-      "version": "3.0.25",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz",
-      "integrity": "sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA=="
-    },
-    "@smithy/util-defaults-mode-node": {
-      "version": "3.0.25",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz",
-      "integrity": "sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g=="
-    },
-    "@smithy/util-endpoints": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz",
-      "integrity": "sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ=="
-    },
-    "@smithy/util-hex-encoding": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz",
-      "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="
-    },
-    "@smithy/util-middleware": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.8.tgz",
-      "integrity": "sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA=="
-    },
-    "@smithy/util-retry": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.8.tgz",
-      "integrity": "sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow=="
-    },
-    "@smithy/util-stream": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.2.1.tgz",
-      "integrity": "sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==",
-      "dependencies": {
-        "@smithy/fetch-http-handler": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz",
-          "integrity": "sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g=="
-        }
-      }
-    },
-    "@smithy/util-uri-escape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
-      "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg=="
-    },
-    "@smithy/util-utf8": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
-      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
-    },
     "@types/node": {
-      "version": "22.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
-      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
+      "version": "22.8.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.2.tgz",
+      "integrity": "sha512-NzaRNFV+FZkvK/KLCsNdTvID0SThyrs5SHB6tsD/lajr22FGC73N2QeDPM2wHtVde8mgcXuSsHQkH5cX1pbPLw=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",
@@ -402,35 +16,10 @@
       "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz",
       "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="
     },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-    },
-    "bowser": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
-      "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
-    },
     "bson": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz",
-      "integrity": "sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ=="
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="
-    },
-    "fast-xml-parser": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
-      "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw=="
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-5.5.1.tgz",
+      "integrity": "sha512-ix0EwukN2EpC0SRWIj/7B5+A6uQMQy6KMREI9qQqvgpkV2frH63T0UDVd1SYedL6dNCmDBYB3QtXi4ISk9YT+g=="
     },
     "ip-address": {
       "version": "9.0.5",
@@ -448,9 +37,9 @@
       "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="
     },
     "mongodb": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.17.2.tgz",
-      "integrity": "sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.0.0.tgz",
+      "integrity": "sha512-WHmlbefKp/iAX2LlSZ56iKt4pRftib/dD3mDaji8R7IJcRoKPc5+/kSn3mIBxKPLVxcl73KdDKBLkQTxj1OjaA=="
     },
     "mongodb-connection-string-url": {
       "version": "2.6.0",
@@ -462,6 +51,11 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
     },
+    "saslprep": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
+      "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="
+    },
     "smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -482,31 +76,16 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
     },
-    "strnum": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
-      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
-    },
     "tr46": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
       "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="
     },
-    "tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA=="
-    },
     "undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
       "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
     },
-    "uuid": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
-    },
     "webidl-conversions": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",

From 5ba0a32f7e0b8faf48ee661e7d00de8f9a036d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 16:22:46 +0100
Subject: [PATCH 0713/1140] solve test

---
 packages/mongo/tests/oplog_tests.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/mongo/tests/oplog_tests.js b/packages/mongo/tests/oplog_tests.js
index 55643c0922..201a09e904 100644
--- a/packages/mongo/tests/oplog_tests.js
+++ b/packages/mongo/tests/oplog_tests.js
@@ -96,14 +96,7 @@ process.env.MONGO_OPLOG_URL &&
       }
       // XXX implement bulk insert #1255
       var rawCollection = self.collection.rawCollection();
-      rawCollection.insertMany(
-        docs,
-        Meteor.bindEnvironment(
-          expect(function(err) {
-            test.isFalse(err);
-          })
-        )
-      );
+      await rawCollection.insertMany(docs);
     },
 
     async function(test, expect) {

From 0e9c0983161c55bbae6ce967e71702bbeb2ab8b5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 29 Oct 2024 11:24:59 -0400
Subject: [PATCH 0714/1140] fix test

---
 packages/mongo/tests/mongo_livedata_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index d3a3080485..48ad53fc2b 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -3961,7 +3961,7 @@ Meteor.isServer &&
 Meteor.isServer &&
   Tinytest.add('mongo-livedata - npm modules', function(test) {
     // Make sure the version number looks like a version number.
-    test.matches(MongoInternals.NpmModules.mongodb.version, /^5\.(\d+)\.(\d+)/);
+    test.matches(MongoInternals.NpmModules.mongodb.version, /^6\.(\d+)\.(\d+)/);
     test.equal(typeof MongoInternals.NpmModules.mongodb.module, 'object');
     test.equal(
       typeof MongoInternals.NpmModules.mongodb.module.ObjectId,

From 8a9b607cb3e2b5075322be4abd1e83c09f90e5c3 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 29 Oct 2024 11:25:14 -0400
Subject: [PATCH 0715/1140] update to 6.10

---
 .../.npm/package/npm-shrinkwrap.json          | 79 ++++++-------------
 packages/npm-mongo/package.js                 |  2 +-
 2 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 85a00eddab..471827971a 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -1,10 +1,10 @@
 {
   "lockfileVersion": 4,
   "dependencies": {
-    "@types/node": {
-      "version": "22.8.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.2.tgz",
-      "integrity": "sha512-NzaRNFV+FZkvK/KLCsNdTvID0SThyrs5SHB6tsD/lajr22FGC73N2QeDPM2wHtVde8mgcXuSsHQkH5cX1pbPLw=="
+    "@mongodb-js/saslprep": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
+      "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",
@@ -12,24 +12,14 @@
       "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA=="
     },
     "@types/whatwg-url": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz",
-      "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz",
+      "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ=="
     },
     "bson": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-5.5.1.tgz",
-      "integrity": "sha512-ix0EwukN2EpC0SRWIj/7B5+A6uQMQy6KMREI9qQqvgpkV2frH63T0UDVd1SYedL6dNCmDBYB3QtXi4ISk9YT+g=="
-    },
-    "ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g=="
-    },
-    "jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-6.9.0.tgz",
+      "integrity": "sha512-X9hJeyeM0//Fus+0pc5dSUMhhrrmWwQUtdavaQeF3Ta6m69matZkGWV/MrBcnwUeLC8W9kwwc2hfkZgUuCX3Ig=="
     },
     "memory-pager": {
       "version": "1.5.0",
@@ -37,54 +27,29 @@
       "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="
     },
     "mongodb": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.0.0.tgz",
-      "integrity": "sha512-WHmlbefKp/iAX2LlSZ56iKt4pRftib/dD3mDaji8R7IJcRoKPc5+/kSn3mIBxKPLVxcl73KdDKBLkQTxj1OjaA=="
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.10.0.tgz",
+      "integrity": "sha512-gP9vduuYWb9ZkDM546M+MP2qKVk5ZG2wPF63OvSRuUbqCR+11ZCAE1mOfllhlAG0wcoJY5yDL/rV3OmYEwXIzg=="
     },
     "mongodb-connection-string-url": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz",
-      "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz",
+      "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg=="
     },
     "punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
     },
-    "saslprep": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
-      "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="
-    },
-    "smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
-    },
-    "socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw=="
-    },
     "sparse-bitfield": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
       "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ=="
     },
-    "sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
-    },
     "tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
+      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw=="
     },
     "webidl-conversions": {
       "version": "7.0.0",
@@ -92,9 +57,9 @@
       "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="
     },
     "whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz",
+      "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig=="
     }
   }
 }
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 022ab71304..cdd60850c1 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -8,7 +8,7 @@ Package.describe({
 });
 
 Npm.depends({
-  mongodb: "5.0.0"
+  mongodb: "6.10.0"
 });
 
 Package.onUse(function (api) {

From 69dff8aea1186703a985b9cf177a59ea85fb6779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 16:36:06 +0100
Subject: [PATCH 0716/1140] fix test

---
 packages/mongo/mongo_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/mongo_common.js b/packages/mongo/mongo_common.js
index 9e1c95a768..c6d0953726 100644
--- a/packages/mongo/mongo_common.js
+++ b/packages/mongo/mongo_common.js
@@ -77,7 +77,7 @@ export const replaceMeteorAtomWithMongo = function (document) {
   if (document instanceof MongoDB.Binary) {
     return document;
   }
-  if (document instanceof Mongo.ObjectID) {
+  if (document instanceof MongoDB.ObjectId) {
     return new MongoDB.ObjectId(document.toHexString());
   }
   if (document instanceof MongoDB.Timestamp) {

From f73aac39ddda754f00efcda0540c411da72e5e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 16:37:47 +0100
Subject: [PATCH 0717/1140] fix reference of ObjectId

---
 packages/mongo/collection/collection.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/mongo/collection/collection.js b/packages/mongo/collection/collection.js
index 87878de2f1..6ce7a0419a 100644
--- a/packages/mongo/collection/collection.js
+++ b/packages/mongo/collection/collection.js
@@ -724,7 +724,7 @@ Object.assign(Mongo, {
  * @class
  * @param {String} [hexString] Optional.  The 24-character hexadecimal contents of the ObjectID to create
  */
-Mongo.ObjectID = MongoID.ObjectID;
+Mongo.ObjectID = MongoID.ObjectId;
 
 /**
  * @summary To create a cursor, use find. To access the documents in a cursor, use forEach, map, or fetch.
@@ -750,4 +750,3 @@ Meteor.Collection = Mongo.Collection;
 
 // Allow deny stuff is now in the allow-deny package
 Object.assign(Mongo.Collection.prototype, AllowDeny.CollectionPrototype);
-

From 4ca0b3794c64655c02bbd883a23ea0f7ec722e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 16:39:04 +0100
Subject: [PATCH 0718/1140] Revert "fix reference of ObjectId"

This reverts commit f73aac39ddda754f00efcda0540c411da72e5e41.
---
 packages/mongo/collection/collection.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/collection/collection.js b/packages/mongo/collection/collection.js
index 6ce7a0419a..87878de2f1 100644
--- a/packages/mongo/collection/collection.js
+++ b/packages/mongo/collection/collection.js
@@ -724,7 +724,7 @@ Object.assign(Mongo, {
  * @class
  * @param {String} [hexString] Optional.  The 24-character hexadecimal contents of the ObjectID to create
  */
-Mongo.ObjectID = MongoID.ObjectId;
+Mongo.ObjectID = MongoID.ObjectID;
 
 /**
  * @summary To create a cursor, use find. To access the documents in a cursor, use forEach, map, or fetch.
@@ -750,3 +750,4 @@ Meteor.Collection = Mongo.Collection;
 
 // Allow deny stuff is now in the allow-deny package
 Object.assign(Mongo.Collection.prototype, AllowDeny.CollectionPrototype);
+

From a7f437e92a51cffcf040517180b64c13be888df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 29 Oct 2024 17:00:26 +0100
Subject: [PATCH 0719/1140] adding missing scenario to properly generate ids

---
 packages/mongo/mongo_common.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/mongo/mongo_common.js b/packages/mongo/mongo_common.js
index c6d0953726..af2ec849c5 100644
--- a/packages/mongo/mongo_common.js
+++ b/packages/mongo/mongo_common.js
@@ -77,6 +77,9 @@ export const replaceMeteorAtomWithMongo = function (document) {
   if (document instanceof MongoDB.Binary) {
     return document;
   }
+  if (document instanceof Mongo.ObjectID) {
+    return new MongoDB.ObjectId(document.toHexString());
+  }
   if (document instanceof MongoDB.ObjectId) {
     return new MongoDB.ObjectId(document.toHexString());
   }

From 21256001833b5bc1d5d0dc9a1535bb58dbd0f7c5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 29 Oct 2024 12:51:43 -0400
Subject: [PATCH 0720/1140] update history

---
 v3-docs/docs/api/packages-listing.md |   4 +-
 v3-docs/docs/history.md              | 142 +++++++++++++++++++++++++++
 2 files changed, 144 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/api/packages-listing.md b/v3-docs/docs/api/packages-listing.md
index f6f064191a..2490d02ed4 100644
--- a/v3-docs/docs/api/packages-listing.md
+++ b/v3-docs/docs/api/packages-listing.md
@@ -134,6 +134,7 @@
 ### [standard-minifier-js](https://github.com/meteor/meteor/tree/devel/packages/standard-minifier-js) {#standard-minifier-js}
 ### [standard-minifiers](https://github.com/meteor/meteor/tree/devel/packages/standard-minifiers) {#standard-minifiers}
 ### [static-html](https://github.com/meteor/meteor/tree/devel/packages/static-html) {#static-html}
+### [static-html-tools](https://github.com/meteor/meteor/tree/devel/packages/static-html-tools) {#static-html-tools}
 ### [test-helpers](https://github.com/meteor/meteor/tree/devel/packages/test-helpers) {#test-helpers}
 ### [test-in-browser](https://github.com/meteor/meteor/tree/devel/packages/test-in-browser) {#test-in-browser}
 ### [test-in-console](https://github.com/meteor/meteor/tree/devel/packages/test-in-console) {#test-in-console}
@@ -145,9 +146,8 @@
 ### [twitter-oauth](https://github.com/meteor/meteor/tree/devel/packages/twitter-oauth) {#twitter-oauth}
 ### [typescript](https://github.com/meteor/meteor/tree/devel/packages/typescript) {#typescript}
 ### [underscore](https://github.com/meteor/meteor/tree/devel/packages/underscore) {#underscore}
-### [underscore-tests](https://github.com/meteor/meteor/tree/devel/packages/underscore-tests) {#underscore-tests}
 ### [url](https://github.com/meteor/meteor/tree/devel/packages/url) {#url}
 ### [webapp](https://github.com/meteor/meteor/tree/devel/packages/webapp) {#webapp}
 ### [webapp-hashing](https://github.com/meteor/meteor/tree/devel/packages/webapp-hashing) {#webapp-hashing}
 ### [weibo-config-ui](https://github.com/meteor/meteor/tree/devel/packages/weibo-config-ui) {#weibo-config-ui}
-### [weibo-oauth](https://github.com/meteor/meteor/tree/devel/packages/weibo-oauth) {#weibo-oauth}
+### [weibo-oauth](https://github.com/meteor/meteor/tree/devel/packages/weibo-oauth) {#weibo-oauth}
\ No newline at end of file
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index fb537c579f..76e1de7641 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -12,6 +12,148 @@ This is a complete history of changes for Meteor releases.
 
 
 
+## v3.1.0, 2024-xx-xx
+
+### Highlights
+
+N/A
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.1.0
+
+```
+
+
+
+#### Meteor Version Release
+
+N/A
+
+#### Special thanks to
+
+N/A
+## v3.0.4, 2024-10-15
+
+### Highlights
+
+- Node 20.18.0 & Typescript 5.6.2
+- Updated webapp dependencies.
+- DDP-server and DDP-client removed underscore
+- Remove dependencies on Blaze packages when using static-html
+- Fix Cordova on Windows
+- Fix Cordova build on using plugins describing dependencies
+- Various Windows specific fixes
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.0.4
+
+```
+
+#### Meteor Version Release
+
+* `Bumped packages`:
+  - accounts-base@3.0.3                
+  - babel-compiler@7.11.1              
+  - caching-compiler@2.0.1             
+  - check@1.4.4                        
+  - ddp-client@3.0.2                   
+  - ddp-server@3.0.2                   
+  - ecmascript-runtime@0.8.3           
+  - modules@0.20.2                     
+  - static-html-tools@1.0.0            
+  - static-html@1.4.0                  
+  - url@1.3.4                          
+  - webapp@2.0.3                       
+  - meteor-tool@3.0.4
+
+#### Special thanks to
+N/A
+## v3.0.3, 2024-09-11
+
+### Highlights
+
+- Fixed `Meteor.userId` only being invoked with `bindEnvironment`.
+- Updated to Node `20.17.x`.
+- Fixed an issue where `meteor --open` opens the browser before the app is started.
+- Investigated and addressed the error when installing the `jam:method` package.
+- Improved the message for new available versions when running an app.
+- Updated the documentation link inside `install.sh`.
+- Resolved the issue where subscriptions stopped after a parameter change.
+- Added MongoDB connection telemetry.
+- Bumped the `email` package to prevent update errors.
+- Cordova package updates
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+- Some internal changes to how async contexts are handled, ensuring better performance and garbage collection.
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.0.3
+
+```
+
+If you've had your Meteor installation for over a year, we suggest reinstalling it to avoid any package installation issues. You can do this by running a few quick commands:
+
+```bash
+npx meteor uninstall // or rm -rf ~/.meteor
+npx meteor
+```
+
+
+
+#### Meteor Version Release
+
+* `Bumped packages`:
+  - accounts-base@3.0.2
+  - accounts-password@3.0.2
+  - email@3.1.0
+  - mongo@2.0.2
+
+
+#### Special thanks to
+
+- [@ayewo](https://github.com/ayewo).
+- [@denihs](https://github.com/denihs).
+- [@harryadel](https://github.com/harryadel).
+- [@kbarr1212](https://github.com/kbarr1212).
+- [@leonardoventurini](https://github.com/leonardoventurini).
+- [@nachocodoner](https://github.com/nachocodoner).
+
 ## v3.0.2, 2024-08-14
 
 ### Highlights

From dce340b4447c39e4efa6e23ba56ddbf2de487002 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 29 Oct 2024 13:41:04 -0400
Subject: [PATCH 0721/1140] - remove module-alias - create a new way to filter
 node warnings - bump BUNDLE_VERSION

---
 meteor                                        |  8 +++-
 .../.npm/package/npm-shrinkwrap.json          |  6 +--
 .../email/.npm/package/npm-shrinkwrap.json    |  6 +--
 scripts/dev-bundle-tool-package.js            |  1 -
 tools/index.js                                | 34 ++++++++--------
 tools/module-alias-setup.js                   | 39 -------------------
 tools/node-process-warnings.js                | 20 ++++++++++
 7 files changed, 49 insertions(+), 65 deletions(-)
 delete mode 100644 tools/module-alias-setup.js
 create mode 100644 tools/node-process-warnings.js

diff --git a/meteor b/meteor
index ab1a946258..976947c7d4 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.10.0.4
+BUNDLE_VERSION=22.10.0.5
 
 
 # OS Check. Put here because here is where we download the precompiled
@@ -123,6 +123,7 @@ fi
 
 DEV_BUNDLE="$SCRIPT_DIR/dev_bundle"
 METEOR="$SCRIPT_DIR/tools/index.js"
+PROCESS_REQUIRES="$SCRIPT_DIR/tools/node-process-requires.js"
 
 # Set the nofile ulimit as high as permitted by the hard-limit/kernel
 if [ "$(ulimit -Sn)" != "unlimited" ]; then
@@ -137,6 +138,11 @@ if [ "$(ulimit -Sn)" != "unlimited" ]; then
     fi
 fi
 
+# By default, we disable all the Node warnings
+# Then we re-enable the warning on tools/node-process-warning
+# The advantage of this is that we have full control of which warning we want to suppress
+export NODE_OPTIONS="--no-warnings"
+
 # We used to set $NODE_PATH here to include the node_modules from the dev
 # bundle, but now we just get them from the symlink at tools/node_modules. This
 # is better because node_modules directories found via the ancestor walk from
diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
index 64d0411523..17d5ae8af2 100644
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
+      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg=="
     },
     "@types/notp": {
       "version": "2.0.5",
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index 68404a03da..662abdbb5a 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw=="
+      "version": "22.8.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
+      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg=="
     },
     "@types/nodemailer": {
       "version": "6.4.14",
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 8c5632939b..ddaea69a84 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -11,7 +11,6 @@ var packageJson = {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
     npm: "10.9.0",
-    "module-alias": "2.2.3",
     "node-gyp": "10.2.0",
     "@mapbox/node-pre-gyp": "1.0.11",
     typescript: "5.6.3",
diff --git a/tools/index.js b/tools/index.js
index 26b786bb9e..5967be9ed7 100644
--- a/tools/index.js
+++ b/tools/index.js
@@ -1,24 +1,22 @@
+require("./node-process-warnings");
 const { getChildProcess } = require("./cli/dev-bundle-bin-commands");
-const { setupAlias } = require("./module-alias-setup");
 
-getChildProcess({ isFirstTry: true })
-  .then(setupAlias)
-  .then(
-    (child) => {
-      if (!child) {
-        // Use process.nextTick here to prevent the Promise from swallowing
-        // errors from the rest of the setup code.
-        process.nextTick(continueSetup);
-      }
-      // If we spawned a process to handle a dev_bundle/bin command like
-      // `meteor npm` or `meteor node`, then don't run any other tool code.
-    },
-    (error) => {
-      process.nextTick(function () {
-        throw error;
-      });
+getChildProcess({ isFirstTry: true }).then(
+  (child) => {
+    if (!child) {
+      // Use process.nextTick here to prevent the Promise from swallowing
+      // errors from the rest of the setup code.
+      process.nextTick(continueSetup);
     }
-  );
+    // If we spawned a process to handle a dev_bundle/bin command like
+    // `meteor npm` or `meteor node`, then don't run any other tool code.
+  },
+  (error) => {
+    process.nextTick(function () {
+      throw error;
+    });
+  }
+);
 
 function continueSetup() {
   // Set up the Babel transpiler
diff --git a/tools/module-alias-setup.js b/tools/module-alias-setup.js
deleted file mode 100644
index be07159bb2..0000000000
--- a/tools/module-alias-setup.js
+++ /dev/null
@@ -1,39 +0,0 @@
-const path = require("path");
-const moduleAlias = require("module-alias");
-const { getDevBundleDir } = require("./cli/dev-bundle");
-
-moduleAlias.addAlias("punycode", "punycode/");
-
-/*
-* A warning was introduced in Node 22:
-*
-* "The `punycode` module is deprecated. Please use a userland alternative instead."
-*
-* The problem is that punycode is deeply integrated in the Node system. It's not a
-* simple direct dependency.
-*
-* Check these issues for more details:
-* https://github.com/mathiasbynens/punycode.js/issues/137
-* https://stackoverflow.com/questions/68774489/punycode-is-deprecated-in-npm-what-should-i-replace-it-with/78946745
-*
-* This warning was, besides being annoying, breaking our tests.
-*
-* The solution below uses module-alias to "change" the punycode's name.
-*/
-async function setupPunycodeAlias() {
-  const devBundleDir = await getDevBundleDir();
-  const nodeModulesPath = path.join(devBundleDir, "lib", "node_modules");
-  process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS || ""} -r ${path.join(
-    nodeModulesPath,
-    "module-alias",
-    "register"
-  )}`;
-}
-
-async function setupAlias() {
-  return setupPunycodeAlias();
-}
-
-module.exports = {
-  setupAlias,
-};
diff --git a/tools/node-process-warnings.js b/tools/node-process-warnings.js
new file mode 100644
index 0000000000..a96bee9d5b
--- /dev/null
+++ b/tools/node-process-warnings.js
@@ -0,0 +1,20 @@
+process.on("warning", (warn) => {
+  if (warn.message.includes("punycode")) {
+    /*
+     * A warning was introduced in Node 22:
+     *
+     * "The `punycode` module is deprecated. Please use a userland alternative instead."
+     *
+     * The problem is that punycode is deeply integrated in the Node system. It's not a
+     * simple direct dependency.
+     *
+     * Check these issues for more details:
+     * https://github.com/mathiasbynens/punycode.js/issues/137
+     * https://stackoverflow.com/questions/68774489/punycode-is-deprecated-in-npm-what-should-i-replace-it-with/78946745
+     *
+     * This warning was, besides being annoying, breaking our tests.
+     */
+    return;
+  }
+  console.warn(warn);
+});

From 99bc37735d3acb7b0a01a5caa198268790cfc25e Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 29 Oct 2024 14:07:34 -0400
Subject: [PATCH 0722/1140] - change node options to include the ones provided
 by the dev

---
 meteor                                        |   4 +-
 .../modules/.npm/package/npm-shrinkwrap.json  |   6 +-
 .../.npm/package/npm-shrinkwrap.json          | 150 +++++++++---------
 3 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/meteor b/meteor
index 976947c7d4..3c3e961ea1 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.10.0.5
+BUNDLE_VERSION=22.10.0.6
 
 
 # OS Check. Put here because here is where we download the precompiled
@@ -141,7 +141,7 @@ fi
 # By default, we disable all the Node warnings
 # Then we re-enable the warning on tools/node-process-warning
 # The advantage of this is that we have full control of which warning we want to suppress
-export NODE_OPTIONS="--no-warnings"
+export NODE_OPTIONS="--no-warnings $NODE_OPTIONS"
 
 # We used to set $NODE_PATH here to include the node_modules from the dev
 # bundle, but now we just get them from the symlink at tools/node_modules. This
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 7c1a6396d6..bd86daae17 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -12,9 +12,9 @@
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "acorn": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
-      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="
     },
     "estree-walker": {
       "version": "2.0.2",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 08e50b8ebe..a8403a7ef9 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,114 +56,114 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.678.0.tgz",
-      "integrity": "sha512-cSIWC9q3GBFjTzqTZTOHILxWln9YQGce3o7Jx1m4XCN16ITRiliFgiw3rbAc1H1vtYy4LfvymhC55iU80jB+4A=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.679.0.tgz",
+      "integrity": "sha512-vJzQ6QpaMu8itJMe3FH1/0rwMjL0ELh63iLTxiAmhiV/SvCwNNoSFLd2HdKxbV0Bg/x8lUiPVq3pl6+cxaIrEQ=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.678.0.tgz",
-      "integrity": "sha512-5Fg2BkR1En8iBbiZ18STvLDGPK9Re5MyCmX+hfIhQzPsEf1FRkAkOluEXX79aBva8iWn2oCD/xKBUku4x3eusw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.679.0.tgz",
+      "integrity": "sha512-/0cAvYnpOZTo/Y961F1kx2fhDDLUYZ0SQQ5/75gh3xVImLj7Zw+vp74ieqFbqWLYGMaq8z1Arr9A8zG95mbLdg=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.678.0.tgz",
-      "integrity": "sha512-sgj9Y4zGiwLePLDjqhGoghoZgseh88JkKkwWH558IIte/cf/ix7ezOvptnA0WUlI5Z/329LtkN6O8TRqSJ7MWw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.679.0.tgz",
+      "integrity": "sha512-/dBYWcCwbA/id4sFCIVZvf0UsvzHCC68SryxeNQk/PDkY9N4n5yRcMUkZDaEyQCjowc3kY4JOXp2AdUP037nhA=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.678.0.tgz",
-      "integrity": "sha512-oRtDnbqIuTbBq0xd7XlaugDA41EqRFzWLpPNr4uwkH8L7xwtIByfJG/qXx2OtOiFFasAhMWJLu/DDqWZyp819A=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.679.0.tgz",
+      "integrity": "sha512-3CvrT8w1RjFu1g8vKA5Azfr5V83r2/b68Ock43WE003Bq/5Y38mwmYX7vk0fPHzC3qejt4YMAWk/C3fSKOy25g=="
     },
     "@aws-sdk/core": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.678.0.tgz",
-      "integrity": "sha512-ZTzybFZqSaPQymgRkTl08vk6xilaxr8LnJOc0h3KhcHLK4TJmdOcxqPpa6QxrBKcn2rmxzGiPRbAHLGI+BIxBw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.679.0.tgz",
+      "integrity": "sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.678.0.tgz",
-      "integrity": "sha512-t9bgu2Kc0H8FdQsSrkIJ42vis0CaVxUlA0wmmNyh268ZZyT9lKXUmf91QIhWbZ1zHx8Ek2u301xusoIaj4mLHA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.679.0.tgz",
+      "integrity": "sha512-XvWd6RPk7TA7tmqITT+NXvJ6ltJP8BUtLO1NAvja4HKExPKR9HAyoOeeH7KM3lVRED4e4LUnLb3fzteH20IXaA=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.678.0.tgz",
-      "integrity": "sha512-29uhXAB7uJqHtvJ2U3pi1YkMfv0WefW9EmSMoFAunjudXXBVktwTlWg0lyCM+KHrGKLkQyfs5UF/A9IelS8tdQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.679.0.tgz",
+      "integrity": "sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.678.0.tgz",
-      "integrity": "sha512-EvpmP0nc7ddRp0qwJOSu0uBXa+MMk4+OLlyEJcdaHnZI4/BoyVWr5fJUD5eQYZk11LZPZSvnsliYXWwLyVNXHQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.679.0.tgz",
+      "integrity": "sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.678.0.tgz",
-      "integrity": "sha512-8kHy7V5rRO73EpBCUclykP9T/QIBVi0SkQsc88ZRxpdh59/JY2N6DT5khMTzrz9+Vvlw3FDMJN4AI/qWjJHhdw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.679.0.tgz",
+      "integrity": "sha512-Rg7t8RwUzKcumpipG4neZqaeJ6DF+Bco1+FHn5BZB68jpvwvjBjcQUuWkxj18B6ctYHr1fkunnzeKEn/+vy7+w=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.678.0.tgz",
-      "integrity": "sha512-KGRBVD/oNr/aD+Wy5zc5AjfeSv5b4ahAu5eAUbOz+eGjGpGgrMtjY+R2rDY/3i3wFj9/DvOIfFGeZQMwtDzIuA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.679.0.tgz",
+      "integrity": "sha512-E3lBtaqCte8tWs6Rkssc8sLzvGoJ10TLGvpkijOlz43wPd6xCRh1YLwg6zolf9fVFtEyUs/GsgymiASOyxhFtw=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.678.0.tgz",
-      "integrity": "sha512-5TpzzHKwPOvUJig0bvTt+brtXfLPaSVLwea9re+XGrS5T6Hz65IaX2RL6uY1GQ0UVOqgwQ5nAti1WOfBoSJ5BA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.679.0.tgz",
+      "integrity": "sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.678.0.tgz",
-      "integrity": "sha512-PXydLUsLYd1rkhZ7zwf0613u5sofxIEhh7C1QGP1MSY3L1jt8bu7pZIcMzubfvmaGZI5k84aHhhjQEiAJUxIMg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.679.0.tgz",
+      "integrity": "sha512-SAtWonhi9asxn0ukEbcE81jkyanKgqpsrtskvYPpO9Z9KOednM4Cqt6h1bfcS9zaHjN2zu815Gv8O7WiV+F/DQ=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.678.0.tgz",
-      "integrity": "sha512-fcYZjTTFcef99l+BhcEAhHS4tEK1kE6Xj5Zz5lT4tFA07BkQt3d6kUKRVVfJnsbcHH4RDBUCnLhU8HPfc/kvjA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.679.0.tgz",
+      "integrity": "sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.678.0.tgz",
-      "integrity": "sha512-cF6IvQI1Jf5nJrK/Q7y3yFSQ8hv6MQ1g7HmZNo1tZTkywhfB3/zKcIFe6YftQul/s6RGHotXC2fr8jDkYQFDSQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.679.0.tgz",
+      "integrity": "sha512-ZjZZb6OERw/UKlSqcJ24AUJIf/ekDLPZrPpo0kPMV70EQ0GkBiklIZ8qULu9bEcI2I4UIapBKRiXTrK4gA6YHg=="
     },
     "@aws-sdk/middleware-host-header": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
-      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.679.0.tgz",
+      "integrity": "sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w=="
     },
     "@aws-sdk/middleware-logger": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
-      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.679.0.tgz",
+      "integrity": "sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA=="
     },
     "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
-      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.679.0.tgz",
+      "integrity": "sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.678.0.tgz",
-      "integrity": "sha512-tg9cC5COgGP0cznD2ys9kxPtVeKUygPZshDWXLAfA/cH/4m2ZUBvoEVv1SxkIbvOjnPwa976rdPLQUwRZvsL0g=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.679.0.tgz",
+      "integrity": "sha512-4hdeXhPDURPqQLPd9jCpUEo9fQITXl3NM3W1MwcJpE0gdUM36uXkQOYsTPeeU/IRCLVjK8Htlh2oCaM9iJrLCA=="
     },
     "@aws-sdk/region-config-resolver": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
-      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.679.0.tgz",
+      "integrity": "sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw=="
     },
     "@aws-sdk/token-providers": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
-      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.679.0.tgz",
+      "integrity": "sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA=="
     },
     "@aws-sdk/types": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
-      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.679.0.tgz",
+      "integrity": "sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q=="
     },
     "@aws-sdk/util-endpoints": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
-      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.679.0.tgz",
+      "integrity": "sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg=="
     },
     "@aws-sdk/util-locate-window": {
       "version": "3.679.0",
@@ -171,14 +171,14 @@
       "integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.675.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz",
-      "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.679.0.tgz",
+      "integrity": "sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.678.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.678.0.tgz",
-      "integrity": "sha512-bKRemCdHMPAlEYE9KuQiMQG9/b4n8C+9DlJAL/X00Q7Zvm9Gv6h0+i5EZ+Xx8sbHq5oUv9a4W4tb+nkUZ0ltpw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.679.0.tgz",
+      "integrity": "sha512-Bw4uXZ+NU5ed6TNfo4tBbhBSW+2eQxXYjYBGl5gLUNUpg2pDFToQAP6rXBFiwcG52V2ny5oLGiD82SoYuYkAVg=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
@@ -388,9 +388,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
-      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
+      "version": "22.8.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.4.tgz",
+      "integrity": "sha512-SpNNxkftTJOPk0oN+y2bIqurEXHTA2AOZ3EJDDKeJ5VzkvvORSvmQXGQarcOzWV1ac7DCaPBEdMDxBsM+d8jWw=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",

From b6b189d56358266eeaa920aae93296620bb5dd83 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <hello@jandvorak.me>
Date: Tue, 29 Oct 2024 21:27:19 +0100
Subject: [PATCH 0723/1140] Update build-dev-bundle-common.sh to node 22.11.0

---
 scripts/build-dev-bundle-common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index a5a8d81b8b..f8dfabf5b7 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.10.0
+NODE_VERSION=22.11.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.0

From 9470329b28e419fa6029f66f11920de11efd2026 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <hello@jandvorak.me>
Date: Tue, 29 Oct 2024 21:27:55 +0100
Subject: [PATCH 0724/1140] Update meteor dev bundle version number

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 3c3e961ea1..c335c922c0 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.10.0.6
+BUNDLE_VERSION=22.11.0.0
 
 
 # OS Check. Put here because here is where we download the precompiled

From 403d46bea08608a6639abd1d08f6dc56615be433 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 07:58:45 -0400
Subject: [PATCH 0725/1140] extract index methods

---
 packages/mongo/collection/collection.js    | 104 +--------------------
 packages/mongo/collection/methods_index.js |  91 ++++++++++++++++++
 2 files changed, 93 insertions(+), 102 deletions(-)
 create mode 100644 packages/mongo/collection/methods_index.js

diff --git a/packages/mongo/collection/collection.js b/packages/mongo/collection/collection.js
index 87878de2f1..29b2526e43 100644
--- a/packages/mongo/collection/collection.js
+++ b/packages/mongo/collection/collection.js
@@ -1,6 +1,7 @@
 import { normalizeProjection } from "../mongo_utils";
 import { AsyncMethods } from './methods_async';
 import { SyncMethods } from './methods_sync';
+import { IndexMethods } from './methods_index';
 
 /**
  * @summary Namespace for MongoDB-related items
@@ -481,10 +482,6 @@ Object.assign(Mongo.Collection.prototype, {
       };
     }
   },
-
-
-
-
 });
 
 Object.assign(Mongo.Collection, {
@@ -542,11 +539,9 @@ Object.assign(Mongo.Collection, {
   },
 });
 
-Object.assign(Mongo.Collection.prototype, SyncMethods);
-Object.assign(Mongo.Collection.prototype, AsyncMethods);
+Object.assign(Mongo.Collection.prototype, SyncMethods, AsyncMethods, IndexMethods);
 
 Object.assign(Mongo.Collection.prototype, {
-
   // Determine if this collection is simply a minimongo representation of a real
   // database on another server
   _isRemoteCollection() {
@@ -554,101 +549,6 @@ Object.assign(Mongo.Collection.prototype, {
     return this._connection && this._connection !== Meteor.server;
   },
 
-
-
-
-
-
-  // We'll actually design an index API later. For now, we just pass through to
-  // Mongo's, but make it synchronous.
-  /**
-   * @summary Asynchronously creates the specified index on the collection.
-   * @locus server
-   * @method ensureIndexAsync
-   * @deprecated in 3.0
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {Object} index A document that contains the field and value pairs where the field is the index key and the value describes the type of index for that field. For an ascending index on a field, specify a value of `1`; for descending index, specify a value of `-1`. Use `text` for text indexes.
-   * @param {Object} [options] All options are listed in [MongoDB documentation](https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#options)
-   * @param {String} options.name Name of the index
-   * @param {Boolean} options.unique Define that the index values must be unique, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-unique/)
-   * @param {Boolean} options.sparse Define that the index is sparse, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-sparse/)
-   */
-  async ensureIndexAsync(index, options) {
-    var self = this;
-    if (!self._collection.ensureIndexAsync || !self._collection.createIndexAsync)
-      throw new Error('Can only call createIndexAsync on server collections');
-    if (self._collection.createIndexAsync) {
-      await self._collection.createIndexAsync(index, options);
-    } else {
-      import { Log } from 'meteor/logging';
-
-      Log.debug(`ensureIndexAsync has been deprecated, please use the new 'createIndexAsync' instead${ options?.name ? `, index name: ${ options.name }` : `, index: ${ JSON.stringify(index) }` }`)
-      await self._collection.ensureIndexAsync(index, options);
-    }
-  },
-
-  /**
-   * @summary Asynchronously creates the specified index on the collection.
-   * @locus server
-   * @method createIndexAsync
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {Object} index A document that contains the field and value pairs where the field is the index key and the value describes the type of index for that field. For an ascending index on a field, specify a value of `1`; for descending index, specify a value of `-1`. Use `text` for text indexes.
-   * @param {Object} [options] All options are listed in [MongoDB documentation](https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#options)
-   * @param {String} options.name Name of the index
-   * @param {Boolean} options.unique Define that the index values must be unique, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-unique/)
-   * @param {Boolean} options.sparse Define that the index is sparse, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-sparse/)
-   */
-  async createIndexAsync(index, options) {
-    var self = this;
-    if (!self._collection.createIndexAsync)
-      throw new Error('Can only call createIndexAsync on server collections');
-
-    try {
-      await self._collection.createIndexAsync(index, options);
-    } catch (e) {
-      if (
-        e.message.includes(
-          'An equivalent index already exists with the same name but different options.'
-        ) &&
-        Meteor.settings?.packages?.mongo?.reCreateIndexOnOptionMismatch
-      ) {
-        import { Log } from 'meteor/logging';
-
-        Log.info(`Re-creating index ${ index } for ${ self._name } due to options mismatch.`);
-        await self._collection.dropIndexAsync(index);
-        await self._collection.createIndexAsync(index, options);
-      } else {
-        console.error(e);
-        throw new Meteor.Error(`An error occurred when creating an index for collection "${ self._name }: ${ e.message }`);
-      }
-    }
-  },
-
-  /**
-   * @summary Asynchronously creates the specified index on the collection.
-   * @locus server
-   * @method createIndex
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {Object} index A document that contains the field and value pairs where the field is the index key and the value describes the type of index for that field. For an ascending index on a field, specify a value of `1`; for descending index, specify a value of `-1`. Use `text` for text indexes.
-   * @param {Object} [options] All options are listed in [MongoDB documentation](https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#options)
-   * @param {String} options.name Name of the index
-   * @param {Boolean} options.unique Define that the index values must be unique, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-unique/)
-   * @param {Boolean} options.sparse Define that the index is sparse, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-sparse/)
-   */
-  createIndex(index, options){
-    return this.createIndexAsync(index, options);
-  },
-
-  async dropIndexAsync(index) {
-    var self = this;
-    if (!self._collection.dropIndexAsync)
-      throw new Error('Can only call dropIndexAsync on server collections');
-    await self._collection.dropIndexAsync(index);
-  },
-
   async dropCollectionAsync() {
     var self = this;
     if (!self._collection.dropCollectionAsync)
diff --git a/packages/mongo/collection/methods_index.js b/packages/mongo/collection/methods_index.js
new file mode 100644
index 0000000000..05d1186054
--- /dev/null
+++ b/packages/mongo/collection/methods_index.js
@@ -0,0 +1,91 @@
+export const IndexMethods = {
+  // We'll actually design an index API later. For now, we just pass through to
+  // Mongo's, but make it synchronous.
+  /**
+   * @summary Asynchronously creates the specified index on the collection.
+   * @locus server
+   * @method ensureIndexAsync
+   * @deprecated in 3.0
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {Object} index A document that contains the field and value pairs where the field is the index key and the value describes the type of index for that field. For an ascending index on a field, specify a value of `1`; for descending index, specify a value of `-1`. Use `text` for text indexes.
+   * @param {Object} [options] All options are listed in [MongoDB documentation](https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#options)
+   * @param {String} options.name Name of the index
+   * @param {Boolean} options.unique Define that the index values must be unique, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-unique/)
+   * @param {Boolean} options.sparse Define that the index is sparse, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-sparse/)
+   */
+  async ensureIndexAsync(index, options) {
+    var self = this;
+    if (!self._collection.ensureIndexAsync || !self._collection.createIndexAsync)
+      throw new Error('Can only call createIndexAsync on server collections');
+    if (self._collection.createIndexAsync) {
+      await self._collection.createIndexAsync(index, options);
+    } else {
+      import { Log } from 'meteor/logging';
+
+      Log.debug(`ensureIndexAsync has been deprecated, please use the new 'createIndexAsync' instead${ options?.name ? `, index name: ${ options.name }` : `, index: ${ JSON.stringify(index) }` }`)
+      await self._collection.ensureIndexAsync(index, options);
+    }
+  },
+
+  /**
+   * @summary Asynchronously creates the specified index on the collection.
+   * @locus server
+   * @method createIndexAsync
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {Object} index A document that contains the field and value pairs where the field is the index key and the value describes the type of index for that field. For an ascending index on a field, specify a value of `1`; for descending index, specify a value of `-1`. Use `text` for text indexes.
+   * @param {Object} [options] All options are listed in [MongoDB documentation](https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#options)
+   * @param {String} options.name Name of the index
+   * @param {Boolean} options.unique Define that the index values must be unique, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-unique/)
+   * @param {Boolean} options.sparse Define that the index is sparse, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-sparse/)
+   */
+  async createIndexAsync(index, options) {
+    var self = this;
+    if (!self._collection.createIndexAsync)
+      throw new Error('Can only call createIndexAsync on server collections');
+
+    try {
+      await self._collection.createIndexAsync(index, options);
+    } catch (e) {
+      if (
+        e.message.includes(
+          'An equivalent index already exists with the same name but different options.'
+        ) &&
+        Meteor.settings?.packages?.mongo?.reCreateIndexOnOptionMismatch
+      ) {
+        import { Log } from 'meteor/logging';
+
+        Log.info(`Re-creating index ${ index } for ${ self._name } due to options mismatch.`);
+        await self._collection.dropIndexAsync(index);
+        await self._collection.createIndexAsync(index, options);
+      } else {
+        console.error(e);
+        throw new Meteor.Error(`An error occurred when creating an index for collection "${ self._name }: ${ e.message }`);
+      }
+    }
+  },
+
+  /**
+   * @summary Asynchronously creates the specified index on the collection.
+   * @locus server
+   * @method createIndex
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {Object} index A document that contains the field and value pairs where the field is the index key and the value describes the type of index for that field. For an ascending index on a field, specify a value of `1`; for descending index, specify a value of `-1`. Use `text` for text indexes.
+   * @param {Object} [options] All options are listed in [MongoDB documentation](https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#options)
+   * @param {String} options.name Name of the index
+   * @param {Boolean} options.unique Define that the index values must be unique, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-unique/)
+   * @param {Boolean} options.sparse Define that the index is sparse, more at [MongoDB documentation](https://docs.mongodb.com/manual/core/index-sparse/)
+   */
+  createIndex(index, options){
+    return this.createIndexAsync(index, options);
+  },
+
+  async dropIndexAsync(index) {
+    var self = this;
+    if (!self._collection.dropIndexAsync)
+      throw new Error('Can only call dropIndexAsync on server collections');
+    await self._collection.dropIndexAsync(index);
+  },
+}
\ No newline at end of file

From d309462debf57dbd083a9f5709cbe65d86c5c743 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 08:14:35 -0400
Subject: [PATCH 0726/1140] break down collection constructor

---
 packages/mongo/collection/collection.js       | 129 +++---------------
 packages/mongo/collection/collection_utils.js |  95 +++++++++++++
 2 files changed, 114 insertions(+), 110 deletions(-)
 create mode 100644 packages/mongo/collection/collection_utils.js

diff --git a/packages/mongo/collection/collection.js b/packages/mongo/collection/collection.js
index 29b2526e43..011185106d 100644
--- a/packages/mongo/collection/collection.js
+++ b/packages/mongo/collection/collection.js
@@ -2,6 +2,14 @@ import { normalizeProjection } from "../mongo_utils";
 import { AsyncMethods } from './methods_async';
 import { SyncMethods } from './methods_sync';
 import { IndexMethods } from './methods_index';
+import {
+  ID_GENERATORS, normalizeOptions,
+  setupAutopublish,
+  setupConnection,
+  setupDriver,
+  setupMutationMethods,
+  validateCollectionName
+} from './collection_utils';
 
 /**
  * @summary Namespace for MongoDB-related items
@@ -26,131 +34,32 @@ The default id generation technique is `'STRING'`.
  * @param {Function} options.transform An optional transformation function. Documents will be passed through this function before being returned from `fetch` or `findOneAsync`, and before being passed to callbacks of `observe`, `map`, `forEach`, `allow`, and `deny`. Transforms are *not* applied for the callbacks of `observeChanges` or to cursors returned from publish functions.
  * @param {Boolean} options.defineMutationMethods Set to `false` to skip setting up the mutation methods that enable insert/update/remove from client code. Default `true`.
  */
+// Main Collection constructor
 Mongo.Collection = function Collection(name, options) {
-  if (!name && name !== null) {
-    Meteor._debug(
-      'Warning: creating anonymous collection. It will not be ' +
-        'saved or synchronized over the network. (Pass null for ' +
-        'the collection name to turn off this warning.)'
-    );
-    name = null;
-  }
+  name = validateCollectionName(name);
 
-  if (name !== null && typeof name !== 'string') {
-    throw new Error(
-      'First argument to new Mongo.Collection must be a string or null'
-    );
-  }
+  options = normalizeOptions(options);
 
-  if (options && options.methods) {
-    // Backwards compatibility hack with original signature (which passed
-    // "connection" directly instead of in options. (Connections must have a "methods"
-    // method.)
-    // XXX remove before 1.0
-    options = { connection: options };
-  }
-  // Backwards compatibility: "connection" used to be called "manager".
-  if (options && options.manager && !options.connection) {
-    options.connection = options.manager;
-  }
-
-  options = {
-    connection: undefined,
-    idGeneration: 'STRING',
-    transform: null,
-    _driver: undefined,
-    _preventAutopublish: false,
-    ...options,
-  };
-
-  switch (options.idGeneration) {
-    case 'MONGO':
-      this._makeNewID = function() {
-        var src = name
-          ? DDP.randomStream('/collection/' + name)
-          : Random.insecure;
-        return new Mongo.ObjectID(src.hexString(24));
-      };
-      break;
-    case 'STRING':
-    default:
-      this._makeNewID = function() {
-        var src = name
-          ? DDP.randomStream('/collection/' + name)
-          : Random.insecure;
-        return src.id();
-      };
-      break;
-  }
+  this._makeNewID = ID_GENERATORS[options.idGeneration] || ID_GENERATORS.STRING;
 
   this._transform = LocalCollection.wrapTransform(options.transform);
-
   this.resolverType = options.resolverType;
 
-  if (!name || options.connection === null)
-    // note: nameless collections never have a connection
-    this._connection = null;
-  else if (options.connection) this._connection = options.connection;
-  else if (Meteor.isClient) this._connection = Meteor.connection;
-  else this._connection = Meteor.server;
+  this._connection = setupConnection(name, options);
 
-  if (!options._driver) {
-    // XXX This check assumes that webapp is loaded so that Meteor.server !==
-    // null. We should fully support the case of "want to use a Mongo-backed
-    // collection from Node code without webapp", but we don't yet.
-    // #MeteorServerNull
-    if (
-      name &&
-      this._connection === Meteor.server &&
-      typeof MongoInternals !== 'undefined' &&
-      MongoInternals.defaultRemoteCollectionDriver
-    ) {
-      options._driver = MongoInternals.defaultRemoteCollectionDriver();
-    } else {
-      const { LocalCollectionDriver } = require('../local_collection_driver.js');
-      options._driver = LocalCollectionDriver;
-    }
-  }
+  const driver = setupDriver(name, this._connection, options);
+  this._driver = driver;
 
-  this._collection = options._driver.open(name, this._connection);
+  this._collection = driver.open(name, this._connection);
   this._name = name;
-  this._driver = options._driver;
 
-  // TODO[fibers]: _maybeSetUpReplication is now async. Let's watch how not waiting for this function to finish
-    // will affect everything
   this._settingUpReplicationPromise = this._maybeSetUpReplication(name, options);
 
-  // XXX don't define these until allow or deny is actually used for this
-  // collection. Could be hard if the security rules are only defined on the
-  // server.
-  if (options.defineMutationMethods !== false) {
-    try {
-      this._defineMutationMethods({
-        useExisting: options._suppressSameNameError === true,
-      });
-    } catch (error) {
-      // Throw a more understandable error on the server for same collection name
-      if (
-        error.message === `A method named '/${name}/insertAsync' is already defined`
-      )
-        throw new Error(`There is already a collection named "${name}"`);
-      throw error;
-    }
-  }
+  setupMutationMethods(this, name, options);
 
-  // autopublish
-  if (
-    Package.autopublish &&
-    !options._preventAutopublish &&
-    this._connection &&
-    this._connection.publish
-  ) {
-    this._connection.publish(null, () => this.find(), {
-      is_auto: true,
-    });
-  }
+  setupAutopublish(this, name, options);
 
-  Mongo._collections.set(this._name, this);
+  Mongo._collections.set(name, this);
 };
 
 Object.assign(Mongo.Collection.prototype, {
diff --git a/packages/mongo/collection/collection_utils.js b/packages/mongo/collection/collection_utils.js
new file mode 100644
index 0000000000..3976835c59
--- /dev/null
+++ b/packages/mongo/collection/collection_utils.js
@@ -0,0 +1,95 @@
+export const ID_GENERATORS = {
+  MONGO(name) {
+    const src = name ? DDP.randomStream('/collection/' + name) : Random.insecure;
+    return new Mongo.ObjectID(src.hexString(24));
+  },
+  STRING(name) {
+    const src = name ? DDP.randomStream('/collection/' + name) : Random.insecure;
+    return src.id();
+  }
+};
+
+export function setupConnection(name, options) {
+  if (!name || options.connection === null) return null;
+  if (options.connection) return options.connection;
+  return Meteor.isClient ? Meteor.connection : Meteor.server;
+}
+
+export function setupDriver(name, connection, options) {
+  if (options._driver) return options._driver;
+
+  if (name &&
+    connection === Meteor.server &&
+    typeof MongoInternals !== 'undefined' &&
+    MongoInternals.defaultRemoteCollectionDriver) {
+    return MongoInternals.defaultRemoteCollectionDriver();
+  }
+
+  const { LocalCollectionDriver } = require('../local_collection_driver.js');
+  return LocalCollectionDriver;
+}
+
+export function setupAutopublish(collection, name, options) {
+  if (Package.autopublish &&
+    !options._preventAutopublish &&
+    collection._connection &&
+    collection._connection.publish) {
+    collection._connection.publish(null, () => collection.find(), {
+      is_auto: true
+    });
+  }
+}
+
+export function setupMutationMethods(collection, name, options) {
+  if (options.defineMutationMethods === false) return;
+
+  try {
+    collection._defineMutationMethods({
+      useExisting: options._suppressSameNameError === true
+    });
+  } catch (error) {
+    if (error.message === `A method named '/${name}/insertAsync' is already defined`) {
+      throw new Error(`There is already a collection named "${name}"`);
+    }
+    throw error;
+  }
+}
+
+export function validateCollectionName(name) {
+  if (!name && name !== null) {
+    Meteor._debug(
+      'Warning: creating anonymous collection. It will not be ' +
+      'saved or synchronized over the network. (Pass null for ' +
+      'the collection name to turn off this warning.)'
+    );
+    name = null;
+  }
+
+  if (name !== null && typeof name !== 'string') {
+    throw new Error(
+      'First argument to new Mongo.Collection must be a string or null'
+    );
+  }
+
+  return name;
+}
+
+export function normalizeOptions(options) {
+  if (options && options.methods) {
+    // Backwards compatibility hack with original signature
+    options = { connection: options };
+  }
+  // Backwards compatibility: "connection" used to be called "manager".
+  if (options && options.manager && !options.connection) {
+    options.connection = options.manager;
+  }
+
+  return {
+    connection: undefined,
+    idGeneration: 'STRING',
+    transform: null,
+    _driver: undefined,
+    _preventAutopublish: false,
+    ...options,
+  };
+}

From 42880e8ff48f9fd30149c3c933d922ed8b10eb1f Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 08:33:40 -0400
Subject: [PATCH 0727/1140] extract replication method

---
 packages/mongo/collection/collection.js       | 298 +-----------------
 packages/mongo/collection/methods_async.js    |  27 ++
 .../mongo/collection/methods_replication.js   | 266 ++++++++++++++++
 3 files changed, 295 insertions(+), 296 deletions(-)
 create mode 100644 packages/mongo/collection/methods_replication.js

diff --git a/packages/mongo/collection/collection.js b/packages/mongo/collection/collection.js
index 011185106d..2f5cb1bd3f 100644
--- a/packages/mongo/collection/collection.js
+++ b/packages/mongo/collection/collection.js
@@ -10,6 +10,7 @@ import {
   setupMutationMethods,
   validateCollectionName
 } from './collection_utils';
+import { ReplicationMethods } from './methods_replication';
 
 /**
  * @summary Namespace for MongoDB-related items
@@ -63,301 +64,6 @@ Mongo.Collection = function Collection(name, options) {
 };
 
 Object.assign(Mongo.Collection.prototype, {
-  async _maybeSetUpReplication(name) {
-    const self = this;
-    if (
-      !(
-        self._connection &&
-        self._connection.registerStoreClient &&
-        self._connection.registerStoreServer
-      )
-    ) {
-      return;
-    }
-
-
-    const wrappedStoreCommon = {
-      // Called around method stub invocations to capture the original versions
-      // of modified documents.
-      saveOriginals() {
-        self._collection.saveOriginals();
-      },
-      retrieveOriginals() {
-        return self._collection.retrieveOriginals();
-      },
-      // To be able to get back to the collection from the store.
-      _getCollection() {
-        return self;
-      },
-    };
-    const wrappedStoreClient = {
-      // Called at the beginning of a batch of updates. batchSize is the number
-      // of update calls to expect.
-      //
-      // XXX This interface is pretty janky. reset probably ought to go back to
-      // being its own function, and callers shouldn't have to calculate
-      // batchSize. The optimization of not calling pause/remove should be
-      // delayed until later: the first call to update() should buffer its
-      // message, and then we can either directly apply it at endUpdate time if
-      // it was the only update, or do pauseObservers/apply/apply at the next
-      // update() if there's another one.
-      async beginUpdate(batchSize, reset) {
-        // pause observers so users don't see flicker when updating several
-        // objects at once (including the post-reconnect reset-and-reapply
-        // stage), and so that a re-sorting of a query can take advantage of the
-        // full _diffQuery moved calculation instead of applying change one at a
-        // time.
-        if (batchSize > 1 || reset) self._collection.pauseObservers();
-
-        if (reset) await self._collection.remove({});
-      },
-
-      // Apply an update.
-      // XXX better specify this interface (not in terms of a wire message)?
-      update(msg) {
-        var mongoId = MongoID.idParse(msg.id);
-        var doc = self._collection._docs.get(mongoId);
-
-        //When the server's mergebox is disabled for a collection, the client must gracefully handle it when:
-        // *We receive an added message for a document that is already there. Instead, it will be changed
-        // *We reeive a change message for a document that is not there. Instead, it will be added
-        // *We receive a removed messsage for a document that is not there. Instead, noting wil happen.
-
-        //Code is derived from client-side code originally in peerlibrary:control-mergebox
-        //https://github.com/peerlibrary/meteor-control-mergebox/blob/master/client.coffee
-
-        //For more information, refer to discussion "Initial support for publication strategies in livedata server":
-        //https://github.com/meteor/meteor/pull/11151
-        if (Meteor.isClient) {
-          if (msg.msg === 'added' && doc) {
-            msg.msg = 'changed';
-          } else if (msg.msg === 'removed' && !doc) {
-            return;
-          } else if (msg.msg === 'changed' && !doc) {
-            msg.msg = 'added';
-            const _ref = msg.fields;
-            for (let field in _ref) {
-              const value = _ref[field];
-              if (value === void 0) {
-                delete msg.fields[field];
-              }
-            }
-          }
-        }
-        // Is this a "replace the whole doc" message coming from the quiescence
-        // of method writes to an object? (Note that 'undefined' is a valid
-        // value meaning "remove it".)
-        if (msg.msg === 'replace') {
-          var replace = msg.replace;
-          if (!replace) {
-            if (doc) self._collection.remove(mongoId);
-          } else if (!doc) {
-            self._collection.insert(replace);
-          } else {
-            // XXX check that replace has no $ ops
-            self._collection.update(mongoId, replace);
-          }
-          return;
-        } else if (msg.msg === 'added') {
-          if (doc) {
-            throw new Error(
-              'Expected not to find a document already present for an add'
-            );
-          }
-          self._collection.insert({ _id: mongoId, ...msg.fields });
-        } else if (msg.msg === 'removed') {
-          if (!doc)
-            throw new Error(
-              'Expected to find a document already present for removed'
-            );
-          self._collection.remove(mongoId);
-        } else if (msg.msg === 'changed') {
-          if (!doc) throw new Error('Expected to find a document to change');
-          const keys = Object.keys(msg.fields);
-          if (keys.length > 0) {
-            var modifier = {};
-            keys.forEach(key => {
-              const value = msg.fields[key];
-              if (EJSON.equals(doc[key], value)) {
-                return;
-              }
-              if (typeof value === 'undefined') {
-                if (!modifier.$unset) {
-                  modifier.$unset = {};
-                }
-                modifier.$unset[key] = 1;
-              } else {
-                if (!modifier.$set) {
-                  modifier.$set = {};
-                }
-                modifier.$set[key] = value;
-              }
-            });
-            if (Object.keys(modifier).length > 0) {
-              self._collection.update(mongoId, modifier);
-            }
-          }
-        } else {
-          throw new Error("I don't know how to deal with this message");
-        }
-      },
-
-      // Called at the end of a batch of updates.livedata_connection.js:1287
-      endUpdate() {
-        self._collection.resumeObserversClient();
-      },
-
-      // Used to preserve current versions of documents across a store reset.
-      getDoc(id) {
-        return self.findOne(id);
-      },
-
-      ...wrappedStoreCommon,
-    };
-    const wrappedStoreServer = {
-      async beginUpdate(batchSize, reset) {
-        if (batchSize > 1 || reset) self._collection.pauseObservers();
-
-        if (reset) await self._collection.removeAsync({});
-      },
-
-      async update(msg) {
-        var mongoId = MongoID.idParse(msg.id);
-        var doc = self._collection._docs.get(mongoId);
-
-        // Is this a "replace the whole doc" message coming from the quiescence
-        // of method writes to an object? (Note that 'undefined' is a valid
-        // value meaning "remove it".)
-        if (msg.msg === 'replace') {
-          var replace = msg.replace;
-          if (!replace) {
-            if (doc) await self._collection.removeAsync(mongoId);
-          } else if (!doc) {
-            await self._collection.insertAsync(replace);
-          } else {
-            // XXX check that replace has no $ ops
-            await self._collection.updateAsync(mongoId, replace);
-          }
-          return;
-        } else if (msg.msg === 'added') {
-          if (doc) {
-            throw new Error(
-              'Expected not to find a document already present for an add'
-            );
-          }
-          await self._collection.insertAsync({ _id: mongoId, ...msg.fields });
-        } else if (msg.msg === 'removed') {
-          if (!doc)
-            throw new Error(
-              'Expected to find a document already present for removed'
-            );
-          await self._collection.removeAsync(mongoId);
-        } else if (msg.msg === 'changed') {
-          if (!doc) throw new Error('Expected to find a document to change');
-          const keys = Object.keys(msg.fields);
-          if (keys.length > 0) {
-            var modifier = {};
-            keys.forEach(key => {
-              const value = msg.fields[key];
-              if (EJSON.equals(doc[key], value)) {
-                return;
-              }
-              if (typeof value === 'undefined') {
-                if (!modifier.$unset) {
-                  modifier.$unset = {};
-                }
-                modifier.$unset[key] = 1;
-              } else {
-                if (!modifier.$set) {
-                  modifier.$set = {};
-                }
-                modifier.$set[key] = value;
-              }
-            });
-            if (Object.keys(modifier).length > 0) {
-              await self._collection.updateAsync(mongoId, modifier);
-            }
-          }
-        } else {
-          throw new Error("I don't know how to deal with this message");
-        }
-      },
-
-      // Called at the end of a batch of updates.
-      async endUpdate() {
-        await self._collection.resumeObserversServer();
-      },
-
-      // Used to preserve current versions of documents across a store reset.
-      async getDoc(id) {
-        return self.findOneAsync(id);
-      },
-      ...wrappedStoreCommon,
-    };
-
-
-    // OK, we're going to be a slave, replicating some remote
-    // database, except possibly with some temporary divergence while
-    // we have unacknowledged RPC's.
-    let registerStoreResult;
-    if (Meteor.isClient) {
-      registerStoreResult = self._connection.registerStoreClient(
-        name,
-        wrappedStoreClient
-      );
-    } else {
-      registerStoreResult = self._connection.registerStoreServer(
-        name,
-        wrappedStoreServer
-      );
-    }
-
-    const message = `There is already a collection named "${name}"`;
-    const logWarn = () => {
-      console.warn ? console.warn(message) : console.log(message);
-    };
-
-    if (!registerStoreResult) {
-      return logWarn();
-    }
-
-    return registerStoreResult?.then?.(ok => {
-      if (!ok) {
-        logWarn();
-      }
-    });
-  },
-
-  ///
-  /// Main collection API
-  ///
-  /**
-   * @summary Gets the number of documents matching the filter. For a fast count of the total documents in a collection see `estimatedDocumentCount`.
-   * @locus Anywhere
-   * @method countDocuments
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {MongoSelector} [selector] A query describing the documents to count
-   * @param {Object} [options] All options are listed in [MongoDB documentation](https://mongodb.github.io/node-mongodb-native/4.11/interfaces/CountDocumentsOptions.html). Please note that not all of them are available on the client.
-   * @returns {Promise<number>}
-   */
-  countDocuments(...args) {
-    return this._collection.countDocuments(...args);
-  },
-
-  /**
-   * @summary Gets an estimate of the count of documents in a collection using collection metadata. For an exact count of the documents in a collection see `countDocuments`.
-   * @locus Anywhere
-   * @method estimatedDocumentCount
-   * @memberof Mongo.Collection
-   * @instance
-   * @param {Object} [options] All options are listed in [MongoDB documentation](https://mongodb.github.io/node-mongodb-native/4.11/interfaces/EstimatedDocumentCountOptions.html). Please note that not all of them are available on the client.
-   * @returns {Promise<number>}
-   */
-  estimatedDocumentCount(...args) {
-    return this._collection.estimatedDocumentCount(...args);
-  },
-
   _getFindSelector(args) {
     if (args.length == 0) return {};
     else return args[0];
@@ -448,7 +154,7 @@ Object.assign(Mongo.Collection, {
   },
 });
 
-Object.assign(Mongo.Collection.prototype, SyncMethods, AsyncMethods, IndexMethods);
+Object.assign(Mongo.Collection.prototype, ReplicationMethods, SyncMethods, AsyncMethods, IndexMethods);
 
 Object.assign(Mongo.Collection.prototype, {
   // Determine if this collection is simply a minimongo representation of a real
diff --git a/packages/mongo/collection/methods_async.js b/packages/mongo/collection/methods_async.js
index 75e8295699..0779b86472 100644
--- a/packages/mongo/collection/methods_async.js
+++ b/packages/mongo/collection/methods_async.js
@@ -206,4 +206,31 @@ export const AsyncMethods = {
         upsert: true,
       });
   },
+
+  /**
+   * @summary Gets the number of documents matching the filter. For a fast count of the total documents in a collection see `estimatedDocumentCount`.
+   * @locus Anywhere
+   * @method countDocuments
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} [selector] A query describing the documents to count
+   * @param {Object} [options] All options are listed in [MongoDB documentation](https://mongodb.github.io/node-mongodb-native/4.11/interfaces/CountDocumentsOptions.html). Please note that not all of them are available on the client.
+   * @returns {Promise<number>}
+   */
+  countDocuments(...args) {
+    return this._collection.countDocuments(...args);
+  },
+
+  /**
+   * @summary Gets an estimate of the count of documents in a collection using collection metadata. For an exact count of the documents in a collection see `countDocuments`.
+   * @locus Anywhere
+   * @method estimatedDocumentCount
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {Object} [options] All options are listed in [MongoDB documentation](https://mongodb.github.io/node-mongodb-native/4.11/interfaces/EstimatedDocumentCountOptions.html). Please note that not all of them are available on the client.
+   * @returns {Promise<number>}
+   */
+  estimatedDocumentCount(...args) {
+    return this._collection.estimatedDocumentCount(...args);
+  },
 }
\ No newline at end of file
diff --git a/packages/mongo/collection/methods_replication.js b/packages/mongo/collection/methods_replication.js
new file mode 100644
index 0000000000..c0b0d64373
--- /dev/null
+++ b/packages/mongo/collection/methods_replication.js
@@ -0,0 +1,266 @@
+export const ReplicationMethods = {
+  async _maybeSetUpReplication(name) {
+    const self = this;
+    if (
+      !(
+        self._connection &&
+        self._connection.registerStoreClient &&
+        self._connection.registerStoreServer
+      )
+    ) {
+      return;
+    }
+
+
+    const wrappedStoreCommon = {
+      // Called around method stub invocations to capture the original versions
+      // of modified documents.
+      saveOriginals() {
+        self._collection.saveOriginals();
+      },
+      retrieveOriginals() {
+        return self._collection.retrieveOriginals();
+      },
+      // To be able to get back to the collection from the store.
+      _getCollection() {
+        return self;
+      },
+    };
+    const wrappedStoreClient = {
+      // Called at the beginning of a batch of updates. batchSize is the number
+      // of update calls to expect.
+      //
+      // XXX This interface is pretty janky. reset probably ought to go back to
+      // being its own function, and callers shouldn't have to calculate
+      // batchSize. The optimization of not calling pause/remove should be
+      // delayed until later: the first call to update() should buffer its
+      // message, and then we can either directly apply it at endUpdate time if
+      // it was the only update, or do pauseObservers/apply/apply at the next
+      // update() if there's another one.
+      async beginUpdate(batchSize, reset) {
+        // pause observers so users don't see flicker when updating several
+        // objects at once (including the post-reconnect reset-and-reapply
+        // stage), and so that a re-sorting of a query can take advantage of the
+        // full _diffQuery moved calculation instead of applying change one at a
+        // time.
+        if (batchSize > 1 || reset) self._collection.pauseObservers();
+
+        if (reset) await self._collection.remove({});
+      },
+
+      // Apply an update.
+      // XXX better specify this interface (not in terms of a wire message)?
+      update(msg) {
+        var mongoId = MongoID.idParse(msg.id);
+        var doc = self._collection._docs.get(mongoId);
+
+        //When the server's mergebox is disabled for a collection, the client must gracefully handle it when:
+        // *We receive an added message for a document that is already there. Instead, it will be changed
+        // *We reeive a change message for a document that is not there. Instead, it will be added
+        // *We receive a removed messsage for a document that is not there. Instead, noting wil happen.
+
+        //Code is derived from client-side code originally in peerlibrary:control-mergebox
+        //https://github.com/peerlibrary/meteor-control-mergebox/blob/master/client.coffee
+
+        //For more information, refer to discussion "Initial support for publication strategies in livedata server":
+        //https://github.com/meteor/meteor/pull/11151
+        if (Meteor.isClient) {
+          if (msg.msg === 'added' && doc) {
+            msg.msg = 'changed';
+          } else if (msg.msg === 'removed' && !doc) {
+            return;
+          } else if (msg.msg === 'changed' && !doc) {
+            msg.msg = 'added';
+            const _ref = msg.fields;
+            for (let field in _ref) {
+              const value = _ref[field];
+              if (value === void 0) {
+                delete msg.fields[field];
+              }
+            }
+          }
+        }
+        // Is this a "replace the whole doc" message coming from the quiescence
+        // of method writes to an object? (Note that 'undefined' is a valid
+        // value meaning "remove it".)
+        if (msg.msg === 'replace') {
+          var replace = msg.replace;
+          if (!replace) {
+            if (doc) self._collection.remove(mongoId);
+          } else if (!doc) {
+            self._collection.insert(replace);
+          } else {
+            // XXX check that replace has no $ ops
+            self._collection.update(mongoId, replace);
+          }
+          return;
+        } else if (msg.msg === 'added') {
+          if (doc) {
+            throw new Error(
+              'Expected not to find a document already present for an add'
+            );
+          }
+          self._collection.insert({ _id: mongoId, ...msg.fields });
+        } else if (msg.msg === 'removed') {
+          if (!doc)
+            throw new Error(
+              'Expected to find a document already present for removed'
+            );
+          self._collection.remove(mongoId);
+        } else if (msg.msg === 'changed') {
+          if (!doc) throw new Error('Expected to find a document to change');
+          const keys = Object.keys(msg.fields);
+          if (keys.length > 0) {
+            var modifier = {};
+            keys.forEach(key => {
+              const value = msg.fields[key];
+              if (EJSON.equals(doc[key], value)) {
+                return;
+              }
+              if (typeof value === 'undefined') {
+                if (!modifier.$unset) {
+                  modifier.$unset = {};
+                }
+                modifier.$unset[key] = 1;
+              } else {
+                if (!modifier.$set) {
+                  modifier.$set = {};
+                }
+                modifier.$set[key] = value;
+              }
+            });
+            if (Object.keys(modifier).length > 0) {
+              self._collection.update(mongoId, modifier);
+            }
+          }
+        } else {
+          throw new Error("I don't know how to deal with this message");
+        }
+      },
+
+      // Called at the end of a batch of updates.livedata_connection.js:1287
+      endUpdate() {
+        self._collection.resumeObserversClient();
+      },
+
+      // Used to preserve current versions of documents across a store reset.
+      getDoc(id) {
+        return self.findOne(id);
+      },
+
+      ...wrappedStoreCommon,
+    };
+    const wrappedStoreServer = {
+      async beginUpdate(batchSize, reset) {
+        if (batchSize > 1 || reset) self._collection.pauseObservers();
+
+        if (reset) await self._collection.removeAsync({});
+      },
+
+      async update(msg) {
+        var mongoId = MongoID.idParse(msg.id);
+        var doc = self._collection._docs.get(mongoId);
+
+        // Is this a "replace the whole doc" message coming from the quiescence
+        // of method writes to an object? (Note that 'undefined' is a valid
+        // value meaning "remove it".)
+        if (msg.msg === 'replace') {
+          var replace = msg.replace;
+          if (!replace) {
+            if (doc) await self._collection.removeAsync(mongoId);
+          } else if (!doc) {
+            await self._collection.insertAsync(replace);
+          } else {
+            // XXX check that replace has no $ ops
+            await self._collection.updateAsync(mongoId, replace);
+          }
+          return;
+        } else if (msg.msg === 'added') {
+          if (doc) {
+            throw new Error(
+              'Expected not to find a document already present for an add'
+            );
+          }
+          await self._collection.insertAsync({ _id: mongoId, ...msg.fields });
+        } else if (msg.msg === 'removed') {
+          if (!doc)
+            throw new Error(
+              'Expected to find a document already present for removed'
+            );
+          await self._collection.removeAsync(mongoId);
+        } else if (msg.msg === 'changed') {
+          if (!doc) throw new Error('Expected to find a document to change');
+          const keys = Object.keys(msg.fields);
+          if (keys.length > 0) {
+            var modifier = {};
+            keys.forEach(key => {
+              const value = msg.fields[key];
+              if (EJSON.equals(doc[key], value)) {
+                return;
+              }
+              if (typeof value === 'undefined') {
+                if (!modifier.$unset) {
+                  modifier.$unset = {};
+                }
+                modifier.$unset[key] = 1;
+              } else {
+                if (!modifier.$set) {
+                  modifier.$set = {};
+                }
+                modifier.$set[key] = value;
+              }
+            });
+            if (Object.keys(modifier).length > 0) {
+              await self._collection.updateAsync(mongoId, modifier);
+            }
+          }
+        } else {
+          throw new Error("I don't know how to deal with this message");
+        }
+      },
+
+      // Called at the end of a batch of updates.
+      async endUpdate() {
+        await self._collection.resumeObserversServer();
+      },
+
+      // Used to preserve current versions of documents across a store reset.
+      async getDoc(id) {
+        return self.findOneAsync(id);
+      },
+      ...wrappedStoreCommon,
+    };
+
+
+    // OK, we're going to be a slave, replicating some remote
+    // database, except possibly with some temporary divergence while
+    // we have unacknowledged RPC's.
+    let registerStoreResult;
+    if (Meteor.isClient) {
+      registerStoreResult = self._connection.registerStoreClient(
+        name,
+        wrappedStoreClient
+      );
+    } else {
+      registerStoreResult = self._connection.registerStoreServer(
+        name,
+        wrappedStoreServer
+      );
+    }
+
+    const message = `There is already a collection named "${name}"`;
+    const logWarn = () => {
+      console.warn ? console.warn(message) : console.log(message);
+    };
+
+    if (!registerStoreResult) {
+      return logWarn();
+    }
+
+    return registerStoreResult?.then?.(ok => {
+      if (!ok) {
+        logWarn();
+      }
+    });
+  },
+}
\ No newline at end of file

From 3f9fdbd2937ab79d144de4c2b0dead0335319070 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 08:37:28 -0400
Subject: [PATCH 0728/1140] shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json          | 156 +++++++++---------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 6c5b66a97b..a8403a7ef9 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,129 +56,129 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.677.0.tgz",
-      "integrity": "sha512-wGhbHAZGa5VeVLCyAfhyFWXl+JfsHSgSl0eodH6xqKoR60LTDJZbBgQZizUwSj8EoSzsglBvgPLYZaLfXTKM/g=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.679.0.tgz",
+      "integrity": "sha512-vJzQ6QpaMu8itJMe3FH1/0rwMjL0ELh63iLTxiAmhiV/SvCwNNoSFLd2HdKxbV0Bg/x8lUiPVq3pl6+cxaIrEQ=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.677.0.tgz",
-      "integrity": "sha512-/y6EskFhOa2w9VwXaXoyOrGeBjnOj/72wsxDOslS908qH+nf7m40pBK6e/iBelg04vlx0gqhlbfK8hLbaT6KHA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.679.0.tgz",
+      "integrity": "sha512-/0cAvYnpOZTo/Y961F1kx2fhDDLUYZ0SQQ5/75gh3xVImLj7Zw+vp74ieqFbqWLYGMaq8z1Arr9A8zG95mbLdg=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.677.0.tgz",
-      "integrity": "sha512-2zgZkRIU7DsnUVOy+9bjfJ0IYMzi9ONWXQt/WqMa7HOnj4RfenfpipyhHYxGZR5kmehgv53EI79yvUu+SAfGNg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.679.0.tgz",
+      "integrity": "sha512-/dBYWcCwbA/id4sFCIVZvf0UsvzHCC68SryxeNQk/PDkY9N4n5yRcMUkZDaEyQCjowc3kY4JOXp2AdUP037nhA=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.677.0.tgz",
-      "integrity": "sha512-N5fs1GLSthnwrs44b4IJI//dcShuIT42g4pM8FCUJZwbrWn9Sp9F876R1mvb8A9TAy2S4qCXi7TkHS0REnuicQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.679.0.tgz",
+      "integrity": "sha512-3CvrT8w1RjFu1g8vKA5Azfr5V83r2/b68Ock43WE003Bq/5Y38mwmYX7vk0fPHzC3qejt4YMAWk/C3fSKOy25g=="
     },
     "@aws-sdk/core": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.677.0.tgz",
-      "integrity": "sha512-5auvc1wmXmd7u9Y9nM95Ia+VX7J2FiZLuADitHqE4mHPH9riDgOY+uK/yM+UKr+lfq4zKiZQG7i8cfabZlCY8g=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.679.0.tgz",
+      "integrity": "sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.677.0.tgz",
-      "integrity": "sha512-ODw8MKhT41KLpKlGIH1yFO2FIOCAW3Nnn2uCu1eAm807aI0OK31ntUNrY+GFzXX7ixv+KFoiJu3ih+w+Oxw5gA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.679.0.tgz",
+      "integrity": "sha512-XvWd6RPk7TA7tmqITT+NXvJ6ltJP8BUtLO1NAvja4HKExPKR9HAyoOeeH7KM3lVRED4e4LUnLb3fzteH20IXaA=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.677.0.tgz",
-      "integrity": "sha512-0ctcqKzclr9TiNIkB8I+YRogjWH/4mLWQGv/bgb8ElHqph+rPy4pOubj1Ax01sbs7XdwDaImjBYV5xXE+BEsYw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.679.0.tgz",
+      "integrity": "sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.677.0.tgz",
-      "integrity": "sha512-c4TnShdzk37dhL1HGGzZ2PDKIIEmo1IbT/4y5hSRdNc8Z8fu6spE5GoeVsv6p/HdSGPS7XTy6aOFCMCk4AeIzQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.679.0.tgz",
+      "integrity": "sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.677.0.tgz",
-      "integrity": "sha512-hW+oHj5zplPLzTk74LG+gZVOKQnmBPyRIbwg3uZWr23xfOxh/Osu9Wq8qwgu2+UyFHr+6/DRFjZJ6avNA2jpKw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.679.0.tgz",
+      "integrity": "sha512-Rg7t8RwUzKcumpipG4neZqaeJ6DF+Bco1+FHn5BZB68jpvwvjBjcQUuWkxj18B6ctYHr1fkunnzeKEn/+vy7+w=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.677.0.tgz",
-      "integrity": "sha512-DwFriiDx2SSdj7VhRv/0fm8UIK7isy+WZAlqUdZ9xDsX4x1AD5KwMv9AwGhJrMuTjnPSxRSwjt23S7ZXwUfhdw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.679.0.tgz",
+      "integrity": "sha512-E3lBtaqCte8tWs6Rkssc8sLzvGoJ10TLGvpkijOlz43wPd6xCRh1YLwg6zolf9fVFtEyUs/GsgymiASOyxhFtw=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.677.0.tgz",
-      "integrity": "sha512-pBqHjIFvHBJb2NOsVqdIHWcOzXDoNXBokxTvMggb3WYML6ixwrH7kpd1CAzegeQlvZD4SCcRoy3ahv5rbuR+og=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.679.0.tgz",
+      "integrity": "sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.677.0.tgz",
-      "integrity": "sha512-OkRP3z8yI22t9LS9At5fYr6RN7zKSDiGgeyjEnrqiGHOWGPMJN2GKa8IAFC4dgXt4Nm/EfmEW7UweiqzEKJKOA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.679.0.tgz",
+      "integrity": "sha512-SAtWonhi9asxn0ukEbcE81jkyanKgqpsrtskvYPpO9Z9KOednM4Cqt6h1bfcS9zaHjN2zu815Gv8O7WiV+F/DQ=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.677.0.tgz",
-      "integrity": "sha512-yjuI6hSt1rLFqBQiNKx/nF75Ao72xR8ybqKztzebtFNCrYl8oXVkRiigg5XKNCDmelsx1lcU9IcSiuPHzlGtUQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.679.0.tgz",
+      "integrity": "sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.677.0.tgz",
-      "integrity": "sha512-fUEDkRI2GuN+p9xyZewlRQC2vFXjxPOoQGugQTmOawTxVUYkFpssg4ID0HUtkKuJYHjaoD2bCyKvOcnL1JU6AA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.679.0.tgz",
+      "integrity": "sha512-ZjZZb6OERw/UKlSqcJ24AUJIf/ekDLPZrPpo0kPMV70EQ0GkBiklIZ8qULu9bEcI2I4UIapBKRiXTrK4gA6YHg=="
     },
     "@aws-sdk/middleware-host-header": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
-      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.679.0.tgz",
+      "integrity": "sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w=="
     },
     "@aws-sdk/middleware-logger": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
-      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.679.0.tgz",
+      "integrity": "sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA=="
     },
     "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
-      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.679.0.tgz",
+      "integrity": "sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.677.0.tgz",
-      "integrity": "sha512-A3gzUsTsvyv/JCmD0p2fkbiOyp+tpAiAADDwzi+eYeyzH4xzqnrzSkGk5KSb58uUQo27eeBzRXHd46d0u+sMrQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.679.0.tgz",
+      "integrity": "sha512-4hdeXhPDURPqQLPd9jCpUEo9fQITXl3NM3W1MwcJpE0gdUM36uXkQOYsTPeeU/IRCLVjK8Htlh2oCaM9iJrLCA=="
     },
     "@aws-sdk/region-config-resolver": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
-      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.679.0.tgz",
+      "integrity": "sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw=="
     },
     "@aws-sdk/token-providers": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
-      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.679.0.tgz",
+      "integrity": "sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA=="
     },
     "@aws-sdk/types": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
-      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.679.0.tgz",
+      "integrity": "sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q=="
     },
     "@aws-sdk/util-endpoints": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
-      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.679.0.tgz",
+      "integrity": "sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg=="
     },
     "@aws-sdk/util-locate-window": {
-      "version": "3.568.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
-      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz",
+      "integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.675.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz",
-      "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.679.0.tgz",
+      "integrity": "sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.677.0.tgz",
-      "integrity": "sha512-gFhL0zVY/um0Eu2aWil82pjWaZL4yBmOnjz0+RDz18okFBHaz1Om8o/H+1Vvj+xsnuDYV4ezVMyAaXVtTcYOnw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.679.0.tgz",
+      "integrity": "sha512-Bw4uXZ+NU5ed6TNfo4tBbhBSW+2eQxXYjYBGl5gLUNUpg2pDFToQAP6rXBFiwcG52V2ny5oLGiD82SoYuYkAVg=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
@@ -388,9 +388,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
-      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
+      "version": "22.8.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.4.tgz",
+      "integrity": "sha512-SpNNxkftTJOPk0oN+y2bIqurEXHTA2AOZ3EJDDKeJ5VzkvvORSvmQXGQarcOzWV1ac7DCaPBEdMDxBsM+d8jWw=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",

From 31e799d00903240c87e59931e3fe8ad20fc3160b Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 11:04:47 -0400
Subject: [PATCH 0729/1140] fix tests

---
 packages/mongo/collection/collection.js       |  2 +-
 packages/mongo/collection/collection_utils.js | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/mongo/collection/collection.js b/packages/mongo/collection/collection.js
index 2f5cb1bd3f..28776c9a93 100644
--- a/packages/mongo/collection/collection.js
+++ b/packages/mongo/collection/collection.js
@@ -41,7 +41,7 @@ Mongo.Collection = function Collection(name, options) {
 
   options = normalizeOptions(options);
 
-  this._makeNewID = ID_GENERATORS[options.idGeneration] || ID_GENERATORS.STRING;
+  this._makeNewID = ID_GENERATORS[options.idGeneration]?.(name);
 
   this._transform = LocalCollection.wrapTransform(options.transform);
   this.resolverType = options.resolverType;
diff --git a/packages/mongo/collection/collection_utils.js b/packages/mongo/collection/collection_utils.js
index 3976835c59..a0f7442ded 100644
--- a/packages/mongo/collection/collection_utils.js
+++ b/packages/mongo/collection/collection_utils.js
@@ -1,11 +1,15 @@
 export const ID_GENERATORS = {
   MONGO(name) {
-    const src = name ? DDP.randomStream('/collection/' + name) : Random.insecure;
-    return new Mongo.ObjectID(src.hexString(24));
+    return function() {
+      const src = name ? DDP.randomStream('/collection/' + name) : Random.insecure;
+      return new Mongo.ObjectID(src.hexString(24));
+    }
   },
   STRING(name) {
-    const src = name ? DDP.randomStream('/collection/' + name) : Random.insecure;
-    return src.id();
+    return function() {
+      const src = name ? DDP.randomStream('/collection/' + name) : Random.insecure;
+      return src.id();
+    }
   }
 };
 

From 9c8c69bb64fc934daf4ffaba7f23f9452facdf44 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 11:11:19 -0400
Subject: [PATCH 0730/1140] shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json          | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index a8403a7ef9..c09baec5ef 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,24 +56,24 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.679.0.tgz",
-      "integrity": "sha512-vJzQ6QpaMu8itJMe3FH1/0rwMjL0ELh63iLTxiAmhiV/SvCwNNoSFLd2HdKxbV0Bg/x8lUiPVq3pl6+cxaIrEQ=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.682.0.tgz",
+      "integrity": "sha512-BD8PPPk3+ZzFqCJSPraoXkgRcPTtjguXtyDYsyBMzFofWmN4YeswXSavZVAC354W98mkffDaXBvieyqu1Y9fKA=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.679.0.tgz",
-      "integrity": "sha512-/0cAvYnpOZTo/Y961F1kx2fhDDLUYZ0SQQ5/75gh3xVImLj7Zw+vp74ieqFbqWLYGMaq8z1Arr9A8zG95mbLdg=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.682.0.tgz",
+      "integrity": "sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.679.0.tgz",
-      "integrity": "sha512-/dBYWcCwbA/id4sFCIVZvf0UsvzHCC68SryxeNQk/PDkY9N4n5yRcMUkZDaEyQCjowc3kY4JOXp2AdUP037nhA=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.682.0.tgz",
+      "integrity": "sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.679.0.tgz",
-      "integrity": "sha512-3CvrT8w1RjFu1g8vKA5Azfr5V83r2/b68Ock43WE003Bq/5Y38mwmYX7vk0fPHzC3qejt4YMAWk/C3fSKOy25g=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.682.0.tgz",
+      "integrity": "sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ=="
     },
     "@aws-sdk/core": {
       "version": "3.679.0",
@@ -81,9 +81,9 @@
       "integrity": "sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.679.0.tgz",
-      "integrity": "sha512-XvWd6RPk7TA7tmqITT+NXvJ6ltJP8BUtLO1NAvja4HKExPKR9HAyoOeeH7KM3lVRED4e4LUnLb3fzteH20IXaA=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.682.0.tgz",
+      "integrity": "sha512-V+y4qUQtc0kTnNR7u5LwnZn8EZk2pjdNX+84MwD9VjXekqbXikADu06Mj93kVGVW+qgqtNMvJ8PpiI3EaaxC7A=="
     },
     "@aws-sdk/credential-provider-env": {
       "version": "3.679.0",
@@ -96,14 +96,14 @@
       "integrity": "sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.679.0.tgz",
-      "integrity": "sha512-Rg7t8RwUzKcumpipG4neZqaeJ6DF+Bco1+FHn5BZB68jpvwvjBjcQUuWkxj18B6ctYHr1fkunnzeKEn/+vy7+w=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.682.0.tgz",
+      "integrity": "sha512-6eqWeHdK6EegAxqDdiCi215nT3QZPwukgWAYuVxNfJ/5m0/P7fAzF+D5kKVgByUvGJEbq/FEL8Fw7OBe64AA+g=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.679.0.tgz",
-      "integrity": "sha512-E3lBtaqCte8tWs6Rkssc8sLzvGoJ10TLGvpkijOlz43wPd6xCRh1YLwg6zolf9fVFtEyUs/GsgymiASOyxhFtw=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.682.0.tgz",
+      "integrity": "sha512-HSmDqZcBVZrTctHCT9m++vdlDfJ1ARI218qmZa+TZzzOFNpKWy6QyHMEra45GB9GnkkMmV6unoDSPMuN0AqcMg=="
     },
     "@aws-sdk/credential-provider-process": {
       "version": "3.679.0",
@@ -111,9 +111,9 @@
       "integrity": "sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.679.0.tgz",
-      "integrity": "sha512-SAtWonhi9asxn0ukEbcE81jkyanKgqpsrtskvYPpO9Z9KOednM4Cqt6h1bfcS9zaHjN2zu815Gv8O7WiV+F/DQ=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.682.0.tgz",
+      "integrity": "sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg=="
     },
     "@aws-sdk/credential-provider-web-identity": {
       "version": "3.679.0",
@@ -121,9 +121,9 @@
       "integrity": "sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.679.0.tgz",
-      "integrity": "sha512-ZjZZb6OERw/UKlSqcJ24AUJIf/ekDLPZrPpo0kPMV70EQ0GkBiklIZ8qULu9bEcI2I4UIapBKRiXTrK4gA6YHg=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.682.0.tgz",
+      "integrity": "sha512-vLBdUlTISEXVKYFFO665ajC0U0RdXFx21fwTHiN2g4edFH++di2XCJ8/Y34bu09z9bV/rwFT2jn41iAVWasNKg=="
     },
     "@aws-sdk/middleware-host-header": {
       "version": "3.679.0",
@@ -141,9 +141,9 @@
       "integrity": "sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.679.0.tgz",
-      "integrity": "sha512-4hdeXhPDURPqQLPd9jCpUEo9fQITXl3NM3W1MwcJpE0gdUM36uXkQOYsTPeeU/IRCLVjK8Htlh2oCaM9iJrLCA=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.682.0.tgz",
+      "integrity": "sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg=="
     },
     "@aws-sdk/region-config-resolver": {
       "version": "3.679.0",
@@ -176,9 +176,9 @@
       "integrity": "sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.679.0.tgz",
-      "integrity": "sha512-Bw4uXZ+NU5ed6TNfo4tBbhBSW+2eQxXYjYBGl5gLUNUpg2pDFToQAP6rXBFiwcG52V2ny5oLGiD82SoYuYkAVg=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.682.0.tgz",
+      "integrity": "sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",

From 5b8e4edb680016adf659d9fd8af5e469297c95f3 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 11:21:57 -0400
Subject: [PATCH 0731/1140] this is not needed

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index eb65503e11..5b0390a9b6 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "@babel/eslint-plugin": "^7.19.1",
     "@babel/preset-react": "^7.18.6",
     "@types/lodash.isempty": "^4.4.9",
-    "@types/meteor": "^2.9.8",
     "@types/node": "^18.16.18",
     "@typescript-eslint/eslint-plugin": "^5.56.0",
     "@typescript-eslint/parser": "^5.56.0",

From 58f5d31dc1d7845dda6eddbe9c996606c14b9ed8 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Wed, 30 Oct 2024 11:51:52 -0400
Subject: [PATCH 0732/1140] force CI tests to run again


From 1e2b3372b88ed3b8f0260ddf29851db3e0b54dd4 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 13:53:55 -0400
Subject: [PATCH 0733/1140] simplify code

---
 packages/accounts-password/password_server.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index e2537f2c5c..5e15f66fcb 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -1074,17 +1074,7 @@ Accounts.createUserVerifyingEmail =
 // method calling Accounts.createUser could set?
 //
 
-Accounts.createUserAsync =
-  async (options, callback) => {
-    options = { ...options };
-
-    // XXX allow an optional callback?
-    if (callback) {
-      throw new Error("Accounts.createUser with callback not supported on the server yet.");
-    }
-
-    return createUser(options);
-  };
+Accounts.createUserAsync = createUser
 
 // Create user directly on the server.
 //

From 4032926172360778f0dcece99ddbea6bda53d191 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 13:54:07 -0400
Subject: [PATCH 0734/1140] adjust doc

---
 packages/accounts-base/accounts_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index fdd45a2890..210fc004c7 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -244,7 +244,7 @@ export class AccountsCommon {
    * @param {Number} options.passwordResetTokenExpiration The number of milliseconds from when a link to reset password is sent until token expires and user can't reset password with the link anymore. If `passwordResetTokenExpirationInDays` is set, it takes precedent.
    * @param {Number} options.passwordEnrollTokenExpirationInDays The number of days from when a link to set initial password is sent until token expires and user can't set password with the link anymore. Defaults to 30.
    * @param {Number} options.passwordEnrollTokenExpiration The number of milliseconds from when a link to set initial password is sent until token expires and user can't set password with the link anymore. If `passwordEnrollTokenExpirationInDays` is set, it takes precedent.
-   * @param {Boolean} options.ambiguousErrorMessages Return ambiguous error messages from login failures to prevent user enumeration. Defaults to `false`, but in production environments it is recommended it defaults to `true`.
+   * @param {Boolean} options.ambiguousErrorMessages Return ambiguous error messages from login failures to prevent user enumeration. Defaults to `true`.
    * @param {Number} options.bcryptRounds Allows override of number of bcrypt rounds (aka work factor) used to store passwords. The default is 10.
    * @param {MongoFieldSpecifier} options.defaultFieldSelector To exclude by default large custom fields from `Meteor.user()` and `Meteor.findUserBy...()` functions when called without a field selector, and all `onLogin`, `onLoginFailure` and `onLogout` callbacks.  Example: `Accounts.config({ defaultFieldSelector: { myBigArray: 0 }})`. Beware when using this. If, for instance, you do not include `email` when excluding the fields, you can have problems with functions like `forgotPassword` that will break because they won't have the required data available. It's recommend that you always keep the fields `_id`, `username`, and `email`.
    * @param {String|Mongo.Collection} options.collection A collection name or a Mongo.Collection object to hold the users.

From e240e25089c0e33a496461ba9ac044da27fe8e33 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 13:54:12 -0400
Subject: [PATCH 0735/1140] add test

---
 packages/accounts-password/password_tests.js | 28 ++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 88461e7d91..b21b4e6d3d 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1896,4 +1896,32 @@ if (Meteor.isServer) (() => {
     test.equal(url.searchParams.get('test'), extraParams.test);
   });
 
+  Tinytest.addAsync('passwords - createUserAsync', async test => {
+    const username = Random.id();
+    const email = `${username}-intercept@example.com`;
+    const password = 'password';
+
+    const userId = await Accounts.createUserAsync({
+      username: username,
+      email: email,
+      password: password
+    });
+
+    test.isTrue(userId, 'User ID should be returned');
+    const user = await Meteor.users.findOneAsync(userId);
+    test.equal(user.username, username, 'Username should match');
+    test.equal(user.emails[0].address, email, 'Email should match');
+
+    Accounts.config({
+      ambiguousErrorMessages: false,
+    })
+
+    await test.throwsAsync(async () => {
+      await Accounts.createUserAsync({
+        username: username,
+        email: email,
+        password: password
+      });
+    }, 'already exists');
+  });
 })();

From 7405f90823e5252a7118cfd7a73f500c2da529e9 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 13:54:19 -0400
Subject: [PATCH 0736/1140] update shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 .../.npm/package/npm-shrinkwrap.json          | 156 +++++++++---------
 2 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
index 231870d16f..747f5f9b62 100644
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
-      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
+      "version": "22.8.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.4.tgz",
+      "integrity": "sha512-SpNNxkftTJOPk0oN+y2bIqurEXHTA2AOZ3EJDDKeJ5VzkvvORSvmQXGQarcOzWV1ac7DCaPBEdMDxBsM+d8jWw=="
     },
     "@types/notp": {
       "version": "2.0.5",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 6c5b66a97b..c09baec5ef 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,129 +56,129 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.677.0.tgz",
-      "integrity": "sha512-wGhbHAZGa5VeVLCyAfhyFWXl+JfsHSgSl0eodH6xqKoR60LTDJZbBgQZizUwSj8EoSzsglBvgPLYZaLfXTKM/g=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.682.0.tgz",
+      "integrity": "sha512-BD8PPPk3+ZzFqCJSPraoXkgRcPTtjguXtyDYsyBMzFofWmN4YeswXSavZVAC354W98mkffDaXBvieyqu1Y9fKA=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.677.0.tgz",
-      "integrity": "sha512-/y6EskFhOa2w9VwXaXoyOrGeBjnOj/72wsxDOslS908qH+nf7m40pBK6e/iBelg04vlx0gqhlbfK8hLbaT6KHA=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.682.0.tgz",
+      "integrity": "sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.677.0.tgz",
-      "integrity": "sha512-2zgZkRIU7DsnUVOy+9bjfJ0IYMzi9ONWXQt/WqMa7HOnj4RfenfpipyhHYxGZR5kmehgv53EI79yvUu+SAfGNg=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.682.0.tgz",
+      "integrity": "sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.677.0.tgz",
-      "integrity": "sha512-N5fs1GLSthnwrs44b4IJI//dcShuIT42g4pM8FCUJZwbrWn9Sp9F876R1mvb8A9TAy2S4qCXi7TkHS0REnuicQ=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.682.0.tgz",
+      "integrity": "sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ=="
     },
     "@aws-sdk/core": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.677.0.tgz",
-      "integrity": "sha512-5auvc1wmXmd7u9Y9nM95Ia+VX7J2FiZLuADitHqE4mHPH9riDgOY+uK/yM+UKr+lfq4zKiZQG7i8cfabZlCY8g=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.679.0.tgz",
+      "integrity": "sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.677.0.tgz",
-      "integrity": "sha512-ODw8MKhT41KLpKlGIH1yFO2FIOCAW3Nnn2uCu1eAm807aI0OK31ntUNrY+GFzXX7ixv+KFoiJu3ih+w+Oxw5gA=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.682.0.tgz",
+      "integrity": "sha512-V+y4qUQtc0kTnNR7u5LwnZn8EZk2pjdNX+84MwD9VjXekqbXikADu06Mj93kVGVW+qgqtNMvJ8PpiI3EaaxC7A=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.677.0.tgz",
-      "integrity": "sha512-0ctcqKzclr9TiNIkB8I+YRogjWH/4mLWQGv/bgb8ElHqph+rPy4pOubj1Ax01sbs7XdwDaImjBYV5xXE+BEsYw=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.679.0.tgz",
+      "integrity": "sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.677.0.tgz",
-      "integrity": "sha512-c4TnShdzk37dhL1HGGzZ2PDKIIEmo1IbT/4y5hSRdNc8Z8fu6spE5GoeVsv6p/HdSGPS7XTy6aOFCMCk4AeIzQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.679.0.tgz",
+      "integrity": "sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.677.0.tgz",
-      "integrity": "sha512-hW+oHj5zplPLzTk74LG+gZVOKQnmBPyRIbwg3uZWr23xfOxh/Osu9Wq8qwgu2+UyFHr+6/DRFjZJ6avNA2jpKw=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.682.0.tgz",
+      "integrity": "sha512-6eqWeHdK6EegAxqDdiCi215nT3QZPwukgWAYuVxNfJ/5m0/P7fAzF+D5kKVgByUvGJEbq/FEL8Fw7OBe64AA+g=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.677.0.tgz",
-      "integrity": "sha512-DwFriiDx2SSdj7VhRv/0fm8UIK7isy+WZAlqUdZ9xDsX4x1AD5KwMv9AwGhJrMuTjnPSxRSwjt23S7ZXwUfhdw=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.682.0.tgz",
+      "integrity": "sha512-HSmDqZcBVZrTctHCT9m++vdlDfJ1ARI218qmZa+TZzzOFNpKWy6QyHMEra45GB9GnkkMmV6unoDSPMuN0AqcMg=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.677.0.tgz",
-      "integrity": "sha512-pBqHjIFvHBJb2NOsVqdIHWcOzXDoNXBokxTvMggb3WYML6ixwrH7kpd1CAzegeQlvZD4SCcRoy3ahv5rbuR+og=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.679.0.tgz",
+      "integrity": "sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.677.0.tgz",
-      "integrity": "sha512-OkRP3z8yI22t9LS9At5fYr6RN7zKSDiGgeyjEnrqiGHOWGPMJN2GKa8IAFC4dgXt4Nm/EfmEW7UweiqzEKJKOA=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.682.0.tgz",
+      "integrity": "sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.677.0.tgz",
-      "integrity": "sha512-yjuI6hSt1rLFqBQiNKx/nF75Ao72xR8ybqKztzebtFNCrYl8oXVkRiigg5XKNCDmelsx1lcU9IcSiuPHzlGtUQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.679.0.tgz",
+      "integrity": "sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.677.0.tgz",
-      "integrity": "sha512-fUEDkRI2GuN+p9xyZewlRQC2vFXjxPOoQGugQTmOawTxVUYkFpssg4ID0HUtkKuJYHjaoD2bCyKvOcnL1JU6AA=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.682.0.tgz",
+      "integrity": "sha512-vLBdUlTISEXVKYFFO665ajC0U0RdXFx21fwTHiN2g4edFH++di2XCJ8/Y34bu09z9bV/rwFT2jn41iAVWasNKg=="
     },
     "@aws-sdk/middleware-host-header": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
-      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.679.0.tgz",
+      "integrity": "sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w=="
     },
     "@aws-sdk/middleware-logger": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
-      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.679.0.tgz",
+      "integrity": "sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA=="
     },
     "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
-      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.679.0.tgz",
+      "integrity": "sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.677.0.tgz",
-      "integrity": "sha512-A3gzUsTsvyv/JCmD0p2fkbiOyp+tpAiAADDwzi+eYeyzH4xzqnrzSkGk5KSb58uUQo27eeBzRXHd46d0u+sMrQ=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.682.0.tgz",
+      "integrity": "sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg=="
     },
     "@aws-sdk/region-config-resolver": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
-      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.679.0.tgz",
+      "integrity": "sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw=="
     },
     "@aws-sdk/token-providers": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
-      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.679.0.tgz",
+      "integrity": "sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA=="
     },
     "@aws-sdk/types": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
-      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.679.0.tgz",
+      "integrity": "sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q=="
     },
     "@aws-sdk/util-endpoints": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
-      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.679.0.tgz",
+      "integrity": "sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg=="
     },
     "@aws-sdk/util-locate-window": {
-      "version": "3.568.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
-      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz",
+      "integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.675.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz",
-      "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww=="
+      "version": "3.679.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.679.0.tgz",
+      "integrity": "sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.677.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.677.0.tgz",
-      "integrity": "sha512-gFhL0zVY/um0Eu2aWil82pjWaZL4yBmOnjz0+RDz18okFBHaz1Om8o/H+1Vvj+xsnuDYV4ezVMyAaXVtTcYOnw=="
+      "version": "3.682.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.682.0.tgz",
+      "integrity": "sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
@@ -388,9 +388,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
-      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
+      "version": "22.8.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.4.tgz",
+      "integrity": "sha512-SpNNxkftTJOPk0oN+y2bIqurEXHTA2AOZ3EJDDKeJ5VzkvvORSvmQXGQarcOzWV1ac7DCaPBEdMDxBsM+d8jWw=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",

From bfa99b6f0c6f43b707cfeb7f2556e64a1be241e3 Mon Sep 17 00:00:00 2001
From: Brian Chan <brianyeung8@gmail.com>
Date: Thu, 31 Oct 2024 12:45:30 +0800
Subject: [PATCH 0737/1140] Update elliptic

---
 npm-packages/meteor-node-stubs/package-lock.json     | 12 ++++++------
 npm-packages/meteor-node-stubs/package.json          |  4 ++--
 tools/static-assets/skel-apollo/package.json         |  2 +-
 tools/static-assets/skel-bare/package.json           |  2 +-
 tools/static-assets/skel-blaze/package.json          |  2 +-
 tools/static-assets/skel-chakra-ui/package.json      |  2 +-
 tools/static-assets/skel-full/package.json           |  2 +-
 tools/static-assets/skel-minimal/package.json        |  2 +-
 tools/static-assets/skel-react/package.json          |  2 +-
 tools/static-assets/skel-solid/package.json          |  2 +-
 tools/static-assets/skel-svelte/package.json         |  2 +-
 tools/static-assets/skel-tailwind/package.json       |  2 +-
 tools/static-assets/skel-typescript/package.json     |  2 +-
 tools/static-assets/skel-vue/package.json            |  2 +-
 tools/tests/apps/app-config/package.json             |  2 +-
 tools/tests/apps/app-prints-pid/package.json         |  2 +-
 tools/tests/apps/client-refresh/package.json         |  2 +-
 tools/tests/apps/css-injection-test/package.json     |  2 +-
 tools/tests/apps/custom-minifier/package.json        |  2 +-
 .../tests/apps/dev-bundle-bin-commands/package.json  |  2 +-
 tools/tests/apps/dynamic-import/package.json         |  2 +-
 tools/tests/apps/ecmascript-regression/package.json  |  2 +-
 tools/tests/apps/git-commit-hash/package.json        |  2 +-
 .../tests/apps/link-config-npm-package/package.json  |  2 +-
 .../apps/linked-external-npm-package/package.json    |  2 +-
 tools/tests/apps/meteor-ignore/package.json          |  2 +-
 tools/tests/apps/modules/package.json                |  2 +-
 tools/tests/apps/shell/package.json                  |  2 +-
 tools/tests/apps/standard-app/package.json           |  2 +-
 29 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/npm-packages/meteor-node-stubs/package-lock.json b/npm-packages/meteor-node-stubs/package-lock.json
index 4fba62f619..b202b0e2db 100644
--- a/npm-packages/meteor-node-stubs/package-lock.json
+++ b/npm-packages/meteor-node-stubs/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor-node-stubs",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor-node-stubs",
-      "version": "1.2.10",
+      "version": "1.2.12",
       "bundleDependencies": [
         "@meteorjs/crypto-browserify",
         "assert",
@@ -41,7 +41,7 @@
         "console-browserify": "^1.2.0",
         "constants-browserify": "^1.0.0",
         "domain-browser": "^4.23.0",
-        "elliptic": "^6.5.7",
+        "elliptic": "^6.6.0",
         "events": "^3.3.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
@@ -532,9 +532,9 @@
       }
     },
     "node_modules/elliptic": {
-      "version": "6.5.7",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
-      "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
+      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index 2068c222c4..42f776f83e 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -2,7 +2,7 @@
   "name": "meteor-node-stubs",
   "author": "Ben Newman <ben@meteor.com>",
   "description": "Stub implementations of Node built-in modules, a la Browserify",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "main": "index.js",
   "license": "MIT",
   "homepage": "https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-node-stubs/README.md",
@@ -18,7 +18,7 @@
     "console-browserify": "^1.2.0",
     "constants-browserify": "^1.0.0",
     "domain-browser": "^4.23.0",
-    "elliptic": "^6.5.7",
+    "elliptic": "^6.6.0",
     "events": "^3.3.0",
     "https-browserify": "^1.0.0",
     "os-browserify": "^0.3.0",
diff --git a/tools/static-assets/skel-apollo/package.json b/tools/static-assets/skel-apollo/package.json
index 9bf478f474..51ca845233 100644
--- a/tools/static-assets/skel-apollo/package.json
+++ b/tools/static-assets/skel-apollo/package.json
@@ -12,7 +12,7 @@
     "@apollo/server": "^4.10.0",
     "@babel/runtime": "^7.23.9",
     "graphql": "^16.8.1",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/tools/static-assets/skel-bare/package.json b/tools/static-assets/skel-bare/package.json
index 7db49f3411..f2cb0b71a7 100644
--- a/tools/static-assets/skel-bare/package.json
+++ b/tools/static-assets/skel-bare/package.json
@@ -6,6 +6,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   }
 }
diff --git a/tools/static-assets/skel-blaze/package.json b/tools/static-assets/skel-blaze/package.json
index 2761af2093..59e15689c0 100644
--- a/tools/static-assets/skel-blaze/package.json
+++ b/tools/static-assets/skel-blaze/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "jquery": "^3.7.1",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": {
diff --git a/tools/static-assets/skel-chakra-ui/package.json b/tools/static-assets/skel-chakra-ui/package.json
index ce630e2918..690f492c11 100644
--- a/tools/static-assets/skel-chakra-ui/package.json
+++ b/tools/static-assets/skel-chakra-ui/package.json
@@ -15,7 +15,7 @@
     "@emotion/styled": "^11.9.3",
     "@react-icons/all-files": "^4.1.0",
     "framer-motion": "^6.4.2",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json
index 28d1d84d2e..953198e35f 100644
--- a/tools/static-assets/skel-full/package.json
+++ b/tools/static-assets/skel-full/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "jquery": "^3.7.1",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "devDependencies": {
     "chai": "^4.2.0"
diff --git a/tools/static-assets/skel-minimal/package.json b/tools/static-assets/skel-minimal/package.json
index 187111707d..3ade9d3a74 100644
--- a/tools/static-assets/skel-minimal/package.json
+++ b/tools/static-assets/skel-minimal/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": {
diff --git a/tools/static-assets/skel-react/package.json b/tools/static-assets/skel-react/package.json
index 9f5e7f9bc8..0c0eb6e4a5 100644
--- a/tools/static-assets/skel-react/package.json
+++ b/tools/static-assets/skel-react/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json
index 7b575928e5..c52cc4f297 100644
--- a/tools/static-assets/skel-solid/package.json
+++ b/tools/static-assets/skel-solid/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.9",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "solid-js": "^1.8.15"
   },
   "meteor": {
diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json
index 1be6779d00..68e6f37acf 100644
--- a/tools/static-assets/skel-svelte/package.json
+++ b/tools/static-assets/skel-svelte/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "svelte": "^3.59.2"
   },
   "devDependencies": {
diff --git a/tools/static-assets/skel-tailwind/package.json b/tools/static-assets/skel-tailwind/package.json
index e738792743..c02e2d027c 100644
--- a/tools/static-assets/skel-tailwind/package.json
+++ b/tools/static-assets/skel-tailwind/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "autoprefixer": "^10.4.4",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "postcss": "^8.4.12",
     "postcss-load-config": "^3.1.4",
     "react": "^17.0.2",
diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json
index 0746e8368a..07da7c102a 100644
--- a/tools/static-assets/skel-typescript/package.json
+++ b/tools/static-assets/skel-typescript/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json
index 3c1bedf120..0fb89687e4 100644
--- a/tools/static-assets/skel-vue/package.json
+++ b/tools/static-assets/skel-vue/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "vue": "^3.3.9",
     "vue-meteor-tracker": "^3.0.0-beta.7",
     "vue-router": "^4.2.5"
diff --git a/tools/tests/apps/app-config/package.json b/tools/tests/apps/app-config/package.json
index dc5c3aaf75..65c8babb5e 100644
--- a/tools/tests/apps/app-config/package.json
+++ b/tools/tests/apps/app-config/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "puppeteer": "^2.1.1"
   },
   "meteor": {
diff --git a/tools/tests/apps/app-prints-pid/package.json b/tools/tests/apps/app-prints-pid/package.json
index c3c3ba64b1..1a2249fa4a 100644
--- a/tools/tests/apps/app-prints-pid/package.json
+++ b/tools/tests/apps/app-prints-pid/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": {
diff --git a/tools/tests/apps/client-refresh/package.json b/tools/tests/apps/client-refresh/package.json
index 98588b9b2f..d79be809f3 100644
--- a/tools/tests/apps/client-refresh/package.json
+++ b/tools/tests/apps/client-refresh/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": {
diff --git a/tools/tests/apps/css-injection-test/package.json b/tools/tests/apps/css-injection-test/package.json
index c9acaecfb9..7778b8ccd5 100644
--- a/tools/tests/apps/css-injection-test/package.json
+++ b/tools/tests/apps/css-injection-test/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "jquery": "^3.7.1",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": "css-injection-test.js"
diff --git a/tools/tests/apps/custom-minifier/package.json b/tools/tests/apps/custom-minifier/package.json
index bc4cc26b3a..1bf5b6c401 100644
--- a/tools/tests/apps/custom-minifier/package.json
+++ b/tools/tests/apps/custom-minifier/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "jquery": "^3.7.1",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": "code.js"
diff --git a/tools/tests/apps/dev-bundle-bin-commands/package.json b/tools/tests/apps/dev-bundle-bin-commands/package.json
index 427753ffe6..6e4a415585 100644
--- a/tools/tests/apps/dev-bundle-bin-commands/package.json
+++ b/tools/tests/apps/dev-bundle-bin-commands/package.json
@@ -8,6 +8,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   }
 }
diff --git a/tools/tests/apps/dynamic-import/package.json b/tools/tests/apps/dynamic-import/package.json
index 679219d5ed..853e7e6133 100644
--- a/tools/tests/apps/dynamic-import/package.json
+++ b/tools/tests/apps/dynamic-import/package.json
@@ -10,7 +10,7 @@
     "acorn": "^7.4.1",
     "arson": "^0.2.6",
     "jquery": "^3.7.1",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "moment": "^2.29.4",
     "optimism": "^0.11.5",
     "private": "^0.1.8",
diff --git a/tools/tests/apps/ecmascript-regression/package.json b/tools/tests/apps/ecmascript-regression/package.json
index 59c305eeda..bc67fd9207 100644
--- a/tools/tests/apps/ecmascript-regression/package.json
+++ b/tools/tests/apps/ecmascript-regression/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "puppeteer": "^10.4.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
diff --git a/tools/tests/apps/git-commit-hash/package.json b/tools/tests/apps/git-commit-hash/package.json
index a08e85969b..dfd798be69 100644
--- a/tools/tests/apps/git-commit-hash/package.json
+++ b/tools/tests/apps/git-commit-hash/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "puppeteer": "^2.1.1"
   },
   "meteor": {
diff --git a/tools/tests/apps/link-config-npm-package/package.json b/tools/tests/apps/link-config-npm-package/package.json
index f174884643..7f00cdf583 100644
--- a/tools/tests/apps/link-config-npm-package/package.json
+++ b/tools/tests/apps/link-config-npm-package/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "config": "file:../config-package",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": {
diff --git a/tools/tests/apps/linked-external-npm-package/package.json b/tools/tests/apps/linked-external-npm-package/package.json
index 96ae9fcaa4..7735413880 100644
--- a/tools/tests/apps/linked-external-npm-package/package.json
+++ b/tools/tests/apps/linked-external-npm-package/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "external-package": "file:../external-package",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": {
diff --git a/tools/tests/apps/meteor-ignore/package.json b/tools/tests/apps/meteor-ignore/package.json
index c5723f52b3..8ab2a13628 100644
--- a/tools/tests/apps/meteor-ignore/package.json
+++ b/tools/tests/apps/meteor-ignore/package.json
@@ -6,6 +6,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   }
 }
diff --git a/tools/tests/apps/modules/package.json b/tools/tests/apps/modules/package.json
index 08d98ce964..ca41575ebe 100644
--- a/tools/tests/apps/modules/package.json
+++ b/tools/tests/apps/modules/package.json
@@ -19,7 +19,7 @@
     "jsx-import-test": "file:imports/links/jsx-import-test",
     "lodash-es": "^4.17.21",
     "markdown-to-jsx": "4.0.3",
-    "meteor-node-stubs": "^1.2.10",
+    "meteor-node-stubs": "^1.2.12",
     "mobx": "5.8.0",
     "moment": "^2.30.1",
     "mssql": "^3.1.1",
diff --git a/tools/tests/apps/shell/package.json b/tools/tests/apps/shell/package.json
index 98ebe3218e..df535c6f42 100644
--- a/tools/tests/apps/shell/package.json
+++ b/tools/tests/apps/shell/package.json
@@ -6,6 +6,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   }
 }
diff --git a/tools/tests/apps/standard-app/package.json b/tools/tests/apps/standard-app/package.json
index 19b6b4faf4..8d4fb76da0 100644
--- a/tools/tests/apps/standard-app/package.json
+++ b/tools/tests/apps/standard-app/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "meteor-node-stubs": "^1.2.10"
+    "meteor-node-stubs": "^1.2.12"
   },
   "meteor": {
     "mainModule": false,

From 7b8f410e45d7fa1d538141554d7ea5805f8794de Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 31 Oct 2024 08:28:05 -0400
Subject: [PATCH 0738/1140] upgrade elliptic and add missing change logs

---
 npm-packages/meteor-node-stubs/CHANGELOG.md      | 8 ++++++++
 npm-packages/meteor-node-stubs/package-lock.json | 9 ++++-----
 npm-packages/meteor-node-stubs/package.json      | 2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/npm-packages/meteor-node-stubs/CHANGELOG.md b/npm-packages/meteor-node-stubs/CHANGELOG.md
index 775ab2be53..7e838c152a 100644
--- a/npm-packages/meteor-node-stubs/CHANGELOG.md
+++ b/npm-packages/meteor-node-stubs/CHANGELOG.md
@@ -1,3 +1,11 @@
+v1.2.12 - 2024-10-31
+
+* Update `elliptic` to v6.6.0 to address a security vulnerability.
+
+v1.2.11 - 2024-10-25
+
+* Update `rimraf` to v5 to remove vulnerable `inflight` dependency.
+
 v1.2.8 - 2024-04-01
 * Add new dependency `@meteorjs/crypto-browserify` to replace `crypto-browserify` as it had unsafe dependencies.
 
diff --git a/npm-packages/meteor-node-stubs/package-lock.json b/npm-packages/meteor-node-stubs/package-lock.json
index 5eb08555a7..5788d1584f 100644
--- a/npm-packages/meteor-node-stubs/package-lock.json
+++ b/npm-packages/meteor-node-stubs/package-lock.json
@@ -41,7 +41,7 @@
         "console-browserify": "^1.2.0",
         "constants-browserify": "^1.0.0",
         "domain-browser": "^4.23.0",
-        "elliptic": "^6.5.7",
+        "elliptic": "^6.6.0",
         "events": "^3.3.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
@@ -614,11 +614,10 @@
       "dev": true
     },
     "node_modules/elliptic": {
-      "version": "6.5.7",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
-      "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
+      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
       "inBundle": true,
-      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.11.9",
         "brorand": "^1.1.0",
diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index ca2a123d44..a86ca314d8 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -18,7 +18,7 @@
     "console-browserify": "^1.2.0",
     "constants-browserify": "^1.0.0",
     "domain-browser": "^4.23.0",
-    "elliptic": "^6.5.7",
+    "elliptic": "^6.6.0",
     "events": "^3.3.0",
     "https-browserify": "^1.0.0",
     "os-browserify": "^0.3.0",

From ecd46c9e0e442bc7c802593fadcd10f7f14c166e Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 31 Oct 2024 08:29:34 -0400
Subject: [PATCH 0739/1140] bump version

---
 npm-packages/meteor-node-stubs/package-lock.json | 4 ++--
 npm-packages/meteor-node-stubs/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/npm-packages/meteor-node-stubs/package-lock.json b/npm-packages/meteor-node-stubs/package-lock.json
index 5788d1584f..6b61b1243f 100644
--- a/npm-packages/meteor-node-stubs/package-lock.json
+++ b/npm-packages/meteor-node-stubs/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor-node-stubs",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor-node-stubs",
-      "version": "1.2.11",
+      "version": "1.2.12",
       "bundleDependencies": [
         "@meteorjs/crypto-browserify",
         "assert",
diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index a86ca314d8..53150b3ec6 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -2,7 +2,7 @@
   "name": "meteor-node-stubs",
   "author": "Ben Newman <ben@meteor.com>",
   "description": "Stub implementations of Node built-in modules, a la Browserify",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "main": "index.js",
   "license": "MIT",
   "homepage": "https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-node-stubs/README.md",

From 85c8d8d165fe4b07d9dd01ef7a59b1ddcf290a25 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 31 Oct 2024 09:32:06 -0400
Subject: [PATCH 0740/1140] update shrinkwrap

---
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 .../email/.npm/package/npm-shrinkwrap.json    |   6 +-
 .../.npm/package/npm-shrinkwrap.json          | 386 ------------------
 3 files changed, 6 insertions(+), 392 deletions(-)

diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
index 17d5ae8af2..b70ec80ef7 100644
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.8.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
-      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg=="
+      "version": "22.8.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.5.tgz",
+      "integrity": "sha512-5iYk6AMPtsMbkZqCO1UGF9W5L38twq11S2pYWkybGHH2ogPUvXWNlQqJBzuEZWKj/WRH+QTeiv6ySWqJtvIEgA=="
     },
     "@types/notp": {
       "version": "2.0.5",
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index 662abdbb5a..637f32d204 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.8.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz",
-      "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg=="
+      "version": "22.8.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.5.tgz",
+      "integrity": "sha512-5iYk6AMPtsMbkZqCO1UGF9W5L38twq11S2pYWkybGHH2ogPUvXWNlQqJBzuEZWKj/WRH+QTeiv6ySWqJtvIEgA=="
     },
     "@types/nodemailer": {
       "version": "6.4.14",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index d7ca80daf3..471827971a 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -1,397 +1,11 @@
 {
   "lockfileVersion": 4,
   "dependencies": {
-    "@aws-crypto/sha256-browser": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
-      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
-      "dependencies": {
-        "@smithy/is-array-buffer": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
-          "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="
-        },
-        "@smithy/util-buffer-from": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
-          "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="
-        },
-        "@smithy/util-utf8": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-          "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="
-        }
-      }
-    },
-    "@aws-crypto/sha256-js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
-      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA=="
-    },
-    "@aws-crypto/supports-web-crypto": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
-      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg=="
-    },
-    "@aws-crypto/util": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
-      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
-      "dependencies": {
-        "@smithy/is-array-buffer": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
-          "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="
-        },
-        "@smithy/util-buffer-from": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
-          "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="
-        },
-        "@smithy/util-utf8": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-          "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="
-        }
-      }
-    },
-    "@aws-sdk/client-cognito-identity": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.682.0.tgz",
-      "integrity": "sha512-BD8PPPk3+ZzFqCJSPraoXkgRcPTtjguXtyDYsyBMzFofWmN4YeswXSavZVAC354W98mkffDaXBvieyqu1Y9fKA=="
-    },
-    "@aws-sdk/client-sso": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.682.0.tgz",
-      "integrity": "sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw=="
-    },
-    "@aws-sdk/client-sso-oidc": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.682.0.tgz",
-      "integrity": "sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ=="
-    },
-    "@aws-sdk/client-sts": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.682.0.tgz",
-      "integrity": "sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ=="
-    },
-    "@aws-sdk/core": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.679.0.tgz",
-      "integrity": "sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg=="
-    },
-    "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.682.0.tgz",
-      "integrity": "sha512-V+y4qUQtc0kTnNR7u5LwnZn8EZk2pjdNX+84MwD9VjXekqbXikADu06Mj93kVGVW+qgqtNMvJ8PpiI3EaaxC7A=="
-    },
-    "@aws-sdk/credential-provider-env": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.679.0.tgz",
-      "integrity": "sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA=="
-    },
-    "@aws-sdk/credential-provider-http": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.679.0.tgz",
-      "integrity": "sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw=="
-    },
-    "@aws-sdk/credential-provider-ini": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.682.0.tgz",
-      "integrity": "sha512-6eqWeHdK6EegAxqDdiCi215nT3QZPwukgWAYuVxNfJ/5m0/P7fAzF+D5kKVgByUvGJEbq/FEL8Fw7OBe64AA+g=="
-    },
-    "@aws-sdk/credential-provider-node": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.682.0.tgz",
-      "integrity": "sha512-HSmDqZcBVZrTctHCT9m++vdlDfJ1ARI218qmZa+TZzzOFNpKWy6QyHMEra45GB9GnkkMmV6unoDSPMuN0AqcMg=="
-    },
-    "@aws-sdk/credential-provider-process": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.679.0.tgz",
-      "integrity": "sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ=="
-    },
-    "@aws-sdk/credential-provider-sso": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.682.0.tgz",
-      "integrity": "sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg=="
-    },
-    "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.679.0.tgz",
-      "integrity": "sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung=="
-    },
-    "@aws-sdk/credential-providers": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.682.0.tgz",
-      "integrity": "sha512-vLBdUlTISEXVKYFFO665ajC0U0RdXFx21fwTHiN2g4edFH++di2XCJ8/Y34bu09z9bV/rwFT2jn41iAVWasNKg=="
-    },
-    "@aws-sdk/middleware-host-header": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.679.0.tgz",
-      "integrity": "sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w=="
-    },
-    "@aws-sdk/middleware-logger": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.679.0.tgz",
-      "integrity": "sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA=="
-    },
-    "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.679.0.tgz",
-      "integrity": "sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ=="
-    },
-    "@aws-sdk/middleware-user-agent": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.682.0.tgz",
-      "integrity": "sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg=="
-    },
-    "@aws-sdk/region-config-resolver": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.679.0.tgz",
-      "integrity": "sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw=="
-    },
-    "@aws-sdk/token-providers": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.679.0.tgz",
-      "integrity": "sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA=="
-    },
-    "@aws-sdk/types": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.679.0.tgz",
-      "integrity": "sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q=="
-    },
-    "@aws-sdk/util-endpoints": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.679.0.tgz",
-      "integrity": "sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg=="
-    },
-    "@aws-sdk/util-locate-window": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz",
-      "integrity": "sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA=="
-    },
-    "@aws-sdk/util-user-agent-browser": {
-      "version": "3.679.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.679.0.tgz",
-      "integrity": "sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ=="
-    },
-    "@aws-sdk/util-user-agent-node": {
-      "version": "3.682.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.682.0.tgz",
-      "integrity": "sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA=="
-    },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
       "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
     },
-    "@smithy/abort-controller": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.6.tgz",
-      "integrity": "sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ=="
-    },
-    "@smithy/config-resolver": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.10.tgz",
-      "integrity": "sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw=="
-    },
-    "@smithy/core": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.1.tgz",
-      "integrity": "sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg=="
-    },
-    "@smithy/credential-provider-imds": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz",
-      "integrity": "sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg=="
-    },
-    "@smithy/fetch-http-handler": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz",
-      "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A=="
-    },
-    "@smithy/hash-node": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.8.tgz",
-      "integrity": "sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng=="
-    },
-    "@smithy/invalid-dependency": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz",
-      "integrity": "sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q=="
-    },
-    "@smithy/is-array-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
-      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="
-    },
-    "@smithy/middleware-content-length": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz",
-      "integrity": "sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg=="
-    },
-    "@smithy/middleware-endpoint": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz",
-      "integrity": "sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA=="
-    },
-    "@smithy/middleware-retry": {
-      "version": "3.0.25",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz",
-      "integrity": "sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg=="
-    },
-    "@smithy/middleware-serde": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz",
-      "integrity": "sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA=="
-    },
-    "@smithy/middleware-stack": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz",
-      "integrity": "sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA=="
-    },
-    "@smithy/node-config-provider": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz",
-      "integrity": "sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew=="
-    },
-    "@smithy/node-http-handler": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz",
-      "integrity": "sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w=="
-    },
-    "@smithy/property-provider": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.8.tgz",
-      "integrity": "sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA=="
-    },
-    "@smithy/protocol-http": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.5.tgz",
-      "integrity": "sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg=="
-    },
-    "@smithy/querystring-builder": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz",
-      "integrity": "sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA=="
-    },
-    "@smithy/querystring-parser": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz",
-      "integrity": "sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg=="
-    },
-    "@smithy/service-error-classification": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz",
-      "integrity": "sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g=="
-    },
-    "@smithy/shared-ini-file-loader": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz",
-      "integrity": "sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA=="
-    },
-    "@smithy/signature-v4": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.1.tgz",
-      "integrity": "sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg=="
-    },
-    "@smithy/smithy-client": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.2.tgz",
-      "integrity": "sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA=="
-    },
-    "@smithy/types": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.6.0.tgz",
-      "integrity": "sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w=="
-    },
-    "@smithy/url-parser": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.8.tgz",
-      "integrity": "sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg=="
-    },
-    "@smithy/util-base64": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz",
-      "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ=="
-    },
-    "@smithy/util-body-length-browser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz",
-      "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ=="
-    },
-    "@smithy/util-body-length-node": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz",
-      "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA=="
-    },
-    "@smithy/util-buffer-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
-      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA=="
-    },
-    "@smithy/util-config-provider": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz",
-      "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="
-    },
-    "@smithy/util-defaults-mode-browser": {
-      "version": "3.0.25",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz",
-      "integrity": "sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA=="
-    },
-    "@smithy/util-defaults-mode-node": {
-      "version": "3.0.25",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz",
-      "integrity": "sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g=="
-    },
-    "@smithy/util-endpoints": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz",
-      "integrity": "sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ=="
-    },
-    "@smithy/util-hex-encoding": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz",
-      "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="
-    },
-    "@smithy/util-middleware": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.8.tgz",
-      "integrity": "sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA=="
-    },
-    "@smithy/util-retry": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.8.tgz",
-      "integrity": "sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow=="
-    },
-    "@smithy/util-stream": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.2.1.tgz",
-      "integrity": "sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==",
-      "dependencies": {
-        "@smithy/fetch-http-handler": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz",
-          "integrity": "sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g=="
-        }
-      }
-    },
-    "@smithy/util-uri-escape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
-      "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg=="
-    },
-    "@smithy/util-utf8": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
-      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
-    },
-    "@types/node": {
-      "version": "22.8.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.4.tgz",
-      "integrity": "sha512-SpNNxkftTJOPk0oN+y2bIqurEXHTA2AOZ3EJDDKeJ5VzkvvORSvmQXGQarcOzWV1ac7DCaPBEdMDxBsM+d8jWw=="
-    },
     "@types/webidl-conversions": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",

From 70d689db072321dbb10da28b682f250de2c893c3 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 31 Oct 2024 13:26:38 -0400
Subject: [PATCH 0741/1140] - never emit the punycode warning

---
 meteor                         |  8 ++-----
 meteor.bat                     |  1 +
 tools/index.js                 |  1 -
 tools/node-process-warnings.js | 38 ++++++++++++++++++----------------
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/meteor b/meteor
index c335c922c0..cda924cbf0 100755
--- a/meteor
+++ b/meteor
@@ -123,7 +123,7 @@ fi
 
 DEV_BUNDLE="$SCRIPT_DIR/dev_bundle"
 METEOR="$SCRIPT_DIR/tools/index.js"
-PROCESS_REQUIRES="$SCRIPT_DIR/tools/node-process-requires.js"
+PROCESS_REQUIRES="$SCRIPT_DIR/tools/node-process-warnings.js"
 
 # Set the nofile ulimit as high as permitted by the hard-limit/kernel
 if [ "$(ulimit -Sn)" != "unlimited" ]; then
@@ -138,11 +138,6 @@ if [ "$(ulimit -Sn)" != "unlimited" ]; then
     fi
 fi
 
-# By default, we disable all the Node warnings
-# Then we re-enable the warning on tools/node-process-warning
-# The advantage of this is that we have full control of which warning we want to suppress
-export NODE_OPTIONS="--no-warnings $NODE_OPTIONS"
-
 # We used to set $NODE_PATH here to include the node_modules from the dev
 # bundle, but now we just get them from the symlink at tools/node_modules. This
 # is better because node_modules directories found via the ancestor walk from
@@ -154,5 +149,6 @@ export NODE_OPTIONS="--no-warnings $NODE_OPTIONS"
 exec "$DEV_BUNDLE/bin/node" \
      --max-old-space-size=4096 \
      --no-wasm-code-gc \
+     --require="$PROCESS_REQUIRES"\
      ${TOOL_NODE_FLAGS} \
      "$METEOR" "$@"
diff --git a/meteor.bat b/meteor.bat
index aa6b05d750..1f0f75d081 100644
--- a/meteor.bat
+++ b/meteor.bat
@@ -48,6 +48,7 @@ SET BABEL_CACHE_DIR=%~dp0\.babel-cache
 
 "%~dp0\dev_bundle\bin\node.exe" ^
   --no-wasm-code-gc ^
+  --require="%~dp0\tools\node-process-warnings.js" ^
   %TOOL_NODE_FLAGS% ^
   "%~dp0\tools\index.js" %*
 
diff --git a/tools/index.js b/tools/index.js
index 5967be9ed7..82876cae67 100644
--- a/tools/index.js
+++ b/tools/index.js
@@ -1,4 +1,3 @@
-require("./node-process-warnings");
 const { getChildProcess } = require("./cli/dev-bundle-bin-commands");
 
 getChildProcess({ isFirstTry: true }).then(
diff --git a/tools/node-process-warnings.js b/tools/node-process-warnings.js
index a96bee9d5b..9dbc7919dd 100644
--- a/tools/node-process-warnings.js
+++ b/tools/node-process-warnings.js
@@ -1,20 +1,22 @@
-process.on("warning", (warn) => {
-  if (warn.message.includes("punycode")) {
-    /*
-     * A warning was introduced in Node 22:
-     *
-     * "The `punycode` module is deprecated. Please use a userland alternative instead."
-     *
-     * The problem is that punycode is deeply integrated in the Node system. It's not a
-     * simple direct dependency.
-     *
-     * Check these issues for more details:
-     * https://github.com/mathiasbynens/punycode.js/issues/137
-     * https://stackoverflow.com/questions/68774489/punycode-is-deprecated-in-npm-what-should-i-replace-it-with/78946745
-     *
-     * This warning was, besides being annoying, breaking our tests.
-     */
+const originalEmitWarning = process.emitWarning;
+
+process.emitWarning = function (message) {
+  /*
+   * A warning was introduced in Node 22:
+   *
+   * "The `punycode` module is deprecated. Please use a userland alternative instead."
+   *
+   * The problem is that punycode is deeply integrated in the Node system. It's not a
+   * simple direct dependency.
+   *
+   * Check these issues for more details:
+   * https://github.com/mathiasbynens/punycode.js/issues/137
+   * https://stackoverflow.com/questions/68774489/punycode-is-deprecated-in-npm-what-should-i-replace-it-with/78946745
+   *
+   * This warning was, besides being annoying, breaking our tests.
+   */
+  if (message.includes("punycode")) {
     return;
   }
-  console.warn(warn);
-});
+  return originalEmitWarning(message);
+};

From 6f3ff7f3b5a053de41a21a2a847d9b900ac93a69 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 31 Oct 2024 13:29:26 -0400
Subject: [PATCH 0742/1140] bump BUNDLE_VERSION

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index cda924cbf0..b07a4daf07 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.11.0.0
+BUNDLE_VERSION=22.11.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled

From 284952f0dd5e85b1ae073217b13fe74a047fbc60 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 31 Oct 2024 13:43:59 -0400
Subject: [PATCH 0743/1140] force CI tests to run again


From 17f8256eff196e5479b13334e79273cef4c6aaa3 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 31 Oct 2024 15:54:21 -0400
Subject: [PATCH 0744/1140] add setImmediate for inbound messages

---
 packages/ddp-server/livedata_server.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index cd7a24094c..0f21be2d18 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -80,6 +80,8 @@ Object.assign(DummyDocumentView.prototype, {
 var SessionDocumentView = function () {
   var self = this;
   self.existsIn = new Set(); // set of subscriptionHandle
+
+  // Memory Growth
   self.dataByKey = new Map(); // key-> [ {subscriptionHandle, value} by precedence]
 };
 
@@ -185,6 +187,7 @@ Object.assign(SessionDocumentView.prototype, {
 var SessionCollectionView = function (collectionName, sessionCallbacks) {
   var self = this;
   self.collectionName = collectionName;
+  // Memory Growth
   self.documents = new Map();
   self.callbacks = sessionCallbacks;
 };
@@ -636,7 +639,7 @@ Object.assign(Session.prototype, {
           if (!blocked)
             return; // idempotent
           blocked = false;
-          processNext();
+          setImmediate(processNext);
         };
 
         self.server.onMessageHook.each(function (callback) {

From 91f9ed434641553192705ca51aac71f787dcb83d Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 31 Oct 2024 15:54:39 -0400
Subject: [PATCH 0745/1140] annotate memory growth point

---
 packages/mongo/oplog_observe_driver.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mongo/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js
index c857a14f48..cb67ac7fc5 100644
--- a/packages/mongo/oplog_observe_driver.js
+++ b/packages/mongo/oplog_observe_driver.js
@@ -87,6 +87,7 @@ export const OplogObserveDriver = function (options) {
     self._comparator = null;
     self._sorter = null;
     self._unpublishedBuffer = null;
+    // Memory Growth
     self._published = new LocalCollection._IdMap;
   }
 

From 76a46545a474e4d034ff03bf7efcd1cece17e886 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 1 Nov 2024 11:13:13 -0400
Subject: [PATCH 0746/1140] add test

---
 packages/ddp-client/test/livedata_tests.js | 98 ++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/packages/ddp-client/test/livedata_tests.js b/packages/ddp-client/test/livedata_tests.js
index 426c5bf832..1fb6c0aa1e 100644
--- a/packages/ddp-client/test/livedata_tests.js
+++ b/packages/ddp-client/test/livedata_tests.js
@@ -1193,6 +1193,104 @@ testAsyncMulti('livedata - methods with nested stubs', [
   },
 ]);
 
+const collName = `test-collection`;
+const coll = new Mongo.Collection(collName);
+
+if (Meteor.isServer) {
+  Meteor.publish(`pub-${collName}`, function () {
+    return coll.find();
+  });
+}
+
+Meteor.methods({
+  [`insert-${collName}`]: async function() {
+    return await coll.insertAsync({ value: 1 });
+  },
+  [`update-${collName}`]: async function(id) {
+    return await coll.updateAsync(id, { $set: { value: 2 } });
+  },
+  [`remove-${collName}`]: async function(id) {
+    return await coll.removeAsync(id);
+  }
+});
+
+if (Meteor.isClient) {
+  Tinytest.addAsync('livedata - method updated message with subscriptions', async function (test) {
+    let messages = [];
+
+    const onMessage = message => messages.push(EJSON.parse(message));
+
+    Meteor.connection._stream.on('message', onMessage);
+
+    const sub = Meteor.subscribe(`pub-${collName}`);
+
+    await new Promise(resolve => {
+      const id = setInterval(() => {
+        if (sub.ready()) {
+          clearInterval(id);
+          resolve();
+        }
+      }, 10);
+    });
+
+    let insertId;
+
+    try {
+      for (let i = 0; i < 100; i++) {
+        messages = [];
+
+        insertId = await Meteor.callAsync(`insert-${collName}`);
+
+        await Meteor.sleep(1)
+
+        const hasResult = messages.some(msg => msg.msg === 'result');
+        const hasAdded = messages.some(msg => msg.msg === 'added');
+        const hasUpdated = messages.some(msg =>
+          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+        );
+
+        test.isTrue(hasResult, `Iteration ${i}: Should receive RESULT message for insert`);
+        test.isTrue(hasAdded, `Iteration ${i}: Should receive ADDED message for insert`);
+        test.isTrue(hasUpdated, `Iteration ${i}: Should receive UPDATED message for insert`);
+
+        messages = [];
+
+        await Meteor.callAsync(`update-${collName}`, insertId);
+
+        await Meteor.sleep(1)
+
+        const hasUpdateResult = messages.some(msg => msg.msg === 'result');
+        const hasChanged = messages.some(msg => msg.msg === 'changed');
+        const hasUpdateUpdated = messages.some(msg =>
+          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+        );
+
+        test.isTrue(hasUpdateResult, `Iteration ${i}: Should receive RESULT message for update`);
+        test.isTrue(hasChanged, `Iteration ${i}: Should receive CHANGED message`);
+        test.isTrue(hasUpdateUpdated, `Iteration ${i}: Should receive UPDATED message for update`);
+
+        messages = [];
+
+        await Meteor.callAsync(`remove-${collName}`, insertId);
+
+        await Meteor.sleep(1)
+
+        const hasRemoveResult = messages.some(msg => msg.msg === 'result');
+        const hasRemoved = messages.some(msg => msg.msg === 'removed');
+        const hasRemoveUpdated = messages.some(msg =>
+          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+        );
+
+        test.isTrue(hasRemoveResult, `Iteration ${i}: Should receive RESULT message for remove`);
+        test.isTrue(hasRemoved, `Iteration ${i}: Should receive REMOVED message`);
+        test.isTrue(hasRemoveUpdated, `Iteration ${i}: Should receive UPDATED message for remove`);
+      }
+    } finally {
+      sub.stop();
+    }
+  });
+}
+
 // TODO [FIBERS] - check if this still makes sense to have
 
 //  Tinytest.addAsync('livedata - isAsync call', async function (test) {

From 44af5ff8a79e44e5c9a6b133e43e710587cdb5f2 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 1 Nov 2024 11:39:29 -0400
Subject: [PATCH 0747/1140] the result message is out of order

---
 packages/ddp-client/test/livedata_tests.js | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/ddp-client/test/livedata_tests.js b/packages/ddp-client/test/livedata_tests.js
index 1fb6c0aa1e..d297aafe58 100644
--- a/packages/ddp-client/test/livedata_tests.js
+++ b/packages/ddp-client/test/livedata_tests.js
@@ -1234,19 +1234,21 @@ if (Meteor.isClient) {
     });
 
     let insertId;
+    let resultId
 
     try {
-      for (let i = 0; i < 100; i++) {
+      for (let i = 0; i < 250; i++) {
         messages = [];
 
         insertId = await Meteor.callAsync(`insert-${collName}`);
 
-        await Meteor.sleep(1)
-
         const hasResult = messages.some(msg => msg.msg === 'result');
+
+        resultId = messages.find(msg => msg.msg === 'result').id;
+
         const hasAdded = messages.some(msg => msg.msg === 'added');
         const hasUpdated = messages.some(msg =>
-          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+          msg.msg === 'updated' && msg.methods?.includes(resultId)
         );
 
         test.isTrue(hasResult, `Iteration ${i}: Should receive RESULT message for insert`);
@@ -1257,12 +1259,13 @@ if (Meteor.isClient) {
 
         await Meteor.callAsync(`update-${collName}`, insertId);
 
-        await Meteor.sleep(1)
-
         const hasUpdateResult = messages.some(msg => msg.msg === 'result');
+
+        resultId = messages.find(msg => msg.msg === 'result').id;
+
         const hasChanged = messages.some(msg => msg.msg === 'changed');
         const hasUpdateUpdated = messages.some(msg =>
-          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+          msg.msg === 'updated' && msg.methods?.includes(resultId)
         );
 
         test.isTrue(hasUpdateResult, `Iteration ${i}: Should receive RESULT message for update`);
@@ -1273,12 +1276,13 @@ if (Meteor.isClient) {
 
         await Meteor.callAsync(`remove-${collName}`, insertId);
 
-        await Meteor.sleep(1)
-
         const hasRemoveResult = messages.some(msg => msg.msg === 'result');
+
+        resultId = messages.find(msg => msg.msg === 'result').id;
+
         const hasRemoved = messages.some(msg => msg.msg === 'removed');
         const hasRemoveUpdated = messages.some(msg =>
-          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+          msg.msg === 'updated' && msg.methods?.includes(resultId)
         );
 
         test.isTrue(hasRemoveResult, `Iteration ${i}: Should receive RESULT message for remove`);

From 2804d307aa4aeb7f05b0a33ee1aeac6e0de801b1 Mon Sep 17 00:00:00 2001
From: 9Morello <caio@quave.com.br>
Date: Sat, 2 Nov 2024 18:48:24 -0300
Subject: [PATCH 0748/1140] chore: fix warning about calling Meteor.user()
 instead of Meteor.userAsync() on the server, when running the
 accounts-password test suite

---
 packages/accounts-password/password_tests.js       | 4 ++--
 packages/accounts-password/password_tests_setup.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 88461e7d91..a7b8b6eff4 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1212,10 +1212,10 @@ if (Meteor.isServer) (() => {
 
   // This test properly belongs in accounts-base/accounts_tests.js, but
   // this is where the tests that actually log in are.
-  Tinytest.addAsync('accounts - user() out of context', async test => {
+  Tinytest.addAsync('accounts - userAsync() out of context', async test => {
     await test.throwsAsync(
       async () =>
-        await Meteor.user()
+        await Meteor.userAsync()
     );
     await Meteor.users.removeAsync({});
   });
diff --git a/packages/accounts-password/password_tests_setup.js b/packages/accounts-password/password_tests_setup.js
index 48a34c8766..50a1e95862 100644
--- a/packages/accounts-password/password_tests_setup.js
+++ b/packages/accounts-password/password_tests_setup.js
@@ -121,7 +121,7 @@ Accounts.config({
 Meteor.methods(
   {
     testMeteorUser:
-      async () => await Meteor.user(),
+      async () => await Meteor.userAsync(),
 
     clearUsernameAndProfile:
       async function () {

From 8a71fd06b52e283e21edc1316be40069f06d82b0 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 4 Nov 2024 08:37:33 -0400
Subject: [PATCH 0749/1140] refactor to oplog_v2_converter to typescript

---
 packages/mongo/oplog_v2_converter.js | 127 ------------------
 packages/mongo/oplog_v2_converter.ts | 184 +++++++++++++++++++++++++++
 packages/mongo/package.js            |   2 +-
 3 files changed, 185 insertions(+), 128 deletions(-)
 delete mode 100644 packages/mongo/oplog_v2_converter.js
 create mode 100644 packages/mongo/oplog_v2_converter.ts

diff --git a/packages/mongo/oplog_v2_converter.js b/packages/mongo/oplog_v2_converter.js
deleted file mode 100644
index 6cb6b4c726..0000000000
--- a/packages/mongo/oplog_v2_converter.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// Converter of the new MongoDB Oplog format (>=5.0) to the one that Meteor
-// handles well, i.e., `$set` and `$unset`. The new format is completely new,
-// and looks as follows:
-//
-//   { $v: 2, diff: Diff }
-//
-// where `Diff` is a recursive structure:
-//
-//   {
-//     // Nested updates (sometimes also represented with an s-field).
-//     // Example: `{ $set: { 'foo.bar': 1 } }`.
-//     i: { <key>: <value>, ... },
-//
-//     // Top-level updates.
-//     // Example: `{ $set: { foo: { bar: 1 } } }`.
-//     u: { <key>: <value>, ... },
-//
-//     // Unsets.
-//     // Example: `{ $unset: { foo: '' } }`.
-//     d: { <key>: false, ... },
-//
-//     // Array operations.
-//     // Example: `{ $push: { foo: 'bar' } }`.
-//     s<key>: { a: true, u<index>: <value>, ... },
-//     ...
-//
-//     // Nested operations (sometimes also represented in the `i` field).
-//     // Example: `{ $set: { 'foo.bar': 1 } }`.
-//     s<key>: Diff,
-//     ...
-//   }
-//
-// (all fields are optional).
-
-function join(prefix, key) {
-  return prefix ? `${prefix}.${key}` : key;
-}
-
-const arrayOperatorKeyRegex = /^(a|[su]\d+)$/;
-
-function isArrayOperatorKey(field) {
-  return arrayOperatorKeyRegex.test(field);
-}
-
-function isArrayOperator(operator) {
-  return operator.a === true && Object.keys(operator).every(isArrayOperatorKey);
-}
-
-function flattenObjectInto(target, source, prefix) {
-  if (Array.isArray(source) || typeof source !== 'object' || source === null ||
-      source instanceof Mongo.ObjectID) {
-    target[prefix] = source;
-  } else {
-    const entries = Object.entries(source);
-    if (entries.length) {
-      entries.forEach(([key, value]) => {
-        flattenObjectInto(target, value, join(prefix, key));
-      });
-    } else {
-      target[prefix] = source;
-    }
-  }
-}
-
-const logDebugMessages = !!process.env.OPLOG_CONVERTER_DEBUG;
-
-function convertOplogDiff(oplogEntry, diff, prefix) {
-  if (logDebugMessages) {
-    console.log(`convertOplogDiff(${JSON.stringify(oplogEntry)}, ${JSON.stringify(diff)}, ${JSON.stringify(prefix)})`);
-  }
-
-  Object.entries(diff).forEach(([diffKey, value]) => {
-    if (diffKey === 'd') {
-      // Handle `$unset`s.
-      oplogEntry.$unset ??= {};
-      Object.keys(value).forEach(key => {
-        oplogEntry.$unset[join(prefix, key)] = true;
-      });
-    } else if (diffKey === 'i') {
-      // Handle (potentially) nested `$set`s.
-      oplogEntry.$set ??= {};
-      flattenObjectInto(oplogEntry.$set, value, prefix);
-    } else if (diffKey === 'u') {
-      // Handle flat `$set`s.
-      oplogEntry.$set ??= {};
-      Object.entries(value).forEach(([key, value]) => {
-        oplogEntry.$set[join(prefix, key)] = value;
-      });
-    } else {
-      // Handle s-fields.
-      const key = diffKey.slice(1);
-      if (isArrayOperator(value)) {
-        // Array operator.
-        Object.entries(value).forEach(([position, value]) => {
-          if (position === 'a') {
-            return;
-          }
-
-          const positionKey = join(join(prefix, key), position.slice(1));
-          if (position[0] === 's') {
-            convertOplogDiff(oplogEntry, value, positionKey);
-          } else if (value === null) {
-            oplogEntry.$unset ??= {};
-            oplogEntry.$unset[positionKey] = true;
-          } else {
-            oplogEntry.$set ??= {};
-            oplogEntry.$set[positionKey] = value;
-          }
-        });
-      } else if (key) {
-        // Nested object.
-        convertOplogDiff(oplogEntry, value, join(prefix, key));
-      }
-    }
-  });
-}
-
-export function oplogV2V1Converter(oplogEntry) {
-  // Pass-through v1 and (probably) invalid entries.
-  if (oplogEntry.$v !== 2 || !oplogEntry.diff) {
-    return oplogEntry;
-  }
-
-  const convertedOplogEntry = { $v: 2 };
-  convertOplogDiff(convertedOplogEntry, oplogEntry.diff, '');
-  return convertedOplogEntry;
-}
diff --git a/packages/mongo/oplog_v2_converter.ts b/packages/mongo/oplog_v2_converter.ts
new file mode 100644
index 0000000000..a892633b79
--- /dev/null
+++ b/packages/mongo/oplog_v2_converter.ts
@@ -0,0 +1,184 @@
+/**
+ * Converter module for the new MongoDB Oplog format (>=5.0) to the one that Meteor
+ * handles well, i.e., `$set` and `$unset`. The new format is completely new,
+ * and looks as follows:
+ *
+ * ```js
+ * { $v: 2, diff: Diff }
+ * ```
+ *
+ * where `Diff` is a recursive structure:
+ * ```js
+ * {
+ *   // Nested updates (sometimes also represented with an s-field).
+ *   // Example: `{ $set: { 'foo.bar': 1 } }`.
+ *   i: { <key>: <value>, ... },
+ *
+ *   // Top-level updates.
+ *   // Example: `{ $set: { foo: { bar: 1 } } }`.
+ *   u: { <key>: <value>, ... },
+ *
+ *   // Unsets.
+ *   // Example: `{ $unset: { foo: '' } }`.
+ *   d: { <key>: false, ... },
+ *
+ *   // Array operations.
+ *   // Example: `{ $push: { foo: 'bar' } }`.
+ *   s<key>: { a: true, u<index>: <value>, ... },
+ *   ...
+ *
+ *   // Nested operations (sometimes also represented in the `i` field).
+ *   // Example: `{ $set: { 'foo.bar': 1 } }`.
+ *   s<key>: Diff,
+ *   ...
+ * }
+ * ```
+ *
+ * (all fields are optional)
+ */
+
+interface OplogEntry {
+  $v: number;
+  diff?: OplogDiff;
+  $set?: Record<string, any>;
+  $unset?: Record<string, any>;
+}
+
+interface OplogDiff {
+  i?: Record<string, any>;
+  u?: Record<string, any>;
+  d?: Record<string, boolean>;
+  [key: `s${string}`]: ArrayOperator | Record<string, any>;
+}
+
+interface ArrayOperator {
+  a: true;
+  [key: `u${number}`]: any;
+}
+
+const arrayOperatorKeyRegex = /^(a|[su]\d+)$/;
+
+/**
+ * Checks if a field is an array operator key of form 'a' or 's1' or 'u1' etc
+ */
+function isArrayOperatorKey(field: string): boolean {
+  return arrayOperatorKeyRegex.test(field);
+}
+
+/**
+ * Type guard to check if an operator is a valid array operator.
+ * Array operators have 'a: true' and keys that match the arrayOperatorKeyRegex
+ */
+function isArrayOperator(operator: unknown): operator is ArrayOperator {
+  return (
+    operator !== null &&
+    typeof operator === 'object' &&
+    'a' in operator &&
+    (operator as ArrayOperator).a === true &&
+    Object.keys(operator).every(isArrayOperatorKey)
+  );
+}
+
+/**
+ * Recursively flattens an object into a target object with dot notation paths.
+ * Handles arrays, plain objects, nulls and Mongo.ObjectIDs differently:
+ * - Arrays, nulls, and ObjectIDs are assigned directly
+ * - Objects are recursively flattened with dot notation
+ * - Empty objects are assigned directly
+ */
+function flattenObjectInto(
+  target: Record<string, any>,
+  source: any,
+  prefix: string
+): void {
+  if (
+    Array.isArray(source) ||
+    typeof source !== 'object' ||
+    source === null ||
+    source instanceof Mongo.ObjectID
+  ) {
+    target[prefix] = source;
+    return;
+  }
+
+  const entries = Object.entries(source);
+  if (entries.length) {
+    entries.forEach(([key, value]) => {
+      flattenObjectInto(target, value, prefix ? `${prefix}.${key}` : key);
+    });
+  } else {
+    target[prefix] = source;
+  }
+}
+
+/**
+ * Converts an oplog diff to a series of $set and $unset operations.
+ * Handles:
+ * - Direct unsets via 'd' field
+ * - Nested sets via 'i' field
+ * - Top-level sets via 'u' field
+ * - Array operations and nested objects via 's' prefixed fields
+ */
+function convertOplogDiff(
+  oplogEntry: OplogEntry,
+  diff: OplogDiff,
+  prefix = ''
+): void {
+  Object.entries(diff).forEach(([diffKey, value]) => {
+    if (diffKey === 'd') {
+      // Handle `$unset`s
+      oplogEntry.$unset ??= {};
+      Object.keys(value).forEach(key => {
+        oplogEntry.$unset![`${prefix}${key}`] = true;
+      });
+    } else if (diffKey === 'i') {
+      // Handle (potentially) nested `$set`s
+      oplogEntry.$set ??= {};
+      flattenObjectInto(oplogEntry.$set, value, prefix);
+    } else if (diffKey === 'u') {
+      // Handle flat `$set`s
+      oplogEntry.$set ??= {};
+      Object.entries(value).forEach(([key, fieldValue]) => {
+        oplogEntry.$set![`${prefix}${key}`] = fieldValue;
+      });
+    } else if (diffKey.startsWith('s')) {
+      // Handle s-fields (array operations and nested objects)
+      const key = diffKey.slice(1);
+      if (isArrayOperator(value)) {
+        // Array operator
+        Object.entries(value).forEach(([position, fieldValue]) => {
+          if (position === 'a') return;
+
+          const positionKey = `${prefix}${key}.${position.slice(1)}`;
+          if (position[0] === 's') {
+            convertOplogDiff(oplogEntry, fieldValue, positionKey);
+          } else if (fieldValue === null) {
+            oplogEntry.$unset ??= {};
+            oplogEntry.$unset[positionKey] = true;
+          } else {
+            oplogEntry.$set ??= {};
+            oplogEntry.$set[positionKey] = fieldValue;
+          }
+        });
+      } else if (key) {
+        // Nested object
+        convertOplogDiff(oplogEntry, value, prefix ? `${prefix}.${key}` : key);
+      }
+    }
+  });
+}
+
+/**
+ * Converts a MongoDB v2 oplog entry to v1 format.
+ * Returns the original entry unchanged if it's not a v2 oplog entry
+ * or doesn't contain a diff field.
+ */
+export function oplogV2V1Converter(oplogEntry: OplogEntry): OplogEntry {
+  if (oplogEntry.$v !== 2 || !oplogEntry.diff) {
+    return oplogEntry;
+  }
+
+  const convertedOplogEntry: OplogEntry = { $v: 2 };
+  convertOplogDiff(convertedOplogEntry, oplogEntry.diff);
+  return convertedOplogEntry;
+}
\ No newline at end of file
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 1356ad0756..8f3bb65cb9 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -90,7 +90,7 @@ Package.onUse(function (api) {
       "doc_fetcher.js",
       "polling_observe_driver.ts",
       "oplog_observe_driver.js",
-      "oplog_v2_converter.js",
+      "oplog_v2_converter.ts",
       "cursor_description.ts",
       "mongo_connection.js",
       "mongo_common.js",

From 6e53028fbd43460d9ef4a9b91122becb4304e860 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 4 Nov 2024 09:49:18 -0400
Subject: [PATCH 0750/1140] bump BUNDLE_VERSION

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index b07a4daf07..04c1d9d179 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.11.0.1
+BUNDLE_VERSION=22.11.0.2
 
 
 # OS Check. Put here because here is where we download the precompiled

From 50eabe07cf2b2cda026b27bcaf06b2e5973b710d Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 4 Nov 2024 10:12:12 -0400
Subject: [PATCH 0751/1140] Meteor version to 3.1-beta.0 :comet:

---
 packages/babel-compiler/package.js            |  2 +-
 .../boilerplate-generator-tests/package.js    |  2 +-
 packages/ddp-client/package.js                |  2 +-
 packages/ddp-server/package.js                |  2 +-
 packages/email/package.js                     | 50 +++++++++----------
 packages/meteor-tool/package.js               |  2 +-
 packages/meteor/package.js                    |  2 +-
 packages/minimongo/package.js                 |  2 +-
 packages/modules/package.js                   |  2 +-
 packages/mongo/package.js                     |  2 +-
 packages/npm-mongo/package.js                 |  2 +-
 packages/test-helpers/package.js              |  2 +-
 packages/test-in-console/package.js           |  2 +-
 packages/tinytest/package.js                  |  2 +-
 packages/typescript/package.js                |  2 +-
 packages/webapp/package.js                    |  2 +-
 .../admin/meteor-release-experimental.json    |  2 +-
 17 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 340fd173a7..b7a67af44f 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.11.1',
+  version: '7.11.2-beta310.0',
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator-tests/package.js b/packages/boilerplate-generator-tests/package.js
index 667dfe56e2..19393bccf2 100644
--- a/packages/boilerplate-generator-tests/package.js
+++ b/packages/boilerplate-generator-tests/package.js
@@ -2,7 +2,7 @@ Package.describe({
   // These tests are in a separate package so that we can Npm.depend on
   // parse5, a html parsing library.
   summary: "Tests for the boilerplate-generator package",
-  version: '1.5.2',
+  version: '1.5.3-beta310.0',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 524091148d..fbf357d0a9 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.0.2",
+  version: "3.0.3-beta310.0",
   documentation: null,
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index c8e42343a8..4ca223d60d 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: "3.0.2",
+  version: "3.0.3-beta310.0",
   documentation: null,
 });
 
diff --git a/packages/email/package.js b/packages/email/package.js
index 79054cd42a..99977f7d14 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,25 +1,25 @@
-Package.describe({
-  summary: "Send email messages",
-  version: "3.1.0",
-});
-
-Npm.depends({
-  nodemailer: "6.9.10",
-  "stream-buffers": "3.0.2",
-  "@types/nodemailer": "6.4.14",
-  "nodemailer-openpgp": "2.2.0",
-});
-
-Package.onUse(function (api) {
-  api.use(["ecmascript", "logging", "callback-hook"], "server");
-  api.addAssets("email.d.ts", "server");
-  api.mainModule("email.js", "server");
-  api.export(["Email", "EmailInternals"], "server");
-  api.export("EmailTest", "server", { testOnly: true });
-});
-
-Package.onTest(function (api) {
-  api.use("email", "server");
-  api.use(["tinytest", "ecmascript"]);
-  api.addFiles("email_tests.js", "server");
-});
+Package.describe({
+  summary: "Send email messages",
+  version: "3.1.1-beta310.0",
+});
+
+Npm.depends({
+  nodemailer: "6.9.10",
+  "stream-buffers": "3.0.2",
+  "@types/nodemailer": "6.4.14",
+  "nodemailer-openpgp": "2.2.0",
+});
+
+Package.onUse(function (api) {
+  api.use(["ecmascript", "logging", "callback-hook"], "server");
+  api.addAssets("email.d.ts", "server");
+  api.mainModule("email.js", "server");
+  api.export(["Email", "EmailInternals"], "server");
+  api.export("EmailTest", "server", { testOnly: true });
+});
+
+Package.onTest(function (api) {
+  api.use("email", "server");
+  api.use(["tinytest", "ecmascript"]);
+  api.addFiles("email_tests.js", "server");
+});
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 72b460a2e9..f7cf32d304 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'The Meteor command-line tool',
-  version: '3.0.4',
+  version: '3.1.0-beta310.0',
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 9071ad502c..779b27a25a 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.0.1',
+  version: '2.0.2-beta310.0',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 585a8d1ab6..a83f197782 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: "2.0.1",
+  version: "2.0.2-beta310.0",
 });
 
 Package.onUse((api) => {
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 383dafa0a3..d657cffed4 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: '0.20.2',
+  version: '0.20.3-beta310.0',
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 1356ad0756..cb9bc53e72 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.0.2",
+  version: "2.0.3-beta310.0",
 });
 
 Npm.depends({
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index cdd60850c1..f7dee16098 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "4.17.4",
+  version: "4.17.3-beta310.0",
   documentation: null,
 });
 
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 8eea18c3f9..3012633763 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: "2.0.1",
+  version: "2.0.2-beta310.0",
 });
 
 Npm.depends({
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 04a0729eb2..49005450a0 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Run tests noninteractively, with results going to the console.',
-  version: '2.0.0',
+  version: '2.0.1-beta310.0',
 });
 
 Package.onUse(function(api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 51461d04ac..90b3833d0c 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.3.0',
+  version: '1.3.1-beta310.0',
 });
 
 Npm.depends({
diff --git a/packages/typescript/package.js b/packages/typescript/package.js
index ea41a3604a..47d1d8caa6 100644
--- a/packages/typescript/package.js
+++ b/packages/typescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'typescript',
-  version: '5.6.3',
+  version: '5.6.3-beta310.0',
   summary:
     'Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files',
   documentation: 'README.md',
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 63c59e215b..42203ad3a2 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.3",
+  version: "2.0.4-beta310.0",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 6c5da70cb0..f8ff292c0f 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.0.4-rc.0",
+  "version": "3.1-beta.0",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"

From b84afd9a528d92960056ff915fa395f65431e3d5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 4 Nov 2024 10:58:57 -0400
Subject: [PATCH 0752/1140] fix tests

---
 packages/mongo/oplog_v2_converter.ts | 91 ++++------------------------
 1 file changed, 13 insertions(+), 78 deletions(-)

diff --git a/packages/mongo/oplog_v2_converter.ts b/packages/mongo/oplog_v2_converter.ts
index a892633b79..df320873f9 100644
--- a/packages/mongo/oplog_v2_converter.ts
+++ b/packages/mongo/oplog_v2_converter.ts
@@ -1,47 +1,10 @@
-/**
- * Converter module for the new MongoDB Oplog format (>=5.0) to the one that Meteor
- * handles well, i.e., `$set` and `$unset`. The new format is completely new,
- * and looks as follows:
- *
- * ```js
- * { $v: 2, diff: Diff }
- * ```
- *
- * where `Diff` is a recursive structure:
- * ```js
- * {
- *   // Nested updates (sometimes also represented with an s-field).
- *   // Example: `{ $set: { 'foo.bar': 1 } }`.
- *   i: { <key>: <value>, ... },
- *
- *   // Top-level updates.
- *   // Example: `{ $set: { foo: { bar: 1 } } }`.
- *   u: { <key>: <value>, ... },
- *
- *   // Unsets.
- *   // Example: `{ $unset: { foo: '' } }`.
- *   d: { <key>: false, ... },
- *
- *   // Array operations.
- *   // Example: `{ $push: { foo: 'bar' } }`.
- *   s<key>: { a: true, u<index>: <value>, ... },
- *   ...
- *
- *   // Nested operations (sometimes also represented in the `i` field).
- *   // Example: `{ $set: { 'foo.bar': 1 } }`.
- *   s<key>: Diff,
- *   ...
- * }
- * ```
- *
- * (all fields are optional)
- */
+import { EJSON } from 'meteor/ejson';
 
 interface OplogEntry {
   $v: number;
   diff?: OplogDiff;
   $set?: Record<string, any>;
-  $unset?: Record<string, any>;
+  $unset?: Record<string, true>;
 }
 
 interface OplogDiff {
@@ -58,17 +21,10 @@ interface ArrayOperator {
 
 const arrayOperatorKeyRegex = /^(a|[su]\d+)$/;
 
-/**
- * Checks if a field is an array operator key of form 'a' or 's1' or 'u1' etc
- */
 function isArrayOperatorKey(field: string): boolean {
   return arrayOperatorKeyRegex.test(field);
 }
 
-/**
- * Type guard to check if an operator is a valid array operator.
- * Array operators have 'a: true' and keys that match the arrayOperatorKeyRegex
- */
 function isArrayOperator(operator: unknown): operator is ArrayOperator {
   return (
     operator !== null &&
@@ -79,13 +35,10 @@ function isArrayOperator(operator: unknown): operator is ArrayOperator {
   );
 }
 
-/**
- * Recursively flattens an object into a target object with dot notation paths.
- * Handles arrays, plain objects, nulls and Mongo.ObjectIDs differently:
- * - Arrays, nulls, and ObjectIDs are assigned directly
- * - Objects are recursively flattened with dot notation
- * - Empty objects are assigned directly
- */
+function join(prefix: string, key: string): string {
+  return prefix ? `${prefix}.${key}` : key;
+}
+
 function flattenObjectInto(
   target: Record<string, any>,
   source: any,
@@ -95,7 +48,8 @@ function flattenObjectInto(
     Array.isArray(source) ||
     typeof source !== 'object' ||
     source === null ||
-    source instanceof Mongo.ObjectID
+    source instanceof Mongo.ObjectID ||
+    EJSON._isCustomType(source)
   ) {
     target[prefix] = source;
     return;
@@ -104,21 +58,13 @@ function flattenObjectInto(
   const entries = Object.entries(source);
   if (entries.length) {
     entries.forEach(([key, value]) => {
-      flattenObjectInto(target, value, prefix ? `${prefix}.${key}` : key);
+      flattenObjectInto(target, value, join(prefix, key));
     });
   } else {
     target[prefix] = source;
   }
 }
 
-/**
- * Converts an oplog diff to a series of $set and $unset operations.
- * Handles:
- * - Direct unsets via 'd' field
- * - Nested sets via 'i' field
- * - Top-level sets via 'u' field
- * - Array operations and nested objects via 's' prefixed fields
- */
 function convertOplogDiff(
   oplogEntry: OplogEntry,
   diff: OplogDiff,
@@ -126,30 +72,25 @@ function convertOplogDiff(
 ): void {
   Object.entries(diff).forEach(([diffKey, value]) => {
     if (diffKey === 'd') {
-      // Handle `$unset`s
       oplogEntry.$unset ??= {};
       Object.keys(value).forEach(key => {
-        oplogEntry.$unset![`${prefix}${key}`] = true;
+        oplogEntry.$unset![join(prefix, key)] = true;
       });
     } else if (diffKey === 'i') {
-      // Handle (potentially) nested `$set`s
       oplogEntry.$set ??= {};
       flattenObjectInto(oplogEntry.$set, value, prefix);
     } else if (diffKey === 'u') {
-      // Handle flat `$set`s
       oplogEntry.$set ??= {};
       Object.entries(value).forEach(([key, fieldValue]) => {
-        oplogEntry.$set![`${prefix}${key}`] = fieldValue;
+        oplogEntry.$set![join(prefix, key)] = fieldValue;
       });
     } else if (diffKey.startsWith('s')) {
-      // Handle s-fields (array operations and nested objects)
       const key = diffKey.slice(1);
       if (isArrayOperator(value)) {
-        // Array operator
         Object.entries(value).forEach(([position, fieldValue]) => {
           if (position === 'a') return;
 
-          const positionKey = `${prefix}${key}.${position.slice(1)}`;
+          const positionKey = join(prefix, `${key}.${position.slice(1)}`);
           if (position[0] === 's') {
             convertOplogDiff(oplogEntry, fieldValue, positionKey);
           } else if (fieldValue === null) {
@@ -161,18 +102,12 @@ function convertOplogDiff(
           }
         });
       } else if (key) {
-        // Nested object
-        convertOplogDiff(oplogEntry, value, prefix ? `${prefix}.${key}` : key);
+        convertOplogDiff(oplogEntry, value, join(prefix, key));
       }
     }
   });
 }
 
-/**
- * Converts a MongoDB v2 oplog entry to v1 format.
- * Returns the original entry unchanged if it's not a v2 oplog entry
- * or doesn't contain a diff field.
- */
 export function oplogV2V1Converter(oplogEntry: OplogEntry): OplogEntry {
   if (oplogEntry.$v !== 2 || !oplogEntry.diff) {
     return oplogEntry;

From 66bbec38fbc21a52565aeebf4ba8910552f52032 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 4 Nov 2024 12:38:58 -0400
Subject: [PATCH 0753/1140] publish new npm install version for beta

---
 npm-packages/meteor-installer/config.js       |   2 +-
 .../meteor-installer/package-lock.json        |   4 +-
 npm-packages/meteor-installer/package.json    |   2 +-
 .../.npm/package/npm-shrinkwrap.json          |  12 +-
 .../email/.npm/package/npm-shrinkwrap.json    |   6 +-
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 .../mongo/.npm/package/npm-shrinkwrap.json    |   5 -
 .../webapp/.npm/package/npm-shrinkwrap.json   | 228 ++++++++++--------
 8 files changed, 149 insertions(+), 116 deletions(-)

diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js
index 7c2a0a6bd2..04c2c116bc 100644
--- a/npm-packages/meteor-installer/config.js
+++ b/npm-packages/meteor-installer/config.js
@@ -1,7 +1,7 @@
 const os = require('os');
 const path = require('path');
 
-const METEOR_LATEST_VERSION = '3.0.4';
+const METEOR_LATEST_VERSION = '3.1.0-beta.0';
 const sudoUser = process.env.SUDO_USER || '';
 function isRoot() {
   return process.getuid && process.getuid() === 0;
diff --git a/npm-packages/meteor-installer/package-lock.json b/npm-packages/meteor-installer/package-lock.json
index dabafd2c0b..c03f2f402c 100644
--- a/npm-packages/meteor-installer/package-lock.json
+++ b/npm-packages/meteor-installer/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor",
-  "version": "3.0.4",
+  "version": "3.1.0-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor",
-      "version": "3.0.4",
+      "version": "3.1.0-beta.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json
index f385aaf156..ed44e3979a 100644
--- a/npm-packages/meteor-installer/package.json
+++ b/npm-packages/meteor-installer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor",
-  "version": "3.0.4",
+  "version": "3.1.0-beta.0",
   "description": "Install Meteor",
   "main": "install.js",
   "scripts": {
diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
index b70ec80ef7..c9264049b9 100644
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.8.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.5.tgz",
-      "integrity": "sha512-5iYk6AMPtsMbkZqCO1UGF9W5L38twq11S2pYWkybGHH2ogPUvXWNlQqJBzuEZWKj/WRH+QTeiv6ySWqJtvIEgA=="
+      "version": "22.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
+      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
     },
     "@types/notp": {
       "version": "2.0.5",
@@ -32,9 +32,9 @@
       "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA=="
     },
     "tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
     "undici-types": {
       "version": "6.19.8",
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index 637f32d204..0f30d4b785 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 4,
   "dependencies": {
     "@types/node": {
-      "version": "22.8.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.5.tgz",
-      "integrity": "sha512-5iYk6AMPtsMbkZqCO1UGF9W5L38twq11S2pYWkybGHH2ogPUvXWNlQqJBzuEZWKj/WRH+QTeiv6ySWqJtvIEgA=="
+      "version": "22.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
+      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
     },
     "@types/nodemailer": {
       "version": "6.4.14",
diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
index 5eedf0b09e..06ede9f967 100644
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
@@ -32,9 +32,9 @@
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="
     },
     "acorn": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
-      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="
     },
     "buffer-from": {
       "version": "1.1.2",
diff --git a/packages/mongo/.npm/package/npm-shrinkwrap.json b/packages/mongo/.npm/package/npm-shrinkwrap.json
index a8a9aef064..123f660516 100644
--- a/packages/mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/mongo/.npm/package/npm-shrinkwrap.json
@@ -11,11 +11,6 @@
       "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
       "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
     },
-    "lodash.identity": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz",
-      "integrity": "sha512-AupTIzdLQxJS5wIYUQlgGyk2XRTfGXA+MCghDHqZk0pzUNYvd3EESS6dkChNauNYVIutcb0dfHw1ri9Q1yPV8Q=="
-    },
     "lodash.isempty": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index aa70093779..6a7731a654 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -12,14 +12,14 @@
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="
     },
     "@types/express": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.0.tgz",
+      "integrity": "sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ=="
     },
     "@types/express-serve-static-core": {
-      "version": "4.19.6",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
-      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
+      "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA=="
     },
     "@types/http-errors": {
       "version": "2.0.4",
@@ -32,9 +32,9 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
     },
     "@types/node": {
-      "version": "22.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
-      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg=="
+      "version": "22.8.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
+      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
     },
     "@types/qs": {
       "version": "6.9.16",
@@ -62,19 +62,34 @@
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="
     },
     "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz",
+      "integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA=="
     },
     "body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.0.2.tgz",
+      "integrity": "sha512-SNMk0OONlQ01uk8EPeiBvTW7W4ovpL5b1O3t1sjpPgfxOQ6BqQJ6XjxinDPR79Z6HdcD5zBBwr5ssiTlgdNztQ==",
       "dependencies": {
         "bytes": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
           "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="
+        },
+        "media-typer": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+          "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+        },
+        "type-is": {
+          "version": "1.6.18",
+          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+          "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
         }
       }
     },
@@ -99,9 +114,9 @@
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="
     },
     "content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
+      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
       "dependencies": {
         "safe-buffer": {
           "version": "5.2.1",
@@ -186,37 +201,57 @@
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-5.0.1.tgz",
+      "integrity": "sha512-ORF7g6qGnD+YtUG9yx4DFoqCShNMmUKiXuT5oWMHiOvt/4WFbHC6yCwQMTSBMno7AqntNCAzzcnnjowRkTL9eQ==",
       "dependencies": {
+        "accepts": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
+          "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="
+        },
         "cookie": {
           "version": "0.7.1",
           "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
           "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
         },
+        "cookie-signature": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
+          "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="
+        },
+        "debug": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+          "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg=="
+        },
+        "mime-types": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.0.tgz",
+          "integrity": "sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w=="
+        },
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "negotiator": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+          "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="
         },
         "safe-buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
           "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "send": {
-          "version": "0.19.0",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-          "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-          "dependencies": {
-            "encodeurl": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-              "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-            }
-          }
-        },
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.0.0.tgz",
+      "integrity": "sha512-MX6Zo2adDViYh+GcxxB1dpO43eypOGUOL12rLCOTMQv/DfIbpSJUy4oQIIZhVZkH9e+bZWKMon0XHFEju16tkQ==",
+      "dependencies": {
         "encodeurl": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -224,20 +259,15 @@
         }
       }
     },
-    "finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ=="
-    },
     "forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
+      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="
     },
     "function-bind": {
       "version": "1.1.2",
@@ -280,9 +310,9 @@
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="
     },
     "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
+      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="
     },
     "inherits": {
       "version": "2.0.4",
@@ -294,31 +324,31 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
+    "is-promise": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
+      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
+    },
     "lru-cache": {
       "version": "7.18.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
       "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="
     },
     "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
+      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="
     },
     "merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
+      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
     "mime-db": {
       "version": "1.53.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
@@ -361,15 +391,20 @@
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
     },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
+    },
     "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
     },
     "path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ=="
     },
     "promise-polyfill": {
       "version": "1.1.6",
@@ -392,17 +427,27 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
+      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
       "dependencies": {
         "bytes": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
           "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+        },
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="
         }
       }
     },
+    "router": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/router/-/router-2.0.0.tgz",
+      "integrity": "sha512-dIM5zVoG8xhC6rnSN8uoAgFARwTE7BQs8YwHEvK0VCmfxQXMaOuA1uiR1IPwsW7JyK5iTt7Od/TC9StasS2NPQ=="
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -423,6 +468,11 @@
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
           "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="
         },
+        "fresh": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+          "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+        },
         "ms": {
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -431,33 +481,9 @@
       }
     },
     "serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-      "dependencies": {
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        },
-        "send": {
-          "version": "0.19.0",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-          "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-          "dependencies": {
-            "encodeurl": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-              "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-            }
-          }
-        },
-        "encodeurl": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-          "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-        }
-      }
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.1.0.tgz",
+      "integrity": "sha512-A3We5UfEjG8Z7VkDv6uItWw6HY2bBSBJT1KtVESn6EOoOr2jAxNhxWCLY3jDE2WcuHXByWju74ck3ZgLwL8xmA=="
     },
     "set-function-length": {
       "version": "1.2.2",
@@ -495,9 +521,16 @@
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
     "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.0.tgz",
+      "integrity": "sha512-gd0sGezQYCbWSbkZr75mln4YBidWUN60+devscpLF5mtRDUpiaTvKpBNrdaCvel1NdR2k6vclXybU5fBd2i+nw==",
+      "dependencies": {
+        "mime-types": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.0.tgz",
+          "integrity": "sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w=="
+        }
+      }
     },
     "uap-core": {
       "version": "0.16.0",
@@ -529,6 +562,11 @@
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
     "yamlparser": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/yamlparser/-/yamlparser-0.0.2.tgz",

From 89e169c9d6b86b3e63679ca578e7a484b1e06e15 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 4 Nov 2024 12:40:25 -0400
Subject: [PATCH 0754/1140] publish new npm install version for beta

---
 npm-packages/meteor-installer/config.js    | 2 +-
 npm-packages/meteor-installer/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js
index 04c2c116bc..95894f17d6 100644
--- a/npm-packages/meteor-installer/config.js
+++ b/npm-packages/meteor-installer/config.js
@@ -1,7 +1,7 @@
 const os = require('os');
 const path = require('path');
 
-const METEOR_LATEST_VERSION = '3.1.0-beta.0';
+const METEOR_LATEST_VERSION = '3.1-beta.0';
 const sudoUser = process.env.SUDO_USER || '';
 function isRoot() {
   return process.getuid && process.getuid() === 0;
diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json
index ed44e3979a..6b7a18097b 100644
--- a/npm-packages/meteor-installer/package.json
+++ b/npm-packages/meteor-installer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor",
-  "version": "3.1.0-beta.0",
+  "version": "3.1.0-beta.1",
   "description": "Install Meteor",
   "main": "install.js",
   "scripts": {

From d40e7a5773e972c8e74713b8d8d51d7147630c3d Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 4 Nov 2024 12:55:44 -0400
Subject: [PATCH 0755/1140] bump mongo-decimal version

---
 packages/non-core/mongo-decimal/.versions  | 31 +++++++++++-----------
 packages/non-core/mongo-decimal/package.js |  2 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/packages/non-core/mongo-decimal/.versions b/packages/non-core/mongo-decimal/.versions
index 608373a20e..709e9dc14b 100644
--- a/packages/non-core/mongo-decimal/.versions
+++ b/packages/non-core/mongo-decimal/.versions
@@ -1,20 +1,20 @@
 allow-deny@2.0.0
-babel-compiler@7.11.0
+babel-compiler@7.11.2-beta310.0
 babel-runtime@1.5.2
 base64@1.0.13
 binary-heap@1.0.12
 boilerplate-generator@2.0.0
 callback-hook@1.6.0
-check@1.4.2
+check@1.4.4
 core-runtime@1.0.0
 ddp@1.4.2
-ddp-client@3.0.1
+ddp-client@3.0.3-beta310.0
 ddp-common@1.4.4
-ddp-server@3.0.1
+ddp-server@3.0.3-beta310.0
 diff-sequence@1.1.3
 dynamic-import@0.7.4
 ecmascript@0.16.9
-ecmascript-runtime@0.8.2
+ecmascript-runtime@0.8.3
 ecmascript-runtime-client@0.12.2
 ecmascript-runtime-server@0.11.1
 ejson@1.1.4
@@ -24,18 +24,18 @@ geojson-utils@1.0.12
 id-map@1.2.0
 insecure@1.0.8
 inter-process-messaging@0.1.2
-local-test:mongo-decimal@0.1.4
+local-test:mongo-decimal@0.1.6-beta310.0
 logging@1.3.5
-meteor@2.0.1
-minimongo@2.0.1
+meteor@2.0.2-beta310.0
+minimongo@2.0.2-beta310.0
 modern-browsers@0.1.11
-modules@0.20.1
+modules@0.20.3-beta310.0
 modules-runtime@0.13.2
-mongo@2.0.1
-mongo-decimal@0.1.4
+mongo@2.0.3-beta310.0
+mongo-decimal@0.1.6-beta310.0
 mongo-dev-server@1.1.1
 mongo-id@1.0.9
-npm-mongo@4.17.4
+npm-mongo@4.17.3-beta310.0
 ordered-dict@1.2.0
 promise@1.0.0
 random@1.2.2
@@ -44,9 +44,8 @@ reload@1.3.2
 retry@1.1.1
 routepolicy@1.1.2
 socket-stream-client@0.5.3
-tinytest@1.3.0
+tinytest@1.3.1-beta310.0
 tracker@1.3.4
-typescript@5.4.3
-underscore@1.6.4
-webapp@2.0.1
+typescript@5.6.3-beta310.0
+webapp@2.0.4-beta310.0
 webapp-hashing@1.1.2
diff --git a/packages/non-core/mongo-decimal/package.js b/packages/non-core/mongo-decimal/package.js
index 1ba4ae4f40..0190ab8c60 100644
--- a/packages/non-core/mongo-decimal/package.js
+++ b/packages/non-core/mongo-decimal/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB Decimal128 type",
-  version: '0.1.5',
+  version: '0.1.6-beta310.0',
 });
 
 Npm.depends({

From 2acc66f1a382e247193664f25c5f15a159a1a616 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 4 Nov 2024 14:01:44 -0400
Subject: [PATCH 0756/1140] add docs back

---
 packages/mongo/oplog_v2_converter.ts | 85 ++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/packages/mongo/oplog_v2_converter.ts b/packages/mongo/oplog_v2_converter.ts
index df320873f9..708f2d00c8 100644
--- a/packages/mongo/oplog_v2_converter.ts
+++ b/packages/mongo/oplog_v2_converter.ts
@@ -1,3 +1,42 @@
+/**
+ * Converter module for the new MongoDB Oplog format (>=5.0) to the one that Meteor
+ * handles well, i.e., `$set` and `$unset`. The new format is completely new,
+ * and looks as follows:
+ *
+ * ```js
+ * { $v: 2, diff: Diff }
+ * ```
+ *
+ * where `Diff` is a recursive structure:
+ * ```js
+ * {
+ *   // Nested updates (sometimes also represented with an s-field).
+ *   // Example: `{ $set: { 'foo.bar': 1 } }`.
+ *   i: { <key>: <value>, ... },
+ *
+ *   // Top-level updates.
+ *   // Example: `{ $set: { foo: { bar: 1 } } }`.
+ *   u: { <key>: <value>, ... },
+ *
+ *   // Unsets.
+ *   // Example: `{ $unset: { foo: '' } }`.
+ *   d: { <key>: false, ... },
+ *
+ *   // Array operations.
+ *   // Example: `{ $push: { foo: 'bar' } }`.
+ *   s<key>: { a: true, u<index>: <value>, ... },
+ *   ...
+ *
+ *   // Nested operations (sometimes also represented in the `i` field).
+ *   // Example: `{ $set: { 'foo.bar': 1 } }`.
+ *   s<key>: Diff,
+ *   ...
+ * }
+ * ```
+ *
+ * (all fields are optional)
+ */
+
 import { EJSON } from 'meteor/ejson';
 
 interface OplogEntry {
@@ -21,10 +60,17 @@ interface ArrayOperator {
 
 const arrayOperatorKeyRegex = /^(a|[su]\d+)$/;
 
+/**
+ * Checks if a field is an array operator key of form 'a' or 's1' or 'u1' etc
+ */
 function isArrayOperatorKey(field: string): boolean {
   return arrayOperatorKeyRegex.test(field);
 }
 
+/**
+ * Type guard to check if an operator is a valid array operator.
+ * Array operators have 'a: true' and keys that match the arrayOperatorKeyRegex
+ */
 function isArrayOperator(operator: unknown): operator is ArrayOperator {
   return (
     operator !== null &&
@@ -35,10 +81,23 @@ function isArrayOperator(operator: unknown): operator is ArrayOperator {
   );
 }
 
+/**
+ * Joins two parts of a field path with a dot.
+ * Returns the key itself if prefix is empty.
+ */
 function join(prefix: string, key: string): string {
   return prefix ? `${prefix}.${key}` : key;
 }
 
+/**
+ * Recursively flattens an object into a target object with dot notation paths.
+ * Handles special cases:
+ * - Arrays are assigned directly
+ * - Custom EJSON types are preserved
+ * - Mongo.ObjectIDs are preserved
+ * - Plain objects are recursively flattened
+ * - Empty objects are assigned directly
+ */
 function flattenObjectInto(
   target: Record<string, any>,
   source: any,
@@ -65,6 +124,17 @@ function flattenObjectInto(
   }
 }
 
+/**
+ * Converts an oplog diff to a series of $set and $unset operations.
+ * Handles several types of operations:
+ * - Direct unsets via 'd' field
+ * - Nested sets via 'i' field
+ * - Top-level sets via 'u' field
+ * - Array operations and nested objects via 's' prefixed fields
+ *
+ * Preserves the structure of EJSON custom types and ObjectIDs while
+ * flattening paths into dot notation for MongoDB updates.
+ */
 function convertOplogDiff(
   oplogEntry: OplogEntry,
   diff: OplogDiff,
@@ -72,21 +142,26 @@ function convertOplogDiff(
 ): void {
   Object.entries(diff).forEach(([diffKey, value]) => {
     if (diffKey === 'd') {
+      // Handle `$unset`s
       oplogEntry.$unset ??= {};
       Object.keys(value).forEach(key => {
         oplogEntry.$unset![join(prefix, key)] = true;
       });
     } else if (diffKey === 'i') {
+      // Handle (potentially) nested `$set`s
       oplogEntry.$set ??= {};
       flattenObjectInto(oplogEntry.$set, value, prefix);
     } else if (diffKey === 'u') {
+      // Handle flat `$set`s
       oplogEntry.$set ??= {};
       Object.entries(value).forEach(([key, fieldValue]) => {
         oplogEntry.$set![join(prefix, key)] = fieldValue;
       });
     } else if (diffKey.startsWith('s')) {
+      // Handle s-fields (array operations and nested objects)
       const key = diffKey.slice(1);
       if (isArrayOperator(value)) {
+        // Array operator
         Object.entries(value).forEach(([position, fieldValue]) => {
           if (position === 'a') return;
 
@@ -102,12 +177,22 @@ function convertOplogDiff(
           }
         });
       } else if (key) {
+        // Nested object
         convertOplogDiff(oplogEntry, value, join(prefix, key));
       }
     }
   });
 }
 
+/**
+ * Converts a MongoDB v2 oplog entry to v1 format.
+ * Returns the original entry unchanged if it's not a v2 oplog entry
+ * or doesn't contain a diff field.
+ *
+ * The converted entry will contain $set and $unset operations that are
+ * equivalent to the v2 diff format, with paths flattened to dot notation
+ * and special handling for EJSON custom types and ObjectIDs.
+ */
 export function oplogV2V1Converter(oplogEntry: OplogEntry): OplogEntry {
   if (oplogEntry.$v !== 2 || !oplogEntry.diff) {
     return oplogEntry;

From 75966aed5d5d4aceb40b958383adf54929f61fbd Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 4 Nov 2024 14:01:52 -0400
Subject: [PATCH 0757/1140] shrinkwrap

---
 packages/modules/.npm/package/npm-shrinkwrap.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 7c1a6396d6..bd86daae17 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -12,9 +12,9 @@
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "acorn": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
-      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="
     },
     "estree-walker": {
       "version": "2.0.2",

From c56361f112585a1700d2016398a2fb74958a9b90 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 4 Nov 2024 16:43:37 -0400
Subject: [PATCH 0758/1140] refactor session and document views

---
 .../.npm/package/npm-shrinkwrap.json          |   5 +
 packages/ddp-server/livedata_server.js        | 213 +-----------------
 packages/ddp-server/package.js                |   4 +-
 .../ddp-server/session_collection_view.ts     | 200 ++++++++++++++++
 packages/ddp-server/session_document_view.ts  | 103 +++++++++
 5 files changed, 313 insertions(+), 212 deletions(-)
 create mode 100644 packages/ddp-server/session_collection_view.ts
 create mode 100644 packages/ddp-server/session_document_view.ts

diff --git a/packages/ddp-server/.npm/package/npm-shrinkwrap.json b/packages/ddp-server/.npm/package/npm-shrinkwrap.json
index f7fd53b35e..542ff6f6fe 100644
--- a/packages/ddp-server/.npm/package/npm-shrinkwrap.json
+++ b/packages/ddp-server/.npm/package/npm-shrinkwrap.json
@@ -31,6 +31,11 @@
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
       "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
     },
+    "lru_map": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.4.1.tgz",
+      "integrity": "sha512-I+lBvqMMFfqaV8CJCISjI3wbjmwVu/VyOoU7+qtu9d7ioW5klMgsTTiUOUp+DJvfTTzKXoPbyC6YfgkNcyPSOg=="
+    },
     "permessage-deflate": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.7.tgz",
diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index 0f21be2d18..75406778b8 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -1,6 +1,8 @@
 import isEmpty from 'lodash.isempty';
 import isString from 'lodash.isstring';
 import isObject from 'lodash.isobject';
+import { SessionCollectionView } from './session_collection_view';
+import { SessionDocumentView } from './session_document_view';
 
 DDPServer = {};
 
@@ -76,15 +78,6 @@ Object.assign(DummyDocumentView.prototype, {
   }
 });
 
-// Represents a single document in a SessionCollectionView
-var SessionDocumentView = function () {
-  var self = this;
-  self.existsIn = new Set(); // set of subscriptionHandle
-
-  // Memory Growth
-  self.dataByKey = new Map(); // key-> [ {subscriptionHandle, value} by precedence]
-};
-
 DDPServer._SessionDocumentView = SessionDocumentView;
 
 DDPServer._getCurrentFence = function () {
@@ -96,211 +89,9 @@ DDPServer._getCurrentFence = function () {
   return currentInvocation ? currentInvocation.fence : undefined;
 };
 
-Object.assign(SessionDocumentView.prototype, {
-
-  getFields: function () {
-    var self = this;
-    var ret = {};
-    self.dataByKey.forEach(function (precedenceList, key) {
-      ret[key] = precedenceList[0].value;
-    });
-    return ret;
-  },
-
-  clearField: function (subscriptionHandle, key, changeCollector) {
-    var self = this;
-    // Publish API ignores _id if present in fields
-    if (key === "_id")
-      return;
-    var precedenceList = self.dataByKey.get(key);
-
-    // It's okay to clear fields that didn't exist. No need to throw
-    // an error.
-    if (!precedenceList)
-      return;
-
-    var removedValue = undefined;
-    for (var i = 0; i < precedenceList.length; i++) {
-      var precedence = precedenceList[i];
-      if (precedence.subscriptionHandle === subscriptionHandle) {
-        // The view's value can only change if this subscription is the one that
-        // used to have precedence.
-        if (i === 0)
-          removedValue = precedence.value;
-        precedenceList.splice(i, 1);
-        break;
-      }
-    }
-    if (precedenceList.length === 0) {
-      self.dataByKey.delete(key);
-      changeCollector[key] = undefined;
-    } else if (removedValue !== undefined &&
-               !EJSON.equals(removedValue, precedenceList[0].value)) {
-      changeCollector[key] = precedenceList[0].value;
-    }
-  },
-
-  changeField: function (subscriptionHandle, key, value,
-                         changeCollector, isAdd) {
-    var self = this;
-    // Publish API ignores _id if present in fields
-    if (key === "_id")
-      return;
-
-    // Don't share state with the data passed in by the user.
-    value = EJSON.clone(value);
-
-    if (!self.dataByKey.has(key)) {
-      self.dataByKey.set(key, [{subscriptionHandle: subscriptionHandle,
-                                value: value}]);
-      changeCollector[key] = value;
-      return;
-    }
-    var precedenceList = self.dataByKey.get(key);
-    var elt;
-    if (!isAdd) {
-      elt = precedenceList.find(function (precedence) {
-          return precedence.subscriptionHandle === subscriptionHandle;
-      });
-    }
-
-    if (elt) {
-      if (elt === precedenceList[0] && !EJSON.equals(value, elt.value)) {
-        // this subscription is changing the value of this field.
-        changeCollector[key] = value;
-      }
-      elt.value = value;
-    } else {
-      // this subscription is newly caring about this field
-      precedenceList.push({subscriptionHandle: subscriptionHandle, value: value});
-    }
-
-  }
-});
-
-/**
- * Represents a client's view of a single collection
- * @param {String} collectionName Name of the collection it represents
- * @param {Object.<String, Function>} sessionCallbacks The callbacks for added, changed, removed
- * @class SessionCollectionView
- */
-var SessionCollectionView = function (collectionName, sessionCallbacks) {
-  var self = this;
-  self.collectionName = collectionName;
-  // Memory Growth
-  self.documents = new Map();
-  self.callbacks = sessionCallbacks;
-};
 
 DDPServer._SessionCollectionView = SessionCollectionView;
 
-
-Object.assign(SessionCollectionView.prototype, {
-
-  isEmpty: function () {
-    var self = this;
-    return self.documents.size === 0;
-  },
-
-  diff: function (previous) {
-    var self = this;
-    DiffSequence.diffMaps(previous.documents, self.documents, {
-      both: self.diffDocument.bind(self),
-
-      rightOnly: function (id, nowDV) {
-        self.callbacks.added(self.collectionName, id, nowDV.getFields());
-      },
-
-      leftOnly: function (id, prevDV) {
-        self.callbacks.removed(self.collectionName, id);
-      }
-    });
-  },
-
-  diffDocument: function (id, prevDV, nowDV) {
-    var self = this;
-    var fields = {};
-    DiffSequence.diffObjects(prevDV.getFields(), nowDV.getFields(), {
-      both: function (key, prev, now) {
-        if (!EJSON.equals(prev, now))
-          fields[key] = now;
-      },
-      rightOnly: function (key, now) {
-        fields[key] = now;
-      },
-      leftOnly: function(key, prev) {
-        fields[key] = undefined;
-      }
-    });
-    self.callbacks.changed(self.collectionName, id, fields);
-  },
-
-  added: function (subscriptionHandle, id, fields) {
-    var self = this;
-    var docView = self.documents.get(id);
-    var added = false;
-    if (!docView) {
-      added = true;
-      if (Meteor.server.getPublicationStrategy(this.collectionName).useDummyDocumentView) {
-        docView = new DummyDocumentView();
-      } else {
-        docView = new SessionDocumentView();
-      }
-
-      self.documents.set(id, docView);
-    }
-    docView.existsIn.add(subscriptionHandle);
-    var changeCollector = {};
-    Object.entries(fields).forEach(function ([key, value]) {
-      docView.changeField(
-        subscriptionHandle, key, value, changeCollector, true);
-    });
-    if (added)
-      self.callbacks.added(self.collectionName, id, changeCollector);
-    else
-      self.callbacks.changed(self.collectionName, id, changeCollector);
-  },
-
-  changed: function (subscriptionHandle, id, changed) {
-    var self = this;
-    var changedResult = {};
-    var docView = self.documents.get(id);
-    if (!docView)
-      throw new Error("Could not find element with id " + id + " to change");
-      Object.entries(changed).forEach(function ([key, value]) {
-      if (value === undefined)
-        docView.clearField(subscriptionHandle, key, changedResult);
-      else
-        docView.changeField(subscriptionHandle, key, value, changedResult);
-    });
-    self.callbacks.changed(self.collectionName, id, changedResult);
-  },
-
-  removed: function (subscriptionHandle, id) {
-    var self = this;
-    var docView = self.documents.get(id);
-    if (!docView) {
-      var err = new Error("Removed nonexistent document " + id);
-      throw err;
-    }
-    docView.existsIn.delete(subscriptionHandle);
-    if (docView.existsIn.size === 0) {
-      // it is gone from everyone
-      self.callbacks.removed(self.collectionName, id);
-      self.documents.delete(id);
-    } else {
-      var changed = {};
-      // remove this subscription from every precedence list
-      // and record the changes
-      docView.dataByKey.forEach(function (precedenceList, key) {
-        docView.clearField(subscriptionHandle, key, changed);
-      });
-
-      self.callbacks.changed(self.collectionName, id, changed);
-    }
-  }
-});
-
 /******************************************************************************/
 /* Session                                                                    */
 /******************************************************************************/
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index c8e42343a8..8ca3864c42 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -10,7 +10,8 @@ Npm.depends({
   "lodash.once": "4.1.1",
   "lodash.isempty": "4.4.0",
   "lodash.isstring": "4.0.1",
-  "lodash.isobject": "3.0.2"
+  "lodash.isobject": "3.0.2",
+  "lru_map": '0.4.1'
 });
 
 Package.onUse(function (api) {
@@ -23,6 +24,7 @@ Package.onUse(function (api) {
       "mongo-id",
       "diff-sequence",
       "ecmascript",
+      "typescript",
     ],
     "server"
   );
diff --git a/packages/ddp-server/session_collection_view.ts b/packages/ddp-server/session_collection_view.ts
new file mode 100644
index 0000000000..add76cda85
--- /dev/null
+++ b/packages/ddp-server/session_collection_view.ts
@@ -0,0 +1,200 @@
+import { SessionDocumentView } from './session_document_view';
+import { LRUMap } from 'lru_map'
+import isEmpty from 'lodash.isempty';
+
+/**
+ * Represents a client's view of documents within a single collection
+ * @class SessionCollectionView
+ */
+export class SessionCollectionView {
+  private readonly collectionName: string;
+  private readonly callbacks: SessionCallbacks;
+  private readonly documents: LRUMap<string, SessionDocumentView>;
+  private readonly options: ViewOptions;
+
+  /**
+   * @param collectionName - Name of the collection this view represents
+   * @param callbacks - Callbacks for document changes (added/changed/removed)
+   * @param options - Configuration options for the view
+   */
+  constructor(
+    collectionName: string,
+    callbacks: SessionCallbacks,
+    options: ViewOptions = {}
+  ) {
+    this.collectionName = collectionName;
+    this.callbacks = callbacks;
+    this.options = {
+      maxDocuments: options.maxDocuments || 10000,
+      documentTTL: options.documentTTL || 3600000, // 1 hour in ms
+      cleanupInterval: options.cleanupInterval || 300000 // 5 minutes in ms
+    };
+
+    // Use LRU cache with max size limit
+    this.documents = new LRUMap<string, SessionDocumentView>(this.options.maxDocuments);
+
+    // Start periodic cleanup
+    this.startCleanup();
+  }
+
+  /**
+   * Periodically removes stale documents and frees memory
+   * @private
+   */
+  private startCleanup(): void {
+    const cleanup = (): void => {
+      const now = Date.now();
+      this.documents.forEach((doc, id) => {
+        if (now - doc.lastAccessed > this.options.documentTTL) {
+          this.documents.delete(id);
+        }
+      });
+    };
+
+    if (typeof setInterval !== 'undefined') {
+      setInterval(cleanup, this.options.cleanupInterval);
+    }
+  }
+
+  /**
+   * Checks if the view is empty
+   */
+  public isEmpty(): boolean {
+    return this.documents.size === 0;
+  }
+
+  /**
+   * Adds or updates a document in the view
+   */
+  public added(subscriptionHandle: string, id: string, fields: Record<string, any>): void {
+    let docView = this.documents.get(id);
+    const added = !docView;
+
+    if (!docView) {
+      docView = new SessionDocumentView();
+      this.documents.set(id, docView);
+    }
+
+    docView.existsIn.add(subscriptionHandle);
+    const changeCollector: Record<string, any> = {};
+
+    Object.entries(fields).forEach(([key, value]) => {
+      docView.changeField(subscriptionHandle, key, value, changeCollector, true);
+    });
+
+    if (added) {
+      this.callbacks.added(this.collectionName, id, changeCollector);
+    } else {
+      this.callbacks.changed(this.collectionName, id, changeCollector);
+    }
+  }
+
+  /**
+   * Updates an existing document in the view
+   */
+  public changed(subscriptionHandle: string, id: string, changed: Record<string, any>): void {
+    const docView = this.documents.get(id);
+    if (!docView) {
+      throw new Error(`Changed called on document ${id} that does not exist`);
+    }
+
+    const changedResult: Record<string, any> = {};
+    Object.entries(changed).forEach(([key, value]) => {
+      if (value === undefined) {
+        docView.clearField(subscriptionHandle, key, changedResult);
+      } else {
+        docView.changeField(subscriptionHandle, key, value, changedResult);
+      }
+    });
+
+    if (!isEmpty(changedResult)) {
+      this.callbacks.changed(this.collectionName, id, changedResult);
+    }
+  }
+
+  /**
+   * Removes a document from the view
+   */
+  public removed(subscriptionHandle: string, id: string): void {
+    const docView = this.documents.get(id);
+    if (!docView) {
+      throw new Error(`Removed called on document ${id} that does not exist`);
+    }
+
+    docView.existsIn.delete(subscriptionHandle);
+
+    if (docView.existsIn.size === 0) {
+      this.documents.delete(id);
+      this.callbacks.removed(this.collectionName, id);
+    } else {
+      const changed: Record<string, any> = {};
+      docView.dataByKey.forEach((precedenceList, key) => {
+        docView.clearField(subscriptionHandle, key, changed);
+      });
+
+      if (!isEmpty(changed)) {
+        this.callbacks.changed(this.collectionName, id, changed);
+      }
+    }
+  }
+
+  /**
+   * Compares this view with another and sends appropriate callbacks
+   */
+  public diff(previous: SessionCollectionView): void {
+    DiffSequence.diffMaps(previous.documents, this.documents, {
+      both: (id, prevDocView, newDocView) => {
+        this.diffDocument(id, prevDocView, newDocView);
+      },
+      rightOnly: (id, newDocView) => {
+        this.callbacks.added(this.collectionName, id, newDocView.getFields());
+      },
+      leftOnly: (id) => {
+        this.callbacks.removed(this.collectionName, id);
+      }
+    });
+  }
+
+  /**
+   * Cleans up resources used by this view
+   */
+  public destroy(): void {
+    this.documents.clear();
+  }
+
+  /**
+   * @private
+   */
+  private diffDocument(id: string, prevDocView: SessionDocumentView, newDocView: SessionDocumentView): void {
+    const fields: Record<string, any> = {};
+    DiffSequence.diffObjects(prevDocView.getFields(), newDocView.getFields(), {
+      both: (key, prev, now) => {
+        if (!EJSON.equals(prev, now)) {
+          fields[key] = now;
+        }
+      },
+      rightOnly: (key, now) => {
+        fields[key] = now;
+      },
+      leftOnly: (key) => {
+        fields[key] = undefined;
+      }
+    });
+
+    if (!isEmpty(fields)) {
+      this.callbacks.changed(this.collectionName, id, fields);
+    }
+  }
+}
+
+interface ViewOptions {
+  maxDocuments?: number;
+  documentTTL?: number;
+  cleanupInterval?: number;
+}
+
+interface SessionCallbacks {
+  added: (collection: string, id: string, fields: Record<string, any>) => void;
+  changed: (collection: string, id: string, fields: Record<string, any>) => void;
+  removed: (collection: string, id: string) => void;
+}
\ No newline at end of file
diff --git a/packages/ddp-server/session_document_view.ts b/packages/ddp-server/session_document_view.ts
new file mode 100644
index 0000000000..b4cd3801b7
--- /dev/null
+++ b/packages/ddp-server/session_document_view.ts
@@ -0,0 +1,103 @@
+/**
+ * Represents a single document in a SessionCollectionView
+ * @class SessionDocumentView
+ */
+export class SessionDocumentView {
+  public existsIn: Set<string>;
+  public dataByKey: Map<string, Array<PrecedenceItem>>;
+  public lastAccessed: number;
+
+  constructor() {
+    this.existsIn = new Set();
+    this.dataByKey = new Map();
+    this.lastAccessed = Date.now();
+  }
+
+  /**
+   * Gets the current fields of the document
+   */
+  public getFields(): Record<string, any> {
+    this.lastAccessed = Date.now();
+    const fields: Record<string, any> = {};
+
+    this.dataByKey.forEach((precedenceList, key) => {
+      if (precedenceList.length > 0) {
+        fields[key] = precedenceList[0].value;
+      }
+    });
+
+    return fields;
+  }
+
+  /**
+   * Clears a field from the document
+   */
+  public clearField(subscriptionHandle: string, key: string, changeCollector: Record<string, any>): void {
+    if (key === '_id') return;
+
+    const precedenceList = this.dataByKey.get(key);
+    if (!precedenceList) return;
+
+    let removedValue: any;
+    for (let i = 0; i < precedenceList.length; i++) {
+      if (precedenceList[i].subscriptionHandle === subscriptionHandle) {
+        if (i === 0) {
+          removedValue = precedenceList[i].value;
+        }
+        precedenceList.splice(i, 1);
+        break;
+      }
+    }
+
+    if (precedenceList.length === 0) {
+      this.dataByKey.delete(key);
+      changeCollector[key] = undefined;
+    } else if (removedValue !== undefined &&
+      !EJSON.equals(removedValue, precedenceList[0].value)) {
+      changeCollector[key] = precedenceList[0].value;
+    }
+  }
+
+  /**
+   * Changes a field value in the document
+   */
+  public changeField(
+    subscriptionHandle: string,
+    key: string,
+    value: any,
+    changeCollector: Record<string, any>,
+    isAdd: boolean = false
+  ): void {
+    if (key === '_id') return;
+
+    value = EJSON.clone(value);
+
+    if (!this.dataByKey.has(key)) {
+      this.dataByKey.set(key, [{
+        subscriptionHandle,
+        value
+      }]);
+      changeCollector[key] = value;
+      return;
+    }
+
+    const precedenceList = this.dataByKey.get(key)!;
+    let item = !isAdd && precedenceList.find(
+      p => p.subscriptionHandle === subscriptionHandle
+    );
+
+    if (item) {
+      if (item === precedenceList[0] && !EJSON.equals(value, item.value)) {
+        changeCollector[key] = value;
+      }
+      item.value = value;
+    } else {
+      precedenceList.push({ subscriptionHandle, value });
+    }
+  }
+}
+
+interface PrecedenceItem {
+  subscriptionHandle: string;
+  value: any;
+}
\ No newline at end of file

From a9f2656e22ca36f293c6d0b74867ddffb3faa306 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 4 Nov 2024 18:14:29 -0400
Subject: [PATCH 0759/1140] fix race condition in oplog tailing

---
 packages/mongo/oplog_tailing.ts | 156 ++++++++++++++++----------------
 1 file changed, 79 insertions(+), 77 deletions(-)

diff --git a/packages/mongo/oplog_tailing.ts b/packages/mongo/oplog_tailing.ts
index 440339fa6f..d56bf8e8eb 100644
--- a/packages/mongo/oplog_tailing.ts
+++ b/packages/mongo/oplog_tailing.ts
@@ -11,7 +11,7 @@ export const OPLOG_COLLECTION = 'oplog.rs';
 let TOO_FAR_BEHIND = +(process.env.METEOR_OPLOG_TOO_FAR_BEHIND || 2000);
 const TAIL_TIMEOUT = +(process.env.METEOR_OPLOG_TAIL_TIMEOUT || 30000);
 
-interface OplogEntry {
+export interface OplogEntry {
   op: string;
   o: any;
   o2?: any;
@@ -19,12 +19,12 @@ interface OplogEntry {
   ns: string;
 }
 
-interface CatchingUpResolver {
+export interface CatchingUpResolver {
   ts: any;
   resolver: () => void;
 }
 
-interface OplogTrigger {
+export interface OplogTrigger {
   dropCollection: boolean;
   dropDatabase: boolean;
   op: OplogEntry;
@@ -34,7 +34,7 @@ interface OplogTrigger {
 
 export class OplogHandle {
   private _oplogUrl: string;
-  private _dbName: string;
+  public _dbName: string;
   private _oplogLastEntryConnection: MongoConnection | null;
   private _oplogTailConnection: MongoConnection | null;
   private _oplogOptions: { excludeCollections?: string[]; includeCollections?: string[] } | null;
@@ -42,16 +42,18 @@ export class OplogHandle {
   private _tailHandle: any;
   private _readyPromiseResolver: (() => void) | null;
   private _readyPromise: Promise<void>;
-  private _crossbar: any;
+  public _crossbar: any;
   private _baseOplogSelector: any;
   private _catchingUpResolvers: CatchingUpResolver[];
   private _lastProcessedTS: any;
   private _onSkippedEntriesHook: any;
-  private _entryQueue: any;
-  private _workerActive: boolean;
   private _startTrailingPromise: Promise<void>;
   private _resolveTimeout: any;
 
+  private _entryQueue = new Meteor._DoubleEndedQueue();
+  private _workerActive = false;
+  private _workerPromise: Promise<void> | null = null;
+
   constructor(oplogUrl: string, dbName: string) {
     this._oplogUrl = oplogUrl;
     this._dbName = dbName;
@@ -90,10 +92,6 @@ export class OplogHandle {
       debugPrintExceptions: "onSkippedEntries callback"
     });
 
-    // @ts-ignore
-    this._entryQueue = new Meteor._DoubleEndedQueue();
-    this._workerActive = false;
-
     this._startTrailingPromise = this._startTailing();
   }
 
@@ -298,64 +296,11 @@ export class OplogHandle {
   }
 
   private _maybeStartWorker(): void {
-    if (this._workerActive) return;
+    if (this._workerPromise) return;
     this._workerActive = true;
 
-    Meteor.defer(async () => {
-      // May be called recursively in case of transactions.
-      const handleDoc = async (doc: OplogEntry): Promise<void> => {
-        if (doc.ns === "admin.$cmd") {
-          if (doc.o.applyOps) {
-            // This was a successful transaction, so we need to apply the
-            // operations that were involved.
-            let nextTimestamp = doc.ts;
-            for (const op of doc.o.applyOps) {
-              // See https://github.com/meteor/meteor/issues/10420.
-              if (!op.ts) {
-                op.ts = nextTimestamp;
-                nextTimestamp = nextTimestamp.add(Long.ONE);
-              }
-              await handleDoc(op);
-            }
-            return;
-          }
-          throw new Error("Unknown command " + JSON.stringify(doc));
-        }
-
-        const trigger: OplogTrigger = {
-          dropCollection: false,
-          dropDatabase: false,
-          op: doc,
-        };
-
-        if (typeof doc.ns === "string" && doc.ns.startsWith(this._dbName + ".")) {
-          trigger.collection = doc.ns.slice(this._dbName.length + 1);
-        }
-
-        // Is it a special command and the collection name is hidden
-        // somewhere in operator?
-        if (trigger.collection === "$cmd") {
-          if (doc.o.dropDatabase) {
-            delete trigger.collection;
-            trigger.dropDatabase = true;
-          } else if ("drop" in doc.o) {
-            trigger.collection = doc.o.drop;
-            trigger.dropCollection = true;
-            trigger.id = null;
-          } else if ("create" in doc.o && "idIndex" in doc.o) {
-            // A collection got implicitly created within a transaction. There's
-            // no need to do anything about it.
-          } else {
-            throw Error("Unknown command " + JSON.stringify(doc));
-          }
-        } else {
-          // All other ops have an id.
-          trigger.id = idForOp(doc);
-        }
-
-        await this._crossbar.fire(trigger);
-      };
-
+    // Convert to a proper promise-based queue processor
+    this._workerPromise = (async () => {
       try {
         while (!this._stopped && !this._entryQueue.isEmpty()) {
           // Are we too far behind? Just tell our observers that they need to
@@ -375,23 +320,25 @@ export class OplogHandle {
             continue;
           }
 
+          // Process next batch from the queue
           const doc = this._entryQueue.shift();
 
-          // Fire trigger(s) for this doc.
-          await handleDoc(doc);
-
-          // Now that we've processed this operation, process pending
-          // sequencers.
-          if (doc.ts) {
-            this._setLastProcessedTS(doc.ts);
-          } else {
-            throw Error("oplog entry without ts: " + JSON.stringify(doc));
+          try {
+            await handleDoc(this, doc);
+            // Process any waiting fence callbacks
+            if (doc.ts) {
+              this._setLastProcessedTS(doc.ts);
+            }
+          } catch (e) {
+            // Keep processing queue even if one entry fails
+            console.error('Error processing oplog entry:', e);
           }
         }
       } finally {
+        this._workerPromise = null;
         this._workerActive = false;
       }
-    });
+    })();
   }
 
   _setLastProcessedTS(ts: any): void {
@@ -422,3 +369,58 @@ export function idForOp(op: OplogEntry): string {
     throw Error("Unknown op: " + JSON.stringify(op));
   }
 }
+
+async function handleDoc(handle: OplogHandle, doc: OplogEntry): Promise<void> {
+  if (doc.ns === "admin.$cmd") {
+    if (doc.o.applyOps) {
+      // This was a successful transaction, so we need to apply the
+      // operations that were involved.
+      let nextTimestamp = doc.ts;
+      for (const op of doc.o.applyOps) {
+        // See https://github.com/meteor/meteor/issues/10420.
+        if (!op.ts) {
+          op.ts = nextTimestamp;
+          nextTimestamp = nextTimestamp.add(Long.ONE);
+        }
+        await handleDoc(handle, op);
+      }
+      return;
+    }
+    throw new Error("Unknown command " + JSON.stringify(doc));
+  }
+
+  const trigger: OplogTrigger = {
+    dropCollection: false,
+    dropDatabase: false,
+    op: doc,
+  };
+
+  if (typeof doc.ns === "string" && doc.ns.startsWith(handle._dbName + ".")) {
+    trigger.collection = doc.ns.slice(handle._dbName.length + 1);
+  }
+
+  // Is it a special command and the collection name is hidden
+  // somewhere in operator?
+  if (trigger.collection === "$cmd") {
+    if (doc.o.dropDatabase) {
+      delete trigger.collection;
+      trigger.dropDatabase = true;
+    } else if ("drop" in doc.o) {
+      trigger.collection = doc.o.drop;
+      trigger.dropCollection = true;
+      trigger.id = null;
+    } else if ("create" in doc.o && "idIndex" in doc.o) {
+      // A collection got implicitly created within a transaction. There's
+      // no need to do anything about it.
+    } else {
+      throw Error("Unknown command " + JSON.stringify(doc));
+    }
+  } else {
+    // All other ops have an id.
+    trigger.id = idForOp(doc);
+  }
+
+  await handle._crossbar.fire(trigger);
+
+  await new Promise(resolve => setImmediate(resolve));
+}
\ No newline at end of file

From 748f7c4f29d87907af8eaeaa9e87d3c09fdef8c0 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 4 Nov 2024 18:21:39 -0400
Subject: [PATCH 0760/1140] prevent blocking event loop in write fence

---
 packages/ddp-server/writefence.js | 121 +++++++++++++-----------------
 1 file changed, 53 insertions(+), 68 deletions(-)

diff --git a/packages/ddp-server/writefence.js b/packages/ddp-server/writefence.js
index a07ab575fc..aee0f1fde7 100644
--- a/packages/ddp-server/writefence.js
+++ b/packages/ddp-server/writefence.js
@@ -1,7 +1,3 @@
-// A write fence collects a group of writes, and provides a callback
-// when all of the writes are fully committed and propagated (all
-// observers have been notified of the write and acknowledged it.)
-//
 DDPServer._WriteFence = class {
   constructor() {
     this.armed = false;
@@ -12,58 +8,49 @@ DDPServer._WriteFence = class {
     this.completion_callbacks = [];
   }
 
-  // Start tracking a write, and return an object to represent it. The
-  // object has a single method, committed(). This method should be
-  // called when the write is fully committed and propagated. You can
-  // continue to add writes to the WriteFence up until it is triggered
-  // (calls its callbacks because all writes have committed.)
   beginWrite() {
-    if (this.retired)
-      return { committed: function () {} };
+    if (this.retired) {
+      return { committed: () => {} };
+    }
 
-    if (this.fired)
+    if (this.fired) {
       throw new Error("fence has already activated -- too late to add writes");
+    }
 
     this.outstanding_writes++;
     let committed = false;
-    const _committedFn = async () => {
-      if (committed)
-        throw new Error("committed called twice on the same write");
-      committed = true;
-      this.outstanding_writes--;
-      await this._maybeFire();
-    };
 
     return {
-      committed: _committedFn,
+      committed: async () => {
+        if (committed) {
+          throw new Error("committed called twice on the same write");
+        }
+        committed = true;
+        this.outstanding_writes--;
+        await this._maybeFire();
+      }
     };
   }
 
-  // Arm the fence. Once the fence is armed, and there are no more
-  // uncommitted writes, it will activate.
   arm() {
-
-    if (this === DDPServer._getCurrentFence())
+    if (this === DDPServer._getCurrentFence()) {
       throw Error("Can't arm the current fence");
+    }
     this.armed = true;
     return this._maybeFire();
   }
 
-  // Register a function to be called once before firing the fence.
-  // Callback function can add new writes to the fence, in which case
-  // it won't fire until those writes are done as well.
   onBeforeFire(func) {
-    if (this.fired)
-      throw new Error("fence has already activated -- too late to " +
-          "add a callback");
+    if (this.fired) {
+      throw new Error("fence has already activated -- too late to add a callback");
+    }
     this.before_fire_callbacks.push(func);
   }
 
-  // Register a function to be called when the fence fires.
   onAllCommitted(func) {
-    if (this.fired)
-      throw new Error("fence has already activated -- too late to " +
-          "add a callback");
+    if (this.fired) {
+      throw new Error("fence has already activated -- too late to add a callback");
+    }
     this.completion_callbacks.push(func);
   }
 
@@ -72,56 +59,54 @@ DDPServer._WriteFence = class {
     const returnValue = new Promise(r => resolver = r);
     this.onAllCommitted(resolver);
     await this.arm();
-
     return returnValue;
   }
-  // Convenience function. Arms the fence, then blocks until it fires.
-  async armAndWait() {
+
+  armAndWait() {
     return this._armAndWait();
   }
 
   async _maybeFire() {
-    if (this.fired)
+    if (this.fired) {
       throw new Error("write fence already activated?");
-    if (this.armed && !this.outstanding_writes) {
-      const invokeCallback = async (func) => {
-        try {
-          await func(this);
-        } catch (err) {
-          Meteor._debug("exception in write fence callback:", err);
-        }
-      };
+    }
 
-      this.outstanding_writes++;
-      while (this.before_fire_callbacks.length > 0) {
-        const cb = this.before_fire_callbacks.shift();
-        await invokeCallback(cb);
-      }
-      this.outstanding_writes--;
+    if (!this.armed || this.outstanding_writes > 0) {
+      return;
+    }
 
-      if (!this.outstanding_writes) {
-        this.fired = true;
-        const callbacks = this.completion_callbacks || [];
-        this.completion_callbacks = [];
-        while (callbacks.length > 0) {
-          const cb = callbacks.shift();
-          await invokeCallback(cb);
-        }
+    const invokeCallback = async (func) => {
+      try {
+        await func(this);
+      } catch (err) {
+        Meteor._debug("exception in write fence callback:", err);
       }
+    };
+
+    this.outstanding_writes++;
+
+    // Process all before_fire callbacks in parallel
+    const beforeCallbacks = [...this.before_fire_callbacks];
+    this.before_fire_callbacks = [];
+    await Promise.all(beforeCallbacks.map(cb => invokeCallback(cb)));
+
+    this.outstanding_writes--;
+
+    if (this.outstanding_writes === 0) {
+      this.fired = true;
+      // Process all completion callbacks in parallel
+      const callbacks = [...this.completion_callbacks];
+      this.completion_callbacks = [];
+      await Promise.all(callbacks.map(cb => invokeCallback(cb)));
     }
   }
 
-  // Deactivate this fence so that adding more writes has no effect.
-  // The fence must have already fired.
   retire() {
-    if (!this.fired)
+    if (!this.fired) {
       throw new Error("Can't retire a fence that hasn't fired.");
+    }
     this.retired = true;
   }
 };
 
-// The current write fence. When there is a current write fence, code
-// that writes to databases should register their writes with it using
-// beginWrite().
-//
-DDPServer._CurrentWriteFence = new Meteor.EnvironmentVariable;
+DDPServer._CurrentWriteFence = new Meteor.EnvironmentVariable;
\ No newline at end of file

From 98a964fa8a10b363a2fa4e9a87d3e85480535632 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 5 Nov 2024 09:42:14 -0400
Subject: [PATCH 0761/1140] remove version from in the tests

---
 packages/roles/package.js | 68 ++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 41 deletions(-)

diff --git a/packages/roles/package.js b/packages/roles/package.js
index 36ed70b7bf..679b380997 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -1,60 +1,46 @@
 /* eslint-env meteor */
 
 Package.describe({
-  summary: 'Authorization package for Meteor',
-  version: '1.0.0',
-  name: 'roles'
-})
+  summary: "Authorization package for Meteor",
+  version: "1.0.0",
+  name: "roles",
+});
 
 Package.onUse(function (api) {
+  const both = ["client", "server"];
 
-  const both = ['client', 'server']
+  api.use(
+    ["ecmascript", "accounts-base", "tracker", "mongo", "check", "ddp"],
+    both
+  );
 
-  api.use([
-    'ecmascript',
-    'accounts-base',
-    'tracker',
-    'mongo',
-    'check',
-    'ddp'
-  ], both)
+  api.use("zodern:types@1.0.13");
 
-  api.use('zodern:types@1.0.13')
+  api.use(["blaze@2.9.0 || 3.0.0"], "client", { weak: true });
 
-  api.use(['blaze@2.9.0 || 3.0.0'], 'client', { weak: true })
+  api.export(["Roles", "RolesCollection", "RoleAssignmentCollection"]);
 
-  api.export(['Roles', 'RolesCollection', 'RoleAssignmentCollection'])
-
-  api.addFiles('roles_client.js', 'client')
-  api.addFiles('roles_common_async.js', both)
-  api.addFiles('roles_server.js', 'server')
-  api.addFiles([
-    'client/debug.js',
-    'client/uiHelpers.js'
-  ], 'client')
-})
+  api.addFiles("roles_client.js", "client");
+  api.addFiles("roles_common_async.js", both);
+  api.addFiles("roles_server.js", "server");
+  api.addFiles(["client/debug.js", "client/uiHelpers.js"], "client");
+});
 
 Package.onTest(function (api) {
   // Add code coverage
   api.use([
-    'lmieulet:meteor-legacy-coverage',
-    'lmieulet:meteor-coverage@4.1.0 || 5.0.0',
-    'meteortesting:mocha@2.1.0 || 3.2.0'
-  ])
+    "lmieulet:meteor-legacy-coverage",
+    "lmieulet:meteor-coverage@4.1.0 || 5.0.0",
+    "meteortesting:mocha@2.1.0 || 3.2.0",
+  ]);
 
-  api.versionsFrom(['2.8.1', '3.0'])
-
-  const both = ['client', 'server']
+  const both = ["client", "server"];
 
   // `accounts-password` is included so `Meteor.users` exists
 
-  api.use([
-    'ecmascript',
-    'alanning:roles',
-    'mongo'
-  ], both)
+  api.use(["ecmascript", "alanning:roles", "mongo"], both);
 
-  api.addFiles('tests/serverAsync.js', 'server')
-  api.addFiles('tests/client.js', 'client')
-  api.addFiles('tests/clientAsync.js', 'client')
-})
+  api.addFiles("tests/serverAsync.js", "server");
+  api.addFiles("tests/client.js", "client");
+  api.addFiles("tests/clientAsync.js", "client");
+});

From ecfcf6d4577c9f660d3d0c4a7369cd3bb5f92d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 5 Nov 2024 17:22:32 +0100
Subject: [PATCH 0762/1140] fix performance issue with bundler ensuring proper
 parallelization

---
 tools/isobuild/compiler-plugin.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 6db7ef7062..f2a52e6373 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -1720,21 +1720,21 @@ export class PackageSourceBatch {
     const fileHashes = [];
     const cacheKeyPrefix = sha1(JSON.stringify({
       linkerOptions,
-      files: await jsResources.reduce(async (acc, inputFile) => {
-        const resolvedAcc = await acc;
-
-        fileHashes.push(await inputFile.hash);
-        return [...resolvedAcc, {
-          meteorInstallOptions: inputFile.meteorInstallOptions,
-          absModuleId: inputFile.absModuleId,
-          sourceMap: !! await inputFile.sourceMap,
-          mainModule: inputFile.mainModule,
-          imported: inputFile.imported,
-          alias: inputFile.alias,
-          lazy: inputFile.lazy,
-          bare: inputFile.bare,
-        }];
-      }, Promise.resolve([]))
+      files: await Promise.all(
+        jsResources.map(async (inputFile) => {
+          fileHashes.push(await inputFile.hash);
+          return {
+            meteorInstallOptions: inputFile.meteorInstallOptions,
+            absModuleId: inputFile.absModuleId,
+            sourceMap: !!(await inputFile.sourceMap),
+            mainModule: inputFile.mainModule,
+            imported: inputFile.imported,
+            alias: inputFile.alias,
+            lazy: inputFile.lazy,
+            bare: inputFile.bare,
+          };
+        })
+      )
     }));
     const cacheKeySuffix = sha1(JSON.stringify({
       LINKER_CACHE_SALT,

From 5a34f97c4c29b566fc0c3524d9d287dfe22fb7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 5 Nov 2024 17:34:50 +0100
Subject: [PATCH 0763/1140] proper await

---
 tools/isobuild/bundler.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index d70f31c6a5..4f1723e5e1 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1223,13 +1223,16 @@ class Target {
           continue;
         }
 
+        var data = await resource.data;
+        var hash = await resource.hash;
+
         const fileOptions = {
           info: 'unbuild ' + resource,
           arch: this.arch,
-          data: await resource.data,
+          data,
           cacheable: false,
-          hash: await resource.hash,
-          skipSri: !!await resource.hash
+          hash,
+          skipSri: !!hash
         };
 
         const file = new File(fileOptions);
@@ -1290,15 +1293,17 @@ class Target {
             continue;
           }
 
+          var data = await resource.data;
+          var hash = await resource.hash;
           let sourcePath;
-          if ((await resource.data) && resource.sourceRoot && resource.sourcePath) {
+          if (data && resource.sourceRoot && resource.sourcePath) {
             sourcePath = files.pathJoin(resource.sourceRoot, resource.sourcePath);
           }
           const f = new File({
             info: 'resource ' + resource.servePath,
             arch: this.arch,
-            data: await resource.data,
-            hash: await resource.hash,
+            data,
+            hash,
             cacheable: false,
             replaceable: resource.type === 'js' && sourceBatch.hmrAvailable,
             sourcePath
@@ -1323,14 +1328,15 @@ class Target {
             });
           }
 
+          var sourceMap = await resource.sourceMap;
           // Both CSS and JS files can have source maps
-          if (await resource.sourceMap) {
+          if (sourceMap) {
             // XXX we used to set sourceMapRoot to
             // files.pathDirname(relPath) but it's unclear why.  With the
             // currently generated source map file names, it works without it
             // and doesn't work well with it... maybe?  we were getting
             // 'packages/packages/foo/bar.js'
-            f.setSourceMap(await resource.sourceMap, null);
+            f.setSourceMap(sourceMap, null);
           }
 
           this[resource.type].push(f);

From fac10222440e4709ecb7f51aa242053b4ba0e4b6 Mon Sep 17 00:00:00 2001
From: Per Bergland <per@refapp.se>
Date: Tue, 5 Nov 2024 18:32:57 +0100
Subject: [PATCH 0764/1140] Fix faulty package types file name and publish it
 INSTEAD of the .d.ts file for zodern:types.

Fixes #13447
---
 ...{package.types.json => package-types.json} |  0
 packages/mongo/package.js                     | 25 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)
 rename packages/mongo/{package.types.json => package-types.json} (100%)

diff --git a/packages/mongo/package.types.json b/packages/mongo/package-types.json
similarity index 100%
rename from packages/mongo/package.types.json
rename to packages/mongo/package-types.json
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index cb9bc53e72..7e8aecae0d 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -20,7 +20,7 @@ Npm.depends({
   "lodash.throttle": "4.1.1",
   "lodash.once": "4.1.1",
   "lodash.isobject": "3.0.2",
-  "lodash.clone": "4.5.0"
+  "lodash.clone": "4.5.0",
 });
 
 Npm.strip({
@@ -51,7 +51,6 @@ Package.onUse(function (api) {
   api.use("mongo-decimal", "server");
   //api.use('emitter-promise', 'server');
 
-
   // Binary Heap data structure is used to optimize oplog observe driver
   // performance.
   api.use("binary-heap", "server");
@@ -103,16 +102,24 @@ Package.onUse(function (api) {
   api.addFiles("remote_collection_driver.ts", "server");
   api.addFiles("collection/collection.js", ["client", "server"]);
   api.addFiles("connection_options.ts", "server");
-  api.addAssets("mongo.d.ts", "server");
+  // For zodern:types to pick up our published types
+  api.addAssets("package-types.json", "server");
 });
 
 Package.onTest(function (api) {
-  api.use('mongo');
-  api.use('check');
-  api.use('ecmascript');
-  api.use('npm-mongo', 'server');
-  api.use(['tinytest', 'test-helpers', 'ejson', 'random',
-           'ddp', 'base64', 'typescript']);
+  api.use("mongo");
+  api.use("check");
+  api.use("ecmascript");
+  api.use("npm-mongo", "server");
+  api.use([
+    "tinytest",
+    "test-helpers",
+    "ejson",
+    "random",
+    "ddp",
+    "base64",
+    "typescript",
+  ]);
   // XXX test order dependency: the allow_tests "partial allow" test
   // fails if it is run before mongo_livedata_tests.
   api.addFiles("tests/mongo_livedata_tests.js", ["client", "server"]);

From ecdfb480f0db6c2ef09b88bbb11199a6f2a0b2bd Mon Sep 17 00:00:00 2001
From: Per Bergland <per@refapp.se>
Date: Tue, 5 Nov 2024 18:42:09 +0100
Subject: [PATCH 0765/1140] Need to publish the .d.ts file as well so it winds
 up next to package-types.json in the isobuild package

---
 packages/mongo/package.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 7e8aecae0d..b6bb78b9ea 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -102,7 +102,9 @@ Package.onUse(function (api) {
   api.addFiles("remote_collection_driver.ts", "server");
   api.addFiles("collection/collection.js", ["client", "server"]);
   api.addFiles("connection_options.ts", "server");
-  // For zodern:types to pick up our published types
+  // For zodern:types to pick up our published types.
+  // Both the .d.ts file and package-types.json must be published
+  api.addAssets("mongo.d.ts", "server");
   api.addAssets("package-types.json", "server");
 });
 

From 104cede0e1be1f48dec40b7eb36c42b7a4e3ea84 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 5 Nov 2024 18:32:15 -0400
Subject: [PATCH 0766/1140] rename files

---
 packages/ddp-client/client/client_convenience.js              | 2 +-
 .../client/{queueStubsHelpers.js => queue_stub_helpers.js}    | 0
 packages/ddp-client/common/livedata_connection.js             | 4 ++--
 .../ddp-client/common/{MethodInvoker.js => method_invoker.js} | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/ddp-client/client/{queueStubsHelpers.js => queue_stub_helpers.js} (100%)
 rename packages/ddp-client/common/{MethodInvoker.js => method_invoker.js} (98%)

diff --git a/packages/ddp-client/client/client_convenience.js b/packages/ddp-client/client/client_convenience.js
index 78a1ff7473..052a3087bb 100644
--- a/packages/ddp-client/client/client_convenience.js
+++ b/packages/ddp-client/client/client_convenience.js
@@ -1,6 +1,6 @@
 import { DDP } from '../common/namespace.js';
 import { Meteor } from 'meteor/meteor';
-import { loadAsyncStubHelpers } from "./queueStubsHelpers";
+import { loadAsyncStubHelpers } from "./queue_stub_helpers";
 
 // Meteor.refresh can be called on the client (if you're in common code) but it
 // only has an effect on the server.
diff --git a/packages/ddp-client/client/queueStubsHelpers.js b/packages/ddp-client/client/queue_stub_helpers.js
similarity index 100%
rename from packages/ddp-client/client/queueStubsHelpers.js
rename to packages/ddp-client/client/queue_stub_helpers.js
diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index e8967e3651..31081f7bcb 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -5,14 +5,14 @@ import { EJSON } from 'meteor/ejson';
 import { Random } from 'meteor/random';
 import { MongoID } from 'meteor/mongo-id';
 import { DDP } from './namespace.js';
-import MethodInvoker from './MethodInvoker.js';
+import { MethodInvoker } from './method_invoker';
 import {
   hasOwn,
   slice,
   keys,
   isEmpty,
   last,
-} from "meteor/ddp-common/utils.js";
+} from "meteor/ddp-common/utils";
 
 class MongoIDMap extends IdMap {
   constructor() {
diff --git a/packages/ddp-client/common/MethodInvoker.js b/packages/ddp-client/common/method_invoker.js
similarity index 98%
rename from packages/ddp-client/common/MethodInvoker.js
rename to packages/ddp-client/common/method_invoker.js
index f2490b92f8..e0ef59e478 100644
--- a/packages/ddp-client/common/MethodInvoker.js
+++ b/packages/ddp-client/common/method_invoker.js
@@ -3,7 +3,7 @@
 // _methodInvokers map; it removes itself once the method is fully finished and
 // the callback is invoked. This occurs when it has both received a result,
 // and the data written by it is fully visible.
-export default class MethodInvoker {
+export class MethodInvoker {
   constructor(options) {
     // Public (within this file) fields.
     this.methodId = options.methodId;

From 4e8c7cf1815298da77f206c2b94d9b52f12e5e60 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 5 Nov 2024 18:40:50 -0400
Subject: [PATCH 0767/1140] fix potential race condition dropping messages

---
 .../ddp-client/common/livedata_connection.js  | 119 ++++++++----------
 1 file changed, 50 insertions(+), 69 deletions(-)

diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index 31081f7bcb..75fe2ae7cf 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -941,7 +941,7 @@ export class Connection {
   // documents.
   _saveOriginals() {
     if (! this._waitingForQuiescence()) {
-      this._flushBufferedWritesClient();
+      this._flushBufferedWrites();
     }
 
     Object.values(this._stores).forEach((store) => {
@@ -1332,61 +1332,40 @@ export class Connection {
     return writes;
   }
 
-  async _flushBufferedWritesServer() {
-    const self = this;
-    const writes = self._prepareBuffersToFlush();
-    await self._performWritesServer(writes);
-  }
-  _flushBufferedWritesClient() {
-    const self = this;
-    const writes = self._prepareBuffersToFlush();
-    self._performWritesClient(writes);
-  }
-  _flushBufferedWrites() {
-    const self = this;
-    return Meteor.isClient
-      ? self._flushBufferedWritesClient()
-      : self._flushBufferedWritesServer();
-  }
+  /**
+   * Server-side store updates handled asynchronously
+   * @private
+   */
   async _performWritesServer(updates) {
     const self = this;
 
-    if (self._resetStores || ! isEmpty(updates)) {
-      // Begin a transactional update of each store.
-
-      for (const [storeName, store] of Object.entries(self._stores)) {
+    if (self._resetStores || !isEmpty(updates)) {
+      // Start all store updates
+      for (const store of Object.values(self._stores)) {
         await store.beginUpdate(
-          hasOwn.call(updates, storeName)
-            ? updates[storeName].length
-            : 0,
+          updates[store._name]?.length || 0,
           self._resetStores
         );
       }
 
       self._resetStores = false;
 
-      for (const [storeName, updateMessages] of Object.entries(updates)) {
+      // Process each store's updates
+      for (const [storeName, messages] of Object.entries(updates)) {
         const store = self._stores[storeName];
         if (store) {
-          for (const updateMessage of updateMessages) {
-            await store.update(updateMessage);
+          for (const msg of messages) {
+            await store.update(msg);
           }
         } else {
-          // Nobody's listening for this data. Queue it up until
-          // someone wants it.
-          // XXX memory use will grow without bound if you forget to
-          // create a collection or just don't care about it... going
-          // to have to do something about that.
-          const updates = self._updatesForUnknownStores;
-
-          if (! hasOwn.call(updates, storeName)) {
-            updates[storeName] = [];
-          }
-
-          updates[storeName].push(...updateMessages);
+          // Queue updates for uninitialized stores
+          self._updatesForUnknownStores[storeName] =
+            self._updatesForUnknownStores[storeName] || [];
+          self._updatesForUnknownStores[storeName].push(...messages);
         }
       }
-      // End update transaction.
+
+      // Complete all updates
       for (const store of Object.values(self._stores)) {
         await store.endUpdate();
       }
@@ -1394,53 +1373,55 @@ export class Connection {
 
     self._runAfterUpdateCallbacks();
   }
+
+  /**
+   * Client-side store updates handled synchronously for optimistic UI
+   * @private
+   */
   _performWritesClient(updates) {
     const self = this;
 
-    if (self._resetStores || ! isEmpty(updates)) {
-      // Begin a transactional update of each store.
-
-      for (const [storeName, store] of Object.entries(self._stores)) {
+    if (self._resetStores || !isEmpty(updates)) {
+      // Synchronous store updates for client
+      Object.values(self._stores).forEach(store => {
         store.beginUpdate(
-          hasOwn.call(updates, storeName)
-            ? updates[storeName].length
-            : 0,
+          updates[store._name]?.length || 0,
           self._resetStores
         );
-      }
+      });
 
       self._resetStores = false;
 
-      for (const [storeName, updateMessages] of Object.entries(updates)) {
+      Object.entries(updates).forEach(([storeName, messages]) => {
         const store = self._stores[storeName];
         if (store) {
-          for (const updateMessage of updateMessages) {
-            store.update(updateMessage);
-          }
+          messages.forEach(msg => store.update(msg));
         } else {
-          // Nobody's listening for this data. Queue it up until
-          // someone wants it.
-          // XXX memory use will grow without bound if you forget to
-          // create a collection or just don't care about it... going
-          // to have to do something about that.
-          const updates = self._updatesForUnknownStores;
-
-          if (! hasOwn.call(updates, storeName)) {
-            updates[storeName] = [];
-          }
-
-          updates[storeName].push(...updateMessages);
+          self._updatesForUnknownStores[storeName] =
+            self._updatesForUnknownStores[storeName] || [];
+          self._updatesForUnknownStores[storeName].push(...messages);
         }
-      }
-      // End update transaction.
-      for (const store of Object.values(self._stores)) {
-        store.endUpdate();
-      }
+      });
+
+      Object.values(self._stores).forEach(store => store.endUpdate());
     }
 
     self._runAfterUpdateCallbacks();
   }
 
+  /**
+   * Executes buffered writes either synchronously (client) or async (server)
+   * @private
+   */
+  _flushBufferedWrites() {
+    const self = this;
+    const writes = self._prepareBuffersToFlush();
+
+    return Meteor.isClient
+      ? self._performWritesClient(writes)
+      : self._performWritesServer(writes);
+  }
+
   // Call any callbacks deferred with _runWhenAllServerDocsAreFlushed whose
   // relevant docs have been flushed, as well as dataVisible callbacks at
   // reconnect-quiescence time.

From 9fa9b82da7666d3c3a63839d634ffdcf0cb7f696 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Wed, 6 Nov 2024 09:00:31 -0400
Subject: [PATCH 0768/1140] add -beta310 so we don't forget to include it in
 the next release

---
 packages/roles/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/roles/package.js b/packages/roles/package.js
index 679b380997..3652a5975d 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "1.0.0",
+  version: "1.0.0-beta310.0",
   name: "roles",
 });
 

From abb854c567dafd29ccddf4f6bafc48c4bfe32b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 6 Nov 2024 14:11:57 +0100
Subject: [PATCH 0769/1140] record packages happens in background

---
 tools/cli/commands.js    | 2 +-
 tools/runners/run-app.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index cc79168e02..dd38086f00 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1374,7 +1374,7 @@ ${Console.command("meteor build ../output")}`,
       files.pathJoin(outputPath, 'bundle')) :
       files.pathJoin(buildDir, 'bundle');
 
-  await stats.recordPackages({
+  stats.recordPackages({
     what: "sdk.bundle",
     projectContext: projectContext
   });
diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index bd76e05317..39c57b224f 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -574,7 +574,7 @@ Object.assign(AppRunner.prototype, {
 
       if (self.recordPackageUsage) {
         // Maybe this doesn't need to be awaited for?
-        await stats.recordPackages({
+        stats.recordPackages({
           what: "sdk.run",
           projectContext: self.projectContext
         });

From dd5965725ccc14c89810f05f8afe86d99272f565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 6 Nov 2024 17:58:44 +0100
Subject: [PATCH 0770/1140] dont need to await refresh

---
 tools/runners/run-app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index 39c57b224f..54eb8bef95 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -911,7 +911,7 @@ Object.assign(AppRunner.prototype, {
 
         var oldPromise = self.runPromise = self._makePromise("run");
 
-        await refreshClient();
+        refreshClient();
 
         // Establish a watcher on the new files.
         setupClientWatcher();

From 2779e6563049e2cdda202e2d0a5c9a56a055e514 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 6 Nov 2024 13:08:40 -0400
Subject: [PATCH 0771/1140] improve buffered writes flushing logic in order to
 not block the event loop

---
 .../ddp-client/common/livedata_connection.js  | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index 75fe2ae7cf..08e080b7e4 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -202,12 +202,6 @@ export class Connection {
     self._updatesForUnknownStores = {};
     // if we're blocking a migration, the retry func
     self._retryMigrate = null;
-
-    self.__flushBufferedWrites = Meteor.bindEnvironment(
-      self._flushBufferedWrites,
-      'flushing DDP buffered writes',
-      self
-    );
     // Collection name -> array of messages.
     self._bufferedWrites = {};
     // When current buffer of updates must be flushed at, in ms timestamp.
@@ -1306,7 +1300,7 @@ export class Connection {
     self._bufferedWritesFlushHandle = setTimeout(() => {
       // __flushBufferedWrites is a promise, so with this we can wait the promise to finish
       // before doing something
-      self._liveDataWritesPromise = self.__flushBufferedWrites();
+      self._liveDataWritesPromise = self._flushBufferedWrites();
 
       if (Meteor._isPromise(self._liveDataWritesPromise)) {
         self._liveDataWritesPromise.finally(
@@ -1340,7 +1334,7 @@ export class Connection {
     const self = this;
 
     if (self._resetStores || !isEmpty(updates)) {
-      // Start all store updates
+      // Start all store updates - keeping original loop structure
       for (const store of Object.values(self._stores)) {
         await store.beginUpdate(
           updates[store._name]?.length || 0,
@@ -1350,12 +1344,21 @@ export class Connection {
 
       self._resetStores = false;
 
-      // Process each store's updates
+      // Process each store's updates sequentially as before
       for (const [storeName, messages] of Object.entries(updates)) {
         const store = self._stores[storeName];
         if (store) {
-          for (const msg of messages) {
-            await store.update(msg);
+          // Batch each store's messages in modest chunks to prevent event loop blocking
+          // while maintaining operation order
+          const CHUNK_SIZE = 100;
+          for (let i = 0; i < messages.length; i += CHUNK_SIZE) {
+            const chunk = messages.slice(i, Math.min(i + CHUNK_SIZE, messages.length));
+
+            for (const msg of chunk) {
+              await store.update(msg);
+            }
+
+            await new Promise(resolve => process.nextTick(resolve));
           }
         } else {
           // Queue updates for uninitialized stores
@@ -1413,7 +1416,7 @@ export class Connection {
    * Executes buffered writes either synchronously (client) or async (server)
    * @private
    */
-  _flushBufferedWrites() {
+  async _flushBufferedWrites() {
     const self = this;
     const writes = self._prepareBuffersToFlush();
 

From 6c1fd9c3138ec3fbc6959cd4e335897cb025f5b5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 6 Nov 2024 14:07:36 -0400
Subject: [PATCH 0772/1140] extract stream handlers

---
 .../common/connection_stream_handlers.js      | 202 ++++++++++++++++++
 .../ddp-client/common/livedata_connection.js  | 179 ++--------------
 packages/ddp-client/common/mongo_id_map.js    |   7 +
 3 files changed, 227 insertions(+), 161 deletions(-)
 create mode 100644 packages/ddp-client/common/connection_stream_handlers.js
 create mode 100644 packages/ddp-client/common/mongo_id_map.js

diff --git a/packages/ddp-client/common/connection_stream_handlers.js b/packages/ddp-client/common/connection_stream_handlers.js
new file mode 100644
index 0000000000..bfef109ff0
--- /dev/null
+++ b/packages/ddp-client/common/connection_stream_handlers.js
@@ -0,0 +1,202 @@
+import { DDPCommon } from 'meteor/ddp-common';
+import { Meteor } from 'meteor/meteor';
+
+export class ConnectionStreamHandlers {
+  constructor(connection) {
+    this._connection = connection;
+  }
+
+  /**
+   * Handles incoming raw messages from the DDP stream
+   * @param {String} raw_msg The raw message received from the stream
+   */
+  async onMessage(raw_msg) {
+    let msg;
+    try {
+      msg = DDPCommon.parseDDP(raw_msg);
+    } catch (e) {
+      Meteor._debug('Exception while parsing DDP', e);
+      return;
+    }
+
+    // Any message counts as receiving a pong, as it demonstrates that
+    // the server is still alive.
+    if (this._connection._heartbeat) {
+      this._connection._heartbeat.messageReceived();
+    }
+
+    if (msg === null || !msg.msg) {
+      if(!msg || !msg.testMessageOnConnect) {
+        if (Object.keys(msg).length === 1 && msg.server_id) return;
+        Meteor._debug('discarding invalid livedata message', msg);
+      }
+      return;
+    }
+
+    // Important: This was missing from previous version
+    // We need to set the current version before routing the message
+    if (msg.msg === 'connected') {
+      this._connection._version = this._connection._versionSuggestion;
+    }
+
+    await this._routeMessage(msg);
+  }
+
+  /**
+   * Routes messages to their appropriate handlers based on message type
+   * @private
+   * @param {Object} msg The parsed DDP message
+   */
+  async _routeMessage(msg) {
+    switch (msg.msg) {
+      case 'connected':
+        await this._connection._livedata_connected(msg);
+        this._connection.options.onConnected();
+        break;
+
+      case 'failed':
+        await this._handleFailedMessage(msg);
+        break;
+
+      case 'ping':
+        if (this._connection.options.respondToPings) {
+          this._connection._send({ msg: 'pong', id: msg.id });
+        }
+        break;
+
+      case 'pong':
+        // noop, as we assume everything's a pong
+        break;
+
+      case 'added':
+      case 'changed':
+      case 'removed':
+      case 'ready':
+      case 'updated':
+        await this._connection._livedata_data(msg);
+        break;
+
+      case 'nosub':
+        await this._connection._livedata_nosub(msg);
+        break;
+
+      case 'result':
+        await this._connection._livedata_result(msg);
+        break;
+
+      case 'error':
+        this._connection._livedata_error(msg);
+        break;
+
+      default:
+        Meteor._debug('discarding unknown livedata message type', msg);
+    }
+  }
+
+  /**
+   * Handles failed connection messages
+   * @private
+   * @param {Object} msg The failed message object
+   */
+  _handleFailedMessage(msg) {
+    if (this._connection._supportedDDPVersions.indexOf(msg.version) >= 0) {
+      this._connection._versionSuggestion = msg.version;
+      this._connection._stream.reconnect({ _force: true });
+    } else {
+      const description =
+        'DDP version negotiation failed; server requested version ' +
+        msg.version;
+      this._connection._stream.disconnect({ _permanent: true, _error: description });
+      this._connection.options.onDDPVersionNegotiationFailure(description);
+    }
+  }
+
+  /**
+   * Handles connection reset events
+   */
+  onReset() {
+    // Reset is called even on the first connection, so this is
+    // the only place we send this message.
+    const msg = this._buildConnectMessage();
+    this._connection._send(msg);
+
+    // Mark non-retry calls as failed and handle outstanding methods
+    this._handleOutstandingMethodsOnReset();
+
+    // Now, to minimize setup latency, go ahead and blast out all of
+    // our pending methods ands subscriptions before we've even taken
+    // the necessary RTT to know if we successfully reconnected.
+    this._connection._callOnReconnectAndSendAppropriateOutstandingMethods();
+    this._resendSubscriptions();
+  }
+
+  /**
+   * Builds the initial connect message
+   * @private
+   * @returns {Object} The connect message object
+   */
+  _buildConnectMessage() {
+    const msg = { msg: 'connect' };
+    if (this._connection._lastSessionId) {
+      msg.session = this._connection._lastSessionId;
+    }
+    msg.version = this._connection._versionSuggestion || this._connection._supportedDDPVersions[0];
+    this._connection._versionSuggestion = msg.version;
+    msg.support = this._connection._supportedDDPVersions;
+    return msg;
+  }
+
+  /**
+   * Handles outstanding methods during a reset
+   * @private
+   */
+  _handleOutstandingMethodsOnReset() {
+    const blocks = this._connection._outstandingMethodBlocks;
+    if (blocks.length === 0) return;
+
+    const currentMethodBlock = blocks[0].methods;
+    blocks[0].methods = currentMethodBlock.filter(
+      methodInvoker => {
+        // Methods with 'noRetry' option set are not allowed to re-send after
+        // recovering dropped connection.
+        if (methodInvoker.sentMessage && methodInvoker.noRetry) {
+          methodInvoker.receiveResult(
+            new Meteor.Error(
+              'invocation-failed',
+              'Method invocation might have failed due to dropped connection. ' +
+              'Failing because `noRetry` option was passed to Meteor.apply.'
+            )
+          );
+        }
+
+        // Only keep a method if it wasn't sent or it's allowed to retry.
+        return !(methodInvoker.sentMessage && methodInvoker.noRetry);
+      }
+    );
+
+    // Clear empty blocks
+    if (blocks.length > 0 && blocks[0].methods.length === 0) {
+      blocks.shift();
+    }
+
+    // Reset all method invokers as unsent
+    Object.values(this._connection._methodInvokers).forEach(invoker => {
+      invoker.sentMessage = false;
+    });
+  }
+
+  /**
+   * Resends all active subscriptions
+   * @private
+   */
+  _resendSubscriptions() {
+    Object.entries(this._connection._subscriptions).forEach(([id, sub]) => {
+      this._connection._sendQueued({
+        msg: 'sub',
+        id: id,
+        name: sub.name,
+        params: sub.params
+      });
+    });
+  }
+}
\ No newline at end of file
diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index 08e080b7e4..d7c67c2038 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -13,12 +13,8 @@ import {
   isEmpty,
   last,
 } from "meteor/ddp-common/utils";
-
-class MongoIDMap extends IdMap {
-  constructor() {
-    super(MongoID.idStringify, MongoID.idParse);
-  }
-}
+import { ConnectionStreamHandlers } from './connection_stream_handlers';
+import { MongoIDMap } from './mongo_id_map';
 
 // @param url {String|Object} URL to Meteor app,
 //   or an object as a test hook (see code)
@@ -243,33 +239,38 @@ export class Connection {
       });
     }
 
+    this._streamHandlers = new ConnectionStreamHandlers(this);
+
     const onDisconnect = () => {
-      if (self._heartbeat) {
-        self._heartbeat.stop();
-        self._heartbeat = null;
+      if (this._heartbeat) {
+        this._heartbeat.stop();
+        this._heartbeat = null;
       }
     };
 
     if (Meteor.isServer) {
-      self._stream.on(
+      this._stream.on(
         'message',
         Meteor.bindEnvironment(
-          this.onMessage.bind(this),
+          msg => this._streamHandlers.onMessage(msg),
           'handling DDP message'
         )
       );
-      self._stream.on(
+      this._stream.on(
         'reset',
-        Meteor.bindEnvironment(this.onReset.bind(this), 'handling DDP reset')
+        Meteor.bindEnvironment(
+          () => this._streamHandlers.onReset(),
+          'handling DDP reset'
+        )
       );
-      self._stream.on(
+      this._stream.on(
         'disconnect',
         Meteor.bindEnvironment(onDisconnect, 'handling DDP disconnect')
       );
     } else {
-      self._stream.on('message', this.onMessage.bind(this));
-      self._stream.on('reset', this.onReset.bind(this));
-      self._stream.on('disconnect', onDisconnect);
+      this._stream.on('message', msg => this._streamHandlers.onMessage(msg));
+      this._stream.on('reset', () => this._streamHandlers.onReset());
+      this._stream.on('disconnect', onDisconnect);
     }
   }
 
@@ -1854,148 +1855,4 @@ export class Connection {
       self._retryMigrate = null;
     }
   }
-
-  async onMessage(raw_msg) {
-    let msg;
-    try {
-      msg = DDPCommon.parseDDP(raw_msg);
-    } catch (e) {
-      Meteor._debug('Exception while parsing DDP', e);
-      return;
-    }
-
-    // Any message counts as receiving a pong, as it demonstrates that
-    // the server is still alive.
-    if (this._heartbeat) {
-      this._heartbeat.messageReceived();
-    }
-
-    if (msg === null || !msg.msg) {
-      if(!msg || !msg.testMessageOnConnect) {
-        if (Object.keys(msg).length === 1 && msg.server_id) return;
-        Meteor._debug('discarding invalid livedata message', msg);
-      }
-      return;
-    }
-
-    if (msg.msg === 'connected') {
-      this._version = this._versionSuggestion;
-      await this._livedata_connected(msg);
-      this.options.onConnected();
-    } else if (msg.msg === 'failed') {
-      if (this._supportedDDPVersions.indexOf(msg.version) >= 0) {
-        this._versionSuggestion = msg.version;
-        this._stream.reconnect({ _force: true });
-      } else {
-        const description =
-          'DDP version negotiation failed; server requested version ' +
-          msg.version;
-        this._stream.disconnect({ _permanent: true, _error: description });
-        this.options.onDDPVersionNegotiationFailure(description);
-      }
-    } else if (msg.msg === 'ping' && this.options.respondToPings) {
-      this._send({ msg: 'pong', id: msg.id });
-    } else if (msg.msg === 'pong') {
-      // noop, as we assume everything's a pong
-    } else if (
-      ['added', 'changed', 'removed', 'ready', 'updated'].includes(msg.msg)
-    ) {
-      await this._livedata_data(msg);
-    } else if (msg.msg === 'nosub') {
-      await this._livedata_nosub(msg);
-    } else if (msg.msg === 'result') {
-      await this._livedata_result(msg);
-    } else if (msg.msg === 'error') {
-      this._livedata_error(msg);
-    } else {
-      Meteor._debug('discarding unknown livedata message type', msg);
-    }
-  }
-
-  onReset() {
-    // Send a connect message at the beginning of the stream.
-    // NOTE: reset is called even on the first connection, so this is
-    // the only place we send this message.
-    const msg = { msg: 'connect' };
-    if (this._lastSessionId) msg.session = this._lastSessionId;
-    msg.version = this._versionSuggestion || this._supportedDDPVersions[0];
-    this._versionSuggestion = msg.version;
-    msg.support = this._supportedDDPVersions;
-    this._send(msg);
-
-    // Mark non-retry calls as failed. This has to be done early as getting these methods out of the
-    // current block is pretty important to making sure that quiescence is properly calculated, as
-    // well as possibly moving on to another useful block.
-
-    // Only bother testing if there is an outstandingMethodBlock (there might not be, especially if
-    // we are connecting for the first time.
-    if (this._outstandingMethodBlocks.length > 0) {
-      // If there is an outstanding method block, we only care about the first one as that is the
-      // one that could have already sent messages with no response, that are not allowed to retry.
-      const currentMethodBlock = this._outstandingMethodBlocks[0].methods;
-      this._outstandingMethodBlocks[0].methods = currentMethodBlock.filter(
-        methodInvoker => {
-          // Methods with 'noRetry' option set are not allowed to re-send after
-          // recovering dropped connection.
-          if (methodInvoker.sentMessage && methodInvoker.noRetry) {
-            // Make sure that the method is told that it failed.
-            methodInvoker.receiveResult(
-              new Meteor.Error(
-                'invocation-failed',
-                'Method invocation might have failed due to dropped connection. ' +
-                  'Failing because `noRetry` option was passed to Meteor.apply.'
-              )
-            );
-          }
-
-          // Only keep a method if it wasn't sent or it's allowed to retry.
-          // This may leave the block empty, but we don't move on to the next
-          // block until the callback has been delivered, in _outstandingMethodFinished.
-          return !(methodInvoker.sentMessage && methodInvoker.noRetry);
-        }
-      );
-    }
-
-    // Now, to minimize setup latency, go ahead and blast out all of
-    // our pending methods ands subscriptions before we've even taken
-    // the necessary RTT to know if we successfully reconnected. (1)
-    // They're supposed to be idempotent, and where they are not,
-    // they can block retry in apply; (2) even if we did reconnect,
-    // we're not sure what messages might have gotten lost
-    // (in either direction) since we were disconnected (TCP being
-    // sloppy about that.)
-
-    // If the current block of methods all got their results (but didn't all get
-    // their data visible), discard the empty block now.
-    if (
-      this._outstandingMethodBlocks.length > 0 &&
-      this._outstandingMethodBlocks[0].methods.length === 0
-    ) {
-      this._outstandingMethodBlocks.shift();
-    }
-
-    // Mark all messages as unsent, they have not yet been sent on this
-    // connection.
-    keys(this._methodInvokers).forEach(id => {
-      this._methodInvokers[id].sentMessage = false;
-    });
-
-    // If an `onReconnect` handler is set, call it first. Go through
-    // some hoops to ensure that methods that are called from within
-    // `onReconnect` get executed _before_ ones that were originally
-    // outstanding (since `onReconnect` is used to re-establish auth
-    // certificates)
-    this._callOnReconnectAndSendAppropriateOutstandingMethods();
-
-    // add new subscriptions at the end. this way they take effect after
-    // the handlers and we don't see flicker.
-    Object.entries(this._subscriptions).forEach(([id, sub]) => {
-      this._sendQueued({
-        msg: 'sub',
-        id: id,
-        name: sub.name,
-        params: sub.params
-      });
-    });
-  }
 }
diff --git a/packages/ddp-client/common/mongo_id_map.js b/packages/ddp-client/common/mongo_id_map.js
new file mode 100644
index 0000000000..179aa214f1
--- /dev/null
+++ b/packages/ddp-client/common/mongo_id_map.js
@@ -0,0 +1,7 @@
+import { MongoID } from 'meteor/mongo-id';
+
+export class MongoIDMap extends IdMap {
+  constructor() {
+    super(MongoID.idStringify, MongoID.idParse);
+  }
+}
\ No newline at end of file

From 959e7abe1a4f53c762f678579d6907e21e105800 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 6 Nov 2024 14:15:59 -0400
Subject: [PATCH 0773/1140] extract processors

---
 .../ddp-client/common/document_processors.js  | 206 ++++++++
 .../ddp-client/common/livedata_connection.js  | 468 +-----------------
 .../ddp-client/common/message_processors.js   | 336 +++++++++++++
 3 files changed, 568 insertions(+), 442 deletions(-)
 create mode 100644 packages/ddp-client/common/document_processors.js
 create mode 100644 packages/ddp-client/common/message_processors.js

diff --git a/packages/ddp-client/common/document_processors.js b/packages/ddp-client/common/document_processors.js
new file mode 100644
index 0000000000..11c4b2f8c0
--- /dev/null
+++ b/packages/ddp-client/common/document_processors.js
@@ -0,0 +1,206 @@
+import { MongoID } from 'meteor/mongo-id';
+import { DiffSequence } from 'meteor/diff-sequence';
+import { hasOwn } from "meteor/ddp-common/utils";
+import { isEmpty } from "meteor/ddp-common/utils";
+
+export class DocumentProcessors {
+  constructor(connection) {
+    this._connection = connection;
+  }
+
+  /**
+   * @summary Process an 'added' message from the server
+   * @param {Object} msg The added message
+   * @param {Object} updates The updates accumulator
+   */
+  async _process_added(msg, updates) {
+    const self = this._connection;
+    const id = MongoID.idParse(msg.id);
+    const serverDoc = self._getServerDoc(msg.collection, id);
+
+    if (serverDoc) {
+      // Some outstanding stub wrote here.
+      const isExisting = serverDoc.document !== undefined;
+
+      serverDoc.document = msg.fields || Object.create(null);
+      serverDoc.document._id = id;
+
+      if (self._resetStores) {
+        // During reconnect the server is sending adds for existing ids.
+        // Always push an update so that document stays in the store after
+        // reset. Use current version of the document for this update, so
+        // that stub-written values are preserved.
+        const currentDoc = await self._stores[msg.collection].getDoc(msg.id);
+        if (currentDoc !== undefined) msg.fields = currentDoc;
+
+        self._pushUpdate(updates, msg.collection, msg);
+      } else if (isExisting) {
+        throw new Error('Server sent add for existing id: ' + msg.id);
+      }
+    } else {
+      self._pushUpdate(updates, msg.collection, msg);
+    }
+  }
+
+  /**
+   * @summary Process a 'changed' message from the server
+   * @param {Object} msg The changed message
+   * @param {Object} updates The updates accumulator
+   */
+  _process_changed(msg, updates) {
+    const self = this._connection;
+    const serverDoc = self._getServerDoc(msg.collection, MongoID.idParse(msg.id));
+
+    if (serverDoc) {
+      if (serverDoc.document === undefined) {
+        throw new Error('Server sent changed for nonexisting id: ' + msg.id);
+      }
+      DiffSequence.applyChanges(serverDoc.document, msg.fields);
+    } else {
+      self._pushUpdate(updates, msg.collection, msg);
+    }
+  }
+
+  /**
+   * @summary Process a 'removed' message from the server
+   * @param {Object} msg The removed message
+   * @param {Object} updates The updates accumulator
+   */
+  _process_removed(msg, updates) {
+    const self = this._connection;
+    const serverDoc = self._getServerDoc(msg.collection, MongoID.idParse(msg.id));
+
+    if (serverDoc) {
+      // Some outstanding stub wrote here.
+      if (serverDoc.document === undefined) {
+        throw new Error('Server sent removed for nonexisting id:' + msg.id);
+      }
+      serverDoc.document = undefined;
+    } else {
+      self._pushUpdate(updates, msg.collection, {
+        msg: 'removed',
+        collection: msg.collection,
+        id: msg.id
+      });
+    }
+  }
+
+  /**
+   * @summary Process a 'ready' message from the server
+   * @param {Object} msg The ready message
+   * @param {Object} updates The updates accumulator
+   */
+  _process_ready(msg, updates) {
+    const self = this._connection;
+
+    // Process "sub ready" messages. "sub ready" messages don't take effect
+    // until all current server documents have been flushed to the local
+    // database. We can use a write fence to implement this.
+    msg.subs.forEach((subId) => {
+      self._runWhenAllServerDocsAreFlushed(() => {
+        const subRecord = self._subscriptions[subId];
+        // Did we already unsubscribe?
+        if (!subRecord) return;
+        // Did we already receive a ready message? (Oops!)
+        if (subRecord.ready) return;
+        subRecord.ready = true;
+        subRecord.readyCallback && subRecord.readyCallback();
+        subRecord.readyDeps.changed();
+      });
+    });
+  }
+
+  /**
+   * @summary Process an 'updated' message from the server
+   * @param {Object} msg The updated message
+   * @param {Object} updates The updates accumulator
+   */
+  _process_updated(msg, updates) {
+    const self = this._connection;
+    // Process "method done" messages.
+    msg.methods.forEach((methodId) => {
+      const docs = self._documentsWrittenByStub[methodId] || {};
+      Object.values(docs).forEach((written) => {
+        const serverDoc = self._getServerDoc(written.collection, written.id);
+        if (!serverDoc) {
+          throw new Error('Lost serverDoc for ' + JSON.stringify(written));
+        }
+        if (!serverDoc.writtenByStubs[methodId]) {
+          throw new Error(
+            'Doc ' +
+            JSON.stringify(written) +
+            ' not written by method ' +
+            methodId
+          );
+        }
+        delete serverDoc.writtenByStubs[methodId];
+        if (isEmpty(serverDoc.writtenByStubs)) {
+          // All methods whose stubs wrote this method have completed! We can
+          // now copy the saved document to the database (reverting the stub's
+          // change if the server did not write to this object, or applying the
+          // server's writes if it did).
+
+          // This is a fake ddp 'replace' message.  It's just for talking
+          // between livedata connections and minimongo.  (We have to stringify
+          // the ID because it's supposed to look like a wire message.)
+          self._pushUpdate(updates, written.collection, {
+            msg: 'replace',
+            id: MongoID.idStringify(written.id),
+            replace: serverDoc.document
+          });
+          // Call all flush callbacks.
+          serverDoc.flushCallbacks.forEach((c) => {
+            c();
+          });
+
+          // Delete this completed serverDocument. Don't bother to GC empty
+          // IdMaps inside self._serverDocuments, since there probably aren't
+          // many collections and they'll be written repeatedly.
+          self._serverDocuments[written.collection].remove(written.id);
+        }
+      });
+      delete self._documentsWrittenByStub[methodId];
+
+      // We want to call the data-written callback, but we can't do so until all
+      // currently buffered messages are flushed.
+      const callbackInvoker = self._methodInvokers[methodId];
+      if (!callbackInvoker) {
+        throw new Error('No callback invoker for method ' + methodId);
+      }
+
+      self._runWhenAllServerDocsAreFlushed(
+        (...args) => callbackInvoker.dataVisible(...args)
+      );
+    });
+  }
+
+  /**
+   * @summary Push an update to the buffer
+   * @private
+   * @param {Object} updates The updates accumulator
+   * @param {String} collection The collection name
+   * @param {Object} msg The update message
+   */
+  _pushUpdate(updates, collection, msg) {
+    if (!hasOwn.call(updates, collection)) {
+      updates[collection] = [];
+    }
+    updates[collection].push(msg);
+  }
+
+  /**
+   * @summary Get a server document by collection and id
+   * @private
+   * @param {String} collection The collection name
+   * @param {String} id The document id
+   * @returns {Object|null} The server document or null
+   */
+  _getServerDoc(collection, id) {
+    const self = this._connection;
+    if (!hasOwn.call(self._serverDocuments, collection)) {
+      return null;
+    }
+    const serverDocsForCollection = self._serverDocuments[collection];
+    return serverDocsForCollection.get(id) || null;
+  }
+}
\ No newline at end of file
diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
index d7c67c2038..abe1161d21 100644
--- a/packages/ddp-client/common/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -15,6 +15,8 @@ import {
 } from "meteor/ddp-common/utils";
 import { ConnectionStreamHandlers } from './connection_stream_handlers';
 import { MongoIDMap } from './mongo_id_map';
+import { MessageProcessors } from './message_processors';
+import { DocumentProcessors } from './document_processors';
 
 // @param url {String|Object} URL to Meteor app,
 //   or an object as a test hook (see code)
@@ -272,6 +274,30 @@ export class Connection {
       this._stream.on('reset', () => this._streamHandlers.onReset());
       this._stream.on('disconnect', onDisconnect);
     }
+
+    this._messageProcessors = new MessageProcessors(this);
+
+    // Expose message processor methods to maintain backward compatibility
+    this._livedata_connected = (msg) => this._messageProcessors._livedata_connected(msg);
+    this._livedata_data = (msg) => this._messageProcessors._livedata_data(msg);
+    this._livedata_nosub = (msg) => this._messageProcessors._livedata_nosub(msg);
+    this._livedata_result = (msg) => this._messageProcessors._livedata_result(msg);
+    this._livedata_error = (msg) => this._messageProcessors._livedata_error(msg);
+
+    this._documentProcessors = new DocumentProcessors(this);
+
+    // Expose document processor methods to maintain backward compatibility
+    this._process_added = (msg, updates) => this._documentProcessors._process_added(msg, updates);
+    this._process_changed = (msg, updates) => this._documentProcessors._process_changed(msg, updates);
+    this._process_removed = (msg, updates) => this._documentProcessors._process_removed(msg, updates);
+    this._process_ready = (msg, updates) => this._documentProcessors._process_ready(msg, updates);
+    this._process_updated = (msg, updates) => this._documentProcessors._process_updated(msg, updates);
+
+    // Also expose utility methods used by other parts of the system
+    this._pushUpdate = (updates, collection, msg) =>
+      this._documentProcessors._pushUpdate(updates, collection, msg);
+    this._getServerDoc = (collection, id) =>
+      this._documentProcessors._getServerDoc(collection, id);
   }
 
   // 'name' is the name of the data on the wire that should go in the
@@ -1094,121 +1120,6 @@ export class Connection {
     return Object.values(invokers).some((invoker) => !!invoker.sentMessage);
   }
 
-  async _livedata_connected(msg) {
-    const self = this;
-
-    if (self._version !== 'pre1' && self._heartbeatInterval !== 0) {
-      self._heartbeat = new DDPCommon.Heartbeat({
-        heartbeatInterval: self._heartbeatInterval,
-        heartbeatTimeout: self._heartbeatTimeout,
-        onTimeout() {
-          self._lostConnection(
-            new DDP.ConnectionError('DDP heartbeat timed out')
-          );
-        },
-        sendPing() {
-          self._send({ msg: 'ping' });
-        }
-      });
-      self._heartbeat.start();
-    }
-
-    // If this is a reconnect, we'll have to reset all stores.
-    if (self._lastSessionId) self._resetStores = true;
-
-    let reconnectedToPreviousSession;
-    if (typeof msg.session === 'string') {
-      reconnectedToPreviousSession = self._lastSessionId === msg.session;
-      self._lastSessionId = msg.session;
-    }
-
-    if (reconnectedToPreviousSession) {
-      // Successful reconnection -- pick up where we left off.  Note that right
-      // now, this never happens: the server never connects us to a previous
-      // session, because DDP doesn't provide enough data for the server to know
-      // what messages the client has processed. We need to improve DDP to make
-      // this possible, at which point we'll probably need more code here.
-      return;
-    }
-
-    // Server doesn't have our data any more. Re-sync a new session.
-
-    // Forget about messages we were buffering for unknown collections. They'll
-    // be resent if still relevant.
-    self._updatesForUnknownStores = Object.create(null);
-
-    if (self._resetStores) {
-      // Forget about the effects of stubs. We'll be resetting all collections
-      // anyway.
-      self._documentsWrittenByStub = Object.create(null);
-      self._serverDocuments = Object.create(null);
-    }
-
-    // Clear _afterUpdateCallbacks.
-    self._afterUpdateCallbacks = [];
-
-    // Mark all named subscriptions which are ready (ie, we already called the
-    // ready callback) as needing to be revived.
-    // XXX We should also block reconnect quiescence until unnamed subscriptions
-    //     (eg, autopublish) are done re-publishing to avoid flicker!
-    self._subsBeingRevived = Object.create(null);
-    Object.entries(self._subscriptions).forEach(([id, sub]) => {
-      if (sub.ready) {
-        self._subsBeingRevived[id] = true;
-      }
-    });
-
-    // Arrange for "half-finished" methods to have their callbacks run, and
-    // track methods that were sent on this connection so that we don't
-    // quiesce until they are all done.
-    //
-    // Start by clearing _methodsBlockingQuiescence: methods sent before
-    // reconnect don't matter, and any "wait" methods sent on the new connection
-    // that we drop here will be restored by the loop below.
-    self._methodsBlockingQuiescence = Object.create(null);
-    if (self._resetStores) {
-      const invokers = self._methodInvokers;
-      keys(invokers).forEach(id => {
-        const invoker = invokers[id];
-        if (invoker.gotResult()) {
-          // This method already got its result, but it didn't call its callback
-          // because its data didn't become visible. We did not resend the
-          // method RPC. We'll call its callback when we get a full quiesce,
-          // since that's as close as we'll get to "data must be visible".
-          self._afterUpdateCallbacks.push(
-            (...args) => invoker.dataVisible(...args)
-          );
-        } else if (invoker.sentMessage) {
-          // This method has been sent on this connection (maybe as a resend
-          // from the last connection, maybe from onReconnect, maybe just very
-          // quickly before processing the connected message).
-          //
-          // We don't need to do anything special to ensure its callbacks get
-          // called, but we'll count it as a method which is preventing
-          // reconnect quiescence. (eg, it might be a login method that was run
-          // from onReconnect, and we don't want to see flicker by seeing a
-          // logged-out state.)
-          self._methodsBlockingQuiescence[invoker.methodId] = true;
-        }
-      });
-    }
-
-    self._messagesBufferedUntilQuiescence = [];
-
-    // If we're not waiting on any methods or subs, we can reset the stores and
-    // call the callbacks immediately.
-    if (! self._waitingForQuiescence()) {
-      if (self._resetStores) {
-        for (const store of Object.values(self._stores)) {
-          await store.beginUpdate(0, true);
-          await store.endUpdate();
-        }
-        self._resetStores = false;
-      }
-      self._runAfterUpdateCallbacks();
-    }
-  }
-
   async _processOneDataMessage(msg, updates) {
     const messageType = msg.msg;
 
@@ -1230,87 +1141,6 @@ export class Connection {
     }
   }
 
-  async _livedata_data(msg) {
-    const self = this;
-
-    if (self._waitingForQuiescence()) {
-      self._messagesBufferedUntilQuiescence.push(msg);
-
-      if (msg.msg === 'nosub') {
-        delete self._subsBeingRevived[msg.id];
-      }
-
-      if (msg.subs) {
-        msg.subs.forEach(subId => {
-          delete self._subsBeingRevived[subId];
-        });
-      }
-
-      if (msg.methods) {
-        msg.methods.forEach(methodId => {
-          delete self._methodsBlockingQuiescence[methodId];
-        });
-      }
-
-      if (self._waitingForQuiescence()) {
-        return;
-      }
-
-      // No methods or subs are blocking quiescence!
-      // We'll now process and all of our buffered messages, reset all stores,
-      // and apply them all at once.
-
-      const bufferedMessages = self._messagesBufferedUntilQuiescence;
-      for (const bufferedMessage of Object.values(bufferedMessages)) {
-        await self._processOneDataMessage(
-          bufferedMessage,
-          self._bufferedWrites
-        );
-      }
-
-      self._messagesBufferedUntilQuiescence = [];
-
-    } else {
-      await self._processOneDataMessage(msg, self._bufferedWrites);
-    }
-
-    // Immediately flush writes when:
-    //  1. Buffering is disabled. Or;
-    //  2. any non-(added/changed/removed) message arrives.
-    const standardWrite =
-      msg.msg === "added" ||
-      msg.msg === "changed" ||
-      msg.msg === "removed";
-
-    if (self._bufferedWritesInterval === 0 || ! standardWrite) {
-      await self._flushBufferedWrites();
-      return;
-    }
-
-    if (self._bufferedWritesFlushAt === null) {
-      self._bufferedWritesFlushAt =
-        new Date().valueOf() + self._bufferedWritesMaxAge;
-    } else if (self._bufferedWritesFlushAt < new Date().valueOf()) {
-      await self._flushBufferedWrites();
-      return;
-    }
-
-    if (self._bufferedWritesFlushHandle) {
-      clearTimeout(self._bufferedWritesFlushHandle);
-    }
-    self._bufferedWritesFlushHandle = setTimeout(() => {
-      // __flushBufferedWrites is a promise, so with this we can wait the promise to finish
-      // before doing something
-      self._liveDataWritesPromise = self._flushBufferedWrites();
-
-      if (Meteor._isPromise(self._liveDataWritesPromise)) {
-        self._liveDataWritesPromise.finally(
-          () => (self._liveDataWritesPromise = undefined)
-        );
-      }
-    }, self._bufferedWritesInterval);
-  }
-
   _prepareBuffersToFlush() {
     const self = this;
     if (self._bufferedWritesFlushHandle) {
@@ -1438,160 +1268,6 @@ export class Connection {
     });
   }
 
-  _pushUpdate(updates, collection, msg) {
-    if (! hasOwn.call(updates, collection)) {
-      updates[collection] = [];
-    }
-    updates[collection].push(msg);
-  }
-
-  _getServerDoc(collection, id) {
-    const self = this;
-    if (! hasOwn.call(self._serverDocuments, collection)) {
-      return null;
-    }
-    const serverDocsForCollection = self._serverDocuments[collection];
-    return serverDocsForCollection.get(id) || null;
-  }
-
-  async _process_added(msg, updates) {
-    const self = this;
-    const id = MongoID.idParse(msg.id);
-    const serverDoc = self._getServerDoc(msg.collection, id);
-    if (serverDoc) {
-      // Some outstanding stub wrote here.
-      const isExisting = serverDoc.document !== undefined;
-
-      serverDoc.document = msg.fields || Object.create(null);
-      serverDoc.document._id = id;
-
-      if (self._resetStores) {
-        // During reconnect the server is sending adds for existing ids.
-        // Always push an update so that document stays in the store after
-        // reset. Use current version of the document for this update, so
-        // that stub-written values are preserved.
-        const currentDoc = await self._stores[msg.collection].getDoc(msg.id);
-        if (currentDoc !== undefined) msg.fields = currentDoc;
-
-        self._pushUpdate(updates, msg.collection, msg);
-      } else if (isExisting) {
-        throw new Error('Server sent add for existing id: ' + msg.id);
-      }
-    } else {
-      self._pushUpdate(updates, msg.collection, msg);
-    }
-  }
-
-  _process_changed(msg, updates) {
-    const self = this;
-    const serverDoc = self._getServerDoc(msg.collection, MongoID.idParse(msg.id));
-    if (serverDoc) {
-      if (serverDoc.document === undefined)
-        throw new Error('Server sent changed for nonexisting id: ' + msg.id);
-      DiffSequence.applyChanges(serverDoc.document, msg.fields);
-    } else {
-      self._pushUpdate(updates, msg.collection, msg);
-    }
-  }
-
-  _process_removed(msg, updates) {
-    const self = this;
-    const serverDoc = self._getServerDoc(msg.collection, MongoID.idParse(msg.id));
-    if (serverDoc) {
-      // Some outstanding stub wrote here.
-      if (serverDoc.document === undefined)
-        throw new Error('Server sent removed for nonexisting id:' + msg.id);
-      serverDoc.document = undefined;
-    } else {
-      self._pushUpdate(updates, msg.collection, {
-        msg: 'removed',
-        collection: msg.collection,
-        id: msg.id
-      });
-    }
-  }
-
-  _process_updated(msg, updates) {
-    const self = this;
-    // Process "method done" messages.
-
-    msg.methods.forEach((methodId) => {
-      const docs = self._documentsWrittenByStub[methodId] || {};
-      Object.values(docs).forEach((written) => {
-        const serverDoc = self._getServerDoc(written.collection, written.id);
-        if (! serverDoc) {
-          throw new Error('Lost serverDoc for ' + JSON.stringify(written));
-        }
-        if (! serverDoc.writtenByStubs[methodId]) {
-          throw new Error(
-            'Doc ' +
-              JSON.stringify(written) +
-              ' not written by  method ' +
-              methodId
-          );
-        }
-        delete serverDoc.writtenByStubs[methodId];
-        if (isEmpty(serverDoc.writtenByStubs)) {
-          // All methods whose stubs wrote this method have completed! We can
-          // now copy the saved document to the database (reverting the stub's
-          // change if the server did not write to this object, or applying the
-          // server's writes if it did).
-
-          // This is a fake ddp 'replace' message.  It's just for talking
-          // between livedata connections and minimongo.  (We have to stringify
-          // the ID because it's supposed to look like a wire message.)
-          self._pushUpdate(updates, written.collection, {
-            msg: 'replace',
-            id: MongoID.idStringify(written.id),
-            replace: serverDoc.document
-          });
-          // Call all flush callbacks.
-
-          serverDoc.flushCallbacks.forEach((c) => {
-            c();
-          });
-
-          // Delete this completed serverDocument. Don't bother to GC empty
-          // IdMaps inside self._serverDocuments, since there probably aren't
-          // many collections and they'll be written repeatedly.
-          self._serverDocuments[written.collection].remove(written.id);
-        }
-      });
-      delete self._documentsWrittenByStub[methodId];
-
-      // We want to call the data-written callback, but we can't do so until all
-      // currently buffered messages are flushed.
-      const callbackInvoker = self._methodInvokers[methodId];
-      if (! callbackInvoker) {
-        throw new Error('No callback invoker for method ' + methodId);
-      }
-
-      self._runWhenAllServerDocsAreFlushed(
-        (...args) => callbackInvoker.dataVisible(...args)
-      );
-    });
-  }
-
-  _process_ready(msg, updates) {
-    const self = this;
-    // Process "sub ready" messages. "sub ready" messages don't take effect
-    // until all current server documents have been flushed to the local
-    // database. We can use a write fence to implement this.
-
-    msg.subs.forEach((subId) => {
-      self._runWhenAllServerDocsAreFlushed(() => {
-        const subRecord = self._subscriptions[subId];
-        // Did we already unsubscribe?
-        if (!subRecord) return;
-        // Did we already receive a ready message? (Oops!)
-        if (subRecord.ready) return;
-        subRecord.ready = true;
-        subRecord.readyCallback && subRecord.readyCallback();
-        subRecord.readyDeps.changed();
-      });
-    });
-  }
-
   // Ensures that "f" will be called after all documents currently in
   // _serverDocuments have been written to the local cache. f will not be called
   // if the connection is lost before then!
@@ -1631,93 +1307,6 @@ export class Connection {
     }
   }
 
-  async _livedata_nosub(msg) {
-    const self = this;
-
-    // First pass it through _livedata_data, which only uses it to help get
-    // towards quiescence.
-    await self._livedata_data(msg);
-
-    // Do the rest of our processing immediately, with no
-    // buffering-until-quiescence.
-
-    // we weren't subbed anyway, or we initiated the unsub.
-    if (! hasOwn.call(self._subscriptions, msg.id)) {
-      return;
-    }
-
-    // XXX COMPAT WITH 1.0.3.1 #errorCallback
-    const errorCallback = self._subscriptions[msg.id].errorCallback;
-    const stopCallback = self._subscriptions[msg.id].stopCallback;
-
-    self._subscriptions[msg.id].remove();
-
-    const meteorErrorFromMsg = msgArg => {
-      return (
-        msgArg &&
-        msgArg.error &&
-        new Meteor.Error(
-          msgArg.error.error,
-          msgArg.error.reason,
-          msgArg.error.details
-        )
-      );
-    };
-
-    // XXX COMPAT WITH 1.0.3.1 #errorCallback
-    if (errorCallback && msg.error) {
-      errorCallback(meteorErrorFromMsg(msg));
-    }
-
-    if (stopCallback) {
-      stopCallback(meteorErrorFromMsg(msg));
-    }
-  }
-
-  async _livedata_result(msg) {
-    // id, result or error. error has error (code), reason, details
-
-    const self = this;
-
-    // Lets make sure there are no buffered writes before returning result.
-    if (! isEmpty(self._bufferedWrites)) {
-      await self._flushBufferedWrites();
-    }
-
-    // find the outstanding request
-    // should be O(1) in nearly all realistic use cases
-    if (isEmpty(self._outstandingMethodBlocks)) {
-      Meteor._debug('Received method result but no methods outstanding');
-      return;
-    }
-    const currentMethodBlock = self._outstandingMethodBlocks[0].methods;
-    let i;
-    const m = currentMethodBlock.find((method, idx) => {
-      const found = method.methodId === msg.id;
-      if (found) i = idx;
-      return found;
-    });
-    if (!m) {
-      Meteor._debug("Can't match method response to original method call", msg);
-      return;
-    }
-
-    // Remove from current method block. This may leave the block empty, but we
-    // don't move on to the next block until the callback has been delivered, in
-    // _outstandingMethodFinished.
-    currentMethodBlock.splice(i, 1);
-
-    if (hasOwn.call(msg, 'error')) {
-      m.receiveResult(
-        new Meteor.Error(msg.error.error, msg.error.reason, msg.error.details)
-      );
-    } else {
-      // msg.result may be undefined if the method didn't return a
-      // value
-      m.receiveResult(undefined, msg.result);
-    }
-  }
-
   _addOutstandingMethod(methodInvoker, options) {
     if (options?.wait) {
       // It's a wait method! Wait methods go in their own block.
@@ -1786,11 +1375,6 @@ export class Connection {
     });
   }
 
-  _livedata_error(msg) {
-    Meteor._debug('Received error from server: ', msg.reason);
-    if (msg.offendingMessage) Meteor._debug('For: ', msg.offendingMessage);
-  }
-
   _sendOutstandingMethodBlocksMessages(oldOutstandingMethodBlocks) {
     const self = this;
     if (isEmpty(oldOutstandingMethodBlocks)) return;
diff --git a/packages/ddp-client/common/message_processors.js b/packages/ddp-client/common/message_processors.js
new file mode 100644
index 0000000000..09b13f742e
--- /dev/null
+++ b/packages/ddp-client/common/message_processors.js
@@ -0,0 +1,336 @@
+import { DDPCommon } from 'meteor/ddp-common';
+import { Meteor } from 'meteor/meteor';
+import { DDP } from './namespace.js';
+import { EJSON } from 'meteor/ejson';
+import { isEmpty, hasOwn } from "meteor/ddp-common/utils";
+
+export class MessageProcessors {
+  constructor(connection) {
+    this._connection = connection;
+  }
+
+  /**
+   * @summary Process the connection message and set up the session
+   * @param {Object} msg The connection message
+   */
+  async _livedata_connected(msg) {
+    const self = this._connection;
+
+    if (self._version !== 'pre1' && self._heartbeatInterval !== 0) {
+      self._heartbeat = new DDPCommon.Heartbeat({
+        heartbeatInterval: self._heartbeatInterval,
+        heartbeatTimeout: self._heartbeatTimeout,
+        onTimeout() {
+          self._lostConnection(
+            new DDP.ConnectionError('DDP heartbeat timed out')
+          );
+        },
+        sendPing() {
+          self._send({ msg: 'ping' });
+        }
+      });
+      self._heartbeat.start();
+    }
+
+    // If this is a reconnect, we'll have to reset all stores.
+    if (self._lastSessionId) self._resetStores = true;
+
+    let reconnectedToPreviousSession;
+    if (typeof msg.session === 'string') {
+      reconnectedToPreviousSession = self._lastSessionId === msg.session;
+      self._lastSessionId = msg.session;
+    }
+
+    if (reconnectedToPreviousSession) {
+      // Successful reconnection -- pick up where we left off.
+      return;
+    }
+
+    // Server doesn't have our data anymore. Re-sync a new session.
+
+    // Forget about messages we were buffering for unknown collections. They'll
+    // be resent if still relevant.
+    self._updatesForUnknownStores = Object.create(null);
+
+    if (self._resetStores) {
+      // Forget about the effects of stubs. We'll be resetting all collections
+      // anyway.
+      self._documentsWrittenByStub = Object.create(null);
+      self._serverDocuments = Object.create(null);
+    }
+
+    // Clear _afterUpdateCallbacks.
+    self._afterUpdateCallbacks = [];
+
+    // Mark all named subscriptions which are ready as needing to be revived.
+    self._subsBeingRevived = Object.create(null);
+    Object.entries(self._subscriptions).forEach(([id, sub]) => {
+      if (sub.ready) {
+        self._subsBeingRevived[id] = true;
+      }
+    });
+
+    // Arrange for "half-finished" methods to have their callbacks run, and
+    // track methods that were sent on this connection so that we don't
+    // quiesce until they are all done.
+    //
+    // Start by clearing _methodsBlockingQuiescence: methods sent before
+    // reconnect don't matter, and any "wait" methods sent on the new connection
+    // that we drop here will be restored by the loop below.
+    self._methodsBlockingQuiescence = Object.create(null);
+    if (self._resetStores) {
+      const invokers = self._methodInvokers;
+      Object.keys(invokers).forEach(id => {
+        const invoker = invokers[id];
+        if (invoker.gotResult()) {
+          // This method already got its result, but it didn't call its callback
+          // because its data didn't become visible. We did not resend the
+          // method RPC. We'll call its callback when we get a full quiesce,
+          // since that's as close as we'll get to "data must be visible".
+          self._afterUpdateCallbacks.push(
+            (...args) => invoker.dataVisible(...args)
+          );
+        } else if (invoker.sentMessage) {
+          // This method has been sent on this connection (maybe as a resend
+          // from the last connection, maybe from onReconnect, maybe just very
+          // quickly before processing the connected message).
+          //
+          // We don't need to do anything special to ensure its callbacks get
+          // called, but we'll count it as a method which is preventing
+          // reconnect quiescence. (eg, it might be a login method that was run
+          // from onReconnect, and we don't want to see flicker by seeing a
+          // logged-out state.)
+          self._methodsBlockingQuiescence[invoker.methodId] = true;
+        }
+      });
+    }
+
+    self._messagesBufferedUntilQuiescence = [];
+
+    // If we're not waiting on any methods or subs, we can reset the stores and
+    // call the callbacks immediately.
+    if (!self._waitingForQuiescence()) {
+      if (self._resetStores) {
+        for (const store of Object.values(self._stores)) {
+          await store.beginUpdate(0, true);
+          await store.endUpdate();
+        }
+        self._resetStores = false;
+      }
+      self._runAfterUpdateCallbacks();
+    }
+  }
+
+  /**
+   * @summary Process various data messages from the server
+   * @param {Object} msg The data message
+   */
+  async _livedata_data(msg) {
+    const self = this._connection;
+
+    if (self._waitingForQuiescence()) {
+      self._messagesBufferedUntilQuiescence.push(msg);
+
+      if (msg.msg === 'nosub') {
+        delete self._subsBeingRevived[msg.id];
+      }
+
+      if (msg.subs) {
+        msg.subs.forEach(subId => {
+          delete self._subsBeingRevived[subId];
+        });
+      }
+
+      if (msg.methods) {
+        msg.methods.forEach(methodId => {
+          delete self._methodsBlockingQuiescence[methodId];
+        });
+      }
+
+      if (self._waitingForQuiescence()) {
+        return;
+      }
+
+      // No methods or subs are blocking quiescence!
+      // We'll now process and all of our buffered messages, reset all stores,
+      // and apply them all at once.
+      const bufferedMessages = self._messagesBufferedUntilQuiescence;
+      for (const bufferedMessage of Object.values(bufferedMessages)) {
+        await this._processOneDataMessage(
+          bufferedMessage,
+          self._bufferedWrites
+        );
+      }
+      self._messagesBufferedUntilQuiescence = [];
+    } else {
+      await this._processOneDataMessage(msg, self._bufferedWrites);
+    }
+
+    // Immediately flush writes when:
+    //  1. Buffering is disabled. Or;
+    //  2. any non-(added/changed/removed) message arrives.
+    const standardWrite =
+      msg.msg === "added" ||
+      msg.msg === "changed" ||
+      msg.msg === "removed";
+
+    if (self._bufferedWritesInterval === 0 || !standardWrite) {
+      await self._flushBufferedWrites();
+      return;
+    }
+
+    if (self._bufferedWritesFlushAt === null) {
+      self._bufferedWritesFlushAt =
+        new Date().valueOf() + self._bufferedWritesMaxAge;
+    } else if (self._bufferedWritesFlushAt < new Date().valueOf()) {
+      await self._flushBufferedWrites();
+      return;
+    }
+
+    if (self._bufferedWritesFlushHandle) {
+      clearTimeout(self._bufferedWritesFlushHandle);
+    }
+    self._bufferedWritesFlushHandle = setTimeout(() => {
+      self._liveDataWritesPromise = self._flushBufferedWrites();
+      if (Meteor._isPromise(self._liveDataWritesPromise)) {
+        self._liveDataWritesPromise.finally(
+          () => (self._liveDataWritesPromise = undefined)
+        );
+      }
+    }, self._bufferedWritesInterval);
+  }
+
+  /**
+   * @summary Process individual data messages by type
+   * @private
+   */
+  async _processOneDataMessage(msg, updates) {
+    const messageType = msg.msg;
+
+    switch (messageType) {
+      case 'added':
+        await this._connection._process_added(msg, updates);
+        break;
+      case 'changed':
+        this._connection._process_changed(msg, updates);
+        break;
+      case 'removed':
+        this._connection._process_removed(msg, updates);
+        break;
+      case 'ready':
+        this._connection._process_ready(msg, updates);
+        break;
+      case 'updated':
+        this._connection._process_updated(msg, updates);
+        break;
+      case 'nosub':
+        // ignore this
+        break;
+      default:
+        Meteor._debug('discarding unknown livedata data message type', msg);
+    }
+  }
+
+  /**
+   * @summary Handle method results arriving from the server
+   * @param {Object} msg The method result message
+   */
+  async _livedata_result(msg) {
+    const self = this._connection;
+
+    // Lets make sure there are no buffered writes before returning result.
+    if (!isEmpty(self._bufferedWrites)) {
+      await self._flushBufferedWrites();
+    }
+
+    // find the outstanding request
+    // should be O(1) in nearly all realistic use cases
+    if (isEmpty(self._outstandingMethodBlocks)) {
+      Meteor._debug('Received method result but no methods outstanding');
+      return;
+    }
+    const currentMethodBlock = self._outstandingMethodBlocks[0].methods;
+    let i;
+    const m = currentMethodBlock.find((method, idx) => {
+      const found = method.methodId === msg.id;
+      if (found) i = idx;
+      return found;
+    });
+    if (!m) {
+      Meteor._debug("Can't match method response to original method call", msg);
+      return;
+    }
+
+    // Remove from current method block. This may leave the block empty, but we
+    // don't move on to the next block until the callback has been delivered, in
+    // _outstandingMethodFinished.
+    currentMethodBlock.splice(i, 1);
+
+    if (hasOwn.call(msg, 'error')) {
+      m.receiveResult(
+        new Meteor.Error(msg.error.error, msg.error.reason, msg.error.details)
+      );
+    } else {
+      // msg.result may be undefined if the method didn't return a value
+      m.receiveResult(undefined, msg.result);
+    }
+  }
+
+  /**
+   * @summary Handle "nosub" messages arriving from the server
+   * @param {Object} msg The nosub message
+   */
+  async _livedata_nosub(msg) {
+    const self = this._connection;
+
+    // First pass it through _livedata_data, which only uses it to help get
+    // towards quiescence.
+    await this._livedata_data(msg);
+
+    // Do the rest of our processing immediately, with no
+    // buffering-until-quiescence.
+
+    // we weren't subbed anyway, or we initiated the unsub.
+    if (!hasOwn.call(self._subscriptions, msg.id)) {
+      return;
+    }
+
+    // XXX COMPAT WITH 1.0.3.1 #errorCallback
+    const errorCallback = self._subscriptions[msg.id].errorCallback;
+    const stopCallback = self._subscriptions[msg.id].stopCallback;
+
+    self._subscriptions[msg.id].remove();
+
+    const meteorErrorFromMsg = msgArg => {
+      return (
+        msgArg &&
+        msgArg.error &&
+        new Meteor.Error(
+          msgArg.error.error,
+          msgArg.error.reason,
+          msgArg.error.details
+        )
+      );
+    };
+
+    // XXX COMPAT WITH 1.0.3.1 #errorCallback
+    if (errorCallback && msg.error) {
+      errorCallback(meteorErrorFromMsg(msg));
+    }
+
+    if (stopCallback) {
+      stopCallback(meteorErrorFromMsg(msg));
+    }
+  }
+
+  /**
+   * @summary Handle errors from the server
+   * @param {Object} msg The error message
+   */
+  _livedata_error(msg) {
+    Meteor._debug('Received error from server: ', msg.reason);
+    if (msg.offendingMessage) Meteor._debug('For: ', msg.offendingMessage);
+  }
+
+  // Document change message processors will be defined in a separate class
+}
\ No newline at end of file

From 6b5248e2367c061f0c8c34704f93166ca7f1c9d8 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 6 Nov 2024 15:27:04 -0400
Subject: [PATCH 0774/1140] run adds in parallel

---
 packages/mongo/observe_handle.ts    | 10 +++++-----
 packages/mongo/observe_multiplex.ts | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index b2d1924088..1ff2248815 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -15,11 +15,11 @@ export class ObserveHandle {
   nonMutatingCallbacks: boolean;
   _stopped: boolean;
 
-  _added?: (...args: any[]) => void;
-  _addedBefore?: (...args: any[]) => void;
-  _changed?: (...args: any[]) => void;
-  _movedBefore?: (...args: any[]) => void;
-  _removed?: (...args: any[]) => void;
+  _added?: (...args: any[]) => Promise<void>;
+  _addedBefore?: (...args: any[]) => Promise<void>;
+  _changed?: (...args: any[]) => Promise<void>;
+  _movedBefore?: (...args: any[]) => Promise<void>;
+  _removed?: (...args: any[]) => Promise<void>;
 
   constructor(multiplexer: any, callbacks: Record<ObserveHandleCallback, any>, nonMutatingCallbacks: boolean) {
     this._multiplexer = multiplexer;
diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index 559c983ab1..b17a9e993d 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -164,19 +164,24 @@ export class ObserveMultiplexer {
 
   async _sendAdds(handle: ObserveHandle): Promise<void> {
     const add = this._ordered ? handle._addedBefore : handle._added;
-
     if (!add) return;
 
-    await this._cache.docs.forEachAsync(async (doc: any, id: string) => {
-      if (!(handle._id in this._handles!))
+    const addPromises: Promise<void>[] = [];
+
+    this._cache.docs.forEach((doc: any, id: string) => {
+      if (!(handle._id in this._handles!)) {
         throw Error("handle got removed before sending initial adds!");
+      }
 
       const { _id, ...fields } = handle.nonMutatingCallbacks ? doc : EJSON.clone(doc);
 
-      if (this._ordered)
-        await add(id, fields, null);
-      else
-        await add(id, fields);
+      const promise = this._ordered ?
+        add(id, fields, null) :
+        add(id, fields);
+
+      addPromises.push(promise);
     });
+
+    await Promise.all(addPromises);
   }
 }
\ No newline at end of file

From 12993e9f2e8c53112b37c81f5bca7319d1745e1a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 7 Nov 2024 08:30:31 -0400
Subject: [PATCH 0775/1140] send initial adds first; parallelize and batch
 asynchronous queue

---
 packages/meteor/async_helpers.js      | 139 -----------------------
 packages/meteor/asynchronous_queue.js | 154 ++++++++++++++++++++++++++
 packages/meteor/package.js            |   1 +
 packages/mongo/observe_handle.ts      |  10 ++
 packages/mongo/observe_multiplex.ts   |  13 ++-
 5 files changed, 175 insertions(+), 142 deletions(-)
 create mode 100644 packages/meteor/asynchronous_queue.js

diff --git a/packages/meteor/async_helpers.js b/packages/meteor/async_helpers.js
index 240915eeed..bbf8bdc1bf 100644
--- a/packages/meteor/async_helpers.js
+++ b/packages/meteor/async_helpers.js
@@ -24,145 +24,6 @@ FakeDoubleEndedQueue.prototype.isEmpty = function () {
 
 Meteor._DoubleEndedQueue = Meteor.isServer ? Npm.require('denque') : FakeDoubleEndedQueue;
 
-// Meteor._SynchronousQueue is a queue which runs task functions serially.
-// Tasks are assumed to be synchronous: ie, it's assumed that they are
-// done when they return.
-//
-// It has two methods:
-//   - queueTask queues a task to be run, and returns immediately.
-//   - runTask queues a task to be run, and then yields. It returns
-//     when the task finishes running.
-//
-// It's safe to call queueTask from within a task, but not runTask (unless
-// you're calling runTask from a nested Fiber).
-//
-// Somewhat inspired by async.queue, but specific to blocking tasks.
-// XXX break this out into an NPM module?
-// XXX could maybe use the npm 'schlock' module instead, which would
-//     also support multiple concurrent "read" tasks
-//
-function AsynchronousQueue () {
-  this._taskHandles = new Meteor._DoubleEndedQueue();
-  this._runningOrRunScheduled = false;
-  // This is true if we're currently draining.  While we're draining, a further
-  // drain is a noop, to prevent infinite loops.  "drain" is a heuristic type
-  // operation, that has a meaning like unto "what a naive person would expect
-  // when modifying a table from an observe"
-  this._draining = false;
-}
-Object.assign(AsynchronousQueue.prototype, {
-  queueTask(task) {
-    const self = this;
-    self._taskHandles.push({
-      task: Meteor.bindEnvironment(task, function (e) {
-        Meteor._debug('Exception from task', e);
-        throw e;
-      }),
-      name: task.name
-    });
-    self._scheduleRun();
-  },
-
-  async _scheduleRun() {
-    // Already running or scheduled? Do nothing.
-    if (this._runningOrRunScheduled)
-      return;
-
-    this._runningOrRunScheduled = true;
-
-    let resolve;
-    const promise = new Promise(r => resolve = r);
-    const runImmediateHandle = (fn) => {
-      if (Meteor.isServer) {
-        Meteor._runFresh(() => setImmediate(fn))
-        return;
-      }
-      setTimeout(fn, 0);
-    };
-    runImmediateHandle(() => {
-      this._run().finally(resolve);
-    });
-    return promise;
-  },
-
-  async _run() {
-    if (!this._runningOrRunScheduled)
-      throw new Error("expected to be _runningOrRunScheduled");
-
-    if (this._taskHandles.isEmpty()) {
-      // Done running tasks! Don't immediately schedule another run, but
-      // allow future tasks to do so.
-      this._runningOrRunScheduled = false;
-      return;
-    }
-    const taskHandle = this._taskHandles.shift();
-    let exception;
-    // Run the task.
-    try {
-      await taskHandle.task();
-    } catch (err) {
-      if (taskHandle.resolver) {
-        // We'll throw this exception through runTask.
-        exception = err;
-      } else {
-        Meteor._debug("Exception in queued task", err);
-      }
-    }
-
-    // Soon, run the next task, if there is any.
-    this._runningOrRunScheduled = false;
-    this._scheduleRun();
-
-    if (taskHandle.resolver) {
-      if (exception) {
-        taskHandle.resolver(null, exception);
-      } else {
-        taskHandle.resolver();
-      }
-    }
-  },
-
-  async runTask(task) {
-    let resolver;
-    const promise = new Promise(
-      (resolve, reject) =>
-      (resolver = (res, rej) => {
-        if (rej) {
-          reject(rej);
-          return;
-        }
-        resolve(res);
-      })
-    );
-
-    const handle = {
-      task,
-      name: task.name,
-      resolver,
-    };
-    this._taskHandles.push(handle);
-    await this._scheduleRun();
-    return promise;
-  },
-
-  flush() {
-    return this.runTask(() => { });
-  },
-
-  async drain() {
-    if (this._draining)
-      return;
-
-    this._draining = true;
-    while (!this._taskHandles.isEmpty()) {
-      await this.flush();
-    }
-    this._draining = false;
-  }
-});
-
-Meteor._AsynchronousQueue = AsynchronousQueue;
-
 
 // Sleep. Mostly used for debugging (eg, inserting latency into server
 // methods).
diff --git a/packages/meteor/asynchronous_queue.js b/packages/meteor/asynchronous_queue.js
new file mode 100644
index 0000000000..fe1a30c783
--- /dev/null
+++ b/packages/meteor/asynchronous_queue.js
@@ -0,0 +1,154 @@
+class AsynchronousQueue {
+  /**
+   * Creates a queue that processes tasks in parallel batches while preserving completion order
+   * when needed. Configurable batch size and concurrency limits help optimize throughput.
+   */
+  constructor({
+                batchSize = 50,
+                maxConcurrent = 10,
+                orderMatters = false
+              } = {}) {
+    this._taskHandles = new Meteor._DoubleEndedQueue();
+    this._runningOrRunScheduled = false;
+    this._draining = false;
+    this._batchSize = batchSize;
+    this._maxConcurrent = maxConcurrent;
+    this._orderMatters = orderMatters;
+    this._activePromises = new Set();
+  }
+
+  queueTask(task) {
+    const wrappedTask = Meteor.bindEnvironment(task, function (e) {
+      Meteor._debug('Exception from task', e);
+      throw e;
+    });
+
+    this._taskHandles.push({
+      task: wrappedTask,
+      name: task.name
+    });
+
+    this._scheduleRun();
+  }
+
+  async _scheduleRun() {
+    if (this._runningOrRunScheduled) return;
+    this._runningOrRunScheduled = true;
+
+    const runImmediateHandle = (fn) => {
+      if (Meteor.isServer) {
+        Meteor._runFresh(() => setImmediate(fn));
+        return;
+      }
+      setTimeout(fn, 0);
+    };
+
+    return new Promise(resolve => {
+      runImmediateHandle(() => {
+        this._run().finally(resolve);
+      });
+    });
+  }
+
+  async _run() {
+    if (!this._runningOrRunScheduled) {
+      throw new Error("expected to be _runningOrRunScheduled");
+    }
+
+    if (this._taskHandles.isEmpty()) {
+      this._runningOrRunScheduled = false;
+      return;
+    }
+
+    // Collect tasks for the current batch
+    const batch = [];
+    while (batch.length < this._batchSize && !this._taskHandles.isEmpty()) {
+      batch.push(this._taskHandles.shift());
+    }
+
+    // Process batch
+    if (this._orderMatters) {
+      await this._processOrderedBatch(batch);
+    } else {
+      await this._processParallelBatch(batch);
+    }
+
+    // Schedule next batch if there are more tasks
+    this._runningOrRunScheduled = false;
+    if (!this._taskHandles.isEmpty()) {
+      this._scheduleRun();
+    }
+  }
+
+  async _processParallelBatch(batch) {
+    const taskPromises = batch.map(async taskHandle => {
+      try {
+        const promise = taskHandle.task();
+        this._activePromises.add(promise);
+        const result = await promise;
+        this._activePromises.delete(promise);
+
+        if (taskHandle.resolver) {
+          taskHandle.resolver(result);
+        }
+      } catch (err) {
+        if (taskHandle.resolver) {
+          taskHandle.resolver(null, err);
+        } else {
+          Meteor._debug("Exception in queued task", err);
+        }
+      }
+    });
+
+    // Process in chunks to control concurrency
+    for (let i = 0; i < taskPromises.length; i += this._maxConcurrent) {
+      const chunk = taskPromises.slice(i, i + this._maxConcurrent);
+      await Promise.all(chunk);
+    }
+  }
+
+  async _processOrderedBatch(batch) {
+    for (const taskHandle of batch) {
+      try {
+        const result = await taskHandle.task();
+        if (taskHandle.resolver) {
+          taskHandle.resolver(result);
+        }
+      } catch (err) {
+        if (taskHandle.resolver) {
+          taskHandle.resolver(null, err);
+        } else {
+          Meteor._debug("Exception in queued task", err);
+        }
+      }
+    }
+  }
+
+  async runTask(task) {
+    return new Promise((resolve, reject) => {
+      const resolver = (res, err) => err ? reject(err) : resolve(res);
+      this._taskHandles.push({ task, name: task.name, resolver });
+      this._scheduleRun();
+    });
+  }
+
+  flush() {
+    return this.runTask(() => {});
+  }
+
+  async drain() {
+    if (this._draining) return;
+    this._draining = true;
+
+    while (!this._taskHandles.isEmpty() || this._activePromises.size > 0) {
+      await this.flush();
+      if (this._activePromises.size > 0) {
+        await Promise.all(Array.from(this._activePromises));
+      }
+    }
+
+    this._draining = false;
+  }
+}
+
+Meteor._AsynchronousQueue = AsynchronousQueue;
\ No newline at end of file
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 9071ad502c..5a27379ec4 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -34,6 +34,7 @@ Package.onUse(function (api) {
   api.addFiles('timers.js', ['client', 'server']);
   api.addFiles('errors.js', ['client', 'server']);
   api.addFiles('asl-helpers.js', 'server');
+  api.addFiles('asynchronous_queue.js', 'server');
   api.addFiles('async_helpers.js', ['client', 'server']);
   api.addFiles('fiber_stubs_client.js', 'client');
   api.addFiles('asl-helpers-client.js', 'client');
diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index 1ff2248815..a18f213400 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -15,6 +15,9 @@ export class ObserveHandle {
   nonMutatingCallbacks: boolean;
   _stopped: boolean;
 
+  public initialAddsSentResolver: (value: void) => void = () => {};
+  public initialAddsSent: Promise<void>
+
   _added?: (...args: any[]) => Promise<void>;
   _addedBefore?: (...args: any[]) => Promise<void>;
   _changed?: (...args: any[]) => Promise<void>;
@@ -40,6 +43,13 @@ export class ObserveHandle {
     this._stopped = false;
     this._id = nextObserveHandleId++;
     this.nonMutatingCallbacks = nonMutatingCallbacks;
+
+    this.initialAddsSent = new Promise(resolve => {
+      return this.initialAddsSentResolver = () => {
+        resolve();
+        this.initialAddsSent = Promise.resolve();
+      };
+    });
   }
 
   async stop() {
diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index b17a9e993d..da8bda0bd9 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -140,7 +140,7 @@ export class ObserveMultiplexer {
     return !!this._isReady;
   }
 
-  _applyCallback(callbackName: string, args: any[]): void {
+  async _applyCallback(callbackName: string, args: any[]) {
     this._queue.queueTask(async () => {
       if (!this._handles) return;
 
@@ -152,12 +152,17 @@ export class ObserveMultiplexer {
 
       for (const handleId of Object.keys(this._handles)) {
         const handle = this._handles && this._handles[handleId];
+
         if (!handle) return;
+
         const callback = (handle as any)[`_${callbackName}`];
-        callback && (await callback.apply(
+
+        if (!callback) continue;
+
+        handle.initialAddsSent.then(callback.apply(
           null,
           handle.nonMutatingCallbacks ? args : EJSON.clone(args)
-        ));
+        ))
       }
     });
   }
@@ -183,5 +188,7 @@ export class ObserveMultiplexer {
     });
 
     await Promise.all(addPromises);
+
+    handle.initialAddsSentResolver();
   }
 }
\ No newline at end of file

From de7eaf79b74c1eb8fb13c977cceba31c1bf98b2a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 7 Nov 2024 16:53:24 -0400
Subject: [PATCH 0776/1140] fix check running twice

---
 .github/workflows/check-syntax.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/check-syntax.yml b/.github/workflows/check-syntax.yml
index 90aa5285bd..a20bb011ca 100644
--- a/.github/workflows/check-syntax.yml
+++ b/.github/workflows/check-syntax.yml
@@ -1,6 +1,5 @@
 name: Check legacy syntax
 on:
-  - push
   - pull_request
 jobs:
   check-code-style:

From e8d6f848c21bab69b9cf96548d2bde2c387daef3 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 7 Nov 2024 16:55:16 -0400
Subject: [PATCH 0777/1140] ignore asynchronous queue from check

---
 scripts/admin/check-legacy-syntax/check-syntax.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/admin/check-legacy-syntax/check-syntax.js b/scripts/admin/check-legacy-syntax/check-syntax.js
index 66fb4fd815..fdbe82b061 100644
--- a/scripts/admin/check-legacy-syntax/check-syntax.js
+++ b/scripts/admin/check-legacy-syntax/check-syntax.js
@@ -34,6 +34,7 @@ const packages = {
     // Ignored server files that has a features > 2016
     ignoredFiles: [
       "async_helpers.js",
+      "asynchronous_queue.js",
     ]
   },
   "accounts-ui": {},

From b11977bbacf6653f0ef7eb5a2c01cdcf0ba2c877 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 7 Nov 2024 17:01:34 -0400
Subject: [PATCH 0778/1140] add timeout mechanism

---
 packages/mongo/observe_handle.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index a18f213400..d084322a61 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -45,9 +45,16 @@ export class ObserveHandle {
     this.nonMutatingCallbacks = nonMutatingCallbacks;
 
     this.initialAddsSent = new Promise(resolve => {
-      return this.initialAddsSentResolver = () => {
+      const ready = () => {
         resolve();
         this.initialAddsSent = Promise.resolve();
+      }
+
+      const timeout = setTimeout(ready, 30000)
+
+      this.initialAddsSentResolver = () => {
+        ready();
+        clearTimeout(timeout);
       };
     });
   }

From f0093cb9c9a93c7cdc5fc63d2011f74d38eaa74f Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 07:58:17 -0400
Subject: [PATCH 0779/1140] disable punycode warning on app process

---
 tools/runners/run-app.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index bd76e05317..38f904224f 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -10,8 +10,8 @@ var Profile = require('../tool-env/profile').Profile;
 var release = require('../packaging/release.js');
 import { pluginVersionsFromStarManifest } from '../cordova/index.js';
 import { closeAllWatchers } from "../fs/safe-watcher";
-import { eachline } from "../utils/eachline";
 import { loadIsopackage } from '../tool-env/isopackets.js';
+import { eachline } from "../utils/eachline";
 
 // Parse out s as if it were a bash command line.
 var bashParse = function (s) {
@@ -250,6 +250,8 @@ Object.assign(AppProcess.prototype, {
       opts.push("--inspect=" + self.inspect.port);
     }
 
+    opts.push(`--require=${files.convertToOSPath(files.pathJoin(__dirname, '../node-process-warnings.js'))}`)
+
     opts.push(entryPoint);
 
     // Call node

From 2539df868f7271e7704722f59aa5a1e3dcbaa928 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 08:21:44 -0400
Subject: [PATCH 0780/1140] exclude roles from travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 4d9997a4d7..a13c416d89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ env:
     - CXX=g++-12
     - phantom=false
     - PUPPETEER_DOWNLOAD_PATH=~/.npm/chromium
+    - TEST_PACKAGES_EXCLUDE=roles
 addons:
   apt:
     sources:

From 4af78246b1b97c3b29f43c97b9f31b96681e813f Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 08:31:37 -0400
Subject: [PATCH 0781/1140] remove shrinkwraps from git (annoying things!)

---
 .../.npm/package/npm-shrinkwrap.json          |  45 --
 .../.npm/package/npm-shrinkwrap.json          | 306 ----------
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  45 --
 .../.npm/package/npm-shrinkwrap.json          |  45 --
 .../.npm/package/npm-shrinkwrap.json          |  30 -
 .../.npm/package/npm-shrinkwrap.json          |  65 --
 .../http/.npm/package/npm-shrinkwrap.json     |  20 -
 .../plugin/lintJshint/npm-shrinkwrap.json     | 154 -----
 .../compileStylusBatch/npm-shrinkwrap.json    | 177 ------
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  15 -
 .../.npm/package/npm-shrinkwrap.json          |  15 -
 .../email/.npm/package/npm-shrinkwrap.json    |  65 --
 .../es5-shim/.npm/package/npm-shrinkwrap.json |  10 -
 .../fetch/.npm/package/npm-shrinkwrap.json    |  30 -
 .../.npm/package/npm-shrinkwrap.json          | 384 ------------
 .../.npm/package/npm-shrinkwrap.json          |  15 -
 .../logging/.npm/package/npm-shrinkwrap.json  |  45 --
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../meteor/.npm/package/npm-shrinkwrap.json   |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  65 --
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../modules/.npm/package/npm-shrinkwrap.json  |  55 --
 .../mongo/.npm/package/npm-shrinkwrap.json    |  45 --
 .../compileLessBatch/npm-shrinkwrap.json      | 115 ----
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  65 --
 .../oauth/.npm/package/npm-shrinkwrap.json    | 115 ----
 .../.npm/package/npm-shrinkwrap.json          |  20 -
 .../promise/.npm/package/npm-shrinkwrap.json  |  15 -
 .../.npm/package/npm-shrinkwrap.json          |  25 -
 .../.npm/package/npm-shrinkwrap.json          |  55 --
 .../.npm/package/npm-shrinkwrap.json          |  45 --
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../tinytest/.npm/package/npm-shrinkwrap.json |  10 -
 packages/url/.npm/package/npm-shrinkwrap.json |  10 -
 .../webapp/.npm/package/npm-shrinkwrap.json   | 576 ------------------
 40 files changed, 2772 deletions(-)
 delete mode 100644 packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/accounts-password/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/boilerplate-generator-tests/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/boilerplate-generator/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/constraint-solver/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ddp-client/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ddp-server/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/deprecated/http/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/deprecated/jshint/.npm/plugin/lintJshint/npm-shrinkwrap.json
 delete mode 100644 packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
 delete mode 100644 packages/deprecated/underscore/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ecmascript/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/email/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/es5-shim/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/fetch/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/force-ssl-common/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/inter-process-messaging/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/logging/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/logic-solver/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/meteor/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/minifier-js/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/modules-runtime/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/modules/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/mongo/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
 delete mode 100644 packages/non-core/mongo-decimal/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/npm-mongo/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/oauth/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/package-version-parser/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/promise/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/react-fast-refresh/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/server-render/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/socket-stream-client/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/test-server-tests-in-console-once/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/tinytest/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/url/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/webapp/.npm/package/npm-shrinkwrap.json

diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index c9264049b9..0000000000
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@types/node": {
-      "version": "22.8.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
-      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
-    },
-    "@types/notp": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/notp/-/notp-2.0.5.tgz",
-      "integrity": "sha512-ZsZS0PYUa6ZE4K3yOGerBvaxCp4ePf6ZmkFbPeilcqz2Ui/lmXox7KlRt7XZkXzqUgXhFLkc09ixyVmFLCU3gQ=="
-    },
-    "node-2fa": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/node-2fa/-/node-2fa-2.0.3.tgz",
-      "integrity": "sha512-PQldrOhjuoZyoydMvMSctllPN1ZPZ1/NwkEcgYwY9faVqE/OymxR+3awPpbWZxm6acLKqvmNqQmdqTsqYyflFw=="
-    },
-    "notp": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/notp/-/notp-2.0.3.tgz",
-      "integrity": "sha512-oBig/2uqkjQ5AkBuw4QJYwkEWa/q+zHxI5/I5z6IeP2NT0alpJFsP/trrfCC+9xOAgQSZXssNi962kp5KBmypQ=="
-    },
-    "qrcode-svg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/qrcode-svg/-/qrcode-svg-1.1.0.tgz",
-      "integrity": "sha512-XyQCIXux1zEIA3NPb0AeR8UMYvXZzWEhgdBgBjH9gO7M48H9uoHzviNz8pXw3UzrAcxRRRn9gxHewAVK7bn9qw=="
-    },
-    "thirty-two": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
-      "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA=="
-    },
-    "tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
-    }
-  }
-}
diff --git a/packages/accounts-password/.npm/package/npm-shrinkwrap.json b/packages/accounts-password/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 4960480477..0000000000
--- a/packages/accounts-password/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,306 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@mapbox/node-pre-gyp": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
-      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="
-    },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
-    },
-    "are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "bcrypt": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
-      "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
-    },
-    "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
-    },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
-    },
-    "debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
-    },
-    "detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw=="
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dependencies": {
-        "minipass": {
-          "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
-        }
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
-    },
-    "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-        }
-      }
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
-    },
-    "minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": {
-          "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-    },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
-    },
-    "node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="
-    },
-    "nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="
-    },
-    "npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-    },
-    "readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="
-    },
-    "tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="
-    },
-    "wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
-}
diff --git a/packages/boilerplate-generator-tests/.npm/package/npm-shrinkwrap.json b/packages/boilerplate-generator-tests/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index d749aa7131..0000000000
--- a/packages/boilerplate-generator-tests/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-    }
-  }
-}
diff --git a/packages/boilerplate-generator/.npm/package/npm-shrinkwrap.json b/packages/boilerplate-generator/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index e9ca2307b4..0000000000
--- a/packages/boilerplate-generator/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="
-    },
-    "combined-stream2": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/combined-stream2/-/combined-stream2-1.1.2.tgz",
-      "integrity": "sha512-sVqUHJmbdVm+HZWy4l34BPLczxI4fltN4Bm2vcvASsqBIXW4xFb4TRkwM8bw/UUXK9/OdHdAwi2cRYVEKrxzbg=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA=="
-    },
-    "lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="
-    },
-    "lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "stream-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz",
-      "integrity": "sha512-aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg=="
-    }
-  }
-}
diff --git a/packages/constraint-solver/.npm/package/npm-shrinkwrap.json b/packages/constraint-solver/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 2ecd80adff..0000000000
--- a/packages/constraint-solver/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.groupby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
-      "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw=="
-    },
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    },
-    "lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
-    },
-    "lodash.zip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
-      "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg=="
-    }
-  }
-}
diff --git a/packages/ddp-client/.npm/package/npm-shrinkwrap.json b/packages/ddp-client/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 1fa71b508b..0000000000
--- a/packages/ddp-client/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@sinonjs/commons": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
-      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ=="
-    },
-    "@sinonjs/fake-timers": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.0.5.tgz",
-      "integrity": "sha512-fUt6b15bjV/VW93UP5opNXJxdwZSbK1EdiwnhN7XrQrcpaOhMJpZ/CjwFpM3THpxwA+YviBUJKSuEqKlCK5alw=="
-    },
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    },
-    "lodash.identity": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz",
-      "integrity": "sha512-AupTIzdLQxJS5wIYUQlgGyk2XRTfGXA+MCghDHqZk0pzUNYvd3EESS6dkChNauNYVIutcb0dfHw1ri9Q1yPV8Q=="
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
-    }
-  }
-}
diff --git a/packages/ddp-server/.npm/package/npm-shrinkwrap.json b/packages/ddp-server/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index f7fd53b35e..0000000000
--- a/packages/ddp-server/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="
-    },
-    "http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
-    },
-    "lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
-    "permessage-deflate": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.7.tgz",
-      "integrity": "sha512-EUNi/RIsyJ1P1u9QHFwMOUWMYetqlE22ZgGbad7YP856WF4BFF0B7DuNy6vEGsgNNud6c/SkdWzkne71hH8MjA=="
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="
-    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
-    }
-  }
-}
diff --git a/packages/deprecated/http/.npm/package/npm-shrinkwrap.json b/packages/deprecated/http/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index dbac0874ce..0000000000
--- a/packages/deprecated/http/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "basic-auth": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
-      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="
-    },
-    "express-basic-auth": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/express-basic-auth/-/express-basic-auth-1.2.1.tgz",
-      "integrity": "sha512-L6YQ1wQ/mNjVLAmK3AG1RK6VkokA1BIY6wmiH304Xtt/cLTps40EusZsU1Uop+v9lTDPxdtzbFmdXfFO3KEnwA=="
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    }
-  }
-}
diff --git a/packages/deprecated/jshint/.npm/plugin/lintJshint/npm-shrinkwrap.json b/packages/deprecated/jshint/.npm/plugin/lintJshint/npm-shrinkwrap.json
deleted file mode 100644
index a7e2c547b5..0000000000
--- a/packages/deprecated/jshint/.npm/plugin/lintJshint/npm-shrinkwrap.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
-    },
-    "cli": {
-      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz",
-      "integrity": "sha512-4H6IzYk78R+VBeJ3fH3VQejcQRkGPR+kMjA9n30srEN+YVMPJLHfoQDtLquIzcLnfrlUrVA8qSQRB9fdgWpUBw=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg=="
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw=="
-    },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-    },
-    "domhandler": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-      "integrity": "sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ=="
-    },
-    "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw=="
-    },
-    "entities": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-      "integrity": "sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ=="
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
-    },
-    "glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-      "integrity": "sha512-hVb0zwEZwC1FXSKRPFTeOtN7AArJcJlI6ULGLtrstaswKNlrTJqAA+1lYlSUop4vjA423xlBzqfVS3iWGlqJ+g==",
-      "dependencies": {
-        "minimatch": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-          "integrity": "sha512-WFX1jI1AaxNTZVOHLBVazwTWKaQjoykSzCBNXB72vDTCzopQGtyP91tKdFK5cv1+qMwPyiTu1HqUriqplI8pcA=="
-        }
-      }
-    },
-    "htmlparser2": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-      "integrity": "sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-    },
-    "jshint": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.7.0.tgz",
-      "integrity": "sha512-omn1ROF3q3//EWz+XkKMT1P7pHnJE8wqcpJ8AUk13nNFugVzzDeGJW8S4dtGXW6hYB5dlSy90zVbRojolLMSwA=="
-    },
-    "lodash": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz",
-      "integrity": "sha512-fysFKsJtaOtRGZT/b3Xx03iyEmO0zjU+d1HBH5NcEaUjtg7XO0wDY5I7IJFfr2rguJt0Rve2V32426Za3zYyRw=="
-    },
-    "lru-cache": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ=="
-    },
-    "minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA=="
-    },
-    "readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="
-    },
-    "shelljs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-      "integrity": "sha512-Ny0KN4dyT8ZSCE0frtcbAJGoM/HTArpyPkeli1/00aYfm0sbD/Gk/4x7N2DP9QKGpBsiQH7n6rpm1L79RtviEQ=="
-    },
-    "sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
-    },
-    "strip-json-comments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-      "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg=="
-    }
-  }
-}
diff --git a/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json b/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
deleted file mode 100644
index 1fe92eee26..0000000000
--- a/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="
-    },
-    "autoprefixer": {
-      "version": "6.3.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.7.tgz",
-      "integrity": "sha512-xnArQBxKETltXW1R/ZrmlaslmU5vF4huqAw0iARn1VXXc8TztdtWQJ9myUe/ywZbG7tvErKQ7hZORBf7G8fArQ=="
-    },
-    "autoprefixer-stylus": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer-stylus/-/autoprefixer-stylus-0.9.4.tgz",
-      "integrity": "sha512-LTcjRdT4sRvfA6FkhRS6HuEtRm/GNFDr3+egHSr4/7oyKUjYJpZCCakpO4hhi/l3NahnJihokz0iaGb1boA4rw=="
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
-    },
-    "browserslist": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.3.6.tgz",
-      "integrity": "sha512-fKSWtyNQTclfi1A+s2KU91/r1mfANG1ZibxTdCwJGfV1J9UwcV22plFOm0wkaq4WzqW87zxiAkyp2Ho1Wn1NnA=="
-    },
-    "caniuse-db": {
-      "version": "1.0.30001669",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001669.tgz",
-      "integrity": "sha512-GK+G6CnRZ7IY2J2H3bcm9kshwHcJ4ZWDC5u9WaIh7DQAAHHeuxIPtaZd15GMTmGvGbDx/u1AcQs3MYur9Tem7A=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "css-parse": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
-      "integrity": "sha512-OI38lO4JQQX2GSisTqwiSFxiWNmLajXdW4tCCxAuiwGKjusHALQadSHBSxGlU8lrFp47IkLuU2AfSYz31qpETQ=="
-    },
-    "debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "glob": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-      "integrity": "sha512-f8c0rE8JiCxpa52kWPAOa3ZaYEnzofDzCQLCn3Vdk0Z5OVLq3BsRFJI4S4ykpeVW6QMGBUkMeUpoEgWnMTnw5Q=="
-    },
-    "has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA=="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "js-base64": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
-    },
-    "minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
-    },
-    "mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-    },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "multi-stage-sourcemap": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz",
-      "integrity": "sha512-umaOM+8BZByZIB/ciD3dQLzTv50rEkkGJV78ta/tIVc/J/rfGZY5y1R+fBD3oTaolx41mK8rRcyGtYbDXlzx8Q=="
-    },
-    "nib": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/nib/-/nib-1.1.2.tgz",
-      "integrity": "sha512-xBpZ9XU0vLOxp0GBTuUHt6Kcl37ZpC/rXPpKcK4LYOUnSmqp2CXkcNiJxf9bgNZeivYR6bxsaZkNHZ9deEMupQ=="
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-    },
-    "postcss": {
-      "version": "5.0.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.21.tgz",
-      "integrity": "sha512-/UdnZhOe5WC0Kvts13bNLPREqhaU0ntLQ1v29S5ofLx38zP+WhM0sjhVzrPrIQwKwXhtf8byfH+BROc3t2YQRg==",
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-        }
-      }
-    },
-    "postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "sax": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-      "integrity": "sha512-c0YL9VcSfcdH3F1Qij9qpYJFpKFKMXNOkLWFssBL3RuF7ZS8oZhllR2rWlCRjDTJsfq3R6wbSsaRU6o0rkEdNw=="
-    },
-    "source-map": {
-      "version": "0.1.43",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-      "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ=="
-    },
-    "stylus": {
-      "version": "0.54.5",
-      "resolved": "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449",
-      "integrity": "sha512-j6fvtoNfjx/TEIlIOZ53OqbP6uDdF5HsQidsRfvp0IfW0D5PCtV8IeHVQa4jjbhF9PbjOXX/rrt5lP4CGpgtfw=="
-    },
-    "supports-color": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A=="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    }
-  }
-}
diff --git a/packages/deprecated/underscore/.npm/package/npm-shrinkwrap.json b/packages/deprecated/underscore/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 9533a246ae..0000000000
--- a/packages/deprecated/underscore/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@types/underscore": {
-      "version": "1.11.9",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.11.9.tgz",
-      "integrity": "sha512-M63wKUdsjDFUfyFt1TCUZHGFk9KDAa5JP0adNUErbm0U45Lr06HtANdYRP+GyleEopEoZ4UyBcdAC5TnW4Uz2w=="
-    }
-  }
-}
diff --git a/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index ace6e4eb63..0000000000
--- a/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "core-js": {
-      "version": "3.15.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz",
-      "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="
-    }
-  }
-}
diff --git a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 22efd2d68d..0000000000
--- a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "core-js": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
-      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw=="
-    }
-  }
-}
diff --git a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 10a5a04a0e..0000000000
--- a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    }
-  }
-}
diff --git a/packages/ecmascript/.npm/package/npm-shrinkwrap.json b/packages/ecmascript/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 10a5a04a0e..0000000000
--- a/packages/ecmascript/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    }
-  }
-}
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 0f30d4b785..0000000000
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@types/node": {
-      "version": "22.8.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
-      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
-    },
-    "@types/nodemailer": {
-      "version": "6.4.14",
-      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.14.tgz",
-      "integrity": "sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA=="
-    },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="
-    },
-    "bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
-    "nodemailer": {
-      "version": "6.9.10",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.10.tgz",
-      "integrity": "sha512-qtoKfGFhvIFW5kLfrkw2R6Nm6Ur4LNUMykyqu6n9BRKJuyQrqEGwdXXUAbwWEKt33dlWUGXb7rzmJP/p4+O+CA=="
-    },
-    "nodemailer-openpgp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-openpgp/-/nodemailer-openpgp-2.2.0.tgz",
-      "integrity": "sha512-e6+pgGVpMEZ2ywHcAtTdKhUCU5HwZI23RFoNUA/mJPytUW369mQqEcHFLUoxEITOLrzeoLjn5wOYFYzSpef+Tg=="
-    },
-    "openpgp": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/openpgp/-/openpgp-5.9.0.tgz",
-      "integrity": "sha512-wEI6TAinCAq8ZLZA4oZ3ZtJ2BhhHj+CiPCd8TzE7zCicr0V8tvG5UF76OtddLLOJcK63w3Aj3KiRd+VLMScirQ=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "stream-buffers": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
-      "integrity": "sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ=="
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
-    }
-  }
-}
diff --git a/packages/es5-shim/.npm/package/npm-shrinkwrap.json b/packages/es5-shim/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 9883bd8fbe..0000000000
--- a/packages/es5-shim/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "es5-shim": {
-      "version": "4.5.10",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.10.tgz",
-      "integrity": "sha512-vmryBdqKRO8Ei9LJ4yyEk/EOmAOGIagcHDYPpTAi6pot4IMHS1AC2q5cTKPmydpijg2iX8DVmCuqgrNxIWj8Yg=="
-    }
-  }
-}
diff --git a/packages/fetch/.npm/package/npm-shrinkwrap.json b/packages/fetch/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index ec19012504..0000000000
--- a/packages/fetch/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "node-fetch": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g=="
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-fetch": {
-      "version": "3.6.17",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz",
-      "integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="
-    }
-  }
-}
diff --git a/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json b/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index cff63db95a..0000000000
--- a/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA=="
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
-    },
-    "arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw=="
-    },
-    "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg=="
-    },
-    "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw=="
-    },
-    "call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "deep-equal": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
-      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg=="
-    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="
-    },
-    "define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="
-    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
-    },
-    "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA=="
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA=="
-    },
-    "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg=="
-    },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ=="
-    },
-    "fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q=="
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="
-    },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw=="
-    },
-    "forwarded-http": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/forwarded-http/-/forwarded-http-0.3.0.tgz",
-      "integrity": "sha512-mlx71SLFQNGSjhK2ADs+N6ED8RH8HPcgsbr1pa3/Qmaw5yPI0K1hQKmn5ECEjKWXo5NfdFvwBpQrWCkMoUWvIQ=="
-    },
-    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
-    "get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA=="
-    },
-    "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w=="
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="
-    },
-    "has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="
-    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="
-    },
-    "ip": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz",
-      "integrity": "sha512-VXpBTSFo8wNvJVwCxlncVwd2hYbzX8egxidocX2oKt6H5tJzLjrzG6gTNoHSNsKtIyelb528n/7sa86kqlnNiA=="
-    },
-    "ip-filter": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ip-filter/-/ip-filter-1.0.2.tgz",
-      "integrity": "sha512-MBT35bC0RnP9Q7TKZKBieE6XaELqWEf1iPS9y4zLtncoZbxA0AxyllbTEruaFOeBlee722u7pYatrjoPX6Y6lQ=="
-    },
-    "ip-port-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ip-port-regex/-/ip-port-regex-1.0.0.tgz",
-      "integrity": "sha512-RGlDctlcwEV5IXeLYcAq9/LwhEcese6YBFP8TwEzlPNv6lC/dkHYFEgnFom6LjB81iWdAggHEOHSm4aBfuGdXw=="
-    },
-    "ip-regex": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
-      "integrity": "sha512-HjpCHTuxbR/6jWJroc/VN+npo5j0T4Vv2TAI5qdEHQx7hsL767MeccGFSsLtF694EiZKTSEqgoeU6DtGFCcuqQ=="
-    },
-    "is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg=="
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA=="
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
-    },
-    "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
-    },
-    "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg=="
-    },
-    "is-match": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/is-match/-/is-match-0.4.1.tgz",
-      "integrity": "sha512-Ds3ju1fPePDIfT9guPIaacKD2f0l6SCiY6hfQg6pDqcernEFCyGfyJaB5CPKHxE7qxc2Igd/5QdSNCYFHFhKow=="
-    },
-    "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg=="
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ=="
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q=="
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-    },
-    "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ=="
-    },
-    "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        }
-      }
-    },
-    "math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
-    },
-    "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="
-    },
-    "object-is": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
-      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA=="
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA=="
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ=="
-    },
-    "randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        }
-      }
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="
-    },
-    "regexp.prototype.flags": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
-      "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ=="
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
-    },
-    "repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="
-    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="
-    },
-    "set-function-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
-      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ=="
-    },
-    "to-file-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-file-path/-/to-file-path-1.0.0.tgz",
-      "integrity": "sha512-wXi4ugrrAjifQOuTf3Hh2CDEfFQtaxnLjfXZUHtVLrmOpkgr7N7EsN2kR+0C0Y+yPuAgbYev0mjAZnTYBrErww=="
-    }
-  }
-}
diff --git a/packages/inter-process-messaging/.npm/package/npm-shrinkwrap.json b/packages/inter-process-messaging/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 55a5e00ced..0000000000
--- a/packages/inter-process-messaging/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "arson": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/arson/-/arson-0.2.6.tgz",
-      "integrity": "sha512-wVRnIfjOaCWu3jrf3j1CU/eotDf7tuM34cBswo32EwyLPaMiaWgETfROdYVv47VWEbWSOaZaDnkypGQtQduLbw=="
-    },
-    "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-    }
-  }
-}
diff --git a/packages/logging/.npm/package/npm-shrinkwrap.json b/packages/logging/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index e2ea56dfae..0000000000
--- a/packages/logging/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
-    }
-  }
-}
diff --git a/packages/logic-solver/.npm/package/npm-shrinkwrap.json b/packages/logic-solver/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 51c79d70fa..0000000000
--- a/packages/logic-solver/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    }
-  }
-}
diff --git a/packages/meteor/.npm/package/npm-shrinkwrap.json b/packages/meteor/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index cf4663cb36..0000000000
--- a/packages/meteor/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "denque": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
-      "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="
-    }
-  }
-}
diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 06ede9f967..0000000000
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg=="
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="
-    },
-    "@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
-    },
-    "@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ=="
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="
-    },
-    "acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="
-    },
-    "terser": {
-      "version": "5.31.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
-      "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg=="
-    }
-  }
-}
diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 4b73e7927f..0000000000
--- a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "install": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.13.0.tgz",
-      "integrity": "sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA=="
-    }
-  }
-}
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index bd86daae17..0000000000
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@meteorjs/reify": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@meteorjs/reify/-/reify-0.25.4.tgz",
-      "integrity": "sha512-/HwynJK85QtS2Rm26M9TS8aEMnqVJ2TIzJNJTGAQz+G6cTYmJGWaU4nFH96oxiDIBbnT6Y3TfX92HDuS9TtNRg=="
-    },
-    "@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
-    },
-    "acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="
-    },
-    "estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-    },
-    "is-reference": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
-      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="
-    },
-    "magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="
-    },
-    "meteor-babel-helpers": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/meteor-babel-helpers/-/meteor-babel-helpers-0.0.3.tgz",
-      "integrity": "sha512-PgfmiyT/HiBaxwGHxS4t3Qi0fpmEW3O0WW2VfrgekiMGz3aZPd9/4PRIaMMZsfyjQ1vyEm6dZqTAFZENbuoTxw=="
-    },
-    "periscopic": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-2.0.3.tgz",
-      "integrity": "sha512-FuCZe61mWxQOJAQFEfmt9FjzebRlcpFz8sFPbyaCKtdusPkMEbA9ey0eARnRav5zAhmXznhaQkKGFAPn7X9NUw=="
-    },
-    "semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    }
-  }
-}
diff --git a/packages/mongo/.npm/package/npm-shrinkwrap.json b/packages/mongo/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 123f660516..0000000000
--- a/packages/mongo/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.clone": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-      "integrity": "sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg=="
-    },
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
-    },
-    "lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
-    "lodash.throttle": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
-    },
-    "lodash.times": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.times/-/lodash.times-4.3.2.tgz",
-      "integrity": "sha512-FfaJzl0SA35CRPDh5SWe2BTght6y5KSK7yJv166qIp/8q7qOwBDCvuDZE2RUSMRpBkLF6rZKbLEUoTmaP3qg6A=="
-    },
-    "mongodb-uri": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz",
-      "integrity": "sha512-s6BdnqNoEYfViPJgkH85X5Nw5NpzxN8hoflKLweNa7vBxt2V7kaS06d74pAtqDxde8fn4r9h4dNdLiFGoNV0KA=="
-    }
-  }
-}
diff --git a/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json b/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
deleted file mode 100644
index 4c4ca06f64..0000000000
--- a/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-      "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="
-    },
-    "copy-anything": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
-      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw=="
-    },
-    "debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="
-    },
-    "errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="
-    },
-    "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
-    },
-    "image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ=="
-    },
-    "is-what": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="
-    },
-    "less": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
-      "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw=="
-    },
-    "make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "needle": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
-      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="
-    },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "sax": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
-      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="
-    },
-    "semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    }
-  }
-}
diff --git a/packages/non-core/mongo-decimal/.npm/package/npm-shrinkwrap.json b/packages/non-core/mongo-decimal/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index d50fde8c41..0000000000
--- a/packages/non-core/mongo-decimal/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
-    }
-  }
-}
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 471827971a..0000000000
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@mongodb-js/saslprep": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
-      "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
-    },
-    "@types/webidl-conversions": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
-      "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA=="
-    },
-    "@types/whatwg-url": {
-      "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz",
-      "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ=="
-    },
-    "bson": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-6.9.0.tgz",
-      "integrity": "sha512-X9hJeyeM0//Fus+0pc5dSUMhhrrmWwQUtdavaQeF3Ta6m69matZkGWV/MrBcnwUeLC8W9kwwc2hfkZgUuCX3Ig=="
-    },
-    "memory-pager": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
-      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="
-    },
-    "mongodb": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.10.0.tgz",
-      "integrity": "sha512-gP9vduuYWb9ZkDM546M+MP2qKVk5ZG2wPF63OvSRuUbqCR+11ZCAE1mOfllhlAG0wcoJY5yDL/rV3OmYEwXIzg=="
-    },
-    "mongodb-connection-string-url": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz",
-      "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg=="
-    },
-    "punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
-    },
-    "sparse-bitfield": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
-      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ=="
-    },
-    "tr46": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw=="
-    },
-    "webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="
-    },
-    "whatwg-url": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz",
-      "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig=="
-    }
-  }
-}
diff --git a/packages/oauth/.npm/package/npm-shrinkwrap.json b/packages/oauth/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 2a953aaaf9..0000000000
--- a/packages/oauth/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="
-    },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-    },
-    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="
-    },
-    "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
-    },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
-    }
-  }
-}
diff --git a/packages/package-version-parser/.npm/package/npm-shrinkwrap.json b/packages/package-version-parser/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index ea7fc351e9..0000000000
--- a/packages/package-version-parser/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="
-    },
-    "semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
-}
diff --git a/packages/promise/.npm/package/npm-shrinkwrap.json b/packages/promise/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 6a86573c60..0000000000
--- a/packages/promise/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
-    },
-    "promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="
-    }
-  }
-}
diff --git a/packages/react-fast-refresh/.npm/package/npm-shrinkwrap.json b/packages/react-fast-refresh/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 9476a975cd..0000000000
--- a/packages/react-fast-refresh/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="
-    },
-    "react-refresh": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ=="
-    },
-    "semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
-}
diff --git a/packages/server-render/.npm/package/npm-shrinkwrap.json b/packages/server-render/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 1b3236a19a..0000000000
--- a/packages/server-render/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="
-    },
-    "combined-stream2": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/combined-stream2/-/combined-stream2-1.1.2.tgz",
-      "integrity": "sha512-sVqUHJmbdVm+HZWy4l34BPLczxI4fltN4Bm2vcvASsqBIXW4xFb4TRkwM8bw/UUXK9/OdHdAwi2cRYVEKrxzbg=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "magic-string": {
-      "version": "0.25.7",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
-    },
-    "promise-polyfill": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz",
-      "integrity": "sha512-7rrONfyLkDEc7OJ5QBkqa4KI4EBhCd340xRuIUPGCfu13znS+vx+VDdrT9ODAJHlXm7w4lbxN3DRjyv58EuzDg=="
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    },
-    "stream-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz",
-      "integrity": "sha512-aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg=="
-    },
-    "stream-to-string": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/stream-to-string/-/stream-to-string-1.2.0.tgz",
-      "integrity": "sha512-8drZlFIKBHSMdX9GCWv8V9AAWnQcTqw0iAI6/GC7UJ0H0SwKeFKjOoZfGY1tOU00GGU7FYZQoJ/ZCUEoXhD7yQ=="
-    }
-  }
-}
diff --git a/packages/socket-stream-client/.npm/package/npm-shrinkwrap.json b/packages/socket-stream-client/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index eaf34702ea..0000000000
--- a/packages/socket-stream-client/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="
-    },
-    "http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
-    "permessage-deflate": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.7.tgz",
-      "integrity": "sha512-EUNi/RIsyJ1P1u9QHFwMOUWMYetqlE22ZgGbad7YP856WF4BFF0B7DuNy6vEGsgNNud6c/SkdWzkne71hH8MjA=="
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
-    }
-  }
-}
diff --git a/packages/test-server-tests-in-console-once/.npm/package/npm-shrinkwrap.json b/packages/test-server-tests-in-console-once/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 51c79d70fa..0000000000
--- a/packages/test-server-tests-in-console-once/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    }
-  }
-}
diff --git a/packages/tinytest/.npm/package/npm-shrinkwrap.json b/packages/tinytest/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index b0da3142b7..0000000000
--- a/packages/tinytest/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    }
-  }
-}
diff --git a/packages/url/.npm/package/npm-shrinkwrap.json b/packages/url/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 22efd2d68d..0000000000
--- a/packages/url/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "core-js": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
-      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw=="
-    }
-  }
-}
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 6a7731a654..0000000000
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,576 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg=="
-    },
-    "@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="
-    },
-    "@types/express": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.0.tgz",
-      "integrity": "sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ=="
-    },
-    "@types/express-serve-static-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
-      "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA=="
-    },
-    "@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
-    },
-    "@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
-    },
-    "@types/node": {
-      "version": "22.8.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
-      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
-    },
-    "@types/qs": {
-      "version": "6.9.16",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz",
-      "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A=="
-    },
-    "@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
-    },
-    "@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA=="
-    },
-    "@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw=="
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="
-    },
-    "array-flatten": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz",
-      "integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA=="
-    },
-    "body-parser": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.0.2.tgz",
-      "integrity": "sha512-SNMk0OONlQ01uk8EPeiBvTW7W4ovpL5b1O3t1sjpPgfxOQ6BqQJ6XjxinDPR79Z6HdcD5zBBwr5ssiTlgdNztQ==",
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="
-        },
-        "media-typer": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-          "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
-        },
-        "type-is": {
-          "version": "1.6.18",
-          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-          "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
-        }
-      }
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
-    },
-    "call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="
-    },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="
-    },
-    "content-disposition": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
-      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
-      }
-    },
-    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
-    },
-    "cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
-    },
-    "cookie-parser": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz",
-      "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="
-    },
-    "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-    },
-    "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
-    },
-    "errorhandler": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz",
-      "integrity": "sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="
-    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
-    },
-    "express": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-5.0.1.tgz",
-      "integrity": "sha512-ORF7g6qGnD+YtUG9yx4DFoqCShNMmUKiXuT5oWMHiOvt/4WFbHC6yCwQMTSBMno7AqntNCAzzcnnjowRkTL9eQ==",
-      "dependencies": {
-        "accepts": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
-          "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="
-        },
-        "cookie": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-          "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
-        },
-        "cookie-signature": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
-          "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="
-        },
-        "debug": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-          "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg=="
-        },
-        "mime-types": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.0.tgz",
-          "integrity": "sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "negotiator": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-          "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.0.0.tgz",
-      "integrity": "sha512-MX6Zo2adDViYh+GcxxB1dpO43eypOGUOL12rLCOTMQv/DfIbpSJUy4oQIIZhVZkH9e+bZWKMon0XHFEju16tkQ==",
-      "dependencies": {
-        "encodeurl": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-          "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-        }
-      }
-    },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-    },
-    "fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
-      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="
-    },
-    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-    },
-    "get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="
-    },
-    "has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="
-    },
-    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="
-    },
-    "iconv-lite": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
-      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-    },
-    "is-promise": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
-      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
-    },
-    "lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="
-    },
-    "media-typer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="
-    },
-    "merge-descriptors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
-      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
-    },
-    "mime-db": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
-      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": {
-          "version": "1.52.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-    },
-    "object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="
-    },
-    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "path-to-regexp": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
-      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ=="
-    },
-    "promise-polyfill": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz",
-      "integrity": "sha512-7rrONfyLkDEc7OJ5QBkqa4KI4EBhCd340xRuIUPGCfu13znS+vx+VDdrT9ODAJHlXm7w4lbxN3DRjyv58EuzDg=="
-    },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="
-    },
-    "qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "raw-body": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
-      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
-        "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="
-        }
-      }
-    },
-    "router": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/router/-/router-2.0.0.tgz",
-      "integrity": "sha512-dIM5zVoG8xhC6rnSN8uoAgFARwTE7BQs8YwHEvK0VCmfxQXMaOuA1uiR1IPwsW7JyK5iTt7Od/TC9StasS2NPQ=="
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "send": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-1.1.0.tgz",
-      "integrity": "sha512-v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==",
-      "dependencies": {
-        "debug": {
-          "version": "4.3.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="
-        },
-        "fresh": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-          "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.1.0.tgz",
-      "integrity": "sha512-A3We5UfEjG8Z7VkDv6uItWw6HY2bBSBJT1KtVESn6EOoOr2jAxNhxWCLY3jDE2WcuHXByWju74ck3ZgLwL8xmA=="
-    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="
-    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA=="
-    },
-    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-    },
-    "stream-to-string": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/stream-to-string/-/stream-to-string-1.2.1.tgz",
-      "integrity": "sha512-WsvTDNF8UYs369Yko3pcdTducQtYpzEZeOV7cTuReyFvOoA9S/DLJ6sYK+xPafSPHhUMpaxiljKYnT6JSFztIA=="
-    },
-    "tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w=="
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-    },
-    "type-is": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.0.tgz",
-      "integrity": "sha512-gd0sGezQYCbWSbkZr75mln4YBidWUN60+devscpLF5mtRDUpiaTvKpBNrdaCvel1NdR2k6vclXybU5fBd2i+nw==",
-      "dependencies": {
-        "mime-types": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.0.tgz",
-          "integrity": "sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w=="
-        }
-      }
-    },
-    "uap-core": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/uap-core/-/uap-core-0.16.0.tgz",
-      "integrity": "sha512-NwObJD5EgDPGWp86fvpyu94UBlYtHUIrk7F2n5J7bf3Cpu8X80qB7n6taM2gFhZGiKmlU/zUQ09Mc/yFgewnLg=="
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
-    },
-    "useragent-ng": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/useragent-ng/-/useragent-ng-2.4.3.tgz",
-      "integrity": "sha512-X08x6u8G/ZSVqQiN7f0KODtXq0HFUmjkmRdSaez0w350E6zCesLk/dZ7Sme7EQRHE6TSHo27DBxEHKbKEErWMg=="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "yamlparser": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/yamlparser/-/yamlparser-0.0.2.tgz",
-      "integrity": "sha512-Cou9FCGblEENtn1/8La5wkDM/ISMh2bzu5Wh7dYzCzA0o9jD4YGyLkUJxe84oPBGoB92f+Oy4ZjVhA8S0C2wlQ=="
-    }
-  }
-}

From 2f22da1f4b5a5ed8063b7b10a1e69a8073b9b2db Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 08:32:39 -0400
Subject: [PATCH 0782/1140] bump package versions so the sub deps are updated

---
 packages/ecmascript/package.js                     | 2 +-
 packages/minifier-js/package.js                    | 2 +-
 packages/non-core/coffeescript-compiler/package.js | 2 +-
 packages/non-core/coffeescript/package.js          | 2 +-
 packages/shell-server/package.js                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 1ad724b508..1d171485ae 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.9',
+  version: '0.16.10-beta310.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index e3128e55df..c4e1973b19 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: '3.0.0',
+  version: '3.0.1-beta310.0',
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
index 807f74a64e..3bb80863c5 100644
--- a/packages/non-core/coffeescript-compiler/package.js
+++ b/packages/non-core/coffeescript-compiler/package.js
@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '2.4.1'
+  version: '2.4.2-beta310.0'
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript/package.js b/packages/non-core/coffeescript/package.js
index eae0b138ac..230c19f999 100644
--- a/packages/non-core/coffeescript/package.js
+++ b/packages/non-core/coffeescript/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // so bumping the version of this package will be how they get newer versions
   // of `coffeescript-compiler`. If you change this, make sure to also update
   // ../coffeescript-compiler/package.js to match.
-  version: '2.7.1-rc300.0'
+  version: '2.7.2-beta310.0'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/shell-server/package.js b/packages/shell-server/package.js
index 2475bd39a0..99d54f9bcc 100644
--- a/packages/shell-server/package.js
+++ b/packages/shell-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "shell-server",
-  version: '0.6.0',
+  version: '0.6.1-beta310.0',
   summary: "Server-side component of the `meteor shell` command.",
   documentation: "README.md"
 });

From 1b40425a19cf5d970775ad5984b008a0d6dfc812 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 08:32:48 -0400
Subject: [PATCH 0783/1140] exclude roles in command

---
 .envrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.envrc b/.envrc
index 47ab5b6410..0ea9402d01 100644
--- a/.envrc
+++ b/.envrc
@@ -20,7 +20,7 @@ function @get-ready {
 }
 
 function @test-packages {
-  TINYTEST_FILTER="$1" @meteor test-packages --exclude-archs=web.browser.legacy,web.cordova
+  TINYTEST_FILTER="$1" @meteor test-packages --exclude-archs=web.browser.legacy,web.cordova --exclude=roles
 }
 
 function @test-self {

From 8a48369d86568e851b28f121da7189a66cb6deaa Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 13:32:01 -0400
Subject: [PATCH 0784/1140] update versions

---
 packages/deprecated/http/.versions | 115 +++++++++++++++--------------
 1 file changed, 58 insertions(+), 57 deletions(-)

diff --git a/packages/deprecated/http/.versions b/packages/deprecated/http/.versions
index e434868a96..579d0d042d 100644
--- a/packages/deprecated/http/.versions
+++ b/packages/deprecated/http/.versions
@@ -1,57 +1,58 @@
-allow-deny@2.0.0-alpha300.18
-babel-compiler@7.11.0-alpha300.18
-babel-runtime@1.5.2-alpha300.18
-base64@1.0.13-alpha300.18
-binary-heap@1.0.12-alpha300.18
-blaze@3.0.0-alpha300.16
-boilerplate-generator@2.0.0-alpha300.18
-callback-hook@1.6.0-alpha300.18
-check@1.3.3-alpha300.18
-core-runtime@1.0.0-alpha300.18
-ddp@1.4.2-alpha300.18
-ddp-client@3.0.0-alpha300.18
-ddp-common@1.4.1-alpha300.18
-ddp-server@3.0.0-alpha300.18
-diff-sequence@1.1.3-alpha300.18
-dynamic-import@0.7.4-alpha300.18
-ecmascript@0.16.8-alpha300.18
-ecmascript-runtime@0.8.2-alpha300.18
-ecmascript-runtime-client@0.12.2-alpha300.18
-ecmascript-runtime-server@0.11.1-alpha300.18
-ejson@1.1.4-alpha300.18
-facts-base@1.0.2-alpha300.18
-fetch@0.1.4-alpha300.18
-geojson-utils@1.0.12-alpha300.18
-htmljs@2.0.0-alpha300.16
-http@3.0.0-alpha300.18
-id-map@1.2.0-alpha300.18
-inter-process-messaging@0.1.2-alpha300.18
-local-test:http@3.0.0-alpha300.18
-logging@1.3.3-alpha300.18
-meteor@2.0.0-alpha300.18
-minimongo@2.0.0-alpha300.18
-modern-browsers@0.1.10-alpha300.18
-modules@0.19.1-alpha300.18
-modules-runtime@0.13.2-alpha300.18
-mongo@2.0.0-alpha300.18
-mongo-decimal@0.1.4-alpha300.18
-mongo-dev-server@1.1.1-alpha300.18
-mongo-id@1.0.9-alpha300.18
-npm-mongo@4.16.1-alpha300.18
-observe-sequence@2.0.0-alpha300.16
-ordered-dict@1.2.0-alpha300.18
-promise@1.0.0-alpha300.18
-random@1.2.2-alpha300.18
-react-fast-refresh@0.2.8-alpha300.18
-reactive-var@1.0.13-alpha300.18
-reload@1.3.2-alpha300.18
-retry@1.1.1-alpha300.18
-routepolicy@1.1.2-alpha300.18
-socket-stream-client@0.5.2-alpha300.18
-test-helpers@2.0.0-alpha300.18
-tinytest@2.0.0-alpha300.18
-tracker@1.3.3-alpha300.18
-underscore@1.0.14-alpha300.18
-url@1.3.2
-webapp@2.0.0-alpha300.18
-webapp-hashing@1.1.2-alpha300.18
+allow-deny@2.0.0
+babel-compiler@7.11.1
+babel-runtime@1.5.2
+base64@1.0.13
+binary-heap@1.0.12
+blaze@3.0.0
+boilerplate-generator@2.0.0
+callback-hook@1.6.0
+check@1.4.4
+core-runtime@1.0.0
+ddp@1.4.2
+ddp-client@3.0.2
+ddp-common@1.4.4
+ddp-server@3.0.2
+diff-sequence@1.1.3
+dynamic-import@0.7.4
+ecmascript@0.16.9
+ecmascript-runtime@0.8.3
+ecmascript-runtime-client@0.12.2
+ecmascript-runtime-server@0.11.1
+ejson@1.1.4
+facts-base@1.0.2
+fetch@0.1.5
+geojson-utils@1.0.12
+htmljs@2.0.1
+http@3.0.0
+id-map@1.2.0
+inter-process-messaging@0.1.2
+local-test:http@3.0.0
+logging@1.3.5
+meteor@2.0.1
+minimongo@2.0.1
+modern-browsers@0.1.11
+modules@0.20.2
+modules-runtime@0.13.2
+mongo@2.0.2
+mongo-decimal@0.1.4
+mongo-dev-server@1.1.1
+mongo-id@1.0.9
+npm-mongo@4.17.4
+observe-sequence@2.0.0
+ordered-dict@1.2.0
+promise@1.0.0
+random@1.2.2
+react-fast-refresh@0.2.9
+reactive-var@1.0.13
+reload@1.3.2
+retry@1.1.1
+routepolicy@1.1.2
+socket-stream-client@0.5.3
+test-helpers@2.0.1
+tinytest@1.3.0
+tracker@1.3.4
+typescript@5.4.3
+underscore@1.6.4
+url@1.3.4
+webapp@2.0.3
+webapp-hashing@1.1.2

From 86a07cc9eb329bad61645da191dc573487460d30 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 07:58:17 -0400
Subject: [PATCH 0785/1140] disable punycode warning on app process

---
 tools/runners/run-app.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index bd76e05317..38f904224f 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -10,8 +10,8 @@ var Profile = require('../tool-env/profile').Profile;
 var release = require('../packaging/release.js');
 import { pluginVersionsFromStarManifest } from '../cordova/index.js';
 import { closeAllWatchers } from "../fs/safe-watcher";
-import { eachline } from "../utils/eachline";
 import { loadIsopackage } from '../tool-env/isopackets.js';
+import { eachline } from "../utils/eachline";
 
 // Parse out s as if it were a bash command line.
 var bashParse = function (s) {
@@ -250,6 +250,8 @@ Object.assign(AppProcess.prototype, {
       opts.push("--inspect=" + self.inspect.port);
     }
 
+    opts.push(`--require=${files.convertToOSPath(files.pathJoin(__dirname, '../node-process-warnings.js'))}`)
+
     opts.push(entryPoint);
 
     // Call node

From 69683dafb883c6dc80f4a9bb92839a306c824855 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 08:21:44 -0400
Subject: [PATCH 0786/1140] exclude roles from travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 4d9997a4d7..a13c416d89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ env:
     - CXX=g++-12
     - phantom=false
     - PUPPETEER_DOWNLOAD_PATH=~/.npm/chromium
+    - TEST_PACKAGES_EXCLUDE=roles
 addons:
   apt:
     sources:

From 92329e78bb68a0f580130baf94139b4a4a00b664 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 08:31:37 -0400
Subject: [PATCH 0787/1140] remove shrinkwraps from git (annoying things!)

---
 .../.npm/package/npm-shrinkwrap.json          |  45 --
 .../.npm/package/npm-shrinkwrap.json          | 306 ----------
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  45 --
 .../.npm/package/npm-shrinkwrap.json          |  45 --
 .../.npm/package/npm-shrinkwrap.json          |  30 -
 .../.npm/package/npm-shrinkwrap.json          |  70 ---
 .../http/.npm/package/npm-shrinkwrap.json     |  20 -
 .../plugin/lintJshint/npm-shrinkwrap.json     | 154 -----
 .../compileStylusBatch/npm-shrinkwrap.json    | 177 ------
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  15 -
 .../.npm/package/npm-shrinkwrap.json          |  15 -
 .../email/.npm/package/npm-shrinkwrap.json    |  65 --
 .../es5-shim/.npm/package/npm-shrinkwrap.json |  10 -
 .../fetch/.npm/package/npm-shrinkwrap.json    |  30 -
 .../.npm/package/npm-shrinkwrap.json          | 384 ------------
 .../.npm/package/npm-shrinkwrap.json          |  15 -
 .../logging/.npm/package/npm-shrinkwrap.json  |  45 --
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../meteor/.npm/package/npm-shrinkwrap.json   |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  65 --
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../modules/.npm/package/npm-shrinkwrap.json  |  55 --
 .../mongo/.npm/package/npm-shrinkwrap.json    |  45 --
 .../compileLessBatch/npm-shrinkwrap.json      | 115 ----
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../.npm/package/npm-shrinkwrap.json          |  65 --
 .../oauth/.npm/package/npm-shrinkwrap.json    | 115 ----
 .../.npm/package/npm-shrinkwrap.json          |  20 -
 .../promise/.npm/package/npm-shrinkwrap.json  |  15 -
 .../.npm/package/npm-shrinkwrap.json          |  25 -
 .../.npm/package/npm-shrinkwrap.json          |  55 --
 .../.npm/package/npm-shrinkwrap.json          |  45 --
 .../.npm/package/npm-shrinkwrap.json          |  10 -
 .../tinytest/.npm/package/npm-shrinkwrap.json |  10 -
 packages/url/.npm/package/npm-shrinkwrap.json |  10 -
 .../webapp/.npm/package/npm-shrinkwrap.json   | 576 ------------------
 40 files changed, 2777 deletions(-)
 delete mode 100644 packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/accounts-password/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/boilerplate-generator-tests/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/boilerplate-generator/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/constraint-solver/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ddp-client/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ddp-server/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/deprecated/http/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/deprecated/jshint/.npm/plugin/lintJshint/npm-shrinkwrap.json
 delete mode 100644 packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
 delete mode 100644 packages/deprecated/underscore/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/ecmascript/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/email/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/es5-shim/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/fetch/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/force-ssl-common/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/inter-process-messaging/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/logging/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/logic-solver/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/meteor/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/minifier-js/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/modules-runtime/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/modules/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/mongo/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
 delete mode 100644 packages/non-core/mongo-decimal/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/npm-mongo/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/oauth/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/package-version-parser/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/promise/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/react-fast-refresh/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/server-render/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/socket-stream-client/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/test-server-tests-in-console-once/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/tinytest/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/url/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/webapp/.npm/package/npm-shrinkwrap.json

diff --git a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json b/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index c9264049b9..0000000000
--- a/packages/accounts-2fa/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@types/node": {
-      "version": "22.8.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
-      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
-    },
-    "@types/notp": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/notp/-/notp-2.0.5.tgz",
-      "integrity": "sha512-ZsZS0PYUa6ZE4K3yOGerBvaxCp4ePf6ZmkFbPeilcqz2Ui/lmXox7KlRt7XZkXzqUgXhFLkc09ixyVmFLCU3gQ=="
-    },
-    "node-2fa": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/node-2fa/-/node-2fa-2.0.3.tgz",
-      "integrity": "sha512-PQldrOhjuoZyoydMvMSctllPN1ZPZ1/NwkEcgYwY9faVqE/OymxR+3awPpbWZxm6acLKqvmNqQmdqTsqYyflFw=="
-    },
-    "notp": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/notp/-/notp-2.0.3.tgz",
-      "integrity": "sha512-oBig/2uqkjQ5AkBuw4QJYwkEWa/q+zHxI5/I5z6IeP2NT0alpJFsP/trrfCC+9xOAgQSZXssNi962kp5KBmypQ=="
-    },
-    "qrcode-svg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/qrcode-svg/-/qrcode-svg-1.1.0.tgz",
-      "integrity": "sha512-XyQCIXux1zEIA3NPb0AeR8UMYvXZzWEhgdBgBjH9gO7M48H9uoHzviNz8pXw3UzrAcxRRRn9gxHewAVK7bn9qw=="
-    },
-    "thirty-two": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
-      "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA=="
-    },
-    "tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
-    }
-  }
-}
diff --git a/packages/accounts-password/.npm/package/npm-shrinkwrap.json b/packages/accounts-password/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 4960480477..0000000000
--- a/packages/accounts-password/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,306 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@mapbox/node-pre-gyp": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
-      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="
-    },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
-    },
-    "are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "bcrypt": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
-      "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
-    },
-    "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
-    },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
-    },
-    "debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
-    },
-    "detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw=="
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dependencies": {
-        "minipass": {
-          "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
-        }
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
-    },
-    "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-        }
-      }
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
-    },
-    "minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": {
-          "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-    },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
-    },
-    "node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="
-    },
-    "nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="
-    },
-    "npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-    },
-    "readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="
-    },
-    "tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="
-    },
-    "wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
-}
diff --git a/packages/boilerplate-generator-tests/.npm/package/npm-shrinkwrap.json b/packages/boilerplate-generator-tests/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index d749aa7131..0000000000
--- a/packages/boilerplate-generator-tests/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-    }
-  }
-}
diff --git a/packages/boilerplate-generator/.npm/package/npm-shrinkwrap.json b/packages/boilerplate-generator/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index e9ca2307b4..0000000000
--- a/packages/boilerplate-generator/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="
-    },
-    "combined-stream2": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/combined-stream2/-/combined-stream2-1.1.2.tgz",
-      "integrity": "sha512-sVqUHJmbdVm+HZWy4l34BPLczxI4fltN4Bm2vcvASsqBIXW4xFb4TRkwM8bw/UUXK9/OdHdAwi2cRYVEKrxzbg=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA=="
-    },
-    "lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="
-    },
-    "lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "stream-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz",
-      "integrity": "sha512-aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg=="
-    }
-  }
-}
diff --git a/packages/constraint-solver/.npm/package/npm-shrinkwrap.json b/packages/constraint-solver/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 2ecd80adff..0000000000
--- a/packages/constraint-solver/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.groupby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
-      "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw=="
-    },
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    },
-    "lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
-    },
-    "lodash.zip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
-      "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg=="
-    }
-  }
-}
diff --git a/packages/ddp-client/.npm/package/npm-shrinkwrap.json b/packages/ddp-client/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 1fa71b508b..0000000000
--- a/packages/ddp-client/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@sinonjs/commons": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
-      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ=="
-    },
-    "@sinonjs/fake-timers": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.0.5.tgz",
-      "integrity": "sha512-fUt6b15bjV/VW93UP5opNXJxdwZSbK1EdiwnhN7XrQrcpaOhMJpZ/CjwFpM3THpxwA+YviBUJKSuEqKlCK5alw=="
-    },
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    },
-    "lodash.identity": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz",
-      "integrity": "sha512-AupTIzdLQxJS5wIYUQlgGyk2XRTfGXA+MCghDHqZk0pzUNYvd3EESS6dkChNauNYVIutcb0dfHw1ri9Q1yPV8Q=="
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
-    }
-  }
-}
diff --git a/packages/ddp-server/.npm/package/npm-shrinkwrap.json b/packages/ddp-server/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 542ff6f6fe..0000000000
--- a/packages/ddp-server/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="
-    },
-    "http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
-    },
-    "lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
-    "lru_map": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.4.1.tgz",
-      "integrity": "sha512-I+lBvqMMFfqaV8CJCISjI3wbjmwVu/VyOoU7+qtu9d7ioW5klMgsTTiUOUp+DJvfTTzKXoPbyC6YfgkNcyPSOg=="
-    },
-    "permessage-deflate": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.7.tgz",
-      "integrity": "sha512-EUNi/RIsyJ1P1u9QHFwMOUWMYetqlE22ZgGbad7YP856WF4BFF0B7DuNy6vEGsgNNud6c/SkdWzkne71hH8MjA=="
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="
-    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
-    }
-  }
-}
diff --git a/packages/deprecated/http/.npm/package/npm-shrinkwrap.json b/packages/deprecated/http/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index dbac0874ce..0000000000
--- a/packages/deprecated/http/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "basic-auth": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
-      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="
-    },
-    "express-basic-auth": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/express-basic-auth/-/express-basic-auth-1.2.1.tgz",
-      "integrity": "sha512-L6YQ1wQ/mNjVLAmK3AG1RK6VkokA1BIY6wmiH304Xtt/cLTps40EusZsU1Uop+v9lTDPxdtzbFmdXfFO3KEnwA=="
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    }
-  }
-}
diff --git a/packages/deprecated/jshint/.npm/plugin/lintJshint/npm-shrinkwrap.json b/packages/deprecated/jshint/.npm/plugin/lintJshint/npm-shrinkwrap.json
deleted file mode 100644
index a7e2c547b5..0000000000
--- a/packages/deprecated/jshint/.npm/plugin/lintJshint/npm-shrinkwrap.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
-    },
-    "cli": {
-      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz",
-      "integrity": "sha512-4H6IzYk78R+VBeJ3fH3VQejcQRkGPR+kMjA9n30srEN+YVMPJLHfoQDtLquIzcLnfrlUrVA8qSQRB9fdgWpUBw=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha512-duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg=="
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw=="
-    },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-    },
-    "domhandler": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-      "integrity": "sha512-q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ=="
-    },
-    "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw=="
-    },
-    "entities": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-      "integrity": "sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ=="
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
-    },
-    "glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-      "integrity": "sha512-hVb0zwEZwC1FXSKRPFTeOtN7AArJcJlI6ULGLtrstaswKNlrTJqAA+1lYlSUop4vjA423xlBzqfVS3iWGlqJ+g==",
-      "dependencies": {
-        "minimatch": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-          "integrity": "sha512-WFX1jI1AaxNTZVOHLBVazwTWKaQjoykSzCBNXB72vDTCzopQGtyP91tKdFK5cv1+qMwPyiTu1HqUriqplI8pcA=="
-        }
-      }
-    },
-    "htmlparser2": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-      "integrity": "sha512-hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-    },
-    "jshint": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.7.0.tgz",
-      "integrity": "sha512-omn1ROF3q3//EWz+XkKMT1P7pHnJE8wqcpJ8AUk13nNFugVzzDeGJW8S4dtGXW6hYB5dlSy90zVbRojolLMSwA=="
-    },
-    "lodash": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz",
-      "integrity": "sha512-fysFKsJtaOtRGZT/b3Xx03iyEmO0zjU+d1HBH5NcEaUjtg7XO0wDY5I7IJFfr2rguJt0Rve2V32426Za3zYyRw=="
-    },
-    "lru-cache": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ=="
-    },
-    "minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA=="
-    },
-    "readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="
-    },
-    "shelljs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-      "integrity": "sha512-Ny0KN4dyT8ZSCE0frtcbAJGoM/HTArpyPkeli1/00aYfm0sbD/Gk/4x7N2DP9QKGpBsiQH7n6rpm1L79RtviEQ=="
-    },
-    "sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
-    },
-    "strip-json-comments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-      "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg=="
-    }
-  }
-}
diff --git a/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json b/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
deleted file mode 100644
index 1fe92eee26..0000000000
--- a/packages/deprecated/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="
-    },
-    "autoprefixer": {
-      "version": "6.3.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.7.tgz",
-      "integrity": "sha512-xnArQBxKETltXW1R/ZrmlaslmU5vF4huqAw0iARn1VXXc8TztdtWQJ9myUe/ywZbG7tvErKQ7hZORBf7G8fArQ=="
-    },
-    "autoprefixer-stylus": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer-stylus/-/autoprefixer-stylus-0.9.4.tgz",
-      "integrity": "sha512-LTcjRdT4sRvfA6FkhRS6HuEtRm/GNFDr3+egHSr4/7oyKUjYJpZCCakpO4hhi/l3NahnJihokz0iaGb1boA4rw=="
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
-    },
-    "browserslist": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.3.6.tgz",
-      "integrity": "sha512-fKSWtyNQTclfi1A+s2KU91/r1mfANG1ZibxTdCwJGfV1J9UwcV22plFOm0wkaq4WzqW87zxiAkyp2Ho1Wn1NnA=="
-    },
-    "caniuse-db": {
-      "version": "1.0.30001669",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001669.tgz",
-      "integrity": "sha512-GK+G6CnRZ7IY2J2H3bcm9kshwHcJ4ZWDC5u9WaIh7DQAAHHeuxIPtaZd15GMTmGvGbDx/u1AcQs3MYur9Tem7A=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "css-parse": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
-      "integrity": "sha512-OI38lO4JQQX2GSisTqwiSFxiWNmLajXdW4tCCxAuiwGKjusHALQadSHBSxGlU8lrFp47IkLuU2AfSYz31qpETQ=="
-    },
-    "debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "glob": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-      "integrity": "sha512-f8c0rE8JiCxpa52kWPAOa3ZaYEnzofDzCQLCn3Vdk0Z5OVLq3BsRFJI4S4ykpeVW6QMGBUkMeUpoEgWnMTnw5Q=="
-    },
-    "has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA=="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "js-base64": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="
-    },
-    "minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
-    },
-    "mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-    },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "multi-stage-sourcemap": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz",
-      "integrity": "sha512-umaOM+8BZByZIB/ciD3dQLzTv50rEkkGJV78ta/tIVc/J/rfGZY5y1R+fBD3oTaolx41mK8rRcyGtYbDXlzx8Q=="
-    },
-    "nib": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/nib/-/nib-1.1.2.tgz",
-      "integrity": "sha512-xBpZ9XU0vLOxp0GBTuUHt6Kcl37ZpC/rXPpKcK4LYOUnSmqp2CXkcNiJxf9bgNZeivYR6bxsaZkNHZ9deEMupQ=="
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-    },
-    "postcss": {
-      "version": "5.0.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.21.tgz",
-      "integrity": "sha512-/UdnZhOe5WC0Kvts13bNLPREqhaU0ntLQ1v29S5ofLx38zP+WhM0sjhVzrPrIQwKwXhtf8byfH+BROc3t2YQRg==",
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-        }
-      }
-    },
-    "postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "sax": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-      "integrity": "sha512-c0YL9VcSfcdH3F1Qij9qpYJFpKFKMXNOkLWFssBL3RuF7ZS8oZhllR2rWlCRjDTJsfq3R6wbSsaRU6o0rkEdNw=="
-    },
-    "source-map": {
-      "version": "0.1.43",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-      "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ=="
-    },
-    "stylus": {
-      "version": "0.54.5",
-      "resolved": "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449",
-      "integrity": "sha512-j6fvtoNfjx/TEIlIOZ53OqbP6uDdF5HsQidsRfvp0IfW0D5PCtV8IeHVQa4jjbhF9PbjOXX/rrt5lP4CGpgtfw=="
-    },
-    "supports-color": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A=="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    }
-  }
-}
diff --git a/packages/deprecated/underscore/.npm/package/npm-shrinkwrap.json b/packages/deprecated/underscore/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 9533a246ae..0000000000
--- a/packages/deprecated/underscore/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@types/underscore": {
-      "version": "1.11.9",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.11.9.tgz",
-      "integrity": "sha512-M63wKUdsjDFUfyFt1TCUZHGFk9KDAa5JP0adNUErbm0U45Lr06HtANdYRP+GyleEopEoZ4UyBcdAC5TnW4Uz2w=="
-    }
-  }
-}
diff --git a/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index ace6e4eb63..0000000000
--- a/packages/ecmascript-runtime-client/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "core-js": {
-      "version": "3.15.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz",
-      "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="
-    }
-  }
-}
diff --git a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 22efd2d68d..0000000000
--- a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "core-js": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
-      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw=="
-    }
-  }
-}
diff --git a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 10a5a04a0e..0000000000
--- a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    }
-  }
-}
diff --git a/packages/ecmascript/.npm/package/npm-shrinkwrap.json b/packages/ecmascript/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 10a5a04a0e..0000000000
--- a/packages/ecmascript/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    }
-  }
-}
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 0f30d4b785..0000000000
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@types/node": {
-      "version": "22.8.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
-      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
-    },
-    "@types/nodemailer": {
-      "version": "6.4.14",
-      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.14.tgz",
-      "integrity": "sha512-fUWthHO9k9DSdPCSPRqcu6TWhYyxTBg382vlNIttSe9M7XfsT06y0f24KHXtbnijPGGRIcVvdKHTNikOI6qiHA=="
-    },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="
-    },
-    "bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
-    "nodemailer": {
-      "version": "6.9.10",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.10.tgz",
-      "integrity": "sha512-qtoKfGFhvIFW5kLfrkw2R6Nm6Ur4LNUMykyqu6n9BRKJuyQrqEGwdXXUAbwWEKt33dlWUGXb7rzmJP/p4+O+CA=="
-    },
-    "nodemailer-openpgp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-openpgp/-/nodemailer-openpgp-2.2.0.tgz",
-      "integrity": "sha512-e6+pgGVpMEZ2ywHcAtTdKhUCU5HwZI23RFoNUA/mJPytUW369mQqEcHFLUoxEITOLrzeoLjn5wOYFYzSpef+Tg=="
-    },
-    "openpgp": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/openpgp/-/openpgp-5.9.0.tgz",
-      "integrity": "sha512-wEI6TAinCAq8ZLZA4oZ3ZtJ2BhhHj+CiPCd8TzE7zCicr0V8tvG5UF76OtddLLOJcK63w3Aj3KiRd+VLMScirQ=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "stream-buffers": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
-      "integrity": "sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ=="
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
-    }
-  }
-}
diff --git a/packages/es5-shim/.npm/package/npm-shrinkwrap.json b/packages/es5-shim/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 9883bd8fbe..0000000000
--- a/packages/es5-shim/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "es5-shim": {
-      "version": "4.5.10",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.10.tgz",
-      "integrity": "sha512-vmryBdqKRO8Ei9LJ4yyEk/EOmAOGIagcHDYPpTAi6pot4IMHS1AC2q5cTKPmydpijg2iX8DVmCuqgrNxIWj8Yg=="
-    }
-  }
-}
diff --git a/packages/fetch/.npm/package/npm-shrinkwrap.json b/packages/fetch/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index ec19012504..0000000000
--- a/packages/fetch/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "node-fetch": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g=="
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-fetch": {
-      "version": "3.6.17",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz",
-      "integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="
-    }
-  }
-}
diff --git a/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json b/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index cff63db95a..0000000000
--- a/packages/force-ssl-common/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA=="
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
-    },
-    "arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw=="
-    },
-    "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg=="
-    },
-    "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw=="
-    },
-    "call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "deep-equal": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
-      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg=="
-    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="
-    },
-    "define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="
-    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
-    },
-    "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA=="
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA=="
-    },
-    "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg=="
-    },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ=="
-    },
-    "fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q=="
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="
-    },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw=="
-    },
-    "forwarded-http": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/forwarded-http/-/forwarded-http-0.3.0.tgz",
-      "integrity": "sha512-mlx71SLFQNGSjhK2ADs+N6ED8RH8HPcgsbr1pa3/Qmaw5yPI0K1hQKmn5ECEjKWXo5NfdFvwBpQrWCkMoUWvIQ=="
-    },
-    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
-    "get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA=="
-    },
-    "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w=="
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="
-    },
-    "has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="
-    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="
-    },
-    "ip": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz",
-      "integrity": "sha512-VXpBTSFo8wNvJVwCxlncVwd2hYbzX8egxidocX2oKt6H5tJzLjrzG6gTNoHSNsKtIyelb528n/7sa86kqlnNiA=="
-    },
-    "ip-filter": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ip-filter/-/ip-filter-1.0.2.tgz",
-      "integrity": "sha512-MBT35bC0RnP9Q7TKZKBieE6XaELqWEf1iPS9y4zLtncoZbxA0AxyllbTEruaFOeBlee722u7pYatrjoPX6Y6lQ=="
-    },
-    "ip-port-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ip-port-regex/-/ip-port-regex-1.0.0.tgz",
-      "integrity": "sha512-RGlDctlcwEV5IXeLYcAq9/LwhEcese6YBFP8TwEzlPNv6lC/dkHYFEgnFom6LjB81iWdAggHEOHSm4aBfuGdXw=="
-    },
-    "ip-regex": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
-      "integrity": "sha512-HjpCHTuxbR/6jWJroc/VN+npo5j0T4Vv2TAI5qdEHQx7hsL767MeccGFSsLtF694EiZKTSEqgoeU6DtGFCcuqQ=="
-    },
-    "is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg=="
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA=="
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
-    },
-    "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="
-    },
-    "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg=="
-    },
-    "is-match": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/is-match/-/is-match-0.4.1.tgz",
-      "integrity": "sha512-Ds3ju1fPePDIfT9guPIaacKD2f0l6SCiY6hfQg6pDqcernEFCyGfyJaB5CPKHxE7qxc2Igd/5QdSNCYFHFhKow=="
-    },
-    "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg=="
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ=="
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q=="
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-    },
-    "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ=="
-    },
-    "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        }
-      }
-    },
-    "math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
-    },
-    "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="
-    },
-    "object-is": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
-      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA=="
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA=="
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ=="
-    },
-    "randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-        }
-      }
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="
-    },
-    "regexp.prototype.flags": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
-      "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ=="
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
-    },
-    "repeat-element": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
-      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="
-    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="
-    },
-    "set-function-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
-      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ=="
-    },
-    "to-file-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-file-path/-/to-file-path-1.0.0.tgz",
-      "integrity": "sha512-wXi4ugrrAjifQOuTf3Hh2CDEfFQtaxnLjfXZUHtVLrmOpkgr7N7EsN2kR+0C0Y+yPuAgbYev0mjAZnTYBrErww=="
-    }
-  }
-}
diff --git a/packages/inter-process-messaging/.npm/package/npm-shrinkwrap.json b/packages/inter-process-messaging/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 55a5e00ced..0000000000
--- a/packages/inter-process-messaging/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "arson": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/arson/-/arson-0.2.6.tgz",
-      "integrity": "sha512-wVRnIfjOaCWu3jrf3j1CU/eotDf7tuM34cBswo32EwyLPaMiaWgETfROdYVv47VWEbWSOaZaDnkypGQtQduLbw=="
-    },
-    "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-    }
-  }
-}
diff --git a/packages/logging/.npm/package/npm-shrinkwrap.json b/packages/logging/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index e2ea56dfae..0000000000
--- a/packages/logging/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
-    }
-  }
-}
diff --git a/packages/logic-solver/.npm/package/npm-shrinkwrap.json b/packages/logic-solver/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 51c79d70fa..0000000000
--- a/packages/logic-solver/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    }
-  }
-}
diff --git a/packages/meteor/.npm/package/npm-shrinkwrap.json b/packages/meteor/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index cf4663cb36..0000000000
--- a/packages/meteor/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "denque": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
-      "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="
-    }
-  }
-}
diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 06ede9f967..0000000000
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg=="
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="
-    },
-    "@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
-    },
-    "@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ=="
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="
-    },
-    "acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="
-    },
-    "terser": {
-      "version": "5.31.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
-      "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg=="
-    }
-  }
-}
diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 4b73e7927f..0000000000
--- a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "install": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.13.0.tgz",
-      "integrity": "sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA=="
-    }
-  }
-}
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index bd86daae17..0000000000
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@meteorjs/reify": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@meteorjs/reify/-/reify-0.25.4.tgz",
-      "integrity": "sha512-/HwynJK85QtS2Rm26M9TS8aEMnqVJ2TIzJNJTGAQz+G6cTYmJGWaU4nFH96oxiDIBbnT6Y3TfX92HDuS9TtNRg=="
-    },
-    "@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
-    },
-    "acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="
-    },
-    "estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-    },
-    "is-reference": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
-      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="
-    },
-    "magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="
-    },
-    "meteor-babel-helpers": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/meteor-babel-helpers/-/meteor-babel-helpers-0.0.3.tgz",
-      "integrity": "sha512-PgfmiyT/HiBaxwGHxS4t3Qi0fpmEW3O0WW2VfrgekiMGz3aZPd9/4PRIaMMZsfyjQ1vyEm6dZqTAFZENbuoTxw=="
-    },
-    "periscopic": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-2.0.3.tgz",
-      "integrity": "sha512-FuCZe61mWxQOJAQFEfmt9FjzebRlcpFz8sFPbyaCKtdusPkMEbA9ey0eARnRav5zAhmXznhaQkKGFAPn7X9NUw=="
-    },
-    "semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    }
-  }
-}
diff --git a/packages/mongo/.npm/package/npm-shrinkwrap.json b/packages/mongo/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 123f660516..0000000000
--- a/packages/mongo/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.clone": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-      "integrity": "sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg=="
-    },
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
-    },
-    "lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
-    "lodash.throttle": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
-    },
-    "lodash.times": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.times/-/lodash.times-4.3.2.tgz",
-      "integrity": "sha512-FfaJzl0SA35CRPDh5SWe2BTght6y5KSK7yJv166qIp/8q7qOwBDCvuDZE2RUSMRpBkLF6rZKbLEUoTmaP3qg6A=="
-    },
-    "mongodb-uri": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz",
-      "integrity": "sha512-s6BdnqNoEYfViPJgkH85X5Nw5NpzxN8hoflKLweNa7vBxt2V7kaS06d74pAtqDxde8fn4r9h4dNdLiFGoNV0KA=="
-    }
-  }
-}
diff --git a/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json b/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
deleted file mode 100644
index 4c4ca06f64..0000000000
--- a/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@babel/runtime": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-      "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="
-    },
-    "copy-anything": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
-      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw=="
-    },
-    "debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="
-    },
-    "errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="
-    },
-    "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
-    },
-    "image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ=="
-    },
-    "is-what": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
-      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="
-    },
-    "less": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
-      "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw=="
-    },
-    "make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "needle": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
-      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="
-    },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
-    },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "sax": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
-      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="
-    },
-    "semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    }
-  }
-}
diff --git a/packages/non-core/mongo-decimal/.npm/package/npm-shrinkwrap.json b/packages/non-core/mongo-decimal/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index d50fde8c41..0000000000
--- a/packages/non-core/mongo-decimal/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
-    }
-  }
-}
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 471827971a..0000000000
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@mongodb-js/saslprep": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
-      "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
-    },
-    "@types/webidl-conversions": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
-      "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA=="
-    },
-    "@types/whatwg-url": {
-      "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz",
-      "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ=="
-    },
-    "bson": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-6.9.0.tgz",
-      "integrity": "sha512-X9hJeyeM0//Fus+0pc5dSUMhhrrmWwQUtdavaQeF3Ta6m69matZkGWV/MrBcnwUeLC8W9kwwc2hfkZgUuCX3Ig=="
-    },
-    "memory-pager": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
-      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="
-    },
-    "mongodb": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.10.0.tgz",
-      "integrity": "sha512-gP9vduuYWb9ZkDM546M+MP2qKVk5ZG2wPF63OvSRuUbqCR+11ZCAE1mOfllhlAG0wcoJY5yDL/rV3OmYEwXIzg=="
-    },
-    "mongodb-connection-string-url": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz",
-      "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg=="
-    },
-    "punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
-    },
-    "sparse-bitfield": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
-      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ=="
-    },
-    "tr46": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw=="
-    },
-    "webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="
-    },
-    "whatwg-url": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz",
-      "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig=="
-    }
-  }
-}
diff --git a/packages/oauth/.npm/package/npm-shrinkwrap.json b/packages/oauth/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 2a953aaaf9..0000000000
--- a/packages/oauth/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="
-    },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-    },
-    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="
-    },
-    "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
-    },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
-    }
-  }
-}
diff --git a/packages/package-version-parser/.npm/package/npm-shrinkwrap.json b/packages/package-version-parser/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index ea7fc351e9..0000000000
--- a/packages/package-version-parser/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="
-    },
-    "semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
-}
diff --git a/packages/promise/.npm/package/npm-shrinkwrap.json b/packages/promise/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 6a86573c60..0000000000
--- a/packages/promise/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
-    },
-    "promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="
-    }
-  }
-}
diff --git a/packages/react-fast-refresh/.npm/package/npm-shrinkwrap.json b/packages/react-fast-refresh/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 9476a975cd..0000000000
--- a/packages/react-fast-refresh/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="
-    },
-    "react-refresh": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ=="
-    },
-    "semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
-}
diff --git a/packages/server-render/.npm/package/npm-shrinkwrap.json b/packages/server-render/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 1b3236a19a..0000000000
--- a/packages/server-render/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="
-    },
-    "combined-stream2": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/combined-stream2/-/combined-stream2-1.1.2.tgz",
-      "integrity": "sha512-sVqUHJmbdVm+HZWy4l34BPLczxI4fltN4Bm2vcvASsqBIXW4xFb4TRkwM8bw/UUXK9/OdHdAwi2cRYVEKrxzbg=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "magic-string": {
-      "version": "0.25.7",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
-    },
-    "promise-polyfill": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz",
-      "integrity": "sha512-7rrONfyLkDEc7OJ5QBkqa4KI4EBhCd340xRuIUPGCfu13znS+vx+VDdrT9ODAJHlXm7w4lbxN3DRjyv58EuzDg=="
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    },
-    "stream-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz",
-      "integrity": "sha512-aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg=="
-    },
-    "stream-to-string": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/stream-to-string/-/stream-to-string-1.2.0.tgz",
-      "integrity": "sha512-8drZlFIKBHSMdX9GCWv8V9AAWnQcTqw0iAI6/GC7UJ0H0SwKeFKjOoZfGY1tOU00GGU7FYZQoJ/ZCUEoXhD7yQ=="
-    }
-  }
-}
diff --git a/packages/socket-stream-client/.npm/package/npm-shrinkwrap.json b/packages/socket-stream-client/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index eaf34702ea..0000000000
--- a/packages/socket-stream-client/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="
-    },
-    "http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
-    "permessage-deflate": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.7.tgz",
-      "integrity": "sha512-EUNi/RIsyJ1P1u9QHFwMOUWMYetqlE22ZgGbad7YP856WF4BFF0B7DuNy6vEGsgNNud6c/SkdWzkne71hH8MjA=="
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
-    }
-  }
-}
diff --git a/packages/test-server-tests-in-console-once/.npm/package/npm-shrinkwrap.json b/packages/test-server-tests-in-console-once/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 51c79d70fa..0000000000
--- a/packages/test-server-tests-in-console-once/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.has": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
-      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
-    }
-  }
-}
diff --git a/packages/tinytest/.npm/package/npm-shrinkwrap.json b/packages/tinytest/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index b0da3142b7..0000000000
--- a/packages/tinytest/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    }
-  }
-}
diff --git a/packages/url/.npm/package/npm-shrinkwrap.json b/packages/url/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 22efd2d68d..0000000000
--- a/packages/url/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "core-js": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
-      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw=="
-    }
-  }
-}
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 6a7731a654..0000000000
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,576 +0,0 @@
-{
-  "lockfileVersion": 4,
-  "dependencies": {
-    "@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg=="
-    },
-    "@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="
-    },
-    "@types/express": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.0.tgz",
-      "integrity": "sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ=="
-    },
-    "@types/express-serve-static-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
-      "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA=="
-    },
-    "@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
-    },
-    "@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
-    },
-    "@types/node": {
-      "version": "22.8.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.7.tgz",
-      "integrity": "sha512-LidcG+2UeYIWcMuMUpBKOnryBWG/rnmOHQR5apjn8myTQcx3rinFRn7DcIFhMnS0PPFSC6OafdIKEad0lj6U0Q=="
-    },
-    "@types/qs": {
-      "version": "6.9.16",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz",
-      "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A=="
-    },
-    "@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
-    },
-    "@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA=="
-    },
-    "@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw=="
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="
-    },
-    "array-flatten": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-3.0.0.tgz",
-      "integrity": "sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA=="
-    },
-    "body-parser": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.0.2.tgz",
-      "integrity": "sha512-SNMk0OONlQ01uk8EPeiBvTW7W4ovpL5b1O3t1sjpPgfxOQ6BqQJ6XjxinDPR79Z6HdcD5zBBwr5ssiTlgdNztQ==",
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="
-        },
-        "media-typer": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-          "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
-        },
-        "type-is": {
-          "version": "1.6.18",
-          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-          "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
-        }
-      }
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
-    },
-    "call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="
-    },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="
-    },
-    "content-disposition": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
-      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
-      }
-    },
-    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
-    },
-    "cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
-    },
-    "cookie-parser": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz",
-      "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
-    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="
-    },
-    "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-    },
-    "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
-    },
-    "errorhandler": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz",
-      "integrity": "sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="
-    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
-    },
-    "express": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-5.0.1.tgz",
-      "integrity": "sha512-ORF7g6qGnD+YtUG9yx4DFoqCShNMmUKiXuT5oWMHiOvt/4WFbHC6yCwQMTSBMno7AqntNCAzzcnnjowRkTL9eQ==",
-      "dependencies": {
-        "accepts": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
-          "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="
-        },
-        "cookie": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-          "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
-        },
-        "cookie-signature": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
-          "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="
-        },
-        "debug": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-          "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg=="
-        },
-        "mime-types": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.0.tgz",
-          "integrity": "sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "negotiator": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-          "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.0.0.tgz",
-      "integrity": "sha512-MX6Zo2adDViYh+GcxxB1dpO43eypOGUOL12rLCOTMQv/DfIbpSJUy4oQIIZhVZkH9e+bZWKMon0XHFEju16tkQ==",
-      "dependencies": {
-        "encodeurl": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-          "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-        }
-      }
-    },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-    },
-    "fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
-      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="
-    },
-    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-    },
-    "get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="
-    },
-    "has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="
-    },
-    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="
-    },
-    "iconv-lite": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
-      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-    },
-    "is-promise": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
-      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
-    },
-    "lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="
-    },
-    "media-typer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="
-    },
-    "merge-descriptors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
-      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
-    },
-    "mime-db": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
-      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": {
-          "version": "1.52.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-    },
-    "object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="
-    },
-    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "path-to-regexp": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
-      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ=="
-    },
-    "promise-polyfill": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz",
-      "integrity": "sha512-7rrONfyLkDEc7OJ5QBkqa4KI4EBhCd340xRuIUPGCfu13znS+vx+VDdrT9ODAJHlXm7w4lbxN3DRjyv58EuzDg=="
-    },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="
-    },
-    "qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "raw-body": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
-      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
-        "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="
-        }
-      }
-    },
-    "router": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/router/-/router-2.0.0.tgz",
-      "integrity": "sha512-dIM5zVoG8xhC6rnSN8uoAgFARwTE7BQs8YwHEvK0VCmfxQXMaOuA1uiR1IPwsW7JyK5iTt7Od/TC9StasS2NPQ=="
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "send": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-1.1.0.tgz",
-      "integrity": "sha512-v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==",
-      "dependencies": {
-        "debug": {
-          "version": "4.3.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-          "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="
-        },
-        "fresh": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-          "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.1.0.tgz",
-      "integrity": "sha512-A3We5UfEjG8Z7VkDv6uItWw6HY2bBSBJT1KtVESn6EOoOr2jAxNhxWCLY3jDE2WcuHXByWju74ck3ZgLwL8xmA=="
-    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="
-    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA=="
-    },
-    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-    },
-    "stream-to-string": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/stream-to-string/-/stream-to-string-1.2.1.tgz",
-      "integrity": "sha512-WsvTDNF8UYs369Yko3pcdTducQtYpzEZeOV7cTuReyFvOoA9S/DLJ6sYK+xPafSPHhUMpaxiljKYnT6JSFztIA=="
-    },
-    "tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w=="
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-    },
-    "type-is": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.0.tgz",
-      "integrity": "sha512-gd0sGezQYCbWSbkZr75mln4YBidWUN60+devscpLF5mtRDUpiaTvKpBNrdaCvel1NdR2k6vclXybU5fBd2i+nw==",
-      "dependencies": {
-        "mime-types": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.0.tgz",
-          "integrity": "sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w=="
-        }
-      }
-    },
-    "uap-core": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/uap-core/-/uap-core-0.16.0.tgz",
-      "integrity": "sha512-NwObJD5EgDPGWp86fvpyu94UBlYtHUIrk7F2n5J7bf3Cpu8X80qB7n6taM2gFhZGiKmlU/zUQ09Mc/yFgewnLg=="
-    },
-    "undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
-    },
-    "useragent-ng": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/useragent-ng/-/useragent-ng-2.4.3.tgz",
-      "integrity": "sha512-X08x6u8G/ZSVqQiN7f0KODtXq0HFUmjkmRdSaez0w350E6zCesLk/dZ7Sme7EQRHE6TSHo27DBxEHKbKEErWMg=="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "yamlparser": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/yamlparser/-/yamlparser-0.0.2.tgz",
-      "integrity": "sha512-Cou9FCGblEENtn1/8La5wkDM/ISMh2bzu5Wh7dYzCzA0o9jD4YGyLkUJxe84oPBGoB92f+Oy4ZjVhA8S0C2wlQ=="
-    }
-  }
-}

From 557f8d3546fa3ffaad90f6bfbbc003a94c772f8c Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 08:32:39 -0400
Subject: [PATCH 0788/1140] bump package versions so the sub deps are updated

---
 packages/ecmascript/package.js                     | 2 +-
 packages/minifier-js/package.js                    | 2 +-
 packages/non-core/coffeescript-compiler/package.js | 2 +-
 packages/non-core/coffeescript/package.js          | 2 +-
 packages/shell-server/package.js                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 1ad724b508..1d171485ae 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.9',
+  version: '0.16.10-beta310.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index e3128e55df..c4e1973b19 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: '3.0.0',
+  version: '3.0.1-beta310.0',
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
index 807f74a64e..3bb80863c5 100644
--- a/packages/non-core/coffeescript-compiler/package.js
+++ b/packages/non-core/coffeescript-compiler/package.js
@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '2.4.1'
+  version: '2.4.2-beta310.0'
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript/package.js b/packages/non-core/coffeescript/package.js
index eae0b138ac..230c19f999 100644
--- a/packages/non-core/coffeescript/package.js
+++ b/packages/non-core/coffeescript/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // so bumping the version of this package will be how they get newer versions
   // of `coffeescript-compiler`. If you change this, make sure to also update
   // ../coffeescript-compiler/package.js to match.
-  version: '2.7.1-rc300.0'
+  version: '2.7.2-beta310.0'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/shell-server/package.js b/packages/shell-server/package.js
index 2475bd39a0..99d54f9bcc 100644
--- a/packages/shell-server/package.js
+++ b/packages/shell-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "shell-server",
-  version: '0.6.0',
+  version: '0.6.1-beta310.0',
   summary: "Server-side component of the `meteor shell` command.",
   documentation: "README.md"
 });

From e00a11181944d0e080fc16a3732eb8dcce1aad95 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 08:32:48 -0400
Subject: [PATCH 0789/1140] exclude roles in command

---
 .envrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.envrc b/.envrc
index 47ab5b6410..0ea9402d01 100644
--- a/.envrc
+++ b/.envrc
@@ -20,7 +20,7 @@ function @get-ready {
 }
 
 function @test-packages {
-  TINYTEST_FILTER="$1" @meteor test-packages --exclude-archs=web.browser.legacy,web.cordova
+  TINYTEST_FILTER="$1" @meteor test-packages --exclude-archs=web.browser.legacy,web.cordova --exclude=roles
 }
 
 function @test-self {

From 4954976d9d0811f5bc6210d7df032e62a102af1e Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 1 Nov 2024 11:13:13 -0400
Subject: [PATCH 0790/1140] add test

---
 packages/ddp-client/test/livedata_tests.js | 98 ++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/packages/ddp-client/test/livedata_tests.js b/packages/ddp-client/test/livedata_tests.js
index 426c5bf832..1fb6c0aa1e 100644
--- a/packages/ddp-client/test/livedata_tests.js
+++ b/packages/ddp-client/test/livedata_tests.js
@@ -1193,6 +1193,104 @@ testAsyncMulti('livedata - methods with nested stubs', [
   },
 ]);
 
+const collName = `test-collection`;
+const coll = new Mongo.Collection(collName);
+
+if (Meteor.isServer) {
+  Meteor.publish(`pub-${collName}`, function () {
+    return coll.find();
+  });
+}
+
+Meteor.methods({
+  [`insert-${collName}`]: async function() {
+    return await coll.insertAsync({ value: 1 });
+  },
+  [`update-${collName}`]: async function(id) {
+    return await coll.updateAsync(id, { $set: { value: 2 } });
+  },
+  [`remove-${collName}`]: async function(id) {
+    return await coll.removeAsync(id);
+  }
+});
+
+if (Meteor.isClient) {
+  Tinytest.addAsync('livedata - method updated message with subscriptions', async function (test) {
+    let messages = [];
+
+    const onMessage = message => messages.push(EJSON.parse(message));
+
+    Meteor.connection._stream.on('message', onMessage);
+
+    const sub = Meteor.subscribe(`pub-${collName}`);
+
+    await new Promise(resolve => {
+      const id = setInterval(() => {
+        if (sub.ready()) {
+          clearInterval(id);
+          resolve();
+        }
+      }, 10);
+    });
+
+    let insertId;
+
+    try {
+      for (let i = 0; i < 100; i++) {
+        messages = [];
+
+        insertId = await Meteor.callAsync(`insert-${collName}`);
+
+        await Meteor.sleep(1)
+
+        const hasResult = messages.some(msg => msg.msg === 'result');
+        const hasAdded = messages.some(msg => msg.msg === 'added');
+        const hasUpdated = messages.some(msg =>
+          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+        );
+
+        test.isTrue(hasResult, `Iteration ${i}: Should receive RESULT message for insert`);
+        test.isTrue(hasAdded, `Iteration ${i}: Should receive ADDED message for insert`);
+        test.isTrue(hasUpdated, `Iteration ${i}: Should receive UPDATED message for insert`);
+
+        messages = [];
+
+        await Meteor.callAsync(`update-${collName}`, insertId);
+
+        await Meteor.sleep(1)
+
+        const hasUpdateResult = messages.some(msg => msg.msg === 'result');
+        const hasChanged = messages.some(msg => msg.msg === 'changed');
+        const hasUpdateUpdated = messages.some(msg =>
+          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+        );
+
+        test.isTrue(hasUpdateResult, `Iteration ${i}: Should receive RESULT message for update`);
+        test.isTrue(hasChanged, `Iteration ${i}: Should receive CHANGED message`);
+        test.isTrue(hasUpdateUpdated, `Iteration ${i}: Should receive UPDATED message for update`);
+
+        messages = [];
+
+        await Meteor.callAsync(`remove-${collName}`, insertId);
+
+        await Meteor.sleep(1)
+
+        const hasRemoveResult = messages.some(msg => msg.msg === 'result');
+        const hasRemoved = messages.some(msg => msg.msg === 'removed');
+        const hasRemoveUpdated = messages.some(msg =>
+          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+        );
+
+        test.isTrue(hasRemoveResult, `Iteration ${i}: Should receive RESULT message for remove`);
+        test.isTrue(hasRemoved, `Iteration ${i}: Should receive REMOVED message`);
+        test.isTrue(hasRemoveUpdated, `Iteration ${i}: Should receive UPDATED message for remove`);
+      }
+    } finally {
+      sub.stop();
+    }
+  });
+}
+
 // TODO [FIBERS] - check if this still makes sense to have
 
 //  Tinytest.addAsync('livedata - isAsync call', async function (test) {

From 855cfa712a7744f8f1e3b302c86cd7804710c6ea Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 1 Nov 2024 11:39:29 -0400
Subject: [PATCH 0791/1140] the result message is out of order

---
 packages/ddp-client/test/livedata_tests.js | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/ddp-client/test/livedata_tests.js b/packages/ddp-client/test/livedata_tests.js
index 1fb6c0aa1e..d297aafe58 100644
--- a/packages/ddp-client/test/livedata_tests.js
+++ b/packages/ddp-client/test/livedata_tests.js
@@ -1234,19 +1234,21 @@ if (Meteor.isClient) {
     });
 
     let insertId;
+    let resultId
 
     try {
-      for (let i = 0; i < 100; i++) {
+      for (let i = 0; i < 250; i++) {
         messages = [];
 
         insertId = await Meteor.callAsync(`insert-${collName}`);
 
-        await Meteor.sleep(1)
-
         const hasResult = messages.some(msg => msg.msg === 'result');
+
+        resultId = messages.find(msg => msg.msg === 'result').id;
+
         const hasAdded = messages.some(msg => msg.msg === 'added');
         const hasUpdated = messages.some(msg =>
-          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+          msg.msg === 'updated' && msg.methods?.includes(resultId)
         );
 
         test.isTrue(hasResult, `Iteration ${i}: Should receive RESULT message for insert`);
@@ -1257,12 +1259,13 @@ if (Meteor.isClient) {
 
         await Meteor.callAsync(`update-${collName}`, insertId);
 
-        await Meteor.sleep(1)
-
         const hasUpdateResult = messages.some(msg => msg.msg === 'result');
+
+        resultId = messages.find(msg => msg.msg === 'result').id;
+
         const hasChanged = messages.some(msg => msg.msg === 'changed');
         const hasUpdateUpdated = messages.some(msg =>
-          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+          msg.msg === 'updated' && msg.methods?.includes(resultId)
         );
 
         test.isTrue(hasUpdateResult, `Iteration ${i}: Should receive RESULT message for update`);
@@ -1273,12 +1276,13 @@ if (Meteor.isClient) {
 
         await Meteor.callAsync(`remove-${collName}`, insertId);
 
-        await Meteor.sleep(1)
-
         const hasRemoveResult = messages.some(msg => msg.msg === 'result');
+
+        resultId = messages.find(msg => msg.msg === 'result').id;
+
         const hasRemoved = messages.some(msg => msg.msg === 'removed');
         const hasRemoveUpdated = messages.some(msg =>
-          msg.msg === 'updated' && msg.methods?.includes(messages[0].id)
+          msg.msg === 'updated' && msg.methods?.includes(resultId)
         );
 
         test.isTrue(hasRemoveResult, `Iteration ${i}: Should receive RESULT message for remove`);

From ea082b0417b8b3790f36c2bedeabeb769eacefff Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 13:53:55 -0400
Subject: [PATCH 0792/1140] simplify code

---
 packages/accounts-password/password_server.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index e2537f2c5c..5e15f66fcb 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -1074,17 +1074,7 @@ Accounts.createUserVerifyingEmail =
 // method calling Accounts.createUser could set?
 //
 
-Accounts.createUserAsync =
-  async (options, callback) => {
-    options = { ...options };
-
-    // XXX allow an optional callback?
-    if (callback) {
-      throw new Error("Accounts.createUser with callback not supported on the server yet.");
-    }
-
-    return createUser(options);
-  };
+Accounts.createUserAsync = createUser
 
 // Create user directly on the server.
 //

From 8fee802b8b48b8c6127b934eb4163eea8c2890db Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 13:54:07 -0400
Subject: [PATCH 0793/1140] adjust doc

---
 packages/accounts-base/accounts_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index fdd45a2890..210fc004c7 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -244,7 +244,7 @@ export class AccountsCommon {
    * @param {Number} options.passwordResetTokenExpiration The number of milliseconds from when a link to reset password is sent until token expires and user can't reset password with the link anymore. If `passwordResetTokenExpirationInDays` is set, it takes precedent.
    * @param {Number} options.passwordEnrollTokenExpirationInDays The number of days from when a link to set initial password is sent until token expires and user can't set password with the link anymore. Defaults to 30.
    * @param {Number} options.passwordEnrollTokenExpiration The number of milliseconds from when a link to set initial password is sent until token expires and user can't set password with the link anymore. If `passwordEnrollTokenExpirationInDays` is set, it takes precedent.
-   * @param {Boolean} options.ambiguousErrorMessages Return ambiguous error messages from login failures to prevent user enumeration. Defaults to `false`, but in production environments it is recommended it defaults to `true`.
+   * @param {Boolean} options.ambiguousErrorMessages Return ambiguous error messages from login failures to prevent user enumeration. Defaults to `true`.
    * @param {Number} options.bcryptRounds Allows override of number of bcrypt rounds (aka work factor) used to store passwords. The default is 10.
    * @param {MongoFieldSpecifier} options.defaultFieldSelector To exclude by default large custom fields from `Meteor.user()` and `Meteor.findUserBy...()` functions when called without a field selector, and all `onLogin`, `onLoginFailure` and `onLogout` callbacks.  Example: `Accounts.config({ defaultFieldSelector: { myBigArray: 0 }})`. Beware when using this. If, for instance, you do not include `email` when excluding the fields, you can have problems with functions like `forgotPassword` that will break because they won't have the required data available. It's recommend that you always keep the fields `_id`, `username`, and `email`.
    * @param {String|Mongo.Collection} options.collection A collection name or a Mongo.Collection object to hold the users.

From a75a89acfdd78c46b1dea7d0e927c1c1f64428df Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 30 Oct 2024 13:54:12 -0400
Subject: [PATCH 0794/1140] add test

---
 packages/accounts-password/password_tests.js | 28 ++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 88461e7d91..b21b4e6d3d 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1896,4 +1896,32 @@ if (Meteor.isServer) (() => {
     test.equal(url.searchParams.get('test'), extraParams.test);
   });
 
+  Tinytest.addAsync('passwords - createUserAsync', async test => {
+    const username = Random.id();
+    const email = `${username}-intercept@example.com`;
+    const password = 'password';
+
+    const userId = await Accounts.createUserAsync({
+      username: username,
+      email: email,
+      password: password
+    });
+
+    test.isTrue(userId, 'User ID should be returned');
+    const user = await Meteor.users.findOneAsync(userId);
+    test.equal(user.username, username, 'Username should match');
+    test.equal(user.emails[0].address, email, 'Email should match');
+
+    Accounts.config({
+      ambiguousErrorMessages: false,
+    })
+
+    await test.throwsAsync(async () => {
+      await Accounts.createUserAsync({
+        username: username,
+        email: email,
+        password: password
+      });
+    }, 'already exists');
+  });
 })();

From 825379a1a21f05eea1bd81dbde5dd78203ebca5c Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 13:32:01 -0400
Subject: [PATCH 0795/1140] update versions

---
 packages/deprecated/http/.versions | 115 +++++++++++++++--------------
 1 file changed, 58 insertions(+), 57 deletions(-)

diff --git a/packages/deprecated/http/.versions b/packages/deprecated/http/.versions
index e434868a96..579d0d042d 100644
--- a/packages/deprecated/http/.versions
+++ b/packages/deprecated/http/.versions
@@ -1,57 +1,58 @@
-allow-deny@2.0.0-alpha300.18
-babel-compiler@7.11.0-alpha300.18
-babel-runtime@1.5.2-alpha300.18
-base64@1.0.13-alpha300.18
-binary-heap@1.0.12-alpha300.18
-blaze@3.0.0-alpha300.16
-boilerplate-generator@2.0.0-alpha300.18
-callback-hook@1.6.0-alpha300.18
-check@1.3.3-alpha300.18
-core-runtime@1.0.0-alpha300.18
-ddp@1.4.2-alpha300.18
-ddp-client@3.0.0-alpha300.18
-ddp-common@1.4.1-alpha300.18
-ddp-server@3.0.0-alpha300.18
-diff-sequence@1.1.3-alpha300.18
-dynamic-import@0.7.4-alpha300.18
-ecmascript@0.16.8-alpha300.18
-ecmascript-runtime@0.8.2-alpha300.18
-ecmascript-runtime-client@0.12.2-alpha300.18
-ecmascript-runtime-server@0.11.1-alpha300.18
-ejson@1.1.4-alpha300.18
-facts-base@1.0.2-alpha300.18
-fetch@0.1.4-alpha300.18
-geojson-utils@1.0.12-alpha300.18
-htmljs@2.0.0-alpha300.16
-http@3.0.0-alpha300.18
-id-map@1.2.0-alpha300.18
-inter-process-messaging@0.1.2-alpha300.18
-local-test:http@3.0.0-alpha300.18
-logging@1.3.3-alpha300.18
-meteor@2.0.0-alpha300.18
-minimongo@2.0.0-alpha300.18
-modern-browsers@0.1.10-alpha300.18
-modules@0.19.1-alpha300.18
-modules-runtime@0.13.2-alpha300.18
-mongo@2.0.0-alpha300.18
-mongo-decimal@0.1.4-alpha300.18
-mongo-dev-server@1.1.1-alpha300.18
-mongo-id@1.0.9-alpha300.18
-npm-mongo@4.16.1-alpha300.18
-observe-sequence@2.0.0-alpha300.16
-ordered-dict@1.2.0-alpha300.18
-promise@1.0.0-alpha300.18
-random@1.2.2-alpha300.18
-react-fast-refresh@0.2.8-alpha300.18
-reactive-var@1.0.13-alpha300.18
-reload@1.3.2-alpha300.18
-retry@1.1.1-alpha300.18
-routepolicy@1.1.2-alpha300.18
-socket-stream-client@0.5.2-alpha300.18
-test-helpers@2.0.0-alpha300.18
-tinytest@2.0.0-alpha300.18
-tracker@1.3.3-alpha300.18
-underscore@1.0.14-alpha300.18
-url@1.3.2
-webapp@2.0.0-alpha300.18
-webapp-hashing@1.1.2-alpha300.18
+allow-deny@2.0.0
+babel-compiler@7.11.1
+babel-runtime@1.5.2
+base64@1.0.13
+binary-heap@1.0.12
+blaze@3.0.0
+boilerplate-generator@2.0.0
+callback-hook@1.6.0
+check@1.4.4
+core-runtime@1.0.0
+ddp@1.4.2
+ddp-client@3.0.2
+ddp-common@1.4.4
+ddp-server@3.0.2
+diff-sequence@1.1.3
+dynamic-import@0.7.4
+ecmascript@0.16.9
+ecmascript-runtime@0.8.3
+ecmascript-runtime-client@0.12.2
+ecmascript-runtime-server@0.11.1
+ejson@1.1.4
+facts-base@1.0.2
+fetch@0.1.5
+geojson-utils@1.0.12
+htmljs@2.0.1
+http@3.0.0
+id-map@1.2.0
+inter-process-messaging@0.1.2
+local-test:http@3.0.0
+logging@1.3.5
+meteor@2.0.1
+minimongo@2.0.1
+modern-browsers@0.1.11
+modules@0.20.2
+modules-runtime@0.13.2
+mongo@2.0.2
+mongo-decimal@0.1.4
+mongo-dev-server@1.1.1
+mongo-id@1.0.9
+npm-mongo@4.17.4
+observe-sequence@2.0.0
+ordered-dict@1.2.0
+promise@1.0.0
+random@1.2.2
+react-fast-refresh@0.2.9
+reactive-var@1.0.13
+reload@1.3.2
+retry@1.1.1
+routepolicy@1.1.2
+socket-stream-client@0.5.3
+test-helpers@2.0.1
+tinytest@1.3.0
+tracker@1.3.4
+typescript@5.4.3
+underscore@1.6.4
+url@1.3.4
+webapp@2.0.3
+webapp-hashing@1.1.2

From 8f63e8cbe83aa3273318ed72ca39059a56f4e5f4 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 8 Nov 2024 14:54:50 -0400
Subject: [PATCH 0796/1140] ignore stylus

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a13c416d89..7120c09376 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ env:
     - CXX=g++-12
     - phantom=false
     - PUPPETEER_DOWNLOAD_PATH=~/.npm/chromium
-    - TEST_PACKAGES_EXCLUDE=roles
+    - TEST_PACKAGES_EXCLUDE=roles,stylus
 addons:
   apt:
     sources:

From b5fd7ac4308bec917d041bec3b75bab8b56dfa25 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Sat, 9 Nov 2024 22:13:13 -0400
Subject: [PATCH 0797/1140] adjust compression parameters and use
 permessage-deflate2 with threshold (only messages larger than 1kb (512 chars)
 are compressed by default)

---
 package-lock.json                        | 17 +++++++++++++++++
 package.json                             |  2 ++
 packages/ddp-server/package.js           |  2 +-
 packages/ddp-server/stream_server.js     | 17 ++++++++++++-----
 packages/socket-stream-client/node.js    |  4 ++--
 packages/socket-stream-client/package.js |  2 +-
 6 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9d647ebc5..2f50dcb896 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,8 @@
         "@babel/preset-react": "^7.18.6",
         "@types/lodash.isempty": "^4.4.9",
         "@types/node": "^18.16.18",
+        "@types/sockjs": "^0.3.36",
+        "@types/sockjs-client": "^1.5.4",
         "@typescript-eslint/eslint-plugin": "^5.56.0",
         "@typescript-eslint/parser": "^5.56.0",
         "eslint": "^8.36.0",
@@ -1127,6 +1129,21 @@
       "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
       "dev": true
     },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/sockjs-client": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/sockjs-client/-/sockjs-client-1.5.4.tgz",
+      "integrity": "sha512-zk+uFZeWyvJ5ZFkLIwoGA/DfJ+pYzcZ8eH4H/EILCm2OBZyHH6Hkdna1/UWL/CFruh5wj6ES7g75SvUB0VsH5w==",
+      "dev": true
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
diff --git a/package.json b/package.json
index 5b0390a9b6..a21df794cd 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,8 @@
     "@babel/preset-react": "^7.18.6",
     "@types/lodash.isempty": "^4.4.9",
     "@types/node": "^18.16.18",
+    "@types/sockjs": "^0.3.36",
+    "@types/sockjs-client": "^1.5.4",
     "@typescript-eslint/eslint-plugin": "^5.56.0",
     "@typescript-eslint/parser": "^5.56.0",
     "eslint": "^8.36.0",
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index a6ceaa8c90..8f72e3b8e2 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -5,7 +5,7 @@ Package.describe({
 });
 
 Npm.depends({
-  "permessage-deflate": "0.1.7",
+  "permessage-deflate2": "0.1.8-alpha.1",
   sockjs: "0.3.24",
   "lodash.once": "4.1.1",
   "lodash.isempty": "4.4.0",
diff --git a/packages/ddp-server/stream_server.js b/packages/ddp-server/stream_server.js
index d57b81456c..6b3fad8de1 100644
--- a/packages/ddp-server/stream_server.js
+++ b/packages/ddp-server/stream_server.js
@@ -1,4 +1,5 @@
 import once from 'lodash.once';
+import zlib from 'node:zlib';
 
 // By default, we use the permessage-deflate extension with default
 // configuration. If $SERVER_WEBSOCKET_COMPRESSION is set, then it must be valid
@@ -14,12 +15,18 @@ import once from 'lodash.once';
 var websocketExtensions = once(function () {
   var extensions = [];
 
-  var websocketCompressionConfig = process.env.SERVER_WEBSOCKET_COMPRESSION
-        ? JSON.parse(process.env.SERVER_WEBSOCKET_COMPRESSION) : {};
+  var websocketCompressionConfig = process.env.SERVER_WEBSOCKET_COMPRESSION ?
+    JSON.parse(process.env.SERVER_WEBSOCKET_COMPRESSION) : {};
+
   if (websocketCompressionConfig) {
-    extensions.push(Npm.require('permessage-deflate').configure(
-      websocketCompressionConfig
-    ));
+    extensions.push(Npm.require('permessage-deflate2').configure({
+      threshold: 512,
+      level: zlib.constants.Z_BEST_SPEED,
+      memLevel: zlib.constants.Z_MIN_MEMLEVEL,
+      noContextTakeover: true,
+      maxWindowBits: zlib.constants.Z_MIN_WINDOWBITS,
+      ...(websocketCompressionConfig || {})
+    }));
   }
 
   return extensions;
diff --git a/packages/socket-stream-client/node.js b/packages/socket-stream-client/node.js
index 708c8a1711..26bae21b50 100644
--- a/packages/socket-stream-client/node.js
+++ b/packages/socket-stream-client/node.js
@@ -1,6 +1,6 @@
 import { Meteor } from "meteor/meteor";
-import { toWebsocketUrl } from "./urls.js";
 import { StreamClientCommon } from "./common.js";
+import { toWebsocketUrl } from "./urls.js";
 
 // @param endpoint {String} URL to Meteor app
 //   "http://subdomain.meteor.com/" or "/" or
@@ -132,7 +132,7 @@ export class ClientStream extends StreamClientCommon {
     // require the module if we actually create a server-to-server
     // connection.
     var FayeWebSocket = Npm.require('faye-websocket');
-    var deflate = Npm.require('permessage-deflate');
+    var deflate = Npm.require('permessage-deflate2');
 
     var targetUrl = toWebsocketUrl(this.endpoint);
     var fayeOptions = {
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index a49c533e6d..ab4c7781f3 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -7,7 +7,7 @@ Package.describe({
 
 Npm.depends({
   "faye-websocket": "0.11.4",
-  "permessage-deflate": "0.1.7",
+  "permessage-deflate2": "0.1.8-alpha.1",
   "lodash.isequal": "4.5.0",
   "lodash.once": "4.1.1"
 });

From c43b50381476825be175d5fb384c4c329b1d82a2 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Sun, 10 Nov 2024 08:54:13 -0400
Subject: [PATCH 0798/1140] fix using rosetta on macos for mongod

---
 scripts/generate-dev-bundle.sh | 10 ++++++++--
 tools/runners/run-mongo.js     |  7 +------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 8e0de641e8..792539fe66 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -70,9 +70,8 @@ case $OS in
         ;;
 esac
 
-
 if [ $OS = "macos" ] && [ "$(uname -m)" = "arm64" ] ; then
-  MONGO_NAME="mongodb-${OS}-x86_64-${MONGO_VERSION}"
+  MONGO_NAME="mongodb-${OS}-arm64-${MONGO_VERSION}"
 elif [ $OS = "linux" ] && [ "$ARCH" = "aarch64" ] ; then
   MONGO_NAME="mongodb-linux-aarch64-ubuntu2204-${MONGO_VERSION}"
 else
@@ -84,6 +83,13 @@ MONGO_URL="${MONGO_BASE_URL}/${MONGO_TGZ}"
 echo "Downloading Mongo from ${MONGO_URL}"
 curl -L "${MONGO_URL}" | tar zx
 
+# The tarball outputs as folder name "mongodb-macos-aarch64-X.X.X" even though the URL and the tarball name suggest "mongodb-macos-arm64-X.X.X"
+# So we need to rename the folder to match the expected folder name
+# Watch out for newer versions of the tarball that might already be named correctly
+if [ $OS = "macos" ] && [ "$(uname -m)" = "arm64" ] ; then
+  MONGO_NAME=$(echo "$MONGO_NAME" | sed 's/arm64/aarch64/g')
+fi
+
 # Put Mongo binaries in the right spot (mongodb/bin)
 mkdir -p "mongodb/bin"
 mv "${MONGO_NAME}/bin/mongod" "mongodb/bin"
diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index f96a126562..5e981334aa 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -1,3 +1,4 @@
+import { loadIsopackage } from '../tool-env/isopackets.js';
 import { MongoExitCodes } from '../utils/mongo-exit-codes';
 var files = require('../fs/files');
 var utils = require('../utils/utils.js');
@@ -5,7 +6,6 @@ var fiberHelpers = require('../utils/fiber-helpers.js');
 var runLog = require('./run-log.js');
 var child_process = require('child_process');
 var _ = require('underscore');
-import { loadIsopackage } from '../tool-env/isopackets.js';
 var Console = require('../console/console.js').Console;
 
 // Given a Mongo URL, open an interactive Mongo shell on this terminal
@@ -51,11 +51,6 @@ function spawnMongod(mongodPath, port, dbPath, replSetName) {
     args.push('--storageEngine', 'mmapv1', '--smallfiles');
   }
 
-  // run with rosetta on mac m1
-  if (process.platform === 'darwin' && process.arch === 'arm64') {
-    args = ['-x86_64', mongodPath, ...args];
-    mongodPath = 'arch';
-  }
   return child_process.spawn(mongodPath, args, {
     // Apparently in some contexts, Mongo crashes if your locale isn't set up
     // right. I wasn't able to reproduce it, but many people on #4019

From 466e849f95f456aaef6ac70fb7b190b282285173 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 11 Nov 2024 11:01:21 -0400
Subject: [PATCH 0799/1140] - Migrate all the tests from Roles to Tinytests

---
 .envrc                                        |    4 +-
 .travis.yml                                   |    2 +-
 .../force-ssl-common/.npm/package/.gitignore  |    1 -
 packages/force-ssl-common/.npm/package/README |    7 -
 packages/roles/package.js                     |   16 +-
 packages/roles/roles_server.js                |    2 +-
 packages/roles/tests/client.js                |  240 +-
 packages/roles/tests/clientAsync.js           |  261 +-
 packages/roles/tests/serverAsync.js           | 4458 ++++++++++-------
 9 files changed, 2946 insertions(+), 2045 deletions(-)
 delete mode 100644 packages/force-ssl-common/.npm/package/.gitignore
 delete mode 100644 packages/force-ssl-common/.npm/package/README

diff --git a/.envrc b/.envrc
index 0ea9402d01..b1f3cbd76f 100644
--- a/.envrc
+++ b/.envrc
@@ -20,7 +20,7 @@ function @get-ready {
 }
 
 function @test-packages {
-  TINYTEST_FILTER="$1" @meteor test-packages --exclude-archs=web.browser.legacy,web.cordova --exclude=roles
+  TINYTEST_FILTER="$1" @meteor test-packages --exclude-archs=web.browser.legacy,web.cordova
 }
 
 function @test-self {
@@ -54,4 +54,4 @@ function @docs-start {
 
 function @docs-migration-start {
   npm run docs:dev --prefix "$ROOT_DIR/v3-docs/v3-migration-docs"
-}
\ No newline at end of file
+}
diff --git a/.travis.yml b/.travis.yml
index 7120c09376..6d58476294 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ env:
     - CXX=g++-12
     - phantom=false
     - PUPPETEER_DOWNLOAD_PATH=~/.npm/chromium
-    - TEST_PACKAGES_EXCLUDE=roles,stylus
+    - TEST_PACKAGES_EXCLUDE=stylus
 addons:
   apt:
     sources:
diff --git a/packages/force-ssl-common/.npm/package/.gitignore b/packages/force-ssl-common/.npm/package/.gitignore
deleted file mode 100644
index 3c3629e647..0000000000
--- a/packages/force-ssl-common/.npm/package/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/packages/force-ssl-common/.npm/package/README b/packages/force-ssl-common/.npm/package/README
deleted file mode 100644
index 3d492553a4..0000000000
--- a/packages/force-ssl-common/.npm/package/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory and the files immediately inside it are automatically generated
-when you change this package's NPM dependencies. Commit the files in this
-directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
-so that others run the same versions of sub-dependencies.
-
-You should NOT check in the node_modules directory that Meteor automatically
-creates; if you are using git, the .gitignore file tells git to ignore it.
diff --git a/packages/roles/package.js b/packages/roles/package.js
index 3652a5975d..d7bfdf7b83 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -27,18 +27,14 @@ Package.onUse(function (api) {
 });
 
 Package.onTest(function (api) {
-  // Add code coverage
-  api.use([
-    "lmieulet:meteor-legacy-coverage",
-    "lmieulet:meteor-coverage@4.1.0 || 5.0.0",
-    "meteortesting:mocha@2.1.0 || 3.2.0",
-  ]);
-
   const both = ["client", "server"];
 
-  // `accounts-password` is included so `Meteor.users` exists
-
-  api.use(["ecmascript", "alanning:roles", "mongo"], both);
+  api.use([
+    "tinytest",
+    "ecmascript",
+    "mongo",
+    "roles"
+  ], both);
 
   api.addFiles("tests/serverAsync.js", "server");
   api.addFiles("tests/client.js", "client");
diff --git a/packages/roles/roles_server.js b/packages/roles/roles_server.js
index 451d8c8db9..436c26cfc7 100644
--- a/packages/roles/roles_server.js
+++ b/packages/roles/roles_server.js
@@ -1,4 +1,4 @@
-import { RolesCollection, RoleAssignmentCollection } from 'packages/roles/roles_common_async'
+import { RolesCollection, RoleAssignmentCollection } from './roles_common_async';
 
 const indexFnAssignment = RoleAssignmentCollection.createIndexAsync.bind(RoleAssignmentCollection)
 const indexFnRoles = RolesCollection.createIndexAsync.bind(RolesCollection)
diff --git a/packages/roles/tests/client.js b/packages/roles/tests/client.js
index f8ef4e2e52..824e5702d9 100644
--- a/packages/roles/tests/client.js
+++ b/packages/roles/tests/client.js
@@ -1,138 +1,152 @@
 /* eslint-env mocha */
 /* global Roles */
 
-import { Meteor } from 'meteor/meteor'
-import { assert } from 'chai'
+import { Meteor } from "meteor/meteor";
+import { Tinytest } from "meteor/tinytest";
 
 // To ensure that the files are loaded for coverage
-import 'packages/roles/roles_client'
+import "../roles_client";
 
 const safeInsert = (collection, data) => {
   try {
-    collection.insert(data)
+    collection.insert(data);
   } catch (e) {}
+};
+
+const roles = ["admin", "editor", "user"];
+const users = {
+  eve: {
+    _id: "eve",
+  },
+  bob: {
+    _id: "bob",
+  },
+  joe: {
+    _id: "joe",
+  },
+};
+
+function testUser(test, username, expectedRoles, scope) {
+  const user = users[username];
+
+  // test using user object rather than userId to avoid mocking
+  for (const role of roles) {
+    const expected = expectedRoles.includes(role);
+    const msg =
+      username + " expected to have '" + role + "' permission but does not";
+    const nmsg = username + " had un-expected permission " + role;
+
+    if (expected) {
+      test.isTrue(Roles.userIsInRole(user, role, scope), msg);
+    } else {
+      test.isFalse(Roles.userIsInRole(user, role, scope), nmsg);
+    }
+  }
 }
 
-describe('roles', function () {
-  const roles = ['admin', 'editor', 'user']
-  const users = {
-    eve: {
-      _id: 'eve'
-    },
-    bob: {
-      _id: 'bob'
-    },
-    joe: {
-      _id: 'joe'
-    }
-  }
+function setupRoles() {
+  safeInsert(Meteor.roleAssignment, {
+    user: users.eve,
+    role: { _id: "admin" },
+    inheritedRoles: [{ _id: "admin" }],
+  });
+  safeInsert(Meteor.roleAssignment, {
+    user: users.eve,
+    role: { _id: "editor" },
+    inheritedRoles: [{ _id: "editor" }],
+  });
 
-  function testUser (username, expectedRoles, scope) {
-    const user = users[username]
+  safeInsert(Meteor.roleAssignment, {
+    user: users.bob,
+    role: { _id: "user" },
+    inheritedRoles: [{ _id: "user" }],
+    scope: "group1",
+  });
+  safeInsert(Meteor.roleAssignment, {
+    user: users.bob,
+    role: { _id: "editor" },
+    inheritedRoles: [{ _id: "editor" }],
+    scope: "group2",
+  });
 
-    // test using user object rather than userId to avoid mocking
-    for (const role of roles) {
-      const expected = expectedRoles.includes(role)
-      const msg = username + ' expected to have \'' + role + '\' permission but does not'
-      const nmsg = username + ' had un-expected permission ' + role
-
-      if (expected) {
-        assert.isTrue(Roles.userIsInRole(user, role, scope), msg)
-      } else {
-        assert.isFalse(Roles.userIsInRole(user, role, scope), nmsg)
-      }
-    }
-  }
-
-  let meteorUserMethod
-  before(() => {
-    meteorUserMethod = Meteor.user
-    // Mock Meteor.user() for isInRole handlebars helper testing
-    Meteor.user = function () {
-      return users.eve
-    }
-  })
-
-  after(() => {
-    Meteor.user = meteorUserMethod
-  })
-
-  beforeEach(() => {
-    safeInsert(Meteor.roleAssignment, {
-      user: users.eve,
-      role: { _id: 'admin' },
-      inheritedRoles: [{ _id: 'admin' }]
-    })
-    safeInsert(Meteor.roleAssignment, {
-      user: users.eve,
-      role: { _id: 'editor' },
-      inheritedRoles: [{ _id: 'editor' }]
-    })
-
-    safeInsert(Meteor.roleAssignment, {
-      user: users.bob,
-      role: { _id: 'user' },
-      inheritedRoles: [{ _id: 'user' }],
-      scope: 'group1'
-    })
-    safeInsert(Meteor.roleAssignment, {
-      user: users.bob,
-      role: { _id: 'editor' },
-      inheritedRoles: [{ _id: 'editor' }],
-      scope: 'group2'
-    })
-
-    safeInsert(Meteor.roleAssignment, {
-      user: users.joe,
-      role: { _id: 'admin' },
-      inheritedRoles: [{ _id: 'admin' }]
-    })
-    safeInsert(Meteor.roleAssignment, {
-      user: users.joe,
-      role: { _id: 'editor' },
-      inheritedRoles: [{ _id: 'editor' }],
-      scope: 'group1'
-    })
-  })
-
-  it('can check current users roles via template helper', function () {
-    let expected
-    let actual
+  safeInsert(Meteor.roleAssignment, {
+    user: users.joe,
+    role: { _id: "admin" },
+    inheritedRoles: [{ _id: "admin" }],
+  });
+  safeInsert(Meteor.roleAssignment, {
+    user: users.joe,
+    role: { _id: "editor" },
+    inheritedRoles: [{ _id: "editor" }],
+    scope: "group1",
+  });
+}
 
+Tinytest.add(
+  "roles - can check current users roles via template helper",
+  (test) => {
     if (!Roles._handlebarsHelpers) {
       // probably running package tests outside of a Meteor app.
       // skip this test.
-      return
+      return;
     }
 
-    const isInRole = Roles._handlebarsHelpers.isInRole
-    assert.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
+    const meteorUserMethod = Meteor.user;
+    Meteor.user = function () {
+      return users.eve;
+    };
 
-    expected = true
-    actual = isInRole('admin, editor')
-    assert.equal(actual, expected)
+    setupRoles();
 
-    expected = true
-    actual = isInRole('admin')
-    assert.equal(actual, expected)
+    const isInRole = Roles._handlebarsHelpers.isInRole;
+    test.equal(typeof isInRole, "function", "'isInRole' helper not registered");
 
-    expected = false
-    actual = isInRole('unknown')
-    assert.equal(actual, expected)
-  })
+    test.equal(isInRole("admin, editor"), true);
+    test.equal(isInRole("admin"), true);
+    test.equal(isInRole("unknown"), false);
 
-  it('can check if user is in role', function () {
-    testUser('eve', ['admin', 'editor'])
-  })
+    Meteor.user = meteorUserMethod;
+  }
+);
 
-  it('can check if user is in role by group', function () {
-    testUser('bob', ['user'], 'group1')
-    testUser('bob', ['editor'], 'group2')
-  })
+Tinytest.add("roles - can check if user is in role", (test) => {
+  const meteorUserMethod = Meteor.user;
+  Meteor.user = function () {
+    return users.eve;
+  };
 
-  it('can check if user is in role with Roles.GLOBAL_GROUP', function () {
-    testUser('joe', ['admin'])
-    testUser('joe', ['admin'], Roles.GLOBAL_GROUP)
-    testUser('joe', ['admin', 'editor'], 'group1')
-  })
-})
+  setupRoles();
+  testUser(test, "eve", ["admin", "editor"]);
+
+  Meteor.user = meteorUserMethod;
+});
+
+Tinytest.add("roles - can check if user is in role by group", (test) => {
+  const meteorUserMethod = Meteor.user;
+  Meteor.user = function () {
+    return users.eve;
+  };
+
+  setupRoles();
+  testUser(test, "bob", ["user"], "group1");
+  testUser(test, "bob", ["editor"], "group2");
+
+  Meteor.user = meteorUserMethod;
+});
+
+Tinytest.add(
+  "roles - can check if user is in role with Roles.GLOBAL_GROUP",
+  (test) => {
+    const meteorUserMethod = Meteor.user;
+    Meteor.user = function () {
+      return users.eve;
+    };
+
+    setupRoles();
+    testUser(test, "joe", ["admin"]);
+    testUser(test, "joe", ["admin"], Roles.GLOBAL_GROUP);
+    testUser(test, "joe", ["admin", "editor"], "group1");
+
+    Meteor.user = meteorUserMethod;
+  }
+);
diff --git a/packages/roles/tests/clientAsync.js b/packages/roles/tests/clientAsync.js
index 6df81cbaf4..1de707d668 100644
--- a/packages/roles/tests/clientAsync.js
+++ b/packages/roles/tests/clientAsync.js
@@ -1,142 +1,159 @@
-/* eslint-env mocha */
-/* global Roles */
-
-import { Meteor } from 'meteor/meteor'
-import chai, { assert } from 'chai'
-import chaiAsPromised from 'chai-as-promised'
+import { Meteor } from "meteor/meteor";
+import { Tinytest } from "meteor/tinytest";
 
 // To ensure that the files are loaded for coverage
-import 'packages/roles/roles_client'
-import 'packages/roles/roles_common_async'
-
-chai.use(chaiAsPromised)
+import "../roles_client";
+import "../roles_common_async";
 
 const safeInsert = async (collection, data) => {
-  return await collection.insertAsync(data).catch(e => console.error(e))
+  return await collection.insertAsync(data).catch((e) => console.error(e));
+};
+
+const roles = ["admin", "editor", "user"];
+const users = {
+  eve: {
+    _id: "eve",
+  },
+  bob: {
+    _id: "bob",
+  },
+  joe: {
+    _id: "joe",
+  },
+};
+
+async function testUser(test, username, expectedRoles, scope) {
+  const user = users[username];
+
+  // test using user object rather than userId to avoid mocking
+  for (const role of roles) {
+    const expected = expectedRoles.includes(role);
+    const msg =
+      username + " expected to have '" + role + "' permission but does not";
+    const nmsg = username + " had un-expected permission " + role;
+
+    const result = await Roles.userIsInRoleAsync(user._id, role, scope);
+    if (expected) {
+      test.isTrue(result, msg);
+    } else {
+      test.isFalse(result, nmsg);
+    }
+  }
 }
 
-describe('roles async', function () {
-  const roles = ['admin', 'editor', 'user']
-  const users = {
-    eve: {
-      _id: 'eve'
-    },
-    bob: {
-      _id: 'bob'
-    },
-    joe: {
-      _id: 'joe'
-    }
-  }
+async function setupRoles() {
+  await safeInsert(Meteor.roleAssignment, {
+    user: users.eve,
+    role: { _id: "admin" },
+    inheritedRoles: [{ _id: "admin" }],
+  });
+  await safeInsert(Meteor.roleAssignment, {
+    user: users.eve,
+    role: { _id: "editor" },
+    inheritedRoles: [{ _id: "editor" }],
+  });
 
-  async function testUser (username, expectedRoles, scope) {
-    const user = users[username]
+  await safeInsert(Meteor.roleAssignment, {
+    user: users.bob,
+    role: { _id: "user" },
+    inheritedRoles: [{ _id: "user" }],
+    scope: "group1",
+  });
+  await safeInsert(Meteor.roleAssignment, {
+    user: users.bob,
+    role: { _id: "editor" },
+    inheritedRoles: [{ _id: "editor" }],
+    scope: "group2",
+  });
 
-    // test using user object rather than userId to avoid mocking
-    for (const role of roles) {
-      const expected = expectedRoles.includes(role)
-      const msg = username + ' expected to have \'' + role + '\' permission but does not'
-      const nmsg = username + ' had un-expected permission ' + role
-
-      const result = await Roles.userIsInRoleAsync(user._id, role, scope)
-      if (expected) {
-        assert.isTrue(result, msg)
-      } else {
-        assert.isFalse(result, nmsg)
-      }
-    }
-  }
-
-  let meteorUserMethod
-  before(() => {
-    meteorUserMethod = Meteor.user
-    // Mock Meteor.user() for isInRole handlebars helper testing
-    Meteor.user = function () {
-      return users.eve
-    }
-    Meteor.subscribe('client_assignments')
-  })
-
-  after(() => {
-    Meteor.user = meteorUserMethod
-  })
-
-  beforeEach(async () => {
-    await safeInsert(Meteor.roleAssignment, {
-      user: users.eve,
-      role: { _id: 'admin' },
-      inheritedRoles: [{ _id: 'admin' }]
-    })
-    await safeInsert(Meteor.roleAssignment, {
-      user: users.eve,
-      role: { _id: 'editor' },
-      inheritedRoles: [{ _id: 'editor' }]
-    })
-
-    await safeInsert(Meteor.roleAssignment, {
-      user: users.bob,
-      role: { _id: 'user' },
-      inheritedRoles: [{ _id: 'user' }],
-      scope: 'group1'
-    })
-    await safeInsert(Meteor.roleAssignment, {
-      user: users.bob,
-      role: { _id: 'editor' },
-      inheritedRoles: [{ _id: 'editor' }],
-      scope: 'group2'
-    })
-
-    await safeInsert(Meteor.roleAssignment, {
-      user: users.joe,
-      role: { _id: 'admin' },
-      inheritedRoles: [{ _id: 'admin' }]
-    })
-    await safeInsert(Meteor.roleAssignment, {
-      user: users.joe,
-      role: { _id: 'editor' },
-      inheritedRoles: [{ _id: 'editor' }],
-      scope: 'group1'
-    })
-  })
-
-  it('can check current users roles via template helper', function () {
-    let expected
-    let actual
+  await safeInsert(Meteor.roleAssignment, {
+    user: users.joe,
+    role: { _id: "admin" },
+    inheritedRoles: [{ _id: "admin" }],
+  });
+  await safeInsert(Meteor.roleAssignment, {
+    user: users.joe,
+    role: { _id: "editor" },
+    inheritedRoles: [{ _id: "editor" }],
+    scope: "group1",
+  });
+}
 
+Tinytest.addAsync(
+  "roles async - can check current users roles via template helper",
+  async (test) => {
     if (!Roles._handlebarsHelpers) {
       // probably running package tests outside of a Meteor app.
       // skip this test.
-      return
+      return;
     }
 
-    const isInRole = Roles._handlebarsHelpers.isInRole
-    assert.equal(typeof isInRole, 'function', "'isInRole' helper not registered")
+    const meteorUserMethod = Meteor.user;
+    Meteor.user = function () {
+      return users.eve;
+    };
+    Meteor.subscribe("client_assignments");
 
-    expected = true
-    actual = isInRole('admin, editor')
-    assert.equal(actual, expected)
+    await setupRoles();
 
-    expected = true
-    actual = isInRole('admin')
-    assert.equal(actual, expected)
+    const isInRole = Roles._handlebarsHelpers.isInRole;
+    test.equal(typeof isInRole, "function", "'isInRole' helper not registered");
 
-    expected = false
-    actual = isInRole('unknown')
-    assert.equal(actual, expected)
-  })
+    test.equal(isInRole("admin, editor"), true);
+    test.equal(isInRole("admin"), true);
+    test.equal(isInRole("unknown"), false);
 
-  it('can check if user is in role', async function () {
-    await testUser('eve', ['admin', 'editor'])
-  })
+    Meteor.user = meteorUserMethod;
+  }
+);
 
-  it('can check if user is in role by group', async function () {
-    await testUser('bob', ['user'], 'group1')
-    await testUser('bob', ['editor'], 'group2')
-  })
+Tinytest.addAsync(
+  "roles async - can check if user is in role",
+  async (test) => {
+    const meteorUserMethod = Meteor.user;
+    Meteor.user = function () {
+      return users.eve;
+    };
+    Meteor.subscribe("client_assignments");
 
-  it('can check if user is in role with Roles.GLOBAL_GROUP', async function () {
-    await testUser('joe', ['admin'])
-    await testUser('joe', ['admin'], Roles.GLOBAL_GROUP)
-    await testUser('joe', ['admin', 'editor'], 'group1')
-  })
-})
+    await setupRoles();
+    await testUser(test, "eve", ["admin", "editor"]);
+
+    Meteor.user = meteorUserMethod;
+  }
+);
+
+Tinytest.addAsync(
+  "roles async - can check if user is in role by group",
+  async (test) => {
+    const meteorUserMethod = Meteor.user;
+    Meteor.user = function () {
+      return users.eve;
+    };
+    Meteor.subscribe("client_assignments");
+
+    await setupRoles();
+    await testUser(test, "bob", ["user"], "group1");
+    await testUser(test, "bob", ["editor"], "group2");
+
+    Meteor.user = meteorUserMethod;
+  }
+);
+
+Tinytest.addAsync(
+  "roles async - can check if user is in role with Roles.GLOBAL_GROUP",
+  async (test) => {
+    const meteorUserMethod = Meteor.user;
+    Meteor.user = function () {
+      return users.eve;
+    };
+    Meteor.subscribe("client_assignments");
+
+    await setupRoles();
+    await testUser(test, "joe", ["admin"]);
+    await testUser(test, "joe", ["admin"], Roles.GLOBAL_GROUP);
+    await testUser(test, "joe", ["admin", "editor"], "group1");
+
+    Meteor.user = meteorUserMethod;
+  }
+);
diff --git a/packages/roles/tests/serverAsync.js b/packages/roles/tests/serverAsync.js
index a381fc896a..1d207adeea 100644
--- a/packages/roles/tests/serverAsync.js
+++ b/packages/roles/tests/serverAsync.js
@@ -1,2146 +1,3028 @@
-/* eslint-env mocha */
-/* global Roles */
-
-import { Meteor } from 'meteor/meteor'
-import chai, { assert } from 'chai'
-import chaiAsPromised from 'chai-as-promised'
+import { Meteor } from "meteor/meteor";
+import { Tinytest } from "meteor/tinytest";
 
 // To ensure that the files are loaded for coverage
-import 'packages/roles/roles_common_async'
-
-chai.use(chaiAsPromised)
+import "../roles_common_async";
 
 // Publication for the client tests
-Meteor.publish('client_assignments', async () => {
-  return Meteor.roleAssignment.find()
-})
+Meteor.publish("client_assignments", async () => {
+  return Meteor.roleAssignment.find();
+});
 
 // To allow inserting on the client, needed for testing.
-if (Meteor.release.split('@')[1][0] === '2') {
-  Meteor.roleAssignment.allow({
-    insert () { return true },
-    update () { return true },
-    remove () { return true }
-  })
-} else {
-  // Meteor 3+
-  Meteor.roleAssignment.allow({
-    insert () { return true },
-    insertAsync () { return true },
-    update () { return true },
-    updateAsync () { return true },
-    remove () { return true },
-    removeAsync () { return true }
-  })
+Meteor.roleAssignment.allow({
+  insert() {
+    return true;
+  },
+  insertAsync() {
+    return true;
+  },
+  update() {
+    return true;
+  },
+  updateAsync() {
+    return true;
+  },
+  remove() {
+    return true;
+  },
+  removeAsync() {
+    return true;
+  },
+});
+
+const hasAnyKeys = (test, obj, keys) => {
+  if (typeof keys === "string") {
+    keys = [keys];
+  }
+  const hasKey = keys.some((key) =>
+    Object.prototype.hasOwnProperty.call(obj, key)
+  );
+  test.equal(
+    hasKey,
+    true,
+    `Object should have at least one of these keys: ${keys.join(", ")}`
+  );
+};
+
+const sameMembers = (test, value, expected) => {
+  // Sort arrays to ensure consistent order
+  const sortedValue = [...value].sort();
+  const sortedExpected = [...expected].sort();
+
+  test.equal(
+    JSON.stringify(sortedValue),
+    JSON.stringify(sortedExpected),
+    "Arrays should have the same members"
+  );
+};
+
+const sameDeepMembers = (test, value, expected) => {
+  // Helper to sort object keys recursively
+  const sortObjectKeys = (obj) => {
+    if (Array.isArray(obj)) {
+      return obj.map(sortObjectKeys);
+    }
+    if (obj && typeof obj === "object") {
+      return Object.keys(obj)
+        .sort()
+        .reduce((sorted, key) => {
+          sorted[key] = sortObjectKeys(obj[key]);
+          return sorted;
+        }, {});
+    }
+    return obj;
+  };
+
+  const sortedValue = sortObjectKeys(value);
+  const sortedExpected = sortObjectKeys(expected);
+
+  test.equal(
+    JSON.stringify(sortedValue),
+    JSON.stringify(sortedExpected),
+    "Role assignments should match expected structure"
+  );
+};
+
+const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop);
+
+let users = {};
+const roles = ["admin", "editor", "user"];
+
+Meteor.publish("_roleAssignments", function () {
+  const loggedInUserId = this.userId;
+  if (!loggedInUserId) {
+    this.ready();
+    return;
+  }
+  return Meteor.roleAssignment.find({ _id: loggedInUserId });
+});
+
+async function addUser(name) {
+  return await Meteor.users.insertAsync({ username: name });
 }
 
-const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop)
+async function testUser(test, username, expectedRoles, scope) {
+  const userId = users[username];
+  const userObj = await Meteor.users.findOneAsync({ _id: userId });
 
-describe('roles async', async function () {
-  let users = {}
-  const roles = ['admin', 'editor', 'user']
+  // check using user ids (makes db calls)
+  await _innerTest(test, userId, username, expectedRoles, scope);
 
-  Meteor.publish('_roleAssignments', function () {
-    const loggedInUserId = this.userId
+  // check using passed-in user object
+  await _innerTest(test, userObj, username, expectedRoles, scope);
+}
 
-    if (!loggedInUserId) {
-      this.ready()
-      return
-    }
+async function _innerTest(test, userParam, username, expectedRoles, scope) {
+  // test that user has only the roles expected and no others
+  for (const role of roles) {
+    const expected = expectedRoles.includes(role);
+    const msg = username + " expected to have '" + role + "' role but does not";
+    const nmsg = username + " had the following un-expected role: " + role;
 
-    return Meteor.roleAssignment.find({ _id: loggedInUserId })
-  })
-
-  async function addUser (name) {
-    return await Meteor.users.insertAsync({ username: name })
-  }
-
-  async function testUser (username, expectedRoles, scope) {
-    const userId = users[username]
-    const userObj = await Meteor.users.findOneAsync({ _id: userId })
-
-    // check using user ids (makes db calls)
-    await _innerTest(userId, username, expectedRoles, scope)
-
-    // check using passed-in user object
-    await _innerTest(userObj, username, expectedRoles, scope)
-  }
-
-  async function _innerTest (userParam, username, expectedRoles, scope) {
-    // test that user has only the roles expected and no others
-    for (const role of roles) {
-      const expected = expectedRoles.includes(role)
-      const msg = username + ' expected to have \'' + role + '\' role but does not'
-      const nmsg = username + ' had the following un-expected role: ' + role
-
-      if (expected) {
-        assert.isTrue(await Roles.userIsInRoleAsync(userParam, role, scope), msg)
-      } else {
-        assert.isFalse(await Roles.userIsInRoleAsync(userParam, role, scope), nmsg)
-      }
+    const result = await Roles.userIsInRoleAsync(userParam, role, scope);
+    if (expected) {
+      test.equal(result, true, msg);
+    } else {
+      test.equal(result, false, nmsg);
     }
   }
+}
 
-  beforeEach(async function () {
-    await Meteor.roles.removeAsync({})
-    await Meteor.roleAssignment.removeAsync({})
-    await Meteor.users.removeAsync({})
+async function clearData() {
+  await Meteor.roles.removeAsync({});
+  await Meteor.roleAssignment.removeAsync({});
+  await Meteor.users.removeAsync({});
 
-    users = {
-      eve: await addUser('eve'),
-      bob: await addUser('bob'),
-      joe: await addUser('joe')
-    }
-  })
+  users = {
+    eve: await addUser("eve"),
+    bob: await addUser("bob"),
+    joe: await addUser("joe"),
+  };
+}
 
-  it('can create and delete roles', async function () {
-    const role1Id = await Roles.createRoleAsync('test1')
-    const test1a = await Meteor.roles.findOneAsync()
-    const test1b = await Meteor.roles.findOneAsync(role1Id)
-    assert.equal(test1a._id, 'test1')
-    assert.equal(test1b._id, 'test1')
+Tinytest.addAsync("roles -can create and delete roles", async function (test) {
+  await clearData();
+  const role1Id = await Roles.createRoleAsync("test1");
+  const test1a = await Meteor.roles.findOneAsync();
+  const test1b = await Meteor.roles.findOneAsync(role1Id);
+  test.equal(test1a._id, "test1");
+  test.equal(test1b._id, "test1");
 
-    const role2Id = await Roles.createRoleAsync('test2')
-    const test2a = await Meteor.roles.findOneAsync({ _id: 'test2' })
-    const test2b = await Meteor.roles.findOneAsync(role2Id)
-    assert.equal(test2a._id, 'test2')
-    assert.equal(test2b._id, 'test2')
+  const role2Id = await Roles.createRoleAsync("test2");
+  const test2a = await Meteor.roles.findOneAsync({ _id: "test2" });
+  const test2b = await Meteor.roles.findOneAsync(role2Id);
+  test.equal(test2a._id, "test2");
+  test.equal(test2b._id, "test2");
 
-    assert.equal(await Meteor.roles.countDocuments(), 2)
+  test.equal(await Meteor.roles.countDocuments(), 2);
 
-    await Roles.deleteRoleAsync('test1')
-    const undefinedTest = await Meteor.roles.findOneAsync({ _id: 'test1' })
-    assert.equal(typeof undefinedTest, 'undefined')
+  await Roles.deleteRoleAsync("test1");
+  const undefinedTest = await Meteor.roles.findOneAsync({ _id: "test1" });
+  test.equal(typeof undefinedTest, "undefined");
 
-    await Roles.deleteRoleAsync('test2')
-    const undefinedTest2 = await Meteor.roles.findOneAsync()
-    assert.equal(typeof undefinedTest2, 'undefined')
-  })
+  await Roles.deleteRoleAsync("test2");
+  const undefinedTest2 = await Meteor.roles.findOneAsync();
+  test.equal(typeof undefinedTest2, "undefined");
+});
 
-  it('can try to remove non-existing roles without crashing', async function () {
+Tinytest.addAsync(
+  "roles -can try to remove non-existing roles without crashing",
+  async function (test) {
+    await clearData();
     try {
-      await Roles.deleteRoleAsync('non-existing-role')
+      await Roles.deleteRoleAsync("non-existing-role");
     } catch (e) {
-      assert.notExists(e)
+      test.notExists(e);
     }
     // Roles.deleteRoleAsync('non-existing-role').should.be.fulfilled
-  })
+  }
+);
+
+Tinytest.addAsync("roles -can't create duplicate roles", async function (test) {
+  await clearData();
+  try {
+    await Roles.createRoleAsync("test1");
+  } catch (e) {
+    test.notExists(e);
+  }
+  try {
+    await Roles.createRoleAsync("test1");
+  } catch (e) {
+    test.exists(e);
+  }
+  test.isNull(await Roles.createRoleAsync("test1", { unlessExists: true }));
+});
+
+Tinytest.addAsync(
+  "roles - can't create role with empty names",
+  async (test) => {
+    await clearData();
 
-  it('can\'t create duplicate roles', async function () {
     try {
-      await Roles.createRoleAsync('test1')
+      await Roles.createRoleAsync("");
+      test.fail("Should throw error for empty name");
     } catch (e) {
-      assert.notExists(e)
+      test.matches(e.message, /Invalid role name/);
     }
-    // assert.eventually.throws(Roles.createRoleAsync('test1'))
+
     try {
-      await Roles.createRoleAsync('test1')
+      await Roles.createRoleAsync(null);
+      test.fail("Should throw error for null name");
     } catch (e) {
-      assert.exists(e)
+      test.matches(e.message, /Invalid role name/);
     }
-    assert.isNull(await Roles.createRoleAsync('test1', { unlessExists: true }))
-  })
 
-  it('can\'t create role with empty names', async function () {
-    await assert.isRejected(Roles.createRoleAsync(''), /Invalid role name/)
-    await assert.isRejected(Roles.createRoleAsync(null), /Invalid role name/)
-    await assert.isRejected(Roles.createRoleAsync(' '), /Invalid role name/)
-    await assert.isRejected(Roles.createRoleAsync(' foobar'), /Invalid role name/)
-    await assert.isRejected(Roles.createRoleAsync(' foobar '), /Invalid role name/)
-  })
+    try {
+      await Roles.createRoleAsync(" ");
+      test.fail("Should throw error for space name");
+    } catch (e) {
+      test.matches(e.message, /Invalid role name/);
+    }
 
-  it('can\'t use invalid scope names', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
+    try {
+      await Roles.createRoleAsync(" foobar");
+      test.fail("Should throw error for leading space");
+    } catch (e) {
+      test.matches(e.message, /Invalid role name/);
+    }
 
-    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ''), /Invalid scope name/)
-    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' '), /Invalid scope name/)
-    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' foobar'), /Invalid scope name/)
-    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], ' foobar '), /Invalid scope name/)
-    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 42), /Invalid scope name/)
-  })
+    try {
+      await Roles.createRoleAsync(" foobar ");
+      test.fail("Should throw error for trailing space");
+    } catch (e) {
+      test.matches(e.message, /Invalid role name/);
+    }
+  }
+);
 
-  it('can check if user is in role', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
+Tinytest.addAsync("roles - can't use invalid scope names", async (test) => {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
+  await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "scope1");
+  await Roles.addUsersToRolesAsync(users.eve, ["editor"], "scope2");
 
-    await testUser('eve', ['admin', 'user'])
-  })
+  try {
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "");
+    test.fail("Should throw error for empty scope");
+  } catch (e) {
+    test.matches(e.message, /Invalid scope name/);
+  }
 
-  it('can check if user is in role by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
+  try {
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], " ");
+    test.fail("Should throw error for space scope");
+  } catch (e) {
+    test.matches(e.message, /Invalid scope name/);
+  }
 
-    testUser('eve', ['admin', 'user'], 'scope1')
-    testUser('eve', ['editor'], 'scope2')
+  try {
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], " foobar");
+    test.fail("Should throw error for leading space in scope");
+  } catch (e) {
+    test.matches(e.message, /Invalid scope name/);
+  }
+});
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope2'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope1'))
+Tinytest.addAsync("roles -can check if user is in role", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"]);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], { anyScope: true }))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['editor'], { anyScope: true }))
-  })
+  await testUser(test, "eve", ["admin", "user"]);
+});
 
-  it('can check if user is in role by scope through options', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], { scope: 'scope1' })
-    await Roles.addUsersToRolesAsync(users.eve, ['editor'], { scope: 'scope2' })
+Tinytest.addAsync(
+  "roles -can check if user is in role by scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "scope1");
+    await Roles.addUsersToRolesAsync(users.eve, ["editor"], "scope2");
 
-    await testUser('eve', ['admin', 'user'], { scope: 'scope1' })
-    await testUser('eve', ['editor'], { scope: 'scope2' })
-  })
+    await testUser(test, "eve", ["admin", "user"], "scope1");
+    await testUser(test, "eve", ["editor"], "scope2");
 
-  it('can check if user is in role by scope with global role', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin'])
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, ["admin", "user"], "scope2")
+    );
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, ["editor"], "scope1")
+    );
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['user'], 'scope1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope2'))
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, ["admin", "user"], {
+        anyScope: true,
+      })
+    );
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, ["editor"], { anyScope: true })
+    );
+  }
+);
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user']))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor']))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user'], null))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], null))
+Tinytest.addAsync(
+  "roles -can check if user is in role by scope through options",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], {
+      scope: "scope1",
+    });
+    await Roles.addUsersToRolesAsync(users.eve, ["editor"], {
+      scope: "scope2",
+    });
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user'], 'scope2'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], 'scope1'))
+    await testUser(test, "eve", ["admin", "user"], { scope: "scope1" });
+    await testUser(test, "eve", ["editor"], { scope: "scope2" });
+  }
+);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin'], 'scope2'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin'], 'scope1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin']))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin'], null))
-  })
+Tinytest.addAsync(
+  "roles -can check if user is in role by scope with global role",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "scope1");
+    await Roles.addUsersToRolesAsync(users.eve, ["editor"], "scope2");
+    await Roles.addUsersToRolesAsync(users.eve, ["admin"]);
 
-  it('renaming scopes', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["user"], "scope1"));
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["editor"], "scope2"));
 
-    await testUser('eve', ['admin', 'user'], 'scope1')
-    await testUser('eve', ['editor'], 'scope2')
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["user"]));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["editor"]));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["user"], null));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["editor"], null));
 
-    await Roles.renameScopeAsync('scope1', 'scope3')
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["user"], "scope2"));
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, ["editor"], "scope1")
+    );
 
-    await testUser('eve', ['admin', 'user'], 'scope3')
-    await testUser('eve', ['editor'], 'scope2')
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["admin"], "scope2"));
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["admin"], "scope1"));
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["admin"]));
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["admin"], null));
+  }
+);
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope2'))
+Tinytest.addAsync("roles -renaming scopes", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
+  await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "scope1");
+  await Roles.addUsersToRolesAsync(users.eve, ["editor"], "scope2");
 
-    await assert.isRejected(Roles.renameScopeAsync('scope3'), /Invalid scope name/)
+  await testUser(test, "eve", ["admin", "user"], "scope1");
+  await testUser(test, "eve", ["editor"], "scope2");
 
-    await Roles.renameScopeAsync('scope3', null)
+  await Roles.renameScopeAsync("scope1", "scope3");
 
-    await testUser('eve', ['admin', 'user', 'editor'], 'scope2')
+  await testUser(test, "eve", ["admin", "user"], "scope3");
+  await testUser(test, "eve", ["editor"], "scope2");
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor']))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin']))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['user']))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], null))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['admin'], null))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, ['user'], null))
+  test.isFalse(
+    await Roles.userIsInRoleAsync(users.eve, ["admin", "user"], "scope1")
+  );
+  test.isFalse(
+    await Roles.userIsInRoleAsync(users.eve, ["admin", "user"], "scope2")
+  );
 
-    await Roles.renameScopeAsync(null, 'scope2')
+  try {
+    await Roles.renameScopeAsync("scope3");
+    test.fail("Should throw error for invalid scope name");
+  } catch (e) {
+    test.matches(e.message, /Invalid scope name/);
+  }
 
-    await testUser('eve', ['admin', 'user', 'editor'], 'scope2')
+  await Roles.renameScopeAsync("scope3", null);
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor']))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin']))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user']))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['editor'], null))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin'], null))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['user'], null))
-  })
+  await testUser(test, "eve", ["admin", "user", "editor"], "scope2");
 
-  it('removing scopes', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync(users.eve, ['editor'], 'scope2')
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["editor"]));
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["admin"]));
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["user"]));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["editor"], null));
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["admin"], null));
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, ["user"], null));
 
-    await testUser('eve', ['admin', 'user'], 'scope1')
-    await testUser('eve', ['editor'], 'scope2')
+  await Roles.renameScopeAsync(null, "scope2");
 
-    await Roles.removeScopeAsync('scope1')
+  await testUser(test, "eve", ["admin", "user", "editor"], "scope2");
 
-    await testUser('eve', ['editor'], 'scope2')
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["editor"]));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["admin"]));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["user"]));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["editor"], null));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["admin"], null));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, ["user"], null));
+});
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['admin', 'user'], 'scope2'))
-  })
+Tinytest.addAsync("roles -removing scopes", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
+  await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "scope1");
+  await Roles.addUsersToRolesAsync(users.eve, ["editor"], "scope2");
 
-  it('can check if non-existant user is in role', async function () {
-    assert.isFalse(await Roles.userIsInRoleAsync('1', 'admin'))
-  })
+  await testUser(test, "eve", ["admin", "user"], "scope1");
+  await testUser(test, "eve", ["editor"], "scope2");
 
-  it('can check if null user is in role', async function () {
-    assert.isFalse(await Roles.userIsInRoleAsync(null, 'admin'))
-  })
+  await Roles.removeScopeAsync("scope1");
 
-  it('can check user against several roles at once', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
+  await testUser(test, "eve", ["editor"], "scope2");
 
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
-    const user = await Meteor.users.findOneAsync({ _id: users.eve })
+  test.isFalse(
+    await Roles.userIsInRoleAsync(users.eve, ["admin", "user"], "scope1")
+  );
+  test.isFalse(
+    await Roles.userIsInRoleAsync(users.eve, ["admin", "user"], "scope2")
+  );
+});
+
+Tinytest.addAsync(
+  "roles -can check if non-existant user is in role",
+  async function (test) {
+    await clearData();
+    test.isFalse(await Roles.userIsInRoleAsync("1", "admin"));
+  }
+);
+
+Tinytest.addAsync(
+  "roles -can check if null user is in role",
+  async function (test) {
+    await clearData();
+    test.isFalse(await Roles.userIsInRoleAsync(null, "admin"));
+  }
+);
+
+Tinytest.addAsync(
+  "roles -can check user against several roles at once",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"]);
+    const user = await Meteor.users.findOneAsync({ _id: users.eve });
 
     // we can check the non-existing role
-    assert.isTrue(await Roles.userIsInRoleAsync(user, ['editor', 'admin']))
-  })
+    test.isTrue(await Roles.userIsInRoleAsync(user, ["editor", "admin"]));
+  }
+);
 
-  it('can\'t add non-existent user to role', async function () {
-    await Roles.createRoleAsync('admin')
+Tinytest.addAsync(
+  "roles -can't add non-existent user to role",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
 
-    await Roles.addUsersToRolesAsync(['1'], ['admin'])
-    assert.equal(await Meteor.users.findOneAsync({ _id: '1' }), undefined)
-  })
+    await Roles.addUsersToRolesAsync(["1"], ["admin"]);
+    test.equal(await Meteor.users.findOneAsync({ _id: "1" }), undefined);
+  }
+);
 
-  it('can\'t add user to non-existent role', async function () {
-    await assert.isRejected(Roles.addUsersToRolesAsync(users.eve, ['admin']), /Role 'admin' does not exist/)
-    await Roles.addUsersToRolesAsync(users.eve, ['admin'], { ifExists: true })
-  })
+Tinytest.addAsync(
+  "roles -can't add user to non-existent role",
+  async function (test) {
+    await clearData();
+    try {
+      await Roles.addUsersToRolesAsync(users.eve, ["admin"]);
+      test.fail("Role shouldn't exist");
+    } catch (e) {
+      test.matches(e.message, /Role 'admin' does not exist/);
+    }
+    await Roles.addUsersToRolesAsync(users.eve, ["admin"], { ifExists: true });
+  }
+);
 
-  it('can\'t set non-existent user to role', async function () {
-    await Roles.createRoleAsync('admin')
+Tinytest.addAsync(
+  "roles -can't set non-existent user to role",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
 
-    await Roles.setUserRolesAsync(['1'], ['admin'])
-    assert.equal(await Meteor.users.findOneAsync({ _id: '1' }), undefined)
-  })
+    await Roles.setUserRolesAsync(["1"], ["admin"]);
+    test.equal(await Meteor.users.findOneAsync({ _id: "1" }), undefined);
+  }
+);
 
-  it('can\'t set user to non-existent role', async function () {
-    await assert.isRejected(Roles.setUserRolesAsync(users.eve, ['admin']), /Role 'admin' does not exist/)
-    await Roles.setUserRolesAsync(users.eve, ['admin'], { ifExists: true })
-  })
+Tinytest.addAsync(
+  "roles -can't set user to non-existent role",
+  async function (test) {
+    await clearData();
+    try {
+      await Roles.addUsersToRolesAsync(users.eve, ["admin"]);
+      test.fail("Role shouldn't exist");
+    } catch (e) {
+      test.matches(e.message, /Role 'admin' does not exist/);
+    }
+    await Roles.setUserRolesAsync(users.eve, ["admin"], { ifExists: true });
+  }
+);
 
-  it('can add individual users to roles', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can add individual users to roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"]);
 
-    await testUser('eve', ['admin', 'user'])
-    await testUser('bob', [])
-    await testUser('joe', [])
+    await testUser(test, "eve", ["admin", "user"]);
+    await testUser(test, "bob", []);
+    await testUser(test, "joe", []);
 
-    await Roles.addUsersToRolesAsync(users.joe, ['editor', 'user'])
+    await Roles.addUsersToRolesAsync(users.joe, ["editor", "user"]);
 
-    await testUser('eve', ['admin', 'user'])
-    await testUser('bob', [])
-    await testUser('joe', ['editor', 'user'])
-  })
+    await testUser(test, "eve", ["admin", "user"]);
+    await testUser(test, "bob", []);
+    await testUser(test, "joe", ["editor", "user"]);
+  }
+);
 
-  it('can add individual users to roles by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can add individual users to roles by scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "scope1");
 
-    await testUser('eve', ['admin', 'user'], 'scope1')
-    await testUser('bob', [], 'scope1')
-    await testUser('joe', [], 'scope1')
+    await testUser(test, "eve", ["admin", "user"], "scope1");
+    await testUser(test, "bob", [], "scope1");
+    await testUser(test, "joe", [], "scope1");
 
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', [], 'scope2')
-    await testUser('joe', [], 'scope2')
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", [], "scope2");
+    await testUser(test, "joe", [], "scope2");
 
-    await Roles.addUsersToRolesAsync(users.joe, ['editor', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync(users.bob, ['editor', 'user'], 'scope2')
+    await Roles.addUsersToRolesAsync(users.joe, ["editor", "user"], "scope1");
+    await Roles.addUsersToRolesAsync(users.bob, ["editor", "user"], "scope2");
 
-    await testUser('eve', ['admin', 'user'], 'scope1')
-    await testUser('bob', [], 'scope1')
-    await testUser('joe', ['editor', 'user'], 'scope1')
+    await testUser(test, "eve", ["admin", "user"], "scope1");
+    await testUser(test, "bob", [], "scope1");
+    await testUser(test, "joe", ["editor", "user"], "scope1");
 
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['editor', 'user'], 'scope2')
-    await testUser('joe', [], 'scope2')
-  })
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["editor", "user"], "scope2");
+    await testUser(test, "joe", [], "scope2");
+  }
+);
 
-  it('can add user to roles via user object', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can add user to roles via user object",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
-    const bob = await Meteor.users.findOneAsync({ _id: users.bob })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve });
+    const bob = await Meteor.users.findOneAsync({ _id: users.bob });
 
-    await Roles.addUsersToRolesAsync(eve, ['admin', 'user'])
+    await Roles.addUsersToRolesAsync(eve, ["admin", "user"]);
 
-    await testUser('eve', ['admin', 'user'])
-    await testUser('bob', [])
-    await testUser('joe', [])
+    await testUser(test, "eve", ["admin", "user"]);
+    await testUser(test, "bob", []);
+    await testUser(test, "joe", []);
 
-    await Roles.addUsersToRolesAsync(bob, ['editor'])
+    await Roles.addUsersToRolesAsync(bob, ["editor"]);
 
-    await testUser('eve', ['admin', 'user'])
-    await testUser('bob', ['editor'])
-    await testUser('joe', [])
-  })
+    await testUser(test, "eve", ["admin", "user"]);
+    await testUser(test, "bob", ["editor"]);
+    await testUser(test, "joe", []);
+  }
+);
 
-  it('can add user to roles multiple times', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can add user to roles multiple times",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"]);
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"]);
 
-    await testUser('eve', ['admin', 'user'])
-    await testUser('bob', [])
-    await testUser('joe', [])
+    await testUser(test, "eve", ["admin", "user"]);
+    await testUser(test, "bob", []);
+    await testUser(test, "joe", []);
 
-    await Roles.addUsersToRolesAsync(users.bob, ['admin'])
-    await Roles.addUsersToRolesAsync(users.bob, ['editor'])
+    await Roles.addUsersToRolesAsync(users.bob, ["admin"]);
+    await Roles.addUsersToRolesAsync(users.bob, ["editor"]);
 
-    await testUser('eve', ['admin', 'user'])
-    await testUser('bob', ['admin', 'editor'])
-    await testUser('joe', [])
-  })
+    await testUser(test, "eve", ["admin", "user"]);
+    await testUser(test, "bob", ["admin", "editor"]);
+    await testUser(test, "joe", []);
+  }
+);
 
-  it('can add user to roles multiple times by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can add user to roles multiple times by scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "scope1");
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"], "scope1");
 
-    await testUser('eve', ['admin', 'user'], 'scope1')
-    await testUser('bob', [], 'scope1')
-    await testUser('joe', [], 'scope1')
+    await testUser(test, "eve", ["admin", "user"], "scope1");
+    await testUser(test, "bob", [], "scope1");
+    await testUser(test, "joe", [], "scope1");
 
-    await Roles.addUsersToRolesAsync(users.bob, ['admin'], 'scope1')
-    await Roles.addUsersToRolesAsync(users.bob, ['editor'], 'scope1')
+    await Roles.addUsersToRolesAsync(users.bob, ["admin"], "scope1");
+    await Roles.addUsersToRolesAsync(users.bob, ["editor"], "scope1");
 
-    await testUser('eve', ['admin', 'user'], 'scope1')
-    await testUser('bob', ['admin', 'editor'], 'scope1')
-    await testUser('joe', [], 'scope1')
-  })
+    await testUser(test, "eve", ["admin", "user"], "scope1");
+    await testUser(test, "bob", ["admin", "editor"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+  }
+);
 
-  it('can add multiple users to roles', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can add multiple users to roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['admin', 'user'])
+    await Roles.addUsersToRolesAsync([users.eve, users.bob], ["admin", "user"]);
 
-    await testUser('eve', ['admin', 'user'])
-    await testUser('bob', ['admin', 'user'])
-    await testUser('joe', [])
+    await testUser(test, "eve", ["admin", "user"]);
+    await testUser(test, "bob", ["admin", "user"]);
+    await testUser(test, "joe", []);
 
-    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor', 'user'])
+    await Roles.addUsersToRolesAsync(
+      [users.bob, users.joe],
+      ["editor", "user"]
+    );
 
-    await testUser('eve', ['admin', 'user'])
-    await testUser('bob', ['admin', 'editor', 'user'])
-    await testUser('joe', ['editor', 'user'])
-  })
+    await testUser(test, "eve", ["admin", "user"]);
+    await testUser(test, "bob", ["admin", "editor", "user"]);
+    await testUser(test, "joe", ["editor", "user"]);
+  }
+);
 
-  it('can add multiple users to roles by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can add multiple users to roles by scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['admin', 'user'], 'scope1')
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.bob],
+      ["admin", "user"],
+      "scope1"
+    );
 
-    await testUser('eve', ['admin', 'user'], 'scope1')
-    await testUser('bob', ['admin', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
+    await testUser(test, "eve", ["admin", "user"], "scope1");
+    await testUser(test, "bob", ["admin", "user"], "scope1");
+    await testUser(test, "joe", [], "scope1");
 
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', [], 'scope2')
-    await testUser('joe', [], 'scope2')
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", [], "scope2");
+    await testUser(test, "joe", [], "scope2");
 
-    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor', 'user'], 'scope2')
+    await Roles.addUsersToRolesAsync(
+      [users.bob, users.joe],
+      ["editor", "user"],
+      "scope1"
+    );
+    await Roles.addUsersToRolesAsync(
+      [users.bob, users.joe],
+      ["editor", "user"],
+      "scope2"
+    );
 
-    await testUser('eve', ['admin', 'user'], 'scope1')
-    await testUser('bob', ['admin', 'editor', 'user'], 'scope1')
-    await testUser('joe', ['editor', 'user'], 'scope1')
+    await testUser(test, "eve", ["admin", "user"], "scope1");
+    await testUser(test, "bob", ["admin", "editor", "user"], "scope1");
+    await testUser(test, "joe", ["editor", "user"], "scope1");
 
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['editor', 'user'], 'scope2')
-    await testUser('joe', ['editor', 'user'], 'scope2')
-  })
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["editor", "user"], "scope2");
+    await testUser(test, "joe", ["editor", "user"], "scope2");
+  }
+);
 
-  it('can remove individual users from roles', async function () {
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can remove individual users from roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
     // remove user role - one user
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'])
-    await testUser('eve', ['editor', 'user'])
-    await testUser('bob', ['editor', 'user'])
-    await Roles.removeUsersFromRolesAsync(users.eve, ['user'])
-    await testUser('eve', ['editor'])
-    await testUser('bob', ['editor', 'user'])
-  })
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.bob],
+      ["editor", "user"]
+    );
+    await testUser(test, "eve", ["editor", "user"]);
+    await testUser(test, "bob", ["editor", "user"]);
+    await Roles.removeUsersFromRolesAsync(users.eve, ["user"]);
+    await testUser(test, "eve", ["editor"]);
+    await testUser(test, "bob", ["editor", "user"]);
+  }
+);
 
-  it('can remove user from roles multiple times', async function () {
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can remove user from roles multiple times",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
     // remove user role - one user
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'])
-    await testUser('eve', ['editor', 'user'])
-    await testUser('bob', ['editor', 'user'])
-    await Roles.removeUsersFromRolesAsync(users.eve, ['user'])
-    await testUser('eve', ['editor'])
-    await testUser('bob', ['editor', 'user'])
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.bob],
+      ["editor", "user"]
+    );
+    await testUser(test, "eve", ["editor", "user"]);
+    await testUser(test, "bob", ["editor", "user"]);
+    await Roles.removeUsersFromRolesAsync(users.eve, ["user"]);
+    await testUser(test, "eve", ["editor"]);
+    await testUser(test, "bob", ["editor", "user"]);
 
     // try remove again
-    await Roles.removeUsersFromRolesAsync(users.eve, ['user'])
-    await testUser('eve', ['editor'])
-  })
+    await Roles.removeUsersFromRolesAsync(users.eve, ["user"]);
+    await testUser(test, "eve", ["editor"]);
+  }
+);
 
-  it('can remove users from roles via user object', async function () {
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can remove users from roles via user object",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
-    const bob = await Meteor.users.findOneAsync({ _id: users.bob })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve });
+    const bob = await Meteor.users.findOneAsync({ _id: users.bob });
 
     // remove user role - one user
-    await Roles.addUsersToRolesAsync([eve, bob], ['editor', 'user'])
-    await testUser('eve', ['editor', 'user'])
-    await testUser('bob', ['editor', 'user'])
-    await Roles.removeUsersFromRolesAsync(eve, ['user'])
-    await testUser('eve', ['editor'])
-    await testUser('bob', ['editor', 'user'])
-  })
+    await Roles.addUsersToRolesAsync([eve, bob], ["editor", "user"]);
+    await testUser(test, "eve", ["editor", "user"]);
+    await testUser(test, "bob", ["editor", "user"]);
+    await Roles.removeUsersFromRolesAsync(eve, ["user"]);
+    await testUser(test, "eve", ["editor"]);
+    await testUser(test, "bob", ["editor", "user"]);
+  }
+);
 
-  it('can remove individual users from roles by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can remove individual users from roles by scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
     // remove user role - one user
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], 'scope2')
-    await testUser('eve', ['editor', 'user'], 'scope1')
-    await testUser('bob', ['editor', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope2')
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.bob],
+      ["editor", "user"],
+      "scope1"
+    );
+    await Roles.addUsersToRolesAsync(
+      [users.joe, users.bob],
+      ["admin"],
+      "scope2"
+    );
+    await testUser(test, "eve", ["editor", "user"], "scope1");
+    await testUser(test, "bob", ["editor", "user"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "joe", ["admin"], "scope2");
 
-    await Roles.removeUsersFromRolesAsync(users.eve, ['user'], 'scope1')
-    await testUser('eve', ['editor'], 'scope1')
-    await testUser('bob', ['editor', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope2')
-  })
+    await Roles.removeUsersFromRolesAsync(users.eve, ["user"], "scope1");
+    await testUser(test, "eve", ["editor"], "scope1");
+    await testUser(test, "bob", ["editor", "user"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "joe", ["admin"], "scope2");
+  }
+);
 
-  it('can remove individual users from roles by scope through options', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can remove individual users from roles by scope through options",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
     // remove user role - one user
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'], { scope: 'scope1' })
-    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], { scope: 'scope2' })
-    await testUser('eve', ['editor', 'user'], 'scope1')
-    await testUser('bob', ['editor', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope2')
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.bob],
+      ["editor", "user"],
+      { scope: "scope1" }
+    );
+    await Roles.addUsersToRolesAsync([users.joe, users.bob], ["admin"], {
+      scope: "scope2",
+    });
+    await testUser(test, "eve", ["editor", "user"], "scope1");
+    await testUser(test, "bob", ["editor", "user"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "joe", ["admin"], "scope2");
 
-    await Roles.removeUsersFromRolesAsync(users.eve, ['user'], { scope: 'scope1' })
-    await testUser('eve', ['editor'], 'scope1')
-    await testUser('bob', ['editor', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope2')
-  })
+    await Roles.removeUsersFromRolesAsync(users.eve, ["user"], {
+      scope: "scope1",
+    });
+    await testUser(test, "eve", ["editor"], "scope1");
+    await testUser(test, "bob", ["editor", "user"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "joe", ["admin"], "scope2");
+  }
+);
 
-  it('can remove multiple users from roles', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can remove multiple users from roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
     // remove user role - two users
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'])
-    await testUser('eve', ['editor', 'user'])
-    await testUser('bob', ['editor', 'user'])
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.bob],
+      ["editor", "user"]
+    );
+    await testUser(test, "eve", ["editor", "user"]);
+    await testUser(test, "bob", ["editor", "user"]);
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'admin'))
-    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin', 'user'])
-    await testUser('bob', ['admin', 'user', 'editor'])
-    await testUser('joe', ['admin', 'user'])
-    await Roles.removeUsersFromRolesAsync([users.bob, users.joe], ['admin'])
-    await testUser('bob', ['user', 'editor'])
-    await testUser('joe', ['user'])
-  })
+    test.isFalse(await Roles.userIsInRoleAsync(users.joe, "admin"));
+    await Roles.addUsersToRolesAsync([users.bob, users.joe], ["admin", "user"]);
+    await testUser(test, "bob", ["admin", "user", "editor"]);
+    await testUser(test, "joe", ["admin", "user"]);
+    await Roles.removeUsersFromRolesAsync([users.bob, users.joe], ["admin"]);
+    await testUser(test, "bob", ["user", "editor"]);
+    await testUser(test, "joe", ["user"]);
+  }
+);
 
-  it('can remove multiple users from roles by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can remove multiple users from roles by scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
     // remove user role - one user
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], 'scope2')
-    await testUser('eve', ['editor', 'user'], 'scope1')
-    await testUser('bob', ['editor', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope2')
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.bob],
+      ["editor", "user"],
+      "scope1"
+    );
+    await Roles.addUsersToRolesAsync(
+      [users.joe, users.bob],
+      ["admin"],
+      "scope2"
+    );
+    await testUser(test, "eve", ["editor", "user"], "scope1");
+    await testUser(test, "bob", ["editor", "user"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "joe", ["admin"], "scope2");
 
-    await Roles.removeUsersFromRolesAsync([users.eve, users.bob], ['user'], 'scope1')
-    await testUser('eve', ['editor'], 'scope1')
-    await testUser('bob', ['editor'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope2')
+    await Roles.removeUsersFromRolesAsync(
+      [users.eve, users.bob],
+      ["user"],
+      "scope1"
+    );
+    await testUser(test, "eve", ["editor"], "scope1");
+    await testUser(test, "bob", ["editor"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "joe", ["admin"], "scope2");
 
-    await Roles.removeUsersFromRolesAsync([users.joe, users.bob], ['admin'], 'scope2')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', [], 'scope2')
-    await testUser('joe', [], 'scope2')
-  })
+    await Roles.removeUsersFromRolesAsync(
+      [users.joe, users.bob],
+      ["admin"],
+      "scope2"
+    );
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", [], "scope2");
+    await testUser(test, "joe", [], "scope2");
+  }
+);
 
-  it('can remove multiple users from roles of any scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can remove multiple users from roles of any scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
     // remove user role - one user
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['user'], 'scope2')
-    await testUser('eve', ['editor', 'user'], 'scope1')
-    await testUser('bob', ['editor', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['user'], 'scope2')
-    await testUser('joe', ['user'], 'scope2')
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.bob],
+      ["editor", "user"],
+      "scope1"
+    );
+    await Roles.addUsersToRolesAsync(
+      [users.joe, users.bob],
+      ["user"],
+      "scope2"
+    );
+    await testUser(test, "eve", ["editor", "user"], "scope1");
+    await testUser(test, "bob", ["editor", "user"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", ["user"], "scope2");
+    await testUser(test, "joe", ["user"], "scope2");
 
-    await Roles.removeUsersFromRolesAsync([users.eve, users.bob], ['user'], { anyScope: true })
-    await testUser('eve', ['editor'], 'scope1')
-    await testUser('bob', ['editor'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', [], 'scope2')
-    await testUser('joe', ['user'], 'scope2')
-  })
+    await Roles.removeUsersFromRolesAsync([users.eve, users.bob], ["user"], {
+      anyScope: true,
+    });
+    await testUser(test, "eve", ["editor"], "scope1");
+    await testUser(test, "bob", ["editor"], "scope1");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "eve", [], "scope2");
+    await testUser(test, "bob", [], "scope2");
+    await testUser(test, "joe", ["user"], "scope2");
+  }
+);
 
-  it('can set user roles', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync("roles -can set user roles", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
 
-    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
-    const bob = await Meteor.users.findOneAsync({ _id: users.bob })
+  const eve = await Meteor.users.findOneAsync({ _id: users.eve });
+  const bob = await Meteor.users.findOneAsync({ _id: users.bob });
 
-    await Roles.setUserRolesAsync([users.eve, bob], ['editor', 'user'])
-    await testUser('eve', ['editor', 'user'])
-    await testUser('bob', ['editor', 'user'])
-    await testUser('joe', [])
+  await Roles.setUserRolesAsync([users.eve, bob], ["editor", "user"]);
+  await testUser(test, "eve", ["editor", "user"]);
+  await testUser(test, "bob", ["editor", "user"]);
+  await testUser(test, "joe", []);
 
-    // use addUsersToRoles add some roles
-    await Roles.addUsersToRolesAsync([bob, users.joe], ['admin'])
-    await testUser('eve', ['editor', 'user'])
-    await testUser('bob', ['admin', 'editor', 'user'])
-    await testUser('joe', ['admin'])
+  // use addUsersToRoles add some roles
+  await Roles.addUsersToRolesAsync([bob, users.joe], ["admin"]);
+  await testUser(test, "eve", ["editor", "user"]);
+  await testUser(test, "bob", ["admin", "editor", "user"]);
+  await testUser(test, "joe", ["admin"]);
 
-    await Roles.setUserRolesAsync([eve, bob], ['user'])
-    await testUser('eve', ['user'])
-    await testUser('bob', ['user'])
-    await testUser('joe', ['admin'])
+  await Roles.setUserRolesAsync([eve, bob], ["user"]);
+  await testUser(test, "eve", ["user"]);
+  await testUser(test, "bob", ["user"]);
+  await testUser(test, "joe", ["admin"]);
 
-    await Roles.setUserRolesAsync(bob, 'editor')
-    await testUser('eve', ['user'])
-    await testUser('bob', ['editor'])
-    await testUser('joe', ['admin'])
+  await Roles.setUserRolesAsync(bob, "editor");
+  await testUser(test, "eve", ["user"]);
+  await testUser(test, "bob", ["editor"]);
+  await testUser(test, "joe", ["admin"]);
 
-    await Roles.setUserRolesAsync([users.joe, users.bob], [])
-    await testUser('eve', ['user'])
-    await testUser('bob', [])
-    await testUser('joe', [])
-  })
+  await Roles.setUserRolesAsync([users.joe, users.bob], []);
+  await testUser(test, "eve", ["user"]);
+  await testUser(test, "bob", []);
+  await testUser(test, "joe", []);
+});
 
-  it('can set user roles by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync("roles -can set user roles by scope", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
 
-    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
-    const bob = await Meteor.users.findOneAsync({ _id: users.bob })
-    const joe = await Meteor.users.findOneAsync({ _id: users.joe })
+  const eve = await Meteor.users.findOneAsync({ _id: users.eve });
+  const bob = await Meteor.users.findOneAsync({ _id: users.bob });
+  const joe = await Meteor.users.findOneAsync({ _id: users.joe });
 
-    await Roles.setUserRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    await Roles.setUserRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
-    await testUser('eve', ['editor', 'user'], 'scope1')
-    await testUser('bob', ['editor', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope2')
+  await Roles.setUserRolesAsync(
+    [users.eve, users.bob],
+    ["editor", "user"],
+    "scope1"
+  );
+  await Roles.setUserRolesAsync([users.bob, users.joe], ["admin"], "scope2");
+  await testUser(test, "eve", ["editor", "user"], "scope1");
+  await testUser(test, "bob", ["editor", "user"], "scope1");
+  await testUser(test, "joe", [], "scope1");
+  await testUser(test, "eve", [], "scope2");
+  await testUser(test, "bob", ["admin"], "scope2");
+  await testUser(test, "joe", ["admin"], "scope2");
 
-    // use addUsersToRoles add some roles
-    await Roles.addUsersToRolesAsync([users.eve, users.bob], ['admin'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor'], 'scope2')
-    await testUser('eve', ['admin', 'editor', 'user'], 'scope1')
-    await testUser('bob', ['admin', 'editor', 'user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', [], 'scope2')
-    await testUser('bob', ['admin', 'editor'], 'scope2')
-    await testUser('joe', ['admin', 'editor'], 'scope2')
+  // use addUsersToRoles add some roles
+  await Roles.addUsersToRolesAsync([users.eve, users.bob], ["admin"], "scope1");
+  await Roles.addUsersToRolesAsync(
+    [users.bob, users.joe],
+    ["editor"],
+    "scope2"
+  );
+  await testUser(test, "eve", ["admin", "editor", "user"], "scope1");
+  await testUser(test, "bob", ["admin", "editor", "user"], "scope1");
+  await testUser(test, "joe", [], "scope1");
+  await testUser(test, "eve", [], "scope2");
+  await testUser(test, "bob", ["admin", "editor"], "scope2");
+  await testUser(test, "joe", ["admin", "editor"], "scope2");
 
-    await Roles.setUserRolesAsync([eve, bob], ['user'], 'scope1')
-    await Roles.setUserRolesAsync([eve, joe], ['editor'], 'scope2')
-    await testUser('eve', ['user'], 'scope1')
-    await testUser('bob', ['user'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', ['editor'], 'scope2')
-    await testUser('bob', ['admin', 'editor'], 'scope2')
-    await testUser('joe', ['editor'], 'scope2')
+  await Roles.setUserRolesAsync([eve, bob], ["user"], "scope1");
+  await Roles.setUserRolesAsync([eve, joe], ["editor"], "scope2");
+  await testUser(test, "eve", ["user"], "scope1");
+  await testUser(test, "bob", ["user"], "scope1");
+  await testUser(test, "joe", [], "scope1");
+  await testUser(test, "eve", ["editor"], "scope2");
+  await testUser(test, "bob", ["admin", "editor"], "scope2");
+  await testUser(test, "joe", ["editor"], "scope2");
 
-    await Roles.setUserRolesAsync(bob, 'editor', 'scope1')
-    await testUser('eve', ['user'], 'scope1')
-    await testUser('bob', ['editor'], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', ['editor'], 'scope2')
-    await testUser('bob', ['admin', 'editor'], 'scope2')
-    await testUser('joe', ['editor'], 'scope2')
+  await Roles.setUserRolesAsync(bob, "editor", "scope1");
+  await testUser(test, "eve", ["user"], "scope1");
+  await testUser(test, "bob", ["editor"], "scope1");
+  await testUser(test, "joe", [], "scope1");
+  await testUser(test, "eve", ["editor"], "scope2");
+  await testUser(test, "bob", ["admin", "editor"], "scope2");
+  await testUser(test, "joe", ["editor"], "scope2");
 
-    const bobRoles1 = await Roles.getRolesForUserAsync(users.bob, { anyScope: true, fullObjects: true })
-    const joeRoles1 = await Roles.getRolesForUserAsync(users.joe, { anyScope: true, fullObjects: true })
-    assert.isTrue(bobRoles1.map(r => r.scope).includes('scope1'))
-    assert.isFalse(joeRoles1.map(r => r.scope).includes('scope1'))
+  const bobRoles1 = await Roles.getRolesForUserAsync(users.bob, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  const joeRoles1 = await Roles.getRolesForUserAsync(users.joe, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  test.isTrue(bobRoles1.map((r) => r.scope).includes("scope1"));
+  test.isFalse(joeRoles1.map((r) => r.scope).includes("scope1"));
 
-    await Roles.setUserRolesAsync([bob, users.joe], [], 'scope1')
-    await testUser('eve', ['user'], 'scope1')
-    await testUser('bob', [], 'scope1')
-    await testUser('joe', [], 'scope1')
-    await testUser('eve', ['editor'], 'scope2')
-    await testUser('bob', ['admin', 'editor'], 'scope2')
-    await testUser('joe', ['editor'], 'scope2')
+  await Roles.setUserRolesAsync([bob, users.joe], [], "scope1");
+  await testUser(test, "eve", ["user"], "scope1");
+  await testUser(test, "bob", [], "scope1");
+  await testUser(test, "joe", [], "scope1");
+  await testUser(test, "eve", ["editor"], "scope2");
+  await testUser(test, "bob", ["admin", "editor"], "scope2");
+  await testUser(test, "joe", ["editor"], "scope2");
 
-    // When roles in a given scope are removed, we do not want any dangling database content for that scope.
-    const bobRoles2 = await Roles.getRolesForUserAsync(users.bob, { anyScope: true, fullObjects: true })
-    const joeRoles2 = await Roles.getRolesForUserAsync(users.joe, { anyScope: true, fullObjects: true })
-    assert.isFalse(bobRoles2.map(r => r.scope).includes('scope1'))
-    assert.isFalse(joeRoles2.map(r => r.scope).includes('scope1'))
-  })
+  // When roles in a given scope are removed, we do not want any dangling database content for that scope.
+  const bobRoles2 = await Roles.getRolesForUserAsync(users.bob, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  const joeRoles2 = await Roles.getRolesForUserAsync(users.joe, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  test.isFalse(bobRoles2.map((r) => r.scope).includes("scope1"));
+  test.isFalse(joeRoles2.map((r) => r.scope).includes("scope1"));
+});
 
-  it('can set user roles by scope including GLOBAL_SCOPE', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can set user roles by scope including GLOBAL_SCOPE",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("editor");
 
-    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve });
 
-    await Roles.addUsersToRolesAsync(eve, 'admin', Roles.GLOBAL_SCOPE)
-    await testUser('eve', ['admin'], 'scope1')
-    await testUser('eve', ['admin'])
+    await Roles.addUsersToRolesAsync(eve, "admin", Roles.GLOBAL_SCOPE);
+    await testUser(test, "eve", ["admin"], "scope1");
+    await testUser(test, "eve", ["admin"]);
 
-    await Roles.setUserRolesAsync(eve, 'editor', Roles.GLOBAL_SCOPE)
-    await testUser('eve', ['editor'], 'scope2')
-    await testUser('eve', ['editor'])
-  })
+    await Roles.setUserRolesAsync(eve, "editor", Roles.GLOBAL_SCOPE);
+    await testUser(test, "eve", ["editor"], "scope2");
+    await testUser(test, "eve", ["editor"]);
+  }
+);
 
-  it('can set user roles by scope and anyScope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -can set user roles by scope and anyScope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("editor");
 
-    const eve = await Meteor.users.findOneAsync({ _id: users.eve })
+    const eve = await Meteor.users.findOneAsync({ _id: users.eve });
 
-    const eveRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(eveRoles.map(obj => { delete obj._id; return obj }), [])
+    const eveRoles = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      eveRoles.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      []
+    );
 
-    await Roles.addUsersToRolesAsync(eve, 'admin')
+    await Roles.addUsersToRolesAsync(eve, "admin");
 
-    const eveRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(eveRoles2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
+    const eveRoles2 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      eveRoles2.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "admin" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "admin" }],
+        },
+      ]
+    );
 
-    await Roles.setUserRolesAsync(eve, 'editor', { anyScope: true, scope: 'scope2' })
+    await Roles.setUserRolesAsync(eve, "editor", {
+      anyScope: true,
+      scope: "scope2",
+    });
 
-    const eveRoles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(eveRoles3.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'editor' },
-      scope: 'scope2',
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'editor' }]
-    }])
-  })
+    const eveRoles3 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      eveRoles3.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "editor" },
+          scope: "scope2",
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "editor" }],
+        },
+      ]
+    );
+  }
+);
 
-  it('can get all roles', async function () {
-    for (const role of roles) {
-      await Roles.createRoleAsync(role)
-    }
+Tinytest.addAsync("roles -can get all roles", async function (test) {
+  await clearData();
+  for (const role of roles) {
+    await Roles.createRoleAsync(role);
+  }
 
-    // compare roles, sorted alphabetically
-    const expected = roles
-    const fetchAll = await Roles.getAllRoles().fetchAsync()
-    const actual = fetchAll.map(r => r._id)
+  // compare roles, sorted alphabetically
+  const expected = roles;
+  const fetchAll = await Roles.getAllRoles().fetchAsync();
+  const actual = fetchAll.map((r) => r._id);
 
-    assert.sameMembers(actual, expected)
+  sameMembers(test, actual, expected);
 
-    const fetchSorted = await Roles.getAllRoles({ sort: { _id: -1 } }).fetchAsync()
-    assert.sameMembers(fetchSorted.map(r => r._id), expected.reverse())
-  })
+  const fetchSorted = await Roles.getAllRoles({
+    sort: { _id: -1 },
+  }).fetchAsync();
+  sameMembers(
+    test,
+    fetchSorted.map((r) => r._id),
+    expected.reverse()
+  );
+});
 
-  it('get an empty list of roles for an empty user', async function () {
-    assert.sameMembers(await Roles.getRolesForUserAsync(undefined), [])
-    assert.sameMembers(await Roles.getRolesForUserAsync(null), [])
-    assert.sameMembers(await Roles.getRolesForUserAsync({}), [])
-  })
+Tinytest.addAsync(
+  "roles -get an empty list of roles for an empty user",
+  async function (test) {
+    await clearData();
+    sameMembers(test, await Roles.getRolesForUserAsync(undefined), []);
+    sameMembers(test, await Roles.getRolesForUserAsync(null), []);
+    sameMembers(test, await Roles.getRolesForUserAsync({}), []);
+  }
+);
 
-  it('get an empty list of roles for non-existant user', async function () {
-    assert.sameMembers(await Roles.getRolesForUserAsync('1'), [])
-    assert.sameMembers(await Roles.getRolesForUserAsync('1', 'scope1'), [])
-  })
+Tinytest.addAsync(
+  "roles -get an empty list of roles for non-existant user",
+  async function (test) {
+    await clearData();
+    sameMembers(test, await Roles.getRolesForUserAsync("1"), []);
+    sameMembers(test, await Roles.getRolesForUserAsync("1", "scope1"), []);
+  }
+);
 
-  it('can get all roles for user', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
+Tinytest.addAsync("roles -can get all roles for user", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
 
-    const userId = users.eve
-    let userObj
+  const userId = users.eve;
+  let userObj;
+
+  // by userId
+  sameMembers(test, await Roles.getRolesForUserAsync(userId), []);
+
+  // by user object
+  userObj = await Meteor.users.findOneAsync({ _id: userId });
+  sameMembers(test, await Roles.getRolesForUserAsync(userObj), []);
+
+  await Roles.addUsersToRolesAsync(userId, ["admin", "user"]);
+
+  // by userId
+  sameMembers(test, await Roles.getRolesForUserAsync(userId), [
+    "admin",
+    "user",
+  ]);
+
+  // by user object
+  userObj = await Meteor.users.findOneAsync({ _id: userId });
+  sameMembers(test, await Roles.getRolesForUserAsync(userObj), [
+    "admin",
+    "user",
+  ]);
+
+  const userRoles = await Roles.getRolesForUserAsync(userId, {
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    userRoles.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "admin" },
+        scope: null,
+        user: { _id: userId },
+        inheritedRoles: [{ _id: "admin" }],
+      },
+      {
+        role: { _id: "user" },
+        scope: null,
+        user: { _id: userId },
+        inheritedRoles: [{ _id: "user" }],
+      },
+    ]
+  );
+});
+
+Tinytest.addAsync(
+  "roles -can get all roles for user by scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
+
+    const userId = users.eve;
+
+    await Roles.addUsersToRolesAsync([users.eve], ["editor"], "scope1");
+    await Roles.addUsersToRolesAsync([users.eve], ["editor", "user"], "scope2");
 
     // by userId
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, "user"), [
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, "editor"), [
+      "scope1",
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, "admin"), []);
 
     // by user object
-    userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
+    const userObj = await Meteor.users.findOneAsync({ _id: userId });
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, "user"), [
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, "editor"), [
+      "scope1",
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, "admin"), []);
+  }
+);
 
-    await Roles.addUsersToRolesAsync(userId, ['admin', 'user'])
+Tinytest.addAsync(
+  "roles -getScopesForUser returns [] when not using scopes",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
+
+    const userId = users.eve;
+
+    await Roles.addUsersToRolesAsync([users.eve], ["editor", "user"]);
 
     // by userId
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['admin', 'user'])
+    sameMembers(test, await Roles.getScopesForUserAsync(userId), []);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, "editor"), []);
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userId, ["editor"]),
+      []
+    );
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userId, ["editor", "user"]),
+      []
+    );
 
     // by user object
-    userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['admin', 'user'])
+    const userObj = await Meteor.users.findOneAsync({ _id: userId });
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj), []);
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, "editor"), []);
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userObj, ["editor"]),
+      []
+    );
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userObj, ["editor", "user"]),
+      []
+    );
+  }
+);
 
-    const userRoles = await Roles.getRolesForUserAsync(userId, { fullObjects: true })
-    assert.sameDeepMembers(userRoles.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }])
-  })
+Tinytest.addAsync(
+  "roles -can get all groups for user by role array",
+  async function (test) {
+    await clearData();
+    const userId = users.eve;
 
-  it('can get all roles for user by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
+    await Roles.createRoleAsync("moderator");
+    await Roles.createRoleAsync("admin");
 
-    const userId = users.eve
-    let userObj
-
-    // by userId
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), [])
-
-    // by user object
-    userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), [])
-
-    // add roles
-    await Roles.addUsersToRolesAsync(userId, ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync(userId, ['admin'], 'scope2')
-
-    // by userId
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['admin', 'user'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope2'), ['admin'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
-
-    // by user object
-    userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['admin', 'user'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope2'), ['admin'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
-
-    const userRoles = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1' })
-    assert.sameDeepMembers(userRoles.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }])
-    const userRoles2 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2' })
-    assert.sameDeepMembers(userRoles2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    const userRoles3 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true })
-    assert.sameDeepMembers(userRoles3.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-
-    await Roles.createRoleAsync('PERMISSION')
-    await Roles.addRolesToParentAsync('PERMISSION', 'user')
-
-    const userRoles4 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1' })
-    assert.sameDeepMembers(userRoles4.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-    const userRoles5 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2' })
-    assert.sameDeepMembers(userRoles5.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope1' }), ['admin', 'user', 'PERMISSION'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope2' }), ['admin'])
-
-    const userRoles6 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true })
-    assert.sameDeepMembers(userRoles6.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { anyScope: true }), ['admin', 'user', 'PERMISSION'])
-
-    const userRoles7 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope1', onlyAssigned: true })
-    assert.sameDeepMembers(userRoles7.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-    const userRoles8 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, scope: 'scope2', onlyAssigned: true })
-    assert.sameDeepMembers(userRoles8.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope1', onlyAssigned: true }), ['admin', 'user'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { scope: 'scope2', onlyAssigned: true }), ['admin'])
-
-    const userRoles9 = await Roles.getRolesForUserAsync(userId, { fullObjects: true, anyScope: true, onlyAssigned: true })
-    assert.sameDeepMembers(userRoles9.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }, {
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }, {
-      role: { _id: 'admin' },
-      scope: 'scope2',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { anyScope: true, onlyAssigned: true }), ['admin', 'user'])
-  })
-
-  it('can get only scoped roles for user', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-
-    const userId = users.eve
-
-    // add roles
-    await Roles.addUsersToRolesAsync(userId, ['user'], 'scope1')
-    await Roles.addUsersToRolesAsync(userId, ['admin'])
-
-    await Roles.createRoleAsync('PERMISSION')
-    await Roles.addRolesToParentAsync('PERMISSION', 'user')
-
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, scope: 'scope1' }), ['user', 'PERMISSION'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, { onlyScoped: true, onlyAssigned: true, scope: 'scope1' }), ['user'])
-    const userRoles = await Roles.getRolesForUserAsync(userId, { onlyScoped: true, fullObjects: true, scope: 'scope1' })
-    assert.sameDeepMembers(userRoles.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: 'scope1',
-      user: { _id: userId },
-      inheritedRoles: [{ _id: 'user' }, { _id: 'PERMISSION' }]
-    }])
-  })
-
-  it('can get all roles for user by scope with periods in name', async function () {
-    await Roles.createRoleAsync('admin')
-
-    await Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.k12.va.us')
-
-    assert.sameMembers(await Roles.getRolesForUserAsync(users.joe, 'example.k12.va.us'), ['admin'])
-  })
-
-  it('can get all roles for user by scope including Roles.GLOBAL_SCOPE', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-
-    const userId = users.eve
-
-    await Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-    await Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], 'scope1')
-
-    // by userId
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['editor', 'admin', 'user'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['editor'])
-
-    // by user object
-    const userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['editor', 'admin', 'user'])
-    assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['editor'])
-  })
-
-  describe('getRolesForUser', function () {
-    it('should not return null entries if user has no roles for scope', async function () {
-      await Roles.createRoleAsync('editor')
-
-      const userId = users.eve
-      let userObj
-
-      // by userId
-      assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), [])
-      assert.sameMembers(await Roles.getRolesForUserAsync(userId), [])
-
-      // by user object
-      userObj = await Meteor.users.findOneAsync({ _id: userId })
-      assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), [])
-      assert.sameMembers(await Roles.getRolesForUserAsync(userObj), [])
-
-      await Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-
-      // by userId
-      assert.sameMembers(await Roles.getRolesForUserAsync(userId, 'scope1'), ['editor'])
-      assert.sameMembers(await Roles.getRolesForUserAsync(userId), ['editor'])
-
-      // by user object
-      userObj = await Meteor.users.findOneAsync({ _id: userId })
-      assert.sameMembers(await Roles.getRolesForUserAsync(userObj, 'scope1'), ['editor'])
-      assert.sameMembers(await Roles.getRolesForUserAsync(userObj), ['editor'])
-    })
-
-    it('should not fail during a call of addUsersToRoles', async function () {
-      await Roles.createRoleAsync('editor')
-
-      const userId = users.eve
-      const promises = []
-      const interval = setInterval(() => {
-        promises.push(Promise.resolve().then(async () => {
-          await Roles.getRolesForUserAsync(userId)
-        }))
-      }, 0)
-
-      await Roles.addUsersToRolesAsync([users.eve], ['editor'], Roles.GLOBAL_SCOPE)
-      clearInterval(interval)
-
-      return Promise.all(promises)
-    })
-  })
-
-  it('returns an empty list of scopes for null as user-id', async function () {
-    assert.sameMembers(await Roles.getScopesForUserAsync(undefined), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(null), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync('foo'), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync({}), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync({ _id: 'foo' }), [])
-  })
-
-  it('can get all scopes for user', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-
-    const userId = users.eve
-
-    await Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], 'scope2')
-
-    // by userId
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId), ['scope1', 'scope2'])
-
-    // by user object
-    const userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj), ['scope1', 'scope2'])
-  })
-
-  it('can get all scopes for user by role', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-
-    const userId = users.eve
-
-    await Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'scope2')
-
-    // by userId
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'user'), ['scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'admin'), [])
-
-    // by user object
-    const userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'user'), ['scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'admin'), [])
-  })
-
-  it('getScopesForUser returns [] when not using scopes', async function () {
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-
-    const userId = users.eve
-
-    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'])
-
-    // by userId
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'editor'), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor']), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor', 'user']), [])
-
-    // by user object
-    const userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'editor'), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor']), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor', 'user']), [])
-  })
-
-  it('can get all groups for user by role array', async function () {
-    const userId = users.eve
-
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
-    await Roles.createRoleAsync('moderator')
-    await Roles.createRoleAsync('admin')
-
-    await Roles.addUsersToRolesAsync([users.eve], ['editor'], 'group1')
-    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'group2')
-    await Roles.addUsersToRolesAsync([users.eve], ['moderator'], 'group3')
+    await Roles.addUsersToRolesAsync([users.eve], ["editor"], "group1");
+    await Roles.addUsersToRolesAsync([users.eve], ["editor", "user"], "group2");
+    await Roles.addUsersToRolesAsync([users.eve], ["moderator"], "group3");
 
     // by userId, one role
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['user']), ['group2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor']), ['group1', 'group2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['admin']), [])
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, ["user"]), [
+      "group2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, ["editor"]), [
+      "group1",
+      "group2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, ["admin"]), []);
 
     // by userId, multiple roles
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor', 'user']), ['group1', 'group2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['user', 'moderator']), ['group2', 'group3'])
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userId, ["editor", "user"]),
+      ["group1", "group2"]
+    );
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userId, ["editor", "moderator"]),
+      ["group1", "group2", "group3"]
+    );
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userId, ["user", "moderator"]),
+      ["group2", "group3"]
+    );
 
     // by user object, one role
-    const userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['user']), ['group2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor']), ['group1', 'group2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['admin']), [])
+    const userObj = await Meteor.users.findOneAsync({ _id: userId });
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, ["user"]), [
+      "group2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, ["editor"]), [
+      "group1",
+      "group2",
+    ]);
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userObj, ["admin"]),
+      []
+    );
 
     // by user object, multiple roles
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor', 'user']), ['group1', 'group2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor', 'moderator']), ['group1', 'group2', 'group3'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['user', 'moderator']), ['group2', 'group3'])
-  })
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userObj, ["editor", "user"]),
+      ["group1", "group2"]
+    );
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userObj, ["editor", "moderator"]),
+      ["group1", "group2", "group3"]
+    );
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userObj, ["user", "moderator"]),
+      ["group2", "group3"]
+    );
+  }
+);
 
-  it('getting all scopes for user does not include GLOBAL_SCOPE', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync(
+  "roles -getting all scopes for user does not include GLOBAL_SCOPE",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    const userId = users.eve
+    const userId = users.eve;
 
-    await Roles.addUsersToRolesAsync([users.eve], ['editor'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user'], 'scope2')
-    await Roles.addUsersToRolesAsync([users.eve], ['editor', 'user', 'admin'], Roles.GLOBAL_SCOPE)
+    await Roles.addUsersToRolesAsync([users.eve], ["editor"], "scope1");
+    await Roles.addUsersToRolesAsync([users.eve], ["editor", "user"], "scope2");
+    await Roles.addUsersToRolesAsync(
+      [users.eve],
+      ["editor", "user", "admin"],
+      Roles.GLOBAL_SCOPE
+    );
 
     // by userId
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'user'), ['scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, 'admin'), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['user']), ['scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['editor']), ['scope1', 'scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['admin']), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userId, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, "user"), [
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, "editor"), [
+      "scope1",
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, "admin"), []);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, ["user"]), [
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, ["editor"]), [
+      "scope1",
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userId, ["admin"]), []);
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userId, ["user", "editor", "admin"]),
+      ["scope1", "scope2"]
+    );
 
     // by user object
-    const userObj = await Meteor.users.findOneAsync({ _id: userId })
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'user'), ['scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'editor'), ['scope1', 'scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, 'admin'), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['user']), ['scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['editor']), ['scope1', 'scope2'])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['admin']), [])
-    assert.sameMembers(await Roles.getScopesForUserAsync(userObj, ['user', 'editor', 'admin']), ['scope1', 'scope2'])
-  })
+    const userObj = await Meteor.users.findOneAsync({ _id: userId });
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, "user"), [
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, "editor"), [
+      "scope1",
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, "admin"), []);
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, ["user"]), [
+      "scope2",
+    ]);
+    sameMembers(test, await Roles.getScopesForUserAsync(userObj, ["editor"]), [
+      "scope1",
+      "scope2",
+    ]);
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userObj, ["admin"]),
+      []
+    );
+    sameMembers(
+      test,
+      await Roles.getScopesForUserAsync(userObj, ["user", "editor", "admin"]),
+      ["scope1", "scope2"]
+    );
+  }
+);
 
-  it('can get all users in role', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+Tinytest.addAsync("roles -can get all users in role", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
 
-    await Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'])
-    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['editor'])
+  await Roles.addUsersToRolesAsync([users.eve, users.joe], ["admin", "user"]);
+  await Roles.addUsersToRolesAsync([users.bob, users.joe], ["editor"]);
 
-    const expected = [users.eve, users.joe]
-    const cursor = await Roles.getUsersInRoleAsync('admin')
-    const fetched = await cursor.fetchAsync()
-    const actual = fetched.map(r => r._id)
+  const expected = [users.eve, users.joe];
+  const cursor = await Roles.getUsersInRoleAsync("admin");
+  const fetched = await cursor.fetchAsync();
+  const actual = fetched.map((r) => r._id);
 
-    assert.sameMembers(actual, expected)
-  })
+  sameMembers(test, actual, expected);
+});
 
-  it('can get all users in role by scope', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
+Tinytest.addAsync(
+  "roles -can get all users in role by scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
 
-    await Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.joe],
+      ["admin", "user"],
+      "scope1"
+    );
+    await Roles.addUsersToRolesAsync(
+      [users.bob, users.joe],
+      ["admin"],
+      "scope2"
+    );
 
-    let expected = [users.eve, users.joe]
-    const cursor1 = await Roles.getUsersInRoleAsync('admin', 'scope1')
-    const fetched1 = await cursor1.fetchAsync()
-    let actual = fetched1.map(r => r._id)
+    let expected = [users.eve, users.joe];
+    const cursor1 = await Roles.getUsersInRoleAsync("admin", "scope1");
+    const fetched1 = await cursor1.fetchAsync();
+    let actual = fetched1.map((r) => r._id);
 
-    assert.sameMembers(actual, expected)
+    sameMembers(test, actual, expected);
 
-    expected = [users.eve, users.joe]
-    const cursor2 = await Roles.getUsersInRoleAsync('admin', { scope: 'scope1' })
-    const fetched2 = await cursor2.fetchAsync()
-    actual = fetched2.map(r => r._id)
-    assert.sameMembers(actual, expected)
+    expected = [users.eve, users.joe];
+    const cursor2 = await Roles.getUsersInRoleAsync("admin", {
+      scope: "scope1",
+    });
+    const fetched2 = await cursor2.fetchAsync();
+    actual = fetched2.map((r) => r._id);
+    sameMembers(test, actual, expected);
 
-    expected = [users.eve, users.bob, users.joe]
-    const cursor3 = await Roles.getUsersInRoleAsync('admin', { anyScope: true })
-    const fetched3 = await cursor3.fetchAsync()
-    actual = fetched3.map(r => r._id)
-    assert.sameMembers(actual, expected)
+    expected = [users.eve, users.bob, users.joe];
+    const cursor3 = await Roles.getUsersInRoleAsync("admin", {
+      anyScope: true,
+    });
+    const fetched3 = await cursor3.fetchAsync();
+    actual = fetched3.map((r) => r._id);
+    sameMembers(test, actual, expected);
 
-    const cursor4 = await Roles.getUsersInRoleAsync('admin')
-    const fetched4 = await cursor4.fetchAsync()
-    actual = fetched4.map(r => r._id)
-    assert.sameMembers(actual, [])
-  })
+    const cursor4 = await Roles.getUsersInRoleAsync("admin");
+    const fetched4 = await cursor4.fetchAsync();
+    actual = fetched4.map((r) => r._id);
+    sameMembers(test, actual, []);
+  }
+);
 
-  // it('can get all users in role by scope including Roles.GLOBAL_SCOPE', function () {
-  //   Roles.createRoleAsync('admin')
-  //   Roles.createRoleAsync('user')
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['admin', 'user'], Roles.GLOBAL_SCOPE)
-  //   Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
-  //
-  //   let expected = [users.eve]
-  //   let actual = await Roles.getUsersInRoleAsync('admin', 'scope1').fetch().map(r => r._id)
-  //
-  //   assert.sameMembers(actual, expected)
-  //
-  //   expected = [users.eve, users.bob, users.joe]
-  //   actual = await Roles.getUsersInRoleAsync('admin', 'scope2').fetch().map(r => r._id)
-  //
-  //   assert.sameMembers(actual, expected)
-  //
-  //   expected = [users.eve]
-  //   actual = await Roles.getUsersInRoleAsync('admin').fetch().map(r => r._id)
-  //
-  //   assert.sameMembers(actual, expected)
-  //
-  //   expected = [users.eve, users.bob, users.joe]
-  //   actual = await Roles.getUsersInRoleAsync('admin', { anyScope: true }).fetch().map(r => r._id)
-  //
-  //   assert.sameMembers(actual, expected)
-  // })
-  //
-  // it('can get all users in role by scope excluding Roles.GLOBAL_SCOPE', function () {
-  //   Roles.createRoleAsync('admin')
-  //
-  //   Roles.addUsersToRolesAsync([users.eve], ['admin'], Roles.GLOBAL_SCOPE)
-  //   Roles.addUsersToRolesAsync([users.bob], ['admin'], 'scope1')
-  //
-  //   let expected = [users.eve]
-  //   let actual = await Roles.getUsersInRoleAsync('admin').fetch().map(r => r._id)
-  //   assert.sameMembers(actual, expected)
-  //
-  //   expected = [users.eve, users.bob]
-  //   actual = await Roles.getUsersInRoleAsync('admin', { scope: 'scope1' }).fetch().map(r => r._id)
-  //   assert.sameMembers(actual, expected)
-  //
-  //   expected = [users.bob]
-  //   actual = await Roles.getUsersInRoleAsync('admin', { scope: 'scope1', onlyScoped: true }).fetch().map(r => r._id)
-  //   assert.sameMembers(actual, expected)
-  // })
+Tinytest.addAsync(
+  "roles -can get all users in role by scope and passes through mongo query arguments",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
 
-  it('can get all users in role by scope and passes through mongo query arguments', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
+    await Roles.addUsersToRolesAsync(
+      [users.eve, users.joe],
+      ["admin", "user"],
+      "scope1"
+    );
+    await Roles.addUsersToRolesAsync(
+      [users.bob, users.joe],
+      ["admin"],
+      "scope2"
+    );
 
-    await Roles.addUsersToRolesAsync([users.eve, users.joe], ['admin', 'user'], 'scope1')
-    await Roles.addUsersToRolesAsync([users.bob, users.joe], ['admin'], 'scope2')
+    const cursor = await Roles.getUsersInRoleAsync("admin", "scope1", {
+      fields: { username: 0 },
+      limit: 1,
+    });
+    const results = await cursor.fetchAsync();
 
-    const cursor = await Roles.getUsersInRoleAsync('admin', 'scope1', { fields: { username: 0 }, limit: 1 })
-    const results = await cursor.fetchAsync()
+    test.equal(1, results.length);
+    test.isTrue(hasProp(results[0], "_id"));
+    test.isFalse(hasProp(results[0], "username"));
+  }
+);
 
-    assert.equal(1, results.length)
-    assert.isTrue(hasProp(results[0], '_id'))
-    assert.isFalse(hasProp(results[0], 'username'))
-  })
+Tinytest.addAsync(
+  "roles -can use Roles.GLOBAL_SCOPE to assign blanket roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
 
-  it('can use Roles.GLOBAL_SCOPE to assign blanket roles', async function () {
-    await Roles.createRoleAsync('admin')
+    await Roles.addUsersToRolesAsync(
+      [users.joe, users.bob],
+      ["admin"],
+      Roles.GLOBAL_SCOPE
+    );
 
-    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
+    await testUser(test, "eve", [], "scope1");
+    await testUser(test, "joe", ["admin"], "scope2");
+    await testUser(test, "joe", ["admin"], "scope1");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "bob", ["admin"], "scope1");
 
-    await testUser('eve', [], 'scope1')
-    await testUser('joe', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope1')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('bob', ['admin'], 'scope1')
+    await Roles.removeUsersFromRolesAsync(
+      users.joe,
+      ["admin"],
+      Roles.GLOBAL_SCOPE
+    );
 
-    await Roles.removeUsersFromRolesAsync(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
+    await testUser(test, "eve", [], "scope1");
+    await testUser(test, "joe", [], "scope2");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "bob", ["admin"], "scope1");
+  }
+);
 
-    await testUser('eve', [], 'scope1')
-    await testUser('joe', [], 'scope2')
-    await testUser('joe', [], 'scope1')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('bob', ['admin'], 'scope1')
-  })
+Tinytest.addAsync(
+  "roles -Roles.GLOBAL_SCOPE is independent of other scopes",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
 
-  it('Roles.GLOBAL_SCOPE is independent of other scopes', async function () {
-    await Roles.createRoleAsync('admin')
+    await Roles.addUsersToRolesAsync(
+      [users.joe, users.bob],
+      ["admin"],
+      "scope5"
+    );
+    await Roles.addUsersToRolesAsync(
+      [users.joe, users.bob],
+      ["admin"],
+      Roles.GLOBAL_SCOPE
+    );
 
-    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], 'scope5')
-    await Roles.addUsersToRolesAsync([users.joe, users.bob], ['admin'], Roles.GLOBAL_SCOPE)
+    await testUser(test, "eve", [], "scope1");
+    await testUser(test, "joe", ["admin"], "scope5");
+    await testUser(test, "joe", ["admin"], "scope2");
+    await testUser(test, "joe", ["admin"], "scope1");
+    await testUser(test, "bob", ["admin"], "scope5");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "bob", ["admin"], "scope1");
 
-    await testUser('eve', [], 'scope1')
-    await testUser('joe', ['admin'], 'scope5')
-    await testUser('joe', ['admin'], 'scope2')
-    await testUser('joe', ['admin'], 'scope1')
-    await testUser('bob', ['admin'], 'scope5')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('bob', ['admin'], 'scope1')
+    await Roles.removeUsersFromRolesAsync(
+      users.joe,
+      ["admin"],
+      Roles.GLOBAL_SCOPE
+    );
 
-    await Roles.removeUsersFromRolesAsync(users.joe, ['admin'], Roles.GLOBAL_SCOPE)
+    await testUser(test, "eve", [], "scope1");
+    await testUser(test, "joe", ["admin"], "scope5");
+    await testUser(test, "joe", [], "scope2");
+    await testUser(test, "joe", [], "scope1");
+    await testUser(test, "bob", ["admin"], "scope5");
+    await testUser(test, "bob", ["admin"], "scope2");
+    await testUser(test, "bob", ["admin"], "scope1");
+  }
+);
 
-    await testUser('eve', [], 'scope1')
-    await testUser('joe', ['admin'], 'scope5')
-    await testUser('joe', [], 'scope2')
-    await testUser('joe', [], 'scope1')
-    await testUser('bob', ['admin'], 'scope5')
-    await testUser('bob', ['admin'], 'scope2')
-    await testUser('bob', ['admin'], 'scope1')
-  })
+Tinytest.addAsync(
+  "roles -Roles.GLOBAL_SCOPE also checked when scope not specified",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
 
-  it('Roles.GLOBAL_SCOPE also checked when scope not specified', async function () {
-    await Roles.createRoleAsync('admin')
+    await Roles.addUsersToRolesAsync(users.joe, "admin", Roles.GLOBAL_SCOPE);
 
-    await Roles.addUsersToRolesAsync(users.joe, 'admin', Roles.GLOBAL_SCOPE)
+    await testUser(test, "joe", ["admin"]);
 
-    await testUser('joe', ['admin'])
+    await Roles.removeUsersFromRolesAsync(
+      users.joe,
+      "admin",
+      Roles.GLOBAL_SCOPE
+    );
 
-    await Roles.removeUsersFromRolesAsync(users.joe, 'admin', Roles.GLOBAL_SCOPE)
+    await testUser(test, "joe", []);
+  }
+);
 
-    await testUser('joe', [])
-  })
+Tinytest.addAsync("roles -can use '.' in scope name", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
 
-  it('can use \'.\' in scope name', async function () {
-    await Roles.createRoleAsync('admin')
+  await Roles.addUsersToRolesAsync(users.joe, ["admin"], "example.com");
+  await testUser(test, "joe", ["admin"], "example.com");
+});
 
-    await Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.com')
-    await testUser('joe', ['admin'], 'example.com')
-  })
+Tinytest.addAsync(
+  "roles -can use multiple periods in scope name",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
 
-  it('can use multiple periods in scope name', async function () {
-    await Roles.createRoleAsync('admin')
+    await Roles.addUsersToRolesAsync(users.joe, ["admin"], "example.k12.va.us");
+    await testUser(test, "joe", ["admin"], "example.k12.va.us");
+  }
+);
 
-    await Roles.addUsersToRolesAsync(users.joe, ['admin'], 'example.k12.va.us')
-    await testUser('joe', ['admin'], 'example.k12.va.us')
-  })
+Tinytest.addAsync("roles -renaming of roles", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
 
-  it('renaming of roles', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('editor')
+  await Roles.setUserRolesAsync(
+    [users.eve, users.bob],
+    ["editor", "user"],
+    "scope1"
+  );
+  await Roles.setUserRolesAsync(
+    [users.bob, users.joe],
+    ["user", "admin"],
+    "scope2"
+  );
 
-    await Roles.setUserRolesAsync([users.eve, users.bob], ['editor', 'user'], 'scope1')
-    await Roles.setUserRolesAsync([users.bob, users.joe], ['user', 'admin'], 'scope2')
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "editor", "scope1"));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "editor", "scope2"));
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'editor', 'scope1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'editor', 'scope2'))
+  test.isFalse(await Roles.userIsInRoleAsync(users.joe, "admin", "scope1"));
+  test.isTrue(await Roles.userIsInRoleAsync(users.joe, "admin", "scope2"));
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'admin', 'scope1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.joe, 'admin', 'scope2'))
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "user", "scope1"));
+  test.isTrue(await Roles.userIsInRoleAsync(users.bob, "user", "scope1"));
+  test.isFalse(await Roles.userIsInRoleAsync(users.joe, "user", "scope1"));
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'user', 'scope1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.bob, 'user', 'scope1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'user', 'scope1'))
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "user", "scope2"));
+  test.isTrue(await Roles.userIsInRoleAsync(users.bob, "user", "scope2"));
+  test.isTrue(await Roles.userIsInRoleAsync(users.joe, "user", "scope2"));
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user', 'scope2'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.bob, 'user', 'scope2'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.joe, 'user', 'scope2'))
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "user2", "scope1"));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "user2", "scope2"));
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user2', 'scope1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user2', 'scope2'))
+  await Roles.renameRoleAsync("user", "user2");
 
-    await Roles.renameRoleAsync('user', 'user2')
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "editor", "scope1"));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "editor", "scope2"));
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'editor', 'scope1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'editor', 'scope2'))
+  test.isFalse(await Roles.userIsInRoleAsync(users.joe, "admin", "scope1"));
+  test.isTrue(await Roles.userIsInRoleAsync(users.joe, "admin", "scope2"));
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'admin', 'scope1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.joe, 'admin', 'scope2'))
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "user2", "scope1"));
+  test.isTrue(await Roles.userIsInRoleAsync(users.bob, "user2", "scope1"));
+  test.isFalse(await Roles.userIsInRoleAsync(users.joe, "user2", "scope1"));
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'user2', 'scope1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.bob, 'user2', 'scope1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.joe, 'user2', 'scope1'))
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "user2", "scope2"));
+  test.isTrue(await Roles.userIsInRoleAsync(users.bob, "user2", "scope2"));
+  test.isTrue(await Roles.userIsInRoleAsync(users.joe, "user2", "scope2"));
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user2', 'scope2'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.bob, 'user2', 'scope2'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.joe, 'user2', 'scope2'))
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "user", "scope1"));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "user", "scope2"));
+});
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user', 'scope1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'user', 'scope2'))
-  })
+Tinytest.addAsync("roles -_addUserToRole", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
 
-  it('_addUserToRole', async function () {
-    await Roles.createRoleAsync('admin')
+  const userRoles = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    userRoles.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    []
+  );
 
-    const userRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(userRoles.map(obj => { delete obj._id; return obj }), [])
+  const roles = await Roles._addUserToRoleAsync(users.eve, "admin", {
+    scope: null,
+    ifExists: false,
+  });
+  hasAnyKeys(test, roles, "insertedId");
 
-    const roles = await Roles._addUserToRoleAsync(users.eve, 'admin', { scope: null, ifExists: false })
-    assert.hasAnyKeys(roles, 'insertedId')
+  const userRoles2 = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    userRoles2.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "admin" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [{ _id: "admin" }],
+      },
+    ]
+  );
 
-    const userRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(userRoles2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
+  const roles2 = await Roles._addUserToRoleAsync(users.eve, "admin", {
+    scope: null,
+    ifExists: false,
+  });
+  hasAnyKeys(test, roles2, "insertedId");
 
-    const roles2 = await Roles._addUserToRoleAsync(users.eve, 'admin', { scope: null, ifExists: false })
-    assert.hasAnyKeys(roles2, 'insertedId')
+  const roles3 = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    roles3.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "admin" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [{ _id: "admin" }],
+      },
+    ]
+  );
+});
 
-    const roles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(roles3.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
-  })
+Tinytest.addAsync("roles -_removeUserFromRole", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
 
-  it('_removeUserFromRole', async function () {
-    await Roles.createRoleAsync('admin')
+  await Roles.addUsersToRolesAsync(users.eve, "admin");
 
-    await Roles.addUsersToRolesAsync(users.eve, 'admin')
+  const rolesForUser = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    rolesForUser.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "admin" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [{ _id: "admin" }],
+      },
+    ]
+  );
 
-    const rolesForUser = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(rolesForUser.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'admin' }]
-    }])
+  await Roles._removeUserFromRoleAsync(users.eve, "admin", { scope: null });
 
-    await Roles._removeUserFromRoleAsync(users.eve, 'admin', { scope: null })
+  const rolesForUser2 = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    rolesForUser2.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    []
+  );
+});
 
-    const rolesForUser2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(rolesForUser2.map(obj => { delete obj._id; return obj }), [])
-  })
+Tinytest.addAsync("roles -keep assigned roles", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("ALL_PERMISSIONS");
+  await Roles.createRoleAsync("VIEW_PERMISSION");
+  await Roles.createRoleAsync("EDIT_PERMISSION");
+  await Roles.createRoleAsync("DELETE_PERMISSION");
+  await Roles.addRolesToParentAsync("ALL_PERMISSIONS", "user");
+  await Roles.addRolesToParentAsync("EDIT_PERMISSION", "ALL_PERMISSIONS");
+  await Roles.addRolesToParentAsync("VIEW_PERMISSION", "ALL_PERMISSIONS");
+  await Roles.addRolesToParentAsync("DELETE_PERMISSION", "admin");
 
-  it('keep assigned roles', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('ALL_PERMISSIONS')
-    await Roles.createRoleAsync('VIEW_PERMISSION')
-    await Roles.createRoleAsync('EDIT_PERMISSION')
-    await Roles.createRoleAsync('DELETE_PERMISSION')
-    await Roles.addRolesToParentAsync('ALL_PERMISSIONS', 'user')
-    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-    await Roles.addRolesToParentAsync('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-    await Roles.addRolesToParentAsync('DELETE_PERMISSION', 'admin')
+  await Roles.addUsersToRolesAsync(users.eve, ["user"]);
 
-    await Roles.addUsersToRolesAsync(users.eve, ['user'])
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "VIEW_PERMISSION"));
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+  const rolesForUser = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    rolesForUser.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "user" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [
+          { _id: "user" },
+          { _id: "ALL_PERMISSIONS" },
+          { _id: "EDIT_PERMISSION" },
+          { _id: "VIEW_PERMISSION" },
+        ],
+      },
+    ]
+  );
 
-    const rolesForUser = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(rolesForUser.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
+  await Roles.addUsersToRolesAsync(users.eve, "VIEW_PERMISSION");
+
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "VIEW_PERMISSION"));
+
+  const rolesForUser2 = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    rolesForUser2.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "user" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [
+          { _id: "user" },
+          { _id: "ALL_PERMISSIONS" },
+          { _id: "EDIT_PERMISSION" },
+          { _id: "VIEW_PERMISSION" },
+        ],
+      },
+      {
+        role: { _id: "VIEW_PERMISSION" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [{ _id: "VIEW_PERMISSION" }],
+      },
+    ]
+  );
+
+  await Roles.removeUsersFromRolesAsync(users.eve, "user");
+
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "VIEW_PERMISSION"));
+
+  const rolesForUser3 = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    rolesForUser3.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "VIEW_PERMISSION" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [{ _id: "VIEW_PERMISSION" }],
+      },
+    ]
+  );
+
+  await Roles.removeUsersFromRolesAsync(users.eve, "VIEW_PERMISSION");
+
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "VIEW_PERMISSION"));
+
+  const rolesForUser4 = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    rolesForUser4.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    []
+  );
+});
+
+Tinytest.addAsync(
+  "roles -adds children of the added role to the assignments",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("ALBUM.ADMIN");
+    await Roles.createRoleAsync("ALBUM.VIEW");
+    await Roles.createRoleAsync("TRACK.ADMIN");
+    await Roles.createRoleAsync("TRACK.VIEW");
+
+    await Roles.addRolesToParentAsync("ALBUM.VIEW", "ALBUM.ADMIN");
+    await Roles.addRolesToParentAsync("TRACK.VIEW", "TRACK.ADMIN");
+
+    await Roles.addRolesToParentAsync("ALBUM.ADMIN", "admin");
+
+    await Roles.addUsersToRolesAsync(users.eve, ["admin"]);
+
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "TRACK.VIEW"));
+
+    await Roles.addRolesToParentAsync("TRACK.ADMIN", "admin");
+
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "TRACK.VIEW"));
+  }
+);
+
+Tinytest.addAsync(
+  "roles -removes children of the removed role from the assignments",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("ALBUM.ADMIN");
+    await Roles.createRoleAsync("ALBUM.VIEW");
+    await Roles.createRoleAsync("TRACK.ADMIN");
+    await Roles.createRoleAsync("TRACK.VIEW");
+
+    await Roles.addRolesToParentAsync("ALBUM.VIEW", "ALBUM.ADMIN");
+    await Roles.addRolesToParentAsync("TRACK.VIEW", "TRACK.ADMIN");
+
+    await Roles.addRolesToParentAsync("ALBUM.ADMIN", "admin");
+    await Roles.addRolesToParentAsync("TRACK.ADMIN", "admin");
+
+    await Roles.addUsersToRolesAsync(users.eve, ["admin"]);
+
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "TRACK.VIEW"));
+
+    await Roles.removeRolesFromParentAsync("TRACK.ADMIN", "admin");
+
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "TRACK.VIEW"));
+  }
+);
+
+Tinytest.addAsync(
+  "roles -modify assigned hierarchical roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("ALL_PERMISSIONS");
+    await Roles.createRoleAsync("VIEW_PERMISSION");
+    await Roles.createRoleAsync("EDIT_PERMISSION");
+    await Roles.createRoleAsync("DELETE_PERMISSION");
+    await Roles.addRolesToParentAsync("ALL_PERMISSIONS", "user");
+    await Roles.addRolesToParentAsync("EDIT_PERMISSION", "ALL_PERMISSIONS");
+    await Roles.addRolesToParentAsync("VIEW_PERMISSION", "ALL_PERMISSIONS");
+    await Roles.addRolesToParentAsync("DELETE_PERMISSION", "admin");
+
+    await Roles.addUsersToRolesAsync(users.eve, ["user"]);
+    await Roles.addUsersToRolesAsync(users.eve, ["ALL_PERMISSIONS"], "scope");
+
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, "MODERATE_PERMISSION")
+    );
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, "MODERATE_PERMISSION", "scope")
+    );
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "user" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "user" },
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+          ],
+        },
+        {
+          role: { _id: "ALL_PERMISSIONS" },
+          scope: "scope",
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+          ],
+        },
       ]
-    }])
+    );
 
-    await Roles.addUsersToRolesAsync(users.eve, 'VIEW_PERMISSION')
+    await Roles.createRoleAsync("MODERATE_PERMISSION");
 
-    assert.eventually.isTrue(Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+    await Roles.addRolesToParentAsync("MODERATE_PERMISSION", "ALL_PERMISSIONS");
 
-    const rolesForUser2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(rolesForUser2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "MODERATE_PERMISSION")
+    );
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "MODERATE_PERMISSION", "scope")
+    );
+
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles2.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "user" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "user" },
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+            { _id: "MODERATE_PERMISSION" },
+          ],
+        },
+        {
+          role: { _id: "ALL_PERMISSIONS" },
+          scope: "scope",
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+            { _id: "MODERATE_PERMISSION" },
+          ],
+        },
       ]
-    }, {
-      role: { _id: 'VIEW_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'VIEW_PERMISSION' }
+    );
+
+    await Roles.addUsersToRolesAsync(users.eve, ["admin"]);
+
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "DELETE_PERMISSION"));
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "DELETE_PERMISSION", "scope")
+    );
+
+    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles3.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "user" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "user" },
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+            { _id: "MODERATE_PERMISSION" },
+          ],
+        },
+        {
+          role: { _id: "ALL_PERMISSIONS" },
+          scope: "scope",
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+            { _id: "MODERATE_PERMISSION" },
+          ],
+        },
+        {
+          role: { _id: "admin" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "admin" }, { _id: "DELETE_PERMISSION" }],
+        },
       ]
-    }])
+    );
 
-    await Roles.removeUsersFromRolesAsync(users.eve, 'user')
+    await Roles.addRolesToParentAsync("DELETE_PERMISSION", "ALL_PERMISSIONS");
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "DELETE_PERMISSION"));
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "DELETE_PERMISSION", "scope")
+    );
 
-    const rolesForUser3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(rolesForUser3.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'VIEW_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'VIEW_PERMISSION' }
+    const usersRoles4 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles4.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "user" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "user" },
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+            { _id: "MODERATE_PERMISSION" },
+            { _id: "DELETE_PERMISSION" },
+          ],
+        },
+        {
+          role: { _id: "ALL_PERMISSIONS" },
+          scope: "scope",
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+            { _id: "MODERATE_PERMISSION" },
+            { _id: "DELETE_PERMISSION" },
+          ],
+        },
+        {
+          role: { _id: "admin" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "admin" }, { _id: "DELETE_PERMISSION" }],
+        },
       ]
-    }])
+    );
 
-    await Roles.removeUsersFromRolesAsync(users.eve, 'VIEW_PERMISSION')
+    await Roles.removeUsersFromRolesAsync(users.eve, ["admin"]);
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'VIEW_PERMISSION'))
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "DELETE_PERMISSION"));
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "DELETE_PERMISSION", "scope")
+    );
 
-    const rolesForUser4 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(rolesForUser4.map(obj => { delete obj._id; return obj }), [])
-  })
-
-  it('adds children of the added role to the assignments', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('ALBUM.ADMIN')
-    await Roles.createRoleAsync('ALBUM.VIEW')
-    await Roles.createRoleAsync('TRACK.ADMIN')
-    await Roles.createRoleAsync('TRACK.VIEW')
-
-    await Roles.addRolesToParentAsync('ALBUM.VIEW', 'ALBUM.ADMIN')
-    await Roles.addRolesToParentAsync('TRACK.VIEW', 'TRACK.ADMIN')
-
-    await Roles.addRolesToParentAsync('ALBUM.ADMIN', 'admin')
-
-    await Roles.addUsersToRolesAsync(users.eve, ['admin'])
-
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
-
-    await Roles.addRolesToParentAsync('TRACK.ADMIN', 'admin')
-
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
-  })
-
-  it('removes children of the removed role from the assignments', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('ALBUM.ADMIN')
-    await Roles.createRoleAsync('ALBUM.VIEW')
-    await Roles.createRoleAsync('TRACK.ADMIN')
-    await Roles.createRoleAsync('TRACK.VIEW')
-
-    await Roles.addRolesToParentAsync('ALBUM.VIEW', 'ALBUM.ADMIN')
-    await Roles.addRolesToParentAsync('TRACK.VIEW', 'TRACK.ADMIN')
-
-    await Roles.addRolesToParentAsync('ALBUM.ADMIN', 'admin')
-    await Roles.addRolesToParentAsync('TRACK.ADMIN', 'admin')
-
-    await Roles.addUsersToRolesAsync(users.eve, ['admin'])
-
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
-
-    await Roles.removeRolesFromParentAsync('TRACK.ADMIN', 'admin')
-
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'TRACK.VIEW'))
-  })
-
-  it('modify assigned hierarchical roles', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('ALL_PERMISSIONS')
-    await Roles.createRoleAsync('VIEW_PERMISSION')
-    await Roles.createRoleAsync('EDIT_PERMISSION')
-    await Roles.createRoleAsync('DELETE_PERMISSION')
-    await Roles.addRolesToParentAsync('ALL_PERMISSIONS', 'user')
-    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'ALL_PERMISSIONS')
-    await Roles.addRolesToParentAsync('VIEW_PERMISSION', 'ALL_PERMISSIONS')
-    await Roles.addRolesToParentAsync('DELETE_PERMISSION', 'admin')
-
-    await Roles.addUsersToRolesAsync(users.eve, ['user'])
-    await Roles.addUsersToRolesAsync(users.eve, ['ALL_PERMISSIONS'], 'scope')
-
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
-
-    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
+    const usersRoles5 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles5.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "user" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "user" },
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+            { _id: "MODERATE_PERMISSION" },
+            { _id: "DELETE_PERMISSION" },
+          ],
+        },
+        {
+          role: { _id: "ALL_PERMISSIONS" },
+          scope: "scope",
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "ALL_PERMISSIONS" },
+            { _id: "EDIT_PERMISSION" },
+            { _id: "VIEW_PERMISSION" },
+            { _id: "MODERATE_PERMISSION" },
+            { _id: "DELETE_PERMISSION" },
+          ],
+        },
       ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' }
+    );
+
+    await await Roles.deleteRoleAsync("ALL_PERMISSIONS");
+
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "DELETE_PERMISSION"));
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, "DELETE_PERMISSION", "scope")
+    );
+
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, "MODERATE_PERMISSION")
+    );
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, "MODERATE_PERMISSION", "scope")
+    );
+
+    const usersRoles6 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles6.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "user" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "user" }],
+        },
       ]
-    }])
+    );
+  }
+);
 
-    await Roles.createRoleAsync('MODERATE_PERMISSION')
+Tinytest.addAsync(
+  "roles -delete role with overlapping hierarchical roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("role1");
+    await Roles.createRoleAsync("role2");
+    await Roles.createRoleAsync("COMMON_PERMISSION_1");
+    await Roles.createRoleAsync("COMMON_PERMISSION_2");
+    await Roles.createRoleAsync("COMMON_PERMISSION_3");
+    await Roles.createRoleAsync("EXTRA_PERMISSION_ROLE_1");
+    await Roles.createRoleAsync("EXTRA_PERMISSION_ROLE_2");
 
-    await Roles.addRolesToParentAsync('MODERATE_PERMISSION', 'ALL_PERMISSIONS')
+    await Roles.addRolesToParentAsync("COMMON_PERMISSION_1", "role1");
+    await Roles.addRolesToParentAsync("COMMON_PERMISSION_2", "role1");
+    await Roles.addRolesToParentAsync("COMMON_PERMISSION_3", "role1");
+    await Roles.addRolesToParentAsync("EXTRA_PERMISSION_ROLE_1", "role1");
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
+    await Roles.addRolesToParentAsync("COMMON_PERMISSION_1", "role2");
+    await Roles.addRolesToParentAsync("COMMON_PERMISSION_2", "role2");
+    await Roles.addRolesToParentAsync("COMMON_PERMISSION_3", "role2");
+    await Roles.addRolesToParentAsync("EXTRA_PERMISSION_ROLE_2", "role2");
 
-    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
+    await Roles.addUsersToRolesAsync(users.eve, "role1");
+    await Roles.addUsersToRolesAsync(users.eve, "role2");
+
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "COMMON_PERMISSION_1")
+    );
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "EXTRA_PERMISSION_ROLE_1")
+    );
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "EXTRA_PERMISSION_ROLE_2")
+    );
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "role1" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "role1" },
+            { _id: "COMMON_PERMISSION_1" },
+            { _id: "COMMON_PERMISSION_2" },
+            { _id: "COMMON_PERMISSION_3" },
+            { _id: "EXTRA_PERMISSION_ROLE_1" },
+          ],
+        },
+        {
+          role: { _id: "role2" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "role2" },
+            { _id: "COMMON_PERMISSION_1" },
+            { _id: "COMMON_PERMISSION_2" },
+            { _id: "COMMON_PERMISSION_3" },
+            { _id: "EXTRA_PERMISSION_ROLE_2" },
+          ],
+        },
       ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
+    );
+
+    await Roles.removeUsersFromRolesAsync(users.eve, "role2");
+
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "COMMON_PERMISSION_1")
+    );
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "EXTRA_PERMISSION_ROLE_1")
+    );
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, "EXTRA_PERMISSION_ROLE_2")
+    );
+
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles2.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "role1" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "role1" },
+            { _id: "COMMON_PERMISSION_1" },
+            { _id: "COMMON_PERMISSION_2" },
+            { _id: "COMMON_PERMISSION_3" },
+            { _id: "EXTRA_PERMISSION_ROLE_1" },
+          ],
+        },
       ]
-    }])
+    );
 
-    await Roles.addUsersToRolesAsync(users.eve, ['admin'])
+    await Roles.addUsersToRolesAsync(users.eve, "role2");
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "COMMON_PERMISSION_1")
+    );
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "EXTRA_PERMISSION_ROLE_1")
+    );
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "EXTRA_PERMISSION_ROLE_2")
+    );
 
-    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles3.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
+    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles3.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "role1" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "role1" },
+            { _id: "COMMON_PERMISSION_1" },
+            { _id: "COMMON_PERMISSION_2" },
+            { _id: "COMMON_PERMISSION_3" },
+            { _id: "EXTRA_PERMISSION_ROLE_1" },
+          ],
+        },
+        {
+          role: { _id: "role2" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "role2" },
+            { _id: "COMMON_PERMISSION_1" },
+            { _id: "COMMON_PERMISSION_2" },
+            { _id: "COMMON_PERMISSION_3" },
+            { _id: "EXTRA_PERMISSION_ROLE_2" },
+          ],
+        },
       ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' }
+    );
+
+    await Roles.deleteRoleAsync("role2");
+
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "COMMON_PERMISSION_1")
+    );
+    test.isTrue(
+      await Roles.userIsInRoleAsync(users.eve, "EXTRA_PERMISSION_ROLE_1")
+    );
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, "EXTRA_PERMISSION_ROLE_2")
+    );
+
+    const usersRoles4 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles4.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "role1" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [
+            { _id: "role1" },
+            { _id: "COMMON_PERMISSION_1" },
+            { _id: "COMMON_PERMISSION_2" },
+            { _id: "COMMON_PERMISSION_3" },
+            { _id: "EXTRA_PERMISSION_ROLE_1" },
+          ],
+        },
       ]
-    }, {
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'admin' },
-        { _id: 'DELETE_PERMISSION' }
+    );
+  }
+);
+
+Tinytest.addAsync("roles -set parent on assigned role", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("EDIT_PERMISSION");
+
+  await Roles.addUsersToRolesAsync(users.eve, "EDIT_PERMISSION");
+
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "EDIT_PERMISSION"));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "admin"));
+
+  const usersRoles = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    usersRoles.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "EDIT_PERMISSION" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [{ _id: "EDIT_PERMISSION" }],
+      },
+    ]
+  );
+
+  await Roles.addRolesToParentAsync("EDIT_PERMISSION", "admin");
+
+  test.isTrue(await Roles.userIsInRoleAsync(users.eve, "EDIT_PERMISSION"));
+  test.isFalse(await Roles.userIsInRoleAsync(users.eve, "admin"));
+
+  const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, {
+    anyScope: true,
+    fullObjects: true,
+  });
+  sameDeepMembers(
+    test,
+    usersRoles2.map((obj) => {
+      delete obj._id;
+      return obj;
+    }),
+    [
+      {
+        role: { _id: "EDIT_PERMISSION" },
+        scope: null,
+        user: { _id: users.eve },
+        inheritedRoles: [{ _id: "EDIT_PERMISSION" }],
+      },
+    ]
+  );
+});
+
+Tinytest.addAsync(
+  "roles -remove parent on assigned role",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("EDIT_PERMISSION");
+
+    await Roles.addRolesToParentAsync("EDIT_PERMISSION", "admin");
+
+    await Roles.addUsersToRolesAsync(users.eve, "EDIT_PERMISSION");
+
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "EDIT_PERMISSION"));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "admin"));
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "EDIT_PERMISSION" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "EDIT_PERMISSION" }],
+        },
       ]
-    }])
+    );
 
-    await Roles.addRolesToParentAsync('DELETE_PERMISSION', 'ALL_PERMISSIONS')
+    await Roles.removeRolesFromParentAsync("EDIT_PERMISSION", "admin");
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "EDIT_PERMISSION"));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "admin"));
 
-    const usersRoles4 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles4.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles2.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "EDIT_PERMISSION" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "EDIT_PERMISSION" }],
+        },
       ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
+    );
+  }
+);
+
+Tinytest.addAsync(
+  "roles -adding and removing extra role parents",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("EDIT_PERMISSION");
+
+    await Roles.addRolesToParentAsync("EDIT_PERMISSION", "admin");
+
+    await Roles.addUsersToRolesAsync(users.eve, "EDIT_PERMISSION");
+
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "EDIT_PERMISSION"));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "admin"));
+
+    const usersRoles = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "EDIT_PERMISSION" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "EDIT_PERMISSION" }],
+        },
       ]
-    }, {
-      role: { _id: 'admin' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'admin' },
-        { _id: 'DELETE_PERMISSION' }
+    );
+
+    await Roles.addRolesToParentAsync("EDIT_PERMISSION", "user");
+
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "EDIT_PERMISSION"));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "admin"));
+
+    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles2.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "EDIT_PERMISSION" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "EDIT_PERMISSION" }],
+        },
       ]
-    }])
+    );
 
-    await Roles.removeUsersFromRolesAsync(users.eve, ['admin'])
+    await Roles.removeRolesFromParentAsync("EDIT_PERMISSION", "user");
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+    test.isTrue(await Roles.userIsInRoleAsync(users.eve, "EDIT_PERMISSION"));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "admin"));
 
-    const usersRoles5 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles5.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' },
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
+    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, {
+      anyScope: true,
+      fullObjects: true,
+    });
+    sameDeepMembers(
+      test,
+      usersRoles3.map((obj) => {
+        delete obj._id;
+        return obj;
+      }),
+      [
+        {
+          role: { _id: "EDIT_PERMISSION" },
+          scope: null,
+          user: { _id: users.eve },
+          inheritedRoles: [{ _id: "EDIT_PERMISSION" }],
+        },
       ]
-    }, {
-      role: { _id: 'ALL_PERMISSIONS' },
-      scope: 'scope',
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'ALL_PERMISSIONS' },
-        { _id: 'EDIT_PERMISSION' },
-        { _id: 'VIEW_PERMISSION' },
-        { _id: 'MODERATE_PERMISSION' },
-        { _id: 'DELETE_PERMISSION' }
-      ]
-    }])
+    );
+  }
+);
 
-    await await Roles.deleteRoleAsync('ALL_PERMISSIONS')
+Tinytest.addAsync("roles -cyclic roles", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("editor");
+  await Roles.createRoleAsync("user");
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'DELETE_PERMISSION', 'scope'))
+  await Roles.addRolesToParentAsync("editor", "admin");
+  await Roles.addRolesToParentAsync("user", "editor");
 
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'MODERATE_PERMISSION', 'scope'))
+  try {
+    await Roles.addRolesToParentAsync("admin", "user");
+    test.fail("Should throw cycle error");
+  } catch (e) {
+    test.matches(e.message, /form a cycle/);
+  }
+});
 
-    const usersRoles6 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles6.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'user' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'user' }
-      ]
-    }])
-  })
+Tinytest.addAsync(
+  "roles -userIsInRole returns false for unknown roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
+    await Roles.addUsersToRolesAsync(users.eve, ["admin", "user"]);
+    await Roles.addUsersToRolesAsync(users.eve, ["editor"]);
 
-  it('delete role with overlapping hierarchical roles', async function () {
-    await Roles.createRoleAsync('role1')
-    await Roles.createRoleAsync('role2')
-    await Roles.createRoleAsync('COMMON_PERMISSION_1')
-    await Roles.createRoleAsync('COMMON_PERMISSION_2')
-    await Roles.createRoleAsync('COMMON_PERMISSION_3')
-    await Roles.createRoleAsync('EXTRA_PERMISSION_ROLE_1')
-    await Roles.createRoleAsync('EXTRA_PERMISSION_ROLE_2')
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, "unknown"));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, []));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, null));
+    test.isFalse(await Roles.userIsInRoleAsync(users.eve, undefined));
 
-    await Roles.addRolesToParentAsync('COMMON_PERMISSION_1', 'role1')
-    await Roles.addRolesToParentAsync('COMMON_PERMISSION_2', 'role1')
-    await Roles.addRolesToParentAsync('COMMON_PERMISSION_3', 'role1')
-    await Roles.addRolesToParentAsync('EXTRA_PERMISSION_ROLE_1', 'role1')
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, "unknown", { anyScope: true })
+    );
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, [], { anyScope: true })
+    );
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, null, { anyScope: true })
+    );
+    test.isFalse(
+      await Roles.userIsInRoleAsync(users.eve, undefined, { anyScope: true })
+    );
 
-    await Roles.addRolesToParentAsync('COMMON_PERMISSION_1', 'role2')
-    await Roles.addRolesToParentAsync('COMMON_PERMISSION_2', 'role2')
-    await Roles.addRolesToParentAsync('COMMON_PERMISSION_3', 'role2')
-    await Roles.addRolesToParentAsync('EXTRA_PERMISSION_ROLE_2', 'role2')
+    test.isFalse(
+      await Roles.userIsInRoleAsync(
+        users.eve,
+        ["Role1", "Role2", undefined],
+        "GroupName"
+      )
+    );
+  }
+);
 
-    await Roles.addUsersToRolesAsync(users.eve, 'role1')
-    await Roles.addUsersToRolesAsync(users.eve, 'role2')
+Tinytest.addAsync(
+  "roles -userIsInRole returns false if user is a function",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.addUsersToRolesAsync(users.eve, ["admin"]);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+    test.isFalse(await Roles.userIsInRoleAsync(() => {}, "admin"));
+  }
+);
 
-    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }, {
-      role: { _id: 'role2' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role2' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_2' }
-      ]
-    }])
+Tinytest.addAsync(
+  "roles -returns false for unknown roles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
 
-    await Roles.removeUsersFromRolesAsync(users.eve, 'role2')
+    test.isFalse(await Roles.isParentOfAsync("admin", "unknown"));
+    test.isFalse(await Roles.isParentOfAsync("admin", null));
+    test.isFalse(await Roles.isParentOfAsync("admin", undefined));
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+    test.isFalse(await Roles.isParentOfAsync("unknown", "admin"));
+    test.isFalse(await Roles.isParentOfAsync(null, "admin"));
+    test.isFalse(await Roles.isParentOfAsync(undefined, "admin"));
+  }
+);
 
-    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }])
+Tinytest.addAsync(
+  "roles -returns false if role is not parent of",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("editor");
+    await Roles.createRoleAsync("user");
+    await Roles.addRolesToParentAsync(["editor"], "admin");
+    await Roles.addRolesToParentAsync(["user"], "editor");
 
-    await Roles.addUsersToRolesAsync(users.eve, 'role2')
+    test.isFalse(await Roles.isParentOfAsync("user", "admin"));
+    test.isFalse(await Roles.isParentOfAsync("editor", "admin"));
+  }
+);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+Tinytest.addAsync(
+  "roles -returns true if role is parent of the demanded role",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("admin");
+    await Roles.createRoleAsync("editor");
+    await Roles.createRoleAsync("user");
+    await Roles.addRolesToParentAsync(["editor"], "admin");
+    await Roles.addRolesToParentAsync(["user"], "editor");
 
-    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles3.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }, {
-      role: { _id: 'role2' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role2' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_2' }
-      ]
-    }])
+    test.isTrue(await Roles.isParentOfAsync("admin", "user"));
+    test.isTrue(await Roles.isParentOfAsync("editor", "user"));
+    test.isTrue(await Roles.isParentOfAsync("admin", "editor"));
 
-    await Roles.deleteRoleAsync('role2')
+    test.isTrue(await Roles.isParentOfAsync("admin", "admin"));
+    test.isTrue(await Roles.isParentOfAsync("editor", "editor"));
+    test.isTrue(await Roles.isParentOfAsync("user", "user"));
+  }
+);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'COMMON_PERMISSION_1'))
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_1'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'EXTRA_PERMISSION_ROLE_2'))
+// here
 
-    const usersRoles4 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles4.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'role1' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [
-        { _id: 'role1' },
-        { _id: 'COMMON_PERMISSION_1' },
-        { _id: 'COMMON_PERMISSION_2' },
-        { _id: 'COMMON_PERMISSION_3' },
-        { _id: 'EXTRA_PERMISSION_ROLE_1' }
-      ]
-    }])
-  })
+Tinytest.addAsync(
+  "should not return null entries if user has no roles for scope",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("editor");
 
-  it('set parent on assigned role', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('EDIT_PERMISSION')
+    const userId = users.eve;
+    let userObj;
 
-    await Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+    // by userId
+    sameMembers(test,await Roles.getRolesForUserAsync(userId, "scope1"), []);
+    sameMembers(test,await Roles.getRolesForUserAsync(userId), []);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+    // by user object
+    userObj = await Meteor.users.findOneAsync({ _id: userId });
+    sameMembers(test,await Roles.getRolesForUserAsync(userObj, "scope1"), []);
+    sameMembers(test,await Roles.getRolesForUserAsync(userObj), []);
 
-    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
+    await Roles.addUsersToRolesAsync(
+      [users.eve],
+      ["editor"],
+      Roles.GLOBAL_SCOPE
+    );
 
-    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'admin')
+    // by userId
+    sameMembers(test,await Roles.getRolesForUserAsync(userId, "scope1"), [
+      "editor",
+    ]);
+    sameMembers(test,await Roles.getRolesForUserAsync(userId), ["editor"]);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+    // by user object
+    userObj = await Meteor.users.findOneAsync({ _id: userId });
+    sameMembers(test,await Roles.getRolesForUserAsync(userObj, "scope1"), [
+      "editor",
+    ]);
+    sameMembers(test,await Roles.getRolesForUserAsync(userObj), ["editor"]);
+  }
+);
 
-    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
+Tinytest.addAsync(
+  "should not fail during a call of addUsersToRoles",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("editor");
 
-  it('remove parent on assigned role', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('EDIT_PERMISSION')
+    const userId = users.eve;
+    const promises = [];
+    const interval = setInterval(() => {
+      promises.push(
+        Promise.resolve().then(async () => {
+          await Roles.getRolesForUserAsync(userId);
+        })
+      );
+    }, 0);
 
-    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'admin')
+    await Roles.addUsersToRolesAsync(
+      [users.eve],
+      ["editor"],
+      Roles.GLOBAL_SCOPE
+    );
+    clearInterval(interval);
 
-    await Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+    return Promise.all(promises);
+  }
+);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+Tinytest.addAsync(
+  "returns an empty list of scopes for null as user-id",
+  async function (test) {
+    await clearData();
+    sameMembers(test,await Roles.getScopesForUserAsync(undefined), []);
+    sameMembers(test,await Roles.getScopesForUserAsync(null), []);
+    sameMembers(test,await Roles.getScopesForUserAsync("foo"), []);
+    sameMembers(test,await Roles.getScopesForUserAsync({}), []);
+    sameMembers(test,await Roles.getScopesForUserAsync({ _id: "foo" }), []);
+  }
+);
 
-    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
+Tinytest.addAsync("can get all scopes for user", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
 
-    await Roles.removeRolesFromParentAsync('EDIT_PERMISSION', 'admin')
+  const userId = users.eve;
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+  await Roles.addUsersToRolesAsync([users.eve], ["editor"], "scope1");
+  await Roles.addUsersToRolesAsync([users.eve], ["admin", "user"], "scope2");
 
-    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
+  // by userId
+  sameMembers(test,await Roles.getScopesForUserAsync(userId), [
+    "scope1",
+    "scope2",
+  ]);
 
-  it('adding and removing extra role parents', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('user')
-    await Roles.createRoleAsync('EDIT_PERMISSION')
+  // by user object
+  const userObj = await Meteor.users.findOneAsync({ _id: userId });
+  sameMembers(test,await Roles.getScopesForUserAsync(userObj), [
+    "scope1",
+    "scope2",
+  ]);
+});
 
-    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'admin')
+Tinytest.addAsync("can get all scopes for user by role", async function (test) {
+  await clearData();
+  await Roles.createRoleAsync("admin");
+  await Roles.createRoleAsync("user");
+  await Roles.createRoleAsync("editor");
 
-    await Roles.addUsersToRolesAsync(users.eve, 'EDIT_PERMISSION')
+  const userId = users.eve;
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+  await Roles.addUsersToRolesAsync([users.eve], ["editor"], "scope1");
+  await Roles.addUsersToRolesAsync([users.eve], ["editor", "user"], "scope2");
 
-    const usersRoles = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
+  // by userId
+  sameMembers(test,await Roles.getScopesForUserAsync(userId, "user"), [
+    "scope2",
+  ]);
+  sameMembers(test,await Roles.getScopesForUserAsync(userId, "editor"), [
+    "scope1",
+    "scope2",
+  ]);
+  sameMembers(test,await Roles.getScopesForUserAsync(userId, "admin"), []);
 
-    await Roles.addRolesToParentAsync('EDIT_PERMISSION', 'user')
+  // by user object
+  const userObj = await Meteor.users.findOneAsync({ _id: userId });
+  sameMembers(test,await Roles.getScopesForUserAsync(userObj, "user"), [
+    "scope2",
+  ]);
+  sameMembers(test,await Roles.getScopesForUserAsync(userObj, "editor"), [
+    "scope1",
+    "scope2",
+  ]);
+  sameMembers(test,await Roles.getScopesForUserAsync(userObj, "admin"), []);
+});
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+Tinytest.addAsync(
+  "getScopesForUser returns [] when not using scopes",
+  async function (test) {
+    await clearData();
+    await Roles.createRoleAsync("user");
+    await Roles.createRoleAsync("editor");
 
-    const usersRoles2 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles2.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
+    const userId = users.eve;
 
-    await Roles.removeRolesFromParentAsync('EDIT_PERMISSION', 'user')
+    await Roles.addUsersToRolesAsync([users.eve], ["editor", "user"]);
 
-    assert.isTrue(await Roles.userIsInRoleAsync(users.eve, 'EDIT_PERMISSION'))
-    assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'admin'))
+    // by userId
+    sameMembers(test,await Roles.getScopesForUserAsync(userId), []);
+    sameMembers(test,await Roles.getScopesForUserAsync(userId, "editor"), []);
+    sameMembers(test,
+      await Roles.getScopesForUserAsync(userId, ["editor"]),
+      []
+    );
+    sameMembers(test,
+      await Roles.getScopesForUserAsync(userId, ["editor", "user"]),
+      []
+    );
 
-    const usersRoles3 = await Roles.getRolesForUserAsync(users.eve, { anyScope: true, fullObjects: true })
-    assert.sameDeepMembers(usersRoles3.map(obj => { delete obj._id; return obj }), [{
-      role: { _id: 'EDIT_PERMISSION' },
-      scope: null,
-      user: { _id: users.eve },
-      inheritedRoles: [{ _id: 'EDIT_PERMISSION' }]
-    }])
-  })
-
-  it('cyclic roles', async function () {
-    await Roles.createRoleAsync('admin')
-    await Roles.createRoleAsync('editor')
-    await Roles.createRoleAsync('user')
-
-    await Roles.addRolesToParentAsync('editor', 'admin')
-    await Roles.addRolesToParentAsync('user', 'editor')
-
-    await assert.isRejected(Roles.addRolesToParentAsync('admin', 'user'), /form a cycle/)
-  })
-
-  describe('userIsInRole', function () {
-    it('userIsInRole returns false for unknown roles', async function () {
-      await Roles.createRoleAsync('admin')
-      await Roles.createRoleAsync('user')
-      await Roles.createRoleAsync('editor')
-      await Roles.addUsersToRolesAsync(users.eve, ['admin', 'user'])
-      await Roles.addUsersToRolesAsync(users.eve, ['editor'])
-
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'unknown'))
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, []))
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, null))
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, undefined))
-
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, 'unknown', { anyScope: true }))
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, [], { anyScope: true }))
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, null, { anyScope: true }))
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, undefined, { anyScope: true }))
-
-      assert.isFalse(await Roles.userIsInRoleAsync(users.eve, ['Role1', 'Role2', undefined], 'GroupName'))
-    })
-
-    it('userIsInRole returns false if user is a function', async function () {
-      await Roles.createRoleAsync('admin')
-      await Roles.addUsersToRolesAsync(users.eve, ['admin'])
-
-      assert.isFalse(await Roles.userIsInRoleAsync(() => {}, 'admin'))
-    })
-  })
-
-  describe('isParentOf', function () {
-    it('returns false for unknown roles', async function () {
-      await Roles.createRoleAsync('admin')
-
-      assert.isFalse(await Roles.isParentOfAsync('admin', 'unknown'))
-      assert.isFalse(await Roles.isParentOfAsync('admin', null))
-      assert.isFalse(await Roles.isParentOfAsync('admin', undefined))
-
-      assert.isFalse(await Roles.isParentOfAsync('unknown', 'admin'))
-      assert.isFalse(await Roles.isParentOfAsync(null, 'admin'))
-      assert.isFalse(await Roles.isParentOfAsync(undefined, 'admin'))
-    })
-
-    it('returns false if role is not parent of', async function () {
-      await Roles.createRoleAsync('admin')
-      await Roles.createRoleAsync('editor')
-      await Roles.createRoleAsync('user')
-      await Roles.addRolesToParentAsync(['editor'], 'admin')
-      await Roles.addRolesToParentAsync(['user'], 'editor')
-
-      assert.isFalse(await Roles.isParentOfAsync('user', 'admin'))
-      assert.isFalse(await Roles.isParentOfAsync('editor', 'admin'))
-    })
-
-    it('returns true if role is parent of the demanded role', async function () {
-      await Roles.createRoleAsync('admin')
-      await Roles.createRoleAsync('editor')
-      await Roles.createRoleAsync('user')
-      await Roles.addRolesToParentAsync(['editor'], 'admin')
-      await Roles.addRolesToParentAsync(['user'], 'editor')
-
-      assert.isTrue(await Roles.isParentOfAsync('admin', 'user'))
-      assert.isTrue(await Roles.isParentOfAsync('editor', 'user'))
-      assert.isTrue(await Roles.isParentOfAsync('admin', 'editor'))
-
-      assert.isTrue(await Roles.isParentOfAsync('admin', 'admin'))
-      assert.isTrue(await Roles.isParentOfAsync('editor', 'editor'))
-      assert.isTrue(await Roles.isParentOfAsync('user', 'user'))
-    })
-  })
-})
+    // by user object
+    const userObj = await Meteor.users.findOneAsync({ _id: userId });
+    sameMembers(test,await Roles.getScopesForUserAsync(userObj), []);
+    sameMembers(test,
+      await Roles.getScopesForUserAsync(userObj, "editor"),
+      []
+    );
+    sameMembers(test,
+      await Roles.getScopesForUserAsync(userObj, ["editor"]),
+      []
+    );
+    sameMembers(test,
+      await Roles.getScopesForUserAsync(userObj, ["editor", "user"]),
+      []
+    );
+  }
+);

From d8c8c3db77c2b951d19611196499d1a08c118ef8 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 11 Nov 2024 12:35:30 -0400
Subject: [PATCH 0800/1140] - update node version on travis - use the latest
 version on puppeteer

---
 .travis.yml                     | 2 +-
 packages/test-in-console/run.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d58476294..95a5100c76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "20.15.1"
+  - "22.11.0"
 cache:
   directories:
     - ".meteor"
diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh
index 9a6231d209..5a88e9065d 100755
--- a/packages/test-in-console/run.sh
+++ b/packages/test-in-console/run.sh
@@ -9,7 +9,7 @@ cd $(dirname $0)/../..
 export METEOR_HOME=`pwd`
 
 # Installs into dev_bundle/lib/node_modules/puppeteer.
-./meteor npm install -g puppeteer@20.4.0
+./meteor npm install -g puppeteer@23.6.0
 
 export PATH=$METEOR_HOME:$PATH
 

From 893798a3aee076bad841159fc632b66903cff24c Mon Sep 17 00:00:00 2001
From: Gywem <igcogi@gmail.com>
Date: Mon, 11 Nov 2024 18:32:55 +0100
Subject: [PATCH 0801/1140] ensure use version of plugins described on
 cordova-plugins file otherwise the package.json defined

---
 tools/cordova/project.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/cordova/project.js b/tools/cordova/project.js
index b6830ac394..27a6891bfd 100644
--- a/tools/cordova/project.js
+++ b/tools/cordova/project.js
@@ -463,6 +463,8 @@ to Cordova project`, async () => {
       let platformSpec = version ? `${platform}@${version}` : platform;
       await cordova_lib.platform('add', platformSpec, this.defaultOptions);
 
+      const installedPlugins = this.listInstalledPluginVersions();
+
       // As per Npm 8, we need now do inject a package.json file
       // with the dependencies so that when running any npm command
       // it keeps the dependencies installed.
@@ -482,10 +484,11 @@ to Cordova project`, async () => {
 
       const packageJsonObj = Object.entries(packages).reduce((acc, [key, value]) => {
         const name = getPackageName(key);
+        const originalPluginVersion = installedPlugins[name];
         return ({
           dependencies: {
             ...acc.dependencies,
-            [name]: value.version,
+            [name]: originalPluginVersion || value.version,
           }
         });
       }, { dependencies: { [`cordova-${platform}`]: version  } });

From bd5d58a3a890bc0900ebb6724f638b8670e671e1 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Mon, 11 Nov 2024 13:58:45 -0400
Subject: [PATCH 0802/1140] - add text condition so puppeteer works with Travis

---
 packages/test-in-console/puppeteer_runner.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/test-in-console/puppeteer_runner.js b/packages/test-in-console/puppeteer_runner.js
index 0ad644d070..991bbd4631 100644
--- a/packages/test-in-console/puppeteer_runner.js
+++ b/packages/test-in-console/puppeteer_runner.js
@@ -12,6 +12,10 @@ async function runNextUrl(browser) {
   page.on('console', async msg => {
     // this is a way to make sure the travis does not timeout
     // if the test is running for too long without any output to the console (10 minutes)
+    const text = msg.text();
+    if (text.includes('Permissions policy violation')) {
+      return;
+    }
     if (msg._text !== undefined) console.log(msg._text);
     else {
       testNumber++;

From aceb2bcf1ba16207943afdf22a1547a192101be7 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 11 Nov 2024 16:42:58 -0400
Subject: [PATCH 0803/1140] add changelog for 3.1

---
 .../generators/changelog/versions/3.1.0.md    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index f7d6ce4f7f..d0b495305c 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -2,11 +2,22 @@
 
 ### Highlights
 
-N/A
+- Upgrade to Node v22
+- Upgrade Mongo Driver to v6
+- Upgrade Express to v5
+- Bring the `roles` package into the core
+- Solve remaining issues with Top Level Await and Reify
+- Refactor part of the real-time code in the `mongo` package into TypeScript
+- Deprecate `underscore` and eliminate it from packages
+- Fix Cordova dependency issues
+- Simplify Meteor.EnvironmentVariable and make sure it works in all cases
+- Stop using Rosetta for development MongoDB on Apple Silicon
+- Test improvements
+- Bump `http` package to 3.0.0
 
 #### Breaking Changes
 
-N/A
+- Express is now at v5 and some it's APIs have changed.
 
 ####  Internal API changes
 
@@ -22,6 +33,10 @@ meteor update --release 3.1.0
 
 ```
 
+Make sure to migrate userland code to use the new Express APIs: 
+
+https://expressjs.com/en/guide/migrating-5.html
+
 
 
 #### Meteor Version Release

From 4f42ace3a2ea363be4a70f18f9158ba82fcee691 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 11 Nov 2024 18:34:51 -0400
Subject: [PATCH 0804/1140] add bumped packages

---
 .envrc                                        | 20 ++++++++++++++
 .../generators/changelog/versions/3.1.0.md    | 26 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/.envrc b/.envrc
index 0ea9402d01..6228711b7e 100644
--- a/.envrc
+++ b/.envrc
@@ -54,4 +54,24 @@ function @docs-start {
 
 function @docs-migration-start {
   npm run docs:dev --prefix "$ROOT_DIR/v3-docs/v3-migration-docs"
+}
+
+function @packages-bumped {
+  git diff --name-only devel...$(git branch --show-current) | grep "packages/.*/package.js$" | while IFS= read -r file; do
+    if ! git show devel:$file > /dev/null 2>&1; then
+      continue
+    fi
+
+    old=$(git show devel:$file | grep -o "version: *['\"][^'\"]*['\"]" | sed "s/version: *.['\"]//;s/['\"].*//")
+    version=$(grep -o "version: *['\"][^'\"]*['\"]" "$file" | sed "s/version: *.['\"]//;s/['\"].*//")
+    name=$(grep -o "name: *['\"][^'\"]*['\"]" "$file" | sed "s/name: *.['\"]//;s/['\"].*//")
+
+    pkg_name=$(echo "$file" | sed -E 's|packages/([^/]*/)?([^/]*)/package\.js|\2|')
+
+    version_in_red=$(tput setaf 1)$version$(tput sgr0)
+
+    if [[ "$version" != "$old" ]]; then
+      echo "- $pkg_name@$version_in_red"
+    fi
+  done
 }
\ No newline at end of file
diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index d0b495305c..746f6ca5da 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -41,7 +41,31 @@ https://expressjs.com/en/guide/migrating-5.html
 
 #### Meteor Version Release
 
-N/A
+### Bumped Packages
+
+- babel-compiler@7.11.2-beta310.0
+- boilerplate-generator-tests@1.5.3-beta310.0
+- ddp-client@3.0.3-beta310.0
+- ddp-server@3.0.3-beta310.0
+- http@3.0.0
+- ecmascript@0.16.10-beta310.1
+- email@3.1.1-beta310.0
+- meteor-tool@3.1.0-beta310.0
+- meteor@2.0.2-beta310.0
+- minifier-js@3.0.1-beta310.0
+- minimongo@2.0.2-beta310.0
+- modules@0.20.3-beta310.0
+- mongo@2.0.3-beta310.0
+- coffeescript-compiler@2.4.2-beta310.0
+- coffeescript@2.7.2-beta310.0
+- mongo-decimal@0.1.6-beta310.0
+- npm-mongo@4.17.3-beta310.0
+- shell-server@0.6.1-beta310.0
+- test-helpers@2.0.2-beta310.0
+- test-in-console@2.0.1-beta310.0
+- tinytest@1.3.1-beta310.0
+- typescript@5.6.3-beta310.0
+- webapp@2.0.4-beta310.0
 
 #### Special thanks to
 

From dc5ff5ff3ed716eb8966efbe9ac3c0700ba99248 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 11 Nov 2024 18:57:25 -0400
Subject: [PATCH 0805/1140] npm packages

---
 .envrc                                        | 20 +++++++++++++++++++
 .../generators/changelog/versions/3.1.0.md    |  6 ++++++
 2 files changed, 26 insertions(+)

diff --git a/.envrc b/.envrc
index 3732cd8bb5..9cbaa921fd 100644
--- a/.envrc
+++ b/.envrc
@@ -75,3 +75,23 @@ function @packages-bumped {
     fi
   done
 }
+
+function @packages-bumped-npm {
+  git diff --name-only devel...$(git branch --show-current) | grep "npm-packages/.*/package.json$" | while IFS= read -r file; do
+    if ! git show devel:$file > /dev/null 2>&1; then
+      continue
+    fi
+
+    old=$(git show devel:$file | grep -o "version: *['\"][^'\"]*['\"]" | sed "s/version: *.['\"]//;s/['\"].*//")
+    version=$(grep -o "\"version\": *['\"][^'\"]*['\"]" "$file" | sed "s/\"version\": *.['\"]//;s/['\"].*//")
+    name=$(grep -o "\"name\": *['\"][^'\"]*['\"]" "$file" | sed "s/\"name\": *.['\"]//;s/['\"].*//")
+
+    pkg_name=$(echo "$file" | sed -E 's|npm-packages/([^/]*/)?([^/]*)/package\.json|\2|')
+
+    version_in_red=$(tput setaf 1)$version$(tput sgr0)
+
+    if [[ "$version" != "$old" ]]; then
+      echo "- $pkg_name@$version_in_red"
+    fi
+  done
+}
diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index 746f6ca5da..75e8919729 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -67,6 +67,12 @@ https://expressjs.com/en/guide/migrating-5.html
 - typescript@5.6.3-beta310.0
 - webapp@2.0.4-beta310.0
 
+#### NPM Packages
+
+- meteor-babel@7.20.1
+- meteor-installer@3.1.0-beta.1
+- meteor-node-stubs@1.2.12
+
 #### Special thanks to
 
 N/A

From 29d7467502d4096617339290bb351d25b127d8fd Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 11 Nov 2024 19:08:27 -0400
Subject: [PATCH 0806/1140] add special thanks

---
 .../generators/changelog/versions/3.1.0.md    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index 75e8919729..2dc5b871c6 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -33,15 +33,12 @@ meteor update --release 3.1.0
 
 ```
 
-Make sure to migrate userland code to use the new Express APIs: 
+Make sure to migrate userland code to use the new Express APIs:
 
 https://expressjs.com/en/guide/migrating-5.html
 
 
-
-#### Meteor Version Release
-
-### Bumped Packages
+#### Bumped Meteor Packages
 
 - babel-compiler@7.11.2-beta310.0
 - boilerplate-generator-tests@1.5.3-beta310.0
@@ -67,12 +64,25 @@ https://expressjs.com/en/guide/migrating-5.html
 - typescript@5.6.3-beta310.0
 - webapp@2.0.4-beta310.0
 
-#### NPM Packages
+
+#### Bumped NPM Packages
 
 - meteor-babel@7.20.1
 - meteor-installer@3.1.0-beta.1
 - meteor-node-stubs@1.2.12
 
+
 #### Special thanks to
 
-N/A
+✨✨✨
+
+- [@denihs](https://github.com/denihs)
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@leonardoventurini](https://github.com/leonardoventurini)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+- [@zodern](https://github.com/zodern)
+- [@harry97](https://github.com/harry97)
+- [@permb](https://github.com/permb)
+- [@9Morello](https://github.com/9Morello)
+
+✨✨✨
\ No newline at end of file

From 4bfb70ac9787a89afc5494beb4a3eeb82d4b0d1f Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 12 Nov 2024 10:26:24 -0400
Subject: [PATCH 0807/1140] add hmr perf improvements

---
 v3-docs/docs/generators/changelog/versions/3.1.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index 2dc5b871c6..e1ad01d55c 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -5,6 +5,7 @@
 - Upgrade to Node v22
 - Upgrade Mongo Driver to v6
 - Upgrade Express to v5
+- HMR performance improvements
 - Bring the `roles` package into the core
 - Solve remaining issues with Top Level Await and Reify
 - Refactor part of the real-time code in the `mongo` package into TypeScript

From a603ff5e773a655b10d90f522490c7424e337270 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 12 Nov 2024 12:53:50 -0400
Subject: [PATCH 0808/1140] add migration note

---
 v3-docs/docs/generators/changelog/versions/3.1.0.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index e1ad01d55c..79767dae1e 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -38,6 +38,8 @@ Make sure to migrate userland code to use the new Express APIs:
 
 https://expressjs.com/en/guide/migrating-5.html
 
+The MongoDB Node.js driver implemented a significant breaking change regarding operation handling. Applications leveraging `rawCollection()` or `rawDatabase()` methods must now utilize Promise-based syntax exclusively, as the callback-pattern API has been deprecated and removed. This modification affects all direct MongoDB operations previously using callback functions.
+
 
 #### Bumped Meteor Packages
 

From 836838b9c5472a14509294437eea179e8863ddd7 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 12 Nov 2024 14:34:23 -0400
Subject: [PATCH 0809/1140] - bump BUNDLE_VERSION

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 04c1d9d179..36527f713f 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.11.0.2
+BUNDLE_VERSION=22.11.0.3
 
 
 # OS Check. Put here because here is where we download the precompiled

From 92dda3946ca50a3ce59cc735d4b7f6f6c50ac9bd Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 12 Nov 2024 14:44:47 -0400
Subject: [PATCH 0810/1140] Meteor version to 3.1-rc.0 :comet:

---
 packages/accounts-password/package.js         | 98 +++++++++----------
 packages/babel-compiler/package.js            |  2 +-
 .../boilerplate-generator-tests/package.js    |  2 +-
 packages/ddp-client/package.js                |  2 +-
 packages/ddp-server/package.js                |  2 +-
 packages/ecmascript/package.js                |  2 +-
 packages/email/package.js                     |  2 +-
 packages/meteor-tool/package.js               |  4 +-
 packages/meteor/package.js                    |  2 +-
 packages/minifier-js/package.js               |  2 +-
 packages/minimongo/package.js                 |  2 +-
 packages/modules/package.js                   |  2 +-
 packages/mongo/package.js                     |  2 +-
 .../non-core/coffeescript-compiler/package.js |  2 +-
 packages/non-core/coffeescript/package.js     |  2 +-
 packages/non-core/mongo-decimal/.versions     | 26 ++---
 packages/non-core/mongo-decimal/package.js    |  2 +-
 packages/npm-mongo/package.js                 |  2 +-
 packages/roles/package.js                     |  2 +-
 packages/shell-server/package.js              |  2 +-
 packages/test-helpers/package.js              |  2 +-
 packages/test-in-console/package.js           |  2 +-
 packages/tinytest/package.js                  |  2 +-
 packages/typescript/package.js                |  2 +-
 packages/webapp/package.js                    |  2 +-
 .../admin/meteor-release-experimental.json    |  2 +-
 .../generators/changelog/versions/3.1.0.md    | 46 ++++-----
 27 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index eb63b6182c..6376eeb589 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,49 +1,49 @@
-Package.describe({
-  summary: "Password support for accounts",
-  // Note: 2.2.0-beta.3 was published during the Meteor 1.6 prerelease
-  // process, so it might be best to skip to 2.3.x instead of reusing
-  // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
-  // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
-  // through -beta.5 and -rc.0 have already been published.
-  version: "3.0.2",
-});
-
-Npm.depends({
-  bcrypt: "5.0.1",
-});
-
-Package.onUse((api) => {
-  api.use(["accounts-base", "sha", "ejson", "ddp"], ["client", "server"]);
-
-  // Export Accounts (etc) to packages using this one.
-  api.imply("accounts-base", ["client", "server"]);
-
-  api.use("email", "server");
-  api.use("random", "server");
-  api.use("check", "server");
-  api.use("ecmascript");
-
-  api.addFiles("email_templates.js", "server");
-  api.addFiles("password_server.js", "server");
-  api.addFiles("password_client.js", "client");
-});
-
-Package.onTest((api) => {
-  api.use([
-    "accounts-password",
-    "sha",
-    "tinytest",
-    "test-helpers",
-    "tracker",
-    "accounts-base",
-    "random",
-    "email",
-    "check",
-    "ddp",
-    "ecmascript",
-  ]);
-  api.addFiles("password_tests_setup.js", "server");
-  api.addFiles("password_tests.js", ["client", "server"]);
-  api.addFiles("email_tests_setup.js", "server");
-  api.addFiles("email_tests.js", "client");
-});
+Package.describe({
+  summary: "Password support for accounts",
+  // Note: 2.2.0-beta.3 was published during the Meteor 1.6 prerelease
+  // process, so it might be best to skip to 2.3.x instead of reusing
+  // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
+  // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
+  // through -beta.5 and -rc.0 have already been published.
+  version: "3.0.3-rc310.0",
+});
+
+Npm.depends({
+  bcrypt: "5.0.1",
+});
+
+Package.onUse((api) => {
+  api.use(["accounts-base", "sha", "ejson", "ddp"], ["client", "server"]);
+
+  // Export Accounts (etc) to packages using this one.
+  api.imply("accounts-base", ["client", "server"]);
+
+  api.use("email", "server");
+  api.use("random", "server");
+  api.use("check", "server");
+  api.use("ecmascript");
+
+  api.addFiles("email_templates.js", "server");
+  api.addFiles("password_server.js", "server");
+  api.addFiles("password_client.js", "client");
+});
+
+Package.onTest((api) => {
+  api.use([
+    "accounts-password",
+    "sha",
+    "tinytest",
+    "test-helpers",
+    "tracker",
+    "accounts-base",
+    "random",
+    "email",
+    "check",
+    "ddp",
+    "ecmascript",
+  ]);
+  api.addFiles("password_tests_setup.js", "server");
+  api.addFiles("password_tests.js", ["client", "server"]);
+  api.addFiles("email_tests_setup.js", "server");
+  api.addFiles("email_tests.js", "client");
+});
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index b7a67af44f..118f065d16 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.11.2-beta310.0',
+  version: '7.11.2-rc310.0',
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator-tests/package.js b/packages/boilerplate-generator-tests/package.js
index 19393bccf2..a0ffa190f3 100644
--- a/packages/boilerplate-generator-tests/package.js
+++ b/packages/boilerplate-generator-tests/package.js
@@ -2,7 +2,7 @@ Package.describe({
   // These tests are in a separate package so that we can Npm.depend on
   // parse5, a html parsing library.
   summary: "Tests for the boilerplate-generator package",
-  version: '1.5.3-beta310.0',
+  version: '1.5.3-rc310.0',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index fbf357d0a9..510e0d84b3 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.0.3-beta310.0",
+  version: "3.0.3-rc310.0",
   documentation: null,
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 4ca223d60d..af293885fe 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: "3.0.3-beta310.0",
+  version: "3.0.3-rc310.0",
   documentation: null,
 });
 
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 1d171485ae..076ff916ed 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.10-beta310.1',
+  version: '0.16.10-rc310.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index 99977f7d14..d4cbf3b950 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "3.1.1-beta310.0",
+  version: "3.1.1-rc310.0",
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index f7cf32d304..905797636a 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
-  summary: 'The Meteor command-line tool',
-  version: '3.1.0-beta310.0',
+  summary: "The Meteor command-line tool",
+  version: "3.1.0-rc.0",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 779b27a25a..aa246a1edd 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.0.2-beta310.0',
+  version: '2.0.2-rc310.0',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index c4e1973b19..92c93e9d04 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: '3.0.1-beta310.0',
+  version: '3.0.1-rc310.0',
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index a83f197782..c3a44c2b51 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: "2.0.2-beta310.0",
+  version: "2.0.2-rc310.0",
 });
 
 Package.onUse((api) => {
diff --git a/packages/modules/package.js b/packages/modules/package.js
index d657cffed4..2bafaa4de3 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: '0.20.3-beta310.0',
+  version: '0.20.3-rc310.0',
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index b6bb78b9ea..e3bc3f53ce 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.0.3-beta310.0",
+  version: "2.0.3-rc310.0",
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
index 3bb80863c5..d5572836e1 100644
--- a/packages/non-core/coffeescript-compiler/package.js
+++ b/packages/non-core/coffeescript-compiler/package.js
@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '2.4.2-beta310.0'
+  version: '2.4.2-rc310.0'
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript/package.js b/packages/non-core/coffeescript/package.js
index 230c19f999..12692da66b 100644
--- a/packages/non-core/coffeescript/package.js
+++ b/packages/non-core/coffeescript/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // so bumping the version of this package will be how they get newer versions
   // of `coffeescript-compiler`. If you change this, make sure to also update
   // ../coffeescript-compiler/package.js to match.
-  version: '2.7.2-beta310.0'
+  version: '2.7.2-rc310.0'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/non-core/mongo-decimal/.versions b/packages/non-core/mongo-decimal/.versions
index 709e9dc14b..452ab49c80 100644
--- a/packages/non-core/mongo-decimal/.versions
+++ b/packages/non-core/mongo-decimal/.versions
@@ -1,5 +1,5 @@
 allow-deny@2.0.0
-babel-compiler@7.11.2-beta310.0
+babel-compiler@7.11.2-rc310.0
 babel-runtime@1.5.2
 base64@1.0.13
 binary-heap@1.0.12
@@ -8,9 +8,9 @@ callback-hook@1.6.0
 check@1.4.4
 core-runtime@1.0.0
 ddp@1.4.2
-ddp-client@3.0.3-beta310.0
+ddp-client@3.0.3-rc310.0
 ddp-common@1.4.4
-ddp-server@3.0.3-beta310.0
+ddp-server@3.0.3-rc310.0
 diff-sequence@1.1.3
 dynamic-import@0.7.4
 ecmascript@0.16.9
@@ -24,18 +24,18 @@ geojson-utils@1.0.12
 id-map@1.2.0
 insecure@1.0.8
 inter-process-messaging@0.1.2
-local-test:mongo-decimal@0.1.6-beta310.0
+local-test:mongo-decimal@0.1.6-rc310.0
 logging@1.3.5
-meteor@2.0.2-beta310.0
-minimongo@2.0.2-beta310.0
+meteor@2.0.2-rc310.0
+minimongo@2.0.2-rc310.0
 modern-browsers@0.1.11
-modules@0.20.3-beta310.0
+modules@0.20.3-rc310.0
 modules-runtime@0.13.2
-mongo@2.0.3-beta310.0
-mongo-decimal@0.1.6-beta310.0
+mongo@2.0.3-rc310.0
+mongo-decimal@0.1.6-rc310.0
 mongo-dev-server@1.1.1
 mongo-id@1.0.9
-npm-mongo@4.17.3-beta310.0
+npm-mongo@4.17.3-rc310.0
 ordered-dict@1.2.0
 promise@1.0.0
 random@1.2.2
@@ -44,8 +44,8 @@ reload@1.3.2
 retry@1.1.1
 routepolicy@1.1.2
 socket-stream-client@0.5.3
-tinytest@1.3.1-beta310.0
+tinytest@1.3.1-rc310.0
 tracker@1.3.4
-typescript@5.6.3-beta310.0
-webapp@2.0.4-beta310.0
+typescript@5.6.3-rc310.0
+webapp@2.0.4-rc310.0
 webapp-hashing@1.1.2
diff --git a/packages/non-core/mongo-decimal/package.js b/packages/non-core/mongo-decimal/package.js
index 0190ab8c60..54eccff005 100644
--- a/packages/non-core/mongo-decimal/package.js
+++ b/packages/non-core/mongo-decimal/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB Decimal128 type",
-  version: '0.1.6-beta310.0',
+  version: '0.1.6-rc310.0',
 });
 
 Npm.depends({
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index f7dee16098..39fe8d5056 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "4.17.3-beta310.0",
+  version: "6.10.0-rc310.0",
   documentation: null,
 });
 
diff --git a/packages/roles/package.js b/packages/roles/package.js
index d7bfdf7b83..0bf8459a22 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "1.0.0-beta310.0",
+  version: "1.0.0-rc310.0",
   name: "roles",
 });
 
diff --git a/packages/shell-server/package.js b/packages/shell-server/package.js
index 99d54f9bcc..192730f7dd 100644
--- a/packages/shell-server/package.js
+++ b/packages/shell-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "shell-server",
-  version: '0.6.1-beta310.0',
+  version: '0.6.1-rc310.0',
   summary: "Server-side component of the `meteor shell` command.",
   documentation: "README.md"
 });
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 3012633763..bb90e58fc3 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: "2.0.2-beta310.0",
+  version: "2.0.2-rc310.0",
 });
 
 Npm.depends({
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 49005450a0..537d32d1d1 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Run tests noninteractively, with results going to the console.',
-  version: '2.0.1-beta310.0',
+  version: '2.0.1-rc310.0',
 });
 
 Package.onUse(function(api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 90b3833d0c..3a025f0aa4 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.3.1-beta310.0',
+  version: '1.3.1-rc310.0',
 });
 
 Npm.depends({
diff --git a/packages/typescript/package.js b/packages/typescript/package.js
index 47d1d8caa6..fde0c53dcb 100644
--- a/packages/typescript/package.js
+++ b/packages/typescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'typescript',
-  version: '5.6.3-beta310.0',
+  version: '5.6.3-rc310.0',
   summary:
     'Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files',
   documentation: 'README.md',
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 42203ad3a2..8b85fa4940 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.4-beta310.0",
+  version: "2.0.4-rc310.0",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index f8ff292c0f..a1a63161ed 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1-beta.0",
+  "version": "3.1-rc.0",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index 79767dae1e..3094442ef7 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -43,29 +43,29 @@ The MongoDB Node.js driver implemented a significant breaking change regarding o
 
 #### Bumped Meteor Packages
 
-- babel-compiler@7.11.2-beta310.0
-- boilerplate-generator-tests@1.5.3-beta310.0
-- ddp-client@3.0.3-beta310.0
-- ddp-server@3.0.3-beta310.0
+- babel-compiler@7.11.2-rc310.0
+- boilerplate-generator-tests@1.5.3-rc310.0
+- ddp-client@3.0.3-rc310.0
+- ddp-server@3.0.3-rc310.0
 - http@3.0.0
-- ecmascript@0.16.10-beta310.1
-- email@3.1.1-beta310.0
-- meteor-tool@3.1.0-beta310.0
-- meteor@2.0.2-beta310.0
-- minifier-js@3.0.1-beta310.0
-- minimongo@2.0.2-beta310.0
-- modules@0.20.3-beta310.0
-- mongo@2.0.3-beta310.0
-- coffeescript-compiler@2.4.2-beta310.0
-- coffeescript@2.7.2-beta310.0
-- mongo-decimal@0.1.6-beta310.0
-- npm-mongo@4.17.3-beta310.0
-- shell-server@0.6.1-beta310.0
-- test-helpers@2.0.2-beta310.0
-- test-in-console@2.0.1-beta310.0
-- tinytest@1.3.1-beta310.0
-- typescript@5.6.3-beta310.0
-- webapp@2.0.4-beta310.0
+- ecmascript@0.16.10-rc310.0
+- email@3.1.1-rc310.0
+- meteor-tool@3.1.0-rc310.0
+- meteor@2.0.2-rc310.0
+- minifier-js@3.0.1-rc310.0
+- minimongo@2.0.2-rc310.0
+- modules@0.20.3-rc310.0
+- mongo@2.0.3-rc310.0
+- coffeescript-compiler@2.4.2-rc310.0
+- coffeescript@2.7.2-rc310.0
+- mongo-decimal@0.1.6-rc310.0
+- npm-mongo@4.17.3-rc310.0
+- shell-server@0.6.1-rc310.0
+- test-helpers@2.0.2-rc310.0
+- test-in-console@2.0.1-rc310.0
+- tinytest@1.3.1-rc310.0
+- typescript@5.6.3-rc310.0
+- webapp@2.0.4-rc310.0
 
 
 #### Bumped NPM Packages
@@ -88,4 +88,4 @@ The MongoDB Node.js driver implemented a significant breaking change regarding o
 - [@permb](https://github.com/permb)
 - [@9Morello](https://github.com/9Morello)
 
-✨✨✨
\ No newline at end of file
+✨✨✨

From f85e4ae0b3b3fb15e79a4d9688843aef1a31ed62 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 12 Nov 2024 15:24:01 -0400
Subject: [PATCH 0811/1140] document null so we can publish this package in the
 release. For some reason the Read.me doesn't exist for this package

---
 packages/roles/package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/roles/package.js b/packages/roles/package.js
index 0bf8459a22..fe4e360b79 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -4,6 +4,7 @@ Package.describe({
   summary: "Authorization package for Meteor",
   version: "1.0.0-rc310.0",
   name: "roles",
+  documentation: null,
 });
 
 Package.onUse(function (api) {

From 0152bb23bfc22c92ad51082f2d30f388622d3fa9 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 12 Nov 2024 17:55:42 -0400
Subject: [PATCH 0812/1140] publish new npm install version for rc

---
 npm-packages/meteor-installer/config.js         | 2 +-
 npm-packages/meteor-installer/package-lock.json | 4 ++--
 npm-packages/meteor-installer/package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js
index 95894f17d6..4841caee3b 100644
--- a/npm-packages/meteor-installer/config.js
+++ b/npm-packages/meteor-installer/config.js
@@ -1,7 +1,7 @@
 const os = require('os');
 const path = require('path');
 
-const METEOR_LATEST_VERSION = '3.1-beta.0';
+const METEOR_LATEST_VERSION = '3.1-rc.0';
 const sudoUser = process.env.SUDO_USER || '';
 function isRoot() {
   return process.getuid && process.getuid() === 0;
diff --git a/npm-packages/meteor-installer/package-lock.json b/npm-packages/meteor-installer/package-lock.json
index c03f2f402c..bf3ff2945c 100644
--- a/npm-packages/meteor-installer/package-lock.json
+++ b/npm-packages/meteor-installer/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor",
-  "version": "3.1.0-beta.0",
+  "version": "3.1.0-rc.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor",
-      "version": "3.1.0-beta.0",
+      "version": "3.1.0-rc.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json
index 6b7a18097b..62af0f53ea 100644
--- a/npm-packages/meteor-installer/package.json
+++ b/npm-packages/meteor-installer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor",
-  "version": "3.1.0-beta.1",
+  "version": "3.1.0-rc.1",
   "description": "Install Meteor",
   "main": "install.js",
   "scripts": {

From 50aeb26e60a51cabc4030ca26482f06812ff4531 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 12 Nov 2024 18:19:57 -0400
Subject: [PATCH 0813/1140] publish new version for mongo-decimal

---
 packages/non-core/mongo-decimal/.versions  | 8 ++++----
 packages/non-core/mongo-decimal/package.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/non-core/mongo-decimal/.versions b/packages/non-core/mongo-decimal/.versions
index 452ab49c80..905e39e321 100644
--- a/packages/non-core/mongo-decimal/.versions
+++ b/packages/non-core/mongo-decimal/.versions
@@ -13,7 +13,7 @@ ddp-common@1.4.4
 ddp-server@3.0.3-rc310.0
 diff-sequence@1.1.3
 dynamic-import@0.7.4
-ecmascript@0.16.9
+ecmascript@0.16.10-rc310.0
 ecmascript-runtime@0.8.3
 ecmascript-runtime-client@0.12.2
 ecmascript-runtime-server@0.11.1
@@ -24,7 +24,7 @@ geojson-utils@1.0.12
 id-map@1.2.0
 insecure@1.0.8
 inter-process-messaging@0.1.2
-local-test:mongo-decimal@0.1.6-rc310.0
+local-test:mongo-decimal@0.2.0
 logging@1.3.5
 meteor@2.0.2-rc310.0
 minimongo@2.0.2-rc310.0
@@ -32,10 +32,10 @@ modern-browsers@0.1.11
 modules@0.20.3-rc310.0
 modules-runtime@0.13.2
 mongo@2.0.3-rc310.0
-mongo-decimal@0.1.6-rc310.0
+mongo-decimal@0.2.0
 mongo-dev-server@1.1.1
 mongo-id@1.0.9
-npm-mongo@4.17.3-rc310.0
+npm-mongo@6.10.0-rc310.0
 ordered-dict@1.2.0
 promise@1.0.0
 random@1.2.2
diff --git a/packages/non-core/mongo-decimal/package.js b/packages/non-core/mongo-decimal/package.js
index 54eccff005..e587275fb6 100644
--- a/packages/non-core/mongo-decimal/package.js
+++ b/packages/non-core/mongo-decimal/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB Decimal128 type",
-  version: '0.1.6-rc310.0',
+  version: '0.2.0',
 });
 
 Npm.depends({

From 04d2e6b60c0d15432b75a3d2ed54f5a3416730ba Mon Sep 17 00:00:00 2001
From: Gywem <igcogi@gmail.com>
Date: Wed, 13 Nov 2024 17:03:39 +0100
Subject: [PATCH 0814/1140] ensure url package compatibility after latest
 upgrades of core-js

---
 packages/url/legacy.js  | 7 +++++++
 packages/url/package.js | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/url/legacy.js b/packages/url/legacy.js
index d88cf97e4b..f002e3ed8d 100644
--- a/packages/url/legacy.js
+++ b/packages/url/legacy.js
@@ -1,6 +1,13 @@
 try {
+  require("url-search-params-polyfill");
+  URLSearchParams = window.URLSearchParams;
+  exports.URLSearchParams = URLSearchParams;
+
   require("core-js/proposals/url");
+  URL = window.URLSearchParams;
+  exports.URL = URL;
 } catch (e) {
+  console.log(' error', e);
   throw new Error([
     "The core-js npm package could not be found in your node_modules ",
     "directory. Please run the following command to install it:",
diff --git a/packages/url/package.js b/packages/url/package.js
index c3cbe03f5c..6391436715 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -6,7 +6,8 @@ Package.describe({
 });
 
 Npm.depends({
-  "core-js": "3.38.1"
+  "core-js": "3.39.0",
+  "url-search-params-polyfill": "8.2.5",
 });
 
 Package.onUse(function(api) {

From 9573eb14a6d82672218484e61aa41ecfec142e45 Mon Sep 17 00:00:00 2001
From: Gywem <igcogi@gmail.com>
Date: Wed, 13 Nov 2024 17:33:09 +0100
Subject: [PATCH 0815/1140] fix proper URL module

---
 packages/url/legacy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/url/legacy.js b/packages/url/legacy.js
index f002e3ed8d..c42b401812 100644
--- a/packages/url/legacy.js
+++ b/packages/url/legacy.js
@@ -4,7 +4,7 @@ try {
   exports.URLSearchParams = URLSearchParams;
 
   require("core-js/proposals/url");
-  URL = window.URLSearchParams;
+  URL = window.URL;
   exports.URL = URL;
 } catch (e) {
   console.log(' error', e);

From e963ac4d088b63c9bdf028d1fe255d81cf0454ec Mon Sep 17 00:00:00 2001
From: Gywem <igcogi@gmail.com>
Date: Wed, 13 Nov 2024 17:39:48 +0100
Subject: [PATCH 0816/1140] clean

---
 packages/url/legacy.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/url/legacy.js b/packages/url/legacy.js
index c42b401812..6f97c73e56 100644
--- a/packages/url/legacy.js
+++ b/packages/url/legacy.js
@@ -7,7 +7,6 @@ try {
   URL = window.URL;
   exports.URL = URL;
 } catch (e) {
-  console.log(' error', e);
   throw new Error([
     "The core-js npm package could not be found in your node_modules ",
     "directory. Please run the following command to install it:",

From 257bf14b69eb13fc085870fd5c225cc18804ff83 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 13 Nov 2024 19:59:59 -0300
Subject: [PATCH 0817/1140] FIX: Issue with meteor publish with update option

It was missing an await in the update readme function.

Adding tests for this is an issue because of this snippet https://github.com/meteor/meteor/blob/3747d4cb875f1282121ae7df473e0b00c3b3ce7c/tools/cli/commands-packages.js#L175-L184 and other parts that require or do some kind of check with the network

Maybe for the future think a way of mocking or being able to do tests in functions and not system tests.

Increase of types could help too.
---
 tools/packaging/package-client.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/packaging/package-client.js b/tools/packaging/package-client.js
index 0a10007e06..c79a2463df 100644
--- a/tools/packaging/package-client.js
+++ b/tools/packaging/package-client.js
@@ -466,7 +466,7 @@ exports.handlePackageServerConnectionError = function (error) {
 };
 
 
-// Update the package metdata in the server catalog. Chane the docs,
+// Update the package metadata in the server catalog. Change the docs,
 // descriptions and the Git URL to new values.
 //
 // options:
@@ -537,7 +537,7 @@ exports.updatePackageMetadata = async function (options) {
 
   // Upload the new Readme.
   await buildmessage.enterJob('uploading documentation', async function () {
-    var readmePath = saveReadmeToTmp(readmeInfo);
+    var readmePath = await saveReadmeToTmp(readmeInfo);
     var uploadInfo =
       await callPackageServerBM(conn, "createReadme", versionIdentifier);
     if (!uploadInfo) {

From 0396a47d1f97687dbe8c654901ee3600acc37015 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 14 Nov 2024 09:47:06 -0300
Subject: [PATCH 0818/1140] CI: solve docs issue with CI

or try to
---
 .circleci/config.yml          | 4 ++--
 v3-docs/docs/about/install.md | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62b5e0a3aa..d37bfcbba2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -765,9 +765,9 @@ jobs:
             if [[ -n "$CIRCLE_PULL_REQUEST" ]]; then
               PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's|.*/pull/\([0-9]*\)|\1|')
               PR_BRANCH=$(curl -s https://api.github.com/repos/meteor/meteor/pulls/$PR_NUMBER | jq -r .head.ref)
-              git clone --branch $PR_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
+              git fetch origin pull/$PR_NUMBER/head:$PR_BRANCH
             else
-              git clone --branch $CIRCLE_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
+              git fetch origin pull/$CIRCLE_PR_NUMBER/head:pr-$CIRCLE_PR_NUMBER
             fi
       # Run almost the same steps the meteor/docs repository runs, minus deploy.
       - run:
diff --git a/v3-docs/docs/about/install.md b/v3-docs/docs/about/install.md
index f12c459444..792d7aa600 100644
--- a/v3-docs/docs/about/install.md
+++ b/v3-docs/docs/about/install.md
@@ -9,7 +9,6 @@ npx meteor
 
 ## Prerequisites {#prereqs}
 
-
 ### Operating System (OS) {#prereqs-os}
 
 - Meteor currently supports **OS X, Windows, and Linux**. Only 64-bit is supported.
@@ -24,7 +23,6 @@ npx meteor
 
 - iOS development requires the latest Xcode.
 
-
 ## Installation
 
 Install the latest official version of Meteor.js from your terminal by running one of the commands below. You can check our [changelog](https://v3-docs.meteor.com/history.html) for the release notes.

From 585ba75ed6379727a699a72a15319104b2da6485 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 14 Nov 2024 09:50:10 -0300
Subject: [PATCH 0819/1140] DEV: add git clone to commands sequence

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d37bfcbba2..81b771533e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -765,8 +765,10 @@ jobs:
             if [[ -n "$CIRCLE_PULL_REQUEST" ]]; then
               PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's|.*/pull/\([0-9]*\)|\1|')
               PR_BRANCH=$(curl -s https://api.github.com/repos/meteor/meteor/pulls/$PR_NUMBER | jq -r .head.ref)
+              git clone https://github.com/meteor/meteor.git
               git fetch origin pull/$PR_NUMBER/head:$PR_BRANCH
             else
+              git clone https://github.com/meteor/meteor.git
               git fetch origin pull/$CIRCLE_PR_NUMBER/head:pr-$CIRCLE_PR_NUMBER
             fi
       # Run almost the same steps the meteor/docs repository runs, minus deploy.

From aabd171f6324e55cc05c9e85ceaa4e892af7e255 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 14 Nov 2024 09:57:03 -0300
Subject: [PATCH 0820/1140] testing something

---
 .circleci/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81b771533e..cfba72b0e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -766,9 +766,13 @@ jobs:
               PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's|.*/pull/\([0-9]*\)|\1|')
               PR_BRANCH=$(curl -s https://api.github.com/repos/meteor/meteor/pulls/$PR_NUMBER | jq -r .head.ref)
               git clone https://github.com/meteor/meteor.git
+              cd meteor
+              echo "Cloning pull/$PR_NUMBER/head:$PR_BRANCH"
               git fetch origin pull/$PR_NUMBER/head:$PR_BRANCH
             else
               git clone https://github.com/meteor/meteor.git
+              cd meteor
+              echo "Cloning pull/$CIRCLE_PR_NUMBER/head:pr-$CIRCLE_PR_NUMBER"
               git fetch origin pull/$CIRCLE_PR_NUMBER/head:pr-$CIRCLE_PR_NUMBER
             fi
       # Run almost the same steps the meteor/docs repository runs, minus deploy.

From 8985540bcba06dd1e158586f41bf3b76afa81f26 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 14 Nov 2024 10:00:13 -0300
Subject: [PATCH 0821/1140] CI: solve docs issue :tada:

---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cfba72b0e7..5a775d2911 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -767,19 +767,17 @@ jobs:
               PR_BRANCH=$(curl -s https://api.github.com/repos/meteor/meteor/pulls/$PR_NUMBER | jq -r .head.ref)
               git clone https://github.com/meteor/meteor.git
               cd meteor
-              echo "Cloning pull/$PR_NUMBER/head:$PR_BRANCH"
               git fetch origin pull/$PR_NUMBER/head:$PR_BRANCH
             else
               git clone https://github.com/meteor/meteor.git
               cd meteor
-              echo "Cloning pull/$CIRCLE_PR_NUMBER/head:pr-$CIRCLE_PR_NUMBER"
               git fetch origin pull/$CIRCLE_PR_NUMBER/head:pr-$CIRCLE_PR_NUMBER
             fi
       # Run almost the same steps the meteor/docs repository runs, minus deploy.
       - run:
           name: Generating Meteor documentation for JSDoc testing
           command: |
-            cd ${CHECKOUT_METEOR_DOCS}/docs
+            cd docs
             npm install
             npm test
 

From 0c335b25cf6f538b842600f17a1f24fd3c8176b5 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 14 Nov 2024 10:19:27 -0300
Subject: [PATCH 0822/1140] debbuging ci

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5a775d2911..5e5e8da35a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -777,6 +777,7 @@ jobs:
       - run:
           name: Generating Meteor documentation for JSDoc testing
           command: |
+            ls 
             cd docs
             npm install
             npm test

From 574ef2b429c598d0d70ebffab11ec158b1d0ef23 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 14 Nov 2024 10:21:53 -0300
Subject: [PATCH 0823/1140] CI: solve docs issue with CI

---
 .circleci/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e5e8da35a..e9643be20e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -777,8 +777,7 @@ jobs:
       - run:
           name: Generating Meteor documentation for JSDoc testing
           command: |
-            ls 
-            cd docs
+            cd meteor/docs
             npm install
             npm test
 

From 5c0d6835a809b95197db0ef072862038b637e32a Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 14 Nov 2024 10:38:44 -0400
Subject: [PATCH 0824/1140] - create Roles document

---
 packages/roles/roles_common_async.js | 462 ++++++--------
 v3-docs/docs/.vitepress/config.mts   | 904 ++++++++++++++-------------
 v3-docs/docs/api/roles.md            | 452 ++++++++++++++
 3 files changed, 1086 insertions(+), 732 deletions(-)
 create mode 100644 v3-docs/docs/api/roles.md

diff --git a/packages/roles/roles_common_async.js b/packages/roles/roles_common_async.js
index 11079194d5..a78281db83 100644
--- a/packages/roles/roles_common_async.js
+++ b/packages/roles/roles_common_async.js
@@ -24,7 +24,6 @@ import { Mongo } from 'meteor/mongo'
  *  - `scope`: scope name
  *  - `inheritedRoles`: A list of all the roles objects inherited by the assigned role.
  *
- * @module Roles
  */
 export const RolesCollection = new Mongo.Collection('roles')
 
@@ -39,7 +38,7 @@ if (!Meteor.roleAssignment) {
 }
 
 /**
- * @class Roles
+ * class Roles
  */
 if (typeof Roles === 'undefined') {
   Roles = {} // eslint-disable-line no-global-assign
@@ -60,6 +59,10 @@ const asyncSome = async (arr, predicate) => {
   return false
 }
 
+/**
+ * @namespace Roles
+ * @summary The namespace for all Roles types and methods.
+ */
 Object.assign(Roles, {
   /**
    * Used as a global group (now scope) name. Not used anymore.
@@ -71,14 +74,13 @@ Object.assign(Roles, {
   GLOBAL_GROUP: null,
 
   /**
-   * Create a new role.
-   *
-   * @method createRoleAsync
+   * @summary Create a new role.
+   * @memberof Roles
+   * @locus Anywhere
    * @param {String} roleName Name of role.
    * @param {Object} [options] Options:
-   *   - `unlessExists`: if `true`, exception will not be thrown in the role already exists
-   * @return {Promise<String>} ID of the new role or null.
-   * @static
+   * - `unlessExists`: if `true`, exception will not be thrown in the role already exists
+   * @return {Promise<String>} ID of the new role or null
    */
   createRoleAsync: async function (roleName, options) {
     Roles._checkRoleName(roleName)
@@ -116,14 +118,12 @@ Object.assign(Roles, {
   },
 
   /**
-   * Delete an existing role.
-   *
+   * @summary Delete an existing role.
    * If the role is set for any user, it is automatically unset.
-   *
-   * @method deleteRoleAsync
+   * @memberof Roles
+   * @locus Anywhere
    * @param {String} roleName Name of role.
    * @returns {Promise}
-   * @static
    */
   deleteRoleAsync: async function (roleName) {
     let roles
@@ -182,13 +182,12 @@ Object.assign(Roles, {
   },
 
   /**
-   * Rename an existing role.
-   *
-   * @method renameRoleAsync
+   * @summary Rename an existing role.
+   * @memberof Roles
+   * @locus Anywhere
    * @param {String} oldName Old name of a role.
    * @param {String} newName New name of a role.
    * @returns {Promise}
-   * @static
    */
   renameRoleAsync: async function (oldName, newName) {
     let count
@@ -254,16 +253,12 @@ Object.assign(Roles, {
   },
 
   /**
-   * Add role parent to roles.
-   *
-   * Previous parents are kept (role can have multiple parents). For users which have the
-   * parent role set, new subroles are added automatically.
-   *
-   * @method addRolesToParentAsync
+   * @summary Add role parent to roles.
+   * @memberof Roles
+   * @locus Anywhere
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    * @returns {Promise}
-   * @static
    */
   addRolesToParentAsync: async function (rolesNames, parentName) {
     // ensure arrays
@@ -339,16 +334,14 @@ Object.assign(Roles, {
   },
 
   /**
-   * Remove role parent from roles.
-   *
+   * @summary Remove role parent from roles.
    * Other parents are kept (role can have multiple parents). For users which have the
    * parent role set, removed subrole is removed automatically.
-   *
-   * @method removeRolesFromParentAsync
-   * @param {Array|String} rolesNames Name(s) of role(s).
-   * @param {String} parentName Name of parent role.
-   * @returns {Promise}
-   * @static
+   * @memberof Roles
+   * @locus Anywhere
+   @param {Array|String} rolesNames Name(s) of role(s).
+   @param {String} parentName Name of parent role.
+   @returns {Promise}
    */
   removeRolesFromParentAsync: async function (rolesNames, parentName) {
     // ensure arrays
@@ -431,26 +424,16 @@ Object.assign(Roles, {
   },
 
   /**
-   * Add users to roles.
-   *
+   * @summary Add users to roles.
    * Adds roles to existing roles for each user.
-   *
-   * @example
-   *     Roles.addUsersToRolesAsync(userId, 'admin')
-   *     Roles.addUsersToRolesAsync(userId, ['view-secrets'], 'example.com')
-   *     Roles.addUsersToRolesAsync([user1, user2], ['user','editor'])
-   *     Roles.addUsersToRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-   *
-   * @method addUsersToRolesAsync
+   * @memberof Roles
+   * @locus Anywhere
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
    * @returns {Promise}
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
    */
   addUsersToRolesAsync: async function (users, roles, options) {
     let id
@@ -487,17 +470,10 @@ Object.assign(Roles, {
   },
 
   /**
-   * Set users' roles.
-   *
+   * @summary Set users' roles.
    * Replaces all existing roles with a new set of roles.
-   *
-   * @example
-   *     await Roles.setUserRolesAsync(userId, 'admin')
-   *     await Roles.setUserRolesAsync(userId, ['view-secrets'], 'example.com')
-   *     await Roles.setUserRolesAsync([user1, user2], ['user','editor'])
-   *     await Roles.setUserRolesAsync([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
-   *
-   * @method setUserRolesAsync
+   * @memberof Roles
+   * @locus Anywhere
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to add users to. Roles have to exist.
    * @param {Object|String} [options] Options:
@@ -505,9 +481,6 @@ Object.assign(Roles, {
    *   - `anyScope`: if `true`, remove all roles the user has, of any scope, if `false`, only the one in the same scope
    *   - `ifExists`: if `true`, do not throw an exception if the role does not exist
    * @returns {Promise}
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
    */
   setUserRolesAsync: async function (users, roles, options) {
     let id
@@ -714,23 +687,15 @@ Object.assign(Roles, {
   },
 
   /**
-   * Remove users from assigned roles.
-   *
-   * @example
-   *     await Roles.removeUsersFromRolesAsync(userId, 'admin')
-   *     await Roles.removeUsersFromRolesAsync([userId, user2], ['editor'])
-   *     await Roles.removeUsersFromRolesAsync(userId, ['user'], 'group1')
-   *
-   * @method removeUsersFromRolesAsync
+   * @summary Remove users from assigned roles.
+   * @memberof Roles
+   * @locus Anywhere
    * @param {Array|String} users User ID(s) or object(s) with an `_id` field.
    * @param {Array|String} roles Name(s) of roles to remove users from. Roles have to exist.
    * @param {Object|String} [options] Options:
    *   - `scope`: name of the scope, or `null` for the global role
    *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
    * @returns {Promise}
-   *
-   * Alternatively, it can be a scope name string.
-   * @static
    */
   removeUsersFromRolesAsync: async function (users, roles, options) {
     if (!users) throw new Error("Missing 'users' param.")
@@ -792,21 +757,9 @@ Object.assign(Roles, {
   },
 
   /**
-   * Check if user has specified roles.
-   *
-   * @example
-   *     // global roles
-   *     await Roles.userIsInRoleAsync(user, 'admin')
-   *     await Roles.userIsInRoleAsync(user, ['admin','editor'])
-   *     await Roles.userIsInRoleAsync(userId, 'admin')
-   *     await Roles.userIsInRoleAsync(userId, ['admin','editor'])
-   *
-   *     // scope roles (global roles are still checked)
-   *     await Roles.userIsInRoleAsync(user, 'admin', 'group1')
-   *     await Roles.userIsInRoleAsync(userId, ['admin','editor'], 'group1')
-   *     await Roles.userIsInRoleAsync(userId, ['admin','editor'], {scope: 'group1'})
-   *
-   * @method userIsInRoleAsync
+   * @summary Check if user has specified roles.
+   * @memberof Roles
+   * @locus Anywhere
    * @param {String|Object} user User ID or an actual user object.
    * @param {Array|String} roles Name of role or an array of roles to check against. If array,
    *                             will return `true` if user is in _any_ role.
@@ -818,7 +771,6 @@ Object.assign(Roles, {
    *
    * Alternatively, it can be a scope name string.
    * @return {Promise<Boolean>} `true` if user is in _any_ of the target roles
-   * @static
    */
   userIsInRoleAsync: async function (user, roles, options) {
     let id
@@ -869,9 +821,9 @@ Object.assign(Roles, {
   },
 
   /**
-   * Retrieve user's roles.
-   *
-   * @method getRolesForUserAsync
+   * @summary Retrieve user's roles.
+   * @memberof Roles
+   * @locus Anywhere
    * @param {String|Object} user User ID or an actual user object.
    * @param {Object|String} [options] Options:
    *   - `scope`: name of scope to provide roles for; if not specified, global roles are returned
@@ -884,7 +836,6 @@ Object.assign(Roles, {
    *
    * Alternatively, it can be a scope name string.
    * @return {Promise<Array>} Array of user's roles, unsorted.
-   * @static
    */
   getRolesForUserAsync: async function (user, options) {
     let id
@@ -954,13 +905,133 @@ Object.assign(Roles, {
   },
 
   /**
-   * Retrieve cursor of all existing roles.
-   *
-   * @method getAllRoles
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to `RolesCollection.find(query, options)`.
+   * @summary Retrieve users scopes, if any.
+   * @memberof Roles
+   * @locus Anywhere
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} [roles] Name of roles to restrict scopes to.
+   * @return {Promise<Array>} Array of user's scopes, unsorted.
+   */
+  getScopesForUserAsync: async function (user, roles) {
+    let id
+
+    if (roles && !Array.isArray(roles)) roles = [roles]
+
+    if (user && typeof user === 'object') {
+      id = user._id
+    } else {
+      id = user
+    }
+
+    if (!id) return []
+
+    const selector = {
+      'user._id': id,
+      scope: { $ne: null }
+    }
+
+    if (roles) {
+      selector['inheritedRoles._id'] = { $in: roles }
+    }
+
+    const scopes = (
+      await Meteor.roleAssignment
+        .find(selector, { fields: { scope: 1 } })
+        .fetchAsync()
+    ).map((obi) => obi.scope)
+
+    return [...new Set(scopes)]
+  },
+
+  /**
+   * @summary Rename a scope.
+   * @memberof Roles
+   * @locus Anywhere
+   * @param {String} oldName Old name of a scope.
+   * @param {String} newName New name of a scope.
+   * @returns {Promise}
+   */
+  renameScopeAsync: async function (oldName, newName) {
+    let count
+
+    Roles._checkScopeName(oldName)
+    Roles._checkScopeName(newName)
+
+    if (oldName === newName) return
+
+    do {
+      count = await Meteor.roleAssignment.updateAsync(
+        {
+          scope: oldName
+        },
+        {
+          $set: {
+            scope: newName
+          }
+        },
+        { multi: true }
+      )
+    } while (count > 0)
+  },
+
+  /**
+   * @summary Remove a scope and all its role assignments.
+   * @memberof Roles
+   * @locus Anywhere
+   * @param {String} name The name of a scope.
+   * @returns {Promise}
+   */
+  removeScopeAsync: async function (name) {
+    Roles._checkScopeName(name)
+
+    await Meteor.roleAssignment.removeAsync({ scope: name })
+  },
+
+  /**
+   * @summary Find out if a role is an ancestor of another role.
+   * @memberof Roles
+   * @locus Anywhere
+   * @param {String} parentRoleName The role you want to research.
+   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
+   * @returns {Promise<Boolean>} True if parent role is ancestor of child role
+   */
+  isParentOfAsync: async function (parentRoleName, childRoleName) {
+    if (parentRoleName === childRoleName) {
+      return true
+    }
+
+    if (parentRoleName == null || childRoleName == null) {
+      return false
+    }
+
+    Roles._checkRoleName(parentRoleName)
+    Roles._checkRoleName(childRoleName)
+
+    let rolesToCheck = [parentRoleName]
+    while (rolesToCheck.length !== 0) {
+      const roleName = rolesToCheck.pop()
+
+      if (roleName === childRoleName) {
+        return true
+      }
+
+      const role = await Meteor.roles.findOneAsync({ _id: roleName })
+
+      // This should not happen, but this is a problem to address at some other time.
+      if (!role) continue
+
+      rolesToCheck = rolesToCheck.concat(role.children.map((r) => r._id))
+    }
+
+    return false
+  },
+
+  /**
+   * @summary Retrieve cursor of all existing roles.
+   * @memberof Roles
+   * @locus Anywhere
+   * @param {Object} [queryOptions] Options which are passed directly through to `Meteor.roles.find(query, options)`.
    * @return {Cursor} Cursor of existing roles.
-   * @static
    */
   getAllRoles: function (queryOptions) {
     queryOptions = queryOptions || { sort: { _id: 1 } }
@@ -969,28 +1040,16 @@ Object.assign(Roles, {
   },
 
   /**
-   * Retrieve all users who are in target role.
-   *
-   * Options:
-   *
-   * @method getUsersInRoleAsync
-   * @param {Array|String} roles Name of role or an array of roles. If array, users
-   *                             returned will have at least one of the roles
-   *                             specified but need not have _all_ roles.
-   *                             Roles do not have to exist.
+   * @summary Retrieve all users who are in target role.
+   * @memberof Roles
+   * @locus Anywhere
+   * @param {Array|String} roles Name of role or an array of roles.
    * @param {Object|String} [options] Options:
-   *   - `scope`: name of the scope to restrict roles to; user's global
-   *     roles will also be checked
-   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
+   *   - `scope`: name of the scope to restrict roles to
+   *   - `anyScope`: if set, role can be in any scope
    *   - `onlyScoped`: if set, only roles in the specified scope are returned
-   *   - `queryOptions`: options which are passed directly
-   *     through to `Meteor.users.find(query, options)`
-   *
-   * Alternatively, it can be a scope name string.
-   * @param {Object} [queryOptions] Options which are passed directly
-   *                                through to `Meteor.users.find(query, options)`
+   *   - `queryOptions`: options which are passed directly through to `Meteor.users.find(query, options)`
    * @return {Promise<Cursor>} Cursor of users in roles.
-   * @static
    */
   getUsersInRoleAsync: async function (roles, options, queryOptions) {
     const ids = (
@@ -1004,25 +1063,15 @@ Object.assign(Roles, {
   },
 
   /**
-   * Retrieve all assignments of a user which are for the target role.
-   *
-   * Options:
-   *
-   * @method getUserAssignmentsForRole
-   * @param {Array|String} roles Name of role or an array of roles. If array, users
-   *                             returned will have at least one of the roles
-   *                             specified but need not have _all_ roles.
-   *                             Roles do not have to exist.
+   * @summary Retrieve all assignments of a user which are for the target role.
+   * @memberof Roles
+   * @locus Anywhere
+   * @param {Array|String} roles Name of role or an array of roles.
    * @param {Object|String} [options] Options:
-   *   - `scope`: name of the scope to restrict roles to; user's global
-   *     roles will also be checked
-   *   - `anyScope`: if set, role can be in any scope (`scope` option is ignored)
-   *   - `queryOptions`: options which are passed directly
-   *     through to `RoleAssignmentCollection.find(query, options)`
-
-   * Alternatively, it can be a scope name string.
+   *   - `scope`: name of the scope to restrict roles to
+   *   - `anyScope`: if set, role can be in any scope
+   *   - `queryOptions`: options which are passed directly through to `RoleAssignmentCollection.find(query, options)`
    * @return {Cursor} Cursor of user assignments for roles.
-   * @static
    */
   getUserAssignmentsForRole: function (roles, options) {
     options = Roles._normalizeOptions(options)
@@ -1114,157 +1163,6 @@ Object.assign(Roles, {
     return await Roles.getScopesForUser(...args)
   },
 
-  /**
-   * Retrieve users scopes, if any.
-   *
-   * @method getScopesForUserAsync
-   * @param {String|Object} user User ID or an actual user object.
-   * @param {Array|String} [roles] Name of roles to restrict scopes to.
-   *
-   * @return {Promise<Array>} Array of user's scopes, unsorted.
-   * @static
-   */
-  getScopesForUserAsync: async function (user, roles) {
-    let id
-
-    if (roles && !Array.isArray(roles)) roles = [roles]
-
-    if (user && typeof user === 'object') {
-      id = user._id
-    } else {
-      id = user
-    }
-
-    if (!id) return []
-
-    const selector = {
-      'user._id': id,
-      scope: { $ne: null }
-    }
-
-    if (roles) {
-      selector['inheritedRoles._id'] = { $in: roles }
-    }
-
-    const scopes = (
-      await Meteor.roleAssignment
-        .find(selector, { fields: { scope: 1 } })
-        .fetchAsync()
-    ).map((obi) => obi.scope)
-
-    return [...new Set(scopes)]
-  },
-
-  /**
-   * Rename a scope.
-   *
-   * Roles assigned with a given scope are changed to be under the new scope.
-   *
-   * @method renameScopeAsync
-   * @param {String} oldName Old name of a scope.
-   * @param {String} newName New name of a scope.
-   * @returns {Promise}
-   * @static
-   */
-  renameScopeAsync: async function (oldName, newName) {
-    let count
-
-    Roles._checkScopeName(oldName)
-    Roles._checkScopeName(newName)
-
-    if (oldName === newName) return
-
-    do {
-      count = await Meteor.roleAssignment.updateAsync(
-        {
-          scope: oldName
-        },
-        {
-          $set: {
-            scope: newName
-          }
-        },
-        { multi: true }
-      )
-    } while (count > 0)
-  },
-
-  /**
-   * Remove a scope.
-   *
-   * Roles assigned with a given scope are removed.
-   *
-   * @method removeScopeAsync
-   * @param {String} name The name of a scope.
-   * @returns {Promise}
-   * @static
-   */
-  removeScopeAsync: async function (name) {
-    Roles._checkScopeName(name)
-
-    await Meteor.roleAssignment.removeAsync({ scope: name })
-  },
-
-  /**
-   * Throw an exception if `roleName` is an invalid role name.
-   *
-   * @method _checkRoleName
-   * @param {String} roleName A role name to match against.
-   * @private
-   * @static
-   */
-  _checkRoleName: function (roleName) {
-    if (
-      !roleName ||
-      typeof roleName !== 'string' ||
-      roleName.trim() !== roleName
-    ) {
-      throw new Error(`Invalid role name '${roleName}'.`)
-    }
-  },
-
-  /**
-   * Find out if a role is an ancestor of another role.
-   *
-   * WARNING: If you check this on the client, please make sure all roles are published.
-   *
-   * @method isParentOfAsync
-   * @param {String} parentRoleName The role you want to research.
-   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
-   * @returns {Promise}
-   * @static
-   */
-  isParentOfAsync: async function (parentRoleName, childRoleName) {
-    if (parentRoleName === childRoleName) {
-      return true
-    }
-
-    if (parentRoleName == null || childRoleName == null) {
-      return false
-    }
-
-    Roles._checkRoleName(parentRoleName)
-    Roles._checkRoleName(childRoleName)
-
-    let rolesToCheck = [parentRoleName]
-    while (rolesToCheck.length !== 0) {
-      const roleName = rolesToCheck.pop()
-
-      if (roleName === childRoleName) {
-        return true
-      }
-
-      const role = await Meteor.roles.findOneAsync({ _id: roleName })
-
-      // This should not happen, but this is a problem to address at some other time.
-      if (!role) continue
-
-      rolesToCheck = rolesToCheck.concat(role.children.map((r) => r._id))
-    }
-
-    return false
-  },
-
   /**
    * Normalize options.
    *
diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 653f1b3b21..5106d81b0e 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -1,450 +1,454 @@
-import { defineConfig } from "vitepress";
-
-// https://vitepress.dev/reference/site-config
-export default defineConfig({
-  title: "Docs",
-  description: "Meteor.js Docs",
-  head: [
-    ["link", { rel: "icon", href: "/logo.png" }],
-    [
-      "script",
-      {
-        async: "",
-        src: "https://widget.kapa.ai/kapa-widget.bundle.js",
-        "data-website-id": "64051b0e-d79f-4fe7-b3ca-ff5c84075693",
-        "data-project-name": "Meteor",
-        "data-project-color": "#36436b",
-        "data-project-logo": "https://v3-docs.meteor.com/logo.png",
-        "data-modal-disclaimer":
-          "This is a custom LLM for answering questions about Meteor. Answers are based on the contents of the docs, answered forum posts, YouTube videos and GitHub issues. Please note that answers are generated by AI and may not be fully accurate, so please use your best judgement.",
-      },
-    ],
-  ],
-  lastUpdated: true,
-  sitemap: {
-    hostname: "https://v3-docs.meteor.com",
-  },
-  themeConfig: {
-    // https://vitepress.dev/reference/default-theme-config
-    nav: [
-      {
-        text: "Docs",
-        activeMatch: `^/(guide|docs|examples)/`,
-        items: [
-          { text: "Quick Start", link: "/about/install" },
-          { text: "Examples", link: "https://github.com/meteor/examples" },
-          {
-            text: "Meteor.js 2 Docs",
-            link: "https://v2-docs.meteor.com",
-          },
-          {
-            text: "Migration from Meteor.js 2",
-            link: "https://v3-migration-docs.meteor.com",
-          },
-          {
-            text: "Tutorials",
-            items: [
-              {
-                text: "Meteor.js 3 + React",
-                link: "/tutorials/react/index",
-              },
-              {
-                text: "Meteor + Vue + vue-meteor-tracker",
-                link: "/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker",
-              },
-            ],
-          },
-        ],
-      },
-      {
-        text: "Ecosystem",
-        activeMatch: `^/ecosystem/`,
-        items: [
-          {
-            text: "Community & Help",
-            items: [
-              {
-                text: "Meteor Forums",
-                link: "https://forums.meteor.com",
-              },
-              {
-                text: "Meteor Lounge Discord",
-                link: "https://discord.gg/hZkTCaVjmT",
-              },
-              {
-                text: "GitHub Discussions",
-                link: "https://github.com/meteor/meteor/discussions",
-              },
-            ],
-          },
-          {
-            text: "Resources",
-            items: [
-              {
-                text: "Packages on Atmosphere",
-                link: "https://atmospherejs.com/",
-              },
-              {
-                text: "VS Code Extension",
-                link: "https://marketplace.visualstudio.com/items?itemName=meteor-toolbox.meteor-toolbox",
-              },
-              {
-                text: "DevTools - Chrome Extension",
-                link: "https://chromewebstore.google.com/detail/ibniinmoafhgbifjojidlagmggecmpgf",
-              },
-              {
-                text: "DevTools - Firefox Extension",
-                link: "https://addons.mozilla.org/en-US/firefox/addon/meteor-devtools-evolved/",
-              },
-            ],
-          },
-          {
-            text: "Learning",
-            items: [
-              {
-                text: "Meteor University",
-                link: "https://university.meteor.com",
-              },
-              {
-                text: "Youtube Channel",
-                link: "https://www.youtube.com/@meteorsoftware",
-              },
-            ],
-          },
-          {
-            text: "News",
-            items: [
-              { text: "Blog on Dev.to", link: "https://dev.to/meteor" },
-              { text: "Blog on Medium", link: "https://blog.meteor.com" },
-              { text: "Twitter", link: "https://x.com/meteorjs" },
-              {
-                text: "LinkedIn",
-                link: "https://www.linkedin.com/company/meteor-software/",
-              },
-            ],
-          },
-        ],
-      },
-      { text: "API", link: "/api/" },
-      { text: "Galaxy Cloud", link: "https://www.meteor.com/cloud" },
-    ],
-    sidebar: [
-      {
-        text: "About",
-        link: "/about/what-is",
-        items: [
-          {
-            text: "What is Meteor?",
-            link: "/about/what-is#introduction",
-          },
-          {
-            text: "Meteor resources",
-            link: "/about/what-is#learning-more",
-          },
-          {
-            text: "Roadmap",
-            link: "/about/roadmap",
-          },
-        ],
-        collapsed: true,
-      },
-      {
-        text: "Quick Start",
-        items: [
-          {
-            text: "Install Meteor",
-            link: "/about/install",
-          },
-          {
-            text: "Web Apps",
-            link: "/about/web-apps",
-          },
-          {
-            text: "Cordova",
-            link: "/about/cordova",
-          },
-        ],
-        collapsed: true,
-      },
-      {
-        text: "API",
-        link: "/api/",
-        items: [
-          {
-            text: "Accounts",
-            link: "/api/accounts",
-            items: [
-              { text: "Accounts-Base", link: "/api/accounts#accounts-base" },
-              { text: "Multi-server", link: "/api/accounts#multi-server" },
-              { text: "Passwords", link: "/api/accounts#passwords" },
-            ],
-            collapsed: true,
-          },
-          {
-            text: "Meteor",
-            link: "/api/meteor",
-            items: [
-              { text: "Core", link: "/api/meteor#core" },
-              { text: "Methods", link: "/api/meteor#methods" },
-              { text: "Publish and Subscribe", link: "/api/meteor#pubsub" },
-              { text: "Server connections", link: "/api/meteor#connections" },
-              { text: "Timers", link: "/api/meteor#timers" },
-            ],
-          },
-          {
-            text: "Collections",
-            link: "/api/collections",
-          },
-          {
-            text: "DDPRateLimiter",
-            link: "/api/DDPRateLimiter",
-          },
-          {
-            text: "Check",
-            link: "/api/check",
-          },
-          {
-            text: "Session",
-            link: "/api/session",
-          },
-          {
-            text: "Blaze",
-            link: "/api/blaze",
-          },
-          {
-            text: "Templates",
-            link: "/api/templates",
-          },
-          {
-            text: "Email",
-            link: "/api/email",
-          },
-          {
-            text: "Tracker",
-            link: "/api/Tracker",
-          },
-          {
-            text: "Reactive Var",
-            link: "/api/ReactiveVar",
-          },
-          {
-            text: "Reactive Dict",
-            link: "/api/ReactiveDict",
-          },
-          {
-            text: "EJSON",
-            link: "/api/EJSON",
-          },
-          {
-            text: "Assets",
-            link: "/api/assets",
-          },
-          {
-            text: "Mobile Configuration",
-            link: "/api/app",
-          },
-          {
-            text: "Package.js",
-            link: "/api/package",
-          },
-          {
-            text: "Top Level Await",
-            link: "/api/top-level-await",
-          },
-        ],
-        collapsed: true,
-      },
-      {
-        text: "Packages",
-        items: [
-          {
-            text: "accounts-ui",
-            link: "/packages/accounts-ui",
-          },
-          {
-            text: "accounts-passwordless",
-            link: "/packages/accounts-passwordless",
-          },
-          {
-            text: "accounts-2fa",
-            link: "/packages/accounts-2fa",
-          },
-          {
-            text: "appcache",
-            link: "/packages/appcache",
-          },
-          {
-            text: "audit-arguments-checks",
-            link: "/packages/audit-argument-checks",
-          },
-          {
-            text: "autoupdate",
-            link: "/packages/autoupdate",
-          },
-          {
-            text: "browser-policy",
-            link: "/packages/browser-policy",
-          },
-          {
-            text: "bundler-visualizer",
-            link: "/packages/bundle-visualizer",
-          },
-          {
-            text: "coffeescript",
-            link: "/packages/coffeescript",
-          },
-          {
-            text: "ecmascript",
-            link: "/packages/ecmascript",
-          },
-          {
-            text: "fetch",
-            link: "/packages/fetch",
-          },
-          {
-            text: "hot-module-replacement",
-            link: "/packages/hot-module-replacement",
-          },
-          {
-            text: "less",
-            link: "/packages/less",
-          },
-          {
-            text: "logging",
-            link: "/packages/logging",
-          },
-          {
-            text: "markdown",
-            link: "/packages/markdown",
-          },
-          {
-            text: "modules",
-            link: "/packages/modules",
-          },
-          {
-            text: "oauth-encryption",
-            link: "/packages/oauth-encryption",
-          },
-          {
-            text: "random",
-            link: "/packages/random",
-          },
-          {
-            text: "server-render",
-            link: "/packages/server-render",
-          },
-          {
-            text: "standard-minifier-css",
-            link: "/packages/standard-minifier-css",
-          },
-          {
-            text: "underscore",
-            link: "/packages/underscore",
-          },
-          {
-            text: "url",
-            link: "/packages/url",
-          },
-          {
-            text: "webapp",
-            link: "/packages/webapp",
-          },
-          {
-            link: "/packages/packages-listing",
-            text: "Maintained Packages",
-          },
-          {
-            link: "packages/community-packages",
-            text: "Community Packages",
-          },
-        ],
-        collapsed: true,
-      },
-      {
-        text: "Troubleshooting",
-        items: [
-          {
-            text: "Expired Certificates",
-            link: "/troubleshooting/expired-certificate",
-          },
-          { text: "Windows", link: "/troubleshooting/windows" },
-          {
-            text: "Known issues in 2.13",
-            link: "/troubleshooting/known-issues",
-          },
-        ],
-        collapsed: true,
-      },
-      {
-        text: "Command Line",
-        items: [
-          { link: "/cli/", text: "CLI" },
-          { link: "/cli/using-core-types", text: "Using Core Types" },
-          { link: "/cli/environment-variables", text: "Environment Variables" },
-        ],
-        collapsed: true,
-      },
-      {
-        text: "Tutorials",
-        items: [
-          {
-            text: "Meteor.js 3 + React",
-            link: "/tutorials/react/index",
-          },
-          {
-            link: "/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker",
-            text: "Meteor + Vue + vue-meteor-tracker",
-          },
-        ],
-        collapsed: true,
-      },
-      {
-        text: "Changelog",
-        items: [
-          // TODO: Open issue in Vitepress about this
-          { link: "/history", text: "Meteor.js v3 (Current)" },
-          {
-            link: "https://v2-docs.meteor.com/changelog",
-            text: "Meteor.js v2",
-          },
-          {
-            link: "https://v2-docs.meteor.com/changelog#v112220211012",
-            text: "Meteor.js v1",
-          },
-        ],
-        collapsed: true,
-      },
-    ],
-
-    socialLinks: [
-      { icon: "github", link: "https://github.com/meteor/meteor" },
-      { icon: "twitter", link: "https://x.com/meteorjs" },
-      { icon: "discord", link: "https://discord.gg/hZkTCaVjmT" },
-    ],
-
-    logo: { dark: "/meteor-logo.png", light: "/meteor-blue.png" },
-
-    search: {
-      provider: "algolia",
-      options: {
-        appId: "2RBX3PR26I",
-        apiKey: "7fcba92008b84946f04369df2afa1744",
-        indexName: "meteor_docs_v3",
-        searchParameters: {
-          facetFilters: ["lang:en"],
-        },
-      },
-    },
-
-    footer: {
-      message:
-        'Released under the <a href="https://github.com/meteor/meteor?tab=License-1-ov-file#readme">MIT License</a>.',
-      copyright:
-        'Copyright (c) 2011 - present <a href="https://www.meteor.com/">Meteor Software</a>.',
-    },
-    editLink: {
-      pattern: "https://github.com/meteor/meteor/edit/devel/v3-docs/docs/:path",
-      text: "Edit this page on GitHub",
-    },
-  },
-});
+import { defineConfig } from "vitepress";
+
+// https://vitepress.dev/reference/site-config
+export default defineConfig({
+  title: "Docs",
+  description: "Meteor.js Docs",
+  head: [
+    ["link", { rel: "icon", href: "/logo.png" }],
+    [
+      "script",
+      {
+        async: "",
+        src: "https://widget.kapa.ai/kapa-widget.bundle.js",
+        "data-website-id": "64051b0e-d79f-4fe7-b3ca-ff5c84075693",
+        "data-project-name": "Meteor",
+        "data-project-color": "#36436b",
+        "data-project-logo": "https://v3-docs.meteor.com/logo.png",
+        "data-modal-disclaimer":
+          "This is a custom LLM for answering questions about Meteor. Answers are based on the contents of the docs, answered forum posts, YouTube videos and GitHub issues. Please note that answers are generated by AI and may not be fully accurate, so please use your best judgement.",
+      },
+    ],
+  ],
+  lastUpdated: true,
+  sitemap: {
+    hostname: "https://v3-docs.meteor.com",
+  },
+  themeConfig: {
+    // https://vitepress.dev/reference/default-theme-config
+    nav: [
+      {
+        text: "Docs",
+        activeMatch: `^/(guide|docs|examples)/`,
+        items: [
+          { text: "Quick Start", link: "/about/install" },
+          { text: "Examples", link: "https://github.com/meteor/examples" },
+          {
+            text: "Meteor.js 2 Docs",
+            link: "https://v2-docs.meteor.com",
+          },
+          {
+            text: "Migration from Meteor.js 2",
+            link: "https://v3-migration-docs.meteor.com",
+          },
+          {
+            text: "Tutorials",
+            items: [
+              {
+                text: "Meteor.js 3 + React",
+                link: "/tutorials/react/index",
+              },
+              {
+                text: "Meteor + Vue + vue-meteor-tracker",
+                link: "/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker",
+              },
+            ],
+          },
+        ],
+      },
+      {
+        text: "Ecosystem",
+        activeMatch: `^/ecosystem/`,
+        items: [
+          {
+            text: "Community & Help",
+            items: [
+              {
+                text: "Meteor Forums",
+                link: "https://forums.meteor.com",
+              },
+              {
+                text: "Meteor Lounge Discord",
+                link: "https://discord.gg/hZkTCaVjmT",
+              },
+              {
+                text: "GitHub Discussions",
+                link: "https://github.com/meteor/meteor/discussions",
+              },
+            ],
+          },
+          {
+            text: "Resources",
+            items: [
+              {
+                text: "Packages on Atmosphere",
+                link: "https://atmospherejs.com/",
+              },
+              {
+                text: "VS Code Extension",
+                link: "https://marketplace.visualstudio.com/items?itemName=meteor-toolbox.meteor-toolbox",
+              },
+              {
+                text: "DevTools - Chrome Extension",
+                link: "https://chromewebstore.google.com/detail/ibniinmoafhgbifjojidlagmggecmpgf",
+              },
+              {
+                text: "DevTools - Firefox Extension",
+                link: "https://addons.mozilla.org/en-US/firefox/addon/meteor-devtools-evolved/",
+              },
+            ],
+          },
+          {
+            text: "Learning",
+            items: [
+              {
+                text: "Meteor University",
+                link: "https://university.meteor.com",
+              },
+              {
+                text: "Youtube Channel",
+                link: "https://www.youtube.com/@meteorsoftware",
+              },
+            ],
+          },
+          {
+            text: "News",
+            items: [
+              { text: "Blog on Dev.to", link: "https://dev.to/meteor" },
+              { text: "Blog on Medium", link: "https://blog.meteor.com" },
+              { text: "Twitter", link: "https://x.com/meteorjs" },
+              {
+                text: "LinkedIn",
+                link: "https://www.linkedin.com/company/meteor-software/",
+              },
+            ],
+          },
+        ],
+      },
+      { text: "API", link: "/api/" },
+      { text: "Galaxy Cloud", link: "https://www.meteor.com/cloud" },
+    ],
+    sidebar: [
+      {
+        text: "About",
+        link: "/about/what-is",
+        items: [
+          {
+            text: "What is Meteor?",
+            link: "/about/what-is#introduction",
+          },
+          {
+            text: "Meteor resources",
+            link: "/about/what-is#learning-more",
+          },
+          {
+            text: "Roadmap",
+            link: "/about/roadmap",
+          },
+        ],
+        collapsed: true,
+      },
+      {
+        text: "Quick Start",
+        items: [
+          {
+            text: "Install Meteor",
+            link: "/about/install",
+          },
+          {
+            text: "Web Apps",
+            link: "/about/web-apps",
+          },
+          {
+            text: "Cordova",
+            link: "/about/cordova",
+          },
+        ],
+        collapsed: true,
+      },
+      {
+        text: "API",
+        link: "/api/",
+        items: [
+          {
+            text: "Accounts",
+            link: "/api/accounts",
+            items: [
+              { text: "Accounts-Base", link: "/api/accounts#accounts-base" },
+              { text: "Multi-server", link: "/api/accounts#multi-server" },
+              { text: "Passwords", link: "/api/accounts#passwords" },
+            ],
+            collapsed: true,
+          },
+          {
+            text: "Meteor",
+            link: "/api/meteor",
+            items: [
+              { text: "Core", link: "/api/meteor#core" },
+              { text: "Methods", link: "/api/meteor#methods" },
+              { text: "Publish and Subscribe", link: "/api/meteor#pubsub" },
+              { text: "Server connections", link: "/api/meteor#connections" },
+              { text: "Timers", link: "/api/meteor#timers" },
+            ],
+          },
+          {
+            text: "Collections",
+            link: "/api/collections",
+          },
+          {
+            text: "DDPRateLimiter",
+            link: "/api/DDPRateLimiter",
+          },
+          {
+            text: "Check",
+            link: "/api/check",
+          },
+          {
+            text: "Session",
+            link: "/api/session",
+          },
+          {
+            text: "Blaze",
+            link: "/api/blaze",
+          },
+          {
+            text: "Templates",
+            link: "/api/templates",
+          },
+          {
+            text: "Email",
+            link: "/api/email",
+          },
+          {
+            text: "Tracker",
+            link: "/api/Tracker",
+          },
+          {
+            text: "Reactive Var",
+            link: "/api/ReactiveVar",
+          },
+          {
+            text: "Reactive Dict",
+            link: "/api/ReactiveDict",
+          },
+          {
+            text: "EJSON",
+            link: "/api/EJSON",
+          },
+          {
+            text: "Assets",
+            link: "/api/assets",
+          },
+          {
+            text: "Mobile Configuration",
+            link: "/api/app",
+          },
+          {
+            text: "Package.js",
+            link: "/api/package",
+          },
+          {
+            text: "Top Level Await",
+            link: "/api/top-level-await",
+          },
+          {
+            text: "Roles",
+            link: "/api/roles",
+          },
+        ],
+        collapsed: true,
+      },
+      {
+        text: "Packages",
+        items: [
+          {
+            text: "accounts-ui",
+            link: "/packages/accounts-ui",
+          },
+          {
+            text: "accounts-passwordless",
+            link: "/packages/accounts-passwordless",
+          },
+          {
+            text: "accounts-2fa",
+            link: "/packages/accounts-2fa",
+          },
+          {
+            text: "appcache",
+            link: "/packages/appcache",
+          },
+          {
+            text: "audit-arguments-checks",
+            link: "/packages/audit-argument-checks",
+          },
+          {
+            text: "autoupdate",
+            link: "/packages/autoupdate",
+          },
+          {
+            text: "browser-policy",
+            link: "/packages/browser-policy",
+          },
+          {
+            text: "bundler-visualizer",
+            link: "/packages/bundle-visualizer",
+          },
+          {
+            text: "coffeescript",
+            link: "/packages/coffeescript",
+          },
+          {
+            text: "ecmascript",
+            link: "/packages/ecmascript",
+          },
+          {
+            text: "fetch",
+            link: "/packages/fetch",
+          },
+          {
+            text: "hot-module-replacement",
+            link: "/packages/hot-module-replacement",
+          },
+          {
+            text: "less",
+            link: "/packages/less",
+          },
+          {
+            text: "logging",
+            link: "/packages/logging",
+          },
+          {
+            text: "markdown",
+            link: "/packages/markdown",
+          },
+          {
+            text: "modules",
+            link: "/packages/modules",
+          },
+          {
+            text: "oauth-encryption",
+            link: "/packages/oauth-encryption",
+          },
+          {
+            text: "random",
+            link: "/packages/random",
+          },
+          {
+            text: "server-render",
+            link: "/packages/server-render",
+          },
+          {
+            text: "standard-minifier-css",
+            link: "/packages/standard-minifier-css",
+          },
+          {
+            text: "underscore",
+            link: "/packages/underscore",
+          },
+          {
+            text: "url",
+            link: "/packages/url",
+          },
+          {
+            text: "webapp",
+            link: "/packages/webapp",
+          },
+          {
+            link: "/packages/packages-listing",
+            text: "Maintained Packages",
+          },
+          {
+            link: "packages/community-packages",
+            text: "Community Packages",
+          },
+        ],
+        collapsed: true,
+      },
+      {
+        text: "Troubleshooting",
+        items: [
+          {
+            text: "Expired Certificates",
+            link: "/troubleshooting/expired-certificate",
+          },
+          { text: "Windows", link: "/troubleshooting/windows" },
+          {
+            text: "Known issues in 2.13",
+            link: "/troubleshooting/known-issues",
+          },
+        ],
+        collapsed: true,
+      },
+      {
+        text: "Command Line",
+        items: [
+          { link: "/cli/", text: "CLI" },
+          { link: "/cli/using-core-types", text: "Using Core Types" },
+          { link: "/cli/environment-variables", text: "Environment Variables" },
+        ],
+        collapsed: true,
+      },
+      {
+        text: "Tutorials",
+        items: [
+          {
+            text: "Meteor.js 3 + React",
+            link: "/tutorials/react/index",
+          },
+          {
+            link: "/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker",
+            text: "Meteor + Vue + vue-meteor-tracker",
+          },
+        ],
+        collapsed: true,
+      },
+      {
+        text: "Changelog",
+        items: [
+          // TODO: Open issue in Vitepress about this
+          { link: "/history", text: "Meteor.js v3 (Current)" },
+          {
+            link: "https://v2-docs.meteor.com/changelog",
+            text: "Meteor.js v2",
+          },
+          {
+            link: "https://v2-docs.meteor.com/changelog#v112220211012",
+            text: "Meteor.js v1",
+          },
+        ],
+        collapsed: true,
+      },
+    ],
+
+    socialLinks: [
+      { icon: "github", link: "https://github.com/meteor/meteor" },
+      { icon: "twitter", link: "https://x.com/meteorjs" },
+      { icon: "discord", link: "https://discord.gg/hZkTCaVjmT" },
+    ],
+
+    logo: { dark: "/meteor-logo.png", light: "/meteor-blue.png" },
+
+    search: {
+      provider: "algolia",
+      options: {
+        appId: "2RBX3PR26I",
+        apiKey: "7fcba92008b84946f04369df2afa1744",
+        indexName: "meteor_docs_v3",
+        searchParameters: {
+          facetFilters: ["lang:en"],
+        },
+      },
+    },
+
+    footer: {
+      message:
+        'Released under the <a href="https://github.com/meteor/meteor?tab=License-1-ov-file#readme">MIT License</a>.',
+      copyright:
+        'Copyright (c) 2011 - present <a href="https://www.meteor.com/">Meteor Software</a>.',
+    },
+    editLink: {
+      pattern: "https://github.com/meteor/meteor/edit/devel/v3-docs/docs/:path",
+      text: "Edit this page on GitHub",
+    },
+  },
+});
diff --git a/v3-docs/docs/api/roles.md b/v3-docs/docs/api/roles.md
new file mode 100644
index 0000000000..5ff06c9449
--- /dev/null
+++ b/v3-docs/docs/api/roles.md
@@ -0,0 +1,452 @@
+# Roles
+
+Authorization package for Meteor - compatible with built-in accounts package.
+
+## Installation
+
+To add roles to your application, run this command in your terminal:
+
+```bash
+meteor add roles
+```
+
+## Overview
+
+The roles package lets you attach roles to users and then check against those roles when deciding whether to grant access to Meteor methods or publish data. The core concept is simple - you create role assignments for users and then verify those roles later. This package provides helper methods to make the process of adding, removing, and verifying roles easier.
+
+## Concepts
+
+### Roles vs Permissions
+
+Although named "roles", you can define your **roles**, **scopes** or **permissions** however you like. They are essentially tags assigned to users that you can check later.
+
+You can have traditional roles like `admin` or `webmaster`, or more granular permissions like `view-secrets`, `users.view`, or `users.manage`. Often, more granular permissions are better as they handle edge cases without creating many higher-level roles.
+
+### Role Hierarchy
+
+Roles can be organized in a hierarchy:
+
+- Roles can have multiple parents and children (subroles)
+- If a parent role is assigned to a user, all its descendant roles also apply
+- This allows creating "super roles" that aggregate permissions
+
+Example hierarchy setup:
+
+```js
+import { Roles } from "meteor/roles";
+
+// Create base roles
+await Roles.createRoleAsync("user");
+await Roles.createRoleAsync("admin");
+
+// Create permission roles
+await Roles.createRoleAsync("USERS_VIEW");
+await Roles.createRoleAsync("POST_EDIT");
+
+// Set up hierarchy
+await Roles.addRolesToParentAsync("USERS_VIEW", "admin");
+await Roles.addRolesToParentAsync("POST_EDIT", "admin");
+await Roles.addRolesToParentAsync("POST_EDIT", "user");
+```
+
+### Scopes
+
+Scopes allow users to have independent sets of roles. Use cases include:
+
+- Different communities within your app
+- Multiple tenants in a multi-tenant application
+- Different resource groups
+
+Users can have both scoped roles and global roles:
+
+- Global roles apply across all scopes
+- Scoped roles only apply within their specific scope
+- Scopes are independent of each other
+
+Example using scopes:
+
+```js
+// Assign scoped roles
+await Roles.addUsersToRolesAsync(userId, ["manage-team"], "team-a");
+await Roles.addUsersToRolesAsync(userId, ["player"], "team-b");
+
+// Check scoped roles
+await Roles.userIsInRoleAsync(userId, "manage-team", "team-a"); // true
+await Roles.userIsInRoleAsync(userId, "manage-team", "team-b"); // false
+
+// Assign global role
+await Roles.addUsersToRolesAsync(userId, "super-admin", null);
+
+// Global roles work in all scopes
+await Roles.userIsInRoleAsync(userId, ["manage-team", "super-admin"], "team-b"); // true
+```
+
+## Role Management
+
+<ApiBox name="Roles.createRoleAsync" hasCustomExample/>
+
+Example:
+
+```js
+import { Roles } from "meteor/roles";
+
+// Create a new role
+await Roles.createRoleAsync("admin");
+
+// Create if doesn't exist
+await Roles.createRoleAsync("editor", { unlessExists: true });
+```
+
+### Modifying Roles
+
+<ApiBox name="Roles.addRolesToParentAsync" hasCustomExample />
+
+Example:
+
+```js
+// Make 'editor' a child role of 'admin'
+await Roles.addRolesToParentAsync("editor", "admin");
+
+// Add multiple child roles
+await Roles.addRolesToParentAsync(["editor", "moderator"], "admin");
+```
+
+<ApiBox name="Roles.removeRolesFromParentAsync" hasCustomExample />
+
+Example:
+
+```js
+// Remove 'editor' as child role of 'admin'
+await Roles.removeRolesFromParentAsync("editor", "admin");
+```
+
+<ApiBox name="Roles.deleteRoleAsync" hasCustomExample />
+
+Example:
+
+```js
+// Delete role and all its assignments
+await Roles.deleteRoleAsync("temp-role");
+```
+
+<ApiBox name="Roles.renameRoleAsync" hasCustomExample />
+
+Example:
+
+```js
+// Rename an existing role
+await Roles.renameRoleAsync('editor', 'content-editor');
+```
+
+### Assigning Roles
+
+<ApiBox name="Roles.addUsersToRolesAsync" hasCustomExample />
+
+Example:
+
+```js
+// Add global roles
+await Roles.addUsersToRolesAsync(userId, ["admin", "editor"]);
+
+// Add scoped roles
+await Roles.addUsersToRolesAsync(userId, ["manager"], "department-a");
+
+// Add roles to multiple users
+await Roles.addUsersToRolesAsync([user1Id, user2Id], ["user"]);
+```
+
+<ApiBox name="Roles.setUserRolesAsync" hasCustomExample />
+
+Example:
+
+```js
+// Replace user's global roles
+await Roles.setUserRolesAsync(userId, ["editor"]);
+
+// Replace scoped roles
+await Roles.setUserRolesAsync(userId, ["viewer"], "project-x");
+
+// Clear all roles in scope
+await Roles.setUserRolesAsync(userId, [], "project-x");
+```
+
+<ApiBox name="Roles.removeUsersFromRolesAsync" hasCustomExample />
+
+Example:
+
+```js
+// Remove global roles
+await Roles.removeUsersFromRolesAsync(userId, ["admin"]);
+
+// Remove scoped roles
+await Roles.removeUsersFromRolesAsync(userId, ["manager"], "department-a");
+
+// Remove roles from multiple users
+await Roles.removeUsersFromRolesAsync([user1Id, user2Id], ["temp-role"]);
+```
+
+<ApiBox name="Roles.renameScopeAsync" hasCustomExample />
+
+Example:
+
+```js
+// Rename a scope
+await Roles.renameScopeAsync('department-1', 'marketing');
+```
+
+<ApiBox name="Roles.removeScopeAsync" hasCustomExample />
+
+Example:
+
+```js
+// Remove a scope and all its role assignments
+await Roles.removeScopeAsync('old-department');
+```
+
+<ApiBox name="Roles.getAllRoles" hasCustomExample />
+
+Example:
+
+```js
+// Get all roles sorted by name
+const roles = Roles.getAllRoles({ sort: { _id: 1 } });
+
+// Get roles with custom query
+const customRoles = Roles.getAllRoles({ 
+  fields: { _id: 1, children: 1 },
+  sort: { _id: -1 }
+});
+```
+
+<ApiBox name="Roles.getUsersInRoleAsync" hasCustomExample />
+
+Example:
+
+```js
+// Find all admin users
+const adminUsers = await Roles.getUsersInRoleAsync('admin');
+
+// Find users with specific roles in a scope
+const scopedUsers = await Roles.getUsersInRoleAsync(['editor', 'writer'], 'blog');
+
+// Find users with custom options
+const users = await Roles.getUsersInRoleAsync('manager', {
+  scope: 'department-a',
+  queryOptions: { 
+    sort: { createdAt: -1 },
+    limit: 10
+  }
+});
+```
+
+## Checking Roles
+
+<ApiBox name="Roles.userIsInRoleAsync" hasCustomExample />
+
+Example:
+
+```js
+// Check global role
+const isAdmin = await Roles.userIsInRoleAsync(userId, "admin");
+
+// Check any of multiple roles
+const canEdit = await Roles.userIsInRoleAsync(userId, ["editor", "admin"]);
+
+// Check scoped role
+const isManager = await Roles.userIsInRoleAsync(
+  userId,
+  "manager",
+  "department-a"
+);
+
+// Check role in any scope
+const hasRole = await Roles.userIsInRoleAsync(userId, "viewer", {
+  anyScope: true,
+});
+```
+
+<ApiBox name="Roles.getRolesForUserAsync"  hasCustomExample />
+
+Example:
+
+```js
+// Get user's global roles
+const globalRoles = await Roles.getRolesForUserAsync(userId);
+
+// Get scoped roles
+const deptRoles = await Roles.getRolesForUserAsync(userId, "department-a");
+
+// Get all roles including inherited
+const allRoles = await Roles.getRolesForUserAsync(userId, {
+  anyScope: true,
+  fullObjects: true,
+});
+```
+
+<ApiBox name="Roles.isParentOfAsync" hasCustomExample />
+
+Example:
+
+```js
+// Check if admin is a parent of editor
+const isParent = await Roles.isParentOfAsync('admin', 'editor');
+
+// Can be used to check inheritance chains
+const hasPermission = await Roles.isParentOfAsync('super-admin', 'post-edit');
+```
+
+<ApiBox name="Roles.getScopesForUserAsync" hasCustomExample />
+
+Example:
+
+```js
+// Get all scopes for user
+const allScopes = await Roles.getScopesForUserAsync(userId);
+
+// Get scopes where user has specific roles
+const editorScopes = await Roles.getScopesForUserAsync(userId, ['editor']);
+```
+
+## Publishing Roles
+
+Role assignments need to be published to be available on the client. Example publication:
+
+```js
+// Publish user's own roles
+Meteor.publish(null, function () {
+  if (this.userId) {
+    return Meteor.roleAssignment.find({ "user._id": this.userId });
+  }
+  this.ready();
+});
+
+// Publish roles for specific scope
+Meteor.publish("scopeRoles", function (scope) {
+  if (this.userId) {
+    return Meteor.roleAssignment.find({ scope: scope });
+  }
+  this.ready();
+});
+```
+
+## Using with Templates
+
+The roles package automatically provides an `isInRole` helper for templates:
+
+```handlebars
+{{#if isInRole "admin"}}
+  <div class="admin-panel">
+    <!-- Admin only content -->
+  </div>
+{{/if}}
+
+{{#if isInRole "editor,writer" "blog"}}
+  <div class="editor-tools">
+    <!-- Blog editor tools -->
+  </div>
+{{/if}}
+```
+
+## Migration to Core Version
+
+If you are currently using the `alanning:roles` package, follow these steps to migrate to the core version:
+
+1. Make sure you are on version 3.6 of `alanning:roles` first
+2. Run any pending migrations from previous versions
+3. Switch all server-side role operations to use the async versions of the functions:
+   - createRoleAsync
+   - deleteRoleAsync
+   - addUsersToRolesAsync
+   - setUserRolesAsync
+   - removeUsersFromRolesAsync
+   - etc.
+4. Remove `alanning:roles` package:
+   ```bash
+   meteor remove alanning:roles
+   ```
+5. Add the core roles package:
+   ```bash
+   meteor add roles
+   ```
+
+The sync versions of these functions are still available on the client.
+
+## Security Considerations
+
+1. Client-side role checks are for convenience only - always verify permissions on the server
+2. Publish only the role data that users need
+3. Use scopes to properly isolate role assignments
+4. Validate role names and scopes to prevent injection attacks
+5. Consider using more granular permissions over broad role assignments
+
+## Example Usage
+
+### Method Security
+
+```js
+// server/methods.js
+Meteor.methods({
+  deletePost: async function (postId) {
+    check(postId, String);
+
+    const canDelete = await Roles.userIsInRoleAsync(
+      this.userId,
+      ["admin", "moderator"],
+      "posts"
+    );
+
+    if (!canDelete) {
+      throw new Meteor.Error("unauthorized", "Not authorized to delete posts");
+    }
+
+    Posts.remove(postId);
+  },
+});
+```
+
+### Publication Security
+
+```js
+// server/publications.js
+Meteor.publish("secretDocuments", async function (scope) {
+  check(scope, String);
+
+  const canView = await Roles.userIsInRoleAsync(
+    this.userId,
+    ["view-secrets", "admin"],
+    scope
+  );
+
+  if (canView) {
+    return SecretDocs.find({ scope: scope });
+  }
+
+  this.ready();
+});
+```
+
+### User Management
+
+```js
+// server/users.js
+Meteor.methods({
+  promoteToEditor: async function (userId, scope) {
+    check(userId, String);
+    check(scope, String);
+
+    const canPromote = await Roles.userIsInRoleAsync(
+      this.userId,
+      "admin",
+      scope
+    );
+
+    if (!canPromote) {
+      throw new Meteor.Error("unauthorized");
+    }
+
+    await Roles.addUsersToRolesAsync(userId, ["editor"], scope);
+  },
+});
+```
+
+

From 23a0c254fb51477c3817a685e53b78f6cc5c9f0c Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 14 Nov 2024 10:50:29 -0400
Subject: [PATCH 0825/1140] force CI tests to run again


From eccbcd22785742100f4b0194b7b120cd302f7a14 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 14 Nov 2024 10:52:22 -0400
Subject: [PATCH 0826/1140] force CI tests to run again


From 53a2f665b0586750ce331d3722e62552d28f7190 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 14 Nov 2024 11:44:02 -0400
Subject: [PATCH 0827/1140] - adding since when roles package is available

---
 v3-docs/docs/api/roles.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/v3-docs/docs/api/roles.md b/v3-docs/docs/api/roles.md
index 5ff06c9449..40c6e69e49 100644
--- a/v3-docs/docs/api/roles.md
+++ b/v3-docs/docs/api/roles.md
@@ -2,6 +2,8 @@
 
 Authorization package for Meteor - compatible with built-in accounts package.
 
+> Available since Meteor 3.1.0
+
 ## Installation
 
 To add roles to your application, run this command in your terminal:

From 77d4496350511d4a1d5c90a1250a879bf3c5479d Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Thu, 14 Nov 2024 12:00:28 -0400
Subject: [PATCH 0828/1140] - adding since when roles package is available

---
 v3-docs/docs/api/roles.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/api/roles.md b/v3-docs/docs/api/roles.md
index 40c6e69e49..fdaee6c473 100644
--- a/v3-docs/docs/api/roles.md
+++ b/v3-docs/docs/api/roles.md
@@ -2,7 +2,7 @@
 
 Authorization package for Meteor - compatible with built-in accounts package.
 
-> Available since Meteor 3.1.0
+> Available since Meteor 3.1.0 (previously alanning:roles)
 
 ## Installation
 

From 39cc2c91f508716c1d1eff77dbf6072184b876b0 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 15 Nov 2024 09:46:20 -0300
Subject: [PATCH 0829/1140] DOCS: Add versions generator script to fetch
 meteor,node and npm versions

---
 v3-docs/v3-migration-docs/index.md            | 31 +++++++++------
 v3-docs/v3-migration-docs/package.json        |  1 +
 .../v3-migration-docs/versions-generator.js   | 39 +++++++++++++++++++
 3 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 v3-docs/v3-migration-docs/versions-generator.js

diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index cf07f5ffe7..aff0df2510 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,3 +1,8 @@
+---
+meteor_version: 3.0.4
+node_version: 20.18.0
+npm_version: 10.8.2
+---
 # Meteor 3.0 Migration Guide
 
 :::info You are reading the migration guide for Meteor 3!
@@ -11,24 +16,24 @@ This guide is for users with Meteor 2.x projects understand the changes between
 
 Meteor 3.0 is currently in its official version!
 
-**Latest version:** `3.0.4` <br/>
-**Node.js version:** `20.18.0 LTS` <br/>
-**NPM version:** `10.8.2`
+**Latest version:** `{{ $frontmatter.meteor_version }}` <br/>
+**Node.js version:** `{{ $frontmatter.node_version }} LTS` <br/>
+**NPM version:** `{{ $frontmatter.npm_version }}`
 
 ## How to try Meteor 3.0?
 
 You can create a new Meteor 3.0 project by running the command below:
 
-```bash
-meteor create my-new-project --release 3.0.4
+```bash-vue
+  meteor create my-new-project --release {{ $frontmatter.meteor_version }}
 ```
 
 ## How to upgrade from Meteor 2.x?
 
 You can upgrade your Meteor 2.x project by running the command below inside your project folder:
 
-```bash
-meteor update --release 3.0.4
+```bash-vue
+meteor update --release {{ $frontmatter.meteor_version }}
 meteor reset # resets project to a fresh state
 ```
 
@@ -53,6 +58,7 @@ This guide covers the necessary topics for migrating your application from Meteo
 
 - [Frequently Asked Questions](./frequently-asked-questions/index.md), answers to common questions.
 - [Breaking Changes](./breaking-changes/index.md), an overview of the changes that will affect your application.
+
   - [Meteor.call x Meteor.callAsync](./breaking-changes/call-x-callAsync.md), why should you change your methods to use `Async` methods.
   - [Upgrading packages](./breaking-changes/upgrading-packages.md), how to upgrade your packages to the be compatible with Meteor v3.
 
@@ -69,14 +75,15 @@ This guide covers the necessary topics for migrating your application from Meteo
 
 We are aware of these articles and guides to assist with your migration:
 
- - [Prepare your Meteor.js project for the big 3.0 release](https://dev.to/jankapunkt/prepare-your-meteorjs-project-for-the-big-30-release-14bf)
- - [Gradually upgrading a Meteor.js project to 3.0](https://dev.to/meteor/gradually-upgrading-a-meteorjs-project-to-30-5aj0)
- - [Meteor 3.0 Migration Guide, from Daniel](https://docs.google.com/document/d/1XxHE5MQaS0-85HQ-bkiXxmGlYi41ggkX3F-9Rjb9HhE/edit#heading=h.65xi3waq9bb)
- - [Illustreets Migration Guide, large SaaS migrated to 3.0](https://forums.meteor.com/t/large-saas-migrated-to-3-0/61113) & their how-to [post](https://forums.meteor.com/t/meteor-3-0-beta-6-is-out/61277/12)
- 
+- [Prepare your Meteor.js project for the big 3.0 release](https://dev.to/jankapunkt/prepare-your-meteorjs-project-for-the-big-30-release-14bf)
+- [Gradually upgrading a Meteor.js project to 3.0](https://dev.to/meteor/gradually-upgrading-a-meteorjs-project-to-30-5aj0)
+- [Meteor 3.0 Migration Guide, from Daniel](https://docs.google.com/document/d/1XxHE5MQaS0-85HQ-bkiXxmGlYi41ggkX3F-9Rjb9HhE/edit#heading=h.65xi3waq9bb)
+- [Illustreets Migration Guide, large SaaS migrated to 3.0](https://forums.meteor.com/t/large-saas-migrated-to-3-0/61113) & their how-to [post](https://forums.meteor.com/t/meteor-3-0-beta-6-is-out/61277/12)
+
 ### Videos
 
 Migrating apps to Meteor 3.0:
+
 - TicTacToe & others: [YouTube](https://www.youtube.com/watch?v=MtStd0aeyQA)
 - Complex Svelte todo list & others: [YouTube](https://www.youtube.com/watch?v=-XW8xwSk-zU)
 - Meteor University with v3
diff --git a/v3-docs/v3-migration-docs/package.json b/v3-docs/v3-migration-docs/package.json
index 23a9213fd2..a6fb13b23f 100644
--- a/v3-docs/v3-migration-docs/package.json
+++ b/v3-docs/v3-migration-docs/package.json
@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
+    "generators:versions": "node ./versions-generator.js",
     "docs:dev": "vitepress dev",
     "docs:build": "vitepress build",
     "docs:preview": "vitepress preview",
diff --git a/v3-docs/v3-migration-docs/versions-generator.js b/v3-docs/v3-migration-docs/versions-generator.js
new file mode 100644
index 0000000000..ddbe2579c1
--- /dev/null
+++ b/v3-docs/v3-migration-docs/versions-generator.js
@@ -0,0 +1,39 @@
+const fs = require("node:fs");
+
+const develDevBundleLink =
+  "https://raw.githubusercontent.com/meteor/meteor/refs/heads/devel/scripts/build-dev-bundle-common.sh";
+
+const meteorToolLink =
+  "https://raw.githubusercontent.com/meteor/meteor/refs/heads/devel/packages/meteor-tool/package.js";
+
+const getMeteorVersionFromDevel = async () => {
+  const response = await fetch(meteorToolLink);
+  const text = await response.text();
+  const version = text.match(/version: '(.*)'/)[1];
+  return version;
+};
+
+const getNodeAndNpmVersionFromDevel = async () => {
+  const response = await fetch(develDevBundleLink);
+  const text = await response.text();
+  const nodeVersion = text.match(/NODE_VERSION=(.*)/)[1];
+  const npmVersion = text.match(/NPM_VERSION=(.*)/)[1];
+  return { nodeVersion, npmVersion };
+};
+
+async function main() {
+  const [meteorVersion, { nodeVersion, npmVersion }] = await Promise.all([
+    getMeteorVersionFromDevel(),
+    getNodeAndNpmVersionFromDevel(),
+  ]);
+
+  const newIndexFile = fs
+    .readFileSync("index.md", "utf8")
+    .replace(/meteor_version: (.*)/, `meteor_version: ${meteorVersion}`)
+    .replace(/node_version: (.*)/, `node_version: ${nodeVersion}`)
+    .replace(/npm_version: (.*)/, `npm_version: ${npmVersion}`);
+
+  fs.writeFileSync("index.md", newIndexFile);
+}
+
+main();

From 07b89937feb6c7dfa72259042ced026a0bb2852a Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 18 Nov 2024 08:37:04 -0300
Subject: [PATCH 0830/1140] DEV: add generator for every command

---
 v3-docs/v3-migration-docs/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v3-docs/v3-migration-docs/package.json b/v3-docs/v3-migration-docs/package.json
index a6fb13b23f..a84b26ec04 100644
--- a/v3-docs/v3-migration-docs/package.json
+++ b/v3-docs/v3-migration-docs/package.json
@@ -6,9 +6,9 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "generators:versions": "node ./versions-generator.js",
-    "docs:dev": "vitepress dev",
-    "docs:build": "vitepress build",
-    "docs:preview": "vitepress preview",
+    "docs:dev": "npm run generators:versions && vitepress dev",
+    "docs:build": "npm run generators:versions && vitepress build",
+    "docs:preview": "npm run generators:versions && vitepress preview",
     "deploy:preview": "npm run docs:build && npm run docs:preview"
   },
   "repository": {

From a1360d9c34c5286f4d1c8e1244f63403ce0f0382 Mon Sep 17 00:00:00 2001
From: Caio <caio@quave.com.br>
Date: Tue, 19 Nov 2024 10:00:07 -0300
Subject: [PATCH 0831/1140] Update types definition for Node in the Typescript
 template

---
 tools/static-assets/skel-typescript/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json
index 07da7c102a..28e97249f6 100644
--- a/tools/static-assets/skel-typescript/package.json
+++ b/tools/static-assets/skel-typescript/package.json
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^8.2.3",
-    "@types/node": "^18.16.5",
+    "@types/node": "^22.9.0",
     "@types/react": "^18.2.5",
     "@types/react-dom": "^18.2.4",
     "typescript": "^5.4.5"

From 759eca24295f07af4a8b43b1a08a736483667ac6 Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Tue, 19 Nov 2024 14:56:03 -0300
Subject: [PATCH 0832/1140] Rename setPublicationStrategy and
 getPublicationStrategy arguments.

---
 packages/ddp-server/livedata_server.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index a79d0febf2..641832ef88 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -1576,33 +1576,33 @@ Object.assign(Server.prototype, {
   },
 
   /**
-   * @summary Set publication strategy for the given publication. Publications strategies are available from `DDPServer.publicationStrategies`. You call this method from `Meteor.server`, like `Meteor.server.setPublicationStrategy()`
+   * @summary Set publication strategy for the given collection. Publications strategies are available from `DDPServer.publicationStrategies`. You call this method from `Meteor.server`, like `Meteor.server.setPublicationStrategy()`
    * @locus Server
    * @alias setPublicationStrategy
-   * @param publicationName {String}
+   * @param collectionName {String}
    * @param strategy {{useCollectionView: boolean, doAccountingForCollection: boolean}}
    * @memberOf Meteor.server
    * @importFromPackage meteor
    */
-  setPublicationStrategy(publicationName, strategy) {
+  setPublicationStrategy(collectionName, strategy) {
     if (!Object.values(publicationStrategies).includes(strategy)) {
       throw new Error(`Invalid merge strategy: ${strategy} 
-        for collection ${publicationName}`);
+        for collection ${collectionName}`);
     }
-    this._publicationStrategies[publicationName] = strategy;
+    this._publicationStrategies[collectionName] = strategy;
   },
 
   /**
-   * @summary Gets the publication strategy for the requested publication. You call this method from `Meteor.server`, like `Meteor.server.getPublicationStrategy()`
+   * @summary Gets the publication strategy for the requested collection. You call this method from `Meteor.server`, like `Meteor.server.getPublicationStrategy()`
    * @locus Server
    * @alias getPublicationStrategy
-   * @param publicationName {String}
+   * @param collectionName {String}
    * @memberOf Meteor.server
    * @importFromPackage meteor
    * @return {{useCollectionView: boolean, doAccountingForCollection: boolean}}
    */
-  getPublicationStrategy(publicationName) {
-    return this._publicationStrategies[publicationName]
+  getPublicationStrategy(collectionName) {
+    return this._publicationStrategies[collectionName]
       || this.options.defaultPublicationStrategy;
   },
 

From 37b38c930579f8b8cace924e284136b7f1792c26 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 19 Nov 2024 15:21:50 -0300
Subject: [PATCH 0833/1140] CI: fix docs-ci issue

It got broke by af8b8d2c97c6ac7818784cfc81c1ee34742f19da but now for contributors.
---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e9643be20e..aa5a7b6a2c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -769,9 +769,7 @@ jobs:
               cd meteor
               git fetch origin pull/$PR_NUMBER/head:$PR_BRANCH
             else
-              git clone https://github.com/meteor/meteor.git
-              cd meteor
-              git fetch origin pull/$CIRCLE_PR_NUMBER/head:pr-$CIRCLE_PR_NUMBER
+              git clone --branch $CIRCLE_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
             fi
       # Run almost the same steps the meteor/docs repository runs, minus deploy.
       - run:

From 8760c53cef88915177ad5f165c4cafa2343c1272 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 19 Nov 2024 15:33:44 -0300
Subject: [PATCH 0834/1140] fix ci issue

---
 .circleci/config.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa5a7b6a2c..b8fb12544f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,8 +76,8 @@ run_save_node_bin: &run_save_node_bin
     fi
 
 # This environment is set to every job (and the initial build).
-build_machine_environment: &build_machine_environment
-  # Specify that we want an actual machine (ala Circle 1.0), not a Docker image.
+build_machine_environment:
+  &build_machine_environment # Specify that we want an actual machine (ala Circle 1.0), not a Docker image.
   docker:
     - image: meteor/circleci:2024.09.11-android-34-node-20
   resource_class: large
@@ -104,8 +104,8 @@ build_machine_environment: &build_machine_environment
 
     # These will be evaled before each command.
     PRE_TEST_COMMANDS: |-
-        ulimit -c unlimited; # Set core dump size as Ubuntu 14.04 lacks prlimit.
-        ulimit -a # Display all ulimit settings for transparency.
+      ulimit -c unlimited; # Set core dump size as Ubuntu 14.04 lacks prlimit.
+      ulimit -a # Display all ulimit settings for transparency.
 
     # This is only to make Meteor self-test not remind us that we can set
     # this argument for self-tests.
@@ -765,8 +765,8 @@ jobs:
             if [[ -n "$CIRCLE_PULL_REQUEST" ]]; then
               PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's|.*/pull/\([0-9]*\)|\1|')
               PR_BRANCH=$(curl -s https://api.github.com/repos/meteor/meteor/pulls/$PR_NUMBER | jq -r .head.ref)
-              git clone https://github.com/meteor/meteor.git
-              cd meteor
+              git clone https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
+              cd ${CHECKOUT_METEOR_DOCS}
               git fetch origin pull/$PR_NUMBER/head:$PR_BRANCH
             else
               git clone --branch $CIRCLE_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
@@ -775,7 +775,7 @@ jobs:
       - run:
           name: Generating Meteor documentation for JSDoc testing
           command: |
-            cd meteor/docs
+            cd ${CHECKOUT_METEOR_DOCS}/docs
             npm install
             npm test
 

From ec3728317fb736f49ba0dbd71350ff38858f5cc3 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 18 Nov 2024 11:42:11 -0300
Subject: [PATCH 0835/1140] DOCS: add meteor-version generator to docs

this adds a metadata generator for meteor versions to the docs
and adds a new item on the header to select the version of the docs.
---
 .../modules/.npm/package/npm-shrinkwrap.json  |   6 +-
 .../.npm/package/npm-shrinkwrap.json          | 342 +++++++++---------
 v3-docs/docs/.vitepress/config.mts            |  17 +
 v3-docs/docs/api/packages-listing.md          |   4 +-
 v3-docs/docs/generators/changelog/README.md   |   2 +-
 v3-docs/docs/generators/codegen.js            |   3 +-
 .../docs/generators/meteor-versions/README.md |  22 ++
 .../meteor-versions/metadata.generated.js     |  26 ++
 .../docs/generators/meteor-versions/script.js |  41 +++
 v3-docs/docs/history.md                       | 109 ++++++
 10 files changed, 394 insertions(+), 178 deletions(-)
 create mode 100644 v3-docs/docs/generators/meteor-versions/README.md
 create mode 100644 v3-docs/docs/generators/meteor-versions/metadata.generated.js
 create mode 100644 v3-docs/docs/generators/meteor-versions/script.js

diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 5d60955420..da4576c59f 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -12,9 +12,9 @@
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
     "acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="
     },
     "estree-walker": {
       "version": "2.0.2",
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index cff9dcf76d..32b404a50d 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -56,129 +56,129 @@
       }
     },
     "@aws-sdk/client-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-4q/yYdtO/RisGdQ3a2E912YekIpQYvS4TYPYS/onCbTXW/7C8/Ha7yUEncE7Woou0MDXyoVh50UATcJEmUt0+Q=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.693.0.tgz",
+      "integrity": "sha512-WfycTcylmrSOnCN8x/xeIjHa4gIV4UhG85LWLZ3M4US8+HJQ8l4c4WUf+pUoTaSxN86vhbXlz0iRvA89nF854Q=="
     },
     "@aws-sdk/client-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz",
-      "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+      "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA=="
     },
     "@aws-sdk/client-sso-oidc": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz",
-      "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+      "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg=="
     },
     "@aws-sdk/client-sts": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz",
-      "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+      "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ=="
     },
     "@aws-sdk/core": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.667.0.tgz",
-      "integrity": "sha512-pMcDVI7Tmdsc8R3sDv0Omj/4iRParGY+uJtAfF669WnZfDfaBQaix2Mq7+Mu08vdjqO9K3gicFvjk9S1VLmOKA=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+      "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A=="
     },
     "@aws-sdk/credential-provider-cognito-identity": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.670.0.tgz",
-      "integrity": "sha512-l41x9lZtZnzyQ6+8D3i7BwqwG1u7JTfHwJDZmsh+sIbrccLlJm7TfxkegOwUbzJ6JdzdigCIM1cKBc52O8EG9w=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.693.0.tgz",
+      "integrity": "sha512-hlpV3tkOhpFl87aToH6Q6k7JBNNuARBPk+irPMtgE8ZqpYRP9tJ/RXftirzZ7CqSzc7NEWe/mnbJzRXw7DfgVQ=="
     },
     "@aws-sdk/credential-provider-env": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.667.0.tgz",
-      "integrity": "sha512-zZbrkkaPc54WXm+QAnpuv0LPNfsts0HPPd+oCECGs7IQRaFsGj187cwvPg9RMWDFZqpm64MdBDoA8OQHsqzYCw=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.693.0.tgz",
+      "integrity": "sha512-hMUZaRSF7+iBKZfBHNLihFs9zvpM1CB8MBOTnTp5NGCVkRYF3SB2LH+Kcippe0ats4qCyB1eEoyQX99rERp2iQ=="
     },
     "@aws-sdk/credential-provider-http": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.667.0.tgz",
-      "integrity": "sha512-sjtybFfERZWiqTY7fswBxKQLvUkiCucOWyqh3IaPo/4nE1PXRnaZCVG0+kRBPrYIxWqiVwytvZzMJy8sVZcG0A=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+      "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA=="
     },
     "@aws-sdk/credential-provider-ini": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz",
-      "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+      "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q=="
     },
     "@aws-sdk/credential-provider-node": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz",
-      "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+      "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA=="
     },
     "@aws-sdk/credential-provider-process": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.667.0.tgz",
-      "integrity": "sha512-HZHnvop32fKgsNHkdhVaul7UzQ25sEc0j9yqA4bjhtbk0ECl42kj3f1pJ+ZU/YD9ut8lMJs/vVqiOdNThVdeBw=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.693.0.tgz",
+      "integrity": "sha512-cvxQkrTWHHjeHrPlj7EWXPnFSq8x7vMx+Zn1oTsMpCY445N9KuzjfJTkmNGwU2GT6rSZI9/0MM02aQvl5bBBTQ=="
     },
     "@aws-sdk/credential-provider-sso": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz",
-      "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+      "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ=="
     },
     "@aws-sdk/credential-provider-web-identity": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.667.0.tgz",
-      "integrity": "sha512-t8CFlZMD/1p/8Cli3rvRiTJpjr/8BO64gw166AHgFZYSN2h95L2l1tcW0jpsc3PprA32nLg1iQVKYt4WGM4ugw=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+      "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA=="
     },
     "@aws-sdk/credential-providers": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.670.0.tgz",
-      "integrity": "sha512-2O7Ditryao7/8pCS4GPP2pba/Ia/rruejKoI8STiSmdgccssHcaHtiJ3mYNkKtRUEdi19ulspfz1nU+Ew4x4fA=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.693.0.tgz",
+      "integrity": "sha512-0CCH8GuH1E41Kpq52NujErbUIRewDWLkdbYO8UJGybDbUQ8KC5JG1tP7K20tKYHmVgJGXDHo+XUIG7ogHD6/JA=="
     },
     "@aws-sdk/middleware-host-header": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.667.0.tgz",
-      "integrity": "sha512-Z7fIAMQnPegs7JjAQvlOeWXwpMRfegh5eCoIP6VLJIeR6DLfYKbP35JBtt98R6DXslrN2RsbTogjbxPEDQfw1w=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+      "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug=="
     },
     "@aws-sdk/middleware-logger": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.667.0.tgz",
-      "integrity": "sha512-PtTRNpNm/5c746jRgZCNg4X9xEJIwggkGJrF0GP9AB1ANg4pc/sF2Fvn1NtqPe9wtQ2stunJprnm5WkCHN7QiA=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+      "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w=="
     },
     "@aws-sdk/middleware-recursion-detection": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.667.0.tgz",
-      "integrity": "sha512-U5glWD3ehFohzpUpopLtmqAlDurGWo2wRGPNgi4SwhWU7UDt6LS7E/UvJjqC0CUrjlzOw+my2A+Ncf+fisMhxQ=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+      "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw=="
     },
     "@aws-sdk/middleware-user-agent": {
-      "version": "3.669.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.669.0.tgz",
-      "integrity": "sha512-K8ScPi45zjJrj5Y2gRqVsvKKQCQbvQBfYGcBw9ZOx9TTavH80bOCBjWg/GFnvs4f37tqVc1wMN2oGvcTF6HveQ=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+      "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw=="
     },
     "@aws-sdk/region-config-resolver": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.667.0.tgz",
-      "integrity": "sha512-iNr+JhhA902JMKHG9IwT9YdaEx6KGl6vjAL5BRNeOjfj4cZYMog6Lz/IlfOAltMtT0w88DAHDEFrBd2uO0l2eg=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+      "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw=="
     },
     "@aws-sdk/token-providers": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.667.0.tgz",
-      "integrity": "sha512-ZecJlG8p6D4UTYlBHwOWX6nknVtw/OBJ3yPXTSajBjhUlj9lE2xvejI8gl4rqkyLXk7z3bki+KR4tATbMaM9yg=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+      "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA=="
     },
     "@aws-sdk/types": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.667.0.tgz",
-      "integrity": "sha512-gYq0xCsqFfQaSL/yT1Gl1vIUjtsg7d7RhnUfsXaHt8xTxOKRTdH9GjbesBjXOzgOvB0W0vfssfreSNGFlOOMJg=="
+      "version": "3.692.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.692.0.tgz",
+      "integrity": "sha512-RpNvzD7zMEhiKgmlxGzyXaEcg2khvM7wd5sSHVapOcrde1awQSOMGI4zKBQ+wy5TnDfrm170ROz/ERLYtrjPZA=="
     },
     "@aws-sdk/util-endpoints": {
-      "version": "3.667.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.667.0.tgz",
-      "integrity": "sha512-X22SYDAuQJWnkF1/q17pkX3nGw5XMD9YEUbmt87vUnRq7iyJ3JOpl6UKOBeUBaL838wA5yzdbinmCITJ/VZ1QA=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+      "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg=="
     },
     "@aws-sdk/util-locate-window": {
-      "version": "3.568.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
-      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.693.0.tgz",
+      "integrity": "sha512-ttrag6haJLWABhLqtg1Uf+4LgHWIMOVSYL+VYZmAp2v4PUGOwWmWQH0Zk8RM7YuQcLfH/EoR72/Yxz6A4FKcuw=="
     },
     "@aws-sdk/util-user-agent-browser": {
-      "version": "3.670.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz",
-      "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+      "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw=="
     },
     "@aws-sdk/util-user-agent-node": {
-      "version": "3.669.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.669.0.tgz",
-      "integrity": "sha512-9jxCYrgggy2xd44ZASqI7AMiRVaSiFp+06Kg8BQSU0ijKpBJlwcsqIS8pDT/n6LxuOw2eV5ipvM2C0r1iKzrGA=="
+      "version": "3.693.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+      "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg=="
     },
     "@mongodb-js/saslprep": {
       "version": "1.1.9",
@@ -186,39 +186,39 @@
       "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw=="
     },
     "@smithy/abort-controller": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.5.tgz",
-      "integrity": "sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg=="
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.8.tgz",
+      "integrity": "sha512-+3DOBcUn5/rVjlxGvUPKc416SExarAQ+Qe0bqk30YSUjbepwpS7QN0cyKUSifvLJhdMZ0WPzPP5ymut0oonrpQ=="
     },
     "@smithy/config-resolver": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.9.tgz",
-      "integrity": "sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg=="
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.12.tgz",
+      "integrity": "sha512-YAJP9UJFZRZ8N+UruTeq78zkdjUHmzsY62J4qKWZ4SXB4QXJ/+680EfXXgkYA2xj77ooMqtUY9m406zGNqwivQ=="
     },
     "@smithy/core": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.4.8.tgz",
-      "integrity": "sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.5.3.tgz",
+      "integrity": "sha512-96uW8maifUSmehaeW7uydWn7wBc98NEeNI3zN8vqakGpyCQgzyJaA64Z4FCOUmAdCJkhppd/7SZ798Fo4Xx37g=="
     },
     "@smithy/credential-provider-imds": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz",
-      "integrity": "sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w=="
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.7.tgz",
+      "integrity": "sha512-cEfbau+rrWF8ylkmmVAObOmjbTIzKyUC5TkBL58SbLywD0RCBC4JAUKbmtSm2w5KUJNRPGgpGFMvE2FKnuNlWQ=="
     },
     "@smithy/fetch-http-handler": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz",
-      "integrity": "sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.1.1.tgz",
+      "integrity": "sha512-bH7QW0+JdX0bPBadXt8GwMof/jz0H28I84hU1Uet9ISpzUqXqRQ3fEZJ+ANPOhzSEczYvANNl3uDQDYArSFDtA=="
     },
     "@smithy/hash-node": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.7.tgz",
-      "integrity": "sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.10.tgz",
+      "integrity": "sha512-3zWGWCHI+FlJ5WJwx73Mw2llYR8aflVyZN5JhoqLxbdPZi6UyKSdCeXAWJw9ja22m6S6Tzz1KZ+kAaSwvydi0g=="
     },
     "@smithy/invalid-dependency": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz",
-      "integrity": "sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.10.tgz",
+      "integrity": "sha512-Lp2L65vFi+cj0vFMu2obpPW69DU+6O5g3086lmI4XcnRCG8PxvpWC7XyaVwJCxsZFzueHjXnrOH/E0pl0zikfA=="
     },
     "@smithy/is-array-buffer": {
       "version": "3.0.0",
@@ -226,89 +226,89 @@
       "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="
     },
     "@smithy/middleware-content-length": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz",
-      "integrity": "sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA=="
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.12.tgz",
+      "integrity": "sha512-1mDEXqzM20yywaMDuf5o9ue8OkJ373lSPbaSjyEvkWdqELhFMyNNgKGWL/rCSf4KME8B+HlHKuR8u9kRj8HzEQ=="
     },
     "@smithy/middleware-endpoint": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz",
-      "integrity": "sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ=="
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.3.tgz",
+      "integrity": "sha512-Hdl9296i/EMptaX7agrSzJZDiz5Y8XPUeBbctTmMtnCguGpqfU3jVsTUan0VLaOhsnquqWLL8Bl5HrlbVGT1og=="
     },
     "@smithy/middleware-retry": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.23.tgz",
-      "integrity": "sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A=="
+      "version": "3.0.27",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.27.tgz",
+      "integrity": "sha512-H3J/PjJpLL7Tt+fxDKiOD25sMc94YetlQhCnYeNmina2LZscAdu0ZEZPas/kwePHABaEtqp7hqa5S4UJgMs1Tg=="
     },
     "@smithy/middleware-serde": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz",
-      "integrity": "sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.10.tgz",
+      "integrity": "sha512-MnAuhh+dD14F428ubSJuRnmRsfOpxSzvRhaGVTvd/lrUDE3kxzCCmH8lnVTvoNQnV2BbJ4c15QwZ3UdQBtFNZA=="
     },
     "@smithy/middleware-stack": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz",
-      "integrity": "sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.10.tgz",
+      "integrity": "sha512-grCHyoiARDBBGPyw2BeicpjgpsDFWZZxptbVKb3CRd/ZA15F/T6rZjCCuBUjJwdck1nwUuIxYtsS4H9DDpbP5w=="
     },
     "@smithy/node-config-provider": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz",
-      "integrity": "sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q=="
+      "version": "3.1.11",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.11.tgz",
+      "integrity": "sha512-URq3gT3RpDikh/8MBJUB+QGZzfS7Bm6TQTqoh4CqE8NBuyPkWa5eUXj0XFcFfeZVgg3WMh1u19iaXn8FvvXxZw=="
     },
     "@smithy/node-http-handler": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz",
-      "integrity": "sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.3.1.tgz",
+      "integrity": "sha512-fr+UAOMGWh6bn4YSEezBCpJn9Ukp9oR4D32sCjCo7U81evE11YePOQ58ogzyfgmjIO79YeOdfXXqr0jyhPQeMg=="
     },
     "@smithy/property-provider": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.7.tgz",
-      "integrity": "sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw=="
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.10.tgz",
+      "integrity": "sha512-n1MJZGTorTH2DvyTVj+3wXnd4CzjJxyXeOgnTlgNVFxaaMeT4OteEp4QrzF8p9ee2yg42nvyVK6R/awLCakjeQ=="
     },
     "@smithy/protocol-http": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.4.tgz",
-      "integrity": "sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ=="
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.7.tgz",
+      "integrity": "sha512-FP2LepWD0eJeOTm0SjssPcgqAlDFzOmRXqXmGhfIM52G7Lrox/pcpQf6RP4F21k0+O12zaqQt5fCDOeBtqY6Cg=="
     },
     "@smithy/querystring-builder": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz",
-      "integrity": "sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.10.tgz",
+      "integrity": "sha512-nT9CQF3EIJtIUepXQuBFb8dxJi3WVZS3XfuDksxSCSn+/CzZowRLdhDn+2acbBv8R6eaJqPupoI/aRFIImNVPQ=="
     },
     "@smithy/querystring-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz",
-      "integrity": "sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.10.tgz",
+      "integrity": "sha512-Oa0XDcpo9SmjhiDD9ua2UyM3uU01ZTuIrNdZvzwUTykW1PM8o2yJvMh1Do1rY5sUQg4NDV70dMi0JhDx4GyxuQ=="
     },
     "@smithy/service-error-classification": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz",
-      "integrity": "sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.10.tgz",
+      "integrity": "sha512-zHe642KCqDxXLuhs6xmHVgRwy078RfqxP2wRDpIyiF8EmsWXptMwnMwbVa50lw+WOGNrYm9zbaEg0oDe3PTtvQ=="
     },
     "@smithy/shared-ini-file-loader": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz",
-      "integrity": "sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw=="
+      "version": "3.1.11",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.11.tgz",
+      "integrity": "sha512-AUdrIZHFtUgmfSN4Gq9nHu3IkHMa1YDcN+s061Nfm+6pQ0mJy85YQDB0tZBCmls0Vuj22pLwDPmL92+Hvfwwlg=="
     },
     "@smithy/signature-v4": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.0.tgz",
-      "integrity": "sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ=="
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.3.tgz",
+      "integrity": "sha512-pPSQQ2v2vu9vc8iew7sszLd0O09I5TRc5zhY71KA+Ao0xYazIG+uLeHbTJfIWGO3BGVLiXjUr3EEeCcEQLjpWQ=="
     },
     "@smithy/smithy-client": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.0.tgz",
-      "integrity": "sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ=="
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.4.4.tgz",
+      "integrity": "sha512-dPGoJuSZqvirBq+yROapBcHHvFjChoAQT8YPWJ820aPHHiowBlB3RL1Q4kPT1hx0qKgJuf+HhyzKi5Gbof4fNA=="
     },
     "@smithy/types": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.5.0.tgz",
-      "integrity": "sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q=="
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.7.1.tgz",
+      "integrity": "sha512-XKLcLXZY7sUQgvvWyeaL/qwNPp6V3dWcUjqrQKjSb+tzYiCy340R/c64LV5j+Tnb2GhmunEX0eou+L+m2hJNYA=="
     },
     "@smithy/url-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.7.tgz",
-      "integrity": "sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.10.tgz",
+      "integrity": "sha512-j90NUalTSBR2NaZTuruEgavSdh8MLirf58LoGSk4AtQfyIymogIhgnGUU2Mga2bkMkpSoC9gxb74xBXL5afKAQ=="
     },
     "@smithy/util-base64": {
       "version": "3.0.0",
@@ -336,19 +336,19 @@
       "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="
     },
     "@smithy/util-defaults-mode-browser": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.23.tgz",
-      "integrity": "sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw=="
+      "version": "3.0.27",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.27.tgz",
+      "integrity": "sha512-GV8NvPy1vAGp7u5iD/xNKUxCorE4nQzlyl057qRac+KwpH5zq8wVq6rE3lPPeuFLyQXofPN6JwxL1N9ojGapiQ=="
     },
     "@smithy/util-defaults-mode-node": {
-      "version": "3.0.23",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.23.tgz",
-      "integrity": "sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg=="
+      "version": "3.0.27",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.27.tgz",
+      "integrity": "sha512-7+4wjWfZqZxZVJvDutO+i1GvL6bgOajEkop4FuR6wudFlqBiqwxw3HoH6M9NgeCd37km8ga8NPp2JacQEtAMPg=="
     },
     "@smithy/util-endpoints": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz",
-      "integrity": "sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw=="
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.1.6.tgz",
+      "integrity": "sha512-mFV1t3ndBh0yZOJgWxO9J/4cHZVn5UG1D8DeCc6/echfNkeEJWu9LD7mgGH5fHrEdR7LDoWw7PQO6QiGpHXhgA=="
     },
     "@smithy/util-hex-encoding": {
       "version": "3.0.0",
@@ -356,19 +356,19 @@
       "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="
     },
     "@smithy/util-middleware": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.7.tgz",
-      "integrity": "sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.10.tgz",
+      "integrity": "sha512-eJO+/+RsrG2RpmY68jZdwQtnfsxjmPxzMlQpnHKjFPwrYqvlcT+fHdT+ZVwcjlWSrByOhGr9Ff2GG17efc192A=="
     },
     "@smithy/util-retry": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.7.tgz",
-      "integrity": "sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug=="
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.10.tgz",
+      "integrity": "sha512-1l4qatFp4PiU6j7UsbasUHL2VU023NRB/gfaa1M0rDqVrRN4g3mCArLRyH3OuktApA4ye+yjWQHjdziunw2eWA=="
     },
     "@smithy/util-stream": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.9.tgz",
-      "integrity": "sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.3.1.tgz",
+      "integrity": "sha512-Ff68R5lJh2zj+AUTvbAU/4yx+6QPRzg7+pI7M1FbtQHcRIp7xvguxVsQBKyB3fwiOwhAKu0lnNyYBaQfSW6TNw=="
     },
     "@smithy/util-uri-escape": {
       "version": "3.0.0",
@@ -381,9 +381,9 @@
       "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="
     },
     "@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ=="
+      "version": "22.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
+      "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ=="
     },
     "@types/webidl-conversions": {
       "version": "7.0.3",
@@ -486,9 +486,9 @@
       "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="
     },
     "tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
     "undici-types": {
       "version": "6.19.8",
diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 653f1b3b21..a004c2867b 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -1,4 +1,5 @@
 import { defineConfig } from "vitepress";
+import metadata from "../generators/meteor-versions/metadata.generated";
 
 // https://vitepress.dev/reference/site-config
 export default defineConfig({
@@ -127,6 +128,22 @@ export default defineConfig({
       },
       { text: "API", link: "/api/" },
       { text: "Galaxy Cloud", link: "https://www.meteor.com/cloud" },
+      {
+        text: metadata.currentVersion,
+        items: metadata.versions.reverse().map((v) => {
+          if (v.isCurrent) {
+            return {
+              text: `${v.version} (Current)`,
+              link: "/",
+              activeMatch: "/",
+            };
+          }
+          return {
+            text: v.version,
+            link: v.url,
+          };
+        }),
+      },
     ],
     sidebar: [
       {
diff --git a/v3-docs/docs/api/packages-listing.md b/v3-docs/docs/api/packages-listing.md
index f6f064191a..df21ba7ff8 100644
--- a/v3-docs/docs/api/packages-listing.md
+++ b/v3-docs/docs/api/packages-listing.md
@@ -45,7 +45,6 @@
 ### [callback-hook](https://github.com/meteor/meteor/tree/devel/packages/callback-hook) {#callback-hook}
 ### [check](https://github.com/meteor/meteor/tree/devel/packages/check) {#check}
 ### [constraint-solver](https://github.com/meteor/meteor/tree/devel/packages/constraint-solver) {#constraint-solver}
-### [context](https://github.com/meteor/meteor/tree/devel/packages/context) {#context}
 ### [core-runtime](https://github.com/meteor/meteor/tree/devel/packages/core-runtime) {#core-runtime}
 ### [crosswalk](https://github.com/meteor/meteor/tree/devel/packages/crosswalk) {#crosswalk}
 ### [ddp](https://github.com/meteor/meteor/tree/devel/packages/ddp) {#ddp}
@@ -134,6 +133,7 @@
 ### [standard-minifier-js](https://github.com/meteor/meteor/tree/devel/packages/standard-minifier-js) {#standard-minifier-js}
 ### [standard-minifiers](https://github.com/meteor/meteor/tree/devel/packages/standard-minifiers) {#standard-minifiers}
 ### [static-html](https://github.com/meteor/meteor/tree/devel/packages/static-html) {#static-html}
+### [static-html-tools](https://github.com/meteor/meteor/tree/devel/packages/static-html-tools) {#static-html-tools}
 ### [test-helpers](https://github.com/meteor/meteor/tree/devel/packages/test-helpers) {#test-helpers}
 ### [test-in-browser](https://github.com/meteor/meteor/tree/devel/packages/test-in-browser) {#test-in-browser}
 ### [test-in-console](https://github.com/meteor/meteor/tree/devel/packages/test-in-console) {#test-in-console}
@@ -150,4 +150,4 @@
 ### [webapp](https://github.com/meteor/meteor/tree/devel/packages/webapp) {#webapp}
 ### [webapp-hashing](https://github.com/meteor/meteor/tree/devel/packages/webapp-hashing) {#webapp-hashing}
 ### [weibo-config-ui](https://github.com/meteor/meteor/tree/devel/packages/weibo-config-ui) {#weibo-config-ui}
-### [weibo-oauth](https://github.com/meteor/meteor/tree/devel/packages/weibo-oauth) {#weibo-oauth}
+### [weibo-oauth](https://github.com/meteor/meteor/tree/devel/packages/weibo-oauth) {#weibo-oauth}
\ No newline at end of file
diff --git a/v3-docs/docs/generators/changelog/README.md b/v3-docs/docs/generators/changelog/README.md
index bd795db186..6af9fc099d 100644
--- a/v3-docs/docs/generators/changelog/README.md
+++ b/v3-docs/docs/generators/changelog/README.md
@@ -32,7 +32,7 @@ organized changelog, since all the files will be reflecting at least one version
 
 ## Update ordering.
 
-If you want to make sure that the changelog is correcly ordered, take a look at the `order-packages.js` file.
+If you want to make sure that the changelog is correctly ordered, take a look at the `order-packages.js` file.
 to use it, run the command below:
 
 ```bash
diff --git a/v3-docs/docs/generators/codegen.js b/v3-docs/docs/generators/codegen.js
index f740041028..a6ed7ab00a 100644
--- a/v3-docs/docs/generators/codegen.js
+++ b/v3-docs/docs/generators/codegen.js
@@ -1,10 +1,11 @@
 const { generateChangelog } = require("./changelog/script.js");
 const { listPackages } = require("./packages-listing/script.js");
-
+const { generateMeteorVersions } = require("./meteor-versions/script.js");
 async function main() {
   console.log("🚂 Started codegen 🚂");
   await generateChangelog();
   await listPackages();
+  await generateMeteorVersions();
   console.log("🚀 Done codegen 🚀");
 }
 
diff --git a/v3-docs/docs/generators/meteor-versions/README.md b/v3-docs/docs/generators/meteor-versions/README.md
new file mode 100644
index 0000000000..6307b198bf
--- /dev/null
+++ b/v3-docs/docs/generators/meteor-versions/README.md
@@ -0,0 +1,22 @@
+## Meteor version generator for docs
+
+This is a generator for the meteor versions for the docs, this is used to generate the links in the docs
+to the correct version of the meteor release and docs version.
+
+
+## Why?
+
+This is a way to ensure that the links in the docs are always pointing to the correct version of the docs and release.
+In an automated way.
+
+
+## How to use
+
+To use this generator you must run the following command:
+
+```bash
+node script.js
+```
+
+and it will check in the `changelog` dir for every version and generate a `versions.generated.json` file that will be used by the docs to generate the links to the correct version of the docs.
+
diff --git a/v3-docs/docs/generators/meteor-versions/metadata.generated.js b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
new file mode 100644
index 0000000000..472b0054dd
--- /dev/null
+++ b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
@@ -0,0 +1,26 @@
+export default {
+  "versions": [
+    {
+      "version": "v3.0.0",
+      "url": "https://3-0-0-docs.meteor.com/"
+    },
+    {
+      "version": "v3.0.1",
+      "url": "https://3-0-1-docs.meteor.com/"
+    },
+    {
+      "version": "v3.0.2",
+      "url": "https://3-0-2-docs.meteor.com/"
+    },
+    {
+      "version": "v3.0.3",
+      "url": "https://3-0-3-docs.meteor.com/"
+    },
+    {
+      "version": "v3.0.4",
+      "url": "https://3-0-4-docs.meteor.com/",
+      "isCurrent": true
+    }
+  ],
+  "currentVersion": "v3.0.4"
+}
\ No newline at end of file
diff --git a/v3-docs/docs/generators/meteor-versions/script.js b/v3-docs/docs/generators/meteor-versions/script.js
new file mode 100644
index 0000000000..114b2c1a27
--- /dev/null
+++ b/v3-docs/docs/generators/meteor-versions/script.js
@@ -0,0 +1,41 @@
+const _fs = require("fs");
+const fs = _fs.promises;
+
+const getDocsUrl = (version = "") => `https://${version}docs.meteor.com/`;
+
+exports.generateMeteorVersions = async () => {
+  console.log("Reading meteor versions...");
+  const files = await fs.readdir("./generators/changelog/versions", "utf8");
+
+  const versions = files
+    .filter((f) => f !== "99999-generated-code-warning.md")
+    .map((f) => f.replace(".md", ""))
+    .map((version) => {
+      return {
+        version: `v${version}`,
+        url: getDocsUrl(`${version.replaceAll(".", "-")}-`),
+      };
+    })
+    .map((v, index, arr) => {
+      const isLast = index === arr.length - 1;
+      if (isLast) {
+        v.isCurrent = true;
+      }
+      return v;
+    });
+  const { version: currentVersion } = versions.find((v) => v.isCurrent);
+
+  console.log("Writing meteor versions...");
+  await fs.writeFile(
+    "./generators/meteor-versions/metadata.generated.js",
+    `export default ${JSON.stringify(
+      {
+        versions,
+        currentVersion,
+      },
+      null,
+      2
+    )}`
+  );
+  console.log("Meteor versions generated!");
+};
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index fb537c579f..183042db9d 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -12,6 +12,115 @@ This is a complete history of changes for Meteor releases.
 
 
 
+## v3.0.4, 2024-10-15
+
+### Highlights
+
+- Node 20.18.0 & Typescript 5.6.2
+- Updated webapp dependencies.
+- DDP-server and DDP-client removed underscore
+- Remove dependencies on Blaze packages when using static-html
+- Fix Cordova on Windows
+- Fix Cordova build on using plugins describing dependencies
+- Various Windows specific fixes
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.0.4
+
+```
+
+#### Meteor Version Release
+
+* `Bumped packages`:
+  - accounts-base@3.0.3                
+  - babel-compiler@7.11.1              
+  - caching-compiler@2.0.1             
+  - check@1.4.4                        
+  - ddp-client@3.0.2                   
+  - ddp-server@3.0.2                   
+  - ecmascript-runtime@0.8.3           
+  - modules@0.20.2                     
+  - static-html-tools@1.0.0            
+  - static-html@1.4.0                  
+  - url@1.3.4                          
+  - webapp@2.0.3                       
+  - meteor-tool@3.0.4
+
+#### Special thanks to
+N/A
+## v3.0.3, 2024-09-11
+
+### Highlights
+
+- Fixed `Meteor.userId` only being invoked with `bindEnvironment`.
+- Updated to Node `20.17.x`.
+- Fixed an issue where `meteor --open` opens the browser before the app is started.
+- Investigated and addressed the error when installing the `jam:method` package.
+- Improved the message for new available versions when running an app.
+- Updated the documentation link inside `install.sh`.
+- Resolved the issue where subscriptions stopped after a parameter change.
+- Added MongoDB connection telemetry.
+- Bumped the `email` package to prevent update errors.
+- Cordova package updates
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+- Some internal changes to how async contexts are handled, ensuring better performance and garbage collection.
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.0.3
+
+```
+
+If you've had your Meteor installation for over a year, we suggest reinstalling it to avoid any package installation issues. You can do this by running a few quick commands:
+
+```bash
+npx meteor uninstall // or rm -rf ~/.meteor
+npx meteor
+```
+
+
+
+#### Meteor Version Release
+
+* `Bumped packages`:
+  - accounts-base@3.0.2
+  - accounts-password@3.0.2
+  - email@3.1.0
+  - mongo@2.0.2
+
+
+#### Special thanks to
+
+- [@ayewo](https://github.com/ayewo).
+- [@denihs](https://github.com/denihs).
+- [@harryadel](https://github.com/harryadel).
+- [@kbarr1212](https://github.com/kbarr1212).
+- [@leonardoventurini](https://github.com/leonardoventurini).
+- [@nachocodoner](https://github.com/nachocodoner).
+
 ## v3.0.2, 2024-08-14
 
 ### Highlights

From 2a32386a89fd144c8a123b94dd2c2bb592e53b30 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 19 Nov 2024 19:53:02 -0300
Subject: [PATCH 0836/1140] DEV: remove 3.0.1 version as we don't have it in
 our github yet

---
 v3-docs/docs/generators/meteor-versions/metadata.generated.js | 4 ----
 v3-docs/docs/generators/meteor-versions/script.js             | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/v3-docs/docs/generators/meteor-versions/metadata.generated.js b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
index 472b0054dd..37fcbf4922 100644
--- a/v3-docs/docs/generators/meteor-versions/metadata.generated.js
+++ b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
@@ -4,10 +4,6 @@ export default {
       "version": "v3.0.0",
       "url": "https://3-0-0-docs.meteor.com/"
     },
-    {
-      "version": "v3.0.1",
-      "url": "https://3-0-1-docs.meteor.com/"
-    },
     {
       "version": "v3.0.2",
       "url": "https://3-0-2-docs.meteor.com/"
diff --git a/v3-docs/docs/generators/meteor-versions/script.js b/v3-docs/docs/generators/meteor-versions/script.js
index 114b2c1a27..873ac3861a 100644
--- a/v3-docs/docs/generators/meteor-versions/script.js
+++ b/v3-docs/docs/generators/meteor-versions/script.js
@@ -10,6 +10,7 @@ exports.generateMeteorVersions = async () => {
   const versions = files
     .filter((f) => f !== "99999-generated-code-warning.md")
     .map((f) => f.replace(".md", ""))
+    .filter((v) => v !== "3.0.1") // there is no 3.0.1 version
     .map((version) => {
       return {
         version: `v${version}`,

From a43f9e2423121588b2338c6b9ef7d94ce0539e89 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 19 Nov 2024 20:38:43 -0300
Subject: [PATCH 0837/1140] DOCS: add GoToLatest button to docs

it will redirect to the latest version of the docs when clicked, respecting the user's current page
---
 v3-docs/docs/.vitepress/theme/GoToLatest.vue | 19 +++++++++++++++++++
 v3-docs/docs/.vitepress/theme/Layout.vue     | 10 ++++++++--
 v3-docs/docs/about/install.md                | 18 ++----------------
 3 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 v3-docs/docs/.vitepress/theme/GoToLatest.vue

diff --git a/v3-docs/docs/.vitepress/theme/GoToLatest.vue b/v3-docs/docs/.vitepress/theme/GoToLatest.vue
new file mode 100644
index 0000000000..c2bd6c2c44
--- /dev/null
+++ b/v3-docs/docs/.vitepress/theme/GoToLatest.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import { ref, watch } from "vue";
+import { useRouter } from "vitepress";
+const router = useRouter();
+let url = ref(`https://docs.meteor.com${router.route.path}`);
+
+if (typeof window !== 'undefined') watch(() => router.route.path, (path) =>
+  url.value = `https://docs.meteor.com${path}`
+  , { immediate: true })
+</script>
+
+<template>
+  <div class="tip custom-block">
+    <p class="custom-block-title">TIP</p>
+    <p>You are viewing an old version of the Meteor documentation. Click <a v-bind:href="url">here</a> to
+      go to the latest version.</p>
+  </div>
+  <br />
+</template>
\ No newline at end of file
diff --git a/v3-docs/docs/.vitepress/theme/Layout.vue b/v3-docs/docs/.vitepress/theme/Layout.vue
index 91cf0e928e..aae4c2253b 100644
--- a/v3-docs/docs/.vitepress/theme/Layout.vue
+++ b/v3-docs/docs/.vitepress/theme/Layout.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import NotFound from './NotFound.vue'
+import GoToLatest from './GoToLatest.vue'
 import { useData, useRouter } from 'vitepress'
 import DefaultTheme from 'vitepress/theme'
 import { nextTick, provide } from 'vue'
@@ -48,13 +49,18 @@ provide('toggle-appearance', async ({ clientX: x, clientY: y }: MouseEvent) => {
     }
   )
 })
+
+const inLatestDeployedDoc = () => window.location.href.startsWith("https://docs.meteor.com/")
 </script>
 
 <template>
-  <DefaultTheme.Layout >
+  <DefaultTheme.Layout>
     <template #not-found>
       <NotFound />
     </template>
+    <template #doc-before v-if="!inLatestDeployedDoc()">
+      <GoToLatest />
+    </template>
   </DefaultTheme.Layout>
 </template>
 
@@ -82,4 +88,4 @@ provide('toggle-appearance', async ({ clientX: x, clientY: y }: MouseEvent) => {
 .VPSwitchAppearance .check {
   transform: none !important;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/v3-docs/docs/about/install.md b/v3-docs/docs/about/install.md
index 792d7aa600..dd8331d501 100644
--- a/v3-docs/docs/about/install.md
+++ b/v3-docs/docs/about/install.md
@@ -1,4 +1,3 @@
-
 # Install
 
 You need to install the Meteor command line tool to create, run, and manage your Meteor.js projects. Check the prerequisites and follow the installation process below.
@@ -18,7 +17,6 @@ npx meteor
 - Disabling antivirus (Windows Defender, etc.) will improve performance.
 - For compatibility, Linux binaries are built with CentOS 6.4 i386/amd64.
 
-
 ### Mobile Development {#prereqs-mobile}
 
 - iOS development requires the latest Xcode.
@@ -63,10 +61,9 @@ curl https://install.meteor.com/\?release\=2.8 | sh
 
 > Do not install the npm Meteor Tool in your project's package.json. This library is just an installer.
 
-
 ## Troubleshooting {#troubleshooting}
 
-If your user doesn't have permission to install global binaries, and you need to use sudo, it's necessary to append *--unsafe-perm* to the above command:
+If your user doesn't have permission to install global binaries, and you need to use sudo, it's necessary to append _--unsafe-perm_ to the above command:
 
 ```bash
 sudo npm install -g meteor --unsafe-perm
@@ -79,7 +76,6 @@ If you only use sudo because of a distribution default permission system, [check
 
 In some cases you can get this error `npm WARN checkPermissions Missing write access to /usr/local/lib/node_modules` because your Node.js installation was performed with wrong permissions. An easy way to fix this is to install Node.js using [nvm](https://github.com/nvm-sh/nvm) and forcing it to be used in your terminal. You can force it in the current session of your terminal by running `nvm use 14`.
 
-
 ## PATH management {#path-management}
 
 By default, the Meteor installer adds its install path (by default, `~/.meteor/`) to your PATH by updating either your `.bashrc`, `.bash_profile`, or `.zshrc` as appropriate. To disable this behavior, install Meteor by running:
@@ -88,11 +84,8 @@ By default, the Meteor installer adds its install path (by default, `~/.meteor/`
 npm install -g meteor --ignore-meteor-setup-exec-path --foreground-script
 ```
 
-
-
 (or by setting the environment variable `npm_config_ignore_meteor_setup_exec_path=true`)
 
-
 ## Old Versions on Apple M1 {#old-versions-m1}
 
 For Apple M1 computers, you can append Rosetta prefix as following, if you need to run older versions of Meteor (before 2.5.1):
@@ -103,7 +96,6 @@ arch -x86_64 npm install -g meteor
 
 or select Terminal in the Applications folder, press CMD(⌘)+I and check the "Open using Rosetta" option.
 
-
 ## Meteor Docker image {#meteor-docker}
 
 You can also use a Docker container for running Meteor inside your CI, or even in your local development toolchain.
@@ -112,26 +104,20 @@ We do provide the meteor/meteor-base ubuntu-based Docker image, that comes pre-b
 
 You can refer to our meteor/galaxy-images repository to see how to use it, and the latest version. [More about meteor-base here.](https://github.com/meteor/galaxy-images/blob/master/meteor-base/README.md)
 
-
-
 ## Note for Windows users {#windows}
 
 On Windows, the installer runs faster when [Windows Developer Mode](https://docs.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development) is enabled. The installation extracts a large number of small files, which Windows Defender can cause to be very slow.
 
-
-
 ## Node version manager {#nvm}
 
 If you use a node version manager that uses a separate global `node_modules` folder for each Node version, you will need to re-install the `meteor` npm package when changing to a Node version for the first time. Otherwise, the `meteor` command will no longer be found.
 
-
 ## Note for fish shell users (Linux) {#fish-shell}
 
 To be able to use the `meteor` command from fish it's needed to include `/home/<user>/.meteor` in `$PATH`; to do that just add this line in `/home/<user>/.config/fish/config.fish` file (replace `<user>` with your username):
 
 `set PATH /home/<user>/.meteor $PATH`
 
-
 ## Uninstalling Meteor {#uninstall}
 
 If you installed Meteor using npx, you can remove it by running:
@@ -143,4 +129,4 @@ npx meteor uninstall
 If you installed Meteor using curl or as a fallback solution, run:
 
 `rm -rf ~/.meteor`
-`sudo rm /usr/local/bin/meteor` 
+`sudo rm /usr/local/bin/meteor`

From 916407b934b3618380a5a27b3569f74fcbcf2b32 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 20 Nov 2024 08:31:04 -0300
Subject: [PATCH 0838/1140] DOCS: add check for `isClient` to show the go back
 to version tip

---
 v3-docs/docs/.vitepress/theme/Layout.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/.vitepress/theme/Layout.vue b/v3-docs/docs/.vitepress/theme/Layout.vue
index aae4c2253b..e240ef669f 100644
--- a/v3-docs/docs/.vitepress/theme/Layout.vue
+++ b/v3-docs/docs/.vitepress/theme/Layout.vue
@@ -50,7 +50,7 @@ provide('toggle-appearance', async ({ clientX: x, clientY: y }: MouseEvent) => {
   )
 })
 
-const inLatestDeployedDoc = () => window.location.href.startsWith("https://docs.meteor.com/")
+const inLatestDeployedDoc = () => isClient && window.location.href.startsWith("https://docs.meteor.com/")
 </script>
 
 <template>

From 711e287933a26a719f9c08bd0f345aefd3febd64 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 20 Nov 2024 11:43:12 -0300
Subject: [PATCH 0839/1140] DOCS: change tip to be a warning

---
 v3-docs/docs/.vitepress/theme/GoToLatest.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/.vitepress/theme/GoToLatest.vue b/v3-docs/docs/.vitepress/theme/GoToLatest.vue
index c2bd6c2c44..cf67d76863 100644
--- a/v3-docs/docs/.vitepress/theme/GoToLatest.vue
+++ b/v3-docs/docs/.vitepress/theme/GoToLatest.vue
@@ -10,8 +10,8 @@ if (typeof window !== 'undefined') watch(() => router.route.path, (path) =>
 </script>
 
 <template>
-  <div class="tip custom-block">
-    <p class="custom-block-title">TIP</p>
+  <div class="warning custom-block">
+    <p class="custom-block-title">Warning</p>
     <p>You are viewing an old version of the Meteor documentation. Click <a v-bind:href="url">here</a> to
       go to the latest version.</p>
   </div>

From 889e3c31097ad14da22fca87676a4dd60348d78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 20 Nov 2024 15:48:06 +0100
Subject: [PATCH 0840/1140] bump bundle version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 36527f713f..446c6c4f25 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.11.0.3
+BUNDLE_VERSION=22.11.0.4
 
 
 # OS Check. Put here because here is where we download the precompiled

From fed15cd09b0c2ca8f62304a52c92c561b30e2619 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 20 Nov 2024 12:04:16 -0300
Subject: [PATCH 0841/1140] DOCS: update urls

---
 .../generators/meteor-versions/metadata.generated.js   | 10 +++++-----
 v3-docs/docs/generators/meteor-versions/script.js      |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/v3-docs/docs/generators/meteor-versions/metadata.generated.js b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
index 37fcbf4922..16e81c5505 100644
--- a/v3-docs/docs/generators/meteor-versions/metadata.generated.js
+++ b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
@@ -1,20 +1,20 @@
 export default {
   "versions": [
     {
-      "version": "v3.0.0",
-      "url": "https://3-0-0-docs.meteor.com/"
+      "version": "v3.0",
+      "url": "https://release-3.0.docs.meteor.com/"
     },
     {
       "version": "v3.0.2",
-      "url": "https://3-0-2-docs.meteor.com/"
+      "url": "https://release-3.0.2.docs.meteor.com/"
     },
     {
       "version": "v3.0.3",
-      "url": "https://3-0-3-docs.meteor.com/"
+      "url": "https://release-3.0.3.docs.meteor.com/"
     },
     {
       "version": "v3.0.4",
-      "url": "https://3-0-4-docs.meteor.com/",
+      "url": "https://release-3.0.4.docs.meteor.com/",
       "isCurrent": true
     }
   ],
diff --git a/v3-docs/docs/generators/meteor-versions/script.js b/v3-docs/docs/generators/meteor-versions/script.js
index 873ac3861a..ee551ef463 100644
--- a/v3-docs/docs/generators/meteor-versions/script.js
+++ b/v3-docs/docs/generators/meteor-versions/script.js
@@ -1,7 +1,8 @@
 const _fs = require("fs");
 const fs = _fs.promises;
 
-const getDocsUrl = (version = "") => `https://${version}docs.meteor.com/`;
+const getDocsUrl = (version = "") =>
+  `https://release-${version}.docs.meteor.com/`;
 
 exports.generateMeteorVersions = async () => {
   console.log("Reading meteor versions...");
@@ -11,10 +12,11 @@ exports.generateMeteorVersions = async () => {
     .filter((f) => f !== "99999-generated-code-warning.md")
     .map((f) => f.replace(".md", ""))
     .filter((v) => v !== "3.0.1") // there is no 3.0.1 version
+    .map((v) => (v.endsWith(".0") ? v.slice(0, -2) : v)) // remove .0 from versions
     .map((version) => {
       return {
         version: `v${version}`,
-        url: getDocsUrl(`${version.replaceAll(".", "-")}-`),
+        url: getDocsUrl(`${version}`),
       };
     })
     .map((v, index, arr) => {

From c7aa6b88e4f80d548293a9448c7e4fcd07ab924f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 20 Nov 2024 16:14:20 +0100
Subject: [PATCH 0842/1140] upgrade migration guide

---
 .../breaking-changes/index.md                 | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/v3-docs/v3-migration-docs/breaking-changes/index.md b/v3-docs/v3-migration-docs/breaking-changes/index.md
index cc822958fa..e03dfbb5ca 100644
--- a/v3-docs/v3-migration-docs/breaking-changes/index.md
+++ b/v3-docs/v3-migration-docs/breaking-changes/index.md
@@ -40,10 +40,10 @@ The `meteor reset` command clears only the local cache by default. Using the `--
 
 This command is often recommended to fix your development project by clearing the cache. Previously, it also cleared the local MongoDB, which could accidentally delete important data.
 
-## Node v20
+## Node v22
 
-Meteor 3.0 is now using Node v20. This means that if you have any dependencies or usages
-of Node v14, you will need to update them to be compatible with Node v20.
+Meteor 3.0 is now using Node v22. This means that if you have any dependencies or usages
+of Node v14, you will need to update them to be compatible with Node v22.
 
 
 ## NPM Installer Update
@@ -119,7 +119,8 @@ await Meteor.callAsync('otherMethod') // [!code highlight]
 
 ```
 
-## WebApp Switches to Express
+## WebApp Switches to Express 5
+
 
 ::: tip
 
@@ -128,6 +129,12 @@ If you've customized the WebApp package before, please verify if those customiza
 
 :::
 
+::: tip
+
+Starting with Meteor 3.1, Express has been updated to version 5. If you're upgrading from an earlier version, [refer to the migration guide](https://expressjs.com/en/guide/migrating-5.html).
+
+:::
+
 The `webapp` package now exports these new properties:
 
 ```ts
@@ -331,3 +338,9 @@ function patchPublish(publish: typeof Meteor.publish) {
 ```
 
 This example demonstrates the migration applied to the [`universe:i18n` package](https://github.com/vazco/meteor-universe-i18n/pull/191).
+
+## mongodb driver 6
+
+In Meteor 3, the MongoDB driver has been updated to version 6.x. This version removes callbacks for async operations, replacing them with standard promises. If you use rawCollection or rawDatabase, ensure your code is updated to use promises.
+
+For details on breaking changes, see [here](https://github.com/mongodb/node-mongodb-native/blob/HEAD/HISTORY.md).

From e5238fa66b8789b7b78ae5cd09458d443cd74109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 20 Nov 2024 16:15:15 +0100
Subject: [PATCH 0843/1140] bump bundle version

---
 v3-docs/v3-migration-docs/breaking-changes/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/v3-migration-docs/breaking-changes/index.md b/v3-docs/v3-migration-docs/breaking-changes/index.md
index e03dfbb5ca..0c3cd4b397 100644
--- a/v3-docs/v3-migration-docs/breaking-changes/index.md
+++ b/v3-docs/v3-migration-docs/breaking-changes/index.md
@@ -339,7 +339,7 @@ function patchPublish(publish: typeof Meteor.publish) {
 
 This example demonstrates the migration applied to the [`universe:i18n` package](https://github.com/vazco/meteor-universe-i18n/pull/191).
 
-## mongodb driver 6
+## Mongo driver
 
 In Meteor 3, the MongoDB driver has been updated to version 6.x. This version removes callbacks for async operations, replacing them with standard promises. If you use rawCollection or rawDatabase, ensure your code is updated to use promises.
 

From 456f7d6d1462894949178407808df487a3b77c4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 20 Nov 2024 17:02:55 +0100
Subject: [PATCH 0844/1140] update changelog to include devs helped to test
 last-minute fix

---
 v3-docs/docs/generators/changelog/versions/3.1.0.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index 3094442ef7..04264a16b6 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -87,5 +87,8 @@ The MongoDB Node.js driver implemented a significant breaking change regarding o
 - [@harry97](https://github.com/harry97)
 - [@permb](https://github.com/permb)
 - [@9Morello](https://github.com/9Morello)
+- [@wreiske](https://github.com/wreiske)
+- [@MarcoTribuz](https://github.com/MarcoTribuz)
+- [@MeteorCoder](https://forums.meteor.com/u/meteorcoder/summary)
 
 ✨✨✨

From 815b674d9a0bf877ac844533a69a20fd14e37870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 20 Nov 2024 17:04:43 +0100
Subject: [PATCH 0845/1140] =?UTF-8?q?Meteor=20version=20to=203.1=C2=A0:com?=
 =?UTF-8?q?et:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/accounts-password/package.js         |  2 +-
 packages/babel-compiler/package.js            |  2 +-
 .../boilerplate-generator-tests/package.js    |  2 +-
 packages/ddp-client/package.js                |  2 +-
 packages/ddp-server/package.js                |  2 +-
 packages/ecmascript/package.js                |  2 +-
 packages/email/package.js                     |  2 +-
 packages/meteor-tool/package.js               |  2 +-
 packages/meteor/package.js                    |  2 +-
 packages/minifier-js/package.js               |  2 +-
 packages/minimongo/package.js                 |  2 +-
 packages/modules/package.js                   |  2 +-
 packages/mongo/package.js                     |  2 +-
 .../non-core/coffeescript-compiler/package.js |  2 +-
 packages/non-core/coffeescript/package.js     |  2 +-
 packages/non-core/mongo-decimal/.versions     | 24 +++++++++----------
 packages/npm-mongo/package.js                 |  2 +-
 packages/roles/package.js                     |  2 +-
 packages/shell-server/package.js              |  2 +-
 packages/test-helpers/package.js              |  2 +-
 packages/test-in-console/package.js           |  2 +-
 packages/tinytest/package.js                  |  2 +-
 packages/typescript/package.js                |  2 +-
 packages/url/package.js                       |  2 +-
 packages/webapp/package.js                    |  2 +-
 scripts/admin/meteor-release-official.json    |  2 +-
 26 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 6376eeb589..b86e57dff1 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.0.3-rc310.0",
+  version: "3.0.3",
 });
 
 Npm.depends({
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 118f065d16..44b6fb8f30 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.11.2-rc310.0',
+  version: '7.11.2',
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator-tests/package.js b/packages/boilerplate-generator-tests/package.js
index a0ffa190f3..8c95f5f034 100644
--- a/packages/boilerplate-generator-tests/package.js
+++ b/packages/boilerplate-generator-tests/package.js
@@ -2,7 +2,7 @@ Package.describe({
   // These tests are in a separate package so that we can Npm.depend on
   // parse5, a html parsing library.
   summary: "Tests for the boilerplate-generator package",
-  version: '1.5.3-rc310.0',
+  version: '1.5.3',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 510e0d84b3..e0cb8bffe5 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.0.3-rc310.0",
+  version: "3.0.3",
   documentation: null,
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index af293885fe..d3eedde20a 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: "3.0.3-rc310.0",
+  version: "3.0.3",
   documentation: null,
 });
 
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 076ff916ed..e74159738d 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.10-rc310.0',
+  version: '0.16.10',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index d4cbf3b950..27ae6d4546 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "3.1.1-rc310.0",
+  version: "3.1.1",
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 905797636a..1656dc9b45 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.0-rc.0",
+  version: "3.1.0",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index aa246a1edd..ba8439fc19 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.0.2-rc310.0',
+  version: '2.0.2',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 92c93e9d04..80b0a54ff5 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: '3.0.1-rc310.0',
+  version: '3.0.1',
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index c3a44c2b51..280fea958b 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: "2.0.2-rc310.0",
+  version: "2.0.2",
 });
 
 Package.onUse((api) => {
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 2bafaa4de3..a49d67488a 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: '0.20.3-rc310.0',
+  version: '0.20.3',
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index e3bc3f53ce..16d28e6e72 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.0.3-rc310.0",
+  version: "2.0.3",
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
index d5572836e1..91a790c4a4 100644
--- a/packages/non-core/coffeescript-compiler/package.js
+++ b/packages/non-core/coffeescript-compiler/package.js
@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '2.4.2-rc310.0'
+  version: '2.4.2'
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript/package.js b/packages/non-core/coffeescript/package.js
index 12692da66b..5d10541f80 100644
--- a/packages/non-core/coffeescript/package.js
+++ b/packages/non-core/coffeescript/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // so bumping the version of this package will be how they get newer versions
   // of `coffeescript-compiler`. If you change this, make sure to also update
   // ../coffeescript-compiler/package.js to match.
-  version: '2.7.2-rc310.0'
+  version: '2.7.2'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/non-core/mongo-decimal/.versions b/packages/non-core/mongo-decimal/.versions
index 905e39e321..8f0bdb4c53 100644
--- a/packages/non-core/mongo-decimal/.versions
+++ b/packages/non-core/mongo-decimal/.versions
@@ -1,5 +1,5 @@
 allow-deny@2.0.0
-babel-compiler@7.11.2-rc310.0
+babel-compiler@7.11.2
 babel-runtime@1.5.2
 base64@1.0.13
 binary-heap@1.0.12
@@ -8,12 +8,12 @@ callback-hook@1.6.0
 check@1.4.4
 core-runtime@1.0.0
 ddp@1.4.2
-ddp-client@3.0.3-rc310.0
+ddp-client@3.0.3
 ddp-common@1.4.4
-ddp-server@3.0.3-rc310.0
+ddp-server@3.0.3
 diff-sequence@1.1.3
 dynamic-import@0.7.4
-ecmascript@0.16.10-rc310.0
+ecmascript@0.16.10
 ecmascript-runtime@0.8.3
 ecmascript-runtime-client@0.12.2
 ecmascript-runtime-server@0.11.1
@@ -26,16 +26,16 @@ insecure@1.0.8
 inter-process-messaging@0.1.2
 local-test:mongo-decimal@0.2.0
 logging@1.3.5
-meteor@2.0.2-rc310.0
-minimongo@2.0.2-rc310.0
+meteor@2.0.2
+minimongo@2.0.2
 modern-browsers@0.1.11
-modules@0.20.3-rc310.0
+modules@0.20.3
 modules-runtime@0.13.2
-mongo@2.0.3-rc310.0
+mongo@2.0.3
 mongo-decimal@0.2.0
 mongo-dev-server@1.1.1
 mongo-id@1.0.9
-npm-mongo@6.10.0-rc310.0
+npm-mongo@6.10.0
 ordered-dict@1.2.0
 promise@1.0.0
 random@1.2.2
@@ -44,8 +44,8 @@ reload@1.3.2
 retry@1.1.1
 routepolicy@1.1.2
 socket-stream-client@0.5.3
-tinytest@1.3.1-rc310.0
+tinytest@1.3.1
 tracker@1.3.4
-typescript@5.6.3-rc310.0
-webapp@2.0.4-rc310.0
+typescript@5.6.3
+webapp@2.0.4
 webapp-hashing@1.1.2
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 39fe8d5056..cc7a598051 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "6.10.0-rc310.0",
+  version: "6.10.0",
   documentation: null,
 });
 
diff --git a/packages/roles/package.js b/packages/roles/package.js
index fe4e360b79..2ff58f3dee 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "1.0.0-rc310.0",
+  version: "1.0.0",
   name: "roles",
   documentation: null,
 });
diff --git a/packages/shell-server/package.js b/packages/shell-server/package.js
index 192730f7dd..3bdcb189ed 100644
--- a/packages/shell-server/package.js
+++ b/packages/shell-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "shell-server",
-  version: '0.6.1-rc310.0',
+  version: '0.6.1',
   summary: "Server-side component of the `meteor shell` command.",
   documentation: "README.md"
 });
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index bb90e58fc3..7d68b8e182 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: "2.0.2-rc310.0",
+  version: "2.0.2",
 });
 
 Npm.depends({
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 537d32d1d1..ebf1b6eff9 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Run tests noninteractively, with results going to the console.',
-  version: '2.0.1-rc310.0',
+  version: '2.0.1',
 });
 
 Package.onUse(function(api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 3a025f0aa4..e869b316ea 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.3.1-rc310.0',
+  version: '1.3.1',
 });
 
 Npm.depends({
diff --git a/packages/typescript/package.js b/packages/typescript/package.js
index fde0c53dcb..ea41a3604a 100644
--- a/packages/typescript/package.js
+++ b/packages/typescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'typescript',
-  version: '5.6.3-rc310.0',
+  version: '5.6.3',
   summary:
     'Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files',
   documentation: 'README.md',
diff --git a/packages/url/package.js b/packages/url/package.js
index 6391436715..6804f101d7 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "url",
-  version: '1.3.4',
+  version: '1.3.5',
   summary: "Isomorphic modern/legacy/Node polyfill for WHATWG URL/URLSearchParams",
   documentation: "README.md"
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 8b85fa4940..615b57d5b2 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.4-rc310.0",
+  version: "2.0.4",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index db3db5140f..504225e62c 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.0.4",
+  "version": "3.1",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"

From 06a148db0d7dff8afa076a64cba18fb4691b28e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 20 Nov 2024 18:02:51 +0100
Subject: [PATCH 0846/1140] update meteor-installer for 3.1

---
 npm-packages/meteor-installer/config.js         | 2 +-
 npm-packages/meteor-installer/package-lock.json | 4 ++--
 npm-packages/meteor-installer/package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js
index 4841caee3b..59915c2a56 100644
--- a/npm-packages/meteor-installer/config.js
+++ b/npm-packages/meteor-installer/config.js
@@ -1,7 +1,7 @@
 const os = require('os');
 const path = require('path');
 
-const METEOR_LATEST_VERSION = '3.1-rc.0';
+const METEOR_LATEST_VERSION = '3.1';
 const sudoUser = process.env.SUDO_USER || '';
 function isRoot() {
   return process.getuid && process.getuid() === 0;
diff --git a/npm-packages/meteor-installer/package-lock.json b/npm-packages/meteor-installer/package-lock.json
index bf3ff2945c..15a83f9214 100644
--- a/npm-packages/meteor-installer/package-lock.json
+++ b/npm-packages/meteor-installer/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor",
-      "version": "3.1.0-rc.1",
+      "version": "3.1.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json
index 62af0f53ea..a20d4735a0 100644
--- a/npm-packages/meteor-installer/package.json
+++ b/npm-packages/meteor-installer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0",
   "description": "Install Meteor",
   "main": "install.js",
   "scripts": {

From abd9fd1b59f5eae5ff790f6a9a787c5da29849ae Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 21 Nov 2024 10:52:35 -0300
Subject: [PATCH 0847/1140] DEV: Final touches in the script to generate the
 metadata for the versions

---
 .../docs/generators/meteor-versions/metadata.generated.js | 8 ++++----
 v3-docs/docs/generators/meteor-versions/script.js         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/v3-docs/docs/generators/meteor-versions/metadata.generated.js b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
index 16e81c5505..8b81886776 100644
--- a/v3-docs/docs/generators/meteor-versions/metadata.generated.js
+++ b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
@@ -2,19 +2,19 @@ export default {
   "versions": [
     {
       "version": "v3.0",
-      "url": "https://release-3.0.docs.meteor.com/"
+      "url": "https://release-3-0.docs.meteor.com/"
     },
     {
       "version": "v3.0.2",
-      "url": "https://release-3.0.2.docs.meteor.com/"
+      "url": "https://release-3-0-2.docs.meteor.com/"
     },
     {
       "version": "v3.0.3",
-      "url": "https://release-3.0.3.docs.meteor.com/"
+      "url": "https://release-3-0-3.docs.meteor.com/"
     },
     {
       "version": "v3.0.4",
-      "url": "https://release-3.0.4.docs.meteor.com/",
+      "url": "https://release-3-0-4.docs.meteor.com/",
       "isCurrent": true
     }
   ],
diff --git a/v3-docs/docs/generators/meteor-versions/script.js b/v3-docs/docs/generators/meteor-versions/script.js
index ee551ef463..ad3900fa9e 100644
--- a/v3-docs/docs/generators/meteor-versions/script.js
+++ b/v3-docs/docs/generators/meteor-versions/script.js
@@ -9,14 +9,14 @@ exports.generateMeteorVersions = async () => {
   const files = await fs.readdir("./generators/changelog/versions", "utf8");
 
   const versions = files
-    .filter((f) => f !== "99999-generated-code-warning.md")
+    .filter((f) => f.startsWith("3."))
     .map((f) => f.replace(".md", ""))
     .filter((v) => v !== "3.0.1") // there is no 3.0.1 version
-    .map((v) => (v.endsWith(".0") ? v.slice(0, -2) : v)) // remove .0 from versions
+    .map((v) => (v === "3.0.0" ? v.slice(0, -2) : v)) // 3.0 doesn't have a patch version in the URL
     .map((version) => {
       return {
         version: `v${version}`,
-        url: getDocsUrl(`${version}`),
+        url: getDocsUrl(`${version}`.replaceAll(".", "-")),
       };
     })
     .map((v, index, arr) => {

From 7e20c02f0e09b2b22af6680bc9fc8def61126108 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 21 Nov 2024 14:16:43 -0300
Subject: [PATCH 0848/1140] Docs: solve mismatch issue

---
 v3-docs/docs/.vitepress/theme/Layout.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/v3-docs/docs/.vitepress/theme/Layout.vue b/v3-docs/docs/.vitepress/theme/Layout.vue
index e240ef669f..0c1de9f573 100644
--- a/v3-docs/docs/.vitepress/theme/Layout.vue
+++ b/v3-docs/docs/.vitepress/theme/Layout.vue
@@ -3,7 +3,7 @@ import NotFound from './NotFound.vue'
 import GoToLatest from './GoToLatest.vue'
 import { useData, useRouter } from 'vitepress'
 import DefaultTheme from 'vitepress/theme'
-import { nextTick, provide } from 'vue'
+import { nextTick, onMounted, provide, ref } from 'vue'
 import { redirect } from './redirects/script';
 const { isDark } = useData()
 const router = useRouter()
@@ -50,7 +50,13 @@ provide('toggle-appearance', async ({ clientX: x, clientY: y }: MouseEvent) => {
   )
 })
 
-const inLatestDeployedDoc = () => isClient && window.location.href.startsWith("https://docs.meteor.com/")
+
+const shouldShowGoToLatest = ref(false);
+
+onMounted(() => {
+  shouldShowGoToLatest.value = isClient && window.location.href.startsWith("https://docs.meteor.com/")
+});
+
 </script>
 
 <template>
@@ -58,7 +64,7 @@ const inLatestDeployedDoc = () => isClient && window.location.href.startsWith("h
     <template #not-found>
       <NotFound />
     </template>
-    <template #doc-before v-if="!inLatestDeployedDoc()">
+    <template #doc-before v-if="!shouldShowGoToLatest">
       <GoToLatest />
     </template>
   </DefaultTheme.Layout>

From b3c39c478f67e858528991d86adcbb5557818b9c Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 21 Nov 2024 14:19:37 -0300
Subject: [PATCH 0849/1140] DEV: change variable name to `isLatestVersion`

---
 v3-docs/docs/.vitepress/theme/Layout.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v3-docs/docs/.vitepress/theme/Layout.vue b/v3-docs/docs/.vitepress/theme/Layout.vue
index 0c1de9f573..6071c76dea 100644
--- a/v3-docs/docs/.vitepress/theme/Layout.vue
+++ b/v3-docs/docs/.vitepress/theme/Layout.vue
@@ -51,10 +51,10 @@ provide('toggle-appearance', async ({ clientX: x, clientY: y }: MouseEvent) => {
 })
 
 
-const shouldShowGoToLatest = ref(false);
+const isLatestVersion = ref(false);
 
 onMounted(() => {
-  shouldShowGoToLatest.value = isClient && window.location.href.startsWith("https://docs.meteor.com/")
+  isLatestVersion.value = isClient && window.location.href.startsWith("https://docs.meteor.com/")
 });
 
 </script>
@@ -64,7 +64,7 @@ onMounted(() => {
     <template #not-found>
       <NotFound />
     </template>
-    <template #doc-before v-if="!shouldShowGoToLatest">
+    <template #doc-before v-if="!isLatestVersion">
       <GoToLatest />
     </template>
   </DefaultTheme.Layout>

From 281fb85c9b10805d07d98e909e9b2616ff8f9453 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 21 Nov 2024 15:54:56 -0400
Subject: [PATCH 0850/1140] update autogenerated files

---
 v3-docs/docs/api/packages-listing.md          |   2 +
 .../meteor-versions/metadata.generated.js     |   8 +-
 v3-docs/docs/history.md                       | 170 +++++++-----------
 3 files changed, 69 insertions(+), 111 deletions(-)

diff --git a/v3-docs/docs/api/packages-listing.md b/v3-docs/docs/api/packages-listing.md
index a113a10852..40d21881ff 100644
--- a/v3-docs/docs/api/packages-listing.md
+++ b/v3-docs/docs/api/packages-listing.md
@@ -45,6 +45,7 @@
 ### [callback-hook](https://github.com/meteor/meteor/tree/devel/packages/callback-hook) {#callback-hook}
 ### [check](https://github.com/meteor/meteor/tree/devel/packages/check) {#check}
 ### [constraint-solver](https://github.com/meteor/meteor/tree/devel/packages/constraint-solver) {#constraint-solver}
+### [context](https://github.com/meteor/meteor/tree/devel/packages/context) {#context}
 ### [core-runtime](https://github.com/meteor/meteor/tree/devel/packages/core-runtime) {#core-runtime}
 ### [crosswalk](https://github.com/meteor/meteor/tree/devel/packages/crosswalk) {#crosswalk}
 ### [ddp](https://github.com/meteor/meteor/tree/devel/packages/ddp) {#ddp}
@@ -122,6 +123,7 @@
 ### [reload](https://github.com/meteor/meteor/tree/devel/packages/reload) {#reload}
 ### [reload-safetybelt](https://github.com/meteor/meteor/tree/devel/packages/reload-safetybelt) {#reload-safetybelt}
 ### [retry](https://github.com/meteor/meteor/tree/devel/packages/retry) {#retry}
+### [roles](https://github.com/meteor/meteor/tree/devel/packages/roles) {#roles}
 ### [routepolicy](https://github.com/meteor/meteor/tree/devel/packages/routepolicy) {#routepolicy}
 ### [server-render](https://github.com/meteor/meteor/tree/devel/packages/server-render) {#server-render}
 ### [service-configuration](https://github.com/meteor/meteor/tree/devel/packages/service-configuration) {#service-configuration}
diff --git a/v3-docs/docs/generators/meteor-versions/metadata.generated.js b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
index 8b81886776..7c96bb4029 100644
--- a/v3-docs/docs/generators/meteor-versions/metadata.generated.js
+++ b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
@@ -14,9 +14,13 @@ export default {
     },
     {
       "version": "v3.0.4",
-      "url": "https://release-3-0-4.docs.meteor.com/",
+      "url": "https://release-3-0-4.docs.meteor.com/"
+    },
+    {
+      "version": "v3.1.0",
+      "url": "https://release-3-1-0.docs.meteor.com/",
       "isCurrent": true
     }
   ],
-  "currentVersion": "v3.0.4"
+  "currentVersion": "v3.1.0"
 }
\ No newline at end of file
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 0d71d13db3..5a8c036af9 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -16,11 +16,23 @@ This is a complete history of changes for Meteor releases.
 
 ### Highlights
 
-N/A
+- Upgrade to Node v22
+- Upgrade Mongo Driver to v6
+- Upgrade Express to v5
+- HMR performance improvements
+- Bring the `roles` package into the core
+- Solve remaining issues with Top Level Await and Reify
+- Refactor part of the real-time code in the `mongo` package into TypeScript
+- Deprecate `underscore` and eliminate it from packages
+- Fix Cordova dependency issues
+- Simplify Meteor.EnvironmentVariable and make sure it works in all cases
+- Stop using Rosetta for development MongoDB on Apple Silicon
+- Test improvements
+- Bump `http` package to 3.0.0
 
 #### Breaking Changes
 
-N/A
+- Express is now at v5 and some it's APIs have changed.
 
 ####  Internal API changes
 
@@ -36,124 +48,64 @@ meteor update --release 3.1.0
 
 ```
 
+Make sure to migrate userland code to use the new Express APIs:
+
+https://expressjs.com/en/guide/migrating-5.html
+
+The MongoDB Node.js driver implemented a significant breaking change regarding operation handling. Applications leveraging `rawCollection()` or `rawDatabase()` methods must now utilize Promise-based syntax exclusively, as the callback-pattern API has been deprecated and removed. This modification affects all direct MongoDB operations previously using callback functions.
 
 
-#### Meteor Version Release
+#### Bumped Meteor Packages
 
-N/A
-
-#### Special thanks to
-
-N/A
-## v3.0.4, 2024-10-15
-
-### Highlights
-
-- Node 20.18.0 & Typescript 5.6.2
-- Updated webapp dependencies.
-- DDP-server and DDP-client removed underscore
-- Remove dependencies on Blaze packages when using static-html
-- Fix Cordova on Windows
-- Fix Cordova build on using plugins describing dependencies
-- Various Windows specific fixes
-
-#### Breaking Changes
-
-N/A
-
-####  Internal API changes
-
-N/A
-
-#### Migration Steps
-
-Please run the following command to update your project:
-
-```bash
-
-meteor update --release 3.0.4
-
-```
-
-#### Meteor Version Release
-
-* `Bumped packages`:
-  - accounts-base@3.0.3                
-  - babel-compiler@7.11.1              
-  - caching-compiler@2.0.1             
-  - check@1.4.4                        
-  - ddp-client@3.0.2                   
-  - ddp-server@3.0.2                   
-  - ecmascript-runtime@0.8.3           
-  - modules@0.20.2                     
-  - static-html-tools@1.0.0            
-  - static-html@1.4.0                  
-  - url@1.3.4                          
-  - webapp@2.0.3                       
-  - meteor-tool@3.0.4
-
-#### Special thanks to
-N/A
-## v3.0.3, 2024-09-11
-
-### Highlights
-
-- Fixed `Meteor.userId` only being invoked with `bindEnvironment`.
-- Updated to Node `20.17.x`.
-- Fixed an issue where `meteor --open` opens the browser before the app is started.
-- Investigated and addressed the error when installing the `jam:method` package.
-- Improved the message for new available versions when running an app.
-- Updated the documentation link inside `install.sh`.
-- Resolved the issue where subscriptions stopped after a parameter change.
-- Added MongoDB connection telemetry.
-- Bumped the `email` package to prevent update errors.
-- Cordova package updates
-
-#### Breaking Changes
-
-N/A
-
-####  Internal API changes
-
-- Some internal changes to how async contexts are handled, ensuring better performance and garbage collection.
-
-#### Migration Steps
-
-Please run the following command to update your project:
-
-```bash
-
-meteor update --release 3.0.3
-
-```
-
-If you've had your Meteor installation for over a year, we suggest reinstalling it to avoid any package installation issues. You can do this by running a few quick commands:
-
-```bash
-npx meteor uninstall // or rm -rf ~/.meteor
-npx meteor
-```
+- babel-compiler@7.11.2-rc310.0
+- boilerplate-generator-tests@1.5.3-rc310.0
+- ddp-client@3.0.3-rc310.0
+- ddp-server@3.0.3-rc310.0
+- http@3.0.0
+- ecmascript@0.16.10-rc310.0
+- email@3.1.1-rc310.0
+- meteor-tool@3.1.0-rc310.0
+- meteor@2.0.2-rc310.0
+- minifier-js@3.0.1-rc310.0
+- minimongo@2.0.2-rc310.0
+- modules@0.20.3-rc310.0
+- mongo@2.0.3-rc310.0
+- coffeescript-compiler@2.4.2-rc310.0
+- coffeescript@2.7.2-rc310.0
+- mongo-decimal@0.1.6-rc310.0
+- npm-mongo@4.17.3-rc310.0
+- shell-server@0.6.1-rc310.0
+- test-helpers@2.0.2-rc310.0
+- test-in-console@2.0.1-rc310.0
+- tinytest@1.3.1-rc310.0
+- typescript@5.6.3-rc310.0
+- webapp@2.0.4-rc310.0
 
 
+#### Bumped NPM Packages
 
-#### Meteor Version Release
-
-* `Bumped packages`:
-  - accounts-base@3.0.2
-  - accounts-password@3.0.2
-  - email@3.1.0
-  - mongo@2.0.2
+- meteor-babel@7.20.1
+- meteor-installer@3.1.0-beta.1
+- meteor-node-stubs@1.2.12
 
 
 #### Special thanks to
 
-- [@ayewo](https://github.com/ayewo).
-- [@denihs](https://github.com/denihs).
-- [@harryadel](https://github.com/harryadel).
-- [@kbarr1212](https://github.com/kbarr1212).
-- [@leonardoventurini](https://github.com/leonardoventurini).
-- [@nachocodoner](https://github.com/nachocodoner).
+✨✨✨
 
+- [@denihs](https://github.com/denihs)
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@leonardoventurini](https://github.com/leonardoventurini)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+- [@zodern](https://github.com/zodern)
+- [@harry97](https://github.com/harry97)
+- [@permb](https://github.com/permb)
+- [@9Morello](https://github.com/9Morello)
+- [@wreiske](https://github.com/wreiske)
+- [@MarcoTribuz](https://github.com/MarcoTribuz)
+- [@MeteorCoder](https://forums.meteor.com/u/meteorcoder/summary)
+
+✨✨✨
 ## v3.0.4, 2024-10-15
 
 ### Highlights

From e6c97998bde0dd1791ea72c4c0dc090218c448e5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 21 Nov 2024 15:57:33 -0400
Subject: [PATCH 0851/1140] update history

---
 .../generators/changelog/versions/3.1.0.md    | 50 ++++++++++---------
 v3-docs/docs/history.md                       | 50 ++++++++++---------
 2 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index 04264a16b6..45ed9504f1 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -1,4 +1,4 @@
-## v3.1.0, 2024-xx-xx
+## v3.1.0, 2024-11-20
 
 ### Highlights
 
@@ -43,35 +43,37 @@ The MongoDB Node.js driver implemented a significant breaking change regarding o
 
 #### Bumped Meteor Packages
 
-- babel-compiler@7.11.2-rc310.0
-- boilerplate-generator-tests@1.5.3-rc310.0
-- ddp-client@3.0.3-rc310.0
-- ddp-server@3.0.3-rc310.0
+- accounts-password@3.0.3
+- babel-compiler@7.11.2
+- boilerplate-generator-tests@1.5.3
+- ddp-client@3.0.3
+- ddp-server@3.0.3
 - http@3.0.0
-- ecmascript@0.16.10-rc310.0
-- email@3.1.1-rc310.0
-- meteor-tool@3.1.0-rc310.0
-- meteor@2.0.2-rc310.0
-- minifier-js@3.0.1-rc310.0
-- minimongo@2.0.2-rc310.0
-- modules@0.20.3-rc310.0
-- mongo@2.0.3-rc310.0
-- coffeescript-compiler@2.4.2-rc310.0
-- coffeescript@2.7.2-rc310.0
-- mongo-decimal@0.1.6-rc310.0
-- npm-mongo@4.17.3-rc310.0
-- shell-server@0.6.1-rc310.0
-- test-helpers@2.0.2-rc310.0
-- test-in-console@2.0.1-rc310.0
-- tinytest@1.3.1-rc310.0
-- typescript@5.6.3-rc310.0
-- webapp@2.0.4-rc310.0
+- ecmascript@0.16.10
+- email@3.1.1
+- meteor-tool@3.1.0
+- meteor@2.0.2
+- minifier-js@3.0.1
+- minimongo@2.0.2
+- modules@0.20.3
+- mongo@2.0.3
+- coffeescript-compiler@2.4.2
+- coffeescript@2.7.2
+- mongo-decimal@0.2.0
+- npm-mongo@6.10.0
+- shell-server@0.6.1
+- test-helpers@2.0.2
+- test-in-console@2.0.1
+- tinytest@1.3.1
+- typescript@5.6.3
+- url@1.3.5
+- webapp@2.0.4
 
 
 #### Bumped NPM Packages
 
 - meteor-babel@7.20.1
-- meteor-installer@3.1.0-beta.1
+- meteor-installer@3.1.0
 - meteor-node-stubs@1.2.12
 
 
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 5a8c036af9..cd753fa4d1 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -12,7 +12,7 @@ This is a complete history of changes for Meteor releases.
 
 
 
-## v3.1.0, 2024-xx-xx
+## v3.1.0, 2024-11-20
 
 ### Highlights
 
@@ -57,35 +57,37 @@ The MongoDB Node.js driver implemented a significant breaking change regarding o
 
 #### Bumped Meteor Packages
 
-- babel-compiler@7.11.2-rc310.0
-- boilerplate-generator-tests@1.5.3-rc310.0
-- ddp-client@3.0.3-rc310.0
-- ddp-server@3.0.3-rc310.0
+- accounts-password@3.0.3
+- babel-compiler@7.11.2
+- boilerplate-generator-tests@1.5.3
+- ddp-client@3.0.3
+- ddp-server@3.0.3
 - http@3.0.0
-- ecmascript@0.16.10-rc310.0
-- email@3.1.1-rc310.0
-- meteor-tool@3.1.0-rc310.0
-- meteor@2.0.2-rc310.0
-- minifier-js@3.0.1-rc310.0
-- minimongo@2.0.2-rc310.0
-- modules@0.20.3-rc310.0
-- mongo@2.0.3-rc310.0
-- coffeescript-compiler@2.4.2-rc310.0
-- coffeescript@2.7.2-rc310.0
-- mongo-decimal@0.1.6-rc310.0
-- npm-mongo@4.17.3-rc310.0
-- shell-server@0.6.1-rc310.0
-- test-helpers@2.0.2-rc310.0
-- test-in-console@2.0.1-rc310.0
-- tinytest@1.3.1-rc310.0
-- typescript@5.6.3-rc310.0
-- webapp@2.0.4-rc310.0
+- ecmascript@0.16.10
+- email@3.1.1
+- meteor-tool@3.1.0
+- meteor@2.0.2
+- minifier-js@3.0.1
+- minimongo@2.0.2
+- modules@0.20.3
+- mongo@2.0.3
+- coffeescript-compiler@2.4.2
+- coffeescript@2.7.2
+- mongo-decimal@0.2.0
+- npm-mongo@6.10.0
+- shell-server@0.6.1
+- test-helpers@2.0.2
+- test-in-console@2.0.1
+- tinytest@1.3.1
+- typescript@5.6.3
+- url@1.3.5
+- webapp@2.0.4
 
 
 #### Bumped NPM Packages
 
 - meteor-babel@7.20.1
-- meteor-installer@3.1.0-beta.1
+- meteor-installer@3.1.0
 - meteor-node-stubs@1.2.12
 
 

From 8135a48cc79e663267a8b9bda55afb90aa8e84ee Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 21 Nov 2024 15:59:47 -0400
Subject: [PATCH 0852/1140] start release 3.1.1


From 588c0adbfc377f1d4168719642b6148c1c2bd25c Mon Sep 17 00:00:00 2001
From: William Reiske <wreiske@mieweb.com>
Date: Thu, 21 Nov 2024 13:10:00 -0700
Subject: [PATCH 0853/1140] Update history.md to include proper release command

---
 v3-docs/docs/history.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index cd753fa4d1..8ae1cb1c32 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -44,7 +44,7 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.1.0
+meteor update --release 3.1
 
 ```
 

From a9ecfa9ca57097f799b319fc9b091b49b8794bee Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Thu, 21 Nov 2024 16:14:47 -0400
Subject: [PATCH 0854/1140] fix command

---
 v3-docs/docs/generators/changelog/versions/3.1.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
index 45ed9504f1..fa1bc45e01 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -30,7 +30,7 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.1.0
+meteor update --release 3.1
 
 ```
 

From e7038de49d282504711af6b7cc1b218291d522e6 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 21 Nov 2024 19:28:34 -0300
Subject: [PATCH 0855/1140] DOCS: solve flicker issue

---
 v3-docs/docs/.vitepress/theme/Layout.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/.vitepress/theme/Layout.vue b/v3-docs/docs/.vitepress/theme/Layout.vue
index 6071c76dea..b2f5460b04 100644
--- a/v3-docs/docs/.vitepress/theme/Layout.vue
+++ b/v3-docs/docs/.vitepress/theme/Layout.vue
@@ -3,7 +3,7 @@ import NotFound from './NotFound.vue'
 import GoToLatest from './GoToLatest.vue'
 import { useData, useRouter } from 'vitepress'
 import DefaultTheme from 'vitepress/theme'
-import { nextTick, onMounted, provide, ref } from 'vue'
+import { nextTick, provide, ref, onBeforeMount } from 'vue'
 import { redirect } from './redirects/script';
 const { isDark } = useData()
 const router = useRouter()
@@ -53,7 +53,7 @@ provide('toggle-appearance', async ({ clientX: x, clientY: y }: MouseEvent) => {
 
 const isLatestVersion = ref(false);
 
-onMounted(() => {
+onBeforeMount(() => {
   isLatestVersion.value = isClient && window.location.href.startsWith("https://docs.meteor.com/")
 });
 

From ce5a8f126a305494569619b469dd167fb7dfe2a4 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 22 Nov 2024 08:56:15 -0300
Subject: [PATCH 0856/1140] DOCS: flip the if check and move on if mounted back

---
 v3-docs/docs/.vitepress/theme/Layout.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v3-docs/docs/.vitepress/theme/Layout.vue b/v3-docs/docs/.vitepress/theme/Layout.vue
index b2f5460b04..4b21e79933 100644
--- a/v3-docs/docs/.vitepress/theme/Layout.vue
+++ b/v3-docs/docs/.vitepress/theme/Layout.vue
@@ -3,7 +3,7 @@ import NotFound from './NotFound.vue'
 import GoToLatest from './GoToLatest.vue'
 import { useData, useRouter } from 'vitepress'
 import DefaultTheme from 'vitepress/theme'
-import { nextTick, provide, ref, onBeforeMount } from 'vue'
+import { nextTick, provide, ref, onMounted } from 'vue'
 import { redirect } from './redirects/script';
 const { isDark } = useData()
 const router = useRouter()
@@ -51,9 +51,9 @@ provide('toggle-appearance', async ({ clientX: x, clientY: y }: MouseEvent) => {
 })
 
 
-const isLatestVersion = ref(false);
+const isLatestVersion = ref(true);
 
-onBeforeMount(() => {
+onMounted(() => {
   isLatestVersion.value = isClient && window.location.href.startsWith("https://docs.meteor.com/")
 });
 

From 2a7fd32e599c57147000720b45393a05d8488e36 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 22 Nov 2024 09:01:43 -0300
Subject: [PATCH 0857/1140] DEV: update generator to check for changes in the
 meteor tool version

---
 v3-docs/v3-migration-docs/index.md              | 6 +++---
 v3-docs/v3-migration-docs/versions-generator.js | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index aff0df2510..4aa566b6fb 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,7 +1,7 @@
 ---
-meteor_version: 3.0.4
-node_version: 20.18.0
-npm_version: 10.8.2
+meteor_version: 3.1.0
+node_version: 22.11.0
+npm_version: 10.9.0
 ---
 # Meteor 3.0 Migration Guide
 
diff --git a/v3-docs/v3-migration-docs/versions-generator.js b/v3-docs/v3-migration-docs/versions-generator.js
index ddbe2579c1..8573648b46 100644
--- a/v3-docs/v3-migration-docs/versions-generator.js
+++ b/v3-docs/v3-migration-docs/versions-generator.js
@@ -9,7 +9,11 @@ const meteorToolLink =
 const getMeteorVersionFromDevel = async () => {
   const response = await fetch(meteorToolLink);
   const text = await response.text();
-  const version = text.match(/version: '(.*)'/)[1];
+  const version = text
+    .match(/version: (.*)/)[1]
+    .replaceAll("'", "")
+    .replaceAll('"', "")
+    .replaceAll(",", "");
   return version;
 };
 

From 216d12cf576404ebbace6979f60915327c9f54d7 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 25 Nov 2024 11:21:27 -0400
Subject: [PATCH 0858/1140] add summarization command

---
 .envrc | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.envrc b/.envrc
index b1f3cbd76f..f1b1524541 100644
--- a/.envrc
+++ b/.envrc
@@ -55,3 +55,19 @@ function @docs-start {
 function @docs-migration-start {
   npm run docs:dev --prefix "$ROOT_DIR/v3-docs/v3-migration-docs"
 }
+
+function @get-changes {
+  git diff --numstat HEAD~1 HEAD | awk '($1 + $2) <= 5000 {print $3}'
+}
+
+function @summarize-changes {
+  changes=$(@get-changes)
+
+  if [ -n "$changes" ]; then
+    changes=$(git diff HEAD~1 HEAD -- $(echo "$changes" | tr '\n' ' '))
+  else
+    changes=$(git diff HEAD~1 HEAD)
+  fi
+
+  echo "$changes" | llm -s "Summarize the following changes in a few sentences:"
+}

From 06ad0b278447fa2c4d3c51677d44c300f3783aeb Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 25 Nov 2024 12:16:39 -0400
Subject: [PATCH 0859/1140] make asynchronous queue name backwards compatible

---
 packages/meteor/asynchronous_queue.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/meteor/asynchronous_queue.js b/packages/meteor/asynchronous_queue.js
index fe1a30c783..ba5bfd2ca5 100644
--- a/packages/meteor/asynchronous_queue.js
+++ b/packages/meteor/asynchronous_queue.js
@@ -151,4 +151,9 @@ class AsynchronousQueue {
   }
 }
 
-Meteor._AsynchronousQueue = AsynchronousQueue;
\ No newline at end of file
+Meteor._AsynchronousQueue = AsynchronousQueue;
+
+/**
+ * Backwards compatibility
+ */
+Meteor._SynchronousQueue = AsynchronousQueue;
\ No newline at end of file

From 6a1a73e285931c036f9128c1f1899efe1db8031e Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 25 Nov 2024 15:25:41 -0400
Subject: [PATCH 0860/1140] add allow deny test

---
 packages/ddp-client/package.js               |  1 +
 packages/ddp-client/test/allow_deny_setup.js | 17 ++++++
 packages/ddp-client/test/livedata_tests.js   | 64 +++++++++++++++++++-
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 packages/ddp-client/test/allow_deny_setup.js

diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index e0cb8bffe5..7ccb3cbec4 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -67,4 +67,5 @@ Package.onTest((api) => {
   api.addFiles("test/async_stubs/client.js", "client");
   api.addFiles("test/async_stubs/server_setup.js", "server");
   api.addFiles("test/livedata_callAsync_tests.js");
+  api.addFiles("test/allow_deny_setup.js");
 });
diff --git a/packages/ddp-client/test/allow_deny_setup.js b/packages/ddp-client/test/allow_deny_setup.js
new file mode 100644
index 0000000000..ed0eca4b25
--- /dev/null
+++ b/packages/ddp-client/test/allow_deny_setup.js
@@ -0,0 +1,17 @@
+export const FlickerCollectionName = `allow_deny_flicker`;
+export const FlickerCollection = new Mongo.Collection(FlickerCollectionName);
+
+if (Meteor.isServer) {
+  FlickerCollection.allow({
+    insert: () => true,
+    update: () => true,
+    remove: () => true,
+    insertAsync: () => true,
+    updateAsync: () => true,
+    removeAsync: () => true,
+  });
+
+  Meteor.publish(`pub-${FlickerCollectionName}`, function() {
+    return FlickerCollection.find();
+  });
+}
\ No newline at end of file
diff --git a/packages/ddp-client/test/livedata_tests.js b/packages/ddp-client/test/livedata_tests.js
index d297aafe58..1b57ecd4b3 100644
--- a/packages/ddp-client/test/livedata_tests.js
+++ b/packages/ddp-client/test/livedata_tests.js
@@ -1,5 +1,7 @@
-import { DDP } from '../common/namespace.js';
+import { Meteor } from 'meteor/meteor';
 import { Connection } from '../common/livedata_connection.js';
+import { DDP } from '../common/namespace.js';
+import { FlickerCollection, FlickerCollectionName } from './allow_deny_setup.js';
 
 const callWhenSubReady = async (subName, handle, cb = () => {}) => {
   let control = 0;
@@ -1295,6 +1297,66 @@ if (Meteor.isClient) {
   });
 }
 
+if (Meteor.isClient) {
+  testAsyncMulti('livedata - allow/deny - no flicker with isomorphic calls', [
+    async function(test, expect) {
+      const docId = await FlickerCollection.insertAsync({
+        value: ['initial'],
+        test: test.runId()
+      });
+
+      let changeCount = 0;
+      const messages = [];
+
+      const handle = await FlickerCollection.find({ _id: docId }).observeChanges({
+        added(id, fields) {
+          messages.push(['added', id, fields]);
+        },
+        changed(id, fields) {
+          changeCount++;
+          messages.push(['changed', id, fields]);
+          
+          if (changeCount > 1) {
+            test.fail('Multiple changes detected - flicker occurred');
+          }
+
+          test.equal(fields.value.length, 2);
+          test.isTrue(fields.value.includes('updated'));
+        }
+      });
+
+      const sub = Meteor.subscribe(`pub-${FlickerCollectionName}`);
+      
+      await new Promise(resolve => {
+        const checkReady = setInterval(() => {
+          console.log('sub.ready()', sub.ready());
+          if (sub.ready()) {
+            clearInterval(checkReady);
+            resolve();
+          }
+        }, 10);
+      });
+
+      await FlickerCollection.updateAsync(docId, {
+        $addToSet: {
+          value: 'updated'
+        }
+      });
+
+      await Meteor._sleepForMs(200);
+
+      handle.stop();
+      sub.stop();
+      
+      test.equal(changeCount, 1, 'Expected exactly one change notification');
+      
+      test.equal(messages.length, 2);
+      test.equal(messages[0][0], 'added');
+      test.equal(messages[1][0], 'changed');
+    }
+  ]);
+}
+
 // TODO [FIBERS] - check if this still makes sense to have
 
 //  Tinytest.addAsync('livedata - isAsync call', async function (test) {

From 29caff3410a77945fe429542238a4604f4b85330 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 26 Nov 2024 10:35:11 -0400
Subject: [PATCH 0861/1140] use original logic instead of the one with lru map

---
 packages/ddp-server/dummy_document_view.ts    |  40 +++
 packages/ddp-server/livedata_server.js        |  21 +-
 packages/ddp-server/package.js                |   3 +-
 .../ddp-server/session_collection_view.ts     | 245 ++++++++----------
 packages/ddp-server/session_document_view.ts  | 117 +++++----
 5 files changed, 213 insertions(+), 213 deletions(-)
 create mode 100644 packages/ddp-server/dummy_document_view.ts

diff --git a/packages/ddp-server/dummy_document_view.ts b/packages/ddp-server/dummy_document_view.ts
new file mode 100644
index 0000000000..f87f0839aa
--- /dev/null
+++ b/packages/ddp-server/dummy_document_view.ts
@@ -0,0 +1,40 @@
+interface ChangeCollector {
+  [key: string]: any;
+}
+
+interface DataEntry {
+  subscriptionHandle: string;
+  value: any;
+}
+
+export class DummyDocumentView {
+  private existsIn: Set<string>;
+  private dataByKey: Map<string, DataEntry[]>;
+
+  constructor() {
+    this.existsIn = new Set<string>(); // set of subscriptionHandle
+    this.dataByKey = new Map<string, DataEntry[]>(); // key-> [ {subscriptionHandle, value} by precedence]
+  }
+
+  getFields(): Record<string, never> {
+    return {};
+  }
+
+  clearField(
+    subscriptionHandle: string, 
+    key: string, 
+    changeCollector: ChangeCollector
+  ): void {
+    changeCollector[key] = undefined;
+  }
+
+  changeField(
+    subscriptionHandle: string,
+    key: string,
+    value: any,
+    changeCollector: ChangeCollector,
+    isAdd?: boolean
+  ): void {
+    changeCollector[key] = value;
+  }
+}
\ No newline at end of file
diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index 75406778b8..d9b49a164c 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -1,6 +1,6 @@
 import isEmpty from 'lodash.isempty';
-import isString from 'lodash.isstring';
 import isObject from 'lodash.isobject';
+import isString from 'lodash.isstring';
 import { SessionCollectionView } from './session_collection_view';
 import { SessionDocumentView } from './session_document_view';
 
@@ -57,26 +57,7 @@ DDPServer.publicationStrategies = publicationStrategies;
 // Session and Subscription are file scope. For now, until we freeze
 // the interface, Server is package scope (in the future it should be
 // exported).
-var DummyDocumentView = function () {
-  var self = this;
-  self.existsIn = new Set(); // set of subscriptionHandle
-  self.dataByKey = new Map(); // key-> [ {subscriptionHandle, value} by precedence]
-};
 
-Object.assign(DummyDocumentView.prototype, {
-  getFields: function () {
-    return {}
-  },
-
-  clearField: function (subscriptionHandle, key, changeCollector) {
-    changeCollector[key] = undefined
-  },
-
-  changeField: function (subscriptionHandle, key, value,
-                         changeCollector, isAdd) {
-    changeCollector[key] = value
-  }
-});
 
 DDPServer._SessionDocumentView = SessionDocumentView;
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 8f72e3b8e2..e9aadfc9e4 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -10,8 +10,7 @@ Npm.depends({
   "lodash.once": "4.1.1",
   "lodash.isempty": "4.4.0",
   "lodash.isstring": "4.0.1",
-  "lodash.isobject": "3.0.2",
-  "lru_map": '0.4.1'
+  "lodash.isobject": "3.0.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ddp-server/session_collection_view.ts b/packages/ddp-server/session_collection_view.ts
index add76cda85..6e5c4c7533 100644
--- a/packages/ddp-server/session_collection_view.ts
+++ b/packages/ddp-server/session_collection_view.ts
@@ -1,77 +1,114 @@
-import { SessionDocumentView } from './session_document_view';
-import { LRUMap } from 'lru_map'
-import isEmpty from 'lodash.isempty';
+import { DummyDocumentView } from "./dummy_document_view";
+import { SessionDocumentView } from "./session_document_view";
+
+interface SessionCallbacks {
+  added: (collectionName: string, id: string, fields: Record<string, any>) => void;
+  changed: (collectionName: string, id: string, fields: Record<string, any>) => void;
+  removed: (collectionName: string, id: string) => void;
+}
+
+interface DiffSequence {
+  diffMaps: (
+    previous: Map<string, DocumentView>,
+    current: Map<string, DocumentView>,
+    callbacks: {
+      both: (id: string, prev: DocumentView, now: DocumentView) => void;
+      rightOnly: (id: string, now: DocumentView) => void;
+      leftOnly: (id: string, prev: DocumentView) => void;
+    }
+  ) => void;
+  diffObjects: (
+    previous: Record<string, any>,
+    current: Record<string, any>,
+    callbacks: {
+      both: (key: string, prev: any, now: any) => void;
+      rightOnly: (key: string, now: any) => void;
+      leftOnly: (key: string, prev: any) => void;
+    }
+  ) => void;
+}
+
+interface DocumentView {
+  existsIn: Set<string>;
+  dataByKey: Map<string, any>;
+  getFields: () => Record<string, any>;
+  changeField: (
+    subscriptionHandle: string,
+    key: string,
+    value: any,
+    changeCollector: Record<string, any>,
+    isAdd?: boolean
+  ) => void;
+  clearField: (
+    subscriptionHandle: string,
+    key: string,
+    changeCollector: Record<string, any>
+  ) => void;
+}
 
-/**
- * Represents a client's view of documents within a single collection
- * @class SessionCollectionView
- */
 export class SessionCollectionView {
   private readonly collectionName: string;
+  private readonly documents: Map<string, DocumentView>;
   private readonly callbacks: SessionCallbacks;
-  private readonly documents: LRUMap<string, SessionDocumentView>;
-  private readonly options: ViewOptions;
 
   /**
-   * @param collectionName - Name of the collection this view represents
-   * @param callbacks - Callbacks for document changes (added/changed/removed)
-   * @param options - Configuration options for the view
+   * Represents a client's view of a single collection
+   * @param collectionName - Name of the collection it represents
+   * @param sessionCallbacks - The callbacks for added, changed, removed
    */
-  constructor(
-    collectionName: string,
-    callbacks: SessionCallbacks,
-    options: ViewOptions = {}
-  ) {
+  constructor(collectionName: string, sessionCallbacks: SessionCallbacks) {
     this.collectionName = collectionName;
-    this.callbacks = callbacks;
-    this.options = {
-      maxDocuments: options.maxDocuments || 10000,
-      documentTTL: options.documentTTL || 3600000, // 1 hour in ms
-      cleanupInterval: options.cleanupInterval || 300000 // 5 minutes in ms
-    };
-
-    // Use LRU cache with max size limit
-    this.documents = new LRUMap<string, SessionDocumentView>(this.options.maxDocuments);
-
-    // Start periodic cleanup
-    this.startCleanup();
+    this.documents = new Map();
+    this.callbacks = sessionCallbacks;
   }
 
-  /**
-   * Periodically removes stale documents and frees memory
-   * @private
-   */
-  private startCleanup(): void {
-    const cleanup = (): void => {
-      const now = Date.now();
-      this.documents.forEach((doc, id) => {
-        if (now - doc.lastAccessed > this.options.documentTTL) {
-          this.documents.delete(id);
-        }
-      });
-    };
-
-    if (typeof setInterval !== 'undefined') {
-      setInterval(cleanup, this.options.cleanupInterval);
-    }
-  }
-
-  /**
-   * Checks if the view is empty
-   */
   public isEmpty(): boolean {
     return this.documents.size === 0;
   }
 
-  /**
-   * Adds or updates a document in the view
-   */
+  public diff(previous: SessionCollectionView): void {
+    DiffSequence.diffMaps(previous.documents, this.documents, {
+      both: this.diffDocument.bind(this),
+      rightOnly: (id: string, nowDV: DocumentView) => {
+        this.callbacks.added(this.collectionName, id, nowDV.getFields());
+      },
+      leftOnly: (id: string, prevDV: DocumentView) => {
+        this.callbacks.removed(this.collectionName, id);
+      }
+    });
+  }
+
+  private diffDocument(id: string, prevDV: DocumentView, nowDV: DocumentView): void {
+    const fields: Record<string, any> = {};
+    
+    DiffSequence.diffObjects(prevDV.getFields(), nowDV.getFields(), {
+      both: (key: string, prev: any, now: any) => {
+        if (!EJSON.equals(prev, now)) {
+          fields[key] = now;
+        }
+      },
+      rightOnly: (key: string, now: any) => {
+        fields[key] = now;
+      },
+      leftOnly: (key: string, prev: any) => {
+        fields[key] = undefined;
+      }
+    });
+    
+    this.callbacks.changed(this.collectionName, id, fields);
+  }
+
   public added(subscriptionHandle: string, id: string, fields: Record<string, any>): void {
     let docView = this.documents.get(id);
-    const added = !docView;
+    let added = false;
 
     if (!docView) {
-      docView = new SessionDocumentView();
+      added = true;
+      if (Meteor.server.getPublicationStrategy(this.collectionName).useDummyDocumentView) {
+        docView = new DummyDocumentView();
+      } else {
+        docView = new SessionDocumentView();
+      }
       this.documents.set(id, docView);
     }
 
@@ -79,7 +116,13 @@ export class SessionCollectionView {
     const changeCollector: Record<string, any> = {};
 
     Object.entries(fields).forEach(([key, value]) => {
-      docView.changeField(subscriptionHandle, key, value, changeCollector, true);
+      docView!.changeField(
+        subscriptionHandle,
+        key,
+        value,
+        changeCollector,
+        true
+      );
     });
 
     if (added) {
@@ -89,16 +132,14 @@ export class SessionCollectionView {
     }
   }
 
-  /**
-   * Updates an existing document in the view
-   */
   public changed(subscriptionHandle: string, id: string, changed: Record<string, any>): void {
+    const changedResult: Record<string, any> = {};
     const docView = this.documents.get(id);
+
     if (!docView) {
-      throw new Error(`Changed called on document ${id} that does not exist`);
+      throw new Error(`Could not find element with id ${id} to change`);
     }
 
-    const changedResult: Record<string, any> = {};
     Object.entries(changed).forEach(([key, value]) => {
       if (value === undefined) {
         docView.clearField(subscriptionHandle, key, changedResult);
@@ -107,94 +148,30 @@ export class SessionCollectionView {
       }
     });
 
-    if (!isEmpty(changedResult)) {
-      this.callbacks.changed(this.collectionName, id, changedResult);
-    }
+    this.callbacks.changed(this.collectionName, id, changedResult);
   }
 
-  /**
-   * Removes a document from the view
-   */
   public removed(subscriptionHandle: string, id: string): void {
     const docView = this.documents.get(id);
+
     if (!docView) {
-      throw new Error(`Removed called on document ${id} that does not exist`);
+      throw new Error(`Removed nonexistent document ${id}`);
     }
 
     docView.existsIn.delete(subscriptionHandle);
 
     if (docView.existsIn.size === 0) {
-      this.documents.delete(id);
+      // it is gone from everyone
       this.callbacks.removed(this.collectionName, id);
+      this.documents.delete(id);
     } else {
       const changed: Record<string, any> = {};
+      // remove this subscription from every precedence list
+      // and record the changes
       docView.dataByKey.forEach((precedenceList, key) => {
         docView.clearField(subscriptionHandle, key, changed);
       });
-
-      if (!isEmpty(changed)) {
-        this.callbacks.changed(this.collectionName, id, changed);
-      }
+      this.callbacks.changed(this.collectionName, id, changed);
     }
   }
-
-  /**
-   * Compares this view with another and sends appropriate callbacks
-   */
-  public diff(previous: SessionCollectionView): void {
-    DiffSequence.diffMaps(previous.documents, this.documents, {
-      both: (id, prevDocView, newDocView) => {
-        this.diffDocument(id, prevDocView, newDocView);
-      },
-      rightOnly: (id, newDocView) => {
-        this.callbacks.added(this.collectionName, id, newDocView.getFields());
-      },
-      leftOnly: (id) => {
-        this.callbacks.removed(this.collectionName, id);
-      }
-    });
-  }
-
-  /**
-   * Cleans up resources used by this view
-   */
-  public destroy(): void {
-    this.documents.clear();
-  }
-
-  /**
-   * @private
-   */
-  private diffDocument(id: string, prevDocView: SessionDocumentView, newDocView: SessionDocumentView): void {
-    const fields: Record<string, any> = {};
-    DiffSequence.diffObjects(prevDocView.getFields(), newDocView.getFields(), {
-      both: (key, prev, now) => {
-        if (!EJSON.equals(prev, now)) {
-          fields[key] = now;
-        }
-      },
-      rightOnly: (key, now) => {
-        fields[key] = now;
-      },
-      leftOnly: (key) => {
-        fields[key] = undefined;
-      }
-    });
-
-    if (!isEmpty(fields)) {
-      this.callbacks.changed(this.collectionName, id, fields);
-    }
-  }
-}
-
-interface ViewOptions {
-  maxDocuments?: number;
-  documentTTL?: number;
-  cleanupInterval?: number;
-}
-
-interface SessionCallbacks {
-  added: (collection: string, id: string, fields: Record<string, any>) => void;
-  changed: (collection: string, id: string, fields: Record<string, any>) => void;
-  removed: (collection: string, id: string) => void;
 }
\ No newline at end of file
diff --git a/packages/ddp-server/session_document_view.ts b/packages/ddp-server/session_document_view.ts
index b4cd3801b7..8cdfb91c55 100644
--- a/packages/ddp-server/session_document_view.ts
+++ b/packages/ddp-server/session_document_view.ts
@@ -1,49 +1,51 @@
-/**
- * Represents a single document in a SessionCollectionView
- * @class SessionDocumentView
- */
+interface PrecedenceItem {
+  subscriptionHandle: string;
+  value: any;
+}
+
+interface ChangeCollector {
+  [key: string]: any;
+}
+
 export class SessionDocumentView {
-  public existsIn: Set<string>;
-  public dataByKey: Map<string, Array<PrecedenceItem>>;
-  public lastAccessed: number;
+  private existsIn: Set<string>;
+  private dataByKey: Map<string, PrecedenceItem[]>;
 
   constructor() {
-    this.existsIn = new Set();
-    this.dataByKey = new Map();
-    this.lastAccessed = Date.now();
+    this.existsIn = new Set(); // set of subscriptionHandle
+    // Memory Growth
+    this.dataByKey = new Map(); // key-> [ {subscriptionHandle, value} by precedence]
   }
 
-  /**
-   * Gets the current fields of the document
-   */
-  public getFields(): Record<string, any> {
-    this.lastAccessed = Date.now();
-    const fields: Record<string, any> = {};
-
+  getFields(): Record<string, any> {
+    const ret: Record<string, any> = {};
     this.dataByKey.forEach((precedenceList, key) => {
-      if (precedenceList.length > 0) {
-        fields[key] = precedenceList[0].value;
-      }
+      ret[key] = precedenceList[0].value;
     });
-
-    return fields;
+    return ret;
   }
 
-  /**
-   * Clears a field from the document
-   */
-  public clearField(subscriptionHandle: string, key: string, changeCollector: Record<string, any>): void {
-    if (key === '_id') return;
+  clearField(
+    subscriptionHandle: string,
+    key: string,
+    changeCollector: ChangeCollector
+  ): void {
+    // Publish API ignores _id if present in fields
+    if (key === "_id") return;
 
     const precedenceList = this.dataByKey.get(key);
+    // It's okay to clear fields that didn't exist. No need to throw
+    // an error.
     if (!precedenceList) return;
 
-    let removedValue: any;
+    let removedValue: any = undefined;
+
     for (let i = 0; i < precedenceList.length; i++) {
-      if (precedenceList[i].subscriptionHandle === subscriptionHandle) {
-        if (i === 0) {
-          removedValue = precedenceList[i].value;
-        }
+      const precedence = precedenceList[i];
+      if (precedence.subscriptionHandle === subscriptionHandle) {
+        // The view's value can only change if this subscription is the one that
+        // used to have precedence.
+        if (i === 0) removedValue = precedence.value;
         precedenceList.splice(i, 1);
         break;
       }
@@ -52,52 +54,53 @@ export class SessionDocumentView {
     if (precedenceList.length === 0) {
       this.dataByKey.delete(key);
       changeCollector[key] = undefined;
-    } else if (removedValue !== undefined &&
-      !EJSON.equals(removedValue, precedenceList[0].value)) {
+    } else if (
+      removedValue !== undefined &&
+      !EJSON.equals(removedValue, precedenceList[0].value)
+    ) {
       changeCollector[key] = precedenceList[0].value;
     }
   }
 
-  /**
-   * Changes a field value in the document
-   */
-  public changeField(
+  changeField(
     subscriptionHandle: string,
     key: string,
     value: any,
-    changeCollector: Record<string, any>,
-    isAdd: boolean = false
+    changeCollector: ChangeCollector,
+    isAdd: boolean
   ): void {
-    if (key === '_id') return;
+    // Publish API ignores _id if present in fields
+    if (key === "_id") return;
 
+    // Don't share state with the data passed in by the user.
     value = EJSON.clone(value);
 
     if (!this.dataByKey.has(key)) {
-      this.dataByKey.set(key, [{
-        subscriptionHandle,
-        value
-      }]);
+      this.dataByKey.set(key, [
+        { subscriptionHandle: subscriptionHandle, value: value },
+      ]);
       changeCollector[key] = value;
       return;
     }
 
     const precedenceList = this.dataByKey.get(key)!;
-    let item = !isAdd && precedenceList.find(
-      p => p.subscriptionHandle === subscriptionHandle
-    );
+    let elt: PrecedenceItem | undefined;
 
-    if (item) {
-      if (item === precedenceList[0] && !EJSON.equals(value, item.value)) {
+    if (!isAdd) {
+      elt = precedenceList.find(
+        (precedence) => precedence.subscriptionHandle === subscriptionHandle
+      );
+    }
+
+    if (elt) {
+      if (elt === precedenceList[0] && !EJSON.equals(value, elt.value)) {
+        // this subscription is changing the value of this field.
         changeCollector[key] = value;
       }
-      item.value = value;
+      elt.value = value;
     } else {
-      precedenceList.push({ subscriptionHandle, value });
+      // this subscription is newly caring about this field
+      precedenceList.push({ subscriptionHandle: subscriptionHandle, value: value });
     }
   }
-}
-
-interface PrecedenceItem {
-  subscriptionHandle: string;
-  value: any;
 }
\ No newline at end of file

From 748dbba2a63383a5f3e1933ce70bb8ce28f03533 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 26 Nov 2024 10:41:34 -0400
Subject: [PATCH 0862/1140] bump threshold

---
 packages/ddp-server/stream_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ddp-server/stream_server.js b/packages/ddp-server/stream_server.js
index 6b3fad8de1..3691f59e1d 100644
--- a/packages/ddp-server/stream_server.js
+++ b/packages/ddp-server/stream_server.js
@@ -20,7 +20,7 @@ var websocketExtensions = once(function () {
 
   if (websocketCompressionConfig) {
     extensions.push(Npm.require('permessage-deflate2').configure({
-      threshold: 512,
+      threshold: 1024,
       level: zlib.constants.Z_BEST_SPEED,
       memLevel: zlib.constants.Z_MIN_MEMLEVEL,
       noContextTakeover: true,

From 9f5de61f7c93f6b9fa6e5863d5c7723c0f88006a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 26 Nov 2024 11:00:03 -0400
Subject: [PATCH 0863/1140] adjust types

---
 .../ddp-server/session_collection_view.ts     | 41 +------------------
 packages/ddp-server/session_document_view.ts  |  2 +-
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/packages/ddp-server/session_collection_view.ts b/packages/ddp-server/session_collection_view.ts
index 6e5c4c7533..153c569bd0 100644
--- a/packages/ddp-server/session_collection_view.ts
+++ b/packages/ddp-server/session_collection_view.ts
@@ -7,44 +7,7 @@ interface SessionCallbacks {
   removed: (collectionName: string, id: string) => void;
 }
 
-interface DiffSequence {
-  diffMaps: (
-    previous: Map<string, DocumentView>,
-    current: Map<string, DocumentView>,
-    callbacks: {
-      both: (id: string, prev: DocumentView, now: DocumentView) => void;
-      rightOnly: (id: string, now: DocumentView) => void;
-      leftOnly: (id: string, prev: DocumentView) => void;
-    }
-  ) => void;
-  diffObjects: (
-    previous: Record<string, any>,
-    current: Record<string, any>,
-    callbacks: {
-      both: (key: string, prev: any, now: any) => void;
-      rightOnly: (key: string, now: any) => void;
-      leftOnly: (key: string, prev: any) => void;
-    }
-  ) => void;
-}
-
-interface DocumentView {
-  existsIn: Set<string>;
-  dataByKey: Map<string, any>;
-  getFields: () => Record<string, any>;
-  changeField: (
-    subscriptionHandle: string,
-    key: string,
-    value: any,
-    changeCollector: Record<string, any>,
-    isAdd?: boolean
-  ) => void;
-  clearField: (
-    subscriptionHandle: string,
-    key: string,
-    changeCollector: Record<string, any>
-  ) => void;
-}
+type DocumentView = SessionDocumentView | DummyDocumentView;
 
 export class SessionCollectionView {
   private readonly collectionName: string;
@@ -99,7 +62,7 @@ export class SessionCollectionView {
   }
 
   public added(subscriptionHandle: string, id: string, fields: Record<string, any>): void {
-    let docView = this.documents.get(id);
+    let docView: DocumentView | undefined = this.documents.get(id);
     let added = false;
 
     if (!docView) {
diff --git a/packages/ddp-server/session_document_view.ts b/packages/ddp-server/session_document_view.ts
index 8cdfb91c55..4bd838c177 100644
--- a/packages/ddp-server/session_document_view.ts
+++ b/packages/ddp-server/session_document_view.ts
@@ -67,7 +67,7 @@ export class SessionDocumentView {
     key: string,
     value: any,
     changeCollector: ChangeCollector,
-    isAdd: boolean
+    isAdd: boolean = false
   ): void {
     // Publish API ignores _id if present in fields
     if (key === "_id") return;

From d86ba5c20d138fffa67fa28626b32175ed0609e8 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 26 Nov 2024 11:15:54 -0400
Subject: [PATCH 0864/1140] fix order of operations

---
 packages/mongo/observe_multiplex.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index da8bda0bd9..ddc9bc9896 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -1,5 +1,5 @@
-import { ObserveHandle } from './observe_handle';
 import isEmpty from 'lodash.isempty';
+import { ObserveHandle } from './observe_handle';
 
 interface ObserveMultiplexerOptions {
   ordered: boolean;
@@ -34,8 +34,7 @@ export class ObserveMultiplexer {
 
     this._ordered = ordered;
     this._onStop = onStop;
-    // @ts-ignore
-    this._queue = new Meteor._AsynchronousQueue();
+    this._queue = new Meteor._AsynchronousQueue({ orderMatters: true });
     this._handles = {};
     this._resolver = null;
     this._isReady = false;

From 3c1391d50d8fe5a856f6973206741855cefce72d Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 26 Nov 2024 12:17:43 -0400
Subject: [PATCH 0865/1140] no need for async here

---
 packages/mongo/observe_multiplex.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index ddc9bc9896..33182a2e22 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -139,7 +139,7 @@ export class ObserveMultiplexer {
     return !!this._isReady;
   }
 
-  async _applyCallback(callbackName: string, args: any[]) {
+  _applyCallback(callbackName: string, args: any[]) {
     this._queue.queueTask(async () => {
       if (!this._handles) return;
 

From e526c52fb76c2d3bc173cb14ca39d1c6a61b08c9 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 26 Nov 2024 12:33:00 -0400
Subject: [PATCH 0866/1140] order matters unless told otherwise

---
 packages/meteor/asynchronous_queue.js | 2 +-
 packages/mongo/observe_multiplex.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/meteor/asynchronous_queue.js b/packages/meteor/asynchronous_queue.js
index ba5bfd2ca5..f2b1482554 100644
--- a/packages/meteor/asynchronous_queue.js
+++ b/packages/meteor/asynchronous_queue.js
@@ -6,7 +6,7 @@ class AsynchronousQueue {
   constructor({
                 batchSize = 50,
                 maxConcurrent = 10,
-                orderMatters = false
+                orderMatters = true
               } = {}) {
     this._taskHandles = new Meteor._DoubleEndedQueue();
     this._runningOrRunScheduled = false;
diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index 33182a2e22..a99d64d562 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -34,7 +34,7 @@ export class ObserveMultiplexer {
 
     this._ordered = ordered;
     this._onStop = onStop;
-    this._queue = new Meteor._AsynchronousQueue({ orderMatters: true });
+    this._queue = new Meteor._AsynchronousQueue();
     this._handles = {};
     this._resolver = null;
     this._isReady = false;

From 93319b9d1125f114bcf972994e37d192725e451a Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 26 Nov 2024 15:17:18 -0400
Subject: [PATCH 0867/1140] add adding tasks to beginning of queue

---
 packages/meteor/asynchronous_queue.js | 19 ++++++++++++++++++-
 packages/mongo/observe_multiplex.ts   |  4 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/packages/meteor/asynchronous_queue.js b/packages/meteor/asynchronous_queue.js
index f2b1482554..773958a378 100644
--- a/packages/meteor/asynchronous_queue.js
+++ b/packages/meteor/asynchronous_queue.js
@@ -4,7 +4,7 @@ class AsynchronousQueue {
    * when needed. Configurable batch size and concurrency limits help optimize throughput.
    */
   constructor({
-                batchSize = 50,
+                batchSize = 256,
                 maxConcurrent = 10,
                 orderMatters = true
               } = {}) {
@@ -149,6 +149,23 @@ class AsynchronousQueue {
 
     this._draining = false;
   }
+
+  unshiftTasks(tasks) {
+    const wrappedTasks = tasks.map(task => ({
+      task: Meteor.bindEnvironment(task, function (e) {
+        Meteor._debug('Exception from task', e);
+        throw e;
+      }),
+      name: task.name
+    }));
+
+    // Add all tasks to the front of the queue
+    wrappedTasks.reverse().forEach(wrappedTask => {
+      this._taskHandles.unshift(wrappedTask);
+    });
+
+    this._scheduleRun();
+  }
 }
 
 Meteor._AsynchronousQueue = AsynchronousQueue;
diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index a99d64d562..0fd4d39eba 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -61,11 +61,11 @@ export class ObserveMultiplexer {
     Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
       "mongo-livedata", "observe-handles", 1);
 
-    await this._queue.runTask(async () => {
+    await this._queue.unshiftTasks([async () => {
       this._handles![handle._id] = handle;
       await this._sendAdds(handle);
       --this._addHandleTasksScheduledButNotPerformed;
-    });
+    }]);
     await this._readyPromise;
   }
 

From 4ee8d850b68e32a0f294a940659f9fbe4ba4cc4e Mon Sep 17 00:00:00 2001
From: Minh Nguyen <minhna@gmail.com>
Date: Wed, 27 Nov 2024 08:01:01 +0700
Subject: [PATCH 0868/1140] Update npm-rebuild.js to support windows

---
 tools/static-assets/server/npm-rebuild.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/static-assets/server/npm-rebuild.js b/tools/static-assets/server/npm-rebuild.js
index e0a5624d3c..ca1a3be7bf 100644
--- a/tools/static-assets/server/npm-rebuild.js
+++ b/tools/static-assets/server/npm-rebuild.js
@@ -28,11 +28,10 @@ var binDir = path.dirname(process.execPath);
 process.env.PATH = binDir + path.delimiter + process.env.PATH;
 
 var npmCmd = "npm";
+var shell = false;
 if (process.platform === "win32") {
-  var npmCmdPath = path.join(binDir, "npm.cmd");
-  if (fs.existsSync(npmCmdPath)) {
-    npmCmd = npmCmdPath;
-  }
+  npmCmd = "npm.cmd";
+  shell = true;
 }
 
 function rebuild(i) {
@@ -41,7 +40,8 @@ function rebuild(i) {
   if (! dir) {
     // Print Node/V8/etc. versions for diagnostic purposes.
     spawn(npmCmd, ["version", "--json"], {
-      stdio: "inherit"
+      stdio: "inherit",
+      shell,
     });
 
     return;
@@ -49,7 +49,8 @@ function rebuild(i) {
 
   spawn(npmCmd, rebuildArgs, {
     cwd: path.join(__dirname, dir),
-    stdio: "inherit"
+    stdio: "inherit",
+    shell,
   }).on("exit", function (code) {
     if (code !== 0) {
       process.exit(code);

From 804fcbb483640dbfe3bac4b25f872c3a6031394d Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 28 Nov 2024 09:20:31 -0300
Subject: [PATCH 0869/1140] DOCS: Add redirect for /changelog

---
 .../.vitepress/theme/redirects/redirects.json |  3 ++-
 .../docs/.vitepress/theme/redirects/script.js | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/v3-docs/docs/.vitepress/theme/redirects/redirects.json b/v3-docs/docs/.vitepress/theme/redirects/redirects.json
index f6dc86f381..d57349da0c 100644
--- a/v3-docs/docs/.vitepress/theme/redirects/redirects.json
+++ b/v3-docs/docs/.vitepress/theme/redirects/redirects.json
@@ -1,4 +1,5 @@
 {
   "meteor_call": "meteor-call",
-  "ddp_connect": "DDP-connect"
+  "ddp_connect": "DDP-connect",
+  "changelog": "history"
 }
diff --git a/v3-docs/docs/.vitepress/theme/redirects/script.js b/v3-docs/docs/.vitepress/theme/redirects/script.js
index 0e7268824c..6721d68b7d 100644
--- a/v3-docs/docs/.vitepress/theme/redirects/script.js
+++ b/v3-docs/docs/.vitepress/theme/redirects/script.js
@@ -1,18 +1,26 @@
-// import json from './redirects.json';
+import redirects from "./redirects.json";
 /**
  *
  * @param {string} path
  */
 export const redirect = (path) => {
-  let shouldRedirect = false;
-  console.log(path)
+  const lastPath = path.split("/").pop().split(".")[0];
+  if (redirects[lastPath]) {
+    return {
+      path: path.replace(lastPath, redirects[lastPath]),
+      shouldRedirect: true,
+    };
+  }
+
   if (path.includes("_")) {
-    shouldRedirect = true;
-    path = path.replace("_", "-");
+    return {
+      path: path.replace("_", "-"),
+      shouldRedirect: true,
+    };
   }
 
   return {
     path,
-    shouldRedirect
+    shouldRedirect: false,
   };
 };

From 754d0060d61d6f356f93abafe9d6fed28d1dcf4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 28 Nov 2024 18:35:43 +0100
Subject: [PATCH 0870/1140] ensure allow/deny rules describe uniquely operation
 configs by deprecating async distinction

---
 packages/allow-deny/allow-deny.js   |   53 +-
 packages/mongo/tests/allow_tests.js | 1272 +++------------------------
 2 files changed, 143 insertions(+), 1182 deletions(-)

diff --git a/packages/allow-deny/allow-deny.js b/packages/allow-deny/allow-deny.js
index faf7f774c9..d6e58f1f8b 100644
--- a/packages/allow-deny/allow-deny.js
+++ b/packages/allow-deny/allow-deny.js
@@ -174,9 +174,14 @@ CollectionPrototype._defineMutationMethods = function(options) {
           // single-ID selectors.
           if (!isInsert(method)) throwIfSelectorIsNotId(args[0], method);
 
+          const syncMethodName = method.replace('Async', '');
+          const syncValidatedMethodName = '_validated' + method.charAt(0).toUpperCase() + syncMethodName.slice(1);
+          // it forces to use async validated behavior
+          const validatedMethodName = syncValidatedMethodName + 'Async';
+
           if (self._restricted) {
             // short circuit if there is no way it will pass.
-            if (self._validators[method].allow.length === 0) {
+            if (self._validators[syncMethodName].allow.length === 0) {
               throw new Meteor.Error(
                 403,
                 'Access denied. No allow validators set on restricted ' +
@@ -186,11 +191,6 @@ CollectionPrototype._defineMutationMethods = function(options) {
               );
             }
 
-            const syncMethodName = method.replace('Async', '');
-            const syncValidatedMethodName = '_validated' + method.charAt(0).toUpperCase() + syncMethodName.slice(1);
-            // it forces to use async validated behavior on the server
-            const validatedMethodName = Meteor.isServer ? syncValidatedMethodName + 'Async' : syncValidatedMethodName;
-
             args.unshift(this.userId);
             isInsert(method) && args.push(generatedId);
             return self[validatedMethodName].apply(self, args);
@@ -292,7 +292,7 @@ CollectionPrototype._validatedInsertAsync = async function(userId, doc,
   const self = this;
   // call user validators.
   // Any deny returns true means denied.
-  if (await asyncSome(self._validators.insertAsync.deny, async (validator) => {
+  if (await asyncSome(self._validators.insert.deny, async (validator) => {
     const result = validator(userId, docToValidate(validator, doc, generatedId));
     return Meteor._isPromise(result) ? await result : result;
   })) {
@@ -300,7 +300,7 @@ CollectionPrototype._validatedInsertAsync = async function(userId, doc,
   }
   // Any allow returns true means proceed. Throw error if they all fail.
 
-  if (await asyncEvery(self._validators.insertAsync.allow, async (validator) => {
+  if (await asyncEvery(self._validators.insert.allow, async (validator) => {
     const result = validator(userId, docToValidate(validator, doc, generatedId));
     return !(Meteor._isPromise(result) ? await result : result);
   })) {
@@ -408,13 +408,12 @@ CollectionPrototype._validatedUpdateAsync = async function(
     });
   }
 
-  const doc = await self._collection.findOneAsync(selector, findOptions);
-  if (!doc)  // none satisfied!
-    return 0;
+
+  const doc = await self._collection.findOneAsync(selector, findOptions) || {};
 
   // call user validators.
   // Any deny returns true means denied.
-  if (await asyncSome(self._validators.updateAsync.deny, async (validator) => {
+  if (await asyncSome(self._validators.update.deny, async (validator) => {
     const factoriedDoc = transformDoc(validator, doc);
     const result = validator(userId,
       factoriedDoc,
@@ -424,8 +423,9 @@ CollectionPrototype._validatedUpdateAsync = async function(
   })) {
     throw new Meteor.Error(403, "Access denied");
   }
+
   // Any allow returns true means proceed. Throw error if they all fail.
-  if (await asyncEvery(self._validators.updateAsync.allow, async (validator) => {
+  if (await asyncEvery(self._validators.update.allow, async (validator) => {
     const factoriedDoc = transformDoc(validator, doc);
     const result = validator(userId,
       factoriedDoc,
@@ -436,6 +436,9 @@ CollectionPrototype._validatedUpdateAsync = async function(
     throw new Meteor.Error(403, "Access denied");
   }
 
+  if (!doc)  // none satisfied!
+    return 0;
+
   options._forbidReplace = true;
 
   // Back when we supported arbitrary client-provided selectors, we actually
@@ -567,26 +570,27 @@ CollectionPrototype._validatedRemoveAsync = async function(userId, selector) {
     });
   }
 
-  const doc = await self._collection.findOneAsync(selector, findOptions);
-  if (!doc)
-    return 0;
+  const doc = await self._collection.findOneAsync(selector, findOptions) || {};
 
   // call user validators.
   // Any deny returns true means denied.
-  if (await asyncSome(self._validators.removeAsync.deny, async (validator) => {
+  if (await asyncSome(self._validators.remove.deny, async (validator) => {
     const result = validator(userId, transformDoc(validator, doc));
     return Meteor._isPromise(result) ? await result : result;
   })) {
     throw new Meteor.Error(403, "Access denied");
   }
   // Any allow returns true means proceed. Throw error if they all fail.
-  if (await asyncEvery(self._validators.removeAsync.allow, async (validator) => {
+  if (await asyncEvery(self._validators.remove.allow, async (validator) => {
     const result = validator(userId, transformDoc(validator, doc));
     return !(Meteor._isPromise(result) ? await result : result);
   })) {
     throw new Meteor.Error(403, "Access denied");
   }
 
+  if (!doc)
+    return 0;
+
   // Back when we supported arbitrary client-provided selectors, we actually
   // rewrote the selector to {_id: {$in: [ids that we found]}} before passing to
   // Mongo to avoid races, but since selector is guaranteed to already just be
@@ -713,6 +717,15 @@ function addValidator(collection, allowOrDeny, options) {
       throw new Error(allowOrDeny + ": Invalid key: " + key);
   });
 
+  Object.keys(options).forEach((key) => {
+    // TODO deprecated async config on future versions
+    const isAsyncKey = key.includes('Async');
+    if (isAsyncKey) {
+      const syncKey = key.replace('Async', '');
+      console.warn(allowOrDeny + `: The "${key}" key is deprecated. Use "${syncKey}" instead.`);
+    }
+  });
+
   collection._restricted = true;
 
   [
@@ -740,7 +753,9 @@ function addValidator(collection, allowOrDeny, options) {
           options.transform
         );
       }
-      collection._validators[name][allowOrDeny].push(options[name]);
+      const isAsyncName = name.includes('Async');
+      const validatorSyncName = isAsyncName ? name.replace('Async', '') : name;
+      collection._validators[validatorSyncName][allowOrDeny].push(options[name]);
     }
   });
 
diff --git a/packages/mongo/tests/allow_tests.js b/packages/mongo/tests/allow_tests.js
index 212a6f6e23..777d9f6b02 100644
--- a/packages/mongo/tests/allow_tests.js
+++ b/packages/mongo/tests/allow_tests.js
@@ -1,1168 +1,5 @@
 import has from 'lodash.has';
 
-if (Meteor.isServer) {
-  // Set up allow/deny rules for test collections
-
-  var allowCollections = {};
-
-  // We create the collections in the publisher (instead of using a method or
-  // something) because if we made them with a method, we'd need to follow the
-  // method with some subscribes, and it's possible that the method call would
-  // be delayed by a wait method and the subscribe messages would be sent before
-  // it and fail due to the collection not yet existing. So we are very hacky
-  // and use a publish.
-  Meteor.publish("allowTests", function (nonce, idGeneration) {
-    check(nonce, String);
-    check(idGeneration, String);
-    var cursors = [];
-    var needToConfigure;
-
-    // helper for defining a collection. we are careful to create just one
-    // Mongo.Collection even if the sub body is rerun, by caching them.
-    var defineCollection = function(name, insecure, transform) {
-      var fullName = name + idGeneration + nonce;
-
-      var collection;
-      if (has(allowCollections, fullName)) {
-        collection = allowCollections[fullName];
-        if (needToConfigure === true)
-          throw new Error("collections inconsistently exist");
-        needToConfigure = false;
-      } else {
-        collection = new Mongo.Collection(
-          fullName, {idGeneration: idGeneration, transform: transform});
-        allowCollections[fullName] = collection;
-        if (needToConfigure === false)
-          throw new Error("collections inconsistently don't exist");
-        needToConfigure = true;
-        collection._insecure = insecure;
-        var m = {};
-        m["clear-collection-" + fullName] = async function() {
-          await collection.removeAsync({}, { returnServerResultPromise: true });
-        };
-        Meteor.methods(m);
-      }
-
-      cursors.push(collection.find());
-      return collection;
-    };
-
-    var insecureCollection = defineCollection(
-      "collection-insecure", true /*insecure*/);
-    // totally locked down collection
-    var lockedDownCollection = defineCollection(
-      "collection-locked-down", false /*insecure*/);
-    // restricted collection with same allowed modifications, both with and
-    // without the `insecure` package
-    var restrictedCollectionDefaultSecure = defineCollection(
-      "collection-restrictedDefaultSecure", false /*insecure*/);
-    var restrictedCollectionDefaultInsecure = defineCollection(
-      "collection-restrictedDefaultInsecure", true /*insecure*/);
-    var restrictedCollectionForUpdateOptionsTest = defineCollection(
-      "collection-restrictedForUpdateOptionsTest", true /*insecure*/);
-    var restrictedCollectionForPartialAllowTest = defineCollection(
-      "collection-restrictedForPartialAllowTest", true /*insecure*/);
-    var restrictedCollectionForPartialDenyTest = defineCollection(
-      "collection-restrictedForPartialDenyTest", true /*insecure*/);
-    var restrictedCollectionForFetchTest = defineCollection(
-      "collection-restrictedForFetchTest", true /*insecure*/);
-    var restrictedCollectionForFetchAllTest = defineCollection(
-      "collection-restrictedForFetchAllTest", true /*insecure*/);
-    var restrictedCollectionWithTransform = defineCollection(
-      "withTransform", false, function (doc) {
-        return doc.a;
-      });
-    var restrictedCollectionForInvalidTransformTest = defineCollection(
-      "collection-restrictedForInvalidTransform", false /*insecure*/);
-    var restrictedCollectionForClientIdTest = defineCollection(
-      "collection-restrictedForClientIdTest", false /*insecure*/);
-
-    if (needToConfigure) {
-      restrictedCollectionWithTransform.allow({
-        insertAsync: function (userId, doc) {
-          return doc.foo === "foo";
-        },
-        updateAsync: function (userId, doc) {
-          return doc.foo === "foo";
-        },
-        removeAsync: function (userId, doc) {
-          return doc.bar === "bar";
-        }
-      });
-      restrictedCollectionWithTransform.allow({
-        // transform: null means that doc here is the top level, not the 'a'
-        // element.
-        transform: null,
-        insertAsync: function (userId, doc) {
-          return !!doc.topLevelField;
-        },
-        updateAsync: function (userId, doc) {
-          return !!doc.topLevelField;
-        }
-      });
-      restrictedCollectionForInvalidTransformTest.allow({
-        // transform must return an object which is not a mongo id
-        transform: function (doc) { return doc._id; },
-        insert: function () { return true; }
-      });
-      restrictedCollectionForClientIdTest.allow({
-        // This test just requires the collection to trigger the restricted
-        // case.
-        insert: function () { return true; },
-        insertAsync: function () { return true; }
-      });
-
-      // two calls to allow to verify that either validator is sufficient.
-      var allows = [{
-        insertAsync: function(userId, doc) {
-          return doc.canInsert;
-        },
-        updateAsync: function(userId, doc) {
-          return doc.canUpdate;
-        },
-        removeAsync: function (userId, doc) {
-          return doc.canRemove;
-        }
-      }, {
-        insertAsync: function(userId, doc) {
-          return doc.canInsert2;
-        },
-        updateAsync: function(userId, doc, fields, modifier) {
-          return -1 !== fields.indexOf('canUpdate2');
-        },
-        removeAsync: function(userId, doc) {
-          return doc.canRemove2;
-        }
-      }];
-
-      // two calls to deny to verify that either one blocks the change.
-      var denies = [{
-        insertAsync: function(userId, doc) {
-          return doc.cantInsert;
-        },
-        removeAsync: function (userId, doc) {
-          return doc.cantRemove;
-        }
-      }, {
-        insertAsync: function(userId, doc) {
-          // Don't allow explicit ID to be set by the client.
-          return has(doc, '_id');
-        },
-        updateAsync: function(userId, doc, fields, modifier) {
-          return -1 !== fields.indexOf('verySecret');
-        }
-      }];
-
-      [
-        restrictedCollectionDefaultSecure,
-        restrictedCollectionDefaultInsecure,
-        restrictedCollectionForUpdateOptionsTest
-      ].forEach(function (collection) {
-        allows.forEach(function (allow) {
-          collection.allow(allow);
-        });
-        denies.forEach(function (deny) {
-          collection.deny(deny);
-        });
-      });
-
-      // just restrict one operation so that we can verify that others
-      // fail
-      restrictedCollectionForPartialAllowTest.allow({
-        insert: function() {}
-      });
-      restrictedCollectionForPartialDenyTest.deny({
-        insert: function() {}
-      });
-
-      // verify that we only fetch the fields specified - we should
-      // be fetching just field1, field2, and field3.
-      restrictedCollectionForFetchTest.allow({
-        insertAsync: function() { return true; },
-        updateAsync: function(userId, doc) {
-          // throw fields in doc so that we can inspect them in test
-          throw new Meteor.Error(
-            999, "Test: Fields in doc: " + Object.keys(doc).sort().join(','));
-        },
-        removeAsync: function(userId, doc) {
-          // throw fields in doc so that we can inspect them in test
-          throw new Meteor.Error(
-            999, "Test: Fields in doc: " + Object.keys(doc).sort().join(','));
-        },
-        fetch: ['field1']
-      });
-      restrictedCollectionForFetchTest.allow({
-        fetch: ['field2']
-      });
-      restrictedCollectionForFetchTest.deny({
-        fetch: ['field3']
-      });
-
-      // verify that not passing fetch to one of the calls to allow
-      // causes all fields to be fetched
-      restrictedCollectionForFetchAllTest.allow({
-        insertAsync: function() { return true; },
-        updateAsync: function(userId, doc) {
-          // throw fields in doc so that we can inspect them in test
-          throw new Meteor.Error(
-            999, "Test: Fields in doc: " + Object.keys(doc).sort().join(','));
-        },
-        removeAsync: function(userId, doc) {
-          // throw fields in doc so that we can inspect them in test
-          throw new Meteor.Error(
-            999, "Test: Fields in doc: " + Object.keys(doc).sort().join(','));
-        },
-        fetch: ['field1']
-      });
-      restrictedCollectionForFetchAllTest.allow({
-        updateAsync: function() { return true; }
-      });
-    }
-
-    return cursors;
-  });
-}
-
-if (Meteor.isClient) {
-  ['STRING', 'MONGO'].forEach(function (idGeneration) {
-    // Set up a bunch of test collections... on the client! They match the ones
-    // created by setUpAllowTestsCollections.
-
-    var nonce = Random.id();
-    // Tell the server to make, configure, and publish a set of collections unique
-    // to our test run. Since the method does not unblock, this will complete
-    // running on the server before anything else happens.
-    Meteor.subscribe('allowTests', nonce, idGeneration);
-
-    // helper for defining a collection, subscribing to it, and defining
-    // a method to clear it
-    var defineCollection = function(name, transform) {
-      var fullName = name + idGeneration + nonce;
-      var collection = new Mongo.Collection(
-        fullName, {idGeneration: idGeneration, transform: transform});
-
-      collection.callClearMethod = async function () {
-        await Meteor.callAsync('clear-collection-' + fullName);
-      };
-      collection.unnoncedName = name + idGeneration;
-      return collection;
-    };
-
-    // totally insecure collection
-    var insecureCollection = defineCollection("collection-insecure");
-
-    // totally locked down collection
-    var lockedDownCollection = defineCollection("collection-locked-down");
-
-    // restricted collection with same allowed modifications, both with and
-    // without the `insecure` package
-    var restrictedCollectionDefaultSecure = defineCollection(
-      "collection-restrictedDefaultSecure");
-    var restrictedCollectionDefaultInsecure = defineCollection(
-      "collection-restrictedDefaultInsecure");
-    var restrictedCollectionForUpdateOptionsTest = defineCollection(
-      "collection-restrictedForUpdateOptionsTest");
-    var restrictedCollectionForPartialAllowTest = defineCollection(
-      "collection-restrictedForPartialAllowTest");
-    var restrictedCollectionForPartialDenyTest = defineCollection(
-      "collection-restrictedForPartialDenyTest");
-    var restrictedCollectionForFetchTest = defineCollection(
-      "collection-restrictedForFetchTest");
-    var restrictedCollectionForFetchAllTest = defineCollection(
-      "collection-restrictedForFetchAllTest");
-    var restrictedCollectionWithTransform = defineCollection(
-      "withTransform", function (doc) {
-        return doc.a;
-      });
-    var restrictedCollectionForInvalidTransformTest = defineCollection(
-      "collection-restrictedForInvalidTransform");
-    var restrictedCollectionForClientIdTest = defineCollection(
-      "collection-restrictedForClientIdTest");
-
-    // test that if allow is called once then the collection is
-    // restricted, and that other mutations aren't allowed
-    testAsyncMulti('collection - partial allow, ' + idGeneration, [
-      async function(test, expect) {
-        try {
-          await restrictedCollectionForPartialAllowTest.updateAsync(
-            'foo',
-            { $set: { updated: true } },
-            {
-              returnServerResultPromise: true,
-            }
-          );
-        } catch (err) {
-          test.equal(err.error, 403);
-        }
-      },
-    ]);
-
-    // test that if deny is called once then the collection is
-    // restricted, and that other mutations aren't allowed
-    testAsyncMulti('collection - partial deny, ' + idGeneration, [
-      async function(test, expect) {
-        try {
-          await restrictedCollectionForPartialDenyTest.updateAsync(
-            'foo',
-            {
-              $set: { updated: true },
-            },
-            {
-              returnServerResultPromise: true,
-            }
-          );
-        } catch (err) {
-          test.equal(err.error, 403);
-        }
-      },
-    ]);
-
-
-    // test that we only fetch the fields specified
-    testAsyncMulti('collection - fetch, ' + idGeneration, [
-      async function(test, expect) {
-        var fetchId = await restrictedCollectionForFetchTest.insertAsync({
-          field1: 1,
-          field2: 1,
-          field3: 1,
-          field4: 1,
-        },{
-          returnServerResultPromise: true,
-        });
-        var fetchAllId = await restrictedCollectionForFetchAllTest.insertAsync({
-          field1: 1,
-          field2: 1,
-          field3: 1,
-          field4: 1,
-        },{
-          returnServerResultPromise: true,
-        });
-       await restrictedCollectionForFetchTest
-         .updateAsync(
-           fetchId,
-           { $set: { updated: true } },
-           {
-             returnServerResultPromise: true,
-           }
-         )
-         .catch(
-           expect(function(err) {
-             test.equal(
-               err.reason,
-               'Test: Fields in doc: _id,field1,field2,field3'
-             );
-           })
-         );
-
-        await restrictedCollectionForFetchTest
-          .removeAsync(fetchId, {
-            returnServerResultPromise: true,
-          })
-          .catch(
-            expect(function(err) {
-              test.equal(
-                err.reason,
-                'Test: Fields in doc: _id,field1,field2,field3'
-              );
-            })
-          );
-
-        await restrictedCollectionForFetchAllTest
-          .updateAsync(
-            fetchAllId,
-            { $set: { updated: true } },
-            {
-              returnServerResultPromise: true,
-            }
-          )
-          .catch(
-            expect(function(err) {
-              test.equal(
-                err.reason,
-                'Test: Fields in doc: _id,field1,field2,field3,field4'
-              );
-            })
-          );
-        await restrictedCollectionForFetchAllTest
-          .removeAsync(fetchAllId, {
-            returnServerResultPromise: true,
-          })
-          .catch(
-            expect(function(err) {
-              test.equal(
-                err.reason,
-                'Test: Fields in doc: _id,field1,field2,field3,field4'
-              );
-            })
-          );
-      },
-    ]);
-
-    (function() {
-      testAsyncMulti('collection - restricted factories ' + idGeneration, [
-        async function(test, expect) {
-          await restrictedCollectionWithTransform.callClearMethod();
-          test.equal(
-            await restrictedCollectionWithTransform.find().countAsync(),
-            0
-          );
-        },
-        async function(test, expect) {
-          var self = this;
-          await restrictedCollectionWithTransform
-            .insertAsync(
-              {
-                a: { foo: 'foo', bar: 'bar', baz: 'baz' },
-              },
-              {
-                returnServerResultPromise: true,
-              }
-            )
-            .then(
-              expect(function(res) {
-                test.isTrue(res);
-                self.item1 = res;
-              })
-            );
-          await restrictedCollectionWithTransform
-            .insertAsync(
-              {
-                a: { foo: 'foo', bar: 'quux', baz: 'quux' },
-                b: 'potato',
-              },
-              {
-                returnServerResultPromise: true,
-              }
-            )
-            .then(
-              expect(function(res) {
-                test.isTrue(res);
-                self.item2 = res;
-              })
-            );
-          await restrictedCollectionWithTransform
-            .insertAsync(
-              {
-                a: { foo: 'adsfadf', bar: 'quux', baz: 'quux' },
-                b: 'potato',
-              },
-              {
-                returnServerResultPromise: true,
-              }
-            )
-            .catch(
-              expect(function(e, res) {
-                test.isTrue(e);
-              })
-            );
-          await restrictedCollectionWithTransform
-            .insertAsync(
-              {
-                a: { foo: 'bar' },
-                topLevelField: true,
-              },
-              {
-                returnServerResultPromise: true,
-              }
-            )
-            .then(
-              expect(function(res) {
-                test.isTrue(res);
-                self.item3 = res;
-              })
-            );
-        },
-        async function(test, expect) {
-          var self = this;
-          // This should work, because there is an update allow for things with
-          // topLevelField.
-          await restrictedCollectionWithTransform
-            .updateAsync(
-              self.item3,
-              { $set: { xxx: true } },
-              {
-                returnServerResultPromise: true,
-              }
-            )
-            .then(
-              expect(function(res) {
-                test.equal(1, res);
-              })
-            );
-        },
-        async function(test, expect) {
-          var self = this;
-          test.equal(
-            await restrictedCollectionWithTransform.findOneAsync(self.item1),
-            {
-              _id: self.item1,
-              foo: 'foo',
-              bar: 'bar',
-              baz: 'baz',
-            }
-          );
-          await restrictedCollectionWithTransform
-            .removeAsync(self.item1, {
-              returnServerResultPromise: true,
-            })
-            .then(
-              expect(function(res) {
-                test.isTrue(res);
-              })
-            );
-          await restrictedCollectionWithTransform
-            .removeAsync(self.item2, {
-              returnServerResultPromise: true,
-            })
-            .catch(
-              expect(function(e) {
-                test.isTrue(e);
-              })
-            );
-        },
-      ]);
-    })();
-
-    testAsyncMulti('collection - insecure, ' + idGeneration, [
-      async function(test, expect) {
-        await insecureCollection.callClearMethod();
-        test.equal(await insecureCollection.find().countAsync(), 0);
-      },
-      async function(test, expect) {
-        let idThen;
-        var id = await insecureCollection
-          .insertAsync(
-            { foo: 'bar' },
-            {
-              returnServerResultPromise: true,
-            }
-          )
-          .then(async function(res) {
-            idThen = res;
-            test.equal(await insecureCollection.find(res).countAsync(), 1);
-            test.equal((await insecureCollection.findOneAsync(res)).foo, 'bar');
-            return res;
-          });
-        test.equal(idThen, id);
-        test.equal(await insecureCollection.find(id).countAsync(), 1);
-        test.equal((await insecureCollection.findOneAsync(id)).foo, 'bar');
-      },
-    ]);
-
-    testAsyncMulti('collection - locked down, ' + idGeneration, [
-      async function(test, expect) {
-        await lockedDownCollection.callClearMethod();
-        test.equal(await lockedDownCollection.find().countAsync(), 0);
-      },
-      async function(test, expect) {
-        await lockedDownCollection
-          .insertAsync(
-            { foo: 'bar' },
-            {
-              returnServerResultPromise: true,
-            }
-          )
-          .catch(async function(err, res) {
-            test.equal(err.error, 403);
-            test.equal(await lockedDownCollection.find().countAsync(), 0);
-          });
-      },
-    ]);
-
-    (function() {
-      var collection = restrictedCollectionForUpdateOptionsTest;
-      var id1, id2;
-      testAsyncMulti('collection - update options, ' + idGeneration, [
-        // init
-        async function(test, expect) {
-          await collection.callClearMethod().then(async function() {
-            test.equal(await collection.find().countAsync(), 0);
-          });
-        },
-        // put a few objects
-        async function(test, expect) {
-          var doc = { canInsert: true, canUpdate: true };
-          id1 = await collection.insertAsync(doc);
-          id2 = await collection.insertAsync(doc);
-          await collection.insertAsync(doc);
-          await collection
-            .insertAsync(doc, { returnServerResultPromise: true })
-            .then(async function(res) {
-              test.equal(await collection.find().countAsync(), 4);
-            });
-        },
-        // update by id
-        async function(test, expect) {
-          await collection
-            .updateAsync(
-              id1,
-              { $set: { updated: true } },
-              { returnServerResultPromise: true }
-            )
-            .then(async function(res) {
-              test.equal(res, 1);
-              test.equal(
-                await collection.find({ updated: true }).countAsync(),
-                1
-              );
-            });
-        },
-        // update by id in an object
-        async function(test, expect) {
-          await collection
-            .updateAsync(
-              { _id: id2 },
-              { $set: { updated: true } },
-              { returnServerResultPromise: true }
-            )
-            .then(async function(res) {
-              test.equal(res, 1);
-              test.equal(
-                await collection.find({ updated: true }).countAsync(),
-                2
-              );
-            });
-        },
-        // update with replacement operator not allowed, and has nice error.
-        async function(test, expect) {
-          await collection
-            .updateAsync(
-              { _id: id2 },
-              { _id: id2, updated: true },
-              { returnServerResultPromise: true }
-            )
-            .catch(async function(err) {
-              test.equal(err.error, 403);
-              test.matches(err.reason, /In a restricted/);
-              // unchanged
-              test.equal(
-                await collection.find({ updated: true }).countAsync(),
-                2
-              );
-            });
-        },
-        // upsert not allowed, and has nice error.
-        async function(test, expect) {
-          await collection
-            .updateAsync(
-              { _id: id2 },
-              { $set: { upserted: true } },
-              { upsert: true, returnServerResultPromise: true }
-            )
-            .catch(async function(err) {
-              test.equal(err.error, 403);
-              test.matches(err.reason, /in a restricted/);
-              test.equal(
-                await collection.find({ upserted: true }).countAsync(),
-                0
-              );
-            });
-        },
-        // update with rename operator not allowed, and has nice error.
-        async function(test, expect) {
-          await collection
-            .updateAsync(
-              { _id: id2 },
-              { $rename: { updated: 'asdf' } },
-              { returnServerResultPromise: true }
-            )
-            .catch(async function(err) {
-              test.equal(err.error, 403);
-              test.matches(err.reason, /not allowed/);
-              // unchanged
-              test.equal(
-                await collection.find({ updated: true }).countAsync(),
-                2
-              );
-            });
-        },
-        // update method with a non-ID selector is not allowed
-        async function(test, expect) {
-          // We shouldn't even send the method...
-          await test.throwsAsync(async function() {
-            await collection.updateAsync(
-              { updated: { $exists: false } },
-              { $set: { updated: true } }
-            );
-          });
-          // ... but if we did, the server would reject it too.
-          await Meteor.callAsync(
-            '/' + collection._name + '/updateAsync',
-            { updated: { $exists: false } },
-            { $set: { updated: true } }
-          ).catch(async function(err, res) {
-            test.equal(err.error, 403);
-            // unchanged
-            test.equal(
-              await collection.find({ updated: true }).countAsync(),
-              2
-            );
-          });
-        },
-        // make sure it doesn't think that {_id: 'foo', something: else} is ok.
-        async function(test, expect) {
-          await test.throwsAsync(async function() {
-            await collection.updateAsync(
-              { _id: id1, updated: { $exists: false } },
-              { $set: { updated: true } }
-            );
-          });
-        },
-        // remove method with a non-ID selector is not allowed
-        async function(test, expect) {
-          // We shouldn't even send the method...
-          await test.throwsAsync(async function() {
-            await collection.removeAsync({ updated: true });
-          });
-          // ... but if we did, the server would reject it too.
-          await Meteor.callAsync(
-            '/' + collection._name + '/removeAsync',
-            {
-              updated: true,
-            }
-          ).catch(async function(err) {
-            test.equal(err.error, 403);
-            // unchanged
-            test.equal(
-              await collection.find({ updated: true }).countAsync(),
-              2
-            );
-          });
-        },
-      ]);
-    })();
-
-    
-      [restrictedCollectionDefaultInsecure, restrictedCollectionDefaultSecure].forEach(
-      function(collection) {
-        var canUpdateId, canRemoveId;
-
-        testAsyncMulti('collection - ' + collection.unnoncedName, [
-          // init
-          async function(test, expect) {
-            await collection.callClearMethod().then(async function() {
-              test.equal(await collection.find().countAsync(), 0);
-            });
-          },
-
-          // insert with no allows passing. request is denied.
-          async function(test, expect) {
-            await collection
-              .insertAsync({}, { returnServerResultPromise: true })
-              .catch(async function(err, res) {
-                test.equal(err.error, 403);
-                test.equal(await collection.find().countAsync(), 0);
-              });
-          },
-          // insert with one allow and one deny. denied.
-          async function(test, expect) {
-            await collection
-              .insertAsync(
-                { canInsert: true, cantInsert: true },
-                { returnServerResultPromise: true }
-              )
-              .catch(async function(err, res) {
-                test.equal(err.error, 403);
-                test.equal(await collection.find().countAsync(), 0);
-              });
-          },
-          // insert with one allow and other deny. denied.
-          async function(test, expect) {
-            await collection
-              .insertAsync(
-                { canInsert: true, _id: Random.id() },
-                { returnServerResultPromise: true }
-              )
-              .catch(async function(err) {
-                test.equal(err.error, 403);
-                test.equal(await collection.find().countAsync(), 0);
-              });
-          },
-          // insert one allow passes. allowed.
-          async function(test, expect) {
-            await collection
-              .insertAsync(
-                { canInsert: true },
-                { returnServerResultPromise: true }
-              )
-              .then(async function(err, res) {
-                test.equal(await collection.find().countAsync(), 1);
-              });
-          },
-          // insert other allow passes. allowed.
-          // includes canUpdate for later.
-          async function(test, expect) {
-            canUpdateId = await collection
-              .insertAsync(
-                { canInsert2: true, canUpdate: true },
-                { returnServerResultPromise: true }
-              )
-              .then(async function(res) {
-                test.equal(await collection.find().countAsync(), 2);
-                return res;
-              });
-          },
-          // yet a third insert executes. this one has canRemove and
-          // cantRemove set for later.
-          async function(test, expect) {
-            canRemoveId = await collection
-              .insertAsync(
-                { canInsert: true, canRemove: true, cantRemove: true },
-                { returnServerResultPromise: true }
-              )
-              .then(async function(res) {
-                test.equal(await collection.find().countAsync(), 3);
-                return res;
-              });
-          },
-
-          // can't update with a non-operator mutation
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                canUpdateId,
-                { newObject: 1 },
-                { returnServerResultPromise: true }
-              )
-              .catch(async function(err, res) {
-                test.equal(err.error, 403);
-                test.equal(await collection.find().countAsync(), 3);
-              });
-          },
-
-          // updating dotted fields works as if we are changing their
-          // top part
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                canUpdateId,
-                { $set: { 'dotted.field': 1 } },
-                { returnServerResultPromise: true }
-              )
-              .then(async function(res) {
-                test.equal(res, 1);
-                test.equal(
-                  (await collection.findOneAsync(canUpdateId)).dotted.field,
-                  1
-                );
-              });
-          },
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                canUpdateId,
-                { $set: { 'verySecret.field': 1 } },
-                { returnServerResultPromise: true }
-              )
-              .catch(async function(err, res) {
-                test.equal(err.error, 403);
-                test.equal(
-                  await collection
-                    .find({ verySecret: { $exists: true } })
-                    .countAsync(),
-                  0
-                );
-              });
-          },
-
-          // update doesn't do anything if no docs match
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                "doesn't exist",
-                { $set: { updated: true } },
-                { returnServerResultPromise: true }
-              )
-              .then(async function(res) {
-                test.equal(res, 0);
-                // nothing has changed
-                test.equal(await collection.find().countAsync(), 3);
-                test.equal(
-                  await collection.find({ updated: true }).countAsync(),
-                  0
-                );
-              });
-          },
-          // update fails when access is denied trying to set `verySecret`
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                canUpdateId,
-                { $set: { verySecret: true } },
-                { returnServerResultPromise: true }
-              )
-              .catch(async function(err) {
-                test.equal(err.error, 403);
-                // nothing has changed
-                test.equal(await collection.find().countAsync(), 3);
-                test.equal(
-                  await collection.find({ updated: true }).countAsync(),
-                  0
-                );
-              });
-          },
-          // update fails when trying to set two fields, one of which is
-          // `verySecret`
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                canUpdateId,
-                { $set: { updated: true, verySecret: true } },
-                { returnServerResultPromise: true }
-              )
-              .catch(async function(err, res) {
-                test.equal(err.error, 403);
-                // nothing has changed
-                test.equal(await collection.find().countAsync(), 3);
-                test.equal(
-                  await collection.find({ updated: true }).countAsync(),
-                  0
-                );
-              });
-          },
-          // update fails when trying to modify docs that don't
-          // have `canUpdate` set
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                canRemoveId,
-                { $set: { updated: true } },
-                { returnServerResultPromise: true }
-              )
-              .catch(async function(err, res) {
-                test.equal(err.error, 403);
-                // nothing has changed
-                test.equal(await collection.find().countAsync(), 3);
-                test.equal(
-                  await collection.find({ updated: true }).countAsync(),
-                  0
-                );
-              });
-          },
-          // update executes when it should
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                canUpdateId,
-                { $set: { updated: true } },
-                { returnServerResultPromise: true }
-              )
-              .then(async function(res) {
-                test.equal(res, 1);
-                test.equal(
-                  await collection.find({ updated: true }).countAsync(),
-                  1
-                );
-              });
-          },
-
-          // remove fails when trying to modify a doc with no `canRemove` set
-          async function(test, expect) {
-            await collection
-              .removeAsync(canUpdateId, { returnServerResultPromise: true })
-              .catch(async function(err, res) {
-                test.equal(err.error, 403);
-                // nothing has changed
-                test.equal(await collection.find().countAsync(), 3);
-              });
-          },
-          // remove fails when trying to modify an doc with `cantRemove`
-          // set
-          async function(test, expect) {
-            await collection
-              .removeAsync(canRemoveId, { returnServerResultPromise: true })
-              .catch(async function(err, res) {
-                test.equal(err.error, 403);
-                // nothing has changed
-                test.equal(await collection.find().countAsync(), 3);
-              });
-          },
-
-          // update the doc to remove cantRemove.
-          async function(test, expect) {
-            await collection
-              .updateAsync(
-                canRemoveId,
-                { $set: { cantRemove: false, canUpdate2: true } },
-                { returnServerResultPromise: true }
-              )
-              .then(async function(res) {
-                test.equal(res, 1);
-                test.equal(
-                  await collection.find({ cantRemove: true }).countAsync(),
-                  0
-                );
-              });
-          },
-
-          // now remove can remove it.
-          async function(test, expect) {
-            await collection
-              .removeAsync(canRemoveId, { returnServerResultPromise: true })
-              .then(async function(res) {
-                test.equal(res, 1);
-                // successfully removed
-                test.equal(await collection.find().countAsync(), 2);
-              });
-          },
-
-          // try to remove a doc that doesn't exist. see we remove no docs.
-          async function(test, expect) {
-            await collection
-              .removeAsync('some-random-id-that-never-matches', {
-                returnServerResultPromise: true,
-              })
-              .then(async function(res) {
-                test.equal(res, 0);
-                // nothing removed
-                test.equal(await collection.find().countAsync(), 2);
-              });
-          },
-
-          // methods can still bypass restrictions
-          async function(test, expect) {
-            await collection.callClearMethod().then(async function(err, res) {
-              // successfully removed
-              test.equal(await collection.find().countAsync(), 0);
-            });
-          },
-        ]);
-      }
-    );
-    testAsyncMulti(
-      'collection - allow/deny transform must return object, ' + idGeneration,
-      [
-        async function(test, expect) {
-          await restrictedCollectionForInvalidTransformTest
-            .insertAsync({}, { returnServerResultPromise: true })
-            .catch(function(err) {
-              test.isTrue(err);
-            });
-        },
-      ]
-    );
-    testAsyncMulti(
-      'collection - restricted collection allows client-side id, ' +
-        idGeneration,
-      [
-        async function(test, expect) {
-          var self = this;
-          self.id = Random.id();
-          await restrictedCollectionForClientIdTest
-            .insertAsync({ _id: self.id }, { returnServerResultPromise: true })
-            .then(async function(res) {
-              test.equal(res, self.id);
-              test.equal(
-                await restrictedCollectionForClientIdTest.findOneAsync(self.id),
-                {
-                  _id: self.id,
-                }
-              );
-            });
-        },
-      ]
-    );
-  });  // end idGeneration loop
-}  // end if isClient
-
-
-
-// A few simple server-only tests which don't need to coordinate collections
-// with the client..
-if (Meteor.isServer) {
-  Tinytest.add("collection - allow and deny validate options", function (test) {
-    var collection = new Mongo.Collection(null);
-
-    test.throws(function () {
-      collection.allow({invalidOption: true});
-    });
-    test.throws(function () {
-      collection.deny({invalidOption: true});
-    });
-
-    ['insert', 'update', 'remove', 'fetch'].forEach(function (key) {
-      var options = {};
-      options[key] = true;
-      test.throws(function () {
-        collection.allow(options);
-      });
-      test.throws(function () {
-        collection.deny(options);
-      });
-    });
-
-    ['insert', 'update', 'remove'].forEach(function (key) {
-      var options = {};
-      options[key] = false;
-      test.throws(function () {
-        collection.allow(options);
-      });
-      test.throws(function () {
-        collection.deny(options);
-      });
-    });
-
-    ['insert', 'update', 'remove'].forEach(function (key) {
-      var options = {};
-      options[key] = undefined;
-      test.throws(function () {
-        collection.allow(options);
-      });
-      test.throws(function () {
-        collection.deny(options);
-      });
-    });
-
-    ['insert', 'update', 'remove'].forEach(function (key) {
-      var options = {};
-      options[key] = ['an array']; // this should be a function, not an array
-      test.throws(function () {
-        collection.allow(options);
-      });
-      test.throws(function () {
-        collection.deny(options);
-      });
-    });
-
-    test.throws(function () {
-      collection.allow({fetch: function () {}}); // this should be an array
-    });
-  });
-
-  Tinytest.add("collection - calling allow restricts", function (test) {
-    var collection = new Mongo.Collection(null);
-    test.equal(collection._restricted, false);
-    collection.allow({
-      insert: function() {}
-    });
-    test.equal(collection._restricted, true);
-  });
-
-  Tinytest.add("collection - global insecure", function (test) {
-    // note: This test alters the global insecure status, by sneakily hacking
-    // the global Package object!
-    var insecurePackage = Package.insecure;
-
-    Package.insecure = {};
-    var collection = new Mongo.Collection(null);
-    test.equal(collection._isInsecure(), true);
-
-    Package.insecure = undefined;
-    test.equal(collection._isInsecure(), false);
-
-    delete Package.insecure;
-    test.equal(collection._isInsecure(), false);
-
-    collection._insecure = true;
-    test.equal(collection._isInsecure(), true);
-
-    if (insecurePackage)
-      Package.insecure = insecurePackage;
-    else
-      delete Package.insecure;
-  });
-}
-
 var AllowAsyncValidateCollection;
 
 Tinytest.addAsync(
@@ -1202,6 +39,7 @@ Tinytest.addAsync(
           error ? reject(error) : resolve(result)
         );
       });
+      console.log('id', id);
       await new Promise((resolve, reject) => {
         AllowAsyncValidateCollection.update(
           id,
@@ -1308,3 +146,111 @@ testAsyncMulti("collection - async definitions on allow/deny rules", [
     }
   },
 ]);
+
+function configAllSyncAllowDeny(collection, configType = 'allow', enabled) {
+  collection[configType]({
+    insert(selector, doc) {
+      if (doc.force) return true;
+      return enabled;
+    },
+    update() {
+      return enabled;
+    },
+    remove() {
+      return enabled;
+    },
+  });
+}
+
+async function runAllSyncExpect(test, collection, expected) {
+  let id;
+  /* sync tests */
+  const syncCallback = (error) => {
+    if (error) {
+      test.isTrue(!expected);
+      return;
+    }
+    test.isTrue(expected);
+  };
+
+  await new Promise((resolve) => {
+    id = collection.insert({ num: 2 }, (error, result) => {
+      if (error) {
+        test.isTrue(!expected);
+        resolve();
+        return;
+      }
+      test.isTrue(expected && result != null);
+      resolve();
+    });
+  });
+
+  await new Promise((resolve) => {
+    collection.update(id, { $set: { num: 22 } }, (error, result) => {
+      if (error) {
+        test.isTrue(!expected);
+        resolve();
+        return;
+      }
+      test.isTrue(expected && result != null);
+      resolve();
+    });
+  });
+
+  await new Promise((resolve) => {
+    collection.remove(id, (error, result) => {
+      if (error) {
+        test.isTrue(!expected);
+        resolve();
+        return;
+      }
+      test.isTrue(expected && result != null);
+      resolve();
+    });
+  });
+}
+
+var AllowDenySyncRulesCollections = {};
+
+testAsyncMulti("collection - sync definitions on allow/deny rules", [
+  async function (test) {
+    AllowDenySyncRulesCollections.allowed =
+      AllowDenySyncRulesCollections.allowed ||
+      new Mongo.Collection(`allowdeny-sync-rules-allowed`);
+    if (Meteor.isServer) {
+      await AllowDenySyncRulesCollections.allowed.removeAsync();
+    }
+
+    configAllAsyncAllowDeny(AllowDenySyncRulesCollections.allowed, 'allow', true);
+    if (Meteor.isClient) {
+      await runAllSyncExpect(test, AllowDenySyncRulesCollections.allowed, true);
+    }
+  },
+  async function (test) {
+    AllowDenySyncRulesCollections.notAllowed =
+      AllowDenySyncRulesCollections.notAllowed ||
+      new Mongo.Collection(`allowdeny-sync-rules-notAllowed`);
+    if (Meteor.isServer) {
+      await AllowDenySyncRulesCollections.notAllowed.removeAsync();
+      await AllowDenySyncRulesCollections.notAllowed.insertAsync({ num: 2 });
+    }
+
+    configAllSyncAllowDeny(AllowDenySyncRulesCollections.notAllowed, 'allow', false);
+    if (Meteor.isClient) {
+      await runAllSyncExpect(test, AllowDenySyncRulesCollections.notAllowed, false);
+    }
+  },
+  async function (test) {
+    AllowDenySyncRulesCollections.denied =
+      AllowDenySyncRulesCollections.denied ||
+      new Mongo.Collection(`allowdeny-sync-rules-denied`);
+    if (Meteor.isServer) {
+      await AllowDenySyncRulesCollections.denied.removeAsync();
+    }
+
+    configAllSyncAllowDeny(AllowDenySyncRulesCollections.denied, 'deny', true);
+    if (Meteor.isClient) {
+      await runAllSyncExpect(test, AllowDenySyncRulesCollections.denied, false);
+    }
+  },
+]);

From fa31a9d16aa0cf94a76b81efae51234aa096a70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 28 Nov 2024 18:45:20 +0100
Subject: [PATCH 0871/1140] revert removal of allow/deny base tests

---
 packages/mongo/tests/allow_tests.js | 1163 +++++++++++++++++++++++++++
 1 file changed, 1163 insertions(+)

diff --git a/packages/mongo/tests/allow_tests.js b/packages/mongo/tests/allow_tests.js
index 777d9f6b02..41abcd32a3 100644
--- a/packages/mongo/tests/allow_tests.js
+++ b/packages/mongo/tests/allow_tests.js
@@ -1,5 +1,1168 @@
 import has from 'lodash.has';
 
+if (Meteor.isServer) {
+  // Set up allow/deny rules for test collections
+
+  var allowCollections = {};
+
+  // We create the collections in the publisher (instead of using a method or
+  // something) because if we made them with a method, we'd need to follow the
+  // method with some subscribes, and it's possible that the method call would
+  // be delayed by a wait method and the subscribe messages would be sent before
+  // it and fail due to the collection not yet existing. So we are very hacky
+  // and use a publish.
+  Meteor.publish("allowTests", function (nonce, idGeneration) {
+    check(nonce, String);
+    check(idGeneration, String);
+    var cursors = [];
+    var needToConfigure;
+
+    // helper for defining a collection. we are careful to create just one
+    // Mongo.Collection even if the sub body is rerun, by caching them.
+    var defineCollection = function(name, insecure, transform) {
+      var fullName = name + idGeneration + nonce;
+
+      var collection;
+      if (has(allowCollections, fullName)) {
+        collection = allowCollections[fullName];
+        if (needToConfigure === true)
+          throw new Error("collections inconsistently exist");
+        needToConfigure = false;
+      } else {
+        collection = new Mongo.Collection(
+          fullName, {idGeneration: idGeneration, transform: transform});
+        allowCollections[fullName] = collection;
+        if (needToConfigure === false)
+          throw new Error("collections inconsistently don't exist");
+        needToConfigure = true;
+        collection._insecure = insecure;
+        var m = {};
+        m["clear-collection-" + fullName] = async function() {
+          await collection.removeAsync({}, { returnServerResultPromise: true });
+        };
+        Meteor.methods(m);
+      }
+
+      cursors.push(collection.find());
+      return collection;
+    };
+
+    var insecureCollection = defineCollection(
+      "collection-insecure", true /*insecure*/);
+    // totally locked down collection
+    var lockedDownCollection = defineCollection(
+      "collection-locked-down", false /*insecure*/);
+    // restricted collection with same allowed modifications, both with and
+    // without the `insecure` package
+    var restrictedCollectionDefaultSecure = defineCollection(
+      "collection-restrictedDefaultSecure", false /*insecure*/);
+    var restrictedCollectionDefaultInsecure = defineCollection(
+      "collection-restrictedDefaultInsecure", true /*insecure*/);
+    var restrictedCollectionForUpdateOptionsTest = defineCollection(
+      "collection-restrictedForUpdateOptionsTest", true /*insecure*/);
+    var restrictedCollectionForPartialAllowTest = defineCollection(
+      "collection-restrictedForPartialAllowTest", true /*insecure*/);
+    var restrictedCollectionForPartialDenyTest = defineCollection(
+      "collection-restrictedForPartialDenyTest", true /*insecure*/);
+    var restrictedCollectionForFetchTest = defineCollection(
+      "collection-restrictedForFetchTest", true /*insecure*/);
+    var restrictedCollectionForFetchAllTest = defineCollection(
+      "collection-restrictedForFetchAllTest", true /*insecure*/);
+    var restrictedCollectionWithTransform = defineCollection(
+      "withTransform", false, function (doc) {
+        return doc.a;
+      });
+    var restrictedCollectionForInvalidTransformTest = defineCollection(
+      "collection-restrictedForInvalidTransform", false /*insecure*/);
+    var restrictedCollectionForClientIdTest = defineCollection(
+      "collection-restrictedForClientIdTest", false /*insecure*/);
+
+    if (needToConfigure) {
+      restrictedCollectionWithTransform.allow({
+        insertAsync: function (userId, doc) {
+          return doc.foo === "foo";
+        },
+        updateAsync: function (userId, doc) {
+          return doc.foo === "foo";
+        },
+        removeAsync: function (userId, doc) {
+          return doc.bar === "bar";
+        }
+      });
+      restrictedCollectionWithTransform.allow({
+        // transform: null means that doc here is the top level, not the 'a'
+        // element.
+        transform: null,
+        insertAsync: function (userId, doc) {
+          return !!doc.topLevelField;
+        },
+        updateAsync: function (userId, doc) {
+          return !!doc.topLevelField;
+        }
+      });
+      restrictedCollectionForInvalidTransformTest.allow({
+        // transform must return an object which is not a mongo id
+        transform: function (doc) { return doc._id; },
+        insert: function () { return true; }
+      });
+      restrictedCollectionForClientIdTest.allow({
+        // This test just requires the collection to trigger the restricted
+        // case.
+        insert: function () { return true; },
+        insertAsync: function () { return true; }
+      });
+
+      // two calls to allow to verify that either validator is sufficient.
+      var allows = [{
+        insertAsync: function(userId, doc) {
+          return doc.canInsert;
+        },
+        updateAsync: function(userId, doc) {
+          return doc.canUpdate;
+        },
+        removeAsync: function (userId, doc) {
+          return doc.canRemove;
+        }
+      }, {
+        insertAsync: function(userId, doc) {
+          return doc.canInsert2;
+        },
+        updateAsync: function(userId, doc, fields, modifier) {
+          return -1 !== fields.indexOf('canUpdate2');
+        },
+        removeAsync: function(userId, doc) {
+          return doc.canRemove2;
+        }
+      }];
+
+      // two calls to deny to verify that either one blocks the change.
+      var denies = [{
+        insertAsync: function(userId, doc) {
+          return doc.cantInsert;
+        },
+        removeAsync: function (userId, doc) {
+          return doc.cantRemove;
+        }
+      }, {
+        insertAsync: function(userId, doc) {
+          // Don't allow explicit ID to be set by the client.
+          return has(doc, '_id');
+        },
+        updateAsync: function(userId, doc, fields, modifier) {
+          return -1 !== fields.indexOf('verySecret');
+        }
+      }];
+
+      [
+        restrictedCollectionDefaultSecure,
+        restrictedCollectionDefaultInsecure,
+        restrictedCollectionForUpdateOptionsTest
+      ].forEach(function (collection) {
+        allows.forEach(function (allow) {
+          collection.allow(allow);
+        });
+        denies.forEach(function (deny) {
+          collection.deny(deny);
+        });
+      });
+
+      // just restrict one operation so that we can verify that others
+      // fail
+      restrictedCollectionForPartialAllowTest.allow({
+        insert: function() {}
+      });
+      restrictedCollectionForPartialDenyTest.deny({
+        insert: function() {}
+      });
+
+      // verify that we only fetch the fields specified - we should
+      // be fetching just field1, field2, and field3.
+      restrictedCollectionForFetchTest.allow({
+        insertAsync: function() { return true; },
+        updateAsync: function(userId, doc) {
+          // throw fields in doc so that we can inspect them in test
+          throw new Meteor.Error(
+            999, "Test: Fields in doc: " + Object.keys(doc).sort().join(','));
+        },
+        removeAsync: function(userId, doc) {
+          // throw fields in doc so that we can inspect them in test
+          throw new Meteor.Error(
+            999, "Test: Fields in doc: " + Object.keys(doc).sort().join(','));
+        },
+        fetch: ['field1']
+      });
+      restrictedCollectionForFetchTest.allow({
+        fetch: ['field2']
+      });
+      restrictedCollectionForFetchTest.deny({
+        fetch: ['field3']
+      });
+
+      // verify that not passing fetch to one of the calls to allow
+      // causes all fields to be fetched
+      restrictedCollectionForFetchAllTest.allow({
+        insertAsync: function() { return true; },
+        updateAsync: function(userId, doc) {
+          // throw fields in doc so that we can inspect them in test
+          throw new Meteor.Error(
+            999, "Test: Fields in doc: " + Object.keys(doc).sort().join(','));
+        },
+        removeAsync: function(userId, doc) {
+          // throw fields in doc so that we can inspect them in test
+          throw new Meteor.Error(
+            999, "Test: Fields in doc: " + Object.keys(doc).sort().join(','));
+        },
+        fetch: ['field1']
+      });
+      restrictedCollectionForFetchAllTest.allow({
+        updateAsync: function() { return true; }
+      });
+    }
+
+    return cursors;
+  });
+}
+
+if (Meteor.isClient) {
+  ['STRING', 'MONGO'].forEach(function (idGeneration) {
+    // Set up a bunch of test collections... on the client! They match the ones
+    // created by setUpAllowTestsCollections.
+
+    var nonce = Random.id();
+    // Tell the server to make, configure, and publish a set of collections unique
+    // to our test run. Since the method does not unblock, this will complete
+    // running on the server before anything else happens.
+    Meteor.subscribe('allowTests', nonce, idGeneration);
+
+    // helper for defining a collection, subscribing to it, and defining
+    // a method to clear it
+    var defineCollection = function(name, transform) {
+      var fullName = name + idGeneration + nonce;
+      var collection = new Mongo.Collection(
+        fullName, {idGeneration: idGeneration, transform: transform});
+
+      collection.callClearMethod = async function () {
+        await Meteor.callAsync('clear-collection-' + fullName);
+      };
+      collection.unnoncedName = name + idGeneration;
+      return collection;
+    };
+
+    // totally insecure collection
+    var insecureCollection = defineCollection("collection-insecure");
+
+    // totally locked down collection
+    var lockedDownCollection = defineCollection("collection-locked-down");
+
+    // restricted collection with same allowed modifications, both with and
+    // without the `insecure` package
+    var restrictedCollectionDefaultSecure = defineCollection(
+      "collection-restrictedDefaultSecure");
+    var restrictedCollectionDefaultInsecure = defineCollection(
+      "collection-restrictedDefaultInsecure");
+    var restrictedCollectionForUpdateOptionsTest = defineCollection(
+      "collection-restrictedForUpdateOptionsTest");
+    var restrictedCollectionForPartialAllowTest = defineCollection(
+      "collection-restrictedForPartialAllowTest");
+    var restrictedCollectionForPartialDenyTest = defineCollection(
+      "collection-restrictedForPartialDenyTest");
+    var restrictedCollectionForFetchTest = defineCollection(
+      "collection-restrictedForFetchTest");
+    var restrictedCollectionForFetchAllTest = defineCollection(
+      "collection-restrictedForFetchAllTest");
+    var restrictedCollectionWithTransform = defineCollection(
+      "withTransform", function (doc) {
+        return doc.a;
+      });
+    var restrictedCollectionForInvalidTransformTest = defineCollection(
+      "collection-restrictedForInvalidTransform");
+    var restrictedCollectionForClientIdTest = defineCollection(
+      "collection-restrictedForClientIdTest");
+
+    // test that if allow is called once then the collection is
+    // restricted, and that other mutations aren't allowed
+    testAsyncMulti('collection - partial allow, ' + idGeneration, [
+      async function(test, expect) {
+        try {
+          await restrictedCollectionForPartialAllowTest.updateAsync(
+            'foo',
+            { $set: { updated: true } },
+            {
+              returnServerResultPromise: true,
+            }
+          );
+        } catch (err) {
+          test.equal(err.error, 403);
+        }
+      },
+    ]);
+
+    // test that if deny is called once then the collection is
+    // restricted, and that other mutations aren't allowed
+    testAsyncMulti('collection - partial deny, ' + idGeneration, [
+      async function(test, expect) {
+        try {
+          await restrictedCollectionForPartialDenyTest.updateAsync(
+            'foo',
+            {
+              $set: { updated: true },
+            },
+            {
+              returnServerResultPromise: true,
+            }
+          );
+        } catch (err) {
+          test.equal(err.error, 403);
+        }
+      },
+    ]);
+
+
+    // test that we only fetch the fields specified
+    testAsyncMulti('collection - fetch, ' + idGeneration, [
+      async function(test, expect) {
+        var fetchId = await restrictedCollectionForFetchTest.insertAsync({
+          field1: 1,
+          field2: 1,
+          field3: 1,
+          field4: 1,
+        },{
+          returnServerResultPromise: true,
+        });
+        var fetchAllId = await restrictedCollectionForFetchAllTest.insertAsync({
+          field1: 1,
+          field2: 1,
+          field3: 1,
+          field4: 1,
+        },{
+          returnServerResultPromise: true,
+        });
+        await restrictedCollectionForFetchTest
+          .updateAsync(
+            fetchId,
+            { $set: { updated: true } },
+            {
+              returnServerResultPromise: true,
+            }
+          )
+          .catch(
+            expect(function(err) {
+              test.equal(
+                err.reason,
+                'Test: Fields in doc: _id,field1,field2,field3'
+              );
+            })
+          );
+
+        await restrictedCollectionForFetchTest
+          .removeAsync(fetchId, {
+            returnServerResultPromise: true,
+          })
+          .catch(
+            expect(function(err) {
+              test.equal(
+                err.reason,
+                'Test: Fields in doc: _id,field1,field2,field3'
+              );
+            })
+          );
+
+        await restrictedCollectionForFetchAllTest
+          .updateAsync(
+            fetchAllId,
+            { $set: { updated: true } },
+            {
+              returnServerResultPromise: true,
+            }
+          )
+          .catch(
+            expect(function(err) {
+              test.equal(
+                err.reason,
+                'Test: Fields in doc: _id,field1,field2,field3,field4'
+              );
+            })
+          );
+        await restrictedCollectionForFetchAllTest
+          .removeAsync(fetchAllId, {
+            returnServerResultPromise: true,
+          })
+          .catch(
+            expect(function(err) {
+              test.equal(
+                err.reason,
+                'Test: Fields in doc: _id,field1,field2,field3,field4'
+              );
+            })
+          );
+      },
+    ]);
+
+    (function() {
+      testAsyncMulti('collection - restricted factories ' + idGeneration, [
+        async function(test, expect) {
+          await restrictedCollectionWithTransform.callClearMethod();
+          test.equal(
+            await restrictedCollectionWithTransform.find().countAsync(),
+            0
+          );
+        },
+        async function(test, expect) {
+          var self = this;
+          await restrictedCollectionWithTransform
+            .insertAsync(
+              {
+                a: { foo: 'foo', bar: 'bar', baz: 'baz' },
+              },
+              {
+                returnServerResultPromise: true,
+              }
+            )
+            .then(
+              expect(function(res) {
+                test.isTrue(res);
+                self.item1 = res;
+              })
+            );
+          await restrictedCollectionWithTransform
+            .insertAsync(
+              {
+                a: { foo: 'foo', bar: 'quux', baz: 'quux' },
+                b: 'potato',
+              },
+              {
+                returnServerResultPromise: true,
+              }
+            )
+            .then(
+              expect(function(res) {
+                test.isTrue(res);
+                self.item2 = res;
+              })
+            );
+          await restrictedCollectionWithTransform
+            .insertAsync(
+              {
+                a: { foo: 'adsfadf', bar: 'quux', baz: 'quux' },
+                b: 'potato',
+              },
+              {
+                returnServerResultPromise: true,
+              }
+            )
+            .catch(
+              expect(function(e, res) {
+                test.isTrue(e);
+              })
+            );
+          await restrictedCollectionWithTransform
+            .insertAsync(
+              {
+                a: { foo: 'bar' },
+                topLevelField: true,
+              },
+              {
+                returnServerResultPromise: true,
+              }
+            )
+            .then(
+              expect(function(res) {
+                test.isTrue(res);
+                self.item3 = res;
+              })
+            );
+        },
+        async function(test, expect) {
+          var self = this;
+          // This should work, because there is an update allow for things with
+          // topLevelField.
+          await restrictedCollectionWithTransform
+            .updateAsync(
+              self.item3,
+              { $set: { xxx: true } },
+              {
+                returnServerResultPromise: true,
+              }
+            )
+            .then(
+              expect(function(res) {
+                test.equal(1, res);
+              })
+            );
+        },
+        async function(test, expect) {
+          var self = this;
+          test.equal(
+            await restrictedCollectionWithTransform.findOneAsync(self.item1),
+            {
+              _id: self.item1,
+              foo: 'foo',
+              bar: 'bar',
+              baz: 'baz',
+            }
+          );
+          await restrictedCollectionWithTransform
+            .removeAsync(self.item1, {
+              returnServerResultPromise: true,
+            })
+            .then(
+              expect(function(res) {
+                test.isTrue(res);
+              })
+            );
+          await restrictedCollectionWithTransform
+            .removeAsync(self.item2, {
+              returnServerResultPromise: true,
+            })
+            .catch(
+              expect(function(e) {
+                test.isTrue(e);
+              })
+            );
+        },
+      ]);
+    })();
+
+    testAsyncMulti('collection - insecure, ' + idGeneration, [
+      async function(test, expect) {
+        await insecureCollection.callClearMethod();
+        test.equal(await insecureCollection.find().countAsync(), 0);
+      },
+      async function(test, expect) {
+        let idThen;
+        var id = await insecureCollection
+          .insertAsync(
+            { foo: 'bar' },
+            {
+              returnServerResultPromise: true,
+            }
+          )
+          .then(async function(res) {
+            idThen = res;
+            test.equal(await insecureCollection.find(res).countAsync(), 1);
+            test.equal((await insecureCollection.findOneAsync(res)).foo, 'bar');
+            return res;
+          });
+        test.equal(idThen, id);
+        test.equal(await insecureCollection.find(id).countAsync(), 1);
+        test.equal((await insecureCollection.findOneAsync(id)).foo, 'bar');
+      },
+    ]);
+
+    testAsyncMulti('collection - locked down, ' + idGeneration, [
+      async function(test, expect) {
+        await lockedDownCollection.callClearMethod();
+        test.equal(await lockedDownCollection.find().countAsync(), 0);
+      },
+      async function(test, expect) {
+        await lockedDownCollection
+          .insertAsync(
+            { foo: 'bar' },
+            {
+              returnServerResultPromise: true,
+            }
+          )
+          .catch(async function(err, res) {
+            test.equal(err.error, 403);
+            test.equal(await lockedDownCollection.find().countAsync(), 0);
+          });
+      },
+    ]);
+
+    (function() {
+      var collection = restrictedCollectionForUpdateOptionsTest;
+      var id1, id2;
+      testAsyncMulti('collection - update options, ' + idGeneration, [
+        // init
+        async function(test, expect) {
+          await collection.callClearMethod().then(async function() {
+            test.equal(await collection.find().countAsync(), 0);
+          });
+        },
+        // put a few objects
+        async function(test, expect) {
+          var doc = { canInsert: true, canUpdate: true };
+          id1 = await collection.insertAsync(doc);
+          id2 = await collection.insertAsync(doc);
+          await collection.insertAsync(doc);
+          await collection
+            .insertAsync(doc, { returnServerResultPromise: true })
+            .then(async function(res) {
+              test.equal(await collection.find().countAsync(), 4);
+            });
+        },
+        // update by id
+        async function(test, expect) {
+          await collection
+            .updateAsync(
+              id1,
+              { $set: { updated: true } },
+              { returnServerResultPromise: true }
+            )
+            .then(async function(res) {
+              test.equal(res, 1);
+              test.equal(
+                await collection.find({ updated: true }).countAsync(),
+                1
+              );
+            });
+        },
+        // update by id in an object
+        async function(test, expect) {
+          await collection
+            .updateAsync(
+              { _id: id2 },
+              { $set: { updated: true } },
+              { returnServerResultPromise: true }
+            )
+            .then(async function(res) {
+              test.equal(res, 1);
+              test.equal(
+                await collection.find({ updated: true }).countAsync(),
+                2
+              );
+            });
+        },
+        // update with replacement operator not allowed, and has nice error.
+        async function(test, expect) {
+          await collection
+            .updateAsync(
+              { _id: id2 },
+              { _id: id2, updated: true },
+              { returnServerResultPromise: true }
+            )
+            .catch(async function(err) {
+              test.equal(err.error, 403);
+              test.matches(err.reason, /In a restricted/);
+              // unchanged
+              test.equal(
+                await collection.find({ updated: true }).countAsync(),
+                2
+              );
+            });
+        },
+        // upsert not allowed, and has nice error.
+        async function(test, expect) {
+          await collection
+            .updateAsync(
+              { _id: id2 },
+              { $set: { upserted: true } },
+              { upsert: true, returnServerResultPromise: true }
+            )
+            .catch(async function(err) {
+              test.equal(err.error, 403);
+              test.matches(err.reason, /in a restricted/);
+              test.equal(
+                await collection.find({ upserted: true }).countAsync(),
+                0
+              );
+            });
+        },
+        // update with rename operator not allowed, and has nice error.
+        async function(test, expect) {
+          await collection
+            .updateAsync(
+              { _id: id2 },
+              { $rename: { updated: 'asdf' } },
+              { returnServerResultPromise: true }
+            )
+            .catch(async function(err) {
+              test.equal(err.error, 403);
+              test.matches(err.reason, /not allowed/);
+              // unchanged
+              test.equal(
+                await collection.find({ updated: true }).countAsync(),
+                2
+              );
+            });
+        },
+        // update method with a non-ID selector is not allowed
+        async function(test, expect) {
+          // We shouldn't even send the method...
+          await test.throwsAsync(async function() {
+            await collection.updateAsync(
+              { updated: { $exists: false } },
+              { $set: { updated: true } }
+            );
+          });
+          // ... but if we did, the server would reject it too.
+          await Meteor.callAsync(
+            '/' + collection._name + '/updateAsync',
+            { updated: { $exists: false } },
+            { $set: { updated: true } }
+          ).catch(async function(err, res) {
+            test.equal(err.error, 403);
+            // unchanged
+            test.equal(
+              await collection.find({ updated: true }).countAsync(),
+              2
+            );
+          });
+        },
+        // make sure it doesn't think that {_id: 'foo', something: else} is ok.
+        async function(test, expect) {
+          await test.throwsAsync(async function() {
+            await collection.updateAsync(
+              { _id: id1, updated: { $exists: false } },
+              { $set: { updated: true } }
+            );
+          });
+        },
+        // remove method with a non-ID selector is not allowed
+        async function(test, expect) {
+          // We shouldn't even send the method...
+          await test.throwsAsync(async function() {
+            await collection.removeAsync({ updated: true });
+          });
+          // ... but if we did, the server would reject it too.
+          await Meteor.callAsync(
+            '/' + collection._name + '/removeAsync',
+            {
+              updated: true,
+            }
+          ).catch(async function(err) {
+            test.equal(err.error, 403);
+            // unchanged
+            test.equal(
+              await collection.find({ updated: true }).countAsync(),
+              2
+            );
+          });
+        },
+      ]);
+    })();
+
+
+    [restrictedCollectionDefaultInsecure, restrictedCollectionDefaultSecure].forEach(
+      function(collection) {
+        var canUpdateId, canRemoveId;
+
+        testAsyncMulti('collection - ' + collection.unnoncedName, [
+          // init
+          async function(test, expect) {
+            await collection.callClearMethod().then(async function() {
+              test.equal(await collection.find().countAsync(), 0);
+            });
+          },
+
+          // insert with no allows passing. request is denied.
+          async function(test, expect) {
+            await collection
+              .insertAsync({}, { returnServerResultPromise: true })
+              .catch(async function(err, res) {
+                test.equal(err.error, 403);
+                test.equal(await collection.find().countAsync(), 0);
+              });
+          },
+          // insert with one allow and one deny. denied.
+          async function(test, expect) {
+            await collection
+              .insertAsync(
+                { canInsert: true, cantInsert: true },
+                { returnServerResultPromise: true }
+              )
+              .catch(async function(err, res) {
+                test.equal(err.error, 403);
+                test.equal(await collection.find().countAsync(), 0);
+              });
+          },
+          // insert with one allow and other deny. denied.
+          async function(test, expect) {
+            await collection
+              .insertAsync(
+                { canInsert: true, _id: Random.id() },
+                { returnServerResultPromise: true }
+              )
+              .catch(async function(err) {
+                test.equal(err.error, 403);
+                test.equal(await collection.find().countAsync(), 0);
+              });
+          },
+          // insert one allow passes. allowed.
+          async function(test, expect) {
+            await collection
+              .insertAsync(
+                { canInsert: true },
+                { returnServerResultPromise: true }
+              )
+              .then(async function(err, res) {
+                test.equal(await collection.find().countAsync(), 1);
+              });
+          },
+          // insert other allow passes. allowed.
+          // includes canUpdate for later.
+          async function(test, expect) {
+            canUpdateId = await collection
+              .insertAsync(
+                { canInsert2: true, canUpdate: true },
+                { returnServerResultPromise: true }
+              )
+              .then(async function(res) {
+                test.equal(await collection.find().countAsync(), 2);
+                return res;
+              });
+          },
+          // yet a third insert executes. this one has canRemove and
+          // cantRemove set for later.
+          async function(test, expect) {
+            canRemoveId = await collection
+              .insertAsync(
+                { canInsert: true, canRemove: true, cantRemove: true },
+                { returnServerResultPromise: true }
+              )
+              .then(async function(res) {
+                test.equal(await collection.find().countAsync(), 3);
+                return res;
+              });
+          },
+
+          // can't update with a non-operator mutation
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                canUpdateId,
+                { newObject: 1 },
+                { returnServerResultPromise: true }
+              )
+              .catch(async function(err, res) {
+                test.equal(err.error, 403);
+                test.equal(await collection.find().countAsync(), 3);
+              });
+          },
+
+          // updating dotted fields works as if we are changing their
+          // top part
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                canUpdateId,
+                { $set: { 'dotted.field': 1 } },
+                { returnServerResultPromise: true }
+              )
+              .then(async function(res) {
+                test.equal(res, 1);
+                test.equal(
+                  (await collection.findOneAsync(canUpdateId)).dotted.field,
+                  1
+                );
+              });
+          },
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                canUpdateId,
+                { $set: { 'verySecret.field': 1 } },
+                { returnServerResultPromise: true }
+              )
+              .catch(async function(err, res) {
+                test.equal(err.error, 403);
+                test.equal(
+                  await collection
+                    .find({ verySecret: { $exists: true } })
+                    .countAsync(),
+                  0
+                );
+              });
+          },
+
+          // update doesn't do anything if no docs match
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                "doesn't exist",
+                { $set: { updated: true } },
+                { returnServerResultPromise: true }
+              )
+              .then(async function(res) {
+                test.equal(res, 0);
+                // nothing has changed
+                test.equal(await collection.find().countAsync(), 3);
+                test.equal(
+                  await collection.find({ updated: true }).countAsync(),
+                  0
+                );
+              });
+          },
+          // update fails when access is denied trying to set `verySecret`
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                canUpdateId,
+                { $set: { verySecret: true } },
+                { returnServerResultPromise: true }
+              )
+              .catch(async function(err) {
+                test.equal(err.error, 403);
+                // nothing has changed
+                test.equal(await collection.find().countAsync(), 3);
+                test.equal(
+                  await collection.find({ updated: true }).countAsync(),
+                  0
+                );
+              });
+          },
+          // update fails when trying to set two fields, one of which is
+          // `verySecret`
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                canUpdateId,
+                { $set: { updated: true, verySecret: true } },
+                { returnServerResultPromise: true }
+              )
+              .catch(async function(err, res) {
+                test.equal(err.error, 403);
+                // nothing has changed
+                test.equal(await collection.find().countAsync(), 3);
+                test.equal(
+                  await collection.find({ updated: true }).countAsync(),
+                  0
+                );
+              });
+          },
+          // update fails when trying to modify docs that don't
+          // have `canUpdate` set
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                canRemoveId,
+                { $set: { updated: true } },
+                { returnServerResultPromise: true }
+              )
+              .catch(async function(err, res) {
+                test.equal(err.error, 403);
+                // nothing has changed
+                test.equal(await collection.find().countAsync(), 3);
+                test.equal(
+                  await collection.find({ updated: true }).countAsync(),
+                  0
+                );
+              });
+          },
+          // update executes when it should
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                canUpdateId,
+                { $set: { updated: true } },
+                { returnServerResultPromise: true }
+              )
+              .then(async function(res) {
+                test.equal(res, 1);
+                test.equal(
+                  await collection.find({ updated: true }).countAsync(),
+                  1
+                );
+              });
+          },
+
+          // remove fails when trying to modify a doc with no `canRemove` set
+          async function(test, expect) {
+            await collection
+              .removeAsync(canUpdateId, { returnServerResultPromise: true })
+              .catch(async function(err, res) {
+                test.equal(err.error, 403);
+                // nothing has changed
+                test.equal(await collection.find().countAsync(), 3);
+              });
+          },
+          // remove fails when trying to modify an doc with `cantRemove`
+          // set
+          async function(test, expect) {
+            await collection
+              .removeAsync(canRemoveId, { returnServerResultPromise: true })
+              .catch(async function(err, res) {
+                test.equal(err.error, 403);
+                // nothing has changed
+                test.equal(await collection.find().countAsync(), 3);
+              });
+          },
+
+          // update the doc to remove cantRemove.
+          async function(test, expect) {
+            await collection
+              .updateAsync(
+                canRemoveId,
+                { $set: { cantRemove: false, canUpdate2: true } },
+                { returnServerResultPromise: true }
+              )
+              .then(async function(res) {
+                test.equal(res, 1);
+                test.equal(
+                  await collection.find({ cantRemove: true }).countAsync(),
+                  0
+                );
+              });
+          },
+
+          // now remove can remove it.
+          async function(test, expect) {
+            await collection
+              .removeAsync(canRemoveId, { returnServerResultPromise: true })
+              .then(async function(res) {
+                test.equal(res, 1);
+                // successfully removed
+                test.equal(await collection.find().countAsync(), 2);
+              });
+          },
+
+          // try to remove a doc that doesn't exist. see we remove no docs.
+          async function(test, expect) {
+            await collection
+              .removeAsync('some-random-id-that-never-matches', {
+                returnServerResultPromise: true,
+              })
+              .then(async function(res) {
+                test.equal(res, 0);
+                // nothing removed
+                test.equal(await collection.find().countAsync(), 2);
+              });
+          },
+
+          // methods can still bypass restrictions
+          async function(test, expect) {
+            await collection.callClearMethod().then(async function(err, res) {
+              // successfully removed
+              test.equal(await collection.find().countAsync(), 0);
+            });
+          },
+        ]);
+      }
+    );
+    testAsyncMulti(
+      'collection - allow/deny transform must return object, ' + idGeneration,
+      [
+        async function(test, expect) {
+          await restrictedCollectionForInvalidTransformTest
+            .insertAsync({}, { returnServerResultPromise: true })
+            .catch(function(err) {
+              test.isTrue(err);
+            });
+        },
+      ]
+    );
+    testAsyncMulti(
+      'collection - restricted collection allows client-side id, ' +
+      idGeneration,
+      [
+        async function(test, expect) {
+          var self = this;
+          self.id = Random.id();
+          await restrictedCollectionForClientIdTest
+            .insertAsync({ _id: self.id }, { returnServerResultPromise: true })
+            .then(async function(res) {
+              test.equal(res, self.id);
+              test.equal(
+                await restrictedCollectionForClientIdTest.findOneAsync(self.id),
+                {
+                  _id: self.id,
+                }
+              );
+            });
+        },
+      ]
+    );
+  });  // end idGeneration loop
+}  // end if isClient
+
+
+
+// A few simple server-only tests which don't need to coordinate collections
+// with the client..
+if (Meteor.isServer) {
+  Tinytest.add("collection - allow and deny validate options", function (test) {
+    var collection = new Mongo.Collection(null);
+
+    test.throws(function () {
+      collection.allow({invalidOption: true});
+    });
+    test.throws(function () {
+      collection.deny({invalidOption: true});
+    });
+
+    ['insert', 'update', 'remove', 'fetch'].forEach(function (key) {
+      var options = {};
+      options[key] = true;
+      test.throws(function () {
+        collection.allow(options);
+      });
+      test.throws(function () {
+        collection.deny(options);
+      });
+    });
+
+    ['insert', 'update', 'remove'].forEach(function (key) {
+      var options = {};
+      options[key] = false;
+      test.throws(function () {
+        collection.allow(options);
+      });
+      test.throws(function () {
+        collection.deny(options);
+      });
+    });
+
+    ['insert', 'update', 'remove'].forEach(function (key) {
+      var options = {};
+      options[key] = undefined;
+      test.throws(function () {
+        collection.allow(options);
+      });
+      test.throws(function () {
+        collection.deny(options);
+      });
+    });
+
+    ['insert', 'update', 'remove'].forEach(function (key) {
+      var options = {};
+      options[key] = ['an array']; // this should be a function, not an array
+      test.throws(function () {
+        collection.allow(options);
+      });
+      test.throws(function () {
+        collection.deny(options);
+      });
+    });
+
+    test.throws(function () {
+      collection.allow({fetch: function () {}}); // this should be an array
+    });
+  });
+
+  Tinytest.add("collection - calling allow restricts", function (test) {
+    var collection = new Mongo.Collection(null);
+    test.equal(collection._restricted, false);
+    collection.allow({
+      insert: function() {}
+    });
+    test.equal(collection._restricted, true);
+  });
+
+  Tinytest.add("collection - global insecure", function (test) {
+    // note: This test alters the global insecure status, by sneakily hacking
+    // the global Package object!
+    var insecurePackage = Package.insecure;
+
+    Package.insecure = {};
+    var collection = new Mongo.Collection(null);
+    test.equal(collection._isInsecure(), true);
+
+    Package.insecure = undefined;
+    test.equal(collection._isInsecure(), false);
+
+    delete Package.insecure;
+    test.equal(collection._isInsecure(), false);
+
+    collection._insecure = true;
+    test.equal(collection._isInsecure(), true);
+
+    if (insecurePackage)
+      Package.insecure = insecurePackage;
+    else
+      delete Package.insecure;
+  });
+}
+
 var AllowAsyncValidateCollection;
 
 Tinytest.addAsync(

From 7ebd1137261a29aa2f6af4ab8f34f1708cd842bd Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 28 Nov 2024 21:09:30 -0300
Subject: [PATCH 0872/1140] DOCS: Add community packages page and
 react-meteor-data package

---
 v3-docs/docs/.vitepress/config.mts         |  15 +
 v3-docs/docs/api/packages-listing.md       |   1 -
 v3-docs/docs/community-packages/index.md   |  10 +
 v3-docs/docs/packages/react-meteor-data.md | 491 +++++++++++++++++++++
 4 files changed, 516 insertions(+), 1 deletion(-)
 create mode 100644 v3-docs/docs/community-packages/index.md
 create mode 100644 v3-docs/docs/packages/react-meteor-data.md

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index a004c2867b..90e1963f61 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -346,6 +346,10 @@ export default defineConfig({
             text: "random",
             link: "/packages/random",
           },
+          {
+            text: "react-meteor-data",
+            link: "/packages/react-meteor-data",
+          },
           {
             text: "server-render",
             link: "/packages/server-render",
@@ -377,6 +381,17 @@ export default defineConfig({
         ],
         collapsed: true,
       },
+      {
+        text: "Community Packages",
+        link: "/community-packages/index",
+        items: [
+          {
+            text: "React Meteor Data",
+            link: "/community-packages/react-meteor-data",
+          },
+        ],
+        collapsed: true,
+      },
       {
         text: "Troubleshooting",
         items: [
diff --git a/v3-docs/docs/api/packages-listing.md b/v3-docs/docs/api/packages-listing.md
index 40d21881ff..c4624c061e 100644
--- a/v3-docs/docs/api/packages-listing.md
+++ b/v3-docs/docs/api/packages-listing.md
@@ -45,7 +45,6 @@
 ### [callback-hook](https://github.com/meteor/meteor/tree/devel/packages/callback-hook) {#callback-hook}
 ### [check](https://github.com/meteor/meteor/tree/devel/packages/check) {#check}
 ### [constraint-solver](https://github.com/meteor/meteor/tree/devel/packages/constraint-solver) {#constraint-solver}
-### [context](https://github.com/meteor/meteor/tree/devel/packages/context) {#context}
 ### [core-runtime](https://github.com/meteor/meteor/tree/devel/packages/core-runtime) {#core-runtime}
 ### [crosswalk](https://github.com/meteor/meteor/tree/devel/packages/crosswalk) {#crosswalk}
 ### [ddp](https://github.com/meteor/meteor/tree/devel/packages/ddp) {#ddp}
diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
new file mode 100644
index 0000000000..8cc5317613
--- /dev/null
+++ b/v3-docs/docs/community-packages/index.md
@@ -0,0 +1,10 @@
+# Community Packages
+
+There are some very popular community packages that do not have a documentation website or only a readme file.
+This section tries to list and add some information about usage, configuration, and examples for these packages.
+
+This section is a work in progress and it is community-driven.
+If you use or have a package that you think would be useful to add to this list, please open a pull request.
+
+## List of Community Packages
+
diff --git a/v3-docs/docs/packages/react-meteor-data.md b/v3-docs/docs/packages/react-meteor-data.md
new file mode 100644
index 0000000000..50717c82b1
--- /dev/null
+++ b/v3-docs/docs/packages/react-meteor-data.md
@@ -0,0 +1,491 @@
+# react-meteor-data
+
+This package provides an integration between React and [`Tracker`](https://atmospherejs.com/meteor/tracker), Meteor's reactive data system.
+
+## Table of Contents
+
+[[toc]]
+
+## Install
+
+::: tip
+
+This package is included with `meteor create` on react options. No need to install it manually.
+
+:::
+
+To install the package, use `meteor add`:
+
+```bash
+meteor add react-meteor-data
+```
+
+You'll also need to install `react` if you have not already:
+
+```bash
+meteor npm install react
+```
+
+### Changelog
+
+[check recent changes here](https://github.com/meteor/react-packages/blob/master/packages/react-meteor-data/CHANGELOG.md)
+
+## Usage
+
+This package provides two ways to use Tracker reactive data in your React components:
+
+- a hook: `useTracker` (v2 only, requires React `^16.8`)
+- a higher-order component (HOC): `withTracker` (v1 and v2).
+
+The `useTracker` hook, introduced in version 2.0.0, embraces the [benefits of hooks](https://reactjs.org/docs/hooks-faq.html). Like all React hooks, it can only be used in function components, not in class components.
+
+The `withTracker` HOC can be used with all components, function or class based.
+
+It is not necessary to rewrite existing applications to use the `useTracker` hook instead of the existing `withTracker` HOC.
+
+### `useTracker(reactiveFn)`
+
+You can use the `useTracker` hook to get the value of a Tracker reactive function in your React "function components." The reactive function will get re-run whenever its reactive inputs change, and the component will re-render with the new value.
+
+`useTracker` manages its own state, and causes re-renders when necessary. There is no need to call React state setters from inside your `reactiveFn`. Instead, return the values from your `reactiveFn` and assign those to variables directly. When the `reactiveFn` updates, the variables will be updated, and the React component will re-render.
+
+Arguments:
+
+- `reactiveFn`: A Tracker reactive function (receives the current computation).
+
+The basic way to use `useTracker` is to simply pass it a reactive function, with no further fuss. This is the preferred configuration in many cases.
+
+#### `useTracker(reactiveFn, deps)`
+
+You can pass an optional deps array as a second value. When provided, the computation will be retained, and reactive updates after the first run will run asynchronously from the react render execution frame. This array typically includes all variables from the outer scope "captured" in the closure passed as the 1st argument. For example, the value of a prop used in a subscription or a minimongo query; see example below.
+
+This should be considered a low level optimization step for cases where your computations are somewhat long running - like a complex minimongo query. In many cases it's safe and even preferred to omit deps and allow the computation to run synchronously with render.
+
+Arguments:
+
+- `reactiveFn`
+- `deps`: An optional array of "dependencies" of the reactive function. This is very similar to how the `deps` argument for [React's built-in `useEffect`, `useCallback` or `useMemo` hooks](https://reactjs.org/docs/hooks-reference.html) work.
+
+```jsx
+import { useTracker } from 'meteor/react-meteor-data';
+
+// React function component.
+function Foo({ listId }) {
+  // This computation uses no value from the outer scope,
+  // and thus does not needs to pass a 'deps' argument.
+  // However, we can optimize the use of the computation
+  // by providing an empty deps array. With it, the
+  // computation will be retained instead of torn down and
+  // rebuilt on every render. useTracker will produce the
+  // same results either way.
+  const currentUser = useTracker(() => Meteor.user(), []);
+
+  // The following two computations both depend on the
+  // listId prop. When deps are specified, the computation
+  // will be retained.
+  const listLoading = useTracker(() => {
+    // Note that this subscription will get cleaned up
+    // when your component is unmounted or deps change.
+    const handle = Meteor.subscribe('todoList', listId);
+    return !handle.ready();
+  }, [listId]);
+  const tasks = useTracker(() => Tasks.find({ listId }).fetch(), [listId]);
+
+  return (
+    <h1>Hello {currentUser.username}</h1>
+    {listLoading ? (
+        <div>Loading</div>
+      ) : (
+        <div>
+          Here is the Todo list {listId}:
+          <ul>
+            {tasks.map(task => (
+              <li key={task._id}>{task.label}</li>
+            ))}
+          </ul>
+        </div>
+      )}
+  );
+}
+```
+
+**Note:** the [eslint-plugin-react-hooks](https://www.npmjs.com/package/eslint-plugin-react-hooks) package provides ESLint hints to help detect missing values in the `deps` argument of React built-in hooks. It can be configured to also validate the `deps` argument of the `useTracker` hook or some other hooks, with the following `eslintrc` config:
+
+```json
+"react-hooks/exhaustive-deps": ["warn", { "additionalHooks": "useTracker|useSomeOtherHook|..." }]
+```
+
+#### `useTracker(reactiveFn, deps, skipUpdate)` or `useTracker(reactiveFn, skipUpdate)`
+
+You may optionally pass a function as a second or third argument. The `skipUpdate` function can evaluate the return value of `reactiveFn` for changes, and control re-renders in sensitive cases. _Note:_ This is not meant to be used with a deep compare (even fast-deep-equals), as in many cases that may actually lead to worse performance than allowing React to do it's thing. But as an example, you could use this to compare an `updatedAt` field between updates, or a subset of specific fields, if you aren't using the entire document in a subscription. As always with any optimization, measure first, then optimize second. Make sure you really need this before implementing it.
+
+Arguments:
+
+- `reactiveFn`
+- `deps?` - optional - you may omit this, or pass a "falsy" value.
+- `skipUpdate` - A function which receives two arguments: `(prev, next) => (prev === next)`. `prev` and `next` will match the type or data shape as that returned by `reactiveFn`. Note: A return value of `true` means the update will be "skipped". `false` means re-render will occur as normal. So the function should be looking for equivalence.
+
+```jsx
+import { useTracker } from 'meteor/react-meteor-data';
+
+// React function component.
+function Foo({ listId }) {
+  const tasks = useTracker(
+    () => Tasks.find({ listId }).fetch(), [listId],
+    (prev, next) => {
+      // prev and next will match the type returned by the reactiveFn
+      return prev.every((doc, i) => (
+        doc._id === next[i] && doc.updatedAt === next[i]
+      )) && prev.length === next.length;
+    }
+  );
+
+  return (
+    <h1>Hello {currentUser.username}</h1>
+    <div>
+      Here is the Todo list {listId}:
+      <ul>
+        {tasks.map(task => (
+          <li key={task._id}>{task.label}</li>
+        ))}
+      </ul>
+    </div>
+  );
+}
+```
+
+### `withTracker(reactiveFn)`
+
+You can use the `withTracker` HOC to wrap your components and pass them additional props values from a Tracker reactive function. The reactive function will get re-run whenever its reactive inputs change, and the wrapped component will re-render with the new values for the additional props.
+
+Arguments:
+
+- `reactiveFn`: a Tracker reactive function, getting the props as a parameter, and returning an object of additional props to pass to the wrapped component.
+
+```jsx
+import { withTracker } from 'meteor/react-meteor-data';
+
+// React component (function or class).
+function Foo({ listId, currentUser, listLoading, tasks }) {
+  return (
+    <h1>Hello {currentUser.username}</h1>
+    {listLoading ?
+      <div>Loading</div> :
+      <div>
+        Here is the Todo list {listId}:
+        <ul>{tasks.map(task => <li key={task._id}>{task.label}</li>)}</ul>
+      </div}
+  );
+}
+
+export default withTracker(({ listId }) => {
+  // Do all your reactive data access in this function.
+  // Note that this subscription will get cleaned up when your component is unmounted
+  const handle = Meteor.subscribe('todoList', listId);
+
+  return {
+    currentUser: Meteor.user(),
+    listLoading: !handle.ready(),
+    tasks: Tasks.find({ listId }).fetch(),
+  };
+})(Foo);
+```
+
+The returned component will, when rendered, render `Foo` (the "lower-order" component) with its provided props in addition to the result of the reactive function. So `Foo` will receive `{ listId }` (provided by its parent) as well as `{ currentUser, listLoading, tasks }` (added by the `withTracker` HOC).
+
+For more information, see the [React article](http://guide.meteor.com/react.html) in the Meteor Guide.
+
+### `withTracker({ reactiveFn, pure, skipUpdate })`
+
+The `withTracker` HOC can receive a config object instead of a simple reactive function.
+
+- `getMeteorData` - The `reactiveFn`.
+- `pure` - `true` by default. Causes the resulting Container to be wrapped with React's `memo()`.
+- `skipUpdate` - A function which receives two arguments: `(prev, next) => (prev === next)`. `prev` and `next` will match the type or data shape as that returned by `reactiveFn`. Note: A return value of `true` means the update will be "skipped". `false` means re-render will occur as normal. So the function should be looking for equivalence.
+
+```jsx
+import { withTracker } from 'meteor/react-meteor-data';
+
+// React component (function or class).
+function Foo({ listId, currentUser, listLoading, tasks }) {
+  return (
+    <h1>Hello {currentUser.username}</h1>
+    {listLoading ?
+      <div>Loading</div> :
+      <div>
+        Here is the Todo list {listId}:
+        <ul>{tasks.map(task => <li key={task._id}>{task.label}</li>)}</ul>
+      </div}
+  );
+}
+
+export default withTracker({
+  getMeteorData ({ listId }) {
+    // Do all your reactive data access in this function.
+    // Note that this subscription will get cleaned up when your component is unmounted
+    const handle = Meteor.subscribe('todoList', listId);
+
+    return {
+      currentUser: Meteor.user(),
+      listLoading: !handle.ready(),
+      tasks: Tasks.find({ listId }).fetch(),
+    };
+  },
+  pure: true,
+  skipUpdate (prev, next) {
+    // prev and next will match the shape returned by the reactiveFn
+    return (
+      prev.currentUser?._id === next.currentUser?._id
+    ) && (
+      prev.listLoading === next.listLoading
+    ) && (
+      prev.tasks.every((doc, i) => (
+        doc._id === next[i] && doc.updatedAt === next[i]
+      ))
+      && prev.tasks.length === next.tasks.length
+    );
+  }
+})(Foo);
+```
+
+### `useSubscribe(subName, ...args)`
+
+`useSubscribe` is a convenient short hand for setting up a subscription. It is particularly useful when working with `useFind`, which should NOT be used for setting up subscriptions. At its core, it is a very simple wrapper around `useTracker` (with no deps) to create the subscription in a safe way, and allows you to avoid some of the ceremony around defining a factory and defining deps. Just pass the name of your subscription, and your arguments.
+
+`useSubscribe` returns an `isLoading` function. You can call `isLoading()` to react to changes in the subscription's loading state. The `isLoading` function will both return the loading state of the subscription, and set up a reactivity for the loading state change. If you don't call this function, no re-render will occur when the loading state changes.
+
+```jsx
+// Note: isLoading is a function!
+const isLoading = useSubscribe("posts", groupId);
+const posts = useFind(() => Posts.find({ groupId }), [groupId]);
+
+if (isLoading()) {
+  return <Loading />;
+} else {
+  return (
+    <ul>
+      {posts.map((post) => (
+        <li key={post._id}>{post.title}</li>
+      ))}
+    </ul>
+  );
+}
+```
+
+If you want to conditionally subscribe, you can set the `name` field (the first argument) to a falsy value to bypass the subscription.
+
+```jsx
+const needsData = false;
+const isLoading = useSubscribe(needsData ? "my-pub" : null);
+
+// When a subscription is not used, isLoading() will always return false
+```
+
+### `useFind(cursorFactory, deps)`
+
+The `useFind` hook can substantially speed up the rendering (and rerendering) of lists coming from mongo queries (subscriptions). It does this by controlling document object references. By providing a highly tailored cursor management within the hook, using the `Cursor.observe` API, `useFind` carefully updates only the object references changed during a DDP update. This approach allows a tighter use of core React tools and philosophies to turbo charge your list renders. It is a very different approach from the more general purpose `useTracker`, and it requires a bit more set up. A notable difference is that you should NOT call `.fetch()`. `useFind` requires its factory to return a `Mongo.Cursor` object. You may also return `null`, if you want to conditionally set up the Cursor.
+
+Here is an example in code:
+
+```jsx
+import React, { memo } from "react";
+import { useFind } from "meteor/react-meteor-data";
+import TestDocs from "/imports/api/collections/TestDocs";
+
+// Memoize the list item
+const ListItem = memo(({ doc }) => {
+  return (
+    <li>
+      {doc.id},{doc.updated}
+    </li>
+  );
+});
+
+const Test = () => {
+  const docs = useFind(() => TestDocs.find(), []);
+  return (
+    <ul>
+      {docs.map((doc) => (
+        <ListItem key={doc.id} doc={doc} />
+      ))}
+    </ul>
+  );
+};
+
+// Later on, update a single document - notice only that single component is updated in the DOM
+TestDocs.update({ id: 2 }, { $inc: { someProp: 1 } });
+```
+
+If you want to conditionally call the find method based on some props configuration or anything else, return `null` from the factory.
+
+```jsx
+const docs = useFind(() => {
+  if (props.skip) {
+    return null;
+  }
+  return TestDocs.find();
+}, []);
+```
+
+### Concurrent Mode, Suspense and Error Boundaries
+
+There are some additional considerations to keep in mind when using Concurrent Mode, Suspense and Error Boundaries, as
+each of these can cause React to cancel and discard (toss) a render, including the result of the first run of your
+reactive function. One of the things React developers often stress is that we should not create "side-effects" directly
+in the render method or in functional components. There are a number of good reasons for this, including allowing the
+React runtime to cancel renders. Limiting the use of side-effects allows features such as concurrent mode, suspense and
+error boundaries to work deterministically, without leaking memory or creating rogue processes. Care should be taken to
+avoid side effects in your reactive function for these reasons. (Note: this caution does not apply to Meteor specific
+side-effects like subscriptions, since those will be automatically cleaned up when `useTracker`'s computation is
+disposed.)
+
+Ideally, side-effects such as creating a Meteor computation would be done in `useEffect`. However, this is problematic
+for Meteor, which mixes an initial data query with setting up the computation to watch those data sources all in one
+initial run. If we wait to do that in `useEffect`, we'll end up rendering a minimum of 2 times (and using hacks for the
+first one) for every component which uses `useTracker` or `withTracker`, or not running at all in the initial render and
+still requiring a minimum of 2 renders, and complicating the API.
+
+To work around this and keep things running fast, we are creating the computation in the render method directly, and
+doing a number of checks later in `useEffect` to make sure we keep that computation fresh and everything up to date,
+while also making sure to clean things up if we detect the render has been tossed. For the most part, this should all be
+transparent.
+
+The important thing to understand is that your reactive function can be initially called more than once for a single
+render, because sometimes the work will be tossed. Additionally, `useTracker` will not call your reactive function
+reactively until the render is committed (until `useEffect` runs). If you have a particularly fast changing data source,
+this is worth understanding. With this very short possible suspension, there are checks in place to make sure the
+eventual result is always up to date with the current state of the reactive function. Once the render is "committed",
+and the component mounted, the computation is kept running, and everything will run as expected.
+
+## Suspendable version of hooks
+
+### `useTracker`
+
+This is a version of `useTracker` that can be used with React Suspense.
+
+For its first argument, a key is necessary, witch is used to identify the computation and to avoid recreating it when the
+component is re-rendered.
+
+Its second argument is a function that can be async and reactive,
+this argument works similar to the original `useTracker` that does not suspend.
+
+For its _optional_ third argument, the dependency array, works similar to the `useTracker` that does not suspend,
+you pass in an array of variables that this tracking function depends upon.
+
+For its _optional_ fourth argument, the options object, works similar to the `useTracker` that does not suspend,
+you pass in a function for when should skip the update.
+
+```jsx
+import { useTracker } from "meteor/react-meteor-data/suspense";
+import { useSubscribe } from "meteor/react-meteor-data/suspense";
+
+function Tasks() {
+  // this component will suspend
+  useSubscribe("tasks");
+  const { username } = useTracker("user", () => Meteor.user()); // Meteor.user() is async meteor 3.0
+  const tasksByUser = useTracker(
+    "tasksByUser",
+    () =>
+      TasksCollection.find(
+        { username },
+        { sort: { createdAt: -1 } }
+      ).fetchAsync() // async call
+  );
+
+  // render the tasks
+}
+```
+
+### Maintaining the reactive context
+
+To maintain a reactive context using the new Meteor Async methods, we are using the new `Tracker.withComputation` API to maintain the reactive context of an
+async call, this is needed because otherwise it would be only called once, and the computation would never run again,
+this way, every time we have a new Link being added, this useTracker is ran.
+
+```jsx
+// needs Tracker.withComputation because otherwise it would be only called once, and the computation would never run again
+const docs = useTracker("name", async (c) => {
+  const placeholders = await fetch(
+    "https://jsonplaceholder.typicode.com/todos"
+  ).then((x) => x.json());
+  console.log(placeholders);
+  return await Tracker.withComputation(c, () =>
+    LinksCollection.find().fetchAsync()
+  );
+});
+```
+
+A rule of thumb is that if you are using a reactive function for example `find` + `fetchAsync`, it is nice to wrap it
+inside `Tracker.withComputation` to make sure that the computation is kept alive, if you are just calling that function
+that is not necessary, like the one bellow, will be always reactive.
+
+```jsx
+const docs = useTracker("name", () => LinksCollection.find().fetchAsync());
+```
+
+### `useSubscribe`
+
+This is a version of `useSubscribe` that can be used with React Suspense.
+It is similar to `useSubscribe`, it throws a promise and suspends the rendering until the promise is resolved.
+It does not return a Meteor Handle to control the subscription
+
+```jsx
+import { useTracker } from "meteor/react-meteor-data/suspense";
+import { useSubscribe } from "meteor/react-meteor-data/suspense";
+
+function Tasks() {
+  // this component will suspend
+  useSubscribe("tasks");
+  const { username } = useTracker("user", () => Meteor.user()); // Meteor.user() is async meteor 3.0
+  const tasksByUser = useTracker(
+    "tasksByUser",
+    () =>
+      TasksCollection.find(
+        { username },
+        { sort: { createdAt: -1 } }
+      ).fetchAsync() // async call
+  );
+
+  // render the tasks
+}
+```
+
+### `useFind`
+
+This is a version of `useFind` that can be used with React Suspense.
+It has a few differences from the `useFind` without suspense, it throws a promise and suspends the rendering until the promise is resolved.
+It returns the result and it is reactive.
+You should pass as the first parameter the collection where is being searched upon and as the second parameter an array with the arguments,
+the same arguments that you would pass to the `find` method of the collection, third parameter is optional, and it is dependency array object.
+It's meant for the SSR, you don't have to use it if you're not interested in SSR.
+
+```jsx
+import { useFind } from "meteor/react-meteor-data/suspense";
+import { useSubscribe } from "meteor/react-meteor-data/suspense";
+
+function Tasks() {
+  // this component will suspend
+  useSubscribe("tasks");
+  const tasksByUser = useFind(TasksCollection, [
+    {},
+    { sort: { createdAt: -1 } },
+  ]);
+
+  // render the tasks
+}
+```
+
+## Version compatibility notes
+
+- `react-meteor-data` v2.x :
+
+  - `useTracker` hook + `withTracker` HOC
+  - Requires React `^16.8`.
+  - Implementation is compatible with "React Suspense", concurrent mode and error boundaries.
+  - The `withTracker` HOC is strictly backwards-compatible with the one provided in v1.x, the major version number is only motivated by the bump of React version requirement. Provided a compatible React version, existing Meteor apps leveraging the `withTracker` HOC can freely upgrade from v1.x to v2.x, and gain compatibility with future React versions.
+  - The previously deprecated `createContainer` has been removed.
+
+- `react-meteor-data` v0.x :
+  - `withTracker` HOC (+ `createContainer`, kept for backwards compatibility with early v0.x releases)
+  - Requires React `^15.3` or `^16.0`.
+  - Implementation relies on React lifecycle methods (`componentWillMount` / `componentWillUpdate`) that are [marked for deprecation in future React versions](https://reactjs.org/blog/2018/03/29/react-v-16-3.html#component-lifecycle-changes) ("React Suspense").

From 419f8ec5bd39319707eb4b781ecf2ab2a62a052f Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 28 Nov 2024 21:11:01 -0300
Subject: [PATCH 0873/1140] DOCS: Update the community packages links

---
 v3-docs/docs/.vitepress/config.mts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 90e1963f61..5cf32b8890 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -384,12 +384,7 @@ export default defineConfig({
       {
         text: "Community Packages",
         link: "/community-packages/index",
-        items: [
-          {
-            text: "React Meteor Data",
-            link: "/community-packages/react-meteor-data",
-          },
-        ],
+        items: [],
         collapsed: true,
       },
       {

From b6157fe37b6a0787c3c0f87697891e34ef48fba5 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <70247653+Grubba27@users.noreply.github.com>
Date: Fri, 29 Nov 2024 10:47:25 -0300
Subject: [PATCH 0874/1140] Update v3-docs/docs/community-packages/index.md

Co-authored-by: Leonardo Venturini <leovenbag@gmail.com>
---
 v3-docs/docs/community-packages/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
index 8cc5317613..fbe9df55db 100644
--- a/v3-docs/docs/community-packages/index.md
+++ b/v3-docs/docs/community-packages/index.md
@@ -1,6 +1,6 @@
 # Community Packages
 
-There are some very popular community packages that do not have a documentation website or only a readme file.
+There are some very popular community packages that do not have a documentation website or only have a readme file.
 This section tries to list and add some information about usage, configuration, and examples for these packages.
 
 This section is a work in progress and it is community-driven.

From 4c30c531350412e4026db8d72420de752faf03ea Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 2 Dec 2024 11:11:13 -0300
Subject: [PATCH 0875/1140] DOCS: refactor and update community packages page

---
 v3-docs/docs/community-packages/index.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
index fbe9df55db..3c23fad224 100644
--- a/v3-docs/docs/community-packages/index.md
+++ b/v3-docs/docs/community-packages/index.md
@@ -3,8 +3,14 @@
 There are some very popular community packages that do not have a documentation website or only have a readme file.
 This section tries to list and add some information about usage, configuration, and examples for these packages.
 
-This section is a work in progress and it is community-driven.
+> Think this section as an `Awesome List`, similar to [`awesome-node`](https://github.com/sindresorhus/awesome-nodejs) or [`awesome-react`](https://github.com/enaqx/awesome-react)
+
 If you use or have a package that you think would be useful to add to this list, please open a pull request.
 
-## List of Community Packages
+Please bear in mind if you are adding a package to this list, try providing as much information as possible, including:
+- `Who maintains the package` – how to get in touch to submit issues or questions
+- `Why is this package for?`
+- `API`
+- `examples/guide`
 
+## List of Community Packages

From 0f840eafcee35f8b79bcbeae9800fba4f0fe0ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 2 Dec 2024 15:17:30 +0100
Subject: [PATCH 0876/1140] fix allow/deny failing regression and ensure sync
 configs accepts async validation

---
 packages/allow-deny/allow-deny.js   | 178 +---------------------------
 packages/mongo/tests/allow_tests.js |  13 +-
 2 files changed, 10 insertions(+), 181 deletions(-)

diff --git a/packages/allow-deny/allow-deny.js b/packages/allow-deny/allow-deny.js
index d6e58f1f8b..3d52acd4c2 100644
--- a/packages/allow-deny/allow-deny.js
+++ b/packages/allow-deny/allow-deny.js
@@ -315,36 +315,6 @@ CollectionPrototype._validatedInsertAsync = async function(userId, doc,
   return self._collection.insertAsync.call(self._collection, doc);
 };
 
-CollectionPrototype._validatedInsert = function (userId, doc,
-                                                         generatedId) {
-  const self = this;
-
-  // call user validators.
-  // Any deny returns true means denied.
-  if (self._validators.insert.deny.some((validator) => {
-    return validator(userId, docToValidate(validator, doc, generatedId));
-  })) {
-    throw new Meteor.Error(403, "Access denied");
-  }
-  // Any allow returns true means proceed. Throw error if they all fail.
-
-  if (self._validators.insert.allow.every((validator) => {
-    return !validator(userId, docToValidate(validator, doc, generatedId));
-  })) {
-    throw new Meteor.Error(403, "Access denied");
-  }
-
-  // If we generated an ID above, insert it now: after the validation, but
-  // before actually inserting.
-  if (generatedId !== null)
-    doc._id = generatedId;
-
-  return (Meteor.isServer
-    ? self._collection.insertAsync
-    : self._collection.insert
-  ).call(self._collection, doc);
-};
-
 // Simulate a mongo `update` operation while validating that the access
 // control rules set by calls to `allow/deny` are satisfied. If all
 // pass, rewrite the mongo operation to use $in to set the list of
@@ -408,8 +378,9 @@ CollectionPrototype._validatedUpdateAsync = async function(
     });
   }
 
-
-  const doc = await self._collection.findOneAsync(selector, findOptions) || {};
+  const doc = await self._collection.findOneAsync(selector, findOptions);
+  if (!doc)  // none satisfied!
+    return 0;
 
   // call user validators.
   // Any deny returns true means denied.
@@ -436,9 +407,6 @@ CollectionPrototype._validatedUpdateAsync = async function(
     throw new Meteor.Error(403, "Access denied");
   }
 
-  if (!doc)  // none satisfied!
-    return 0;
-
   options._forbidReplace = true;
 
   // Back when we supported arbitrary client-provided selectors, we actually
@@ -450,102 +418,6 @@ CollectionPrototype._validatedUpdateAsync = async function(
     self._collection, selector, mutator, options);
 };
 
-CollectionPrototype._validatedUpdate = function(
-    userId, selector, mutator, options) {
-  const self = this;
-
-  check(mutator, Object);
-
-  options = Object.assign(Object.create(null), options);
-
-  if (!LocalCollection._selectorIsIdPerhapsAsObject(selector))
-    throw new Error("validated update should be of a single ID");
-
-  // We don't support upserts because they don't fit nicely into allow/deny
-  // rules.
-  if (options.upsert)
-    throw new Meteor.Error(403, "Access denied. Upserts not " +
-                           "allowed in a restricted collection.");
-
-  const noReplaceError = "Access denied. In a restricted collection you can only" +
-        " update documents, not replace them. Use a Mongo update operator, such " +
-        "as '$set'.";
-
-  const mutatorKeys = Object.keys(mutator);
-
-  // compute modified fields
-  const modifiedFields = {};
-
-  if (mutatorKeys.length === 0) {
-    throw new Meteor.Error(403, noReplaceError);
-  }
-  mutatorKeys.forEach((op) => {
-    const params = mutator[op];
-    if (op.charAt(0) !== '$') {
-      throw new Meteor.Error(403, noReplaceError);
-    } else if (!hasOwn.call(ALLOWED_UPDATE_OPERATIONS, op)) {
-      throw new Meteor.Error(
-        403, "Access denied. Operator " + op + " not allowed in a restricted collection.");
-    } else {
-      Object.keys(params).forEach((field) => {
-        // treat dotted fields as if they are replacing their
-        // top-level part
-        if (field.indexOf('.') !== -1)
-          field = field.substring(0, field.indexOf('.'));
-
-        // record the field we are trying to change
-        modifiedFields[field] = true;
-      });
-    }
-  });
-
-  const fields = Object.keys(modifiedFields);
-
-  const findOptions = {transform: null};
-  if (!self._validators.fetchAllFields) {
-    findOptions.fields = {};
-    self._validators.fetch.forEach((fieldName) => {
-      findOptions.fields[fieldName] = 1;
-    });
-  }
-
-  const doc = self._collection.findOne(selector, findOptions);
-  if (!doc)  // none satisfied!
-    return 0;
-
-  // call user validators.
-  // Any deny returns true means denied.
-  if (self._validators.update.deny.some((validator) => {
-    const factoriedDoc = transformDoc(validator, doc);
-    return validator(userId,
-                     factoriedDoc,
-                     fields,
-                     mutator);
-  })) {
-    throw new Meteor.Error(403, "Access denied");
-  }
-  // Any allow returns true means proceed. Throw error if they all fail.
-  if (self._validators.update.allow.every((validator) => {
-    const factoriedDoc = transformDoc(validator, doc);
-    return !validator(userId,
-                      factoriedDoc,
-                      fields,
-                      mutator);
-  })) {
-    throw new Meteor.Error(403, "Access denied");
-  }
-
-  options._forbidReplace = true;
-
-  // Back when we supported arbitrary client-provided selectors, we actually
-  // rewrote the selector to include an _id clause before passing to Mongo to
-  // avoid races, but since selector is guaranteed to already just be an ID, we
-  // don't have to any more.
-
-  return self._collection.update.call(
-    self._collection, selector, mutator, options);
-};
-
 // Only allow these operations in validated updates. Specifically
 // whitelist operations, rather than blacklist, so new complex
 // operations that are added aren't automatically allowed. A complex
@@ -570,7 +442,9 @@ CollectionPrototype._validatedRemoveAsync = async function(userId, selector) {
     });
   }
 
-  const doc = await self._collection.findOneAsync(selector, findOptions) || {};
+  const doc = await self._collection.findOneAsync(selector, findOptions);
+  if (!doc)
+    return 0;
 
   // call user validators.
   // Any deny returns true means denied.
@@ -588,9 +462,6 @@ CollectionPrototype._validatedRemoveAsync = async function(userId, selector) {
     throw new Meteor.Error(403, "Access denied");
   }
 
-  if (!doc)
-    return 0;
-
   // Back when we supported arbitrary client-provided selectors, we actually
   // rewrote the selector to {_id: {$in: [ids that we found]}} before passing to
   // Mongo to avoid races, but since selector is guaranteed to already just be
@@ -599,43 +470,6 @@ CollectionPrototype._validatedRemoveAsync = async function(userId, selector) {
   return self._collection.removeAsync.call(self._collection, selector);
 };
 
-CollectionPrototype._validatedRemove = function(userId, selector) {
-  const self = this;
-
-  const findOptions = {transform: null};
-  if (!self._validators.fetchAllFields) {
-    findOptions.fields = {};
-    self._validators.fetch.forEach((fieldName) => {
-      findOptions.fields[fieldName] = 1;
-    });
-  }
-
-  const doc = self._collection.findOne(selector, findOptions);
-  if (!doc)
-    return 0;
-
-  // call user validators.
-  // Any deny returns true means denied.
-  if (self._validators.remove.deny.some((validator) => {
-    return validator(userId, transformDoc(validator, doc));
-  })) {
-    throw new Meteor.Error(403, "Access denied");
-  }
-  // Any allow returns true means proceed. Throw error if they all fail.
-  if (self._validators.remove.allow.every((validator) => {
-    return !validator(userId, transformDoc(validator, doc));
-  })) {
-    throw new Meteor.Error(403, "Access denied");
-  }
-
-  // Back when we supported arbitrary client-provided selectors, we actually
-  // rewrote the selector to {_id: {$in: [ids that we found]}} before passing to
-  // Mongo to avoid races, but since selector is guaranteed to already just be
-  // an ID, we don't have to any more.
-
-  return self._collection.remove.call(self._collection, selector);
-};
-
 CollectionPrototype._callMutatorMethodAsync = function _callMutatorMethodAsync(name, args, options = {}) {
 
   // For two out of three mutator methods, the first argument is a selector
diff --git a/packages/mongo/tests/allow_tests.js b/packages/mongo/tests/allow_tests.js
index 41abcd32a3..84442b8003 100644
--- a/packages/mongo/tests/allow_tests.js
+++ b/packages/mongo/tests/allow_tests.js
@@ -874,6 +874,7 @@ if (Meteor.isClient) {
                 { returnServerResultPromise: true }
               )
               .then(async function(res) {
+                console.log('res', res);
                 test.equal(res, 0);
                 // nothing has changed
                 test.equal(await collection.find().countAsync(), 3);
@@ -1328,14 +1329,6 @@ function configAllSyncAllowDeny(collection, configType = 'allow', enabled) {
 async function runAllSyncExpect(test, collection, expected) {
   let id;
   /* sync tests */
-  const syncCallback = (error) => {
-    if (error) {
-      test.isTrue(!expected);
-      return;
-    }
-    test.isTrue(expected);
-  };
-
   await new Promise((resolve) => {
     id = collection.insert({ num: 2 }, (error, result) => {
       if (error) {
@@ -1349,6 +1342,7 @@ async function runAllSyncExpect(test, collection, expected) {
   });
 
   await new Promise((resolve) => {
+    id = collection.insert({ force: true });
     collection.update(id, { $set: { num: 22 } }, (error, result) => {
       if (error) {
         test.isTrue(!expected);
@@ -1361,6 +1355,7 @@ async function runAllSyncExpect(test, collection, expected) {
   });
 
   await new Promise((resolve) => {
+    id = collection.insert({ force: true });
     collection.remove(id, (error, result) => {
       if (error) {
         test.isTrue(!expected);
@@ -1384,7 +1379,7 @@ testAsyncMulti("collection - sync definitions on allow/deny rules", [
       await AllowDenySyncRulesCollections.allowed.removeAsync();
     }
 
-    configAllAsyncAllowDeny(AllowDenySyncRulesCollections.allowed, 'allow', true);
+    configAllSyncAllowDeny(AllowDenySyncRulesCollections.allowed, 'allow', true);
     if (Meteor.isClient) {
       await runAllSyncExpect(test, AllowDenySyncRulesCollections.allowed, true);
     }

From 750fca9883174cf51702e62698b32ac924f2ca86 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 2 Dec 2024 10:20:40 -0400
Subject: [PATCH 0877/1140] Revert "add adding tasks to beginning of queue"

This reverts commit 93319b9d1125f114bcf972994e37d192725e451a.
---
 packages/meteor/asynchronous_queue.js | 19 +------------------
 packages/mongo/observe_multiplex.ts   |  4 ++--
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/packages/meteor/asynchronous_queue.js b/packages/meteor/asynchronous_queue.js
index 773958a378..f2b1482554 100644
--- a/packages/meteor/asynchronous_queue.js
+++ b/packages/meteor/asynchronous_queue.js
@@ -4,7 +4,7 @@ class AsynchronousQueue {
    * when needed. Configurable batch size and concurrency limits help optimize throughput.
    */
   constructor({
-                batchSize = 256,
+                batchSize = 50,
                 maxConcurrent = 10,
                 orderMatters = true
               } = {}) {
@@ -149,23 +149,6 @@ class AsynchronousQueue {
 
     this._draining = false;
   }
-
-  unshiftTasks(tasks) {
-    const wrappedTasks = tasks.map(task => ({
-      task: Meteor.bindEnvironment(task, function (e) {
-        Meteor._debug('Exception from task', e);
-        throw e;
-      }),
-      name: task.name
-    }));
-
-    // Add all tasks to the front of the queue
-    wrappedTasks.reverse().forEach(wrappedTask => {
-      this._taskHandles.unshift(wrappedTask);
-    });
-
-    this._scheduleRun();
-  }
 }
 
 Meteor._AsynchronousQueue = AsynchronousQueue;
diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index 0fd4d39eba..a99d64d562 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -61,11 +61,11 @@ export class ObserveMultiplexer {
     Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
       "mongo-livedata", "observe-handles", 1);
 
-    await this._queue.unshiftTasks([async () => {
+    await this._queue.runTask(async () => {
       this._handles![handle._id] = handle;
       await this._sendAdds(handle);
       --this._addHandleTasksScheduledButNotPerformed;
-    }]);
+    });
     await this._readyPromise;
   }
 

From 605faa91297572964052f8e6fd8ff2399f9aadfd Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 2 Dec 2024 10:33:24 -0400
Subject: [PATCH 0878/1140] Refactor AsynchronousQueue constructor to use
 environment variables for batch size and concurrency limits

- Updated the constructor to read batch size and maximum concurrent tasks from environment variables (METEOR_ASYNC_QUEUE_BATCH_SIZE and METEOR_ASYNC_QUEUE_MAX_CONCURRENT) with default values.
- Improved documentation to clarify configuration options for batch processing and task order preservation.
---
 packages/meteor/asynchronous_queue.js | 28 +++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/meteor/asynchronous_queue.js b/packages/meteor/asynchronous_queue.js
index f2b1482554..3d0a80de35 100644
--- a/packages/meteor/asynchronous_queue.js
+++ b/packages/meteor/asynchronous_queue.js
@@ -2,18 +2,30 @@ class AsynchronousQueue {
   /**
    * Creates a queue that processes tasks in parallel batches while preserving completion order
    * when needed. Configurable batch size and concurrency limits help optimize throughput.
+   * 
+   * Batch size and concurrency are configured via environment variables:
+   * - METEOR_ASYNC_QUEUE_BATCH_SIZE: Number of tasks to process in each batch (default: 128)
+   * - METEOR_ASYNC_QUEUE_MAX_CONCURRENT: Maximum number of concurrent tasks (default: 16)
+   * 
+   * @param {Object} options
+   * @param {boolean} [options.orderMatters=true] Whether task completion order should be preserved
    */
-  constructor({
-                batchSize = 50,
-                maxConcurrent = 10,
-                orderMatters = true
-              } = {}) {
+  constructor({ orderMatters = true } = {}) {
+    this._batchSize = parseInt(
+      process.env.METEOR_ASYNC_QUEUE_BATCH_SIZE ||
+      '128'
+    );
+    
+    this._maxConcurrent = parseInt(
+      process.env.METEOR_ASYNC_QUEUE_MAX_CONCURRENT ||
+      '16'
+    );
+    
+    this._orderMatters = orderMatters;
+
     this._taskHandles = new Meteor._DoubleEndedQueue();
     this._runningOrRunScheduled = false;
     this._draining = false;
-    this._batchSize = batchSize;
-    this._maxConcurrent = maxConcurrent;
-    this._orderMatters = orderMatters;
     this._activePromises = new Set();
   }
 

From 060799c67a71f958fb2665b245ffbc9186af332d Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 2 Dec 2024 10:44:42 -0400
Subject: [PATCH 0879/1140] adjust types

---
 packages/mongo/observe_handle.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index d084322a61..66235fa920 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -4,12 +4,15 @@ let nextObserveHandleId = 1;
 
 export type ObserveHandleCallbackInternal = '_added' | '_addedBefore' | '_changed' | '_movedBefore' | '_removed';
 
+
+export type Callback<T = any> = (...args: T[]) => Promise<void> | void;
+
 /**
  * The "observe handle" returned from observeChanges.
  * Contains a reference to an ObserveMultiplexer.
  * Used to stop observation and clean up resources.
  */
-export class ObserveHandle {
+export class ObserveHandle<T = any> {
   _id: number;
   _multiplexer: ObserveMultiplexer;
   nonMutatingCallbacks: boolean;
@@ -18,13 +21,13 @@ export class ObserveHandle {
   public initialAddsSentResolver: (value: void) => void = () => {};
   public initialAddsSent: Promise<void>
 
-  _added?: (...args: any[]) => Promise<void>;
-  _addedBefore?: (...args: any[]) => Promise<void>;
-  _changed?: (...args: any[]) => Promise<void>;
-  _movedBefore?: (...args: any[]) => Promise<void>;
-  _removed?: (...args: any[]) => Promise<void>;
+  _added?: Callback<T>;
+  _addedBefore?: Callback<T>;
+  _changed?: Callback<T>;
+  _movedBefore?: Callback<T>;
+  _removed?: Callback<T>;
 
-  constructor(multiplexer: any, callbacks: Record<ObserveHandleCallback, any>, nonMutatingCallbacks: boolean) {
+  constructor(multiplexer: any, callbacks: Record<ObserveHandleCallback, Callback<T>>, nonMutatingCallbacks: boolean) {
     this._multiplexer = multiplexer;
 
     multiplexer.callbackNames().forEach((name: ObserveHandleCallback) => {

From c73515470f5a4a623b8403231fbfa6c8472cd5b1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 2 Dec 2024 11:24:45 -0400
Subject: [PATCH 0880/1140] add compression docs

---
 v3-docs/docs/.vitepress/config.mts            |  9 +++
 .../docs/performance/websocket-compression.md | 57 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 v3-docs/docs/performance/websocket-compression.md

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index a004c2867b..b199d78b91 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -431,6 +431,15 @@ export default defineConfig({
         ],
         collapsed: true,
       },
+      {
+        text: "Performance",
+        items: [
+          {
+            text: "WebSocket Compression",
+            link: "/performance/websocket-compression",
+          },
+        ],
+      },
     ],
 
     socialLinks: [
diff --git a/v3-docs/docs/performance/websocket-compression.md b/v3-docs/docs/performance/websocket-compression.md
new file mode 100644
index 0000000000..e466c9ff6a
--- /dev/null
+++ b/v3-docs/docs/performance/websocket-compression.md
@@ -0,0 +1,57 @@
+# Websocket Compression in Meteor
+
+Meteor's stream server uses the permessage-deflate extension for websocket compression by default. While compression can help reduce bandwidth usage, it may impact performance in reactivity-intensive applications due to the computational overhead of compressing numerous DDP messages.
+
+## Configuration
+
+### Disabling Compression
+
+You can disable websocket compression by setting the `SERVER_WEBSOCKET_COMPRESSION` environment variable to `false`:
+
+```bash
+SERVER_WEBSOCKET_COMPRESSION=false
+```
+
+### Custom Compression Settings
+
+To customize compression settings, set `SERVER_WEBSOCKET_COMPRESSION` to a JSON string with your desired configuration:
+
+```bash
+# Example with custom settings
+SERVER_WEBSOCKET_COMPRESSION='{"threshold": 2048, "level": 1}'
+```
+
+Available configuration options:
+
+- `threshold`: Minimum message size (in bytes) before compression is applied (default: 1024)
+- `level`: Compression level (0-9, where 0=none, 1=fastest, 9=best compression)
+- `memLevel`: Memory level (1-9, lower uses less memory)
+- `noContextTakeover`: When true, compressor resets for each message (default: true)
+- `maxWindowBits`: Window size for compression (9-15, lower uses less memory)
+
+## Verifying Compression Status
+
+You can check if compression is enabled through the Meteor shell:
+
+```javascript
+Meteor.server.stream_server.server.options.faye_server_options.extensions
+```
+
+Results interpretation:
+- `[]` (empty array): Compression is disabled
+- `[{}]` (array with object): Compression is enabled
+
+## Performance Considerations
+
+- For apps with high message throughput or frequent small updates, disabling compression may improve performance
+- Large message payloads may benefit from compression, especially over slower network connections
+- Consider monitoring CPU usage and response times when adjusting compression settings
+
+## Default Configuration
+
+When enabled, the default configuration uses:
+- Compression threshold: 1024 bytes
+- Compression level: Z_BEST_SPEED (fastest)
+- Memory level: Z_MIN_MEMLEVEL (minimum memory usage)
+- Context takeover: Disabled
+- Window bits: Z_MIN_WINDOWBITS (minimum window size)

From e98956a8db71f9c6b57cf936dfa5eadb6720501a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 2 Dec 2024 16:33:29 +0100
Subject: [PATCH 0881/1140] clean

---
 packages/allow-deny/allow-deny.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/allow-deny/allow-deny.js b/packages/allow-deny/allow-deny.js
index 3d52acd4c2..528bae567b 100644
--- a/packages/allow-deny/allow-deny.js
+++ b/packages/allow-deny/allow-deny.js
@@ -549,9 +549,7 @@ function addValidator(collection, allowOrDeny, options) {
   Object.keys(options).forEach((key) => {
     if (!validKeysRegEx.test(key))
       throw new Error(allowOrDeny + ": Invalid key: " + key);
-  });
 
-  Object.keys(options).forEach((key) => {
     // TODO deprecated async config on future versions
     const isAsyncKey = key.includes('Async');
     if (isAsyncKey) {

From c40a9fb61b61dbdbcc0fbaa1c496a67741f36334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 2 Dec 2024 16:44:51 +0100
Subject: [PATCH 0882/1140] update docs after changes on allow/deny

---
 v3-docs/docs/api/collections.md | 54 +++++++++------------------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/v3-docs/docs/api/collections.md b/v3-docs/docs/api/collections.md
index 1575ad7d5f..a595c4485d 100644
--- a/v3-docs/docs/api/collections.md
+++ b/v3-docs/docs/api/collections.md
@@ -526,8 +526,8 @@ restrictions. That includes methods that are called with `Meteor.call`
 relying on `allow` and `deny`.
 
 You can call `allow` as many times as you like, and each call can
-include any combination of `insert`/`insertAsync`, `update`/`updateAsync`,
-and `remove`/`removeAsync` functions. The functions should return `true`
+include any combination of `insert`, `update`,
+and `remove` functions. The functions should return `true`
 if they think the operation should be allowed. Otherwise they should
 return `false`, or nothing at all (`undefined`). In that case Meteor
 will continue searching through any other `allow` rules on the collection.
@@ -536,18 +536,18 @@ The available callbacks are:
 
 ### Callbacks
 
-- `insert(userId, doc)`/`insertAsync(userId, doc)` - The user `userId` wants to insert the
+- `insert(userId, doc)` - The user `userId` wants to insert the
   document `doc` into the collection. Return `true` if this should be
-  allowed.
+  allowed. Supports async validations.
 
   `doc` will contain the `_id` field if one was explicitly set by the client, or
   if there is an active `transform`. You can use this to prevent users from
   specifying arbitrary `_id` fields.
 
-- `update(userId, doc, fieldNames, modifier)`/`updateAsync(userId, doc, fieldNames, modifier)` - The user `userId`
+- `update(userId, doc, fieldNames, modifier)` - The user `userId`
   wants to update a document `doc` in the database. (`doc` is the
   current version of the document from the database, without the
-  proposed update.) Return `true` to permit the change.
+  proposed update.) Return `true` to permit the change. Supports async validations.
 
   `fieldNames` is an array of the (top-level) fields in `doc` that the
   client wants to modify, for example
@@ -562,8 +562,8 @@ The available callbacks are:
   \$-modifiers, the request will be denied without checking the `allow`
   functions.
 
-- `remove(userId, doc)`/`removeAsync(userId, doc)` - the user `userId` wants to remove `doc` from the database. Return
-  `true` to permit this.
+- `remove(userId, doc)` - the user `userId` wants to remove `doc` from the database. Return
+  `true` to permit this. Supports async validations.
 
 
 When calling `update`/`updateAsync` or `remove`/`removeAsync` Meteor will by default fetch the
@@ -593,28 +593,12 @@ Posts.allow({
     return doc.owner === userId;
   },
 
-  remove(userId, doc) {
+  async remove(userId, doc) {
+    // Any custom async validation is supported
+    await Meteor.sleep(100);
     // Can only remove your own documents.
     return doc.owner === userId;
   },
-  
-  async insertAsync(userId, doc) {
-    // Any custom async validation is supported
-    const allowed = await allowInsertAsync(userId, doc);
-    return userId && allowed;
-  },
-
-  async updateAsync(userId, doc, fields, modifier) {
-    // Any custom async validation is supported
-    const allowed = await allowUpdateAsync(userId, doc);
-    return userId && allowed;
-  },
-
-  async removeAsync(userId, doc) {
-    // Any custom async validation is supported
-    const allowed = await allowRemoveAsync(userId, doc);
-    return userId && allowed;
-  },
 
   fetch: ["owner"],
 });
@@ -625,22 +609,12 @@ Posts.deny({
     return _.contains(fields, "owner");
   },
 
-  remove(userId, doc) {
+  async remove(userId, doc) {
+    // Any custom async validation is supported
+    await Meteor.sleep(100);
     // Can't remove locked documents.
     return doc.locked;
   },
-  
-  async updateAsync(userId, doc, fields, modifier) {
-    // Any custom async validation is supported
-    const denied = await denyUpdateAsync(userId, doc);
-    return userId && denied;
-  },
-
-  async removeAsync(userId, doc) {
-    // Any custom async validation is supported
-    const denied = await denyRemoveAsync(userId, doc);
-    return userId && denied;
-  },
 
   fetch: ["locked"], // No need to fetch `owner`
 });

From 40c67dd80e004950ebfe2cd2266dbe53c7ed379e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 2 Dec 2024 17:14:15 +0100
Subject: [PATCH 0883/1140] add missing tests

---
 packages/mongo/package.js           | 16 ++++++++--------
 packages/mongo/tests/allow_tests.js | 28 +++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 16d28e6e72..521b2e8277 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -124,13 +124,13 @@ Package.onTest(function (api) {
   ]);
   // XXX test order dependency: the allow_tests "partial allow" test
   // fails if it is run before mongo_livedata_tests.
-  api.addFiles("tests/mongo_livedata_tests.js", ["client", "server"]);
-  api.addFiles("tests/upsert_compatibility_test.js", "server");
+  // api.addFiles("tests/mongo_livedata_tests.js", ["client", "server"]);
+  // api.addFiles("tests/upsert_compatibility_test.js", "server");
   api.addFiles("tests/allow_tests.js", ["client", "server"]);
-  api.addFiles("tests/collection_tests.js", ["client", "server"]);
-  api.addFiles("tests/collection_async_tests.js", ["client", "server"]);
-  api.addFiles("tests/observe_changes_tests.js", ["client", "server"]);
-  api.addFiles("tests/oplog_tests.js", "server");
-  api.addFiles("tests/oplog_v2_converter_tests.js", "server");
-  api.addFiles("tests/doc_fetcher_tests.js", "server");
+  // api.addFiles("tests/collection_tests.js", ["client", "server"]);
+  // api.addFiles("tests/collection_async_tests.js", ["client", "server"]);
+  // api.addFiles("tests/observe_changes_tests.js", ["client", "server"]);
+  // api.addFiles("tests/oplog_tests.js", "server");
+  // api.addFiles("tests/oplog_v2_converter_tests.js", "server");
+  // api.addFiles("tests/doc_fetcher_tests.js", "server");
 });
diff --git a/packages/mongo/tests/allow_tests.js b/packages/mongo/tests/allow_tests.js
index 84442b8003..844e40c2b7 100644
--- a/packages/mongo/tests/allow_tests.js
+++ b/packages/mongo/tests/allow_tests.js
@@ -1314,7 +1314,7 @@ testAsyncMulti("collection - async definitions on allow/deny rules", [
 function configAllSyncAllowDeny(collection, configType = 'allow', enabled) {
   collection[configType]({
     insert(selector, doc) {
-      if (doc.force) return true;
+      if (doc.force) return configType === 'allow';
       return enabled;
     },
     update() {
@@ -1411,4 +1411,30 @@ testAsyncMulti("collection - sync definitions on allow/deny rules", [
       await runAllSyncExpect(test, AllowDenySyncRulesCollections.denied, false);
     }
   },
+  async function (test) {
+    AllowDenySyncRulesCollections.noRules =
+      AllowDenySyncRulesCollections.noRules ||
+      new Mongo.Collection(`allowdeny-sync-rules-noRules`);
+    if (Meteor.isServer) {
+      await AllowDenySyncRulesCollections.noRules.removeAsync();
+    }
+
+    if (Meteor.isClient) {
+      await runAllSyncExpect(test, AllowDenySyncRulesCollections.noRules, false);
+    }
+  },
+  async function (test) {
+    AllowDenySyncRulesCollections.allowThenDeny =
+      AllowDenySyncRulesCollections.allowThenDeny ||
+      new Mongo.Collection(`allowdeny-sync-rules-allowThenDeny`);
+    if (Meteor.isServer) {
+      await AllowDenySyncRulesCollections.allowThenDeny.removeAsync();
+    }
+
+    configAllSyncAllowDeny(AllowDenySyncRulesCollections.allowThenDeny, 'allow', true);
+    configAllSyncAllowDeny(AllowDenySyncRulesCollections.allowThenDeny, 'deny', true);
+    if (Meteor.isClient) {
+      await runAllSyncExpect(test, AllowDenySyncRulesCollections.allowThenDeny, false);
+    }
+  },
 ]);

From c7d88f8cb39956b080f3f8fa945c36de09f390fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 2 Dec 2024 17:33:25 +0100
Subject: [PATCH 0884/1140] refactor tests for sync and async allow/deny
 configurations

---
 packages/mongo/tests/allow_tests.js | 335 +++++++++++++---------------
 1 file changed, 150 insertions(+), 185 deletions(-)

diff --git a/packages/mongo/tests/allow_tests.js b/packages/mongo/tests/allow_tests.js
index 844e40c2b7..d2647060b9 100644
--- a/packages/mongo/tests/allow_tests.js
+++ b/packages/mongo/tests/allow_tests.js
@@ -1225,216 +1225,181 @@ Tinytest.addAsync(
   }
 );
 
-function configAllAsyncAllowDeny(collection, configType = 'allow', enabled) {
-  collection[configType]({
-    async insertAsync(selector, doc) {
-      if (doc.force) return true;
-      await Meteor._sleepForMs(100);
-      return enabled;
-    },
-    async updateAsync() {
-      await Meteor._sleepForMs(100);
-      return enabled;
-    },
-    async removeAsync() {
-      await Meteor._sleepForMs(100);
-      return enabled;
-    },
-  });
+function configAllAllowDeny(collection, configType = 'allow', enabled, isAsync = true) {
+  const handler = isAsync
+    ? {
+      async insertAsync(selector, doc) {
+        if (doc.force) return configType === 'allow';
+        await Meteor._sleepForMs(100);
+        return enabled;
+      },
+      async updateAsync() {
+        await Meteor._sleepForMs(100);
+        return enabled;
+      },
+      async removeAsync() {
+        await Meteor._sleepForMs(100);
+        return enabled;
+      },
+    }
+    : {
+      insert(selector, doc) {
+        if (doc.force) return configType === 'allow';
+        return enabled;
+      },
+      update() {
+        return enabled;
+      },
+      remove() {
+        return enabled;
+      },
+    };
+
+  collection[configType](handler);
 }
 
-async function runAllAsyncExpect(test, collection, allow) {
+async function runAllExpect(test, collection, allow, isAsync = true) {
   let id;
-  /* async tests */
+
+  const resolveSyncCallback = (resolve, reject) =>
+    (error, result) => {
+    if (error) {
+      reject(error);
+      return;
+    }
+    resolve(result);
+  };
+  const methods = isAsync
+    ? {
+      insert: async (doc) => await collection.insertAsync(doc),
+      update: async (id, modifier) => await collection.updateAsync(id, modifier),
+      remove: async (id) => await collection.removeAsync(id),
+    }
+    : {
+      insert: (doc) =>
+        new Promise((resolve, reject) =>
+          collection.insert(doc, resolveSyncCallback(resolve, reject))
+        ),
+      update: (id, modifier) =>
+        new Promise((resolve, reject) =>
+          collection.update(id, modifier, resolveSyncCallback(resolve, reject))
+        ),
+      remove: (id) =>
+        new Promise((resolve, reject) =>
+          collection.remove(id, resolveSyncCallback(resolve, reject))
+        ),
+    };
+
   try {
-    id = await collection.insertAsync({ num: 2 });
+    id = await methods.insert({ num: 2 });
     test.isTrue(allow);
   } catch (e) {
     test.isTrue(!allow);
   }
+
   try {
-    id = await collection.insertAsync({ force: true });
-    await collection.updateAsync(id, { $set: { num: 22 } });
+    id = await methods.insert({ force: true });
+    await methods.update(id, { $set: { num: 22 } });
     test.isTrue(allow);
   } catch (e) {
     test.isTrue(!allow);
   }
+
   try {
-    await collection.removeAsync(id);
+    id = await methods.insert({ force: true });
+    await methods.remove(id);
     test.isTrue(allow);
   } catch (e) {
     test.isTrue(!allow);
   }
 }
 
-var AllowDenyAsyncRulesCollections = {};
+const AllowDenyRulesCollections = {};
 
-testAsyncMulti("collection - async definitions on allow/deny rules", [
-  async function (test) {
-    AllowDenyAsyncRulesCollections.allowed =
-      AllowDenyAsyncRulesCollections.allowed ||
-      new Mongo.Collection(`allowdeny-async-rules-allowed`);
-    if (Meteor.isServer) {
-      await AllowDenyAsyncRulesCollections.allowed.removeAsync();
-    }
+function createAllowDenyRulesTest(collections, isAsync = true) {
+  return [
+    async function (test) {
+      const collectionName = `allowdeny-${isAsync ? "async" : "sync"}-rules-noRules`;
+      collections.noRules =
+        collections.noRules || new Mongo.Collection(collectionName);
+      if (Meteor.isServer) {
+        await collections.noRules.removeAsync();
+      }
 
-    configAllAsyncAllowDeny(AllowDenyAsyncRulesCollections.allowed, 'allow', true);
-    if (Meteor.isClient) {
-      await runAllAsyncExpect(test, AllowDenyAsyncRulesCollections.allowed, true);
-    }
-  },
-  async function (test) {
-    AllowDenyAsyncRulesCollections.notAllowed =
-      AllowDenyAsyncRulesCollections.notAllowed ||
-      new Mongo.Collection(`allowdeny-async-rules-notAllowed`);
-    if (Meteor.isServer) {
-      await AllowDenyAsyncRulesCollections.notAllowed.removeAsync();
-    }
-
-    configAllAsyncAllowDeny(AllowDenyAsyncRulesCollections.notAllowed, 'allow', false);
-    if (Meteor.isClient) {
-      await runAllAsyncExpect(test, AllowDenyAsyncRulesCollections.notAllowed, false);
-    }
-  },
-  async function (test) {
-    AllowDenyAsyncRulesCollections.denied =
-      AllowDenyAsyncRulesCollections.denied ||
-      new Mongo.Collection(`allowdeny-async-rules-denied`);
-    if (Meteor.isServer) {
-      await AllowDenyAsyncRulesCollections.denied.removeAsync();
-    }
-
-    configAllAsyncAllowDeny(AllowDenyAsyncRulesCollections.denied, 'deny', true);
-    if (Meteor.isClient) {
-      await runAllAsyncExpect(test, AllowDenyAsyncRulesCollections.denied, false);
-    }
-  },
-]);
-
-function configAllSyncAllowDeny(collection, configType = 'allow', enabled) {
-  collection[configType]({
-    insert(selector, doc) {
-      if (doc.force) return configType === 'allow';
-      return enabled;
+      if (Meteor.isClient) {
+        await runAllExpect(test, collections.noRules, false, isAsync);
+      }
     },
-    update() {
-      return enabled;
+    async function (test) {
+      const collectionName = `allowdeny-${isAsync ? "async" : "sync"}-rules-allowed`;
+      collections.allowed =
+        collections.allowed || new Mongo.Collection(collectionName);
+      if (Meteor.isServer) {
+        await collections.allowed.removeAsync();
+      }
+
+      configAllAllowDeny(collections.allowed, 'allow', true, isAsync);
+      if (Meteor.isClient) {
+        await runAllExpect(test, collections.allowed, true, isAsync);
+      }
     },
-    remove() {
-      return enabled;
+    async function (test) {
+      const collectionName = `allowdeny-${isAsync ? "async" : "sync"}-rules-notAllowed`;
+      collections.notAllowed =
+        collections.notAllowed || new Mongo.Collection(collectionName);
+      if (Meteor.isServer) {
+        await collections.notAllowed.removeAsync();
+      }
+
+      configAllAllowDeny(collections.notAllowed, 'allow', false, isAsync);
+      if (Meteor.isClient) {
+        await runAllExpect(test, collections.notAllowed, false, isAsync);
+      }
     },
-  });
+    async function (test) {
+      const collectionName = `allowdeny-${isAsync ? "async" : "sync"}-rules-denied`;
+      collections.denied =
+        collections.denied || new Mongo.Collection(collectionName);
+      if (Meteor.isServer) {
+        await collections.denied.removeAsync();
+      }
+
+      configAllAllowDeny(collections.denied, 'deny', true, isAsync);
+      if (Meteor.isClient) {
+        await runAllExpect(test, collections.denied, false, isAsync);
+      }
+    },
+    async function (test) {
+      const collectionName = `allowdeny-${isAsync ? "async" : "sync"}-rules-allowThenDeny`;
+      collections.allowThenDeny =
+        collections.allowThenDeny || new Mongo.Collection(collectionName);
+      if (Meteor.isServer) {
+        await collections.allowThenDeny.removeAsync();
+      }
+
+      configAllAllowDeny(collections.allowThenDeny, 'allow', true, isAsync);
+      configAllAllowDeny(collections.allowThenDeny, 'deny', true, isAsync);
+      if (Meteor.isClient) {
+        await runAllExpect(test, collections.allowThenDeny, false, isAsync);
+      }
+    },
+    async function (test) {
+      const collectionName = `allowdeny-${isAsync ? "async" : "sync"}-rules-allowThenNotDenied`;
+      collections.allowThenNotDenied =
+        collections.allowThenNotDenied || new Mongo.Collection(collectionName);
+      if (Meteor.isServer) {
+        await collections.allowThenNotDenied.removeAsync();
+      }
+
+      configAllAllowDeny(collections.allowThenNotDenied, 'allow', true, isAsync);
+      configAllAllowDeny(collections.allowThenNotDenied, 'deny', false, isAsync);
+      if (Meteor.isClient) {
+        await runAllExpect(test, collections.allowThenNotDenied, true, isAsync);
+      }
+    },
+  ];
 }
 
-async function runAllSyncExpect(test, collection, expected) {
-  let id;
-  /* sync tests */
-  await new Promise((resolve) => {
-    id = collection.insert({ num: 2 }, (error, result) => {
-      if (error) {
-        test.isTrue(!expected);
-        resolve();
-        return;
-      }
-      test.isTrue(expected && result != null);
-      resolve();
-    });
-  });
+testAsyncMulti("collection - async definitions on allow/deny rules", createAllowDenyRulesTest(AllowDenyRulesCollections, true));
 
-  await new Promise((resolve) => {
-    id = collection.insert({ force: true });
-    collection.update(id, { $set: { num: 22 } }, (error, result) => {
-      if (error) {
-        test.isTrue(!expected);
-        resolve();
-        return;
-      }
-      test.isTrue(expected && result != null);
-      resolve();
-    });
-  });
-
-  await new Promise((resolve) => {
-    id = collection.insert({ force: true });
-    collection.remove(id, (error, result) => {
-      if (error) {
-        test.isTrue(!expected);
-        resolve();
-        return;
-      }
-      test.isTrue(expected && result != null);
-      resolve();
-    });
-  });
-}
-
-var AllowDenySyncRulesCollections = {};
-
-testAsyncMulti("collection - sync definitions on allow/deny rules", [
-  async function (test) {
-    AllowDenySyncRulesCollections.allowed =
-      AllowDenySyncRulesCollections.allowed ||
-      new Mongo.Collection(`allowdeny-sync-rules-allowed`);
-    if (Meteor.isServer) {
-      await AllowDenySyncRulesCollections.allowed.removeAsync();
-    }
-
-    configAllSyncAllowDeny(AllowDenySyncRulesCollections.allowed, 'allow', true);
-    if (Meteor.isClient) {
-      await runAllSyncExpect(test, AllowDenySyncRulesCollections.allowed, true);
-    }
-  },
-  async function (test) {
-    AllowDenySyncRulesCollections.notAllowed =
-      AllowDenySyncRulesCollections.notAllowed ||
-      new Mongo.Collection(`allowdeny-sync-rules-notAllowed`);
-    if (Meteor.isServer) {
-      await AllowDenySyncRulesCollections.notAllowed.removeAsync();
-      await AllowDenySyncRulesCollections.notAllowed.insertAsync({ num: 2 });
-    }
-
-    configAllSyncAllowDeny(AllowDenySyncRulesCollections.notAllowed, 'allow', false);
-    if (Meteor.isClient) {
-      await runAllSyncExpect(test, AllowDenySyncRulesCollections.notAllowed, false);
-    }
-  },
-  async function (test) {
-    AllowDenySyncRulesCollections.denied =
-      AllowDenySyncRulesCollections.denied ||
-      new Mongo.Collection(`allowdeny-sync-rules-denied`);
-    if (Meteor.isServer) {
-      await AllowDenySyncRulesCollections.denied.removeAsync();
-    }
-
-    configAllSyncAllowDeny(AllowDenySyncRulesCollections.denied, 'deny', true);
-    if (Meteor.isClient) {
-      await runAllSyncExpect(test, AllowDenySyncRulesCollections.denied, false);
-    }
-  },
-  async function (test) {
-    AllowDenySyncRulesCollections.noRules =
-      AllowDenySyncRulesCollections.noRules ||
-      new Mongo.Collection(`allowdeny-sync-rules-noRules`);
-    if (Meteor.isServer) {
-      await AllowDenySyncRulesCollections.noRules.removeAsync();
-    }
-
-    if (Meteor.isClient) {
-      await runAllSyncExpect(test, AllowDenySyncRulesCollections.noRules, false);
-    }
-  },
-  async function (test) {
-    AllowDenySyncRulesCollections.allowThenDeny =
-      AllowDenySyncRulesCollections.allowThenDeny ||
-      new Mongo.Collection(`allowdeny-sync-rules-allowThenDeny`);
-    if (Meteor.isServer) {
-      await AllowDenySyncRulesCollections.allowThenDeny.removeAsync();
-    }
-
-    configAllSyncAllowDeny(AllowDenySyncRulesCollections.allowThenDeny, 'allow', true);
-    configAllSyncAllowDeny(AllowDenySyncRulesCollections.allowThenDeny, 'deny', true);
-    if (Meteor.isClient) {
-      await runAllSyncExpect(test, AllowDenySyncRulesCollections.allowThenDeny, false);
-    }
-  },
-]);
+testAsyncMulti("collection - sync definitions on allow/deny rules", createAllowDenyRulesTest(AllowDenyRulesCollections, false));

From 0e3c16aa6a1127d37d6c2abb44a8d60393684665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 2 Dec 2024 17:33:58 +0100
Subject: [PATCH 0885/1140] reneable tests

---
 packages/mongo/package.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 521b2e8277..16d28e6e72 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -124,13 +124,13 @@ Package.onTest(function (api) {
   ]);
   // XXX test order dependency: the allow_tests "partial allow" test
   // fails if it is run before mongo_livedata_tests.
-  // api.addFiles("tests/mongo_livedata_tests.js", ["client", "server"]);
-  // api.addFiles("tests/upsert_compatibility_test.js", "server");
+  api.addFiles("tests/mongo_livedata_tests.js", ["client", "server"]);
+  api.addFiles("tests/upsert_compatibility_test.js", "server");
   api.addFiles("tests/allow_tests.js", ["client", "server"]);
-  // api.addFiles("tests/collection_tests.js", ["client", "server"]);
-  // api.addFiles("tests/collection_async_tests.js", ["client", "server"]);
-  // api.addFiles("tests/observe_changes_tests.js", ["client", "server"]);
-  // api.addFiles("tests/oplog_tests.js", "server");
-  // api.addFiles("tests/oplog_v2_converter_tests.js", "server");
-  // api.addFiles("tests/doc_fetcher_tests.js", "server");
+  api.addFiles("tests/collection_tests.js", ["client", "server"]);
+  api.addFiles("tests/collection_async_tests.js", ["client", "server"]);
+  api.addFiles("tests/observe_changes_tests.js", ["client", "server"]);
+  api.addFiles("tests/oplog_tests.js", "server");
+  api.addFiles("tests/oplog_v2_converter_tests.js", "server");
+  api.addFiles("tests/doc_fetcher_tests.js", "server");
 });

From 2ceab9fc2ef8f07619e376055739e3f5dfa18892 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 2 Dec 2024 13:31:07 -0400
Subject: [PATCH 0886/1140] point out that rosetta is no longer needed in 3.1

---
 v3-docs/docs/about/install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/install.md b/v3-docs/docs/about/install.md
index dd8331d501..1d685e9ec3 100644
--- a/v3-docs/docs/about/install.md
+++ b/v3-docs/docs/about/install.md
@@ -13,7 +13,7 @@ npx meteor
 - Meteor currently supports **OS X, Windows, and Linux**. Only 64-bit is supported.
 - Meteor supports Windows 7 / Windows Server 2008 R2 and up.
 - Apple M1 is natively supported from Meteor 2.5.1 onward (for older versions, rosetta terminal is required).
-- If you are on a Mac M1 (Arm64 version) you need to have Rosetta 2 installed, as Meteor uses it for running MongoDB. Check how to install it [here](https://osxdaily.com/2020/12/04/how-install-rosetta-2-apple-silicon-mac/).
+- If you are using Meteor <= 3.0.4 and you are on a Mac M1 (Arm64 version) you need to have Rosetta 2 installed, as Meteor uses it for running MongoDB. Check how to install it [here](https://osxdaily.com/2020/12/04/how-install-rosetta-2-apple-silicon-mac/). *No longer needed in Meteor 3.1*.
 - Disabling antivirus (Windows Defender, etc.) will improve performance.
 - For compatibility, Linux binaries are built with CentOS 6.4 i386/amd64.
 

From cd27b01f10dd92c1aa4a7416f617ec1b355e05fb Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 2 Dec 2024 20:19:32 -0300
Subject: [PATCH 0887/1140] DOCS: Add meteor-rpc to community packages

---
 v3-docs/docs/community-packages/index.md      |   4 +
 v3-docs/docs/community-packages/meteor-rpc.md | 569 ++++++++++++++++++
 2 files changed, 573 insertions(+)
 create mode 100644 v3-docs/docs/community-packages/meteor-rpc.md

diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
index 3c23fad224..8c73cae2b0 100644
--- a/v3-docs/docs/community-packages/index.md
+++ b/v3-docs/docs/community-packages/index.md
@@ -14,3 +14,7 @@ Please bear in mind if you are adding a package to this list, try providing as m
 - `examples/guide`
 
 ## List of Community Packages
+
+#### Method/Subscription helpers
+
+- [`meteor-rpc`](./meteor-rpc.md)
\ No newline at end of file
diff --git a/v3-docs/docs/community-packages/meteor-rpc.md b/v3-docs/docs/community-packages/meteor-rpc.md
new file mode 100644
index 0000000000..007746dc1f
--- /dev/null
+++ b/v3-docs/docs/community-packages/meteor-rpc.md
@@ -0,0 +1,569 @@
+# Meteor-RPC
+
+- `Who maintains the package` – [Grubba27](https://github.com/Grubba27), you can get in touch via [X](https://twitter.com/gab_grubba)
+
+[[toc]]
+
+## What is this package?
+
+_Inspired on [zodern:relay](https://github.com/zodern/meteor-relay) and on [tRPC](https://trpc.io/)_
+
+This package provides functions for building E2E type-safe RPCs, focused on React front ends.
+
+## How to download it?
+
+```bash
+meteor npm i grubba-rpc @tanstack/react-query zod
+```
+
+::: warning
+
+Before continuing the installation make sure you have `react-query` all set in your project, for more info follow their [quick start guide](https://tanstack.com/query/latest/docs/framework/react/quick-start).
+
+:::
+
+## How to use it?
+
+There is a few concepts that are important while using this package:
+
+<!-- - `createModule` - used to create a module that will be used to call our methods and publications
+- `module.addPublication` - used to add a publication to the module
+- `module.addSubmodule` - used to add a submodule to the module
+- `module.addMiddlewares` - used to add middlewares to the module
+
+- `createClient` - used to create a client on the frontend, that will be used to call the methods and publications
+- `client.method(args)` - used to call the method, it uses `Meteor.callAsync` under the hood
+- `client.method.useMutation(args)` - used to call the method as a mutation, it uses `useMutation` from `react-query`
+- `client.method.useQuery(args)` - used to call the method as a query, it uses `useQuery` from `react-query`
+
+- `client.publication.useSubscription(args)` - used to subscribe to a publication, it uses `useSubscription` from [`react-meteor-data`](../packages/react-meteor-data.md#usesubscribe) -->
+
+- This package is built on top of [`Meteor.methods`](../api/meteor.md#method-apis-methods) and [`Meteor.publish`](../api/meteor.md#publish-and-subscribe-pubsub) but with types and runtime validation, their understanding is important to use this package.
+- Every method and publication use `zod` to validate the arguments, so you can be sure that the data you are receiving is the data you are expecting.
+
+::: tip
+If you are accepting any type of data you can use `z.any()` as the schema or `z.void` for when there is no argument
+:::
+
+### `createModule`
+
+This function is used to create a module that will be used to call our methods and publications
+
+`subModule` without a namespace: `createModule()` is used to create the `main` server module, the one that will be exported to be used in the client.`
+
+`subModule` with a namespace: `createModule("namespace")` is used to create a submodule that will be added to the main module.
+
+> Remember to use `build` at the end of module creation to ensure that the module is going to be created.
+
+Example:
+
+::: code-group
+
+```typescript [server/main.ts]
+import { createModule } from "grubba-rpc";
+import { Chat } from "./chat";
+
+const server = createModule() // server has no namespace
+  .addMethod("bar", z.string(), (arg) => "bar" as const)
+  .addSubmodule(Chat)
+  .build();
+
+export type Server = typeof server;
+```
+
+```typescript [server/chat.ts]
+import { createModule } from "grubba-rpc";
+import { ChatCollection } from "/imports/api/chat";
+import { z } from "zod";
+
+export const Chat = createModule("chat")
+  .addMethod("createChat", z.void(), async () => {
+    return ChatCollection.insertAsync({ createdAt: new Date(), messages: [] });
+  })
+  .buildSubmodule();
+```
+
+```typescript [client/main.ts]
+import { createClient } from "grubba-rpc";
+// you must import the type of the server
+import type { Server } from "/imports/api/server";
+
+const api = createClient<Server>();
+const bar: "bar" = await api.bar("some string");
+//   ?^ 'bar'
+const newChatId = await api.chat.createChat(); // with intellisense
+```
+
+:::
+
+### `module.addMethod`
+
+Type:
+
+```ts
+addMethod(
+  name: string,
+  schema: ZodSchema,
+  handler: (args: ZodTypeInput<ZodSchema>) => T,
+  config?: Config<ZodTypeInput<ZodSchema>, T>
+)
+```
+
+This is the equivalent of `Meteor.methods` but with types and runtime validation.
+
+::: code-group
+
+```typescript [server/with-meteor-rpc.ts]
+import { createModule } from "grubba-rpc";
+import { z } from "zod";
+
+const server = createModule()
+  .addMethod("foo", z.string(), (arg) => "foo" as const)
+  .build();
+```
+
+```typescript [server/without-meteor-rpc.ts]
+import { Meteor } from "meteor/meteor";
+import { z } from "zod";
+
+Meteor.methods({
+  foo(arg: string) {
+    z.string().parse(arg);
+    return "foo";
+  },
+});
+```
+
+:::
+
+### `module.addPublication`
+
+Type:
+
+```typescript
+addPublication(
+  name: string,
+  schema: ZodSchema,
+  handler: (args: ZodTypeInput<ZodSchema>) => Cursor<Result, Result>
+)
+```
+
+This is the equivalent of `Meteor.publish` but with types and runtime validation.
+
+::: code-group
+
+```typescript [server/with-meteor-rpc.ts]
+import { createModule } from "grubba-rpc";
+import { ChatCollection } from "/imports/api/chat";
+import { z } from "zod";
+
+const server = createModule()
+  .addPublication("chatRooms", z.void(), () => {
+    return ChatCollection.find();
+  })
+  .build();
+```
+
+```typescript [server/without-meteor-rpc.ts]
+import { Meteor } from "meteor/meteor";
+import { ChatCollection } from "/imports/api/chat";
+
+Meteor.publish("chatRooms", function () {
+  return ChatCollection.find();
+});
+```
+
+:::
+
+### `module.addSubmodule`
+
+This is used to add a submodule to the main module, adding namespaces for your methods and publications and making it easier to organize your code.
+
+> Remember to use `submodule.buildSubmodule` when creating a submodule
+
+::: code-group
+
+```typescript [server/chat.ts]
+import { ChatCollection } from "/imports/api/chat";
+import { createModule } from "grubba-rpc";
+
+export const chatModule = createModule("chat")
+  .addMethod("createChat", z.void(), async () => {
+    return ChatCollection.insertAsync({ createdAt: new Date(), messages: [] });
+  })
+  .buildSubmodule(); // <-- this is important so that this module can be added as a submodule
+```
+
+```typescript [server/chat.ts]
+import { createModule } from "grubba-rpc";
+import { chatModule } from "./server/chat";
+
+const server = createModule()
+  .addMethod("bar", z.string(), (arg) => "bar" as const)
+  .addSubmodule(chatModule)
+  .build();
+
+server.chat; // <-- this is the namespace for the chat module
+server.chat.createChat(); // <-- this is the method from the chat module and it gets autocompleted
+```
+
+:::
+
+### `module.addMiddlewares`
+
+Type:
+
+```typescript
+type Middleware = (raw: unknown, parsed: unknown) => void;
+
+addMiddlewares(middlewares: Middleware[])
+```
+
+This is used to add middlewares to the module, it can be used to add side effects logic to the methods and publications, ideal for logging or rate limiting.
+
+The middleware ordering is last in first out. Check the example below:
+
+::: code-group
+
+```typescript [server/chat.ts]
+import { ChatCollection } from "/imports/api/chat";
+import { createModule } from "grubba-rpc";
+
+export const chatModule = createModule("chat")
+  .addMiddlewares([
+    (raw, parsed) => {
+      console.log("runs first");
+    },
+  ])
+  .addMethod("createChat", z.void(), async () => {
+    return ChatCollection.insertAsync({ createdAt: new Date(), messages: [] });
+  })
+  .buildSubmodule();
+```
+
+```typescript [server/main.ts]
+import { createModule } from "grubba-rpc";
+import { chatModule } from "./server/chat";
+
+const server = createModule()
+  .addMiddlewares([
+    (raw, parsed) => {
+      console.log("runs second");
+    },
+  ])
+  .addMethod("bar", z.string(), (arg) => "bar" as const)
+  .addSubmodule(chatModule)
+  .build();
+```
+
+```typescript [client/main.ts]
+import { createClient } from "grubba-rpc";
+import type { Server } from "/imports/api/server"; // you must import the type
+
+const api = createClient<Server>();
+await api.chat.createChat(); // logs "runs first" then "runs second"
+await api.bar("str"); // logs "runs second"
+```
+
+:::
+
+### `module.build`
+
+This is used to build the module, it should be used at the end of the module creation to ensure that the exported type is correct.
+
+::: code-group
+
+```typescript [correct.ts]
+// ✅ it has the build method
+import { createModule } from "grubba-rpc";
+import { z } from "zod";
+const server = createModule()
+  .addMethod("bar", z.string(), (arg) => "bar" as const)
+  .build();
+
+export type Server = typeof server;
+```
+
+```typescript [incorrect.ts]
+// ❌ it is missing the build method
+import { createModule } from "grubba-rpc";
+import { z } from "zod";
+const server = createModule().addMethod(
+  "bar",
+  z.string(),
+  (arg) => "bar" as const
+);
+
+export type Server = typeof server;
+```
+
+:::
+
+### `module.buildSubmodule`
+
+This is used to build the submodule, it should be used at the end of the submodule creation and imported in the main module in the [`addSubmodule`](./meteor-rpc.md#module-addsubmodule) method.
+
+::: code-group
+
+```typescript [correct.ts]
+import { createModule } from "grubba-rpc";
+import { z } from "zod";
+
+export const chatModule = createModule("chat")
+  .addMethod("createChat", z.void(), async () => {
+    return "chat" as const;
+  })
+  // ✅ it has the buildSubmodule method
+  .buildSubmodule();
+```
+
+```typescript [incorrect.ts]
+import { createModule } from "grubba-rpc";
+import { z } from "zod";
+
+export const otherSubmodule = createModule("other")
+  .addMethod("otherMethod", z.void(), async () => {
+    return "other" as const;
+  })
+  // ❌ it is missing the buildSubmodule method
+  .build();
+
+export const otherSubmodule = createModule("other").addMethod(
+  "otherMethod",
+  z.void(),
+  async () => {
+    return "other" as const;
+  }
+); // ❌ it is missing the buildSubmodule method
+```
+
+```typescript [server/main.ts]
+import { createModule } from "grubba-rpc";
+import { chatModule } from "./server/chat";
+
+const server = createModule()
+  .addMethod("bar", z.string(), (arg) => "bar" as const)
+  .addSubmodule(chatModule)
+  .build();
+```
+
+:::
+
+## Using in the client
+
+When using in the client you _have_ to use the `createModule` and `build` methods to create a module that will be used in the client
+and be sure that you are exporting the type of the module
+
+_You should only create one client in your application_
+
+You can have something like `api.ts` that will export the client and the type of the client
+
+::: code-group
+
+```typescript [server/main.ts]
+import { createModule } from "grubba-rpc";
+
+const server = createModule()
+  .addMethod("bar", z.string(), (arg) => "bar" as const)
+  .build();
+
+export type Server = typeof server;
+```
+
+```typescript [client/main.ts]
+// you must import the type
+import type { Server } from "/imports/api/server";
+const app = createClient<Server>();
+
+await app.bar("str"); // it will return "bar"
+```
+
+:::
+
+## React focused API
+
+Our package has a React focused API that uses `react-query` to handle the data fetching and mutations.
+
+### `method.useMutation`
+
+It uses the [`useMutation`](https://tanstack.com/query/latest/docs/framework/react/reference/useMutation#usemutation) from react-query to create a mutation that will call the method
+
+::: code-group
+
+```typescript [server/main.ts]
+import { createModule } from "grubba-rpc";
+
+const server = createModule()
+  .addMethod("bar", z.string(), (arg) => {
+    console.log("Server received", arg);
+    return "bar" as const;
+  })
+  .build();
+
+export type Server = typeof server;
+```
+
+```tsx [client.ts]
+// you must import the type
+import type { Server } from "/imports/api/server";
+const app = createClient<Server>();
+
+export const Component = () => {
+  const { mutate, isLoading, isError, error, data } = app.bar.useMutation();
+
+  return (
+    <button
+      onClick={() => {
+        mutation.mutate("str");
+      }}
+    >
+      Click me
+    </button>
+  );
+};
+```
+
+:::
+
+### `method.useQuery`
+
+It uses the [`useQuery`](https://tanstack.com/query/latest/docs/framework/react/reference/useSuspenseQuery#usesuspensequery) from react-query to create a query that will call the method, it uses `suspense` to handle loading states
+
+::: code-group
+
+```typescript [server/main.ts]
+import { createModule } from "grubba-rpc";
+
+const server = createModule()
+  .addMethod("bar", z.string(), (arg) => "bar" as const)
+  .build();
+
+export type Server = typeof server;
+```
+
+```tsx [client.ts]
+// you must import the type of the server
+import type { Server } from "/imports/api/server";
+const app = createClient<Server>();
+
+export const Component = () => {
+  const { data } = app.bar.useQuery("str"); // this will trigger suspense
+
+  return <div>{data}</div>;
+};
+```
+
+:::
+
+### `publication.useSubscription`
+
+Subscriptions on the client have `useSubscription` method that can be used as a hook to subscribe to a publication. It uses `suspense` to handle loading states
+
+::: code-group
+
+```typescript [server/main.ts]
+// server/main.ts
+import { createModule } from "grubba-rpc";
+import { ChatCollection } from "/imports/api/chat";
+import { z } from "zod";
+
+const server = createModule()
+  .addPublication("chatRooms", z.void(), () => {
+    return ChatCollection.find();
+  })
+  .build();
+
+export type Server = typeof server;
+```
+
+```tsx [client.ts]
+import type { Server } from "/imports/api/server"; // you must import the type
+const app = createClient<Server>();
+
+export const Component = () => {
+  // it will trigger suspense and `rooms` is reactive in this context.
+  // When there is a change in the collection it will rerender
+  const { data: rooms, collection: chatCollection } =
+    api.chatRooms.usePublication();
+
+  return (
+    <div>
+      {rooms.map((room) => (
+        <div key={room._id}>{room.name}</div>
+      ))}
+    </div>
+  );
+};
+```
+
+:::
+
+## Examples
+
+Currently we have:
+
+- [chat-app](https://github.com/Grubba27/testing-meteor-rpc) that uses this package to create a chat-app
+- [askme](https://github.com/fredmaiaarantes/askme) that uses this package to create a Q&A app, you can check it live [here](https://askmeaquestion.meteorapp.com/)
+
+## Advanced usage
+
+you can take advantage of the hooks to add custom logic to your methods, checking the raw and parsed data, and the result of the method,
+if the method has failed you can also check the error.
+
+::: code-group
+
+```typescript [on-method-after-creation.ts]
+import { createModule } from "grubba-rpc";
+import { z } from "zod";
+
+const server = createModule()
+  .addMethod("bar", z.string(), (arg) => "bar" as const)
+  .build();
+
+// you can add hooks after the method has been created
+server.bar.addBeforeResolveHook((raw, parsed) => {
+  console.log("before resolve", raw, parsed);
+});
+
+server.bar.addAfterResolveHook((raw, parsed, result) => {
+  console.log("after resolve", raw, parsed, result);
+});
+
+server.bar.addErrorResolveHook((err, raw, parsed) => {
+  console.log("on error", err, raw, parsed);
+});
+
+export type Server = typeof server;
+```
+
+```typescript [on-method-creation.ts]
+import { createModule } from "grubba-rpc";
+import { z } from "zod";
+
+const server = createModule()
+  // Or you can add hooks when creating the method
+  .addMethod("bar", z.any(), () => "str", {
+    hooks: {
+      onBeforeResolve: [
+        (raw, parsed) => {
+          console.log("before resolve", raw, parsed);
+        },
+      ],
+      onAfterResolve: [
+        (raw, parsed, result) => {
+          console.log("after resolve", raw, parsed, result);
+        },
+      ],
+      onErrorResolve: [
+        (err, raw, parsed) => {
+          console.log("on error", err, raw, parsed);
+        },
+      ],
+    },
+  })
+  .build();
+
+export type Server = typeof server;
+```
+
+:::

From bd9cc2cee4f0ed7a709d163cbbe939e9437942f6 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 2 Dec 2024 20:20:49 -0300
Subject: [PATCH 0888/1140] DOCS: add brief description of Meteor RPC to
 community packages

---
 v3-docs/docs/community-packages/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
index 8c73cae2b0..3e2bd6d2fe 100644
--- a/v3-docs/docs/community-packages/index.md
+++ b/v3-docs/docs/community-packages/index.md
@@ -8,6 +8,7 @@ This section tries to list and add some information about usage, configuration,
 If you use or have a package that you think would be useful to add to this list, please open a pull request.
 
 Please bear in mind if you are adding a package to this list, try providing as much information as possible, including:
+
 - `Who maintains the package` – how to get in touch to submit issues or questions
 - `Why is this package for?`
 - `API`
@@ -17,4 +18,4 @@ Please bear in mind if you are adding a package to this list, try providing as m
 
 #### Method/Subscription helpers
 
-- [`meteor-rpc`](./meteor-rpc.md)
\ No newline at end of file
+- [`meteor-rpc`](./meteor-rpc.md), Meteor Methods Evolved with type checking and runtime validation

From 69c6882133198ed505d855012651b85682dff14a Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 2 Dec 2024 20:23:04 -0300
Subject: [PATCH 0889/1140] DOCS: add meteor-rpc to vite config links

---
 v3-docs/docs/.vitepress/config.mts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 5cf32b8890..4cd9c168f9 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -384,7 +384,12 @@ export default defineConfig({
       {
         text: "Community Packages",
         link: "/community-packages/index",
-        items: [],
+        items: [
+          {
+            text: "Meteor RPC",
+            link: "/community-packages/meteor-rpc",
+          },
+        ],
         collapsed: true,
       },
       {

From 314167b246615156b3aeca118bf35eff547d6e4c Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 3 Dec 2024 09:37:57 -0300
Subject: [PATCH 0890/1140] DOCS: add warning about meteor-rpc compat with
 Meteor 2.8 and up

---
 v3-docs/docs/community-packages/meteor-rpc.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/v3-docs/docs/community-packages/meteor-rpc.md b/v3-docs/docs/community-packages/meteor-rpc.md
index 007746dc1f..1ab8072bce 100644
--- a/v3-docs/docs/community-packages/meteor-rpc.md
+++ b/v3-docs/docs/community-packages/meteor-rpc.md
@@ -12,6 +12,18 @@ This package provides functions for building E2E type-safe RPCs, focused on Reac
 
 ## How to download it?
 
+::: warning
+
+This package works only with Meteor 2.8 or higher.
+
+If not sure about the version of Meteor you are using, you can check it by running the following command in your terminal within your project:
+
+```bash
+meteor --version
+```
+
+:::
+
 ```bash
 meteor npm i grubba-rpc @tanstack/react-query zod
 ```

From 91bc27f0da01ff1437a4bd7aa3c8ec702e329629 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 3 Dec 2024 19:00:38 -0300
Subject: [PATCH 0891/1140] DOCS: remove known issues tab

it is no longer relevant for the current version of meteor.
---
 v3-docs/docs/.vitepress/config.mts           |  4 --
 v3-docs/docs/troubleshooting/known-issues.md | 39 --------------------
 2 files changed, 43 deletions(-)
 delete mode 100644 v3-docs/docs/troubleshooting/known-issues.md

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 5cf32b8890..3e36909b2a 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -395,10 +395,6 @@ export default defineConfig({
             link: "/troubleshooting/expired-certificate",
           },
           { text: "Windows", link: "/troubleshooting/windows" },
-          {
-            text: "Known issues in 2.13",
-            link: "/troubleshooting/known-issues",
-          },
         ],
         collapsed: true,
       },
diff --git a/v3-docs/docs/troubleshooting/known-issues.md b/v3-docs/docs/troubleshooting/known-issues.md
deleted file mode 100644
index f533d80a76..0000000000
--- a/v3-docs/docs/troubleshooting/known-issues.md
+++ /dev/null
@@ -1,39 +0,0 @@
-
-# Known issues in 2.13
-
-Troubleshooting in Meteor 2.13
-
-## Cannot extract version of meteor tool {#cannot-extract-meteor-tool}
-
-
-For some users, the `meteor update` to version 2.13 command may fail with the following error or similar:
-
-```shell
-Error: incorrect data check
-    at Zlib.zlibOnError [as onerror] (zlib.js:187:17)
- => awaited here:
- ...
-    at /tools/cli/main.js:1165:7 {
-  errno: -3,
-  code: 'Z_DATA_ERROR'
-  }
-
-```
-
-## The issue {#the-issue}
-
-It seems related to [our first ESM version of Node.js v14.21.4](https://github.com/meteor/node-v14-esm) and the `zlib` package.
-We have been able to reproduce this issue only in Mac Intel.
-
-You can follow along with the [GitHub issue](https://github.com/meteor/meteor/issues/12731) for updates.
-
-## Solution {#solution}
-
-The solution for this issue is running the following command in your terminal:
-
-```shell
-
-curl https://install.meteor.com/\?release\=2.13.3 | sh
-
-```
-

From 6a0db09fc468059202dd1e5d8184ed73e0a488a7 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 3 Dec 2024 19:38:27 -0300
Subject: [PATCH 0892/1140] DOCS: remove comments from docs

---
 v3-docs/docs/community-packages/meteor-rpc.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/v3-docs/docs/community-packages/meteor-rpc.md b/v3-docs/docs/community-packages/meteor-rpc.md
index 1ab8072bce..e97a6e99b5 100644
--- a/v3-docs/docs/community-packages/meteor-rpc.md
+++ b/v3-docs/docs/community-packages/meteor-rpc.md
@@ -38,18 +38,6 @@ Before continuing the installation make sure you have `react-query` all set in y
 
 There is a few concepts that are important while using this package:
 
-<!-- - `createModule` - used to create a module that will be used to call our methods and publications
-- `module.addPublication` - used to add a publication to the module
-- `module.addSubmodule` - used to add a submodule to the module
-- `module.addMiddlewares` - used to add middlewares to the module
-
-- `createClient` - used to create a client on the frontend, that will be used to call the methods and publications
-- `client.method(args)` - used to call the method, it uses `Meteor.callAsync` under the hood
-- `client.method.useMutation(args)` - used to call the method as a mutation, it uses `useMutation` from `react-query`
-- `client.method.useQuery(args)` - used to call the method as a query, it uses `useQuery` from `react-query`
-
-- `client.publication.useSubscription(args)` - used to subscribe to a publication, it uses `useSubscription` from [`react-meteor-data`](../packages/react-meteor-data.md#usesubscribe) -->
-
 - This package is built on top of [`Meteor.methods`](../api/meteor.md#method-apis-methods) and [`Meteor.publish`](../api/meteor.md#publish-and-subscribe-pubsub) but with types and runtime validation, their understanding is important to use this package.
 - Every method and publication use `zod` to validate the arguments, so you can be sure that the data you are receiving is the data you are expecting.
 

From 270a864e8a15b8a0672883e13fdd3c453764447d Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 4 Dec 2024 09:59:37 -0300
Subject: [PATCH 0893/1140] DOCS: move community packages to section

---
 v3-docs/docs/community-packages/index.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
index 3c23fad224..8ab9b502b0 100644
--- a/v3-docs/docs/community-packages/index.md
+++ b/v3-docs/docs/community-packages/index.md
@@ -1,13 +1,22 @@
 # Community Packages
 
+::: tip
+The Meteor community is making great efforts to migrate popular packages to Meteor 3.0.
+
+A [spreadsheet maintained](https://docs.google.com/spreadsheets/u/0/d/1JbUZmJab3owZ9LV71Ubto32YX_QWQljRypJTOQupxL8/htmlview) by [@harryadel](https://github.com/harryadel) tracks the status of your favorite packages and offers opportunities to help.
+:::
+
 There are some very popular community packages that do not have a documentation website or only have a readme file.
 This section tries to list and add some information about usage, configuration, and examples for these packages.
 
 > Think this section as an `Awesome List`, similar to [`awesome-node`](https://github.com/sindresorhus/awesome-nodejs) or [`awesome-react`](https://github.com/enaqx/awesome-react)
 
+Many packages have been consolidated into the [Meteor Community organization](https://github.com/Meteor-Community-Packages). Others are maintained by individual developers or companies.
+
 If you use or have a package that you think would be useful to add to this list, please open a pull request.
 
 Please bear in mind if you are adding a package to this list, try providing as much information as possible, including:
+
 - `Who maintains the package` – how to get in touch to submit issues or questions
 - `Why is this package for?`
 - `API`

From fdec6d735117828577a9297ded16b76a1ffe8594 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 4 Dec 2024 10:01:07 -0300
Subject: [PATCH 0894/1140] DOCS: remove old references to community packages

---
 v3-docs/docs/.vitepress/config.mts          |  4 ----
 v3-docs/docs/packages/community-packages.md | 17 -----------------
 2 files changed, 21 deletions(-)
 delete mode 100644 v3-docs/docs/packages/community-packages.md

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 3e36909b2a..7bd70ba18e 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -374,10 +374,6 @@ export default defineConfig({
             link: "/packages/packages-listing",
             text: "Maintained Packages",
           },
-          {
-            link: "packages/community-packages",
-            text: "Community Packages",
-          },
         ],
         collapsed: true,
       },
diff --git a/v3-docs/docs/packages/community-packages.md b/v3-docs/docs/packages/community-packages.md
deleted file mode 100644
index 626a7e871e..0000000000
--- a/v3-docs/docs/packages/community-packages.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-[//]: # (Do not edit this file by hand.)
-
-[//]: # (This is a generated file.)
-
-[//]: # (If you want to change something in this file)
-
-[//]: # (go to meteor/docs/generators/packages-listing)
-
-# Community Packages
-
-The Meteor community is making great efforts to migrate popular packages to Meteor 3.0.
-
-Many packages have been consolidated into the [Meteor Community organization](https://github.com/Meteor-Community-Packages). Others are maintained by individual developers or companies.
-
-A [spreadsheet maintained](https://docs.google.com/spreadsheets/u/0/d/1JbUZmJab3owZ9LV71Ubto32YX_QWQljRypJTOQupxL8/htmlview) by [@harryadel](https://github.com/harryadel) tracks the status of your favorite packages and offers opportunities to help.

From 085587d7537aea121d3a60364ac2558994adc6c1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 4 Dec 2024 10:54:22 -0400
Subject: [PATCH 0895/1140] add examples

---
 .../docs/performance/websocket-compression.md | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/v3-docs/docs/performance/websocket-compression.md b/v3-docs/docs/performance/websocket-compression.md
index e466c9ff6a..c1c28c09a7 100644
--- a/v3-docs/docs/performance/websocket-compression.md
+++ b/v3-docs/docs/performance/websocket-compression.md
@@ -29,6 +29,46 @@ Available configuration options:
 - `noContextTakeover`: When true, compressor resets for each message (default: true)
 - `maxWindowBits`: Window size for compression (9-15, lower uses less memory)
 
+## Configuration Examples
+
+Here are recommended configurations for different types of applications:
+
+### High-Frequency Updates / Real-Time Dashboard
+
+For applications with frequent small updates (e.g., real-time dashboards, trading platforms):
+
+```bash
+# Disable compression for optimal performance with small, frequent updates
+SERVER_WEBSOCKET_COMPRESSION=false
+```
+
+### Large Data Transfers
+
+For applications transferring large datasets (e.g., file sharing, data visualization):
+
+```bash
+# Optimize for large data transfers
+SERVER_WEBSOCKET_COMPRESSION='{"threshold": 1024, "level": 6, "memLevel": 8}'
+```
+
+### Memory-Constrained Environment
+
+For deployments with limited memory resources:
+
+```bash
+# Minimize memory usage while maintaining compression
+SERVER_WEBSOCKET_COMPRESSION='{"threshold": 2048, "level": 1, "memLevel": 1, "maxWindowBits": 9}'
+```
+
+### Balanced Configuration
+
+For typical applications with mixed message sizes:
+
+```bash
+# Balance between compression and performance
+SERVER_WEBSOCKET_COMPRESSION='{"threshold": 1536, "level": 3, "memLevel": 4}'
+```
+
 ## Verifying Compression Status
 
 You can check if compression is enabled through the Meteor shell:

From 5fcf8e6d99a182a6dca3a76ac107ed9ba78cb462 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 4 Dec 2024 10:54:36 -0400
Subject: [PATCH 0896/1140] update permessage-deflate2

---
 packages/ddp-server/package.js           | 2 +-
 packages/socket-stream-client/package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 7b3408d31b..2f847a0801 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -5,7 +5,7 @@ Package.describe({
 });
 
 Npm.depends({
-  "permessage-deflate2": "0.1.8-alpha.1",
+  "permessage-deflate2": "0.1.8",
   sockjs: "0.3.24",
   "lodash.once": "4.1.1",
   "lodash.isempty": "4.4.0",
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index ab4c7781f3..b15e88267a 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -7,7 +7,7 @@ Package.describe({
 
 Npm.depends({
   "faye-websocket": "0.11.4",
-  "permessage-deflate2": "0.1.8-alpha.1",
+  "permessage-deflate2": "0.1.8",
   "lodash.isequal": "4.5.0",
   "lodash.once": "4.1.1"
 });

From af8e8ef31701ab52ee78fea10eb05f52bc8b2995 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 4 Dec 2024 11:03:29 -0400
Subject: [PATCH 0897/1140] add disclaimer

---
 v3-docs/docs/performance/websocket-compression.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/v3-docs/docs/performance/websocket-compression.md b/v3-docs/docs/performance/websocket-compression.md
index c1c28c09a7..e7c117f155 100644
--- a/v3-docs/docs/performance/websocket-compression.md
+++ b/v3-docs/docs/performance/websocket-compression.md
@@ -1,5 +1,12 @@
 # Websocket Compression in Meteor
 
+::: warning
+Modifying websocket compression settings without understanding your application's DDP messaging patterns can negatively impact performance. Before changing these settings, you should:
+- Use [Meteor DevTools Evolved](https://chromewebstore.google.com/detail/meteor-devtools-evolved/ibniinmoafhgbifjojidlagmggecmpgf) or your browser's Network tab to monitor WebSocket traffic
+- Analyze your DDP message frequency and payload sizes  
+- Test changes in a staging environment with realistic data and user load
+:::
+
 Meteor's stream server uses the permessage-deflate extension for websocket compression by default. While compression can help reduce bandwidth usage, it may impact performance in reactivity-intensive applications due to the computational overhead of compressing numerous DDP messages.
 
 ## Configuration

From 3dac12a5990c10c6995b015e3c4500b0b451c9b5 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 4 Dec 2024 11:45:06 -0400
Subject: [PATCH 0898/1140] downgrade mongo driver minor due to connection
 issue with old databases

---
 packages/npm-mongo/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index cc7a598051..1e546f940b 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,12 +3,12 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "6.10.0",
+  version: "6.10.1",
   documentation: null,
 });
 
 Npm.depends({
-  mongodb: "6.10.0"
+  mongodb: "6.9.0"
 });
 
 Package.onUse(function (api) {

From 24b452a81a33619d4dfe45f43a1c0140d84210fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 4 Dec 2024 17:28:07 +0100
Subject: [PATCH 0899/1140] fix a scenario on allow/deny rules tests due to
 insecure mode

---
 packages/mongo/tests/allow_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/tests/allow_tests.js b/packages/mongo/tests/allow_tests.js
index d2647060b9..7fad697128 100644
--- a/packages/mongo/tests/allow_tests.js
+++ b/packages/mongo/tests/allow_tests.js
@@ -1327,7 +1327,7 @@ function createAllowDenyRulesTest(collections, isAsync = true) {
       }
 
       if (Meteor.isClient) {
-        await runAllExpect(test, collections.noRules, false, isAsync);
+        await runAllExpect(test, collections.noRules, collections.noRules._isInsecure(), isAsync);
       }
     },
     async function (test) {

From 0a8db7532038ff836c1bc06a2dc3c87a906e1437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 5 Dec 2024 14:26:03 +0100
Subject: [PATCH 0900/1140] fix flaky tests by comparing expected array values
 equality regardless the order

---
 packages/roles/tests/serverAsync.js | 62 +++++++++++++++++------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/packages/roles/tests/serverAsync.js b/packages/roles/tests/serverAsync.js
index 1d207adeea..2c403228c6 100644
--- a/packages/roles/tests/serverAsync.js
+++ b/packages/roles/tests/serverAsync.js
@@ -57,23 +57,23 @@ const sameMembers = (test, value, expected) => {
   );
 };
 
-const sameDeepMembers = (test, value, expected) => {
-  // Helper to sort object keys recursively
-  const sortObjectKeys = (obj) => {
-    if (Array.isArray(obj)) {
-      return obj.map(sortObjectKeys);
-    }
-    if (obj && typeof obj === "object") {
-      return Object.keys(obj)
-        .sort()
-        .reduce((sorted, key) => {
-          sorted[key] = sortObjectKeys(obj[key]);
-          return sorted;
-        }, {});
-    }
-    return obj;
-  };
+// Helper to sort object keys recursively
+const sortObjectKeys = (obj) => {
+  if (Array.isArray(obj)) {
+    return obj.map(sortObjectKeys);
+  }
+  if (obj && typeof obj === "object") {
+    return Object.keys(obj)
+      .sort()
+      .reduce((sorted, key) => {
+        sorted[key] = sortObjectKeys(obj[key]);
+        return sorted;
+      }, {});
+  }
+  return obj;
+};
 
+const sameDeepMembers = (test, value, expected) => {
   const sortedValue = sortObjectKeys(value);
   const sortedExpected = sortObjectKeys(expected);
 
@@ -84,6 +84,16 @@ const sameDeepMembers = (test, value, expected) => {
   );
 };
 
+function sameDeepUnorderedMembers(test, value, expected) {
+  const sortAndStringify = (arr) => {
+    return JSON.stringify(arr.map(item => JSON.stringify(sortObjectKeys(item))).sort());
+  };
+  const sortedValue = sortAndStringify(value);
+  const sortedExpected = sortAndStringify(expected);
+
+  test.equal(sortedValue, sortedExpected, 'Arrays should have the same elements, regardless of order');
+}
+
 const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop);
 
 let users = {};
@@ -1885,7 +1895,7 @@ Tinytest.addAsync("roles -keep assigned roles", async function (test) {
     anyScope: true,
     fullObjects: true,
   });
-  sameDeepMembers(
+  sameDeepUnorderedMembers(
     test,
     rolesForUser.map((obj) => {
       delete obj._id;
@@ -1914,7 +1924,7 @@ Tinytest.addAsync("roles -keep assigned roles", async function (test) {
     anyScope: true,
     fullObjects: true,
   });
-  sameDeepMembers(
+  sameDeepUnorderedMembers(
     test,
     rolesForUser2.map((obj) => {
       delete obj._id;
@@ -1949,7 +1959,7 @@ Tinytest.addAsync("roles -keep assigned roles", async function (test) {
     anyScope: true,
     fullObjects: true,
   });
-  sameDeepMembers(
+  sameDeepUnorderedMembers(
     test,
     rolesForUser3.map((obj) => {
       delete obj._id;
@@ -1973,7 +1983,7 @@ Tinytest.addAsync("roles -keep assigned roles", async function (test) {
     anyScope: true,
     fullObjects: true,
   });
-  sameDeepMembers(
+  sameDeepUnorderedMembers(
     test,
     rolesForUser4.map((obj) => {
       delete obj._id;
@@ -2063,7 +2073,7 @@ Tinytest.addAsync(
       anyScope: true,
       fullObjects: true,
     });
-    sameDeepMembers(
+    sameDeepUnorderedMembers(
       test,
       usersRoles.map((obj) => {
         delete obj._id;
@@ -2109,7 +2119,7 @@ Tinytest.addAsync(
       anyScope: true,
       fullObjects: true,
     });
-    sameDeepMembers(
+    sameDeepUnorderedMembers(
       test,
       usersRoles2.map((obj) => {
         delete obj._id;
@@ -2153,7 +2163,7 @@ Tinytest.addAsync(
       anyScope: true,
       fullObjects: true,
     });
-    sameDeepMembers(
+    sameDeepUnorderedMembers(
       test,
       usersRoles3.map((obj) => {
         delete obj._id;
@@ -2203,7 +2213,7 @@ Tinytest.addAsync(
       anyScope: true,
       fullObjects: true,
     });
-    sameDeepMembers(
+    sameDeepUnorderedMembers(
       test,
       usersRoles4.map((obj) => {
         delete obj._id;
@@ -2255,7 +2265,7 @@ Tinytest.addAsync(
       anyScope: true,
       fullObjects: true,
     });
-    sameDeepMembers(
+    sameDeepUnorderedMembers(
       test,
       usersRoles5.map((obj) => {
         delete obj._id;
@@ -2308,7 +2318,7 @@ Tinytest.addAsync(
       anyScope: true,
       fullObjects: true,
     });
-    sameDeepMembers(
+    sameDeepUnorderedMembers(
       test,
       usersRoles6.map((obj) => {
         delete obj._id;

From 197ea3e00403e7edb78f7b20ee0123c877c262bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 5 Dec 2024 14:41:11 +0100
Subject: [PATCH 0901/1140] convert to arrow func to perserve code style

---
 packages/roles/tests/serverAsync.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/roles/tests/serverAsync.js b/packages/roles/tests/serverAsync.js
index 2c403228c6..1e844550fc 100644
--- a/packages/roles/tests/serverAsync.js
+++ b/packages/roles/tests/serverAsync.js
@@ -84,7 +84,7 @@ const sameDeepMembers = (test, value, expected) => {
   );
 };
 
-function sameDeepUnorderedMembers(test, value, expected) {
+const sameDeepUnorderedMembers = (test, value, expected) => {
   const sortAndStringify = (arr) => {
     return JSON.stringify(arr.map(item => JSON.stringify(sortObjectKeys(item))).sort());
   };
@@ -92,7 +92,7 @@ function sameDeepUnorderedMembers(test, value, expected) {
   const sortedExpected = sortAndStringify(expected);
 
   test.equal(sortedValue, sortedExpected, 'Arrays should have the same elements, regardless of order');
-}
+};
 
 const hasProp = (target, prop) => Object.hasOwnProperty.call(target, prop);
 

From e3f186469c18c11d44c8ae5997734741a53d653e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <hello@jandvorak.me>
Date: Fri, 6 Dec 2024 13:05:02 +0900
Subject: [PATCH 0902/1140] Node 22.12.0

---
 .travis.yml                        | 2 +-
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 v3-docs/v3-migration-docs/index.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95a5100c76..9367f92d0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "22.11.0"
+  - "22.12.0"
 cache:
   directories:
     - ".meteor"
diff --git a/meteor b/meteor
index 446c6c4f25..949fe701f1 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.11.0.4
+BUNDLE_VERSION=22.12.0.0
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index f8dfabf5b7..792bec99ea 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.11.0
+NODE_VERSION=22.12.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.0
diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 4aa566b6fb..cb1782a2ce 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,6 +1,6 @@
 ---
 meteor_version: 3.1.0
-node_version: 22.11.0
+node_version: 22.12.0
 npm_version: 10.9.0
 ---
 # Meteor 3.0 Migration Guide

From 82b730e7a09d5e159a205be80af800471f1a2287 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 6 Dec 2024 10:03:23 -0300
Subject: [PATCH 0903/1140] DOCS: move roles docs to packages folder

---
 v3-docs/docs/.vitepress/config.mts      |  4 ++++
 v3-docs/docs/{api => packages}/roles.md | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 rename v3-docs/docs/{api => packages}/roles.md (98%)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index fa04db0aca..322e37ef3d 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -318,6 +318,10 @@ export default defineConfig({
             text: "fetch",
             link: "/packages/fetch",
           },
+          {
+            text: "roles",
+            link: "/packages/roles",
+          },
           {
             text: "hot-module-replacement",
             link: "/packages/hot-module-replacement",
diff --git a/v3-docs/docs/api/roles.md b/v3-docs/docs/packages/roles.md
similarity index 98%
rename from v3-docs/docs/api/roles.md
rename to v3-docs/docs/packages/roles.md
index fdaee6c473..526b2d6fef 100644
--- a/v3-docs/docs/api/roles.md
+++ b/v3-docs/docs/packages/roles.md
@@ -214,7 +214,7 @@ Example:
 const roles = Roles.getAllRoles({ sort: { _id: 1 } });
 
 // Get roles with custom query
-const customRoles = Roles.getAllRoles({ 
+const customRoles = Roles.getAllRoles({
   fields: { _id: 1, children: 1 },
   sort: { _id: -1 }
 });
@@ -234,7 +234,7 @@ const scopedUsers = await Roles.getUsersInRoleAsync(['editor', 'writer'], 'blog'
 // Find users with custom options
 const users = await Roles.getUsersInRoleAsync('manager', {
   scope: 'department-a',
-  queryOptions: { 
+  queryOptions: {
     sort: { createdAt: -1 },
     limit: 10
   }
@@ -370,6 +370,10 @@ If you are currently using the `alanning:roles` package, follow these steps to m
    ```bash
    meteor add roles
    ```
+6. Update imports to use the new package:
+   ```js
+   import { Roles } from "meteor/roles";
+   ```
 
 The sync versions of these functions are still available on the client.
 
@@ -450,5 +454,3 @@ Meteor.methods({
   },
 });
 ```
-
-

From eb4b7bafd0d825703eb79fbde06a2dcc0095ea73 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 6 Dec 2024 10:09:37 -0300
Subject: [PATCH 0904/1140] DOCS: merge from devel config

---
 v3-docs/docs/.vitepress/config.mts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 322e37ef3d..eab9c52d87 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -350,6 +350,10 @@ export default defineConfig({
             text: "random",
             link: "/packages/random",
           },
+          {
+            text: "react-meteor-data",
+            link: "/packages/react-meteor-data",
+          },
           {
             text: "server-render",
             link: "/packages/server-render",
@@ -374,13 +378,15 @@ export default defineConfig({
             link: "/packages/packages-listing",
             text: "Maintained Packages",
           },
-          {
-            link: "packages/community-packages",
-            text: "Community Packages",
-          },
         ],
         collapsed: true,
       },
+      {
+        text: "Community Packages",
+        link: "/community-packages/index",
+        items: [],
+        collapsed: true,
+      },
       {
         text: "Troubleshooting",
         items: [
@@ -389,10 +395,6 @@ export default defineConfig({
             link: "/troubleshooting/expired-certificate",
           },
           { text: "Windows", link: "/troubleshooting/windows" },
-          {
-            text: "Known issues in 2.13",
-            link: "/troubleshooting/known-issues",
-          },
         ],
         collapsed: true,
       },

From 17aa93549fca575a2e906fcd11f01cbce8d04699 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 6 Dec 2024 10:14:35 -0300
Subject: [PATCH 0905/1140] docs: add roles again in config

---
 v3-docs/docs/.vitepress/config.mts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index ebb0235aea..1fdc607a2e 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -322,6 +322,10 @@ export default defineConfig({
             text: "hot-module-replacement",
             link: "/packages/hot-module-replacement",
           },
+          {
+            text: "roles",
+            link: "/packages/roles",
+          },
           {
             text: "less",
             link: "/packages/less",

From 59a64e46bc54dd4ccada25facb8924eda2cb10a2 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 6 Dec 2024 11:10:47 -0300
Subject: [PATCH 0906/1140] DOCS: add client sync methods

---
 v3-docs/docs/packages/roles.md | 50 +++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/v3-docs/docs/packages/roles.md b/v3-docs/docs/packages/roles.md
index 526b2d6fef..4461c2dbec 100644
--- a/v3-docs/docs/packages/roles.md
+++ b/v3-docs/docs/packages/roles.md
@@ -137,7 +137,7 @@ Example:
 
 ```js
 // Rename an existing role
-await Roles.renameRoleAsync('editor', 'content-editor');
+await Roles.renameRoleAsync("editor", "content-editor");
 ```
 
 ### Assigning Roles
@@ -193,7 +193,7 @@ Example:
 
 ```js
 // Rename a scope
-await Roles.renameScopeAsync('department-1', 'marketing');
+await Roles.renameScopeAsync("department-1", "marketing");
 ```
 
 <ApiBox name="Roles.removeScopeAsync" hasCustomExample />
@@ -202,7 +202,7 @@ Example:
 
 ```js
 // Remove a scope and all its role assignments
-await Roles.removeScopeAsync('old-department');
+await Roles.removeScopeAsync("old-department");
 ```
 
 <ApiBox name="Roles.getAllRoles" hasCustomExample />
@@ -216,7 +216,7 @@ const roles = Roles.getAllRoles({ sort: { _id: 1 } });
 // Get roles with custom query
 const customRoles = Roles.getAllRoles({
   fields: { _id: 1, children: 1 },
-  sort: { _id: -1 }
+  sort: { _id: -1 },
 });
 ```
 
@@ -226,18 +226,21 @@ Example:
 
 ```js
 // Find all admin users
-const adminUsers = await Roles.getUsersInRoleAsync('admin');
+const adminUsers = await Roles.getUsersInRoleAsync("admin");
 
 // Find users with specific roles in a scope
-const scopedUsers = await Roles.getUsersInRoleAsync(['editor', 'writer'], 'blog');
+const scopedUsers = await Roles.getUsersInRoleAsync(
+  ["editor", "writer"],
+  "blog"
+);
 
 // Find users with custom options
-const users = await Roles.getUsersInRoleAsync('manager', {
-  scope: 'department-a',
+const users = await Roles.getUsersInRoleAsync("manager", {
+  scope: "department-a",
   queryOptions: {
     sort: { createdAt: -1 },
-    limit: 10
-  }
+    limit: 10,
+  },
 });
 ```
 
@@ -291,10 +294,10 @@ Example:
 
 ```js
 // Check if admin is a parent of editor
-const isParent = await Roles.isParentOfAsync('admin', 'editor');
+const isParent = await Roles.isParentOfAsync("admin", "editor");
 
 // Can be used to check inheritance chains
-const hasPermission = await Roles.isParentOfAsync('super-admin', 'post-edit');
+const hasPermission = await Roles.isParentOfAsync("super-admin", "post-edit");
 ```
 
 <ApiBox name="Roles.getScopesForUserAsync" hasCustomExample />
@@ -306,7 +309,7 @@ Example:
 const allScopes = await Roles.getScopesForUserAsync(userId);
 
 // Get scopes where user has specific roles
-const editorScopes = await Roles.getScopesForUserAsync(userId, ['editor']);
+const editorScopes = await Roles.getScopesForUserAsync(userId, ["editor"]);
 ```
 
 ## Publishing Roles
@@ -331,6 +334,27 @@ Meteor.publish("scopeRoles", function (scope) {
 });
 ```
 
+## Client only APIs
+
+On the client alongside the async methods, you can use the `sync` versions of the functions:
+
+- `Roles.userIsInRole(userId, roles, scope)`
+- `Roles.getRolesForUser(userId, scope)`
+- `Roles.getScopesForUser(userId)`
+- `Roles.isParentOf(parent, child)`
+- `Roles.getUsersInRole(role, scope)`
+- `Roles.getAllRoles(options)`
+- `Roles.createRole(role, options)`
+- `Roles.addUsersToRoles(userId, roles, scope)`
+- `Roles.setUserRoles(userId, roles, scope)`
+- `Roles.removeUsersFromRoles(userId, roles, scope)`
+- `Roles.addRolesToParent(child, parent)`
+- `Roles.removeRolesFromParent(child, parent)`
+- `Roles.deleteRole(role)`
+- `Roles.renameRole(oldRole, newRole)`
+- `Roles.renameScope(oldScope, newScope)`
+- `Roles.removeScope(scope)`
+
 ## Using with Templates
 
 The roles package automatically provides an `isInRole` helper for templates:

From 45459bd72981b25048749b28ca560a42c5d9800e Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 6 Dec 2024 11:15:16 -0300
Subject: [PATCH 0907/1140] FIX: Add missing types to roles package

it was missing an `addAssets` in the `package.js` file
---
 packages/roles/package.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/roles/package.js b/packages/roles/package.js
index 2ff58f3dee..6bbafa487f 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -25,17 +25,14 @@ Package.onUse(function (api) {
   api.addFiles("roles_common_async.js", both);
   api.addFiles("roles_server.js", "server");
   api.addFiles(["client/debug.js", "client/uiHelpers.js"], "client");
+
+  api.addAssets("definitions.d.ts", both);
 });
 
 Package.onTest(function (api) {
   const both = ["client", "server"];
 
-  api.use([
-    "tinytest",
-    "ecmascript",
-    "mongo",
-    "roles"
-  ], both);
+  api.use(["tinytest", "ecmascript", "mongo", "roles"], both);
 
   api.addFiles("tests/serverAsync.js", "server");
   api.addFiles("tests/client.js", "client");

From 803e6d2eef506371bb78f4d1f2f9a0e673c2ba5f Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 9 Dec 2024 10:48:52 -0300
Subject: [PATCH 0908/1140] DEV: removed zodern:types explict dependency

added package-types.json to roles package
---
 packages/roles/package-types.json | 3 +++
 packages/roles/package.js         | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 packages/roles/package-types.json

diff --git a/packages/roles/package-types.json b/packages/roles/package-types.json
new file mode 100644
index 0000000000..7838991b97
--- /dev/null
+++ b/packages/roles/package-types.json
@@ -0,0 +1,3 @@
+{
+  "typesEntry": "definitions.d.ts"
+}
diff --git a/packages/roles/package.js b/packages/roles/package.js
index 6bbafa487f..e3a7080835 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -15,8 +15,6 @@ Package.onUse(function (api) {
     both
   );
 
-  api.use("zodern:types@1.0.13");
-
   api.use(["blaze@2.9.0 || 3.0.0"], "client", { weak: true });
 
   api.export(["Roles", "RolesCollection", "RoleAssignmentCollection"]);
@@ -26,7 +24,8 @@ Package.onUse(function (api) {
   api.addFiles("roles_server.js", "server");
   api.addFiles(["client/debug.js", "client/uiHelpers.js"], "client");
 
-  api.addAssets("definitions.d.ts", both);
+  api.addAssets("definitions.d.ts", "server");
+  api.addAssets("package-types.json", "server");
 });
 
 Package.onTest(function (api) {

From f1121457f9e457bcc4e467f4caa3ad39bb0294d3 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 9 Dec 2024 11:24:04 -0300
Subject: [PATCH 0909/1140] DEV: fix declarations

---
 packages/roles/definitions.d.ts | 232 ++++++++++++++++++++------------
 1 file changed, 149 insertions(+), 83 deletions(-)

diff --git a/packages/roles/definitions.d.ts b/packages/roles/definitions.d.ts
index d8f4441022..c15c8c9652 100644
--- a/packages/roles/definitions.d.ts
+++ b/packages/roles/definitions.d.ts
@@ -4,14 +4,14 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Minimum TypeScript Version: 4.1
 
-import { Mongo } from 'meteor/mongo'
+import { Mongo } from "meteor/mongo";
 
 /**
  * Provides functions related to user authorization. Compatible with built-in Meteor accounts packages.
  *
  * @module Roles
  */
-declare namespace Roles {
+export declare namespace Roles {
   /**
    * Constant used to reference the special 'global' group that
    * can be used to apply blanket permissions across all groups.
@@ -27,7 +27,7 @@ declare namespace Roles {
    * @static
    * @final
    */
-  var GLOBAL_GROUP: string
+  var GLOBAL_GROUP: string;
 
   /**
    * Subscription handle for the currently logged in user's permissions.
@@ -42,7 +42,7 @@ declare namespace Roles {
    *
    * @for Roles
    */
-  var subscription: Subscription
+  var subscription: Subscription;
 
   /**
    * Add users to roles.
@@ -68,12 +68,12 @@ declare namespace Roles {
     users: string | string[] | Meteor.User | Meteor.User[],
     roles: string | string[],
     options?: string | { scope?: string; ifExists?: boolean }
-  ): void
+  ): void;
   function addUsersToRolesAsync(
     users: string | string[] | Meteor.User | Meteor.User[],
     roles: string | string[],
     options?: string | { scope?: string; ifExists?: boolean }
-  ): Promise<void>
+  ): Promise<void>;
 
   /**
    * Create a new role.
@@ -84,8 +84,14 @@ declare namespace Roles {
    *   - `unlessExists`: if `true`, exception will not be thrown in the role already exists
    * @return {String} ID of the new role or null.
    */
-  function createRole(roleName: string, options?: { unlessExists: boolean }): string
-  function createRoleAsync(roleName: string, options?: { unlessExists: boolean }): Promise<string>
+  function createRole(
+    roleName: string,
+    options?: { unlessExists: boolean }
+  ): string;
+  function createRoleAsync(
+    roleName: string,
+    options?: { unlessExists: boolean }
+  ): Promise<string>;
 
   /**
    * Delete an existing role.
@@ -95,8 +101,8 @@ declare namespace Roles {
    * @method deleteRole
    * @param {String} roleName Name of role.
    */
-  function deleteRole(roleName: string): void
-  function deleteRoleAsync(roleName: string): Promise<void>
+  function deleteRole(roleName: string): void;
+  function deleteRoleAsync(roleName: string): Promise<void>;
 
   /**
    * Rename an existing role.
@@ -105,8 +111,8 @@ declare namespace Roles {
    * @param {String} oldName Old name of a role.
    * @param {String} newName New name of a role.
    */
-  function renameRole(oldName: string, newName: string): void
-  function renameRoleAsync(oldName: string, newName: string): Promise<void>
+  function renameRole(oldName: string, newName: string): void;
+  function renameRoleAsync(oldName: string, newName: string): Promise<void>;
 
   /**
    * Add role parent to roles.
@@ -118,8 +124,14 @@ declare namespace Roles {
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    */
-  function addRolesToParent(rolesNames: string | string[], parentName: string): void
-  function addRolesToParentAsync(rolesNames: string | string[], parentName: string): Promise<void>
+  function addRolesToParent(
+    rolesNames: string | string[],
+    parentName: string
+  ): void;
+  function addRolesToParentAsync(
+    rolesNames: string | string[],
+    parentName: string
+  ): Promise<void>;
 
   /**
    * Remove role parent from roles.
@@ -131,8 +143,14 @@ declare namespace Roles {
    * @param {Array|String} rolesNames Name(s) of role(s).
    * @param {String} parentName Name of parent role.
    */
-  function removeRolesFromParent(rolesNames: string | string[], parentName: string): void
-  function removeRolesFromParentAsync(rolesNames: string | string[], parentName: string): Promise<void>
+  function removeRolesFromParent(
+    rolesNames: string | string[],
+    parentName: string
+  ): void;
+  function removeRolesFromParentAsync(
+    rolesNames: string | string[],
+    parentName: string
+  ): Promise<void>;
 
   /**
    * Retrieve cursor of all existing roles.
@@ -142,7 +160,7 @@ declare namespace Roles {
    *                                through to `Meteor.roles.find(query, options)`.
    * @return {Cursor} Cursor of existing roles.
    */
-  function getAllRoles(queryOptions?: QueryOptions): Mongo.Cursor<Role>
+  function getAllRoles(queryOptions?: QueryOptions): Mongo.Cursor<Role>;
 
   /**
    * Retrieve users groups, if any
@@ -153,8 +171,14 @@ declare namespace Roles {
    *
    * @return {Array} Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted
    */
-  function getGroupsForUser(user: string | Meteor.User, role?: string): string[]
-  function getGroupsForUserAsync(user: string | Meteor.User, role?: string): Promise<string[]>
+  function getGroupsForUser(
+    user: string | Meteor.User,
+    role?: string
+  ): string[];
+  function getGroupsForUserAsync(
+    user: string | Meteor.User,
+    role?: string
+  ): Promise<string[]>;
 
   /**
    * Retrieve users scopes, if any.
@@ -165,8 +189,14 @@ declare namespace Roles {
    *
    * @return {Array} Array of user's scopes, unsorted.
    */
-  function getScopesForUser(user: string | Meteor.User, roles?: string | string[]): string[]
-  function getScopesForUserAsync(user: string | Meteor.User, roles?: string | string[]): Promise<string[]>
+  function getScopesForUser(
+    user: string | Meteor.User,
+    roles?: string | string[]
+  ): string[];
+  function getScopesForUserAsync(
+    user: string | Meteor.User,
+    roles?: string | string[]
+  ): Promise<string[]>;
 
   /**
    * Rename a scope.
@@ -177,8 +207,8 @@ declare namespace Roles {
    * @param {String} oldName Old name of a scope.
    * @param {String} newName New name of a scope.
    */
-  function renameScope(oldName: string, newName: string): void
-  function renameScopeAsync(oldName: string, newName: string): Promise<void>
+  function renameScope(oldName: string, newName: string): void;
+  function renameScopeAsync(oldName: string, newName: string): Promise<void>;
 
   /**
    * Remove a scope.
@@ -189,8 +219,8 @@ declare namespace Roles {
    * @param {String} name The name of a scope.
    *
    */
-  function removeScope(name: String): void
-  function removeScopeAsync(name: String): Promise<void>
+  function removeScope(name: String): void;
+  function removeScopeAsync(name: String): Promise<void>;
 
   /**
    * Find out if a role is an ancestor of another role.
@@ -202,8 +232,11 @@ declare namespace Roles {
    * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
    * @return {Boolean}
    */
-  function isParentOf(parentRoleName: string, childRoleName: string): boolean
-  function isParentOfAsync(parentRoleName: string, childRoleName: string): Promise<boolean>
+  function isParentOf(parentRoleName: string, childRoleName: string): boolean;
+  function isParentOfAsync(
+    parentRoleName: string,
+    childRoleName: string
+  ): Promise<boolean>;
 
   /**
    * Retrieve user's roles.
@@ -222,20 +255,30 @@ declare namespace Roles {
    * Alternatively, it can be a scope name string.
    * @return {Array} Array of user's roles, unsorted.
    */
-  function getRolesForUser(user: string | Meteor.User, options?: string | {
-    scope?: string;
-    anyScope?: boolean;
-    onlyScoped?: boolean;
-    onlyAssigned?: boolean;
-    fullObjects?: boolean
-  }): string[]
-  function getRolesForUserAsync(user: string | Meteor.User, options?: string | {
-    scope?: string;
-    anyScope?: boolean;
-    onlyScoped?: boolean;
-    onlyAssigned?: boolean;
-    fullObjects?: boolean
-  }): Promise<string[]>
+  function getRolesForUser(
+    user: string | Meteor.User,
+    options?:
+      | string
+      | {
+          scope?: string;
+          anyScope?: boolean;
+          onlyScoped?: boolean;
+          onlyAssigned?: boolean;
+          fullObjects?: boolean;
+        }
+  ): string[];
+  function getRolesForUserAsync(
+    user: string | Meteor.User,
+    options?:
+      | string
+      | {
+          scope?: string;
+          anyScope?: boolean;
+          onlyScoped?: boolean;
+          onlyAssigned?: boolean;
+          fullObjects?: boolean;
+        }
+  ): Promise<string[]>;
 
   /**
    * Retrieve all assignments of a user which are for the target role.
@@ -257,11 +300,16 @@ declare namespace Roles {
    * Alternatively, it can be a scope name string.
    * @return {Cursor} Cursor of user assignments for roles.
    */
-  function getUserAssignmentsForRole(roles: string | string[], options?: string | {
-    scope?: string
-    anyScope?: boolean
-    queryOptions?: QueryOptions
-  }): Mongo.Cursor<RoleAssignment>
+  function getUserAssignmentsForRole(
+    roles: string | string[],
+    options?:
+      | string
+      | {
+          scope?: string;
+          anyScope?: boolean;
+          queryOptions?: QueryOptions;
+        }
+  ): Mongo.Cursor<RoleAssignment>;
 
   /**
    * Retrieve all users who are in target role.
@@ -288,14 +336,28 @@ declare namespace Roles {
    */
   function getUsersInRole(
     roles: string | string[],
-    options?: string | { scope?: string; anyScope?: boolean; onlyScoped?: boolean; queryOptions?: QueryOptions },
+    options?:
+      | string
+      | {
+          scope?: string;
+          anyScope?: boolean;
+          onlyScoped?: boolean;
+          queryOptions?: QueryOptions;
+        },
     queryOptions?: QueryOptions
-  ): Mongo.Cursor<Meteor.User>
+  ): Mongo.Cursor<Meteor.User>;
   function getUsersInRoleAsync(
     roles: string | string[],
-    options?: string | { scope?: string; anyScope?: boolean; onlyScoped?: boolean; queryOptions?: QueryOptions },
+    options?:
+      | string
+      | {
+          scope?: string;
+          anyScope?: boolean;
+          onlyScoped?: boolean;
+          queryOptions?: QueryOptions;
+        },
     queryOptions?: QueryOptions
-  ): Promise<Mongo.Cursor<Meteor.User>>
+  ): Promise<Mongo.Cursor<Meteor.User>>;
 
   /**
    * Remove users from assigned roles.
@@ -318,12 +380,12 @@ declare namespace Roles {
     users: string | string[] | Meteor.User | Meteor.User[],
     roles?: string | string[],
     options?: string | { scope?: string; anyScope?: boolean }
-  ): void
+  ): void;
   function removeUsersFromRolesAsync(
     users: string | string[] | Meteor.User | Meteor.User[],
     roles?: string | string[],
     options?: string | { scope?: string; anyScope?: boolean }
-  ): Promise<void>
+  ): Promise<void>;
 
   /**
    * Set users' roles.
@@ -349,13 +411,17 @@ declare namespace Roles {
   function setUserRoles(
     users: string | string[] | Meteor.User | Meteor.User[],
     roles: string | string[],
-    options?: string | { scope?: string; anyScope?: boolean; ifExists?: boolean }
-  ): void
+    options?:
+      | string
+      | { scope?: string; anyScope?: boolean; ifExists?: boolean }
+  ): void;
   function setUserRolesAsync(
     users: string | string[] | Meteor.User | Meteor.User[],
     roles: string | string[],
-    options?: string | { scope?: string; anyScope?: boolean; ifExists?: boolean }
-  ): Promise<void>
+    options?:
+      | string
+      | { scope?: string; anyScope?: boolean; ifExists?: boolean }
+  ): Promise<void>;
 
   /**
    * Check if user has specified roles.
@@ -389,55 +455,55 @@ declare namespace Roles {
     user: string | string[] | Meteor.User | Meteor.User[],
     roles: string | string[],
     options?: string | { scope?: string; anyScope?: boolean }
-  ): boolean
+  ): boolean;
   function userIsInRoleAsync(
     user: string | string[] | Meteor.User | Meteor.User[],
     roles: string | string[],
     options?: string | { scope?: string; anyScope?: boolean }
-  ): Promise<boolean>
+  ): Promise<boolean>;
 
   // The schema for the roles collection
   interface Role {
-    _id: string
-    name: string
-    children: { _id: string }[]
+    _id: string;
+    name: string;
+    children: { _id: string }[];
   }
 
   // The schema for the role-assignment collection
   interface RoleAssignment {
-    _id: string
+    _id: string;
     user: {
-      _id: string
-    }
+      _id: string;
+    };
     role: {
-      _id: string
-    }
+      _id: string;
+    };
     inheritedRoles?: {
-      _id: string
-    }[]
-    scope?: string
+      _id: string;
+    }[];
+    scope?: string;
   }
 
   interface QueryOptions {
-    sort?: Mongo.SortSpecifier | undefined
-    skip?: number | undefined
-    limit?: number | undefined
-    fields?: Mongo.FieldSpecifier | undefined
-    projection?: Mongo.FieldSpecifier | undefined
-    reactive?: boolean | undefined
-    transform?: Function | undefined
+    sort?: Mongo.SortSpecifier | undefined;
+    skip?: number | undefined;
+    limit?: number | undefined;
+    fields?: Mongo.FieldSpecifier | undefined;
+    projection?: Mongo.FieldSpecifier | undefined;
+    reactive?: boolean | undefined;
+    transform?: Function | undefined;
   }
-
 } // module
 
 // Exported collections
-declare type RolesCollection = Mongo.Collection<Roles.Role>
-declare type RoleAssignmentsCollection = Mongo.Collection<Roles.RoleAssignment>
+export declare type RolesCollection = Mongo.Collection<Roles.Role>;
+export declare type RoleAssignmentsCollection =
+  Mongo.Collection<Roles.RoleAssignment>;
 
 // Additions to the Meteor object
-declare module 'meteor/meteor' {
-  namespace Meteor {
-    const roles: Mongo.Collection<Roles.Role>
-    const roleAssignment: Mongo.Collection<Roles.RoleAssignment>
+declare module "meteor/meteor" {
+  export namespace Meteor {
+    const roles: Mongo.Collection<Roles.Role>;
+    const roleAssignment: Mongo.Collection<Roles.RoleAssignment>;
   }
 }

From 080f270d6bff9ec6e249b49931f5b22e8aea7137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 9 Dec 2024 16:27:38 +0100
Subject: [PATCH 0910/1140] update types and docs for new allow/deny tweaks

---
 packages/allow-deny/allow-deny.js |  4 ++--
 packages/mongo/mongo.d.ts         | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/allow-deny/allow-deny.js b/packages/allow-deny/allow-deny.js
index 528bae567b..cd071c4b4f 100644
--- a/packages/allow-deny/allow-deny.js
+++ b/packages/allow-deny/allow-deny.js
@@ -49,7 +49,7 @@ const CollectionPrototype = AllowDeny.CollectionPrototype;
  * @memberOf Mongo.Collection
  * @instance
  * @param {Object} options
- * @param {Function} options.insertAsync,updateAsync,removeAsync Functions that look at a proposed modification to the database and return true if it should be allowed.
+ * @param {Function} options.insert,update,remove Functions that look at a proposed modification to the database and return true if it should be allowed.
  * @param {String[]} options.fetch Optional performance enhancement. Limits the fields that will be fetched from the database for inspection by your `update` and `remove` functions.
  * @param {Function} options.transform Overrides `transform` on the  [`Collection`](#collections).  Pass `null` to disable transformation.
  */
@@ -64,7 +64,7 @@ CollectionPrototype.allow = function(options) {
  * @memberOf Mongo.Collection
  * @instance
  * @param {Object} options
- * @param {Function} options.insertAsync,updateAsync,removeAsync Functions that look at a proposed modification to the database and return true if it should be denied, even if an [allow](#allow) rule says otherwise.
+ * @param {Function} options.insert,update,remove Functions that look at a proposed modification to the database and return true if it should be denied, even if an [allow](#allow) rule says otherwise.
  * @param {String[]} options.fetch Optional performance enhancement. Limits the fields that will be fetched from the database for inspection by your `update` and `remove` functions.
  * @param {Function} options.transform Overrides `transform` on the  [`Collection`](#collections).  Pass `null` to disable transformation.
  */
diff --git a/packages/mongo/mongo.d.ts b/packages/mongo/mongo.d.ts
index f624412e75..2f3c941732 100644
--- a/packages/mongo/mongo.d.ts
+++ b/packages/mongo/mongo.d.ts
@@ -96,7 +96,7 @@ export namespace Mongo {
   interface Collection<T extends NpmModuleMongodb.Document, U = T> {
     allow<Fn extends Transform<T> = undefined>(options: {
       insert?:
-        | ((userId: string, doc: DispatchTransform<Fn, T, U>) => boolean)
+        | ((userId: string, doc: DispatchTransform<Fn, T, U>) => Promise<boolean>|boolean)
         | undefined;
       update?:
         | ((
@@ -104,10 +104,10 @@ export namespace Mongo {
             doc: DispatchTransform<Fn, T, U>,
             fieldNames: string[],
             modifier: any
-          ) => boolean)
+          ) => Promise<boolean>|boolean)
         | undefined;
       remove?:
-        | ((userId: string, doc: DispatchTransform<Fn, T, U>) => boolean)
+        | ((userId: string, doc: DispatchTransform<Fn, T, U>) => Promise<boolean>|boolean)
         | undefined;
       fetch?: string[] | undefined;
       transform?: Fn | undefined;
@@ -131,7 +131,7 @@ export namespace Mongo {
     ): Promise<void>;
     deny<Fn extends Transform<T> = undefined>(options: {
       insert?:
-        | ((userId: string, doc: DispatchTransform<Fn, T, U>) => boolean)
+        | ((userId: string, doc: DispatchTransform<Fn, T, U>) => Promise<boolean>|boolean)
         | undefined;
       update?:
         | ((
@@ -139,10 +139,10 @@ export namespace Mongo {
             doc: DispatchTransform<Fn, T, U>,
             fieldNames: string[],
             modifier: any
-          ) => boolean)
+          ) => Promise<boolean>|boolean)
         | undefined;
       remove?:
-        | ((userId: string, doc: DispatchTransform<Fn, T, U>) => boolean)
+        | ((userId: string, doc: DispatchTransform<Fn, T, U>) => Promise<boolean>|boolean)
         | undefined;
       fetch?: string[] | undefined;
       transform?: Fn | undefined;

From d82bc304d86fa56ac0362ae5fa643b89a9d254a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 9 Dec 2024 16:51:47 +0100
Subject: [PATCH 0911/1140] add missing functionality used on tests or exposed
 in previous versions

---
 packages/roles/roles_common_async.js | 151 +++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/packages/roles/roles_common_async.js b/packages/roles/roles_common_async.js
index a78281db83..790de323f6 100644
--- a/packages/roles/roles_common_async.js
+++ b/packages/roles/roles_common_async.js
@@ -1163,6 +1163,157 @@ Object.assign(Roles, {
     return await Roles.getScopesForUser(...args)
   },
 
+  /**
+   * Retrieve users scopes, if any.
+   *
+   * @method getScopesForUserAsync
+   * @param {String|Object} user User ID or an actual user object.
+   * @param {Array|String} [roles] Name of roles to restrict scopes to.
+   *
+   * @return {Promise<Array>} Array of user's scopes, unsorted.
+   * @static
+   */
+  getScopesForUserAsync: async function (user, roles) {
+    let id
+
+    if (roles && !Array.isArray(roles)) roles = [roles]
+
+    if (user && typeof user === 'object') {
+      id = user._id
+    } else {
+      id = user
+    }
+
+    if (!id) return []
+
+    const selector = {
+      'user._id': id,
+      scope: { $ne: null }
+    }
+
+    if (roles) {
+      selector['inheritedRoles._id'] = { $in: roles }
+    }
+
+    const scopes = (
+      await Meteor.roleAssignment
+        .find(selector, { fields: { scope: 1 } })
+        .fetchAsync()
+    ).map((obi) => obi.scope)
+
+    return [...new Set(scopes)]
+  },
+
+  /**
+   * Rename a scope.
+   *
+   * Roles assigned with a given scope are changed to be under the new scope.
+   *
+   * @method renameScopeAsync
+   * @param {String} oldName Old name of a scope.
+   * @param {String} newName New name of a scope.
+   * @returns {Promise}
+   * @static
+   */
+  renameScopeAsync: async function (oldName, newName) {
+    let count
+
+    Roles._checkScopeName(oldName)
+    Roles._checkScopeName(newName)
+
+    if (oldName === newName) return
+
+    do {
+      count = await Meteor.roleAssignment.updateAsync(
+        {
+          scope: oldName
+        },
+        {
+          $set: {
+            scope: newName
+          }
+        },
+        { multi: true }
+      )
+    } while (count > 0)
+  },
+
+  /**
+   * Remove a scope.
+   *
+   * Roles assigned with a given scope are removed.
+   *
+   * @method removeScopeAsync
+   * @param {String} name The name of a scope.
+   * @returns {Promise}
+   * @static
+   */
+  removeScopeAsync: async function (name) {
+    Roles._checkScopeName(name)
+
+    await Meteor.roleAssignment.removeAsync({ scope: name })
+  },
+
+  /**
+   * Throw an exception if `roleName` is an invalid role name.
+   *
+   * @method _checkRoleName
+   * @param {String} roleName A role name to match against.
+   * @private
+   * @static
+   */
+  _checkRoleName: function (roleName) {
+    if (
+      !roleName ||
+      typeof roleName !== 'string' ||
+      roleName.trim() !== roleName
+    ) {
+      throw new Error(`Invalid role name '${roleName}'.`)
+    }
+  },
+
+  /**
+   * Find out if a role is an ancestor of another role.
+   *
+   * WARNING: If you check this on the client, please make sure all roles are published.
+   *
+   * @method isParentOfAsync
+   * @param {String} parentRoleName The role you want to research.
+   * @param {String} childRoleName The role you expect to be among the children of parentRoleName.
+   * @returns {Promise}
+   * @static
+   */
+  isParentOfAsync: async function (parentRoleName, childRoleName) {
+    if (parentRoleName === childRoleName) {
+      return true
+    }
+
+    if (parentRoleName == null || childRoleName == null) {
+      return false
+    }
+
+    Roles._checkRoleName(parentRoleName)
+    Roles._checkRoleName(childRoleName)
+
+    let rolesToCheck = [parentRoleName]
+    while (rolesToCheck.length !== 0) {
+      const roleName = rolesToCheck.pop()
+
+      if (roleName === childRoleName) {
+        return true
+      }
+
+      const role = await Meteor.roles.findOneAsync({ _id: roleName })
+
+      // This should not happen, but this is a problem to address at some other time.
+      if (!role) continue
+
+      rolesToCheck = rolesToCheck.concat(role.children.map((r) => r._id))
+    }
+
+    return false
+  },
+
   /**
    * Normalize options.
    *

From 55758fca5821e186ea1f1b0a3a64a9e881b2c3bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 9 Dec 2024 17:11:39 +0100
Subject: [PATCH 0912/1140] =?UTF-8?q?Meteor=20version=20to=203.1.1-beta.0?=
 =?UTF-8?q?=C2=A0:comet:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/allow-deny/package.js                |  2 +-
 packages/ddp-client/package.js                |  2 +-
 packages/ddp-server/package.js                |  2 +-
 packages/meteor-tool/package.js               |  2 +-
 packages/meteor/package.js                    |  2 +-
 packages/mongo/package.js                     |  2 +-
 packages/npm-mongo/package.js                 |  2 +-
 packages/socket-stream-client/package.js      |  2 +-
 .../admin/meteor-release-experimental.json    |  2 +-
 .../generators/changelog/versions/3.1.1.md    | 52 +++++++++++++++++++
 10 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 v3-docs/docs/generators/changelog/versions/3.1.1.md

diff --git a/packages/allow-deny/package.js b/packages/allow-deny/package.js
index 98a3d427a9..6029580e5f 100644
--- a/packages/allow-deny/package.js
+++ b/packages/allow-deny/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'allow-deny',
-  version: '2.0.0',
+  version: '2.1.0-beta311.0',
   // Brief, one-line summary of the package.
   summary: 'Implements functionality for allow/deny and client-side db operations',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 7ccb3cbec4..f59ced0813 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.0.3",
+  version: "3.1.0-beta311.0",
   documentation: null,
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 2f847a0801..5b3292fd75 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: "3.0.3",
+  version: "3.1.0-beta311.0",
   documentation: null,
 });
 
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 1656dc9b45..0dd7ce41f5 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.0",
+  version: "3.1.1-beta311.0",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index f9e81a4def..2bd187e9ee 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.0.2',
+  version: '2.1.0-beta311.0',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 5d7a744985..69ffdcd899 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.0.3",
+  version: "2.1.0-beta311.0",
 });
 
 Npm.depends({
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 1e546f940b..33a9160712 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "6.10.1",
+  version: "6.10.2-beta311.0",
   documentation: null,
 });
 
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index b15e88267a..8eb5c03ca2 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "socket-stream-client",
-  version: '0.5.3',
+  version: '0.6.0-beta311.0',
   summary: "Provides the ClientStream abstraction used by ddp-client",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index a1a63161ed..328cd19db3 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1-rc.0",
+  "version": "3.1.1-beta.0",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/v3-docs/docs/generators/changelog/versions/3.1.1.md b/v3-docs/docs/generators/changelog/versions/3.1.1.md
new file mode 100644
index 0000000000..757ec765ae
--- /dev/null
+++ b/v3-docs/docs/generators/changelog/versions/3.1.1.md
@@ -0,0 +1,52 @@
+## v3.1.1, /date/
+
+### Highlights
+
+- Real-time Performance Boost: Refactored AsynchronousQueue for parallel processing and optimized MongoDB observers for faster initial document handling.
+- Allow/Deny Rules Update: Deprecated async rules and updated documentation and types.
+- Mongo Driver Downgrade: Reverted to a stable version to prevent issues in Meteor.
+- [...]
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.1.1-beta.0
+
+```
+
+#### Bumped Meteor Packages
+
+- allow-deny@2.1.0
+- ddp-client@3.1.0
+- ddp-server@3.1.0
+- meteor-tool@3.1.1
+- meteor@2.1.0
+- mongo@2.1.0
+- npm-mongo@6.10.2
+- socket-stream-client@0.6.0
+- [...]
+
+#### Bumped NPM Packages
+
+N/A
+
+#### Special thanks to
+
+✨✨✨
+
+- [@leonardoventurini](https://github.com/leonardoventurini)
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@Grubba27](https://github.com/Grubba27)
+
+✨✨✨

From 4f2593b48e3870aa136eeaecf9b68c465c34587b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 10 Dec 2024 16:46:56 +0100
Subject: [PATCH 0913/1140] use proper suffix

---
 packages/meteor-tool/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 0dd7ce41f5..a565e09ead 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.1-beta311.0",
+  version: "3.1.1-beta.0",
 });
 
 Package.includeTool();

From 21ca4b6a3ed72ffcd39d0d6ba86b57b1612b976a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 10 Dec 2024 18:54:58 +0100
Subject: [PATCH 0914/1140] =?UTF-8?q?Meteor=20version=20to=203.1.1-beta.1?=
 =?UTF-8?q?=C2=A0:comet:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/allow-deny/package.js                 | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/socket-stream-client/package.js       | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/allow-deny/package.js b/packages/allow-deny/package.js
index 6029580e5f..868ec7dde9 100644
--- a/packages/allow-deny/package.js
+++ b/packages/allow-deny/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'allow-deny',
-  version: '2.1.0-beta311.0',
+  version: '2.1.0-beta311.1',
   // Brief, one-line summary of the package.
   summary: 'Implements functionality for allow/deny and client-side db operations',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index f59ced0813..27b5cd05c7 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.1.0-beta311.0",
+  version: "3.1.0-beta311.1",
   documentation: null,
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 5b3292fd75..cadb844d53 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: "3.1.0-beta311.0",
+  version: "3.1.0-beta311.1",
   documentation: null,
 });
 
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index a565e09ead..9fe28f4cca 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.1-beta.0",
+  version: "3.1.1-beta.1",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 2bd187e9ee..9a0b55cd0a 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.1.0-beta311.0',
+  version: '2.1.0-beta311.1',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 69ffdcd899..e67ad10117 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.0-beta311.0",
+  version: "2.1.0-beta311.1",
 });
 
 Npm.depends({
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 33a9160712..f3fc223f2a 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "6.10.2-beta311.0",
+  version: "6.10.2-beta311.1",
   documentation: null,
 });
 
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index 8eb5c03ca2..5c9376d0d4 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "socket-stream-client",
-  version: '0.6.0-beta311.0',
+  version: '0.6.0-beta311.1',
   summary: "Provides the ClientStream abstraction used by ddp-client",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 328cd19db3..8c531cca6b 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1.1-beta.0",
+  "version": "3.1.1-beta.1",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"

From d63386697f3cf1ea099dd0e7415b7c2565cceb9d Mon Sep 17 00:00:00 2001
From: Jan Dvorak <hello@jandvorak.me>
Date: Wed, 11 Dec 2024 13:16:13 +0900
Subject: [PATCH 0915/1140] Bump npm version to 10.9.2

This is to include fix for this annoyance: https://github.com/npm/cli/issues/7900
---
 scripts/build-dev-bundle-common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 792bec99ea..194a19af67 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -8,7 +8,7 @@ ARCH=$(uname -m)
 NODE_VERSION=22.12.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
-NPM_VERSION=10.9.0
+NPM_VERSION=10.9.2
 
 
 if [ "$UNAME" == "Linux" ] ; then

From 1e6d9f5564e922ac1cb0510ef6cf21be40cd6e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 11 Dec 2024 16:28:28 +0100
Subject: [PATCH 0916/1140] ensure callback will be used even after retried
 credential secret

---
 packages/accounts-oauth/oauth_client.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/accounts-oauth/oauth_client.js b/packages/accounts-oauth/oauth_client.js
index d47736cc84..a5fb19177c 100644
--- a/packages/accounts-oauth/oauth_client.js
+++ b/packages/accounts-oauth/oauth_client.js
@@ -82,10 +82,7 @@ Accounts.oauth.tryLoginAfterPopupClosed = (
   // In some case the function OAuth._retrieveCredentialSecret() can return null, because the local storage might not
   // be ready. So we retry after a timeout.
 
-  if (!credentialSecret) {
-    if (!shouldRetry) {
-      return;
-    }
+  if (!credentialSecret && shouldRetry) {
     Meteor.setTimeout(
       () =>
         Accounts.oauth.tryLoginAfterPopupClosed(
@@ -97,10 +94,11 @@ Accounts.oauth.tryLoginAfterPopupClosed = (
     );
     return;
   }
+
   // continue with the rest of the function
   Accounts.callLoginMethod({
     methodArguments: [{ oauth: { credentialToken, credentialSecret } }],
-    userCallback: callback && (err => callback(convertError(err))),
+    userCallback: callback ? err => callback(convertError(err)) : () => {},
   });
 };
 
@@ -112,4 +110,3 @@ Accounts.oauth.credentialRequestCompleteHandler = callback =>
       Accounts.oauth.tryLoginAfterPopupClosed(credentialTokenOrError, callback);
     }
   }
-

From aadff4e3aa461a366320ef86217fc89c11880361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 11 Dec 2024 17:04:57 +0100
Subject: [PATCH 0917/1140] re-run checks


From 8a0f0b709a6ae09395bd4b76770bd95640cb38d3 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 13 Dec 2024 09:54:06 -0300
Subject: [PATCH 0918/1140] DOCS: rename to meteor-rpc and add known issues
 part

---
 v3-docs/docs/community-packages/meteor-rpc.md | 81 ++++++++++++++-----
 1 file changed, 59 insertions(+), 22 deletions(-)

diff --git a/v3-docs/docs/community-packages/meteor-rpc.md b/v3-docs/docs/community-packages/meteor-rpc.md
index e97a6e99b5..a830f5f9aa 100644
--- a/v3-docs/docs/community-packages/meteor-rpc.md
+++ b/v3-docs/docs/community-packages/meteor-rpc.md
@@ -25,7 +25,7 @@ meteor --version
 :::
 
 ```bash
-meteor npm i grubba-rpc @tanstack/react-query zod
+meteor npm i meteor-rpc @tanstack/react-query zod
 ```
 
 ::: warning
@@ -60,7 +60,7 @@ Example:
 ::: code-group
 
 ```typescript [server/main.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { Chat } from "./chat";
 
 const server = createModule() // server has no namespace
@@ -72,7 +72,7 @@ export type Server = typeof server;
 ```
 
 ```typescript [server/chat.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { ChatCollection } from "/imports/api/chat";
 import { z } from "zod";
 
@@ -84,7 +84,7 @@ export const Chat = createModule("chat")
 ```
 
 ```typescript [client/main.ts]
-import { createClient } from "grubba-rpc";
+import { createClient } from "meteor-rpc";
 // you must import the type of the server
 import type { Server } from "/imports/api/server";
 
@@ -114,7 +114,7 @@ This is the equivalent of `Meteor.methods` but with types and runtime validation
 ::: code-group
 
 ```typescript [server/with-meteor-rpc.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { z } from "zod";
 
 const server = createModule()
@@ -153,7 +153,7 @@ This is the equivalent of `Meteor.publish` but with types and runtime validation
 ::: code-group
 
 ```typescript [server/with-meteor-rpc.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { ChatCollection } from "/imports/api/chat";
 import { z } from "zod";
 
@@ -185,7 +185,7 @@ This is used to add a submodule to the main module, adding namespaces for your m
 
 ```typescript [server/chat.ts]
 import { ChatCollection } from "/imports/api/chat";
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 
 export const chatModule = createModule("chat")
   .addMethod("createChat", z.void(), async () => {
@@ -195,7 +195,7 @@ export const chatModule = createModule("chat")
 ```
 
 ```typescript [server/chat.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { chatModule } from "./server/chat";
 
 const server = createModule()
@@ -227,7 +227,7 @@ The middleware ordering is last in first out. Check the example below:
 
 ```typescript [server/chat.ts]
 import { ChatCollection } from "/imports/api/chat";
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 
 export const chatModule = createModule("chat")
   .addMiddlewares([
@@ -242,7 +242,7 @@ export const chatModule = createModule("chat")
 ```
 
 ```typescript [server/main.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { chatModule } from "./server/chat";
 
 const server = createModule()
@@ -257,7 +257,7 @@ const server = createModule()
 ```
 
 ```typescript [client/main.ts]
-import { createClient } from "grubba-rpc";
+import { createClient } from "meteor-rpc";
 import type { Server } from "/imports/api/server"; // you must import the type
 
 const api = createClient<Server>();
@@ -275,7 +275,7 @@ This is used to build the module, it should be used at the end of the module cre
 
 ```typescript [correct.ts]
 // ✅ it has the build method
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { z } from "zod";
 const server = createModule()
   .addMethod("bar", z.string(), (arg) => "bar" as const)
@@ -286,7 +286,7 @@ export type Server = typeof server;
 
 ```typescript [incorrect.ts]
 // ❌ it is missing the build method
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { z } from "zod";
 const server = createModule().addMethod(
   "bar",
@@ -306,7 +306,7 @@ This is used to build the submodule, it should be used at the end of the submodu
 ::: code-group
 
 ```typescript [correct.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { z } from "zod";
 
 export const chatModule = createModule("chat")
@@ -318,7 +318,7 @@ export const chatModule = createModule("chat")
 ```
 
 ```typescript [incorrect.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { z } from "zod";
 
 export const otherSubmodule = createModule("other")
@@ -338,7 +338,7 @@ export const otherSubmodule = createModule("other").addMethod(
 ```
 
 ```typescript [server/main.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { chatModule } from "./server/chat";
 
 const server = createModule()
@@ -361,7 +361,7 @@ You can have something like `api.ts` that will export the client and the type of
 ::: code-group
 
 ```typescript [server/main.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 
 const server = createModule()
   .addMethod("bar", z.string(), (arg) => "bar" as const)
@@ -391,7 +391,7 @@ It uses the [`useMutation`](https://tanstack.com/query/latest/docs/framework/rea
 ::: code-group
 
 ```typescript [server/main.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 
 const server = createModule()
   .addMethod("bar", z.string(), (arg) => {
@@ -432,7 +432,7 @@ It uses the [`useQuery`](https://tanstack.com/query/latest/docs/framework/react/
 ::: code-group
 
 ```typescript [server/main.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 
 const server = createModule()
   .addMethod("bar", z.string(), (arg) => "bar" as const)
@@ -463,7 +463,7 @@ Subscriptions on the client have `useSubscription` method that can be used as a
 
 ```typescript [server/main.ts]
 // server/main.ts
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { ChatCollection } from "/imports/api/chat";
 import { z } from "zod";
 
@@ -513,7 +513,7 @@ if the method has failed you can also check the error.
 ::: code-group
 
 ```typescript [on-method-after-creation.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { z } from "zod";
 
 const server = createModule()
@@ -537,7 +537,7 @@ export type Server = typeof server;
 ```
 
 ```typescript [on-method-creation.ts]
-import { createModule } from "grubba-rpc";
+import { createModule } from "meteor-rpc";
 import { z } from "zod";
 
 const server = createModule()
@@ -567,3 +567,40 @@ export type Server = typeof server;
 ```
 
 :::
+
+## Known issues
+
+if you are getting a similar error like this one:
+
+```text
+
+=> Started MongoDB.
+Typescript processing requested for web.browser using Typescript 5.7.2
+Creating new Typescript watcher for /app
+Starting compilation in watch mode...
+Compiling server/chat/model.ts
+Compiling server/chat/module.ts
+Compiling server/main.ts
+Writing .meteor/local/plugin-cache/refapp_meteor-typescript/0.5.6/v2cache/buildfile.tsbuildinfo
+Compilation finished in 0.3 seconds. 3 files were (re)compiled.
+did not find /app/.meteor/local/plugin-cache/refapp_meteor-typescript/0.5.6/v2cache/out/client/main.js
+did not find /app/.meteor/local/plugin-cache/refapp_meteor-typescript/0.5.6/v2cache/out/client/main.js
+Nothing emitted for client/main.tsx
+node:internal/crypto/hash:115
+    throw new ERR_INVALID_ARG_TYPE(
+          ^
+
+TypeError [ERR_INVALID_ARG_TYPE]: The "data" argument must be of type string or an instance of Buffer, TypedArray, or DataView. Received null
+    at Hash.update (node:internal/crypto/hash:115:11)
+    at /Users/user/.meteor/packages/meteor-tool/.3.0.4.1tddsze.as7rh++os.osx.arm64+web.browser+web.browser.legacy+web.cordova/mt-os.osx.arm64/tools/fs/tools/fs/watch.ts:329:28
+    at Array.forEach (<anonymous>)
+    at /Users/user/.meteor/packages/meteor-tool/.3.0.4.1tddsze.as7rh++os.osx.arm64+web.browser+web.browser.legacy+web.cordova/mt-os.osx.arm64/tools/fs/tools/fs/watch.ts:329:8
+    at JsOutputResource._get (/tools/isobuild/compiler-plugin.js:1002:19) {
+  code: 'ERR_INVALID_ARG_TYPE'
+}
+
+Node.js v20.18.0
+```
+
+Please check if you are using `refapp:meteor-typescript` package, if so, you can remove it and use the `typescript` package instead.
+Currently, the `refapp:meteor-typescript` package is not compatible with the `meteor-rpc` package.

From b61edb2f504162e704fbb9abb039e947f1883aff Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 13 Dec 2024 09:58:12 -0300
Subject: [PATCH 0919/1140] DEV: adjust config for vitepress

---
 v3-docs/docs/.vitepress/config.mts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index f57a717671..d2a7dcb97b 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -378,13 +378,22 @@ export default defineConfig({
             link: "/packages/packages-listing",
             text: "Maintained Packages",
           },
+          {
+            link: "packages/community-packages",
+            text: "Community Packages",
+          },
         ],
         collapsed: true,
       },
       {
         text: "Community Packages",
         link: "/community-packages/index",
-        items: [],
+        items: [
+          {
+            text: "Meteor RPC",
+            link: "/community-packages/meteor-rpc",
+          },
+        ],
         collapsed: true,
       },
       {

From 757eca3106e53e55451b9fe319a1f9d4ba4c656e Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 13 Dec 2024 10:43:52 -0300
Subject: [PATCH 0920/1140] docs: add repo link

---
 v3-docs/docs/community-packages/meteor-rpc.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/v3-docs/docs/community-packages/meteor-rpc.md b/v3-docs/docs/community-packages/meteor-rpc.md
index a830f5f9aa..45d0a89400 100644
--- a/v3-docs/docs/community-packages/meteor-rpc.md
+++ b/v3-docs/docs/community-packages/meteor-rpc.md
@@ -604,3 +604,5 @@ Node.js v20.18.0
 
 Please check if you are using `refapp:meteor-typescript` package, if so, you can remove it and use the `typescript` package instead.
 Currently, the `refapp:meteor-typescript` package is not compatible with the `meteor-rpc` package.
+
+If it is still not working, please open an issue in the [repo](https://github.com/Grubba27/meteor-rpc)

From 4fe24fdae934aee92a46d938dc506ab9f80366da Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 13 Dec 2024 17:12:40 -0300
Subject: [PATCH 0921/1140] FIX: typos in meteor-rpc.md

we had a few typos in the meteor-rpc.md file, passes the whole file in Grammarly and fixed all the typos.
---
 v3-docs/docs/community-packages/meteor-rpc.md | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/v3-docs/docs/community-packages/meteor-rpc.md b/v3-docs/docs/community-packages/meteor-rpc.md
index 45d0a89400..683a98be16 100644
--- a/v3-docs/docs/community-packages/meteor-rpc.md
+++ b/v3-docs/docs/community-packages/meteor-rpc.md
@@ -8,7 +8,7 @@
 
 _Inspired on [zodern:relay](https://github.com/zodern/meteor-relay) and on [tRPC](https://trpc.io/)_
 
-This package provides functions for building E2E type-safe RPCs, focused on React front ends.
+This package provides functions for building E2E type-safe RPCs focused on React front ends.
 
 ## How to download it?
 
@@ -16,7 +16,7 @@ This package provides functions for building E2E type-safe RPCs, focused on Reac
 
 This package works only with Meteor 2.8 or higher.
 
-If not sure about the version of Meteor you are using, you can check it by running the following command in your terminal within your project:
+If you are not sure about the version of Meteor you are using, you can check it by running the following command in your terminal within your project:
 
 ```bash
 meteor --version
@@ -30,19 +30,19 @@ meteor npm i meteor-rpc @tanstack/react-query zod
 
 ::: warning
 
-Before continuing the installation make sure you have `react-query` all set in your project, for more info follow their [quick start guide](https://tanstack.com/query/latest/docs/framework/react/quick-start).
+Before continuing the installation, make sure you have `react-query` all set in your project; for more info, follow their [quick start guide](https://tanstack.com/query/latest/docs/framework/react/quick-start).
 
 :::
 
 ## How to use it?
 
-There is a few concepts that are important while using this package:
+There are a few concepts that are important while using this package:
 
 - This package is built on top of [`Meteor.methods`](../api/meteor.md#method-apis-methods) and [`Meteor.publish`](../api/meteor.md#publish-and-subscribe-pubsub) but with types and runtime validation, their understanding is important to use this package.
-- Every method and publication use `zod` to validate the arguments, so you can be sure that the data you are receiving is the data you are expecting.
+- Every method and publication uses `Zod` to validate the arguments, so you can be sure that the data you are receiving is what you expect.
 
 ::: tip
-If you are accepting any type of data you can use `z.any()` as the schema or `z.void` for when there is no argument
+If you are accepting any type of data, you can use `z.any()` as the schema or `z.void` when there is no argument
 :::
 
 ### `createModule`
@@ -53,7 +53,7 @@ This function is used to create a module that will be used to call our methods a
 
 `subModule` with a namespace: `createModule("namespace")` is used to create a submodule that will be added to the main module.
 
-> Remember to use `build` at the end of module creation to ensure that the module is going to be created.
+> Remember to use `build` at the end of module creation to ensure that the module will be created.
 
 Example:
 
@@ -90,7 +90,7 @@ import type { Server } from "/imports/api/server";
 
 const api = createClient<Server>();
 const bar: "bar" = await api.bar("some string");
-//   ?^ 'bar'
+// ?^ 'bar'
 const newChatId = await api.chat.createChat(); // with intellisense
 ```
 
@@ -191,7 +191,7 @@ export const chatModule = createModule("chat")
   .addMethod("createChat", z.void(), async () => {
     return ChatCollection.insertAsync({ createdAt: new Date(), messages: [] });
   })
-  .buildSubmodule(); // <-- this is important so that this module can be added as a submodule
+  .buildSubmodule(); // <-- This is important so that this module can be added as a submodule
 ```
 
 ```typescript [server/chat.ts]
@@ -219,9 +219,9 @@ type Middleware = (raw: unknown, parsed: unknown) => void;
 addMiddlewares(middlewares: Middleware[])
 ```
 
-This is used to add middlewares to the module, it can be used to add side effects logic to the methods and publications, ideal for logging or rate limiting.
+This is used to add middleware to the module; it should be used to add side effects logic to the methods and publications, which is ideal for logging or rate limiting.
 
-The middleware ordering is last in first out. Check the example below:
+The middleware ordering is last in, first out. Check the example below:
 
 ::: code-group
 
@@ -351,7 +351,7 @@ const server = createModule()
 
 ## Using in the client
 
-When using in the client you _have_ to use the `createModule` and `build` methods to create a module that will be used in the client
+When using in the client, you _have_ to use the `createModule` and `build` methods to create a module that will be used in the client
 and be sure that you are exporting the type of the module
 
 _You should only create one client in your application_
@@ -382,7 +382,7 @@ await app.bar("str"); // it will return "bar"
 
 ## React focused API
 
-Our package has a React focused API that uses `react-query` to handle the data fetching and mutations.
+Our package has a React-focused API that uses `react-query` to handle the data fetching and mutations.
 
 ### `method.useMutation`
 
@@ -500,15 +500,15 @@ export const Component = () => {
 
 ## Examples
 
-Currently we have:
+Currently, we have:
 
 - [chat-app](https://github.com/Grubba27/testing-meteor-rpc) that uses this package to create a chat-app
 - [askme](https://github.com/fredmaiaarantes/askme) that uses this package to create a Q&A app, you can check it live [here](https://askmeaquestion.meteorapp.com/)
 
 ## Advanced usage
 
-you can take advantage of the hooks to add custom logic to your methods, checking the raw and parsed data, and the result of the method,
-if the method has failed you can also check the error.
+You can take advantage of the hooks to add custom logic to your methods, checking the raw and parsed data and the result of the method,
+If the method fails, you can also check the error.
 
 ::: code-group
 
@@ -603,6 +603,6 @@ Node.js v20.18.0
 ```
 
 Please check if you are using `refapp:meteor-typescript` package, if so, you can remove it and use the `typescript` package instead.
-Currently, the `refapp:meteor-typescript` package is not compatible with the `meteor-rpc` package.
+The `refapp:meteor-typescript` package is currently incompatible with the `meteor-rpc` package.
 
 If it is still not working, please open an issue in the [repo](https://github.com/Grubba27/meteor-rpc)

From 6e24668a644839ebb912b1c8644a2a50b4e45385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 16 Dec 2024 16:09:42 +0100
Subject: [PATCH 0922/1140] fix facebook registerLoginHandler to support
 async/await

---
 packages/facebook-oauth/facebook_server.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/facebook-oauth/facebook_server.js b/packages/facebook-oauth/facebook_server.js
index a260f7eeec..c60a7ce200 100644
--- a/packages/facebook-oauth/facebook_server.js
+++ b/packages/facebook-oauth/facebook_server.js
@@ -26,11 +26,12 @@ Facebook.handleAuthFromAccessToken = async (accessToken, expiresAt) => {
   };
 };
 
-Accounts.registerLoginHandler(request => {
+Accounts.registerLoginHandler(async request => {
   if (request.facebookSignIn !== true) {
     return;
   }
-  const facebookData = Facebook.handleAuthFromAccessToken(request.accessToken, (+new Date) + (1000 * request.expirationTime));
+  const facebookData = await Facebook.handleAuthFromAccessToken(request.accessToken, (+new Date) + (1000 * request.expirationTime));
+  if (!facebookData) return;
   return Accounts.updateOrCreateUserFromExternalService('facebook', facebookData.serviceData, facebookData.options);
 });
 

From 596bbfbce1a62de66c26f2ce8ab4ee8650b64332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 16 Dec 2024 16:53:07 +0100
Subject: [PATCH 0923/1140] implement a retry mechanism over a second

---
 packages/accounts-oauth/oauth_client.js    | 46 +++++++++++-----------
 packages/facebook-oauth/facebook_server.js |  1 -
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/packages/accounts-oauth/oauth_client.js b/packages/accounts-oauth/oauth_client.js
index a5fb19177c..2cb04a8fd2 100644
--- a/packages/accounts-oauth/oauth_client.js
+++ b/packages/accounts-oauth/oauth_client.js
@@ -74,32 +74,34 @@ Meteor.startup(() => {
 Accounts.oauth.tryLoginAfterPopupClosed = (
   credentialToken,
   callback,
-  shouldRetry = true
+  timeout = 1000
 ) => {
-  const credentialSecret =
-    OAuth._retrieveCredentialSecret(credentialToken);
+  let startTime = Date.now();
+  let intervalId;
+  const checkForCredentialSecret = (clearInterval = false) => {
+    const credentialSecret = OAuth._retrieveCredentialSecret(credentialToken);
+    if (clearInterval || credentialSecret) {
+      Meteor.clearInterval(intervalId);
+      Accounts.callLoginMethod({
+        methodArguments: [{ oauth: { credentialToken, credentialSecret } }],
+        userCallback: callback ? err => callback(convertError(err)) : () => {},
+      });
+    }
+  };
 
+  // Check immediately
+  checkForCredentialSecret();
+
+  // Then check on an interval
   // In some case the function OAuth._retrieveCredentialSecret() can return null, because the local storage might not
   // be ready. So we retry after a timeout.
-
-  if (!credentialSecret && shouldRetry) {
-    Meteor.setTimeout(
-      () =>
-        Accounts.oauth.tryLoginAfterPopupClosed(
-          credentialToken,
-          callback,
-          false
-        ),
-      500
-    );
-    return;
-  }
-
-  // continue with the rest of the function
-  Accounts.callLoginMethod({
-    methodArguments: [{ oauth: { credentialToken, credentialSecret } }],
-    userCallback: callback ? err => callback(convertError(err)) : () => {},
-  });
+  intervalId = Meteor.setInterval(() => {
+    if (Date.now() - startTime > timeout) {
+      checkForCredentialSecret(true);
+    } else {
+      checkForCredentialSecret();
+    }
+  }, 250);
 };
 
 Accounts.oauth.credentialRequestCompleteHandler = callback =>
diff --git a/packages/facebook-oauth/facebook_server.js b/packages/facebook-oauth/facebook_server.js
index c60a7ce200..c9f9610871 100644
--- a/packages/facebook-oauth/facebook_server.js
+++ b/packages/facebook-oauth/facebook_server.js
@@ -97,7 +97,6 @@ const getTokenResponse = async (query) => {
     .then((res) => res.json())
     .then(data => {
       const fbAccessToken = data.access_token;
-      console.log("-> fbAccessToken", fbAccessToken);
       const fbExpires = data.expires_in;
       if (!fbAccessToken) {
         throw new Error("Failed to complete OAuth handshake with facebook " +

From 991248c3812bce1500de44bb80d769d1d6ffe9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 16 Dec 2024 17:17:32 +0100
Subject: [PATCH 0924/1140] ensure scenario of login performaed twice but the
 last one without the secret that triggered the login (producing a wrong/extra
 cancel)

---
 packages/accounts-oauth/oauth_client.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/accounts-oauth/oauth_client.js b/packages/accounts-oauth/oauth_client.js
index 2cb04a8fd2..ad28401437 100644
--- a/packages/accounts-oauth/oauth_client.js
+++ b/packages/accounts-oauth/oauth_client.js
@@ -77,15 +77,19 @@ Accounts.oauth.tryLoginAfterPopupClosed = (
   timeout = 1000
 ) => {
   let startTime = Date.now();
+  let calledOnce = false;
   let intervalId;
   const checkForCredentialSecret = (clearInterval = false) => {
     const credentialSecret = OAuth._retrieveCredentialSecret(credentialToken);
-    if (clearInterval || credentialSecret) {
+    if (!calledOnce && (credentialSecret || clearInterval)) {
+      calledOnce = true;
       Meteor.clearInterval(intervalId);
       Accounts.callLoginMethod({
         methodArguments: [{ oauth: { credentialToken, credentialSecret } }],
         userCallback: callback ? err => callback(convertError(err)) : () => {},
       });
+    } else if (clearInterval) {
+      Meteor.clearInterval(intervalId);
     }
   };
 

From d6688c6f1cc1deca8c7ab959a076f6846f3705a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 18 Dec 2024 18:03:22 +0100
Subject: [PATCH 0925/1140] ignore syntax errors on parse, these are not
 important to exit early and manage cancel of login

---
 packages/oauth/oauth_cordova.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/oauth/oauth_cordova.js b/packages/oauth/oauth_cordova.js
index 8ba66d5744..87da00af5f 100644
--- a/packages/oauth/oauth_cordova.js
+++ b/packages/oauth/oauth_cordova.js
@@ -34,9 +34,17 @@ OAuth.showPopup = (url, callback, dimensions) => {
         throw new Error("No hash fragment in OAuth popup?");
       }
 
-      const credentials = JSON.parse(decodeURIComponent(hashFragment));
-      OAuth._handleCredentialSecret(credentials.credentialToken,
-                                    credentials.credentialSecret);
+      try {
+        const credentials = JSON.parse(decodeURIComponent(hashFragment));
+        OAuth._handleCredentialSecret(credentials.credentialToken,
+          credentials.credentialSecret);
+      } catch (error) {
+        if (error instanceof SyntaxError) {
+          // Ignore or a default value if parsing fails
+        } else {
+          throw error; // Re-throw if it's not a syntax error
+        }
+      }
 
       oauthFinished = true;
 

From adf5df9de0f8498b7a2b49e0ad0e4d9e0c91d63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 14:54:38 +0100
Subject: [PATCH 0926/1140] add ObjectID alias to backward compatible of meteor
 packages

---
 packages/mongo/mongo_common.js               | 4 +++-
 packages/mongo/tests/mongo_livedata_tests.js | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/mongo_common.js b/packages/mongo/mongo_common.js
index af2ec849c5..ee5c575443 100644
--- a/packages/mongo/mongo_common.js
+++ b/packages/mongo/mongo_common.js
@@ -1,7 +1,9 @@
 import clone from 'lodash.clone'
 
 /** @type {import('mongodb')} */
-export const MongoDB = NpmModuleMongodb;
+export const MongoDB = Object.assign(NpmModuleMongodb, {
+  ObjectID: NpmModuleMongodb.ObjectId,
+});
 
 // The write methods block until the database has confirmed the write (it may
 // not be replicated or stable on disk, but one server has confirmed it) if no
diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 48ad53fc2b..c17202dd21 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -3967,6 +3967,11 @@ Meteor.isServer &&
       typeof MongoInternals.NpmModules.mongodb.module.ObjectId,
       'function'
     );
+    test.equal(
+      MongoInternals.NpmModule.ObjectID,
+      MongoInternals.NpmModule.ObjectId,
+      'MongoInternals.ObjectID should be an alias for MongoInternals.ObjectId'
+    );
 
     var c = new Mongo.Collection(Random.id());
     var rawCollection = c.rawCollection();

From bd68461e5d3283261d5e86bb99d8ca46bb158194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 15:28:40 +0100
Subject: [PATCH 0927/1140] ensure cancel error is triggered if exit and oauth
 not processed

---
 packages/oauth/oauth_cordova.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/oauth/oauth_cordova.js b/packages/oauth/oauth_cordova.js
index 87da00af5f..b71e13d133 100644
--- a/packages/oauth/oauth_cordova.js
+++ b/packages/oauth/oauth_cordova.js
@@ -64,6 +64,12 @@ OAuth.showPopup = (url, callback, dimensions) => {
   };
 
   const onExit = () => {
+    // Force callback to throw cancel error when exit
+    // and oauth process didn't start
+    if (!oauthFinished) {
+      callback();
+    }
+
     popup.removeEventListener('loadstop', pageLoaded);
     popup.removeEventListener('loaderror', fail);
     popup.removeEventListener('exit', onExit);

From 2070514ffd56e07ed86589534c29475f24f23320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 16:26:37 +0100
Subject: [PATCH 0928/1140] use a proxy for deprecation

---
 packages/mongo/mongo_driver.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 6518967967..441a503670 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -18,7 +18,17 @@ MongoInternals.NpmModules = {
 // MongoInternals.NpmModules.mongodb.module.  It was never documented, but
 // people do use it.
 // XXX COMPAT WITH 1.0.3.2
-MongoInternals.NpmModule = MongoDB;
+MongoInternals.NpmModule = new Proxy(MongoDB, {
+  get(target, propertyKey, receiver) {
+    if (propertyKey === 'ObjectID') {
+      console.warn(
+        `Accessing 'MongoInternals.NpmModule.ObjectID' directly is deprecated. ` +
+        `Use 'MongoInternals.NpmModules.mongodb.module.ObjectId' instead.`
+      );
+    }
+    return Reflect.get(target, propertyKey, receiver);
+  },
+});
 
 MongoInternals.OplogHandle = OplogHandle;
 

From 560e2e5f70512d21325f3ae682057e062bf4a65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 16:33:03 +0100
Subject: [PATCH 0929/1140] fix log

---
 packages/mongo/mongo_driver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 441a503670..5933bff913 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -23,7 +23,7 @@ MongoInternals.NpmModule = new Proxy(MongoDB, {
     if (propertyKey === 'ObjectID') {
       console.warn(
         `Accessing 'MongoInternals.NpmModule.ObjectID' directly is deprecated. ` +
-        `Use 'MongoInternals.NpmModules.mongodb.module.ObjectId' instead.`
+        `Use 'MongoInternals.NpmModule.ObjectId' instead.`
       );
     }
     return Reflect.get(target, propertyKey, receiver);

From 601820f7e5f2b6a32d219cccd7981140d7bcafca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 18:02:40 +0100
Subject: [PATCH 0930/1140] implement machinery to Meteor.deprecate

---
 packages/meteor/deprecate.js | 35 +++++++++++++++++++++++++++++++++++
 packages/meteor/package.js   |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 packages/meteor/deprecate.js

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
new file mode 100644
index 0000000000..aee1b303e9
--- /dev/null
+++ b/packages/meteor/deprecate.js
@@ -0,0 +1,35 @@
+function cleanStackTrace(stackTrace) {
+  if (!stackTrace) return [];
+  const lines = stackTrace.split('\n');
+  const trace = [];
+  for (const line of lines) {
+    const _line = line.trim();
+    if (_line.includes('Meteor.deprecate')) continue;
+    if (_line.includes('packages/')) {
+      trace.push(_line);
+    } else if (_line && _line.includes('/')) {
+      // Stop processing if a valid path that does not start with 'packages/**' is found
+      break;
+    }
+  }
+  return trace.join('\n');
+}
+
+Meteor.deprecate = function (...messages) {
+  if (!Meteor.isDevelopment) {
+    return;
+  }
+  if (typeof console !== 'undefined' && typeof console.warn !== 'undefined') {
+    const stackStrace = cleanStackTrace(new Error().stack || '');
+    console.warn(
+      '[DEPRECATION]',
+      ...messages,
+      ...stackStrace?.length > 0 && [
+        '\n\n',
+        'Trace:',
+        '\n',
+        stackStrace
+      ] || []
+    );
+  }
+};
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 9a0b55cd0a..42b1de6c62 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -41,6 +41,7 @@ Package.onUse(function (api) {
   api.addFiles('startup_client.js', ['client']);
   api.addFiles('startup_server.js', ['server']);
   api.addFiles('debug.js', ['client', 'server']);
+  api.addFiles('deprecate.js', ['client', 'server']);
   api.addFiles('string_utils.js', ['client', 'server']);
   api.addFiles('test_environment.js', ['client', 'server']);
 

From e44a14e99dcb7779f8a60c665a04bddc68b2e615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 18:13:57 +0100
Subject: [PATCH 0931/1140] apply Meteor.deprecate on allow-deny and ObjectID

---
 packages/allow-deny/allow-deny.js | 2 +-
 packages/mongo/mongo_driver.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/allow-deny/allow-deny.js b/packages/allow-deny/allow-deny.js
index cd071c4b4f..802cd467dd 100644
--- a/packages/allow-deny/allow-deny.js
+++ b/packages/allow-deny/allow-deny.js
@@ -554,7 +554,7 @@ function addValidator(collection, allowOrDeny, options) {
     const isAsyncKey = key.includes('Async');
     if (isAsyncKey) {
       const syncKey = key.replace('Async', '');
-      console.warn(allowOrDeny + `: The "${key}" key is deprecated. Use "${syncKey}" instead.`);
+      Meteor.deprecate(allowOrDeny + `: The "${key}" key is deprecated. Use "${syncKey}" instead.`);
     }
   });
 
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 5933bff913..1f7a014c5b 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -21,7 +21,7 @@ MongoInternals.NpmModules = {
 MongoInternals.NpmModule = new Proxy(MongoDB, {
   get(target, propertyKey, receiver) {
     if (propertyKey === 'ObjectID') {
-      console.warn(
+      Meteor.deprecate(
         `Accessing 'MongoInternals.NpmModule.ObjectID' directly is deprecated. ` +
         `Use 'MongoInternals.NpmModule.ObjectId' instead.`
       );

From 7b775016bf457d9130247adcb5676bc43c59773d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 18:14:48 +0100
Subject: [PATCH 0932/1140] remove updateAsync as update rule already covers it

---
 packages/accounts-base/accounts_server.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index cf8f573b1d..ed45af5a0f 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -1806,21 +1806,6 @@ const setupUsersCollection = async users => {
 
       return true;
     },
-    updateAsync: (userId, user, fields, modifier) => {
-      // make sure it is our record
-      if (user._id !== userId) {
-        return false;
-      }
-
-      // user can only modify the 'profile' field. sets to multiple
-      // sub-keys (eg profile.foo and profile.bar) are merged into entry
-      // in the fields list.
-      if (fields.length !== 1 || fields[0] !== 'profile') {
-        return false;
-      }
-
-      return true;
-    },
     fetch: ['_id'] // we only look at _id.
   });
 
@@ -1861,4 +1846,3 @@ const generateCasePermutationsForString = string => {
   }
   return permutations;
 }
-

From fe96f3df56dd7f56103284d0343ea4981dc22c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 18:23:50 +0100
Subject: [PATCH 0933/1140] replace const by var

---
 packages/meteor/deprecate.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index aee1b303e9..b19eb25e1e 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -1,9 +1,9 @@
 function cleanStackTrace(stackTrace) {
   if (!stackTrace) return [];
-  const lines = stackTrace.split('\n');
-  const trace = [];
-  for (const line of lines) {
-    const _line = line.trim();
+  var lines = stackTrace.split('\n');
+  var trace = [];
+  for (var line of lines) {
+    var _line = line.trim();
     if (_line.includes('Meteor.deprecate')) continue;
     if (_line.includes('packages/')) {
       trace.push(_line);
@@ -20,7 +20,7 @@ Meteor.deprecate = function (...messages) {
     return;
   }
   if (typeof console !== 'undefined' && typeof console.warn !== 'undefined') {
-    const stackStrace = cleanStackTrace(new Error().stack || '');
+    var stackStrace = cleanStackTrace(new Error().stack || '');
     console.warn(
       '[DEPRECATION]',
       ...messages,

From 3b6363455d50b450d624dbeed127333ea327d75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 18:37:44 +0100
Subject: [PATCH 0934/1140] transform code

---
 packages/meteor/deprecate.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index b19eb25e1e..284a01a07a 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -2,12 +2,12 @@ function cleanStackTrace(stackTrace) {
   if (!stackTrace) return [];
   var lines = stackTrace.split('\n');
   var trace = [];
-  for (var line of lines) {
-    var _line = line.trim();
-    if (_line.includes('Meteor.deprecate')) continue;
-    if (_line.includes('packages/')) {
+  for (var i = 0; i < lines.length; i++) {
+    var _line = lines[i].trim();
+    if (_line.indexOf('Meteor.deprecate') !== -1) continue;
+    if (_line.indexOf('packages/') !== -1) {
       trace.push(_line);
-    } else if (_line && _line.includes('/')) {
+    } else if (_line && _line.indexOf('/') !== -1) {
       // Stop processing if a valid path that does not start with 'packages/**' is found
       break;
     }

From fc543ae4b6865a5eb28455777804b6a339592d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 19 Dec 2024 18:40:45 +0100
Subject: [PATCH 0935/1140] transform code

---
 packages/meteor/deprecate.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index 284a01a07a..d49dc045e4 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -15,21 +15,18 @@ function cleanStackTrace(stackTrace) {
   return trace.join('\n');
 }
 
-Meteor.deprecate = function (...messages) {
+Meteor.deprecate = function () {
   if (!Meteor.isDevelopment) {
     return;
   }
   if (typeof console !== 'undefined' && typeof console.warn !== 'undefined') {
     var stackStrace = cleanStackTrace(new Error().stack || '');
-    console.warn(
-      '[DEPRECATION]',
-      ...messages,
-      ...stackStrace?.length > 0 && [
-        '\n\n',
-        'Trace:',
-        '\n',
-        stackStrace
-      ] || []
-    );
+    var messages = Array.prototype.slice.call(arguments); // Convert arguments to array
+
+    if (stackStrace.length > 0) {
+      messages.push('\n\n', 'Trace:', '\n', stackStrace);
+    }
+
+    console.warn.apply(console, ['[DEPRECATION]'].concat(messages));
   }
 };

From f0da097ae892a5febb4be8a1c55635aec41935d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 20 Dec 2024 05:48:18 +0100
Subject: [PATCH 0936/1140] safety update to avoid crashes

---
 packages/meteor/deprecate.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index d49dc045e4..d10af51110 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -1,16 +1,20 @@
 function cleanStackTrace(stackTrace) {
-  if (!stackTrace) return [];
+  if (!stackTrace || typeof stackTrace !== 'string') return [];
   var lines = stackTrace.split('\n');
   var trace = [];
-  for (var i = 0; i < lines.length; i++) {
-    var _line = lines[i].trim();
-    if (_line.indexOf('Meteor.deprecate') !== -1) continue;
-    if (_line.indexOf('packages/') !== -1) {
-      trace.push(_line);
-    } else if (_line && _line.indexOf('/') !== -1) {
-      // Stop processing if a valid path that does not start with 'packages/**' is found
-      break;
+  try {
+    for (var i = 0; i < lines.length; i++) {
+      var _line = lines[i].trim();
+      if (_line.indexOf('Meteor.deprecate') !== -1) continue;
+      if (_line.indexOf('packages/') !== -1) {
+        trace.push(_line);
+      } else if (_line && _line.indexOf('/') !== -1) {
+        // Stop processing if a valid path that does not start with 'packages/**' is found
+        break;
+      }
     }
+  } catch (e) {
+    console.error('Error cleaning stack trace: ', e);
   }
   return trace.join('\n');
 }

From 4d2ff467510d82017e951df5951d9fb95d30405e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 20 Dec 2024 05:54:26 +0100
Subject: [PATCH 0937/1140] trace the line that caused the stop

---
 packages/meteor/deprecate.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index d10af51110..1e213ceeab 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -10,6 +10,7 @@ function cleanStackTrace(stackTrace) {
         trace.push(_line);
       } else if (_line && _line.indexOf('/') !== -1) {
         // Stop processing if a valid path that does not start with 'packages/**' is found
+        trace.push(_line);
         break;
       }
     }

From 9e0f15b53dd84204efdecca166f97268d63d39e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 20 Dec 2024 06:22:28 +0100
Subject: [PATCH 0938/1140] upgrade json and semver dependencies

---
 packages/babel-compiler/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 44b6fb8f30..82e629e965 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,8 +6,8 @@ Package.describe({
 
 Npm.depends({
   '@meteorjs/babel': '7.20.1',
-  'json5': '2.1.1',
-  'semver': '7.3.8'
+  'json5': '2.2.3',
+  'semver': '7.6.3'
 });
 
 Package.onUse(function (api) {

From bd6a1c5e915384a23e3e5bcb0b78d49e25d25c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 20 Dec 2024 06:39:22 +0100
Subject: [PATCH 0939/1140] upgrade missing places for 22.12.0

---
 scripts/dev-bundle-tool-package.js | 2 +-
 v3-docs/v3-migration-docs/index.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index ddaea69a84..04aaa1029a 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -10,7 +10,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.9.0",
+    npm: "10.9.2",
     "node-gyp": "10.2.0",
     "@mapbox/node-pre-gyp": "1.0.11",
     typescript: "5.6.3",
diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 4aa566b6fb..8a64b0bca6 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,7 +1,7 @@
 ---
 meteor_version: 3.1.0
-node_version: 22.11.0
-npm_version: 10.9.0
+node_version: 22.12.0
+npm_version: 10.9.2
 ---
 # Meteor 3.0 Migration Guide
 

From d93a963b16442a18099b23abedefb4c16cd6b500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 20 Dec 2024 06:46:45 +0100
Subject: [PATCH 0940/1140] update npm in a missing place

---
 .../eslint-plugin-meteor/scripts/dev-bundle-tool-package.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js b/npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js
index 3c17af938f..0ce217a8f2 100644
--- a/npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js
+++ b/npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js
@@ -10,7 +10,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.8.2",
+    npm: "10.9.2",
     pacote: "https://github.com/meteor/pacote/tarball/a81b0324686e85d22c7688c47629d4009000e8b8",
     "node-gyp": "9.4.0",
     "@mapbox/node-pre-gyp": "1.0.11",

From 6f912d5b11459f3e3c31319d15537215db42f2a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 20 Dec 2024 13:53:12 +0100
Subject: [PATCH 0941/1140] bump bundle version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 949fe701f1..6f1d234302 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.12.0.0
+BUNDLE_VERSION=22.12.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled

From cfd9809885cedc7ba45089b1f19d6c280ce0f631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 20 Dec 2024 14:16:19 +0100
Subject: [PATCH 0942/1140] re-run checks


From 73c79799936685ba429a3fcf9a43d8896c65dfce Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 20 Dec 2024 10:44:05 -0400
Subject: [PATCH 0943/1140] add test

---
 packages/ddp-server/livedata_server_tests.js | 67 ++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/packages/ddp-server/livedata_server_tests.js b/packages/ddp-server/livedata_server_tests.js
index bdd94440a6..4f3f9b99dd 100644
--- a/packages/ddp-server/livedata_server_tests.js
+++ b/packages/ddp-server/livedata_server_tests.js
@@ -493,6 +493,73 @@ Tinytest.addAsync('livedata server - publish cursor is properly awaited', async
   cleanup()
 });
 
+Tinytest.addAsync('livedata server - publication stop should not throw error', async function (test) {
+  let sub = null;
+
+  const { conn, messages, cleanup } = await captureConnectionMessages(test);
+
+  const coll = new Mongo.Collection('items', {
+    defineMutationMethods: false,
+  });
+
+  for (let i = 0; i < 10; i++) {
+    await coll.removeAsync({ _id: `item_${i}` })
+    await coll.insertAsync({ _id: `item_${i}`, title: `Item #${i}` });
+  }
+
+  const publicationName = `publication_${Random.id()}`
+
+  delete Meteor.server.publish_handlers[publicationName];
+
+  Meteor.publish(publicationName, async function () {
+    const user = {
+      _id: 'user_id',
+      customer: 'customer_id',
+    }
+
+    if (user) {
+      let count = 0;
+  
+      let initializing = true;
+      const handle = await coll.find({}).observeChangesAsync({
+        added: () => {
+          count += 1;
+          if (!initializing) this.changed('issueUnreadCount', user._id, {count});
+        },
+        removed: () => {
+          count -= 1;
+          this.changed('issueUnreadCount', user._id, {count});
+        }
+      });
+
+      initializing = false;
+  
+      this.added('issueUnreadCount', user._id, {count});
+      this.onStop(() => {
+        console.log('onStop');
+        return handle.stop();
+      });
+      this.ready();
+    }
+  });
+
+  sub = conn.subscribe(publicationName);
+
+  await sleep(100);
+
+  await coll.insertAsync({ _id: 'item_10', title: 'Item #10' });
+  await sleep(100);
+
+  await coll.removeAsync({ _id: 'item_0' });
+  await sleep(100);
+
+  sub.stop();
+
+  console.log(messages);
+
+  cleanup();
+});
+
 function getTestConnections(test) {
   return new Promise((resolve, reject) => {
     makeTestConnection(test, (clientConn, serverConn) => {

From d0ed35ab8c1ebcdcb66ebe6d7f64199bf414f2e4 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 20 Dec 2024 17:59:25 -0400
Subject: [PATCH 0944/1140] attempt to trigger race condition

---
 packages/ddp-server/livedata_server_tests.js | 36 +++++++++++++++-----
 packages/mongo/mongo_connection.js           | 21 +++++++-----
 packages/mongo/observe_handle.ts             |  7 +++-
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/packages/ddp-server/livedata_server_tests.js b/packages/ddp-server/livedata_server_tests.js
index 4f3f9b99dd..d6315848c3 100644
--- a/packages/ddp-server/livedata_server_tests.js
+++ b/packages/ddp-server/livedata_server_tests.js
@@ -537,23 +537,43 @@ Tinytest.addAsync('livedata server - publication stop should not throw error', a
       this.added('issueUnreadCount', user._id, {count});
       this.onStop(() => {
         console.log('onStop');
-        return handle.stop();
+        handle.stop();
       });
       this.ready();
     }
   });
 
-  sub = conn.subscribe(publicationName);
-
-  await sleep(100);
+  // Create multiple competing subscriptions
+  const sub1 = conn.subscribe(publicationName);
+  const sub2 = conn.subscribe(publicationName);
+  const sub3 = conn.subscribe(publicationName);
 
+  // Make changes that will affect all subs
   await coll.insertAsync({ _id: 'item_10', title: 'Item #10' });
-  await sleep(100);
+  
+  // Stop middle subscription during changes
+  sub2.stop();
+  
+  await coll.insertAsync({ _id: 'item_11', title: 'Item #11' });
+  
+  // Create new subscription while changes happening
+  const sub4 = conn.subscribe(publicationName);
+  
+  await coll.removeAsync({ _id: 'item_10' });
+  
+  sub1.stop();
+  
+  await coll.insertAsync({ _id: 'item_12', title: 'Item #12' });
+  
+  // Final subscription during teardown of others
+  const sub5 = conn.subscribe(publicationName);
+  
+  sub3.stop();
+  sub4.stop();
 
-  await coll.removeAsync({ _id: 'item_0' });
-  await sleep(100);
+  await sleep(50);
 
-  sub.stop();
+  sub5.stop();
 
   console.log(messages);
 
diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
index 47e0f91f75..58760b605a 100644
--- a/packages/mongo/mongo_connection.js
+++ b/packages/mongo/mongo_connection.js
@@ -1,17 +1,16 @@
 import { Meteor } from 'meteor/meteor';
-import path from 'path';
-import { DocFetcher } from './doc_fetcher';
-import { ObserveMultiplexer } from './observe_multiplex';
-import { ObserveHandle } from './observe_handle';
-import { OPLOG_COLLECTION, OplogHandle } from './oplog_tailing';
 import { CLIENT_ONLY_METHODS, getAsyncMethodName } from 'meteor/minimongo/constants';
-import { OplogObserveDriver } from './oplog_observe_driver';
-import { PollingObserveDriver } from './polling_observe_driver';
-import { replaceMeteorAtomWithMongo, replaceTypes, transformResult } from './mongo_common';
+import path from 'path';
 import { AsynchronousCursor } from './asynchronous_cursor';
-import { MongoDB } from './mongo_common';
 import { Cursor } from './cursor';
 import { CursorDescription } from './cursor_description';
+import { DocFetcher } from './doc_fetcher';
+import { MongoDB, replaceMeteorAtomWithMongo, replaceTypes, transformResult } from './mongo_common';
+import { ObserveHandle } from './observe_handle';
+import { ObserveMultiplexer } from './observe_multiplex';
+import { OplogObserveDriver } from './oplog_observe_driver';
+import { OPLOG_COLLECTION, OplogHandle } from './oplog_tailing';
+import { PollingObserveDriver } from './polling_observe_driver';
 
 const FILE_ASSET_SUFFIX = 'Asset';
 const ASSETS_FOLDER = 'assets';
@@ -841,6 +840,10 @@ Object.assign(MongoConnection.prototype, {
         }
       });
     }
+    
+    if (!multiplexer) {
+      throw new Error("multiplexer is required");
+    }
 
     var observeHandle = new ObserveHandle(multiplexer,
       callbacks,
diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index 66235fa920..7154ba1395 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -27,7 +27,12 @@ export class ObserveHandle<T = any> {
   _movedBefore?: Callback<T>;
   _removed?: Callback<T>;
 
-  constructor(multiplexer: any, callbacks: Record<ObserveHandleCallback, Callback<T>>, nonMutatingCallbacks: boolean) {
+  constructor(multiplexer: ObserveMultiplexer, callbacks: Record<ObserveHandleCallback, Callback<T>>, nonMutatingCallbacks: boolean) {
+
+    if (!multiplexer) {
+      throw new Error("Multiplexer is required");
+    }
+
     this._multiplexer = multiplexer;
 
     multiplexer.callbackNames().forEach((name: ObserveHandleCallback) => {

From bfc13f51aac291db808681d09f2760255c8b85c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 23 Dec 2024 17:03:19 +0100
Subject: [PATCH 0945/1140] =?UTF-8?q?Meteor=20version=20to=203.1.1-beta.2?=
 =?UTF-8?q?=C2=A0:comet:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/accounts-base/package.js                   |  2 +-
 packages/accounts-oauth/package.js                  |  2 +-
 packages/allow-deny/package.js                      |  2 +-
 packages/babel-compiler/package.js                  |  2 +-
 packages/ddp-client/package.js                      |  2 +-
 packages/ddp-server/package.js                      |  2 +-
 packages/facebook-oauth/package.js                  |  2 +-
 packages/meteor-tool/package.js                     |  2 +-
 packages/meteor/package.js                          |  2 +-
 packages/mongo/package.js                           |  2 +-
 packages/npm-mongo/package.js                       |  2 +-
 packages/oauth/package.js                           |  2 +-
 packages/roles/package.js                           |  2 +-
 packages/socket-stream-client/package.js            |  2 +-
 scripts/admin/meteor-release-experimental.json      |  2 +-
 v3-docs/docs/generators/changelog/versions/3.1.1.md | 13 ++++++++++++-
 16 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index d0dad77c8d..ea90ebfbad 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.0.3",
+  version: "3.0.4-beta311.2",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index e8d1716706..4645ca604c 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: '1.4.5',
+  version: '1.4.6-beta311.2',
 });
 
 Package.onUse(api => {
diff --git a/packages/allow-deny/package.js b/packages/allow-deny/package.js
index 868ec7dde9..14b93deb0d 100644
--- a/packages/allow-deny/package.js
+++ b/packages/allow-deny/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'allow-deny',
-  version: '2.1.0-beta311.1',
+  version: '2.1.0-beta311.2',
   // Brief, one-line summary of the package.
   summary: 'Implements functionality for allow/deny and client-side db operations',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 82e629e965..3bc19c8e63 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.11.2',
+  version: '7.11.3-beta311.2',
 });
 
 Npm.depends({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 27b5cd05c7..e359f37b44 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.1.0-beta311.1",
+  version: "3.1.0-beta311.2",
   documentation: null,
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index cadb844d53..5af96707b3 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: "3.1.0-beta311.1",
+  version: "3.1.0-beta311.2",
   documentation: null,
 });
 
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 4f5a2db7bc..560be83c66 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: '1.11.4',
+  version: '1.11.5-beta311.2',
 });
 
 Package.onUse(api => {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 9fe28f4cca..4435e5e270 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.1-beta.1",
+  version: "3.1.1-beta.2",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 42b1de6c62..4d1f02c601 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.1.0-beta311.1',
+  version: '2.1.0-beta311.2',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index e67ad10117..cdd1c8054a 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.0-beta311.1",
+  version: "2.1.0-beta311.2",
 });
 
 Npm.depends({
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index f3fc223f2a..f2fd624a1e 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "6.10.2-beta311.1",
+  version: "6.10.2-beta311.2",
   documentation: null,
 });
 
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 6017b85215..0aef862f3d 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: '3.0.0',
+  version: '3.0.1-beta311.2',
 });
 
 Package.onUse(api => {
diff --git a/packages/roles/package.js b/packages/roles/package.js
index e3a7080835..36d5b1b8d9 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "1.0.0",
+  version: "1.0.1-beta311.2",
   name: "roles",
   documentation: null,
 });
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index 5c9376d0d4..1784571292 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "socket-stream-client",
-  version: '0.6.0-beta311.1',
+  version: '0.6.0-beta311.2',
   summary: "Provides the ClientStream abstraction used by ddp-client",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 8c531cca6b..e294c6eb83 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1.1-beta.1",
+  "version": "3.1.1-beta.2",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/v3-docs/docs/generators/changelog/versions/3.1.1.md b/v3-docs/docs/generators/changelog/versions/3.1.1.md
index 757ec765ae..7aee157725 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.1.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.1.md
@@ -5,6 +5,9 @@
 - Real-time Performance Boost: Refactored AsynchronousQueue for parallel processing and optimized MongoDB observers for faster initial document handling.
 - Allow/Deny Rules Update: Deprecated async rules and updated documentation and types.
 - Mongo Driver Downgrade: Reverted to a stable version to prevent issues in Meteor.
+- Support for Meteor.deprecate: Added deprecation warnings with stack trace for outdated code usage.
+- OAuth Fixes: Resolved issues with cancel popup event and callback.
+- Security Updates: Upgraded json5 and semver from babel compiler.
 - [...]
 
 #### Breaking Changes
@@ -21,19 +24,26 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.1.1-beta.0
+meteor update --release 3.1.1-beta.2
 
 ```
 
 #### Bumped Meteor Packages
 
+- accounts-base@3.0.4
+- accounts-oauth@1.4.6
 - allow-deny@2.1.0
+- babel-compiler@7.11.3
 - ddp-client@3.1.0
 - ddp-server@3.1.0
 - meteor-tool@3.1.1
+- facebook-oauth@1.11.5
 - meteor@2.1.0
+- meteor-tool@3.1.1
 - mongo@2.1.0
 - npm-mongo@6.10.2
+- oauth@3.0.1
+- roles@@1.0.1
 - socket-stream-client@0.6.0
 - [...]
 
@@ -48,5 +58,6 @@ N/A
 - [@leonardoventurini](https://github.com/leonardoventurini)
 - [@nachocodoner](https://github.com/nachocodoner)
 - [@Grubba27](https://github.com/Grubba27)
+- [@9Morello](https://github.com/9Morello)
 
 ✨✨✨

From 781f079e2d8981c45b5fd806a4d41362be5c58b6 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 30 Dec 2024 09:03:15 -0300
Subject: [PATCH 0946/1140] bind context correctly by using property instead

---
 packages/mongo/observe_handle.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index 7154ba1395..262a4659a4 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -67,7 +67,10 @@ export class ObserveHandle<T = any> {
     });
   }
 
-  async stop() {
+  /**
+   * Using property syntax and arrow function syntax to avoid binding the wrong context on callbacks.
+   */
+  stop = async () => {
     if (this._stopped) return;
     this._stopped = true;
     await this._multiplexer.removeHandle(this._id);

From 8db7c8e733a0a64ebdafe0ccaaa92647f80b4558 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 30 Dec 2024 09:17:14 -0300
Subject: [PATCH 0947/1140] properly test handle state as we cannot intercept
 errors from bindEnvironment

---
 packages/ddp-server/livedata_server_tests.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/ddp-server/livedata_server_tests.js b/packages/ddp-server/livedata_server_tests.js
index d6315848c3..2de0312cbe 100644
--- a/packages/ddp-server/livedata_server_tests.js
+++ b/packages/ddp-server/livedata_server_tests.js
@@ -533,12 +533,15 @@ Tinytest.addAsync('livedata server - publication stop should not throw error', a
       });
 
       initializing = false;
-  
+
       this.added('issueUnreadCount', user._id, {count});
+      
+      this.onStop(handle.stop);
+
       this.onStop(() => {
-        console.log('onStop');
-        handle.stop();
-      });
+        test.isTrue(handle._stopped)
+      })
+
       this.ready();
     }
   });
@@ -575,8 +578,6 @@ Tinytest.addAsync('livedata server - publication stop should not throw error', a
 
   sub5.stop();
 
-  console.log(messages);
-
   cleanup();
 });
 

From 555f9eb7311cccc56e585eda18d42cec7514c872 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 30 Dec 2024 14:43:07 -0300
Subject: [PATCH 0948/1140] rename test and make sure the check occurs before
 it finishes

---
 packages/ddp-server/livedata_server_tests.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ddp-server/livedata_server_tests.js b/packages/ddp-server/livedata_server_tests.js
index 2de0312cbe..51243e3f78 100644
--- a/packages/ddp-server/livedata_server_tests.js
+++ b/packages/ddp-server/livedata_server_tests.js
@@ -493,7 +493,7 @@ Tinytest.addAsync('livedata server - publish cursor is properly awaited', async
   cleanup()
 });
 
-Tinytest.addAsync('livedata server - publication stop should not throw error', async function (test) {
+Tinytest.addAsync('livedata server - stopping a handle should preserve its context on callbacks', async function (test) {
   let sub = null;
 
   const { conn, messages, cleanup } = await captureConnectionMessages(test);
@@ -535,7 +535,7 @@ Tinytest.addAsync('livedata server - publication stop should not throw error', a
       initializing = false;
 
       this.added('issueUnreadCount', user._id, {count});
-      
+
       this.onStop(handle.stop);
 
       this.onStop(() => {
@@ -577,6 +577,8 @@ Tinytest.addAsync('livedata server - publication stop should not throw error', a
   await sleep(50);
 
   sub5.stop();
+  
+  await sleep(50);
 
   cleanup();
 });

From 74cc407e1e38125841f3961c61ee38d908d887ff Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 30 Dec 2024 14:45:02 -0300
Subject: [PATCH 0949/1140] remove unnecessary checks

---
 packages/mongo/mongo_connection.js | 4 ----
 packages/mongo/observe_handle.ts   | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
index 58760b605a..114b8de9aa 100644
--- a/packages/mongo/mongo_connection.js
+++ b/packages/mongo/mongo_connection.js
@@ -840,10 +840,6 @@ Object.assign(MongoConnection.prototype, {
         }
       });
     }
-    
-    if (!multiplexer) {
-      throw new Error("multiplexer is required");
-    }
 
     var observeHandle = new ObserveHandle(multiplexer,
       callbacks,
diff --git a/packages/mongo/observe_handle.ts b/packages/mongo/observe_handle.ts
index 262a4659a4..acc388aad5 100644
--- a/packages/mongo/observe_handle.ts
+++ b/packages/mongo/observe_handle.ts
@@ -28,11 +28,6 @@ export class ObserveHandle<T = any> {
   _removed?: Callback<T>;
 
   constructor(multiplexer: ObserveMultiplexer, callbacks: Record<ObserveHandleCallback, Callback<T>>, nonMutatingCallbacks: boolean) {
-
-    if (!multiplexer) {
-      throw new Error("Multiplexer is required");
-    }
-
     this._multiplexer = multiplexer;
 
     multiplexer.callbackNames().forEach((name: ObserveHandleCallback) => {

From 3e9a981a9b2ea01310f99b46bdea1f96ec1ab2fd Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 30 Dec 2024 14:48:16 -0300
Subject: [PATCH 0950/1140] add comments

---
 packages/ddp-server/livedata_server_tests.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ddp-server/livedata_server_tests.js b/packages/ddp-server/livedata_server_tests.js
index 51243e3f78..15b0349e87 100644
--- a/packages/ddp-server/livedata_server_tests.js
+++ b/packages/ddp-server/livedata_server_tests.js
@@ -494,8 +494,6 @@ Tinytest.addAsync('livedata server - publish cursor is properly awaited', async
 });
 
 Tinytest.addAsync('livedata server - stopping a handle should preserve its context on callbacks', async function (test) {
-  let sub = null;
-
   const { conn, messages, cleanup } = await captureConnectionMessages(test);
 
   const coll = new Mongo.Collection('items', {
@@ -536,9 +534,11 @@ Tinytest.addAsync('livedata server - stopping a handle should preserve its conte
 
       this.added('issueUnreadCount', user._id, {count});
 
+      // Should be the same as `this.onStop(() => handle.stop())`
       this.onStop(handle.stop);
 
       this.onStop(() => {
+        // If stop is called and breaks for some reason, this will be false
         test.isTrue(handle._stopped)
       })
 
@@ -577,7 +577,7 @@ Tinytest.addAsync('livedata server - stopping a handle should preserve its conte
   await sleep(50);
 
   sub5.stop();
-  
+
   await sleep(50);
 
   cleanup();

From 4a28e83c7d43bd306ab74db5ad11a5557365da53 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 8 Jan 2025 10:32:05 -0400
Subject: [PATCH 0951/1140] add troubleshooting section to docs

---
 v3-docs/docs/.vitepress/config.mts            |  1 +
 v3-docs/docs/api/packages-listing.md          |  1 +
 .../meteor-versions/metadata.generated.js     |  8 ++-
 v3-docs/docs/history.md                       | 63 +++++++++++++++++++
 .../troubleshooting/mongodb-connection.md     | 17 +++++
 5 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 v3-docs/docs/troubleshooting/mongodb-connection.md

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 4be43c310e..7470128bd5 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -404,6 +404,7 @@ export default defineConfig({
             link: "/troubleshooting/expired-certificate",
           },
           { text: "Windows", link: "/troubleshooting/windows" },
+          { text: "MongoDB Connection", link: "/troubleshooting/mongodb-connection" }
         ],
         collapsed: true,
       },
diff --git a/v3-docs/docs/api/packages-listing.md b/v3-docs/docs/api/packages-listing.md
index c4624c061e..40d21881ff 100644
--- a/v3-docs/docs/api/packages-listing.md
+++ b/v3-docs/docs/api/packages-listing.md
@@ -45,6 +45,7 @@
 ### [callback-hook](https://github.com/meteor/meteor/tree/devel/packages/callback-hook) {#callback-hook}
 ### [check](https://github.com/meteor/meteor/tree/devel/packages/check) {#check}
 ### [constraint-solver](https://github.com/meteor/meteor/tree/devel/packages/constraint-solver) {#constraint-solver}
+### [context](https://github.com/meteor/meteor/tree/devel/packages/context) {#context}
 ### [core-runtime](https://github.com/meteor/meteor/tree/devel/packages/core-runtime) {#core-runtime}
 ### [crosswalk](https://github.com/meteor/meteor/tree/devel/packages/crosswalk) {#crosswalk}
 ### [ddp](https://github.com/meteor/meteor/tree/devel/packages/ddp) {#ddp}
diff --git a/v3-docs/docs/generators/meteor-versions/metadata.generated.js b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
index 7c96bb4029..c9e681baf8 100644
--- a/v3-docs/docs/generators/meteor-versions/metadata.generated.js
+++ b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
@@ -18,9 +18,13 @@ export default {
     },
     {
       "version": "v3.1.0",
-      "url": "https://release-3-1-0.docs.meteor.com/",
+      "url": "https://release-3-1-0.docs.meteor.com/"
+    },
+    {
+      "version": "v3.1.1",
+      "url": "https://release-3-1-1.docs.meteor.com/",
       "isCurrent": true
     }
   ],
-  "currentVersion": "v3.1.0"
+  "currentVersion": "v3.1.1"
 }
\ No newline at end of file
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 8ae1cb1c32..815c8cc894 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -12,6 +12,69 @@ This is a complete history of changes for Meteor releases.
 
 
 
+## v3.1.1, /date/
+
+### Highlights
+
+- Real-time Performance Boost: Refactored AsynchronousQueue for parallel processing and optimized MongoDB observers for faster initial document handling.
+- Allow/Deny Rules Update: Deprecated async rules and updated documentation and types.
+- Mongo Driver Downgrade: Reverted to a stable version to prevent issues in Meteor.
+- Support for Meteor.deprecate: Added deprecation warnings with stack trace for outdated code usage.
+- OAuth Fixes: Resolved issues with cancel popup event and callback.
+- Security Updates: Upgraded json5 and semver from babel compiler.
+- [...]
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.1.1-beta.2
+
+```
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.0.4
+- accounts-oauth@1.4.6
+- allow-deny@2.1.0
+- babel-compiler@7.11.3
+- ddp-client@3.1.0
+- ddp-server@3.1.0
+- meteor-tool@3.1.1
+- facebook-oauth@1.11.5
+- meteor@2.1.0
+- meteor-tool@3.1.1
+- mongo@2.1.0
+- npm-mongo@6.10.2
+- oauth@3.0.1
+- roles@@1.0.1
+- socket-stream-client@0.6.0
+- [...]
+
+#### Bumped NPM Packages
+
+N/A
+
+#### Special thanks to
+
+✨✨✨
+
+- [@leonardoventurini](https://github.com/leonardoventurini)
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@Grubba27](https://github.com/Grubba27)
+- [@9Morello](https://github.com/9Morello)
+
+✨✨✨
 ## v3.1.0, 2024-11-20
 
 ### Highlights
diff --git a/v3-docs/docs/troubleshooting/mongodb-connection.md b/v3-docs/docs/troubleshooting/mongodb-connection.md
new file mode 100644
index 0000000000..7a4d9ffa8c
--- /dev/null
+++ b/v3-docs/docs/troubleshooting/mongodb-connection.md
@@ -0,0 +1,17 @@
+# Topology Closed Error
+
+One possible scenario we've saw is that after migrating to Meteor 3, some apps become partially unresponsive and throw `MongoTopologyClosedError: Topology is closed` errors on startup.
+
+In this case, you might consider increasing the server selection timeout for your MongoDB instance, like this:
+
+```json
+{
+  "packages": {
+    "mongo": {
+      "options": {
+        "serverSelectionTimeoutMS": 120000
+      }
+    }
+  }
+}
+```
\ No newline at end of file

From 326937ddba653eb2fecd34ec61b5868faf9871b1 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 8 Jan 2025 10:40:34 -0400
Subject: [PATCH 0952/1140] fix typo

---
 v3-docs/docs/troubleshooting/mongodb-connection.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/troubleshooting/mongodb-connection.md b/v3-docs/docs/troubleshooting/mongodb-connection.md
index 7a4d9ffa8c..90bbd0aaef 100644
--- a/v3-docs/docs/troubleshooting/mongodb-connection.md
+++ b/v3-docs/docs/troubleshooting/mongodb-connection.md
@@ -1,6 +1,6 @@
 # Topology Closed Error
 
-One possible scenario we've saw is that after migrating to Meteor 3, some apps become partially unresponsive and throw `MongoTopologyClosedError: Topology is closed` errors on startup.
+One possible scenario we've seen is that after migrating to Meteor 3, some apps become partially unresponsive and throw `MongoTopologyClosedError: Topology is closed` errors on startup.
 
 In this case, you might consider increasing the server selection timeout for your MongoDB instance, like this:
 

From f2d15fabf3b203de5567a6452d2fd362f6ba7cb2 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 8 Jan 2025 10:52:02 -0400
Subject: [PATCH 0953/1140] add per to special thanks!

---
 v3-docs/docs/generators/changelog/versions/3.1.1.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.1.md b/v3-docs/docs/generators/changelog/versions/3.1.1.md
index 7aee157725..226d133e6e 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.1.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.1.md
@@ -59,5 +59,6 @@ N/A
 - [@nachocodoner](https://github.com/nachocodoner)
 - [@Grubba27](https://github.com/Grubba27)
 - [@9Morello](https://github.com/9Morello)
+- [@perbergland](https://github.com/perbergland)
 
 ✨✨✨

From 0a17c8d5137ab2d6644f0749cf5935b2969ff643 Mon Sep 17 00:00:00 2001
From: Jan Starzak <jan.starzak@gmail.com>
Date: Thu, 9 Jan 2025 13:33:33 +0100
Subject: [PATCH 0954/1140] fix: built-in dev mongo can't start on win32 when
 username has spaces

---
 tools/runners/run-mongo.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index 5e981334aa..3b8b8bf603 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -28,6 +28,17 @@ function spawnMongod(mongodPath, port, dbPath, replSetName) {
   mongodPath = files.convertToOSPath(mongodPath);
   dbPath = files.convertToOSPath(dbPath);
 
+  // Because we're spawning the process with shell: true on win32, the
+  // command string and args array are effectively concatenated to
+  // a single string and passed into the shell. If any of those paths
+  // contain spaces, these will get broken up on white-spaces and treated
+  // as separate tokens. If they are quoted, they will be parsed
+  // correctly by the shell.
+  if (process.platform === 'win32') {
+    mongodPath = '"' + mongodPath + '"'
+    dbPath = '"' + dbPath + '"'
+  }
+
   let args = [
     // nb: cli-test.sh and findMongoPids make strong assumptions about the
     // order of the arguments! Check them before changing any arguments.

From fd5edded8ecf237dadd3c7485c090b4472f50d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Sun, 12 Jan 2025 07:34:22 +0100
Subject: [PATCH 0955/1140] upgrade node to 22.13.0

---
 .travis.yml                        | 2 +-
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 v3-docs/v3-migration-docs/index.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9367f92d0c..a0a6e2233d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "22.12.0"
+  - "22.13.0"
 cache:
   directories:
     - ".meteor"
diff --git a/meteor b/meteor
index 6f1d234302..6804daede5 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.12.0.1
+BUNDLE_VERSION=22.13.0.0
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 194a19af67..5764954743 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.12.0
+NODE_VERSION=22.13.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.2
diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 8a64b0bca6..8d724ad33b 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,6 +1,6 @@
 ---
 meteor_version: 3.1.0
-node_version: 22.12.0
+node_version: 22.13.0
 npm_version: 10.9.2
 ---
 # Meteor 3.0 Migration Guide

From ac9257c0bd9ae2ea84eb792f5cc91a3dd7eb3300 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Fri, 20 Dec 2024 15:44:05 +0100
Subject: [PATCH 0956/1140] ensure an env variable that handles deprecation
 messages

---
 packages/meteor/deprecate.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index 1e213ceeab..d00ab68bf0 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -1,3 +1,13 @@
+if (Meteor.isServer && Meteor.isDevelopment) {
+  if (typeof __meteor_runtime_config__ === 'object') {
+    var noDeprecations = process.env.METEOR_NO_DEPRECATIONS;
+    if (noDeprecations === 'true' || noDeprecations === 'false') {
+      noDeprecations = noDeprecations === 'true';
+    }
+    __meteor_runtime_config__.noDeprecations = noDeprecations;
+  }
+}
+
 function cleanStackTrace(stackTrace) {
   if (!stackTrace || typeof stackTrace !== 'string') return [];
   var lines = stackTrace.split('\n');
@@ -28,6 +38,14 @@ Meteor.deprecate = function () {
     var stackStrace = cleanStackTrace(new Error().stack || '');
     var messages = Array.prototype.slice.call(arguments); // Convert arguments to array
 
+    if (typeof __meteor_runtime_config__.noDeprecations === 'string') {
+      const noDeprecationPattern = new RegExp(__meteor_runtime_config__.noDeprecations);
+      if (noDeprecationPattern.test(stackStrace)) {
+        return;
+      }
+    } else if (typeof __meteor_runtime_config__.noDeprecations === 'boolean' && __meteor_runtime_config__.noDeprecations) {
+      return;
+    }
     if (stackStrace.length > 0) {
       messages.push('\n\n', 'Trace:', '\n', stackStrace);
     }

From 16e123d1eb6454de373b3aa535e5a9d1936fec75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 13 Jan 2025 15:07:41 +0100
Subject: [PATCH 0957/1140] ensure deprecations will only be shown once

---
 packages/meteor/deprecate.js | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index d00ab68bf0..8f97e07c4d 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -1,13 +1,26 @@
 if (Meteor.isServer && Meteor.isDevelopment) {
   if (typeof __meteor_runtime_config__ === 'object') {
-    var noDeprecations = process.env.METEOR_NO_DEPRECATIONS;
-    if (noDeprecations === 'true' || noDeprecations === 'false') {
-      noDeprecations = noDeprecations === 'true';
+    var noDeprecation = process.env.METEOR_NO_DEPRECATION;
+    if (noDeprecation === 'true' || noDeprecation === 'false') {
+      noDeprecation = noDeprecation === 'true';
     }
-    __meteor_runtime_config__.noDeprecations = noDeprecations;
+    __meteor_runtime_config__.noDeprecation = noDeprecation;
   }
 }
 
+function oncePerArgument(func) {
+  const cache = new Map();
+
+  return function (...args) {
+    const key = JSON.stringify(args);
+    if (!cache.has(key)) {
+      const result = func.apply(this, args);
+      cache.set(key, result);
+    }
+    return cache.get(key);
+  };
+}
+
 function cleanStackTrace(stackTrace) {
   if (!stackTrace || typeof stackTrace !== 'string') return [];
   var lines = stackTrace.split('\n');
@@ -30,6 +43,10 @@ function cleanStackTrace(stackTrace) {
   return trace.join('\n');
 }
 
+const onceWarning = oncePerArgument((message) => {
+  console.warn.apply(console, message);
+});
+
 Meteor.deprecate = function () {
   if (!Meteor.isDevelopment) {
     return;
@@ -38,18 +55,19 @@ Meteor.deprecate = function () {
     var stackStrace = cleanStackTrace(new Error().stack || '');
     var messages = Array.prototype.slice.call(arguments); // Convert arguments to array
 
-    if (typeof __meteor_runtime_config__.noDeprecations === 'string') {
-      const noDeprecationPattern = new RegExp(__meteor_runtime_config__.noDeprecations);
+    if (typeof __meteor_runtime_config__.noDeprecation === 'string') {
+      const noDeprecationPattern = new RegExp(__meteor_runtime_config__.noDeprecation);
       if (noDeprecationPattern.test(stackStrace)) {
         return;
       }
-    } else if (typeof __meteor_runtime_config__.noDeprecations === 'boolean' && __meteor_runtime_config__.noDeprecations) {
+    } else if (typeof __meteor_runtime_config__.noDeprecation === 'boolean' && __meteor_runtime_config__.noDeprecation) {
       return;
     }
     if (stackStrace.length > 0) {
       messages.push('\n\n', 'Trace:', '\n', stackStrace);
     }
+    messages.push('\n\n', 'To disable warnings, set the `METEOR_NO_DEPRECATION` to `true` or a regex pattern.', '\n');
 
-    console.warn.apply(console, ['[DEPRECATION]'].concat(messages));
+    onceWarning(['[DEPRECATION]'].concat(messages));
   }
 };

From 0b5045ff0873c3b88dc35f0eb29cf1d2f2a688d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 13 Jan 2025 15:13:38 +0100
Subject: [PATCH 0958/1140] affect node's no-deprecation on meteor deprecation
 warnings

---
 packages/meteor/deprecate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index 8f97e07c4d..81fa898565 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -1,6 +1,6 @@
 if (Meteor.isServer && Meteor.isDevelopment) {
   if (typeof __meteor_runtime_config__ === 'object') {
-    var noDeprecation = process.env.METEOR_NO_DEPRECATION;
+    var noDeprecation = process.env.METEOR_NO_DEPRECATION || process.noDeprecation;
     if (noDeprecation === 'true' || noDeprecation === 'false') {
       noDeprecation = noDeprecation === 'true';
     }

From b8f5862304d34b64f6e20d7cfc88415e6c2fe221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 13 Jan 2025 15:41:12 +0100
Subject: [PATCH 0959/1140] add a log to warn about existing deprecation
 warnings

---
 packages/meteor/deprecate.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index 81fa898565..80d588f2a2 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -47,6 +47,10 @@ const onceWarning = oncePerArgument((message) => {
   console.warn.apply(console, message);
 });
 
+const onceFixDeprecation = () => {
+  onceWarning(['Deprecation warnings are hidden but crucial to address for future Meteor updates.', '\n', 'Remove the `METEOR_NO_DEPRECATION` env var to reveal them, then report or fix the issues.']);
+};
+
 Meteor.deprecate = function () {
   if (!Meteor.isDevelopment) {
     return;
@@ -58,9 +62,11 @@ Meteor.deprecate = function () {
     if (typeof __meteor_runtime_config__.noDeprecation === 'string') {
       const noDeprecationPattern = new RegExp(__meteor_runtime_config__.noDeprecation);
       if (noDeprecationPattern.test(stackStrace)) {
+        onceFixDeprecation();
         return;
       }
     } else if (typeof __meteor_runtime_config__.noDeprecation === 'boolean' && __meteor_runtime_config__.noDeprecation) {
+      onceFixDeprecation();
       return;
     }
     if (stackStrace.length > 0) {

From 9c1236873ba2d1360f8e40f72a16eaa4d4127154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 13 Jan 2025 15:50:33 +0100
Subject: [PATCH 0960/1140] fix code style issues

---
 packages/meteor/deprecate.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/meteor/deprecate.js b/packages/meteor/deprecate.js
index 80d588f2a2..a21e641b94 100644
--- a/packages/meteor/deprecate.js
+++ b/packages/meteor/deprecate.js
@@ -9,12 +9,12 @@ if (Meteor.isServer && Meteor.isDevelopment) {
 }
 
 function oncePerArgument(func) {
-  const cache = new Map();
+  var cache = new Map();
 
-  return function (...args) {
-    const key = JSON.stringify(args);
+  return function _oncePerArgument() {
+    var key = JSON.stringify(arguments);
     if (!cache.has(key)) {
-      const result = func.apply(this, args);
+      var result = func.apply(this, arguments);
       cache.set(key, result);
     }
     return cache.get(key);
@@ -43,13 +43,13 @@ function cleanStackTrace(stackTrace) {
   return trace.join('\n');
 }
 
-const onceWarning = oncePerArgument((message) => {
+var onceWarning = oncePerArgument(function _onceWarning(message) {
   console.warn.apply(console, message);
 });
 
-const onceFixDeprecation = () => {
+function onceFixDeprecation() {
   onceWarning(['Deprecation warnings are hidden but crucial to address for future Meteor updates.', '\n', 'Remove the `METEOR_NO_DEPRECATION` env var to reveal them, then report or fix the issues.']);
-};
+}
 
 Meteor.deprecate = function () {
   if (!Meteor.isDevelopment) {
@@ -60,7 +60,7 @@ Meteor.deprecate = function () {
     var messages = Array.prototype.slice.call(arguments); // Convert arguments to array
 
     if (typeof __meteor_runtime_config__.noDeprecation === 'string') {
-      const noDeprecationPattern = new RegExp(__meteor_runtime_config__.noDeprecation);
+      var noDeprecationPattern = new RegExp(__meteor_runtime_config__.noDeprecation);
       if (noDeprecationPattern.test(stackStrace)) {
         onceFixDeprecation();
         return;

From 30da834f315cba710c15e0e5f8e8020e84319f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 13 Jan 2025 16:16:12 +0100
Subject: [PATCH 0961/1140] fix issue on create a new meteor app with spaces on
 path

---
 tools/cli/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index dd38086f00..bc3d4ed998 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1058,7 +1058,7 @@ main.registerCommand({
     process.env.GIT_TERMINAL_PROMPT = 0;
 
     const gitCommand = isWindows
-      ? `git clone --progress ${url} ${files.convertToOSPath(appPath)}`
+      ? `git clone --progress ${url} "${files.convertToOSPath(appPath)}"`
       : `git clone --progress ${url} ${appPath}`;
     const [okClone, errClone] = await bash`${gitCommand}`;
     const errorMessage = errClone && typeof errClone === "string" ? errClone : errClone?.message;

From f6c31a60f502da38990c3c6e1bc06e57d44be5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 13 Jan 2025 17:12:09 +0100
Subject: [PATCH 0962/1140] add in the changelog the new changes about to
 include and special thanks

---
 v3-docs/docs/generators/changelog/versions/3.1.1.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.1.md b/v3-docs/docs/generators/changelog/versions/3.1.1.md
index 226d133e6e..97f4080f81 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.1.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.1.md
@@ -2,11 +2,13 @@
 
 ### Highlights
 
+- Node upgrade: v22.13.0
 - Real-time Performance Boost: Refactored AsynchronousQueue for parallel processing and optimized MongoDB observers for faster initial document handling.
 - Allow/Deny Rules Update: Deprecated async rules and updated documentation and types.
 - Mongo Driver Downgrade: Reverted to a stable version to prevent issues in Meteor.
 - Support for Meteor.deprecate: Added deprecation warnings with stack trace for outdated code usage.
 - OAuth Fixes: Resolved issues with cancel popup event and callback.
+- Windows Fixes: Fixed issues with running from folders with spaces and post-npm install build errors on Windows.
 - Security Updates: Upgraded json5 and semver from babel compiler.
 - [...]
 
@@ -60,5 +62,9 @@ N/A
 - [@Grubba27](https://github.com/Grubba27)
 - [@9Morello](https://github.com/9Morello)
 - [@perbergland](https://github.com/perbergland)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+- [@MrSpark2591](https://github.com/MrSpark2591)
+- [@jstarpl](https://github.com/jstarpl)
+- [@minhna](https://github.com/minhna)
 
 ✨✨✨

From cb2e56844318a0eaed3cd8a6585bb7102dc92636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 14 Jan 2025 17:23:23 +0100
Subject: [PATCH 0963/1140] Update @types/node to latest matching closely 3.1.1
 Node's version

---
 tools/static-assets/skel-typescript/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json
index 28e97249f6..1bd98a2050 100644
--- a/tools/static-assets/skel-typescript/package.json
+++ b/tools/static-assets/skel-typescript/package.json
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^8.2.3",
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.10.6",
     "@types/react": "^18.2.5",
     "@types/react-dom": "^18.2.4",
     "typescript": "^5.4.5"

From 48aef6829d888f2a9da478f3077206c64c6263c1 Mon Sep 17 00:00:00 2001
From: Gabs Ferreira <developer.gabriel@gmail.com>
Date: Tue, 14 Jan 2025 16:35:05 -0300
Subject: [PATCH 0964/1140] Update README.md

---
 README.md | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index a6249e4157..149e1c4771 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,13 @@
 <div align="center">
   <a href="https://www.meteor.com" target="_blank">
-    <img align="center" width="225" src="https://user-images.githubusercontent.com/841294/26841702-0902bbee-4af3-11e7-9805-0618da66a246.png">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://dmtgy0px4zdqn.cloudfront.net/images/meteor-logo.webp">
+      <source media="(prefers-color-scheme: light)" srcset="https://github.com/user-attachments/assets/0467afb6-4f36-4cad-9d78-237150d5d881">
+      <img alt="Meteor logo" src="https://github.com/user-attachments/assets/0467afb6-4f36-4cad-9d78-237150d5d881" width="300">
+    </picture>
   </a>
 </div>
 
-<br>
-
 <div align="center">
 
 [![Travis CI Status](https://api.travis-ci.com/meteor/meteor.svg?branch=devel)](https://app.travis-ci.com/github/meteor/meteor)
@@ -54,23 +56,20 @@ How about trying a tutorial to get started with your favorite technology?
 | [<img align="left" width="25" src="https://upload.wikimedia.org/wikipedia/commons/a/a7/React-icon.svg"> React](https://docs.meteor.com/tutorials/react/) |
 | - |
 | [<img align="left" width="25" src="https://progsoft.net/images/blaze-css-icon-3e80acb3996047afd09f1150f53fcd78e98c1e1b.png"> Blaze](https://blaze-tutorial.meteor.com/) |
-| [<img align="left" width="25" src="https://vuejs.org/images/logo.png"> Vue](https://vue-tutorial.meteor.com/) |
-| [<img align="left" width="25" src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1b/Svelte_Logo.svg/1200px-Svelte_Logo.svg.png"> Svelte](https://svelte-tutorial.meteor.com/) |
-
-Next, read the [documentation](https://docs.meteor.com/) and get some [examples](https://github.com/meteor/examples).
+| [<img align="left" width="25" src="https://vuejs.org/images/logo.png"> Vue](https://docs.meteor.com/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.html) |
 
 # 🚀 Quick Start
 
 On your platform, use this line:
 
 ```shell
-> npm install -g meteor
+> npx meteor
 ```
  
 🚀 To create a project:
 
 ```shell
-> meteor create my-app
+> meteor create
 ```
 
 ☄️ Run it:
@@ -84,10 +83,9 @@ meteor
 
 **Building an application with Meteor?**
 
-* Deploy on [Meteor Cloud](https://www.meteor.com/cloud)
+* Deploy on [Galaxy](https://www.meteor.com/cloud)
 * Discuss on [Forums](https://forums.meteor.com/)
 * Join the Meteor Discord by clicking this [invite link](https://discord.gg/hZkTCaVjmT).
-* Announcement list. Subscribe in the [footer](https://www.meteor.com/).
 
 
 Interested in helping or contributing to Meteor?  These resources will help:
@@ -96,15 +94,3 @@ Interested in helping or contributing to Meteor?  These resources will help:
 * [Contribution guidelines](CONTRIBUTING.md)
 * [Feature requests](https://github.com/meteor/meteor/discussions/)
 * [Issue tracker](https://github.com/meteor/meteor/issues)
-
-To uninstall Meteor: 
-  - If installed via npm, run:
-      ```shell
-      meteor-installer uninstall
-      ```
-  - If installed via curl, run:
-    ```shell
-    rm -rf ~/.meteor 
-    sudo rm /usr/local/bin/meteor
-    ```
-To find more information about installation, [read here](https://docs.meteor.com/about/install.html#uninstall).

From d981c27f4a5a94d7661ebf798ce4ef98ea25757b Mon Sep 17 00:00:00 2001
From: Gabs Ferreira <developer.gabriel@gmail.com>
Date: Tue, 14 Jan 2025 16:43:54 -0300
Subject: [PATCH 0965/1140] Adding new logo to the docs

---
 v3-docs/docs/public/meteor-logo.png | Bin 32389 -> 13590 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/v3-docs/docs/public/meteor-logo.png b/v3-docs/docs/public/meteor-logo.png
index ca7bb89de556b6bc7b045fa795625f5d8a1324f3..3b848982ca11fd68a4862522dd0e3c70f60adbb9 100644
GIT binary patch
literal 13590
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
B2;Tqz

literal 32389
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


From 453ee97326ece4bcb2a63bccca422ac74c1a38e3 Mon Sep 17 00:00:00 2001
From: Gabs Ferreira <developer.gabriel@gmail.com>
Date: Tue, 14 Jan 2025 16:49:55 -0300
Subject: [PATCH 0966/1140] Adding new logo

---
 v3-docs/docs/public/meteor-blue.png | Bin 35136 -> 15545 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/v3-docs/docs/public/meteor-blue.png b/v3-docs/docs/public/meteor-blue.png
index c91f7a97180b3f929fca9cd521ea7ce6bd0f9f97..0934189a3eb6a2b7daba9f3bdf975d48f23816f2 100644
GIT binary patch
literal 15545
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

literal 35136
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


From 437d042092610ded48e1458bb59606baa60c219c Mon Sep 17 00:00:00 2001
From: Gabs Ferreira <developer.gabriel@gmail.com>
Date: Tue, 14 Jan 2025 16:53:01 -0300
Subject: [PATCH 0967/1140] Adding new white logo

---
 .../v3-migration-docs/public/meteor-logo.png  | Bin 32389 -> 13590 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/v3-docs/v3-migration-docs/public/meteor-logo.png b/v3-docs/v3-migration-docs/public/meteor-logo.png
index ca7bb89de556b6bc7b045fa795625f5d8a1324f3..3b848982ca11fd68a4862522dd0e3c70f60adbb9 100644
GIT binary patch
literal 13590
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
B2;Tqz

literal 32389
zcmdSB2UL^!wmzH?0RaP8C{hIMO7C4%L`AwZ=^Y`oNDV!)0E(i63MdMqNC{G<*C+@o
zA_@c$1R@rO9;FHb|NR2voOACv_nxn;^{sE#%q$IW-e240+0TA{TsG7{fo0`mMWIkw
z?UTn&qfm?l6bhZOkqJI&#E*r-UyizKY8q<F${d$f)<dE8|8YA`Lx<s<Ky<1dE@<1W
z3*2&oS|{y|_AyG3ShNg<x1=iuq^#_GDl~MYM6RUtc>aUzzBHy#>~XDQ#x)F|_Mggo
zb}I8>>yL24JY^0Oe#H3o6`}52mB0`e?Ph1JUht74NA|qQa;G})ylsh@uT|en>)(mG
z+n#ajHsj|XEfH#07CUZ!?|Om1I3RmNvO|o9d1=uWc-RxYburHWumDCx^``vcd+4;&
z(UL^Nyn3v#vrqa>VQ=CCQ-vwv6p~wBQ)0;cs3h_3)#2vC`2`{46`@Q#4YhmjOInT1
zK~>A6uTLGZ%C(d=(o3Zd3Ez}2)~^b<j%tYM33#FMX6^!Er1Cz>TFYLkH{hm|RL4aR
z^Sh-#We=AxTS{jH5enEz#;qP+=VchjRa-;zLv0rY!Z_aHHPDCct;3zmWS+sMvfxiz
z_@PkTdyxOo+NXEZ;j`!NCTIN5=;^9B`FKe<IQuxdND#d6@H7ggra{0vIC;4E3p=`;
zb@x`^IayV=Q`p^EeW$s+o|GP5)5XpGWQebeafrT&Q;3I?vhz-jL&9nV6?lP{i@$>~
z!OPRzPlceqbM?I{@Mq*>$(_QhkNA72?>vGGD11iGP*~H)*F{)CLQ338N=impQCUJ-
zK~7FVN=#TrN=8ajN?uZ0MqFA!MM_RZT2XlYpPew8ud}Pl>0`&&$AZ79?{xF`$E!$6
z1_cF41j$PH_@0%NR#sM)l#-E@kr9U{#QlQ3{T&G6-hR9Odc!dnKPO*zyuZ7Tw=nWX
z2S=X(fAyU()3qgd;eWr@+i!iFV8bK{4tPmv2`OYrs}DLm{eBJ~;On_MxU-X_i>Hg1
zi?_cYJS+YCS=c2#z2A@j%h!5&{eIfdUn>x1w7#}~`Lv%&Fy2M-w2PllfUlE_Rv?VH
z>#vFV`JZ<Adu#rKufyZNzl?YD@%Qm_^Z7TM@cYOAv=#pDuK#90<R}01s0+dU-#m)^
z<oBa^6-{3k2Y(-56CWSXzih|wuek}!NK42F@7Hs1a`#4NdjMJb`d3_zIrzJ%?*vnl
z7MD_le@&#NRb*vVWTnKxproYM9@PWmbawD}`2DbqxRk88jFJi1ot(0Yl=444?Bne2
z8vMUL>g=TA>f`I>07vKU<#5(T67PL>bu>La6>V=ne+O?T7wu!}J7KC4?(WViPR=s2
zvMvg8;x4YzPU3QMa!TS33NF&(it-N9a;`3}vWnnk$im?J$9$Xu5VJzQzvf}iK2GqC
z-{+y?Ebpx7qAVvXE+_BgAnxP@Z&Ol~RuorOl9yF-lv8$ec5?jdZ3e#X;N%XT|M*s9
zR?hH7MI}dB1$k*#aV1A5C3u;lg1EA@lasiUtCWMHgS3LIj1uhO-{Wffc>4J2`8dO#
z%l_l%+7QlteO%o=;RowseWx&D4k|D@ti%CvK=qx{>mQy$Y}qql{X;o9DfmZH8u|bF
z0~Y_=1AqVA)Y~1-KxU^fVp1xr6EueC1`|<`mzR}a|J=}>;Np4am^*B%-`Z4Q(0}}y
z#XtN^PDTcaA8Utk(%la%Gk85B8M~ZY|C6V?@T%*oI5@4X!wIor7dXVVkKO-;5&UP{
zz4rYeHy7Bk|G~1?9`o~Y^$&9Jbvbetw)sEs9m#(;eLsi5|9SEbGO|vxuHae9((pey
z7g=d>M@3l$aR&!Qd09Cn2W4eBIEDW*`G4nW|Mw=p{&puf2k)~kkgg<m{@dj^`FIDq
z`2NFr;2nG&AWOOU`l;`9_4V-*cEIC3-JMn~Q!>!oc|G|5wsm2DAK||}``?b^?BeVG
z4;%N7qx_zN@c)bB{jbOLp9Px#4~|I^$-is<Bl%xlYd!9*?d5UgbXN14%D-}=|I`j4
z(WyY({2fXEuf@Ez@qPZE#!kd;Ru}#cK;*BF0No&e{0*z%FTa7Ai#M3JFTk$GN{u@x
zlpnwLu_Gpgd*gjU<>IE{E8ph^LyYDR@L`NFml?-6Lt7fMrgv&-d0yD5ux-N=>Djy8
zTu+`w=@jnT$*}W2W5TwZCmpvulhf7}-pjd*C9!#7N!st`=%<PH+3BeW_15qm-J!FV
z12tz`?}TbReH(Q2?RM?>-N?Uf^Pbco^xB`})2Y(5+p8bPr~e`I|A#+TY7H=YYHv)N
z+=5K|nzcl16?%owalvAs<YavM@Jr=6o9B{v#(el`x;Cry(#G;giCDpfJgxZM+2Tyq
z$h!B6HryiaOnh;FarIN|`lsRz(_Hqc*4%R=Row99jP3MO@bukk&h`_;eP4<QhR6uJ
z<zEra;o~;T?`Aaj3b7s3AQAYh9*btxDF5NVrln^n5gS0!rX*_W+D%sN(2kcoq}gnY
zCG3GI=N_mKD`h&w7IvUv`a|vLAG@_b%M`0o*WP;fX0xLeEyqM;^29>k30Pm#yB{VP
zTjbn4PD{l0q6Rk9ZgC8;8km8_p5wJl!BIrvhwd$}UB2s3UQo7ECZm#~<~U%La{K=t
z5+)jms?{pFJNGANdt-_Yybh!A_n?W*j{C?r=C;u8h-C1GNWcrR9q)d0<Ss}Yh9~0}
zxE&Xy>AdzqwB{MTZuo$yb#=D!M9y|D$_~mdlB}P_$I>C>*#zg+32B#bw$G84h|H*=
z&ZS^jHdFK3R}{87F0kV_;_YY;D>dMd+Jx7(xs5?2V~V6nvLWjDT8y>%AuG08f0q@f
z<AMs^pVmdX)$CZdI{V7)YnyUcq+yzo_JJZujP<ind$Kx(2of4O{oUd_8>U%kXJ~;G
zMp*u2*-kjr6{of7>1>p~kE-VDW>OMOd?BKq2+wceT|Mu%qKirW4Ap{XIKmDjzK~tr
zjkP0>H=_j+IgFRAMs8M!#f?|Mu@*P3&tB$Ik_?@Jc55MR?pqNdJdz8>Dv|hdZ!zza
z>(PzjiNeTwWWN@jVZO&Ia7JVL5N%!sm9SfT>+e&DHxo&G(MjndsgFeKGsSI^_8QAS
zs2$%?n)Wq&%|MG!f#ERLvZxhB{3%Mgsi~_tZ4SPRYX=hvU7P#COGy#zW6Zy_m)?m`
z?gY?PgDb=)O!J*#B=t2%PglN}l*c%WUM`Ao3!?q9<}Mq}&5FC2w9MMAn)t#C@rd-2
z*K23>ZJT2yUpId_jORev18;g~XL?^5qokJjf<2sPC-}hn0bw^vFC`uPQbUe#GpDs#
za|aFQX0cy{9XUe#Y8;sl=Jbc6#ZB1bbf&LG<sA6U1>sBYOerZM8A8+Mri&xC)k2K@
zn;jP-5VP(`fEDMhhN5()OG(RHy4lL}BHT{U2Cca{Ci2O%my*0uwi~N=CBE2&_(*!m
z^R?;nftl_oki^5gXDP7oh^jhr50B%5!GjI@FI@_Kke3&8ubuK~wxha<=<67T4h}Eo
zd$*ehiOXc1U3h(kCUNd-5y299RxV&|-#g+t+k+`vNy#J8rD**Ym+!aMpIssb4HYSs
zPKH2~kXf@woKeiMKMlVu`Nf7KOeOKf)M5@fTqHx3s7_J@!!TZbuc?DuP&j6z$h6IQ
z#7^Z8CcZGDF!QMWQWeQ4n=vvl_qF)7m##-^rx=N3Ttker%{nR}lW+BmPoMC$s1`WG
z`)4hd;1c6bSW)sg8D3wK-x-<0?O2(Hcz|UI>|m+e4P?XNX#3f#gP+ysqYi=h*l_F#
z*xBIEZJK<g33K*aQMq0#IH%n9_5F^6wF}W7GIB(+6B=)smvx3mYi#(nxxg-Fcm(k~
z_ZKja%JWD7jIRt5pnqq)uD)GKKJi6qUt;?;&h}`MIhunB0+rol1w3-Rm1{NNc3i03
zQ-6SRlUpr78gCyn+%u6ga$F)dh(Qva$1uw-y`+WAqSzAxmd!IHo@uLZl=j+iiguOJ
zK%G@d66~$doO&nGDA&G!bGcIDi~3OH;NSbMhWXtyS>CVkO!Op1gC(wlvoXU>@NjJi
z;}lPpcXgmT{$$KB|B~4r?Y6eRCm*uSaX}d`Mek!Y=!+#Aj7!|-p_1S$#>6S27cn2U
z!MDy73ES%?@RYMXfO3fPl`W-G7Vj<*+gF*7oGU*Oll^>rh5{iyZnzBGweiK8Eiwr=
zOixlKD7V>C7Px5f*|XWX=2DY7T;9yIi`Lvef37}TzhiZG<b)wSG1M}S71OduNf=Gt
zp+Gy+MTmkMtv7wljrdcOA{`*g3?bCXEto92nnT<Vk0g`TndZ9~4ZJY-?lcd6N0!Xl
zZc6E=7>q>6F&s*6b{t(M!->srTKk6mQC)LXC`!YI-Vs8Jtq@E35NsrvH85vODVfoX
zW;pw$Xg+eu6n3d#J*1&7CDn3_F<Y0>vU7<BUy79SrXH#o)=h?IS)N9XvD`~-c8p#o
z-?fv7z3*$`*&8GX*>^q0kXWU|nUyZCu&FA}rC4+4PnJIPzL->t71-pNB^0tBf37c;
zaBHNK|N2XpbBnbef9%$aU5^i>W|u+@Iv1H6%XS|nz~ji*uQBoMR`Z}C&F|O1V0sQw
zT~k-%&wTPv$j97xeZl!t@yFf%-WJ+XT|4F!_K(GvGVP90iyUmqOiLsirnP84lhuoN
zQBU<p&zPLvdI+rsu}*zK;#j;KcHQ#-fT?Vtf8TD9$|QjJQPq{oKbi->QhF6a{~V$`
z6Up$IHEFXRky_TI2tl;WLY!Vy_OBEge|&f1i&)}Z3t>TxM&WF4RTazL3K2+%@WPeD
z3zf3Nap9=Jo|ZjGgy$h{g(IG^xxU-|Cm3YU!y||{9pByH&p;p9ZZOGieWQ6WQAI3U
zG=GDB&)7;ACKY1N`IM16IyG&T8*EdX2U)_qc4_lTny&@@jbN?(^dH*|?DPX<i&Fj1
zoE{zNWJ+aZhoc_V)b;r@ExqDvQFjXN>&&92?mqF7n%&uvzp;V)MPG{zv<trm^<F9j
z?J<41Sk`Ast*tD1)<vx0R-1{Sb#t~Scpp=ALyS~{>Cg_x5I-b}aV!44cnDx-hc~3C
zINi)4)*RK1{9t1`4hJbtC3i(j5=N#dpPZ`S15$(Jo^7^YNC-LB&OO>h^kmU`(*4ol
z#iq~5ey{MAJS9RTLt`wDJPWBp{07m6M=gLI|B}~7F0pw~k*Gs#C+%wDHPLCal=^!D
zdEQp|y;Qx<(l08s2b}Gf?sHK|kcQG(gM)189YMq;P2H8waMP(*F5i<WiX=9o=ISdt
zu;K=N<VgnD|J~YC+2$cTHd-q<-5e(Zo>9xIBKMdN9P^eWn{7)D<prbd4K#tQ!El{<
zc0(=rT;P(~Zf!o5bs$0vc{~(BnRE3l!qUH5b3a{}i8~!Le1cL-F@O~a(TV_Aj@6QX
zUQBw+bc(#AKJiOYcOeq3F|KQnWb0<fO73p{qyXcRnZs{f&Y1+Q+HN=*zgPzc;c*xs
z-i?Wzy9P1CQxvwWkWHBjdp+ZK_g!5>J9-f2Z~)?7Z%_7Q43kQHAzHPXdL~iKXnt<B
z5_NopM67ycKJJi6#&uLa!vsSZKp)IvE+o2R{my!b5$?^h{T?h*(49Y5Cpdqfvz@-|
zP!6DD2S?Z+$&zk8C^h+p>Bq<vAa<i9A6HuRgJZBE5UI2H@1)JbDs6Kl08`|_{bB4Y
zCECy8$!G?Wwe=ZOo?goA#H6;meE%4ygL~dgx^C1bHu=PwJ9^q0+~M$gsCoz{q)pBH
zRH>y9DnTE%=C%qlHeEcbE0k&Zz4DzI1<8OJpX0xs&M%1AL3g1gP!fGD1U~qf#;2zh
zXk9=~QxB}|1j7(RuUOHCJCrn$j8x<m@IA))KJamrfMUk%wt$T*0rtikpUk6@BI=qT
zR_gKn1*o+>4u{_?l+Cu}dgHs6vb+HwNW^k5oB$u+MvLKW#|kFMC0cX$GVq`{a)m-T
z=<(8w)Ofi-@GP(Qt9Z}jaLlkZ?J`9#)^m10g0)orjZOE(p${p3uE=Dt%hhZ*$}&GQ
z$!2Y<;jc!2bzsIQVR!D;^$3pzTa^=Lh+V25%_pfJ)zz5DAO})&vHFi#kC%PvMZ6?(
z@=2ER*P?k-GFO*s7sq|HfWl*L{&+c)zn%NqE0=TI=+E{jEHc~A0a_Ql)lnI8dqSDw
z^S1koul<1Zr5^C>G}hor6OCI$Oh$*JW_%P9P{sL>ZFIlJA|1Yw@M25yk_z4e(w@rx
z?0}iqol7K*)WTPJV3OzNCdhXU1ZyX;zfLR}qOIeb2lZv`01yeR`Gw_$qq;uK{Y4F~
zs)m<RuK)QUy^|_xHHXRrSHGWqbeuWBoEmmicOVm|ehz?}x5=VsB9gZP)-iWy7H4}7
zX=_5arz)-5nmaVm@boBTGE5c5yrtVYl+53vURp)|233UuUaBB1;!khNV?e3{=6dnz
z6YIgHCs2TXc~9vFruh(w*nP!z`d~|u9Ak{uvWTxgZJLgNfQ&L=^d<{IvVLgIeSHL=
z_i3JWbHuVqyU>&=JPF<Y>hw$2+$V}5J+GSR%{h&;o<+k;hpN`5u!UaTvZH64iBN|z
zKri<7;rVzRdp6#pbR~BCi_$&=Qt+um+@V&7+Cz(kc)^7Sz%(!pXL%{<5NmbVQv_z-
zKP4rpU0HF%Z=xzHndL92n5&GG0B=z{o?dMk;B^eKY2Fj?(DqZv!C1-jA(HgLkQY-l
zFo<v(7u${qi<sg2;T^lQjenPy@zZsXs+q&K68@A?(AcaLD3&(l=xd>dng6mSS&R0P
zvps50>8OoFEGq0Gd8zSRzZTbYTtuq&X}jO>Gd|)7l%W_Nbd`kDlmWVx+^crgQX=*<
zaZapo-P6kK-iP^GJi+LrQvlHzFtnyTKXfzw&?a#M`89%}PZt0pS^^Vj+xX3nF$JoO
zv_5hVg!gL{kA&_q8T&fU_7cHch<90GGBKf$LUJg^M|Hb`>~8PA*8966ZsUfu#xk!^
z@EKMkq$JfaZ8vU4t+nQ!WVS7Da81O7Mkg(2Uw}X{XLg8(&~QFeBBST*1rG8a_mi+7
ziO$2eNYpEif~skg8sB`Ei|6tg#82xwa7KMfO!IHH^p3HnTXR?W8@5`H1a4V8eW@)u
zbQ|7CB39Mkj@ssH@ewJS7V^Mp-mce7H<}%*AoWaC#g#&(g_=bzhi^~T*oL6i`#rg2
zn;GoOIMmxSj_p+piIBJtFPgSw+CHw@hyQv$bAs9WZnL9uu96Cu;{uwV1rcM~CU!UW
z&RU3X5oz!jERaZip}Cm%SX?Ay(l{4Y<Gnq3k`-~gJXm`kXFC&3imbpC`vF}JIpC3%
zBu*cKA1V}WE>6ImB~xEk1=vvsS7Fk<=0S<@uASPNE^7(M4`EBX0esMEJ=}F-hE*vd
z6kqSxC9<Y3Lk9wLaOQnIw8OMe9nVTZe4s?EW)I|&nIK4Q1AyyKkZ+XzSxeqiBScu{
z#JFkmF{~Fv5CcOgB^6?}?}Eg=SfuZBsIhbxTx|(TxBQ?oa=RtK<3bHdNTP69oFw_R
zNU3NE@#RW^ZlN;-&FXQY9|ZPy;igZi;<C1E)s7F)#k*$?ZW_<?L5W<f)mg1@Ota0;
z^$QWg1$FiG!M)L`F2S);c^GzfX`6T6rsJ<&3b)d|$h43H`5UEcYQDyQOK5fsqKVlr
zozGNYI1!bkKT%8m0B*r{kF{E(q1YtSSsT~#+s1HbBw}|FPoPd*N>Z4$G2jPpVVm!k
zQLNiR@QoRs=GMW1yM!{ZbVqDYuHz>RztdcX_`zKJGNFDU5o)i#bK0>GC9P;-kejyx
zZgcngJIRQ@bouT`QzT_xO!EG-Dn$W6?Phwdi+3$r3Al?pYcFRuV!YZb?lg5X+w3{J
z$``wxPa^s0uSFQC5V%ni7=6C_Q|{XBe?w7AumwHfWHiBHW>#lh%|~eWRb;m1bzCrv
z-BSVv^oS%&@=7TDxt-!LgY9L?sTKa7x7{Fe6QTdc`4O<*G)uiDM)K{(dN#$~dY!Nt
zK1F*Gj3mw?UBfglO8XT;{qzM^w@ECB%LR2Psd+HSN-R47zyN6<MiC+dhUn9g%gB`D
z{eqsb-9U&XOgiy}xT=^t6ts1ZDu3Fr+`HH8=pf{vZ7I7JWwULXP>~og|G~H6JniuV
z=tI@##|L03;}v4Z7e|u=G(PQ0s0dz7Fmd7ua%D(bu*k{bK)>B_+ECDOfsKq>`c5$)
zO)k)GySvWvh_g!fZBW}fFJk(#%A<};K7V;;o`)gx3C%?kb0{9FVbxWL<xbOT{urhx
z4AJEAi}<_vP4tTGt?GQ`_9t`RYw8Z5*%@Y0Z<}4dHzTF^ec3f?B7v%Cp}K9}3ZW&g
z|5=gVNIf$9i83ro_~1uu1#DM&A0Z!9HWQX)6bJ4AIbs*e)si{!ba4}aKdT=oniZs}
z9vjnGHtG8(s4}0^Oq#m%R|i<5Vbj?=6hEk-=0nN1qZX&FPk$c4(+z3WT-9Szv|{O%
zknoscEQO`{<1cm-kuQ%d#oQ&5ZEl>DRrs*YWU_PZwXAA9<s7D{@JT4$)8DQWA1A;p
z7$6*=Glz-@r&{;O=dm+$Y>=>e);#NCzhq<nNl943uXjAFfAYxqZQ0ZoiIcxRT-A%X
zeK0G+ImlF8qG4K^+$p4LM4c@_UaP<U+UT{Uyux}9_O(LY`otr4<~dAl+4;mJZp`Rp
z<(2@U!Chw}Vy}1+jr}ad=8k*a&yhSi#$v7Pbh8&d^sT5n|LMa7PREdabOrlR@?`rL
zv)4LpN7u{mLe6##L&mdRs7W{m;4g93g6tF6Utd{mXHm5H!db&yD-!`G>w-6lfPI0U
z(&@>;9fJKR$2IQlH7x1gUzLN?hH~m5d3@TM+W_J2aHa@VT;Fn$b3tOY0<(k!Btoe$
zsViF9OuH0tQfYg@nNShafzGcBCuoJh;aDCZy9DH1_9HRp(_AJ|wnq6IcH9G0kCu37
zxm~sSyGX`dpz-@bB=sF)Rx6BflPb~XtNTsgbvyz?VSKy6n<b2eVA<CcC<7(_QLY~o
z<>wP^uwy`fO_^Q6S@hus9ci{;M*E0Eo8-UP;g2{blwC}+?K46GNufNRiHZv*4q$BM
zJ2-9H2*0yxdJ2S3&Usd9{#YuTz!o6H>rCZ6?uZ`dsbufo*D#$MNXD7hg#0{B>oTVo
z<ue$tNZSnPn@(9E1KcD&isCdGD(X%kyEJN!Mjv8V3)%>?&;LDpIaGxhJF|Y?${Yu2
zX>>XBCRE2H6Ng?$WPlw?N)7({;7mETHNV8oxIOJQ37naeMs|l8oe6j(ympgXz{Z^S
zKoh5o3_j1B(Y(O^eh+rw@5q7yj&~d0dZ~^ht@1;6{*1ZN6hJJ7u@hW95?u<E?Lb(R
ze@VcY%x&(!iIe}~tIk@!Kk<cNPc~A|<TJEdIzHWpItv7=cGAEV&UOP*II%8QNM+;v
z@jg)tAfnc383?O~XxC;|`nS%T_4U}xAoUzG1HT!)XofNbcFA>+9jZ1166TCWLAb^$
zm+A2s0cJqS+BrULVi@XLiV5X%tYqzGn@?Ow8+ce5^CJi0O<JVZ;sP2%Bs(E;sZN!F
z2R!V|^*!<u4gM1N{rGlP+fpuip*6RpcP2UTQj$bkNUJDIX%NDf^{p*r?nflgZr5N=
zQ^W9~Sy9W6+-Am;$7g;{wAq=)%W14-RK64*bZYj>Vj_tR42bHaek~`mWd(2l_}Zp{
z+s%&IhUadqruSE`&yTAbUAmzqs@3BDjPbI?gg)1g{;~`4+yE{P)phUvl4m0NRj31b
zwb1&jlQ@ktSQ+ZfG>Wr1#vN+7sOLG`&k}j^1|R1`A>k+y`@SztwZWei|Ay7BR1gpO
z7Gt?Tn<d%qMv_ZAZaO;1u=U}Hf`|ca#mv~pfO^Vt4zPSWbv<OFAsla1+g_d(;iis1
zB@z1w$kAYt3=VYN(<_NPut-X<sfYa3Fnxq3FB<kifdYMtl=nxq{jw!b3ZU;5He{4#
zvYwuEuOq*>l=PM%<=IMZMt|H$20nTgnDE@VHJF4oi5VWE9HFEFx661Ba?{M(LVAg1
zPX-_F!Q&)ibNMBZY^8{qwD{EAiB1)86dGKGPPD;23VlpU>WMFm0p6Sw$!Pr%o0AO`
zOfwYZ2EdMyFWxinnaBzkxjIqiiIhm$@<<-ug1_FfV;P0_jB$6;FqH?!lI2NtIGVyp
zAp!i7w?3US!o5`}6W3IDx{kS;Y^$!yTOsDnc8^01zdc!q-%%y)YkUImT=E}(xt{X@
zpi&#{yZajDHw@teIztsbkTK#?`HF`q)8MZOqvWuwX&j#!T^60Ou^#}NPX>4y5PMk?
z&742@RS1)!SbQV05e~lp%s^JId4*U%Mxc!Li38oVX?*H-$KR1jZVRL$wDqX~<1D?m
zX!h)0<*T-Wgb404dXgQ@q#EE(Iy_Cs$yU1e7}Wx~Bv)AJw>aBZ<gBP+uGTk_9?uDv
z)Rxn=X>>+|a27(3iNwQ`xW>O{{s++Z={W6zK39%No^Fi>f4#M-8!*n=y=czgFbl9V
z>jSw5Ncc`lFh$e+`wuqK1x?*91<Q_mfUs}k_Ds&|c(H|TCWNFO!G)juWJ04b8r(Ms
z*!;C}A_v$DD0i8+)B6cq>qT+y8Ev1XDknP^0@|wv3mrbABI$0^8G%m-_uMvS1X`1t
z5_;Y@6#}j(%Qg%1e)^$a;{mHe<i`MYFK7{nBP_CM^{<2WshsU!TL4c(eQ$iJWX|SA
zbKQxOke?&RWA7SE!~!Hs?-ef*$4i*r=&_Onx~J@+O6iUoTDC^of<AU+>ONm<`%S5e
zIt}kv;-w>1=k4SQe2=#X9jzZa1SqO)_r)X$26l}1$FWbLm;r!?`4MECS)cD9Cz<+6
zv}6|^YAouLsByg-hEO5eq}lf$%!cDDRmg@wP~0T2!Mg5h%N*)$e(3xxM6>~ur5h`R
zXT}`q3t^L;!A5Q6U&MbIHE$x6n9XCL@2Pzg(gB}h-S!Xqls!&t3TLye*vE9JRzZ(T
znSsc1ln?g`HO{9%OiVPb4m(R;s<V1(+On^~UqrD^Sh`s=tG`}9m%AjUr8X!M)_5P<
zaD$4K`KS2gF#`$P=?cw~+29H3Z!abt!U{a4eHtfCL1cQbseO%2dg&I<W$1Pe;b$Nc
z!?|Zo1dD-&fc_>fq;_JXHPj$~w3x}KZilc}v5!6u>D0S0U5lE_JNp1PS6HEH#Q5&|
zNbNy)nN6Ymu9RN2x_kAX4?)kg&G}MNKS#Cqv-&cox4@RUaUgMaTGB+_h$qUcxp0+)
zGw>+RN`Ok+pyZ0baxRt|3KwsQ*d;!3oc;{sWgc<ADZL{z^?;p>W^f~Yq)UpDAK8_l
zqI-6qXOG@>2OrEPf_%U-5z36VFEHH3YM*EIqoh_S+ah4NJoerl*eBoinwOy<GV;h-
znl!IAm6#Qt41VoJWqvK%pPY-Nr>&$eNx!M_?2sQ5R9h_od`t4C?`rY#GZ}2mCj#wm
z%ULkh<Tz7$+3T(%^=M_F8a<owx));@WH^t|tju!(qv!ibk#;T3Bn~JMOrM&Th&K2u
z7&0j44t^aa89?ICd;bu+bs-r1b3mI3<d#MU@q}WaPK1p52;+4;Y9(Cs_dvvtRquE2
zv8GlX6&d;zZl>5TcSn$SLBjr8a>Jb4Ql(VI<ol>=m|xExy-)5b96a|>B&p{d;|?oa
z(~Y>>*4(2+W0LsHJ@w5>3Jr1#pC2rjEcq~$S$yT3++cesqZJzJQ$&td=?1H#y7}JZ
zl;E#L8!7up^@%^@le22;CVg_V_COaQW@Nsn&9Pz*-E@6eRsL8?W=YJmdmd<S>4H5^
znX1S6Iud=Z-FY44X1HSSc4ePei36_bO4H>idt4J2!82P>Q`HP&0;|$i!W-_CWik32
zAmaMWs6Y(?wtBE&`ja}ppZ*J)+}{B10Ih<K@QD-AXNco_9cnvxzCkQM-yAguQ<cp+
zKP;}ysN~4nWNxQs;K6c1d4P{DQGb!amiHYpg*QQNZZL)O|6&Si$P^NAmqs;9>C+!5
zTY;RLEG2(~V;~+Bwyt|EQj5Cf#QFu;MhszCKr?JRVZ^Y1Y73ItHK@3LYH@Co6;LLm
zpjN^HKjm{KK5XXMRB=M~+|<N7hJMm*S?y)~NJ=WwLF)u>DWNP=IAEkhNK?~$z{|7+
zN`_}6i|q_*Ec1}eypnUs0g}vz6q-g;QP9hDtcrqOLCkO+Nt38y`K&pPN&l5gVSwr?
zc;7*5kxl96FBeXHF)Ijkqx|fU4TWfK{27h3{m~*BIiwn5WcTxS4rYnBE``QrkjxsU
zgK5fsn+iGT*FvaMG^)C7>WPvqK_xrbR+~VsKmdjxanvXc10-2b%%9<U8=Yi}3BxzG
zb1+H(jp>05q~&^89@FnVe+lUWcT{k;UnljEJYZSjBprZ-k9x^>p;xPf|0tljjdDqo
zMJ@64+`I6Dru=c#5KiiHou8~}%h}6pTb_<-)#bR@Z3y#j^qXU-g{)C4*tsiLEAQJ2
zVwsM|GNf}2Cxp5rA>xD-N`Mt%p)31nEpw2SDL~3ejIC@F=Nxm}88i7Vb$<?~TG=M4
zpv<0?3mZie%aLeDie2dT33#`>iS}fB^4Q6e)61LtO!wqkc&KcZp^bOmT`nql(`p8e
zif9iqDQL=!6(J;)oKk&#yf}*+DT=F|;zTBnl#KW$MxDZ$hVRM`Cp8c8x*Bi%Nr$~^
zMGT>W1EEtxOO2_XFw`+x(e`9O#`8V-RpfMej}}+WwZf;E2{J_*>q7<4Ps6}eLRTWK
zmu&f+l~(Up9f3$TBCynUGG}|8abNf7Yvrg4byI`>@Vfwtbs#f;?aDH<*GRwpklToP
zd=WhWl<g{{VxP=A=-y&^QzRelGuQcrC)Xt+14&CV(3?nKxcws;P9=oKRw4GS!ogy4
zB>6@Sr;<yYLusZZb>XEe_*KksYL++mT&v%vr&v62s+n@e)UXk@Ezw0^;eb31xJ)MB
z>jP<{c%?V?!;!@h+7|%56RU&zDgS}?(dhihldBbxfDFnCS%XbL_VaKqQ3L3Z5q2o<
zVutt9@H7v2{c6CjNzMjfgAhfLsZL3&-B#NUUDGMxrtg11Hd7w&3Vc*=Hm(#<P}b4@
z9PSTeHh_0hns@q}Bov$FW>@e3qE<Z@`dQDzao>D>_4b=9c~9(k_RiUSC^$#dAjpLn
ztD33l%WW`L&7(N!jPs5bo{lc}v2?x(ajHwy@dQXgIw^Nd6elcmu@qxa_27VwhdjWG
zM^mqS46X((PY=_nyWrM5D4{c-n!Oopp`ba*wnrR#W8M@killhahkc~8U5Ys4mZ@UP
zcdwNfxG`2T9+cjEqh&4p;m(FR=O-)nXRiMDc;j>k;!QQbQp6v6hp=j*4aM<xH-&B?
zorfWY>q$;Y$;6?kq(hy$t6bMUdH|WLVrpIrKh1gcr3+#OB_bKrYHx|=O+BqB_MFgp
z*4B2M-shp=G{$O-=-HO<%v~ctKOpSRR45DmvQ|o@3biGzbUZ7ik^1RFEoJT-ud68S
zk<)N0sI2zVP0Tub>~&H&!b)vf`f@nilSy-cs(s$Le6P*3+6i4=jKG^g^@|*+w@@)u
zN#No;3tpW)xo*zKspC8;m@t<=T4ph|%HKH2wdl@%3dc8r5jZXtJ8UIifX?M1d8v*x
zN*4r$N>bssnJwf_CefLlw00Y2sz`<(F|&~HZaEpzqXdp+fF0lUf9Vk$<-j|h??2<L
z7p~FxOEmK7yoVyLz9Ww7`c~|-jyO?z_i5D({F9DnT^1B4o)2Tb2*7hxyunwDz-k@_
z)mG(>MH0`oG>vl-v59COANwqg4YM55Hhq*cIlvbR(zR$e02q4GSZvCUftd=>IDo01
zBq80-_9NOCz6M(gx_!Cl70cvxS%Z?$+KNcWaA#tMnP|eas#wob(Hj7X+Vqgvy~Nwi
zoTQk3h;QCRP=VbtW>}Ci2}{<@GP}EMiE+xc?Bke!MfnMsX+7e5u98F>s(mlFOl(3Z
zG7-UByK`M`zPY`|ooQc8ieMV!`1N9Eav$To8Q{~v(<UHrF*hvnD0h9EmckweooDf(
zd~!g(<1klx^Em_ZQe-Mqqh*PUEf~lriq;Hn0^l3;tB1BEdvV;e8`y0SpU^@KQra8L
znC1|199DBW7MLT$T;E?+S_-{8kOcCmDk~ccgx&+z;QVC2tR^(n-{md8OiMDo_k3rd
zv0*or?J_;QQ1I74NQqdbXhn^;We*Fx?B%UTotiITANiw`{OYR?Q+2&eh2)tFzmTd5
z$S<!=vm2JdP)adxArIX>lyw0dYAc!lrH#gr;dS&|=!rK^nNw3LOOCLFJtBQl$d&8M
zAr+c=-9aLPED~Os<t;mQjyzbZpkxDSy+a8$L3-RALix?tch+~V?t!;c!M@mhe9a#E
zV`%LJ8Y4+!l@kD?Oru-^E4v5nnvPuT4i4*13ci=&>~u|=KQag~ZIXe0&yG`%EE=Dw
zjHa7WSRm$fN0`PpN_;{0KcF`zXWV|6|NPI%=e-5;OW{e+ZSL^=c$@X#43qH06AF?)
zC>0b19nXc=l}&%{2P_eTGyPf}`yg)v2xM%OBTdJ_pR8zG?8}&<s#pMmO)n$+3e5@h
zWn93|Q=l>cl<y0`Jz=$wGT~uP@ZEwp5o9;GJLEoNZ#qP`+T{7_33?K*H!FErwD?;c
zoAEE^3;#Xd7^|5nfFe+c=1;ccw|f&xOzfzOI-~-nIMcCjD`nlLlv?OLwAz`50t`Zz
zZ|kl|6Bz*JE?m<o_cg1;NzYe$6xc)|uhLasox^&A*ic45CW8T1ddZ;5bf$T#IHYJW
zb&;vM*`C72OZP7NpQgf1j>N8POMoVq4F1a*bG~myO04tt7)=|D02qWm#;Ig);tQK>
zvmXjn%R!7uPH<@NiYSuEbD;6)RgkU)tnOvp*YEce3x8fhgd84L;^Y%4nbfVAeg$6o
za{j9ot#d3997*3ac-7o<u>YJ0k_HQlAkw5ThY_|Xr=UR^vJl+7rvw0`C~<F(-miV8
zyk#c&R9hJ2_CY1jk-g_qnc4Ffmu4Lq!9s$eC6{OR2zWKdd2Uk!+T&jb3JhZ0<<+B^
zTVWH5ANu`V1$>VfJAZJLmi+1m6;%2&NNXDiUu6{3Q9xb|1^B}{F#T;5!!mSjO7kFv
zsS&3aGwf?0Njr<h2J_Ov1bP+Z`maFqkfYi@P9zSa4-V5~N)au3lg#Js8;P)3dL^AV
z<j`wTINc@NCw=y<i>D<DL<r@^$a)&4akK`es7fw8u5TcyV8m<-vr(Vt6P8dkPlvi|
zXyJLt>$fQGHjEI0H6B+g`7X&Qtg_mX$@1DBZ?bs!_~`5dS#|a~#oPl=!Gq<v0g;wo
z9S_8uUK$;8@)x6DW@@xxMl^A3{Jc5x0iu`dv%D2LFGe%)bp18L7<1Uu9O|DU89Ky$
zh1Cz1*eP0|KIp?4#UFo03=-%(O{+-g&q3a<5@6RhgtmhQV$dT?cS0Ssr)-xFrDDPg
z!4^RwV~V{-1sc$tcveyAOAW~f0+aa#r@Rhd$&+t>oFubx)%6&v$FfR8&%E$WOWA6S
z35wmL?eWS@_P`n$)^_D$k^+MP<6E1?Z*@mY;-`$D!B)Kxen?R1DGUOY>-`Ebrcfu4
zUF{<#$|-%(HyKyi(L+mWE`5%`)Kk$&_aGH*Tl}WQ=T%tFtvz}mcp+S!J@}mU$)&md
zka6{nLV_UI<_=gieoHpv+tJ}|+LALclty91Vt;O-aR8O<;a1%Ur6;z!;+aSpGjt&e
zPh4=4=w*d<_?jc45)QWvgbmZ*U|aX5C8)*a+$eYRdrt@K(tF}|dR+4@%)0}1ih7y@
z`;1rSdDyi*%m*~=mfGu;p|;HJ;Vp9qdJ411kSOUi<(1{F6nL!4R6ai<H5xVG<@WL{
zB0VY$(EN;))_k-JSoUBK+8dB-C@6g^%B4d&rHbMSq|QMwVoC^lT6c|t6;Iridpk1p
znoKIv#&AzsU>7|uc-8;GWb2#oU3vr1<0}sx&=NZlGdw`5A&G)hno*kkEUJt95d2@6
zFp^=_%<?qxvmq@9THRi5)d~Wbu+nGWK{f)^|1YK{>ryVrSx73mz<&Ve-o%h<>zJJ1
zi7xHnTFFzAVygZu`&yJmCuuMga#p+<h`L)T;(ivtTn9>!QB#TG#7Nt3I{nhqw#8Nu
zF%|7O5_nuCn+{Q+x9;8hj&N<YX>{{j2&d+4&D9c|U%>B!83BqLD+ar_F5jO3h|ir6
z3EO~ggvJO%b@{kT`t}UI={Si@R%MR-Z~Q)d1I!;TWD6Xg7~KOXGovVfrE9gWep>u$
zJUZK=&fBuet-euu$KD);Mn%<J$&Z^5-063t=lwUJrXHduK%MC5aZ?V?$Qwl6;|V|G
z4N$Gwq3Lm;nzX}!RIvNqjYy`k?T(d|Y2W!w^JSKq4CU0OFH;HwVm@RqM7i@|g6{fd
znL{<we|WWTfQ7=do)pTkf(^?}S()rjsT19$W)K>;tmV`j8EfG`(C=uk<BBCTc^uR@
z_OVMxiY9m!nd}`)P8W(Qp?%?bi&V*HRyF2qK`$Xu=ml(;upaPtr$awfKq-|xG~pY@
zMK~2Ryf90~*$Q&n9;YUjuxM=9!SA?m4(x|)>k=k{Ux|uFO7=sRn>u)QOE5&ZzfA+n
zF3x!XQNe6xWaQQMPr*HY(=FG$gx)$*R3$O}F8qreTjr)@c<JnoUuNq&bj4$2XoA)5
z;h$U)ZX)GEN1O!0O|+r{vwgzk2^C_X&C;j(1t?1}u|HY-7}t2vOic3YL7FsZjTPi<
z9{~zG%!Qk5qrW?gF~|!25(xObp2&7)8F*6Q_yu}#(`jq7NVw*u;e8oBS-pv1?)*eU
z_hVDDGewp6W-o`aY>Dt|Vh}xJ=29}y6I=xL)2fv!0MZ4RKQb%fHi-bCzmFmH?9aJ~
zpR)FoP@WZ=n@)`o>B$r?KE5A(<Unj>4;UH<x<*Yze2m8rDEw3?h>RJ|#9psTH$^b}
zCR)Lv^CQ{3tNY>U)SGA}<F~>tP7^$%Y`H4~e*;nQ-)EJsNgRnf1$wH&fYz^KP=oBD
z1&b11EfJxj9{YG&J9i_Z!{l`%zi61HXld3wvyB-RBC2Pf|8uXp0HR3HM+W3<hYmEu
zRH?cWN+~o;vE`<U>wKRGrvJOF7;-hFGlsL>Bl~FoQ|OU*1*z*mdfG<#$!c39dt;=N
z`O#)a6(OZf-S6Jr=tU2_aVa!_(>~ZRjj`9DRYpbEN}9fmydKqL({@k-BCnOnkr_dL
zUL8JF&HgxEx_*7q(SB(v=w^3g-%C?8FhgDHM$F){>@+V}haiml@Nv8)w8r=hWmXQp
z(*t2lD{y^lLqvl<AyQFoI^XzGHHSCh<DOiE;HiTVyerKM<&H;H3rf*U6E_7RSruA1
zGWZRkWB~E5>YR0(Z}pb>3tXOc>rD)DCKqu1m{u?ROK1dvQCB^a=70L(_1BD}<9el;
zmBjDeu!z&)M+WEkcySPX7UiW9(j%_!ZIYqgk9!|B3>&o@DAQun!85(vpv^KA&utpr
zCW)#oIG+d-UBG19$4#hlob64-&wK*DqBM||NV?<SG+s>7&#a`qEABO%c^ZC{%}MgB
z>60;7N6-UY7d?xqF~0GQX|=d4?S6ttbhTz4qSNC8X<jP{LyCON`p1rbKW)fkUg<ao
z`Zca<PeJ;t^#&98K67>HCx-!$Dz;#+e}H4mbW`Z)cU~1SwYocu-7yP>pf;X$eguP@
ziL7Qn_oaK$iB)}sn+`OAC<3KiW2hj)hIjDL{pSBLe$5r0p8Hg@t(%1q7Bf6%%Vv2L
z_$iVf>BJNIV;_vIMYPW&5SWZpn)!CjVkpv@zXYJPC4IXvu4lW|aYT*=$VDEnQV@ix
z@7o}--EqMg<D}QQv9&$rk-4kqB9H6XX9UEKQC=Hi8VLn(9Y@>pF=soK;zUY4-FIvB
zfO=waR>;@ywUn=-VZ)+XmRwIfYRR3|4D<MUNYpVf9*~n5eNXp!MX26=Bx2t(z)ck_
z<ul1gUh1P6WnWYePP46iJ6*s1#?gKeD%=^_tp^>!CeU)1ATn>;j@A9PVT0Cn#q-1+
zYs!Y?d~)#2!QMwCW4;{=?i3L4e<Xi8my8#q4|6vyo75DQZiR02e1xWEt!(0p-l|RH
z$LQ~&16we*C9m*^ntlY-oB7bQ99_MB;M5AdLBsS`Ab7}JwbPvBl#DX3TJkq)O*98{
zZ72QRbqvCJCr35i*Ac`C9hsU8x|wNwskgUOZn@>nIXKirv=IN`K~HT(*(;vSJF43|
z=WcJFbHa>0TMJ<AK`ZqcA1?fJ2#X4Q0_?IJes2MmE<%pT<qs9dZHD@XQDQ?x@FmHm
z9R)#s4;|?vrkQ7rO4{Apf=D2%?UGZQupU9p>e9-r?heY3=az)TuSLp2Ly6Uz0ZCIJ
z@Dgxbn2c)Vui2cE86CjD8(lc=)cri7lsUh$W9W!%BL*SU_-a75OSwt9MlqtCt@?F)
z_BN<U*`cWIVzpZUu|&Y13WNZSuBP|88eJ{w+o1f^GEQ^a1wv<LbYxrGw(A=thJS>E
z-YWrj`&XU3+?OL)-Q+7fI5oe+jSn(5stU$9ef_9zCZ_et%A6r>6q0?P9YV&3M;{#P
zDR`bZq09ASyfe(SrT0ndXsUwRbRL2}1KkN9E1>#=8#9%U4+JuvPMi#l19<mK0q+30
z*xgM{+v5g$a(a6yQt^8j#tgSpGLm!0(W}(x4joHqMyio-H!0@QAFp+Uou>d{v8&H9
zM7*QFQ-#=dfwgLsn-8S<-tJeb40FFk*z0^A(1lQQ*en8$auEYMv2rWT&)Swwn+RP|
z5}LLc7cfhA;iJ0y81nO1=0r?#Y=TDeA0jZ2F{S28Vn4f*V&aR47PF2xmFbUc^G5ZW
zD+f)hqN3&Duz;;*3S{mX*;=hmU5wC0#)=sZqe-m}c0b!}7stT|iE`{r)wuXic?i~)
zf<`H7U&l(Q0j(F#wa*C&IN=P0R|jn?v3L;w6@7}gG>T3M#hA;hO-mYI>eCx|<0S#a
zKw3y$SBcz<K$9g;4tMuo$&flOQEec-=|kFkPfLpLL}B_%>glGib(U3e7{{f7WJ|tH
zxZ6YDfT?BbFS?SL$9xDV-f~w_9Dp}g^1G+Qw{zDzKKAvW-|lIc-e;1F&GT`;lDnoK
zd;HzU6*(VI=6i6JZiT7omfSg}Y7d=cAUlhY)fkFoY!X0+<wm$6oNefgIiiNkXF62;
zI<anF;)~?uCz&9vt9wwn*`i(4%7+D^PTKi*1i^Y@vn=`LsC9v9xy0+=istVpG}hfw
zhO}1XF2C>z8+X9{`O&xa&0oE%UlkN+rCpNlvlF+hlPE514Jlb|M2dO&E;`^k^OHLz
zdJ4{6jebSG_Ps@aluZ$sDp9&Xdf?UJGf?D<(sb>O^V_h8A^wF$BK17*PwwR8{M<(E
z)f+)ArqnnPDYAs!JowS02awHNnbZUs;u#;c)~g+<*Ljo>HOmEx5td^S8rz|KJNycc
z6H<1xve=(FUYF{FG+QvDCj@zWk06OFTSO#dg^3-#{12UZT&YS@I1|3}U^Ic9{u7j#
zisq)OtJKK*x34?50%Whebj}=d^>$iPLZ<SLd1r}Ot75g*y(ciKUW7MrGm79L!FJ)8
zwrs`upmE&D7g{aujwpfI3E6|j;t-s&^|OD*l}<=sWef$EUOb*g+u04=@WLaqyfDm}
z@s`ZD%<L@EB>@-m8=;4^QR#Ldw{s0Y!QEWcG7&C<d5}u$g5c%{;O5}wDMLHmdDa5E
zdQC*o#%uPd)#>8U@b~+uD2M6AU^h_$me7^AH)3N&s*3$zfUYspTC(xKK)S{dh=<)Q
z<(uY9T6RQeKyQCIBZ7Qa92B3VSmI)?Z;S@hEEYIIYtwPJituN&^Upzg${6Pre0KwI
z6P2Z3gYP0lggJ3vbdt9l;o~!ab0PQk5tpw;XmG4zxsi9>?5n~$EHuG+y9LW#pGIHL
zz<rP^Phbj=Dg#j{Y(FP*;YbzP{*hTmNjLZTU8Gj5r;rfGy^lWx81dTh!xA-)nNy!I
zL=6wZpPIy{qp^Y@^@U(j8hq3i<A?-{FW~m+ta^$*Hh7>6LbwJWbmaI1G3Qx+<qXOM
z`FAfY0?^_{u<EGDo%jXA*>im|gC}V@;sz!BtK8)eHIR9fKm3#?gt=!|X7R^vXdC6Q
z;jpXl>N4B_JV3?Ok1B=|Bx&b?l9)T)u@lHq1JeO{9WT}TILZqs<@;AhslgIFbm}Lu
zVSf8_j*KR3jz;sqRgS)_qsxnBY6e>o;zStX@2cd~^8UJ&oQ|kySn&G`9G*rCv09tV
zjR=AW!H!{ZDpvHm`QWTcj_{m&9yt({QjGVy+vwNRdzvns!2)G1M6;)HSfz}ZXZ6qd
zl&NumZvKJgtEwKPMn77@7hD$AbXyLDX6J9`z6_XIjd({uQiN&!!n5)=Qiy!}{M^{%
zEG=NRb*ML|Bh8c>6imEWQ`)RebCtR0opqcBuH%F_cD@9*_ykw~$^*E1_h{s7sA2OI
z@Kfjlp&X=#o<aTdx*Ne-dzTX>M=xRPN4^OpU2NrcRAE$deO6z0yyP@pMEw@hvi)gN
z*BRM<F#3!^fN=$nJW@IAC~0M??QYvvg&KJ4a_)LUqun2HLC2OdP^L!BMf7w6?|-Pl
zt)v@2AsYFv3gs6SVDC1sU+!MY=WJ&tc8L)Pq2vUn&}qXqxMBf`S$;@rRZzEg#9gQF
z(d;ngj<{aoF2R`$8vv@;N$SKLs}$U-X5F?2j$h)W+GQ#t_2EZ~^OR0{`DuP@weIsb
zrs#*d_~Cc=%<X?e_!!=Hb7u7UlW-YJeg$?qb8Fk)GNBCDrAqhlhgkk5Lei5S-hr{=
zTD+|8csWDs5nR)@>s&-|91vL1=}a^rBudTV^VT%wZ<OCe6P-q+0>A=6po><^czhra
z1H}AeWDh_rfRV_+Wxp#8LQCeD>y`l%_=)mL92*H8q;T<TeU*SXGJ_f1y1HkjJsmU#
zkP?^KERM-uhq;HBqgMPoGjdV5I85@>w{W{vk<a()iDnD<b`2%@o4~jIw5LEqq|`kG
zvx?B4$ypxoa=!wi<ftE_E5L(28hI5O&fH#e5hp)csjv^S8>>>@<4*%{_pbl*;kK9M
z=gX8y!%S($A$E^KCG-BOsCz~ZnA6$&|9J~;>y11Z)uB9tZYA_<o-t}yi0N;LOYuwc
zLxj8<9uLyZ;D(+H?WlcMLPj@AO}%0I(%K#@qBD(boZWhdDaIpGHK0c7M^%?T{$v0>
z?;p5naVTa(D)$j*bsdGO&Ik2m_}UL`Ur~28{-6j3c>3%J{!b~|d2zL+MmU0I7wO_U
zkGhTXZ|*sb9ijRWqM1hAwScP08mTUNe4x`f*EK?4=W{-QRb3kX?xbDS9%hEKLq+9Y
z$v46An5*j^e@fLX>4_-Fd0(<uZ;un70H*&Nc3e_1=k}eqB*oj|4<lSw{C}K?_xB55
z@w63<l+#>ok(7SiLervTMsM3mT{6D@V8mGUdNe{#cDpZ=d!YQ|A=_4)1ClVK2>GAG
z6n%wA#ZGWI(Z0mJs>Lr}j~Y9XK45RLTx~jOO^vr3fzheZqqTzuDstt<XIXxuNCwtK
z^txn<Usfms;!l%5a}aPLL^^>nFH>q!g^J|yi|>h$+8k(9LA{_=8K7#J{1Jd;cPL$!
zcO8S6YWZwDqIit0oH_cx>6ZA6cVCOB>%L&_@rGPCX*?R~#?k*Qxs%5`DqGN;rhGE?
zhd}YB8C<6hu?ptlgISDDis*4Sip`3AvCKe2`>_XL@t~7eg?<Jk_9`RBo-&Vfcj2y4
zSDJG^Ooxqd4%WJ%TeV?&$V<=APFQ*C{CGmfJimP_2xE)oB6dM?w^iLo{CUl5z}u0d
zU;gcd>c|NUlG-7b31NWusl1daq(37%e!<-xauZxMoBwoA)61ZQ)i-}_{fltFHL_Hx
zg)Pg{_v6DC$_b;7Df?9Jj>ZA48IhCAGQwXexZ#(!j`2rKxme<ha4SAL%QxxI`$X1%
zZG^ZL0?=;ERf?<CAl<HyHN9k4HfbBITEfr84$!)RVzdAms^<B;J#B$IGx#7P#q+Yf
z=cGMzaBv8f87TKPkfI31cOHz!wq?;Ux6}&~2P2|-Xq%4@aisL-z2CjG^~+gFSXoK>
zvgyoHx9<(YS%}dbBhYOax!qJ{Tw<Bj6hedk=m}_10Ad+3o)PMQHz;=<1N6CL75C7Y
z(=qP5=-X)3aTy<(lpvkU_S}6?D_p2L-lyclOe;@lOel4Jk`r_S1O?$t*ZQVpkzWsB
z3AaMG5g4r4w<wm#5j@LGTc8)<L8ks;Wf@$(#R|O-u6OrA?`v1Xv^+GgGhlt2=q<HA
z{U8=4kxQNhsosUEAAWOy<>-o)-3@}+6hzX;p6=G}BK3W7gqtPb#JCT}eP6ozA$|6e
zqD4F3XRJ4_-`VRQSf;jzYRtK(`-*7WN~?)(7(|7aSe1(_1?@{l<sH+l;!OP<0{o6R
z*^@TV6ga^k1W2Tr6h3NLqzHFWx0l}_>zy?3XR0pBO@0e#QJAX7(0k@U_>f3H-U|>?
zNjSrqp6=P9Z`^%lFtFDT;$&QE2`s%MjkA3y+q<@8&nQU}O2oiuq&)Q(p*!0<Vd@3-
z;G*p)bR{5cI#Irh8$1=Iw#)>&2d8Mk?R{)F&wMX?W;i3FKN{`fRRhFMAr-e92TLhx
zb~s;C{wOGj>7U?LD{XB(0}*NDNX+mqN{*{q&HA+{=-@zE!<_Qr9X=Xu2mH6!8vA2Q
zD-k#FQzYLADoYr$FsZo$xMQE7{-PL72keE~NJH>?t&^gHn!o7GDU)Y;pS+tu&c*e+
z67*s0FL}Aw2lOd$Mft*fRVY%r#q#laui+O(APb@M!qETWhg==2HONRE#9N<2e&#Y+
z{M^Hysm_Zi#k_iXt0%I<j@8$f25eQ#^)hA&WImT-$pT83YZGh;d!Q{!m!W-*Rf`nB
z`%1*l^xb+|&e?vMGRn_4k%nNRsD+$KXq5nz1A2da@mmOTucySr?NP}yu{u4jA7#Gn
z6$|GZq_Nn!Rtg6{pALih`0QI^S!h&s%akla&@nxz{m|h@df`nrW5~olehfPZHv_QP
zAfMGsr=HM3=ve&bM&=(Z8SbQ50C$U9J)2rafujMB>hjc3NYA*cRGJVoyhIu0;~n{u
z*3WDB$f-b;lc}0dwcZ8+kcW@z@&ipcBvJGsf}+^FaC_ENi9H5;ZT(_uRHKJ(jZX>`
zR)Bw);I||gm8!J@${0YUu={U!ozN{=u^K)h;25%tUaK5c9yQw=;I@z<Fcv3s7F0D&
z`|HGDtKy3VkURAkh?6kNuI%##cH<e~)zsV*@2u$+Yd2W=`0}CR;V1257y|TTM#=QG
zkfWN}n*yLgr3`#8hO>fZs-hL&3V~*vL+I0^YzD;VQJzvFmj7OZj~COw%=_bQYpWrQ
z#|OvRn!WJAw)UlK)#*#sRsNvInHlNahvt!!`;v?NS`z_;sLjUAH=ze6>?^lIFwVFT
z><W#e4b=}nyZh*roC;sbV9t{~sm7)heo0bYrNRGr`^?F$GClVWfaHX>)R=rcSl+(G
z?!0tum&h5})VYNKhhhzT*LC5^ww&eKd^^QlO_%yc`GBOW|5Ola1+(J--V2gqNmZa9
zp;G$6I06vOP;U%eLr|3aqDNuV)b$#mdA=B#3ju<iJtGt@qN>~*(~^iSGw$11preS~
zaWZ>47-%%p!g?JY!F*=yo3}Zpl~1#LG}uzzYL*2qXsilR?#XXeVsE(nvl>e%X`H`4
zdKW!O)BC$RMJ8iZb9By;rXTAWD2NBD<GKD7%VRLVtdSb?3-z_o2FhS+@;Ih58IW)t
z)0%6p6C{zSg<3`t0y)~@)^~^xKL)@87hbqPgDy;Cr?e95(r~IjUco8!BvrXXQ}z+p
z{Wn-bqQf=DYN@x8-Lvj`;hjv?mQKH#0zi%MUt(d&liJ}9Xpex}Cz1$vsA}7^jbcH@
zyA{8ks@HzkmjQ2`nscTsJtCi{aQ@(E1_<$ReS07JRfvJ)`_YKz$C5Hs{`Q__p)IZL
zBk!{?AiaC)`cv`w*Quw7F&^LFFdYsYL6>CFht=C@1T)3es4rchir0hnZk+c=q~rpA
z-ZP<n{N>~e!zrjR$S0+OZvtdzMm}Ytho+^La)=sPny%XQ(hE=4@3eMY=4>w`T_9mW
z7qWICU@{#kFd{aNX;BY7JYc|B+ha~q1_>Xlz0h53@!1b-N@Wx1j};*^bP<2Qn-%}3
zz3&QWDr?s!1c-_Rb(CIYL{yNbAYBxOQ4~a_L<0eYK{^T2JIDx*iaIh10>Y>i2_-1K
zM;T<4ra<U{00Pp37<xJH4$S$__x(5L>Rf$yx!OB>?Y-7|->0ox$$Y`roTRE#J@XCp
zy%Nr@)Gbz(7s%+^TdFw4%y!tj7C8z1500eZaPw(#P#GVlQ9dXZe*H?Po?lsiJP!~8
zcQCp${q41CzDY^DW#>ryCiwS};d2pFn(@=ki0c^Vr_|91B(XSYd!8$Qs|^P@OUjC(
zOECzEpGS@@kryct+PJQsm=XgcrUFw<k+a$6eYzsg$<GUvg6Mb!6xLz(ah)8C#275w
zn6iZ~C4T%m;cj7z(?=o)XrDj-k}~7~q8JR#Wl%0CeqEWm#4?_iX4xOR8oR0I&-9W?
zj}0F#xaQA8!uQMbvE2=Z`PBh8Y{0Tr5`_G12y}{cI`Jvl!4WEuWMuqd(x;cN*YN7>
zDp3LJWl+3j%dfy9HUE+;q4Ib0Pw;{hASpmAyjb486&;?xGTv2YczbLwBR(p+64WDf
zk!wn@dT}Ll^|rnB*1F71=l^P(3kVj$&<9OD+3nE#O!mvvOXFV)o*2uz0w<Mj81iA{
zi=z~*mBu}C5wTBR(}|Y~RZ8sZSx2D=MKKEb_{()@lnLFU0ngDrcA9+Z6)(q%Fbdf#
z;(kD{h5%tQs$*1rfabTdTc<%j#~`*o0XD2(Vzn4Bw9;!YmU&#xplqywjXqu2;uYtc
zg@+y2m<r&IuNK+-qX{4kr68t5SNsXrMOXb^Z`Xf+WQ7}+j86pDJGVl&t5YZo3eLSd
z{iEwirZ5043A@0VtSzqY2p&>EKl><j@{{j-7_od0N+lKnxgSNqT~Knoz&q1#K`aVr
zFS1`Qg~A47#W>>Knqc?bcxKHR`Lp|C8+zcn?vHHB9Psrs1h_ihOV3D+1Bhfiko14T
zesQMI5?0rbLyqVSzzLz0hlYlZK-jm(79xs$Rp?N)Ro$G1q9$T=URjM6v;ou0J}AK^
z;mwEZ#!{m)M2_xzqC}VPxv2!_iSx(aH``geOORf!Xm?O}V^>fGn`-~V7Hc6kK(R)D
zjEZp`R}vmdeD*JuxXLb8OxvEkq{IsZer=7vyaUVG5SuH*jiD^RbHkcZ>l3fNjop4t
zlRn0Es0~d(m_QuI%%uHvccPw=@j{S<3P|WKy*xCrMMiuUSS&U`_IlT!Z;#<^O&A{?
z+^YDP2rubY_{yM7?g2k%RnI$S9qQ2Nn=AeAI<r_mCJ>EZ#}|*j`RX#vR0PAv-DwMX
z;s@6oSA&6<E0b`2m~Q*6D?!dbv2{Mq;a<uImqiT)#t!Qo<=kX4AZq`%6!L+kx*R2l
z)>4=|sF;H;wT9jaRl-q1<gH2BE(Rz_0Ixmeinw|x*559=HFTT0=3i|A#9k`_NuJ~m
zRz>2{9%jL^-MiF)WD8!rhGF?lTtZ{DFv2o&LXyn^TN_43eeee@K>c*$3=}tVw?SP$
ziC!h}*34jnfzp`53kB7VCl2bw$ofxzymV^PS#^##qIp4SM#hAT%~ik?sn`NLe{Jyy
zQcf5{x11u|Yc>6m23*C&1g;x`UD90?XDRRw&N3ds;?(`FQ_g}S17Lq%jdRM5U=3tt
zZ7MzT>0}bQ<A#kdrip^Pa~_|p8k@#eI#kD-h7ys_`YVfufxSqaamu#ln9U6?^KJfF
z^8noa<;@KQAo8EtrtSiz`8zcE1K9Lu>oxh>SoN1x!ZwcMr&hL8(+ExF)X2>F4GQZ@
zq>6y6EYv9CDMvz2XDlYeTujaE0@gTkB_3RF5>Nz}uHpDOo2E6ndZnR3gWi%tytcSy
z??#3_#I#~9yk0A5UfE1uPLt4x$8@it!}^9Rcze-E>9z75?&9sL0Cz#^Ica%da&@Wv
zp!Q9BaI#n`-85n}n{lw34=F-%cv-|m3ppym3Vy@0=O$0F`XuNuQqYa4k<IIIzUou@
z;fOP=Z6GO;b1JugLhm0Zn(A5oy;mX!6oi=fX@68@n+7T(qm@b<XfLJ8d0lm**Q`on
ztjli3^`^KKPJkuN$x|vlKm5@!McewfsaF<9BwIFbw4L^`J4-WZzRK*hV}`t(p3%mR
z$<xI%KF@8^ca$tlzvgj1+wNTjY`L}R;^2h=9fYTI1#y52!<70Pp?{K`yg{H^;+T(~
zWiCINZokYX6eRplpReiPvk2t*0ZWlE1GwroZIP1n8t0jF`@Z>>h3OlGVJ3}{+iWE?
zJ%9(w8<|Vn3`r=Rm5IW&wJa|li<$N6PD<%I##Z=7y41W!tuwB6Bl3Z4sI&;MP6+YG
znv4F+!Z3v>y~Kdt*j|BFf3d!AEq8Qd7jt!A#TQN6ja{ZLnTU{Vk-(6bzc35Jq8>}J
zu&(humL0<vdX5=t70Y-@Gq!&4xmi{>u@&BIJ;!}M<!7Dtd@({}0r<7?Vd>zz5%NzF
z{{Ff0hVhMtLS%Be0wGU{P`jA3f3kqzWy*=+CD$3M#Q@*rO0gMIK0}j28{A6-=}Yd(
z<pYX<Z=cNLXXaxw)(#?Z7!RgM7hsp-#`1W4z0r5efdk1Y41sY8`MNerzX&h7U#Pml
zKKm;2q9I{VmnT$ET{o__QY$&=0237Mz!-}%Km;3IYzneWp5ThwS(}}~Aa5&!KKV)D
z!Ku?!7Chj_tK~hC@Iiq<9D{xN%(`A~whZth$#?5<_@e8?^b>bcl(G>NThj#KkRDky
zg#bM7HSy*UH1j7$3%HgAs2`B%iwts?o{_M>0?FlWt9GR9U(*%3-}Dl>Q$#hBAgary
zLn`$4n2PPT%7-@Fl3MDFcctBrmvfKMfn{(((Cui-)0Ea7z*{P@F-4a({;7ZC5J0<V
z0erymaDGk`i1?$=_7<m&FD;7#8$5%ekRv;q+6H<cV-KGsgTg>QgS+Q_P{VP~3zyma
zGXElXrKMdE+eaTxIv)IkI!tDp5WzQl4(OO<iAHL6bw}ddh1&!}qLkZ^2X)>D{2Q9W
z35tZ-w)>-10-ZmU+_<F}a*%Ynqq@bKqJ47PqQ~9Vz3k+?&Oxzy5F3fnJ`U$TgOMpD
zT!8overCGDXwo$khG^;0h7c9*5ySJ$Q#hQq5TaQ4jaRu+5TZPQOT9ngKOM&H3uyho
z`3GE8oh+oXf}lTMtG+>%aukTu737;<ABA8a)U)DRjy|{nozNEyRRx}bCNvh`?&s31
z?EF!+!MYsLu*ipw!40HYWNh)tZ52RzS!!Y1*Cill?>clazmAVsA#5|eCtU~%3~d`!
zL0HNKS7fLZIlRkW6oEnM^?jTR5CJU%!TH~Jlg}F~4dGGfzA@oJl+s@b$RbuaD#Y+I
zlivlUQXZ^L=RvQii(71|;}``w<ntvqG{im0x0+h(Jk5dlz%Fe*f*NXO^4j=;a7FLJ
z%jMG(!CdB);gdR$Wf2mXdm6tTH<f!6Md=<njqD;h%2Mfx;f@@RsAkS8aE~TpM>iBm
zN~9X#j87rWub*>SdM&)>Kk)&plJXbw#c8s`kpMWAf&#fDIshmXsFHdVWU_+fb+?zK
z-dz%y?Mxnxds1WT2Lx#A7Zg&?W#W8FSU)i?lSS`@ysQ@h{BSO!COpw%v4!voFER;~
zaX#WPqs1-&sMW=T#Nq9RXGsn8nfUy@^&ON06}eS+eJI1wLr&OL2}`sO^|oBz=_?BC
z6G2~HJ?bJ7S(KXGHqgFKU5M!C1ka3T26j|8#)W(K+|*fG3uAYqMFGGD;8~O)I(a4l
z{|NM&;axA#{1p7|@_3;mFn)c&tiRS~%<c^shRod6Lpy7OE%WS6=FW}ZM$Htkg!48j
zhwi-|Q`@b!Px2s1BXMw(r!>0LxUZR<&VqXp!XP)HlHY&CNl@C5&Azfeks%NHEXX~U
zpg0vZ*Sc>rgWQ7#f(Ua$LveW5gQ%km1nORYwkGKj9?ZppWQlwn%8wf{=R}A%K}ltt
z<v(_Uih~_3r|XUY_<Vk3u42;zg_*Avh&PKb(mxJ)Qj3G)Ly_v;nqUOq%NbjKMuNgf
zk5Qt#ZmJA)>>tAYmX}LJCdLso!mt{tO5irS+)zP7%NG<qS1qte1x8u|Y0B(H6_8yr
zHXP@zMBD8h{6od9aSMqRj<EKc?^>4&UB7<03BWVu)&0ncvUtk8nt0Q}ObpP(`f(9i
zY|=Ybo=lW3lBC^v2eum!c6DFdUYEBl8dM3qx{C#h0;>HfYL908_<qJD@(7=<=V-5!
zqsP<;B!4r(SOC6mj~}0Lad01ZN-mWBzUnAzRjY;B6qa6ggeCj=j^Yy+bMCJ}Y57t!
zLCZAfijMtb{R$AmNqYCTFdkD4#T(`hGv4KTXcryyN$J*!sGhpEJoQR%daW$}=oa`^
zZ@RWqJ%3oEO;O)kn3*d@5M!DyKSxlf%!80v_bp6qPY;Nt74CNUsVwkOuTg8W#0E9Y
zo_}v|G*`70KPSl@{5o=M8a~~55AlXV1AvO>!qyVXi`caOAwOk^5b`GTV%?XWz)prw
z)?Z7!EMfn5`3^Rtj#>R9G#=U7UAhE3q~~Enko;=r<3^ujK}rnV=r`(9K;l}hkm&(J
zT1?ZJZ5iSnwJXMsbiY7=G@XF*Dq&%>tdF{|b(SLU{mv=NwP#^FRzuI*pBLG+HC~G2
zqQ9**UFWY1zi(03u4A*n6I$|73hF-)zUh0JH(J12%eCl>X{G-r`$b+e-W8k*ajk2O
zf1l{uv3M40clLvDG5F+nh5(6cgBQZpsHENU%N-<u%&jmZ1|51%_a|i0@`0BB1mhWm
z1v>jo`ieJ%sG46a@Al>3Pv4;zR#{5Eo`sWuyso~t-jG=VMD(ALrA4o*guB+g{f@u6
z)dwoC9D)(}Fm*_Jk@{6&oEzh*YgIQolA`>D0Lx=x<_F|f+Q_X~L&MZMwUrHe1aH|D
zaga&E7jMyzWk{HXxFT#U4BC3+_|L!Ke3j_w$pz8Shzs0`-$PQO880m}Kf+)`?`#ly
zLu{9*(CA*qLB4wjoTZ^(<Y&WmhF)1j>3J(g8!*@V%}IeB*pUr6axx{$9g}x}1SXeg
zRUFL?w7;L|F@LusZHamnJj>y~ys=Daa^g4Ez|twVa-XvyVq&NY@sex%^uH_@Mt6iH
z7M?IZlI6K?<`^i&7Ov9$TMzp&g!umq&>byYOx7v}wb;;T#VbBh%wnXYGoqEu52Y9Q
zg00kE+sMNG9?=(XQzDEQu}Ak8+TW==XEV+*WklXrk+^ysr14|TTJam7S*tzSH*QZL
z#8<ylHuO(wdgZ%HLImefh<6_QqZViz##Hj(`4m?1XqS3C{!A{Ls+*<$4rxUr3mMc|
zh@r7On&p$6A*%Ym`NosCA@7TYIv-sHDr)C+eUVYtT6RbG%2W($#@5I~*Ql{=-P8Tw
zB(6|KEQ86J?MGJ&TGV7f((ys@hOqs#bAvuvVs>cSj*rdA2(rina}n<4@%)QI%!(?D
z+neqLNv{qCE^IEbr2{4f2>S?qyd}CMM>6j&HI6XeV9eqU(lwj6L9yB<YA*LuhV6J*
z8lp^vNE9){V(#h#R^_{GVN~IN6t7c~9Xu70YX3tetXylKMg(FKqrf>04)zW-I4hpD
zzg<1Z%nXRytUE6n-Zilh2)dY~ZQWlRY!)$S3gvX`=iq9v?aW-vk(sWSM6J-&#!MsO
zKX}|r89f@goD?m<#Ab`JY%gMNBVXvP_*~RH&w6NnG&m1ngT5->AQ@plD$J=4NyVZf
zvd*&~>@)@akI`ALbhy}HxK_f9Ai!8Dq3AvgS`ac_GV4TAhvP4g98b$D^UP(qH+AwS
z42O=m4u@c){?US@7X^OY_y0Yh!(nJ)IIVal^B9@^e9DCqOkgZ@m}MH#OZ%BG6!0Q#
z0}FNC$&Sav^k|Z$agVb%8+K^X`%ytr@ws1LM;Xp)(-V|KbMto&&iQgvqFgjEfA7b#
zF?m;g@uVpOTBM&B5qv~||L3fWf|e+d@vBC30E%=j1YK$YehO?w!BoJBxy@2yjMUUv
zxlO$^qZBpGX?3}O^1`FQt(+l|>|L!XoS2I&2EEtw)Z~739qetd`?J!FdsYG)#Pu7n
z;{^&b+lxlK8Wc{AANZ0@l=YQnrsa<IH2}6dkw`bxS54y%GR4RA3ZbptJzgWL#7^WL
z#6UH@hy2jH=4M7RPZID~Jp!Xm)ZNsM5iu7NB&v+J$5;jGJXyv8_vZYkpqOns<Ews%
z!)M}d2FlS#XW_cXnL?u9476lNOh5YU3=mXe(DW=d85!U8k!<glZLs72xdSiQohWP7
zQ&n54#tCYSCXF`z%$uJSJepW~3@`D9{0~5SgQU1)Ac+H_syLGWUR`mN04o&OluGJE
zq;oE9IZG}9F&jmm8Q0@~Iex1fPZF^M+m+DbkVbTwAluxZTn^Lu`S;^reH|t?<30M=
z*9^T-7*^H8>P@`LkM#M+1G7)#8~zYrmfrC@&QsC-NNK1VDOoddY&Sh|Ak+BmSO`98
z1rNvs1;)bkd}MT!4b3ev$E~uUF+kvo2~BjV6FbVa?zb_?Z`B7^hP?nJO7eu;52I|)
zX*`f3HiqN!xzc?;A&pqV?Om;+;Xf2J+wPmm1xWS{_To%gt!s4}(cQ`9!oQN|aH^J-
zZ+yZS%{@tuynTrfu_fLNc%cY+&C8*~OOaUx?)r&R9%p%_FWjI4TM_f9aQ;K9PRU#B
z=LI^bz>KEL|Cb^#quDFMkyZkz#l3lHz8o;Qw<#C4C&Rp@N7TQ%*&X1<j+1@2$~Jo8
zUX9aB8v}|M(u`MS4nH|Ua<nFGh5ouepqNofg-?s+ygfNX3)aEFCrt})<#~#J@wFXB
zHtk0R1)54)oa*+xCPZ|wYMepW;3{|?Idj3u$D%qy@n^e^6zOYnc^Hy;;+)%C$hCsf
zy{z640zo*C&K$XkI+AGE&a#Rw_;e+5O#bQRE0wbUd<;n3ix`hp#jOm`RsjASe0MI4
z-(QS&XCMG#n*N-!8RJ)86VFqlM<<(bG(or#AublCE{6oKRnKsRCDVw(ONj1m5y?;2
zx3*MKaXg1RneOJ@FK?-`bJGkk)nV`cS?OQQ39xd%2N{Ta1aHJjbLW>SD%8HN-+=St
zxRAEv@hIfk8n~~Y3k&fo_KN5!P_5e;#x;psP@V?-Ec#MqzonnXj6f2vnAw6syMTZ4
zbghu?+*QpUL4DWHw$z@a*OH%HYrj@m@>H~ZGn%@h3|0igkpAmW?VN@+&br5UYdB@Y
zvULjl2XVrQ!JPgVEGuoH=-s!d(wKArLZJ>oa0}Yr9r6R~I2}<0itHLt_+_{B9LE=e
zc+6Msp9~R&tfsaF^5AKav4FrGqv6V-)A`<SbfefyGt2<6wB%avE7QskYLGx7+QcIH
z#;_eEBmEi(;;ziWqY%Qou(%{MN8@@422oM1_-Z(>g{Bz!n3kW^5j)E=o{?51p1a0+
zvzhb!Nai_QPY|wm5(|E_mgg}`x*#BVJ}}P%_0?=WUyL7M>8;@hdPKr@Zz4(l$ZNWQ
z!Dg&n40=w;)SCuDeRRQxy%tgw=dE}D0rX%8f#t~;PTXrIci7L(c^w)%cc+r*OWe=3
zR8{&K0jb_zQIaz&=ov)j2ue{n#D{1)tmC|z^4JO6K?{W2W{H>oE+4U&-Aq1zBm+w{
zfwBMkhUR)MB#6*0Wd~}hANXQ?B+0bo1t+HpfafbQ{-%~gigu!q+G{d>qXiCch!`qQ
z@`^H+dn(!HC)L80llib?GYv{bqyDRMkRX}y{jGe%vrN2XQv0WeAjRs=pT(=er34mF
zA(vuj6{Rl=DgsblNu4Nzi%ms%fgq{hPijvqzLwYZ@RzM*OGGLzNA(iuf@IPYsGtI+
zg`dgcOE;sUdd()L`C^I>)^TJMsIMPIvA0moXDaDxoHLU*nuI<0E3#*POzm#d>r;KZ
z_3y4iKaW-<{1V&40ZHxtmwCPVPtjxt%fa<0%7D;Z6JU02E<)|gxfm!qq*&wXbrs3|
zEyIomYcPMujwTNO4Z$>%<=dQZw*Mt-z2$041veS@YTu8E*%$~3AN(pXvTnlQU?_@;
z+|WUEp3UI7vbh-DV#2B5Y`^NDe#gbejb8hU&#N`P<*TI?r8YbgtzLXBGNzWbT1)?o
zWPw1%j>SlW<o+G%uVYT2*eMbb)kLSip;HA!%2<DB?Iz+`fDYIdx#(UbiFKm`E~^#e
z$YBFrv4M8k=u%pvvHX{31)wL>n*<k?!<%Wruzz1a*=as*oh9kmSmmlNWcGodDv;O;
z?kS~0uTOu_s+Tvek~ut;B~jK_Fk!|`)x4x5OgTR63Y@tRc+iFI05YGUCrSi8t>P8C
zi20I}h2u*x4wG}P-fh>Nkx`1dmO46?nSy>_VgjdM+0eICW5{-FIQ0tMlYt&R`g&~c
zRrh|CZkhc6D(4*{5h80Oc!S9?Alu9<(;}I-+AFp~k_7CTZSasmcOVbZPq|;9_jN`<
zTA>}xKE*A8QjW0CZNF{IX9rJ&a3ZOiJtwp`z>tUPP*b05jcA3htcMW~o9_DVPIO87
z*z344YicoA<IC@U7@yyZbhNd>yhbO2TV5Hv-})x~;P}>SPPiQHkJ$QNkJ%$=uu9iu
z$iql8Lw$?liKYu8@^D2}br}v&I+N>&HxMBCY~iDYYe)}P_QWNPW#gmVe_hkrKq}`Q
ze3KuxgoHU7K&xex&2~L_()k@lbpX7yow@3Wibkucs!twp%0$Em55gmzec_63{D=mg
z0_aMQ>E!lRcfmPYRsVoh3;sl@dBxT`p$bs93Cv{^2-kH)jH(N+{_D*sMYkJ9wm8P4
z<tPuZ;}JNtg`K{Sc**6-lfVFX$Oq|5>!{Y=9g&Nx_eXxWuy@JwKeX@L)-utaz5L!W
z=(YDsgw|!~u&1I%H<XxUnL4hm$ZJuFxLvJd)ZNAp$~hs;2d36(!B|@VgAk``%&h9s
zkU8B<qA72{p_<KkSdh*}ckF#L=g~b#oX*3j(J(n?u1sC3i!+kcRHvd1;_z)^J>N^@
z^7b(ysf#j!KqSKj{gI0VsdSm3W9RYRzx?+y)($7iI8cYK!oMu$tb#V9i!Tn*hyd$$
z<Y8!V%@B}-D1ZIdq1;asURNQ&>;=p1<@D(a-Kp>Ut2ou4-||d5VdTDVMjEue?2}=T
zb6C2L&b)U771Hn<r|d$#+egsN+!x$k8oD8G-f~+iEM^kwug5%bU!4$Tlx4BbrQ1g?
z(VcQXJT4LqKLAJ{kz|zV4o`h%D=9A(A2O8xGOlzf5h?-2ID-S%&TOfsWZw5Qq@P-T
z%=duTJS)lsr03_vc-XYJyUAWVO^pAZ^EO;pa$im`u3QfLx%!S8lDt70GJd&gTN$W~
zeYxV1gCuXzK?46z^2P}_E7Rx?APY^cBIW}|Us*i1xt*Q`3XQ_k2M$_YUhU(sdFp#@
z=rV#C&yDXDQxT!NT$Csvc;d``3{T^j(sTVN(1xyA_WS_Ng66JKv5{e^bU&3#&1Uz$
zYgayLM%nk;+`T$qRZ&ZQ(g3Xvdp})<;{3R|P??y?^SAp_K?wh%EVE-6xxp;;5X`g}
znW%}!bx;+bP#uxg*~zxeAy2xj!t9}@K-AL)k9Hpk_k&U)DX1W#aFeq(w4C3=_~PJE
zE{J>~;t4<%eK)n0WSl{+J3w_dE>Zys&4iXR{~%Gs>+v+&3b2D@<g#T#{z`djBp%Yx
z9>r1#e@PM~yW#K(CM_a%ccVs(rpUEsG1KL$wKhwlV-&g*1G3FJUtD9#utE}R1^AG%
zL@d?DtXOjK80ph7n{Q~wTVuKkB)uz84^qVwg@_U7Gw~u;J#FDW)R66;0;y%cx`wZT
zP`i`%D~QB?b1|PmN0f8)pmZ_o5{nAVMp(AX$d31Z4osdGQ);SiR=oZpM6*Bu4ozyD
z4VQ@i98#RV$RG84a)Bxdtn)klF~rOL#aDOwrwu>t);OyMt-1yEDb*e<td7u8eP*nd
zU%CZuCYOdrE9@lXwq~UBWLruH^Ey?UzuOba1Ns8Z;!({4BS77Qu&?fU_RC-Yyrx+Y
z?zdI8ssPN*_9{3%Ra}aJxqT8MZzdAOii_k(hLx8~b|ZSn2WfbNo(xOmgp(^C5TyNb
z>!6yJJ>w^MR#0J;_Zl|}Z!J|D(1v{VTkX+)Xa#UiZ>00=R9<^XR-E-gKBkF?h0!-k
z8xOlx3m-SU#Q#3Yug?Bpo<Iz<Y959;WN@M!wdi(!E(NX4SCV;aAdDNyq$H}T!VxDy
z)FCHFSOj~c$D@26bvyjs^TXC;eUj;+n}@OV(0v#o7!|*sTf0=fO&f%>Y!kXC$rK$G
zufUW1lNKUt7uIQ3G|bsre4V-BHSzWG`|~mhjA$w@;!Je>$?mtShfowS1z4ik-elwv
zz|{V^%|GjVr<H)ICE+mN=eGO#m$C=>0>ae}SInk+2K)0GP4Q}*!&Ee$&22bPd7RAS
z;Zpbi`0};|_b050^o0{Tm`n&nz&LAz?n&JL>Rr<cAVsFrd4P}7W2_m+6z}i@+56|A
zRs6fNVA4Yux!qg2p<JE!-wqR`V3n3{l?#u>i*1O*cG1&j3yF^$6nB>j^Ul|GrD=uN
zUEVJIiFVx@9T4685%Dryu?P|SzBa}JOY#G=Po~Z)Vk$5J_Xxk0Ro!xS3sZD<zJs<D
znu9t}{$BYXVH4LbILmwOBc9pH_Yi^PSU&KH7F!CfW8wB~U&29wa3Ises3T3%M>|DY
zzwg3kg6$)f8(UWRVx?6@RUO;PZ;POePOnQI0KU&eGvWLr&3|sr1^Y1?=#n=B&xua{
z+8ltbpv86u7st#BF5bX+o$Wq`n=NYC+&)qfYXlOZZLY7sF1FYc^}g&Wa+nNgl8aO^
zd8kF(yF;)&z$SZoy9U34w+z<;68t4?m<35*Y79Nbycd>LyQ?*JgyQ50el*TKq)~w=
zUFE;NzYuu;xZr0v!op|s7#zbNAO-(qo+NDt1QL};+;{?Olrl7LKH&b+VV3hfIAR!S
zM`a(c)4~ON8d~fp+6!CN3t;9de~YAomT>}wmHS*O49m`s1;^Pxr*l100W{q!B7+05
zv4wGobpTfjk0qR^OIiaJF$WfGbi{SCv~%ayxF_TxG7d+MjlzaFY1;?8S}Uf+Ee?W8
zCnQ`Fj58@0X<<KmnH#o{wwe$XPpNbhv>&DqyIOy*F&AacqYX+rcU+-6G}(5HKI&Y!
z<k2|?(FhaH@^(sGs;bn#gn&ysKY~h$Tl>%Td~v2Ob(rb^nMd;z?#2*huYHf4!X$Do
zaQePVS?6ach7&nbwkzlO(kRmMkR{)Cdb1RPF;7kF+B}Q}e*e662G)OmZhpr98HfLj
j1G1R^U(Ac~4RqzfE3Y^k?5mNZ%?%AM{FJL_d-J~l7t6WY


From aca13a5a72e797ffb6cbc36e039bb3ffb953d92e Mon Sep 17 00:00:00 2001
From: Gabs Ferreira <developer.gabriel@gmail.com>
Date: Tue, 14 Jan 2025 16:53:37 -0300
Subject: [PATCH 0968/1140] Adding new blue logo

---
 .../v3-migration-docs/public/meteor-blue.png  | Bin 35136 -> 15545 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/v3-docs/v3-migration-docs/public/meteor-blue.png b/v3-docs/v3-migration-docs/public/meteor-blue.png
index c91f7a97180b3f929fca9cd521ea7ce6bd0f9f97..0934189a3eb6a2b7daba9f3bdf975d48f23816f2 100644
GIT binary patch
literal 15545
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

literal 35136
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


From 552de61b0098f9c1940adb2528f49deddcdb953d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 15 Jan 2025 12:24:49 +0100
Subject: [PATCH 0969/1140] bump version to regenerate dev_bundle and include
 latest tool windows changes

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 6804daede5..066e44b62e 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.13.0.0
+BUNDLE_VERSION=22.13.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled

From 4b9f317e3c1df702d4a2c2b334690e1e936784c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 15 Jan 2025 12:24:49 +0100
Subject: [PATCH 0970/1140] bump version to regenerate dev_bundle and include
 latest tool windows changes

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 6804daede5..066e44b62e 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.13.0.0
+BUNDLE_VERSION=22.13.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled

From 1d406b1ed19c84f491a72e79d925e320b3f2205c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 15 Jan 2025 12:30:34 +0100
Subject: [PATCH 0971/1140] re-run checks


From a03b2d22ad0606820b5b62322b57d81b772a70ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 15 Jan 2025 13:32:50 +0100
Subject: [PATCH 0972/1140] re-run checks


From 584867ec84e6a698c6588c1230a360f86db7274d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 15 Jan 2025 14:06:15 +0100
Subject: [PATCH 0973/1140] Meteor version to 3.1.1 :comet:

---
 packages/accounts-base/package.js                  |  2 +-
 packages/accounts-oauth/package.js                 |  2 +-
 packages/accounts-passwordless/package.js          |  2 +-
 packages/allow-deny/package.js                     |  2 +-
 packages/babel-compiler/package.js                 |  2 +-
 packages/ddp-client/package.js                     |  2 +-
 packages/ddp-server/package.js                     |  2 +-
 packages/facebook-oauth/package.js                 |  2 +-
 packages/meteor-tool/package.js                    |  2 +-
 packages/meteor/package.js                         |  2 +-
 packages/mongo/package.js                          |  2 +-
 packages/npm-mongo/package.js                      |  2 +-
 packages/oauth/package.js                          |  2 +-
 packages/roles/package.js                          |  2 +-
 packages/socket-stream-client/package.js           |  2 +-
 scripts/admin/meteor-release-official.json         |  2 +-
 .../docs/generators/changelog/versions/3.1.1.md    |  5 ++---
 v3-docs/docs/history.md                            | 14 ++++++++++----
 18 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index ea90ebfbad..d9a2fd72ee 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.0.4-beta311.2",
+  version: "3.0.4",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index 4645ca604c..890762bd9b 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: '1.4.6-beta311.2',
+  version: '1.4.6',
 });
 
 Package.onUse(api => {
diff --git a/packages/accounts-passwordless/package.js b/packages/accounts-passwordless/package.js
index 902897a01d..c9da46ee47 100644
--- a/packages/accounts-passwordless/package.js
+++ b/packages/accounts-passwordless/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'No-password login/sign-up support for accounts',
-  version: '3.0.0',
+  version: '3.0.1',
 });
 
 Package.onUse(api => {
diff --git a/packages/allow-deny/package.js b/packages/allow-deny/package.js
index 14b93deb0d..c4dc9d3e78 100644
--- a/packages/allow-deny/package.js
+++ b/packages/allow-deny/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'allow-deny',
-  version: '2.1.0-beta311.2',
+  version: '2.1.0',
   // Brief, one-line summary of the package.
   summary: 'Implements functionality for allow/deny and client-side db operations',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 3bc19c8e63..03822c789b 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.11.3-beta311.2',
+  version: '7.11.3',
 });
 
 Npm.depends({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index e359f37b44..1b0e48c929 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: "3.1.0-beta311.2",
+  version: "3.1.0",
   documentation: null,
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 5af96707b3..e081ffa73d 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: "3.1.0-beta311.2",
+  version: "3.1.0",
   documentation: null,
 });
 
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 560be83c66..1b1bf9f4e7 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: '1.11.5-beta311.2',
+  version: '1.11.5',
 });
 
 Package.onUse(api => {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 4435e5e270..7ca44c0182 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.1-beta.2",
+  version: "3.1.1",
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 4d1f02c601..a9ee2425dc 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '2.1.0-beta311.2',
+  version: '2.1.0',
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index cdd1c8054a..5727c2e01c 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.0-beta311.2",
+  version: "2.1.0",
 });
 
 Npm.depends({
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index f2fd624a1e..8b45db0032 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "6.10.2-beta311.2",
+  version: "6.10.2",
   documentation: null,
 });
 
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 0aef862f3d..410a7c2b54 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: '3.0.1-beta311.2',
+  version: '3.0.1',
 });
 
 Package.onUse(api => {
diff --git a/packages/roles/package.js b/packages/roles/package.js
index 36d5b1b8d9..dbcc7ac855 100644
--- a/packages/roles/package.js
+++ b/packages/roles/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Authorization package for Meteor",
-  version: "1.0.1-beta311.2",
+  version: "1.0.1",
   name: "roles",
   documentation: null,
 });
diff --git a/packages/socket-stream-client/package.js b/packages/socket-stream-client/package.js
index 1784571292..b67eafc1f9 100644
--- a/packages/socket-stream-client/package.js
+++ b/packages/socket-stream-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "socket-stream-client",
-  version: '0.6.0-beta311.2',
+  version: '0.6.0',
   summary: "Provides the ClientStream abstraction used by ddp-client",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 504225e62c..21a3b156ca 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1",
+  "version": "3.1.1",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"
diff --git a/v3-docs/docs/generators/changelog/versions/3.1.1.md b/v3-docs/docs/generators/changelog/versions/3.1.1.md
index 97f4080f81..23747a2334 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.1.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.1.md
@@ -10,7 +10,6 @@
 - OAuth Fixes: Resolved issues with cancel popup event and callback.
 - Windows Fixes: Fixed issues with running from folders with spaces and post-npm install build errors on Windows.
 - Security Updates: Upgraded json5 and semver from babel compiler.
-- [...]
 
 #### Breaking Changes
 
@@ -26,7 +25,7 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.1.1-beta.2
+meteor update --release 3.1.1
 
 ```
 
@@ -34,6 +33,7 @@ meteor update --release 3.1.1-beta.2
 
 - accounts-base@3.0.4
 - accounts-oauth@1.4.6
+- accounts-passwordless@3.0.1
 - allow-deny@2.1.0
 - babel-compiler@7.11.3
 - ddp-client@3.1.0
@@ -47,7 +47,6 @@ meteor update --release 3.1.1-beta.2
 - oauth@3.0.1
 - roles@@1.0.1
 - socket-stream-client@0.6.0
-- [...]
 
 #### Bumped NPM Packages
 
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 815c8cc894..c600565f52 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -12,17 +12,18 @@ This is a complete history of changes for Meteor releases.
 
 
 
-## v3.1.1, /date/
+## v3.1.1, 2025-01-15
 
 ### Highlights
 
+- Node upgrade: v22.13.0
 - Real-time Performance Boost: Refactored AsynchronousQueue for parallel processing and optimized MongoDB observers for faster initial document handling.
 - Allow/Deny Rules Update: Deprecated async rules and updated documentation and types.
 - Mongo Driver Downgrade: Reverted to a stable version to prevent issues in Meteor.
 - Support for Meteor.deprecate: Added deprecation warnings with stack trace for outdated code usage.
 - OAuth Fixes: Resolved issues with cancel popup event and callback.
+- Windows Fixes: Fixed issues with running from folders with spaces and post-npm install build errors on Windows.
 - Security Updates: Upgraded json5 and semver from babel compiler.
-- [...]
 
 #### Breaking Changes
 
@@ -38,7 +39,7 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.1.1-beta.2
+meteor update --release 3.1.1
 
 ```
 
@@ -46,6 +47,7 @@ meteor update --release 3.1.1-beta.2
 
 - accounts-base@3.0.4
 - accounts-oauth@1.4.6
+- accounts-passwordless@3.0.1
 - allow-deny@2.1.0
 - babel-compiler@7.11.3
 - ddp-client@3.1.0
@@ -59,7 +61,6 @@ meteor update --release 3.1.1-beta.2
 - oauth@3.0.1
 - roles@@1.0.1
 - socket-stream-client@0.6.0
-- [...]
 
 #### Bumped NPM Packages
 
@@ -73,6 +74,11 @@ N/A
 - [@nachocodoner](https://github.com/nachocodoner)
 - [@Grubba27](https://github.com/Grubba27)
 - [@9Morello](https://github.com/9Morello)
+- [@perbergland](https://github.com/perbergland)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+- [@MrSpark2591](https://github.com/MrSpark2591)
+- [@jstarpl](https://github.com/jstarpl)
+- [@minhna](https://github.com/minhna)
 
 ✨✨✨
 ## v3.1.0, 2024-11-20

From 4092f503693113ca2c63ab75d31efba737d1df2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 15 Jan 2025 16:24:09 +0100
Subject: [PATCH 0974/1140] update meteor-installer to use latest 3.1.1

---
 npm-packages/meteor-installer/config.js    | 2 +-
 npm-packages/meteor-installer/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js
index 59915c2a56..fa0e73ef14 100644
--- a/npm-packages/meteor-installer/config.js
+++ b/npm-packages/meteor-installer/config.js
@@ -1,7 +1,7 @@
 const os = require('os');
 const path = require('path');
 
-const METEOR_LATEST_VERSION = '3.1';
+const METEOR_LATEST_VERSION = '3.1.1';
 const sudoUser = process.env.SUDO_USER || '';
 function isRoot() {
   return process.getuid && process.getuid() === 0;
diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json
index a20d4735a0..1cc7402b05 100644
--- a/npm-packages/meteor-installer/package.json
+++ b/npm-packages/meteor-installer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Install Meteor",
   "main": "install.js",
   "scripts": {

From 422694eebccd9e0f02d5a6f81c80e929e180ae1e Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <70247653+Grubba27@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:47:35 -0300
Subject: [PATCH 0975/1140] Update 3.1.1.md

Add date to changelog
---
 v3-docs/docs/generators/changelog/versions/3.1.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.1.md b/v3-docs/docs/generators/changelog/versions/3.1.1.md
index 23747a2334..830b59fd96 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.1.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.1.md
@@ -1,4 +1,4 @@
-## v3.1.1, /date/
+## v3.1.1, 2025-01-15
 
 ### Highlights
 

From adcadb062546cd8889649ce97d74c7f3238cabc2 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <hello@jandvorak.me>
Date: Thu, 16 Jan 2025 09:33:27 +0100
Subject: [PATCH 0976/1140] Update SECURITY.md for Meteor 3

Update security for Meteor 3 and downgrade Meteor 2 for only major security issues.
---
 SECURITY.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 278969b992..6f7cd97a4d 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,7 +4,8 @@
 
 | Version | Support Status
 | ------- | --------------
-| 2.x.y   | ✅  all security issues
+| 3.x.y   | ✅  all security issues
+| 2.x.y   | ⚠️  only major security issues
 | <= 1.12.x   | ❌  no longer supported
 
 ## Reporting a Vulnerability

From c79de8aec6187617688dba65369f89dffc0f00d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 16 Jan 2025 13:19:47 +0100
Subject: [PATCH 0977/1140] add missing devs who reported issues that were
 fixed on 3.1.1

---
 v3-docs/docs/generators/changelog/versions/3.1.1.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.1.md b/v3-docs/docs/generators/changelog/versions/3.1.1.md
index 23747a2334..f5c891668e 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.1.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.1.md
@@ -65,5 +65,7 @@ N/A
 - [@MrSpark2591](https://github.com/MrSpark2591)
 - [@jstarpl](https://github.com/jstarpl)
 - [@minhna](https://github.com/minhna)
+- [@svolkomorov](https://github.com/svolkomorov)
+- [@quyetdgroup](https://github.com/quyetdgroup)
 
 ✨✨✨

From 647c8ac522e2921ab8b32dfcc3d8e6faa4e6ae42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 16 Jan 2025 13:20:12 +0100
Subject: [PATCH 0978/1140] add missing devs who reported issues that were
 fixed on 3.1.1

---
 v3-docs/docs/history.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index c600565f52..90c3e20603 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -79,6 +79,8 @@ N/A
 - [@MrSpark2591](https://github.com/MrSpark2591)
 - [@jstarpl](https://github.com/jstarpl)
 - [@minhna](https://github.com/minhna)
+- [@svolkomorov](https://github.com/svolkomorov)
+- [@quyetdgroup](https://github.com/quyetdgroup)
 
 ✨✨✨
 ## v3.1.0, 2024-11-20

From 9f0bef76c3a338002b3578c265751cee643abb41 Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 17 Jan 2025 18:13:39 +0100
Subject: [PATCH 0979/1140] Update accounts-password to use argon2 instead of
 bcrypt

Users that have a bcrypt password stored get progressively migrated to argon2 when their password is checked by `checkPasswordAsync`
---
 packages/accounts-base/accounts-base.d.ts     |   8 +-
 packages/accounts-base/accounts_common.js     |   8 +-
 packages/accounts-password/package.js         |   1 +
 packages/accounts-password/password_server.js | 248 ++++++++++++------
 packages/accounts-password/password_tests.js  |  50 ++--
 v3-docs/docs/api/accounts.md                  |   2 +-
 6 files changed, 210 insertions(+), 107 deletions(-)

diff --git a/packages/accounts-base/accounts-base.d.ts b/packages/accounts-base/accounts-base.d.ts
index 0ab68de576..7dacf0e4a9 100644
--- a/packages/accounts-base/accounts-base.d.ts
+++ b/packages/accounts-base/accounts-base.d.ts
@@ -81,7 +81,7 @@ export namespace Accounts {
     passwordEnrollTokenExpiration?: number | undefined;
     passwordEnrollTokenExpirationInDays?: number | undefined;
     ambiguousErrorMessages?: boolean | undefined;
-    bcryptRounds?: number | undefined;
+    argon2Iterations?: number | undefined;
     defaultFieldSelector?: { [key: string]: 0 | 1 } | undefined;
     collection?: string | undefined;
     loginTokenExpirationHours?: number | undefined;
@@ -353,10 +353,10 @@ export namespace Accounts {
 
   /**
    *
-   * Check whether the provided password matches the bcrypt'ed password in
+   * Check whether the provided password matches the argon2'ed password in
    * the database user record. `password` can be a string (in which case
-   * it will be run through SHA256 before bcrypt) or an object with
-   * properties `digest` and `algorithm` (in which case we bcrypt
+   * it will be run through SHA256 before argon2) or an object with
+   * properties `digest` and `algorithm` (in which case we argon2
    * `password.digest`).
    */
   function _checkPasswordAsync(
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 210fc004c7..f641a7607e 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -13,7 +13,7 @@ const VALID_CONFIG_KEYS = [
   'passwordEnrollTokenExpirationInDays',
   'passwordEnrollTokenExpiration',
   'ambiguousErrorMessages',
-  'bcryptRounds',
+  'argon2Iterations',
   'defaultFieldSelector',
   'collection',
   'loginTokenExpirationHours',
@@ -226,8 +226,8 @@ export class AccountsCommon {
   // - ambiguousErrorMessages {Boolean}
   //     Return ambiguous error messages from login failures to prevent
   //     user enumeration.
-  // - bcryptRounds {Number}
-  //     Allows override of number of bcrypt rounds (aka work factor) used
+  // - argon2Iterations {Number}
+  //     Allows override of number of argon2 iterations (aka time cost) used
   //     to store passwords.
 
   /**
@@ -245,7 +245,7 @@ export class AccountsCommon {
    * @param {Number} options.passwordEnrollTokenExpirationInDays The number of days from when a link to set initial password is sent until token expires and user can't set password with the link anymore. Defaults to 30.
    * @param {Number} options.passwordEnrollTokenExpiration The number of milliseconds from when a link to set initial password is sent until token expires and user can't set password with the link anymore. If `passwordEnrollTokenExpirationInDays` is set, it takes precedent.
    * @param {Boolean} options.ambiguousErrorMessages Return ambiguous error messages from login failures to prevent user enumeration. Defaults to `true`.
-   * @param {Number} options.bcryptRounds Allows override of number of bcrypt rounds (aka work factor) used to store passwords. The default is 10.
+   * @param {Number} options.argon2Iterations Allows override of number of argon2 iterations (aka time cost) used to store passwords. The default is 3.
    * @param {MongoFieldSpecifier} options.defaultFieldSelector To exclude by default large custom fields from `Meteor.user()` and `Meteor.findUserBy...()` functions when called without a field selector, and all `onLogin`, `onLoginFailure` and `onLogout` callbacks.  Example: `Accounts.config({ defaultFieldSelector: { myBigArray: 0 }})`. Beware when using this. If, for instance, you do not include `email` when excluding the fields, you can have problems with functions like `forgotPassword` that will break because they won't have the required data available. It's recommend that you always keep the fields `_id`, `username`, and `email`.
    * @param {String|Mongo.Collection} options.collection A collection name or a Mongo.Collection object to hold the users.
    * @param {Number} options.loginTokenExpirationHours When using the package `accounts-2fa`, use this to set the amount of time a token sent is valid. As it's just a number, you can use, for example, 0.5 to make the token valid for just half hour. The default is 1 hour.
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index b86e57dff1..ca8a7b5651 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -10,6 +10,7 @@ Package.describe({
 
 Npm.depends({
   bcrypt: "5.0.1",
+  argon2: "0.41.1",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 5e15f66fcb..f97a115fb7 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -1,4 +1,5 @@
-import { hash as bcryptHash, compare as bcryptCompare } from 'bcrypt';
+import argon2 from "argon2";
+import { compare as bcryptCompare } from "bcrypt";
 import { Accounts } from "meteor/accounts-base";
 
 // Utility for grabbing user
@@ -6,8 +7,9 @@ const getUserById =
   async (id, options) =>
     await Meteor.users.findOneAsync(id, Accounts._addDefaultFieldSelector(options));
 
-// User records have a 'services.password.bcrypt' field on them to hold
-// their hashed passwords.
+// User records have two fields that are used for password-based login:
+// - 'services.password.bcrypt', which stores the bcrypt password, which is now deprecated
+// - 'services.password.argon2', which stores the argon2 password
 //
 // When the client sends a password to the server, it can either be a
 // string (the plaintext password) or an object with keys 'digest' and
@@ -17,18 +19,25 @@ const getUserById =
 // strings.
 //
 // When the server receives a plaintext password as a string, it always
-// hashes it with SHA256 before passing it into bcrypt. When the server
+// hashes it with SHA256 before passing it into argon2. When the server
 // receives a password as an object, it asserts that the algorithm is
-// "sha-256" and then passes the digest to bcrypt.
+// "sha-256" and then passes the digest to argon2.
 
+Accounts._argon2Iterations = () => Accounts._options.argon2Iterations || 3;
 
-Accounts._bcryptRounds = () => Accounts._options.bcryptRounds || 10;
-
-// Given a 'password' from the client, extract the string that we should
-// bcrypt. 'password' can be one of:
-//  - String (the plaintext password)
-//  - Object with 'digest' and 'algorithm' keys. 'algorithm' must be "sha-256".
-//
+/**
+ * Extracts the string to be encrypted using Argon2 from the given `password`.
+ *
+ * @param {string|Object} password - The password provided by the client. It can be:
+ *  - A plaintext string password.
+ *  - An object with the following properties:
+ *      @property {string} digest - The hashed password.
+ *      @property {string} algorithm - The hashing algorithm used. Must be "sha-256".
+ *
+ * @returns {string} - The resulting password string to encrypt.
+ *
+ * @throws {Error} - If the `algorithm` in the password object is not "sha-256".
+ */
 const getPasswordString = password => {
   if (typeof password === "string") {
     password = SHA256(password);
@@ -42,65 +51,137 @@ const getPasswordString = password => {
   return password;
 };
 
-// Use bcrypt to hash the password for storage in the database.
+// Use argon2 to hash the password for storage in the database.
 // `password` can be a string (in which case it will be run through
-// SHA256 before bcrypt) or an object with properties `digest` and
-// `algorithm` (in which case we bcrypt `password.digest`).
+// SHA256 before argon2) or an object with properties `digest` and
+// `algorithm` (in which case we argon2 `password.digest`).
 //
 const hashPassword = async password => {
   password = getPasswordString(password);
-  return await bcryptHash(password, Accounts._bcryptRounds());
+  return await argon2.hash(password, {
+    timeCost: Accounts._argon2Iterations(),
+    type: argon2.argon2id
+  });
 };
 
-// Extract the number of rounds used in the specified bcrypt hash.
-const getRoundsFromBcryptHash = hash => {
-  let rounds;
-  if (hash) {
-    const hashSegments = hash.split('$');
-    if (hashSegments.length > 2) {
-      rounds = parseInt(hashSegments[2], 10);
+/**
+ * Extract the number of iterations used in the specified argon2 hash
+ * @param hash String
+ * @returns {null|number}
+ */
+const getIterationsFromArgon2Hash = function(hash) {
+  const parts = hash?.split("$") || [];
+  if (parts.length < 4 || !parts[1].startsWith("argon2")) {
+    throw new Error("Invalid Argon2 hash format");
+  }
+
+  const params = parts[3].split(",");
+  let iterations = null;
+
+  for (const param of params) {
+    if (param.startsWith("t=")) {
+      iterations = parseInt(param.split("=")[1], 10);
+      break;
     }
   }
-  return rounds;
+
+  if (iterations === null) {
+    throw new Error("Iterations parameter not found in the hash");
+  }
+
+  return iterations;
+};
+Accounts._getIterationsFromArgon2Hash = getIterationsFromArgon2Hash;
+
+const getUserPasswordHash = user => {
+  return user.services?.password?.argon2 || user.services?.password?.bcrypt;
 };
 
-// Check whether the provided password matches the bcrypt'ed password in
-// the database user record. `password` can be a string (in which case
-// it will be run through SHA256 before bcrypt) or an object with
-// properties `digest` and `algorithm` (in which case we bcrypt
-// `password.digest`).
-//
-// The user parameter needs at least user._id and user.services
-Accounts._checkPasswordUserFields = {_id: 1, services: 1};
-//
+Accounts._checkPasswordUserFields = { _id: 1, services: 1 };
+
+/**
+ * Checks whether the provided password matches the hashed password stored in the user's database record.
+ *
+ * @param {Object} user - The user object containing at least:
+ *   @property {string} _id - The user's unique identifier.
+ *   @property {Object} services - The user's services data.
+ *   @property {Object} services.password - The user's password object.
+ *   @property {string} [services.password.argon2] - The Argon2 hashed password.
+ *   @property {string} [services.password.bcrypt] - The bcrypt hashed password, deprecated
+ *
+ * @param {string|Object} password - The password provided by the client. It can be:
+ *   - A plaintext string password.
+ *   - An object with the following properties:
+ *       @property {string} digest - The hashed password.
+ *       @property {string} algorithm - The hashing algorithm used. Must be "sha-256".
+ *
+ * @returns {Promise<Object>} - A result object with the following properties:
+ *   @property {string} userId - The user's unique identifier.
+ *   @property {Object} [error] - An error object if the password does not match or an error occurs.
+ *
+ * @throws {Error} - If an unexpected error occurs during the process.
+ */
 const checkPasswordAsync = async (user, password) => {
   const result = {
     userId: user._id
   };
 
   const formattedPassword = getPasswordString(password);
-  const hash = user.services.password.bcrypt;
-  const hashRounds = getRoundsFromBcryptHash(hash);
+  const hash = getUserPasswordHash(user);
 
-  if (! await bcryptCompare(formattedPassword, hash)) {
-    result.error = Accounts._handleError("Incorrect password", false);
-  } else if (hash && Accounts._bcryptRounds() != hashRounds) {
-    // The password checks out, but the user's bcrypt hash needs to be updated.
-
-    Meteor.defer(async () => {
-      await Meteor.users.updateAsync({ _id: user._id }, {
-        $set: {
-          'services.password.bcrypt':
-            await bcryptHash(formattedPassword, Accounts._bcryptRounds())
-        }
+  // bcrypt hashes start with $2a$ or $2b$
+  // argon2 hashes start with $argon2i$, $argon2d$ or $argon2id$
+  if (hash.startsWith("$2")) {
+    // migration code from bcrypt to argon2
+    const match = await bcryptCompare(formattedPassword, hash);
+    if (!match) {
+      result.error = Accounts._handleError("Incorrect password", false);
+    }
+    else {
+      // The password checks out, but the user's stored password needs to be updated to argon2
+      Meteor.defer(async () => {
+        await Meteor.users.updateAsync(
+          { _id: user._id },
+          {
+            $set: {
+              "services.password.argon2":
+                await hashPassword(password)
+            },
+            $unset: {
+              "services.password.bcrypt": 1
+            }
+          }
+        );
       });
-    });
+    }
+  }
+  else {
+    // argon2 password
+    const argon2Iterations = getIterationsFromArgon2Hash(hash);
+
+    if (!(await argon2.verify(hash, formattedPassword))) {
+      result.error = Accounts._handleError("Incorrect password", false);
+    }
+    else if (hash && Accounts._argon2Iterations() !== argon2Iterations) {
+      // The password checks out, but the user's argon2 hash needs to be updated with the right number of iterations
+      Meteor.defer(async () => {
+        await Meteor.users.updateAsync(
+          { _id: user._id },
+          {
+            $set: {
+              "services.password.argon2":
+                await hashPassword(formattedPassword)
+            }
+          }
+        );
+      });
+    }
   }
 
   return result;
 };
 
-Accounts._checkPasswordAsync =  checkPasswordAsync;
+Accounts._checkPasswordAsync = checkPasswordAsync;
 
 ///
 /// LOGIN
@@ -185,9 +266,7 @@ Accounts.registerLoginHandler("password", async options => {
     Accounts._handleError("User not found");
   }
 
-
-  if (!user.services || !user.services.password ||
-      !user.services.password.bcrypt) {
+  if (!getUserPasswordHash(user)) {
     Accounts._handleError("User has no password set");
   }
 
@@ -283,7 +362,7 @@ Meteor.methods(
     Accounts._handleError("User not found");
   }
 
-  if (!user.services || !user.services.password || !user.services.password.bcrypt) {
+  if (!getUserPasswordHash(user)) {
     Accounts._handleError("User has no password set");
   }
 
@@ -302,11 +381,14 @@ Meteor.methods(
   await Meteor.users.updateAsync(
     { _id: this.userId },
     {
-      $set: { 'services.password.bcrypt': hashed },
+      $set: { 'services.password.argon2': hashed },
       $pull: {
         'services.resume.loginTokens': { hashedToken: { $ne: currentToken } }
       },
-      $unset: { 'services.password.reset': 1 }
+      $unset: {
+        'services.password.reset': 1,
+        'services.password.bcrypt': 1
+      }
     }
   );
 
@@ -320,7 +402,7 @@ Meteor.methods(
  * @summary Forcibly change the password for a user.
  * @locus Server
  * @param {String} userId The id of the user to update.
- * @param {String} newPassword A new password for the user.
+ * @param {String} newPlaintextPassword A new password for the user.
  * @param {Object} [options]
  * @param {Object} options.logout Logout all current connections with this userId (default: true)
  * @importFromPackage accounts-base
@@ -339,9 +421,12 @@ Accounts.setPasswordAsync =
 
   const update = {
     $unset: {
-      'services.password.reset': 1
+      'services.password.reset': 1,
+      'services.password.bcrypt': 1
     },
-    $set: {'services.password.bcrypt': await hashPassword(newPlaintextPassword)}
+    $set: {
+      'services.password.argon2': await hashPassword(newPlaintextPassword)
+    }
   };
 
   if (options.logout) {
@@ -430,25 +515,32 @@ Accounts.generateResetToken =
   // if this method is called from the enroll account work-flow then
   // store the token record in 'services.password.enroll' db field
   // else store the token record in in 'services.password.reset' db field
-  if(reason === 'enrollAccount') {
-    await Meteor.users.updateAsync({_id: user._id}, {
-      $set : {
-        'services.password.enroll': tokenRecord
+  if (reason === "enrollAccount") {
+    await Meteor.users.updateAsync(
+      { _id: user._id },
+      {
+        $set: {
+          "services.password.enroll": tokenRecord
+        }
       }
-    });
+    );
     // before passing to template, update user object with new token
-     Meteor._ensure(user, 'services', 'password').enroll = tokenRecord;
-  } else {
-    await Meteor.users.updateAsync({_id: user._id}, {
-      $set : {
-        'services.password.reset': tokenRecord
+    Meteor._ensure(user, "services", "password").enroll = tokenRecord;
+  }
+  else {
+    await Meteor.users.updateAsync(
+      { _id: user._id },
+      {
+        $set: {
+          "services.password.reset": tokenRecord
+        }
       }
-    });
+    );
     // before passing to template, update user object with new token
-     Meteor._ensure(user, 'services', 'password').reset = tokenRecord;
+    Meteor._ensure(user, "services", "password").reset = tokenRecord;
   }
 
-  return {email, user, token};
+  return { email, user, token };
 };
 
 /**
@@ -669,10 +761,13 @@ Meteor.methods(
                   },
                   {
                     $set: {
-                      'services.password.bcrypt': hashed,
+                      'services.password.argon2': hashed,
                       'emails.$.verified': true
                     },
-                    $unset: { 'services.password.enroll': 1 }
+                    $unset: {
+                      'services.password.enroll': 1,
+                      'services.password.bcrypt': 1,
+                    }
                   });
               } else {
                 affectedRecords = await Meteor.users.updateAsync(
@@ -683,10 +778,13 @@ Meteor.methods(
                   },
                   {
                     $set: {
-                      'services.password.bcrypt': hashed,
+                      'services.password.argon2': hashed,
                       'emails.$.verified': true
                     },
-                    $unset: { 'services.password.reset': 1 }
+                    $unset: {
+                      'services.password.reset': 1,
+                      'services.password.bcrypt': 1,
+                    }
                   });
               }
               if (affectedRecords !== 1)
@@ -990,7 +1088,7 @@ const createUser =
     const user = { services: {} };
     if (password) {
       const hashed = await hashPassword(password);
-      user.services.password = { bcrypt: hashed };
+      user.services.password = { argon2: hashed };
     }
 
     return await Accounts._createUserCheckingDuplicates({ user, email, username, options });
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 63af757d2c..fdd466fe63 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1171,7 +1171,7 @@ if (Meteor.isServer) (() => {
       // set a new password.
       await Accounts.setPasswordAsync(userId, 'new password');
       user = await Meteor.users.findOneAsync(userId);
-      const oldSaltedHash = user.services.password.bcrypt;
+      const oldSaltedHash = user.services.password.argon2;
       test.isTrue(oldSaltedHash);
       // Send a reset password email (setting a reset token) and insert a login
       // token.
@@ -1184,7 +1184,7 @@ if (Meteor.isServer) (() => {
       // reset with the same password, see we get a different salted hash
       await Accounts.setPasswordAsync(userId, 'new password', { logout: false });
       user = await Meteor.users.findOneAsync(userId);
-      const newSaltedHash = user.services.password.bcrypt;
+      const newSaltedHash = user.services.password.argon2;
       test.isTrue(newSaltedHash);
       test.notEqual(oldSaltedHash, newSaltedHash);
       // No more reset token.
@@ -1196,7 +1196,7 @@ if (Meteor.isServer) (() => {
       // reset again, see that the login tokens are gone.
       await Accounts.setPasswordAsync(userId, 'new password');
       user = await Meteor.users.findOneAsync(userId);
-      const newerSaltedHash = user.services.password.bcrypt;
+      const newerSaltedHash = user.services.password.argon2;
       test.isTrue(newerSaltedHash);
       test.notEqual(oldSaltedHash, newerSaltedHash);
       test.notEqual(newSaltedHash, newerSaltedHash);
@@ -1822,28 +1822,32 @@ if (Meteor.isServer) (() => {
     ]);
   });
 
-  const getUserHashRounds = user =>
-    Number(user.services.password.bcrypt.substring(4, 6));
-  testAsyncMulti("passwords - allow custom bcrypt rounds",[
+  const getUserHashArgon2Iterations = function (user) {
+    const hash = user?.services?.password?.argon2;
+    return Accounts._getIterationsFromArgon2Hash(hash);
+  }
+
+  testAsyncMulti("passwords - allow custom argon2 iterations",[
     async function (test) {
-      // Verify that a bcrypt hash generated for a new account uses the
+      // Verify that a argon2 hash generated for a new account uses the
+      // default number of iterations.
       let username = Random.id();
       this.password = hashPassword('abc123');
       this.userId1 = await Accounts.createUser({ username, password: this.password });
       this.user1 =  await Meteor.users.findOneAsync(this.userId1);
-      let rounds = getUserHashRounds(this.user1);
-      test.equal(rounds, Accounts._bcryptRounds());
+      let rounds = getUserHashArgon2Iterations(this.user1);
+      test.equal(rounds, Accounts._argon2Iterations());
 
-      // When a custom number of bcrypt rounds is set via Accounts.config,
-      // and an account was already created using the default number of rounds,
+      // When a custom number of argon2 iterations is set via Accounts.config,
+      // and an account was already created using the default number of iterations,
       // make sure that a new hash is created (and stored) using the new number
-      // of rounds, the next time the password is checked.
-      this.customRounds = 11;
-      Accounts._options.bcryptRounds = this.customRounds;
+      // of iterations, the next time the password is checked.
+      this.customIterations = 4;
+      Accounts._options.argon2Iterations = this.customIterations;
       await Accounts._checkPasswordAsync(this.user1, this.password);
     },
     async function(test) {
-      const defaultRounds = Accounts._bcryptRounds();
+      const defaultRounds = Accounts._argon2Iterations();
       let rounds;
       let username;
 
@@ -1852,18 +1856,18 @@ if (Meteor.isServer) (() => {
 
       Meteor.setTimeout(async () => {
         this.user1 = await Meteor.users.findOneAsync(this.userId1);
-        rounds = getUserHashRounds(this.user1);
-        test.equal(rounds, this.customRounds);
-        // When a custom number of bcrypt rounds is set, make sure it's
-        // used for new bcrypt password hashes.
+        rounds = getUserHashArgon2Iterations(this.user1);
+        test.equal(rounds, this.customIterations);
+        // When a custom number of argon2 iterations is set, make sure it's
+        // used for new argon2 password hashes.
         username = Random.id();
         const userId2 = await Accounts.createUser({ username, password: this.password });
         const user2 = await Meteor.users.findOneAsync(userId2);
-        rounds = getUserHashRounds(user2);
-        test.equal(rounds, this.customRounds);
+        rounds = getUserHashArgon2Iterations(user2);
+        test.equal(rounds, this.customIterations);
 
         // Cleanup
-        Accounts._options.bcryptRounds = defaultRounds;
+        Accounts._options.argon2Iterations = defaultRounds;
         await Meteor.users.removeAsync(this.userId1);
         await Meteor.users.removeAsync(userId2);
         resolve();
@@ -1871,7 +1875,7 @@ if (Meteor.isServer) (() => {
 
       return promise;
     }
-  ]); // default number of rounds.
+  ]);
 
 
   Tinytest.addAsync('passwords - extra params in email urls',
diff --git a/v3-docs/docs/api/accounts.md b/v3-docs/docs/api/accounts.md
index 676909156f..1317b97653 100644
--- a/v3-docs/docs/api/accounts.md
+++ b/v3-docs/docs/api/accounts.md
@@ -773,7 +773,7 @@ sign-in process, it also supports email-based sign-in including
 address verification and password recovery emails.
 
 The Meteor server stores passwords using the
-[bcrypt](http://en.wikipedia.org/wiki/Bcrypt) algorithm. This helps
+[argon2](http://en.wikipedia.org/wiki/Argon2) algorithm. This helps
 protect against embarrassing password leaks if the server's database is
 compromised.
 

From ccaeffd2d3fdc651a74e2a4daa0d9c6a9dd0052c Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 17 Jan 2025 18:14:53 +0100
Subject: [PATCH 0980/1140] Accounts-passowrd: Adding a test case to ensure
 smooth migration from bcrypt to argon2

---
 packages/accounts-password/password_tests.js | 43 +++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index fdd466fe63..13896cf6ae 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1871,7 +1871,7 @@ if (Meteor.isServer) (() => {
         await Meteor.users.removeAsync(this.userId1);
         await Meteor.users.removeAsync(userId2);
         resolve();
-      }, 5000);
+      }, 1000);
 
       return promise;
     }
@@ -1928,4 +1928,45 @@ if (Meteor.isServer) (() => {
       });
     }, 'already exists');
   });
+
+  Tinytest.addAsync("passwords - migration from bcrypt encryption to argon2", async test => {
+    const username = Random.id();
+    const email = `${username}@bcrypt.com`;
+    const password = "password";
+    const bcryptPasswordHash = "$2b$10$XIz481R/8TTXqtl9igiPmeZexiLkhy7oTk4pfO/oN5ymQnS5mWilC";// = brcypt(sha256('password'))
+    const userId = await Meteor.users.insertAsync({
+      username,
+      emails: [{ address: email, verified: false }],
+      services: {
+        password: {
+          bcrypt: bcryptPasswordHash
+        }
+      }
+    });
+    let user = await Meteor.users.findOneAsync(userId);
+    const isValid = await Accounts._checkPasswordAsync(user, password);
+    test.equal(isValid.userId, userId, "checkPassword with bcrypt - User ID should be returned");
+    test.equal(typeof isValid.error, "undefined", "checkPassword with bcrypt - No error should be returned");
+
+
+    let resolve;
+    const promise = new Promise(res => resolve = res);
+
+    // wait for defered execution of user update inside _checkPasswordAsync
+    Meteor.setTimeout(async () => {
+      user = await Meteor.users.findOneAsync(userId);
+      // bcrypt has been unset and argon2 set
+      test.equal(typeof user.services.password.bcrypt, "undefined", "bcrypt should be unset");
+      test.equal(typeof user.services.password.argon2, "string", "argon2 should be set");
+      // password is still valid using argon2
+      const isValidArgon = await Accounts._checkPasswordAsync(user, password);
+      test.equal(isValidArgon.userId, userId, "checkPassword with argon2 - User ID should be returned");
+      test.equal(typeof isValidArgon.error, "undefined", "checkPassword with argon2 - No error should be returned");
+      resolve();
+    }, 1000);
+
+    return promise
+
+
+  });
 })();

From c9c8fbc6d373406f6aeee16888395d88416060ff Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 17 Jan 2025 18:17:25 +0100
Subject: [PATCH 0981/1140] account-password: bump version to 3.0.4

---
 packages/accounts-password/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index ca8a7b5651..14ef15ebe2 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.0.3",
+  version: "3.0.4",
 });
 
 Npm.depends({

From 30be82af6112721f8ad23070771fddc070512335 Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Mon, 20 Jan 2025 09:26:38 +0100
Subject: [PATCH 0982/1140] accounts-password: major version and more
 documentation about password encryption

---
 packages/accounts-password/package.js |  2 +-
 v3-docs/docs/api/accounts.md          | 35 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 14ef15ebe2..71d15a383f 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.0.4",
+  version: "4.0.0",
 });
 
 Npm.depends({
diff --git a/v3-docs/docs/api/accounts.md b/v3-docs/docs/api/accounts.md
index 1317b97653..c84a2777a8 100644
--- a/v3-docs/docs/api/accounts.md
+++ b/v3-docs/docs/api/accounts.md
@@ -777,6 +777,41 @@ The Meteor server stores passwords using the
 protect against embarrassing password leaks if the server's database is
 compromised.
 
+### Password encryption and security
+
+Passwords are hashed on the client using **SHA-256** algorithm before being sent to the server. This ensures that sensitive data is never transmitted in plain text. Once received by the server, the hashed value is further encrypted and securely stored in the `Meteor.users` collection.
+
+Starting from `accounts-passwords:4.0.0`, the encryption algorithm used is [Argon2](http://en.wikipedia.org/wiki/Argon2). This algorithm is specifically designed to resist GPU-based brute force attacks. Argon2 has replaced the previous [bcrypt](http://en.wikipedia.org/wiki/Bcrypt) algorithm as it's now regarded as a more robust option. For more details, see the [OWASP Password Storage Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html).
+
+**Migrating from `bcrypt` to `argon2`**
+
+The transition from `bcrypt` to `argon2` is handled seamlessly during user logins. When a user logs in, their password is first verified against the existing bcrypt hash. If successful, the password is re-encrypted using Argon2 and the new hash is stored in the database.
+
+**Configuring `argon2` parameters**
+
+The accounts-password package allows limited customization of the Argon2 algorithm's parameters. The configurable options include:
+
+- `timeCost` (default: 3) – This controls the computational cost of the hashing process, affecting both the security level and performance.
+
+To update the timeCost, use the following configuration:
+
+```js
+Accounts.config({
+    argon2Iterations: 4
+});
+```
+
+Other Argon2 parameters, such as `hashLength`, `memoryCost`, `parallelism`, and `type`, are set to default values:
+- `hashLength`: 32 bytes
+- `memoryCost`: 64 MB
+- `parallelism`: 4
+- `type`: Argon2id (provides a blend of resistance against GPU and side-channel attacks)
+
+For more information about Argon2's parameters, refer to the [argon2 options documentation](https://github.com/ranisalt/node-argon2/wiki/Options).
+
+
+### Using passwords
+
 To add password support to your application, run this command in your terminal:
 
 ```bash

From bd5b155633879507280f464a0b57f1a989a681df Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Mon, 20 Jan 2025 11:55:27 +0100
Subject: [PATCH 0983/1140] remove old comments (replaced by jsdoc)

---
 packages/accounts-base/accounts_common.js | 35 -----------------------
 1 file changed, 35 deletions(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index f641a7607e..1380302f58 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -194,41 +194,6 @@ export class AccountsCommon {
       ? this.users.findOneAsync(userId, this._addDefaultFieldSelector(options))
       : null;
   }
-  // Set up config for the accounts system. Call this on both the client
-  // and the server.
-  //
-  // Note that this method gets overridden on AccountsServer.prototype, but
-  // the overriding method calls the overridden method.
-  //
-  // XXX we should add some enforcement that this is called on both the
-  // client and the server. Otherwise, a user can
-  // 'forbidClientAccountCreation' only on the client and while it looks
-  // like their app is secure, the server will still accept createUser
-  // calls. https://github.com/meteor/meteor/issues/828
-  //
-  // @param options {Object} an object with fields:
-  // - sendVerificationEmail {Boolean}
-  //     Send email address verification emails to new users created from
-  //     client signups.
-  // - forbidClientAccountCreation {Boolean}
-  //     Do not allow clients to create accounts directly.
-  // - restrictCreationByEmailDomain {Function or String}
-  //     Require created users to have an email matching the function or
-  //     having the string as domain.
-  // - loginExpirationInDays {Number}
-  //     Number of days since login until a user is logged out (login token
-  //     expires).
-  // - collection {String|Mongo.Collection}
-  //     A collection name or a Mongo.Collection object to hold the users.
-  // - passwordResetTokenExpirationInDays {Number}
-  //     Number of days since password reset token creation until the
-  //     token can't be used any longer (password reset token expires).
-  // - ambiguousErrorMessages {Boolean}
-  //     Return ambiguous error messages from login failures to prevent
-  //     user enumeration.
-  // - argon2Iterations {Number}
-  //     Allows override of number of argon2 iterations (aka time cost) used
-  //     to store passwords.
 
   /**
    * @summary Set global accounts options. You can also set these in `Meteor.settings.packages.accounts` without the need to call this function.

From 78f16e4642614a0a137927ddb90ba8541dd4bd35 Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Mon, 20 Jan 2025 11:55:02 +0100
Subject: [PATCH 0984/1140] enable using other argon2 settings

---
 packages/accounts-base/accounts-base.d.ts     |  5 +-
 packages/accounts-base/accounts_common.js     | 10 +-
 packages/accounts-password/password_server.js | 91 +++++++++++--------
 v3-docs/docs/api/accounts.md                  | 20 ++--
 4 files changed, 76 insertions(+), 50 deletions(-)

diff --git a/packages/accounts-base/accounts-base.d.ts b/packages/accounts-base/accounts-base.d.ts
index 7dacf0e4a9..0c44cc7657 100644
--- a/packages/accounts-base/accounts-base.d.ts
+++ b/packages/accounts-base/accounts-base.d.ts
@@ -81,7 +81,10 @@ export namespace Accounts {
     passwordEnrollTokenExpiration?: number | undefined;
     passwordEnrollTokenExpirationInDays?: number | undefined;
     ambiguousErrorMessages?: boolean | undefined;
-    argon2Iterations?: number | undefined;
+    argon2Type?: string | undefined;
+    argon2TimeCost: number | undefined;
+    argon2MemoryCost: number | undefined;
+    argon2Parallelism: number | undefined;
     defaultFieldSelector?: { [key: string]: 0 | 1 } | undefined;
     collection?: string | undefined;
     loginTokenExpirationHours?: number | undefined;
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 1380302f58..9186a9ac85 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -13,7 +13,10 @@ const VALID_CONFIG_KEYS = [
   'passwordEnrollTokenExpirationInDays',
   'passwordEnrollTokenExpiration',
   'ambiguousErrorMessages',
-  'argon2Iterations',
+  'argon2Type',
+  'argon2TimeCost',
+  'argon2MemoryCost',
+  'argon2Parallelism',
   'defaultFieldSelector',
   'collection',
   'loginTokenExpirationHours',
@@ -210,7 +213,10 @@ export class AccountsCommon {
    * @param {Number} options.passwordEnrollTokenExpirationInDays The number of days from when a link to set initial password is sent until token expires and user can't set password with the link anymore. Defaults to 30.
    * @param {Number} options.passwordEnrollTokenExpiration The number of milliseconds from when a link to set initial password is sent until token expires and user can't set password with the link anymore. If `passwordEnrollTokenExpirationInDays` is set, it takes precedent.
    * @param {Boolean} options.ambiguousErrorMessages Return ambiguous error messages from login failures to prevent user enumeration. Defaults to `true`.
-   * @param {Number} options.argon2Iterations Allows override of number of argon2 iterations (aka time cost) used to store passwords. The default is 3.
+   * @param {'argon2id' | 'argon2i' | 'argon2d'} options.argon2Type Allows override of the argon2 algorithm type. The default is `argon2id`.
+   * @param {Number} options.argon2TimeCost Allows override of number of argon2 iterations (aka time cost) used to store passwords. The default is 3.
+   * @param {Number} options.argon2MemoryCost Allows override of the amount of memory (in KiB) used by the argon2 algorithm. The default is 65536 (64MB).
+   * @param {Number} options.argon2Parallelism Allows override of the number of threads used by the argon2 algorithm. The default is 4.
    * @param {MongoFieldSpecifier} options.defaultFieldSelector To exclude by default large custom fields from `Meteor.user()` and `Meteor.findUserBy...()` functions when called without a field selector, and all `onLogin`, `onLoginFailure` and `onLogout` callbacks.  Example: `Accounts.config({ defaultFieldSelector: { myBigArray: 0 }})`. Beware when using this. If, for instance, you do not include `email` when excluding the fields, you can have problems with functions like `forgotPassword` that will break because they won't have the required data available. It's recommend that you always keep the fields `_id`, `username`, and `email`.
    * @param {String|Mongo.Collection} options.collection A collection name or a Mongo.Collection object to hold the users.
    * @param {Number} options.loginTokenExpirationHours When using the package `accounts-2fa`, use this to set the amount of time a token sent is valid. As it's just a number, you can use, for example, 0.5 to make the token valid for just half hour. The default is 1 hour.
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index f97a115fb7..9bd9470035 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -23,7 +23,16 @@ const getUserById =
 // receives a password as an object, it asserts that the algorithm is
 // "sha-256" and then passes the digest to argon2.
 
-Accounts._argon2Iterations = () => Accounts._options.argon2Iterations || 3;
+const ARGON2_TYPES = {
+  argon2i: argon2.argon2i,
+  argon2d: argon2.argon2d,
+  argon2id: argon2.argon2id
+};
+
+Accounts._argon2Type = () => ARGON2_TYPES[Accounts._options.argon2Type] || argon2.argon2id;
+Accounts._argon2TimeCost = () => Accounts._options.argon2TimeCost || 3;
+Accounts._argon2MemoryCost = () => Accounts._options.argon2MemoryCost || 65536;
+Accounts._argon2Parallelism = () => Accounts._options.argon2Parallelism || 4;
 
 /**
  * Extracts the string to be encrypted using Argon2 from the given `password`.
@@ -59,39 +68,39 @@ const getPasswordString = password => {
 const hashPassword = async password => {
   password = getPasswordString(password);
   return await argon2.hash(password, {
-    timeCost: Accounts._argon2Iterations(),
-    type: argon2.argon2id
+    type: Accounts._argon2Type(),
+    timeCost: Accounts._argon2TimeCost(),
+    memoryCost: Accounts._argon2MemoryCost(),
+    parallelism: Accounts._argon2Parallelism(),
   });
 };
 
 /**
- * Extract the number of iterations used in the specified argon2 hash
- * @param hash String
- * @returns {null|number}
+ * Extract readable parameters from an Argon2 hash string.
+ * @param {string} hash - The Argon2 hash string.
+ * @returns {object} An object containing the parsed parameters.
+ * @throws {Error} If the hash format is invalid.
  */
-const getIterationsFromArgon2Hash = function(hash) {
-  const parts = hash?.split("$") || [];
-  if (parts.length < 4 || !parts[1].startsWith("argon2")) {
-    throw new Error("Invalid Argon2 hash format");
+function getArgon2Params(hash) {
+  const regex = /^\$(argon2(?:i|d|id))\$v=\d+\$m=(\d+),t=(\d+),p=(\d+)/;
+
+  const match = hash.match(regex);
+
+  if (!match) {
+    throw new Error("Invalid Argon2 hash format.");
   }
 
-  const params = parts[3].split(",");
-  let iterations = null;
+  const [, type, memoryCost, timeCost, parallelism] = match;
 
-  for (const param of params) {
-    if (param.startsWith("t=")) {
-      iterations = parseInt(param.split("=")[1], 10);
-      break;
-    }
-  }
+  return {
+    type: ARGON2_TYPES[type],
+    timeCost: parseInt(timeCost, 10),
+    memoryCost: parseInt(memoryCost, 10),
+    parallelism: parseInt(parallelism, 10)
+  };
+}
 
-  if (iterations === null) {
-    throw new Error("Iterations parameter not found in the hash");
-  }
-
-  return iterations;
-};
-Accounts._getIterationsFromArgon2Hash = getIterationsFromArgon2Hash;
+Accounts._getArgon2Params = getArgon2Params;
 
 const getUserPasswordHash = user => {
   return user.services?.password?.argon2 || user.services?.password?.bcrypt;
@@ -157,24 +166,30 @@ const checkPasswordAsync = async (user, password) => {
   }
   else {
     // argon2 password
-    const argon2Iterations = getIterationsFromArgon2Hash(hash);
+    const argon2Params = getArgon2Params(hash);
 
     if (!(await argon2.verify(hash, formattedPassword))) {
       result.error = Accounts._handleError("Incorrect password", false);
     }
-    else if (hash && Accounts._argon2Iterations() !== argon2Iterations) {
-      // The password checks out, but the user's argon2 hash needs to be updated with the right number of iterations
-      Meteor.defer(async () => {
-        await Meteor.users.updateAsync(
-          { _id: user._id },
-          {
-            $set: {
-              "services.password.argon2":
-                await hashPassword(formattedPassword)
+    else if (hash) {
+      const paramsChanged = argon2Params.memoryCost !== Accounts._argon2MemoryCost() ||
+        argon2Params.timeCost !== Accounts._argon2TimeCost() ||
+        argon2Params.parallelism !== Accounts._argon2Parallelism() ||
+        argon2Params.type !== Accounts._argon2Type();
+      if (paramsChanged === true) {
+        // The password checks out, but the user's argon2 hash needs to be updated with the right params
+        Meteor.defer(async () => {
+          await Meteor.users.updateAsync(
+            { _id: user._id },
+            {
+              $set: {
+                "services.password.argon2":
+                  await hashPassword(formattedPassword)
+              }
             }
-          }
-        );
-      });
+          );
+        });
+      }
     }
   }
 
diff --git a/v3-docs/docs/api/accounts.md b/v3-docs/docs/api/accounts.md
index c84a2777a8..79d54b5738 100644
--- a/v3-docs/docs/api/accounts.md
+++ b/v3-docs/docs/api/accounts.md
@@ -789,23 +789,25 @@ The transition from `bcrypt` to `argon2` is handled seamlessly during user login
 
 **Configuring `argon2` parameters**
 
-The accounts-password package allows limited customization of the Argon2 algorithm's parameters. The configurable options include:
+The accounts-password package allows customization of the Argon2 algorithm's parameters. The configurable options include:
 
+- `type`: `argon2id` (provides a blend of resistance against GPU and side-channel attacks)
 - `timeCost` (default: 3) – This controls the computational cost of the hashing process, affecting both the security level and performance.
+- `memoryCost`: 65536 (64 MB) - The amount of memory used by the algorithm in KiB per thread
+- `parallelism`: 4 - The number of threads used by the algorithm
 
-To update the timeCost, use the following configuration:
-
+To update the values, use the following configuration:
 ```js
 Accounts.config({
-    argon2Iterations: 4
+    argon2Type: "argon2id",
+    argon2TimeCost: 4,
+    argon2MemoryCost: 65536,
+    argon2Parallelism: 4,
 });
 ```
 
-Other Argon2 parameters, such as `hashLength`, `memoryCost`, `parallelism`, and `type`, are set to default values:
-- `hashLength`: 32 bytes
-- `memoryCost`: 64 MB
-- `parallelism`: 4
-- `type`: Argon2id (provides a blend of resistance against GPU and side-channel attacks)
+Other Argon2 parameters, such as `hashLength`, are kept to default values:
+- `hashLength`: 32 bytes - The length of the hash output in bytes
 
 For more information about Argon2's parameters, refer to the [argon2 options documentation](https://github.com/ranisalt/node-argon2/wiki/Options).
 

From c3b3e4c42e9e72961e9d93afecfabdb6533cac54 Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Mon, 20 Jan 2025 12:28:58 +0100
Subject: [PATCH 0985/1140] update tests for argon2 settings

---
 packages/accounts-password/password_tests.js | 68 +++++++++++++-------
 1 file changed, 46 insertions(+), 22 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 13896cf6ae..f50943e59f 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1822,33 +1822,47 @@ if (Meteor.isServer) (() => {
     ]);
   });
 
-  const getUserHashArgon2Iterations = function (user) {
+  const getUserHashArgon2Params = function (user) {
     const hash = user?.services?.password?.argon2;
-    return Accounts._getIterationsFromArgon2Hash(hash);
+    return Accounts._getArgon2Params(hash);
   }
 
-  testAsyncMulti("passwords - allow custom argon2 iterations",[
-    async function (test) {
+  testAsyncMulti("passwords - allow custom argon2 Params", [
+    async function(test) {
       // Verify that a argon2 hash generated for a new account uses the
-      // default number of iterations.
+      // default params.
       let username = Random.id();
-      this.password = hashPassword('abc123');
+      this.password = hashPassword("abc123");
       this.userId1 = await Accounts.createUser({ username, password: this.password });
-      this.user1 =  await Meteor.users.findOneAsync(this.userId1);
-      let rounds = getUserHashArgon2Iterations(this.user1);
-      test.equal(rounds, Accounts._argon2Iterations());
+      this.user1 = await Meteor.users.findOneAsync(this.userId1);
+      let argon2Params = getUserHashArgon2Params(this.user1);
+      test.equal(argon2Params.type, Accounts._argon2Type());
+      test.equal(argon2Params.memoryCost, Accounts._argon2MemoryCost());
+      test.equal(argon2Params.timeCost, Accounts._argon2TimeCost());
+      test.equal(argon2Params.parallelism, Accounts._argon2Parallelism());
 
-      // When a custom number of argon2 iterations is set via Accounts.config,
-      // and an account was already created using the default number of iterations,
+
+      // When a custom number of argon2 TimeCost is set via Accounts.config,
+      // and an account was already created using the default number of TimeCost,
       // make sure that a new hash is created (and stored) using the new number
-      // of iterations, the next time the password is checked.
-      this.customIterations = 4;
-      Accounts._options.argon2Iterations = this.customIterations;
+      // of TimeCost, the next time the password is checked.
+      this.customType = "argon2d"; // argon2.argon2d = 2
+      this.customTimeCost = 4;
+      this.customMemoryCost = 32768;
+      this.customParallelism = 1;
+      Accounts._options.argon2Type = this.customType;
+      Accounts._options.argon2TimeCost = this.customTimeCost;
+      Accounts._options.argon2MemoryCost = this.customMemoryCost;
+      Accounts._options.argon2Parallelism = this.customParallelism;
+
       await Accounts._checkPasswordAsync(this.user1, this.password);
     },
     async function(test) {
-      const defaultRounds = Accounts._argon2Iterations();
-      let rounds;
+      const defaultType = Accounts._argon2Type();
+      const defaultTimeCost = Accounts._argon2TimeCost();
+      const defaultMemoryCost = Accounts._argon2MemoryCost();
+      const defaultParallelism = Accounts._argon2Parallelism();
+      let params;
       let username;
 
       let resolve;
@@ -1856,18 +1870,28 @@ if (Meteor.isServer) (() => {
 
       Meteor.setTimeout(async () => {
         this.user1 = await Meteor.users.findOneAsync(this.userId1);
-        rounds = getUserHashArgon2Iterations(this.user1);
-        test.equal(rounds, this.customIterations);
-        // When a custom number of argon2 iterations is set, make sure it's
+        params = getUserHashArgon2Params(this.user1);
+        test.equal(params.type, 2);
+        test.equal(params.timeCost, this.customTimeCost);
+        test.equal(params.memoryCost, this.customMemoryCost);
+        test.equal(params.parallelism, this.customParallelism);
+
+        // When a custom number of argon2 TimeCost is set, make sure it's
         // used for new argon2 password hashes.
         username = Random.id();
         const userId2 = await Accounts.createUser({ username, password: this.password });
         const user2 = await Meteor.users.findOneAsync(userId2);
-        rounds = getUserHashArgon2Iterations(user2);
-        test.equal(rounds, this.customIterations);
+        params = getUserHashArgon2Params(user2);
+        test.equal(params.type, 2);
+        test.equal(params.timeCost, this.customTimeCost);
+        test.equal(params.memoryCost, this.customMemoryCost);
+        test.equal(params.parallelism, this.customParallelism);
 
         // Cleanup
-        Accounts._options.argon2Iterations = defaultRounds;
+        Accounts._options.argon2Type = defaultType;
+        Accounts._options.argon2TimeCost = defaultTimeCost;
+        Accounts._options.argon2MemoryCost = defaultMemoryCost;
+        Accounts._options.argon2Parallelism = defaultParallelism;
         await Meteor.users.removeAsync(this.userId1);
         await Meteor.users.removeAsync(userId2);
         resolve();

From 96bd02060b64291cc72992290bfa2f5101347eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 22 Jan 2025 14:55:12 +0100
Subject: [PATCH 0986/1140] upgrade node to 22.13.1

---
 .travis.yml                        | 2 +-
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 v3-docs/v3-migration-docs/index.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a0a6e2233d..cd2ddb2f03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "22.13.0"
+  - "22.13.1"
 cache:
   directories:
     - ".meteor"
diff --git a/meteor b/meteor
index 066e44b62e..2da7aecc12 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.13.0.1
+BUNDLE_VERSION=22.13.1.0
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 5764954743..22acd0d917 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.13.0
+NODE_VERSION=22.13.1
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.2
diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 8d724ad33b..777a25ac15 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,6 +1,6 @@
 ---
 meteor_version: 3.1.0
-node_version: 22.13.0
+node_version: 22.13.1
 npm_version: 10.9.2
 ---
 # Meteor 3.0 Migration Guide

From f78b9923bb6aa7f75bf9723a698e53725bca14c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 22 Jan 2025 15:04:24 +0100
Subject: [PATCH 0987/1140] re-run checks


From 5a06273a23107b639650c921d50ae195cc917ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 22 Jan 2025 16:55:26 +0100
Subject: [PATCH 0988/1140] upgrade skeletons related with meteor-vite to use
 latest

---
 tools/static-assets/skel-solid/.meteor/packages |  2 +-
 tools/static-assets/skel-solid/package.json     | 10 +++++-----
 tools/static-assets/skel-vue/.meteor/packages   |  3 +--
 tools/static-assets/skel-vue/package.json       | 10 +++++-----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/tools/static-assets/skel-solid/.meteor/packages b/tools/static-assets/skel-solid/.meteor/packages
index f00629b1a1..665679a90c 100644
--- a/tools/static-assets/skel-solid/.meteor/packages
+++ b/tools/static-assets/skel-solid/.meteor/packages
@@ -19,4 +19,4 @@ hot-module-replacement  # Update client in development without reloading the pag
 
 ~prototype~
 static-html             # Define static page content in .html files
-jorgenvatle:vite-bundler
+jorgenvatle:vite
diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json
index c52cc4f297..8bf42cf302 100644
--- a/tools/static-assets/skel-solid/package.json
+++ b/tools/static-assets/skel-solid/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.9",
     "meteor-node-stubs": "^1.2.12",
-    "solid-js": "^1.8.15"
+    "solid-js": "^1.9.4"
   },
   "meteor": {
     "mainModule": {
@@ -21,9 +21,9 @@
   },
   "devDependencies": {
     "babel-preset-solid": "^1.8.15",
-    "meteor-vite": "^1.10.2",
-    "vite": "^4.5.2",
-    "vite-plugin-solid": "^2.10.1",
-    "vite-plugin-solid-svg": "^0.8.0"
+    "meteor-vite": "^3.2.0",
+    "vite": "^6.0.11",
+    "vite-plugin-solid": "^2.11.0",
+    "vite-plugin-solid-svg": "^0.8.1"
   }
 }
diff --git a/tools/static-assets/skel-vue/.meteor/packages b/tools/static-assets/skel-vue/.meteor/packages
index 3ae6a18b5f..b5e90db564 100644
--- a/tools/static-assets/skel-vue/.meteor/packages
+++ b/tools/static-assets/skel-vue/.meteor/packages
@@ -18,6 +18,5 @@ shell-server                   # Server-side component of the `meteor shell` com
 hot-module-replacement         # Update client in development without reloading the page
 
 static-html                    # Define static page content in .html files
-jorgenvatle:vite-bundler
+jorgenvatle:vite
 ~prototype~
-
diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json
index 0fb89687e4..467e49014f 100644
--- a/tools/static-assets/skel-vue/package.json
+++ b/tools/static-assets/skel-vue/package.json
@@ -11,9 +11,9 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "meteor-node-stubs": "^1.2.12",
-    "vue": "^3.3.9",
+    "vue": "^3.5.13",
     "vue-meteor-tracker": "^3.0.0-beta.7",
-    "vue-router": "^4.2.5"
+    "vue-router": "^4.5.0"
   },
   "meteor": {
     "mainModule": {
@@ -24,11 +24,11 @@
   },
   "devDependencies": {
     "@types/meteor": "^2.9.7",
-    "@vitejs/plugin-vue": "^3.2.0",
+    "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.16",
-    "meteor-vite": "^1.10.3",
+    "meteor-vite": "^3.2.0",
     "postcss": "^8.4.31",
     "tailwindcss": "^3.3.5",
-    "vite": "^3.2.7"
+    "vite": "^6.0.11"
   }
 }

From ce0b334a9bc4910f89140219887b2af646f8c3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 27 Jan 2025 17:02:09 +0100
Subject: [PATCH 0989/1140] fix skeleton that are dependent on meteor-vite on
 its latest version

---
 .../skel-solid/client/entry-meteor.js         |  0
 tools/static-assets/skel-solid/package.json   |  7 +++---
 .../skel-solid/server/entry-meteor.js         |  0
 tools/static-assets/skel-solid/vite.config.js | 19 +++++++++++-----
 .../skel-vue/client/entry-meteor.js           |  0
 tools/static-assets/skel-vue/package.json     | 10 ++++-----
 .../skel-vue/server/entry-meteor.js           |  0
 tools/static-assets/skel-vue/vite.config.js   | 22 +++++++++++++------
 8 files changed, 37 insertions(+), 21 deletions(-)
 create mode 100644 tools/static-assets/skel-solid/client/entry-meteor.js
 create mode 100644 tools/static-assets/skel-solid/server/entry-meteor.js
 create mode 100644 tools/static-assets/skel-vue/client/entry-meteor.js
 create mode 100644 tools/static-assets/skel-vue/server/entry-meteor.js

diff --git a/tools/static-assets/skel-solid/client/entry-meteor.js b/tools/static-assets/skel-solid/client/entry-meteor.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json
index 8bf42cf302..d096a76612 100644
--- a/tools/static-assets/skel-solid/package.json
+++ b/tools/static-assets/skel-solid/package.json
@@ -10,18 +10,19 @@
   "dependencies": {
     "@babel/runtime": "^7.23.9",
     "meteor-node-stubs": "^1.2.12",
+    "picocolors": "^1.1.1",
     "solid-js": "^1.9.4"
   },
   "meteor": {
     "mainModule": {
-      "client": "client/main.jsx",
-      "server": "server/main.js"
+      "client": "client/entry-meteor.js",
+      "server": "server/entry-meteor.js"
     },
     "testModule": "tests/main.js"
   },
   "devDependencies": {
     "babel-preset-solid": "^1.8.15",
-    "meteor-vite": "^3.2.0",
+    "meteor-vite": "^3.2.1",
     "vite": "^6.0.11",
     "vite-plugin-solid": "^2.11.0",
     "vite-plugin-solid-svg": "^0.8.1"
diff --git a/tools/static-assets/skel-solid/server/entry-meteor.js b/tools/static-assets/skel-solid/server/entry-meteor.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/static-assets/skel-solid/vite.config.js b/tools/static-assets/skel-solid/vite.config.js
index c49fa70b16..5ec03437ec 100644
--- a/tools/static-assets/skel-solid/vite.config.js
+++ b/tools/static-assets/skel-solid/vite.config.js
@@ -1,12 +1,19 @@
 import { defineConfig } from 'vite';
 import solidPlugin from 'vite-plugin-solid';
 import solidSvg from "vite-plugin-solid-svg";
+import { meteor } from 'meteor-vite/plugin';
 
 export default defineConfig({
-  plugins: [solidPlugin(), solidSvg({
-    defaultExport: 'component',
-  })],
-  meteor: {
-    clientEntry: 'imports/ui/main.jsx',
-  },
+  plugins: [
+    solidPlugin(),
+    solidSvg({ defaultExport: 'component' }),
+    meteor({
+      clientEntry: 'imports/ui/main.jsx',
+      serverEntry: 'server/main.js',
+      enableExperimentalFeatures: true,
+      stubValidation: {
+        warnOnly: true,
+      },
+    }),
+  ],
 });
diff --git a/tools/static-assets/skel-vue/client/entry-meteor.js b/tools/static-assets/skel-vue/client/entry-meteor.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json
index 467e49014f..560c8a23a5 100644
--- a/tools/static-assets/skel-vue/package.json
+++ b/tools/static-assets/skel-vue/package.json
@@ -11,14 +11,14 @@
   "dependencies": {
     "@babel/runtime": "^7.23.5",
     "meteor-node-stubs": "^1.2.12",
-    "vue": "^3.5.13",
+    "vue": "^3.3.9",
     "vue-meteor-tracker": "^3.0.0-beta.7",
-    "vue-router": "^4.5.0"
+    "vue-router": "^4.2.5"
   },
   "meteor": {
     "mainModule": {
-      "client": "client/main.js",
-      "server": "server/main.js"
+      "client": "client/entry-meteor.js",
+      "server": "server/entry-meteor.js"
     },
     "testModule": "tests/main.js"
   },
@@ -26,7 +26,7 @@
     "@types/meteor": "^2.9.7",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.16",
-    "meteor-vite": "^3.2.0",
+    "meteor-vite": "^3.2.1",
     "postcss": "^8.4.31",
     "tailwindcss": "^3.3.5",
     "vite": "^6.0.11"
diff --git a/tools/static-assets/skel-vue/server/entry-meteor.js b/tools/static-assets/skel-vue/server/entry-meteor.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/static-assets/skel-vue/vite.config.js b/tools/static-assets/skel-vue/vite.config.js
index d3aeaa9aba..a93029004d 100644
--- a/tools/static-assets/skel-vue/vite.config.js
+++ b/tools/static-assets/skel-vue/vite.config.js
@@ -1,12 +1,20 @@
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import { meteor } from 'meteor-vite/plugin';
 
 export default defineConfig({
-  plugins: [vue()],
-  meteor: {
-    clientEntry: 'imports/ui/main.js',
-  },
+  plugins: [
+    vue(),
+    meteor({
+      clientEntry: 'imports/ui/main.js',
+      serverEntry: 'server/main.js',
+      enableExperimentalFeatures: true,
+      stubValidation: {
+        warnOnly: true,
+      },
+    }),
+  ],
   optimizeDeps: {
     exclude: ['vue-meteor-tracker'],
   },
-})
+});

From 75f9a6f3e1d5ee31e4f5ebb6eec6f50a1cb7f4c4 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 27 Jan 2025 18:30:29 -0300
Subject: [PATCH 0990/1140] DEV: Update vite version in docs

This solved https://github.com/meteor/meteor/issues/13560

and also makes our docs up to date with the latest version of vite.
---
 v3-docs/docs/api/packages-listing.md |    1 -
 v3-docs/docs/package-lock.json       | 1809 ++++++++++++++++++--------
 v3-docs/docs/package.json            |    2 +-
 3 files changed, 1241 insertions(+), 571 deletions(-)

diff --git a/v3-docs/docs/api/packages-listing.md b/v3-docs/docs/api/packages-listing.md
index 40d21881ff..c4624c061e 100644
--- a/v3-docs/docs/api/packages-listing.md
+++ b/v3-docs/docs/api/packages-listing.md
@@ -45,7 +45,6 @@
 ### [callback-hook](https://github.com/meteor/meteor/tree/devel/packages/callback-hook) {#callback-hook}
 ### [check](https://github.com/meteor/meteor/tree/devel/packages/check) {#check}
 ### [constraint-solver](https://github.com/meteor/meteor/tree/devel/packages/constraint-solver) {#constraint-solver}
-### [context](https://github.com/meteor/meteor/tree/devel/packages/context) {#context}
 ### [core-runtime](https://github.com/meteor/meteor/tree/devel/packages/core-runtime) {#core-runtime}
 ### [crosswalk](https://github.com/meteor/meteor/tree/devel/packages/crosswalk) {#crosswalk}
 ### [ddp](https://github.com/meteor/meteor/tree/devel/packages/ddp) {#ddp}
diff --git a/v3-docs/docs/package-lock.json b/v3-docs/docs/package-lock.json
index 55d9e175c4..c3e2777111 100644
--- a/v3-docs/docs/package-lock.json
+++ b/v3-docs/docs/package-lock.json
@@ -10,38 +10,38 @@
       "devDependencies": {
         "canonical-json": "^0.0.4",
         "jsdoc": "^4.0.2",
-        "vitepress": "1.0.1"
+        "vitepress": "1.6.3"
       }
     },
     "node_modules/@algolia/autocomplete-core": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.9.3.tgz",
-      "integrity": "sha512-009HdfugtGCdC4JdXUbVJClA0q0zh24yyePn+KUGk3rP7j8FEe/m5Yo/z65gn6nP/cM39PxpzqKrL7A6fP6PPw==",
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz",
+      "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==",
       "dev": true,
       "dependencies": {
-        "@algolia/autocomplete-plugin-algolia-insights": "1.9.3",
-        "@algolia/autocomplete-shared": "1.9.3"
+        "@algolia/autocomplete-plugin-algolia-insights": "1.17.7",
+        "@algolia/autocomplete-shared": "1.17.7"
       }
     },
     "node_modules/@algolia/autocomplete-plugin-algolia-insights": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.9.3.tgz",
-      "integrity": "sha512-a/yTUkcO/Vyy+JffmAnTWbr4/90cLzw+CC3bRbhnULr/EM0fGNvM13oQQ14f2moLMcVDyAx/leczLlAOovhSZg==",
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz",
+      "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==",
       "dev": true,
       "dependencies": {
-        "@algolia/autocomplete-shared": "1.9.3"
+        "@algolia/autocomplete-shared": "1.17.7"
       },
       "peerDependencies": {
         "search-insights": ">= 1 < 3"
       }
     },
     "node_modules/@algolia/autocomplete-preset-algolia": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.9.3.tgz",
-      "integrity": "sha512-d4qlt6YmrLMYy95n5TB52wtNDr6EgAIPH81dvvvW8UmuWRgxEtY0NJiPwl/h95JtG2vmRM804M0DSwMCNZlzRA==",
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz",
+      "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==",
       "dev": true,
       "dependencies": {
-        "@algolia/autocomplete-shared": "1.9.3"
+        "@algolia/autocomplete-shared": "1.17.7"
       },
       "peerDependencies": {
         "@algolia/client-search": ">= 4.9.1 < 6",
@@ -49,149 +49,221 @@
       }
     },
     "node_modules/@algolia/autocomplete-shared": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.9.3.tgz",
-      "integrity": "sha512-Wnm9E4Ye6Rl6sTTqjoymD+l8DjSTHsHboVRYrKgEt8Q7UHm9nYbqhN/i0fhUYA3OAEH7WA8x3jfpnmJm3rKvaQ==",
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz",
+      "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==",
       "dev": true,
       "peerDependencies": {
         "@algolia/client-search": ">= 4.9.1 < 6",
         "algoliasearch": ">= 4.9.1 < 6"
       }
     },
-    "node_modules/@algolia/cache-browser-local-storage": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz",
-      "integrity": "sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g==",
+    "node_modules/@algolia/client-abtesting": {
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.20.0.tgz",
+      "integrity": "sha512-YaEoNc1Xf2Yk6oCfXXkZ4+dIPLulCx8Ivqj0OsdkHWnsI3aOJChY5qsfyHhDBNSOhqn2ilgHWxSfyZrjxBcAww==",
       "dev": true,
       "dependencies": {
-        "@algolia/cache-common": "4.22.1"
-      }
-    },
-    "node_modules/@algolia/cache-common": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.22.1.tgz",
-      "integrity": "sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA==",
-      "dev": true
-    },
-    "node_modules/@algolia/cache-in-memory": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz",
-      "integrity": "sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw==",
-      "dev": true,
-      "dependencies": {
-        "@algolia/cache-common": "4.22.1"
-      }
-    },
-    "node_modules/@algolia/client-account": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.22.1.tgz",
-      "integrity": "sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw==",
-      "dev": true,
-      "dependencies": {
-        "@algolia/client-common": "4.22.1",
-        "@algolia/client-search": "4.22.1",
-        "@algolia/transporter": "4.22.1"
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/@algolia/client-analytics": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.22.1.tgz",
-      "integrity": "sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.20.0.tgz",
+      "integrity": "sha512-CIT9ni0+5sYwqehw+t5cesjho3ugKQjPVy/iPiJvtJX4g8Cdb6je6SPt2uX72cf2ISiXCAX9U3cY0nN0efnRDw==",
       "dev": true,
       "dependencies": {
-        "@algolia/client-common": "4.22.1",
-        "@algolia/client-search": "4.22.1",
-        "@algolia/requester-common": "4.22.1",
-        "@algolia/transporter": "4.22.1"
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/@algolia/client-common": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.22.1.tgz",
-      "integrity": "sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.20.0.tgz",
+      "integrity": "sha512-iSTFT3IU8KNpbAHcBUJw2HUrPnMXeXLyGajmCL7gIzWOsYM4GabZDHXOFx93WGiXMti1dymz8k8R+bfHv1YZmA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-insights": {
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.20.0.tgz",
+      "integrity": "sha512-w9RIojD45z1csvW1vZmAko82fqE/Dm+Ovsy2ElTsjFDB0HMAiLh2FO86hMHbEXDPz6GhHKgGNmBRiRP8dDPgJg==",
       "dev": true,
       "dependencies": {
-        "@algolia/requester-common": "4.22.1",
-        "@algolia/transporter": "4.22.1"
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/@algolia/client-personalization": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.22.1.tgz",
-      "integrity": "sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.20.0.tgz",
+      "integrity": "sha512-p/hftHhrbiHaEcxubYOzqVV4gUqYWLpTwK+nl2xN3eTrSW9SNuFlAvUBFqPXSVBqc6J5XL9dNKn3y8OA1KElSQ==",
       "dev": true,
       "dependencies": {
-        "@algolia/client-common": "4.22.1",
-        "@algolia/requester-common": "4.22.1",
-        "@algolia/transporter": "4.22.1"
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-query-suggestions": {
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.20.0.tgz",
+      "integrity": "sha512-m4aAuis5vZi7P4gTfiEs6YPrk/9hNTESj3gEmGFgfJw3hO2ubdS4jSId1URd6dGdt0ax2QuapXufcrN58hPUcw==",
+      "dev": true,
+      "dependencies": {
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/@algolia/client-search": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.22.1.tgz",
-      "integrity": "sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.20.0.tgz",
+      "integrity": "sha512-KL1zWTzrlN4MSiaK1ea560iCA/UewMbS4ZsLQRPoDTWyrbDKVbztkPwwv764LAqgXk0fvkNZvJ3IelcK7DqhjQ==",
       "dev": true,
       "dependencies": {
-        "@algolia/client-common": "4.22.1",
-        "@algolia/requester-common": "4.22.1",
-        "@algolia/transporter": "4.22.1"
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@algolia/logger-common": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.22.1.tgz",
-      "integrity": "sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg==",
-      "dev": true
-    },
-    "node_modules/@algolia/logger-console": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.22.1.tgz",
-      "integrity": "sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA==",
+    "node_modules/@algolia/ingestion": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.20.0.tgz",
+      "integrity": "sha512-shj2lTdzl9un4XJblrgqg54DoK6JeKFO8K8qInMu4XhE2JuB8De6PUuXAQwiRigZupbI0xq8aM0LKdc9+qiLQA==",
       "dev": true,
       "dependencies": {
-        "@algolia/logger-common": "4.22.1"
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/monitoring": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.20.0.tgz",
+      "integrity": "sha512-aF9blPwOhKtWvkjyyXh9P5peqmhCA1XxLBRgItT+K6pbT0q4hBDQrCid+pQZJYy4HFUKjB/NDDwyzFhj/rwKhw==",
+      "dev": true,
+      "dependencies": {
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/recommend": {
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.20.0.tgz",
+      "integrity": "sha512-T6B/WPdZR3b89/F9Vvk6QCbt/wrLAtrGoL8z4qPXDFApQ8MuTFWbleN/4rHn6APWO3ps+BUePIEbue2rY5MlRw==",
+      "dev": true,
+      "dependencies": {
+        "@algolia/client-common": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/@algolia/requester-browser-xhr": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz",
-      "integrity": "sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.20.0.tgz",
+      "integrity": "sha512-t6//lXsq8E85JMenHrI6mhViipUT5riNhEfCcvtRsTV+KIBpC6Od18eK864dmBhoc5MubM0f+sGpKOqJIlBSCg==",
       "dev": true,
       "dependencies": {
-        "@algolia/requester-common": "4.22.1"
+        "@algolia/client-common": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@algolia/requester-common": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.22.1.tgz",
-      "integrity": "sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg==",
-      "dev": true
+    "node_modules/@algolia/requester-fetch": {
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.20.0.tgz",
+      "integrity": "sha512-FHxYGqRY+6bgjKsK4aUsTAg6xMs2S21elPe4Y50GB0Y041ihvw41Vlwy2QS6K9ldoftX4JvXodbKTcmuQxywdQ==",
+      "dev": true,
+      "dependencies": {
+        "@algolia/client-common": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
     },
     "node_modules/@algolia/requester-node-http": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz",
-      "integrity": "sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.20.0.tgz",
+      "integrity": "sha512-kmtQClq/w3vtPteDSPvaW9SPZL/xrIgMrxZyAgsFwrJk0vJxqyC5/hwHmrCraDnStnGSADnLpBf4SpZnwnkwWw==",
       "dev": true,
       "dependencies": {
-        "@algolia/requester-common": "4.22.1"
+        "@algolia/client-common": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@algolia/transporter": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.22.1.tgz",
-      "integrity": "sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ==",
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
-      "dependencies": {
-        "@algolia/cache-common": "4.22.1",
-        "@algolia/logger-common": "4.22.1",
-        "@algolia/requester-common": "4.22.1"
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
-      "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
+      "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
       "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.26.7"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -199,32 +271,45 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/types": {
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
+      "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@docsearch/css": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.6.0.tgz",
-      "integrity": "sha512-+sbxb71sWre+PwDK7X2T8+bhS6clcVMLwBPznX45Qu6opJcgRjAp7gYSDzVFp187J+feSj5dNBN1mJoi6ckkUQ==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz",
+      "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==",
       "dev": true
     },
     "node_modules/@docsearch/js": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.6.0.tgz",
-      "integrity": "sha512-QujhqINEElrkIfKwyyyTfbsfMAYCkylInLYMRqHy7PHc8xTBQCow73tlo/Kc7oIwBrCLf0P3YhjlOeV4v8hevQ==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz",
+      "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==",
       "dev": true,
       "dependencies": {
-        "@docsearch/react": "3.6.0",
+        "@docsearch/react": "3.8.2",
         "preact": "^10.0.0"
       }
     },
     "node_modules/@docsearch/react": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.6.0.tgz",
-      "integrity": "sha512-HUFut4ztcVNmqy9gp/wxNbC7pTOHhgVVkHVGCACTuLhUKUhKAF9KYHJtMiLUJxEqiFLQiuri1fWF8zqwM/cu1w==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz",
+      "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==",
       "dev": true,
       "dependencies": {
-        "@algolia/autocomplete-core": "1.9.3",
-        "@algolia/autocomplete-preset-algolia": "1.9.3",
-        "@docsearch/css": "3.6.0",
-        "algoliasearch": "^4.19.1"
+        "@algolia/autocomplete-core": "1.17.7",
+        "@algolia/autocomplete-preset-algolia": "1.17.7",
+        "@docsearch/css": "3.8.2",
+        "algoliasearch": "^5.14.2"
       },
       "peerDependencies": {
         "@types/react": ">= 16.8.0 < 19.0.0",
@@ -248,9 +333,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "cpu": [
         "ppc64"
       ],
@@ -264,9 +349,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "cpu": [
         "arm"
       ],
@@ -280,9 +365,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "cpu": [
         "arm64"
       ],
@@ -296,9 +381,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "cpu": [
         "x64"
       ],
@@ -312,9 +397,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "cpu": [
         "arm64"
       ],
@@ -328,9 +413,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "cpu": [
         "x64"
       ],
@@ -344,9 +429,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "cpu": [
         "arm64"
       ],
@@ -360,9 +445,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "cpu": [
         "x64"
       ],
@@ -376,9 +461,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "cpu": [
         "arm"
       ],
@@ -392,9 +477,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "cpu": [
         "arm64"
       ],
@@ -408,9 +493,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "cpu": [
         "ia32"
       ],
@@ -424,9 +509,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "cpu": [
         "loong64"
       ],
@@ -440,9 +525,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "cpu": [
         "mips64el"
       ],
@@ -456,9 +541,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "cpu": [
         "ppc64"
       ],
@@ -472,9 +557,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "cpu": [
         "riscv64"
       ],
@@ -488,9 +573,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "cpu": [
         "s390x"
       ],
@@ -504,9 +589,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "cpu": [
         "x64"
       ],
@@ -520,9 +605,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "cpu": [
         "x64"
       ],
@@ -536,9 +621,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "cpu": [
         "x64"
       ],
@@ -552,9 +637,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "cpu": [
         "x64"
       ],
@@ -568,9 +653,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "cpu": [
         "arm64"
       ],
@@ -584,9 +669,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "cpu": [
         "ia32"
       ],
@@ -600,9 +685,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
@@ -615,10 +700,25 @@
         "node": ">=12"
       }
     },
+    "node_modules/@iconify-json/simple-icons": {
+      "version": "1.2.22",
+      "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.22.tgz",
+      "integrity": "sha512-0UzThRMwHuOJfgpp+tyV/y2uEBLjFVrxC4igv9iWjSEQEBK4tNjWZNTRCBCYyv/FwWVYyKAsA8tZQ8vUYzvFnw==",
+      "dev": true,
+      "dependencies": {
+        "@iconify/types": "*"
+      }
+    },
+    "node_modules/@iconify/types": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
+      "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
+      "dev": true
+    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "dev": true
     },
     "node_modules/@jsdoc/salty": {
@@ -634,9 +734,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz",
-      "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.32.0.tgz",
+      "integrity": "sha512-G2fUQQANtBPsNwiVFg4zKiPQyjVKZCUdQUol53R8E71J7AsheRMV/Yv/nB8giOcOVqP7//eB5xPqieBYZe9bGg==",
       "cpu": [
         "arm"
       ],
@@ -647,9 +747,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz",
-      "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.32.0.tgz",
+      "integrity": "sha512-qhFwQ+ljoymC+j5lXRv8DlaJYY/+8vyvYmVx074zrLsu5ZGWYsJNLjPPVJJjhZQpyAKUGPydOq9hRLLNvh1s3A==",
       "cpu": [
         "arm64"
       ],
@@ -660,9 +760,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz",
-      "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.32.0.tgz",
+      "integrity": "sha512-44n/X3lAlWsEY6vF8CzgCx+LQaoqWGN7TzUfbJDiTIOjJm4+L2Yq+r5a8ytQRGyPqgJDs3Rgyo8eVL7n9iW6AQ==",
       "cpu": [
         "arm64"
       ],
@@ -673,9 +773,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz",
-      "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.32.0.tgz",
+      "integrity": "sha512-F9ct0+ZX5Np6+ZDztxiGCIvlCaW87HBdHcozUfsHnj1WCUTBUubAoanhHUfnUHZABlElyRikI0mgcw/qdEm2VQ==",
       "cpu": [
         "x64"
       ],
@@ -685,10 +785,49 @@
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.0.tgz",
+      "integrity": "sha512-JpsGxLBB2EFXBsTLHfkZDsXSpSmKD3VxXCgBQtlPcuAqB8TlqtLcbeMhxXQkCDv1avgwNjF8uEIbq5p+Cee0PA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.32.0.tgz",
+      "integrity": "sha512-wegiyBT6rawdpvnD9lmbOpx5Sph+yVZKHbhnSP9MqUEDX08G4UzMU+D87jrazGE7lRSyTRs6NEYHtzfkJ3FjjQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz",
-      "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.32.0.tgz",
+      "integrity": "sha512-3pA7xecItbgOs1A5H58dDvOUEboG5UfpTq3WzAdF54acBbUM+olDJAPkgj1GRJ4ZqE12DZ9/hNS2QZk166v92A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.32.0.tgz",
+      "integrity": "sha512-Y7XUZEVISGyge51QbYyYAEHwpGgmRrAxQXO3siyYo2kmaj72USSG8LtlQQgAtlGfxYiOwu+2BdbPjzEpcOpRmQ==",
       "cpu": [
         "arm"
       ],
@@ -699,9 +838,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz",
-      "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.32.0.tgz",
+      "integrity": "sha512-r7/OTF5MqeBrZo5omPXcTnjvv1GsrdH8a8RerARvDFiDwFpDVDnJyByYM/nX+mvks8XXsgPUxkwe/ltaX2VH7w==",
       "cpu": [
         "arm64"
       ],
@@ -712,9 +851,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz",
-      "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.32.0.tgz",
+      "integrity": "sha512-HJbifC9vex9NqnlodV2BHVFNuzKL5OnsV2dvTw6e1dpZKkNjPG6WUq+nhEYV6Hv2Bv++BXkwcyoGlXnPrjAKXw==",
       "cpu": [
         "arm64"
       ],
@@ -724,10 +863,36 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.32.0.tgz",
+      "integrity": "sha512-VAEzZTD63YglFlWwRj3taofmkV1V3xhebDXffon7msNz4b14xKsz7utO6F8F4cqt8K/ktTl9rm88yryvDpsfOw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.32.0.tgz",
+      "integrity": "sha512-Sts5DST1jXAc9YH/iik1C9QRsLcCoOScf3dfbY5i4kH9RJpKxiTBXqm7qU5O6zTXBTEZry69bGszr3SMgYmMcQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz",
-      "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.32.0.tgz",
+      "integrity": "sha512-qhlXeV9AqxIyY9/R1h1hBD6eMvQCO34ZmdYvry/K+/MBs6d1nRFLm6BOiITLVI+nFAAB9kUB6sdJRKyVHXnqZw==",
       "cpu": [
         "riscv64"
       ],
@@ -737,10 +902,23 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.32.0.tgz",
+      "integrity": "sha512-8ZGN7ExnV0qjXa155Rsfi6H8M4iBBwNLBM9lcVS+4NcSzOFaNqmt7djlox8pN1lWrRPMRRQ8NeDlozIGx3Omsw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz",
-      "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.32.0.tgz",
+      "integrity": "sha512-VDzNHtLLI5s7xd/VubyS10mq6TxvZBp+4NRWoW+Hi3tgV05RtVm4qK99+dClwTN1McA6PHwob6DEJ6PlXbY83A==",
       "cpu": [
         "x64"
       ],
@@ -751,9 +929,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz",
-      "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.32.0.tgz",
+      "integrity": "sha512-qcb9qYDlkxz9DxJo7SDhWxTWV1gFuwznjbTiov289pASxlfGbaOD54mgbs9+z94VwrXtKTu+2RqwlSTbiOqxGg==",
       "cpu": [
         "x64"
       ],
@@ -764,9 +942,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz",
-      "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.32.0.tgz",
+      "integrity": "sha512-pFDdotFDMXW2AXVbfdUEfidPAk/OtwE/Hd4eYMTNVVaCQ6Yl8et0meDaKNL63L44Haxv4UExpv9ydSf3aSayDg==",
       "cpu": [
         "arm64"
       ],
@@ -777,9 +955,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz",
-      "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.32.0.tgz",
+      "integrity": "sha512-/TG7WfrCAjeRNDvI4+0AAMoHxea/USWhAzf9PVDFHbcqrQ7hMMKp4jZIy4VEjk72AAfN5k4TiSMRXRKf/0akSw==",
       "cpu": [
         "ia32"
       ],
@@ -790,9 +968,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz",
-      "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.32.0.tgz",
+      "integrity": "sha512-5hqO5S3PTEO2E5VjCePxv40gIgyS2KvO7E7/vvC/NbIW4SIRamkMr1hqj+5Y67fbBWv/bQLB6KelBQmXlyCjWA==",
       "cpu": [
         "x64"
       ],
@@ -803,46 +981,134 @@
       ]
     },
     "node_modules/@shikijs/core": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.2.0.tgz",
-      "integrity": "sha512-OlFvx+nyr5C8zpcMBnSGir0YPD6K11uYhouqhNmm1qLiis4GA7SsGtu07r9gKS9omks8RtQqHrJL4S+lqWK01A==",
-      "dev": true
-    },
-    "node_modules/@shikijs/transformers": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-1.2.0.tgz",
-      "integrity": "sha512-xKn7DtA65DQV4FOfYsrvqM80xOy2xuXnxWWKsZmHv1VII/IOuDUDsWDu3KnpeLH6wqNJWp1GRoNUsHR1aw/VhQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.1.0.tgz",
+      "integrity": "sha512-v795KDmvs+4oV0XD05YLzfDMe9ISBgNjtFxP4PAEv5DqyeghO1/TwDqs9ca5/E6fuO95IcAcWqR6cCX9TnqLZA==",
       "dev": true,
       "dependencies": {
-        "shiki": "1.2.0"
+        "@shikijs/engine-javascript": "2.1.0",
+        "@shikijs/engine-oniguruma": "2.1.0",
+        "@shikijs/types": "2.1.0",
+        "@shikijs/vscode-textmate": "^10.0.1",
+        "@types/hast": "^3.0.4",
+        "hast-util-to-html": "^9.0.4"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+    "node_modules/@shikijs/engine-javascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.1.0.tgz",
+      "integrity": "sha512-cgIUdAliOsoaa0rJz/z+jvhrpRd+fVAoixVFEVxUq5FA+tHgBZAIfVJSgJNVRj2hs/wZ1+4hMe82eKAThVh0nQ==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/types": "2.1.0",
+        "@shikijs/vscode-textmate": "^10.0.1",
+        "oniguruma-to-es": "^2.3.0"
+      }
+    },
+    "node_modules/@shikijs/engine-oniguruma": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.1.0.tgz",
+      "integrity": "sha512-Ujik33wEDqgqY2WpjRDUBECGcKPv3eGGkoXPujIXvokLaRmGky8NisSk8lHUGeSFxo/Cz5sgFej9sJmA9yeepg==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/types": "2.1.0",
+        "@shikijs/vscode-textmate": "^10.0.1"
+      }
+    },
+    "node_modules/@shikijs/langs": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.1.0.tgz",
+      "integrity": "sha512-Jn0gS4rPgerMDPj1ydjgFzZr5fAIoMYz4k7ZT3LJxWWBWA6lokK0pumUwVtb+MzXtlpjxOaQejLprmLbvMZyww==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/types": "2.1.0"
+      }
+    },
+    "node_modules/@shikijs/themes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.1.0.tgz",
+      "integrity": "sha512-oS2mU6+bz+8TKutsjBxBA7Z3vrQk21RCmADLpnu8cy3tZD6Rw0FKqDyXNtwX52BuIDKHxZNmRlTdG3vtcYv3NQ==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/types": "2.1.0"
+      }
+    },
+    "node_modules/@shikijs/transformers": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.1.0.tgz",
+      "integrity": "sha512-3sfvh6OKUVkT5wZFU1xxiq1qqNIuCwUY3yOb9ZGm19y80UZ/eoroLE2orGNzfivyTxR93GfXXZC/ghPR0/SBow==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/core": "2.1.0",
+        "@shikijs/types": "2.1.0"
+      }
+    },
+    "node_modules/@shikijs/types": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.1.0.tgz",
+      "integrity": "sha512-OFOdHA6VEVbiQvepJ8yqicC6VmBrKxFFhM2EsHHrZESqLVAXOSeRDiuSYV185lIgp15TVic5vYBYNhTsk1xHLg==",
+      "dev": true,
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.1",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/vscode-textmate": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.1.tgz",
+      "integrity": "sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==",
       "dev": true
     },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true
+    },
+    "node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
     "node_modules/@types/linkify-it": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
-      "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
       "dev": true
     },
     "node_modules/@types/markdown-it": {
-      "version": "13.0.7",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-13.0.7.tgz",
-      "integrity": "sha512-U/CBi2YUUcTHBt5tjO2r5QV/x0Po6nsYwQU4Y04fBS6vfoImaiZ6f8bi3CjTCxBPQSO1LMyUqkByzi8AidyxfA==",
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
       "dependencies": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdast": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "*"
       }
     },
     "node_modules/@types/mdurl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
-      "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true
+    },
+    "node_modules/@types/unist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
       "dev": true
     },
     "node_modules/@types/web-bluetooth": {
@@ -851,219 +1117,199 @@
       "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
       "dev": true
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true
+    },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz",
-      "integrity": "sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.1.tgz",
+      "integrity": "sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==",
       "dev": true,
       "engines": {
         "node": "^18.0.0 || >=20.0.0"
       },
       "peerDependencies": {
-        "vite": "^5.0.0",
+        "vite": "^5.0.0 || ^6.0.0",
         "vue": "^3.2.25"
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
-      "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
+      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
       "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.23.9",
-        "@vue/shared": "3.4.21",
+        "@babel/parser": "^7.25.3",
+        "@vue/shared": "3.5.13",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.0.2"
+        "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
-      "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
+      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
       "dev": true,
       "dependencies": {
-        "@vue/compiler-core": "3.4.21",
-        "@vue/shared": "3.4.21"
+        "@vue/compiler-core": "3.5.13",
+        "@vue/shared": "3.5.13"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
-      "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
+      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
       "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.23.9",
-        "@vue/compiler-core": "3.4.21",
-        "@vue/compiler-dom": "3.4.21",
-        "@vue/compiler-ssr": "3.4.21",
-        "@vue/shared": "3.4.21",
+        "@babel/parser": "^7.25.3",
+        "@vue/compiler-core": "3.5.13",
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.7",
-        "postcss": "^8.4.35",
-        "source-map-js": "^1.0.2"
+        "magic-string": "^0.30.11",
+        "postcss": "^8.4.48",
+        "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
-      "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
+      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
       "dev": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.4.21",
-        "@vue/shared": "3.4.21"
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/shared": "3.5.13"
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "7.0.16",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.0.16.tgz",
-      "integrity": "sha512-fZG2CG8624qphMf4aj59zNHckMx1G3lxODUuyM9USKuLznXCh66TP+tEbPOCcml16hA0GizJ4D8w6F34hrfbcw==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.1.tgz",
+      "integrity": "sha512-Cexc8GimowoDkJ6eNelOPdYIzsu2mgNyp0scOQ3tiaYSb9iok6LOESSsJvHaI+ib3joRfqRJNLkHFjhNuWA5dg==",
       "dev": true,
       "dependencies": {
-        "@vue/devtools-kit": "^7.0.16"
+        "@vue/devtools-kit": "^7.7.1"
       }
     },
     "node_modules/@vue/devtools-kit": {
-      "version": "7.0.16",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.0.16.tgz",
-      "integrity": "sha512-IA8SSGiZbNgOi4wLT3mRvd71Q9KE0KvMfGk6haa2GZ6bL2K/xMA8Fvvj3o1maspfUXrGcCXutaqbLqbGx/espQ==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.1.tgz",
+      "integrity": "sha512-yhZ4NPnK/tmxGtLNQxmll90jIIXdb2jAhPF76anvn5M/UkZCiLJy28bYgPIACKZ7FCosyKoaope89/RsFJll1w==",
       "dev": true,
       "dependencies": {
-        "@vue/devtools-shared": "^7.0.16",
+        "@vue/devtools-shared": "^7.7.1",
+        "birpc": "^0.2.19",
         "hookable": "^5.5.3",
         "mitt": "^3.0.1",
         "perfect-debounce": "^1.0.0",
-        "speakingurl": "^14.0.1"
-      },
-      "peerDependencies": {
-        "vue": "^3.0.0"
+        "speakingurl": "^14.0.1",
+        "superjson": "^2.2.1"
       }
     },
     "node_modules/@vue/devtools-shared": {
-      "version": "7.0.16",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.0.16.tgz",
-      "integrity": "sha512-Lew4FrGjDjmanaUWSueNE1Rre83k7jQpttc17MaoVw0eARWU5DgZ1F/g9GNUMZXVjbP9rwE+LL3gd9XfXCfkvA==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.1.tgz",
+      "integrity": "sha512-BtgF7kHq4BHG23Lezc/3W2UhK2ga7a8ohAIAGJMBr4BkxUFzhqntQtCiuL1ijo2ztWnmusymkirgqUrXoQKumA==",
       "dev": true,
       "dependencies": {
-        "rfdc": "^1.3.1"
+        "rfdc": "^1.4.1"
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.21.tgz",
-      "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
+      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
       "dev": true,
       "dependencies": {
-        "@vue/shared": "3.4.21"
+        "@vue/shared": "3.5.13"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
-      "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
+      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
       "dev": true,
       "dependencies": {
-        "@vue/reactivity": "3.4.21",
-        "@vue/shared": "3.4.21"
+        "@vue/reactivity": "3.5.13",
+        "@vue/shared": "3.5.13"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
-      "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
+      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
       "dev": true,
       "dependencies": {
-        "@vue/runtime-core": "3.4.21",
-        "@vue/shared": "3.4.21",
+        "@vue/reactivity": "3.5.13",
+        "@vue/runtime-core": "3.5.13",
+        "@vue/shared": "3.5.13",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
-      "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
+      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
       "dev": true,
       "dependencies": {
-        "@vue/compiler-ssr": "3.4.21",
-        "@vue/shared": "3.4.21"
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13"
       },
       "peerDependencies": {
-        "vue": "3.4.21"
+        "vue": "3.5.13"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
-      "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
+      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
       "dev": true
     },
     "node_modules/@vueuse/core": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.9.0.tgz",
-      "integrity": "sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.5.0.tgz",
+      "integrity": "sha512-GVyH1iYqNANwcahAx8JBm6awaNgvR/SwZ1fjr10b8l1HIgDp82ngNbfzJUgOgWEoxjL+URAggnlilAEXwCOZtg==",
       "dev": true,
       "dependencies": {
         "@types/web-bluetooth": "^0.0.20",
-        "@vueuse/metadata": "10.9.0",
-        "@vueuse/shared": "10.9.0",
-        "vue-demi": ">=0.14.7"
+        "@vueuse/metadata": "12.5.0",
+        "@vueuse/shared": "12.5.0",
+        "vue": "^3.5.13"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/@vueuse/core/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@vueuse/integrations": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-10.9.0.tgz",
-      "integrity": "sha512-acK+A01AYdWSvL4BZmCoJAcyHJ6EqhmkQEXbQLwev1MY7NBnS+hcEMx/BzVoR9zKI+UqEPMD9u6PsyAuiTRT4Q==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.5.0.tgz",
+      "integrity": "sha512-HYLt8M6mjUfcoUOzyBcX2RjpfapIwHPBmQJtTmXOQW845Y/Osu9VuTJ5kPvnmWJ6IUa05WpblfOwZ+P0G4iZsQ==",
       "dev": true,
       "dependencies": {
-        "@vueuse/core": "10.9.0",
-        "@vueuse/shared": "10.9.0",
-        "vue-demi": ">=0.14.7"
+        "@vueuse/core": "12.5.0",
+        "@vueuse/shared": "12.5.0",
+        "vue": "^3.5.13"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       },
       "peerDependencies": {
-        "async-validator": "*",
-        "axios": "*",
-        "change-case": "*",
-        "drauu": "*",
-        "focus-trap": "*",
-        "fuse.js": "*",
-        "idb-keyval": "*",
-        "jwt-decode": "*",
-        "nprogress": "*",
-        "qrcode": "*",
-        "sortablejs": "*",
-        "universal-cookie": "*"
+        "async-validator": "^4",
+        "axios": "^1",
+        "change-case": "^5",
+        "drauu": "^0.4",
+        "focus-trap": "^7",
+        "fuse.js": "^7",
+        "idb-keyval": "^6",
+        "jwt-decode": "^4",
+        "nprogress": "^0.2",
+        "qrcode": "^1.5",
+        "sortablejs": "^1",
+        "universal-cookie": "^7"
       },
       "peerDependenciesMeta": {
         "async-validator": {
@@ -1104,99 +1350,49 @@
         }
       }
     },
-    "node_modules/@vueuse/integrations/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@vueuse/metadata": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.9.0.tgz",
-      "integrity": "sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.5.0.tgz",
+      "integrity": "sha512-Ui7Lo2a7AxrMAXRF+fAp9QsXuwTeeZ8fIB9wsLHqzq9MQk+2gMYE2IGJW48VMJ8ecvCB3z3GsGLKLbSasQ5Qlg==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/@vueuse/shared": {
-      "version": "10.9.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.9.0.tgz",
-      "integrity": "sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.5.0.tgz",
+      "integrity": "sha512-vMpcL1lStUU6O+kdj6YdHDixh0odjPAUM15uJ9f7MY781jcYkIwFA4iv2EfoIPO6vBmvutI1HxxAwmf0cx5ISQ==",
       "dev": true,
       "dependencies": {
-        "vue-demi": ">=0.14.7"
+        "vue": "^3.5.13"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/@vueuse/shared/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/algoliasearch": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.22.1.tgz",
-      "integrity": "sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.20.0.tgz",
+      "integrity": "sha512-groO71Fvi5SWpxjI9Ia+chy0QBwT61mg6yxJV27f5YFf+Mw+STT75K6SHySpP8Co5LsCrtsbCH5dJZSRtkSKaQ==",
       "dev": true,
       "dependencies": {
-        "@algolia/cache-browser-local-storage": "4.22.1",
-        "@algolia/cache-common": "4.22.1",
-        "@algolia/cache-in-memory": "4.22.1",
-        "@algolia/client-account": "4.22.1",
-        "@algolia/client-analytics": "4.22.1",
-        "@algolia/client-common": "4.22.1",
-        "@algolia/client-personalization": "4.22.1",
-        "@algolia/client-search": "4.22.1",
-        "@algolia/logger-common": "4.22.1",
-        "@algolia/logger-console": "4.22.1",
-        "@algolia/requester-browser-xhr": "4.22.1",
-        "@algolia/requester-common": "4.22.1",
-        "@algolia/requester-node-http": "4.22.1",
-        "@algolia/transporter": "4.22.1"
+        "@algolia/client-abtesting": "5.20.0",
+        "@algolia/client-analytics": "5.20.0",
+        "@algolia/client-common": "5.20.0",
+        "@algolia/client-insights": "5.20.0",
+        "@algolia/client-personalization": "5.20.0",
+        "@algolia/client-query-suggestions": "5.20.0",
+        "@algolia/client-search": "5.20.0",
+        "@algolia/ingestion": "1.20.0",
+        "@algolia/monitoring": "1.20.0",
+        "@algolia/recommend": "5.20.0",
+        "@algolia/requester-browser-xhr": "5.20.0",
+        "@algolia/requester-fetch": "5.20.0",
+        "@algolia/requester-node-http": "5.20.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
       }
     },
     "node_modules/argparse": {
@@ -1205,6 +1401,15 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
+    "node_modules/birpc": {
+      "version": "0.2.19",
+      "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.19.tgz",
+      "integrity": "sha512-5WeXXAvTmitV1RqJFppT5QtUiz2p1mRSYU000Jkft5ZUCLJIk4uQriYNO50HknxKwM6jd8utNc66K1qGIwwWBQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -1229,12 +1434,95 @@
         "node": ">= 10"
       }
     },
+    "node_modules/ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/comma-separated-tokens": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/copy-anything": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
+      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+      "dev": true,
+      "dependencies": {
+        "is-what": "^4.1.8"
+      },
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
       "dev": true
     },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/devlop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/emoji-regex-xs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
+      "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
+      "dev": true
+    },
     "node_modules/entities": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -1248,9 +1536,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -1260,29 +1548,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -1301,9 +1589,9 @@
       "dev": true
     },
     "node_modules/focus-trap": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.4.tgz",
-      "integrity": "sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==",
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.4.tgz",
+      "integrity": "sha512-xx560wGBk7seZ6y933idtjJQc1l+ck+pI3sKvhKozdBV1dRZoKhkW5xoCaFv9tQiX5RH1xfSxjuNu6g+lmN/gw==",
       "dev": true,
       "dependencies": {
         "tabbable": "^6.2.0"
@@ -1329,12 +1617,70 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
+    "node_modules/hast-util-to-html": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.4.tgz",
+      "integrity": "sha512-wxQzXtdbhiwGAUKrnQJXlOPmHnEehzphwkK7aluUPQ+lEc1xefC8pblMgpp2w5ldBTEfveRIrADcrhGIWrlTDA==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-whitespace": "^3.0.0",
+        "html-void-elements": "^3.0.0",
+        "mdast-util-to-hast": "^13.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.0",
+        "zwitch": "^2.0.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-whitespace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+      "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/hookable": {
       "version": "5.5.3",
       "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
       "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
       "dev": true
     },
+    "node_modules/html-void-elements": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/is-what": {
+      "version": "4.1.16",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz",
+      "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
     "node_modules/js2xmlparser": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
@@ -1408,15 +1754,12 @@
       "dev": true
     },
     "node_modules/magic-string": {
-      "version": "0.30.8",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/mark.js": {
@@ -1472,16 +1815,126 @@
         "node": ">= 12"
       }
     },
+    "node_modules/mdast-util-to-hast": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz",
+      "integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
       "dev": true
     },
+    "node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-encode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-sanitize-uri": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-types": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.1.tgz",
+      "integrity": "sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
     "node_modules/minisearch": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-6.3.0.tgz",
-      "integrity": "sha512-ihFnidEeU8iXzcVHy74dhkxh/dn8Dc08ERl0xwoMMGqp4+LvRSCgicb+zGqWthVokQKvCSxITlh3P08OzdTYCQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.1.1.tgz",
+      "integrity": "sha512-b3YZEYCEH4EdCAtYP7OlDyx7FdPwNzuNwLQ34SfJpM9dlbBZzeXndGavTrC+VCiRWomL21SWfMc6SCKO/U2ZNw==",
       "dev": true
     },
     "node_modules/mitt": {
@@ -1503,9 +1956,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "dev": true,
       "funding": [
         {
@@ -1520,6 +1973,17 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/oniguruma-to-es": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-2.3.0.tgz",
+      "integrity": "sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex-xs": "^1.0.0",
+        "regex": "^5.1.1",
+        "regex-recursion": "^5.1.1"
+      }
+    },
     "node_modules/perfect-debounce": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
@@ -1527,15 +1991,15 @@
       "dev": true
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true
     },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
+      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
       "dev": true,
       "funding": [
         {
@@ -1552,24 +2016,59 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
       }
     },
     "node_modules/preact": {
-      "version": "10.20.0",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.20.0.tgz",
-      "integrity": "sha512-wU7iZw2BjsaKDal3pDRDy/HpPB6cuFOnVUCcw9aIPKG98+ZrXx3F+szkos8BVME5bquyKDKvRlOJFG8kMkcAbg==",
+      "version": "10.25.4",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.25.4.tgz",
+      "integrity": "sha512-jLdZDb+Q+odkHJ+MpW/9U5cODzqnB+fy2EiHSZES7ldV5LK7yjlVzTp7R8Xy6W6y75kfK8iWYtFVH7lvjwrCMA==",
       "dev": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
       }
     },
+    "node_modules/property-information": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+      "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/regex": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/regex/-/regex-5.1.1.tgz",
+      "integrity": "sha512-dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw==",
+      "dev": true,
+      "dependencies": {
+        "regex-utilities": "^2.3.0"
+      }
+    },
+    "node_modules/regex-recursion": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-5.1.1.tgz",
+      "integrity": "sha512-ae7SBCbzVNrIjgSbh7wMznPcQel1DNlDtzensnFxpiNpXt1U2ju/bHugH422r+4LAVS1FpW1YCwilmnNsjum9w==",
+      "dev": true,
+      "dependencies": {
+        "regex": "^5.1.1",
+        "regex-utilities": "^2.3.0"
+      }
+    },
+    "node_modules/regex-utilities": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
+      "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
+      "dev": true
+    },
     "node_modules/requizzle": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
@@ -1580,18 +2079,18 @@
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz",
-      "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true
     },
     "node_modules/rollup": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
-      "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.0.tgz",
+      "integrity": "sha512-JmrhfQR31Q4AuNBjjAX4s+a/Pu/Q8Q9iwjWBsjRH1q52SPFE2NqRMK6fUZKKnvKO6id+h7JIRf0oYsph53eATg==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1601,47 +2100,70 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.13.0",
-        "@rollup/rollup-android-arm64": "4.13.0",
-        "@rollup/rollup-darwin-arm64": "4.13.0",
-        "@rollup/rollup-darwin-x64": "4.13.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.13.0",
-        "@rollup/rollup-linux-arm64-musl": "4.13.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.13.0",
-        "@rollup/rollup-linux-x64-gnu": "4.13.0",
-        "@rollup/rollup-linux-x64-musl": "4.13.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.13.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.13.0",
-        "@rollup/rollup-win32-x64-msvc": "4.13.0",
+        "@rollup/rollup-android-arm-eabi": "4.32.0",
+        "@rollup/rollup-android-arm64": "4.32.0",
+        "@rollup/rollup-darwin-arm64": "4.32.0",
+        "@rollup/rollup-darwin-x64": "4.32.0",
+        "@rollup/rollup-freebsd-arm64": "4.32.0",
+        "@rollup/rollup-freebsd-x64": "4.32.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.32.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.32.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.32.0",
+        "@rollup/rollup-linux-arm64-musl": "4.32.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.32.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.32.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.32.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.32.0",
+        "@rollup/rollup-linux-x64-gnu": "4.32.0",
+        "@rollup/rollup-linux-x64-musl": "4.32.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.32.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.32.0",
+        "@rollup/rollup-win32-x64-msvc": "4.32.0",
         "fsevents": "~2.3.2"
       }
     },
     "node_modules/search-insights": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.13.0.tgz",
-      "integrity": "sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==",
+      "version": "2.17.3",
+      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
+      "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
       "dev": true,
       "peer": true
     },
     "node_modules/shiki": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.2.0.tgz",
-      "integrity": "sha512-xLhiTMOIUXCv5DqJ4I70GgQCtdlzsTqFLZWcMHHG3TAieBUbvEGthdrlPDlX4mL/Wszx9C6rEcxU6kMlg4YlxA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.1.0.tgz",
+      "integrity": "sha512-yvKPdNGLXZv7WC4bl7JBbU3CEcUxnBanvMez8MG3gZXKpClGL4bHqFyLhTx+2zUvbjClUANs/S22HXb7aeOgmA==",
       "dev": true,
       "dependencies": {
-        "@shikijs/core": "1.2.0"
+        "@shikijs/core": "2.1.0",
+        "@shikijs/engine-javascript": "2.1.0",
+        "@shikijs/engine-oniguruma": "2.1.0",
+        "@shikijs/langs": "2.1.0",
+        "@shikijs/themes": "2.1.0",
+        "@shikijs/types": "2.1.0",
+        "@shikijs/vscode-textmate": "^10.0.1",
+        "@types/hast": "^3.0.4"
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/space-separated-tokens": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/speakingurl": {
       "version": "14.0.1",
       "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
@@ -1651,6 +2173,20 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/stringify-entities": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
+      "dev": true,
+      "dependencies": {
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -1663,12 +2199,34 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/superjson": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.2.tgz",
+      "integrity": "sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==",
+      "dev": true,
+      "dependencies": {
+        "copy-anything": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/tabbable": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
       "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
       "dev": true
     },
+    "node_modules/trim-lines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
@@ -1681,15 +2239,111 @@
       "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
       "dev": true
     },
-    "node_modules/vite": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.3.tgz",
-      "integrity": "sha512-+i1oagbvkVIhEy9TnEV+fgXsng13nZM90JQbrcPrf6DvW2mXARlz+DK7DLiDP+qeKoD1FCVx/1SpFL1CLq9Mhw==",
+    "node_modules/unist-util-is": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+      "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.20.1",
-        "postcss": "^8.4.36",
-        "rollup": "^4.13.0"
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-position": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit-parents": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
+      "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-message": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
+      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.4.14",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
+      "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -1708,6 +2362,7 @@
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -1725,6 +2380,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -1737,26 +2395,29 @@
       }
     },
     "node_modules/vitepress": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.1.tgz",
-      "integrity": "sha512-eNr5pOBppYUUjEhv8S0S2t9Tv95LQ6mMeHj6ivaGwfHxpov70Vduuwl/QQMDRznKDSaP0WKV7a82Pb4JVOaqEw==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.3.tgz",
+      "integrity": "sha512-fCkfdOk8yRZT8GD9BFqusW3+GggWYZ/rYncOfmgcDtP3ualNHCAg+Robxp2/6xfH1WwPHtGpPwv7mbA3qomtBw==",
       "dev": true,
       "dependencies": {
-        "@docsearch/css": "^3.6.0",
-        "@docsearch/js": "^3.6.0",
-        "@shikijs/core": "^1.2.0",
-        "@shikijs/transformers": "^1.2.0",
-        "@types/markdown-it": "^13.0.7",
-        "@vitejs/plugin-vue": "^5.0.4",
-        "@vue/devtools-api": "^7.0.16",
-        "@vueuse/core": "^10.9.0",
-        "@vueuse/integrations": "^10.9.0",
-        "focus-trap": "^7.5.4",
+        "@docsearch/css": "3.8.2",
+        "@docsearch/js": "3.8.2",
+        "@iconify-json/simple-icons": "^1.2.21",
+        "@shikijs/core": "^2.1.0",
+        "@shikijs/transformers": "^2.1.0",
+        "@shikijs/types": "^2.1.0",
+        "@types/markdown-it": "^14.1.2",
+        "@vitejs/plugin-vue": "^5.2.1",
+        "@vue/devtools-api": "^7.7.0",
+        "@vue/shared": "^3.5.13",
+        "@vueuse/core": "^12.4.0",
+        "@vueuse/integrations": "^12.4.0",
+        "focus-trap": "^7.6.4",
         "mark.js": "8.11.1",
-        "minisearch": "^6.3.0",
-        "shiki": "^1.2.0",
-        "vite": "^5.2.2",
-        "vue": "^3.4.21"
+        "minisearch": "^7.1.1",
+        "shiki": "^2.1.0",
+        "vite": "^5.4.14",
+        "vue": "^3.5.13"
       },
       "bin": {
         "vitepress": "bin/vitepress.js"
@@ -1775,16 +2436,16 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.4.21",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz",
-      "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
+      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
       "dev": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.4.21",
-        "@vue/compiler-sfc": "3.4.21",
-        "@vue/runtime-dom": "3.4.21",
-        "@vue/server-renderer": "3.4.21",
-        "@vue/shared": "3.4.21"
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-sfc": "3.5.13",
+        "@vue/runtime-dom": "3.5.13",
+        "@vue/server-renderer": "3.5.13",
+        "@vue/shared": "3.5.13"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -1805,6 +2466,16 @@
       "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
       "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
       "dev": true
+    },
+    "node_modules/zwitch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
     }
   }
 }
diff --git a/v3-docs/docs/package.json b/v3-docs/docs/package.json
index 748ffdba66..5d5223c82b 100644
--- a/v3-docs/docs/package.json
+++ b/v3-docs/docs/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "canonical-json": "^0.0.4",
     "jsdoc": "^4.0.2",
-    "vitepress": "1.0.1"
+    "vitepress": "1.6.3"
   },
   "dependencies": {
     "vue-collapsed": "^1.3.0"

From b943df84f58c98063901c1c4de2aab1d5233ef13 Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Mon, 27 Jan 2025 18:55:15 -0300
Subject: [PATCH 0991/1140] Update documentation with new Meteor logo and minor
 text adjustments

---
 v3-docs/docs/.vitepress/config.mts |   2 +-
 v3-docs/docs/index.md              |   4 ++--
 v3-docs/docs/public/logo.png       | Bin 102152 -> 31050 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 7470128bd5..07d33f8773 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -15,7 +15,7 @@ export default defineConfig({
         "data-website-id": "64051b0e-d79f-4fe7-b3ca-ff5c84075693",
         "data-project-name": "Meteor",
         "data-project-color": "#36436b",
-        "data-project-logo": "https://v3-docs.meteor.com/logo.png",
+        "data-project-logo": "/logo.png",
         "data-modal-disclaimer":
           "This is a custom LLM for answering questions about Meteor. Answers are based on the contents of the docs, answered forum posts, YouTube videos and GitHub issues. Please note that answers are generated by AI and may not be fully accurate, so please use your best judgement.",
       },
diff --git a/v3-docs/docs/index.md b/v3-docs/docs/index.md
index 84434df490..8f97a7ecb7 100644
--- a/v3-docs/docs/index.md
+++ b/v3-docs/docs/index.md
@@ -3,8 +3,8 @@
 layout: home
 
 hero:
-  text: "Meteor.js Docs"
-  tagline: "Documentation, resources, and API references to help you build and deploy with Meteor.js."
+  text: "Meteor Docs"
+  tagline: "Documentation, resources, and API references to help you build and deploy with Meteor."
   image:
     src: /logo.png
     alt: Meteor
diff --git a/v3-docs/docs/public/logo.png b/v3-docs/docs/public/logo.png
index c3335379817970a92643801d2ce60569d9fd5b17..8644c2a46ee526db41e5ba8a7f45bc090df4bcbb 100644
GIT binary patch
literal 31050
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

literal 102152
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%0D#x2*
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


From 1a1030e4602640359033e12741e211c289b0be74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:37:37 +0000
Subject: [PATCH 0992/1140] Bump send and serve-static in /docs

Bumps [send](https://github.com/pillarjs/send) and [serve-static](https://github.com/expressjs/serve-static). These dependencies needed to be updated together.

Updates `send` from 0.18.0 to 0.19.0
- [Release notes](https://github.com/pillarjs/send/releases)
- [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md)
- [Commits](https://github.com/pillarjs/send/compare/0.18.0...0.19.0)

Updates `serve-static` from 1.15.0 to 1.16.2
- [Release notes](https://github.com/expressjs/serve-static/releases)
- [Changelog](https://github.com/expressjs/serve-static/blob/v1.16.2/HISTORY.md)
- [Commits](https://github.com/expressjs/serve-static/compare/v1.15.0...v1.16.2)

---
updated-dependencies:
- dependency-name: send
  dependency-type: indirect
- dependency-name: serve-static
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/package-lock.json | 5885 ++++++++++++++++++++++++----------------
 1 file changed, 3563 insertions(+), 2322 deletions(-)

diff --git a/docs/package-lock.json b/docs/package-lock.json
index 7965d6e9ba..b859702c83 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1,336 +1,407 @@
 {
   "name": "hexo-site",
   "version": "0.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@babel/parser": {
+  "packages": {
+    "": {
+      "version": "0.0.0",
+      "devDependencies": {
+        "@meteorjs/meteor-hexo-config": "1.0.14",
+        "@meteorjs/meteor-theme-hexo": "2.0.8",
+        "canonical-json": "0.0.4",
+        "chexo": "1.0.7",
+        "handlebars": "4.7.7",
+        "hexo": "3.9.0",
+        "hexo-prism-plus": "1.1.0",
+        "hexo-renderer-ejs": "1.0.0",
+        "hexo-renderer-less": "0.2.0",
+        "hexo-renderer-marked": "2.0.0",
+        "hexo-server": "1.0.0",
+        "hexo-versioned-netlify-redirects": "1.1.0",
+        "jsdoc": "^4.0.2",
+        "showdown": "1.9.1",
+        "underscore": "1.13.1"
+      }
+    },
+    "node_modules/@babel/parser": {
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
       "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
     },
-    "@jsdoc/salty": {
+    "node_modules/@jsdoc/salty": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.6.tgz",
       "integrity": "sha512-aA+awb5yoml8TQ3CzI5Ue7sM3VMRC4l1zJJW4fgZ8OCL1wshJZhNzaf0PL85DSnOUw6QuFgeHGD/eq/xwwAF2g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=v12.0.0"
       }
     },
-    "@meteorjs/meteor-hexo-config": {
+    "node_modules/@meteorjs/meteor-hexo-config": {
       "version": "1.0.14",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-hexo-config/-/meteor-hexo-config-1.0.14.tgz",
       "integrity": "sha512-Vl4cEMEoVw2JV8qTBsqaq+YL7MRHasTtE88WJa5BGBYMfN35Yk0yeYwVc2OTFJ/cGiQcPEaC0RvRKVyNJfwIGQ==",
       "dev": true
     },
-    "@meteorjs/meteor-theme-hexo": {
+    "node_modules/@meteorjs/meteor-theme-hexo": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-theme-hexo/-/meteor-theme-hexo-2.0.8.tgz",
       "integrity": "sha512-LQIFN05wBMjX7SXgW5CFVTfolDWMuknoypwQ0czl/44LYRBR4/LYZUgX6c+1vLjloJb+5+2HTvMGlVN9Wo1MKA==",
-      "dev": true
+      "dev": true,
+      "hasShrinkwrap": true
     },
-    "@types/linkify-it": {
+    "node_modules/@types/linkify-it": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
       "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
       "dev": true
     },
-    "@types/markdown-it": {
+    "node_modules/@types/markdown-it": {
       "version": "12.2.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
       "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "@types/linkify-it": "*",
         "@types/mdurl": "*"
       }
     },
-    "@types/mdurl": {
+    "node_modules/@types/mdurl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
       "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
       "dev": true
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
-    "a-sync-waterfall": {
+    "node_modules/a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
       "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
       "dev": true
     },
-    "abbrev": {
+    "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
-    "accepts": {
+    "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "acorn": {
+    "node_modules/acorn": {
       "version": "6.4.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
       "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
-    "ajv": {
+    "node_modules/ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "co": "^4.6.0",
         "json-stable-stringify": "^1.0.1"
       }
     },
-    "align-text": {
+    "node_modules/align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
       "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2",
         "longest": "^1.0.1",
         "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "ansi-regex": {
+    "node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "ansi-styles": {
+    "node_modules/ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "anymatch": {
+    "node_modules/anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
       "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "micromatch": "^2.1.5",
         "normalize-path": "^2.0.0"
       }
     },
-    "archy": {
+    "node_modules/archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
-    "argparse": {
+    "node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
-    "arr-diff": {
+    "node_modules/arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-flatten": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "arr-flatten": {
+    "node_modules/arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "arr-union": {
+    "node_modules/arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "array-unique": {
+    "node_modules/array-unique": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "asap": {
+    "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "dev": true
     },
-    "asn1": {
+    "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "safer-buffer": "~2.1.0"
       }
     },
-    "assert-plus": {
+    "node_modules/assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
       "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
     },
-    "assign-symbols": {
+    "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "async": {
+    "node_modules/async": {
       "version": "0.2.10",
       "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
       "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
       "dev": true
     },
-    "async-each": {
+    "node_modules/async-each": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
       "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
-      "dev": true
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
-    "asynckit": {
+    "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true,
       "optional": true
     },
-    "atob": {
+    "node_modules/atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
     },
-    "aws-sign2": {
+    "node_modules/aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
       "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "aws4": {
+    "node_modules/aws4": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
       "dev": true,
       "optional": true
     },
-    "babel-code-frame": {
+    "node_modules/babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
       }
     },
-    "babel-messages": {
+    "node_modules/babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.22.0"
       }
     },
-    "babel-plugin-syntax-decorators": {
+    "node_modules/babel-plugin-syntax-decorators": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha512-AWj19x2aDm8qFQ5O2JcD6pwJDW1YdcnO+1b81t7gxrGjz5VHiUqeYWAR4h7zueWMalRelrQDXprv2FrY1dbpbw==",
       "dev": true
     },
-    "babel-plugin-transform-decorators-legacy": {
+    "node_modules/babel-plugin-transform-decorators-legacy": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz",
       "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-plugin-syntax-decorators": "^6.1.18",
         "babel-runtime": "^6.2.0",
         "babel-template": "^6.3.0"
       }
     },
-    "babel-polyfill": {
+    "node_modules/babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
         "regenerator-runtime": "^0.10.5"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        },
-        "regenerator-runtime": {
-          "version": "0.10.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-          "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
-          "dev": true
-        }
       }
     },
-    "babel-runtime": {
+    "node_modules/babel-polyfill/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+      "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
+      "dev": true
+    },
+    "node_modules/babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        }
       }
     },
-    "babel-template": {
+    "node_modules/babel-runtime/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
         "babel-types": "^6.26.0",
@@ -338,12 +409,12 @@
         "lodash": "^4.17.4"
       }
     },
-    "babel-traverse": {
+    "node_modules/babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
         "babel-runtime": "^6.26.0",
@@ -355,36 +426,39 @@
         "lodash": "^4.17.4"
       }
     },
-    "babel-types": {
+    "node_modules/babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
         "lodash": "^4.17.4",
         "to-fast-properties": "^1.0.3"
       }
     },
-    "babylon": {
+    "node_modules/babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "babylon": "bin/babylon.js"
+      }
     },
-    "balanced-match": {
+    "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "base": {
+    "node_modules/base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
         "component-emitter": "^1.2.1",
@@ -393,130 +467,156 @@
         "mixin-deep": "^1.2.0",
         "pascalcase": "^0.1.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "basic-auth": {
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/basic-auth": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
       "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "bcrypt-pbkdf": {
+    "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "tweetnacl": "^0.14.3"
       }
     },
-    "binary-extensions": {
+    "node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "bindings": {
+    "node_modules/bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "file-uri-to-path": "1.0.0"
       }
     },
-    "bluebird": {
+    "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "boolbase": {
+    "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
-    "boom": {
+    "node_modules/boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "hoek": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.10.40"
       }
     },
-    "brace-expansion": {
+    "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "braces": {
+    "node_modules/braces": {
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
       "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "expand-range": "^1.8.1",
         "preserve": "^0.2.0",
         "repeat-element": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "browser-fingerprint": {
+    "node_modules/browser-fingerprint": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
       "integrity": "sha512-b8SXP7yOlzLUJXF8WUvIjmbJzkJC0X6OHe7J9a/SHqEBC7a9Eglag6AANSTJz82h5U582kuxm/5TPudnD68EPA==",
       "dev": true
     },
-    "bytes": {
+    "node_modules/bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "cache-base": {
+    "node_modules/cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
         "get-value": "^2.0.6",
@@ -527,96 +627,118 @@
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "call-bind": {
+    "node_modules/cache-base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/call-bind": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
       "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
         "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "camel-case": {
+    "node_modules/camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
       "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "no-case": "^2.2.0",
         "upper-case": "^1.1.1"
       }
     },
-    "camelcase": {
+    "node_modules/camelcase": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
       "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "canonical-json": {
+    "node_modules/canonical-json": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/canonical-json/-/canonical-json-0.0.4.tgz",
       "integrity": "sha512-2sW7x0m/P7dqEnO0O87U7RTVQAaa7MELcd+Jd9FA6CYgYtwJ1TlDWIYMD8nuMkH1KoThsJogqgLyklrt9d/Azw==",
       "dev": true
     },
-    "caseless": {
+    "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true,
       "optional": true
     },
-    "catharsis": {
+    "node_modules/catharsis": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
       "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash": "^4.17.15"
+      },
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "center-align": {
+    "node_modules/center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "align-text": "^0.1.3",
         "lazy-cache": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "chalk": {
+    "node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
         "has-ansi": "^2.0.0",
         "strip-ansi": "^3.0.0",
         "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "cheerio": {
+    "node_modules/cheerio": {
       "version": "0.22.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
       "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "css-select": "~1.2.0",
         "dom-serializer": "~0.1.0",
         "entities": "~1.1.1",
@@ -633,179 +755,218 @@
         "lodash.reduce": "^4.4.0",
         "lodash.reject": "^4.4.0",
         "lodash.some": "^4.4.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "chexo": {
+    "node_modules/chexo": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/chexo/-/chexo-1.0.7.tgz",
       "integrity": "sha512-7ScGKzHsZDLpCZhzIypwbK+hkx1fkWZjeLemEkmnreThGLNWhLRDC4gJ/Wu04jAbH0zYR/ev0QPAACEnaYXrcA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hexo-cli": "^1.1.0",
         "minimist": "^1.2.0"
       },
-      "dependencies": {
-        "hexo-cli": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
-          "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
-          "dev": true,
-          "requires": {
-            "abbrev": "^1.0.7",
-            "bluebird": "^3.4.0",
-            "chalk": "^1.1.3",
-            "command-exists": "^1.2.0",
-            "hexo-fs": "^0.2.0",
-            "hexo-log": "^0.2.0",
-            "hexo-util": "^0.6.0",
-            "minimist": "^1.2.0",
-            "object-assign": "^4.1.0",
-            "resolve": "^1.5.0",
-            "tildify": "^1.2.0"
-          }
-        }
+      "bin": {
+        "chexo": "bin/chexo"
+      },
+      "peerDependencies": {
+        "hexo": ">= 3.3.0 < 4"
       }
     },
-    "chokidar": {
+    "node_modules/chexo/node_modules/hexo-cli": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
+      "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "^1.0.7",
+        "bluebird": "^3.4.0",
+        "chalk": "^1.1.3",
+        "command-exists": "^1.2.0",
+        "hexo-fs": "^0.2.0",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.0",
+        "minimist": "^1.2.0",
+        "object-assign": "^4.1.0",
+        "resolve": "^1.5.0",
+        "tildify": "^1.2.0"
+      },
+      "bin": {
+        "hexo": "bin/hexo"
+      }
+    },
+    "node_modules/chokidar": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
       "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "anymatch": "^1.3.0",
         "async-each": "^1.0.0",
-        "fsevents": "^1.0.0",
         "glob-parent": "^2.0.0",
         "inherits": "^2.0.1",
         "is-binary-path": "^1.0.0",
         "is-glob": "^2.0.0",
         "path-is-absolute": "^1.0.0",
         "readdirp": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.0.0"
       }
     },
-    "class-utils": {
+    "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
         "isobject": "^3.0.0",
         "static-extend": "^0.1.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "cliui": {
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cliui": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
       "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "center-align": "^0.1.1",
         "right-align": "^0.1.1",
         "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-          "dev": true
-        }
       }
     },
-    "co": {
+    "node_modules/cliui/node_modules/wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
     },
-    "collection-visit": {
+    "node_modules/collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "color-convert": {
+    "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "color-name": "1.1.3"
       }
     },
-    "color-name": {
+    "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
-    "combined-stream": {
+    "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "command-exists": {
+    "node_modules/command-exists": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
       "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
       "dev": true
     },
-    "commander": {
+    "node_modules/commander": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
       "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
     },
-    "component-emitter": {
+    "node_modules/component-emitter": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
-      "dev": true
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "compressible": {
+    "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "compression": {
+    "node_modules/compression": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
         "compressible": "~2.0.16",
@@ -813,425 +974,532 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "concat-map": {
+    "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "connect": {
+    "node_modules/connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "copy-descriptor": {
+    "node_modules/copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "core-decorators": {
+    "node_modules/core-decorators": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/core-decorators/-/core-decorators-0.11.2.tgz",
       "integrity": "sha512-47n1NWwwc+qPmOMtY9zUKCM1cYfoxLvBRxKzirFrqhE61yqK+yZP/BOA3gjaBUVb9P46J1RyJjasrtqYoWCbvA==",
       "dev": true
     },
-    "core-js": {
+    "node_modules/core-js": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
       "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
       "dev": true
     },
-    "core-util-is": {
+    "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
-    "cross-spawn": {
+    "node_modules/cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
       "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lru-cache": "^4.0.1",
         "which": "^1.2.9"
       }
     },
-    "cryptiles": {
+    "node_modules/cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "boom": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.10.40"
       }
     },
-    "css-select": {
+    "node_modules/css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
       "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "boolbase": "~1.0.0",
         "css-what": "2.1",
         "domutils": "1.5.1",
         "nth-check": "~1.0.1"
       }
     },
-    "css-what": {
+    "node_modules/css-what": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
       "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "cuid": {
+    "node_modules/cuid": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
       "integrity": "sha512-MoL67ZZuBetDMxzrZtO+Iq1ATajFACQCP52QRinBgd3yTjYdv54mJO8ibUrh06fojKCoX5P2i7KkEatm4VTIOQ==",
+      "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "browser-fingerprint": "0.0.1",
         "core-js": "^1.1.1",
         "node-fingerprint": "0.0.2"
       }
     },
-    "dashdash": {
+    "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^1.0.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "debug": {
+    "node_modules/dashdash/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "decamelize": {
+    "node_modules/decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "decode-uri-component": {
+    "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "define-data-property": {
+    "node_modules/define-data-property": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
         "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "define-property": {
+    "node_modules/define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "delayed-stream": {
+    "node_modules/define-property/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/define-property/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
-    "depd": {
+    "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "destroy": {
+    "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
-    "dom-serializer": {
+    "node_modules/dom-serializer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
       "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "domelementtype": "^1.3.0",
         "entities": "^1.1.1"
       }
     },
-    "domelementtype": {
+    "node_modules/domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
-    "domhandler": {
+    "node_modules/domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "domelementtype": "1"
       }
     },
-    "domutils": {
+    "node_modules/domutils": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "dom-serializer": "0",
         "domelementtype": "1"
       }
     },
-    "ecc-jsbn": {
+    "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
-    "ee-first": {
+    "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
-    "ejs": {
+    "node_modules/ejs": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "dev": true
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "emoji-regex": {
+    "node_modules/emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
-    "encodeurl": {
+    "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "entities": {
+    "node_modules/entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
-    "errno": {
+    "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
       }
     },
-    "es-define-property": {
+    "node_modules/es-define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
       "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "es-errors": {
+    "node_modules/es-errors": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "escape-html": {
+    "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
-    "escape-string-regexp": {
+    "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "esprima": {
+    "node_modules/esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "esutils": {
+    "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "etag": {
+    "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "expand-brackets": {
+    "node_modules/expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-posix-bracket": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "expand-range": {
+    "node_modules/expand-range": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "fill-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extend": {
+    "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true,
       "optional": true
     },
-    "extend-shallow": {
+    "node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
       },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extglob": {
+    "node_modules/extend-shallow/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extsprintf": {
+    "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
       "optional": true
     },
-    "file-uri-to-path": {
+    "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
       "optional": true
     },
-    "filename-regex": {
+    "node_modules/filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "fill-range": {
+    "node_modules/fill-range": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
       "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^2.1.0",
         "isobject": "^2.0.0",
         "randomatic": "^3.0.0",
         "repeat-element": "^1.1.2",
         "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "finalhandler": {
+    "node_modules/finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
       "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -1239,349 +1507,467 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "find-up": {
+    "node_modules/find-up": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "for-in": {
+    "node_modules/for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "for-own": {
+    "node_modules/for-own": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "forever-agent": {
+    "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "form-data": {
+    "node_modules/form-data": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.5",
         "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
       }
     },
-    "fragment-cache": {
+    "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "fresh": {
+    "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "fsevents": {
+    "node_modules/fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "dev": true,
+      "hasInstallScript": true,
       "optional": true,
-      "requires": {
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
         "bindings": "^1.5.0",
         "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
       }
     },
-    "function-bind": {
+    "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "get-caller-file": {
+    "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
     },
-    "get-intrinsic": {
+    "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
       "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "get-value": {
+    "node_modules/get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "getpass": {
+    "node_modules/getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "optional": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      },
       "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+        "assert-plus": "^1.0.0"
       }
     },
-    "glob": {
+    "node_modules/getpass/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/glob": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
       "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "inflight": "^1.0.4",
         "inherits": "2",
         "minimatch": "2 || 3",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "glob-base": {
+    "node_modules/glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "glob-parent": {
+    "node_modules/glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-glob": "^2.0.0"
       }
     },
-    "globals": {
+    "node_modules/globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
       "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "gopd": {
+    "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "graceful-fs": {
+    "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "handlebars": {
+    "node_modules/handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
       "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
         "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4",
         "wordwrap": "^1.0.0"
       },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
       }
     },
-    "har-schema": {
+    "node_modules/handlebars/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
       "integrity": "sha512-f8xf2GOR6Rgwc9FPTLNzgwB+JQ2/zMauYXSWmX5YV5acex6VomT0ocSuwR7BfXo5MpHi+jL+saaux2fwsGJDKQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "har-validator": {
+    "node_modules/har-validator": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha512-5Gbp6RAftMYYV3UEI4c4Vv3+a4dQ7taVyvHt+/L6kRt+f4HX1GweAk5UDWN0SvdVnRBzGQ6OG89pGaD9uSFnVw==",
+      "deprecated": "this library is no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "ajv": "^4.9.1",
         "har-schema": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "has-ansi": {
+    "node_modules/has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "has-flag": {
+    "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "has-property-descriptors": {
+    "node_modules/has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "has-proto": {
+    "node_modules/has-proto": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
       "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "has-symbols": {
+    "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "has-value": {
+    "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "has-values": {
+    "node_modules/has-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "hasown": {
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "hawk": {
+    "node_modules/hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==",
+      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "boom": "2.x.x",
         "cryptiles": "2.x.x",
         "hoek": "2.x.x",
         "sntp": "1.x.x"
+      },
+      "engines": {
+        "node": ">=0.10.32"
       }
     },
-    "hexo": {
+    "node_modules/hexo": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.9.0.tgz",
       "integrity": "sha512-uga6MsxGlD0AeafiObbFkQVWlUO+wWTb/IJVPI3fFpmAJu0PBD//Ek0qVOxHjlzdvFGeW0bYWYqXgDbR7suJng==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "abbrev": "^1.1.1",
         "archy": "^1.0.0",
         "bluebird": "^3.5.2",
@@ -1610,422 +1996,74 @@
         "titlecase": "^1.1.2",
         "warehouse": "^2.2.0"
       },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "hexo-cli": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
-          "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
-          "dev": true,
-          "requires": {
-            "abbrev": "^1.1.1",
-            "acorn": "^6.1.1",
-            "bluebird": "^3.5.3",
-            "chalk": "^2.4.2",
-            "command-exists": "^1.2.8",
-            "hexo-fs": "^1.0.2",
-            "hexo-log": "^0.2.0",
-            "hexo-util": "^0.6.3",
-            "minimist": "^1.2.0",
-            "resolve": "^1.10.0",
-            "tildify": "^1.2.0"
-          }
-        },
-        "hexo-fs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.1",
-            "chokidar": "^2.0.4",
-            "escape-string-regexp": "^1.0.5",
-            "graceful-fs": "^4.1.11"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+      "bin": {
+        "hexo": "bin/hexo"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "hexo-bunyan": {
+    "node_modules/hexo-bunyan": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-bunyan/-/hexo-bunyan-1.0.0.tgz",
       "integrity": "sha512-RymT8Ck+K77mLt9BEYNb4uyfC7RIQnU5N3laXowMrS28jj2h89VHJCOnhV00mmta4fHRqNa07kP1Hrn17nvMkQ==",
+      "deprecated": "Please see https://github.com/hexojs/hexo-bunyan/issues/17",
       "dev": true,
-      "requires": {
+      "engines": [
+        "node >=0.10.0"
+      ],
+      "bin": {
+        "bunyan": "bin/bunyan"
+      },
+      "optionalDependencies": {
         "moment": "^2.10.6",
         "mv": "~2",
         "safe-json-stringify": "~1"
       }
     },
-    "hexo-front-matter": {
+    "node_modules/hexo-front-matter": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-0.2.3.tgz",
       "integrity": "sha512-GL/pGfYqsvjMgxjhOWv1zAc7t4JoGUow+CH9Tes/5N2wKxxTzt2woKEMHz1+c01CmhdVYUR4lO3R1ZAcxc0caA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "js-yaml": "^3.6.1"
       }
     },
-    "hexo-fs": {
+    "node_modules/hexo-fs": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-0.2.3.tgz",
       "integrity": "sha512-rLB1rMVUW3csAljvJgHfyjemL0BrmcUZfBf9hJe6S0pA53igFa3ON0PFwomvoLs1Wdmjs9Awnw9Tru4PjWFSlQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.4.0",
         "chokidar": "^1.5.2",
         "escape-string-regexp": "^1.0.5",
         "graceful-fs": "^4.1.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "hexo-i18n": {
+    "node_modules/hexo-i18n": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
       "integrity": "sha512-QhVmN/eLohu9UzvrX85zhfL7yN5O4MOkXKYmCRI8GPcg0EczX+blYYmMCugZKu/NIJ9XD5/etAVWCi/5F+fS6g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "sprintf-js": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "hexo-inject": {
+    "node_modules/hexo-inject": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-inject/-/hexo-inject-1.0.0.tgz",
       "integrity": "sha512-Ly0k7FO3G5+XNvFNE7yjSENSWy8QTnzl8cNFWYuMXRYMogbHd/Q0Ane8WCKYb5QD/A+WXC3rHb32wIGb0YAfVw==",
+      "deprecated": "The author does not use Hexo any more. This plugin is no longer maintained.",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-plugin-transform-decorators-legacy": "^1.3.4",
         "babel-polyfill": "^6.7.2",
         "bluebird": "^3.3.4",
@@ -2033,418 +2071,499 @@
         "underscore": "^1.8.3"
       }
     },
-    "hexo-log": {
+    "node_modules/hexo-log": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-0.2.0.tgz",
       "integrity": "sha512-fzoc+GQexxPPILTjoOQILnA3ZG2MFgqMBVel4xvJ11pXptw9+f97ynTgDAExXafyp9Nz2ChXRuqlCYgPtZSlxQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "chalk": "^1.1.1",
         "hexo-bunyan": "^1.0.0"
       }
     },
-    "hexo-prism-plus": {
+    "node_modules/hexo-prism-plus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-prism-plus/-/hexo-prism-plus-1.1.0.tgz",
       "integrity": "sha512-lkDJRZDVN3iNpYtuwrI+JFLj3rSa4PeMwz1OlVfUOkY6CyjD/D3dGtW7cTpcxYejr3/JWjusIqWVnUTLpKr4Yw==",
       "dev": true,
-      "requires": {
+      "hasInstallScript": true,
+      "dependencies": {
         "hexo-fs": "^1.0.0",
         "hexo-inject": "^1.0.0",
         "hexo-util": "^0.6.3",
         "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "hexo-fs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.1",
-            "chokidar": "^2.0.4",
-            "escape-string-regexp": "^1.0.5",
-            "graceful-fs": "^4.1.11"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        }
       }
     },
-    "hexo-renderer-ejs": {
+    "node_modules/hexo-prism-plus/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/hexo-fs": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-renderer-ejs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-1.0.0.tgz",
       "integrity": "sha512-O925i69FG4NYO62oWORcPhRZZX0sPx1SXGKUS5DaR/lzajyiXH5i2sqnkj0ya0rNLXIy/D7Xmt7WbFyuQx/kKQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ejs": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "hexo-renderer-less": {
+    "node_modules/hexo-renderer-less": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-less/-/hexo-renderer-less-0.2.0.tgz",
       "integrity": "sha512-mhkwGsrLPG1e0bpE40FSRufaDHJ4uDtTYNUIQDBYR3aZkbOxAnpN607BTjymr/F+4uYy0cd7MK4y5vFx5pEDQw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "less": "^2.5.1"
       }
     },
-    "hexo-renderer-marked": {
+    "node_modules/hexo-renderer-marked": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-marked/-/hexo-renderer-marked-2.0.0.tgz",
       "integrity": "sha512-+LMjgPkJSUAOlWYHJnBXxUHwGqemGNlK/I+JNO4zA5rEHWNWZ9wNAZKd5g0lEVdMAZzAV54gCylXGURgMO4IAw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hexo-util": "1.0.0",
         "marked": "^0.7.0",
         "strip-indent": "^3.0.0"
       },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "hexo-util": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
-          "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.2",
-            "camel-case": "^3.0.0",
-            "cross-spawn": "^6.0.5",
-            "highlight.js": "^9.13.1",
-            "html-entities": "^1.2.1",
-            "striptags": "^3.1.1"
-          }
-        },
-        "marked": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-          "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-          "dev": true,
-          "requires": {
-            "min-indent": "^1.0.0"
-          }
-        },
-        "striptags": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
-          "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "hexo-server": {
+    "node_modules/hexo-renderer-marked/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/hexo-util": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
+      "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.2",
+        "camel-case": "^3.0.0",
+        "cross-spawn": "^6.0.5",
+        "highlight.js": "^9.13.1",
+        "html-entities": "^1.2.1",
+        "striptags": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/marked": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
+      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/striptags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
+      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
+      "dev": true
+    },
+    "node_modules/hexo-server": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-server/-/hexo-server-1.0.0.tgz",
       "integrity": "sha512-eSY+a5oiGCG/3T6FrdrNRBkttMLJkM+oitY6ZMFowjcBiG2VNEhQmfWUDOykfvApZs4wPYBb//uXD/58tfe3mA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.5.5",
         "chalk": "^2.4.2",
         "compression": "^1.7.4",
@@ -2454,50 +2573,66 @@
         "open": "^6.3.0",
         "serve-static": "^1.14.1"
       },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "mime": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "hexo-util": {
+    "node_modules/hexo-server/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-server/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-server/node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/hexo-server/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-util": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-0.6.3.tgz",
       "integrity": "sha512-zPxaqCWZz3/25SAB4FlrRtWktJ+Pr+vBiv/nyHpXKgXPt1m70liViKlRwWLqDmRjJ72x6/k4qCEeXHajvcGHUw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.4.0",
         "camel-case": "^3.0.0",
         "cross-spawn": "^4.0.0",
@@ -2506,344 +2641,879 @@
         "striptags": "^2.1.1"
       }
     },
-    "hexo-versioned-netlify-redirects": {
+    "node_modules/hexo-versioned-netlify-redirects": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-versioned-netlify-redirects/-/hexo-versioned-netlify-redirects-1.1.0.tgz",
       "integrity": "sha512-kfY19ZZDwBnRaZFA6KQgt5DhVBpTQG1yBoq01zaACFHIFuSd9OjhiHCkJ3it+TMvGl+JGTtgKhIwZoQUJHyv/g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "url-join": "^4.0.0"
       }
     },
-    "highlight.js": {
+    "node_modules/hexo/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/hexo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/hexo/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/hexo-cli": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
+      "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "^1.1.1",
+        "acorn": "^6.1.1",
+        "bluebird": "^3.5.3",
+        "chalk": "^2.4.2",
+        "command-exists": "^1.2.8",
+        "hexo-fs": "^1.0.2",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.3",
+        "minimist": "^1.2.0",
+        "resolve": "^1.10.0",
+        "tildify": "^1.2.0"
+      },
+      "bin": {
+        "hexo": "bin/hexo"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/hexo/node_modules/hexo-fs": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo/node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/hexo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/highlight.js": {
       "version": "9.18.5",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
       "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
-      "dev": true
+      "deprecated": "Support has ended for 9.x series. Upgrade to @latest",
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "hoek": {
+    "node_modules/hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.40"
+      }
     },
-    "html-entities": {
+    "node_modules/html-entities": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
       "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
-    "htmlparser2": {
+    "node_modules/htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "domelementtype": "^1.3.1",
         "domhandler": "^2.3.0",
         "domutils": "^1.5.1",
         "entities": "^1.1.1",
         "inherits": "^2.0.1",
         "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
       }
     },
-    "http-errors": {
+    "node_modules/htmlparser2/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "requires": {
+      "license": "MIT",
+      "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
-      "dependencies": {
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "http-signature": {
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^0.2.0",
         "jsprim": "^1.2.2",
         "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
       }
     },
-    "image-size": {
+    "node_modules/image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "inflight": {
+    "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
-    "inherits": {
+    "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "invariant": {
+    "node_modules/invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "loose-envify": "^1.0.0"
       }
     },
-    "is-accessor-descriptor": {
+    "node_modules/is-accessor-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
       "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "is-binary-path": {
+    "node_modules/is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-buffer": {
+    "node_modules/is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "is-core-module": {
+    "node_modules/is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
       "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "is-data-descriptor": {
+    "node_modules/is-data-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
       "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "is-descriptor": {
+    "node_modules/is-descriptor": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "is-dotfile": {
+    "node_modules/is-dotfile": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-equal-shallow": {
+    "node_modules/is-equal-shallow": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-primitive": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-extendable": {
+    "node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-extglob": {
+    "node_modules/is-extglob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
       "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-fullwidth-code-point": {
+    "node_modules/is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
       "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "is-glob": {
+    "node_modules/is-glob": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
       "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-number": {
+    "node_modules/is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
       "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-plain-object": {
+    "node_modules/is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-posix-bracket": {
+    "node_modules/is-plain-object/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-primitive": {
+    "node_modules/is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-typedarray": {
+    "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true,
       "optional": true
     },
-    "is-windows": {
+    "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-wsl": {
+    "node_modules/is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
       "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "isarray": {
+    "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "isexe": {
+    "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "isobject": {
+    "node_modules/isobject": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "isstream": {
+    "node_modules/isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true,
       "optional": true
     },
-    "js-tokens": {
+    "node_modules/js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
       "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
       "dev": true
     },
-    "js-yaml": {
+    "node_modules/js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "js2xmlparser": {
+    "node_modules/js2xmlparser": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
       "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "xmlcreate": "^2.0.4"
       }
     },
-    "jsbn": {
+    "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true,
       "optional": true
     },
-    "jsdoc": {
+    "node_modules/jsdoc": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
       "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "@babel/parser": "^7.20.15",
         "@jsdoc/salty": "^0.2.1",
         "@types/markdown-it": "^12.2.3",
@@ -2860,140 +3530,201 @@
         "strip-json-comments": "^3.1.0",
         "underscore": "~1.13.2"
       },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.7.2",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-          "dev": true
-        },
-        "marked": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-          "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        },
-        "underscore": {
-          "version": "1.13.6",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
-          "dev": true
-        }
+      "bin": {
+        "jsdoc": "jsdoc.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "json-schema": {
+    "node_modules/jsdoc/node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/jsdoc/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jsdoc/node_modules/marked": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/jsdoc/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jsdoc/node_modules/underscore": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+      "dev": true
+    },
+    "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true,
       "optional": true
     },
-    "json-stable-stringify": {
+    "node_modules/json-stable-stringify": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
       "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "call-bind": "^1.0.5",
         "isarray": "^2.0.5",
         "jsonify": "^0.0.1",
         "object-keys": "^1.1.1"
       },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "json-stringify-safe": {
+    "node_modules/json-stable-stringify/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true,
       "optional": true
     },
-    "jsonify": {
+    "node_modules/jsonify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
       "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "jsonparse": {
+    "node_modules/jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
     },
-    "jsprim": {
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
         "json-schema": "0.4.0",
         "verror": "1.10.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">=0.6.0"
       }
     },
-    "kind-of": {
+    "node_modules/jsprim/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "klaw": {
+    "node_modules/klaw": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
       "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "graceful-fs": "^4.1.9"
       }
     },
-    "lazy-cache": {
+    "node_modules/lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
       "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "less": {
+    "node_modules/less": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
       "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
       "dev": true,
-      "requires": {
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=0.12"
+      },
+      "optionalDependencies": {
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
@@ -3004,209 +3735,239 @@
         "source-map": "^0.5.3"
       }
     },
-    "linkify-it": {
+    "node_modules/linkify-it": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
       "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "uc.micro": "^1.0.1"
       }
     },
-    "locate-path": {
+    "node_modules/locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "lodash": {
+    "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.assignin": {
+    "node_modules/lodash.assignin": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
       "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
       "dev": true
     },
-    "lodash.bind": {
+    "node_modules/lodash.bind": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
       "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==",
       "dev": true
     },
-    "lodash.defaults": {
+    "node_modules/lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
       "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
       "dev": true
     },
-    "lodash.filter": {
+    "node_modules/lodash.filter": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
       "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==",
       "dev": true
     },
-    "lodash.flatten": {
+    "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
       "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
       "dev": true
     },
-    "lodash.foreach": {
+    "node_modules/lodash.foreach": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
       "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
       "dev": true
     },
-    "lodash.map": {
+    "node_modules/lodash.map": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
       "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==",
       "dev": true
     },
-    "lodash.merge": {
+    "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.pick": {
+    "node_modules/lodash.pick": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
       "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
+      "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.",
       "dev": true
     },
-    "lodash.reduce": {
+    "node_modules/lodash.reduce": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
       "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==",
       "dev": true
     },
-    "lodash.reject": {
+    "node_modules/lodash.reject": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
       "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==",
       "dev": true
     },
-    "lodash.some": {
+    "node_modules/lodash.some": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
       "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
       "dev": true
     },
-    "longest": {
+    "node_modules/longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
       "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "loose-envify": {
+    "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
       }
     },
-    "lower-case": {
+    "node_modules/lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
       "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
       "dev": true
     },
-    "lru-cache": {
+    "node_modules/lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
       }
     },
-    "map-cache": {
+    "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "map-visit": {
+    "node_modules/map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "markdown": {
+    "node_modules/markdown": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
       "integrity": "sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "nopt": "~2.1.1"
+      },
+      "bin": {
+        "md2html": "bin/md2html.js"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "markdown-it": {
+    "node_modules/markdown-it": {
       "version": "12.3.2",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
       "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "argparse": "^2.0.1",
         "entities": "~2.1.0",
         "linkify-it": "^3.0.1",
         "mdurl": "^1.0.1",
         "uc.micro": "^1.0.5"
       },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "entities": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-          "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-          "dev": true
-        }
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
       }
     },
-    "markdown-it-anchor": {
+    "node_modules/markdown-it-anchor": {
       "version": "8.6.7",
       "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
       "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
+      "dev": true,
+      "peerDependencies": {
+        "@types/markdown-it": "*",
+        "markdown-it": "*"
+      }
+    },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "math-random": {
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
       "dev": true
     },
-    "mdurl": {
+    "node_modules/mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
       "dev": true
     },
-    "micromatch": {
+    "node_modules/micromatch": {
       "version": "2.3.11",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-diff": "^2.0.0",
         "array-unique": "^0.2.1",
         "braces": "^1.8.2",
@@ -3220,140 +3981,183 @@
         "object.omit": "^2.0.0",
         "parse-glob": "^3.0.4",
         "regex-cache": "^0.4.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "mime": {
+    "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "mime-db": {
+    "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "mime-types": {
+    "node_modules/mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "min-indent": {
+    "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "minimatch": {
+    "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "minimist": {
+    "node_modules/minimist": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "mixin-deep": {
+    "node_modules/mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
       },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "mkdirp": {
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "moment": {
+    "node_modules/moment": {
       "version": "2.30.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
       "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "moment-timezone": {
+    "node_modules/moment-timezone": {
       "version": "0.5.45",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
       "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "morgan": {
+    "node_modules/morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
       "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-finished": "~2.3.0",
         "on-headers": "~1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "ms": {
+    "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "mv": {
+    "node_modules/mv": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
       "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "mkdirp": "~0.5.1",
         "ncp": "~2.0.0",
         "rimraf": "~2.4.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "nan": {
+    "node_modules/nan": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
       "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
       "dev": true,
       "optional": true
     },
-    "nanomatch": {
+    "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
         "define-property": "^2.0.2",
@@ -3366,438 +4170,564 @@
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
       },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "ncp": {
+    "node_modules/nanomatch/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
       "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "ncp": "bin/ncp"
+      }
     },
-    "negotiator": {
+    "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "neo-async": {
+    "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "nice-try": {
+    "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "no-case": {
+    "node_modules/no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lower-case": "^1.1.1"
       }
     },
-    "node-fingerprint": {
+    "node_modules/node-fingerprint": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/node-fingerprint/-/node-fingerprint-0.0.2.tgz",
       "integrity": "sha512-vPFfTD5EBJieQ4SI3v61fWxlV1kav3m9Dbejd6CjWhOJn8s+XMxpOOosCNAyIrUQ/jJOlPndfrZ0lSw4+RgwcA==",
       "dev": true
     },
-    "nopt": {
+    "node_modules/nopt": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
       "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
       }
     },
-    "normalize-path": {
+    "node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "nth-check": {
+    "node_modules/nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
       "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "boolbase": "~1.0.0"
       }
     },
-    "nunjucks": {
+    "node_modules/nunjucks": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
       "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
         "commander": "^5.1.0"
+      },
+      "bin": {
+        "nunjucks-precompile": "bin/precompile"
+      },
+      "engines": {
+        "node": ">= 6.9.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.3.0"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "oauth-sign": {
+    "node_modules/oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
       "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "object-assign": {
+    "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "object-copy": {
+    "node_modules/object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
         "kind-of": "^3.0.3"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object-keys": {
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "object-visit": {
+    "node_modules/object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.omit": {
+    "node_modules/object-visit/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.pick": {
+    "node_modules/object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "on-finished": {
+    "node_modules/object.pick/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "on-headers": {
+    "node_modules/on-headers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "once": {
+    "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "wrappy": "1"
       }
     },
-    "open": {
+    "node_modules/open": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
       "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "optimist": {
+    "node_modules/optimist": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-          "dev": true
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-          "dev": true
-        }
       }
     },
-    "os-homedir": {
+    "node_modules/optimist/node_modules/minimist": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+      "dev": true
+    },
+    "node_modules/optimist/node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "p-limit": {
+    "node_modules/p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "p-locate": {
+    "node_modules/p-locate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "p-try": {
+    "node_modules/p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "parse-glob": {
+    "node_modules/parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
         "is-extglob": "^1.0.0",
         "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "parseurl": {
+    "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "pascalcase": {
+    "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-dirname": {
+    "node_modules/path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
       "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
       "dev": true
     },
-    "path-exists": {
+    "node_modules/path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "path-is-absolute": {
+    "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-key": {
+    "node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "path-parse": {
+    "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "performance-now": {
+    "node_modules/performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
       "integrity": "sha512-YHk5ez1hmMR5LOkb9iJkLKqoBlL7WD5M8ljC75ZfzXriuBIVNuecaXuU7e+hOwyqf24Wxhh7Vxgt7Hnw9288Tg==",
       "dev": true,
       "optional": true
     },
-    "posix-character-classes": {
+    "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "preserve": {
+    "node_modules/preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "pretty-hrtime": {
+    "node_modules/pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "process-nextick-args": {
+    "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "promise": {
+    "node_modules/promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asap": "~2.0.3"
       }
     },
-    "prr": {
+    "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true,
       "optional": true
     },
-    "pseudomap": {
+    "node_modules/pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
-    "punycode": {
+    "node_modules/punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
       "dev": true,
       "optional": true
     },
-    "qs": {
+    "node_modules/qs": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.1.tgz",
       "integrity": "sha512-LQy1Q1fcva/UsnP/6Iaa4lVeM49WiOitu2T4hZCyA/elLKu37L99qcBJk4VCCk+rdLvnMzfKyiN3SZTqdAZGSQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.6"
+      }
     },
-    "randomatic": {
+    "node_modules/randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
         "math-random": "^1.0.1"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "range-parser": {
+    "node_modules/randomatic/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/randomatic/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "readable-stream": {
+    "node_modules/readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
         "isarray": "~1.0.0",
@@ -3807,277 +4737,338 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "readdirp": {
+    "node_modules/readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
         "readable-stream": "^2.0.2"
       },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        }
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "regenerator-runtime": {
+    "node_modules/readdirp/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
-    "regex-cache": {
+    "node_modules/regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-equal-shallow": "^0.1.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "regex-not": {
+    "node_modules/regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "remove-trailing-separator": {
+    "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
-    "repeat-element": {
+    "node_modules/repeat-element": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "repeat-string": {
+    "node_modules/repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "request": {
+    "node_modules/request": {
       "version": "2.81.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
       "integrity": "sha512-IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "aws-sign2": "~0.6.0",
         "aws4": "^1.2.1",
         "caseless": "~0.12.0",
@@ -4100,112 +5091,139 @@
         "tough-cookie": "~2.3.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "require-directory": {
+    "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "require-main-filename": {
+    "node_modules/require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
-    "requizzle": {
+    "node_modules/requizzle": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
       "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash": "^4.17.21"
       }
     },
-    "resolve": {
+    "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "resolve-url": {
+    "node_modules/resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "ret": {
+    "node_modules/ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
     },
-    "right-align": {
+    "node_modules/right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
       "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "align-text": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "rimraf": {
+    "node_modules/rimraf": {
       "version": "2.4.5",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
       "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "glob": "^6.0.1"
+      },
+      "bin": {
+        "rimraf": "bin.js"
       }
     },
-    "safe-buffer": {
+    "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
-    "safe-json-stringify": {
+    "node_modules/safe-json-stringify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
       "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
       "dev": true,
       "optional": true
     },
-    "safe-regex": {
+    "node_modules/safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ret": "~0.1.10"
       }
     },
-    "safer-buffer": {
+    "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true,
       "optional": true
     },
-    "semver": {
+    "node_modules/semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true
-    },
-    "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "requires": {
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -4220,169 +5238,214 @@
         "range-parser": "~1.2.1",
         "statuses": "2.0.1"
       },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        },
-        "on-finished": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-          "dev": true,
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
+      "license": "MIT"
+    },
+    "node_modules/send/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "set-blocking": {
+    "node_modules/serve-static/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
-    "set-function-length": {
+    "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "set-value": {
+    "node_modules/set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
         "is-plain-object": "^2.0.3",
         "split-string": "^3.0.1"
       },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "setprototypeof": {
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
-    "shebang-command": {
+    "node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "shebang-regex": {
+    "node_modules/shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "showdown": {
+    "node_modules/showdown": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz",
       "integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "yargs": "^14.2"
       },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "yargs": {
-          "version": "14.2.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
-          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^15.0.1"
-          }
-        }
+      "bin": {
+        "showdown": "bin/showdown.js"
       }
     },
-    "snapdragon": {
+    "node_modules/showdown/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/showdown/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/yargs": {
+      "version": "14.2.3",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+      "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^15.0.1"
+      }
+    },
+    "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
         "define-property": "^0.2.5",
@@ -4392,96 +5455,124 @@
         "source-map-resolve": "^0.5.0",
         "use": "^3.1.0"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "snapdragon-node": {
+    "node_modules/snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
         "snapdragon-util": "^3.0.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "snapdragon-util": {
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "sntp": {
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==",
+      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "hoek": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "source-map": {
+    "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "source-map-resolve": {
+    "node_modules/source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
@@ -4489,34 +5580,38 @@
         "urix": "^0.1.0"
       }
     },
-    "source-map-url": {
+    "node_modules/source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
-    "split-string": {
+    "node_modules/split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "sprintf-js": {
+    "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
-    "sshpk": {
+    "node_modules/sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
         "bcrypt-pbkdf": "^1.0.0",
@@ -4527,570 +5622,716 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "static-extend": {
+    "node_modules/sshpk/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "statuses": {
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true
-    },
-    "string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
-      "requires": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "string_decoder": {
+    "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
-    "stringstream": {
+    "node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stringstream": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
       "dev": true,
       "optional": true
     },
-    "strip-ansi": {
+    "node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "strip-indent": {
+    "node_modules/strip-indent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
       "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "strip-json-comments": {
+    "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "striptags": {
+    "node_modules/striptags": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz",
       "integrity": "sha512-vZTvmFP0IYu/zn8MXV6PrLb6VKbd9WGSEnlm4D5RNXS/+zYYlHrSfJgoBw1w56D6RJCr515er3BittRGQqihLA==",
       "dev": true
     },
-    "supports-color": {
+    "node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "supports-preserve-symlinks-flag": {
+    "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "swig-extras": {
+    "node_modules/swig-extras": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
       "integrity": "sha512-mFgpjjcQ0Kj+WplOrnWfUEw8iehZMD78sRId6uMXaTlWpy/vt8PTv3GoNsHrHBpZNnPnIsoWxrmRbS3vePjWpA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "markdown": "~0.5.0"
       }
     },
-    "swig-templates": {
+    "node_modules/swig-templates": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
       "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
+      "deprecated": "unmaintained",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "optimist": "~0.6",
         "uglify-js": "2.6.0"
       },
-      "dependencies": {
-        "uglify-js": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
-          "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
-          "dev": true,
-          "requires": {
-            "async": "~0.2.6",
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
-          }
-        }
+      "bin": {
+        "swig": "bin/swig.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "text-table": {
+    "node_modules/swig-templates/node_modules/uglify-js": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
+      "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
+      "dev": true,
+      "dependencies": {
+        "async": "~0.2.6",
+        "source-map": "~0.5.1",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.10.0"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "through": {
+    "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
-    "tildify": {
+    "node_modules/tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
       "integrity": "sha512-Y9q1GaV/BO65Z9Yf4NOGMuwt3SGdptkZBnaaKfTQakrDyCLiuO1Kc5wxW4xLdsjzunRtqtOdhekiUFmZbklwYQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "os-homedir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "titlecase": {
+    "node_modules/titlecase": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.3.tgz",
       "integrity": "sha512-pQX4oiemzjBEELPqgK4WE+q0yhAqjp/yzusGtlSJsOuiDys0RQxggepYmo0BuegIDppYS3b3cpdegRwkpyN3hw==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "to-title-case": "bin.js"
+      }
     },
-    "to-fast-properties": {
+    "node_modules/to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "to-object-path": {
+    "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "to-regex": {
+    "node_modules/to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "to-regex-range": {
+    "node_modules/to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "toidentifier": {
+    "node_modules/to-regex-range/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
     },
-    "tough-cookie": {
+    "node_modules/tough-cookie": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "punycode": "^1.4.1"
+      },
+      "engines": {
+        "node": ">=0.8"
       }
     },
-    "tunnel-agent": {
+    "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "tweetnacl": {
+    "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true,
       "optional": true
     },
-    "uc.micro": {
+    "node_modules/uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
       "dev": true
     },
-    "uglify-js": {
+    "node_modules/uglify-js": {
       "version": "3.17.4",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
       "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "uglify-to-browserify": {
+    "node_modules/uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
       "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
       "dev": true
     },
-    "underscore": {
+    "node_modules/underscore": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
       "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
       "dev": true
     },
-    "union-value": {
+    "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "unpipe": {
+    "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "unset-value": {
+    "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-          "dev": true
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "upath": {
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
     },
-    "upper-case": {
+    "node_modules/upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
       "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
       "dev": true
     },
-    "urix": {
+    "node_modules/urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "url-join": {
+    "node_modules/url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
       "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
       "dev": true
     },
-    "use": {
+    "node_modules/use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "util-deprecate": {
+    "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "utils-merge": {
+    "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
     },
-    "uuid": {
+    "node_modules/uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
     },
-    "vary": {
+    "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "verror": {
+    "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-          "dev": true,
-          "optional": true
-        }
       }
     },
-    "warehouse": {
+    "node_modules/verror/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/verror/node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/warehouse": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz",
       "integrity": "sha512-axyo83DpdZabmCsiipkHYKnwl6ull2Vv7fqxMnV8KOQLdiJKffn9W+B3Yac7QVWzBE56Q6B6j2cIY1k2gc10PA==",
       "dev": true,
-      "requires": {
-        "JSONStream": "^1.0.7",
+      "dependencies": {
         "bluebird": "^3.2.2",
         "cuid": "~1.3.8",
         "graceful-fs": "^4.1.3",
         "is-plain-object": "^2.0.1",
+        "JSONStream": "^1.0.7",
         "lodash": "^4.2.1"
       }
     },
-    "which": {
+    "node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "which-module": {
+    "node_modules/which-module": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
       "dev": true
     },
-    "window-size": {
+    "node_modules/window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
       "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
     },
-    "wordwrap": {
+    "node_modules/wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
       "dev": true
     },
-    "wrap-ansi": {
+    "node_modules/wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
       "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-styles": "^3.2.0",
         "string-width": "^3.0.0",
         "strip-ansi": "^5.0.0"
       },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=6"
       }
     },
-    "wrappy": {
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "optional": true
     },
-    "xmlcreate": {
+    "node_modules/xmlcreate": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
       "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
       "dev": true
     },
-    "y18n": {
+    "node_modules/y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
-    "yallist": {
+    "node_modules/yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
-    "yargs": {
+    "node_modules/yargs": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
       "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "camelcase": "^1.0.2",
         "cliui": "^2.1.0",
         "decamelize": "^1.0.0",
         "window-size": "0.1.0"
       }
     },
-    "yargs-parser": {
+    "node_modules/yargs-parser": {
       "version": "15.0.3",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz",
       "integrity": "sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        }
+      }
+    },
+    "node_modules/yargs-parser/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
       }
     }
   }

From cce7c9bf55c5a2dc7d9edc7a0c35415628bb3882 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:43:15 +0000
Subject: [PATCH 0993/1140] Bump minimist and hexo in /guide

Bumps [minimist](https://github.com/minimistjs/minimist) to 1.2.8 and updates ancestor dependency [hexo](https://github.com/hexojs/hexo). These dependencies need to be updated together.


Updates `minimist` from 0.0.10 to 1.2.8
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v0.0.10...v1.2.8)

Updates `hexo` from 3.9.0 to 7.3.0
- [Release notes](https://github.com/hexojs/hexo/releases)
- [Commits](https://github.com/hexojs/hexo/compare/3.9.0...v7.3.0)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
- dependency-name: hexo
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 guide/package-lock.json | 6006 +++++++++++++++++++++++----------------
 guide/package.json      |    2 +-
 2 files changed, 3587 insertions(+), 2421 deletions(-)

diff --git a/guide/package-lock.json b/guide/package-lock.json
index a72419e298..3071e988f8 100644
--- a/guide/package-lock.json
+++ b/guide/package-lock.json
@@ -1,299 +1,322 @@
 {
   "name": "meteor-guide",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@meteorjs/meteor-hexo-config": {
+  "packages": {
+    "": {
+      "version": "1.0.0",
+      "devDependencies": {
+        "@meteorjs/meteor-hexo-config": "1.0.14",
+        "@meteorjs/meteor-theme-hexo": "2.0.8",
+        "chexo": "1.0.7",
+        "hexo": "7.3.0",
+        "hexo-prism-plus": "1.1.0",
+        "hexo-renderer-ejs": "1.0.0",
+        "hexo-renderer-less": "0.2.0",
+        "hexo-renderer-marked": "2.0.0",
+        "hexo-server": "1.0.0",
+        "hexo-versioned-netlify-redirects": "1.1.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-hexo-config": {
       "version": "1.0.14",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-hexo-config/-/meteor-hexo-config-1.0.14.tgz",
       "integrity": "sha512-Vl4cEMEoVw2JV8qTBsqaq+YL7MRHasTtE88WJa5BGBYMfN35Yk0yeYwVc2OTFJ/cGiQcPEaC0RvRKVyNJfwIGQ==",
       "dev": true
     },
-    "@meteorjs/meteor-theme-hexo": {
+    "node_modules/@meteorjs/meteor-theme-hexo": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-theme-hexo/-/meteor-theme-hexo-2.0.8.tgz",
       "integrity": "sha512-LQIFN05wBMjX7SXgW5CFVTfolDWMuknoypwQ0czl/44LYRBR4/LYZUgX6c+1vLjloJb+5+2HTvMGlVN9Wo1MKA==",
-      "dev": true
-    },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
+      "hasShrinkwrap": true
     },
-    "a-sync-waterfall": {
+    "node_modules/a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
       "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
       "dev": true
     },
-    "abbrev": {
+    "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
-    "accepts": {
+    "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true
-    },
-    "ajv": {
+    "node_modules/ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "co": "^4.6.0",
         "json-stable-stringify": "^1.0.1"
       }
     },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      }
-    },
-    "ansi-regex": {
+    "node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "ansi-styles": {
+    "node_modules/ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "anymatch": {
+    "node_modules/anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
       "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "micromatch": "^2.1.5",
         "normalize-path": "^2.0.0"
       }
     },
-    "archy": {
+    "node_modules/archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
+      "license": "Python-2.0"
     },
-    "arr-diff": {
+    "node_modules/arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-flatten": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "arr-flatten": {
+    "node_modules/arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "arr-union": {
+    "node_modules/arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "array-unique": {
+    "node_modules/array-unique": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "asap": {
+    "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "dev": true
     },
-    "asn1": {
+    "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "safer-buffer": "~2.1.0"
       }
     },
-    "assert-plus": {
+    "node_modules/assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
       "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
     },
-    "assign-symbols": {
+    "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "async": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-      "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
-      "dev": true
-    },
-    "async-each": {
+    "node_modules/async-each": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
       "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
-      "dev": true
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
-    "asynckit": {
+    "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true,
       "optional": true
     },
-    "atob": {
+    "node_modules/atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
     },
-    "aws-sign2": {
+    "node_modules/aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
       "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "aws4": {
+    "node_modules/aws4": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
       "dev": true,
       "optional": true
     },
-    "babel-code-frame": {
+    "node_modules/babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
       }
     },
-    "babel-messages": {
+    "node_modules/babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.22.0"
       }
     },
-    "babel-plugin-syntax-decorators": {
+    "node_modules/babel-plugin-syntax-decorators": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha512-AWj19x2aDm8qFQ5O2JcD6pwJDW1YdcnO+1b81t7gxrGjz5VHiUqeYWAR4h7zueWMalRelrQDXprv2FrY1dbpbw==",
       "dev": true
     },
-    "babel-plugin-transform-decorators-legacy": {
+    "node_modules/babel-plugin-transform-decorators-legacy": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz",
       "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-plugin-syntax-decorators": "^6.1.18",
         "babel-runtime": "^6.2.0",
         "babel-template": "^6.3.0"
       }
     },
-    "babel-polyfill": {
+    "node_modules/babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
         "regenerator-runtime": "^0.10.5"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        },
-        "regenerator-runtime": {
-          "version": "0.10.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-          "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
-          "dev": true
-        }
       }
     },
-    "babel-runtime": {
+    "node_modules/babel-polyfill/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+      "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
+      "dev": true
+    },
+    "node_modules/babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        }
       }
     },
-    "babel-template": {
+    "node_modules/babel-runtime/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
         "babel-types": "^6.26.0",
@@ -301,12 +324,12 @@
         "lodash": "^4.17.4"
       }
     },
-    "babel-traverse": {
+    "node_modules/babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
         "babel-runtime": "^6.26.0",
@@ -318,36 +341,40 @@
         "lodash": "^4.17.4"
       }
     },
-    "babel-types": {
+    "node_modules/babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
         "lodash": "^4.17.4",
         "to-fast-properties": "^1.0.3"
       }
     },
-    "babylon": {
+    "node_modules/babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "babylon": "bin/babylon.js"
+      }
     },
-    "balanced-match": {
+    "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
-    "base": {
+    "node_modules/base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
         "component-emitter": "^1.2.1",
@@ -356,130 +383,145 @@
         "mixin-deep": "^1.2.0",
         "pascalcase": "^0.1.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "basic-auth": {
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/basic-auth": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
       "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "bcrypt-pbkdf": {
+    "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "tweetnacl": "^0.14.3"
       }
     },
-    "binary-extensions": {
+    "node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "bindings": {
+    "node_modules/bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "file-uri-to-path": "1.0.0"
       }
     },
-    "bluebird": {
+    "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
-    },
-    "boom": {
+    "node_modules/boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "hoek": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.10.40"
       }
     },
-    "brace-expansion": {
+    "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "requires": {
+      "optional": true,
+      "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "braces": {
+    "node_modules/braces": {
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
       "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "expand-range": "^1.8.1",
         "preserve": "^0.2.0",
         "repeat-element": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "browser-fingerprint": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
-      "integrity": "sha512-b8SXP7yOlzLUJXF8WUvIjmbJzkJC0X6OHe7J9a/SHqEBC7a9Eglag6AANSTJz82h5U582kuxm/5TPudnD68EPA==",
-      "dev": true
-    },
-    "bytes": {
+    "node_modules/bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "cache-base": {
+    "node_modules/cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
         "get-value": "^2.0.6",
@@ -490,268 +532,251 @@
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "call-bind": {
+    "node_modules/cache-base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/call-bind": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
       "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.1",
         "set-function-length": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "camel-case": {
+    "node_modules/camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
       "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "no-case": "^2.2.0",
         "upper-case": "^1.1.1"
       }
     },
-    "camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
-      "dev": true
-    },
-    "caseless": {
+    "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true,
       "optional": true
     },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
-      "dev": true,
-      "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
-      }
-    },
-    "chalk": {
+    "node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
         "has-ansi": "^2.0.0",
         "strip-ansi": "^3.0.0",
         "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "cheerio": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
-      "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==",
-      "dev": true,
-      "requires": {
-        "css-select": "~1.2.0",
-        "dom-serializer": "~0.1.0",
-        "entities": "~1.1.1",
-        "htmlparser2": "^3.9.1",
-        "lodash.assignin": "^4.0.9",
-        "lodash.bind": "^4.1.4",
-        "lodash.defaults": "^4.0.1",
-        "lodash.filter": "^4.4.0",
-        "lodash.flatten": "^4.2.0",
-        "lodash.foreach": "^4.3.0",
-        "lodash.map": "^4.4.0",
-        "lodash.merge": "^4.4.0",
-        "lodash.pick": "^4.2.1",
-        "lodash.reduce": "^4.4.0",
-        "lodash.reject": "^4.4.0",
-        "lodash.some": "^4.4.0"
-      }
-    },
-    "chexo": {
+    "node_modules/chexo": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/chexo/-/chexo-1.0.7.tgz",
       "integrity": "sha512-7ScGKzHsZDLpCZhzIypwbK+hkx1fkWZjeLemEkmnreThGLNWhLRDC4gJ/Wu04jAbH0zYR/ev0QPAACEnaYXrcA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hexo-cli": "^1.1.0",
         "minimist": "^1.2.0"
       },
-      "dependencies": {
-        "hexo-cli": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
-          "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
-          "dev": true,
-          "requires": {
-            "abbrev": "^1.0.7",
-            "bluebird": "^3.4.0",
-            "chalk": "^1.1.3",
-            "command-exists": "^1.2.0",
-            "hexo-fs": "^0.2.0",
-            "hexo-log": "^0.2.0",
-            "hexo-util": "^0.6.0",
-            "minimist": "^1.2.0",
-            "object-assign": "^4.1.0",
-            "resolve": "^1.5.0",
-            "tildify": "^1.2.0"
-          }
-        }
+      "bin": {
+        "chexo": "bin/chexo"
+      },
+      "peerDependencies": {
+        "hexo": ">= 3.3.0 < 4"
       }
     },
-    "chokidar": {
+    "node_modules/chexo/node_modules/hexo-cli": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
+      "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "^1.0.7",
+        "bluebird": "^3.4.0",
+        "chalk": "^1.1.3",
+        "command-exists": "^1.2.0",
+        "hexo-fs": "^0.2.0",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.0",
+        "minimist": "^1.2.0",
+        "object-assign": "^4.1.0",
+        "resolve": "^1.5.0",
+        "tildify": "^1.2.0"
+      },
+      "bin": {
+        "hexo": "bin/hexo"
+      }
+    },
+    "node_modules/chokidar": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
       "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "anymatch": "^1.3.0",
         "async-each": "^1.0.0",
-        "fsevents": "^1.0.0",
         "glob-parent": "^2.0.0",
         "inherits": "^2.0.1",
         "is-binary-path": "^1.0.0",
         "is-glob": "^2.0.0",
         "path-is-absolute": "^1.0.0",
         "readdirp": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.0.0"
       }
     },
-    "class-utils": {
+    "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
         "isobject": "^3.0.0",
         "static-extend": "^0.1.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
-      "requires": {
-        "center-align": "^0.1.1",
-        "right-align": "^0.1.1",
-        "wordwrap": "0.0.2"
-      },
       "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-          "dev": true
-        }
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "co": {
+    "node_modules/class-utils/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
     },
-    "collection-visit": {
+    "node_modules/collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "color-convert": {
+    "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "color-name": "1.1.3"
       }
     },
-    "color-name": {
+    "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
-    "combined-stream": {
+    "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "command-exists": {
+    "node_modules/command-exists": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
       "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
       "dev": true
     },
-    "commander": {
+    "node_modules/commander": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
       "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
     },
-    "component-emitter": {
+    "node_modules/component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "compressible": {
+    "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "compression": {
+    "node_modules/compression": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
         "compressible": "~2.0.16",
@@ -759,402 +784,507 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "concat-map": {
+    "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
-    "connect": {
+    "node_modules/connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "copy-descriptor": {
+    "node_modules/copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "core-decorators": {
+    "node_modules/core-decorators": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/core-decorators/-/core-decorators-0.11.2.tgz",
       "integrity": "sha512-47n1NWwwc+qPmOMtY9zUKCM1cYfoxLvBRxKzirFrqhE61yqK+yZP/BOA3gjaBUVb9P46J1RyJjasrtqYoWCbvA==",
       "dev": true
     },
-    "core-js": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-      "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
-      "dev": true
-    },
-    "core-util-is": {
+    "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
-    "cross-spawn": {
+    "node_modules/cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
       "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lru-cache": "^4.0.1",
         "which": "^1.2.9"
       }
     },
-    "cryptiles": {
+    "node_modules/cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "boom": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.10.40"
       }
     },
-    "css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==",
+    "node_modules/cuid": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz",
+      "integrity": "sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==",
+      "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
       "dev": true,
-      "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
-      }
+      "license": "MIT"
     },
-    "css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "dev": true
-    },
-    "cuid": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
-      "integrity": "sha512-MoL67ZZuBetDMxzrZtO+Iq1ATajFACQCP52QRinBgd3yTjYdv54mJO8ibUrh06fojKCoX5P2i7KkEatm4VTIOQ==",
-      "dev": true,
-      "requires": {
-        "browser-fingerprint": "0.0.1",
-        "core-js": "^1.1.1",
-        "node-fingerprint": "0.0.2"
-      }
-    },
-    "dashdash": {
+    "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^1.0.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "debug": {
+    "node_modules/dashdash/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true
-    },
-    "decode-uri-component": {
+    "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "define-data-property": {
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-data-property": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
       "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "define-property": {
+    "node_modules/define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "delayed-stream": {
+    "node_modules/define-property/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/define-property/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
-    "depd": {
+    "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "destroy": {
+    "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true
-    },
-    "dom-serializer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
-      "requires": {
-        "domelementtype": "^1.3.0",
-        "entities": "^1.1.1"
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
-      "requires": {
-        "domelementtype": "1"
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "ecc-jsbn": {
+    "node_modules/domutils": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
-    "ee-first": {
+    "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
-    "ejs": {
+    "node_modules/ejs": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "dev": true
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "encodeurl": {
+    "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
     },
-    "errno": {
+    "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
       }
     },
-    "escape-html": {
+    "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
-    "escape-string-regexp": {
+    "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "esprima": {
+    "node_modules/esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "esutils": {
+    "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "etag": {
+    "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "expand-brackets": {
+    "node_modules/expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-posix-bracket": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "expand-range": {
+    "node_modules/expand-range": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "fill-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extend": {
+    "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true,
       "optional": true
     },
-    "extend-shallow": {
+    "node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
       },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extglob": {
+    "node_modules/extend-shallow/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extsprintf": {
+    "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
       "optional": true
     },
-    "file-uri-to-path": {
+    "node_modules/fast-equals": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-3.0.3.tgz",
+      "integrity": "sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
       "optional": true
     },
-    "filename-regex": {
+    "node_modules/filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "fill-range": {
+    "node_modules/fill-range": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
       "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^2.1.0",
         "isobject": "^2.0.0",
         "randomatic": "^3.0.0",
         "repeat-element": "^1.1.2",
         "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "finalhandler": {
+    "node_modules/finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
       "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -1162,756 +1292,881 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "for-in": {
+    "node_modules/for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "for-own": {
+    "node_modules/for-own": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "forever-agent": {
+    "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "form-data": {
+    "node_modules/form-data": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.5",
         "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
       }
     },
-    "fragment-cache": {
+    "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "fresh": {
+    "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "fsevents": {
+    "node_modules/fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "dev": true,
+      "hasInstallScript": true,
       "optional": true,
-      "requires": {
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
         "bindings": "^1.5.0",
         "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
       }
     },
-    "function-bind": {
+    "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "get-intrinsic": {
+    "node_modules/get-intrinsic": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
       "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "get-value": {
+    "node_modules/get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "getpass": {
+    "node_modules/getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "optional": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      },
       "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+        "assert-plus": "^1.0.0"
       }
     },
-    "glob": {
+    "node_modules/getpass/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/glob": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
       "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "inflight": "^1.0.4",
         "inherits": "2",
         "minimatch": "2 || 3",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "glob-base": {
+    "node_modules/glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "glob-parent": {
+    "node_modules/glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-glob": "^2.0.0"
       }
     },
-    "globals": {
+    "node_modules/globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
       "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "gopd": {
+    "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "graceful-fs": {
+    "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "har-schema": {
+    "node_modules/har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
       "integrity": "sha512-f8xf2GOR6Rgwc9FPTLNzgwB+JQ2/zMauYXSWmX5YV5acex6VomT0ocSuwR7BfXo5MpHi+jL+saaux2fwsGJDKQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "har-validator": {
+    "node_modules/har-validator": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha512-5Gbp6RAftMYYV3UEI4c4Vv3+a4dQ7taVyvHt+/L6kRt+f4HX1GweAk5UDWN0SvdVnRBzGQ6OG89pGaD9uSFnVw==",
+      "deprecated": "this library is no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "ajv": "^4.9.1",
         "har-schema": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "has-ansi": {
+    "node_modules/has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "has-flag": {
+    "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "has-property-descriptors": {
+    "node_modules/has-property-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
       "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "get-intrinsic": "^1.2.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "has-proto": {
+    "node_modules/has-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "has-symbols": {
+    "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "has-value": {
+    "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "has-values": {
+    "node_modules/has-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "hasown": {
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
       "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "hawk": {
+    "node_modules/hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==",
+      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "boom": "2.x.x",
         "cryptiles": "2.x.x",
         "hoek": "2.x.x",
         "sntp": "1.x.x"
-      }
-    },
-    "hexo": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.9.0.tgz",
-      "integrity": "sha512-uga6MsxGlD0AeafiObbFkQVWlUO+wWTb/IJVPI3fFpmAJu0PBD//Ek0qVOxHjlzdvFGeW0bYWYqXgDbR7suJng==",
-      "dev": true,
-      "requires": {
-        "abbrev": "^1.1.1",
-        "archy": "^1.0.0",
-        "bluebird": "^3.5.2",
-        "chalk": "^2.4.1",
-        "cheerio": "0.22.0",
-        "hexo-cli": "^2.0.0",
-        "hexo-front-matter": "^0.2.3",
-        "hexo-fs": "^1.0.0",
-        "hexo-i18n": "^0.2.1",
-        "hexo-log": "^0.2.0",
-        "hexo-util": "^0.6.3",
-        "js-yaml": "^3.12.0",
-        "lodash": "^4.17.11",
-        "minimatch": "^3.0.4",
-        "moment": "^2.22.2",
-        "moment-timezone": "^0.5.21",
-        "nunjucks": "^3.1.3",
-        "pretty-hrtime": "^1.0.3",
-        "resolve": "^1.8.1",
-        "strip-ansi": "^5.0.0",
-        "strip-indent": "^2.0.0",
-        "swig-extras": "0.0.1",
-        "swig-templates": "^2.0.3",
-        "text-table": "^0.2.0",
-        "tildify": "^1.2.0",
-        "titlecase": "^1.1.2",
-        "warehouse": "^2.2.0"
       },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "hexo-cli": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
-          "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
-          "dev": true,
-          "requires": {
-            "abbrev": "^1.1.1",
-            "acorn": "^6.1.1",
-            "bluebird": "^3.5.3",
-            "chalk": "^2.4.2",
-            "command-exists": "^1.2.8",
-            "hexo-fs": "^1.0.2",
-            "hexo-log": "^0.2.0",
-            "hexo-util": "^0.6.3",
-            "minimist": "^1.2.0",
-            "resolve": "^1.10.0",
-            "tildify": "^1.2.0"
-          }
-        },
-        "hexo-fs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.1",
-            "chokidar": "^2.0.4",
-            "escape-string-regexp": "^1.0.5",
-            "graceful-fs": "^4.1.11"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.32"
       }
     },
-    "hexo-bunyan": {
+    "node_modules/hexo": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/hexo/-/hexo-7.3.0.tgz",
+      "integrity": "sha512-dOe8mzBKrvjubW5oBmyhcnQDpC+M2xmAMLae5K+o+SkHxyvAhShkS2VQZoTsOLIJKY6xilv7dzCjCvE7ol/NHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abbrev": "^2.0.0",
+        "archy": "^1.0.0",
+        "bluebird": "^3.7.2",
+        "hexo-cli": "^4.3.2",
+        "hexo-front-matter": "^4.2.1",
+        "hexo-fs": "^4.1.3",
+        "hexo-i18n": "^2.0.0",
+        "hexo-log": "^4.0.1",
+        "hexo-util": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "js-yaml-js-types": "^1.0.0",
+        "micromatch": "^4.0.4",
+        "moize": "^6.1.6",
+        "moment": "^2.29.1",
+        "moment-timezone": "^0.5.34",
+        "nunjucks": "^3.2.3",
+        "picocolors": "^1.0.0",
+        "pretty-hrtime": "^1.0.3",
+        "resolve": "^1.22.0",
+        "strip-ansi": "^6.0.0",
+        "text-table": "^0.2.0",
+        "tildify": "^2.0.0",
+        "titlecase": "^1.1.3",
+        "warehouse": "^5.0.1"
+      },
+      "bin": {
+        "hexo": "bin/hexo"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/hexo"
+      }
+    },
+    "node_modules/hexo-bunyan": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-bunyan/-/hexo-bunyan-1.0.0.tgz",
       "integrity": "sha512-RymT8Ck+K77mLt9BEYNb4uyfC7RIQnU5N3laXowMrS28jj2h89VHJCOnhV00mmta4fHRqNa07kP1Hrn17nvMkQ==",
+      "deprecated": "Please see https://github.com/hexojs/hexo-bunyan/issues/17",
       "dev": true,
-      "requires": {
+      "engines": [
+        "node >=0.10.0"
+      ],
+      "bin": {
+        "bunyan": "bin/bunyan"
+      },
+      "optionalDependencies": {
         "moment": "^2.10.6",
         "mv": "~2",
         "safe-json-stringify": "~1"
       }
     },
-    "hexo-front-matter": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-0.2.3.tgz",
-      "integrity": "sha512-GL/pGfYqsvjMgxjhOWv1zAc7t4JoGUow+CH9Tes/5N2wKxxTzt2woKEMHz1+c01CmhdVYUR4lO3R1ZAcxc0caA==",
+    "node_modules/hexo-cli": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-4.3.2.tgz",
+      "integrity": "sha512-druJeBgLpG9ncDS5AhBHdAXk0G4CFj8Qes09pApyZ6bR+nJW1JYiDMuilhudaKDdq+1l49jWXVTidkcb7p0Jbw==",
       "dev": true,
-      "requires": {
-        "js-yaml": "^3.6.1"
+      "license": "MIT",
+      "dependencies": {
+        "abbrev": "^2.0.0",
+        "bluebird": "^3.7.2",
+        "command-exists": "^1.2.9",
+        "hexo-fs": "^4.1.1",
+        "hexo-log": "^4.0.1",
+        "hexo-util": "^3.3.0",
+        "minimist": "^1.2.5",
+        "picocolors": "^1.0.0",
+        "resolve": "^1.20.0",
+        "tildify": "^2.0.0"
+      },
+      "bin": {
+        "hexo": "bin/hexo"
+      },
+      "engines": {
+        "node": ">=14"
       }
     },
-    "hexo-fs": {
+    "node_modules/hexo-cli/node_modules/abbrev": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/hexo-fs": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-4.1.3.tgz",
+      "integrity": "sha512-Q92zQ5PlVDouvSWFLXQoFSTLIUIODikUJs2BfAXQglyOEjN1dOQn1Z5Nimk/7GHof17R5h/uObCQLnZAjzI2tg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bluebird": "^3.7.2",
+        "chokidar": "^3.5.3",
+        "graceful-fs": "^4.2.10",
+        "hexo-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/hexo-log": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
+      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/hexo-util": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-3.3.0.tgz",
+      "integrity": "sha512-YvGngXijE2muEh5L/VI4Fmjqb+/yAkmY+VuyhWVoRwQu1X7bmWodsfYRXX7CUYhi5LqsvH8FAe/yBW1+f6ZX4Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "cross-spawn": "^7.0.3",
+        "deepmerge": "^4.2.2",
+        "highlight.js": "^11.6.0",
+        "htmlparser2": "^9.0.0",
+        "prismjs": "^1.29.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/highlight.js": {
+      "version": "11.11.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
+      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/tildify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz",
+      "integrity": "sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/hexo-front-matter": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-4.2.1.tgz",
+      "integrity": "sha512-sJJI0GNmejYiwBvgnGRKn5V3sbODB4dNPr8jyw2Qp0PRHr4Uuyv8iyxw6WfK3+T7yvzYvJOh+tZ7jnwr2BYARA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-yaml": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/hexo-fs": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-0.2.3.tgz",
       "integrity": "sha512-rLB1rMVUW3csAljvJgHfyjemL0BrmcUZfBf9hJe6S0pA53igFa3ON0PFwomvoLs1Wdmjs9Awnw9Tru4PjWFSlQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.4.0",
         "chokidar": "^1.5.2",
         "escape-string-regexp": "^1.0.5",
         "graceful-fs": "^4.1.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "hexo-i18n": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
-      "integrity": "sha512-QhVmN/eLohu9UzvrX85zhfL7yN5O4MOkXKYmCRI8GPcg0EczX+blYYmMCugZKu/NIJ9XD5/etAVWCi/5F+fS6g==",
+    "node_modules/hexo-i18n": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-2.0.0.tgz",
+      "integrity": "sha512-dkUXecEtChaQMdTHN4WR13c8GwKqjbSOZPJS9qDqV6Ebnb77Wa/nQzWFckhP0dCps3a9lUQBd8hYGOMbOosiQQ==",
       "dev": true,
-      "requires": {
-        "sprintf-js": "^1.0.2"
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=14"
       }
     },
-    "hexo-inject": {
+    "node_modules/hexo-inject": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-inject/-/hexo-inject-1.0.0.tgz",
       "integrity": "sha512-Ly0k7FO3G5+XNvFNE7yjSENSWy8QTnzl8cNFWYuMXRYMogbHd/Q0Ane8WCKYb5QD/A+WXC3rHb32wIGb0YAfVw==",
+      "deprecated": "The author does not use Hexo any more. This plugin is no longer maintained.",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-plugin-transform-decorators-legacy": "^1.3.4",
         "babel-polyfill": "^6.7.2",
         "bluebird": "^3.3.4",
@@ -1919,412 +2174,475 @@
         "underscore": "^1.8.3"
       }
     },
-    "hexo-log": {
+    "node_modules/hexo-log": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-0.2.0.tgz",
       "integrity": "sha512-fzoc+GQexxPPILTjoOQILnA3ZG2MFgqMBVel4xvJ11pXptw9+f97ynTgDAExXafyp9Nz2ChXRuqlCYgPtZSlxQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "chalk": "^1.1.1",
         "hexo-bunyan": "^1.0.0"
       }
     },
-    "hexo-prism-plus": {
+    "node_modules/hexo-prism-plus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-prism-plus/-/hexo-prism-plus-1.1.0.tgz",
       "integrity": "sha512-lkDJRZDVN3iNpYtuwrI+JFLj3rSa4PeMwz1OlVfUOkY6CyjD/D3dGtW7cTpcxYejr3/JWjusIqWVnUTLpKr4Yw==",
       "dev": true,
-      "requires": {
+      "hasInstallScript": true,
+      "dependencies": {
         "hexo-fs": "^1.0.0",
         "hexo-inject": "^1.0.0",
         "hexo-util": "^0.6.3",
         "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "hexo-fs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.1",
-            "chokidar": "^2.0.4",
-            "escape-string-regexp": "^1.0.5",
-            "graceful-fs": "^4.1.11"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        }
       }
     },
-    "hexo-renderer-ejs": {
+    "node_modules/hexo-prism-plus/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/hexo-fs": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-renderer-ejs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-1.0.0.tgz",
       "integrity": "sha512-O925i69FG4NYO62oWORcPhRZZX0sPx1SXGKUS5DaR/lzajyiXH5i2sqnkj0ya0rNLXIy/D7Xmt7WbFyuQx/kKQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ejs": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "hexo-renderer-less": {
+    "node_modules/hexo-renderer-less": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-less/-/hexo-renderer-less-0.2.0.tgz",
       "integrity": "sha512-mhkwGsrLPG1e0bpE40FSRufaDHJ4uDtTYNUIQDBYR3aZkbOxAnpN607BTjymr/F+4uYy0cd7MK4y5vFx5pEDQw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "less": "^2.5.1"
       }
     },
-    "hexo-renderer-marked": {
+    "node_modules/hexo-renderer-marked": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-marked/-/hexo-renderer-marked-2.0.0.tgz",
       "integrity": "sha512-+LMjgPkJSUAOlWYHJnBXxUHwGqemGNlK/I+JNO4zA5rEHWNWZ9wNAZKd5g0lEVdMAZzAV54gCylXGURgMO4IAw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hexo-util": "1.0.0",
         "marked": "^0.7.0",
         "strip-indent": "^3.0.0"
       },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "hexo-util": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
-          "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.2",
-            "camel-case": "^3.0.0",
-            "cross-spawn": "^6.0.5",
-            "highlight.js": "^9.13.1",
-            "html-entities": "^1.2.1",
-            "striptags": "^3.1.1"
-          }
-        },
-        "strip-indent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-          "dev": true,
-          "requires": {
-            "min-indent": "^1.0.0"
-          }
-        },
-        "striptags": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
-          "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "hexo-server": {
+    "node_modules/hexo-renderer-marked/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/hexo-util": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
+      "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.2",
+        "camel-case": "^3.0.0",
+        "cross-spawn": "^6.0.5",
+        "highlight.js": "^9.13.1",
+        "html-entities": "^1.2.1",
+        "striptags": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/striptags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
+      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
+      "dev": true
+    },
+    "node_modules/hexo-server": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-server/-/hexo-server-1.0.0.tgz",
       "integrity": "sha512-eSY+a5oiGCG/3T6FrdrNRBkttMLJkM+oitY6ZMFowjcBiG2VNEhQmfWUDOykfvApZs4wPYBb//uXD/58tfe3mA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.5.5",
         "chalk": "^2.4.2",
         "compression": "^1.7.4",
@@ -2334,50 +2652,66 @@
         "open": "^6.3.0",
         "serve-static": "^1.14.1"
       },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "mime": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "hexo-util": {
+    "node_modules/hexo-server/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-server/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-server/node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/hexo-server/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-util": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-0.6.3.tgz",
       "integrity": "sha512-zPxaqCWZz3/25SAB4FlrRtWktJ+Pr+vBiv/nyHpXKgXPt1m70liViKlRwWLqDmRjJ72x6/k4qCEeXHajvcGHUw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.4.0",
         "camel-case": "^3.0.0",
         "cross-spawn": "^4.0.0",
@@ -2386,415 +2720,897 @@
         "striptags": "^2.1.1"
       }
     },
-    "hexo-versioned-netlify-redirects": {
+    "node_modules/hexo-versioned-netlify-redirects": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-versioned-netlify-redirects/-/hexo-versioned-netlify-redirects-1.1.0.tgz",
       "integrity": "sha512-kfY19ZZDwBnRaZFA6KQgt5DhVBpTQG1yBoq01zaACFHIFuSd9OjhiHCkJ3it+TMvGl+JGTtgKhIwZoQUJHyv/g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "url-join": "^4.0.0"
       }
     },
-    "highlight.js": {
+    "node_modules/hexo/node_modules/abbrev": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/hexo/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/hexo/node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hexo/node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/hexo/node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/hexo/node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/hexo/node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/hexo/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hexo/node_modules/hexo-fs": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-4.1.3.tgz",
+      "integrity": "sha512-Q92zQ5PlVDouvSWFLXQoFSTLIUIODikUJs2BfAXQglyOEjN1dOQn1Z5Nimk/7GHof17R5h/uObCQLnZAjzI2tg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bluebird": "^3.7.2",
+        "chokidar": "^3.5.3",
+        "graceful-fs": "^4.2.10",
+        "hexo-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/hexo/node_modules/hexo-log": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
+      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/hexo/node_modules/hexo-util": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-3.3.0.tgz",
+      "integrity": "sha512-YvGngXijE2muEh5L/VI4Fmjqb+/yAkmY+VuyhWVoRwQu1X7bmWodsfYRXX7CUYhi5LqsvH8FAe/yBW1+f6ZX4Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "cross-spawn": "^7.0.3",
+        "deepmerge": "^4.2.2",
+        "highlight.js": "^11.6.0",
+        "htmlparser2": "^9.0.0",
+        "prismjs": "^1.29.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/hexo/node_modules/highlight.js": {
+      "version": "11.11.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
+      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/hexo/node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/hexo/node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/tildify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz",
+      "integrity": "sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/hexo/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/highlight.js": {
       "version": "9.18.5",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
       "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
-      "dev": true
+      "deprecated": "Support has ended for 9.x series. Upgrade to @latest",
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "hoek": {
+    "node_modules/hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.40"
+      }
     },
-    "html-entities": {
+    "node_modules/html-entities": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
       "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
-    "htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+    "node_modules/htmlparser2": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
+      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
       "dev": true,
-      "requires": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
         }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.1.0",
+        "entities": "^4.5.0"
       }
     },
-    "http-errors": {
+    "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
-      "dependencies": {
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "http-signature": {
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^0.2.0",
         "jsprim": "^1.2.2",
         "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
       }
     },
-    "image-size": {
+    "node_modules/image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "inflight": {
+    "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
-    "inherits": {
+    "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "invariant": {
+    "node_modules/invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "loose-envify": "^1.0.0"
       }
     },
-    "is-accessor-descriptor": {
+    "node_modules/is-accessor-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
       "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "is-binary-path": {
+    "node_modules/is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-buffer": {
+    "node_modules/is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "is-core-module": {
+    "node_modules/is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
       "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "is-data-descriptor": {
+    "node_modules/is-data-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
       "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "is-descriptor": {
+    "node_modules/is-descriptor": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "is-dotfile": {
+    "node_modules/is-dotfile": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-equal-shallow": {
+    "node_modules/is-equal-shallow": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-primitive": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-extendable": {
+    "node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-extglob": {
+    "node_modules/is-extglob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
       "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-glob": {
+    "node_modules/is-glob": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
       "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-number": {
+    "node_modules/is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
       "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-plain-object": {
+    "node_modules/is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-posix-bracket": {
+    "node_modules/is-plain-object/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-primitive": {
+    "node_modules/is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-typedarray": {
+    "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true,
       "optional": true
     },
-    "is-windows": {
+    "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-wsl": {
+    "node_modules/is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
       "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "isarray": {
+    "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "isexe": {
+    "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "isobject": {
+    "node_modules/isobject": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "isstream": {
+    "node_modules/isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true,
       "optional": true
     },
-    "js-tokens": {
+    "node_modules/js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
       "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
       "dev": true
     },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "jsbn": {
+    "node_modules/js-yaml-js-types": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/js-yaml-js-types/-/js-yaml-js-types-1.0.1.tgz",
+      "integrity": "sha512-5tpfyORs8OQ43alNERbWfYRCtWgykvzYgY46fUhrQi2+kS7N0NuuFYLZ/IrfmVm5muLTndeMublgraXiFRjEPw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esprima": "^4.0.1"
+      },
+      "peerDependencies": {
+        "js-yaml": "4.x"
+      }
+    },
+    "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true,
       "optional": true
     },
-    "json-schema": {
+    "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true,
       "optional": true
     },
-    "json-stable-stringify": {
+    "node_modules/json-stable-stringify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz",
       "integrity": "sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "call-bind": "^1.0.5",
         "isarray": "^2.0.5",
         "jsonify": "^0.0.1",
         "object-keys": "^1.1.1"
       },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "json-stringify-safe": {
+    "node_modules/json-stable-stringify/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true,
       "optional": true
     },
-    "jsonify": {
+    "node_modules/jsonify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
       "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "jsonparse": {
+    "node_modules/jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ],
+      "license": "MIT"
     },
-    "jsprim": {
+    "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
         "json-schema": "0.4.0",
         "verror": "1.10.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">=0.6.0"
       }
     },
-    "kind-of": {
+    "node_modules/jsprim/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-      "dev": true
-    },
-    "less": {
+    "node_modules/less": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
       "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
       "dev": true,
-      "requires": {
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=0.12"
+      },
+      "optionalDependencies": {
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
@@ -2805,157 +3621,92 @@
         "source-map": "^0.5.3"
       }
     },
-    "lodash": {
+    "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.assignin": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
-      "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
-      "dev": true
-    },
-    "lodash.bind": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
-      "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==",
-      "dev": true
-    },
-    "lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true
-    },
-    "lodash.filter": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
-      "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==",
-      "dev": true
-    },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true
-    },
-    "lodash.foreach": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
-      "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
-      "dev": true
-    },
-    "lodash.map": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
-      "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "lodash.pick": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
-      "dev": true
-    },
-    "lodash.reduce": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
-      "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==",
-      "dev": true
-    },
-    "lodash.reject": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
-      "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==",
-      "dev": true
-    },
-    "lodash.some": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
-      "dev": true
-    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
-      "dev": true
-    },
-    "loose-envify": {
+    "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
       }
     },
-    "lower-case": {
+    "node_modules/lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
       "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
       "dev": true
     },
-    "lru-cache": {
+    "node_modules/lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
       }
     },
-    "map-cache": {
+    "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "map-visit": {
+    "node_modules/map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "markdown": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
-      "integrity": "sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==",
-      "dev": true,
-      "requires": {
-        "nopt": "~2.1.1"
-      }
-    },
-    "marked": {
+    "node_modules/marked": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
       "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "math-random": {
+    "node_modules/math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
       "dev": true
     },
-    "micromatch": {
+    "node_modules/micro-memoize": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/micro-memoize/-/micro-memoize-4.1.3.tgz",
+      "integrity": "sha512-DzRMi8smUZXT7rCGikRwldEh6eO6qzKiPPopcr1+2EY3AYKpy5fu159PKWwIS9A6IWnrvPKDMcuFtyrroZa8Bw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/micromatch": {
       "version": "2.3.11",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-diff": "^2.0.0",
         "array-unique": "^0.2.1",
         "braces": "^1.8.2",
@@ -2969,140 +3720,195 @@
         "object.omit": "^2.0.0",
         "parse-glob": "^3.0.4",
         "regex-cache": "^0.4.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "mime": {
+    "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "mime-db": {
+    "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "mime-types": {
+    "node_modules/mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "min-indent": {
+    "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "minimatch": {
+    "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "requires": {
+      "optional": true,
+      "dependencies": {
         "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "minimist": {
+    "node_modules/minimist": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "mixin-deep": {
+    "node_modules/mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
       },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "mkdirp": {
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "moment": {
+    "node_modules/moize": {
+      "version": "6.1.6",
+      "resolved": "https://registry.npmjs.org/moize/-/moize-6.1.6.tgz",
+      "integrity": "sha512-vSKdIUO61iCmTqhdoIDrqyrtp87nWZUmBPniNjO0fX49wEYmyDO4lvlnFXiGcaH1JLE/s/9HbiK4LSHsbiUY6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-equals": "^3.0.1",
+        "micro-memoize": "^4.1.2"
+      }
+    },
+    "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "moment-timezone": {
+    "node_modules/moment-timezone": {
       "version": "0.5.43",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
       "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "morgan": {
+    "node_modules/morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
       "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-finished": "~2.3.0",
         "on-headers": "~1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "ms": {
+    "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "mv": {
+    "node_modules/mv": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
       "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "mkdirp": "~0.5.1",
         "ncp": "~2.0.0",
         "rimraf": "~2.4.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "nan": {
+    "node_modules/nan": {
       "version": "2.18.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
       "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
       "dev": true,
       "optional": true
     },
-    "nanomatch": {
+    "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
         "define-property": "^2.0.2",
@@ -3115,396 +3921,522 @@
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
       },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "ncp": {
+    "node_modules/nanomatch/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
       "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "ncp": "bin/ncp"
+      }
     },
-    "negotiator": {
+    "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "nice-try": {
+    "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "no-case": {
+    "node_modules/no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lower-case": "^1.1.1"
       }
     },
-    "node-fingerprint": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/node-fingerprint/-/node-fingerprint-0.0.2.tgz",
-      "integrity": "sha512-vPFfTD5EBJieQ4SI3v61fWxlV1kav3m9Dbejd6CjWhOJn8s+XMxpOOosCNAyIrUQ/jJOlPndfrZ0lSw4+RgwcA==",
-      "dev": true
-    },
-    "nopt": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
-      "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
-      "dev": true,
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "normalize-path": {
+    "node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dev": true,
-      "requires": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "nunjucks": {
+    "node_modules/nunjucks": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
       "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
         "commander": "^5.1.0"
+      },
+      "bin": {
+        "nunjucks-precompile": "bin/precompile"
+      },
+      "engines": {
+        "node": ">= 6.9.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.3.0"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "oauth-sign": {
+    "node_modules/oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
       "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "object-assign": {
+    "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "object-copy": {
+    "node_modules/object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
         "kind-of": "^3.0.3"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object-keys": {
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "object-visit": {
+    "node_modules/object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.omit": {
+    "node_modules/object-visit/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.pick": {
+    "node_modules/object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "on-finished": {
+    "node_modules/object.pick/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "on-headers": {
+    "node_modules/on-headers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "once": {
+    "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "wrappy": "1"
       }
     },
-    "open": {
+    "node_modules/open": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
       "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dev": true,
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
-      "dev": true,
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
       "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-          "dev": true
-        }
+        "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "os-homedir": {
+    "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "parse-glob": {
+    "node_modules/parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
         "is-extglob": "^1.0.0",
         "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "parseurl": {
+    "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "pascalcase": {
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/pascal-case/node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/pascal-case/node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-dirname": {
+    "node_modules/path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
       "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
       "dev": true
     },
-    "path-is-absolute": {
+    "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-key": {
+    "node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "path-parse": {
+    "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "performance-now": {
+    "node_modules/performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
       "integrity": "sha512-YHk5ez1hmMR5LOkb9iJkLKqoBlL7WD5M8ljC75ZfzXriuBIVNuecaXuU7e+hOwyqf24Wxhh7Vxgt7Hnw9288Tg==",
       "dev": true,
       "optional": true
     },
-    "posix-character-classes": {
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "preserve": {
+    "node_modules/preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "pretty-hrtime": {
+    "node_modules/pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "process-nextick-args": {
+    "node_modules/prismjs": {
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
+      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "promise": {
+    "node_modules/promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asap": "~2.0.3"
       }
     },
-    "prr": {
+    "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true,
       "optional": true
     },
-    "pseudomap": {
+    "node_modules/pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
-    "punycode": {
+    "node_modules/punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
       "dev": true,
       "optional": true
     },
-    "qs": {
+    "node_modules/qs": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.1.tgz",
       "integrity": "sha512-LQy1Q1fcva/UsnP/6Iaa4lVeM49WiOitu2T4hZCyA/elLKu37L99qcBJk4VCCk+rdLvnMzfKyiN3SZTqdAZGSQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.6"
+      }
     },
-    "randomatic": {
+    "node_modules/randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
         "math-random": "^1.0.1"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "range-parser": {
+    "node_modules/randomatic/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/randomatic/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "readable-stream": {
+    "node_modules/readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
         "isarray": "~1.0.0",
@@ -3514,277 +4446,338 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "readdirp": {
+    "node_modules/readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
         "readable-stream": "^2.0.2"
       },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        }
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "regenerator-runtime": {
+    "node_modules/readdirp/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
-    "regex-cache": {
+    "node_modules/regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-equal-shallow": "^0.1.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "regex-not": {
+    "node_modules/regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "remove-trailing-separator": {
+    "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
-    "repeat-element": {
+    "node_modules/repeat-element": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "repeat-string": {
+    "node_modules/repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "request": {
+    "node_modules/request": {
       "version": "2.81.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
       "integrity": "sha512-IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "aws-sign2": "~0.6.0",
         "aws4": "^1.2.1",
         "caseless": "~0.12.0",
@@ -3807,91 +4800,109 @@
         "tough-cookie": "~2.3.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "resolve": {
+    "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "resolve-url": {
+    "node_modules/resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "ret": {
+    "node_modules/ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "dev": true,
-      "requires": {
-        "align-text": "^0.1.1"
+      "engines": {
+        "node": ">=0.12"
       }
     },
-    "rimraf": {
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/rimraf": {
       "version": "2.4.5",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
       "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "glob": "^6.0.1"
+      },
+      "bin": {
+        "rimraf": "bin.js"
       }
     },
-    "safe-buffer": {
+    "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
-    "safe-json-stringify": {
+    "node_modules/safe-json-stringify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
       "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
       "dev": true,
       "optional": true
     },
-    "safe-regex": {
+    "node_modules/safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ret": "~0.1.10"
       }
     },
-    "safer-buffer": {
+    "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true,
       "optional": true
     },
-    "semver": {
+    "node_modules/semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
     },
-    "send": {
+    "node_modules/send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
       "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -3906,105 +4917,128 @@
         "range-parser": "~1.2.1",
         "statuses": "2.0.1"
       },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        },
-        "on-finished": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-          "dev": true,
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "serve-static": {
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/serve-static": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
       "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
         "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "set-function-length": {
+    "node_modules/set-function-length": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
       "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "define-data-property": "^1.1.1",
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "set-value": {
+    "node_modules/set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
         "is-plain-object": "^2.0.3",
         "split-string": "^3.0.1"
       },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "setprototypeof": {
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
-    "shebang-command": {
+    "node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "shebang-regex": {
+    "node_modules/shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "snapdragon": {
+    "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
         "define-property": "^0.2.5",
@@ -4014,96 +5048,124 @@
         "source-map-resolve": "^0.5.0",
         "use": "^3.1.0"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "snapdragon-node": {
+    "node_modules/snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
         "snapdragon-util": "^3.0.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "snapdragon-util": {
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "sntp": {
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==",
+      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "hoek": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "source-map": {
+    "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "source-map-resolve": {
+    "node_modules/source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
@@ -4111,34 +5173,39 @@
         "urix": "^0.1.0"
       }
     },
-    "source-map-url": {
+    "node_modules/source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
-    "split-string": {
+    "node_modules/split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
-    "sshpk": {
+    "node_modules/sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
         "bcrypt-pbkdf": "^1.0.0",
@@ -4149,449 +5216,548 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "static-extend": {
+    "node_modules/sshpk/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "statuses": {
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "string_decoder": {
+    "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
-    "stringstream": {
+    "node_modules/stringstream": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
       "dev": true,
       "optional": true
     },
-    "strip-ansi": {
+    "node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "strip-indent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-      "dev": true
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "striptags": {
+    "node_modules/striptags": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz",
       "integrity": "sha512-vZTvmFP0IYu/zn8MXV6PrLb6VKbd9WGSEnlm4D5RNXS/+zYYlHrSfJgoBw1w56D6RJCr515er3BittRGQqihLA==",
       "dev": true
     },
-    "supports-color": {
+    "node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "supports-preserve-symlinks-flag": {
+    "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "swig-extras": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
-      "integrity": "sha512-mFgpjjcQ0Kj+WplOrnWfUEw8iehZMD78sRId6uMXaTlWpy/vt8PTv3GoNsHrHBpZNnPnIsoWxrmRbS3vePjWpA==",
       "dev": true,
-      "requires": {
-        "markdown": "~0.5.0"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "swig-templates": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
-      "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
-      "dev": true,
-      "requires": {
-        "optimist": "~0.6",
-        "uglify-js": "2.6.0"
-      }
-    },
-    "text-table": {
+    "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "3"
+      }
     },
-    "tildify": {
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
       "integrity": "sha512-Y9q1GaV/BO65Z9Yf4NOGMuwt3SGdptkZBnaaKfTQakrDyCLiuO1Kc5wxW4xLdsjzunRtqtOdhekiUFmZbklwYQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "os-homedir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "titlecase": {
+    "node_modules/titlecase": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.3.tgz",
       "integrity": "sha512-pQX4oiemzjBEELPqgK4WE+q0yhAqjp/yzusGtlSJsOuiDys0RQxggepYmo0BuegIDppYS3b3cpdegRwkpyN3hw==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "to-title-case": "bin.js"
+      }
     },
-    "to-fast-properties": {
+    "node_modules/to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "to-object-path": {
+    "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "to-regex": {
+    "node_modules/to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "to-regex-range": {
+    "node_modules/to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "toidentifier": {
+    "node_modules/to-regex-range/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
     },
-    "tough-cookie": {
+    "node_modules/tough-cookie": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "punycode": "^1.4.1"
+      },
+      "engines": {
+        "node": ">=0.8"
       }
     },
-    "tunnel-agent": {
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "tweetnacl": {
+    "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true,
       "optional": true
     },
-    "uglify-js": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
-      "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
-      "dev": true,
-      "requires": {
-        "async": "~0.2.6",
-        "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.10.0"
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
-      "dev": true
-    },
-    "underscore": {
+    "node_modules/underscore": {
       "version": "1.13.6",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
       "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
       "dev": true
     },
-    "union-value": {
+    "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "unpipe": {
+    "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "unset-value": {
+    "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-          "dev": true
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "upath": {
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
     },
-    "upper-case": {
+    "node_modules/upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
       "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
       "dev": true
     },
-    "urix": {
+    "node_modules/urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "url-join": {
+    "node_modules/url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
       "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
       "dev": true
     },
-    "use": {
+    "node_modules/use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "util-deprecate": {
+    "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "utils-merge": {
+    "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
     },
-    "uuid": {
+    "node_modules/uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
     },
-    "vary": {
+    "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "verror": {
+    "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-          "dev": true,
-          "optional": true
-        }
       }
     },
-    "warehouse": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz",
-      "integrity": "sha512-axyo83DpdZabmCsiipkHYKnwl6ull2Vv7fqxMnV8KOQLdiJKffn9W+B3Yac7QVWzBE56Q6B6j2cIY1k2gc10PA==",
+    "node_modules/verror/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
-      "requires": {
-        "JSONStream": "^1.0.7",
-        "bluebird": "^3.2.2",
-        "cuid": "~1.3.8",
-        "graceful-fs": "^4.1.3",
-        "is-plain-object": "^2.0.1",
-        "lodash": "^4.2.1"
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
       }
     },
-    "which": {
+    "node_modules/verror/node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/warehouse": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-5.0.1.tgz",
+      "integrity": "sha512-5BQEQP56bPY+cqocTho4syazuGgSoyKd0y3PsS2j8tGN10HH+CEfJSIY+KUw9D0k4jaVEFMXLz0KqCiUzTYb8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bluebird": "^3.7.2",
+        "cuid": "^2.1.8",
+        "graceful-fs": "^4.2.10",
+        "hexo-log": "^4.0.1",
+        "is-plain-object": "^5.0.0",
+        "jsonparse": "^1.3.1",
+        "rfdc": "^1.3.0",
+        "through2": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/warehouse/node_modules/hexo-log": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
+      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/warehouse/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
-      "dev": true
-    },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-      "dev": true
-    },
-    "wrappy": {
+    "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "optional": true
     },
-    "yallist": {
+    "node_modules/yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
-    },
-    "yargs": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-      "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^1.0.2",
-        "cliui": "^2.1.0",
-        "decamelize": "^1.0.0",
-        "window-size": "0.1.0"
-      }
     }
   }
 }
diff --git a/guide/package.json b/guide/package.json
index cc6e1a248d..29c05f07dd 100644
--- a/guide/package.json
+++ b/guide/package.json
@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "chexo": "1.0.7",
-    "hexo": "3.9.0",
+    "hexo": "7.3.0",
     "hexo-prism-plus": "1.1.0",
     "hexo-renderer-ejs": "1.0.0",
     "hexo-renderer-less": "0.2.0",

From 0eb87926e695b871e77650e4ae4510046ce36cf9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:43:31 +0000
Subject: [PATCH 0994/1140] Bump vite from 5.1.5 to 5.4.14 in
 /v3-docs/v3-migration-docs

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.1.5 to 5.4.14.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.14/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.14/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 v3-docs/v3-migration-docs/package-lock.json | 493 +++++++++++++-------
 1 file changed, 316 insertions(+), 177 deletions(-)

diff --git a/v3-docs/v3-migration-docs/package-lock.json b/v3-docs/v3-migration-docs/package-lock.json
index e0cc9531e2..e2e4559942 100644
--- a/v3-docs/v3-migration-docs/package-lock.json
+++ b/v3-docs/v3-migration-docs/package-lock.json
@@ -247,13 +247,14 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "aix"
@@ -263,13 +264,14 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -279,13 +281,14 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -295,13 +298,14 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -311,13 +315,14 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -327,13 +332,14 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -343,13 +349,14 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -359,13 +366,14 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -375,13 +383,14 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -391,13 +400,14 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -407,13 +417,14 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -423,13 +434,14 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -439,13 +451,14 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "cpu": [
         "mips64el"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -455,13 +468,14 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -471,13 +485,14 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -487,13 +502,14 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -503,13 +519,14 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -519,13 +536,14 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -535,13 +553,14 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -551,13 +570,14 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -567,13 +587,14 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -583,13 +604,14 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -599,13 +621,14 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -621,179 +644,277 @@
       "dev": true
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz",
-      "integrity": "sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.32.1.tgz",
+      "integrity": "sha512-/pqA4DmqyCm8u5YIDzIdlLcEmuvxb0v8fZdFhVMszSpDTgbQKdw3/mB3eMUHIbubtJ6F9j+LtmyCnHTEqIHyzA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz",
-      "integrity": "sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.32.1.tgz",
+      "integrity": "sha512-If3PDskT77q7zgqVqYuj7WG3WC08G1kwXGVFi9Jr8nY6eHucREHkfpX79c0ACAjLj3QIWKPJR7w4i+f5EdLH5Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz",
-      "integrity": "sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.32.1.tgz",
+      "integrity": "sha512-zCpKHioQ9KgZToFp5Wvz6zaWbMzYQ2LJHQ+QixDKq52KKrF65ueu6Af4hLlLWHjX1Wf/0G5kSJM9PySW9IrvHA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz",
-      "integrity": "sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.32.1.tgz",
+      "integrity": "sha512-sFvF+t2+TyUo/ZQqUcifrJIgznx58oFZbdHS9TvHq3xhPVL9nOp+yZ6LKrO9GWTP+6DbFtoyLDbjTpR62Mbr3Q==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.1.tgz",
+      "integrity": "sha512-NbOa+7InvMWRcY9RG+B6kKIMD/FsnQPH0MWUvDlQB1iXnF/UcKSudCXZtv4lW+C276g3w5AxPbfry5rSYvyeYA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.32.1.tgz",
+      "integrity": "sha512-JRBRmwvHPXR881j2xjry8HZ86wIPK2CcDw0EXchE1UgU0ubWp9nvlT7cZYKc6bkypBt745b4bglf3+xJ7hXWWw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz",
-      "integrity": "sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.32.1.tgz",
+      "integrity": "sha512-PKvszb+9o/vVdUzCCjL0sKHukEQV39tD3fepXxYrHE3sTKrRdCydI7uldRLbjLmDA3TFDmh418XH19NOsDRH8g==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.32.1.tgz",
+      "integrity": "sha512-9WHEMV6Y89eL606ReYowXuGF1Yb2vwfKWKdD1A5h+OYnPZSJvxbEjxTRKPgi7tkP2DSnW0YLab1ooy+i/FQp/Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz",
-      "integrity": "sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.32.1.tgz",
+      "integrity": "sha512-tZWc9iEt5fGJ1CL2LRPw8OttkCBDs+D8D3oEM8mH8S1ICZCtFJhD7DZ3XMGM8kpqHvhGUTvNUYVDnmkj4BDXnw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz",
-      "integrity": "sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.32.1.tgz",
+      "integrity": "sha512-FTYc2YoTWUsBz5GTTgGkRYYJ5NGJIi/rCY4oK/I8aKowx1ToXeoVVbIE4LGAjsauvlhjfl0MYacxClLld1VrOw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.32.1.tgz",
+      "integrity": "sha512-F51qLdOtpS6P1zJVRzYM0v6MrBNypyPEN1GfMiz0gPu9jN8ScGaEFIZQwteSsGKg799oR5EaP7+B2jHgL+d+Kw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.32.1.tgz",
+      "integrity": "sha512-wO0WkfSppfX4YFm5KhdCCpnpGbtgQNj/tgvYzrVYFKDpven8w2N6Gg5nB6w+wAMO3AIfSTWeTjfVe+uZ23zAlg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz",
-      "integrity": "sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.32.1.tgz",
+      "integrity": "sha512-iWswS9cIXfJO1MFYtI/4jjlrGb/V58oMu4dYJIKnR5UIwbkzR0PJ09O0PDZT0oJ3LYWXBSWahNf/Mjo6i1E5/g==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.32.1.tgz",
+      "integrity": "sha512-RKt8NI9tebzmEthMnfVgG3i/XeECkMPS+ibVZjZ6mNekpbbUmkNWuIN2yHsb/mBPyZke4nlI4YqIdFPgKuoyQQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz",
-      "integrity": "sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.32.1.tgz",
+      "integrity": "sha512-WQFLZ9c42ECqEjwg/GHHsouij3pzLXkFdz0UxHa/0OM12LzvX7DzedlY0SIEly2v18YZLRhCRoHZDxbBSWoGYg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz",
-      "integrity": "sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.32.1.tgz",
+      "integrity": "sha512-BLoiyHDOWoS3uccNSADMza6V6vCNiphi94tQlVIL5de+r6r/CCQuNnerf+1g2mnk2b6edp5dk0nhdZ7aEjOBsA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz",
-      "integrity": "sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.32.1.tgz",
+      "integrity": "sha512-w2l3UnlgYTNNU+Z6wOR8YdaioqfEnwPjIsJ66KxKAf0p+AuL2FHeTX6qvM+p/Ue3XPBVNyVSfCrfZiQh7vZHLQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz",
-      "integrity": "sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.32.1.tgz",
+      "integrity": "sha512-Am9H+TGLomPGkBnaPWie4F3x+yQ2rr4Bk2jpwy+iV+Gel9jLAu/KqT8k3X4jxFPW6Zf8OMnehyutsd+eHoq1WQ==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz",
-      "integrity": "sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.32.1.tgz",
+      "integrity": "sha512-ar80GhdZb4DgmW3myIS9nRFYcpJRSME8iqWgzH2i44u+IdrzmiXVxeFnExQ5v4JYUSpg94bWjevMG8JHf1Da5Q==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/hast": {
       "version": "3.0.4",
@@ -1254,11 +1375,12 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
-      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -1266,29 +1388,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.19.12",
-        "@esbuild/android-arm": "0.19.12",
-        "@esbuild/android-arm64": "0.19.12",
-        "@esbuild/android-x64": "0.19.12",
-        "@esbuild/darwin-arm64": "0.19.12",
-        "@esbuild/darwin-x64": "0.19.12",
-        "@esbuild/freebsd-arm64": "0.19.12",
-        "@esbuild/freebsd-x64": "0.19.12",
-        "@esbuild/linux-arm": "0.19.12",
-        "@esbuild/linux-arm64": "0.19.12",
-        "@esbuild/linux-ia32": "0.19.12",
-        "@esbuild/linux-loong64": "0.19.12",
-        "@esbuild/linux-mips64el": "0.19.12",
-        "@esbuild/linux-ppc64": "0.19.12",
-        "@esbuild/linux-riscv64": "0.19.12",
-        "@esbuild/linux-s390x": "0.19.12",
-        "@esbuild/linux-x64": "0.19.12",
-        "@esbuild/netbsd-x64": "0.19.12",
-        "@esbuild/openbsd-x64": "0.19.12",
-        "@esbuild/sunos-x64": "0.19.12",
-        "@esbuild/win32-arm64": "0.19.12",
-        "@esbuild/win32-ia32": "0.19.12",
-        "@esbuild/win32-x64": "0.19.12"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "node_modules/estree-walker": {
@@ -1312,6 +1434,7 @@
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1605,9 +1728,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "dev": true,
       "funding": [
         {
@@ -1615,6 +1738,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -1635,15 +1759,16 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/postcss": {
-      "version": "8.4.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
-      "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
+      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
       "dev": true,
       "funding": [
         {
@@ -1659,10 +1784,11 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -1689,12 +1815,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.0.tgz",
-      "integrity": "sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.1.tgz",
+      "integrity": "sha512-z+aeEsOeEa3mEbS1Tjl6sAZ8NE3+AalQz1RJGj81M+fizusbdDMoEJwdJNHfaB40Scr4qNu+welOfes7maKonA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1704,19 +1831,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.12.0",
-        "@rollup/rollup-android-arm64": "4.12.0",
-        "@rollup/rollup-darwin-arm64": "4.12.0",
-        "@rollup/rollup-darwin-x64": "4.12.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.12.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.12.0",
-        "@rollup/rollup-linux-arm64-musl": "4.12.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.12.0",
-        "@rollup/rollup-linux-x64-gnu": "4.12.0",
-        "@rollup/rollup-linux-x64-musl": "4.12.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.12.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.12.0",
-        "@rollup/rollup-win32-x64-msvc": "4.12.0",
+        "@rollup/rollup-android-arm-eabi": "4.32.1",
+        "@rollup/rollup-android-arm64": "4.32.1",
+        "@rollup/rollup-darwin-arm64": "4.32.1",
+        "@rollup/rollup-darwin-x64": "4.32.1",
+        "@rollup/rollup-freebsd-arm64": "4.32.1",
+        "@rollup/rollup-freebsd-x64": "4.32.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.32.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.32.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.32.1",
+        "@rollup/rollup-linux-arm64-musl": "4.32.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.32.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.32.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.32.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.32.1",
+        "@rollup/rollup-linux-x64-gnu": "4.32.1",
+        "@rollup/rollup-linux-x64-musl": "4.32.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.32.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.32.1",
+        "@rollup/rollup-win32-x64-msvc": "4.32.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -1746,10 +1879,11 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1906,14 +2040,15 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.5.tgz",
-      "integrity": "sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==",
+      "version": "5.4.14",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
+      "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.19.3",
-        "postcss": "^8.4.35",
-        "rollup": "^4.2.0"
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -1932,6 +2067,7 @@
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -1949,6 +2085,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },

From 2aa10c9ad1e63955f1b2328f4c0d0f398e6b00f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:47:55 +0000
Subject: [PATCH 0995/1140] Bump ejs and hexo-renderer-ejs in /docs

Bumps [ejs](https://github.com/mde/ejs) to 3.1.10 and updates ancestor dependency [hexo-renderer-ejs](https://github.com/hexojs/hexo-renderer-ejs). These dependencies need to be updated together.


Updates `ejs` from 2.7.4 to 3.1.10
- [Release notes](https://github.com/mde/ejs/releases)
- [Commits](https://github.com/mde/ejs/compare/v2.7.4...v3.1.10)

Updates `hexo-renderer-ejs` from 1.0.0 to 2.0.0
- [Release notes](https://github.com/hexojs/hexo-renderer-ejs/releases)
- [Commits](https://github.com/hexojs/hexo-renderer-ejs/compare/1.0.0...2.0.0)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
- dependency-name: hexo-renderer-ejs
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 docs/package-lock.json | 5998 ++++++++++++++++++++++++----------------
 docs/package.json      |    2 +-
 2 files changed, 3680 insertions(+), 2320 deletions(-)

diff --git a/docs/package-lock.json b/docs/package-lock.json
index 7965d6e9ba..80719e739b 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1,336 +1,407 @@
 {
   "name": "hexo-site",
   "version": "0.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "@babel/parser": {
+  "packages": {
+    "": {
+      "version": "0.0.0",
+      "devDependencies": {
+        "@meteorjs/meteor-hexo-config": "1.0.14",
+        "@meteorjs/meteor-theme-hexo": "2.0.8",
+        "canonical-json": "0.0.4",
+        "chexo": "1.0.7",
+        "handlebars": "4.7.7",
+        "hexo": "3.9.0",
+        "hexo-prism-plus": "1.1.0",
+        "hexo-renderer-ejs": "2.0.0",
+        "hexo-renderer-less": "0.2.0",
+        "hexo-renderer-marked": "2.0.0",
+        "hexo-server": "1.0.0",
+        "hexo-versioned-netlify-redirects": "1.1.0",
+        "jsdoc": "^4.0.2",
+        "showdown": "1.9.1",
+        "underscore": "1.13.1"
+      }
+    },
+    "node_modules/@babel/parser": {
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
       "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
     },
-    "@jsdoc/salty": {
+    "node_modules/@jsdoc/salty": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.6.tgz",
       "integrity": "sha512-aA+awb5yoml8TQ3CzI5Ue7sM3VMRC4l1zJJW4fgZ8OCL1wshJZhNzaf0PL85DSnOUw6QuFgeHGD/eq/xwwAF2g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=v12.0.0"
       }
     },
-    "@meteorjs/meteor-hexo-config": {
+    "node_modules/@meteorjs/meteor-hexo-config": {
       "version": "1.0.14",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-hexo-config/-/meteor-hexo-config-1.0.14.tgz",
       "integrity": "sha512-Vl4cEMEoVw2JV8qTBsqaq+YL7MRHasTtE88WJa5BGBYMfN35Yk0yeYwVc2OTFJ/cGiQcPEaC0RvRKVyNJfwIGQ==",
       "dev": true
     },
-    "@meteorjs/meteor-theme-hexo": {
+    "node_modules/@meteorjs/meteor-theme-hexo": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-theme-hexo/-/meteor-theme-hexo-2.0.8.tgz",
       "integrity": "sha512-LQIFN05wBMjX7SXgW5CFVTfolDWMuknoypwQ0czl/44LYRBR4/LYZUgX6c+1vLjloJb+5+2HTvMGlVN9Wo1MKA==",
-      "dev": true
+      "dev": true,
+      "hasShrinkwrap": true
     },
-    "@types/linkify-it": {
+    "node_modules/@types/linkify-it": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
       "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
       "dev": true
     },
-    "@types/markdown-it": {
+    "node_modules/@types/markdown-it": {
       "version": "12.2.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
       "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "@types/linkify-it": "*",
         "@types/mdurl": "*"
       }
     },
-    "@types/mdurl": {
+    "node_modules/@types/mdurl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
       "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
       "dev": true
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
-    "a-sync-waterfall": {
+    "node_modules/a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
       "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
       "dev": true
     },
-    "abbrev": {
+    "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
-    "accepts": {
+    "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "acorn": {
+    "node_modules/acorn": {
       "version": "6.4.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
       "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
-    "ajv": {
+    "node_modules/ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "co": "^4.6.0",
         "json-stable-stringify": "^1.0.1"
       }
     },
-    "align-text": {
+    "node_modules/align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
       "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2",
         "longest": "^1.0.1",
         "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "ansi-regex": {
+    "node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "ansi-styles": {
+    "node_modules/ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "anymatch": {
+    "node_modules/anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
       "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "micromatch": "^2.1.5",
         "normalize-path": "^2.0.0"
       }
     },
-    "archy": {
+    "node_modules/archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
-    "argparse": {
+    "node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
-    "arr-diff": {
+    "node_modules/arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-flatten": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "arr-flatten": {
+    "node_modules/arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "arr-union": {
+    "node_modules/arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "array-unique": {
+    "node_modules/array-unique": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "asap": {
+    "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "dev": true
     },
-    "asn1": {
+    "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "safer-buffer": "~2.1.0"
       }
     },
-    "assert-plus": {
+    "node_modules/assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
       "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
     },
-    "assign-symbols": {
+    "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "async": {
+    "node_modules/async": {
       "version": "0.2.10",
       "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
       "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
       "dev": true
     },
-    "async-each": {
+    "node_modules/async-each": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
       "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
-      "dev": true
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
     },
-    "asynckit": {
+    "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true,
       "optional": true
     },
-    "atob": {
+    "node_modules/atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
     },
-    "aws-sign2": {
+    "node_modules/aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
       "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "aws4": {
+    "node_modules/aws4": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
       "dev": true,
       "optional": true
     },
-    "babel-code-frame": {
+    "node_modules/babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
       }
     },
-    "babel-messages": {
+    "node_modules/babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.22.0"
       }
     },
-    "babel-plugin-syntax-decorators": {
+    "node_modules/babel-plugin-syntax-decorators": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha512-AWj19x2aDm8qFQ5O2JcD6pwJDW1YdcnO+1b81t7gxrGjz5VHiUqeYWAR4h7zueWMalRelrQDXprv2FrY1dbpbw==",
       "dev": true
     },
-    "babel-plugin-transform-decorators-legacy": {
+    "node_modules/babel-plugin-transform-decorators-legacy": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz",
       "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-plugin-syntax-decorators": "^6.1.18",
         "babel-runtime": "^6.2.0",
         "babel-template": "^6.3.0"
       }
     },
-    "babel-polyfill": {
+    "node_modules/babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
         "regenerator-runtime": "^0.10.5"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        },
-        "regenerator-runtime": {
-          "version": "0.10.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-          "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
-          "dev": true
-        }
       }
     },
-    "babel-runtime": {
+    "node_modules/babel-polyfill/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+      "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
+      "dev": true
+    },
+    "node_modules/babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        }
       }
     },
-    "babel-template": {
+    "node_modules/babel-runtime/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
         "babel-types": "^6.26.0",
@@ -338,12 +409,12 @@
         "lodash": "^4.17.4"
       }
     },
-    "babel-traverse": {
+    "node_modules/babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
         "babel-runtime": "^6.26.0",
@@ -355,36 +426,39 @@
         "lodash": "^4.17.4"
       }
     },
-    "babel-types": {
+    "node_modules/babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
         "lodash": "^4.17.4",
         "to-fast-properties": "^1.0.3"
       }
     },
-    "babylon": {
+    "node_modules/babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "babylon": "bin/babylon.js"
+      }
     },
-    "balanced-match": {
+    "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "base": {
+    "node_modules/base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
         "component-emitter": "^1.2.1",
@@ -393,130 +467,156 @@
         "mixin-deep": "^1.2.0",
         "pascalcase": "^0.1.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "basic-auth": {
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/basic-auth": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
       "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "bcrypt-pbkdf": {
+    "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "tweetnacl": "^0.14.3"
       }
     },
-    "binary-extensions": {
+    "node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "bindings": {
+    "node_modules/bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "file-uri-to-path": "1.0.0"
       }
     },
-    "bluebird": {
+    "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "boolbase": {
+    "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
-    "boom": {
+    "node_modules/boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "hoek": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.10.40"
       }
     },
-    "brace-expansion": {
+    "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "braces": {
+    "node_modules/braces": {
       "version": "1.8.5",
       "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
       "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "expand-range": "^1.8.1",
         "preserve": "^0.2.0",
         "repeat-element": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "browser-fingerprint": {
+    "node_modules/browser-fingerprint": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
       "integrity": "sha512-b8SXP7yOlzLUJXF8WUvIjmbJzkJC0X6OHe7J9a/SHqEBC7a9Eglag6AANSTJz82h5U582kuxm/5TPudnD68EPA==",
       "dev": true
     },
-    "bytes": {
+    "node_modules/bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "cache-base": {
+    "node_modules/cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
         "get-value": "^2.0.6",
@@ -527,96 +627,118 @@
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "call-bind": {
+    "node_modules/cache-base/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/call-bind": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
       "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
         "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "camel-case": {
+    "node_modules/camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
       "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "no-case": "^2.2.0",
         "upper-case": "^1.1.1"
       }
     },
-    "camelcase": {
+    "node_modules/camelcase": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
       "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "canonical-json": {
+    "node_modules/canonical-json": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/canonical-json/-/canonical-json-0.0.4.tgz",
       "integrity": "sha512-2sW7x0m/P7dqEnO0O87U7RTVQAaa7MELcd+Jd9FA6CYgYtwJ1TlDWIYMD8nuMkH1KoThsJogqgLyklrt9d/Azw==",
       "dev": true
     },
-    "caseless": {
+    "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true,
       "optional": true
     },
-    "catharsis": {
+    "node_modules/catharsis": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
       "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash": "^4.17.15"
+      },
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "center-align": {
+    "node_modules/center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "align-text": "^0.1.3",
         "lazy-cache": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "chalk": {
+    "node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
         "has-ansi": "^2.0.0",
         "strip-ansi": "^3.0.0",
         "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "cheerio": {
+    "node_modules/cheerio": {
       "version": "0.22.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
       "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "css-select": "~1.2.0",
         "dom-serializer": "~0.1.0",
         "entities": "~1.1.1",
@@ -633,179 +755,218 @@
         "lodash.reduce": "^4.4.0",
         "lodash.reject": "^4.4.0",
         "lodash.some": "^4.4.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "chexo": {
+    "node_modules/chexo": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/chexo/-/chexo-1.0.7.tgz",
       "integrity": "sha512-7ScGKzHsZDLpCZhzIypwbK+hkx1fkWZjeLemEkmnreThGLNWhLRDC4gJ/Wu04jAbH0zYR/ev0QPAACEnaYXrcA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hexo-cli": "^1.1.0",
         "minimist": "^1.2.0"
       },
-      "dependencies": {
-        "hexo-cli": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
-          "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
-          "dev": true,
-          "requires": {
-            "abbrev": "^1.0.7",
-            "bluebird": "^3.4.0",
-            "chalk": "^1.1.3",
-            "command-exists": "^1.2.0",
-            "hexo-fs": "^0.2.0",
-            "hexo-log": "^0.2.0",
-            "hexo-util": "^0.6.0",
-            "minimist": "^1.2.0",
-            "object-assign": "^4.1.0",
-            "resolve": "^1.5.0",
-            "tildify": "^1.2.0"
-          }
-        }
+      "bin": {
+        "chexo": "bin/chexo"
+      },
+      "peerDependencies": {
+        "hexo": ">= 3.3.0 < 4"
       }
     },
-    "chokidar": {
+    "node_modules/chexo/node_modules/hexo-cli": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
+      "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "^1.0.7",
+        "bluebird": "^3.4.0",
+        "chalk": "^1.1.3",
+        "command-exists": "^1.2.0",
+        "hexo-fs": "^0.2.0",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.0",
+        "minimist": "^1.2.0",
+        "object-assign": "^4.1.0",
+        "resolve": "^1.5.0",
+        "tildify": "^1.2.0"
+      },
+      "bin": {
+        "hexo": "bin/hexo"
+      }
+    },
+    "node_modules/chokidar": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
       "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "anymatch": "^1.3.0",
         "async-each": "^1.0.0",
-        "fsevents": "^1.0.0",
         "glob-parent": "^2.0.0",
         "inherits": "^2.0.1",
         "is-binary-path": "^1.0.0",
         "is-glob": "^2.0.0",
         "path-is-absolute": "^1.0.0",
         "readdirp": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.0.0"
       }
     },
-    "class-utils": {
+    "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
         "isobject": "^3.0.0",
         "static-extend": "^0.1.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "cliui": {
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cliui": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
       "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "center-align": "^0.1.1",
         "right-align": "^0.1.1",
         "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-          "dev": true
-        }
       }
     },
-    "co": {
+    "node_modules/cliui/node_modules/wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
     },
-    "collection-visit": {
+    "node_modules/collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "color-convert": {
+    "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "color-name": "1.1.3"
       }
     },
-    "color-name": {
+    "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
-    "combined-stream": {
+    "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "command-exists": {
+    "node_modules/command-exists": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
       "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
       "dev": true
     },
-    "commander": {
+    "node_modules/commander": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
       "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
     },
-    "component-emitter": {
+    "node_modules/component-emitter": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
-      "dev": true
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "compressible": {
+    "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "compression": {
+    "node_modules/compression": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
         "compressible": "~2.0.16",
@@ -813,425 +974,569 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "concat-map": {
+    "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "connect": {
+    "node_modules/connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "copy-descriptor": {
+    "node_modules/copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "core-decorators": {
+    "node_modules/core-decorators": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/core-decorators/-/core-decorators-0.11.2.tgz",
       "integrity": "sha512-47n1NWwwc+qPmOMtY9zUKCM1cYfoxLvBRxKzirFrqhE61yqK+yZP/BOA3gjaBUVb9P46J1RyJjasrtqYoWCbvA==",
       "dev": true
     },
-    "core-js": {
+    "node_modules/core-js": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
       "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
       "dev": true
     },
-    "core-util-is": {
+    "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
-    "cross-spawn": {
+    "node_modules/cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
       "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lru-cache": "^4.0.1",
         "which": "^1.2.9"
       }
     },
-    "cryptiles": {
+    "node_modules/cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "boom": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.10.40"
       }
     },
-    "css-select": {
+    "node_modules/css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
       "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "boolbase": "~1.0.0",
         "css-what": "2.1",
         "domutils": "1.5.1",
         "nth-check": "~1.0.1"
       }
     },
-    "css-what": {
+    "node_modules/css-what": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
       "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "cuid": {
+    "node_modules/cuid": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
       "integrity": "sha512-MoL67ZZuBetDMxzrZtO+Iq1ATajFACQCP52QRinBgd3yTjYdv54mJO8ibUrh06fojKCoX5P2i7KkEatm4VTIOQ==",
+      "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "browser-fingerprint": "0.0.1",
         "core-js": "^1.1.1",
         "node-fingerprint": "0.0.2"
       }
     },
-    "dashdash": {
+    "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^1.0.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "debug": {
+    "node_modules/dashdash/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ms": "2.0.0"
       }
     },
-    "decamelize": {
+    "node_modules/decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "decode-uri-component": {
+    "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "define-data-property": {
+    "node_modules/define-data-property": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
         "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "define-property": {
+    "node_modules/define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "delayed-stream": {
+    "node_modules/define-property/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/define-property/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
-    "depd": {
+    "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "destroy": {
+    "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
-    "dom-serializer": {
+    "node_modules/dom-serializer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
       "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "domelementtype": "^1.3.0",
         "entities": "^1.1.1"
       }
     },
-    "domelementtype": {
+    "node_modules/domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
-    "domhandler": {
+    "node_modules/domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "domelementtype": "1"
       }
     },
-    "domutils": {
+    "node_modules/domutils": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "dom-serializer": "0",
         "domelementtype": "1"
       }
     },
-    "ecc-jsbn": {
+    "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
-    "ee-first": {
+    "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
-    "ejs": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "dev": true
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "emoji-regex": {
+    "node_modules/emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
-    "encodeurl": {
+    "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "entities": {
+    "node_modules/entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
-    "errno": {
+    "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
       }
     },
-    "es-define-property": {
+    "node_modules/es-define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
       "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "es-errors": {
+    "node_modules/es-errors": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "escape-html": {
+    "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
-    "escape-string-regexp": {
+    "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "esprima": {
+    "node_modules/esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "esutils": {
+    "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "etag": {
+    "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "expand-brackets": {
+    "node_modules/expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-posix-bracket": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "expand-range": {
+    "node_modules/expand-range": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "fill-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extend": {
+    "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true,
       "optional": true
     },
-    "extend-shallow": {
+    "node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
       },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extglob": {
+    "node_modules/extend-shallow/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "extsprintf": {
+    "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
       "optional": true
     },
-    "file-uri-to-path": {
+    "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
       "optional": true
     },
-    "filename-regex": {
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "fill-range": {
+    "node_modules/fill-range": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
       "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^2.1.0",
         "isobject": "^2.0.0",
         "randomatic": "^3.0.0",
         "repeat-element": "^1.1.2",
         "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "finalhandler": {
+    "node_modules/finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
       "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -1239,349 +1544,466 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "find-up": {
+    "node_modules/find-up": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "for-in": {
+    "node_modules/for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "for-own": {
+    "node_modules/for-own": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "forever-agent": {
+    "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "form-data": {
+    "node_modules/form-data": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.5",
         "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
       }
     },
-    "fragment-cache": {
+    "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "fresh": {
+    "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "fsevents": {
+    "node_modules/fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "dev": true,
+      "hasInstallScript": true,
       "optional": true,
-      "requires": {
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
         "bindings": "^1.5.0",
         "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
       }
     },
-    "function-bind": {
+    "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "get-caller-file": {
+    "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
     },
-    "get-intrinsic": {
+    "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
       "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "get-value": {
+    "node_modules/get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "getpass": {
+    "node_modules/getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "optional": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      },
       "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+        "assert-plus": "^1.0.0"
       }
     },
-    "glob": {
+    "node_modules/getpass/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/glob": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
       "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "inflight": "^1.0.4",
         "inherits": "2",
         "minimatch": "2 || 3",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "glob-base": {
+    "node_modules/glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "glob-parent": {
+    "node_modules/glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-glob": "^2.0.0"
       }
     },
-    "globals": {
+    "node_modules/globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
       "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "gopd": {
+    "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "graceful-fs": {
+    "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "handlebars": {
+    "node_modules/handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
       "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
         "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4",
         "wordwrap": "^1.0.0"
       },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
       }
     },
-    "har-schema": {
+    "node_modules/handlebars/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
       "integrity": "sha512-f8xf2GOR6Rgwc9FPTLNzgwB+JQ2/zMauYXSWmX5YV5acex6VomT0ocSuwR7BfXo5MpHi+jL+saaux2fwsGJDKQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "har-validator": {
+    "node_modules/har-validator": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha512-5Gbp6RAftMYYV3UEI4c4Vv3+a4dQ7taVyvHt+/L6kRt+f4HX1GweAk5UDWN0SvdVnRBzGQ6OG89pGaD9uSFnVw==",
+      "deprecated": "this library is no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "ajv": "^4.9.1",
         "har-schema": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "has-ansi": {
+    "node_modules/has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "has-flag": {
+    "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "has-property-descriptors": {
+    "node_modules/has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "has-proto": {
+    "node_modules/has-proto": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
       "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "has-symbols": {
+    "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "has-value": {
+    "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "has-values": {
+    "node_modules/has-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "hasown": {
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "hawk": {
+    "node_modules/hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==",
+      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "boom": "2.x.x",
         "cryptiles": "2.x.x",
         "hoek": "2.x.x",
         "sntp": "1.x.x"
+      },
+      "engines": {
+        "node": ">=0.10.32"
       }
     },
-    "hexo": {
+    "node_modules/hexo": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.9.0.tgz",
       "integrity": "sha512-uga6MsxGlD0AeafiObbFkQVWlUO+wWTb/IJVPI3fFpmAJu0PBD//Ek0qVOxHjlzdvFGeW0bYWYqXgDbR7suJng==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "abbrev": "^1.1.1",
         "archy": "^1.0.0",
         "bluebird": "^3.5.2",
@@ -1610,422 +2032,74 @@
         "titlecase": "^1.1.2",
         "warehouse": "^2.2.0"
       },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "hexo-cli": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
-          "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
-          "dev": true,
-          "requires": {
-            "abbrev": "^1.1.1",
-            "acorn": "^6.1.1",
-            "bluebird": "^3.5.3",
-            "chalk": "^2.4.2",
-            "command-exists": "^1.2.8",
-            "hexo-fs": "^1.0.2",
-            "hexo-log": "^0.2.0",
-            "hexo-util": "^0.6.3",
-            "minimist": "^1.2.0",
-            "resolve": "^1.10.0",
-            "tildify": "^1.2.0"
-          }
-        },
-        "hexo-fs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.1",
-            "chokidar": "^2.0.4",
-            "escape-string-regexp": "^1.0.5",
-            "graceful-fs": "^4.1.11"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+      "bin": {
+        "hexo": "bin/hexo"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "hexo-bunyan": {
+    "node_modules/hexo-bunyan": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-bunyan/-/hexo-bunyan-1.0.0.tgz",
       "integrity": "sha512-RymT8Ck+K77mLt9BEYNb4uyfC7RIQnU5N3laXowMrS28jj2h89VHJCOnhV00mmta4fHRqNa07kP1Hrn17nvMkQ==",
+      "deprecated": "Please see https://github.com/hexojs/hexo-bunyan/issues/17",
       "dev": true,
-      "requires": {
+      "engines": [
+        "node >=0.10.0"
+      ],
+      "bin": {
+        "bunyan": "bin/bunyan"
+      },
+      "optionalDependencies": {
         "moment": "^2.10.6",
         "mv": "~2",
         "safe-json-stringify": "~1"
       }
     },
-    "hexo-front-matter": {
+    "node_modules/hexo-front-matter": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-0.2.3.tgz",
       "integrity": "sha512-GL/pGfYqsvjMgxjhOWv1zAc7t4JoGUow+CH9Tes/5N2wKxxTzt2woKEMHz1+c01CmhdVYUR4lO3R1ZAcxc0caA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "js-yaml": "^3.6.1"
       }
     },
-    "hexo-fs": {
+    "node_modules/hexo-fs": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-0.2.3.tgz",
       "integrity": "sha512-rLB1rMVUW3csAljvJgHfyjemL0BrmcUZfBf9hJe6S0pA53igFa3ON0PFwomvoLs1Wdmjs9Awnw9Tru4PjWFSlQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.4.0",
         "chokidar": "^1.5.2",
         "escape-string-regexp": "^1.0.5",
         "graceful-fs": "^4.1.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "hexo-i18n": {
+    "node_modules/hexo-i18n": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
       "integrity": "sha512-QhVmN/eLohu9UzvrX85zhfL7yN5O4MOkXKYmCRI8GPcg0EczX+blYYmMCugZKu/NIJ9XD5/etAVWCi/5F+fS6g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "sprintf-js": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "hexo-inject": {
+    "node_modules/hexo-inject": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-inject/-/hexo-inject-1.0.0.tgz",
       "integrity": "sha512-Ly0k7FO3G5+XNvFNE7yjSENSWy8QTnzl8cNFWYuMXRYMogbHd/Q0Ane8WCKYb5QD/A+WXC3rHb32wIGb0YAfVw==",
+      "deprecated": "The author does not use Hexo any more. This plugin is no longer maintained.",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "babel-plugin-transform-decorators-legacy": "^1.3.4",
         "babel-polyfill": "^6.7.2",
         "bluebird": "^3.3.4",
@@ -2033,418 +2107,500 @@
         "underscore": "^1.8.3"
       }
     },
-    "hexo-log": {
+    "node_modules/hexo-log": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-0.2.0.tgz",
       "integrity": "sha512-fzoc+GQexxPPILTjoOQILnA3ZG2MFgqMBVel4xvJ11pXptw9+f97ynTgDAExXafyp9Nz2ChXRuqlCYgPtZSlxQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "chalk": "^1.1.1",
         "hexo-bunyan": "^1.0.0"
       }
     },
-    "hexo-prism-plus": {
+    "node_modules/hexo-prism-plus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-prism-plus/-/hexo-prism-plus-1.1.0.tgz",
       "integrity": "sha512-lkDJRZDVN3iNpYtuwrI+JFLj3rSa4PeMwz1OlVfUOkY6CyjD/D3dGtW7cTpcxYejr3/JWjusIqWVnUTLpKr4Yw==",
       "dev": true,
-      "requires": {
+      "hasInstallScript": true,
+      "dependencies": {
         "hexo-fs": "^1.0.0",
         "hexo-inject": "^1.0.0",
         "hexo-util": "^0.6.3",
         "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "hexo-fs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.1",
-            "chokidar": "^2.0.4",
-            "escape-string-regexp": "^1.0.5",
-            "graceful-fs": "^4.1.11"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        }
       }
     },
-    "hexo-renderer-ejs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-1.0.0.tgz",
-      "integrity": "sha512-O925i69FG4NYO62oWORcPhRZZX0sPx1SXGKUS5DaR/lzajyiXH5i2sqnkj0ya0rNLXIy/D7Xmt7WbFyuQx/kKQ==",
+    "node_modules/hexo-prism-plus/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
-      "requires": {
-        "ejs": "^2.6.1"
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
-    "hexo-renderer-less": {
+    "node_modules/hexo-prism-plus/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/hexo-fs": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-prism-plus/node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-renderer-ejs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-2.0.0.tgz",
+      "integrity": "sha512-qCjE1IdwgDgv65qyb0KMVCwCdSVAkH0vwAe9XihjvaKWkmb9dtt8DgErOdqCXn0HReSyWiEVP2BrLRj3gyHwOQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ejs": "^3.1.6"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/hexo-renderer-less": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-less/-/hexo-renderer-less-0.2.0.tgz",
       "integrity": "sha512-mhkwGsrLPG1e0bpE40FSRufaDHJ4uDtTYNUIQDBYR3aZkbOxAnpN607BTjymr/F+4uYy0cd7MK4y5vFx5pEDQw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "less": "^2.5.1"
       }
     },
-    "hexo-renderer-marked": {
+    "node_modules/hexo-renderer-marked": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-marked/-/hexo-renderer-marked-2.0.0.tgz",
       "integrity": "sha512-+LMjgPkJSUAOlWYHJnBXxUHwGqemGNlK/I+JNO4zA5rEHWNWZ9wNAZKd5g0lEVdMAZzAV54gCylXGURgMO4IAw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hexo-util": "1.0.0",
         "marked": "^0.7.0",
         "strip-indent": "^3.0.0"
       },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "hexo-util": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
-          "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.2",
-            "camel-case": "^3.0.0",
-            "cross-spawn": "^6.0.5",
-            "highlight.js": "^9.13.1",
-            "html-entities": "^1.2.1",
-            "striptags": "^3.1.1"
-          }
-        },
-        "marked": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-          "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
-          "dev": true
-        },
-        "strip-indent": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-          "dev": true,
-          "requires": {
-            "min-indent": "^1.0.0"
-          }
-        },
-        "striptags": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
-          "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "hexo-server": {
+    "node_modules/hexo-renderer-marked/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/hexo-util": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
+      "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.2",
+        "camel-case": "^3.0.0",
+        "cross-spawn": "^6.0.5",
+        "highlight.js": "^9.13.1",
+        "html-entities": "^1.2.1",
+        "striptags": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/marked": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
+      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/hexo-renderer-marked/node_modules/striptags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
+      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
+      "dev": true
+    },
+    "node_modules/hexo-server": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-server/-/hexo-server-1.0.0.tgz",
       "integrity": "sha512-eSY+a5oiGCG/3T6FrdrNRBkttMLJkM+oitY6ZMFowjcBiG2VNEhQmfWUDOykfvApZs4wPYBb//uXD/58tfe3mA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.5.5",
         "chalk": "^2.4.2",
         "compression": "^1.7.4",
@@ -2454,50 +2610,66 @@
         "open": "^6.3.0",
         "serve-static": "^1.14.1"
       },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "mime": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "hexo-util": {
+    "node_modules/hexo-server/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-server/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-server/node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/hexo-server/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo-util": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-0.6.3.tgz",
       "integrity": "sha512-zPxaqCWZz3/25SAB4FlrRtWktJ+Pr+vBiv/nyHpXKgXPt1m70liViKlRwWLqDmRjJ72x6/k4qCEeXHajvcGHUw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "bluebird": "^3.4.0",
         "camel-case": "^3.0.0",
         "cross-spawn": "^4.0.0",
@@ -2506,344 +2678,979 @@
         "striptags": "^2.1.1"
       }
     },
-    "hexo-versioned-netlify-redirects": {
+    "node_modules/hexo-versioned-netlify-redirects": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-versioned-netlify-redirects/-/hexo-versioned-netlify-redirects-1.1.0.tgz",
       "integrity": "sha512-kfY19ZZDwBnRaZFA6KQgt5DhVBpTQG1yBoq01zaACFHIFuSd9OjhiHCkJ3it+TMvGl+JGTtgKhIwZoQUJHyv/g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "url-join": "^4.0.0"
       }
     },
-    "highlight.js": {
+    "node_modules/hexo/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/hexo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/hexo/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hexo/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/hexo-cli": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
+      "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "^1.1.1",
+        "acorn": "^6.1.1",
+        "bluebird": "^3.5.3",
+        "chalk": "^2.4.2",
+        "command-exists": "^1.2.8",
+        "hexo-fs": "^1.0.2",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.3",
+        "minimist": "^1.2.0",
+        "resolve": "^1.10.0",
+        "tildify": "^1.2.0"
+      },
+      "bin": {
+        "hexo": "bin/hexo"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/hexo/node_modules/hexo-fs": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+      "dev": true,
+      "dependencies": {
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hexo/node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/hexo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/highlight.js": {
       "version": "9.18.5",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
       "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
-      "dev": true
+      "deprecated": "Support has ended for 9.x series. Upgrade to @latest",
+      "dev": true,
+      "hasInstallScript": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "hoek": {
+    "node_modules/hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.40"
+      }
     },
-    "html-entities": {
+    "node_modules/html-entities": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
       "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
-    "htmlparser2": {
+    "node_modules/htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "domelementtype": "^1.3.1",
         "domhandler": "^2.3.0",
         "domutils": "^1.5.1",
         "entities": "^1.1.1",
         "inherits": "^2.0.1",
         "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
       }
     },
-    "http-errors": {
+    "node_modules/htmlparser2/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
-      "dependencies": {
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "http-signature": {
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^0.2.0",
         "jsprim": "^1.2.2",
         "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
       }
     },
-    "image-size": {
+    "node_modules/image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "inflight": {
+    "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
-    "inherits": {
+    "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "invariant": {
+    "node_modules/invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "loose-envify": "^1.0.0"
       }
     },
-    "is-accessor-descriptor": {
+    "node_modules/is-accessor-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
       "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "is-binary-path": {
+    "node_modules/is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-buffer": {
+    "node_modules/is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "is-core-module": {
+    "node_modules/is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
       "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "is-data-descriptor": {
+    "node_modules/is-data-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
       "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "is-descriptor": {
+    "node_modules/is-descriptor": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "is-dotfile": {
+    "node_modules/is-dotfile": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-equal-shallow": {
+    "node_modules/is-equal-shallow": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-primitive": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-extendable": {
+    "node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-extglob": {
+    "node_modules/is-extglob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
       "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-fullwidth-code-point": {
+    "node_modules/is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
       "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "is-glob": {
+    "node_modules/is-glob": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
       "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-number": {
+    "node_modules/is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
       "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-plain-object": {
+    "node_modules/is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "is-posix-bracket": {
+    "node_modules/is-plain-object/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-primitive": {
+    "node_modules/is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-typedarray": {
+    "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true,
       "optional": true
     },
-    "is-windows": {
+    "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "is-wsl": {
+    "node_modules/is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
       "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "isarray": {
+    "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "isexe": {
+    "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "isobject": {
+    "node_modules/isobject": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "isstream": {
+    "node_modules/isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true,
       "optional": true
     },
-    "js-tokens": {
+    "node_modules/jake": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jake/node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jake/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jake/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jake/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jake/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jake/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
       "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
       "dev": true
     },
-    "js-yaml": {
+    "node_modules/js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "js2xmlparser": {
+    "node_modules/js2xmlparser": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
       "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "xmlcreate": "^2.0.4"
       }
     },
-    "jsbn": {
+    "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true,
       "optional": true
     },
-    "jsdoc": {
+    "node_modules/jsdoc": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
       "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "@babel/parser": "^7.20.15",
         "@jsdoc/salty": "^0.2.1",
         "@types/markdown-it": "^12.2.3",
@@ -2860,140 +3667,201 @@
         "strip-json-comments": "^3.1.0",
         "underscore": "~1.13.2"
       },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.7.2",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-          "dev": true
-        },
-        "marked": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-          "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        },
-        "underscore": {
-          "version": "1.13.6",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
-          "dev": true
-        }
+      "bin": {
+        "jsdoc": "jsdoc.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "json-schema": {
+    "node_modules/jsdoc/node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/jsdoc/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jsdoc/node_modules/marked": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/jsdoc/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jsdoc/node_modules/underscore": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+      "dev": true
+    },
+    "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true,
       "optional": true
     },
-    "json-stable-stringify": {
+    "node_modules/json-stable-stringify": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
       "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "call-bind": "^1.0.5",
         "isarray": "^2.0.5",
         "jsonify": "^0.0.1",
         "object-keys": "^1.1.1"
       },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "json-stringify-safe": {
+    "node_modules/json-stable-stringify/node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true,
       "optional": true
     },
-    "jsonify": {
+    "node_modules/jsonify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
       "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "jsonparse": {
+    "node_modules/jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
     },
-    "jsprim": {
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
         "json-schema": "0.4.0",
         "verror": "1.10.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "engines": {
+        "node": ">=0.6.0"
       }
     },
-    "kind-of": {
+    "node_modules/jsprim/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "klaw": {
+    "node_modules/klaw": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
       "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "graceful-fs": "^4.1.9"
       }
     },
-    "lazy-cache": {
+    "node_modules/lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
       "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "less": {
+    "node_modules/less": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
       "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
       "dev": true,
-      "requires": {
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=0.12"
+      },
+      "optionalDependencies": {
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
@@ -3004,209 +3872,239 @@
         "source-map": "^0.5.3"
       }
     },
-    "linkify-it": {
+    "node_modules/linkify-it": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
       "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "uc.micro": "^1.0.1"
       }
     },
-    "locate-path": {
+    "node_modules/locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "lodash": {
+    "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.assignin": {
+    "node_modules/lodash.assignin": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
       "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
       "dev": true
     },
-    "lodash.bind": {
+    "node_modules/lodash.bind": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
       "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==",
       "dev": true
     },
-    "lodash.defaults": {
+    "node_modules/lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
       "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
       "dev": true
     },
-    "lodash.filter": {
+    "node_modules/lodash.filter": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
       "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==",
       "dev": true
     },
-    "lodash.flatten": {
+    "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
       "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
       "dev": true
     },
-    "lodash.foreach": {
+    "node_modules/lodash.foreach": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
       "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
       "dev": true
     },
-    "lodash.map": {
+    "node_modules/lodash.map": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
       "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==",
       "dev": true
     },
-    "lodash.merge": {
+    "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.pick": {
+    "node_modules/lodash.pick": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
       "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
+      "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.",
       "dev": true
     },
-    "lodash.reduce": {
+    "node_modules/lodash.reduce": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
       "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==",
       "dev": true
     },
-    "lodash.reject": {
+    "node_modules/lodash.reject": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
       "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==",
       "dev": true
     },
-    "lodash.some": {
+    "node_modules/lodash.some": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
       "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
       "dev": true
     },
-    "longest": {
+    "node_modules/longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
       "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "loose-envify": {
+    "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
       }
     },
-    "lower-case": {
+    "node_modules/lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
       "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
       "dev": true
     },
-    "lru-cache": {
+    "node_modules/lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
       }
     },
-    "map-cache": {
+    "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "map-visit": {
+    "node_modules/map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "markdown": {
+    "node_modules/markdown": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
       "integrity": "sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "nopt": "~2.1.1"
+      },
+      "bin": {
+        "md2html": "bin/md2html.js"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "markdown-it": {
+    "node_modules/markdown-it": {
       "version": "12.3.2",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
       "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "argparse": "^2.0.1",
         "entities": "~2.1.0",
         "linkify-it": "^3.0.1",
         "mdurl": "^1.0.1",
         "uc.micro": "^1.0.5"
       },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "entities": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-          "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-          "dev": true
-        }
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
       }
     },
-    "markdown-it-anchor": {
+    "node_modules/markdown-it-anchor": {
       "version": "8.6.7",
       "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
       "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
+      "dev": true,
+      "peerDependencies": {
+        "@types/markdown-it": "*",
+        "markdown-it": "*"
+      }
+    },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "math-random": {
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
       "dev": true
     },
-    "mdurl": {
+    "node_modules/mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
       "dev": true
     },
-    "micromatch": {
+    "node_modules/micromatch": {
       "version": "2.3.11",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-diff": "^2.0.0",
         "array-unique": "^0.2.1",
         "braces": "^1.8.2",
@@ -3220,140 +4118,183 @@
         "object.omit": "^2.0.0",
         "parse-glob": "^3.0.4",
         "regex-cache": "^0.4.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "mime": {
+    "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "mime-db": {
+    "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "mime-types": {
+    "node_modules/mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "min-indent": {
+    "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "minimatch": {
+    "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "minimist": {
+    "node_modules/minimist": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "mixin-deep": {
+    "node_modules/mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
       },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "mkdirp": {
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "moment": {
+    "node_modules/moment": {
       "version": "2.30.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
       "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "moment-timezone": {
+    "node_modules/moment-timezone": {
       "version": "0.5.45",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
       "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "morgan": {
+    "node_modules/morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
       "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-finished": "~2.3.0",
         "on-headers": "~1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "ms": {
+    "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "mv": {
+    "node_modules/mv": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
       "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "mkdirp": "~0.5.1",
         "ncp": "~2.0.0",
         "rimraf": "~2.4.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "nan": {
+    "node_modules/nan": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
       "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
       "dev": true,
       "optional": true
     },
-    "nanomatch": {
+    "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
         "define-property": "^2.0.2",
@@ -3366,438 +4307,563 @@
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
       },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "ncp": {
+    "node_modules/nanomatch/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
       "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "ncp": "bin/ncp"
+      }
     },
-    "negotiator": {
+    "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "neo-async": {
+    "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "nice-try": {
+    "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "no-case": {
+    "node_modules/no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lower-case": "^1.1.1"
       }
     },
-    "node-fingerprint": {
+    "node_modules/node-fingerprint": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/node-fingerprint/-/node-fingerprint-0.0.2.tgz",
       "integrity": "sha512-vPFfTD5EBJieQ4SI3v61fWxlV1kav3m9Dbejd6CjWhOJn8s+XMxpOOosCNAyIrUQ/jJOlPndfrZ0lSw4+RgwcA==",
       "dev": true
     },
-    "nopt": {
+    "node_modules/nopt": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
       "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
       }
     },
-    "normalize-path": {
+    "node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "nth-check": {
+    "node_modules/nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
       "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "boolbase": "~1.0.0"
       }
     },
-    "nunjucks": {
+    "node_modules/nunjucks": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
       "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
         "commander": "^5.1.0"
+      },
+      "bin": {
+        "nunjucks-precompile": "bin/precompile"
+      },
+      "engines": {
+        "node": ">= 6.9.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.3.0"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "oauth-sign": {
+    "node_modules/oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
       "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
     },
-    "object-assign": {
+    "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "object-copy": {
+    "node_modules/object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
         "kind-of": "^3.0.3"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object-keys": {
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "object-visit": {
+    "node_modules/object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.omit": {
+    "node_modules/object-visit/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "object.pick": {
+    "node_modules/object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isobject": "^3.0.1"
       },
-      "dependencies": {
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "on-finished": {
+    "node_modules/object.pick/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "on-headers": {
+    "node_modules/on-headers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "once": {
+    "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "wrappy": "1"
       }
     },
-    "open": {
+    "node_modules/open": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
       "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "optimist": {
+    "node_modules/optimist": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-          "dev": true
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-          "dev": true
-        }
       }
     },
-    "os-homedir": {
+    "node_modules/optimist/node_modules/minimist": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+      "dev": true
+    },
+    "node_modules/optimist/node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "p-limit": {
+    "node_modules/p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "p-locate": {
+    "node_modules/p-locate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "p-try": {
+    "node_modules/p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "parse-glob": {
+    "node_modules/parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
         "is-extglob": "^1.0.0",
         "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "parseurl": {
+    "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "pascalcase": {
+    "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-dirname": {
+    "node_modules/path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
       "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
       "dev": true
     },
-    "path-exists": {
+    "node_modules/path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "path-is-absolute": {
+    "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "path-key": {
+    "node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "path-parse": {
+    "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "performance-now": {
+    "node_modules/performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
       "integrity": "sha512-YHk5ez1hmMR5LOkb9iJkLKqoBlL7WD5M8ljC75ZfzXriuBIVNuecaXuU7e+hOwyqf24Wxhh7Vxgt7Hnw9288Tg==",
       "dev": true,
       "optional": true
     },
-    "posix-character-classes": {
+    "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "preserve": {
+    "node_modules/preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "pretty-hrtime": {
+    "node_modules/pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "process-nextick-args": {
+    "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "promise": {
+    "node_modules/promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asap": "~2.0.3"
       }
     },
-    "prr": {
+    "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true,
       "optional": true
     },
-    "pseudomap": {
+    "node_modules/pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
-    "punycode": {
+    "node_modules/punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
       "dev": true,
       "optional": true
     },
-    "qs": {
+    "node_modules/qs": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.1.tgz",
       "integrity": "sha512-LQy1Q1fcva/UsnP/6Iaa4lVeM49WiOitu2T4hZCyA/elLKu37L99qcBJk4VCCk+rdLvnMzfKyiN3SZTqdAZGSQ==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": ">=0.6"
+      }
     },
-    "randomatic": {
+    "node_modules/randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
         "math-random": "^1.0.1"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "range-parser": {
+    "node_modules/randomatic/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/randomatic/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "readable-stream": {
+    "node_modules/readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
         "isarray": "~1.0.0",
@@ -3807,277 +4873,338 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "readdirp": {
+    "node_modules/readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
         "readable-stream": "^2.0.2"
       },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        }
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "regenerator-runtime": {
+    "node_modules/readdirp/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
-    "regex-cache": {
+    "node_modules/regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-equal-shallow": "^0.1.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "regex-not": {
+    "node_modules/regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "remove-trailing-separator": {
+    "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
-    "repeat-element": {
+    "node_modules/repeat-element": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "repeat-string": {
+    "node_modules/repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
     },
-    "request": {
+    "node_modules/request": {
       "version": "2.81.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
       "integrity": "sha512-IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "aws-sign2": "~0.6.0",
         "aws4": "^1.2.1",
         "caseless": "~0.12.0",
@@ -4100,112 +5227,138 @@
         "tough-cookie": "~2.3.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "require-directory": {
+    "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "require-main-filename": {
+    "node_modules/require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
-    "requizzle": {
+    "node_modules/requizzle": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
       "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "lodash": "^4.17.21"
       }
     },
-    "resolve": {
+    "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "resolve-url": {
+    "node_modules/resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "ret": {
+    "node_modules/ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
     },
-    "right-align": {
+    "node_modules/right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
       "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "align-text": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "rimraf": {
+    "node_modules/rimraf": {
       "version": "2.4.5",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
       "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "glob": "^6.0.1"
+      },
+      "bin": {
+        "rimraf": "bin.js"
       }
     },
-    "safe-buffer": {
+    "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
-    "safe-json-stringify": {
+    "node_modules/safe-json-stringify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
       "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
       "dev": true,
       "optional": true
     },
-    "safe-regex": {
+    "node_modules/safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ret": "~0.1.10"
       }
     },
-    "safer-buffer": {
+    "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true,
       "optional": true
     },
-    "semver": {
+    "node_modules/semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
     },
-    "send": {
+    "node_modules/send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
       "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -4220,169 +5373,199 @@
         "range-parser": "~1.2.1",
         "statuses": "2.0.1"
       },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        },
-        "on-finished": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-          "dev": true,
-          "requires": {
-            "ee-first": "1.1.1"
-          }
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "serve-static": {
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/serve-static": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
       "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
         "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "set-blocking": {
+    "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
-    "set-function-length": {
+    "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "set-value": {
+    "node_modules/set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
         "is-plain-object": "^2.0.3",
         "split-string": "^3.0.1"
       },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "setprototypeof": {
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
-    "shebang-command": {
+    "node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "shebang-regex": {
+    "node_modules/shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "showdown": {
+    "node_modules/showdown": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz",
       "integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "yargs": "^14.2"
       },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "yargs": {
-          "version": "14.2.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
-          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^15.0.1"
-          }
-        }
+      "bin": {
+        "showdown": "bin/showdown.js"
       }
     },
-    "snapdragon": {
+    "node_modules/showdown/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/showdown/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/showdown/node_modules/yargs": {
+      "version": "14.2.3",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+      "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^15.0.1"
+      }
+    },
+    "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
         "define-property": "^0.2.5",
@@ -4392,96 +5575,124 @@
         "source-map-resolve": "^0.5.0",
         "use": "^3.1.0"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "snapdragon-node": {
+    "node_modules/snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
         "snapdragon-util": "^3.0.1"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "snapdragon-util": {
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "sntp": {
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==",
+      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "hoek": "2.x.x"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "source-map": {
+    "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "source-map-resolve": {
+    "node_modules/source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
@@ -4489,34 +5700,38 @@
         "urix": "^0.1.0"
       }
     },
-    "source-map-url": {
+    "node_modules/source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
-    "split-string": {
+    "node_modules/split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "sprintf-js": {
+    "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
-    "sshpk": {
+    "node_modules/sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
         "bcrypt-pbkdf": "^1.0.0",
@@ -4527,570 +5742,715 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        }
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "static-extend": {
+    "node_modules/sshpk/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
       },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "statuses": {
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true
-    },
-    "string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
-      "requires": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "string_decoder": {
+    "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
-    "stringstream": {
+    "node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stringstream": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
       "dev": true,
       "optional": true
     },
-    "strip-ansi": {
+    "node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "strip-indent": {
+    "node_modules/strip-indent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
       "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "strip-json-comments": {
+    "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "striptags": {
+    "node_modules/striptags": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz",
       "integrity": "sha512-vZTvmFP0IYu/zn8MXV6PrLb6VKbd9WGSEnlm4D5RNXS/+zYYlHrSfJgoBw1w56D6RJCr515er3BittRGQqihLA==",
       "dev": true
     },
-    "supports-color": {
+    "node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "supports-preserve-symlinks-flag": {
+    "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "swig-extras": {
+    "node_modules/swig-extras": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
       "integrity": "sha512-mFgpjjcQ0Kj+WplOrnWfUEw8iehZMD78sRId6uMXaTlWpy/vt8PTv3GoNsHrHBpZNnPnIsoWxrmRbS3vePjWpA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "markdown": "~0.5.0"
       }
     },
-    "swig-templates": {
+    "node_modules/swig-templates": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
       "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
+      "deprecated": "unmaintained",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "optimist": "~0.6",
         "uglify-js": "2.6.0"
       },
-      "dependencies": {
-        "uglify-js": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
-          "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
-          "dev": true,
-          "requires": {
-            "async": "~0.2.6",
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
-          }
-        }
+      "bin": {
+        "swig": "bin/swig.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "text-table": {
+    "node_modules/swig-templates/node_modules/uglify-js": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
+      "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
+      "dev": true,
+      "dependencies": {
+        "async": "~0.2.6",
+        "source-map": "~0.5.1",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.10.0"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "through": {
+    "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
-    "tildify": {
+    "node_modules/tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
       "integrity": "sha512-Y9q1GaV/BO65Z9Yf4NOGMuwt3SGdptkZBnaaKfTQakrDyCLiuO1Kc5wxW4xLdsjzunRtqtOdhekiUFmZbklwYQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "os-homedir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "titlecase": {
+    "node_modules/titlecase": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.3.tgz",
       "integrity": "sha512-pQX4oiemzjBEELPqgK4WE+q0yhAqjp/yzusGtlSJsOuiDys0RQxggepYmo0BuegIDppYS3b3cpdegRwkpyN3hw==",
-      "dev": true
+      "dev": true,
+      "bin": {
+        "to-title-case": "bin.js"
+      }
     },
-    "to-fast-properties": {
+    "node_modules/to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "to-object-path": {
+    "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "to-regex": {
+    "node_modules/to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "to-regex-range": {
+    "node_modules/to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "toidentifier": {
+    "node_modules/to-regex-range/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
     },
-    "tough-cookie": {
+    "node_modules/tough-cookie": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "punycode": "^1.4.1"
+      },
+      "engines": {
+        "node": ">=0.8"
       }
     },
-    "tunnel-agent": {
+    "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "optional": true,
-      "requires": {
+      "dependencies": {
         "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "tweetnacl": {
+    "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true,
       "optional": true
     },
-    "uc.micro": {
+    "node_modules/uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
       "dev": true
     },
-    "uglify-js": {
+    "node_modules/uglify-js": {
       "version": "3.17.4",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
       "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
     },
-    "uglify-to-browserify": {
+    "node_modules/uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
       "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
       "dev": true
     },
-    "underscore": {
+    "node_modules/underscore": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
       "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
       "dev": true
     },
-    "union-value": {
+    "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "unpipe": {
+    "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "unset-value": {
+    "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
       },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-          "dev": true
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "upath": {
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
+      }
     },
-    "upper-case": {
+    "node_modules/upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
       "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
       "dev": true
     },
-    "urix": {
+    "node_modules/urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "url-join": {
+    "node_modules/url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
       "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
       "dev": true
     },
-    "use": {
+    "node_modules/use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "util-deprecate": {
+    "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "utils-merge": {
+    "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
     },
-    "uuid": {
+    "node_modules/uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
     },
-    "vary": {
+    "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "verror": {
+    "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
       "optional": true,
-      "requires": {
+      "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-          "dev": true,
-          "optional": true
-        }
       }
     },
-    "warehouse": {
+    "node_modules/verror/node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/verror/node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/warehouse": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz",
       "integrity": "sha512-axyo83DpdZabmCsiipkHYKnwl6ull2Vv7fqxMnV8KOQLdiJKffn9W+B3Yac7QVWzBE56Q6B6j2cIY1k2gc10PA==",
       "dev": true,
-      "requires": {
-        "JSONStream": "^1.0.7",
+      "dependencies": {
         "bluebird": "^3.2.2",
         "cuid": "~1.3.8",
         "graceful-fs": "^4.1.3",
         "is-plain-object": "^2.0.1",
+        "JSONStream": "^1.0.7",
         "lodash": "^4.2.1"
       }
     },
-    "which": {
+    "node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "which-module": {
+    "node_modules/which-module": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
       "dev": true
     },
-    "window-size": {
+    "node_modules/window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
       "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
-      "dev": true
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
     },
-    "wordwrap": {
+    "node_modules/wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
       "dev": true
     },
-    "wrap-ansi": {
+    "node_modules/wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
       "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "ansi-styles": "^3.2.0",
         "string-width": "^3.0.0",
         "strip-ansi": "^5.0.0"
       },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+      "engines": {
+        "node": ">=6"
       }
     },
-    "wrappy": {
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "optional": true
     },
-    "xmlcreate": {
+    "node_modules/xmlcreate": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
       "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
       "dev": true
     },
-    "y18n": {
+    "node_modules/y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
-    "yallist": {
+    "node_modules/yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
-    "yargs": {
+    "node_modules/yargs": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
       "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "camelcase": "^1.0.2",
         "cliui": "^2.1.0",
         "decamelize": "^1.0.0",
         "window-size": "0.1.0"
       }
     },
-    "yargs-parser": {
+    "node_modules/yargs-parser": {
       "version": "15.0.3",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz",
       "integrity": "sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        }
+      }
+    },
+    "node_modules/yargs-parser/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
       }
     }
   }
diff --git a/docs/package.json b/docs/package.json
index 79c7f3bf31..18bbaee387 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -11,7 +11,7 @@
     "handlebars": "4.7.7",
     "hexo": "3.9.0",
     "hexo-prism-plus": "1.1.0",
-    "hexo-renderer-ejs": "1.0.0",
+    "hexo-renderer-ejs": "2.0.0",
     "hexo-renderer-less": "0.2.0",
     "hexo-renderer-marked": "2.0.0",
     "hexo-server": "1.0.0",

From 19ca6aa3f696e4e0116da8b09c1cea0d680a08e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:50:21 +0000
Subject: [PATCH 0996/1140] Bump braces from 3.0.2 to 3.0.3

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 94 ++++++++++++++++++++++++-----------------------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2f50dcb896..11cd9adc55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1850,6 +1850,19 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/browserslist": {
       "version": "4.22.2",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
@@ -3025,39 +3038,6 @@
         "node": ">=8.6.0"
       }
     },
-    "node_modules/fast-glob/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/fast-glob/node_modules/micromatch": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
@@ -3071,18 +3051,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/fast-glob/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -3116,6 +3084,19 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/flat-cache": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
@@ -3659,6 +3640,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/is-number-object": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
@@ -4728,6 +4719,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.15.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",

From 96fd1646ec45e6a3f6cc3ef0990ecf3908c7ffa6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:51:46 +0000
Subject: [PATCH 0997/1140] Bump rollup from 4.12.0 to 4.32.1 in
 /v3-docs/v3-migration-docs

Bumps [rollup](https://github.com/rollup/rollup) from 4.12.0 to 4.32.1.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.12.0...v4.32.1)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 v3-docs/v3-migration-docs/package-lock.json | 225 ++++++++++++++------
 1 file changed, 165 insertions(+), 60 deletions(-)

diff --git a/v3-docs/v3-migration-docs/package-lock.json b/v3-docs/v3-migration-docs/package-lock.json
index e0cc9531e2..97b4488c74 100644
--- a/v3-docs/v3-migration-docs/package-lock.json
+++ b/v3-docs/v3-migration-docs/package-lock.json
@@ -621,179 +621,277 @@
       "dev": true
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz",
-      "integrity": "sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.32.1.tgz",
+      "integrity": "sha512-/pqA4DmqyCm8u5YIDzIdlLcEmuvxb0v8fZdFhVMszSpDTgbQKdw3/mB3eMUHIbubtJ6F9j+LtmyCnHTEqIHyzA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz",
-      "integrity": "sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.32.1.tgz",
+      "integrity": "sha512-If3PDskT77q7zgqVqYuj7WG3WC08G1kwXGVFi9Jr8nY6eHucREHkfpX79c0ACAjLj3QIWKPJR7w4i+f5EdLH5Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz",
-      "integrity": "sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.32.1.tgz",
+      "integrity": "sha512-zCpKHioQ9KgZToFp5Wvz6zaWbMzYQ2LJHQ+QixDKq52KKrF65ueu6Af4hLlLWHjX1Wf/0G5kSJM9PySW9IrvHA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz",
-      "integrity": "sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.32.1.tgz",
+      "integrity": "sha512-sFvF+t2+TyUo/ZQqUcifrJIgznx58oFZbdHS9TvHq3xhPVL9nOp+yZ6LKrO9GWTP+6DbFtoyLDbjTpR62Mbr3Q==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.1.tgz",
+      "integrity": "sha512-NbOa+7InvMWRcY9RG+B6kKIMD/FsnQPH0MWUvDlQB1iXnF/UcKSudCXZtv4lW+C276g3w5AxPbfry5rSYvyeYA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.32.1.tgz",
+      "integrity": "sha512-JRBRmwvHPXR881j2xjry8HZ86wIPK2CcDw0EXchE1UgU0ubWp9nvlT7cZYKc6bkypBt745b4bglf3+xJ7hXWWw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz",
-      "integrity": "sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.32.1.tgz",
+      "integrity": "sha512-PKvszb+9o/vVdUzCCjL0sKHukEQV39tD3fepXxYrHE3sTKrRdCydI7uldRLbjLmDA3TFDmh418XH19NOsDRH8g==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.32.1.tgz",
+      "integrity": "sha512-9WHEMV6Y89eL606ReYowXuGF1Yb2vwfKWKdD1A5h+OYnPZSJvxbEjxTRKPgi7tkP2DSnW0YLab1ooy+i/FQp/Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz",
-      "integrity": "sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.32.1.tgz",
+      "integrity": "sha512-tZWc9iEt5fGJ1CL2LRPw8OttkCBDs+D8D3oEM8mH8S1ICZCtFJhD7DZ3XMGM8kpqHvhGUTvNUYVDnmkj4BDXnw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz",
-      "integrity": "sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.32.1.tgz",
+      "integrity": "sha512-FTYc2YoTWUsBz5GTTgGkRYYJ5NGJIi/rCY4oK/I8aKowx1ToXeoVVbIE4LGAjsauvlhjfl0MYacxClLld1VrOw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.32.1.tgz",
+      "integrity": "sha512-F51qLdOtpS6P1zJVRzYM0v6MrBNypyPEN1GfMiz0gPu9jN8ScGaEFIZQwteSsGKg799oR5EaP7+B2jHgL+d+Kw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.32.1.tgz",
+      "integrity": "sha512-wO0WkfSppfX4YFm5KhdCCpnpGbtgQNj/tgvYzrVYFKDpven8w2N6Gg5nB6w+wAMO3AIfSTWeTjfVe+uZ23zAlg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz",
-      "integrity": "sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.32.1.tgz",
+      "integrity": "sha512-iWswS9cIXfJO1MFYtI/4jjlrGb/V58oMu4dYJIKnR5UIwbkzR0PJ09O0PDZT0oJ3LYWXBSWahNf/Mjo6i1E5/g==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.32.1.tgz",
+      "integrity": "sha512-RKt8NI9tebzmEthMnfVgG3i/XeECkMPS+ibVZjZ6mNekpbbUmkNWuIN2yHsb/mBPyZke4nlI4YqIdFPgKuoyQQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz",
-      "integrity": "sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.32.1.tgz",
+      "integrity": "sha512-WQFLZ9c42ECqEjwg/GHHsouij3pzLXkFdz0UxHa/0OM12LzvX7DzedlY0SIEly2v18YZLRhCRoHZDxbBSWoGYg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz",
-      "integrity": "sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.32.1.tgz",
+      "integrity": "sha512-BLoiyHDOWoS3uccNSADMza6V6vCNiphi94tQlVIL5de+r6r/CCQuNnerf+1g2mnk2b6edp5dk0nhdZ7aEjOBsA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz",
-      "integrity": "sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.32.1.tgz",
+      "integrity": "sha512-w2l3UnlgYTNNU+Z6wOR8YdaioqfEnwPjIsJ66KxKAf0p+AuL2FHeTX6qvM+p/Ue3XPBVNyVSfCrfZiQh7vZHLQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz",
-      "integrity": "sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.32.1.tgz",
+      "integrity": "sha512-Am9H+TGLomPGkBnaPWie4F3x+yQ2rr4Bk2jpwy+iV+Gel9jLAu/KqT8k3X4jxFPW6Zf8OMnehyutsd+eHoq1WQ==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz",
-      "integrity": "sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.32.1.tgz",
+      "integrity": "sha512-ar80GhdZb4DgmW3myIS9nRFYcpJRSME8iqWgzH2i44u+IdrzmiXVxeFnExQ5v4JYUSpg94bWjevMG8JHf1Da5Q==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/hast": {
       "version": "3.0.4",
@@ -1689,12 +1787,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.0.tgz",
-      "integrity": "sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==",
+      "version": "4.32.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.1.tgz",
+      "integrity": "sha512-z+aeEsOeEa3mEbS1Tjl6sAZ8NE3+AalQz1RJGj81M+fizusbdDMoEJwdJNHfaB40Scr4qNu+welOfes7maKonA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1704,19 +1803,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.12.0",
-        "@rollup/rollup-android-arm64": "4.12.0",
-        "@rollup/rollup-darwin-arm64": "4.12.0",
-        "@rollup/rollup-darwin-x64": "4.12.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.12.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.12.0",
-        "@rollup/rollup-linux-arm64-musl": "4.12.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.12.0",
-        "@rollup/rollup-linux-x64-gnu": "4.12.0",
-        "@rollup/rollup-linux-x64-musl": "4.12.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.12.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.12.0",
-        "@rollup/rollup-win32-x64-msvc": "4.12.0",
+        "@rollup/rollup-android-arm-eabi": "4.32.1",
+        "@rollup/rollup-android-arm64": "4.32.1",
+        "@rollup/rollup-darwin-arm64": "4.32.1",
+        "@rollup/rollup-darwin-x64": "4.32.1",
+        "@rollup/rollup-freebsd-arm64": "4.32.1",
+        "@rollup/rollup-freebsd-x64": "4.32.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.32.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.32.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.32.1",
+        "@rollup/rollup-linux-arm64-musl": "4.32.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.32.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.32.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.32.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.32.1",
+        "@rollup/rollup-linux-x64-gnu": "4.32.1",
+        "@rollup/rollup-linux-x64-musl": "4.32.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.32.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.32.1",
+        "@rollup/rollup-win32-x64-msvc": "4.32.1",
         "fsevents": "~2.3.2"
       }
     },

From b2f03c042a51ebd8677b48024af6882abbc4d4de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:53:52 +0000
Subject: [PATCH 0998/1140] Bump cross-spawn from 7.0.3 to 7.0.6 in
 /npm-packages/meteor-installer

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../meteor-installer/package-lock.json        | 1585 +++++++++--------
 1 file changed, 793 insertions(+), 792 deletions(-)

diff --git a/npm-packages/meteor-installer/package-lock.json b/npm-packages/meteor-installer/package-lock.json
index 15a83f9214..e1eeaa2f2b 100644
--- a/npm-packages/meteor-installer/package-lock.json
+++ b/npm-packages/meteor-installer/package-lock.json
@@ -1,792 +1,793 @@
-{
-  "name": "meteor",
-  "version": "3.1.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "meteor",
-      "version": "3.1.0",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "7zip-bin": "^5.2.0",
-        "cli-progress": "^3.11.1",
-        "https-proxy-agent": "^5.0.1",
-        "node-7z": "^2.1.2",
-        "node-downloader-helper": "^2.1.9",
-        "rimraf": "^6.0.1",
-        "semver": "^7.3.7",
-        "tar": "^6.1.11",
-        "tmp": "^0.2.1"
-      },
-      "bin": {
-        "meteor-installer": "cli.js"
-      },
-      "engines": {
-        "node": ">=20.x",
-        "npm": ">=10.x"
-      }
-    },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "license": "MIT"
-    },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/7zip-bin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
-      "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A=="
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "license": "MIT"
-    },
-    "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cli-progress": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz",
-      "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==",
-      "dependencies": {
-        "string-width": "^4.2.3"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "license": "MIT"
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "license": "MIT"
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
-      "license": "ISC",
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/glob": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz",
-      "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==",
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^4.0.1",
-        "minimatch": "^10.0.0",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^2.0.0"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob/node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "node_modules/jackspeak": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz",
-      "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==",
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
-    "node_modules/lodash.defaultsdeep": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
-      "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="
-    },
-    "node_modules/lodash.defaultto": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaultto/-/lodash.defaultto-4.14.0.tgz",
-      "integrity": "sha512-G6tizqH6rg4P5j32Wy4Z3ZIip7OfG8YWWlPFzUFGcYStH1Ld0l1tWs6NevEQNEDnO1M3NZYjuHuraaFSN5WqeQ=="
-    },
-    "node_modules/lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="
-    },
-    "node_modules/lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
-    },
-    "node_modules/lodash.negate": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.negate/-/lodash.negate-3.0.2.tgz",
-      "integrity": "sha512-JGJYYVslKYC0tRMm/7igfdHulCjoXjoganRNWM8AgS+RXfOvFnPkOveDhPI65F9aAypCX9QEEQoBqWf7Q6uAeA=="
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
-      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/node-7z": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/node-7z/-/node-7z-2.1.2.tgz",
-      "integrity": "sha512-mSmn90OIYKYIkuRwH1YRJl2sMwB9OlYhCQS4SPTOfxlzWwomoC1G9j4tsvAsv7vJPwvK7B76Z0a2dH5Mvwo91Q==",
-      "dependencies": {
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.1.1",
-        "lodash.defaultsdeep": "^4.6.1",
-        "lodash.defaultto": "^4.14.0",
-        "lodash.flattendeep": "^4.4.0",
-        "lodash.isempty": "^4.4.0",
-        "lodash.negate": "^3.0.2",
-        "normalize-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-downloader-helper": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.9.tgz",
-      "integrity": "sha512-FSvAol2Z8UP191sZtsUZwHIN0eGoGue3uEXGdWIH5228e9KH1YHXT7fN8Oa33UGf+FbqGTQg3sJfrRGzmVCaJA==",
-      "bin": {
-        "ndh": "bin/ndh"
-      },
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
-      "license": "BlueOak-1.0.0"
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-scurry": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
-      "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^11.0.0",
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz",
-      "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==",
-      "license": "ISC",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/path-scurry/node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
-      "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==",
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^11.0.0",
-        "package-json-from-dist": "^1.0.0"
-      },
-      "bin": {
-        "rimraf": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs": {
-      "name": "string-width",
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^5.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs": {
-      "name": "wrap-ansi",
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
-}
+{
+  "name": "meteor",
+  "version": "3.1.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "meteor",
+      "version": "3.1.1",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "7zip-bin": "^5.2.0",
+        "cli-progress": "^3.11.1",
+        "https-proxy-agent": "^5.0.1",
+        "node-7z": "^2.1.2",
+        "node-downloader-helper": "^2.1.9",
+        "rimraf": "^6.0.1",
+        "semver": "^7.3.7",
+        "tar": "^6.1.11",
+        "tmp": "^0.2.1"
+      },
+      "bin": {
+        "meteor-installer": "cli.js"
+      },
+      "engines": {
+        "node": ">=20.x",
+        "npm": ">=10.x"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "license": "MIT"
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/7zip-bin": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
+      "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A=="
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cli-progress": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz",
+      "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==",
+      "dependencies": {
+        "string-width": "^4.2.3"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "license": "MIT"
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/glob": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz",
+      "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==",
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^4.0.1",
+        "minimatch": "^10.0.0",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^2.0.0"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/jackspeak": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz",
+      "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/lodash.defaultsdeep": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
+      "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="
+    },
+    "node_modules/lodash.defaultto": {
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaultto/-/lodash.defaultto-4.14.0.tgz",
+      "integrity": "sha512-G6tizqH6rg4P5j32Wy4Z3ZIip7OfG8YWWlPFzUFGcYStH1Ld0l1tWs6NevEQNEDnO1M3NZYjuHuraaFSN5WqeQ=="
+    },
+    "node_modules/lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="
+    },
+    "node_modules/lodash.isempty": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
+      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
+    },
+    "node_modules/lodash.negate": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash.negate/-/lodash.negate-3.0.2.tgz",
+      "integrity": "sha512-JGJYYVslKYC0tRMm/7igfdHulCjoXjoganRNWM8AgS+RXfOvFnPkOveDhPI65F9aAypCX9QEEQoBqWf7Q6uAeA=="
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
+      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/node-7z": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/node-7z/-/node-7z-2.1.2.tgz",
+      "integrity": "sha512-mSmn90OIYKYIkuRwH1YRJl2sMwB9OlYhCQS4SPTOfxlzWwomoC1G9j4tsvAsv7vJPwvK7B76Z0a2dH5Mvwo91Q==",
+      "dependencies": {
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.1.1",
+        "lodash.defaultsdeep": "^4.6.1",
+        "lodash.defaultto": "^4.14.0",
+        "lodash.flattendeep": "^4.4.0",
+        "lodash.isempty": "^4.4.0",
+        "lodash.negate": "^3.0.2",
+        "normalize-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-downloader-helper": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.9.tgz",
+      "integrity": "sha512-FSvAol2Z8UP191sZtsUZwHIN0eGoGue3uEXGdWIH5228e9KH1YHXT7fN8Oa33UGf+FbqGTQg3sJfrRGzmVCaJA==",
+      "bin": {
+        "ndh": "bin/ndh"
+      },
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
+      "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz",
+      "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==",
+      "license": "ISC",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/path-scurry/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
+      "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==",
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^11.0.0",
+        "package-json-from-dist": "^1.0.0"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
+}

From 5f8007c2f14278dd1ff2fd330dcc37cd40d0f9b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:55:54 +0000
Subject: [PATCH 0999/1140] Bump semver from 7.3.8 to 7.5.2 in
 /scripts/admin/update-semver

Bumps [semver](https://github.com/npm/node-semver) from 7.3.8 to 7.5.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.8...v7.5.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 scripts/admin/update-semver/package-lock.json | 15 ++++++++-------
 scripts/admin/update-semver/package.json      |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/admin/update-semver/package-lock.json b/scripts/admin/update-semver/package-lock.json
index 80901d6328..10b77a0c9f 100644
--- a/scripts/admin/update-semver/package-lock.json
+++ b/scripts/admin/update-semver/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "semver": "^7.3.8"
+        "semver": "^7.5.2"
       }
     },
     "node_modules/lru-cache": {
@@ -24,9 +24,10 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -53,9 +54,9 @@
       }
     },
     "semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
diff --git a/scripts/admin/update-semver/package.json b/scripts/admin/update-semver/package.json
index 3ba0bf697b..4f875a48cf 100644
--- a/scripts/admin/update-semver/package.json
+++ b/scripts/admin/update-semver/package.json
@@ -11,6 +11,6 @@
   "author": "grubba27",
   "license": "MIT",
   "dependencies": {
-    "semver": "^7.3.8"
+    "semver": "^7.5.2"
   }
 }

From 9a9d83c7ed6793c039e1a9770d2ede4ca88441fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 28 Jan 2025 16:14:03 +0100
Subject: [PATCH 1000/1140] update deps

---
 docs/package-lock.json    | 965 +++++++++++++++++++++++++++++++++-----
 v3-docs/docs/package.json |   4 +-
 2 files changed, 837 insertions(+), 132 deletions(-)

diff --git a/docs/package-lock.json b/docs/package-lock.json
index 41b61a0e07..dcb1a8aab4 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "hexo-site",
       "version": "0.0.0",
       "devDependencies": {
         "@meteorjs/meteor-hexo-config": "1.0.14",
@@ -61,6 +62,397 @@
       "dev": true,
       "hasShrinkwrap": true
     },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "extraneous": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "extraneous": true,
+      "dependencies": {
+        "inherits": "~2.0.0"
+      },
+      "engines": {
+        "node": "0.4 || >=0.5.8"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "extraneous": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "extraneous": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "extraneous": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs-extra": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "extraneous": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "extraneous": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "extraneous": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "extraneous": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/interpret": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "extraneous": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "extraneous": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "extraneous": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "extraneous": true,
+      "dependencies": {
+        "minimist": "0.0.8"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "extraneous": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "extraneous": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/resolve": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
+      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+      "extraneous": true,
+      "dependencies": {
+        "path-parse": "^1.0.5"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "extraneous": true,
+      "dependencies": {
+        "glob": "^7.0.5"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/shelljs": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz",
+      "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==",
+      "extraneous": true,
+      "dependencies": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/simple-git": {
+      "version": "1.89.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz",
+      "integrity": "sha1-71L+c01QYFZs4Yeyu6zjbCMj40w=",
+      "extraneous": true,
+      "dependencies": {
+        "debug": "^3.1.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
+      "extraneous": true,
+      "dependencies": {
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tarball-extract": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tarball-extract/-/tarball-extract-0.0.6.tgz",
+      "integrity": "sha1-FQ5sAR3mdkeRn67CUDVhHGdh/RA=",
+      "extraneous": true,
+      "dependencies": {
+        "tar": "2.2.1",
+        "wget": "*"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "extraneous": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp-promise": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.4.tgz",
+      "integrity": "sha512-76r7LZhAvRJ3kLD/xrPSEGb3aq0tirzMLJKhcchKSkQIiEgXB+RouC0ygReuZX+oiA64taGo+j+1gHTKSG8/Mg==",
+      "extraneous": true,
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "tmp": "0.0.33"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tunnel": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz",
+      "integrity": "sha1-8jvNi3p7ioZCYbIIT2b5MZM5YzQ=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wget": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/wget/-/wget-0.0.1.tgz",
+      "integrity": "sha1-i7ga8LjmC13yYtPIHlc34fSTHlM=",
+      "extraneous": true,
+      "dependencies": {
+        "tunnel": "0.0.2"
+      },
+      "bin": {
+        "nwget": "bin/nwget.js"
+      },
+      "engines": {
+        "node": ">= 0.6.18"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "extraneous": true
+    },
     "node_modules/@types/linkify-it": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
@@ -164,13 +556,19 @@
       }
     },
     "node_modules/anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
     "node_modules/archy": {
@@ -193,6 +591,7 @@
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-flatten": "^1.0.1"
       },
@@ -223,6 +622,7 @@
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -583,17 +983,18 @@
       }
     },
     "node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
+        "fill-range": "^7.1.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/browser-fingerprint": {
@@ -799,22 +1200,91 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       },
       "optionalDependencies": {
-        "fsevents": "^1.0.0"
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar/node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chokidar/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/chokidar/node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
       }
     },
     "node_modules/class-utils": {
@@ -1212,6 +1682,7 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
@@ -1384,6 +1855,7 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -1393,6 +1865,7 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-posix-bracket": "^0.1.0"
       },
@@ -1405,6 +1878,7 @@
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^2.1.0"
       },
@@ -1412,6 +1886,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/expand-range/node_modules/fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-range/node_modules/is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -1449,6 +1953,7 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^1.0.0"
       },
@@ -1456,6 +1961,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/extglob/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -1511,24 +2026,39 @@
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/fill-range/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
       }
     },
     "node_modules/finalhandler": {
@@ -1575,6 +2105,7 @@
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-in": "^1.0.1"
       },
@@ -1624,6 +2155,7 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -1737,6 +2269,7 @@
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
@@ -1745,15 +2278,54 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-parent": {
+    "node_modules/glob-base/node_modules/glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^2.0.0"
       }
     },
+    "node_modules/glob-base/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-base/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
@@ -2081,6 +2653,83 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/hexo-fs/node_modules/anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^2.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/hexo-i18n": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
@@ -2400,27 +3049,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hexo-prism-plus/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -2487,15 +3115,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hexo-renderer-ejs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-2.0.0.tgz",
@@ -3017,27 +3636,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/hexo/node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hexo/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -3104,15 +3702,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hexo/node_modules/strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -3198,6 +3787,7 @@
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -3214,6 +3804,7 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -3346,6 +3937,7 @@
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3355,6 +3947,7 @@
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-primitive": "^2.0.0"
       },
@@ -3372,10 +3965,11 @@
       }
     },
     "node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3390,27 +3984,28 @@
       }
     },
     "node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^1.0.0"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.12.0"
       }
     },
     "node_modules/is-plain-object": {
@@ -3439,6 +4034,7 @@
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3448,6 +4044,7 @@
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3494,6 +4091,7 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isarray": "1.0.0"
       },
@@ -3674,12 +4272,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/jsdoc/node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
     "node_modules/jsdoc/node_modules/escape-string-regexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
@@ -4091,7 +4683,8 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/mdurl": {
       "version": "1.0.1",
@@ -4104,6 +4697,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-diff": "^2.0.0",
         "array-unique": "^0.2.1",
@@ -4123,6 +4717,57 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/micromatch/node_modules/braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -4397,13 +5042,11 @@
       }
     },
     "node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4523,6 +5166,7 @@
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
@@ -4670,6 +5314,7 @@
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
@@ -4680,6 +5325,29 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/parse-glob/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-glob/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -4744,6 +5412,21 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -4758,6 +5441,7 @@
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4822,6 +5506,7 @@
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
@@ -4836,6 +5521,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
       "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4845,6 +5531,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4854,6 +5541,7 @@
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -5153,6 +5841,7 @@
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-equal-shallow": "^0.1.3"
       },
@@ -5354,10 +6043,11 @@
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -5381,13 +6071,15 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/send/node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
       "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -5400,25 +6092,37 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/serve-static/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -6050,6 +6754,7 @@
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
diff --git a/v3-docs/docs/package.json b/v3-docs/docs/package.json
index 748ffdba66..2fc2dc1ec5 100644
--- a/v3-docs/docs/package.json
+++ b/v3-docs/docs/package.json
@@ -9,10 +9,10 @@
   },
   "devDependencies": {
     "canonical-json": "^0.0.4",
-    "jsdoc": "^4.0.2",
+    "jsdoc": "^4.0.4",
     "vitepress": "1.0.1"
   },
   "dependencies": {
-    "vue-collapsed": "^1.3.0"
+    "vue-collapsed": "^1.3.4"
   }
 }

From 167685863e5f5bb2fa46b3a4cc840fb84c5c211d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 28 Jan 2025 16:47:09 +0100
Subject: [PATCH 1001/1140] update node version

---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index dc85db922f..afaed0dbe1 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 12.x
+          node-version: 22.x
       - name: Build the Docs
         run: npm ci && npm run build
       - name: Deploy to Netlify for preview

From 7f78c1c284f67d0c04bed0c8f7b85927470a68e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 28 Jan 2025 16:52:23 +0100
Subject: [PATCH 1002/1140] upgrade guide check with latest node

---
 .github/workflows/guide.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/guide.yml b/.github/workflows/guide.yml
index f485145f18..bd3d801966 100644
--- a/.github/workflows/guide.yml
+++ b/.github/workflows/guide.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 12.x
+          node-version: 22.x
       - name: Build the Guide
         run: npm ci && npm run build
       - name: Deploy to Netlify for preview

From f9e6c000af97aed1a66181de1fb3626084d4983b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 28 Jan 2025 17:00:06 +0100
Subject: [PATCH 1003/1140] can update properly hexo

---
 guide/package-lock.json | 2830 +++++++++++++++++++++++++++------------
 guide/package.json      |    2 +-
 2 files changed, 1941 insertions(+), 891 deletions(-)

diff --git a/guide/package-lock.json b/guide/package-lock.json
index 3071e988f8..b9073abdc7 100644
--- a/guide/package-lock.json
+++ b/guide/package-lock.json
@@ -5,12 +5,13 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "meteor-guide",
       "version": "1.0.0",
       "devDependencies": {
         "@meteorjs/meteor-hexo-config": "1.0.14",
         "@meteorjs/meteor-theme-hexo": "2.0.8",
         "chexo": "1.0.7",
-        "hexo": "7.3.0",
+        "hexo": "3.9.0",
         "hexo-prism-plus": "1.1.0",
         "hexo-renderer-ejs": "1.0.0",
         "hexo-renderer-less": "0.2.0",
@@ -32,6 +33,397 @@
       "dev": true,
       "hasShrinkwrap": true
     },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "extraneous": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "extraneous": true,
+      "dependencies": {
+        "inherits": "~2.0.0"
+      },
+      "engines": {
+        "node": "0.4 || >=0.5.8"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "extraneous": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "extraneous": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "extraneous": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs-extra": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "extraneous": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "extraneous": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "extraneous": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "extraneous": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/interpret": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "extraneous": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "extraneous": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "extraneous": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "extraneous": true,
+      "dependencies": {
+        "minimist": "0.0.8"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "extraneous": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "extraneous": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/resolve": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
+      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+      "extraneous": true,
+      "dependencies": {
+        "path-parse": "^1.0.5"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "extraneous": true,
+      "dependencies": {
+        "glob": "^7.0.5"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/shelljs": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz",
+      "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==",
+      "extraneous": true,
+      "dependencies": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/simple-git": {
+      "version": "1.89.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz",
+      "integrity": "sha1-71L+c01QYFZs4Yeyu6zjbCMj40w=",
+      "extraneous": true,
+      "dependencies": {
+        "debug": "^3.1.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
+      "extraneous": true,
+      "dependencies": {
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tarball-extract": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tarball-extract/-/tarball-extract-0.0.6.tgz",
+      "integrity": "sha1-FQ5sAR3mdkeRn67CUDVhHGdh/RA=",
+      "extraneous": true,
+      "dependencies": {
+        "tar": "2.2.1",
+        "wget": "*"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "extraneous": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp-promise": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.4.tgz",
+      "integrity": "sha512-76r7LZhAvRJ3kLD/xrPSEGb3aq0tirzMLJKhcchKSkQIiEgXB+RouC0ygReuZX+oiA64taGo+j+1gHTKSG8/Mg==",
+      "extraneous": true,
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "tmp": "0.0.33"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tunnel": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz",
+      "integrity": "sha1-8jvNi3p7ioZCYbIIT2b5MZM5YzQ=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wget": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/wget/-/wget-0.0.1.tgz",
+      "integrity": "sha1-i7ga8LjmC13yYtPIHlc34fSTHlM=",
+      "extraneous": true,
+      "dependencies": {
+        "tunnel": "0.0.2"
+      },
+      "bin": {
+        "nwget": "bin/nwget.js"
+      },
+      "engines": {
+        "node": ">= 0.6.18"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "extraneous": true
+    },
     "node_modules/a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
@@ -57,6 +449,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
@@ -68,6 +473,21 @@
         "json-stable-stringify": "^1.0.1"
       }
     },
+    "node_modules/align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -87,13 +507,19 @@
       }
     },
     "node_modules/anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
     "node_modules/archy": {
@@ -103,17 +529,28 @@
       "dev": true
     },
     "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "Python-2.0"
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/argparse/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-flatten": "^1.0.1"
       },
@@ -144,6 +581,7 @@
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -183,6 +621,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
+      "dev": true
+    },
     "node_modules/async-each": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
@@ -366,8 +810,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node_modules/base": {
       "version": "0.11.2",
@@ -468,6 +911,13 @@
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
@@ -487,26 +937,33 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
+        "fill-range": "^7.1.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
+    "node_modules/browser-fingerprint": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
+      "integrity": "sha512-b8SXP7yOlzLUJXF8WUvIjmbJzkJC0X6OHe7J9a/SHqEBC7a9Eglag6AANSTJz82h5U582kuxm/5TPudnD68EPA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -570,6 +1027,16 @@
         "upper-case": "^1.1.1"
       }
     },
+    "node_modules/camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -577,6 +1044,20 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
@@ -593,6 +1074,34 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/cheerio": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
+      "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.0",
+        "entities": "~1.1.1",
+        "htmlparser2": "^3.9.1",
+        "lodash.assignin": "^4.0.9",
+        "lodash.bind": "^4.1.4",
+        "lodash.defaults": "^4.0.1",
+        "lodash.filter": "^4.4.0",
+        "lodash.flatten": "^4.2.0",
+        "lodash.foreach": "^4.3.0",
+        "lodash.map": "^4.4.0",
+        "lodash.merge": "^4.4.0",
+        "lodash.pick": "^4.2.1",
+        "lodash.reduce": "^4.4.0",
+        "lodash.reject": "^4.4.0",
+        "lodash.some": "^4.4.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/chexo": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/chexo/-/chexo-1.0.7.tgz",
@@ -632,22 +1141,91 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       },
       "optionalDependencies": {
-        "fsevents": "^1.0.0"
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar/node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chokidar/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/chokidar/node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
       }
     },
     "node_modules/class-utils": {
@@ -686,6 +1264,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "center-align": "^0.1.1",
+        "right-align": "^0.1.1",
+        "wordwrap": "0.0.2"
+      }
+    },
+    "node_modules/cliui/node_modules/wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+      "dev": true,
+      "license": "MIT/X11",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -793,8 +1393,7 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node_modules/connect": {
       "version": "3.7.0",
@@ -826,6 +1425,14 @@
       "integrity": "sha512-47n1NWwwc+qPmOMtY9zUKCM1cYfoxLvBRxKzirFrqhE61yqK+yZP/BOA3gjaBUVb9P46J1RyJjasrtqYoWCbvA==",
       "dev": true
     },
+    "node_modules/core-js": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+      "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -856,13 +1463,41 @@
         "node": ">=0.10.40"
       }
     },
+    "node_modules/css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==",
+      "dev": true,
+      "license": "BSD-like",
+      "dependencies": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/cuid": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz",
-      "integrity": "sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
+      "integrity": "sha512-MoL67ZZuBetDMxzrZtO+Iq1ATajFACQCP52QRinBgd3yTjYdv54mJO8ibUrh06fojKCoX5P2i7KkEatm4VTIOQ==",
       "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "browser-fingerprint": "0.0.1",
+        "core-js": "^1.1.1",
+        "node-fingerprint": "0.0.2"
+      }
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
@@ -896,6 +1531,16 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
@@ -905,16 +1550,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/define-data-property": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
@@ -995,62 +1630,41 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
       }
     },
     "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
       "license": "BSD-2-Clause"
     },
     "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "domelementtype": "1"
       }
     },
     "node_modules/domutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+        "dom-serializer": "0",
+        "domelementtype": "1"
       }
     },
     "node_modules/ecc-jsbn": {
@@ -1090,17 +1704,11 @@
       }
     },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
+      "license": "BSD-2-Clause"
     },
     "node_modules/errno": {
       "version": "0.1.8",
@@ -1167,6 +1775,7 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-posix-bracket": "^0.1.0"
       },
@@ -1179,6 +1788,7 @@
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^2.1.0"
       },
@@ -1186,6 +1796,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/expand-range/node_modules/fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-range/node_modules/is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -1223,6 +1863,7 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^1.0.0"
       },
@@ -1230,6 +1871,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/extglob/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -1240,13 +1891,6 @@
       ],
       "optional": true
     },
-    "node_modules/fast-equals": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-3.0.3.tgz",
-      "integrity": "sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -1259,24 +1903,39 @@
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/fill-range/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
       }
     },
     "node_modules/finalhandler": {
@@ -1311,6 +1970,7 @@
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-in": "^1.0.1"
       },
@@ -1460,6 +2120,7 @@
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
@@ -1468,15 +2129,54 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-parent": {
+    "node_modules/glob-base/node_modules/glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^2.0.0"
       }
     },
+    "node_modules/glob-base/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-base/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
@@ -1692,46 +2392,45 @@
       }
     },
     "node_modules/hexo": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/hexo/-/hexo-7.3.0.tgz",
-      "integrity": "sha512-dOe8mzBKrvjubW5oBmyhcnQDpC+M2xmAMLae5K+o+SkHxyvAhShkS2VQZoTsOLIJKY6xilv7dzCjCvE7ol/NHQ==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.9.0.tgz",
+      "integrity": "sha512-uga6MsxGlD0AeafiObbFkQVWlUO+wWTb/IJVPI3fFpmAJu0PBD//Ek0qVOxHjlzdvFGeW0bYWYqXgDbR7suJng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "abbrev": "^2.0.0",
+        "abbrev": "^1.1.1",
         "archy": "^1.0.0",
-        "bluebird": "^3.7.2",
-        "hexo-cli": "^4.3.2",
-        "hexo-front-matter": "^4.2.1",
-        "hexo-fs": "^4.1.3",
-        "hexo-i18n": "^2.0.0",
-        "hexo-log": "^4.0.1",
-        "hexo-util": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "js-yaml-js-types": "^1.0.0",
-        "micromatch": "^4.0.4",
-        "moize": "^6.1.6",
-        "moment": "^2.29.1",
-        "moment-timezone": "^0.5.34",
-        "nunjucks": "^3.2.3",
-        "picocolors": "^1.0.0",
+        "bluebird": "^3.5.2",
+        "chalk": "^2.4.1",
+        "cheerio": "0.22.0",
+        "hexo-cli": "^2.0.0",
+        "hexo-front-matter": "^0.2.3",
+        "hexo-fs": "^1.0.0",
+        "hexo-i18n": "^0.2.1",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.3",
+        "js-yaml": "^3.12.0",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "moment": "^2.22.2",
+        "moment-timezone": "^0.5.21",
+        "nunjucks": "^3.1.3",
         "pretty-hrtime": "^1.0.3",
-        "resolve": "^1.22.0",
-        "strip-ansi": "^6.0.0",
+        "resolve": "^1.8.1",
+        "strip-ansi": "^5.0.0",
+        "strip-indent": "^2.0.0",
+        "swig-extras": "0.0.1",
+        "swig-templates": "^2.0.3",
         "text-table": "^0.2.0",
-        "tildify": "^2.0.0",
-        "titlecase": "^1.1.3",
-        "warehouse": "^5.0.1"
+        "tildify": "^1.2.0",
+        "titlecase": "^1.1.2",
+        "warehouse": "^2.2.0"
       },
       "bin": {
         "hexo": "bin/hexo"
       },
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/hexo"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/hexo-bunyan": {
@@ -1753,383 +2452,414 @@
       }
     },
     "node_modules/hexo-cli": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-4.3.2.tgz",
-      "integrity": "sha512-druJeBgLpG9ncDS5AhBHdAXk0G4CFj8Qes09pApyZ6bR+nJW1JYiDMuilhudaKDdq+1l49jWXVTidkcb7p0Jbw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
+      "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "abbrev": "^2.0.0",
-        "bluebird": "^3.7.2",
-        "command-exists": "^1.2.9",
-        "hexo-fs": "^4.1.1",
-        "hexo-log": "^4.0.1",
-        "hexo-util": "^3.3.0",
-        "minimist": "^1.2.5",
-        "picocolors": "^1.0.0",
-        "resolve": "^1.20.0",
-        "tildify": "^2.0.0"
+        "abbrev": "^1.1.1",
+        "acorn": "^6.1.1",
+        "bluebird": "^3.5.3",
+        "chalk": "^2.4.2",
+        "command-exists": "^1.2.8",
+        "hexo-fs": "^1.0.2",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.3",
+        "minimist": "^1.2.0",
+        "resolve": "^1.10.0",
+        "tildify": "^1.2.0"
       },
       "bin": {
         "hexo": "bin/hexo"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+    "node_modules/hexo-cli/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=4"
       }
     },
     "node_modules/hexo-cli/node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
-    "node_modules/hexo-cli/node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+    "node_modules/hexo-cli/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo-cli/node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+    "node_modules/hexo-cli/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/hexo-cli/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "^1.2.7"
       }
     },
-    "node_modules/hexo-cli/node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+    "node_modules/hexo-cli/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/hexo-cli/node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "node_modules/hexo-cli/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo-cli/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo-cli/node_modules/hexo-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-4.1.3.tgz",
-      "integrity": "sha512-Q92zQ5PlVDouvSWFLXQoFSTLIUIODikUJs2BfAXQglyOEjN1dOQn1Z5Nimk/7GHof17R5h/uObCQLnZAjzI2tg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bluebird": "^3.7.2",
-        "chokidar": "^3.5.3",
-        "graceful-fs": "^4.2.10",
-        "hexo-util": "^3.0.1"
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
       },
       "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/hexo-log": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
-      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/hexo-util": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-3.3.0.tgz",
-      "integrity": "sha512-YvGngXijE2muEh5L/VI4Fmjqb+/yAkmY+VuyhWVoRwQu1X7bmWodsfYRXX7CUYhi5LqsvH8FAe/yBW1+f6ZX4Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "deepmerge": "^4.2.2",
-        "highlight.js": "^11.6.0",
-        "htmlparser2": "^9.0.0",
-        "prismjs": "^1.29.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/highlight.js": {
-      "version": "11.11.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
-      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/hexo-cli/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/hexo-cli/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+    "node_modules/hexo-cli/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "picomatch": "^2.2.1"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+    "node_modules/hexo-cli/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "shebang-regex": "^3.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/tildify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz",
-      "integrity": "sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
+        "node": ">=4"
       }
     },
     "node_modules/hexo-front-matter": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-4.2.1.tgz",
-      "integrity": "sha512-sJJI0GNmejYiwBvgnGRKn5V3sbODB4dNPr8jyw2Qp0PRHr4Uuyv8iyxw6WfK3+T7yvzYvJOh+tZ7jnwr2BYARA==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-0.2.3.tgz",
+      "integrity": "sha512-GL/pGfYqsvjMgxjhOWv1zAc7t4JoGUow+CH9Tes/5N2wKxxTzt2woKEMHz1+c01CmhdVYUR4lO3R1ZAcxc0caA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "js-yaml": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=14"
+        "js-yaml": "^3.6.1"
       }
     },
     "node_modules/hexo-fs": {
@@ -2147,17 +2877,94 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/hexo-i18n": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-2.0.0.tgz",
-      "integrity": "sha512-dkUXecEtChaQMdTHN4WR13c8GwKqjbSOZPJS9qDqV6Ebnb77Wa/nQzWFckhP0dCps3a9lUQBd8hYGOMbOosiQQ==",
+    "node_modules/hexo-fs/node_modules/anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "sprintf-js": "^1.1.2"
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^2.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-i18n": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
+      "integrity": "sha512-QhVmN/eLohu9UzvrX85zhfL7yN5O4MOkXKYmCRI8GPcg0EczX+blYYmMCugZKu/NIJ9XD5/etAVWCi/5F+fS6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
     "node_modules/hexo-inject": {
@@ -2467,27 +3274,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hexo-prism-plus/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -2554,15 +3340,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hexo-renderer-ejs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-1.0.0.tgz",
@@ -2729,383 +3506,412 @@
         "url-join": "^4.0.0"
       }
     },
-    "node_modules/hexo/node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/hexo/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
+      }
+    },
+    "node_modules/hexo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/hexo/node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
-    "node_modules/hexo/node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+    "node_modules/hexo/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo/node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+    "node_modules/hexo/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/hexo/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "^1.2.7"
       }
     },
-    "node_modules/hexo/node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+    "node_modules/hexo/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/hexo/node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "node_modules/hexo/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo/node_modules/hexo-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-4.1.3.tgz",
-      "integrity": "sha512-Q92zQ5PlVDouvSWFLXQoFSTLIUIODikUJs2BfAXQglyOEjN1dOQn1Z5Nimk/7GHof17R5h/uObCQLnZAjzI2tg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bluebird": "^3.7.2",
-        "chokidar": "^3.5.3",
-        "graceful-fs": "^4.2.10",
-        "hexo-util": "^3.0.1"
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
       },
       "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo/node_modules/hexo-log": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
-      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo/node_modules/hexo-util": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-3.3.0.tgz",
-      "integrity": "sha512-YvGngXijE2muEh5L/VI4Fmjqb+/yAkmY+VuyhWVoRwQu1X7bmWodsfYRXX7CUYhi5LqsvH8FAe/yBW1+f6ZX4Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "deepmerge": "^4.2.2",
-        "highlight.js": "^11.6.0",
-        "htmlparser2": "^9.0.0",
-        "prismjs": "^1.29.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo/node_modules/highlight.js": {
-      "version": "11.11.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
-      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo/node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/hexo/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/hexo/node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/hexo/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+    "node_modules/hexo/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "picomatch": "^2.2.1"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+    "node_modules/hexo/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/hexo/node_modules/tildify": {
+    "node_modules/hexo/node_modules/strip-indent": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz",
-      "integrity": "sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw==",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/hexo/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+    "node_modules/hexo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-number": "^7.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/hexo/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
+        "node": ">=4"
       }
     },
     "node_modules/highlight.js": {
@@ -3137,23 +3943,33 @@
       "dev": true
     },
     "node_modules/htmlparser2": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
-      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.1.0",
-        "entities": "^4.5.0"
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/http-errors": {
@@ -3309,6 +4125,7 @@
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3318,6 +4135,7 @@
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-primitive": "^2.0.0"
       },
@@ -3335,36 +4153,38 @@
       }
     },
     "node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^1.0.0"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.12.0"
       }
     },
     "node_modules/is-plain-object": {
@@ -3393,6 +4213,7 @@
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3402,6 +4223,7 @@
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3448,6 +4270,7 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isarray": "1.0.0"
       },
@@ -3469,31 +4292,19 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
       "bin": {
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/js-yaml-js-types": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-yaml-js-types/-/js-yaml-js-types-1.0.1.tgz",
-      "integrity": "sha512-5tpfyORs8OQ43alNERbWfYRCtWgykvzYgY46fUhrQi2+kS7N0NuuFYLZ/IrfmVm5muLTndeMublgraXiFRjEPw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esprima": "^4.0.1"
-      },
-      "peerDependencies": {
-        "js-yaml": "4.x"
-      }
-    },
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@@ -3561,6 +4372,23 @@
       ],
       "license": "MIT"
     },
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "license": "(MIT OR Apache-2.0)",
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -3599,6 +4427,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/less": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
@@ -3627,6 +4465,101 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "node_modules/lodash.assignin": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
+      "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.bind": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
+      "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.filter": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
+      "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.foreach": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
+      "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.map": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
+      "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
+      "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.reduce": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
+      "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.reject": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
+      "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.some": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -3676,6 +4609,21 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/markdown": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
+      "integrity": "sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==",
+      "dev": true,
+      "dependencies": {
+        "nopt": "~2.1.1"
+      },
+      "bin": {
+        "md2html": "bin/md2html.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/marked": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
@@ -3692,12 +4640,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true
-    },
-    "node_modules/micro-memoize": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/micro-memoize/-/micro-memoize-4.1.3.tgz",
-      "integrity": "sha512-DzRMi8smUZXT7rCGikRwldEh6eO6qzKiPPopcr1+2EY3AYKpy5fu159PKWwIS9A6IWnrvPKDMcuFtyrroZa8Bw==",
       "dev": true,
       "license": "MIT"
     },
@@ -3706,6 +4648,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-diff": "^2.0.0",
         "array-unique": "^0.2.1",
@@ -3725,6 +4668,57 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/micromatch/node_modules/braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -3772,7 +4766,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -3827,17 +4820,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/moize": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/moize/-/moize-6.1.6.tgz",
-      "integrity": "sha512-vSKdIUO61iCmTqhdoIDrqyrtp87nWZUmBPniNjO0fX49wEYmyDO4lvlnFXiGcaH1JLE/s/9HbiK4LSHsbiUY6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-equals": "^3.0.1",
-        "micro-memoize": "^4.1.2"
-      }
-    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -3986,18 +4968,46 @@
         "lower-case": "^1.1.1"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+    "node_modules/node-fingerprint": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/node-fingerprint/-/node-fingerprint-0.0.2.tgz",
+      "integrity": "sha512-vPFfTD5EBJieQ4SI3v61fWxlV1kav3m9Dbejd6CjWhOJn8s+XMxpOOosCNAyIrUQ/jJOlPndfrZ0lSw4+RgwcA==",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nopt": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
+      "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
+        "abbrev": "1"
       },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "~1.0.0"
+      }
+    },
     "node_modules/nunjucks": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
@@ -4104,6 +5114,7 @@
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
@@ -4176,6 +5187,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
+      "dev": true,
+      "license": "MIT/X11",
+      "dependencies": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      }
+    },
+    "node_modules/optimist/node_modules/minimist": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -4190,6 +5219,7 @@
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
@@ -4200,6 +5230,29 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/parse-glob/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-glob/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -4209,38 +5262,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/pascal-case/node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/pascal-case/node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -4287,19 +5308,14 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -4321,6 +5337,7 @@
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4334,16 +5351,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/prismjs": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
-      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -4395,6 +5402,7 @@
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
@@ -4409,6 +5417,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
       "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4418,6 +5427,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4726,6 +5736,7 @@
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-equal-shallow": "^0.1.3"
       },
@@ -4838,12 +5849,18 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/rfdc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+    "node_modules/right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "align-text": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/rimraf": {
       "version": "2.4.5",
@@ -5337,36 +6354,46 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/swig-extras": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
+      "integrity": "sha512-mFgpjjcQ0Kj+WplOrnWfUEw8iehZMD78sRId6uMXaTlWpy/vt8PTv3GoNsHrHBpZNnPnIsoWxrmRbS3vePjWpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "markdown": "~0.5.0"
+      }
+    },
+    "node_modules/swig-templates": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
+      "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
+      "deprecated": "unmaintained",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "optimist": "~0.6",
+        "uglify-js": "2.6.0"
+      },
+      "bin": {
+        "swig": "bin/swig.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
+      "license": "MIT"
     },
     "node_modules/tildify": {
       "version": "1.2.0",
@@ -5472,13 +6499,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD"
-    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -5499,6 +6519,32 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/uglify-js": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
+      "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "async": "~0.2.6",
+        "source-map": "~0.5.1",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.10.0"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/underscore": {
       "version": "1.13.6",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
@@ -5692,46 +6738,18 @@
       "optional": true
     },
     "node_modules/warehouse": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-5.0.1.tgz",
-      "integrity": "sha512-5BQEQP56bPY+cqocTho4syazuGgSoyKd0y3PsS2j8tGN10HH+CEfJSIY+KUw9D0k4jaVEFMXLz0KqCiUzTYb8A==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz",
+      "integrity": "sha512-axyo83DpdZabmCsiipkHYKnwl6ull2Vv7fqxMnV8KOQLdiJKffn9W+B3Yac7QVWzBE56Q6B6j2cIY1k2gc10PA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bluebird": "^3.7.2",
-        "cuid": "^2.1.8",
-        "graceful-fs": "^4.2.10",
-        "hexo-log": "^4.0.1",
-        "is-plain-object": "^5.0.0",
-        "jsonparse": "^1.3.1",
-        "rfdc": "^1.3.0",
-        "through2": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/warehouse/node_modules/hexo-log": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
-      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/warehouse/node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+        "bluebird": "^3.2.2",
+        "cuid": "~1.3.8",
+        "graceful-fs": "^4.1.3",
+        "is-plain-object": "^2.0.1",
+        "JSONStream": "^1.0.7",
+        "lodash": "^4.2.1"
       }
     },
     "node_modules/which": {
@@ -5746,6 +6764,25 @@
         "which": "bin/which"
       }
     },
+    "node_modules/window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -5758,6 +6795,19 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+      "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelcase": "^1.0.2",
+        "cliui": "^2.1.0",
+        "decamelize": "^1.0.0",
+        "window-size": "0.1.0"
+      }
     }
   }
 }
diff --git a/guide/package.json b/guide/package.json
index 29c05f07dd..cc6e1a248d 100644
--- a/guide/package.json
+++ b/guide/package.json
@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "chexo": "1.0.7",
-    "hexo": "7.3.0",
+    "hexo": "3.9.0",
     "hexo-prism-plus": "1.1.0",
     "hexo-renderer-ejs": "1.0.0",
     "hexo-renderer-less": "0.2.0",

From 000b4e525acf83dd5680e95f6044faafe4e78475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 28 Jan 2025 17:00:06 +0100
Subject: [PATCH 1004/1140] can update properly hexo

---
 guide/package-lock.json | 2830 +++++++++++++++++++++++++++------------
 guide/package.json      |    2 +-
 2 files changed, 1941 insertions(+), 891 deletions(-)

diff --git a/guide/package-lock.json b/guide/package-lock.json
index 3071e988f8..b9073abdc7 100644
--- a/guide/package-lock.json
+++ b/guide/package-lock.json
@@ -5,12 +5,13 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "meteor-guide",
       "version": "1.0.0",
       "devDependencies": {
         "@meteorjs/meteor-hexo-config": "1.0.14",
         "@meteorjs/meteor-theme-hexo": "2.0.8",
         "chexo": "1.0.7",
-        "hexo": "7.3.0",
+        "hexo": "3.9.0",
         "hexo-prism-plus": "1.1.0",
         "hexo-renderer-ejs": "1.0.0",
         "hexo-renderer-less": "0.2.0",
@@ -32,6 +33,397 @@
       "dev": true,
       "hasShrinkwrap": true
     },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "extraneous": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "extraneous": true,
+      "dependencies": {
+        "inherits": "~2.0.0"
+      },
+      "engines": {
+        "node": "0.4 || >=0.5.8"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "extraneous": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "extraneous": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "extraneous": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs-extra": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "extraneous": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "extraneous": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "extraneous": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "extraneous": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/interpret": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "extraneous": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "extraneous": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "extraneous": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "extraneous": true,
+      "dependencies": {
+        "minimist": "0.0.8"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "extraneous": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "extraneous": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/resolve": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
+      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+      "extraneous": true,
+      "dependencies": {
+        "path-parse": "^1.0.5"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "extraneous": true,
+      "dependencies": {
+        "glob": "^7.0.5"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/shelljs": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz",
+      "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==",
+      "extraneous": true,
+      "dependencies": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/simple-git": {
+      "version": "1.89.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz",
+      "integrity": "sha1-71L+c01QYFZs4Yeyu6zjbCMj40w=",
+      "extraneous": true,
+      "dependencies": {
+        "debug": "^3.1.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
+      "extraneous": true,
+      "dependencies": {
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tarball-extract": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tarball-extract/-/tarball-extract-0.0.6.tgz",
+      "integrity": "sha1-FQ5sAR3mdkeRn67CUDVhHGdh/RA=",
+      "extraneous": true,
+      "dependencies": {
+        "tar": "2.2.1",
+        "wget": "*"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "extraneous": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp-promise": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.4.tgz",
+      "integrity": "sha512-76r7LZhAvRJ3kLD/xrPSEGb3aq0tirzMLJKhcchKSkQIiEgXB+RouC0ygReuZX+oiA64taGo+j+1gHTKSG8/Mg==",
+      "extraneous": true,
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "tmp": "0.0.33"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tunnel": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz",
+      "integrity": "sha1-8jvNi3p7ioZCYbIIT2b5MZM5YzQ=",
+      "extraneous": true,
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "extraneous": true
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wget": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/wget/-/wget-0.0.1.tgz",
+      "integrity": "sha1-i7ga8LjmC13yYtPIHlc34fSTHlM=",
+      "extraneous": true,
+      "dependencies": {
+        "tunnel": "0.0.2"
+      },
+      "bin": {
+        "nwget": "bin/nwget.js"
+      },
+      "engines": {
+        "node": ">= 0.6.18"
+      }
+    },
+    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "extraneous": true
+    },
     "node_modules/a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
@@ -57,6 +449,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
@@ -68,6 +473,21 @@
         "json-stable-stringify": "^1.0.1"
       }
     },
+    "node_modules/align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -87,13 +507,19 @@
       }
     },
     "node_modules/anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
     "node_modules/archy": {
@@ -103,17 +529,28 @@
       "dev": true
     },
     "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "Python-2.0"
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/argparse/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-flatten": "^1.0.1"
       },
@@ -144,6 +581,7 @@
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -183,6 +621,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
+      "dev": true
+    },
     "node_modules/async-each": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
@@ -366,8 +810,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node_modules/base": {
       "version": "0.11.2",
@@ -468,6 +911,13 @@
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
@@ -487,26 +937,33 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
+        "fill-range": "^7.1.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
+    "node_modules/browser-fingerprint": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
+      "integrity": "sha512-b8SXP7yOlzLUJXF8WUvIjmbJzkJC0X6OHe7J9a/SHqEBC7a9Eglag6AANSTJz82h5U582kuxm/5TPudnD68EPA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -570,6 +1027,16 @@
         "upper-case": "^1.1.1"
       }
     },
+    "node_modules/camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -577,6 +1044,20 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
@@ -593,6 +1074,34 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/cheerio": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
+      "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.0",
+        "entities": "~1.1.1",
+        "htmlparser2": "^3.9.1",
+        "lodash.assignin": "^4.0.9",
+        "lodash.bind": "^4.1.4",
+        "lodash.defaults": "^4.0.1",
+        "lodash.filter": "^4.4.0",
+        "lodash.flatten": "^4.2.0",
+        "lodash.foreach": "^4.3.0",
+        "lodash.map": "^4.4.0",
+        "lodash.merge": "^4.4.0",
+        "lodash.pick": "^4.2.1",
+        "lodash.reduce": "^4.4.0",
+        "lodash.reject": "^4.4.0",
+        "lodash.some": "^4.4.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/chexo": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/chexo/-/chexo-1.0.7.tgz",
@@ -632,22 +1141,91 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       },
       "optionalDependencies": {
-        "fsevents": "^1.0.0"
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar/node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chokidar/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/chokidar/node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar/node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
       }
     },
     "node_modules/class-utils": {
@@ -686,6 +1264,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "center-align": "^0.1.1",
+        "right-align": "^0.1.1",
+        "wordwrap": "0.0.2"
+      }
+    },
+    "node_modules/cliui/node_modules/wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+      "dev": true,
+      "license": "MIT/X11",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -793,8 +1393,7 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "node_modules/connect": {
       "version": "3.7.0",
@@ -826,6 +1425,14 @@
       "integrity": "sha512-47n1NWwwc+qPmOMtY9zUKCM1cYfoxLvBRxKzirFrqhE61yqK+yZP/BOA3gjaBUVb9P46J1RyJjasrtqYoWCbvA==",
       "dev": true
     },
+    "node_modules/core-js": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+      "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -856,13 +1463,41 @@
         "node": ">=0.10.40"
       }
     },
+    "node_modules/css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==",
+      "dev": true,
+      "license": "BSD-like",
+      "dependencies": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/cuid": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz",
-      "integrity": "sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
+      "integrity": "sha512-MoL67ZZuBetDMxzrZtO+Iq1ATajFACQCP52QRinBgd3yTjYdv54mJO8ibUrh06fojKCoX5P2i7KkEatm4VTIOQ==",
       "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "browser-fingerprint": "0.0.1",
+        "core-js": "^1.1.1",
+        "node-fingerprint": "0.0.2"
+      }
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
@@ -896,6 +1531,16 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
@@ -905,16 +1550,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/define-data-property": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
@@ -995,62 +1630,41 @@
       }
     },
     "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
       }
     },
     "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
       "license": "BSD-2-Clause"
     },
     "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "domelementtype": "1"
       }
     },
     "node_modules/domutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+        "dom-serializer": "0",
+        "domelementtype": "1"
       }
     },
     "node_modules/ecc-jsbn": {
@@ -1090,17 +1704,11 @@
       }
     },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
+      "license": "BSD-2-Clause"
     },
     "node_modules/errno": {
       "version": "0.1.8",
@@ -1167,6 +1775,7 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-posix-bracket": "^0.1.0"
       },
@@ -1179,6 +1788,7 @@
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^2.1.0"
       },
@@ -1186,6 +1796,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/expand-range/node_modules/fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-range/node_modules/is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -1223,6 +1863,7 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^1.0.0"
       },
@@ -1230,6 +1871,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/extglob/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -1240,13 +1891,6 @@
       ],
       "optional": true
     },
-    "node_modules/fast-equals": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-3.0.3.tgz",
-      "integrity": "sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -1259,24 +1903,39 @@
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/fill-range/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
       }
     },
     "node_modules/finalhandler": {
@@ -1311,6 +1970,7 @@
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-in": "^1.0.1"
       },
@@ -1460,6 +2120,7 @@
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
@@ -1468,15 +2129,54 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-parent": {
+    "node_modules/glob-base/node_modules/glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^2.0.0"
       }
     },
+    "node_modules/glob-base/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-base/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
@@ -1692,46 +2392,45 @@
       }
     },
     "node_modules/hexo": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/hexo/-/hexo-7.3.0.tgz",
-      "integrity": "sha512-dOe8mzBKrvjubW5oBmyhcnQDpC+M2xmAMLae5K+o+SkHxyvAhShkS2VQZoTsOLIJKY6xilv7dzCjCvE7ol/NHQ==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.9.0.tgz",
+      "integrity": "sha512-uga6MsxGlD0AeafiObbFkQVWlUO+wWTb/IJVPI3fFpmAJu0PBD//Ek0qVOxHjlzdvFGeW0bYWYqXgDbR7suJng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "abbrev": "^2.0.0",
+        "abbrev": "^1.1.1",
         "archy": "^1.0.0",
-        "bluebird": "^3.7.2",
-        "hexo-cli": "^4.3.2",
-        "hexo-front-matter": "^4.2.1",
-        "hexo-fs": "^4.1.3",
-        "hexo-i18n": "^2.0.0",
-        "hexo-log": "^4.0.1",
-        "hexo-util": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "js-yaml-js-types": "^1.0.0",
-        "micromatch": "^4.0.4",
-        "moize": "^6.1.6",
-        "moment": "^2.29.1",
-        "moment-timezone": "^0.5.34",
-        "nunjucks": "^3.2.3",
-        "picocolors": "^1.0.0",
+        "bluebird": "^3.5.2",
+        "chalk": "^2.4.1",
+        "cheerio": "0.22.0",
+        "hexo-cli": "^2.0.0",
+        "hexo-front-matter": "^0.2.3",
+        "hexo-fs": "^1.0.0",
+        "hexo-i18n": "^0.2.1",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.3",
+        "js-yaml": "^3.12.0",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "moment": "^2.22.2",
+        "moment-timezone": "^0.5.21",
+        "nunjucks": "^3.1.3",
         "pretty-hrtime": "^1.0.3",
-        "resolve": "^1.22.0",
-        "strip-ansi": "^6.0.0",
+        "resolve": "^1.8.1",
+        "strip-ansi": "^5.0.0",
+        "strip-indent": "^2.0.0",
+        "swig-extras": "0.0.1",
+        "swig-templates": "^2.0.3",
         "text-table": "^0.2.0",
-        "tildify": "^2.0.0",
-        "titlecase": "^1.1.3",
-        "warehouse": "^5.0.1"
+        "tildify": "^1.2.0",
+        "titlecase": "^1.1.2",
+        "warehouse": "^2.2.0"
       },
       "bin": {
         "hexo": "bin/hexo"
       },
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/hexo"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/hexo-bunyan": {
@@ -1753,383 +2452,414 @@
       }
     },
     "node_modules/hexo-cli": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-4.3.2.tgz",
-      "integrity": "sha512-druJeBgLpG9ncDS5AhBHdAXk0G4CFj8Qes09pApyZ6bR+nJW1JYiDMuilhudaKDdq+1l49jWXVTidkcb7p0Jbw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
+      "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "abbrev": "^2.0.0",
-        "bluebird": "^3.7.2",
-        "command-exists": "^1.2.9",
-        "hexo-fs": "^4.1.1",
-        "hexo-log": "^4.0.1",
-        "hexo-util": "^3.3.0",
-        "minimist": "^1.2.5",
-        "picocolors": "^1.0.0",
-        "resolve": "^1.20.0",
-        "tildify": "^2.0.0"
+        "abbrev": "^1.1.1",
+        "acorn": "^6.1.1",
+        "bluebird": "^3.5.3",
+        "chalk": "^2.4.2",
+        "command-exists": "^1.2.8",
+        "hexo-fs": "^1.0.2",
+        "hexo-log": "^0.2.0",
+        "hexo-util": "^0.6.3",
+        "minimist": "^1.2.0",
+        "resolve": "^1.10.0",
+        "tildify": "^1.2.0"
       },
       "bin": {
         "hexo": "bin/hexo"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+    "node_modules/hexo-cli/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=4"
       }
     },
     "node_modules/hexo-cli/node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
-    "node_modules/hexo-cli/node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+    "node_modules/hexo-cli/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo-cli/node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+    "node_modules/hexo-cli/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/hexo-cli/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "^1.2.7"
       }
     },
-    "node_modules/hexo-cli/node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+    "node_modules/hexo-cli/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/hexo-cli/node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "node_modules/hexo-cli/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo-cli/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo-cli/node_modules/hexo-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-4.1.3.tgz",
-      "integrity": "sha512-Q92zQ5PlVDouvSWFLXQoFSTLIUIODikUJs2BfAXQglyOEjN1dOQn1Z5Nimk/7GHof17R5h/uObCQLnZAjzI2tg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bluebird": "^3.7.2",
-        "chokidar": "^3.5.3",
-        "graceful-fs": "^4.2.10",
-        "hexo-util": "^3.0.1"
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
       },
       "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/hexo-log": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
-      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/hexo-util": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-3.3.0.tgz",
-      "integrity": "sha512-YvGngXijE2muEh5L/VI4Fmjqb+/yAkmY+VuyhWVoRwQu1X7bmWodsfYRXX7CUYhi5LqsvH8FAe/yBW1+f6ZX4Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "deepmerge": "^4.2.2",
-        "highlight.js": "^11.6.0",
-        "htmlparser2": "^9.0.0",
-        "prismjs": "^1.29.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/highlight.js": {
-      "version": "11.11.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
-      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/hexo-cli/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/hexo-cli/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+    "node_modules/hexo-cli/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "picomatch": "^2.2.1"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-cli/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+    "node_modules/hexo-cli/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-cli/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "shebang-regex": "^3.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/tildify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz",
-      "integrity": "sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
+        "node": ">=4"
       }
     },
     "node_modules/hexo-front-matter": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-4.2.1.tgz",
-      "integrity": "sha512-sJJI0GNmejYiwBvgnGRKn5V3sbODB4dNPr8jyw2Qp0PRHr4Uuyv8iyxw6WfK3+T7yvzYvJOh+tZ7jnwr2BYARA==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-0.2.3.tgz",
+      "integrity": "sha512-GL/pGfYqsvjMgxjhOWv1zAc7t4JoGUow+CH9Tes/5N2wKxxTzt2woKEMHz1+c01CmhdVYUR4lO3R1ZAcxc0caA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "js-yaml": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=14"
+        "js-yaml": "^3.6.1"
       }
     },
     "node_modules/hexo-fs": {
@@ -2147,17 +2877,94 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/hexo-i18n": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-2.0.0.tgz",
-      "integrity": "sha512-dkUXecEtChaQMdTHN4WR13c8GwKqjbSOZPJS9qDqV6Ebnb77Wa/nQzWFckhP0dCps3a9lUQBd8hYGOMbOosiQQ==",
+    "node_modules/hexo-fs/node_modules/anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "sprintf-js": "^1.1.2"
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^2.0.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-fs/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo-i18n": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
+      "integrity": "sha512-QhVmN/eLohu9UzvrX85zhfL7yN5O4MOkXKYmCRI8GPcg0EczX+blYYmMCugZKu/NIJ9XD5/etAVWCi/5F+fS6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
     "node_modules/hexo-inject": {
@@ -2467,27 +3274,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hexo-prism-plus/node_modules/is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -2554,15 +3340,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/hexo-renderer-ejs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-1.0.0.tgz",
@@ -2729,383 +3506,412 @@
         "url-join": "^4.0.0"
       }
     },
-    "node_modules/hexo/node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/hexo/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
+      }
+    },
+    "node_modules/hexo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/hexo/node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
-    "node_modules/hexo/node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+    "node_modules/hexo/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo/node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+    "node_modules/hexo/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/hexo/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "^1.2.7"
       }
     },
-    "node_modules/hexo/node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+    "node_modules/hexo/node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hexo/node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/hexo/node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "node_modules/hexo/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/hexo/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo/node_modules/hexo-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-4.1.3.tgz",
-      "integrity": "sha512-Q92zQ5PlVDouvSWFLXQoFSTLIUIODikUJs2BfAXQglyOEjN1dOQn1Z5Nimk/7GHof17R5h/uObCQLnZAjzI2tg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bluebird": "^3.7.2",
-        "chokidar": "^3.5.3",
-        "graceful-fs": "^4.2.10",
-        "hexo-util": "^3.0.1"
+        "bluebird": "^3.5.1",
+        "chokidar": "^2.0.4",
+        "escape-string-regexp": "^1.0.5",
+        "graceful-fs": "^4.1.11"
       },
       "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo/node_modules/hexo-log": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
-      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo/node_modules/hexo-util": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-3.3.0.tgz",
-      "integrity": "sha512-YvGngXijE2muEh5L/VI4Fmjqb+/yAkmY+VuyhWVoRwQu1X7bmWodsfYRXX7CUYhi5LqsvH8FAe/yBW1+f6ZX4Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "deepmerge": "^4.2.2",
-        "highlight.js": "^11.6.0",
-        "htmlparser2": "^9.0.0",
-        "prismjs": "^1.29.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/hexo/node_modules/highlight.js": {
-      "version": "11.11.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
-      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo/node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/hexo/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/hexo/node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/hexo/node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+    "node_modules/hexo/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "picomatch": "^2.2.1"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hexo/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+    "node_modules/hexo/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/hexo/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/hexo/node_modules/tildify": {
+    "node_modules/hexo/node_modules/strip-indent": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tildify/-/tildify-2.0.0.tgz",
-      "integrity": "sha512-Cc+OraorugtXNfs50hU9KS369rFXCfgGLpfCfvlc+Ud5u6VWmUQsOAa9HbTvheQdYnrdJqqv1e5oIqXppMYnSw==",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/hexo/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+    "node_modules/hexo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-number": "^7.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/hexo/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
+        "node": ">=4"
       }
     },
     "node_modules/highlight.js": {
@@ -3137,23 +3943,33 @@
       "dev": true
     },
     "node_modules/htmlparser2": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
-      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.1.0",
-        "entities": "^4.5.0"
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/http-errors": {
@@ -3309,6 +4125,7 @@
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3318,6 +4135,7 @@
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-primitive": "^2.0.0"
       },
@@ -3335,36 +4153,38 @@
       }
     },
     "node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^1.0.0"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.12.0"
       }
     },
     "node_modules/is-plain-object": {
@@ -3393,6 +4213,7 @@
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3402,6 +4223,7 @@
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3448,6 +4270,7 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isarray": "1.0.0"
       },
@@ -3469,31 +4292,19 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
       "bin": {
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/js-yaml-js-types": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-yaml-js-types/-/js-yaml-js-types-1.0.1.tgz",
-      "integrity": "sha512-5tpfyORs8OQ43alNERbWfYRCtWgykvzYgY46fUhrQi2+kS7N0NuuFYLZ/IrfmVm5muLTndeMublgraXiFRjEPw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esprima": "^4.0.1"
-      },
-      "peerDependencies": {
-        "js-yaml": "4.x"
-      }
-    },
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@@ -3561,6 +4372,23 @@
       ],
       "license": "MIT"
     },
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "license": "(MIT OR Apache-2.0)",
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -3599,6 +4427,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/less": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
@@ -3627,6 +4465,101 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "node_modules/lodash.assignin": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
+      "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.bind": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
+      "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.filter": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
+      "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.foreach": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
+      "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.map": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
+      "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
+      "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.reduce": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
+      "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.reject": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
+      "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.some": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -3676,6 +4609,21 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/markdown": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
+      "integrity": "sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==",
+      "dev": true,
+      "dependencies": {
+        "nopt": "~2.1.1"
+      },
+      "bin": {
+        "md2html": "bin/md2html.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/marked": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
@@ -3692,12 +4640,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true
-    },
-    "node_modules/micro-memoize": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/micro-memoize/-/micro-memoize-4.1.3.tgz",
-      "integrity": "sha512-DzRMi8smUZXT7rCGikRwldEh6eO6qzKiPPopcr1+2EY3AYKpy5fu159PKWwIS9A6IWnrvPKDMcuFtyrroZa8Bw==",
       "dev": true,
       "license": "MIT"
     },
@@ -3706,6 +4648,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-diff": "^2.0.0",
         "array-unique": "^0.2.1",
@@ -3725,6 +4668,57 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/micromatch/node_modules/braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/micromatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -3772,7 +4766,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -3827,17 +4820,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/moize": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/moize/-/moize-6.1.6.tgz",
-      "integrity": "sha512-vSKdIUO61iCmTqhdoIDrqyrtp87nWZUmBPniNjO0fX49wEYmyDO4lvlnFXiGcaH1JLE/s/9HbiK4LSHsbiUY6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-equals": "^3.0.1",
-        "micro-memoize": "^4.1.2"
-      }
-    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -3986,18 +4968,46 @@
         "lower-case": "^1.1.1"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+    "node_modules/node-fingerprint": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/node-fingerprint/-/node-fingerprint-0.0.2.tgz",
+      "integrity": "sha512-vPFfTD5EBJieQ4SI3v61fWxlV1kav3m9Dbejd6CjWhOJn8s+XMxpOOosCNAyIrUQ/jJOlPndfrZ0lSw4+RgwcA==",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nopt": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
+      "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
+        "abbrev": "1"
       },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "~1.0.0"
+      }
+    },
     "node_modules/nunjucks": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
@@ -4104,6 +5114,7 @@
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
@@ -4176,6 +5187,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
+      "dev": true,
+      "license": "MIT/X11",
+      "dependencies": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      }
+    },
+    "node_modules/optimist/node_modules/minimist": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -4190,6 +5219,7 @@
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
@@ -4200,6 +5230,29 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/parse-glob/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-glob/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -4209,38 +5262,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/pascal-case/node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/pascal-case/node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -4287,19 +5308,14 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -4321,6 +5337,7 @@
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4334,16 +5351,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/prismjs": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
-      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -4395,6 +5402,7 @@
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
@@ -4409,6 +5417,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
       "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4418,6 +5427,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4726,6 +5736,7 @@
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-equal-shallow": "^0.1.3"
       },
@@ -4838,12 +5849,18 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/rfdc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+    "node_modules/right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "align-text": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/rimraf": {
       "version": "2.4.5",
@@ -5337,36 +6354,46 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/swig-extras": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
+      "integrity": "sha512-mFgpjjcQ0Kj+WplOrnWfUEw8iehZMD78sRId6uMXaTlWpy/vt8PTv3GoNsHrHBpZNnPnIsoWxrmRbS3vePjWpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "markdown": "~0.5.0"
+      }
+    },
+    "node_modules/swig-templates": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
+      "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
+      "deprecated": "unmaintained",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "optimist": "~0.6",
+        "uglify-js": "2.6.0"
+      },
+      "bin": {
+        "swig": "bin/swig.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
+      "license": "MIT"
     },
     "node_modules/tildify": {
       "version": "1.2.0",
@@ -5472,13 +6499,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD"
-    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -5499,6 +6519,32 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/uglify-js": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
+      "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "async": "~0.2.6",
+        "source-map": "~0.5.1",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.10.0"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/underscore": {
       "version": "1.13.6",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
@@ -5692,46 +6738,18 @@
       "optional": true
     },
     "node_modules/warehouse": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-5.0.1.tgz",
-      "integrity": "sha512-5BQEQP56bPY+cqocTho4syazuGgSoyKd0y3PsS2j8tGN10HH+CEfJSIY+KUw9D0k4jaVEFMXLz0KqCiUzTYb8A==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz",
+      "integrity": "sha512-axyo83DpdZabmCsiipkHYKnwl6ull2Vv7fqxMnV8KOQLdiJKffn9W+B3Yac7QVWzBE56Q6B6j2cIY1k2gc10PA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bluebird": "^3.7.2",
-        "cuid": "^2.1.8",
-        "graceful-fs": "^4.2.10",
-        "hexo-log": "^4.0.1",
-        "is-plain-object": "^5.0.0",
-        "jsonparse": "^1.3.1",
-        "rfdc": "^1.3.0",
-        "through2": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/warehouse/node_modules/hexo-log": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-4.1.0.tgz",
-      "integrity": "sha512-i2Sgxk8Cgx5viSjq5qW5N/rBFfwoCKQcH8qnnW1fawCapcdEAhIsq+Y3vbrs9bssyDlyU6Vqm4oQmosREaNI7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/warehouse/node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+        "bluebird": "^3.2.2",
+        "cuid": "~1.3.8",
+        "graceful-fs": "^4.1.3",
+        "is-plain-object": "^2.0.1",
+        "JSONStream": "^1.0.7",
+        "lodash": "^4.2.1"
       }
     },
     "node_modules/which": {
@@ -5746,6 +6764,25 @@
         "which": "bin/which"
       }
     },
+    "node_modules/window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -5758,6 +6795,19 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+      "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelcase": "^1.0.2",
+        "cliui": "^2.1.0",
+        "decamelize": "^1.0.0",
+        "window-size": "0.1.0"
+      }
     }
   }
 }
diff --git a/guide/package.json b/guide/package.json
index 29c05f07dd..cc6e1a248d 100644
--- a/guide/package.json
+++ b/guide/package.json
@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "chexo": "1.0.7",
-    "hexo": "7.3.0",
+    "hexo": "3.9.0",
     "hexo-prism-plus": "1.1.0",
     "hexo-renderer-ejs": "1.0.0",
     "hexo-renderer-less": "0.2.0",

From ef2ba0b42f76cf2e0c00bcf7f707c19f07c147fa Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 28 Jan 2025 20:38:24 +0100
Subject: [PATCH 1005/1140] Update useragent-ng to v2.4.4, fix #13539

---
 packages/webapp/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 615b57d5b2..43fc103fa4 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -13,7 +13,7 @@ Npm.depends({
   send: "1.1.0",
   "stream-to-string": "1.2.1",
   qs: "6.13.0",
-  "useragent-ng": "2.4.3",
+  "useragent-ng": "2.4.4",
   "tmp": "0.2.3",
 });
 

From bd0fe29393a61e2ce638e28565ac25043c8fbc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 29 Jan 2025 15:34:14 +0100
Subject: [PATCH 1006/1140] properly update docs and guides locked deps

---
 docs/package-lock.json  | 6811 ++++++++++++++-------------------------
 guide/package-lock.json | 6786 ++++++++++++++------------------------
 2 files changed, 4859 insertions(+), 8738 deletions(-)

diff --git a/docs/package-lock.json b/docs/package-lock.json
index dcb1a8aab4..d9945d9314 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1,807 +1,336 @@
 {
   "name": "hexo-site",
   "version": "0.0.0",
-  "lockfileVersion": 3,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "hexo-site",
-      "version": "0.0.0",
-      "devDependencies": {
-        "@meteorjs/meteor-hexo-config": "1.0.14",
-        "@meteorjs/meteor-theme-hexo": "2.0.8",
-        "canonical-json": "0.0.4",
-        "chexo": "1.0.7",
-        "handlebars": "4.7.7",
-        "hexo": "3.9.0",
-        "hexo-prism-plus": "1.1.0",
-        "hexo-renderer-ejs": "2.0.0",
-        "hexo-renderer-less": "0.2.0",
-        "hexo-renderer-marked": "2.0.0",
-        "hexo-server": "1.0.0",
-        "hexo-versioned-netlify-redirects": "1.1.0",
-        "jsdoc": "^4.0.2",
-        "showdown": "1.9.1",
-        "underscore": "1.13.1"
-      }
-    },
-    "node_modules/@babel/parser": {
+  "dependencies": {
+    "@babel/parser": {
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
       "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
+      "dev": true
     },
-    "node_modules/@jsdoc/salty": {
+    "@jsdoc/salty": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.6.tgz",
       "integrity": "sha512-aA+awb5yoml8TQ3CzI5Ue7sM3VMRC4l1zJJW4fgZ8OCL1wshJZhNzaf0PL85DSnOUw6QuFgeHGD/eq/xwwAF2g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lodash": "^4.17.21"
-      },
-      "engines": {
-        "node": ">=v12.0.0"
       }
     },
-    "node_modules/@meteorjs/meteor-hexo-config": {
+    "@meteorjs/meteor-hexo-config": {
       "version": "1.0.14",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-hexo-config/-/meteor-hexo-config-1.0.14.tgz",
       "integrity": "sha512-Vl4cEMEoVw2JV8qTBsqaq+YL7MRHasTtE88WJa5BGBYMfN35Yk0yeYwVc2OTFJ/cGiQcPEaC0RvRKVyNJfwIGQ==",
       "dev": true
     },
-    "node_modules/@meteorjs/meteor-theme-hexo": {
+    "@meteorjs/meteor-theme-hexo": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-theme-hexo/-/meteor-theme-hexo-2.0.8.tgz",
       "integrity": "sha512-LQIFN05wBMjX7SXgW5CFVTfolDWMuknoypwQ0czl/44LYRBR4/LYZUgX6c+1vLjloJb+5+2HTvMGlVN9Wo1MKA==",
-      "dev": true,
-      "hasShrinkwrap": true
+      "dev": true
     },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-      "extraneous": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "extraneous": true,
-      "dependencies": {
-        "inherits": "~2.0.0"
-      },
-      "engines": {
-        "node": "0.4 || >=0.5.8"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "extraneous": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "extraneous": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-      "extraneous": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-      "extraneous": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "extraneous": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "extraneous": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "extraneous": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/interpret": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-      "extraneous": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "extraneous": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "extraneous": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "extraneous": true,
-      "dependencies": {
-        "minimist": "0.0.8"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "extraneous": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "extraneous": true,
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/resolve": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-      "extraneous": true,
-      "dependencies": {
-        "path-parse": "^1.0.5"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "extraneous": true,
-      "dependencies": {
-        "glob": "^7.0.5"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/shelljs": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz",
-      "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==",
-      "extraneous": true,
-      "dependencies": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      },
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/simple-git": {
-      "version": "1.89.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz",
-      "integrity": "sha1-71L+c01QYFZs4Yeyu6zjbCMj40w=",
-      "extraneous": true,
-      "dependencies": {
-        "debug": "^3.1.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
-      "extraneous": true,
-      "dependencies": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tarball-extract": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tarball-extract/-/tarball-extract-0.0.6.tgz",
-      "integrity": "sha1-FQ5sAR3mdkeRn67CUDVhHGdh/RA=",
-      "extraneous": true,
-      "dependencies": {
-        "tar": "2.2.1",
-        "wget": "*"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "extraneous": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp-promise": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.4.tgz",
-      "integrity": "sha512-76r7LZhAvRJ3kLD/xrPSEGb3aq0tirzMLJKhcchKSkQIiEgXB+RouC0ygReuZX+oiA64taGo+j+1gHTKSG8/Mg==",
-      "extraneous": true,
-      "dependencies": {
-        "bluebird": "^3.5.0",
-        "tmp": "0.0.33"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tunnel": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz",
-      "integrity": "sha1-8jvNi3p7ioZCYbIIT2b5MZM5YzQ=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wget": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/wget/-/wget-0.0.1.tgz",
-      "integrity": "sha1-i7ga8LjmC13yYtPIHlc34fSTHlM=",
-      "extraneous": true,
-      "dependencies": {
-        "tunnel": "0.0.2"
-      },
-      "bin": {
-        "nwget": "bin/nwget.js"
-      },
-      "engines": {
-        "node": ">= 0.6.18"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "extraneous": true
-    },
-    "node_modules/@types/linkify-it": {
+    "@types/linkify-it": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
       "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
       "dev": true
     },
-    "node_modules/@types/markdown-it": {
+    "@types/markdown-it": {
       "version": "12.2.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
       "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "@types/linkify-it": "*",
         "@types/mdurl": "*"
       }
     },
-    "node_modules/@types/mdurl": {
+    "@types/mdurl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
       "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
       "dev": true
     },
-    "node_modules/a-sync-waterfall": {
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
+    "a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
       "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
       "dev": true
     },
-    "node_modules/abbrev": {
+    "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
-    "node_modules/accepts": {
+    "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/acorn": {
+    "acorn": {
       "version": "6.4.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
       "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "dev": true
     },
-    "node_modules/ajv": {
+    "ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "co": "^4.6.0",
         "json-stable-stringify": "^1.0.1"
       }
     },
-    "node_modules/align-text": {
+    "align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
       "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.0.2",
         "longest": "^1.0.1",
         "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/ansi-regex": {
+    "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/ansi-styles": {
+    "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
       }
     },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/archy": {
+    "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
-    "node_modules/argparse": {
+    "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/arr-diff": {
+    "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "arr-flatten": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/arr-flatten": {
+    "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/arr-union": {
+    "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/array-unique": {
+    "array-unique": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/asap": {
+    "asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "dev": true
     },
-    "node_modules/asn1": {
+    "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "safer-buffer": "~2.1.0"
       }
     },
-    "node_modules/assert-plus": {
+    "assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
       "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
+      "optional": true
     },
-    "node_modules/assign-symbols": {
+    "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/async": {
+    "async": {
       "version": "0.2.10",
       "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
       "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
       "dev": true
     },
-    "node_modules/async-each": {
+    "async-each": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
       "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ]
+      "dev": true
     },
-    "node_modules/asynckit": {
+    "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true,
       "optional": true
     },
-    "node_modules/atob": {
+    "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
+      "dev": true
     },
-    "node_modules/aws-sign2": {
+    "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
       "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/aws4": {
+    "aws4": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/babel-code-frame": {
+    "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
       }
     },
-    "node_modules/babel-messages": {
+    "babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.22.0"
       }
     },
-    "node_modules/babel-plugin-syntax-decorators": {
+    "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha512-AWj19x2aDm8qFQ5O2JcD6pwJDW1YdcnO+1b81t7gxrGjz5VHiUqeYWAR4h7zueWMalRelrQDXprv2FrY1dbpbw==",
       "dev": true
     },
-    "node_modules/babel-plugin-transform-decorators-legacy": {
+    "babel-plugin-transform-decorators-legacy": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz",
       "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-plugin-syntax-decorators": "^6.1.18",
         "babel-runtime": "^6.2.0",
         "babel-template": "^6.3.0"
       }
     },
-    "node_modules/babel-polyfill": {
+    "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
         "regenerator-runtime": "^0.10.5"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        },
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/babel-polyfill/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
-      "dev": true
-    },
-    "node_modules/babel-runtime": {
+    "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/babel-template": {
+    "babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
         "babel-types": "^6.26.0",
@@ -809,12 +338,12 @@
         "lodash": "^4.17.4"
       }
     },
-    "node_modules/babel-traverse": {
+    "babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
         "babel-runtime": "^6.26.0",
@@ -826,39 +355,36 @@
         "lodash": "^4.17.4"
       }
     },
-    "node_modules/babel-types": {
+    "babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
         "lodash": "^4.17.4",
         "to-fast-properties": "^1.0.3"
       }
     },
-    "node_modules/babylon": {
+    "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true,
-      "bin": {
-        "babylon": "bin/babylon.js"
-      }
+      "dev": true
     },
-    "node_modules/balanced-match": {
+    "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "node_modules/base": {
+    "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
         "component-emitter": "^1.2.1",
@@ -867,157 +393,130 @@
         "mixin-deep": "^1.2.0",
         "pascalcase": "^0.1.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/basic-auth": {
+    "basic-auth": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
       "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/bcrypt-pbkdf": {
+    "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "tweetnacl": "^0.14.3"
       }
     },
-    "node_modules/binary-extensions": {
+    "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/bindings": {
+    "bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/bluebird": {
+    "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "node_modules/boolbase": {
+    "boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
-    "node_modules/boom": {
+    "boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "hoek": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.40"
       }
     },
-    "node_modules/brace-expansion": {
+    "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
       }
     },
-    "node_modules/browser-fingerprint": {
+    "browser-fingerprint": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
       "integrity": "sha512-b8SXP7yOlzLUJXF8WUvIjmbJzkJC0X6OHe7J9a/SHqEBC7a9Eglag6AANSTJz82h5U582kuxm/5TPudnD68EPA==",
       "dev": true
     },
-    "node_modules/bytes": {
+    "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/cache-base": {
+    "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
         "get-value": "^2.0.6",
@@ -1028,118 +527,96 @@
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/cache-base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/call-bind": {
+    "call-bind": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
       "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
         "set-function-length": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/camel-case": {
+    "camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
       "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "no-case": "^2.2.0",
         "upper-case": "^1.1.1"
       }
     },
-    "node_modules/camelcase": {
+    "camelcase": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
       "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/canonical-json": {
+    "canonical-json": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/canonical-json/-/canonical-json-0.0.4.tgz",
       "integrity": "sha512-2sW7x0m/P7dqEnO0O87U7RTVQAaa7MELcd+Jd9FA6CYgYtwJ1TlDWIYMD8nuMkH1KoThsJogqgLyklrt9d/Azw==",
       "dev": true
     },
-    "node_modules/caseless": {
+    "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/catharsis": {
+    "catharsis": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
       "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lodash": "^4.17.15"
-      },
-      "engines": {
-        "node": ">= 10"
       }
     },
-    "node_modules/center-align": {
+    "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "align-text": "^0.1.3",
         "lazy-cache": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/chalk": {
+    "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
         "has-ansi": "^2.0.0",
         "strip-ansi": "^3.0.0",
         "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/cheerio": {
+    "cheerio": {
       "version": "0.22.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
       "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "css-select": "~1.2.0",
         "dom-serializer": "~0.1.0",
         "entities": "~1.1.1",
@@ -1156,287 +633,179 @@
         "lodash.reduce": "^4.4.0",
         "lodash.reject": "^4.4.0",
         "lodash.some": "^4.4.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/chexo": {
+    "chexo": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/chexo/-/chexo-1.0.7.tgz",
       "integrity": "sha512-7ScGKzHsZDLpCZhzIypwbK+hkx1fkWZjeLemEkmnreThGLNWhLRDC4gJ/Wu04jAbH0zYR/ev0QPAACEnaYXrcA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hexo-cli": "^1.1.0",
         "minimist": "^1.2.0"
       },
-      "bin": {
-        "chexo": "bin/chexo"
-      },
-      "peerDependencies": {
-        "hexo": ">= 3.3.0 < 4"
-      }
-    },
-    "node_modules/chexo/node_modules/hexo-cli": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
-      "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
-      "dev": true,
       "dependencies": {
-        "abbrev": "^1.0.7",
-        "bluebird": "^3.4.0",
-        "chalk": "^1.1.3",
-        "command-exists": "^1.2.0",
-        "hexo-fs": "^0.2.0",
-        "hexo-log": "^0.2.0",
-        "hexo-util": "^0.6.0",
-        "minimist": "^1.2.0",
-        "object-assign": "^4.1.0",
-        "resolve": "^1.5.0",
-        "tildify": "^1.2.0"
-      },
-      "bin": {
-        "hexo": "bin/hexo"
+        "hexo-cli": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
+          "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
+          "dev": true,
+          "requires": {
+            "abbrev": "^1.0.7",
+            "bluebird": "^3.4.0",
+            "chalk": "^1.1.3",
+            "command-exists": "^1.2.0",
+            "hexo-fs": "^0.2.0",
+            "hexo-log": "^0.2.0",
+            "hexo-util": "^0.6.0",
+            "minimist": "^1.2.0",
+            "object-assign": "^4.1.0",
+            "resolve": "^1.5.0",
+            "tildify": "^1.2.0"
+          }
+        }
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+      "requires": {
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "fsevents": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
       }
     },
-    "node_modules/chokidar/node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/chokidar/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true,
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chokidar/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/class-utils": {
+    "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
         "isobject": "^3.0.0",
         "static-extend": "^0.1.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/class-utils/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cliui": {
+    "cliui": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
       "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "center-align": "^0.1.1",
         "right-align": "^0.1.1",
         "wordwrap": "0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+          "dev": true
+        }
       }
     },
-    "node_modules/cliui/node_modules/wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/co": {
+    "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
+      "optional": true
     },
-    "node_modules/collection-visit": {
+    "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/color-convert": {
+    "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "color-name": "1.1.3"
       }
     },
-    "node_modules/color-name": {
+    "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
-    "node_modules/combined-stream": {
+    "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/command-exists": {
+    "command-exists": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
       "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
       "dev": true
     },
-    "node_modules/commander": {
+    "commander": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
       "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
+      "dev": true
     },
-    "node_modules/component-emitter": {
+    "component-emitter": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "dev": true
     },
-    "node_modules/compressible": {
+    "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/compression": {
+    "compression": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
         "compressible": "~2.0.16",
@@ -1444,629 +813,457 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/concat-map": {
+    "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "node_modules/connect": {
+    "connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
       }
     },
-    "node_modules/copy-descriptor": {
+    "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/core-decorators": {
+    "core-decorators": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/core-decorators/-/core-decorators-0.11.2.tgz",
       "integrity": "sha512-47n1NWwwc+qPmOMtY9zUKCM1cYfoxLvBRxKzirFrqhE61yqK+yZP/BOA3gjaBUVb9P46J1RyJjasrtqYoWCbvA==",
       "dev": true
     },
-    "node_modules/core-js": {
+    "core-js": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
       "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
       "dev": true
     },
-    "node_modules/core-util-is": {
+    "core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
-    "node_modules/cross-spawn": {
+    "cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
       "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lru-cache": "^4.0.1",
         "which": "^1.2.9"
       }
     },
-    "node_modules/cryptiles": {
+    "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "boom": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.40"
       }
     },
-    "node_modules/css-select": {
+    "css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
       "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "boolbase": "~1.0.0",
         "css-what": "2.1",
         "domutils": "1.5.1",
         "nth-check": "~1.0.1"
       }
     },
-    "node_modules/css-what": {
+    "css-what": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
       "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/cuid": {
+    "cuid": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
       "integrity": "sha512-MoL67ZZuBetDMxzrZtO+Iq1ATajFACQCP52QRinBgd3yTjYdv54mJO8ibUrh06fojKCoX5P2i7KkEatm4VTIOQ==",
-      "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "browser-fingerprint": "0.0.1",
         "core-js": "^1.1.1",
         "node-fingerprint": "0.0.2"
       }
     },
-    "node_modules/dashdash": {
+    "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/dashdash/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/debug": {
+    "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ms": "2.0.0"
       }
     },
-    "node_modules/decamelize": {
+    "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/decode-uri-component": {
+    "decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
+      "dev": true
     },
-    "node_modules/define-data-property": {
+    "define-data-property": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
         "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/define-property": {
+    "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/define-property/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
+    "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "optional": true
     },
-    "node_modules/depd": {
+    "depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/destroy": {
+    "destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
+      "dev": true
     },
-    "node_modules/dom-serializer": {
+    "dom-serializer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
       "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "domelementtype": "^1.3.0",
         "entities": "^1.1.1"
       }
     },
-    "node_modules/domelementtype": {
+    "domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
-    "node_modules/domhandler": {
+    "domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "domelementtype": "1"
       }
     },
-    "node_modules/domutils": {
+    "domutils": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "dom-serializer": "0",
         "domelementtype": "1"
       }
     },
-    "node_modules/ecc-jsbn": {
+    "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
-    "node_modules/ee-first": {
+    "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
-    "node_modules/ejs": {
+    "ejs": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
       "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
+      "requires": {
         "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/emoji-regex": {
+    "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
-    "node_modules/encodeurl": {
+    "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/entities": {
+    "entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
-    "node_modules/errno": {
+    "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
       }
     },
-    "node_modules/es-define-property": {
+    "es-define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
       "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/es-errors": {
+    "es-errors": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
+      "optional": true
     },
-    "node_modules/escape-html": {
+    "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
-    "node_modules/escape-string-regexp": {
+    "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/esprima": {
+    "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/esutils": {
+    "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/etag": {
+    "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/expand-brackets": {
+    "expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-posix-bracket": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-range": {
+    "expand-range": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "fill-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-range/node_modules/fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-range/node_modules/is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend": {
+    "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true,
       "optional": true
     },
-    "node_modules/extend-shallow": {
+    "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
-    "node_modules/extglob": {
+    "extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/extglob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extsprintf": {
+    "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
       "optional": true
     },
-    "node_modules/file-uri-to-path": {
+    "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/filelist": {
+    "filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
       "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
+      "requires": {
         "minimatch": "^5.0.1"
-      }
-    },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
       },
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
       }
     },
-    "node_modules/filename-regex": {
+    "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fill-range/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/finalhandler": {
+    "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
       "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -2074,508 +1271,349 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/find-up": {
+    "find-up": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
       }
     },
-    "node_modules/for-in": {
+    "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/for-own": {
+    "for-own": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/forever-agent": {
+    "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/form-data": {
+    "form-data": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.5",
         "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
       }
     },
-    "node_modules/fragment-cache": {
+    "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/fresh": {
+    "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/fsevents": {
+    "fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "dev": true,
-      "hasInstallScript": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
+      "requires": {
         "bindings": "^1.5.0",
         "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
       }
     },
-    "node_modules/function-bind": {
+    "function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/get-caller-file": {
+    "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
+      "dev": true
     },
-    "node_modules/get-intrinsic": {
+    "get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
       "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-value": {
+    "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/getpass": {
+    "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/getpass/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/glob": {
+    "glob": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
       "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "inflight": "^1.0.4",
         "inherits": "2",
         "minimatch": "2 || 3",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/glob-base": {
+    "glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-base/node_modules/glob-parent": {
+    "glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
+      "requires": {
         "is-glob": "^2.0.0"
       }
     },
-    "node_modules/glob-base/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globals": {
+    "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
       "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/gopd": {
+    "gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/graceful-fs": {
+    "graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/handlebars": {
+    "handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
       "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
         "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4",
         "wordwrap": "^1.0.0"
       },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
-    "node_modules/handlebars/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/har-schema": {
+    "har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
       "integrity": "sha512-f8xf2GOR6Rgwc9FPTLNzgwB+JQ2/zMauYXSWmX5YV5acex6VomT0ocSuwR7BfXo5MpHi+jL+saaux2fwsGJDKQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "optional": true
     },
-    "node_modules/har-validator": {
+    "har-validator": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha512-5Gbp6RAftMYYV3UEI4c4Vv3+a4dQ7taVyvHt+/L6kRt+f4HX1GweAk5UDWN0SvdVnRBzGQ6OG89pGaD9uSFnVw==",
-      "deprecated": "this library is no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "ajv": "^4.9.1",
         "har-schema": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4"
       }
     },
-    "node_modules/has-ansi": {
+    "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/has-flag": {
+    "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/has-property-descriptors": {
+    "has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
+    "has-proto": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
       "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/has-symbols": {
+    "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/has-value": {
+    "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/has-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
+    "has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hasown": {
+    "hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/hawk": {
+    "hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==",
-      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "boom": "2.x.x",
         "cryptiles": "2.x.x",
         "hoek": "2.x.x",
         "sntp": "1.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.32"
       }
     },
-    "node_modules/hexo": {
+    "hexo": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.9.0.tgz",
       "integrity": "sha512-uga6MsxGlD0AeafiObbFkQVWlUO+wWTb/IJVPI3fFpmAJu0PBD//Ek0qVOxHjlzdvFGeW0bYWYqXgDbR7suJng==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "abbrev": "^1.1.1",
         "archy": "^1.0.0",
         "bluebird": "^3.5.2",
@@ -2604,151 +1642,422 @@
         "titlecase": "^1.1.2",
         "warehouse": "^2.2.0"
       },
-      "bin": {
-        "hexo": "bin/hexo"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "hexo-cli": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
+          "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
+          "dev": true,
+          "requires": {
+            "abbrev": "^1.1.1",
+            "acorn": "^6.1.1",
+            "bluebird": "^3.5.3",
+            "chalk": "^2.4.2",
+            "command-exists": "^1.2.8",
+            "hexo-fs": "^1.0.2",
+            "hexo-log": "^0.2.0",
+            "hexo-util": "^0.6.3",
+            "minimist": "^1.2.0",
+            "resolve": "^1.10.0",
+            "tildify": "^1.2.0"
+          }
+        },
+        "hexo-fs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.1",
+            "chokidar": "^2.0.4",
+            "escape-string-regexp": "^1.0.5",
+            "graceful-fs": "^4.1.11"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/hexo-bunyan": {
+    "hexo-bunyan": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-bunyan/-/hexo-bunyan-1.0.0.tgz",
       "integrity": "sha512-RymT8Ck+K77mLt9BEYNb4uyfC7RIQnU5N3laXowMrS28jj2h89VHJCOnhV00mmta4fHRqNa07kP1Hrn17nvMkQ==",
-      "deprecated": "Please see https://github.com/hexojs/hexo-bunyan/issues/17",
       "dev": true,
-      "engines": [
-        "node >=0.10.0"
-      ],
-      "bin": {
-        "bunyan": "bin/bunyan"
-      },
-      "optionalDependencies": {
+      "requires": {
         "moment": "^2.10.6",
         "mv": "~2",
         "safe-json-stringify": "~1"
       }
     },
-    "node_modules/hexo-front-matter": {
+    "hexo-front-matter": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-0.2.3.tgz",
       "integrity": "sha512-GL/pGfYqsvjMgxjhOWv1zAc7t4JoGUow+CH9Tes/5N2wKxxTzt2woKEMHz1+c01CmhdVYUR4lO3R1ZAcxc0caA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "js-yaml": "^3.6.1"
       }
     },
-    "node_modules/hexo-fs": {
+    "hexo-fs": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-0.2.3.tgz",
       "integrity": "sha512-rLB1rMVUW3csAljvJgHfyjemL0BrmcUZfBf9hJe6S0pA53igFa3ON0PFwomvoLs1Wdmjs9Awnw9Tru4PjWFSlQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.4.0",
         "chokidar": "^1.5.2",
         "escape-string-regexp": "^1.0.5",
         "graceful-fs": "^4.1.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
       }
     },
-    "node_modules/hexo-fs/node_modules/anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.0.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^2.0.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-i18n": {
+    "hexo-i18n": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
       "integrity": "sha512-QhVmN/eLohu9UzvrX85zhfL7yN5O4MOkXKYmCRI8GPcg0EczX+blYYmMCugZKu/NIJ9XD5/etAVWCi/5F+fS6g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "sprintf-js": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
       }
     },
-    "node_modules/hexo-inject": {
+    "hexo-inject": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-inject/-/hexo-inject-1.0.0.tgz",
       "integrity": "sha512-Ly0k7FO3G5+XNvFNE7yjSENSWy8QTnzl8cNFWYuMXRYMogbHd/Q0Ane8WCKYb5QD/A+WXC3rHb32wIGb0YAfVw==",
-      "deprecated": "The author does not use Hexo any more. This plugin is no longer maintained.",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-plugin-transform-decorators-legacy": "^1.3.4",
         "babel-polyfill": "^6.7.2",
         "bluebird": "^3.3.4",
@@ -2756,470 +2065,418 @@
         "underscore": "^1.8.3"
       }
     },
-    "node_modules/hexo-log": {
+    "hexo-log": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-0.2.0.tgz",
       "integrity": "sha512-fzoc+GQexxPPILTjoOQILnA3ZG2MFgqMBVel4xvJ11pXptw9+f97ynTgDAExXafyp9Nz2ChXRuqlCYgPtZSlxQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "chalk": "^1.1.1",
         "hexo-bunyan": "^1.0.0"
       }
     },
-    "node_modules/hexo-prism-plus": {
+    "hexo-prism-plus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-prism-plus/-/hexo-prism-plus-1.1.0.tgz",
       "integrity": "sha512-lkDJRZDVN3iNpYtuwrI+JFLj3rSa4PeMwz1OlVfUOkY6CyjD/D3dGtW7cTpcxYejr3/JWjusIqWVnUTLpKr4Yw==",
       "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
+      "requires": {
         "hexo-fs": "^1.0.0",
         "hexo-inject": "^1.0.0",
         "hexo-util": "^0.6.3",
         "lodash": "^4.17.11"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
       "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "hexo-fs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.1",
+            "chokidar": "^2.0.4",
+            "escape-string-regexp": "^1.0.5",
+            "graceful-fs": "^4.1.11"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        }
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/hexo-fs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "chokidar": "^2.0.4",
-        "escape-string-regexp": "^1.0.5",
-        "graceful-fs": "^4.1.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-renderer-ejs": {
+    "hexo-renderer-ejs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-2.0.0.tgz",
       "integrity": "sha512-qCjE1IdwgDgv65qyb0KMVCwCdSVAkH0vwAe9XihjvaKWkmb9dtt8DgErOdqCXn0HReSyWiEVP2BrLRj3gyHwOQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "ejs": "^3.1.6"
-      },
-      "engines": {
-        "node": ">=12"
       }
     },
-    "node_modules/hexo-renderer-less": {
+    "hexo-renderer-less": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-less/-/hexo-renderer-less-0.2.0.tgz",
       "integrity": "sha512-mhkwGsrLPG1e0bpE40FSRufaDHJ4uDtTYNUIQDBYR3aZkbOxAnpN607BTjymr/F+4uYy0cd7MK4y5vFx5pEDQw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "less": "^2.5.1"
       }
     },
-    "node_modules/hexo-renderer-marked": {
+    "hexo-renderer-marked": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-marked/-/hexo-renderer-marked-2.0.0.tgz",
       "integrity": "sha512-+LMjgPkJSUAOlWYHJnBXxUHwGqemGNlK/I+JNO4zA5rEHWNWZ9wNAZKd5g0lEVdMAZzAV54gCylXGURgMO4IAw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hexo-util": "1.0.0",
         "marked": "^0.7.0",
         "strip-indent": "^3.0.0"
       },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-renderer-marked/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "hexo-util": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
+          "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.2",
+            "camel-case": "^3.0.0",
+            "cross-spawn": "^6.0.5",
+            "highlight.js": "^9.13.1",
+            "html-entities": "^1.2.1",
+            "striptags": "^3.1.1"
+          }
+        },
+        "marked": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
+          "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+          "dev": true,
+          "requires": {
+            "min-indent": "^1.0.0"
+          }
+        },
+        "striptags": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
+          "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/hexo-renderer-marked/node_modules/hexo-util": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
-      "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.2",
-        "camel-case": "^3.0.0",
-        "cross-spawn": "^6.0.5",
-        "highlight.js": "^9.13.1",
-        "html-entities": "^1.2.1",
-        "striptags": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-renderer-marked/node_modules/marked": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-renderer-marked/node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/hexo-renderer-marked/node_modules/striptags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
-      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
-      "dev": true
-    },
-    "node_modules/hexo-server": {
+    "hexo-server": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-server/-/hexo-server-1.0.0.tgz",
       "integrity": "sha512-eSY+a5oiGCG/3T6FrdrNRBkttMLJkM+oitY6ZMFowjcBiG2VNEhQmfWUDOykfvApZs4wPYBb//uXD/58tfe3mA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.5.5",
         "chalk": "^2.4.2",
         "compression": "^1.7.4",
@@ -3229,66 +2486,50 @@
         "open": "^6.3.0",
         "serve-static": "^1.14.1"
       },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-server/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "mime": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/hexo-server/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-server/node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/hexo-server/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-util": {
+    "hexo-util": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-0.6.3.tgz",
       "integrity": "sha512-zPxaqCWZz3/25SAB4FlrRtWktJ+Pr+vBiv/nyHpXKgXPt1m70liViKlRwWLqDmRjJ72x6/k4qCEeXHajvcGHUw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.4.0",
         "camel-case": "^3.0.0",
         "cross-spawn": "^4.0.0",
@@ -3297,958 +2538,413 @@
         "striptags": "^2.1.1"
       }
     },
-    "node_modules/hexo-versioned-netlify-redirects": {
+    "hexo-versioned-netlify-redirects": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-versioned-netlify-redirects/-/hexo-versioned-netlify-redirects-1.1.0.tgz",
       "integrity": "sha512-kfY19ZZDwBnRaZFA6KQgt5DhVBpTQG1yBoq01zaACFHIFuSd9OjhiHCkJ3it+TMvGl+JGTtgKhIwZoQUJHyv/g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "url-join": "^4.0.0"
       }
     },
-    "node_modules/hexo/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/hexo/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/hexo/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/hexo/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/hexo-cli": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
-      "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "^1.1.1",
-        "acorn": "^6.1.1",
-        "bluebird": "^3.5.3",
-        "chalk": "^2.4.2",
-        "command-exists": "^1.2.8",
-        "hexo-fs": "^1.0.2",
-        "hexo-log": "^0.2.0",
-        "hexo-util": "^0.6.3",
-        "minimist": "^1.2.0",
-        "resolve": "^1.10.0",
-        "tildify": "^1.2.0"
-      },
-      "bin": {
-        "hexo": "bin/hexo"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo/node_modules/hexo-fs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "chokidar": "^2.0.4",
-        "escape-string-regexp": "^1.0.5",
-        "graceful-fs": "^4.1.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/hexo/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/highlight.js": {
+    "highlight.js": {
       "version": "9.18.5",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
       "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
-      "deprecated": "Support has ended for 9.x series. Upgrade to @latest",
-      "dev": true,
-      "hasInstallScript": true,
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/hoek": {
+    "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.40"
-      }
+      "optional": true
     },
-    "node_modules/html-entities": {
+    "html-entities": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
       "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
-    "node_modules/htmlparser2": {
+    "htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "domelementtype": "^1.3.1",
         "domhandler": "^2.3.0",
         "domutils": "^1.5.1",
         "entities": "^1.1.1",
         "inherits": "^2.0.1",
         "readable-stream": "^3.1.1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
       },
-      "engines": {
-        "node": ">= 6"
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
-    "node_modules/http-errors": {
+    "http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
-      "engines": {
-        "node": ">= 0.8"
+      "dependencies": {
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/http-errors/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-signature": {
+    "http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^0.2.0",
         "jsprim": "^1.2.2",
         "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
       }
     },
-    "node_modules/image-size": {
+    "image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "optional": true
     },
-    "node_modules/inflight": {
+    "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
-    "node_modules/inherits": {
+    "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/invariant": {
+    "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "loose-envify": "^1.0.0"
       }
     },
-    "node_modules/is-accessor-descriptor": {
+    "is-accessor-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
       "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
       }
     },
-    "node_modules/is-binary-path": {
+    "is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-buffer": {
+    "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "node_modules/is-core-module": {
+    "is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
       "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-data-descriptor": {
+    "is-data-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
       "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/is-descriptor": {
+    "is-descriptor": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/is-dotfile": {
+    "is-dotfile": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-equal-shallow": {
+    "is-equal-shallow": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-primitive": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-extendable": {
+    "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true
     },
-    "node_modules/is-fullwidth-code-point": {
+    "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
       "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
       "dev": true,
-      "engines": {
-        "node": ">=4"
+      "requires": {
+        "is-extglob": "^1.0.0"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "kind-of": "^3.0.2"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-plain-object": {
+    "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/is-plain-object/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-posix-bracket": {
+    "is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-primitive": {
+    "is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-typedarray": {
+    "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/is-windows": {
+    "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-wsl": {
+    "is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
       "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/isarray": {
+    "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "node_modules/isexe": {
+    "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "node_modules/isobject": {
+    "isobject": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
+    "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true,
       "optional": true
     },
-    "node_modules/jake": {
+    "jake": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
       "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
+      "requires": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
         "filelist": "^1.0.4",
         "minimatch": "^3.1.2"
       },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "async": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+          "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
-    "node_modules/jake/node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/js-tokens": {
+    "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
       "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
       "dev": true
     },
-    "node_modules/js-yaml": {
+    "js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/js2xmlparser": {
+    "js2xmlparser": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
       "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "xmlcreate": "^2.0.4"
       }
     },
-    "node_modules/jsbn": {
+    "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/jsdoc": {
+    "jsdoc": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
       "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "@babel/parser": "^7.20.15",
         "@jsdoc/salty": "^0.2.1",
         "@types/markdown-it": "^12.2.3",
@@ -4265,195 +2961,140 @@
         "strip-json-comments": "^3.1.0",
         "underscore": "~1.13.2"
       },
-      "bin": {
-        "jsdoc": "jsdoc.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
+      "dependencies": {
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        },
+        "marked": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+          "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "underscore": {
+          "version": "1.13.6",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jsdoc/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jsdoc/node_modules/marked": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/jsdoc/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jsdoc/node_modules/underscore": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
-      "dev": true
-    },
-    "node_modules/json-schema": {
+    "json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/json-stable-stringify": {
+    "json-stable-stringify": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
       "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.5",
         "isarray": "^2.0.5",
         "jsonify": "^0.0.1",
         "object-keys": "^1.1.1"
       },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/json-stable-stringify/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/json-stringify-safe": {
+    "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/jsonify": {
+    "jsonify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
       "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
       "dev": true,
-      "optional": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/jsonparse": {
+    "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ]
+      "dev": true
     },
-    "node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/jsprim": {
+    "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
         "json-schema": "0.4.0",
         "verror": "1.10.0"
       },
-      "engines": {
-        "node": ">=0.6.0"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/jsprim/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/kind-of": {
+    "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/klaw": {
+    "klaw": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
       "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "graceful-fs": "^4.1.9"
       }
     },
-    "node_modules/lazy-cache": {
+    "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
       "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/less": {
+    "less": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
       "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
       "dev": true,
-      "bin": {
-        "lessc": "bin/lessc"
-      },
-      "engines": {
-        "node": ">=0.12"
-      },
-      "optionalDependencies": {
+      "requires": {
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
@@ -4464,241 +3105,209 @@
         "source-map": "^0.5.3"
       }
     },
-    "node_modules/linkify-it": {
+    "linkify-it": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
       "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "uc.micro": "^1.0.1"
       }
     },
-    "node_modules/locate-path": {
+    "locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
       }
     },
-    "node_modules/lodash": {
+    "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.assignin": {
+    "lodash.assignin": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
       "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
       "dev": true
     },
-    "node_modules/lodash.bind": {
+    "lodash.bind": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
       "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==",
       "dev": true
     },
-    "node_modules/lodash.defaults": {
+    "lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
       "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
       "dev": true
     },
-    "node_modules/lodash.filter": {
+    "lodash.filter": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
       "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==",
       "dev": true
     },
-    "node_modules/lodash.flatten": {
+    "lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
       "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
       "dev": true
     },
-    "node_modules/lodash.foreach": {
+    "lodash.foreach": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
       "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
       "dev": true
     },
-    "node_modules/lodash.map": {
+    "lodash.map": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
       "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==",
       "dev": true
     },
-    "node_modules/lodash.merge": {
+    "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.pick": {
+    "lodash.pick": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
       "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
-      "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.",
       "dev": true
     },
-    "node_modules/lodash.reduce": {
+    "lodash.reduce": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
       "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==",
       "dev": true
     },
-    "node_modules/lodash.reject": {
+    "lodash.reject": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
       "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==",
       "dev": true
     },
-    "node_modules/lodash.some": {
+    "lodash.some": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
       "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
       "dev": true
     },
-    "node_modules/longest": {
+    "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
       "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/loose-envify": {
+    "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
       }
     },
-    "node_modules/lower-case": {
+    "lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
       "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
       "dev": true
     },
-    "node_modules/lru-cache": {
+    "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
       }
     },
-    "node_modules/map-cache": {
+    "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/map-visit": {
+    "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/markdown": {
+    "markdown": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
       "integrity": "sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "nopt": "~2.1.1"
-      },
-      "bin": {
-        "md2html": "bin/md2html.js"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/markdown-it": {
+    "markdown-it": {
       "version": "12.3.2",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
       "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "argparse": "^2.0.1",
         "entities": "~2.1.0",
         "linkify-it": "^3.0.1",
         "mdurl": "^1.0.1",
         "uc.micro": "^1.0.5"
       },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "entities": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+          "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/markdown-it-anchor": {
+    "markdown-it-anchor": {
       "version": "8.6.7",
       "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
       "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
-      "dev": true,
-      "peerDependencies": {
-        "@types/markdown-it": "*",
-        "markdown-it": "*"
-      }
-    },
-    "node_modules/markdown-it/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/math-random": {
+    "math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/mdurl": {
+    "mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
       "dev": true
     },
-    "node_modules/micromatch": {
+    "micromatch": {
       "version": "2.3.11",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "arr-diff": "^2.0.0",
         "array-unique": "^0.2.1",
         "braces": "^1.8.2",
@@ -4712,234 +3321,140 @@
         "object.omit": "^2.0.0",
         "parse-glob": "^3.0.4",
         "regex-cache": "^0.4.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/micromatch/node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mime": {
+    "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/mime-db": {
+    "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/mime-types": {
+    "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/min-indent": {
+    "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/minimatch": {
+    "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/minimist": {
+    "minimist": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/mixin-deep": {
+    "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
-    "node_modules/mkdirp": {
+    "mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/moment": {
+    "moment": {
       "version": "2.30.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
       "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/moment-timezone": {
+    "moment-timezone": {
       "version": "0.5.45",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
       "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "moment": "^2.29.4"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/morgan": {
+    "morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
       "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-finished": "~2.3.0",
         "on-headers": "~1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/ms": {
+    "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/mv": {
+    "mv": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
       "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "mkdirp": "~0.5.1",
         "ncp": "~2.0.0",
         "rimraf": "~2.4.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/nan": {
+    "nan": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
       "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/nanomatch": {
+    "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
         "define-property": "^2.0.2",
@@ -4952,606 +3467,438 @@
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/nanomatch/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ncp": {
+    "ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
       "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "ncp": "bin/ncp"
-      }
+      "optional": true
     },
-    "node_modules/negotiator": {
+    "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/neo-async": {
+    "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "node_modules/nice-try": {
+    "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node_modules/no-case": {
+    "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lower-case": "^1.1.1"
       }
     },
-    "node_modules/node-fingerprint": {
+    "node-fingerprint": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/node-fingerprint/-/node-fingerprint-0.0.2.tgz",
       "integrity": "sha512-vPFfTD5EBJieQ4SI3v61fWxlV1kav3m9Dbejd6CjWhOJn8s+XMxpOOosCNAyIrUQ/jJOlPndfrZ0lSw4+RgwcA==",
       "dev": true
     },
-    "node_modules/nopt": {
+    "nopt": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
       "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
       }
     },
-    "node_modules/nth-check": {
+    "nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
       "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "boolbase": "~1.0.0"
       }
     },
-    "node_modules/nunjucks": {
+    "nunjucks": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
       "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
         "commander": "^5.1.0"
-      },
-      "bin": {
-        "nunjucks-precompile": "bin/precompile"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.3.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
       }
     },
-    "node_modules/oauth-sign": {
+    "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
       "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/object-assign": {
+    "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/object-copy": {
+    "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
         "kind-of": "^3.0.3"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/object-keys": {
+    "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
+      "optional": true
     },
-    "node_modules/object-visit": {
+    "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/object-visit/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.omit": {
+    "object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/object.pick": {
+    "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/object.pick/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/on-finished": {
+    "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/on-headers": {
+    "on-headers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/once": {
+    "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "wrappy": "1"
       }
     },
-    "node_modules/open": {
+    "open": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
       "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-wsl": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=8"
       }
     },
-    "node_modules/optimist": {
+    "optimist": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+          "dev": true
+        },
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/optimist/node_modules/minimist": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-      "dev": true
-    },
-    "node_modules/optimist/node_modules/wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/os-homedir": {
+    "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/p-limit": {
+    "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-locate": {
+    "p-locate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
       }
     },
-    "node_modules/p-try": {
+    "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
+      "dev": true
     },
-    "node_modules/parse-glob": {
+    "parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
         "is-extglob": "^1.0.0",
         "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/parse-glob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-glob/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parseurl": {
+    "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/pascalcase": {
+    "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/path-dirname": {
+    "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
       "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
       "dev": true
     },
-    "node_modules/path-exists": {
+    "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
       "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/path-is-absolute": {
+    "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/path-key": {
+    "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/path-parse": {
+    "path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "node_modules/performance-now": {
+    "performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
       "integrity": "sha512-YHk5ez1hmMR5LOkb9iJkLKqoBlL7WD5M8ljC75ZfzXriuBIVNuecaXuU7e+hOwyqf24Wxhh7Vxgt7Hnw9288Tg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/posix-character-classes": {
+    "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/preserve": {
+    "preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/pretty-hrtime": {
+    "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/process-nextick-args": {
+    "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "node_modules/promise": {
+    "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asap": "~2.0.3"
       }
     },
-    "node_modules/prr": {
+    "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/pseudomap": {
+    "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
-    "node_modules/punycode": {
+    "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
       "dev": true,
       "optional": true
     },
-    "node_modules/qs": {
+    "qs": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.1.tgz",
       "integrity": "sha512-LQy1Q1fcva/UsnP/6Iaa4lVeM49WiOitu2T4hZCyA/elLKu37L99qcBJk4VCCk+rdLvnMzfKyiN3SZTqdAZGSQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.6"
-      }
+      "optional": true
     },
-    "node_modules/randomatic": {
+    "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
         "math-random": "^1.0.1"
       },
-      "engines": {
-        "node": ">= 0.10.0"
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/randomatic/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/randomatic/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/range-parser": {
+    "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/readable-stream": {
+    "readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
         "isarray": "~1.0.0",
@@ -5561,339 +3908,277 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/readdirp": {
+    "readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
         "readable-stream": "^2.0.2"
       },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/readdirp/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
       "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regenerator-runtime": {
+    "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
-    "node_modules/regex-cache": {
+    "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-equal-shallow": "^0.1.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/regex-not": {
+    "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/remove-trailing-separator": {
+    "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
-    "node_modules/repeat-element": {
+    "repeat-element": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/repeat-string": {
+    "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
+      "dev": true
     },
-    "node_modules/request": {
+    "request": {
       "version": "2.81.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
       "integrity": "sha512-IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "aws-sign2": "~0.6.0",
         "aws4": "^1.2.1",
         "caseless": "~0.12.0",
@@ -5916,139 +4201,112 @@
         "tough-cookie": "~2.3.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 4"
       }
     },
-    "node_modules/require-directory": {
+    "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/require-main-filename": {
+    "require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
-    "node_modules/requizzle": {
+    "requizzle": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
       "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lodash": "^4.17.21"
       }
     },
-    "node_modules/resolve": {
+    "resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/resolve-url": {
+    "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "node_modules/ret": {
+    "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
+      "dev": true
     },
-    "node_modules/right-align": {
+    "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
       "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "align-text": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
+    "rimraf": {
       "version": "2.4.5",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
       "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "glob": "^6.0.1"
-      },
-      "bin": {
-        "rimraf": "bin.js"
       }
     },
-    "node_modules/safe-buffer": {
+    "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
-    "node_modules/safe-json-stringify": {
+    "safe-json-stringify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
       "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/safe-regex": {
+    "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ret": "~0.1.10"
       }
     },
-    "node_modules/safer-buffer": {
+    "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/semver": {
+    "semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
+      "dev": true
     },
-    "node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+    "send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -6063,214 +4321,169 @@
         "range-parser": "~1.2.1",
         "statuses": "2.0.1"
       },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/send/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/send/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+    "serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "encodeurl": "~2.0.0",
+      "requires": {
+        "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.19.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+        "send": "0.18.0"
       }
     },
-    "node_modules/serve-static/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/set-blocking": {
+    "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
-    "node_modules/set-function-length": {
+    "set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/set-value": {
+    "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
         "is-plain-object": "^2.0.3",
         "split-string": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/setprototypeof": {
+    "setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
-    "node_modules/shebang-command": {
+    "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/shebang-regex": {
+    "shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/showdown": {
+    "showdown": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz",
       "integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "yargs": "^14.2"
       },
-      "bin": {
-        "showdown": "bin/showdown.js"
-      }
-    },
-    "node_modules/showdown/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/showdown/node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
       "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "yargs": {
+          "version": "14.2.3",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^15.0.1"
+          }
+        }
       }
     },
-    "node_modules/showdown/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/showdown/node_modules/yargs": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
-      "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^15.0.1"
-      }
-    },
-    "node_modules/snapdragon": {
+    "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
         "define-property": "^0.2.5",
@@ -6280,124 +4493,96 @@
         "source-map-resolve": "^0.5.0",
         "use": "^3.1.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/snapdragon-node": {
+    "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
         "snapdragon-util": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
+    "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sntp": {
+    "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==",
-      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "hoek": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/source-map": {
+    "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/source-map-resolve": {
+    "source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
@@ -6405,38 +4590,34 @@
         "urix": "^0.1.0"
       }
     },
-    "node_modules/source-map-url": {
+    "source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
-    "node_modules/split-string": {
+    "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/sprintf-js": {
+    "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
-    "node_modules/sshpk": {
+    "sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
         "bcrypt-pbkdf": "^1.0.0",
@@ -6447,716 +4628,570 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/sshpk/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/static-extend": {
+    "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/statuses": {
+    "statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string-width": {
+    "string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
       "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "emoji-regex": "^7.0.1",
         "is-fullwidth-code-point": "^2.0.0",
         "strip-ansi": "^5.1.0"
       },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
       "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
-    "node_modules/stringstream": {
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "stringstream": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/strip-ansi": {
+    "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-indent": {
+    "strip-indent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
       "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/strip-json-comments": {
+    "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "dev": true
     },
-    "node_modules/striptags": {
+    "striptags": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz",
       "integrity": "sha512-vZTvmFP0IYu/zn8MXV6PrLb6VKbd9WGSEnlm4D5RNXS/+zYYlHrSfJgoBw1w56D6RJCr515er3BittRGQqihLA==",
       "dev": true
     },
-    "node_modules/supports-color": {
+    "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/supports-preserve-symlinks-flag": {
+    "supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/swig-extras": {
+    "swig-extras": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
       "integrity": "sha512-mFgpjjcQ0Kj+WplOrnWfUEw8iehZMD78sRId6uMXaTlWpy/vt8PTv3GoNsHrHBpZNnPnIsoWxrmRbS3vePjWpA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "markdown": "~0.5.0"
       }
     },
-    "node_modules/swig-templates": {
+    "swig-templates": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
       "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
-      "deprecated": "unmaintained",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "optimist": "~0.6",
         "uglify-js": "2.6.0"
       },
-      "bin": {
-        "swig": "bin/swig.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/swig-templates/node_modules/uglify-js": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
-      "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
-      "dev": true,
       "dependencies": {
-        "async": "~0.2.6",
-        "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.10.0"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
+        "uglify-js": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
+          "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
+          "dev": true,
+          "requires": {
+            "async": "~0.2.6",
+            "source-map": "~0.5.1",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.10.0"
+          }
+        }
       }
     },
-    "node_modules/text-table": {
+    "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "node_modules/through": {
+    "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
-    "node_modules/tildify": {
+    "tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
       "integrity": "sha512-Y9q1GaV/BO65Z9Yf4NOGMuwt3SGdptkZBnaaKfTQakrDyCLiuO1Kc5wxW4xLdsjzunRtqtOdhekiUFmZbklwYQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "os-homedir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/titlecase": {
+    "titlecase": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.3.tgz",
       "integrity": "sha512-pQX4oiemzjBEELPqgK4WE+q0yhAqjp/yzusGtlSJsOuiDys0RQxggepYmo0BuegIDppYS3b3cpdegRwkpyN3hw==",
-      "dev": true,
-      "bin": {
-        "to-title-case": "bin.js"
-      }
+      "dev": true
     },
-    "node_modules/to-fast-properties": {
+    "to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/to-object-path": {
+    "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/to-regex": {
+    "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/to-regex-range": {
+    "to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex-range/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/toidentifier": {
+    "toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.6"
-      }
+      "dev": true
     },
-    "node_modules/tough-cookie": {
+    "tough-cookie": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "punycode": "^1.4.1"
-      },
-      "engines": {
-        "node": ">=0.8"
       }
     },
-    "node_modules/tunnel-agent": {
+    "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/tweetnacl": {
+    "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/uc.micro": {
+    "uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
       "dev": true
     },
-    "node_modules/uglify-js": {
+    "uglify-js": {
       "version": "3.17.4",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
       "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "optional": true
     },
-    "node_modules/uglify-to-browserify": {
+    "uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
       "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
       "dev": true
     },
-    "node_modules/underscore": {
+    "underscore": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
       "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
       "dev": true
     },
-    "node_modules/union-value": {
+    "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/unpipe": {
+    "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/unset-value": {
+    "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-      "dev": true,
       "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
+    "upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
+      "dev": true
     },
-    "node_modules/upper-case": {
+    "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
       "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
       "dev": true
     },
-    "node_modules/urix": {
+    "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "node_modules/url-join": {
+    "url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
       "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
       "dev": true
     },
-    "node_modules/use": {
+    "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/util-deprecate": {
+    "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "node_modules/utils-merge": {
+    "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
+      "dev": true
     },
-    "node_modules/uuid": {
+    "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
+      "optional": true
     },
-    "node_modules/vary": {
+    "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/verror": {
+    "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/verror/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/verror/node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/warehouse": {
+    "warehouse": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz",
       "integrity": "sha512-axyo83DpdZabmCsiipkHYKnwl6ull2Vv7fqxMnV8KOQLdiJKffn9W+B3Yac7QVWzBE56Q6B6j2cIY1k2gc10PA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
+        "JSONStream": "^1.0.7",
         "bluebird": "^3.2.2",
         "cuid": "~1.3.8",
         "graceful-fs": "^4.1.3",
         "is-plain-object": "^2.0.1",
-        "JSONStream": "^1.0.7",
         "lodash": "^4.2.1"
       }
     },
-    "node_modules/which": {
+    "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
       }
     },
-    "node_modules/which-module": {
+    "which-module": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
       "dev": true
     },
-    "node_modules/window-size": {
+    "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
       "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/wordwrap": {
+    "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
       "dev": true
     },
-    "node_modules/wrap-ansi": {
+    "wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
       "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-styles": "^3.2.0",
         "string-width": "^3.0.0",
         "strip-ansi": "^5.0.0"
       },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrappy": {
+    "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "optional": true
     },
-    "node_modules/xmlcreate": {
+    "xmlcreate": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
       "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
       "dev": true
     },
-    "node_modules/y18n": {
+    "y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
-    "node_modules/yallist": {
+    "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
-    "node_modules/yargs": {
+    "yargs": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
       "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "camelcase": "^1.0.2",
         "cliui": "^2.1.0",
         "decamelize": "^1.0.0",
         "window-size": "0.1.0"
       }
     },
-    "node_modules/yargs-parser": {
+    "yargs-parser": {
       "version": "15.0.3",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz",
       "integrity": "sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/yargs-parser/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        }
       }
     }
   }
diff --git a/guide/package-lock.json b/guide/package-lock.json
index b9073abdc7..b8a97f4379 100644
--- a/guide/package-lock.json
+++ b/guide/package-lock.json
@@ -1,766 +1,493 @@
 {
   "name": "meteor-guide",
   "version": "1.0.0",
-  "lockfileVersion": 3,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "meteor-guide",
-      "version": "1.0.0",
-      "devDependencies": {
-        "@meteorjs/meteor-hexo-config": "1.0.14",
-        "@meteorjs/meteor-theme-hexo": "2.0.8",
-        "chexo": "1.0.7",
-        "hexo": "3.9.0",
-        "hexo-prism-plus": "1.1.0",
-        "hexo-renderer-ejs": "1.0.0",
-        "hexo-renderer-less": "0.2.0",
-        "hexo-renderer-marked": "2.0.0",
-        "hexo-server": "1.0.0",
-        "hexo-versioned-netlify-redirects": "1.1.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-hexo-config": {
+  "dependencies": {
+    "@meteorjs/meteor-hexo-config": {
       "version": "1.0.14",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-hexo-config/-/meteor-hexo-config-1.0.14.tgz",
       "integrity": "sha512-Vl4cEMEoVw2JV8qTBsqaq+YL7MRHasTtE88WJa5BGBYMfN35Yk0yeYwVc2OTFJ/cGiQcPEaC0RvRKVyNJfwIGQ==",
       "dev": true
     },
-    "node_modules/@meteorjs/meteor-theme-hexo": {
+    "@meteorjs/meteor-theme-hexo": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-theme-hexo/-/meteor-theme-hexo-2.0.8.tgz",
       "integrity": "sha512-LQIFN05wBMjX7SXgW5CFVTfolDWMuknoypwQ0czl/44LYRBR4/LYZUgX6c+1vLjloJb+5+2HTvMGlVN9Wo1MKA==",
       "dev": true,
-      "hasShrinkwrap": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-      "extraneous": true,
       "dependencies": {
-        "sprintf-js": "~1.0.2"
+        "argparse": {
+          "version": "1.0.9",
+          "requires": {
+            "sprintf-js": "~1.0.2"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0"
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "requires": {
+            "inherits": "~2.0.0"
+          }
+        },
+        "bluebird": {
+          "version": "3.5.1"
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1"
+        },
+        "debug": {
+          "version": "3.1.0",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "esprima": {
+          "version": "4.0.0"
+        },
+        "fs-extra": {
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0"
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "inherits": "~2.0.0",
+            "mkdirp": ">=0.5 0",
+            "rimraf": "2"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11"
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3"
+        },
+        "interpret": {
+          "version": "1.1.0"
+        },
+        "js-yaml": {
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8"
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0"
+        },
+        "once": {
+          "version": "1.4.0",
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-tmpdir": {
+          "version": "1.0.2"
+        },
+        "path-is-absolute": {
+          "version": "1.0.1"
+        },
+        "path-parse": {
+          "version": "1.0.5"
+        },
+        "rechoir": {
+          "version": "0.6.2",
+          "requires": {
+            "resolve": "^1.1.6"
+          }
+        },
+        "resolve": {
+          "version": "1.5.0",
+          "requires": {
+            "path-parse": "^1.0.5"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "requires": {
+            "glob": "^7.0.5"
+          }
+        },
+        "shelljs": {
+          "requires": {
+            "glob": "^7.0.0",
+            "interpret": "^1.0.0",
+            "rechoir": "^0.6.2"
+          }
+        },
+        "simple-git": {
+          "requires": {
+            "debug": "^3.1.0"
+          }
+        },
+        "sprintf-js": {
+          "version": "1.0.3"
+        },
+        "tar": {
+          "version": "2.2.1",
+          "requires": {
+            "block-stream": "*",
+            "fstream": "^1.0.2",
+            "inherits": "2"
+          }
+        },
+        "tarball-extract": {
+          "requires": {
+            "tar": "2.2.1",
+            "wget": "*"
+          }
+        },
+        "tmp": {
+          "version": "0.0.33",
+          "requires": {
+            "os-tmpdir": "~1.0.2"
+          }
+        },
+        "tmp-promise": {
+          "requires": {
+            "bluebird": "^3.5.0",
+            "tmp": "0.0.33"
+          }
+        },
+        "tunnel": {
+          "version": "0.0.2"
+        },
+        "universalify": {
+          "version": "0.1.1"
+        },
+        "wget": {
+          "version": "0.0.1",
+          "requires": {
+            "tunnel": "0.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2"
+        }
       }
     },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "extraneous": true,
-      "dependencies": {
-        "inherits": "~2.0.0"
-      },
-      "engines": {
-        "node": "0.4 || >=0.5.8"
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
       }
     },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "extraneous": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "extraneous": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-      "extraneous": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-      "extraneous": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "extraneous": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "extraneous": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "extraneous": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/interpret": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-      "extraneous": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "extraneous": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "extraneous": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "extraneous": true,
-      "dependencies": {
-        "minimist": "0.0.8"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "extraneous": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "extraneous": true,
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/resolve": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-      "extraneous": true,
-      "dependencies": {
-        "path-parse": "^1.0.5"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "extraneous": true,
-      "dependencies": {
-        "glob": "^7.0.5"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/shelljs": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz",
-      "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==",
-      "extraneous": true,
-      "dependencies": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      },
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/simple-git": {
-      "version": "1.89.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz",
-      "integrity": "sha1-71L+c01QYFZs4Yeyu6zjbCMj40w=",
-      "extraneous": true,
-      "dependencies": {
-        "debug": "^3.1.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
-      "extraneous": true,
-      "dependencies": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tarball-extract": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tarball-extract/-/tarball-extract-0.0.6.tgz",
-      "integrity": "sha1-FQ5sAR3mdkeRn67CUDVhHGdh/RA=",
-      "extraneous": true,
-      "dependencies": {
-        "tar": "2.2.1",
-        "wget": "*"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "extraneous": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp-promise": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.4.tgz",
-      "integrity": "sha512-76r7LZhAvRJ3kLD/xrPSEGb3aq0tirzMLJKhcchKSkQIiEgXB+RouC0ygReuZX+oiA64taGo+j+1gHTKSG8/Mg==",
-      "extraneous": true,
-      "dependencies": {
-        "bluebird": "^3.5.0",
-        "tmp": "0.0.33"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tunnel": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz",
-      "integrity": "sha1-8jvNi3p7ioZCYbIIT2b5MZM5YzQ=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wget": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/wget/-/wget-0.0.1.tgz",
-      "integrity": "sha1-i7ga8LjmC13yYtPIHlc34fSTHlM=",
-      "extraneous": true,
-      "dependencies": {
-        "tunnel": "0.0.2"
-      },
-      "bin": {
-        "nwget": "bin/nwget.js"
-      },
-      "engines": {
-        "node": ">= 0.6.18"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "extraneous": true
-    },
-    "node_modules/a-sync-waterfall": {
+    "a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
       "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
       "dev": true
     },
-    "node_modules/abbrev": {
+    "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
-    "node_modules/accepts": {
+    "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/acorn": {
+    "acorn": {
       "version": "6.4.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
       "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "dev": true
     },
-    "node_modules/ajv": {
+    "ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "co": "^4.6.0",
         "json-stable-stringify": "^1.0.1"
       }
     },
-    "node_modules/align-text": {
+    "align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
       "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.0.2",
         "longest": "^1.0.1",
         "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/ansi-regex": {
+    "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/ansi-styles": {
+    "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/archy": {
+    "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
-    "node_modules/argparse": {
+    "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/argparse/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/arr-diff": {
+    "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "arr-flatten": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/arr-flatten": {
+    "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/arr-union": {
+    "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/array-unique": {
+    "array-unique": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/asap": {
+    "asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "dev": true
     },
-    "node_modules/asn1": {
+    "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "safer-buffer": "~2.1.0"
       }
     },
-    "node_modules/assert-plus": {
+    "assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
       "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
+      "optional": true
     },
-    "node_modules/assign-symbols": {
+    "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/async": {
+    "async": {
       "version": "0.2.10",
       "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
       "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
       "dev": true
     },
-    "node_modules/async-each": {
+    "async-each": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
       "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ]
+      "dev": true
     },
-    "node_modules/asynckit": {
+    "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true,
       "optional": true
     },
-    "node_modules/atob": {
+    "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
+      "dev": true
     },
-    "node_modules/aws-sign2": {
+    "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
       "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/aws4": {
+    "aws4": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/babel-code-frame": {
+    "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
       }
     },
-    "node_modules/babel-messages": {
+    "babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.22.0"
       }
     },
-    "node_modules/babel-plugin-syntax-decorators": {
+    "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha512-AWj19x2aDm8qFQ5O2JcD6pwJDW1YdcnO+1b81t7gxrGjz5VHiUqeYWAR4h7zueWMalRelrQDXprv2FrY1dbpbw==",
       "dev": true
     },
-    "node_modules/babel-plugin-transform-decorators-legacy": {
+    "babel-plugin-transform-decorators-legacy": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz",
       "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-plugin-syntax-decorators": "^6.1.18",
         "babel-runtime": "^6.2.0",
         "babel-template": "^6.3.0"
       }
     },
-    "node_modules/babel-polyfill": {
+    "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
         "regenerator-runtime": "^0.10.5"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        },
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/babel-polyfill/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
-      "dev": true
-    },
-    "node_modules/babel-runtime": {
+    "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/babel-template": {
+    "babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
         "babel-types": "^6.26.0",
@@ -768,12 +495,12 @@
         "lodash": "^4.17.4"
       }
     },
-    "node_modules/babel-traverse": {
+    "babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
         "babel-runtime": "^6.26.0",
@@ -785,39 +512,36 @@
         "lodash": "^4.17.4"
       }
     },
-    "node_modules/babel-types": {
+    "babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
         "lodash": "^4.17.4",
         "to-fast-properties": "^1.0.3"
       }
     },
-    "node_modules/babylon": {
+    "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true,
-      "bin": {
-        "babylon": "bin/babylon.js"
-      }
+      "dev": true
     },
-    "node_modules/balanced-match": {
+    "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "node_modules/base": {
+    "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
         "component-emitter": "^1.2.1",
@@ -826,159 +550,119 @@
         "mixin-deep": "^1.2.0",
         "pascalcase": "^0.1.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/basic-auth": {
+    "basic-auth": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
       "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/bcrypt-pbkdf": {
+    "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "tweetnacl": "^0.14.3"
       }
     },
-    "node_modules/binary-extensions": {
+    "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/bindings": {
+    "bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/bluebird": {
+    "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "node_modules/boolbase": {
+    "boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
-    "node_modules/boom": {
+    "boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "hoek": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.40"
       }
     },
-    "node_modules/brace-expansion": {
+    "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-fingerprint": {
+    "browser-fingerprint": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
       "integrity": "sha512-b8SXP7yOlzLUJXF8WUvIjmbJzkJC0X6OHe7J9a/SHqEBC7a9Eglag6AANSTJz82h5U582kuxm/5TPudnD68EPA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/bytes": {
+    "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/cache-base": {
+    "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
         "get-value": "^2.0.6",
@@ -989,98 +673,79 @@
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/cache-base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/call-bind": {
+    "call-bind": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
       "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.1",
         "set-function-length": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/camel-case": {
+    "camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
       "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "no-case": "^2.2.0",
         "upper-case": "^1.1.1"
       }
     },
-    "node_modules/camelcase": {
+    "camelcase": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
       "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/caseless": {
+    "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/center-align": {
+    "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "align-text": "^0.1.3",
         "lazy-cache": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/chalk": {
+    "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
         "has-ansi": "^2.0.0",
         "strip-ansi": "^3.0.0",
         "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/cheerio": {
+    "cheerio": {
       "version": "0.22.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
       "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "css-select": "~1.2.0",
         "dom-serializer": "~0.1.0",
         "entities": "~1.1.1",
@@ -1097,286 +762,162 @@
         "lodash.reduce": "^4.4.0",
         "lodash.reject": "^4.4.0",
         "lodash.some": "^4.4.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/chexo": {
+    "chexo": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/chexo/-/chexo-1.0.7.tgz",
       "integrity": "sha512-7ScGKzHsZDLpCZhzIypwbK+hkx1fkWZjeLemEkmnreThGLNWhLRDC4gJ/Wu04jAbH0zYR/ev0QPAACEnaYXrcA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hexo-cli": "^1.1.0",
         "minimist": "^1.2.0"
       },
-      "bin": {
-        "chexo": "bin/chexo"
-      },
-      "peerDependencies": {
-        "hexo": ">= 3.3.0 < 4"
-      }
-    },
-    "node_modules/chexo/node_modules/hexo-cli": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
-      "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
-      "dev": true,
       "dependencies": {
-        "abbrev": "^1.0.7",
-        "bluebird": "^3.4.0",
-        "chalk": "^1.1.3",
-        "command-exists": "^1.2.0",
-        "hexo-fs": "^0.2.0",
-        "hexo-log": "^0.2.0",
-        "hexo-util": "^0.6.0",
-        "minimist": "^1.2.0",
-        "object-assign": "^4.1.0",
-        "resolve": "^1.5.0",
-        "tildify": "^1.2.0"
-      },
-      "bin": {
-        "hexo": "bin/hexo"
+        "hexo-cli": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
+          "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
+          "dev": true,
+          "requires": {
+            "abbrev": "^1.0.7",
+            "bluebird": "^3.4.0",
+            "chalk": "^1.1.3",
+            "command-exists": "^1.2.0",
+            "hexo-fs": "^0.2.0",
+            "hexo-log": "^0.2.0",
+            "hexo-util": "^0.6.0",
+            "minimist": "^1.2.0",
+            "object-assign": "^4.1.0",
+            "resolve": "^1.5.0",
+            "tildify": "^1.2.0"
+          }
+        }
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar/node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/chokidar/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true,
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chokidar/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/class-utils": {
+    "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
         "isobject": "^3.0.0",
         "static-extend": "^0.1.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/class-utils/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cliui": {
+    "cliui": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
       "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
+      "requires": {
         "center-align": "^0.1.1",
         "right-align": "^0.1.1",
         "wordwrap": "0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+          "dev": true
+        }
       }
     },
-    "node_modules/cliui/node_modules/wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-      "dev": true,
-      "license": "MIT/X11",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/co": {
+    "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
+      "optional": true
     },
-    "node_modules/collection-visit": {
+    "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/color-convert": {
+    "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "color-name": "1.1.3"
       }
     },
-    "node_modules/color-name": {
+    "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
-    "node_modules/combined-stream": {
+    "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/command-exists": {
+    "command-exists": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
       "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
       "dev": true
     },
-    "node_modules/commander": {
+    "commander": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
       "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
+      "dev": true
     },
-    "node_modules/component-emitter": {
+    "component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "node_modules/compressible": {
+    "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/compression": {
+    "compression": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
         "compressible": "~2.0.16",
@@ -1384,566 +925,421 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/concat-map": {
+    "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "node_modules/connect": {
+    "connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
       }
     },
-    "node_modules/copy-descriptor": {
+    "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/core-decorators": {
+    "core-decorators": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/core-decorators/-/core-decorators-0.11.2.tgz",
       "integrity": "sha512-47n1NWwwc+qPmOMtY9zUKCM1cYfoxLvBRxKzirFrqhE61yqK+yZP/BOA3gjaBUVb9P46J1RyJjasrtqYoWCbvA==",
       "dev": true
     },
-    "node_modules/core-js": {
+    "core-js": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
       "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/core-util-is": {
+    "core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
-    "node_modules/cross-spawn": {
+    "cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
       "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lru-cache": "^4.0.1",
         "which": "^1.2.9"
       }
     },
-    "node_modules/cryptiles": {
+    "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "boom": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.40"
       }
     },
-    "node_modules/css-select": {
+    "css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
       "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==",
       "dev": true,
-      "license": "BSD-like",
-      "dependencies": {
+      "requires": {
         "boolbase": "~1.0.0",
         "css-what": "2.1",
         "domutils": "1.5.1",
         "nth-check": "~1.0.1"
       }
     },
-    "node_modules/css-what": {
+    "css-what": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
       "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/cuid": {
+    "cuid": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
       "integrity": "sha512-MoL67ZZuBetDMxzrZtO+Iq1ATajFACQCP52QRinBgd3yTjYdv54mJO8ibUrh06fojKCoX5P2i7KkEatm4VTIOQ==",
-      "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "browser-fingerprint": "0.0.1",
         "core-js": "^1.1.1",
         "node-fingerprint": "0.0.2"
       }
     },
-    "node_modules/dashdash": {
+    "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/dashdash/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/debug": {
+    "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ms": "2.0.0"
       }
     },
-    "node_modules/decamelize": {
+    "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/decode-uri-component": {
+    "decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
+      "dev": true
     },
-    "node_modules/define-data-property": {
+    "define-data-property": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
       "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/define-property": {
+    "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/define-property/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
+    "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "optional": true
     },
-    "node_modules/depd": {
+    "depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/destroy": {
+    "destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
+      "dev": true
     },
-    "node_modules/dom-serializer": {
+    "dom-serializer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
       "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "domelementtype": "^1.3.0",
         "entities": "^1.1.1"
       }
     },
-    "node_modules/domelementtype": {
+    "domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "dev": true
     },
-    "node_modules/domhandler": {
+    "domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
+      "requires": {
         "domelementtype": "1"
       }
     },
-    "node_modules/domutils": {
+    "domutils": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "dom-serializer": "0",
         "domelementtype": "1"
       }
     },
-    "node_modules/ecc-jsbn": {
+    "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
-    "node_modules/ee-first": {
+    "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
-    "node_modules/ejs": {
+    "ejs": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/encodeurl": {
+    "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/entities": {
+    "entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "dev": true
     },
-    "node_modules/errno": {
+    "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
       }
     },
-    "node_modules/escape-html": {
+    "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
-    "node_modules/escape-string-regexp": {
+    "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/esprima": {
+    "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/esutils": {
+    "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/etag": {
+    "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/expand-brackets": {
+    "expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-posix-bracket": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-range": {
+    "expand-range": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "fill-range": "^2.1.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-range/node_modules/fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "fill-range": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "dev": true,
+          "requires": {
+            "is-number": "^2.1.0",
+            "isobject": "^2.0.0",
+            "randomatic": "^3.0.0",
+            "repeat-element": "^1.1.2",
+            "repeat-string": "^1.5.2"
+          }
+        },
+        "is-number": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+          "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/expand-range/node_modules/is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend": {
+    "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true,
       "optional": true
     },
-    "node_modules/extend-shallow": {
+    "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
-    "node_modules/extglob": {
+    "extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-extglob": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+          "dev": true
+        }
       }
     },
-    "node_modules/extglob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extsprintf": {
+    "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
       "optional": true
     },
-    "node_modules/file-uri-to-path": {
+    "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/filename-regex": {
+    "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fill-range/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/finalhandler": {
+    "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
       "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -1951,453 +1347,329 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/for-in": {
+    "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/for-own": {
+    "for-own": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/forever-agent": {
+    "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/form-data": {
+    "form-data": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.5",
         "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
       }
     },
-    "node_modules/fragment-cache": {
+    "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/fresh": {
+    "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/fsevents": {
+    "fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "dev": true,
-      "hasInstallScript": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
+      "requires": {
         "bindings": "^1.5.0",
         "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
       }
     },
-    "node_modules/function-bind": {
+    "function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/get-intrinsic": {
+    "get-intrinsic": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
       "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-value": {
+    "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/getpass": {
+    "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/getpass/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/glob": {
+    "glob": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
       "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "inflight": "^1.0.4",
         "inherits": "2",
         "minimatch": "2 || 3",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/glob-base": {
+    "glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-      "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "is-glob": "^2.0.0"
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
       }
     },
-    "node_modules/glob-base/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globals": {
+    "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
       "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/gopd": {
+    "gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/graceful-fs": {
+    "graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/har-schema": {
+    "har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
       "integrity": "sha512-f8xf2GOR6Rgwc9FPTLNzgwB+JQ2/zMauYXSWmX5YV5acex6VomT0ocSuwR7BfXo5MpHi+jL+saaux2fwsGJDKQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "optional": true
     },
-    "node_modules/har-validator": {
+    "har-validator": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha512-5Gbp6RAftMYYV3UEI4c4Vv3+a4dQ7taVyvHt+/L6kRt+f4HX1GweAk5UDWN0SvdVnRBzGQ6OG89pGaD9uSFnVw==",
-      "deprecated": "this library is no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "ajv": "^4.9.1",
         "har-schema": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4"
       }
     },
-    "node_modules/has-ansi": {
+    "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/has-flag": {
+    "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/has-property-descriptors": {
+    "has-property-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
       "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "get-intrinsic": "^1.2.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
+    "has-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/has-symbols": {
+    "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/has-value": {
+    "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/has-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
+    "has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hasown": {
+    "hasown": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
       "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/hawk": {
+    "hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==",
-      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "boom": "2.x.x",
         "cryptiles": "2.x.x",
         "hoek": "2.x.x",
         "sntp": "1.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.32"
       }
     },
-    "node_modules/hexo": {
+    "hexo": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.9.0.tgz",
       "integrity": "sha512-uga6MsxGlD0AeafiObbFkQVWlUO+wWTb/IJVPI3fFpmAJu0PBD//Ek0qVOxHjlzdvFGeW0bYWYqXgDbR7suJng==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "abbrev": "^1.1.1",
         "archy": "^1.0.0",
         "bluebird": "^3.5.2",
@@ -2426,554 +1698,355 @@
         "titlecase": "^1.1.2",
         "warehouse": "^2.2.0"
       },
-      "bin": {
-        "hexo": "bin/hexo"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "hexo-cli": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
+          "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
+          "dev": true,
+          "requires": {
+            "abbrev": "^1.1.1",
+            "acorn": "^6.1.1",
+            "bluebird": "^3.5.3",
+            "chalk": "^2.4.2",
+            "command-exists": "^1.2.8",
+            "hexo-fs": "^1.0.2",
+            "hexo-log": "^0.2.0",
+            "hexo-util": "^0.6.3",
+            "minimist": "^1.2.0",
+            "resolve": "^1.10.0",
+            "tildify": "^1.2.0"
+          }
+        },
+        "hexo-fs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.1",
+            "chokidar": "^2.0.4",
+            "escape-string-regexp": "^1.0.5",
+            "graceful-fs": "^4.1.11"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/hexo-bunyan": {
+    "hexo-bunyan": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-bunyan/-/hexo-bunyan-1.0.0.tgz",
       "integrity": "sha512-RymT8Ck+K77mLt9BEYNb4uyfC7RIQnU5N3laXowMrS28jj2h89VHJCOnhV00mmta4fHRqNa07kP1Hrn17nvMkQ==",
-      "deprecated": "Please see https://github.com/hexojs/hexo-bunyan/issues/17",
       "dev": true,
-      "engines": [
-        "node >=0.10.0"
-      ],
-      "bin": {
-        "bunyan": "bin/bunyan"
-      },
-      "optionalDependencies": {
+      "requires": {
         "moment": "^2.10.6",
         "mv": "~2",
         "safe-json-stringify": "~1"
       }
     },
-    "node_modules/hexo-cli": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
-      "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "abbrev": "^1.1.1",
-        "acorn": "^6.1.1",
-        "bluebird": "^3.5.3",
-        "chalk": "^2.4.2",
-        "command-exists": "^1.2.8",
-        "hexo-fs": "^1.0.2",
-        "hexo-log": "^0.2.0",
-        "hexo-util": "^0.6.3",
-        "minimist": "^1.2.0",
-        "resolve": "^1.10.0",
-        "tildify": "^1.2.0"
-      },
-      "bin": {
-        "hexo": "bin/hexo"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/hexo-fs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "chokidar": "^2.0.4",
-        "escape-string-regexp": "^1.0.5",
-        "graceful-fs": "^4.1.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-front-matter": {
+    "hexo-front-matter": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-0.2.3.tgz",
       "integrity": "sha512-GL/pGfYqsvjMgxjhOWv1zAc7t4JoGUow+CH9Tes/5N2wKxxTzt2woKEMHz1+c01CmhdVYUR4lO3R1ZAcxc0caA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "js-yaml": "^3.6.1"
       }
     },
-    "node_modules/hexo-fs": {
+    "hexo-fs": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-0.2.3.tgz",
       "integrity": "sha512-rLB1rMVUW3csAljvJgHfyjemL0BrmcUZfBf9hJe6S0pA53igFa3ON0PFwomvoLs1Wdmjs9Awnw9Tru4PjWFSlQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.4.0",
         "chokidar": "^1.5.2",
         "escape-string-regexp": "^1.0.5",
         "graceful-fs": "^4.1.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
+        "anymatch": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^2.1.5",
+            "normalize-path": "^2.0.0"
+          },
+          "dependencies": {
+            "micromatch": {
+              "version": "2.3.11",
+              "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+              "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
+              "dev": true,
+              "requires": {
+                "arr-diff": "^2.0.0",
+                "array-unique": "^0.2.1",
+                "braces": "^1.8.2",
+                "expand-brackets": "^0.1.4",
+                "extglob": "^0.3.1",
+                "filename-regex": "^2.0.0",
+                "is-extglob": "^1.0.0",
+                "is-glob": "^2.0.1",
+                "kind-of": "^3.0.2",
+                "normalize-path": "^2.0.1",
+                "object.omit": "^2.0.0",
+                "parse-glob": "^3.0.4",
+                "regex-cache": "^0.4.2"
+              }
+            }
+          }
+        },
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+          "dev": true,
+          "requires": {
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
+          }
+        },
+        "chokidar": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+          "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^1.3.0",
+            "async-each": "^1.0.0",
+            "fsevents": "^1.0.0",
+            "glob-parent": "^2.0.0",
+            "inherits": "^2.0.1",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^2.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.0.0"
+          }
+        },
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
       }
     },
-    "node_modules/hexo-fs/node_modules/chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.0.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^2.0.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-i18n": {
+    "hexo-i18n": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
       "integrity": "sha512-QhVmN/eLohu9UzvrX85zhfL7yN5O4MOkXKYmCRI8GPcg0EczX+blYYmMCugZKu/NIJ9XD5/etAVWCi/5F+fS6g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "sprintf-js": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
       }
     },
-    "node_modules/hexo-inject": {
+    "hexo-inject": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-inject/-/hexo-inject-1.0.0.tgz",
       "integrity": "sha512-Ly0k7FO3G5+XNvFNE7yjSENSWy8QTnzl8cNFWYuMXRYMogbHd/Q0Ane8WCKYb5QD/A+WXC3rHb32wIGb0YAfVw==",
-      "deprecated": "The author does not use Hexo any more. This plugin is no longer maintained.",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-plugin-transform-decorators-legacy": "^1.3.4",
         "babel-polyfill": "^6.7.2",
         "bluebird": "^3.3.4",
@@ -2981,445 +2054,382 @@
         "underscore": "^1.8.3"
       }
     },
-    "node_modules/hexo-log": {
+    "hexo-log": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-0.2.0.tgz",
       "integrity": "sha512-fzoc+GQexxPPILTjoOQILnA3ZG2MFgqMBVel4xvJ11pXptw9+f97ynTgDAExXafyp9Nz2ChXRuqlCYgPtZSlxQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "chalk": "^1.1.1",
         "hexo-bunyan": "^1.0.0"
       }
     },
-    "node_modules/hexo-prism-plus": {
+    "hexo-prism-plus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-prism-plus/-/hexo-prism-plus-1.1.0.tgz",
       "integrity": "sha512-lkDJRZDVN3iNpYtuwrI+JFLj3rSa4PeMwz1OlVfUOkY6CyjD/D3dGtW7cTpcxYejr3/JWjusIqWVnUTLpKr4Yw==",
       "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
+      "requires": {
         "hexo-fs": "^1.0.0",
         "hexo-inject": "^1.0.0",
         "hexo-util": "^0.6.3",
         "lodash": "^4.17.11"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
       "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "hexo-fs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.1",
+            "chokidar": "^2.0.4",
+            "escape-string-regexp": "^1.0.5",
+            "graceful-fs": "^4.1.11"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/hexo-fs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "chokidar": "^2.0.4",
-        "escape-string-regexp": "^1.0.5",
-        "graceful-fs": "^4.1.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-renderer-ejs": {
+    "hexo-renderer-ejs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-1.0.0.tgz",
       "integrity": "sha512-O925i69FG4NYO62oWORcPhRZZX0sPx1SXGKUS5DaR/lzajyiXH5i2sqnkj0ya0rNLXIy/D7Xmt7WbFyuQx/kKQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ejs": "^2.6.1"
-      },
-      "engines": {
-        "node": ">=8.6.0"
       }
     },
-    "node_modules/hexo-renderer-less": {
+    "hexo-renderer-less": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-less/-/hexo-renderer-less-0.2.0.tgz",
       "integrity": "sha512-mhkwGsrLPG1e0bpE40FSRufaDHJ4uDtTYNUIQDBYR3aZkbOxAnpN607BTjymr/F+4uYy0cd7MK4y5vFx5pEDQw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "less": "^2.5.1"
       }
     },
-    "node_modules/hexo-renderer-marked": {
+    "hexo-renderer-marked": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-marked/-/hexo-renderer-marked-2.0.0.tgz",
       "integrity": "sha512-+LMjgPkJSUAOlWYHJnBXxUHwGqemGNlK/I+JNO4zA5rEHWNWZ9wNAZKd5g0lEVdMAZzAV54gCylXGURgMO4IAw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hexo-util": "1.0.0",
         "marked": "^0.7.0",
         "strip-indent": "^3.0.0"
       },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-renderer-marked/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "hexo-util": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
+          "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.2",
+            "camel-case": "^3.0.0",
+            "cross-spawn": "^6.0.5",
+            "highlight.js": "^9.13.1",
+            "html-entities": "^1.2.1",
+            "striptags": "^3.1.1"
+          }
+        },
+        "striptags": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
+          "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/hexo-renderer-marked/node_modules/hexo-util": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
-      "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.2",
-        "camel-case": "^3.0.0",
-        "cross-spawn": "^6.0.5",
-        "highlight.js": "^9.13.1",
-        "html-entities": "^1.2.1",
-        "striptags": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-renderer-marked/node_modules/striptags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
-      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
-      "dev": true
-    },
-    "node_modules/hexo-server": {
+    "hexo-server": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-server/-/hexo-server-1.0.0.tgz",
       "integrity": "sha512-eSY+a5oiGCG/3T6FrdrNRBkttMLJkM+oitY6ZMFowjcBiG2VNEhQmfWUDOykfvApZs4wPYBb//uXD/58tfe3mA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.5.5",
         "chalk": "^2.4.2",
         "compression": "^1.7.4",
@@ -3429,66 +2439,50 @@
         "open": "^6.3.0",
         "serve-static": "^1.14.1"
       },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-server/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "mime": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/hexo-server/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-server/node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/hexo-server/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-util": {
+    "hexo-util": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-0.6.3.tgz",
       "integrity": "sha512-zPxaqCWZz3/25SAB4FlrRtWktJ+Pr+vBiv/nyHpXKgXPt1m70liViKlRwWLqDmRjJ72x6/k4qCEeXHajvcGHUw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.4.0",
         "camel-case": "^3.0.0",
         "cross-spawn": "^4.0.0",
@@ -3497,958 +2491,406 @@
         "striptags": "^2.1.1"
       }
     },
-    "node_modules/hexo-versioned-netlify-redirects": {
+    "hexo-versioned-netlify-redirects": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-versioned-netlify-redirects/-/hexo-versioned-netlify-redirects-1.1.0.tgz",
       "integrity": "sha512-kfY19ZZDwBnRaZFA6KQgt5DhVBpTQG1yBoq01zaACFHIFuSd9OjhiHCkJ3it+TMvGl+JGTtgKhIwZoQUJHyv/g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "url-join": "^4.0.0"
       }
     },
-    "node_modules/hexo/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/hexo/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/hexo/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/hexo/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/hexo-fs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "chokidar": "^2.0.4",
-        "escape-string-regexp": "^1.0.5",
-        "graceful-fs": "^4.1.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/hexo/node_modules/strip-indent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/highlight.js": {
+    "highlight.js": {
       "version": "9.18.5",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
       "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
-      "deprecated": "Support has ended for 9.x series. Upgrade to @latest",
-      "dev": true,
-      "hasInstallScript": true,
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/hoek": {
+    "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.40"
-      }
+      "optional": true
     },
-    "node_modules/html-entities": {
+    "html-entities": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
       "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
-    "node_modules/htmlparser2": {
+    "htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "domelementtype": "^1.3.1",
         "domhandler": "^2.3.0",
         "domutils": "^1.5.1",
         "entities": "^1.1.1",
         "inherits": "^2.0.1",
         "readable-stream": "^3.1.1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
       },
-      "engines": {
-        "node": ">= 6"
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
-    "node_modules/http-errors": {
+    "http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
-      "engines": {
-        "node": ">= 0.8"
+      "dependencies": {
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/http-errors/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-signature": {
+    "http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^0.2.0",
         "jsprim": "^1.2.2",
         "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
       }
     },
-    "node_modules/image-size": {
+    "image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "optional": true
     },
-    "node_modules/inflight": {
+    "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
-    "node_modules/inherits": {
+    "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/invariant": {
+    "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "loose-envify": "^1.0.0"
       }
     },
-    "node_modules/is-accessor-descriptor": {
+    "is-accessor-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
       "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
       }
     },
-    "node_modules/is-binary-path": {
+    "is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-buffer": {
+    "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "node_modules/is-core-module": {
+    "is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
       "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-data-descriptor": {
+    "is-data-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
       "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/is-descriptor": {
+    "is-descriptor": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/is-dotfile": {
+    "is-dotfile": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-equal-shallow": {
+    "is-equal-shallow": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-primitive": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-extendable": {
+    "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-extglob": {
+    "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-glob": {
+    "is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-plain-object": {
+    "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/is-plain-object/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-posix-bracket": {
+    "is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-primitive": {
+    "is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-typedarray": {
+    "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/is-windows": {
+    "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-wsl": {
+    "is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
       "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/isarray": {
+    "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "node_modules/isexe": {
+    "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "node_modules/isobject": {
+    "isobject": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
+    "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true,
       "optional": true
     },
-    "node_modules/js-tokens": {
+    "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
       "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
       "dev": true
     },
-    "node_modules/js-yaml": {
+    "js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
+    "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/json-schema": {
+    "json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/json-stable-stringify": {
+    "json-stable-stringify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz",
       "integrity": "sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.5",
         "isarray": "^2.0.5",
         "jsonify": "^0.0.1",
         "object-keys": "^1.1.1"
       },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/json-stable-stringify/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/json-stringify-safe": {
+    "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/jsonify": {
+    "jsonify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
       "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
       "dev": true,
-      "optional": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/jsonparse": {
+    "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ],
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "license": "(MIT OR Apache-2.0)",
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/jsprim": {
+    "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
         "json-schema": "0.4.0",
         "verror": "1.10.0"
       },
-      "engines": {
-        "node": ">=0.6.0"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/jsprim/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/kind-of": {
+    "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/lazy-cache": {
+    "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
       "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/less": {
+    "less": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
       "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
       "dev": true,
-      "bin": {
-        "lessc": "bin/lessc"
-      },
-      "engines": {
-        "node": ">=0.12"
-      },
-      "optionalDependencies": {
+      "requires": {
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
@@ -4459,438 +2901,493 @@
         "source-map": "^0.5.3"
       }
     },
-    "node_modules/lodash": {
+    "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.assignin": {
+    "lodash.assignin": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
       "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.bind": {
+    "lodash.bind": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
       "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.defaults": {
+    "lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
       "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.filter": {
+    "lodash.filter": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
       "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.flatten": {
+    "lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
       "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.foreach": {
+    "lodash.foreach": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
       "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.map": {
+    "lodash.map": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
       "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.merge": {
+    "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.pick": {
+    "lodash.pick": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
       "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
-      "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.reduce": {
+    "lodash.reduce": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
       "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.reject": {
+    "lodash.reject": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
       "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.some": {
+    "lodash.some": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
       "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/longest": {
+    "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
       "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/loose-envify": {
+    "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
       }
     },
-    "node_modules/lower-case": {
+    "lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
       "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
       "dev": true
     },
-    "node_modules/lru-cache": {
+    "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
       }
     },
-    "node_modules/map-cache": {
+    "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/map-visit": {
+    "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/markdown": {
+    "markdown": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
       "integrity": "sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "nopt": "~2.1.1"
-      },
-      "bin": {
-        "md2html": "bin/md2html.js"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/marked": {
+    "marked": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
       "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/math-random": {
+    "math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-diff": "^2.0.0",
-        "array-unique": "^0.2.1",
-        "braces": "^1.8.2",
-        "expand-brackets": "^0.1.4",
-        "extglob": "^0.3.1",
-        "filename-regex": "^2.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "normalize-path": "^2.0.1",
-        "object.omit": "^2.0.0",
-        "parse-glob": "^3.0.4",
-        "regex-cache": "^0.4.2"
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/micromatch/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mime": {
+    "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/mime-db": {
+    "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/mime-types": {
+    "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/min-indent": {
+    "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/minimatch": {
+    "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/minimist": {
+    "minimist": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/mixin-deep": {
+    "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
-    "node_modules/mkdirp": {
+    "mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/moment": {
+    "moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/moment-timezone": {
-      "version": "0.5.43",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
-      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
+    "moment-timezone": {
+      "version": "0.5.47",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz",
+      "integrity": "sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "moment": "^2.29.4"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/morgan": {
+    "morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
       "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-finished": "~2.3.0",
         "on-headers": "~1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/ms": {
+    "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/mv": {
+    "mv": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
       "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "mkdirp": "~0.5.1",
         "ncp": "~2.0.0",
         "rimraf": "~2.4.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/nan": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
-      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
+    "nan": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/nanomatch": {
+    "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
         "define-property": "^2.0.2",
@@ -4903,550 +3400,410 @@
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/nanomatch/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ncp": {
+    "ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
       "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "ncp": "bin/ncp"
-      }
+      "optional": true
     },
-    "node_modules/negotiator": {
+    "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/nice-try": {
+    "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node_modules/no-case": {
+    "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lower-case": "^1.1.1"
       }
     },
-    "node_modules/node-fingerprint": {
+    "node-fingerprint": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/node-fingerprint/-/node-fingerprint-0.0.2.tgz",
       "integrity": "sha512-vPFfTD5EBJieQ4SI3v61fWxlV1kav3m9Dbejd6CjWhOJn8s+XMxpOOosCNAyIrUQ/jJOlPndfrZ0lSw4+RgwcA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/nopt": {
+    "nopt": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
       "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
       }
     },
-    "node_modules/normalize-path": {
+    "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/nth-check": {
+    "nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
       "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
+      "requires": {
         "boolbase": "~1.0.0"
       }
     },
-    "node_modules/nunjucks": {
+    "nunjucks": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
       "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
         "commander": "^5.1.0"
-      },
-      "bin": {
-        "nunjucks-precompile": "bin/precompile"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.3.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
       }
     },
-    "node_modules/oauth-sign": {
+    "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
       "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/object-assign": {
+    "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/object-copy": {
+    "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
         "kind-of": "^3.0.3"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/object-keys": {
+    "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
+      "optional": true
     },
-    "node_modules/object-visit": {
+    "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/object-visit/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.omit": {
+    "object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/object.pick": {
+    "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/object.pick/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/on-finished": {
+    "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/on-headers": {
+    "on-headers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/once": {
+    "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "wrappy": "1"
       }
     },
-    "node_modules/open": {
+    "open": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
       "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-wsl": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=8"
       }
     },
-    "node_modules/optimist": {
+    "optimist": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
       "dev": true,
-      "license": "MIT/X11",
-      "dependencies": {
+      "requires": {
         "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/optimist/node_modules/minimist": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/os-homedir": {
+    "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/parse-glob": {
+    "parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
         "is-extglob": "^1.0.0",
         "is-glob": "^2.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-glob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-glob/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
       }
     },
-    "node_modules/parseurl": {
+    "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/pascalcase": {
+    "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/path-dirname": {
+    "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
       "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
       "dev": true
     },
-    "node_modules/path-is-absolute": {
+    "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/path-key": {
+    "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/path-parse": {
+    "path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "node_modules/performance-now": {
+    "performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
       "integrity": "sha512-YHk5ez1hmMR5LOkb9iJkLKqoBlL7WD5M8ljC75ZfzXriuBIVNuecaXuU7e+hOwyqf24Wxhh7Vxgt7Hnw9288Tg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/posix-character-classes": {
+    "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/preserve": {
+    "preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/pretty-hrtime": {
+    "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/process-nextick-args": {
+    "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "node_modules/promise": {
+    "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asap": "~2.0.3"
       }
     },
-    "node_modules/prr": {
+    "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/pseudomap": {
+    "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
-    "node_modules/punycode": {
+    "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
       "dev": true,
       "optional": true
     },
-    "node_modules/qs": {
+    "qs": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.1.tgz",
       "integrity": "sha512-LQy1Q1fcva/UsnP/6Iaa4lVeM49WiOitu2T4hZCyA/elLKu37L99qcBJk4VCCk+rdLvnMzfKyiN3SZTqdAZGSQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.6"
-      }
+      "optional": true
     },
-    "node_modules/randomatic": {
+    "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
         "math-random": "^1.0.1"
       },
-      "engines": {
-        "node": ">= 0.10.0"
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/randomatic/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/randomatic/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/range-parser": {
+    "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/readable-stream": {
+    "readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
         "isarray": "~1.0.0",
@@ -5456,339 +3813,277 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/readdirp": {
+    "readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
         "readable-stream": "^2.0.2"
       },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/readdirp/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
       "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regenerator-runtime": {
+    "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
-    "node_modules/regex-cache": {
+    "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-equal-shallow": "^0.1.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/regex-not": {
+    "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/remove-trailing-separator": {
+    "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
-    "node_modules/repeat-element": {
+    "repeat-element": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/repeat-string": {
+    "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
+      "dev": true
     },
-    "node_modules/request": {
+    "request": {
       "version": "2.81.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
       "integrity": "sha512-IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "aws-sign2": "~0.6.0",
         "aws4": "^1.2.1",
         "caseless": "~0.12.0",
@@ -5811,115 +4106,91 @@
         "tough-cookie": "~2.3.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 4"
       }
     },
-    "node_modules/resolve": {
+    "resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/resolve-url": {
+    "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "node_modules/ret": {
+    "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
+      "dev": true
     },
-    "node_modules/right-align": {
+    "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
       "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "align-text": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
+    "rimraf": {
       "version": "2.4.5",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
       "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "glob": "^6.0.1"
-      },
-      "bin": {
-        "rimraf": "bin.js"
       }
     },
-    "node_modules/safe-buffer": {
+    "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
-    "node_modules/safe-json-stringify": {
+    "safe-json-stringify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
       "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/safe-regex": {
+    "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ret": "~0.1.10"
       }
     },
-    "node_modules/safer-buffer": {
+    "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/semver": {
+    "semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
+      "dev": true
     },
-    "node_modules/send": {
+    "send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
       "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -5934,128 +4205,105 @@
         "range-parser": "~1.2.1",
         "statuses": "2.0.1"
       },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
       "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/send/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/serve-static": {
+    "serve-static": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
       "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
         "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/set-function-length": {
+    "set-function-length": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
       "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "define-data-property": "^1.1.1",
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/set-value": {
+    "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
         "is-plain-object": "^2.0.3",
         "split-string": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/setprototypeof": {
+    "setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
-    "node_modules/shebang-command": {
+    "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/shebang-regex": {
+    "shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/snapdragon": {
+    "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
         "define-property": "^0.2.5",
@@ -6065,124 +4313,96 @@
         "source-map-resolve": "^0.5.0",
         "use": "^3.1.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/snapdragon-node": {
+    "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
         "snapdragon-util": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
+    "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sntp": {
+    "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==",
-      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "hoek": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/source-map": {
+    "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/source-map-resolve": {
+    "source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
@@ -6190,39 +4410,34 @@
         "urix": "^0.1.0"
       }
     },
-    "node_modules/source-map-url": {
+    "source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
-    "node_modules/split-string": {
+    "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
     },
-    "node_modules/sshpk": {
+    "sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
         "bcrypt-pbkdf": "^1.0.0",
@@ -6233,576 +4448,447 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/sshpk/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/static-extend": {
+    "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/statuses": {
+    "statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/string_decoder": {
+    "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "safe-buffer": "~5.1.0"
       }
     },
-    "node_modules/stringstream": {
+    "stringstream": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/strip-ansi": {
+    "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-indent": {
+    "strip-indent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
       "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
       }
     },
-    "node_modules/striptags": {
+    "striptags": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz",
       "integrity": "sha512-vZTvmFP0IYu/zn8MXV6PrLb6VKbd9WGSEnlm4D5RNXS/+zYYlHrSfJgoBw1w56D6RJCr515er3BittRGQqihLA==",
       "dev": true
     },
-    "node_modules/supports-color": {
+    "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/supports-preserve-symlinks-flag": {
+    "supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/swig-extras": {
+    "swig-extras": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
       "integrity": "sha512-mFgpjjcQ0Kj+WplOrnWfUEw8iehZMD78sRId6uMXaTlWpy/vt8PTv3GoNsHrHBpZNnPnIsoWxrmRbS3vePjWpA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "markdown": "~0.5.0"
       }
     },
-    "node_modules/swig-templates": {
+    "swig-templates": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
       "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
-      "deprecated": "unmaintained",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "optimist": "~0.6",
         "uglify-js": "2.6.0"
-      },
-      "bin": {
-        "swig": "bin/swig.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/text-table": {
+    "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "node_modules/through": {
+    "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/tildify": {
+    "tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
       "integrity": "sha512-Y9q1GaV/BO65Z9Yf4NOGMuwt3SGdptkZBnaaKfTQakrDyCLiuO1Kc5wxW4xLdsjzunRtqtOdhekiUFmZbklwYQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "os-homedir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/titlecase": {
+    "titlecase": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.3.tgz",
       "integrity": "sha512-pQX4oiemzjBEELPqgK4WE+q0yhAqjp/yzusGtlSJsOuiDys0RQxggepYmo0BuegIDppYS3b3cpdegRwkpyN3hw==",
-      "dev": true,
-      "bin": {
-        "to-title-case": "bin.js"
-      }
+      "dev": true
     },
-    "node_modules/to-fast-properties": {
+    "to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/to-object-path": {
+    "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/to-regex": {
+    "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/to-regex-range": {
+    "to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex-range/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/toidentifier": {
+    "toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
+      "dev": true
     },
-    "node_modules/tough-cookie": {
+    "tough-cookie": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "punycode": "^1.4.1"
-      },
-      "engines": {
-        "node": ">=0.8"
       }
     },
-    "node_modules/tunnel-agent": {
+    "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/tweetnacl": {
+    "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/uglify-js": {
+    "uglify-js": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
       "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
+      "requires": {
         "async": "~0.2.6",
         "source-map": "~0.5.1",
         "uglify-to-browserify": "~1.0.0",
         "yargs": "~3.10.0"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/uglify-to-browserify": {
+    "uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
       "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/underscore": {
+    "underscore": {
       "version": "1.13.6",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
       "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
       "dev": true
     },
-    "node_modules/union-value": {
+    "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/unpipe": {
+    "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/unset-value": {
+    "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-      "dev": true,
       "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
+    "upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
+      "dev": true
     },
-    "node_modules/upper-case": {
+    "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
       "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
       "dev": true
     },
-    "node_modules/urix": {
+    "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "node_modules/url-join": {
+    "url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
       "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
       "dev": true
     },
-    "node_modules/use": {
+    "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/util-deprecate": {
+    "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "node_modules/utils-merge": {
+    "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
+      "dev": true
     },
-    "node_modules/uuid": {
+    "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
+      "optional": true
     },
-    "node_modules/vary": {
+    "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/verror": {
+    "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/verror/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/verror/node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/warehouse": {
+    "warehouse": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz",
       "integrity": "sha512-axyo83DpdZabmCsiipkHYKnwl6ull2Vv7fqxMnV8KOQLdiJKffn9W+B3Yac7QVWzBE56Q6B6j2cIY1k2gc10PA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
+        "JSONStream": "^1.0.7",
         "bluebird": "^3.2.2",
         "cuid": "~1.3.8",
         "graceful-fs": "^4.1.3",
         "is-plain-object": "^2.0.1",
-        "JSONStream": "^1.0.7",
         "lodash": "^4.2.1"
       }
     },
-    "node_modules/which": {
+    "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
       }
     },
-    "node_modules/window-size": {
+    "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
       "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/wordwrap": {
+    "wordwrap": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
       "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "dev": true
     },
-    "node_modules/wrappy": {
+    "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "optional": true
     },
-    "node_modules/yallist": {
+    "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
-    "node_modules/yargs": {
+    "yargs": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
       "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "camelcase": "^1.0.2",
         "cliui": "^2.1.0",
         "decamelize": "^1.0.0",

From 8e386d83c16f1e100a4801bbf0b8a55491a76f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 29 Jan 2025 15:56:17 +0100
Subject: [PATCH 1007/1140] revert security changes on docs and guides apps

---
 docs/package-lock.json  | 117 +----
 guide/package-lock.json | 930 ++++++++++++++--------------------------
 2 files changed, 322 insertions(+), 725 deletions(-)

diff --git a/docs/package-lock.json b/docs/package-lock.json
index d9945d9314..7965d6e9ba 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1058,13 +1058,10 @@
       "dev": true
     },
     "ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "dev": true,
-      "requires": {
-        "jake": "^10.8.5"
-      }
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
+      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
+      "dev": true
     },
     "emoji-regex": {
       "version": "7.0.3",
@@ -1210,35 +1207,6 @@
       "dev": true,
       "optional": true
     },
-    "filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "dev": true,
-      "requires": {
-        "minimatch": "^5.0.1"
-      },
-      "dependencies": {
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "5.1.6",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        }
-      }
-    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -2393,12 +2361,12 @@
       }
     },
     "hexo-renderer-ejs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-2.0.0.tgz",
-      "integrity": "sha512-qCjE1IdwgDgv65qyb0KMVCwCdSVAkH0vwAe9XihjvaKWkmb9dtt8DgErOdqCXn0HReSyWiEVP2BrLRj3gyHwOQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-1.0.0.tgz",
+      "integrity": "sha512-O925i69FG4NYO62oWORcPhRZZX0sPx1SXGKUS5DaR/lzajyiXH5i2sqnkj0ya0rNLXIy/D7Xmt7WbFyuQx/kKQ==",
       "dev": true,
       "requires": {
-        "ejs": "^3.1.6"
+        "ejs": "^2.6.1"
       }
     },
     "hexo-renderer-less": {
@@ -2838,75 +2806,6 @@
       "dev": true,
       "optional": true
     },
-    "jake": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
-      "dev": true,
-      "requires": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "async": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-          "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
diff --git a/guide/package-lock.json b/guide/package-lock.json
index b8a97f4379..a72419e298 100644
--- a/guide/package-lock.json
+++ b/guide/package-lock.json
@@ -14,211 +14,7 @@
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-theme-hexo/-/meteor-theme-hexo-2.0.8.tgz",
       "integrity": "sha512-LQIFN05wBMjX7SXgW5CFVTfolDWMuknoypwQ0czl/44LYRBR4/LYZUgX6c+1vLjloJb+5+2HTvMGlVN9Wo1MKA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": {
-          "version": "1.0.9",
-          "requires": {
-            "sprintf-js": "~1.0.2"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0"
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "requires": {
-            "inherits": "~2.0.0"
-          }
-        },
-        "bluebird": {
-          "version": "3.5.1"
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1"
-        },
-        "debug": {
-          "version": "3.1.0",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "esprima": {
-          "version": "4.0.0"
-        },
-        "fs-extra": {
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0"
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11"
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3"
-        },
-        "interpret": {
-          "version": "1.1.0"
-        },
-        "js-yaml": {
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8"
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0"
-        },
-        "once": {
-          "version": "1.4.0",
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-tmpdir": {
-          "version": "1.0.2"
-        },
-        "path-is-absolute": {
-          "version": "1.0.1"
-        },
-        "path-parse": {
-          "version": "1.0.5"
-        },
-        "rechoir": {
-          "version": "0.6.2",
-          "requires": {
-            "resolve": "^1.1.6"
-          }
-        },
-        "resolve": {
-          "version": "1.5.0",
-          "requires": {
-            "path-parse": "^1.0.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.2",
-          "requires": {
-            "glob": "^7.0.5"
-          }
-        },
-        "shelljs": {
-          "requires": {
-            "glob": "^7.0.0",
-            "interpret": "^1.0.0",
-            "rechoir": "^0.6.2"
-          }
-        },
-        "simple-git": {
-          "requires": {
-            "debug": "^3.1.0"
-          }
-        },
-        "sprintf-js": {
-          "version": "1.0.3"
-        },
-        "tar": {
-          "version": "2.2.1",
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.2",
-            "inherits": "2"
-          }
-        },
-        "tarball-extract": {
-          "requires": {
-            "tar": "2.2.1",
-            "wget": "*"
-          }
-        },
-        "tmp": {
-          "version": "0.0.33",
-          "requires": {
-            "os-tmpdir": "~1.0.2"
-          }
-        },
-        "tmp-promise": {
-          "requires": {
-            "bluebird": "^3.5.0",
-            "tmp": "0.0.33"
-          }
-        },
-        "tunnel": {
-          "version": "0.0.2"
-        },
-        "universalify": {
-          "version": "0.1.1"
-        },
-        "wget": {
-          "version": "0.0.1",
-          "requires": {
-            "tunnel": "0.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2"
-        }
-      }
+      "dev": true
     },
     "JSONStream": {
       "version": "1.3.5",
@@ -292,6 +88,16 @@
       "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
       "dev": true
     },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "requires": {
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
+      }
+    },
     "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
@@ -645,6 +451,17 @@
         "concat-map": "0.0.1"
       }
     },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+      "dev": true,
+      "requires": {
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
+      }
+    },
     "browser-fingerprint": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
@@ -795,6 +612,23 @@
         }
       }
     },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "fsevents": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
+      }
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -1243,30 +1077,6 @@
       "dev": true,
       "requires": {
         "fill-range": "^2.1.0"
-      },
-      "dependencies": {
-        "fill-range": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-          "dev": true,
-          "requires": {
-            "is-number": "^2.1.0",
-            "isobject": "^2.0.0",
-            "randomatic": "^3.0.0",
-            "repeat-element": "^1.1.2",
-            "repeat-string": "^1.5.2"
-          }
-        },
-        "is-number": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-          "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        }
       }
     },
     "extend": {
@@ -1304,14 +1114,6 @@
       "dev": true,
       "requires": {
         "is-extglob": "^1.0.0"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-          "dev": true
-        }
       }
     },
     "extsprintf": {
@@ -1334,6 +1136,19 @@
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
       "dev": true
     },
+    "fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "dev": true,
+      "requires": {
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
+      }
+    },
     "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -1475,32 +1290,15 @@
       "requires": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^2.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        }
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^2.0.0"
       }
     },
     "globals": {
@@ -1735,6 +1533,12 @@
             }
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
         "array-unique": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -1757,6 +1561,17 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "chalk": {
@@ -1790,13 +1605,85 @@
             "upath": "^1.1.1"
           }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "fill-range": {
@@ -1809,6 +1696,17 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
         "glob-parent": {
@@ -1863,6 +1761,31 @@
             "graceful-fs": "^4.1.11"
           }
         },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -1870,6 +1793,17 @@
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
         "isobject": {
@@ -1878,6 +1812,39 @@
           "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
           "dev": true
         },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -1887,12 +1854,6 @@
             "ansi-regex": "^4.1.0"
           }
         },
-        "strip-indent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-          "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-          "dev": true
-        },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1934,102 +1895,6 @@
         "chokidar": "^1.5.2",
         "escape-string-regexp": "^1.0.5",
         "graceful-fs": "^4.1.4"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^2.1.5",
-            "normalize-path": "^2.0.0"
-          },
-          "dependencies": {
-            "micromatch": {
-              "version": "2.3.11",
-              "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-              "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
-              "dev": true,
-              "requires": {
-                "arr-diff": "^2.0.0",
-                "array-unique": "^0.2.1",
-                "braces": "^1.8.2",
-                "expand-brackets": "^0.1.4",
-                "extglob": "^0.3.1",
-                "filename-regex": "^2.0.0",
-                "is-extglob": "^1.0.0",
-                "is-glob": "^2.0.1",
-                "kind-of": "^3.0.2",
-                "normalize-path": "^2.0.1",
-                "object.omit": "^2.0.0",
-                "parse-glob": "^3.0.4",
-                "regex-cache": "^0.4.2"
-              }
-            }
-          }
-        },
-        "braces": {
-          "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
-          "dev": true,
-          "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
-          }
-        },
-        "chokidar": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-          "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^1.3.0",
-            "async-each": "^1.0.0",
-            "fsevents": "^1.0.0",
-            "glob-parent": "^2.0.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^2.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0"
-          }
-        },
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^2.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
       }
     },
     "hexo-i18n": {
@@ -2305,6 +2170,21 @@
             "is-data-descriptor": "^1.0.1"
           }
         },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -2357,6 +2237,12 @@
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
           }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
         }
       }
     },
@@ -2416,6 +2302,15 @@
             "striptags": "^3.1.1"
           }
         },
+        "strip-indent": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+          "dev": true,
+          "requires": {
+            "min-indent": "^1.0.0"
+          }
+        },
         "striptags": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
@@ -2686,18 +2581,27 @@
       "dev": true
     },
     "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
       "dev": true
     },
     "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.1"
+        "is-extglob": "^1.0.0"
+      }
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
       }
     },
     "is-plain-object": {
@@ -3047,213 +2951,24 @@
       "dev": true
     },
     "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.7",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^1.0.1",
-                "is-data-descriptor": "^1.0.1"
-              }
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.1",
-            "is-data-descriptor": "^1.0.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
+        "arr-diff": "^2.0.0",
+        "array-unique": "^0.2.1",
+        "braces": "^1.8.2",
+        "expand-brackets": "^0.1.4",
+        "extglob": "^0.3.1",
+        "filename-regex": "^2.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "normalize-path": "^2.0.1",
+        "object.omit": "^2.0.0",
+        "parse-glob": "^3.0.4",
+        "regex-cache": "^0.4.2"
       }
     },
     "mime": {
@@ -3336,9 +3051,9 @@
       "dev": true
     },
     "moment-timezone": {
-      "version": "0.5.47",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz",
-      "integrity": "sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==",
+      "version": "0.5.43",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
+      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
       "dev": true,
       "requires": {
         "moment": "^2.29.4"
@@ -3376,9 +3091,9 @@
       }
     },
     "nan": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
-      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
       "dev": true,
       "optional": true
     },
@@ -3465,10 +3180,13 @@
       }
     },
     "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
     },
     "nth-check": {
       "version": "1.0.2",
@@ -3644,23 +3362,6 @@
         "is-dotfile": "^1.0.0",
         "is-extglob": "^1.0.0",
         "is-glob": "^2.0.0"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        }
       }
     },
     "parseurl": {
@@ -4511,13 +4212,10 @@
       }
     },
     "strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "requires": {
-        "min-indent": "^1.0.0"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
+      "dev": true
     },
     "striptags": {
       "version": "2.2.1",

From a102e9cf9afc70516bd96f8e87f4d06725a6a533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 29 Jan 2025 15:58:10 +0100
Subject: [PATCH 1008/1140] revert node version

---
 .github/workflows/docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index afaed0dbe1..dc85db922f 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 12.x
       - name: Build the Docs
         run: npm ci && npm run build
       - name: Deploy to Netlify for preview

From b42bfd6678c3a6be4f06a6d50216194eb3f5956b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 29 Jan 2025 16:00:34 +0100
Subject: [PATCH 1009/1140] revert npm version

---
 docs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/package.json b/docs/package.json
index 18bbaee387..79c7f3bf31 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -11,7 +11,7 @@
     "handlebars": "4.7.7",
     "hexo": "3.9.0",
     "hexo-prism-plus": "1.1.0",
-    "hexo-renderer-ejs": "2.0.0",
+    "hexo-renderer-ejs": "1.0.0",
     "hexo-renderer-less": "0.2.0",
     "hexo-renderer-marked": "2.0.0",
     "hexo-server": "1.0.0",

From 15b1aa41a8405f8bb07ef546d29a395ab0a1474a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 29 Jan 2025 16:07:02 +0100
Subject: [PATCH 1010/1140] revert guide package lock

---
 guide/package-lock.json | 6460 +++++++++++++--------------------------
 1 file changed, 2122 insertions(+), 4338 deletions(-)

diff --git a/guide/package-lock.json b/guide/package-lock.json
index b9073abdc7..a72419e298 100644
--- a/guide/package-lock.json
+++ b/guide/package-lock.json
@@ -1,766 +1,299 @@
 {
   "name": "meteor-guide",
   "version": "1.0.0",
-  "lockfileVersion": 3,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "meteor-guide",
-      "version": "1.0.0",
-      "devDependencies": {
-        "@meteorjs/meteor-hexo-config": "1.0.14",
-        "@meteorjs/meteor-theme-hexo": "2.0.8",
-        "chexo": "1.0.7",
-        "hexo": "3.9.0",
-        "hexo-prism-plus": "1.1.0",
-        "hexo-renderer-ejs": "1.0.0",
-        "hexo-renderer-less": "0.2.0",
-        "hexo-renderer-marked": "2.0.0",
-        "hexo-server": "1.0.0",
-        "hexo-versioned-netlify-redirects": "1.1.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-hexo-config": {
+  "dependencies": {
+    "@meteorjs/meteor-hexo-config": {
       "version": "1.0.14",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-hexo-config/-/meteor-hexo-config-1.0.14.tgz",
       "integrity": "sha512-Vl4cEMEoVw2JV8qTBsqaq+YL7MRHasTtE88WJa5BGBYMfN35Yk0yeYwVc2OTFJ/cGiQcPEaC0RvRKVyNJfwIGQ==",
       "dev": true
     },
-    "node_modules/@meteorjs/meteor-theme-hexo": {
+    "@meteorjs/meteor-theme-hexo": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/@meteorjs/meteor-theme-hexo/-/meteor-theme-hexo-2.0.8.tgz",
       "integrity": "sha512-LQIFN05wBMjX7SXgW5CFVTfolDWMuknoypwQ0czl/44LYRBR4/LYZUgX6c+1vLjloJb+5+2HTvMGlVN9Wo1MKA==",
+      "dev": true
+    },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
-      "hasShrinkwrap": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-      "extraneous": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
       }
     },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "extraneous": true,
-      "dependencies": {
-        "inherits": "~2.0.0"
-      },
-      "engines": {
-        "node": "0.4 || >=0.5.8"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "extraneous": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "extraneous": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-      "extraneous": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-      "extraneous": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "extraneous": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "extraneous": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "extraneous": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/interpret": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-      "extraneous": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "extraneous": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "extraneous": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "extraneous": true,
-      "dependencies": {
-        "minimist": "0.0.8"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "extraneous": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "extraneous": true,
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/resolve": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-      "extraneous": true,
-      "dependencies": {
-        "path-parse": "^1.0.5"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "extraneous": true,
-      "dependencies": {
-        "glob": "^7.0.5"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/shelljs": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz",
-      "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==",
-      "extraneous": true,
-      "dependencies": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      },
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/simple-git": {
-      "version": "1.89.0",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz",
-      "integrity": "sha1-71L+c01QYFZs4Yeyu6zjbCMj40w=",
-      "extraneous": true,
-      "dependencies": {
-        "debug": "^3.1.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
-      "extraneous": true,
-      "dependencies": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tarball-extract": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tarball-extract/-/tarball-extract-0.0.6.tgz",
-      "integrity": "sha1-FQ5sAR3mdkeRn67CUDVhHGdh/RA=",
-      "extraneous": true,
-      "dependencies": {
-        "tar": "2.2.1",
-        "wget": "*"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "extraneous": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tmp-promise": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.4.tgz",
-      "integrity": "sha512-76r7LZhAvRJ3kLD/xrPSEGb3aq0tirzMLJKhcchKSkQIiEgXB+RouC0ygReuZX+oiA64taGo+j+1gHTKSG8/Mg==",
-      "extraneous": true,
-      "dependencies": {
-        "bluebird": "^3.5.0",
-        "tmp": "0.0.33"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/tunnel": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz",
-      "integrity": "sha1-8jvNi3p7ioZCYbIIT2b5MZM5YzQ=",
-      "extraneous": true,
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
-      "extraneous": true
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wget": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/wget/-/wget-0.0.1.tgz",
-      "integrity": "sha1-i7ga8LjmC13yYtPIHlc34fSTHlM=",
-      "extraneous": true,
-      "dependencies": {
-        "tunnel": "0.0.2"
-      },
-      "bin": {
-        "nwget": "bin/nwget.js"
-      },
-      "engines": {
-        "node": ">= 0.6.18"
-      }
-    },
-    "node_modules/@meteorjs/meteor-theme-hexo/node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "extraneous": true
-    },
-    "node_modules/a-sync-waterfall": {
+    "a-sync-waterfall": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
       "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
       "dev": true
     },
-    "node_modules/abbrev": {
+    "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
-    "node_modules/accepts": {
+    "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/acorn": {
+    "acorn": {
       "version": "6.4.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
       "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "dev": true
     },
-    "node_modules/ajv": {
+    "ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "co": "^4.6.0",
         "json-stable-stringify": "^1.0.1"
       }
     },
-    "node_modules/align-text": {
+    "align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
       "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.0.2",
         "longest": "^1.0.1",
         "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/ansi-regex": {
+    "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/ansi-styles": {
+    "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
       }
     },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/archy": {
+    "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
-    "node_modules/argparse": {
+    "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/argparse/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/arr-diff": {
+    "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
       "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "arr-flatten": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/arr-flatten": {
+    "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/arr-union": {
+    "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/array-unique": {
+    "array-unique": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/asap": {
+    "asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
       "dev": true
     },
-    "node_modules/asn1": {
+    "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "safer-buffer": "~2.1.0"
       }
     },
-    "node_modules/assert-plus": {
+    "assert-plus": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
       "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
+      "optional": true
     },
-    "node_modules/assign-symbols": {
+    "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/async": {
+    "async": {
       "version": "0.2.10",
       "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
       "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
       "dev": true
     },
-    "node_modules/async-each": {
+    "async-each": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
       "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ]
+      "dev": true
     },
-    "node_modules/asynckit": {
+    "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true,
       "optional": true
     },
-    "node_modules/atob": {
+    "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
+      "dev": true
     },
-    "node_modules/aws-sign2": {
+    "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
       "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/aws4": {
+    "aws4": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
       "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/babel-code-frame": {
+    "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
         "js-tokens": "^3.0.2"
       }
     },
-    "node_modules/babel-messages": {
+    "babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.22.0"
       }
     },
-    "node_modules/babel-plugin-syntax-decorators": {
+    "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha512-AWj19x2aDm8qFQ5O2JcD6pwJDW1YdcnO+1b81t7gxrGjz5VHiUqeYWAR4h7zueWMalRelrQDXprv2FrY1dbpbw==",
       "dev": true
     },
-    "node_modules/babel-plugin-transform-decorators-legacy": {
+    "babel-plugin-transform-decorators-legacy": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz",
       "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-plugin-syntax-decorators": "^6.1.18",
         "babel-runtime": "^6.2.0",
         "babel-template": "^6.3.0"
       }
     },
-    "node_modules/babel-polyfill": {
+    "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
         "regenerator-runtime": "^0.10.5"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        },
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/babel-polyfill/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
-      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==",
-      "dev": true
-    },
-    "node_modules/babel-runtime": {
+    "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/babel-template": {
+    "babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
         "babel-types": "^6.26.0",
@@ -768,12 +301,12 @@
         "lodash": "^4.17.4"
       }
     },
-    "node_modules/babel-traverse": {
+    "babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
         "babel-runtime": "^6.26.0",
@@ -785,39 +318,36 @@
         "lodash": "^4.17.4"
       }
     },
-    "node_modules/babel-types": {
+    "babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
         "lodash": "^4.17.4",
         "to-fast-properties": "^1.0.3"
       }
     },
-    "node_modules/babylon": {
+    "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true,
-      "bin": {
-        "babylon": "bin/babylon.js"
-      }
+      "dev": true
     },
-    "node_modules/balanced-match": {
+    "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "node_modules/base": {
+    "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
         "component-emitter": "^1.2.1",
@@ -826,159 +356,130 @@
         "mixin-deep": "^1.2.0",
         "pascalcase": "^0.1.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/base/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/basic-auth": {
+    "basic-auth": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
       "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/bcrypt-pbkdf": {
+    "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "tweetnacl": "^0.14.3"
       }
     },
-    "node_modules/binary-extensions": {
+    "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/bindings": {
+    "bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/bluebird": {
+    "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "node_modules/boolbase": {
+    "boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true,
-      "license": "ISC"
+      "dev": true
     },
-    "node_modules/boom": {
+    "boom": {
       "version": "2.10.1",
       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "hoek": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.40"
       }
     },
-    "node_modules/brace-expansion": {
+    "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
       }
     },
-    "node_modules/browser-fingerprint": {
+    "browser-fingerprint": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/browser-fingerprint/-/browser-fingerprint-0.0.1.tgz",
       "integrity": "sha512-b8SXP7yOlzLUJXF8WUvIjmbJzkJC0X6OHe7J9a/SHqEBC7a9Eglag6AANSTJz82h5U582kuxm/5TPudnD68EPA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/bytes": {
+    "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/cache-base": {
+    "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
         "get-value": "^2.0.6",
@@ -989,98 +490,79 @@
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/cache-base/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/call-bind": {
+    "call-bind": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
       "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.1",
         "set-function-length": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/camel-case": {
+    "camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
       "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "no-case": "^2.2.0",
         "upper-case": "^1.1.1"
       }
     },
-    "node_modules/camelcase": {
+    "camelcase": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
       "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/caseless": {
+    "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/center-align": {
+    "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
       "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "align-text": "^0.1.3",
         "lazy-cache": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/chalk": {
+    "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
         "has-ansi": "^2.0.0",
         "strip-ansi": "^3.0.0",
         "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/cheerio": {
+    "cheerio": {
       "version": "0.22.0",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
       "integrity": "sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "css-select": "~1.2.0",
         "dom-serializer": "~0.1.0",
         "entities": "~1.1.1",
@@ -1097,286 +579,179 @@
         "lodash.reduce": "^4.4.0",
         "lodash.reject": "^4.4.0",
         "lodash.some": "^4.4.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/chexo": {
+    "chexo": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/chexo/-/chexo-1.0.7.tgz",
       "integrity": "sha512-7ScGKzHsZDLpCZhzIypwbK+hkx1fkWZjeLemEkmnreThGLNWhLRDC4gJ/Wu04jAbH0zYR/ev0QPAACEnaYXrcA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hexo-cli": "^1.1.0",
         "minimist": "^1.2.0"
       },
-      "bin": {
-        "chexo": "bin/chexo"
-      },
-      "peerDependencies": {
-        "hexo": ">= 3.3.0 < 4"
-      }
-    },
-    "node_modules/chexo/node_modules/hexo-cli": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
-      "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
-      "dev": true,
       "dependencies": {
-        "abbrev": "^1.0.7",
-        "bluebird": "^3.4.0",
-        "chalk": "^1.1.3",
-        "command-exists": "^1.2.0",
-        "hexo-fs": "^0.2.0",
-        "hexo-log": "^0.2.0",
-        "hexo-util": "^0.6.0",
-        "minimist": "^1.2.0",
-        "object-assign": "^4.1.0",
-        "resolve": "^1.5.0",
-        "tildify": "^1.2.0"
-      },
-      "bin": {
-        "hexo": "bin/hexo"
+        "hexo-cli": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-1.1.0.tgz",
+          "integrity": "sha512-IWQPppwgmj1iBUcP5mpcMg3Tre6a8Qlr8ejXw6naZiJNSepSgh4mS3KiNPKDa2qQIgPDqJYJzNVFLw+RLA9CkA==",
+          "dev": true,
+          "requires": {
+            "abbrev": "^1.0.7",
+            "bluebird": "^3.4.0",
+            "chalk": "^1.1.3",
+            "command-exists": "^1.2.0",
+            "hexo-fs": "^0.2.0",
+            "hexo-log": "^0.2.0",
+            "hexo-util": "^0.6.0",
+            "minimist": "^1.2.0",
+            "object-assign": "^4.1.0",
+            "resolve": "^1.5.0",
+            "tildify": "^1.2.0"
+          }
+        }
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+      "requires": {
+        "anymatch": "^1.3.0",
+        "async-each": "^1.0.0",
+        "fsevents": "^1.0.0",
+        "glob-parent": "^2.0.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^2.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0"
       }
     },
-    "node_modules/chokidar/node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/chokidar/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "peer": true,
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chokidar/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/class-utils": {
+    "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
         "isobject": "^3.0.0",
         "static-extend": "^0.1.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/class-utils/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cliui": {
+    "cliui": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
       "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
+      "requires": {
         "center-align": "^0.1.1",
         "right-align": "^0.1.1",
         "wordwrap": "0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+          "dev": true
+        }
       }
     },
-    "node_modules/cliui/node_modules/wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-      "dev": true,
-      "license": "MIT/X11",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/co": {
+    "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
+      "optional": true
     },
-    "node_modules/collection-visit": {
+    "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/color-convert": {
+    "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "color-name": "1.1.3"
       }
     },
-    "node_modules/color-name": {
+    "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
-    "node_modules/combined-stream": {
+    "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/command-exists": {
+    "command-exists": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
       "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
       "dev": true
     },
-    "node_modules/commander": {
+    "commander": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
       "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
+      "dev": true
     },
-    "node_modules/component-emitter": {
+    "component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
-    "node_modules/compressible": {
+    "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/compression": {
+    "compression": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
         "compressible": "~2.0.16",
@@ -1384,566 +759,402 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/concat-map": {
+    "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "node_modules/connect": {
+    "connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
       }
     },
-    "node_modules/copy-descriptor": {
+    "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/core-decorators": {
+    "core-decorators": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/core-decorators/-/core-decorators-0.11.2.tgz",
       "integrity": "sha512-47n1NWwwc+qPmOMtY9zUKCM1cYfoxLvBRxKzirFrqhE61yqK+yZP/BOA3gjaBUVb9P46J1RyJjasrtqYoWCbvA==",
       "dev": true
     },
-    "node_modules/core-js": {
+    "core-js": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
       "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/core-util-is": {
+    "core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
-    "node_modules/cross-spawn": {
+    "cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
       "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lru-cache": "^4.0.1",
         "which": "^1.2.9"
       }
     },
-    "node_modules/cryptiles": {
+    "cryptiles": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "boom": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.40"
       }
     },
-    "node_modules/css-select": {
+    "css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
       "integrity": "sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==",
       "dev": true,
-      "license": "BSD-like",
-      "dependencies": {
+      "requires": {
         "boolbase": "~1.0.0",
         "css-what": "2.1",
         "domutils": "1.5.1",
         "nth-check": "~1.0.1"
       }
     },
-    "node_modules/css-what": {
+    "css-what": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
       "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/cuid": {
+    "cuid": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
       "integrity": "sha512-MoL67ZZuBetDMxzrZtO+Iq1ATajFACQCP52QRinBgd3yTjYdv54mJO8ibUrh06fojKCoX5P2i7KkEatm4VTIOQ==",
-      "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "browser-fingerprint": "0.0.1",
         "core-js": "^1.1.1",
         "node-fingerprint": "0.0.2"
       }
     },
-    "node_modules/dashdash": {
+    "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/dashdash/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/debug": {
+    "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ms": "2.0.0"
       }
     },
-    "node_modules/decamelize": {
+    "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/decode-uri-component": {
+    "decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
       "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
+      "dev": true
     },
-    "node_modules/define-data-property": {
+    "define-data-property": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
       "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/define-property": {
+    "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/define-property/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/define-property/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
+    "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "optional": true
     },
-    "node_modules/depd": {
+    "depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/destroy": {
+    "destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
+      "dev": true
     },
-    "node_modules/dom-serializer": {
+    "dom-serializer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
       "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "domelementtype": "^1.3.0",
         "entities": "^1.1.1"
       }
     },
-    "node_modules/domelementtype": {
+    "domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "dev": true
     },
-    "node_modules/domhandler": {
+    "domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
+      "requires": {
         "domelementtype": "1"
       }
     },
-    "node_modules/domutils": {
+    "domutils": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "dom-serializer": "0",
         "domelementtype": "1"
       }
     },
-    "node_modules/ecc-jsbn": {
+    "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
-    "node_modules/ee-first": {
+    "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
-    "node_modules/ejs": {
+    "ejs": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/encodeurl": {
+    "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/entities": {
+    "entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "dev": true
     },
-    "node_modules/errno": {
+    "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
       }
     },
-    "node_modules/escape-html": {
+    "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
-    "node_modules/escape-string-regexp": {
+    "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/esprima": {
+    "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/esutils": {
+    "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/etag": {
+    "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/expand-brackets": {
+    "expand-brackets": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
       "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-posix-bracket": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-range": {
+    "expand-range": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "fill-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-range/node_modules/fill-range": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^2.1.0",
-        "isobject": "^2.0.0",
-        "randomatic": "^3.0.0",
-        "repeat-element": "^1.1.2",
-        "repeat-string": "^1.5.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-range/node_modules/is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend": {
+    "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true,
       "optional": true
     },
-    "node_modules/extend-shallow": {
+    "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extend-shallow/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
-    "node_modules/extglob": {
+    "extglob": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
       "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/extglob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extsprintf": {
+    "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
       "optional": true
     },
-    "node_modules/file-uri-to-path": {
+    "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/filename-regex": {
+    "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fill-range/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/finalhandler": {
+    "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
       "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -1951,453 +1162,312 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/for-in": {
+    "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/for-own": {
+    "for-own": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
       "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "for-in": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/forever-agent": {
+    "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/form-data": {
+    "form-data": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
       "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.5",
         "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
       }
     },
-    "node_modules/fragment-cache": {
+    "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/fresh": {
+    "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/fsevents": {
+    "fsevents": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
       "dev": true,
-      "hasInstallScript": true,
       "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
+      "requires": {
         "bindings": "^1.5.0",
         "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
       }
     },
-    "node_modules/function-bind": {
+    "function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/get-intrinsic": {
+    "get-intrinsic": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
       "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-value": {
+    "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/getpass": {
+    "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/getpass/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/glob": {
+    "glob": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
       "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "inflight": "^1.0.4",
         "inherits": "2",
         "minimatch": "2 || 3",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/glob-base": {
+    "glob-base": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
       "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "glob-parent": "^2.0.0",
         "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/glob-base/node_modules/glob-parent": {
+    "glob-parent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
       "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
+      "requires": {
         "is-glob": "^2.0.0"
       }
     },
-    "node_modules/glob-base/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-base/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globals": {
+    "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
       "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/gopd": {
+    "gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/graceful-fs": {
+    "graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/har-schema": {
+    "har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
       "integrity": "sha512-f8xf2GOR6Rgwc9FPTLNzgwB+JQ2/zMauYXSWmX5YV5acex6VomT0ocSuwR7BfXo5MpHi+jL+saaux2fwsGJDKQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "optional": true
     },
-    "node_modules/har-validator": {
+    "har-validator": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
       "integrity": "sha512-5Gbp6RAftMYYV3UEI4c4Vv3+a4dQ7taVyvHt+/L6kRt+f4HX1GweAk5UDWN0SvdVnRBzGQ6OG89pGaD9uSFnVw==",
-      "deprecated": "this library is no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "ajv": "^4.9.1",
         "har-schema": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4"
       }
     },
-    "node_modules/has-ansi": {
+    "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/has-flag": {
+    "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/has-property-descriptors": {
+    "has-property-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
       "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "get-intrinsic": "^1.2.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
+    "has-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/has-symbols": {
+    "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/has-value": {
+    "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/has-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
+    "has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hasown": {
+    "hasown": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
       "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/hawk": {
+    "hawk": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==",
-      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "boom": "2.x.x",
         "cryptiles": "2.x.x",
         "hoek": "2.x.x",
         "sntp": "1.x.x"
-      },
-      "engines": {
-        "node": ">=0.10.32"
       }
     },
-    "node_modules/hexo": {
+    "hexo": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/hexo/-/hexo-3.9.0.tgz",
       "integrity": "sha512-uga6MsxGlD0AeafiObbFkQVWlUO+wWTb/IJVPI3fFpmAJu0PBD//Ek0qVOxHjlzdvFGeW0bYWYqXgDbR7suJng==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "abbrev": "^1.1.1",
         "archy": "^1.0.0",
         "bluebird": "^3.5.2",
@@ -2426,554 +1496,422 @@
         "titlecase": "^1.1.2",
         "warehouse": "^2.2.0"
       },
-      "bin": {
-        "hexo": "bin/hexo"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "hexo-cli": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
+          "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
+          "dev": true,
+          "requires": {
+            "abbrev": "^1.1.1",
+            "acorn": "^6.1.1",
+            "bluebird": "^3.5.3",
+            "chalk": "^2.4.2",
+            "command-exists": "^1.2.8",
+            "hexo-fs": "^1.0.2",
+            "hexo-log": "^0.2.0",
+            "hexo-util": "^0.6.3",
+            "minimist": "^1.2.0",
+            "resolve": "^1.10.0",
+            "tildify": "^1.2.0"
+          }
+        },
+        "hexo-fs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.1",
+            "chokidar": "^2.0.4",
+            "escape-string-regexp": "^1.0.5",
+            "graceful-fs": "^4.1.11"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/hexo-bunyan": {
+    "hexo-bunyan": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-bunyan/-/hexo-bunyan-1.0.0.tgz",
       "integrity": "sha512-RymT8Ck+K77mLt9BEYNb4uyfC7RIQnU5N3laXowMrS28jj2h89VHJCOnhV00mmta4fHRqNa07kP1Hrn17nvMkQ==",
-      "deprecated": "Please see https://github.com/hexojs/hexo-bunyan/issues/17",
       "dev": true,
-      "engines": [
-        "node >=0.10.0"
-      ],
-      "bin": {
-        "bunyan": "bin/bunyan"
-      },
-      "optionalDependencies": {
+      "requires": {
         "moment": "^2.10.6",
         "mv": "~2",
         "safe-json-stringify": "~1"
       }
     },
-    "node_modules/hexo-cli": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-cli/-/hexo-cli-2.0.0.tgz",
-      "integrity": "sha512-ZHWh2W35IHaAv9vmcrq+yWjubF26TV+qXoihMnJ3LojWlUCFoMWfEoxJcm0AL709SSuVMpwvUI8la4CpQCOGXQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "abbrev": "^1.1.1",
-        "acorn": "^6.1.1",
-        "bluebird": "^3.5.3",
-        "chalk": "^2.4.2",
-        "command-exists": "^1.2.8",
-        "hexo-fs": "^1.0.2",
-        "hexo-log": "^0.2.0",
-        "hexo-util": "^0.6.3",
-        "minimist": "^1.2.0",
-        "resolve": "^1.10.0",
-        "tildify": "^1.2.0"
-      },
-      "bin": {
-        "hexo": "bin/hexo"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/hexo-fs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "chokidar": "^2.0.4",
-        "escape-string-regexp": "^1.0.5",
-        "graceful-fs": "^4.1.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-cli/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-front-matter": {
+    "hexo-front-matter": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-front-matter/-/hexo-front-matter-0.2.3.tgz",
       "integrity": "sha512-GL/pGfYqsvjMgxjhOWv1zAc7t4JoGUow+CH9Tes/5N2wKxxTzt2woKEMHz1+c01CmhdVYUR4lO3R1ZAcxc0caA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "js-yaml": "^3.6.1"
       }
     },
-    "node_modules/hexo-fs": {
+    "hexo-fs": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-0.2.3.tgz",
       "integrity": "sha512-rLB1rMVUW3csAljvJgHfyjemL0BrmcUZfBf9hJe6S0pA53igFa3ON0PFwomvoLs1Wdmjs9Awnw9Tru4PjWFSlQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.4.0",
         "chokidar": "^1.5.2",
         "escape-string-regexp": "^1.0.5",
         "graceful-fs": "^4.1.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
       }
     },
-    "node_modules/hexo-fs/node_modules/anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "micromatch": "^2.1.5",
-        "normalize-path": "^2.0.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "^1.3.0",
-        "async-each": "^1.0.0",
-        "glob-parent": "^2.0.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^2.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.0.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^2.0.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-fs/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-i18n": {
+    "hexo-i18n": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/hexo-i18n/-/hexo-i18n-0.2.1.tgz",
       "integrity": "sha512-QhVmN/eLohu9UzvrX85zhfL7yN5O4MOkXKYmCRI8GPcg0EczX+blYYmMCugZKu/NIJ9XD5/etAVWCi/5F+fS6g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "sprintf-js": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
       }
     },
-    "node_modules/hexo-inject": {
+    "hexo-inject": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-inject/-/hexo-inject-1.0.0.tgz",
       "integrity": "sha512-Ly0k7FO3G5+XNvFNE7yjSENSWy8QTnzl8cNFWYuMXRYMogbHd/Q0Ane8WCKYb5QD/A+WXC3rHb32wIGb0YAfVw==",
-      "deprecated": "The author does not use Hexo any more. This plugin is no longer maintained.",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "babel-plugin-transform-decorators-legacy": "^1.3.4",
         "babel-polyfill": "^6.7.2",
         "bluebird": "^3.3.4",
@@ -2981,445 +1919,412 @@
         "underscore": "^1.8.3"
       }
     },
-    "node_modules/hexo-log": {
+    "hexo-log": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-0.2.0.tgz",
       "integrity": "sha512-fzoc+GQexxPPILTjoOQILnA3ZG2MFgqMBVel4xvJ11pXptw9+f97ynTgDAExXafyp9Nz2ChXRuqlCYgPtZSlxQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "chalk": "^1.1.1",
         "hexo-bunyan": "^1.0.0"
       }
     },
-    "node_modules/hexo-prism-plus": {
+    "hexo-prism-plus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-prism-plus/-/hexo-prism-plus-1.1.0.tgz",
       "integrity": "sha512-lkDJRZDVN3iNpYtuwrI+JFLj3rSa4PeMwz1OlVfUOkY6CyjD/D3dGtW7cTpcxYejr3/JWjusIqWVnUTLpKr4Yw==",
       "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
+      "requires": {
         "hexo-fs": "^1.0.0",
         "hexo-inject": "^1.0.0",
         "hexo-util": "^0.6.3",
         "lodash": "^4.17.11"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
       "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "hexo-fs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
+          "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.1",
+            "chokidar": "^2.0.4",
+            "escape-string-regexp": "^1.0.5",
+            "graceful-fs": "^4.1.11"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        }
       }
     },
-    "node_modules/hexo-prism-plus/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/hexo-fs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "chokidar": "^2.0.4",
-        "escape-string-regexp": "^1.0.5",
-        "graceful-fs": "^4.1.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-prism-plus/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo-renderer-ejs": {
+    "hexo-renderer-ejs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-ejs/-/hexo-renderer-ejs-1.0.0.tgz",
       "integrity": "sha512-O925i69FG4NYO62oWORcPhRZZX0sPx1SXGKUS5DaR/lzajyiXH5i2sqnkj0ya0rNLXIy/D7Xmt7WbFyuQx/kKQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ejs": "^2.6.1"
-      },
-      "engines": {
-        "node": ">=8.6.0"
       }
     },
-    "node_modules/hexo-renderer-less": {
+    "hexo-renderer-less": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-less/-/hexo-renderer-less-0.2.0.tgz",
       "integrity": "sha512-mhkwGsrLPG1e0bpE40FSRufaDHJ4uDtTYNUIQDBYR3aZkbOxAnpN607BTjymr/F+4uYy0cd7MK4y5vFx5pEDQw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "less": "^2.5.1"
       }
     },
-    "node_modules/hexo-renderer-marked": {
+    "hexo-renderer-marked": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/hexo-renderer-marked/-/hexo-renderer-marked-2.0.0.tgz",
       "integrity": "sha512-+LMjgPkJSUAOlWYHJnBXxUHwGqemGNlK/I+JNO4zA5rEHWNWZ9wNAZKd5g0lEVdMAZzAV54gCylXGURgMO4IAw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hexo-util": "1.0.0",
         "marked": "^0.7.0",
         "strip-indent": "^3.0.0"
       },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-renderer-marked/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "hexo-util": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
+          "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.2",
+            "camel-case": "^3.0.0",
+            "cross-spawn": "^6.0.5",
+            "highlight.js": "^9.13.1",
+            "html-entities": "^1.2.1",
+            "striptags": "^3.1.1"
+          }
+        },
+        "strip-indent": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+          "dev": true,
+          "requires": {
+            "min-indent": "^1.0.0"
+          }
+        },
+        "striptags": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
+          "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/hexo-renderer-marked/node_modules/hexo-util": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-1.0.0.tgz",
-      "integrity": "sha512-oV1/Y7ablc7e3d2kFFvQ/Ypi/BfL/uDSc1oNaMcxqr/UOH8F0QkHZ0Dmv+yLrEpFNYrrhBA0uavo3e+EqHNjnQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.2",
-        "camel-case": "^3.0.0",
-        "cross-spawn": "^6.0.5",
-        "highlight.js": "^9.13.1",
-        "html-entities": "^1.2.1",
-        "striptags": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-renderer-marked/node_modules/striptags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/striptags/-/striptags-3.2.0.tgz",
-      "integrity": "sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw==",
-      "dev": true
-    },
-    "node_modules/hexo-server": {
+    "hexo-server": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexo-server/-/hexo-server-1.0.0.tgz",
       "integrity": "sha512-eSY+a5oiGCG/3T6FrdrNRBkttMLJkM+oitY6ZMFowjcBiG2VNEhQmfWUDOykfvApZs4wPYBb//uXD/58tfe3mA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.5.5",
         "chalk": "^2.4.2",
         "compression": "^1.7.4",
@@ -3429,66 +2334,50 @@
         "open": "^6.3.0",
         "serve-static": "^1.14.1"
       },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/hexo-server/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "mime": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "node_modules/hexo-server/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-server/node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/hexo-server/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo-util": {
+    "hexo-util": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-0.6.3.tgz",
       "integrity": "sha512-zPxaqCWZz3/25SAB4FlrRtWktJ+Pr+vBiv/nyHpXKgXPt1m70liViKlRwWLqDmRjJ72x6/k4qCEeXHajvcGHUw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "bluebird": "^3.4.0",
         "camel-case": "^3.0.0",
         "cross-spawn": "^4.0.0",
@@ -3497,958 +2386,415 @@
         "striptags": "^2.1.1"
       }
     },
-    "node_modules/hexo-versioned-netlify-redirects": {
+    "hexo-versioned-netlify-redirects": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hexo-versioned-netlify-redirects/-/hexo-versioned-netlify-redirects-1.1.0.tgz",
       "integrity": "sha512-kfY19ZZDwBnRaZFA6KQgt5DhVBpTQG1yBoq01zaACFHIFuSd9OjhiHCkJ3it+TMvGl+JGTtgKhIwZoQUJHyv/g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "url-join": "^4.0.0"
       }
     },
-    "node_modules/hexo/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/hexo/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/hexo/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/extglob/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hexo/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/hexo/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/hexo-fs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hexo-fs/-/hexo-fs-1.0.2.tgz",
-      "integrity": "sha512-cbDnYuk6IndW/Fr2RcfZsZXE5wlG6tFoeBgZsHY230sSYalvX4JBPOUrE8As7Agysl+NGMthtr/Drtuliy5foQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bluebird": "^3.5.1",
-        "chokidar": "^2.0.4",
-        "escape-string-regexp": "^1.0.5",
-        "graceful-fs": "^4.1.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/hexo/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hexo/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/hexo/node_modules/strip-indent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hexo/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/highlight.js": {
+    "highlight.js": {
       "version": "9.18.5",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
       "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
-      "deprecated": "Support has ended for 9.x series. Upgrade to @latest",
-      "dev": true,
-      "hasInstallScript": true,
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/hoek": {
+    "hoek": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.40"
-      }
+      "optional": true
     },
-    "node_modules/html-entities": {
+    "html-entities": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
       "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
-    "node_modules/htmlparser2": {
+    "htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "domelementtype": "^1.3.1",
         "domhandler": "^2.3.0",
         "domutils": "^1.5.1",
         "entities": "^1.1.1",
         "inherits": "^2.0.1",
         "readable-stream": "^3.1.1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
       },
-      "engines": {
-        "node": ">= 6"
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
-    "node_modules/http-errors": {
+    "http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
-      "engines": {
-        "node": ">= 0.8"
+      "dependencies": {
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/http-errors/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-signature": {
+    "http-signature": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
       "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^0.2.0",
         "jsprim": "^1.2.2",
         "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
       }
     },
-    "node_modules/image-size": {
+    "image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "optional": true
     },
-    "node_modules/inflight": {
+    "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
       }
     },
-    "node_modules/inherits": {
+    "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/invariant": {
+    "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "loose-envify": "^1.0.0"
       }
     },
-    "node_modules/is-accessor-descriptor": {
+    "is-accessor-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
       "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
       }
     },
-    "node_modules/is-binary-path": {
+    "is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-buffer": {
+    "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "node_modules/is-core-module": {
+    "is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
       "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-data-descriptor": {
+    "is-data-descriptor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
       "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/is-descriptor": {
+    "is-descriptor": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/is-dotfile": {
+    "is-dotfile": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
       "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-equal-shallow": {
+    "is-equal-shallow": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
       "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-primitive": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-extendable": {
+    "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "is-extglob": "^1.0.0"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "kind-of": "^3.0.2"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-plain-object": {
+    "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/is-plain-object/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-posix-bracket": {
+    "is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
       "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-primitive": {
+    "is-primitive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
       "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-typedarray": {
+    "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/is-windows": {
+    "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/is-wsl": {
+    "is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
       "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/isarray": {
+    "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "node_modules/isexe": {
+    "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "node_modules/isobject": {
+    "isobject": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
+    "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true,
       "optional": true
     },
-    "node_modules/js-tokens": {
+    "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
       "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
       "dev": true
     },
-    "node_modules/js-yaml": {
+    "js-yaml": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
+    "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/json-schema": {
+    "json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/json-stable-stringify": {
+    "json-stable-stringify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz",
       "integrity": "sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.5",
         "isarray": "^2.0.5",
         "jsonify": "^0.0.1",
         "object-keys": "^1.1.1"
       },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/json-stable-stringify/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/json-stringify-safe": {
+    "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/jsonify": {
+    "jsonify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
       "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
       "dev": true,
-      "optional": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "optional": true
     },
-    "node_modules/jsonparse": {
+    "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
       "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ],
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "license": "(MIT OR Apache-2.0)",
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/jsprim": {
+    "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
         "json-schema": "0.4.0",
         "verror": "1.10.0"
       },
-      "engines": {
-        "node": ">=0.6.0"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/jsprim/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/kind-of": {
+    "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/lazy-cache": {
+    "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
       "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/less": {
+    "less": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
       "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
       "dev": true,
-      "bin": {
-        "lessc": "bin/lessc"
-      },
-      "engines": {
-        "node": ">=0.12"
-      },
-      "optionalDependencies": {
+      "requires": {
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
@@ -4459,197 +2805,157 @@
         "source-map": "^0.5.3"
       }
     },
-    "node_modules/lodash": {
+    "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.assignin": {
+    "lodash.assignin": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
       "integrity": "sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.bind": {
+    "lodash.bind": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
       "integrity": "sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.defaults": {
+    "lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
       "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.filter": {
+    "lodash.filter": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
       "integrity": "sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.flatten": {
+    "lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
       "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.foreach": {
+    "lodash.foreach": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
       "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.map": {
+    "lodash.map": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
       "integrity": "sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.merge": {
+    "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.pick": {
+    "lodash.pick": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
       "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
-      "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.reduce": {
+    "lodash.reduce": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
       "integrity": "sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.reject": {
+    "lodash.reject": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
       "integrity": "sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/lodash.some": {
+    "lodash.some": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
       "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/longest": {
+    "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
       "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/loose-envify": {
+    "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
       }
     },
-    "node_modules/lower-case": {
+    "lower-case": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
       "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
       "dev": true
     },
-    "node_modules/lru-cache": {
+    "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
       }
     },
-    "node_modules/map-cache": {
+    "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/map-visit": {
+    "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/markdown": {
+    "markdown": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz",
       "integrity": "sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "nopt": "~2.1.1"
-      },
-      "bin": {
-        "md2html": "bin/md2html.js"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/marked": {
+    "marked": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
       "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/math-random": {
+    "math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/micromatch": {
+    "micromatch": {
       "version": "2.3.11",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
       "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "arr-diff": "^2.0.0",
         "array-unique": "^0.2.1",
         "braces": "^1.8.2",
@@ -4663,234 +2969,140 @@
         "object.omit": "^2.0.0",
         "parse-glob": "^3.0.4",
         "regex-cache": "^0.4.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/micromatch/node_modules/braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "expand-range": "^1.8.1",
-        "preserve": "^0.2.0",
-        "repeat-element": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mime": {
+    "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/mime-db": {
+    "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/mime-types": {
+    "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
       }
     },
-    "node_modules/min-indent": {
+    "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/minimatch": {
+    "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/minimist": {
+    "minimist": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/mixin-deep": {
+    "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mixin-deep/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
-    "node_modules/mkdirp": {
+    "mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/moment": {
+    "moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
+      "dev": true
     },
-    "node_modules/moment-timezone": {
+    "moment-timezone": {
       "version": "0.5.43",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
       "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "moment": "^2.29.4"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/morgan": {
+    "morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
       "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-finished": "~2.3.0",
         "on-headers": "~1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/ms": {
+    "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/mv": {
+    "mv": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
       "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "mkdirp": "~0.5.1",
         "ncp": "~2.0.0",
         "rimraf": "~2.4.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/nan": {
+    "nan": {
       "version": "2.18.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
       "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
       "dev": true,
       "optional": true
     },
-    "node_modules/nanomatch": {
+    "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
         "define-property": "^2.0.2",
@@ -4903,550 +3115,396 @@
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/nanomatch/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ncp": {
+    "ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
       "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "ncp": "bin/ncp"
-      }
+      "optional": true
     },
-    "node_modules/negotiator": {
+    "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/nice-try": {
+    "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node_modules/no-case": {
+    "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
       "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "lower-case": "^1.1.1"
       }
     },
-    "node_modules/node-fingerprint": {
+    "node-fingerprint": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/node-fingerprint/-/node-fingerprint-0.0.2.tgz",
       "integrity": "sha512-vPFfTD5EBJieQ4SI3v61fWxlV1kav3m9Dbejd6CjWhOJn8s+XMxpOOosCNAyIrUQ/jJOlPndfrZ0lSw4+RgwcA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/nopt": {
+    "nopt": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
       "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
       }
     },
-    "node_modules/nth-check": {
+    "nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
       "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
+      "requires": {
         "boolbase": "~1.0.0"
       }
     },
-    "node_modules/nunjucks": {
+    "nunjucks": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz",
       "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
         "commander": "^5.1.0"
-      },
-      "bin": {
-        "nunjucks-precompile": "bin/precompile"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.3.0"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
       }
     },
-    "node_modules/oauth-sign": {
+    "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
       "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
-    "node_modules/object-assign": {
+    "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/object-copy": {
+    "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
         "kind-of": "^3.0.3"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/object-keys": {
+    "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
+      "optional": true
     },
-    "node_modules/object-visit": {
+    "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/object-visit/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.omit": {
+    "object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
       "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "for-own": "^0.1.4",
         "is-extendable": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/object.pick": {
+    "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isobject": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/object.pick/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/on-finished": {
+    "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
       "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
       }
     },
-    "node_modules/on-headers": {
+    "on-headers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/once": {
+    "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "wrappy": "1"
       }
     },
-    "node_modules/open": {
+    "open": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
       "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-wsl": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=8"
       }
     },
-    "node_modules/optimist": {
+    "optimist": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
       "dev": true,
-      "license": "MIT/X11",
-      "dependencies": {
+      "requires": {
         "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/optimist/node_modules/minimist": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/os-homedir": {
+    "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/parse-glob": {
+    "parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
       "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "glob-base": "^0.3.0",
         "is-dotfile": "^1.0.0",
         "is-extglob": "^1.0.0",
         "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/parse-glob/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse-glob/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parseurl": {
+    "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/pascalcase": {
+    "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/path-dirname": {
+    "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
       "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
       "dev": true
     },
-    "node_modules/path-is-absolute": {
+    "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/path-key": {
+    "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "dev": true
     },
-    "node_modules/path-parse": {
+    "path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "node_modules/performance-now": {
+    "performance-now": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
       "integrity": "sha512-YHk5ez1hmMR5LOkb9iJkLKqoBlL7WD5M8ljC75ZfzXriuBIVNuecaXuU7e+hOwyqf24Wxhh7Vxgt7Hnw9288Tg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/posix-character-classes": {
+    "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/preserve": {
+    "preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
       "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/pretty-hrtime": {
+    "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/process-nextick-args": {
+    "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "node_modules/promise": {
+    "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asap": "~2.0.3"
       }
     },
-    "node_modules/prr": {
+    "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true,
       "optional": true
     },
-    "node_modules/pseudomap": {
+    "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
-    "node_modules/punycode": {
+    "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
       "dev": true,
       "optional": true
     },
-    "node_modules/qs": {
+    "qs": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.1.tgz",
       "integrity": "sha512-LQy1Q1fcva/UsnP/6Iaa4lVeM49WiOitu2T4hZCyA/elLKu37L99qcBJk4VCCk+rdLvnMzfKyiN3SZTqdAZGSQ==",
       "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.6"
-      }
+      "optional": true
     },
-    "node_modules/randomatic": {
+    "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
       "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-number": "^4.0.0",
         "kind-of": "^6.0.0",
         "math-random": "^1.0.1"
       },
-      "engines": {
-        "node": ">= 0.10.0"
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/randomatic/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/randomatic/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/range-parser": {
+    "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/readable-stream": {
+    "readable-stream": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
         "isarray": "~1.0.0",
@@ -5456,339 +3514,277 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/readdirp": {
+    "readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
         "readable-stream": "^2.0.2"
       },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/readdirp/node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
       "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
+              }
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
-      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readdirp/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regenerator-runtime": {
+    "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
       "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
-    "node_modules/regex-cache": {
+    "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
       "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "is-equal-shallow": "^0.1.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/regex-not": {
+    "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/remove-trailing-separator": {
+    "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
-    "node_modules/repeat-element": {
+    "repeat-element": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/repeat-string": {
+    "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
+      "dev": true
     },
-    "node_modules/request": {
+    "request": {
       "version": "2.81.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
       "integrity": "sha512-IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "aws-sign2": "~0.6.0",
         "aws4": "^1.2.1",
         "caseless": "~0.12.0",
@@ -5811,115 +3807,91 @@
         "tough-cookie": "~2.3.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 4"
       }
     },
-    "node_modules/resolve": {
+    "resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/resolve-url": {
+    "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "node_modules/ret": {
+    "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
+      "dev": true
     },
-    "node_modules/right-align": {
+    "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
       "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "align-text": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
+    "rimraf": {
       "version": "2.4.5",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
       "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "glob": "^6.0.1"
-      },
-      "bin": {
-        "rimraf": "bin.js"
       }
     },
-    "node_modules/safe-buffer": {
+    "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
-    "node_modules/safe-json-stringify": {
+    "safe-json-stringify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
       "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/safe-regex": {
+    "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ret": "~0.1.10"
       }
     },
-    "node_modules/safer-buffer": {
+    "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true,
       "optional": true
     },
-    "node_modules/semver": {
+    "semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
+      "dev": true
     },
-    "node_modules/send": {
+    "send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
       "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -5934,128 +3906,105 @@
         "range-parser": "~1.2.1",
         "statuses": "2.0.1"
       },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
       "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/send/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/serve-static": {
+    "serve-static": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
       "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
         "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
       }
     },
-    "node_modules/set-function-length": {
+    "set-function-length": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
       "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "define-data-property": "^1.1.1",
         "get-intrinsic": "^1.2.1",
         "gopd": "^1.0.1",
         "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
       }
     },
-    "node_modules/set-value": {
+    "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
         "is-plain-object": "^2.0.3",
         "split-string": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/setprototypeof": {
+    "setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
-    "node_modules/shebang-command": {
+    "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/shebang-regex": {
+    "shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/snapdragon": {
+    "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
         "define-property": "^0.2.5",
@@ -6065,124 +4014,96 @@
         "source-map-resolve": "^0.5.0",
         "use": "^3.1.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/snapdragon-node": {
+    "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
         "snapdragon-util": "^3.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/snapdragon-node/node_modules/is-descriptor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
-      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.1",
-        "is-data-descriptor": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
+    "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sntp": {
+    "sntp": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==",
-      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "hoek": "2.x.x"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/source-map": {
+    "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/source-map-resolve": {
+    "source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
@@ -6190,39 +4111,34 @@
         "urix": "^0.1.0"
       }
     },
-    "node_modules/source-map-url": {
+    "source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
       "dev": true
     },
-    "node_modules/split-string": {
+    "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
     },
-    "node_modules/sshpk": {
+    "sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
       "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
         "bcrypt-pbkdf": "^1.0.0",
@@ -6233,576 +4149,444 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/sshpk/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/static-extend": {
+    "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
       }
     },
-    "node_modules/statuses": {
+    "statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "dev": true
     },
-    "node_modules/string_decoder": {
+    "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "safe-buffer": "~5.1.0"
       }
     },
-    "node_modules/stringstream": {
+    "stringstream": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
       "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/strip-ansi": {
+    "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "strip-indent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
+      "dev": true
     },
-    "node_modules/striptags": {
+    "striptags": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz",
       "integrity": "sha512-vZTvmFP0IYu/zn8MXV6PrLb6VKbd9WGSEnlm4D5RNXS/+zYYlHrSfJgoBw1w56D6RJCr515er3BittRGQqihLA==",
       "dev": true
     },
-    "node_modules/supports-color": {
+    "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/supports-preserve-symlinks-flag": {
+    "supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "dev": true
     },
-    "node_modules/swig-extras": {
+    "swig-extras": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/swig-extras/-/swig-extras-0.0.1.tgz",
       "integrity": "sha512-mFgpjjcQ0Kj+WplOrnWfUEw8iehZMD78sRId6uMXaTlWpy/vt8PTv3GoNsHrHBpZNnPnIsoWxrmRbS3vePjWpA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "markdown": "~0.5.0"
       }
     },
-    "node_modules/swig-templates": {
+    "swig-templates": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz",
       "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==",
-      "deprecated": "unmaintained",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "optimist": "~0.6",
         "uglify-js": "2.6.0"
-      },
-      "bin": {
-        "swig": "bin/swig.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/text-table": {
+    "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "node_modules/through": {
+    "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/tildify": {
+    "tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
       "integrity": "sha512-Y9q1GaV/BO65Z9Yf4NOGMuwt3SGdptkZBnaaKfTQakrDyCLiuO1Kc5wxW4xLdsjzunRtqtOdhekiUFmZbklwYQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "os-homedir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/titlecase": {
+    "titlecase": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.3.tgz",
       "integrity": "sha512-pQX4oiemzjBEELPqgK4WE+q0yhAqjp/yzusGtlSJsOuiDys0RQxggepYmo0BuegIDppYS3b3cpdegRwkpyN3hw==",
-      "dev": true,
-      "bin": {
-        "to-title-case": "bin.js"
-      }
+      "dev": true
     },
-    "node_modules/to-fast-properties": {
+    "to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/to-object-path": {
+    "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/to-regex": {
+    "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/to-regex-range": {
+    "to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex-range/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        }
       }
     },
-    "node_modules/toidentifier": {
+    "toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
+      "dev": true
     },
-    "node_modules/tough-cookie": {
+    "tough-cookie": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "punycode": "^1.4.1"
-      },
-      "engines": {
-        "node": ">=0.8"
       }
     },
-    "node_modules/tunnel-agent": {
+    "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "optional": true,
-      "dependencies": {
+      "requires": {
         "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
       }
     },
-    "node_modules/tweetnacl": {
+    "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true,
       "optional": true
     },
-    "node_modules/uglify-js": {
+    "uglify-js": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz",
       "integrity": "sha512-SYZzhZQRrlAc6QT3Eqz4WHuyrCLjvvKmfII/of82rVACMxsIwb/CqlZVbUwOIq8Xd1EMp2WTtCrIxFYF+779zw==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
+      "requires": {
         "async": "~0.2.6",
         "source-map": "~0.5.1",
         "uglify-to-browserify": "~1.0.0",
         "yargs": "~3.10.0"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
       }
     },
-    "node_modules/uglify-to-browserify": {
+    "uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
       "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
-    "node_modules/underscore": {
+    "underscore": {
       "version": "1.13.6",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
       "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
       "dev": true
     },
-    "node_modules/union-value": {
+    "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       }
     },
-    "node_modules/unpipe": {
+    "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/unset-value": {
+    "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-      "dev": true,
       "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+          "dev": true
+        }
       }
     },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
+    "upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
+      "dev": true
     },
-    "node_modules/upper-case": {
+    "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
       "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
       "dev": true
     },
-    "node_modules/urix": {
+    "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "node_modules/url-join": {
+    "url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
       "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
       "dev": true
     },
-    "node_modules/use": {
+    "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "dev": true
     },
-    "node_modules/util-deprecate": {
+    "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "node_modules/utils-merge": {
+    "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
+      "dev": true
     },
-    "node_modules/uuid": {
+    "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
+      "optional": true
     },
-    "node_modules/vary": {
+    "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "dev": true
     },
-    "node_modules/verror": {
+    "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
       "optional": true,
-      "dependencies": {
+      "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "node_modules/verror/node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/verror/node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/warehouse": {
+    "warehouse": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/warehouse/-/warehouse-2.2.0.tgz",
       "integrity": "sha512-axyo83DpdZabmCsiipkHYKnwl6ull2Vv7fqxMnV8KOQLdiJKffn9W+B3Yac7QVWzBE56Q6B6j2cIY1k2gc10PA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
+        "JSONStream": "^1.0.7",
         "bluebird": "^3.2.2",
         "cuid": "~1.3.8",
         "graceful-fs": "^4.1.3",
         "is-plain-object": "^2.0.1",
-        "JSONStream": "^1.0.7",
         "lodash": "^4.2.1"
       }
     },
-    "node_modules/which": {
+    "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
       }
     },
-    "node_modules/window-size": {
+    "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
       "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
+      "dev": true
     },
-    "node_modules/wordwrap": {
+    "wordwrap": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
       "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "dev": true
     },
-    "node_modules/wrappy": {
+    "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "optional": true
     },
-    "node_modules/yallist": {
+    "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
-    "node_modules/yargs": {
+    "yargs": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
       "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
+      "requires": {
         "camelcase": "^1.0.2",
         "cliui": "^2.1.0",
         "decamelize": "^1.0.0",

From a93bcf6d3dc9d798399c99e1ba8a0238c16b8cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 29 Jan 2025 17:11:37 +0100
Subject: [PATCH 1011/1140] update v3-docs dependabot updates

---
 v3-docs/docs/package-lock.json | 117 ++++++++++++++++++---------------
 1 file changed, 64 insertions(+), 53 deletions(-)

diff --git a/v3-docs/docs/package-lock.json b/v3-docs/docs/package-lock.json
index 55d9e175c4..6e23079102 100644
--- a/v3-docs/docs/package-lock.json
+++ b/v3-docs/docs/package-lock.json
@@ -5,11 +5,11 @@
   "packages": {
     "": {
       "dependencies": {
-        "vue-collapsed": "^1.3.0"
+        "vue-collapsed": "^1.3.4"
       },
       "devDependencies": {
         "canonical-json": "^0.0.4",
-        "jsdoc": "^4.0.2",
+        "jsdoc": "^4.0.4",
         "vitepress": "1.0.1"
       }
     },
@@ -824,10 +824,11 @@
       "dev": true
     },
     "node_modules/@types/linkify-it": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz",
-      "integrity": "sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==",
-      "dev": true
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/markdown-it": {
       "version": "13.0.7",
@@ -840,10 +841,11 @@
       }
     },
     "node_modules/@types/mdurl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz",
-      "integrity": "sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.20",
@@ -1345,21 +1347,22 @@
       }
     },
     "node_modules/jsdoc": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
-      "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz",
+      "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/parser": "^7.20.15",
         "@jsdoc/salty": "^0.2.1",
-        "@types/markdown-it": "^12.2.3",
+        "@types/markdown-it": "^14.1.1",
         "bluebird": "^3.7.2",
         "catharsis": "^0.9.0",
         "escape-string-regexp": "^2.0.0",
         "js2xmlparser": "^4.0.2",
         "klaw": "^3.0.0",
-        "markdown-it": "^12.3.2",
-        "markdown-it-anchor": "^8.4.1",
+        "markdown-it": "^14.1.0",
+        "markdown-it-anchor": "^8.6.7",
         "marked": "^4.0.10",
         "mkdirp": "^1.0.4",
         "requizzle": "^0.2.3",
@@ -1374,13 +1377,14 @@
       }
     },
     "node_modules/jsdoc/node_modules/@types/markdown-it": {
-      "version": "12.2.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
       }
     },
     "node_modules/klaw": {
@@ -1393,12 +1397,13 @@
       }
     },
     "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
       }
     },
     "node_modules/lodash": {
@@ -1426,19 +1431,21 @@
       "dev": true
     },
     "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
       },
       "bin": {
-        "markdown-it": "bin/markdown-it.js"
+        "markdown-it": "bin/markdown-it.mjs"
       }
     },
     "node_modules/markdown-it-anchor": {
@@ -1451,15 +1458,6 @@
         "markdown-it": "*"
       }
     },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/marked": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
@@ -1473,10 +1471,11 @@
       }
     },
     "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/minisearch": {
       "version": "6.3.0",
@@ -1570,6 +1569,16 @@
         "url": "https://opencollective.com/preact"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/requizzle": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
@@ -1670,10 +1679,11 @@
       "dev": true
     },
     "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/underscore": {
       "version": "1.13.6",
@@ -1796,9 +1806,10 @@
       }
     },
     "node_modules/vue-collapsed": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/vue-collapsed/-/vue-collapsed-1.3.0.tgz",
-      "integrity": "sha512-d2qwv0fj4aaoekI+6x1RgxpoK0s5K8HLj70E+dWxIKkgzADcZ9kUrnXRazgIz9ETYkKOi6j2CWv/8+rS8Kr3LQ=="
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/vue-collapsed/-/vue-collapsed-1.3.4.tgz",
+      "integrity": "sha512-W92b+QT3n5iTrfrH6kyvx3TsriYPfy/Ymsb6DaanjeMkJYMdVl1S4wzKRYVDsxWQPDxiC+5m+UwPwT/8YAYodA==",
+      "license": "MIT"
     },
     "node_modules/xmlcreate": {
       "version": "2.0.4",

From 8d1ddbc70220c7bbf591eed553fa8322a29fef0a Mon Sep 17 00:00:00 2001
From: Per Bergland <2690254+perbergland@users.noreply.github.com>
Date: Thu, 30 Jan 2025 08:29:36 +0100
Subject: [PATCH 1012/1140] Fixes #13592 by adding an alias

---
 packages/modern-browsers/modern.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/modern-browsers/modern.js b/packages/modern-browsers/modern.js
index 19ff2734ae..6ec81cd07d 100644
--- a/packages/modern-browsers/modern.js
+++ b/packages/modern-browsers/modern.js
@@ -22,11 +22,15 @@ const browserAliases = {
     'headlesschrome',
   ],
 
-  // If a call to setMinimumBrowserVersions specifies Edge 12 as a minimum
-  // version, that means no version of Internet Explorer pre-Edge should
-  // be classified as modern. This edge:["ie"] alias effectively enforces
-  // that logic, because there is no IE12. #9818 #9839
-  edge: ['ie'],
+  edge: [
+    // If a call to setMinimumBrowserVersions specifies Edge 12 as a minimum
+    // version, that means no version of Internet Explorer pre-Edge should
+    // be classified as modern. This edge:["ie"] alias effectively enforces
+    // that logic, because there is no IE12. #9818 #9839
+    'ie',
+    // Detected by recent useragent-ng as a new browser family when it sees EdgiOS or EdgA in the user agent #13592
+    'edgeMobile'
+  ],
 
   firefox: ['firefoxMobile'],
 

From 4309505ce52d103c1b358e3e2739f11ee93cf96b Mon Sep 17 00:00:00 2001
From: Per Bergland <2690254+perbergland@users.noreply.github.com>
Date: Thu, 30 Jan 2025 09:36:23 +0100
Subject: [PATCH 1013/1140] add test

---
 packages/modern-browsers/modern-tests.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/modern-browsers/modern-tests.js b/packages/modern-browsers/modern-tests.js
index eaac754918..b882ca30db 100644
--- a/packages/modern-browsers/modern-tests.js
+++ b/packages/modern-browsers/modern-tests.js
@@ -12,6 +12,11 @@ Tinytest.add('modern-browsers - versions - basic', function (test) {
     major: 60,
   }));
 
+  test.isTrue(isModern({
+    name: "edgeMobile",
+    major: 120,
+  }));
+
   test.isFalse(isModern({
     name: "firefox",
     major: 25,

From a7fd961753c876f017904791be0a3bc246679632 Mon Sep 17 00:00:00 2001
From: David Amaral <amaraldavi1@gmail.com>
Date: Thu, 30 Jan 2025 10:29:26 -0300
Subject: [PATCH 1014/1140] Add cleanup step for windows workflow

---
 .github/workflows/meteor-selftest-windows.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index ca1fac7a89..69134c32ff 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -27,6 +27,9 @@ jobs:
       cancel-in-progress: true
 
     steps:
+      - name: Cleanup
+        uses: asilbek99/action-cleanup@v1
+
       - name: Checkout code
         uses: actions/checkout@v4
 

From 98a5130a80225ef3493796a7604ca220708db14f Mon Sep 17 00:00:00 2001
From: David Amaral <amaraldavi1@gmail.com>
Date: Thu, 30 Jan 2025 11:37:59 -0300
Subject: [PATCH 1015/1140] Update cleanup step for windows workflow

---
 .github/workflows/meteor-selftest-windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index 69134c32ff..8ae3cf4b48 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Cleanup
-        uses: asilbek99/action-cleanup@v1
+        uses: rtCamp/action-cleanup@master
 
       - name: Checkout code
         uses: actions/checkout@v4

From b831f43f8704610b728e38538ed3b60c30312886 Mon Sep 17 00:00:00 2001
From: David Amaral <amaraldavi1@gmail.com>
Date: Thu, 30 Jan 2025 11:49:56 -0300
Subject: [PATCH 1016/1140] Update cleanup step for windows workflow

---
 .github/workflows/meteor-selftest-windows.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index 8ae3cf4b48..d243ca23bd 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -27,8 +27,9 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - name: Cleanup
-        uses: rtCamp/action-cleanup@master
+      - name: cleanup
+        shell: powershell
+        run: Remove-Item -Recurse -Force ${{ github.workspace }}\*
 
       - name: Checkout code
         uses: actions/checkout@v4

From 78bbb9908cc615f97dd87eae751683e36097c2e2 Mon Sep 17 00:00:00 2001
From: Julio Araujo <julio.araujo@rocket.chat>
Date: Thu, 30 Jan 2025 16:23:41 +0100
Subject: [PATCH 1017/1140] Bump openpgp

---
 packages/email/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/email/package.js b/packages/email/package.js
index 27ae6d4546..3152940a19 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -7,7 +7,7 @@ Npm.depends({
   nodemailer: "6.9.10",
   "stream-buffers": "3.0.2",
   "@types/nodemailer": "6.4.14",
-  "nodemailer-openpgp": "2.2.0",
+  "nodemailer-openpgp": "2.2.1",
 });
 
 Package.onUse(function (api) {

From 48e33b7bdcb3a15e3847f05b3e3b8ddb77d8e98d Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 31 Jan 2025 10:35:33 +0100
Subject: [PATCH 1018/1140] feat: add feature toggle argon2Enabled

---
 packages/accounts-base/accounts-base.d.ts     |   8 +-
 packages/accounts-base/accounts_common.js     |   4 +
 packages/accounts-password/password_server.js | 378 ++++++++++--------
 3 files changed, 230 insertions(+), 160 deletions(-)

diff --git a/packages/accounts-base/accounts-base.d.ts b/packages/accounts-base/accounts-base.d.ts
index 0c44cc7657..7fbbfde0a6 100644
--- a/packages/accounts-base/accounts-base.d.ts
+++ b/packages/accounts-base/accounts-base.d.ts
@@ -81,6 +81,8 @@ export namespace Accounts {
     passwordEnrollTokenExpiration?: number | undefined;
     passwordEnrollTokenExpirationInDays?: number | undefined;
     ambiguousErrorMessages?: boolean | undefined;
+    bcryptRounds?: number | undefined;
+    argon2Enabled?: string | false;
     argon2Type?: string | undefined;
     argon2TimeCost: number | undefined;
     argon2MemoryCost: number | undefined;
@@ -356,10 +358,10 @@ export namespace Accounts {
 
   /**
    *
-   * Check whether the provided password matches the argon2'ed password in
+   * Check whether the provided password matches the encrypted password in
    * the database user record. `password` can be a string (in which case
-   * it will be run through SHA256 before argon2) or an object with
-   * properties `digest` and `algorithm` (in which case we argon2
+   * it will be run through SHA256 before bcrypt or argon2) or an object with
+   * properties `digest` and `algorithm` (in which case we bcrypt/argon2
    * `password.digest`).
    */
   function _checkPasswordAsync(
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 9186a9ac85..d95eae8aba 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -13,6 +13,8 @@ const VALID_CONFIG_KEYS = [
   'passwordEnrollTokenExpirationInDays',
   'passwordEnrollTokenExpiration',
   'ambiguousErrorMessages',
+  'bcryptRounds',
+  'argon2Enabled',
   'argon2Type',
   'argon2TimeCost',
   'argon2MemoryCost',
@@ -213,6 +215,8 @@ export class AccountsCommon {
    * @param {Number} options.passwordEnrollTokenExpirationInDays The number of days from when a link to set initial password is sent until token expires and user can't set password with the link anymore. Defaults to 30.
    * @param {Number} options.passwordEnrollTokenExpiration The number of milliseconds from when a link to set initial password is sent until token expires and user can't set password with the link anymore. If `passwordEnrollTokenExpirationInDays` is set, it takes precedent.
    * @param {Boolean} options.ambiguousErrorMessages Return ambiguous error messages from login failures to prevent user enumeration. Defaults to `true`.
+   * @param {Number} options.bcryptRounds Allows override of number of bcrypt rounds (aka work factor) used to store passwords. The default is 10.
+   * @param {Boolean} options.argon2Enabled Enable argon2 algorithm usage in replacement for bcrypt. The default is `false`.
    * @param {'argon2id' | 'argon2i' | 'argon2d'} options.argon2Type Allows override of the argon2 algorithm type. The default is `argon2id`.
    * @param {Number} options.argon2TimeCost Allows override of number of argon2 iterations (aka time cost) used to store passwords. The default is 3.
    * @param {Number} options.argon2MemoryCost Allows override of the amount of memory (in KiB) used by the argon2 algorithm. The default is 65536 (64MB).
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 9bd9470035..3498de2721 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -1,5 +1,5 @@
 import argon2 from "argon2";
-import { compare as bcryptCompare } from "bcrypt";
+import { hash as bcryptHash, compare as bcryptCompare } from "bcrypt";
 import { Accounts } from "meteor/accounts-base";
 
 // Utility for grabbing user
@@ -8,7 +8,7 @@ const getUserById =
     await Meteor.users.findOneAsync(id, Accounts._addDefaultFieldSelector(options));
 
 // User records have two fields that are used for password-based login:
-// - 'services.password.bcrypt', which stores the bcrypt password, which is now deprecated
+// - 'services.password.bcrypt', which stores the bcrypt password, which will be deprecated
 // - 'services.password.argon2', which stores the argon2 password
 //
 // When the client sends a password to the server, it can either be a
@@ -19,9 +19,13 @@ const getUserById =
 // strings.
 //
 // When the server receives a plaintext password as a string, it always
-// hashes it with SHA256 before passing it into argon2. When the server
+// hashes it with SHA256 before passing it into bcrypt / argon2. When the server
 // receives a password as an object, it asserts that the algorithm is
-// "sha-256" and then passes the digest to argon2.
+// "sha-256" and then passes the digest to bcrypt / argon2.
+
+Accounts._bcryptRounds = () => Accounts._options.bcryptRounds || 10;
+
+Accounts._argon2Enabled = () => Accounts._options.argon2Enabled || false;
 
 const ARGON2_TYPES = {
   argon2i: argon2.argon2i,
@@ -35,7 +39,7 @@ Accounts._argon2MemoryCost = () => Accounts._options.argon2MemoryCost || 65536;
 Accounts._argon2Parallelism = () => Accounts._options.argon2Parallelism || 4;
 
 /**
- * Extracts the string to be encrypted using Argon2 from the given `password`.
+ * Extracts the string to be encrypted using bcrypt or Argon2 from the given `password`.
  *
  * @param {string|Object} password - The password provided by the client. It can be:
  *  - A plaintext string password.
@@ -50,31 +54,51 @@ Accounts._argon2Parallelism = () => Accounts._options.argon2Parallelism || 4;
 const getPasswordString = password => {
   if (typeof password === "string") {
     password = SHA256(password);
-  } else { // 'password' is an object
+  }
+  else { // 'password' is an object
     if (password.algorithm !== "sha-256") {
       throw new Error("Invalid password hash algorithm. " +
-                      "Only 'sha-256' is allowed.");
+        "Only 'sha-256' is allowed.");
     }
     password = password.digest;
   }
   return password;
 };
 
-// Use argon2 to hash the password for storage in the database.
-// `password` can be a string (in which case it will be run through
-// SHA256 before argon2) or an object with properties `digest` and
-// `algorithm` (in which case we argon2 `password.digest`).
-//
-const hashPassword = async password => {
+/**
+ * Encrypt the given `password` using either bcrypt or Argon2.
+ * @param password can be a string (in which case it will be run through SHA256 before encryption) or an object with properties `digest` and `algorithm` (in which case we bcrypt or Argon2 `password.digest`).
+ * @returns {Promise<string>} The encrypted password.
+ */
+const hashPassword = async (password) => {
   password = getPasswordString(password);
-  return await argon2.hash(password, {
-    type: Accounts._argon2Type(),
-    timeCost: Accounts._argon2TimeCost(),
-    memoryCost: Accounts._argon2MemoryCost(),
-    parallelism: Accounts._argon2Parallelism(),
-  });
+  if (Accounts._argon2Enabled() === true) {
+    return await argon2.hash(password, {
+      type: Accounts._argon2Type(),
+      timeCost: Accounts._argon2TimeCost(),
+      memoryCost: Accounts._argon2MemoryCost(),
+      parallelism: Accounts._argon2Parallelism()
+    });
+  }
+  else {
+    return await bcryptHash(password, Accounts._bcryptRounds());
+  }
 };
 
+// Extract the number of rounds used in the specified bcrypt hash.
+const getRoundsFromBcryptHash = (hash) => {
+  let rounds;
+  if (hash) {
+    const hashSegments = hash.split("$");
+    if (hashSegments.length > 2) {
+      rounds = parseInt(hashSegments[2], 10);
+    }
+  }
+  return rounds;
+};
+Accounts._getRoundsFromBcryptHash = getRoundsFromBcryptHash;
+
+
 /**
  * Extract readable parameters from an Argon2 hash string.
  * @param {string} hash - The Argon2 hash string.
@@ -108,6 +132,49 @@ const getUserPasswordHash = user => {
 
 Accounts._checkPasswordUserFields = { _id: 1, services: 1 };
 
+const isBcrypt = (hash) => {
+  // bcrypt hashes start with $2a$ or $2b$
+  // argon2 hashes start with $argon2i$, $argon2d$ or $argon2id$
+  return hash.startsWith("$2");
+};
+
+const updateUserPasswordDefered = (user, formattedPassword) => {
+  Meteor.defer(async () => {
+    await updateUserPassword(user, formattedPassword);
+  });
+};
+
+/**
+ * Hashes the provided password and returns an object that can be used to update the user's password.
+ * @param formattedPassword
+ * @returns {Promise<{$set: {"services.password.bcrypt": string}}|{$unset: {"services.password.bcrypt": number}, $set: {"services.password.argon2": string}}>}
+ */
+const getUpdatorForUserPassword = async (formattedPassword) => {
+  const encryptedPassword = await hashPassword(formattedPassword);
+  if (Accounts._argon2Enabled() === false) {
+    return {
+      $set: {
+        "services.password.bcrypt": encryptedPassword
+      }
+    };
+  }
+  else if (Accounts._argon2Enabled() === true) {
+    return {
+      $set: {
+        "services.password.argon2": encryptedPassword
+      },
+      $unset: {
+        "services.password.bcrypt": 1
+      }
+    };
+  }
+};
+
+const updateUserPassword = async (user, formattedPassword) => {
+  const updator = await getUpdatorForUserPassword(formattedPassword);
+  await Meteor.users.updateAsync({ _id: user._id }, updator);
+};
+
 /**
  * Checks whether the provided password matches the hashed password stored in the user's database record.
  *
@@ -138,60 +205,55 @@ const checkPasswordAsync = async (user, password) => {
   const formattedPassword = getPasswordString(password);
   const hash = getUserPasswordHash(user);
 
-  // bcrypt hashes start with $2a$ or $2b$
-  // argon2 hashes start with $argon2i$, $argon2d$ or $argon2id$
-  if (hash.startsWith("$2")) {
-    // migration code from bcrypt to argon2
+
+  const argon2Enabled = Accounts._argon2Enabled();
+  if (argon2Enabled === false) {
+    const hashRounds = getRoundsFromBcryptHash(hash);
     const match = await bcryptCompare(formattedPassword, hash);
     if (!match) {
       result.error = Accounts._handleError("Incorrect password", false);
     }
-    else {
-      // The password checks out, but the user's stored password needs to be updated to argon2
-      Meteor.defer(async () => {
-        await Meteor.users.updateAsync(
-          { _id: user._id },
-          {
-            $set: {
-              "services.password.argon2":
-                await hashPassword(password)
-            },
-            $unset: {
-              "services.password.bcrypt": 1
-            }
-          }
-        );
-      });
-    }
-  }
-  else {
-    // argon2 password
-    const argon2Params = getArgon2Params(hash);
-
-    if (!(await argon2.verify(hash, formattedPassword))) {
-      result.error = Accounts._handleError("Incorrect password", false);
-    }
     else if (hash) {
-      const paramsChanged = argon2Params.memoryCost !== Accounts._argon2MemoryCost() ||
-        argon2Params.timeCost !== Accounts._argon2TimeCost() ||
-        argon2Params.parallelism !== Accounts._argon2Parallelism() ||
-        argon2Params.type !== Accounts._argon2Type();
+      const paramsChanged = hashRounds !== Accounts._bcryptRounds();
+      // The password checks out, but the user's bcrypt hash needs to be updated
+      // to match current bcrypt settings
       if (paramsChanged === true) {
-        // The password checks out, but the user's argon2 hash needs to be updated with the right params
-        Meteor.defer(async () => {
-          await Meteor.users.updateAsync(
-            { _id: user._id },
-            {
-              $set: {
-                "services.password.argon2":
-                  await hashPassword(formattedPassword)
-              }
-            }
-          );
-        });
+        updateUserPasswordDefered(user, { digest: formattedPassword, algorithm: "sha-256" });
       }
     }
   }
+  else if (argon2Enabled === true) {
+    if (isBcrypt(hash)) {
+      // migration code from bcrypt to argon2
+      const match = await bcryptCompare(formattedPassword, hash);
+      if (!match) {
+        result.error = Accounts._handleError("Incorrect password", false);
+      }
+      else {
+        // The password checks out, but the user's stored password needs to be updated to argon2
+        updateUserPasswordDefered(user, { digest: formattedPassword, algorithm: "sha-256" });
+      }
+    }
+    else {
+      // argon2 password
+      const argon2Params = getArgon2Params(hash);
+      const match = await argon2.verify(hash, formattedPassword);
+      if (!match) {
+        result.error = Accounts._handleError("Incorrect password", false);
+      }
+      else if (hash) {
+        const paramsChanged = argon2Params.memoryCost !== Accounts._argon2MemoryCost() ||
+          argon2Params.timeCost !== Accounts._argon2TimeCost() ||
+          argon2Params.parallelism !== Accounts._argon2Parallelism() ||
+          argon2Params.type !== Accounts._argon2Type();
+        if (paramsChanged === true) {
+          // The password checks out, but the user's argon2 hash needs to be updated with the right params
+          updateUserPasswordDefered(user, { digest: formattedPassword, algorithm: "sha-256" });
+        }
+      }
+    }
+  }
+
 
   return result;
 };
@@ -361,54 +423,54 @@ Accounts.setUsername =
 // `digest` and `algorithm` (representing the SHA256 of the password).
 Meteor.methods(
   {
-    changePassword: async function (oldPassword, newPassword) {
-  check(oldPassword, passwordValidator);
-  check(newPassword, passwordValidator);
+    changePassword: async function(oldPassword, newPassword) {
+      check(oldPassword, passwordValidator);
+      check(newPassword, passwordValidator);
 
-  if (!this.userId) {
-    throw new Meteor.Error(401, "Must be logged in");
-  }
-
-  const user = await getUserById(this.userId, {fields: {
-    services: 1,
-    ...Accounts._checkPasswordUserFields,
-  }});
-  if (!user) {
-    Accounts._handleError("User not found");
-  }
-
-  if (!getUserPasswordHash(user)) {
-    Accounts._handleError("User has no password set");
-  }
-
-  const result = await checkPasswordAsync(user, oldPassword);
-  if (result.error) {
-    throw result.error;
-  }
-
-  const hashed = await hashPassword(newPassword);
-
-  // It would be better if this removed ALL existing tokens and replaced
-  // the token for the current connection with a new one, but that would
-  // be tricky, so we'll settle for just replacing all tokens other than
-  // the one for the current connection.
-  const currentToken = Accounts._getLoginToken(this.connection.id);
-  await Meteor.users.updateAsync(
-    { _id: this.userId },
-    {
-      $set: { 'services.password.argon2': hashed },
-      $pull: {
-        'services.resume.loginTokens': { hashedToken: { $ne: currentToken } }
-      },
-      $unset: {
-        'services.password.reset': 1,
-        'services.password.bcrypt': 1
+      if (!this.userId) {
+        throw new Meteor.Error(401, "Must be logged in");
       }
-    }
-  );
 
-  return {passwordChanged: true};
-}});
+      const user = await getUserById(this.userId, {
+        fields: {
+          services: 1,
+          ...Accounts._checkPasswordUserFields
+        }
+      });
+      if (!user) {
+        Accounts._handleError("User not found");
+      }
+
+      if (!getUserPasswordHash(user)) {
+        Accounts._handleError("User has no password set");
+      }
+
+      const result = await checkPasswordAsync(user, oldPassword);
+      if (result.error) {
+        throw result.error;
+      }
+
+      // It would be better if this removed ALL existing tokens and replaced
+      // the token for the current connection with a new one, but that would
+      // be tricky, so we'll settle for just replacing all tokens other than
+      // the one for the current connection.
+      const currentToken = Accounts._getLoginToken(this.connection.id);
+      const updator = await getUpdatorForUserPassword(newPassword);
+
+      await Meteor.users.updateAsync(
+        { _id: this.userId },
+        {
+          $set: updator.$set,
+          $pull: {
+            "services.resume.loginTokens": { hashedToken: { $ne: currentToken } }
+          },
+          $unset: { "services.password.reset": 1, ...updator.$unset }
+        }
+      );
+
+      return { passwordChanged: true };
+    }
+  });
 
 
 // Force change the users password.
@@ -424,33 +486,27 @@ Meteor.methods(
  */
 Accounts.setPasswordAsync =
   async (userId, newPlaintextPassword, options) => {
-  check(userId, String);
-  check(newPlaintextPassword, Match.Where(str => Match.test(str, String) && str.length <= Meteor.settings?.packages?.accounts?.passwordMaxLength || 256));
-  check(options, Match.Maybe({ logout: Boolean }));
-  options = { logout: true , ...options };
+    check(userId, String);
+    check(newPlaintextPassword, Match.Where(str => Match.test(str, String) && str.length <= Meteor.settings?.packages?.accounts?.passwordMaxLength || 256));
+    check(options, Match.Maybe({ logout: Boolean }));
+    options = { logout: true, ...options };
 
-  const user = await getUserById(userId, { fields: { _id: 1 } });
-  if (!user) {
-    throw new Meteor.Error(403, "User not found");
-  }
-
-  const update = {
-    $unset: {
-      'services.password.reset': 1,
-      'services.password.bcrypt': 1
-    },
-    $set: {
-      'services.password.argon2': await hashPassword(newPlaintextPassword)
+    const user = await getUserById(userId, { fields: { _id: 1 } });
+    if (!user) {
+      throw new Meteor.Error(403, "User not found");
     }
+
+    let updator = await getUpdatorForUserPassword(newPlaintextPassword);
+    updator.$unset = updator.$unset || {};
+    updator.$unset["services.password.reset"] = 1;
+
+    if (options.logout) {
+      updator.$unset["services.resume.loginTokens"] = 1;
+    }
+
+    await Meteor.users.updateAsync({ _id: user._id }, updator);
   };
 
-  if (options.logout) {
-    update.$unset['services.resume.loginTokens'] = 1;
-  }
-
-  await Meteor.users.updateAsync({_id: user._id}, update);
-};
-
 ///
 /// RESETTING VIA EMAIL
 ///
@@ -749,8 +805,6 @@ Meteor.methods(
                 error: new Meteor.Error(403, "Token has invalid email address")
               };
 
-            const hashed = await hashPassword(newPassword);
-
             // NOTE: We're about to invalidate tokens on the user, who we might be
             // logged in as. Make sure to avoid logging ourselves out if this
             // happens. But also make sure not to leave the connection in a state
@@ -760,6 +814,8 @@ Meteor.methods(
             const resetToOldToken = () =>
               Accounts._setLoginToken(user._id, this.connection, oldToken);
 
+            const updator = await getUpdatorForUserPassword(newPassword);
+
             try {
               // Update the user record by:
               // - Changing the password to the new one
@@ -771,34 +827,35 @@ Meteor.methods(
                 affectedRecords = await Meteor.users.updateAsync(
                   {
                     _id: user._id,
-                    'emails.address': email,
-                    'services.password.enroll.token': token
+                    "emails.address": email,
+                    "services.password.enroll.token": token
                   },
                   {
                     $set: {
-                      'services.password.argon2': hashed,
-                      'emails.$.verified': true
+                      "emails.$.verified": true,
+                      ...updator.$set
                     },
                     $unset: {
-                      'services.password.enroll': 1,
-                      'services.password.bcrypt': 1,
+                      "services.password.enroll": 1,
+                      ...updator.$unset
                     }
                   });
-              } else {
+              }
+              else {
                 affectedRecords = await Meteor.users.updateAsync(
                   {
                     _id: user._id,
-                    'emails.address': email,
-                    'services.password.reset.token': token
+                    "emails.address": email,
+                    "services.password.reset.token": token
                   },
                   {
                     $set: {
-                      'services.password.argon2': hashed,
-                      'emails.$.verified': true
+                      "emails.$.verified": true,
+                      ...updator.$set
                     },
                     $unset: {
-                      'services.password.reset': 1,
-                      'services.password.bcrypt': 1,
+                      "services.password.reset": 1,
+                      ...updator.$unset
                     }
                   });
               }
@@ -817,15 +874,16 @@ Meteor.methods(
             await Accounts._clearAllLoginTokens(user._id);
 
             if (Accounts._check2faEnabled?.(user)) {
-        return {
-          userId: user._id,
-          error: Accounts._handleError(
-            'Changed password, but user not logged in because 2FA is enabled',
-            false,
-            '2fa-enabled'
-          ),
-        };
-      }return { userId: user._id };
+              return {
+                userId: user._id,
+                error: Accounts._handleError(
+                  'Changed password, but user not logged in because 2FA is enabled',
+                  false,
+                  '2fa-enabled'
+                ),
+              };
+            }
+            return { userId: user._id };
           }
         );
       }
@@ -1103,7 +1161,13 @@ const createUser =
     const user = { services: {} };
     if (password) {
       const hashed = await hashPassword(password);
-      user.services.password = { argon2: hashed };
+      const argon2Enabled = Accounts._argon2Enabled();
+      if (argon2Enabled === false) {
+        user.services.password = { bcrypt: hashed };
+      }
+      else {
+        user.services.password = { argon2: hashed };
+      }
     }
 
     return await Accounts._createUserCheckingDuplicates({ user, email, username, options });

From 9325a6f1df741ca8ffb319b6cfcaaf193cd96eef Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 31 Jan 2025 10:35:59 +0100
Subject: [PATCH 1019/1140] fix: remove console log of Urls when
 Meteor.isPackageTest

---
 packages/accounts-password/password_server.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 3498de2721..8d738b7fd5 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -697,7 +697,7 @@ Accounts.sendResetPasswordEmail =
     const options = await Accounts.generateOptionsForEmail(realEmail, user, url, 'resetPassword');
     await Email.sendAsync(options);
 
-    if (Meteor.isDevelopment) {
+    if (Meteor.isDevelopment && !Meteor.isPackageTest) {
       console.log(`\nReset password URL: ${ url }`);
     }
     return { email: realEmail, user, token, url, options };
@@ -733,7 +733,7 @@ Accounts.sendEnrollmentEmail =
       await Accounts.generateOptionsForEmail(realEmail, user, url, 'enrollAccount');
 
     await Email.sendAsync(options);
-    if (Meteor.isDevelopment) {
+    if (Meteor.isDevelopment && !Meteor.isPackageTest) {
       console.log(`\nEnrollment email URL: ${ url }`);
     }
     return { email: realEmail, user, token, url, options };
@@ -919,7 +919,7 @@ Accounts.sendVerificationEmail =
     const url = Accounts.urls.verifyEmail(token, extraParams);
     const options = await Accounts.generateOptionsForEmail(realEmail, user, url, 'verifyEmail');
     await Email.sendAsync(options);
-    if (Meteor.isDevelopment) {
+    if (Meteor.isDevelopment && !Meteor.isPackageTest) {
       console.log(`\nVerification email URL: ${ url }`);
     }
     return { email: realEmail, user, token, url, options };

From 41de1fe907c660399f876ac20f367e45cd9dfb4c Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 31 Jan 2025 11:03:34 +0100
Subject: [PATCH 1020/1140] fix: revert to initial password_tests file

---
 packages/accounts-password/password_tests.js | 319 ++++++++-----------
 1 file changed, 125 insertions(+), 194 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index f50943e59f..7e895374cd 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -802,7 +802,7 @@ if (Meteor.isClient) (() => {
       // Can update own profile using ID.
       await Meteor.users.updateAsync(
         this.userId, { $set: { 'profile.updated': 42 } },
-       );
+      );
       test.equal(42, Meteor.user().profile.updated);
     },
     logoutStep
@@ -1171,7 +1171,7 @@ if (Meteor.isServer) (() => {
       // set a new password.
       await Accounts.setPasswordAsync(userId, 'new password');
       user = await Meteor.users.findOneAsync(userId);
-      const oldSaltedHash = user.services.password.argon2;
+      const oldSaltedHash = user.services.password.bcrypt;
       test.isTrue(oldSaltedHash);
       // Send a reset password email (setting a reset token) and insert a login
       // token.
@@ -1184,7 +1184,7 @@ if (Meteor.isServer) (() => {
       // reset with the same password, see we get a different salted hash
       await Accounts.setPasswordAsync(userId, 'new password', { logout: false });
       user = await Meteor.users.findOneAsync(userId);
-      const newSaltedHash = user.services.password.argon2;
+      const newSaltedHash = user.services.password.bcrypt;
       test.isTrue(newSaltedHash);
       test.notEqual(oldSaltedHash, newSaltedHash);
       // No more reset token.
@@ -1196,7 +1196,7 @@ if (Meteor.isServer) (() => {
       // reset again, see that the login tokens are gone.
       await Accounts.setPasswordAsync(userId, 'new password');
       user = await Meteor.users.findOneAsync(userId);
-      const newerSaltedHash = user.services.password.argon2;
+      const newerSaltedHash = user.services.password.bcrypt;
       test.isTrue(newerSaltedHash);
       test.notEqual(oldSaltedHash, newerSaltedHash);
       test.notEqual(newSaltedHash, newerSaltedHash);
@@ -1727,142 +1727,124 @@ if (Meteor.isServer) (() => {
     });
 
   Tinytest.addAsync("passwords - add email when user has not an existing email",
-      async test => {
-    const userId = await Accounts.createUser({
-      username: `user${ Random.id() }`
-    });
+    async test => {
+      const userId = await Accounts.createUser({
+        username: `user${ Random.id() }`
+      });
 
-    const newEmail = `${ Random.id() }@turing.com`;
-    await Accounts.addEmailAsync(userId, newEmail);
-    const u1 = await Accounts._findUserByQuery({ id: userId })
-    test.equal(u1.emails, [
-      { address: newEmail, verified: false },
-    ]);
-  });
+      const newEmail = `${ Random.id() }@turing.com`;
+      await Accounts.addEmailAsync(userId, newEmail);
+      const u1 = await Accounts._findUserByQuery({ id: userId })
+      test.equal(u1.emails, [
+        { address: newEmail, verified: false },
+      ]);
+    });
 
   Tinytest.addAsync("passwords - add email when the user has an existing email " +
     "only differing in case",
     async test => {
-    const origEmail = `${ Random.id() }@turing.com`;
-    const userId = await Accounts.createUser({
-      email: origEmail
+      const origEmail = `${ Random.id() }@turing.com`;
+      const userId = await Accounts.createUser({
+        email: origEmail
+      });
+
+      const newEmail = `${ Random.id() }@turing.com`;
+      await Accounts.addEmailAsync(userId, newEmail);
+
+      const thirdEmail = origEmail.toUpperCase();
+      await Accounts.addEmailAsync(userId, thirdEmail, true);
+      const u1 = await Accounts._findUserByQuery({ id: userId })
+      test.equal(u1.emails, [
+        { address: thirdEmail, verified: true },
+        { address: newEmail, verified: false }
+      ]);
     });
 
-    const newEmail = `${ Random.id() }@turing.com`;
-    await Accounts.addEmailAsync(userId, newEmail);
-
-    const thirdEmail = origEmail.toUpperCase();
-    await Accounts.addEmailAsync(userId, thirdEmail, true);
-    const u1 = await Accounts._findUserByQuery({ id: userId })
-    test.equal(u1.emails, [
-      { address: thirdEmail, verified: true },
-      { address: newEmail, verified: false }
-    ]);
-  });
-
   Tinytest.addAsync("passwords - add email should fail when there is an existing " +
     "user with an email only differing in case",
     async test => {
-    const user1Email = `${ Random.id() }@turing.com`;
-    const userId1 = await Accounts.createUser({
-      email: user1Email
+      const user1Email = `${ Random.id() }@turing.com`;
+      const userId1 = await Accounts.createUser({
+        email: user1Email
+      });
+
+      const user2Email = `${ Random.id() }@turing.com`;
+      const userId2 = await Accounts.createUser({
+        email: user2Email
+      });
+
+      const dupEmail = user1Email.toUpperCase();
+      await test.throwsAsync(
+        async () => await Accounts.addEmailAsync(userId2, dupEmail),
+        /Email already exists/
+      );
+
+      const u1 = await Accounts._findUserByQuery({ id: userId1 })
+      test.equal(u1.emails, [
+        { address: user1Email, verified: false }
+      ]);
+      const u2 = await Accounts._findUserByQuery({ id: userId2 })
+      test.equal(u2.emails, [
+        { address: user2Email, verified: false }
+      ]);
     });
 
-    const user2Email = `${ Random.id() }@turing.com`;
-    const userId2 = await Accounts.createUser({
-      email: user2Email
-    });
-
-    const dupEmail = user1Email.toUpperCase();
-    await test.throwsAsync(
-     async () => await Accounts.addEmailAsync(userId2, dupEmail),
-      /Email already exists/
-    );
-
-    const u1 = await Accounts._findUserByQuery({ id: userId1 })
-    test.equal(u1.emails, [
-      { address: user1Email, verified: false }
-    ]);
-    const u2 = await Accounts._findUserByQuery({ id: userId2 })
-    test.equal(u2.emails, [
-      { address: user2Email, verified: false }
-    ]);
-  });
-
   Tinytest.addAsync("passwords - remove email",
     async test => {
-    const origEmail = `${ Random.id() }@turing.com`;
-    const userId = await Accounts.createUser({
-      email: origEmail
+      const origEmail = `${ Random.id() }@turing.com`;
+      const userId = await Accounts.createUser({
+        email: origEmail
+      });
+
+      const newEmail = `${ Random.id() }@turing.com`;
+      await Accounts.addEmailAsync(userId, newEmail);
+
+      const thirdEmail = `${ Random.id() }@turing.com`;
+      await Accounts.addEmailAsync(userId, thirdEmail, true);
+      const u1 = await Accounts._findUserByQuery({ id: userId })
+      test.equal(u1.emails, [
+        { address: origEmail, verified: false },
+        { address: newEmail, verified: false },
+        { address: thirdEmail, verified: true }
+      ]);
+
+      await Accounts.removeEmail(userId, newEmail);
+      const u2 = await Accounts._findUserByQuery({ id: userId })
+      test.equal(u2.emails, [
+        { address: origEmail, verified: false },
+        { address: thirdEmail, verified: true }
+      ]);
+
+      await Accounts.removeEmail(userId, origEmail);
+      const u3 = await Accounts._findUserByQuery({ id: userId })
+      test.equal(u3.emails, [
+        { address: thirdEmail, verified: true }
+      ]);
     });
 
-    const newEmail = `${ Random.id() }@turing.com`;
-    await Accounts.addEmailAsync(userId, newEmail);
-
-    const thirdEmail = `${ Random.id() }@turing.com`;
-    await Accounts.addEmailAsync(userId, thirdEmail, true);
-    const u1 = await Accounts._findUserByQuery({ id: userId })
-    test.equal(u1.emails, [
-      { address: origEmail, verified: false },
-      { address: newEmail, verified: false },
-      { address: thirdEmail, verified: true }
-    ]);
-
-    await Accounts.removeEmail(userId, newEmail);
-    const u2 = await Accounts._findUserByQuery({ id: userId })
-    test.equal(u2.emails, [
-      { address: origEmail, verified: false },
-      { address: thirdEmail, verified: true }
-    ]);
-
-    await Accounts.removeEmail(userId, origEmail);
-    const u3 = await Accounts._findUserByQuery({ id: userId })
-    test.equal(u3.emails, [
-      { address: thirdEmail, verified: true }
-    ]);
-  });
-
-  const getUserHashArgon2Params = function (user) {
-    const hash = user?.services?.password?.argon2;
-    return Accounts._getArgon2Params(hash);
-  }
-
-  testAsyncMulti("passwords - allow custom argon2 Params", [
-    async function(test) {
-      // Verify that a argon2 hash generated for a new account uses the
-      // default params.
+  const getUserHashRounds = user =>
+    Number(user.services.password.bcrypt.substring(4, 6));
+  testAsyncMulti("passwords - allow custom bcrypt rounds",[
+    async function (test) {
+      // Verify that a bcrypt hash generated for a new account uses the
       let username = Random.id();
-      this.password = hashPassword("abc123");
+      this.password = hashPassword('abc123');
       this.userId1 = await Accounts.createUser({ username, password: this.password });
-      this.user1 = await Meteor.users.findOneAsync(this.userId1);
-      let argon2Params = getUserHashArgon2Params(this.user1);
-      test.equal(argon2Params.type, Accounts._argon2Type());
-      test.equal(argon2Params.memoryCost, Accounts._argon2MemoryCost());
-      test.equal(argon2Params.timeCost, Accounts._argon2TimeCost());
-      test.equal(argon2Params.parallelism, Accounts._argon2Parallelism());
+      this.user1 =  await Meteor.users.findOneAsync(this.userId1);
+      let rounds = getUserHashRounds(this.user1);
+      test.equal(rounds, Accounts._bcryptRounds());
 
-
-      // When a custom number of argon2 TimeCost is set via Accounts.config,
-      // and an account was already created using the default number of TimeCost,
+      // When a custom number of bcrypt rounds is set via Accounts.config,
+      // and an account was already created using the default number of rounds,
       // make sure that a new hash is created (and stored) using the new number
-      // of TimeCost, the next time the password is checked.
-      this.customType = "argon2d"; // argon2.argon2d = 2
-      this.customTimeCost = 4;
-      this.customMemoryCost = 32768;
-      this.customParallelism = 1;
-      Accounts._options.argon2Type = this.customType;
-      Accounts._options.argon2TimeCost = this.customTimeCost;
-      Accounts._options.argon2MemoryCost = this.customMemoryCost;
-      Accounts._options.argon2Parallelism = this.customParallelism;
-
+      // of rounds, the next time the password is checked.
+      this.customRounds = 11;
+      Accounts._options.bcryptRounds = this.customRounds;
       await Accounts._checkPasswordAsync(this.user1, this.password);
     },
     async function(test) {
-      const defaultType = Accounts._argon2Type();
-      const defaultTimeCost = Accounts._argon2TimeCost();
-      const defaultMemoryCost = Accounts._argon2MemoryCost();
-      const defaultParallelism = Accounts._argon2Parallelism();
-      let params;
+      const defaultRounds = Accounts._bcryptRounds();
+      let rounds;
       let username;
 
       let resolve;
@@ -1870,60 +1852,50 @@ if (Meteor.isServer) (() => {
 
       Meteor.setTimeout(async () => {
         this.user1 = await Meteor.users.findOneAsync(this.userId1);
-        params = getUserHashArgon2Params(this.user1);
-        test.equal(params.type, 2);
-        test.equal(params.timeCost, this.customTimeCost);
-        test.equal(params.memoryCost, this.customMemoryCost);
-        test.equal(params.parallelism, this.customParallelism);
-
-        // When a custom number of argon2 TimeCost is set, make sure it's
-        // used for new argon2 password hashes.
+        rounds = getUserHashRounds(this.user1);
+        test.equal(rounds, this.customRounds);
+        // When a custom number of bcrypt rounds is set, make sure it's
+        // used for new bcrypt password hashes.
         username = Random.id();
         const userId2 = await Accounts.createUser({ username, password: this.password });
         const user2 = await Meteor.users.findOneAsync(userId2);
-        params = getUserHashArgon2Params(user2);
-        test.equal(params.type, 2);
-        test.equal(params.timeCost, this.customTimeCost);
-        test.equal(params.memoryCost, this.customMemoryCost);
-        test.equal(params.parallelism, this.customParallelism);
+        rounds = getUserHashRounds(user2);
+        test.equal(rounds, this.customRounds);
 
         // Cleanup
-        Accounts._options.argon2Type = defaultType;
-        Accounts._options.argon2TimeCost = defaultTimeCost;
-        Accounts._options.argon2MemoryCost = defaultMemoryCost;
-        Accounts._options.argon2Parallelism = defaultParallelism;
+        Accounts._options.bcryptRounds = defaultRounds;
         await Meteor.users.removeAsync(this.userId1);
         await Meteor.users.removeAsync(userId2);
         resolve();
-      }, 1000);
+      }, 5000);
 
       return promise;
     }
-  ]);
+  ]); // default number of rounds.
 
 
   Tinytest.addAsync('passwords - extra params in email urls',
     async (test) => {
-    const username = Random.id();
-    const email = `${ username }-intercept@example.com`;
+      const username = Random.id();
+      const email = `${ username }-intercept@example.com`;
 
-    const userId = await Accounts.createUser({
-      username: username,
-      email: email
+      const userId = await Accounts.createUser({
+        username: username,
+        email: email
+      });
+
+      const extraParams = { test: 'success' };
+      await Accounts.sendEnrollmentEmail(userId, email, null, extraParams);
+
+      const [enrollPasswordEmailOptions] =
+        await Meteor.callAsync("getInterceptedEmails", email);
+
+      const re = new RegExp(`${Meteor.absoluteUrl()}(\\S*)`);
+      const match = enrollPasswordEmailOptions.text.match(re);
+      const url = new URL(match)
+      test.equal(url.searchParams.get('test'), extraParams.test);
     });
 
-    const extraParams = { test: 'success' };
-    await Accounts.sendEnrollmentEmail(userId, email, null, extraParams);
-
-    const [enrollPasswordEmailOptions] =
-     await Meteor.callAsync("getInterceptedEmails", email);
-
-    const re = new RegExp(`${Meteor.absoluteUrl()}(\\S*)`);
-    const match = enrollPasswordEmailOptions.text.match(re);
-    const url = new URL(match)
-    test.equal(url.searchParams.get('test'), extraParams.test);
-  });
-
   Tinytest.addAsync('passwords - createUserAsync', async test => {
     const username = Random.id();
     const email = `${username}-intercept@example.com`;
@@ -1952,45 +1924,4 @@ if (Meteor.isServer) (() => {
       });
     }, 'already exists');
   });
-
-  Tinytest.addAsync("passwords - migration from bcrypt encryption to argon2", async test => {
-    const username = Random.id();
-    const email = `${username}@bcrypt.com`;
-    const password = "password";
-    const bcryptPasswordHash = "$2b$10$XIz481R/8TTXqtl9igiPmeZexiLkhy7oTk4pfO/oN5ymQnS5mWilC";// = brcypt(sha256('password'))
-    const userId = await Meteor.users.insertAsync({
-      username,
-      emails: [{ address: email, verified: false }],
-      services: {
-        password: {
-          bcrypt: bcryptPasswordHash
-        }
-      }
-    });
-    let user = await Meteor.users.findOneAsync(userId);
-    const isValid = await Accounts._checkPasswordAsync(user, password);
-    test.equal(isValid.userId, userId, "checkPassword with bcrypt - User ID should be returned");
-    test.equal(typeof isValid.error, "undefined", "checkPassword with bcrypt - No error should be returned");
-
-
-    let resolve;
-    const promise = new Promise(res => resolve = res);
-
-    // wait for defered execution of user update inside _checkPasswordAsync
-    Meteor.setTimeout(async () => {
-      user = await Meteor.users.findOneAsync(userId);
-      // bcrypt has been unset and argon2 set
-      test.equal(typeof user.services.password.bcrypt, "undefined", "bcrypt should be unset");
-      test.equal(typeof user.services.password.argon2, "string", "argon2 should be set");
-      // password is still valid using argon2
-      const isValidArgon = await Accounts._checkPasswordAsync(user, password);
-      test.equal(isValidArgon.userId, userId, "checkPassword with argon2 - User ID should be returned");
-      test.equal(typeof isValidArgon.error, "undefined", "checkPassword with argon2 - No error should be returned");
-      resolve();
-    }, 1000);
-
-    return promise
-
-
-  });
 })();

From 15c249f6560d4c943e236b750e144fc749ffe632 Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 31 Jan 2025 11:02:16 +0100
Subject: [PATCH 1021/1140] fix: rename hashPassword in test file to
 hashPasswordWithSha to avoid confusion with server side hashPassword used to
 encrypt password

---
 packages/accounts-password/password_tests.js | 46 ++++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 7e895374cd..e488c9a89e 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -10,7 +10,7 @@ const makeTestConnAsync =
     })
 const simplePollAsync = (fn) =>
   new Promise((resolve, reject) => simplePoll(fn,resolve,reject))
-function hashPassword(password) {
+function hashPasswordWithSha(password) {
   return {
     digest: SHA256(password),
     algorithm: "sha-256"
@@ -486,7 +486,7 @@ if (Meteor.isClient) (() => {
     function (test, expect) {
       this.secondConn = DDP.connect(Meteor.absoluteUrl());
       this.secondConn.call('login',
-        { user: { username: this.username }, password: hashPassword(this.password) },
+        { user: { username: this.username }, password: hashPasswordWithSha(this.password) },
         expect((err, result) => {
           test.isFalse(err);
           this.secondConn.setUserId(result.id);
@@ -1230,7 +1230,7 @@ if (Meteor.isServer) (() => {
       const username = Random.id();
       const id = await Accounts.createUser({
         username: username,
-        password: hashPassword('password')
+        password: hashPasswordWithSha('password')
       });
 
       const {
@@ -1245,7 +1245,7 @@ if (Meteor.isServer) (() => {
 
       const result = await clientConn.callAsync('login', {
         user: { username: username },
-        password: hashPassword('password')
+        password: hashPasswordWithSha('password')
       });
 
       test.isTrue(result);
@@ -1278,7 +1278,7 @@ if (Meteor.isServer) (() => {
       const userId = await Accounts.createUser({
         username: username,
         email: email,
-        password: hashPassword("old-password")
+        password: hashPasswordWithSha("old-password")
       });
       const user = await Meteor.users.findOneAsync(userId);
 
@@ -1297,7 +1297,7 @@ if (Meteor.isServer) (() => {
 
       await test.throwsAsync(
         async () =>
-          await Meteor.callAsync("resetPassword", resetPasswordToken, hashPassword("new-password")),
+          await Meteor.callAsync("resetPassword", resetPasswordToken, hashPasswordWithSha("new-password")),
         /Token has invalid email address/
       );
       await test.throwsAsync(
@@ -1306,7 +1306,7 @@ if (Meteor.isServer) (() => {
             "login",
             {
               user: { username: username },
-              password: hashPassword("new-password")
+              password: hashPasswordWithSha("new-password")
             }
           ),
         /Something went wrong. Please check your credentials./);
@@ -1321,7 +1321,7 @@ if (Meteor.isServer) (() => {
       const userId = await Accounts.createUser({
         username: username,
         email: email,
-        password: hashPassword("old-password")
+        password: hashPasswordWithSha("old-password")
       });
 
       const user = await Meteor.users.findOneAsync(userId);
@@ -1338,11 +1338,11 @@ if (Meteor.isServer) (() => {
       test.isTrue(await clientConn.callAsync(
         "resetPassword",
         resetPasswordToken,
-        hashPassword("new-password")
+        hashPasswordWithSha("new-password")
       ));
       test.isTrue(await clientConn.callAsync("login", {
         user: { username },
-        password: hashPassword("new-password")
+        password: hashPasswordWithSha("new-password")
       }));
     });
 
@@ -1355,7 +1355,7 @@ if (Meteor.isServer) (() => {
       const userId = await Accounts.createUser({
         username: username,
         email: email,
-        password: hashPassword("old-password")
+        password: hashPasswordWithSha("old-password")
       });
 
       const user = await Meteor.users.findOneAsync(userId);
@@ -1373,7 +1373,7 @@ if (Meteor.isServer) (() => {
       await Meteor.users.updateAsync(userId, { $set: { "services.password.reset.when": new Date(Date.now() + -5 * 24 * 3600 * 1000) } });
 
       try {
-        await Meteor.callAsync("resetPassword", resetPasswordToken, hashPassword("new-password"))
+        await Meteor.callAsync("resetPassword", resetPasswordToken, hashPasswordWithSha("new-password"))
       } catch (e) {
         test.throws(() => {
           throw e;
@@ -1385,7 +1385,7 @@ if (Meteor.isServer) (() => {
           "login",
           {
             user: { username: username },
-            password: hashPassword("new-password")
+            password: hashPasswordWithSha("new-password")
           }
         ),
         /Something went wrong. Please check your credentials./);
@@ -1405,7 +1405,7 @@ if (Meteor.isServer) (() => {
         {
           username: username,
           email: email,
-          password: hashPassword(password)
+          password: hashPasswordWithSha(password)
         },
       );
 
@@ -1432,7 +1432,7 @@ if (Meteor.isServer) (() => {
         await Accounts.createUser(
           {
             email: email,
-            password: hashPassword('password')
+            password: hashPasswordWithSha('password')
           }
         );
       await Accounts.sendResetPasswordEmail(userId, email);
@@ -1452,7 +1452,7 @@ if (Meteor.isServer) (() => {
         await Accounts.createUser(
           {
             email: email,
-            password: hashPassword('password')
+            password: hashPasswordWithSha('password')
           }
         );
       await Accounts.sendResetPasswordEmail(userId, email);
@@ -1498,12 +1498,12 @@ if (Meteor.isServer) (() => {
         await clientConn.callAsync(
           "resetPassword",
           enrollPasswordToken,
-          hashPassword("new-password"))
+          hashPasswordWithSha("new-password"))
       );
       test.isTrue(
         await clientConn.callAsync("login", {
           user: { username },
-          password: hashPassword("new-password")
+          password: hashPasswordWithSha("new-password")
         })
       );
 
@@ -1535,7 +1535,7 @@ if (Meteor.isServer) (() => {
       await Meteor.users.updateAsync(userId, { $set: { "services.password.enroll.when": new Date(Date.now() + -35 * 24 * 3600 * 1000) } });
 
       await test.throwsAsync(
-        async () => await Meteor.callAsync("resetPassword", enrollPasswordToken, hashPassword("new-password")),
+        async () => await Meteor.callAsync("resetPassword", enrollPasswordToken, hashPasswordWithSha("new-password")),
         /Token expired/
       );
     });
@@ -1544,7 +1544,7 @@ if (Meteor.isServer) (() => {
     async test => {
       const email = `${ test.id }-intercept@example.com`;
       const userId =
-        await Accounts.createUser({ email: email, password: hashPassword('password') });
+        await Accounts.createUser({ email: email, password: hashPasswordWithSha('password') });
 
       await Accounts.sendEnrollmentEmail(userId, email);
       const user1 = await Meteor.users.findOneAsync(userId);
@@ -1561,7 +1561,7 @@ if (Meteor.isServer) (() => {
       const userId =
         await Accounts.createUser({
           email: email,
-          password: hashPassword('password')
+          password: hashPasswordWithSha('password')
         });
 
       await Accounts.sendEnrollmentEmail(userId, email);
@@ -1580,7 +1580,7 @@ if (Meteor.isServer) (() => {
     async test => {
       const email = `${ test.id }-intercept@example.com`;
       const userId =
-        await Accounts.createUser({ email: email, password: hashPassword('password') });
+        await Accounts.createUser({ email: email, password: hashPasswordWithSha('password') });
 
       await Accounts.sendResetPasswordEmail(userId, email);
       const user1 = await Meteor.users.findOneAsync(userId);
@@ -1828,7 +1828,7 @@ if (Meteor.isServer) (() => {
     async function (test) {
       // Verify that a bcrypt hash generated for a new account uses the
       let username = Random.id();
-      this.password = hashPassword('abc123');
+      this.password = hashPasswordWithSha('abc123');
       this.userId1 = await Accounts.createUser({ username, password: this.password });
       this.user1 =  await Meteor.users.findOneAsync(this.userId1);
       let rounds = getUserHashRounds(this.user1);

From 107f2621caa8a2ff5170488f0553cd24791f9c82 Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 31 Jan 2025 14:47:52 +0100
Subject: [PATCH 1022/1140] feat: add tests for argon : migration, set password
 and argon parameters change

---
 packages/accounts-password/package.js         |   3 +-
 .../accounts-password/password_argon_tests.js | 183 ++++++++++++++++++
 2 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 packages/accounts-password/password_argon_tests.js

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 71d15a383f..c4160683ba 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -41,10 +41,11 @@ Package.onTest((api) => {
     "email",
     "check",
     "ddp",
-    "ecmascript",
+    "ecmascript"
   ]);
   api.addFiles("password_tests_setup.js", "server");
   api.addFiles("password_tests.js", ["client", "server"]);
   api.addFiles("email_tests_setup.js", "server");
   api.addFiles("email_tests.js", "client");
+  api.addFiles("password_argon_tests.js", ["client", "server"]);
 });
diff --git a/packages/accounts-password/password_argon_tests.js b/packages/accounts-password/password_argon_tests.js
new file mode 100644
index 0000000000..51eefc66e7
--- /dev/null
+++ b/packages/accounts-password/password_argon_tests.js
@@ -0,0 +1,183 @@
+if (Meteor.isServer) {
+    Tinytest.addAsync("passwords Argon - migration from bcrypt encryption to argon2", async (test) => {
+        Accounts._options.argon2Enabled = false;
+        const username = Random.id();
+        const email = `${username}@bcrypt.com`;
+        const password = "password";
+        const userId = await Accounts.createUser(
+            {
+                username: username,
+                email: email,
+                password: password
+            }
+        );
+        Accounts._options.argon2Enabled = true;
+        let user = await Meteor.users.findOneAsync(userId);
+        const isValid = await Accounts._checkPasswordAsync(user, password);
+        test.equal(isValid.userId, userId, "checkPassword with bcrypt - User ID should be returned");
+        test.equal(typeof isValid.error, "undefined", "checkPassword with bcrypt - No error should be returned");
+
+
+        // wait for defered execution of user update inside _checkPasswordAsync
+        await new Promise((resolve) => {
+            Meteor.setTimeout(async () => {
+                user = await Meteor.users.findOneAsync(userId);
+                // bcrypt has been unset and argon2 set
+                test.equal(typeof user.services.password.bcrypt, "undefined", "bcrypt should be unset");
+                test.equal(typeof user.services.password.argon2, "string", "argon2 should be set");
+                // password is still valid using argon2
+                const isValidArgon = await Accounts._checkPasswordAsync(user, password);
+                test.equal(isValidArgon.userId, userId, "checkPassword with argon2 - User ID should be returned");
+                test.equal(typeof isValidArgon.error, "undefined", "checkPassword with argon2 - No error should be returned");
+                resolve();
+            }, 100);
+        });
+
+        // cleanup
+        Accounts._options.argon2Enabled = false;
+        await Meteor.users.removeAsync(userId);
+    });
+
+
+    Tinytest.addAsync("passwords Argon - setPassword", async (test) => {
+        Accounts._options.argon2Enabled = true;
+        const username = Random.id();
+        const email = `${username}-intercept@example.com`;
+
+        const userId = await Accounts.createUser({ username: username, email: email });
+
+        let user = await Meteor.users.findOneAsync(userId);
+        // no services yet.
+        test.equal(user.services.password, undefined);
+
+        // set a new password.
+        await Accounts.setPasswordAsync(userId, "new password");
+        user = await Meteor.users.findOneAsync(userId);
+        const oldSaltedHash = user.services.password.argon2;
+        test.isTrue(oldSaltedHash);
+        // Send a reset password email (setting a reset token) and insert a login
+        // token.
+        await Accounts.sendResetPasswordEmail(userId, email);
+        await Accounts._insertLoginToken(userId, Accounts._generateStampedLoginToken());
+        const user2 = await Meteor.users.findOneAsync(userId);
+        test.isTrue(user2.services.password.reset);
+        test.isTrue(user2.services.resume.loginTokens);
+
+        // reset with the same password, see we get a different salted hash
+        await Accounts.setPasswordAsync(userId, "new password", { logout: false });
+        user = await Meteor.users.findOneAsync(userId);
+        const newSaltedHash = user.services.password.argon2;
+        test.isTrue(newSaltedHash);
+        test.notEqual(oldSaltedHash, newSaltedHash);
+        // No more reset token.
+        const user3 = await Meteor.users.findOneAsync(userId);
+        test.isFalse(user3.services.password.reset);
+        // But loginTokens are still here since we did logout: false.
+        test.isTrue(user3.services.resume.loginTokens);
+
+        // reset again, see that the login tokens are gone.
+        await Accounts.setPasswordAsync(userId, "new password");
+        user = await Meteor.users.findOneAsync(userId);
+        const newerSaltedHash = user.services.password.argon2;
+        test.isTrue(newerSaltedHash);
+        test.notEqual(oldSaltedHash, newerSaltedHash);
+        test.notEqual(newSaltedHash, newerSaltedHash);
+        // No more tokens.
+        const user4 = await Meteor.users.findOneAsync(userId);
+        test.isFalse(user4.services.password.reset);
+        test.isFalse(user4.services.resume.loginTokens);
+
+        // cleanup
+        Accounts._options.argon2Enabled = false;
+        await Meteor.users.removeAsync(userId);
+    });
+
+
+
+    const getUserHashArgon2Params = function (user) {
+        const hash = user?.services?.password?.argon2;
+        return Accounts._getArgon2Params(hash);
+    }
+    const hashPasswordWithSha = function (password) {
+        return {
+            digest: SHA256(password),
+            algorithm: "sha-256"
+        };
+    }
+
+    testAsyncMulti("passwords Argon - allow custom argon2 Params and ensure migration if changed", [
+        async function(test) {
+            Accounts._options.argon2Enabled = true;
+            // Verify that a argon2 hash generated for a new account uses the
+            // default params.
+            let username = Random.id();
+            this.password = hashPasswordWithSha("abc123");
+            this.userId1 = await Accounts.createUserAsync({ username, password: this.password });
+            this.user1 = await Meteor.users.findOneAsync(this.userId1);
+            let argon2Params = getUserHashArgon2Params(this.user1);
+            test.equal(argon2Params.type, Accounts._argon2Type());
+            test.equal(argon2Params.memoryCost, Accounts._argon2MemoryCost());
+            test.equal(argon2Params.timeCost, Accounts._argon2TimeCost());
+            test.equal(argon2Params.parallelism, Accounts._argon2Parallelism());
+
+
+            // When a custom number of argon2 TimeCost is set via Accounts.config,
+            // and an account was already created using the default number of TimeCost,
+            // make sure that a new hash is created (and stored) using the new number
+            // of TimeCost, the next time the password is checked.
+            this.customType = "argon2d"; // argon2.argon2d = 2
+            this.customTimeCost = 4;
+            this.customMemoryCost = 32768;
+            this.customParallelism = 1;
+            Accounts._options.argon2Type = this.customType;
+            Accounts._options.argon2TimeCost = this.customTimeCost;
+            Accounts._options.argon2MemoryCost = this.customMemoryCost;
+            Accounts._options.argon2Parallelism = this.customParallelism;
+
+            await Accounts._checkPasswordAsync(this.user1, this.password);
+        },
+        async function(test) {
+            const defaultType = Accounts._argon2Type();
+            const defaultTimeCost = Accounts._argon2TimeCost();
+            const defaultMemoryCost = Accounts._argon2MemoryCost();
+            const defaultParallelism = Accounts._argon2Parallelism();
+            let params;
+            let username;
+
+            let resolve;
+            const promise = new Promise(res => resolve = res);
+
+            Meteor.setTimeout(async () => {
+                this.user1 = await Meteor.users.findOneAsync(this.userId1);
+                params = getUserHashArgon2Params(this.user1);
+                test.equal(params.type, 2);
+                test.equal(params.timeCost, this.customTimeCost);
+                test.equal(params.memoryCost, this.customMemoryCost);
+                test.equal(params.parallelism, this.customParallelism);
+
+                // When a custom number of argon2 TimeCost is set, make sure it's
+                // used for new argon2 password hashes.
+                username = Random.id();
+                const userId2 = await Accounts.createUser({ username, password: this.password });
+                const user2 = await Meteor.users.findOneAsync(userId2);
+                params = getUserHashArgon2Params(user2);
+                test.equal(params.type, 2);
+                test.equal(params.timeCost, this.customTimeCost);
+                test.equal(params.memoryCost, this.customMemoryCost);
+                test.equal(params.parallelism, this.customParallelism);
+
+                // Cleanup
+                Accounts._options.argon2Enabled = false;
+                Accounts._options.argon2Type = defaultType;
+                Accounts._options.argon2TimeCost = defaultTimeCost;
+                Accounts._options.argon2MemoryCost = defaultMemoryCost;
+                Accounts._options.argon2Parallelism = defaultParallelism;
+                await Meteor.users.removeAsync(this.userId1);
+                await Meteor.users.removeAsync(userId2);
+                resolve();
+            }, 1000);
+
+            return promise;
+        }
+    ]);
+}

From df0a2ef6aeb78b9ffcebdb692e0b02c870027ab5 Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 31 Jan 2025 15:14:37 +0100
Subject: [PATCH 1023/1140] feat: enable rollback from argon2 to bcrypt

---
 .../accounts-password/password_argon_tests.js | 36 +++++++++++++++
 packages/accounts-password/password_server.js | 44 ++++++++++++++-----
 2 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-password/password_argon_tests.js b/packages/accounts-password/password_argon_tests.js
index 51eefc66e7..d580cf0512 100644
--- a/packages/accounts-password/password_argon_tests.js
+++ b/packages/accounts-password/password_argon_tests.js
@@ -92,8 +92,44 @@ if (Meteor.isServer) {
         await Meteor.users.removeAsync(userId);
     });
 
+    Tinytest.addAsync("passwords Argon - migration from argon2 encryption to bcrypt", async (test) => {
+        Accounts._options.argon2Enabled = true;
+        const username = Random.id();
+        const email = `${username}@bcrypt.com`;
+        const password = "password";
+        const userId = await Accounts.createUser(
+            {
+                username: username,
+                email: email,
+                password: password
+            }
+        );
+        Accounts._options.argon2Enabled = false;
+        let user = await Meteor.users.findOneAsync(userId);
+        const isValidArgon = await Accounts._checkPasswordAsync(user, password);
+        test.equal(isValidArgon.userId, userId, "checkPassword with argon2 - User ID should be returned");
+        test.equal(typeof isValidArgon.error, "undefined", "checkPassword with argon2 - No error should be returned");
 
 
+        // wait for defered execution of user update inside _checkPasswordAsync
+        await new Promise((resolve) => {
+            Meteor.setTimeout(async () => {
+                user = await Meteor.users.findOneAsync(userId);
+                // bcrypt has been unset and argon2 set
+                test.equal(typeof user.services.password.argon2, "undefined", "argon2 should be unset");
+                test.equal(typeof user.services.password.bcrypt, "string", "bcrypt should be set");
+                // password is still valid using argon2
+                const isValidBcrypt = await Accounts._checkPasswordAsync(user, password);
+                test.equal(isValidBcrypt.userId, userId, "checkPassword with argon2 - User ID should be returned");
+                test.equal(typeof isValidBcrypt.error, "undefined", "checkPassword with argon2 - No error should be returned");
+                resolve();
+            }, 100);
+        });
+
+        // cleanup
+        await Meteor.users.removeAsync(userId);
+    });
+
     const getUserHashArgon2Params = function (user) {
         const hash = user?.services?.password?.argon2;
         return Accounts._getArgon2Params(hash);
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 8d738b7fd5..b6fd1c2348 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -134,10 +134,14 @@ Accounts._checkPasswordUserFields = { _id: 1, services: 1 };
 
 const isBcrypt = (hash) => {
   // bcrypt hashes start with $2a$ or $2b$
-  // argon2 hashes start with $argon2i$, $argon2d$ or $argon2id$
   return hash.startsWith("$2");
 };
 
+const isArgon = (hash) => {
+    // argon2 hashes start with $argon2i$, $argon2d$ or $argon2id$
+    return hash.startsWith("$argon2");
+}
+
 const updateUserPasswordDefered = (user, formattedPassword) => {
   Meteor.defer(async () => {
     await updateUserPassword(user, formattedPassword);
@@ -155,6 +159,9 @@ const getUpdatorForUserPassword = async (formattedPassword) => {
     return {
       $set: {
         "services.password.bcrypt": encryptedPassword
+      },
+      $unset: {
+        "services.password.argon2": 1
       }
     };
   }
@@ -208,19 +215,34 @@ const checkPasswordAsync = async (user, password) => {
 
   const argon2Enabled = Accounts._argon2Enabled();
   if (argon2Enabled === false) {
-    const hashRounds = getRoundsFromBcryptHash(hash);
-    const match = await bcryptCompare(formattedPassword, hash);
-    if (!match) {
-      result.error = Accounts._handleError("Incorrect password", false);
-    }
-    else if (hash) {
-      const paramsChanged = hashRounds !== Accounts._bcryptRounds();
-      // The password checks out, but the user's bcrypt hash needs to be updated
-      // to match current bcrypt settings
-      if (paramsChanged === true) {
+    if (isArgon(hash)) {
+      // this is a rollback feature, enabling to switch back from argon2 to bcrypt if needed
+      // TODO : deprecate this
+      console.warn("User has an argon2 password and argon2 is not enabled, rolling back to bcrypt encryption");
+      const match = await argon2.verify(hash, formattedPassword);
+      if (!match) {
+        result.error = Accounts._handleError("Incorrect password", false);
+      }
+      else{
+        // The password checks out, but the user's stored password needs to be updated to argon2
         updateUserPasswordDefered(user, { digest: formattedPassword, algorithm: "sha-256" });
       }
     }
+    else {
+      const hashRounds = getRoundsFromBcryptHash(hash);
+      const match = await bcryptCompare(formattedPassword, hash);
+      if (!match) {
+        result.error = Accounts._handleError("Incorrect password", false);
+      }
+      else if (hash) {
+        const paramsChanged = hashRounds !== Accounts._bcryptRounds();
+        // The password checks out, but the user's bcrypt hash needs to be updated
+        // to match current bcrypt settings
+        if (paramsChanged === true) {
+          updateUserPasswordDefered(user, { digest: formattedPassword, algorithm: "sha-256" });
+        }
+      }
+    }
   }
   else if (argon2Enabled === true) {
     if (isBcrypt(hash)) {

From 7aaf607c8631178aecf65b0370fb2bc24c5813fb Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Fri, 31 Jan 2025 15:47:45 +0100
Subject: [PATCH 1024/1140] adding the feature toggle to the docs

---
 v3-docs/docs/api/accounts.md | 40 +++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/v3-docs/docs/api/accounts.md b/v3-docs/docs/api/accounts.md
index 79d54b5738..13acb2cb97 100644
--- a/v3-docs/docs/api/accounts.md
+++ b/v3-docs/docs/api/accounts.md
@@ -772,24 +772,49 @@ authentication. In addition to the basic username and password-based
 sign-in process, it also supports email-based sign-in including
 address verification and password recovery emails.
 
-The Meteor server stores passwords using the
-[argon2](http://en.wikipedia.org/wiki/Argon2) algorithm. This helps
+### Password encryption and security
+
+Starting from `accounts-passwords:4.0.0`, you can choose which algorithm is used by the Meteor server to store passwords : either [bcrypt](http://en.wikipedia.org/wiki/Bcrypt) or
+[Argon2](http://en.wikipedia.org/wiki/Argon2) algorithm. Both are robust and contribute to
 protect against embarrassing password leaks if the server's database is
 compromised.
 
-### Password encryption and security
+Before version 4.0.0, `bcrypt` was the only available option. argon2 has been introduced because it is  considered the most secure option. This algorithm is specifically designed to resist GPU-based brute force attacks. For more details, see the [OWASP Password Storage Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html).
+
+As of January 2025, **`bcrypt` is still the default option** to enable a smooth transition. In the future, `argon2` will replace `bcrypt` as default and `bcrypt` option will be deprecated.
 
 Passwords are hashed on the client using **SHA-256** algorithm before being sent to the server. This ensures that sensitive data is never transmitted in plain text. Once received by the server, the hashed value is further encrypted and securely stored in the `Meteor.users` collection.
 
-Starting from `accounts-passwords:4.0.0`, the encryption algorithm used is [Argon2](http://en.wikipedia.org/wiki/Argon2). This algorithm is specifically designed to resist GPU-based brute force attacks. Argon2 has replaced the previous [bcrypt](http://en.wikipedia.org/wiki/Bcrypt) algorithm as it's now regarded as a more robust option. For more details, see the [OWASP Password Storage Cheat Sheet](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html).
 
-**Migrating from `bcrypt` to `argon2`**
+**About the migration process from `bcrypt` to `argon2`**
 
-The transition from `bcrypt` to `argon2` is handled seamlessly during user logins. When a user logs in, their password is first verified against the existing bcrypt hash. If successful, the password is re-encrypted using Argon2 and the new hash is stored in the database.
+The transition from `bcrypt` to `argon2` happens automatically upon user login. If Argon2 encryption is enabled in an existing application, each user's password is re-encrypted during their next successful login.
+- Step 1: The password is first validated against the existing `bcrypt` hash.
+- Step 2: If authentication succeeds, the password is re-encrypted using `Argon2`.
+- Step 3: The new `Argon2` hash replaces the old `bcrypt` hash in the database.
+
+
+To monitor the migration progress, you can count users still using bcrypt:
+```js
+const bcryptUsers = await Meteor.users.find({ "services.password.bcrypt": { $exists: true } }).countAsync();
+const totalUsers = await Meteor.users.find({ "services.password": { $exists: true } }).countAsync();
+console.log("Remaining users to migrate:", bcryptUsers, "/", totalUsers);
+```
+Once `bcryptUsers` reaches 0, the migration is complete.
+
+**Enabling Argon2 encryption**
+
+To enable Argon2 encryption, you need a small configuration change on the server: 
+
+```js
+Accounts.config({
+    argon2Enabled: true,
+});
+```
 
 **Configuring `argon2` parameters**
 
-The accounts-password package allows customization of the Argon2 algorithm's parameters. The configurable options include:
+One enabled, the `accounts-password` package allows customization of Argon2's parameters. The configurable options include:
 
 - `type`: `argon2id` (provides a blend of resistance against GPU and side-channel attacks)
 - `timeCost` (default: 3) – This controls the computational cost of the hashing process, affecting both the security level and performance.
@@ -799,6 +824,7 @@ The accounts-password package allows customization of the Argon2 algorithm's par
 To update the values, use the following configuration:
 ```js
 Accounts.config({
+    argon2Enabled: true,
     argon2Type: "argon2id",
     argon2TimeCost: 4,
     argon2MemoryCost: 65536,

From a7d68b3817cd6997f7cee6e987a9e1777f143ab3 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <hello@jandvorak.me>
Date: Sat, 1 Feb 2025 19:00:00 +0100
Subject: [PATCH 1025/1140] Update Facebook API version to v22

---
 packages/facebook-oauth/facebook_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/facebook-oauth/facebook_server.js b/packages/facebook-oauth/facebook_server.js
index c9f9610871..319381f60e 100644
--- a/packages/facebook-oauth/facebook_server.js
+++ b/packages/facebook-oauth/facebook_server.js
@@ -2,7 +2,7 @@ Facebook = {};
 import crypto from 'crypto';
 import { Accounts } from 'meteor/accounts-base';
 
-const API_VERSION = Meteor.settings?.public?.packages?.['facebook-oauth']?.apiVersion || '17.0';
+const API_VERSION = Meteor.settings?.public?.packages?.['facebook-oauth']?.apiVersion || '22.0';
 
 Facebook.handleAuthFromAccessToken = async (accessToken, expiresAt) => {
   // include basic fields from facebook

From 8ea36eae8b42e5f5eaccc8d60cc9ce5888b62727 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 3 Feb 2025 09:54:34 -0300
Subject: [PATCH 1026/1140] DOCS: Fix typo in Tracker.md

Before it was using `findAsync({}).fetch` but it should have been `find({}).fetchAsync()`
---
 v3-docs/docs/api/Tracker.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/api/Tracker.md b/v3-docs/docs/api/Tracker.md
index b5242b548d..acbe6ad254 100644
--- a/v3-docs/docs/api/Tracker.md
+++ b/v3-docs/docs/api/Tracker.md
@@ -87,13 +87,13 @@ Tracker.autorun(async function example1(computation) {
   // Code before the first await will stay reactive.
   reactiveVar1.get(); // This will trigger a rerun.
 
-  let links = await LinksCollection.findAsync({}).fetch(); // First async call will stay reactive.
+  let links = await LinksCollection.find({}).fetchAsync(); // First async call will stay reactive.
 
   // Code after the first await looses Tracker.currentComputation: no reactivity.
   reactiveVar2.get(); // This won't trigger a rerun.
 
   // You can bring back reactivity with the Tracker.withCompuation wrapper:
-  let users = await Tracker.withComputation(computation, () => Meteor.users.findAsync({}).fetch());
+  let users = await Tracker.withComputation(computation, () => Meteor.users.find({}).fetchAsync());
 
   // Code below will again not be reactive, so you will need another Tracker.withComputation.
   const value = Tracker.withComputation(computation, () => reactiveVar3.get()); // This will trigger a rerun.

From 4faa9acd203edc8227c0f9a7bd8f5629e70b883b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 3 Feb 2025 15:03:42 +0100
Subject: [PATCH 1027/1140] update docs deps

---
 v3-docs/docs/package-lock.json | 98 +++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/v3-docs/docs/package-lock.json b/v3-docs/docs/package-lock.json
index c3e2777111..8c1d06310d 100644
--- a/v3-docs/docs/package-lock.json
+++ b/v3-docs/docs/package-lock.json
@@ -5,11 +5,11 @@
   "packages": {
     "": {
       "dependencies": {
-        "vue-collapsed": "^1.3.0"
+        "vue-collapsed": "^1.3.4"
       },
       "devDependencies": {
         "canonical-json": "^0.0.4",
-        "jsdoc": "^4.0.2",
+        "jsdoc": "^4.0.4",
         "vitepress": "1.6.3"
       }
     },
@@ -1691,21 +1691,22 @@
       }
     },
     "node_modules/jsdoc": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
-      "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz",
+      "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/parser": "^7.20.15",
         "@jsdoc/salty": "^0.2.1",
-        "@types/markdown-it": "^12.2.3",
+        "@types/markdown-it": "^14.1.1",
         "bluebird": "^3.7.2",
         "catharsis": "^0.9.0",
         "escape-string-regexp": "^2.0.0",
         "js2xmlparser": "^4.0.2",
         "klaw": "^3.0.0",
-        "markdown-it": "^12.3.2",
-        "markdown-it-anchor": "^8.4.1",
+        "markdown-it": "^14.1.0",
+        "markdown-it-anchor": "^8.6.7",
         "marked": "^4.0.10",
         "mkdirp": "^1.0.4",
         "requizzle": "^0.2.3",
@@ -1719,16 +1720,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/jsdoc/node_modules/@types/markdown-it": {
-      "version": "12.2.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
-      }
-    },
     "node_modules/klaw": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
@@ -1739,12 +1730,13 @@
       }
     },
     "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
       }
     },
     "node_modules/lodash": {
@@ -1769,19 +1761,21 @@
       "dev": true
     },
     "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
       },
       "bin": {
-        "markdown-it": "bin/markdown-it.js"
+        "markdown-it": "bin/markdown-it.mjs"
       }
     },
     "node_modules/markdown-it-anchor": {
@@ -1794,15 +1788,6 @@
         "markdown-it": "*"
       }
     },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/marked": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
@@ -1837,10 +1822,11 @@
       }
     },
     "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/micromark-util-character": {
       "version": "2.1.1",
@@ -2044,6 +2030,16 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/regex": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/regex/-/regex-5.1.1.tgz",
@@ -2228,10 +2224,11 @@
       }
     },
     "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/underscore": {
       "version": "1.13.6",
@@ -2457,9 +2454,10 @@
       }
     },
     "node_modules/vue-collapsed": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/vue-collapsed/-/vue-collapsed-1.3.0.tgz",
-      "integrity": "sha512-d2qwv0fj4aaoekI+6x1RgxpoK0s5K8HLj70E+dWxIKkgzADcZ9kUrnXRazgIz9ETYkKOi6j2CWv/8+rS8Kr3LQ=="
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/vue-collapsed/-/vue-collapsed-1.3.4.tgz",
+      "integrity": "sha512-W92b+QT3n5iTrfrH6kyvx3TsriYPfy/Ymsb6DaanjeMkJYMdVl1S4wzKRYVDsxWQPDxiC+5m+UwPwT/8YAYodA==",
+      "license": "MIT"
     },
     "node_modules/xmlcreate": {
       "version": "2.0.4",

From 316d55cc723497137cdb621371bf6596c30ee998 Mon Sep 17 00:00:00 2001
From: Mike Cunneen <mike@appworkshop.net>
Date: Mon, 13 Jan 2025 02:37:13 +0800
Subject: [PATCH 1028/1140] feat(logic-solver): :zap: recompile minisat with
 ALLOW_MEMORY_GROWTH option

Fixes issue #12902 with minisat: "Cannot enlarge memory arrays". Recompiled minisat.js as per https://github.com/cunneen/minisat/commit/9068151

Addresses #12902
---
 packages/logic-solver/minisat.js         | 98 +++++++++++++++++-------
 packages/logic-solver/minisat_wrapper.js | 17 ++--
 packages/logic-solver/package.js         |  2 +-
 3 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/packages/logic-solver/minisat.js b/packages/logic-solver/minisat.js
index 07b1732edf..f0d5fcc947 100644
--- a/packages/logic-solver/minisat.js
+++ b/packages/logic-solver/minisat.js
@@ -1,37 +1,79 @@
 // This file is generated by the meteor/minisat repo.
 // See that repo's README for instructions for building it.
-C_MINISAT=(function(){var module={};var require=(function(){});var process={argv:["node","minisat"],on:(function(){}),stdout:{write:(function(str){console.log("MINISAT-out:",str.replace(/\n$/,""))})},stderr:{write:(function(str){console.log("MINISAT-err:",str.replace(/\n$/,""))})}};var window=0;var Module;if(!Module)Module=(typeof Module!=="undefined"?Module:null)||{};var moduleOverrides={};for(var key in Module){if(Module.hasOwnProperty(key)){moduleOverrides[key]=Module[key]}}var ENVIRONMENT_IS_NODE=typeof process==="object"&&typeof require==="function";var ENVIRONMENT_IS_WEB=typeof window==="object";var ENVIRONMENT_IS_WORKER=typeof importScripts==="function";var ENVIRONMENT_IS_SHELL=!ENVIRONMENT_IS_WEB&&!ENVIRONMENT_IS_NODE&&!ENVIRONMENT_IS_WORKER;if(ENVIRONMENT_IS_NODE){if(!Module["print"])Module["print"]=function print(x){process["stdout"].write(x+"\n")};if(!Module["printErr"])Module["printErr"]=function printErr(x){process["stderr"].write(x+"\n")};var nodeFS=require("fs");var nodePath=require("path");Module["read"]=function read(filename,binary){filename=nodePath["normalize"](filename);var ret=nodeFS["readFileSync"](filename);if(!ret&&filename!=nodePath["resolve"](filename)){filename=path.join(__dirname,"..","src",filename);ret=nodeFS["readFileSync"](filename)}if(ret&&!binary)ret=ret.toString();return ret};Module["readBinary"]=function readBinary(filename){return Module["read"](filename,true)};Module["load"]=function load(f){globalEval(read(f))};if(process["argv"].length>1){Module["thisProgram"]=process["argv"][1].replace(/\\/g,"/")}else{Module["thisProgram"]="unknown-program"}Module["arguments"]=process["argv"].slice(2);if(typeof module!=="undefined"){module["exports"]=Module}process["on"]("uncaughtException",(function(ex){if(!(ex instanceof ExitStatus)){throw ex}}))}else if(ENVIRONMENT_IS_SHELL){if(!Module["print"])Module["print"]=print;if(typeof printErr!="undefined")Module["printErr"]=printErr;if(typeof read!="undefined"){Module["read"]=read}else{Module["read"]=function read(){throw"no read() available (jsc?)"}}Module["readBinary"]=function readBinary(f){if(typeof readbuffer==="function"){return new Uint8Array(readbuffer(f))}var data=read(f,"binary");assert(typeof data==="object");return data};if(typeof scriptArgs!="undefined"){Module["arguments"]=scriptArgs}else if(typeof arguments!="undefined"){Module["arguments"]=arguments}this["Module"]=Module}else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){Module["read"]=function read(url){var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.send(null);return xhr.responseText};if(typeof arguments!="undefined"){Module["arguments"]=arguments}if(typeof console!=="undefined"){if(!Module["print"])Module["print"]=function print(x){console.log(x)};if(!Module["printErr"])Module["printErr"]=function printErr(x){console.log(x)}}else{var TRY_USE_DUMP=false;if(!Module["print"])Module["print"]=TRY_USE_DUMP&&typeof dump!=="undefined"?(function(x){dump(x)}):(function(x){})}if(ENVIRONMENT_IS_WEB){window["Module"]=Module}else{Module["load"]=importScripts}}else{throw"Unknown runtime environment. Where are we?"}function globalEval(x){eval.call(null,x)}if(!Module["load"]&&Module["read"]){Module["load"]=function load(f){globalEval(Module["read"](f))}}if(!Module["print"]){Module["print"]=(function(){})}if(!Module["printErr"]){Module["printErr"]=Module["print"]}if(!Module["arguments"]){Module["arguments"]=[]}if(!Module["thisProgram"]){Module["thisProgram"]="./this.program"}Module.print=Module["print"];Module.printErr=Module["printErr"];Module["preRun"]=[];Module["postRun"]=[];for(var key in moduleOverrides){if(moduleOverrides.hasOwnProperty(key)){Module[key]=moduleOverrides[key]}}var Runtime={setTempRet0:(function(value){tempRet0=value}),getTempRet0:(function(){return tempRet0}),stackSave:(function(){return STACKTOP}),stackRestore:(function(stackTop){STACKTOP=stackTop}),getNativeTypeSize:(function(type){switch(type){case"i1":case"i8":return 1;case"i16":return 2;case"i32":return 4;case"i64":return 8;case"float":return 4;case"double":return 8;default:{if(type[type.length-1]==="*"){return Runtime.QUANTUM_SIZE}else if(type[0]==="i"){var bits=parseInt(type.substr(1));assert(bits%8===0);return bits/8}else{return 0}}}}),getNativeFieldSize:(function(type){return Math.max(Runtime.getNativeTypeSize(type),Runtime.QUANTUM_SIZE)}),STACK_ALIGN:16,getAlignSize:(function(type,size,vararg){if(!vararg&&(type=="i64"||type=="double"))return 8;if(!type)return Math.min(size,8);return Math.min(size||(type?Runtime.getNativeFieldSize(type):0),Runtime.QUANTUM_SIZE)}),dynCall:(function(sig,ptr,args){if(args&&args.length){if(!args.splice)args=Array.prototype.slice.call(args);args.splice(0,0,ptr);return Module["dynCall_"+sig].apply(null,args)}else{return Module["dynCall_"+sig].call(null,ptr)}}),functionPointers:[],addFunction:(function(func){for(var i=0;i<Runtime.functionPointers.length;i++){if(!Runtime.functionPointers[i]){Runtime.functionPointers[i]=func;return 2*(1+i)}}throw"Finished up all reserved function pointers. Use a higher value for RESERVED_FUNCTION_POINTERS."}),removeFunction:(function(index){Runtime.functionPointers[(index-2)/2]=null}),getAsmConst:(function(code,numArgs){if(!Runtime.asmConstCache)Runtime.asmConstCache={};var func=Runtime.asmConstCache[code];if(func)return func;var args=[];for(var i=0;i<numArgs;i++){args.push(String.fromCharCode(36)+i)}var source=Pointer_stringify(code);if(source[0]==='"'){if(source.indexOf('"',1)===source.length-1){source=source.substr(1,source.length-2)}else{abort("invalid EM_ASM input |"+source+"|. Please use EM_ASM(..code..) (no quotes) or EM_ASM({ ..code($0).. }, input) (to input values)")}}try{var evalled=eval("(function(Module, FS) { return function("+args.join(",")+"){ "+source+" } })")(Module,typeof FS!=="undefined"?FS:null)}catch(e){Module.printErr("error in executing inline EM_ASM code: "+e+" on: \n\n"+source+"\n\nwith args |"+args+"| (make sure to use the right one out of EM_ASM, EM_ASM_ARGS, etc.)");throw e}return Runtime.asmConstCache[code]=evalled}),warnOnce:(function(text){if(!Runtime.warnOnce.shown)Runtime.warnOnce.shown={};if(!Runtime.warnOnce.shown[text]){Runtime.warnOnce.shown[text]=1;Module.printErr(text)}}),funcWrappers:{},getFuncWrapper:(function(func,sig){assert(sig);if(!Runtime.funcWrappers[sig]){Runtime.funcWrappers[sig]={}}var sigCache=Runtime.funcWrappers[sig];if(!sigCache[func]){sigCache[func]=function dynCall_wrapper(){return Runtime.dynCall(sig,func,arguments)}}return sigCache[func]}),UTF8Processor:(function(){var buffer=[];var needed=0;this.processCChar=(function(code){code=code&255;if(buffer.length==0){if((code&128)==0){return String.fromCharCode(code)}buffer.push(code);if((code&224)==192){needed=1}else if((code&240)==224){needed=2}else{needed=3}return""}if(needed){buffer.push(code);needed--;if(needed>0)return""}var c1=buffer[0];var c2=buffer[1];var c3=buffer[2];var c4=buffer[3];var ret;if(buffer.length==2){ret=String.fromCharCode((c1&31)<<6|c2&63)}else if(buffer.length==3){ret=String.fromCharCode((c1&15)<<12|(c2&63)<<6|c3&63)}else{var codePoint=(c1&7)<<18|(c2&63)<<12|(c3&63)<<6|c4&63;ret=String.fromCharCode(((codePoint-65536)/1024|0)+55296,(codePoint-65536)%1024+56320)}buffer.length=0;return ret});this.processJSString=function processJSString(string){string=unescape(encodeURIComponent(string));var ret=[];for(var i=0;i<string.length;i++){ret.push(string.charCodeAt(i))}return ret}}),getCompilerSetting:(function(name){throw"You must build with -s RETAIN_COMPILER_SETTINGS=1 for Runtime.getCompilerSetting or emscripten_get_compiler_setting to work"}),stackAlloc:(function(size){var ret=STACKTOP;STACKTOP=STACKTOP+size|0;STACKTOP=STACKTOP+15&-16;return ret}),staticAlloc:(function(size){var ret=STATICTOP;STATICTOP=STATICTOP+size|0;STATICTOP=STATICTOP+15&-16;return ret}),dynamicAlloc:(function(size){var ret=DYNAMICTOP;DYNAMICTOP=DYNAMICTOP+size|0;DYNAMICTOP=DYNAMICTOP+15&-16;if(DYNAMICTOP>=TOTAL_MEMORY)enlargeMemory();return ret}),alignMemory:(function(size,quantum){var ret=size=Math.ceil(size/(quantum?quantum:16))*(quantum?quantum:16);return ret}),makeBigInt:(function(low,high,unsigned){var ret=unsigned?+(low>>>0)+ +(high>>>0)*+4294967296:+(low>>>0)+ +(high|0)*+4294967296;return ret}),GLOBAL_BASE:8,QUANTUM_SIZE:4,__dummy__:0};Module["Runtime"]=Runtime;var __THREW__=0;var ABORT=false;var EXITSTATUS=0;var undef=0;var tempValue,tempInt,tempBigInt,tempInt2,tempBigInt2,tempPair,tempBigIntI,tempBigIntR,tempBigIntS,tempBigIntP,tempBigIntD,tempDouble,tempFloat;var tempI64,tempI64b;var tempRet0,tempRet1,tempRet2,tempRet3,tempRet4,tempRet5,tempRet6,tempRet7,tempRet8,tempRet9;function assert(condition,text){if(!condition){abort("Assertion failed: "+text)}}var globalScope=this;function getCFunc(ident){var func=Module["_"+ident];if(!func){try{func=eval("_"+ident)}catch(e){}}assert(func,"Cannot call unknown function "+ident+" (perhaps LLVM optimizations or closure removed it?)");return func}var cwrap,ccall;((function(){var JSfuncs={"stackSave":(function(){Runtime.stackSave()}),"stackRestore":(function(){Runtime.stackRestore()}),"arrayToC":(function(arr){var ret=Runtime.stackAlloc(arr.length);writeArrayToMemory(arr,ret);return ret}),"stringToC":(function(str){var ret=0;if(str!==null&&str!==undefined&&str!==0){ret=Runtime.stackAlloc((str.length<<2)+1);writeStringToMemory(str,ret)}return ret})};var toC={"string":JSfuncs["stringToC"],"array":JSfuncs["arrayToC"]};ccall=function ccallFunc(ident,returnType,argTypes,args){var func=getCFunc(ident);var cArgs=[];var stack=0;if(args){for(var i=0;i<args.length;i++){var converter=toC[argTypes[i]];if(converter){if(stack===0)stack=Runtime.stackSave();cArgs[i]=converter(args[i])}else{cArgs[i]=args[i]}}}var ret=func.apply(null,cArgs);if(returnType==="string")ret=Pointer_stringify(ret);if(stack!==0)Runtime.stackRestore(stack);return ret};var sourceRegex=/^function\s*\(([^)]*)\)\s*{\s*([^*]*?)[\s;]*(?:return\s*(.*?)[;\s]*)?}$/;function parseJSFunc(jsfunc){var parsed=jsfunc.toString().match(sourceRegex).slice(1);return{arguments:parsed[0],body:parsed[1],returnValue:parsed[2]}}var JSsource={};for(var fun in JSfuncs){if(JSfuncs.hasOwnProperty(fun)){JSsource[fun]=parseJSFunc(JSfuncs[fun])}}cwrap=function cwrap(ident,returnType,argTypes){argTypes=argTypes||[];var cfunc=getCFunc(ident);var numericArgs=argTypes.every((function(type){return type==="number"}));var numericRet=returnType!=="string";if(numericRet&&numericArgs){return cfunc}var argNames=argTypes.map((function(x,i){return"$"+i}));var funcstr="(function("+argNames.join(",")+") {";var nargs=argTypes.length;if(!numericArgs){funcstr+="var stack = "+JSsource["stackSave"].body+";";for(var i=0;i<nargs;i++){var arg=argNames[i],type=argTypes[i];if(type==="number")continue;var convertCode=JSsource[type+"ToC"];funcstr+="var "+convertCode.arguments+" = "+arg+";";funcstr+=convertCode.body+";";funcstr+=arg+"="+convertCode.returnValue+";"}}var cfuncname=parseJSFunc((function(){return cfunc})).returnValue;funcstr+="var ret = "+cfuncname+"("+argNames.join(",")+");";if(!numericRet){var strgfy=parseJSFunc((function(){return Pointer_stringify})).returnValue;funcstr+="ret = "+strgfy+"(ret);"}if(!numericArgs){funcstr+=JSsource["stackRestore"].body.replace("()","(stack)")+";"}funcstr+="return ret})";return eval(funcstr)}}))();Module["cwrap"]=cwrap;Module["ccall"]=ccall;function setValue(ptr,value,type,noSafe){type=type||"i8";if(type.charAt(type.length-1)==="*")type="i32";switch(type){case"i1":HEAP8[ptr>>0]=value;break;case"i8":HEAP8[ptr>>0]=value;break;case"i16":HEAP16[ptr>>1]=value;break;case"i32":HEAP32[ptr>>2]=value;break;case"i64":tempI64=[value>>>0,(tempDouble=value,+Math_abs(tempDouble)>=+1?tempDouble>+0?(Math_min(+Math_floor(tempDouble/+4294967296),+4294967295)|0)>>>0:~~+Math_ceil((tempDouble- +(~~tempDouble>>>0))/+4294967296)>>>0:0)],HEAP32[ptr>>2]=tempI64[0],HEAP32[ptr+4>>2]=tempI64[1];break;case"float":HEAPF32[ptr>>2]=value;break;case"double":HEAPF64[ptr>>3]=value;break;default:abort("invalid type for setValue: "+type)}}Module["setValue"]=setValue;function getValue(ptr,type,noSafe){type=type||"i8";if(type.charAt(type.length-1)==="*")type="i32";switch(type){case"i1":return HEAP8[ptr>>0];case"i8":return HEAP8[ptr>>0];case"i16":return HEAP16[ptr>>1];case"i32":return HEAP32[ptr>>2];case"i64":return HEAP32[ptr>>2];case"float":return HEAPF32[ptr>>2];case"double":return HEAPF64[ptr>>3];default:abort("invalid type for setValue: "+type)}return null}Module["getValue"]=getValue;var ALLOC_NORMAL=0;var ALLOC_STACK=1;var ALLOC_STATIC=2;var ALLOC_DYNAMIC=3;var ALLOC_NONE=4;Module["ALLOC_NORMAL"]=ALLOC_NORMAL;Module["ALLOC_STACK"]=ALLOC_STACK;Module["ALLOC_STATIC"]=ALLOC_STATIC;Module["ALLOC_DYNAMIC"]=ALLOC_DYNAMIC;Module["ALLOC_NONE"]=ALLOC_NONE;function allocate(slab,types,allocator,ptr){var zeroinit,size;if(typeof slab==="number"){zeroinit=true;size=slab}else{zeroinit=false;size=slab.length}var singleType=typeof types==="string"?types:null;var ret;if(allocator==ALLOC_NONE){ret=ptr}else{ret=[_malloc,Runtime.stackAlloc,Runtime.staticAlloc,Runtime.dynamicAlloc][allocator===undefined?ALLOC_STATIC:allocator](Math.max(size,singleType?1:types.length))}if(zeroinit){var ptr=ret,stop;assert((ret&3)==0);stop=ret+(size&~3);for(;ptr<stop;ptr+=4){HEAP32[ptr>>2]=0}stop=ret+size;while(ptr<stop){HEAP8[ptr++>>0]=0}return ret}if(singleType==="i8"){if(slab.subarray||slab.slice){HEAPU8.set(slab,ret)}else{HEAPU8.set(new Uint8Array(slab),ret)}return ret}var i=0,type,typeSize,previousType;while(i<size){var curr=slab[i];if(typeof curr==="function"){curr=Runtime.getFunctionIndex(curr)}type=singleType||types[i];if(type===0){i++;continue}if(type=="i64")type="i32";setValue(ret+i,curr,type);if(previousType!==type){typeSize=Runtime.getNativeTypeSize(type);previousType=type}i+=typeSize}return ret}Module["allocate"]=allocate;function Pointer_stringify(ptr,length){if(length===0||!ptr)return"";var hasUtf=false;var t;var i=0;while(1){t=HEAPU8[ptr+i>>0];if(t>=128)hasUtf=true;else if(t==0&&!length)break;i++;if(length&&i==length)break}if(!length)length=i;var ret="";if(!hasUtf){var MAX_CHUNK=1024;var curr;while(length>0){curr=String.fromCharCode.apply(String,HEAPU8.subarray(ptr,ptr+Math.min(length,MAX_CHUNK)));ret=ret?ret+curr:curr;ptr+=MAX_CHUNK;length-=MAX_CHUNK}return ret}var utf8=new Runtime.UTF8Processor;for(i=0;i<length;i++){t=HEAPU8[ptr+i>>0];ret+=utf8.processCChar(t)}return ret}Module["Pointer_stringify"]=Pointer_stringify;function UTF16ToString(ptr){var i=0;var str="";while(1){var codeUnit=HEAP16[ptr+i*2>>1];if(codeUnit==0)return str;++i;str+=String.fromCharCode(codeUnit)}}Module["UTF16ToString"]=UTF16ToString;function stringToUTF16(str,outPtr){for(var i=0;i<str.length;++i){var codeUnit=str.charCodeAt(i);HEAP16[outPtr+i*2>>1]=codeUnit}HEAP16[outPtr+str.length*2>>1]=0}Module["stringToUTF16"]=stringToUTF16;function UTF32ToString(ptr){var i=0;var str="";while(1){var utf32=HEAP32[ptr+i*4>>2];if(utf32==0)return str;++i;if(utf32>=65536){var ch=utf32-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}else{str+=String.fromCharCode(utf32)}}}Module["UTF32ToString"]=UTF32ToString;function stringToUTF32(str,outPtr){var iChar=0;for(var iCodeUnit=0;iCodeUnit<str.length;++iCodeUnit){var codeUnit=str.charCodeAt(iCodeUnit);if(codeUnit>=55296&&codeUnit<=57343){var trailSurrogate=str.charCodeAt(++iCodeUnit);codeUnit=65536+((codeUnit&1023)<<10)|trailSurrogate&1023}HEAP32[outPtr+iChar*4>>2]=codeUnit;++iChar}HEAP32[outPtr+iChar*4>>2]=0}Module["stringToUTF32"]=stringToUTF32;function demangle(func){var hasLibcxxabi=!!Module["___cxa_demangle"];if(hasLibcxxabi){try{var buf=_malloc(func.length);writeStringToMemory(func.substr(1),buf);var status=_malloc(4);var ret=Module["___cxa_demangle"](buf,0,0,status);if(getValue(status,"i32")===0&&ret){return Pointer_stringify(ret)}}catch(e){}finally{if(buf)_free(buf);if(status)_free(status);if(ret)_free(ret)}}var i=3;var basicTypes={"v":"void","b":"bool","c":"char","s":"short","i":"int","l":"long","f":"float","d":"double","w":"wchar_t","a":"signed char","h":"unsigned char","t":"unsigned short","j":"unsigned int","m":"unsigned long","x":"long long","y":"unsigned long long","z":"..."};var subs=[];var first=true;function dump(x){if(x)Module.print(x);Module.print(func);var pre="";for(var a=0;a<i;a++)pre+=" ";Module.print(pre+"^")}function parseNested(){i++;if(func[i]==="K")i++;var parts=[];while(func[i]!=="E"){if(func[i]==="S"){i++;var next=func.indexOf("_",i);var num=func.substring(i,next)||0;parts.push(subs[num]||"?");i=next+1;continue}if(func[i]==="C"){parts.push(parts[parts.length-1]);i+=2;continue}var size=parseInt(func.substr(i));var pre=size.toString().length;if(!size||!pre){i--;break}var curr=func.substr(i+pre,size);parts.push(curr);subs.push(curr);i+=pre+size}i++;return parts}function parse(rawList,limit,allowVoid){limit=limit||Infinity;var ret="",list=[];function flushList(){return"("+list.join(", ")+")"}var name;if(func[i]==="N"){name=parseNested().join("::");limit--;if(limit===0)return rawList?[name]:name}else{if(func[i]==="K"||first&&func[i]==="L")i++;var size=parseInt(func.substr(i));if(size){var pre=size.toString().length;name=func.substr(i+pre,size);i+=pre+size}}first=false;if(func[i]==="I"){i++;var iList=parse(true);var iRet=parse(true,1,true);ret+=iRet[0]+" "+name+"<"+iList.join(", ")+">"}else{ret=name}paramLoop:while(i<func.length&&limit-->0){var c=func[i++];if(c in basicTypes){list.push(basicTypes[c])}else{switch(c){case"P":list.push(parse(true,1,true)[0]+"*");break;case"R":list.push(parse(true,1,true)[0]+"&");break;case"L":{i++;var end=func.indexOf("E",i);var size=end-i;list.push(func.substr(i,size));i+=size+2;break};case"A":{var size=parseInt(func.substr(i));i+=size.toString().length;if(func[i]!=="_")throw"?";i++;list.push(parse(true,1,true)[0]+" ["+size+"]");break};case"E":break paramLoop;default:ret+="?"+c;break paramLoop}}}if(!allowVoid&&list.length===1&&list[0]==="void")list=[];if(rawList){if(ret){list.push(ret+"?")}return list}else{return ret+flushList()}}var parsed=func;try{if(func=="Object._main"||func=="_main"){return"main()"}if(typeof func==="number")func=Pointer_stringify(func);if(func[0]!=="_")return func;if(func[1]!=="_")return func;if(func[2]!=="Z")return func;switch(func[3]){case"n":return"operator new()";case"d":return"operator delete()"}parsed=parse()}catch(e){parsed+="?"}if(parsed.indexOf("?")>=0&&!hasLibcxxabi){Runtime.warnOnce("warning: a problem occurred in builtin C++ name demangling; build with  -s DEMANGLE_SUPPORT=1  to link in libcxxabi demangling")}return parsed}function demangleAll(text){return text.replace(/__Z[\w\d_]+/g,(function(x){var y=demangle(x);return x===y?x:x+" ["+y+"]"}))}function jsStackTrace(){var err=new Error;if(!err.stack){try{throw new Error(0)}catch(e){err=e}if(!err.stack){return"(no stack trace available)"}}return err.stack.toString()}function stackTrace(){return demangleAll(jsStackTrace())}Module["stackTrace"]=stackTrace;var PAGE_SIZE=4096;function alignMemoryPage(x){return x+4095&-4096}var HEAP;var HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;var STATIC_BASE=0,STATICTOP=0,staticSealed=false;var STACK_BASE=0,STACKTOP=0,STACK_MAX=0;var DYNAMIC_BASE=0,DYNAMICTOP=0;function enlargeMemory(){abort("Cannot enlarge memory arrays. Either (1) compile with -s TOTAL_MEMORY=X with X higher than the current value "+TOTAL_MEMORY+", (2) compile with ALLOW_MEMORY_GROWTH which adjusts the size at runtime but prevents some optimizations, or (3) set Module.TOTAL_MEMORY before the program runs.")}var TOTAL_STACK=Module["TOTAL_STACK"]||5242880;var TOTAL_MEMORY=Module["TOTAL_MEMORY"]||67108864;var FAST_MEMORY=Module["FAST_MEMORY"]||2097152;var totalMemory=64*1024;while(totalMemory<TOTAL_MEMORY||totalMemory<2*TOTAL_STACK){if(totalMemory<16*1024*1024){totalMemory*=2}else{totalMemory+=16*1024*1024}}if(totalMemory!==TOTAL_MEMORY){Module.printErr("increasing TOTAL_MEMORY to "+totalMemory+" to be compliant with the asm.js spec");TOTAL_MEMORY=totalMemory}assert(typeof Int32Array!=="undefined"&&typeof Float64Array!=="undefined"&&!!(new Int32Array(1))["subarray"]&&!!(new Int32Array(1))["set"],"JS engine does not provide full typed array support");var buffer=new ArrayBuffer(TOTAL_MEMORY);HEAP8=new Int8Array(buffer);HEAP16=new Int16Array(buffer);HEAP32=new Int32Array(buffer);HEAPU8=new Uint8Array(buffer);HEAPU16=new Uint16Array(buffer);HEAPU32=new Uint32Array(buffer);HEAPF32=new Float32Array(buffer);HEAPF64=new Float64Array(buffer);HEAP32[0]=255;assert(HEAPU8[0]===255&&HEAPU8[3]===0,"Typed arrays 2 must be run on a little-endian system");Module["HEAP"]=HEAP;Module["buffer"]=buffer;Module["HEAP8"]=HEAP8;Module["HEAP16"]=HEAP16;Module["HEAP32"]=HEAP32;Module["HEAPU8"]=HEAPU8;Module["HEAPU16"]=HEAPU16;Module["HEAPU32"]=HEAPU32;Module["HEAPF32"]=HEAPF32;Module["HEAPF64"]=HEAPF64;function callRuntimeCallbacks(callbacks){while(callbacks.length>0){var callback=callbacks.shift();if(typeof callback=="function"){callback();continue}var func=callback.func;if(typeof func==="number"){if(callback.arg===undefined){Runtime.dynCall("v",func)}else{Runtime.dynCall("vi",func,[callback.arg])}}else{func(callback.arg===undefined?null:callback.arg)}}}var __ATPRERUN__=[];var __ATINIT__=[];var __ATMAIN__=[];var __ATEXIT__=[];var __ATPOSTRUN__=[];var runtimeInitialized=false;var runtimeExited=false;function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(__ATPRERUN__)}function ensureInitRuntime(){if(runtimeInitialized)return;runtimeInitialized=true;callRuntimeCallbacks(__ATINIT__)}function preMain(){callRuntimeCallbacks(__ATMAIN__)}function exitRuntime(){callRuntimeCallbacks(__ATEXIT__);runtimeExited=true}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(cb){__ATPRERUN__.unshift(cb)}Module["addOnPreRun"]=Module.addOnPreRun=addOnPreRun;function addOnInit(cb){__ATINIT__.unshift(cb)}Module["addOnInit"]=Module.addOnInit=addOnInit;function addOnPreMain(cb){__ATMAIN__.unshift(cb)}Module["addOnPreMain"]=Module.addOnPreMain=addOnPreMain;function addOnExit(cb){__ATEXIT__.unshift(cb)}Module["addOnExit"]=Module.addOnExit=addOnExit;function addOnPostRun(cb){__ATPOSTRUN__.unshift(cb)}Module["addOnPostRun"]=Module.addOnPostRun=addOnPostRun;function intArrayFromString(stringy,dontAddNull,length){var ret=(new Runtime.UTF8Processor).processJSString(stringy);if(length){ret.length=length}if(!dontAddNull){ret.push(0)}return ret}Module["intArrayFromString"]=intArrayFromString;function intArrayToString(array){var ret=[];for(var i=0;i<array.length;i++){var chr=array[i];if(chr>255){chr&=255}ret.push(String.fromCharCode(chr))}return ret.join("")}Module["intArrayToString"]=intArrayToString;function writeStringToMemory(string,buffer,dontAddNull){var array=intArrayFromString(string,dontAddNull);var i=0;while(i<array.length){var chr=array[i];HEAP8[buffer+i>>0]=chr;i=i+1}}Module["writeStringToMemory"]=writeStringToMemory;function writeArrayToMemory(array,buffer){for(var i=0;i<array.length;i++){HEAP8[buffer+i>>0]=array[i]}}Module["writeArrayToMemory"]=writeArrayToMemory;function writeAsciiToMemory(str,buffer,dontAddNull){for(var i=0;i<str.length;i++){HEAP8[buffer+i>>0]=str.charCodeAt(i)}if(!dontAddNull)HEAP8[buffer+str.length>>0]=0}Module["writeAsciiToMemory"]=writeAsciiToMemory;function unSign(value,bits,ignore){if(value>=0){return value}return bits<=32?2*Math.abs(1<<bits-1)+value:Math.pow(2,bits)+value}function reSign(value,bits,ignore){if(value<=0){return value}var half=bits<=32?Math.abs(1<<bits-1):Math.pow(2,bits-1);if(value>=half&&(bits<=32||value>half)){value=-2*half+value}return value}if(!Math["imul"]||Math["imul"](4294967295,5)!==-5)Math["imul"]=function imul(a,b){var ah=a>>>16;var al=a&65535;var bh=b>>>16;var bl=b&65535;return al*bl+(ah*bl+al*bh<<16)|0};Math.imul=Math["imul"];var Math_abs=Math.abs;var Math_cos=Math.cos;var Math_sin=Math.sin;var Math_tan=Math.tan;var Math_acos=Math.acos;var Math_asin=Math.asin;var Math_atan=Math.atan;var Math_atan2=Math.atan2;var Math_exp=Math.exp;var Math_log=Math.log;var Math_sqrt=Math.sqrt;var Math_ceil=Math.ceil;var Math_floor=Math.floor;var Math_pow=Math.pow;var Math_imul=Math.imul;var Math_fround=Math.fround;var Math_min=Math.min;var runDependencies=0;var runDependencyWatcher=null;var dependenciesFulfilled=null;function addRunDependency(id){runDependencies++;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}}Module["addRunDependency"]=addRunDependency;function removeRunDependency(id){runDependencies--;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}if(runDependencies==0){if(runDependencyWatcher!==null){clearInterval(runDependencyWatcher);runDependencyWatcher=null}if(dependenciesFulfilled){var callback=dependenciesFulfilled;dependenciesFulfilled=null;callback()}}}Module["removeRunDependency"]=removeRunDependency;Module["preloadedImages"]={};Module["preloadedAudios"]={};var memoryInitializer=null;STATIC_BASE=8;STATICTOP=STATIC_BASE+5664;__ATINIT__.push({func:(function(){__GLOBAL__I_a()})},{func:(function(){__GLOBAL__I_a127()})});allocate([78,55,77,105,110,105,115,97,116,50,48,79,117,116,79,102,77,101,109,111,114,121,69,120,99,101,112,116,105,111,110,69,0,0,0,0,0,0,0,0,88,18,0,0,8,0,0,0,78,55,77,105,110,105,115,97,116,54,79,112,116,105,111,110,69,0,0,0,0,0,0,0,88,18,0,0,56,0,0,0,10,32,32,32,32,32,32,32,32,37,115,10,0,0,0,0,0,0,0,0,80,0,0,0,1,0,0,0,2,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,0,0,1,0,0,0,3,0,0,0,1,0,0,0,1,0,0,0,78,55,77,105,110,105,115,97,116,49,48,66,111,111,108,79,112,116,105,111,110,69,0,0,128,18,0,0,176,0,0,0,80,0,0,0,0,0,0,0,32,32,45,37,115,44,32,45,110,111,45,37,115,0,0,0,40,100,101,102,97,117,108,116,58,32,37,115,41,10,0,0,111,110,0,0,0,0,0,0,111,102,102,0,0,0,0,0,110,111,45,0,0,0,0,0,0,0,0,0,64,1,0,0,1,0,0,0,4,0,0,0,2,0,0,0,2,0,0,0,78,55,77,105,110,105,115,97,116,57,73,110,116,79,112,116,105,111,110,69,0,0,0,0,128,18,0,0,40,1,0,0,80,0,0,0,0,0,0,0,32,32,45,37,45,49,50,115,32,61,32,37,45,56,115,32,91,0,0,0,0,0,0,0,105,109,105,110,0,0,0,0,37,52,100,0,0,0,0,0,32,46,46,32,0,0,0,0,105,109,97,120,0,0,0,0,93,32,40,100,101,102,97,117,108,116,58,32,37,100,41,10,0,0,0,0,0,0,0,0,69,82,82,79,82,33,32,118,97,108,117,101,32,60,37,115,62,32,105,115,32,116,111,111,32,108,97,114,103,101,32,102,111,114,32,111,112,116,105,111,110,32,34,37,115,34,46,10,0,0,0,0,0,0,0,0,69,82,82,79,82,33,32,118,97,108,117,101,32,60,37,115,62,32,105,115,32,116,111,111,32,115,109,97,108,108,32,102,111,114,32,111,112,116,105,111,110,32,34,37,115,34,46,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,118,97,114,45,100,101,99,97,121,0,0,0,0,0,0,0,84,104,101,32,118,97,114,105,97,98,108,101,32,97,99,116,105,118,105,116,121,32,100,101,99,97,121,32,102,97,99,116,111,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,99,108,97,45,100,101,99,97,121,0,0,0,0,0,0,0,84,104,101,32,99,108,97,117,115,101,32,97,99,116,105,118,105,116,121,32,100,101,99,97,121,32,102,97,99,116,111,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,110,100,45,102,114,101,113,0,0,0,0,0,0,0,0,84,104,101,32,102,114,101,113,117,101,110,99,121,32,119,105,116,104,32,119,104,105,99,104,32,116,104,101,32,100,101,99,105,115,105,111,110,32,104,101,117,114,105,115,116,105,99,32,116,114,105,101,115,32,116,111,32,99,104,111,111,115,101,32,97,32,114,97,110,100,111,109,32,118,97,114,105,97,98,108,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,110,100,45,115,101,101,100,0,0,0,0,0,0,0,0,85,115,101,100,32,98,121,32,116,104,101,32,114,97,110,100,111,109,32,118,97,114,105,97,98,108,101,32,115,101,108,101,99,116,105,111,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,99,99,109,105,110,45,109,111,100,101,0,0,0,0,0,0,67,111,110,116,114,111,108,115,32,99,111,110,102,108,105,99,116,32,99,108,97,117,115,101,32,109,105,110,105,109,105,122,97,116,105,111,110,32,40,48,61,110,111,110,101,44,32,49,61,98,97,115,105,99,44,32,50,61,100,101,101,112,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,112,104,97,115,101,45,115,97,118,105,110,103,0,0,0,0,67,111,110,116,114,111,108,115,32,116,104,101,32,108,101,118,101,108,32,111,102,32,112,104,97,115,101,32,115,97,118,105,110,103,32,40,48,61,110,111,110,101,44,32,49,61,108,105,109,105,116,101,100,44,32,50,61,102,117,108,108,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,110,100,45,105,110,105,116,0,0,0,0,0,0,0,0,82,97,110,100,111,109,105,122,101,32,116,104,101,32,105,110,105,116,105,97,108,32,97,99,116,105,118,105,116,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,108,117,98,121,0,0,0,0,85,115,101,32,116,104,101,32,76,117,98,121,32,114,101,115,116,97,114,116,32,115,101,113,117,101,110,99,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,102,105,114,115,116,0,0,84,104,101,32,98,97,115,101,32,114,101,115,116,97,114,116,32,105,110,116,101,114,118,97,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,105,110,99,0,0,0,0,82,101,115,116,97,114,116,32,105,110,116,101,114,118,97,108,32,105,110,99,114,101,97,115,101,32,102,97,99,116,111,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,103,99,45,102,114,97,99,0,84,104,101,32,102,114,97,99,116,105,111,110,32,111,102,32,119,97,115,116,101,100,32,109,101,109,111,114,121,32,97,108,108,111,119,101,100,32,98,101,102,111,114,101,32,97,32,103,97,114,98,97,103,101,32,99,111,108,108,101,99,116,105,111,110,32,105,115,32,116,114,105,103,103,101,114,101,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,109,105,110,45,108,101,97,114,110,116,115,0,0,0,0,0,77,105,110,105,109,117,109,32,108,101,97,114,110,116,32,99,108,97,117,115,101,32,108,105,109,105,116,0,0,0,0,0,0,0,0,0,192,7,0,0,5,0,0,0,6,0,0,0,7,0,0,0,0,0,0,0,124,32,37,57,100,32,124,32,37,55,100,32,37,56,100,32,37,56,100,32,124,32,37,56,100,32,37,56,100,32,37,54,46,48,102,32,124,32,37,54,46,51,102,32,37,37,32,124,10,0,0,0,0,0,0,0,124,32,32,71,97,114,98,97,103,101,32,99,111,108,108,101,99,116,105,111,110,58,32,32,32,37,49,50,100,32,98,121,116,101,115,32,61,62,32,37,49,50,100,32,98,121,116,101,115,32,32,32,32,32,32,32,32,32,32,32,32,32,124,10,0,0,0,0,0,0,0,0,78,55,77,105,110,105,115,97,116,54,83,111,108,118,101,114,69,0,0,0,0,0,0,0,88,18,0,0,168,7,0,0,60,98,111,111,108,62,0,0,10,32,32,32,32,32,32,32,32,37,115,10,0,0,0,0,60,105,110,116,51,50,62,0,69,82,82,79,82,33,32,118,97,108,117,101,32,60,37,115,62,32,105,115,32,116,111,111,32,108,97,114,103,101,32,102,111,114,32,111,112,116,105,111,110,32,34,37,115,34,46,10,0,0,0,0,0,0,0,0,69,82,82,79,82,33,32,118,97,108,117,101,32,60,37,115,62,32,105,115,32,116,111,111,32,115,109,97,108,108,32,102,111,114,32,111,112,116,105,111,110,32,34,37,115,34,46,10,0,0,0,0,0,0,0,0,67,79,82,69,0,0,0,0,60,100,111,117,98,108,101,62,0,0,0,0,0,0,0,0,0,0,0,0,168,8,0,0,1,0,0,0,8,0,0,0,3,0,0,0,3,0,0,0,78,55,77,105,110,105,115,97,116,49,50,68,111,117,98,108,101,79,112,116,105,111,110,69,0,0,0,0,0,0,0,0,128,18,0,0,136,8,0,0,80,0,0,0,0,0,0,0,32,32,45,37,45,49,50,115,32,61,32,37,45,56,115,32,37,99,37,52,46,50,103,32,46,46,32,37,52,46,50,103,37,99,32,40,100,101,102,97,117,108,116,58,32,37,103,41,10,0,0,0,0,0,0,0,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,91,32,83,101,97,114,99,104,32,83,116,97,116,105,115,116,105,99,115,32,93,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,0,124,32,67,111,110,102,108,105,99,116,115,32,124,32,32,32,32,32,32,32,32,32,32,79,82,73,71,73,78,65,76,32,32,32,32,32,32,32,32,32,124,32,32,32,32,32,32,32,32,32,32,76,69,65,82,78,84,32,32,32,32,32,32,32,32,32,32,124,32,80,114,111,103,114,101,115,115,32,124,0,124,32,32,32,32,32,32,32,32,32,32,32,124,32,32,32,32,86,97,114,115,32,32,67,108,97,117,115,101,115,32,76,105,116,101,114,97,108,115,32,124,32,32,32,32,76,105,109,105,116,32,32,67,108,97,117,115,101,115,32,76,105,116,47,67,108,32,124,32,32,32,32,32,32,32,32,32,32,124,0,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,115,121,109,109,0,0,0,83,104,114,105,110,107,32,99,108,97,117,115,101,115,32,98,121,32,97,115,121,109,109,101,116,114,105,99,32,98,114,97,110,99,104,105,110,103,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,99,104,101,99,107,0,0,67,104,101,99,107,32,105,102,32,97,32,99,108,97,117,115,101,32,105,115,32,97,108,114,101,97,100,121,32,105,109,112,108,105,101,100,46,32,40,99,111,115,116,108,121,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,108,105,109,0,0,0,0,80,101,114,102,111,114,109,32,118,97,114,105,97,98,108,101,32,101,108,105,109,105,110,97,116,105,111,110,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,103,114,111,119,0,0,0,0,65,108,108,111,119,32,97,32,118,97,114,105,97,98,108,101,32,101,108,105,109,105,110,97,116,105,111,110,32,115,116,101,112,32,116,111,32,103,114,111,119,32,98,121,32,97,32,110,117,109,98,101,114,32,111,102,32,99,108,97,117,115,101,115,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,99,108,45,108,105,109,0,0,86,97,114,105,97,98,108,101,115,32,97,114,101,32,110,111,116,32,101,108,105,109,105,110,97,116,101,100,32,105,102,32,105,116,32,112,114,111,100,117,99,101,115,32,97,32,114,101,115,111,108,118,101,110,116,32,119,105,116,104,32,97,32,108,101,110,103,116,104,32,97,98,111,118,101,32,116,104,105,115,32,108,105,109,105,116,46,32,45,49,32,109,101,97,110,115,32,110,111,32,108,105,109,105,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,115,117,98,45,108,105,109,0,68,111,32,110,111,116,32,99,104,101,99,107,32,105,102,32,115,117,98,115,117,109,112,116,105,111,110,32,97,103,97,105,110,115,116,32,97,32,99,108,97,117,115,101,32,108,97,114,103,101,114,32,116,104,97,110,32,116,104,105,115,46,32,45,49,32,109,101,97,110,115,32,110,111,32,108,105,109,105,116,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,115,105,109,112,45,103,99,45,102,114,97,99,0,0,0,0,84,104,101,32,102,114,97,99,116,105,111,110,32,111,102,32,119,97,115,116,101,100,32,109,101,109,111,114,121,32,97,108,108,111,119,101,100,32,98,101,102,111,114,101,32,97,32,103,97,114,98,97,103,101,32,99,111,108,108,101,99,116,105,111,110,32,105,115,32,116,114,105,103,103,101,114,101,100,32,100,117,114,105,110,103,32,115,105,109,112,108,105,102,105,99,97,116,105,111,110,46,0,0,0,0,0,0,0,120,14,0,0,9,0,0,0,10,0,0,0,11,0,0,0,0,0,0,0,115,117,98,115,117,109,112,116,105,111,110,32,108,101,102,116,58,32,37,49,48,100,32,40,37,49,48,100,32,115,117,98,115,117,109,101,100,44,32,37,49,48,100,32,100,101,108,101,116,101,100,32,108,105,116,101,114,97,108,115,41,13,0,0,101,108,105,109,105,110,97,116,105,111,110,32,108,101,102,116,58,32,37,49,48,100,13,0,124,32,32,69,108,105,109,105,110,97,116,101,100,32,99,108,97,117,115,101,115,58,32,32,32,32,32,37,49,48,46,50,102,32,77,98,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,124,10,0,0,0,0,124,32,32,71,97,114,98,97,103,101,32,99,111,108,108,101,99,116,105,111,110,58,32,32,32,37,49,50,100,32,98,121,116,101,115,32,61,62,32,37,49,50,100,32,98,121,116,101,115,32,32,32,32,32,32,32,32,32,32,32,32,32,124,10,0,0,0,0,0,0,0,0,78,55,77,105,110,105,115,97,116,49,48,83,105,109,112,83,111,108,118,101,114,69,0,0,128,18,0,0,96,14,0,0,192,7,0,0,0,0,0,0,60,100,111,117,98,108,101,62,0,0,0,0,0,0,0,0,60,105,110,116,51,50,62,0,83,73,77,80,0,0,0,0,60,98,111,111,108,62,0,0,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,79,33,0,0,0,0,0,2,0,0,0,0,0,0,0,48,15,0,0,0,0,0,0,117,110,99,97,117,103,104,116,0,0,0,0,0,0,0,0,116,101,114,109,105,110,97,116,105,110,103,32,119,105,116,104,32,37,115,32,101,120,99,101,112,116,105,111,110,32,111,102,32,116,121,112,101,32,37,115,58,32,37,115,0,0,0,0,116,101,114,109,105,110,97,116,105,110,103,32,119,105,116,104,32,37,115,32,101,120,99,101,112,116,105,111,110,32,111,102,32,116,121,112,101,32,37,115,0,0,0,0,0,0,0,0,116,101,114,109,105,110,97,116,105,110,103,32,119,105,116,104,32,37,115,32,102,111,114,101,105,103,110,32,101,120,99,101,112,116,105,111,110,0,0,0,116,101,114,109,105,110,97,116,105,110,103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,112,116,104,114,101,97,100,95,111,110,99,101,32,102,97,105,108,117,114,101,32,105,110,32,95,95,99,120,97,95,103,101,116,95,103,108,111,98,97,108,115,95,102,97,115,116,40,41,0,0,0,0,0,0,0,0,99,97,110,110,111,116,32,99,114,101,97,116,101,32,112,116,104,114,101,97,100,32,107,101,121,32,102,111,114,32,95,95,99,120,97,95,103,101,116,95,103,108,111,98,97,108,115,40,41,0,0,0,0,0,0,0,99,97,110,110,111,116,32,122,101,114,111,32,111,117,116,32,116,104,114,101,97,100,32,118,97,108,117,101,32,102,111,114,32,95,95,99,120,97,95,103,101,116,95,103,108,111,98,97,108,115,40,41,0,0,0,0,0,0,0,0,200,16,0,0,12,0,0,0,13,0,0,0,1,0,0,0,0,0,0,0,115,116,100,58,58,98,97,100,95,97,108,108,111,99,0,0,83,116,57,98,97,100,95,97,108,108,111,99,0,0,0,0,128,18,0,0,184,16,0,0,80,17,0,0,0,0,0,0,116,101,114,109,105,110,97,116,101,95,104,97,110,100,108,101,114,32,117,110,101,120,112,101,99,116,101,100,108,121,32,114,101,116,117,114,110,101,100,0,116,101,114,109,105,110,97,116,101,95,104,97,110,100,108,101,114,32,117,110,101,120,112,101,99,116,101,100,108,121,32,116,104,114,101,119,32,97,110,32,101,120,99,101,112,116,105,111,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,116,57,101,120,99,101,112,116,105,111,110,0,0,0,0,88,18,0,0,64,17,0,0,83,116,57,116,121,112,101,95,105,110,102,111,0,0,0,0,88,18,0,0,88,17,0,0,78,49,48,95,95,99,120,120,97,98,105,118,49,49,54,95,95,115,104,105,109,95,116,121,112,101,95,105,110,102,111,69,0,0,0,0,0,0,0,0,128,18,0,0,112,17,0,0,104,17,0,0,0,0,0,0,78,49,48,95,95,99,120,120,97,98,105,118,49,49,55,95,95,99,108,97,115,115,95,116,121,112,101,95,105,110,102,111,69,0,0,0,0,0,0,0,128,18,0,0,168,17,0,0,152,17,0,0,0,0,0,0,78,49,48,95,95,99,120,120,97,98,105,118,49,49,57,95,95,112,111,105,110,116,101,114,95,116,121,112,101,95,105,110,102,111,69,0,0,0,0,0,78,49,48,95,95,99,120,120,97,98,105,118,49,49,55,95,95,112,98,97,115,101,95,116,121,112,101,95,105,110,102,111,69,0,0,0,0,0,0,0,128,18,0,0,8,18,0,0,152,17,0,0,0,0,0,0,128,18,0,0,224,17,0,0,48,18,0,0,0,0,0,0,0,0,0,0,208,17,0,0,14,0,0,0,15,0,0,0,16,0,0,0,17,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,200,18,0,0,14,0,0,0,18,0,0,0,16,0,0,0,17,0,0,0,1,0,0,0,2,0,0,0,2,0,0,0,2,0,0,0,78,49,48,95,95,99,120,120,97,98,105,118,49,50,48,95,95,115,105,95,99,108,97,115,115,95,116,121,112,101,95,105,110,102,111,69,0,0,0,0,128,18,0,0,160,18,0,0,208,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,1,2,3,4,5,6,7,8,9,255,255,255,255,255,255,255,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,255,255,255,255,255,255,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,0,0,0,0,0,0,1,2,4,7,3,6,5,0,0,0,0,0,0,0,0,105,110,102,105,110,105,116,121,0,0,0,0,0,0,0,0,110,97,110,0,0,0,0,0,95,112,137,0,255,9,47,15,10,0,0,0,100,0,0,0,232,3,0,0,16,39,0,0,160,134,1,0,64,66,15,0,128,150,152,0,0,225,245,5],"i8",ALLOC_NONE,Runtime.GLOBAL_BASE);var tempDoublePtr=Runtime.alignMemory(allocate(12,"i8",ALLOC_STATIC),8);assert(tempDoublePtr%8==0);function copyTempFloat(ptr){HEAP8[tempDoublePtr]=HEAP8[ptr];HEAP8[tempDoublePtr+1]=HEAP8[ptr+1];HEAP8[tempDoublePtr+2]=HEAP8[ptr+2];HEAP8[tempDoublePtr+3]=HEAP8[ptr+3]}function copyTempDouble(ptr){HEAP8[tempDoublePtr]=HEAP8[ptr];HEAP8[tempDoublePtr+1]=HEAP8[ptr+1];HEAP8[tempDoublePtr+2]=HEAP8[ptr+2];HEAP8[tempDoublePtr+3]=HEAP8[ptr+3];HEAP8[tempDoublePtr+4]=HEAP8[ptr+4];HEAP8[tempDoublePtr+5]=HEAP8[ptr+5];HEAP8[tempDoublePtr+6]=HEAP8[ptr+6];HEAP8[tempDoublePtr+7]=HEAP8[ptr+7]}function _atexit(func,arg){__ATEXIT__.unshift({func:func,arg:arg})}function ___cxa_atexit(){return _atexit.apply(null,arguments)}Module["_i64Subtract"]=_i64Subtract;var ___errno_state=0;function ___setErrNo(value){HEAP32[___errno_state>>2]=value;return value}var ERRNO_CODES={EPERM:1,ENOENT:2,ESRCH:3,EINTR:4,EIO:5,ENXIO:6,E2BIG:7,ENOEXEC:8,EBADF:9,ECHILD:10,EAGAIN:11,EWOULDBLOCK:11,ENOMEM:12,EACCES:13,EFAULT:14,ENOTBLK:15,EBUSY:16,EEXIST:17,EXDEV:18,ENODEV:19,ENOTDIR:20,EISDIR:21,EINVAL:22,ENFILE:23,EMFILE:24,ENOTTY:25,ETXTBSY:26,EFBIG:27,ENOSPC:28,ESPIPE:29,EROFS:30,EMLINK:31,EPIPE:32,EDOM:33,ERANGE:34,ENOMSG:42,EIDRM:43,ECHRNG:44,EL2NSYNC:45,EL3HLT:46,EL3RST:47,ELNRNG:48,EUNATCH:49,ENOCSI:50,EL2HLT:51,EDEADLK:35,ENOLCK:37,EBADE:52,EBADR:53,EXFULL:54,ENOANO:55,EBADRQC:56,EBADSLT:57,EDEADLOCK:35,EBFONT:59,ENOSTR:60,ENODATA:61,ETIME:62,ENOSR:63,ENONET:64,ENOPKG:65,EREMOTE:66,ENOLINK:67,EADV:68,ESRMNT:69,ECOMM:70,EPROTO:71,EMULTIHOP:72,EDOTDOT:73,EBADMSG:74,ENOTUNIQ:76,EBADFD:77,EREMCHG:78,ELIBACC:79,ELIBBAD:80,ELIBSCN:81,ELIBMAX:82,ELIBEXEC:83,ENOSYS:38,ENOTEMPTY:39,ENAMETOOLONG:36,ELOOP:40,EOPNOTSUPP:95,EPFNOSUPPORT:96,ECONNRESET:104,ENOBUFS:105,EAFNOSUPPORT:97,EPROTOTYPE:91,ENOTSOCK:88,ENOPROTOOPT:92,ESHUTDOWN:108,ECONNREFUSED:111,EADDRINUSE:98,ECONNABORTED:103,ENETUNREACH:101,ENETDOWN:100,ETIMEDOUT:110,EHOSTDOWN:112,EHOSTUNREACH:113,EINPROGRESS:115,EALREADY:114,EDESTADDRREQ:89,EMSGSIZE:90,EPROTONOSUPPORT:93,ESOCKTNOSUPPORT:94,EADDRNOTAVAIL:99,ENETRESET:102,EISCONN:106,ENOTCONN:107,ETOOMANYREFS:109,EUSERS:87,EDQUOT:122,ESTALE:116,ENOTSUP:95,ENOMEDIUM:123,EILSEQ:84,EOVERFLOW:75,ECANCELED:125,ENOTRECOVERABLE:131,EOWNERDEAD:130,ESTRPIPE:86};function _sysconf(name){switch(name){case 30:return PAGE_SIZE;case 132:case 133:case 12:case 137:case 138:case 15:case 235:case 16:case 17:case 18:case 19:case 20:case 149:case 13:case 10:case 236:case 153:case 9:case 21:case 22:case 159:case 154:case 14:case 77:case 78:case 139:case 80:case 81:case 79:case 82:case 68:case 67:case 164:case 11:case 29:case 47:case 48:case 95:case 52:case 51:case 46:return 200809;case 27:case 246:case 127:case 128:case 23:case 24:case 160:case 161:case 181:case 182:case 242:case 183:case 184:case 243:case 244:case 245:case 165:case 178:case 179:case 49:case 50:case 168:case 169:case 175:case 170:case 171:case 172:case 97:case 76:case 32:case 173:case 35:return-1;case 176:case 177:case 7:case 155:case 8:case 157:case 125:case 126:case 92:case 93:case 129:case 130:case 131:case 94:case 91:return 1;case 74:case 60:case 69:case 70:case 4:return 1024;case 31:case 42:case 72:return 32;case 87:case 26:case 33:return 2147483647;case 34:case 1:return 47839;case 38:case 36:return 99;case 43:case 37:return 2048;case 0:return 2097152;case 3:return 65536;case 28:return 32768;case 44:return 32767;case 75:return 16384;case 39:return 1e3;case 89:return 700;case 71:return 256;case 40:return 255;case 2:return 100;case 180:return 64;case 25:return 20;case 5:return 16;case 6:return 6;case 73:return 4;case 84:{if(typeof navigator==="object")return navigator["hardwareConcurrency"]||1;return 1}}___setErrNo(ERRNO_CODES.EINVAL);return-1}function __ZSt18uncaught_exceptionv(){return!!__ZSt18uncaught_exceptionv.uncaught_exception}var EXCEPTIONS={last:0,caught:[],infos:{},deAdjust:(function(adjusted){if(!adjusted||EXCEPTIONS.infos[adjusted])return adjusted;for(var ptr in EXCEPTIONS.infos){var info=EXCEPTIONS.infos[ptr];if(info.adjusted===adjusted){return ptr}}return adjusted}),addRef:(function(ptr){if(!ptr)return;var info=EXCEPTIONS.infos[ptr];info.refcount++}),decRef:(function(ptr){if(!ptr)return;var info=EXCEPTIONS.infos[ptr];assert(info.refcount>0);info.refcount--;if(info.refcount===0){if(info.destructor){Runtime.dynCall("vi",info.destructor,[ptr])}delete EXCEPTIONS.infos[ptr];___cxa_free_exception(ptr)}}),clearRef:(function(ptr){if(!ptr)return;var info=EXCEPTIONS.infos[ptr];info.refcount=0})};function ___resumeException(ptr){if(!EXCEPTIONS.last){EXCEPTIONS.last=ptr}EXCEPTIONS.clearRef(EXCEPTIONS.deAdjust(ptr));throw ptr+" - Exception catching is disabled, this exception cannot be caught. Compile with -s DISABLE_EXCEPTION_CATCHING=0 or DISABLE_EXCEPTION_CATCHING=2 to catch."}function ___cxa_find_matching_catch(){var thrown=EXCEPTIONS.last;if(!thrown){return(asm["setTempRet0"](0),0)|0}var info=EXCEPTIONS.infos[thrown];var throwntype=info.type;if(!throwntype){return(asm["setTempRet0"](0),thrown)|0}var typeArray=Array.prototype.slice.call(arguments);var pointer=Module["___cxa_is_pointer_type"](throwntype);if(!___cxa_find_matching_catch.buffer)___cxa_find_matching_catch.buffer=_malloc(4);HEAP32[___cxa_find_matching_catch.buffer>>2]=thrown;thrown=___cxa_find_matching_catch.buffer;for(var i=0;i<typeArray.length;i++){if(typeArray[i]&&Module["___cxa_can_catch"](typeArray[i],throwntype,thrown)){thrown=HEAP32[thrown>>2];info.adjusted=thrown;return(asm["setTempRet0"](typeArray[i]),thrown)|0}}thrown=HEAP32[thrown>>2];return(asm["setTempRet0"](throwntype),thrown)|0}function ___cxa_throw(ptr,type,destructor){EXCEPTIONS.infos[ptr]={ptr:ptr,adjusted:ptr,type:type,destructor:destructor,refcount:0};EXCEPTIONS.last=ptr;if(!("uncaught_exception"in __ZSt18uncaught_exceptionv)){__ZSt18uncaught_exceptionv.uncaught_exception=1}else{__ZSt18uncaught_exceptionv.uncaught_exception++}throw ptr+" - Exception catching is disabled, this exception cannot be caught. Compile with -s DISABLE_EXCEPTION_CATCHING=0 or DISABLE_EXCEPTION_CATCHING=2 to catch."}Module["_memset"]=_memset;Module["_bitshift64Shl"]=_bitshift64Shl;function _abort(){Module["abort"]()}var FS=undefined;var SOCKFS=undefined;function _send(fd,buf,len,flags){var sock=SOCKFS.getSocket(fd);if(!sock){___setErrNo(ERRNO_CODES.EBADF);return-1}return _write(fd,buf,len)}function _pwrite(fildes,buf,nbyte,offset){var stream=FS.getStream(fildes);if(!stream){___setErrNo(ERRNO_CODES.EBADF);return-1}try{var slab=HEAP8;return FS.write(stream,slab,buf,nbyte,offset)}catch(e){FS.handleFSError(e);return-1}}function _write(fildes,buf,nbyte){var stream=FS.getStream(fildes);if(!stream){___setErrNo(ERRNO_CODES.EBADF);return-1}try{var slab=HEAP8;return FS.write(stream,slab,buf,nbyte)}catch(e){FS.handleFSError(e);return-1}}function _fileno(stream){stream=FS.getStreamFromPtr(stream);if(!stream)return-1;return stream.fd}function _fwrite(ptr,size,nitems,stream){var bytesToWrite=nitems*size;if(bytesToWrite==0)return 0;var fd=_fileno(stream);var bytesWritten=_write(fd,ptr,bytesToWrite);if(bytesWritten==-1){var streamObj=FS.getStreamFromPtr(stream);if(streamObj)streamObj.error=true;return 0}else{return bytesWritten/size|0}}Module["_strlen"]=_strlen;function __reallyNegative(x){return x<0||x===0&&1/x===-Infinity}function __formatString(format,varargs){var textIndex=format;var argIndex=0;function getNextArg(type){var ret;if(type==="double"){ret=(HEAP32[tempDoublePtr>>2]=HEAP32[varargs+argIndex>>2],HEAP32[tempDoublePtr+4>>2]=HEAP32[varargs+(argIndex+4)>>2],+HEAPF64[tempDoublePtr>>3])}else if(type=="i64"){ret=[HEAP32[varargs+argIndex>>2],HEAP32[varargs+(argIndex+4)>>2]]}else{type="i32";ret=HEAP32[varargs+argIndex>>2]}argIndex+=Runtime.getNativeFieldSize(type);return ret}var ret=[];var curr,next,currArg;while(1){var startTextIndex=textIndex;curr=HEAP8[textIndex>>0];if(curr===0)break;next=HEAP8[textIndex+1>>0];if(curr==37){var flagAlwaysSigned=false;var flagLeftAlign=false;var flagAlternative=false;var flagZeroPad=false;var flagPadSign=false;flagsLoop:while(1){switch(next){case 43:flagAlwaysSigned=true;break;case 45:flagLeftAlign=true;break;case 35:flagAlternative=true;break;case 48:if(flagZeroPad){break flagsLoop}else{flagZeroPad=true;break};case 32:flagPadSign=true;break;default:break flagsLoop}textIndex++;next=HEAP8[textIndex+1>>0]}var width=0;if(next==42){width=getNextArg("i32");textIndex++;next=HEAP8[textIndex+1>>0]}else{while(next>=48&&next<=57){width=width*10+(next-48);textIndex++;next=HEAP8[textIndex+1>>0]}}var precisionSet=false,precision=-1;if(next==46){precision=0;precisionSet=true;textIndex++;next=HEAP8[textIndex+1>>0];if(next==42){precision=getNextArg("i32");textIndex++}else{while(1){var precisionChr=HEAP8[textIndex+1>>0];if(precisionChr<48||precisionChr>57)break;precision=precision*10+(precisionChr-48);textIndex++}}next=HEAP8[textIndex+1>>0]}if(precision<0){precision=6;precisionSet=false}var argSize;switch(String.fromCharCode(next)){case"h":var nextNext=HEAP8[textIndex+2>>0];if(nextNext==104){textIndex++;argSize=1}else{argSize=2}break;case"l":var nextNext=HEAP8[textIndex+2>>0];if(nextNext==108){textIndex++;argSize=8}else{argSize=4}break;case"L":case"q":case"j":argSize=8;break;case"z":case"t":case"I":argSize=4;break;default:argSize=null}if(argSize)textIndex++;next=HEAP8[textIndex+1>>0];switch(String.fromCharCode(next)){case"d":case"i":case"u":case"o":case"x":case"X":case"p":{var signed=next==100||next==105;argSize=argSize||4;var currArg=getNextArg("i"+argSize*8);var origArg=currArg;var argText;if(argSize==8){currArg=Runtime.makeBigInt(currArg[0],currArg[1],next==117)}if(argSize<=4){var limit=Math.pow(256,argSize)-1;currArg=(signed?reSign:unSign)(currArg&limit,argSize*8)}var currAbsArg=Math.abs(currArg);var prefix="";if(next==100||next==105){if(argSize==8&&i64Math)argText=i64Math.stringify(origArg[0],origArg[1],null);else argText=reSign(currArg,8*argSize,1).toString(10)}else if(next==117){if(argSize==8&&i64Math)argText=i64Math.stringify(origArg[0],origArg[1],true);else argText=unSign(currArg,8*argSize,1).toString(10);currArg=Math.abs(currArg)}else if(next==111){argText=(flagAlternative?"0":"")+currAbsArg.toString(8)}else if(next==120||next==88){prefix=flagAlternative&&currArg!=0?"0x":"";if(argSize==8&&i64Math){if(origArg[1]){argText=(origArg[1]>>>0).toString(16);var lower=(origArg[0]>>>0).toString(16);while(lower.length<8)lower="0"+lower;argText+=lower}else{argText=(origArg[0]>>>0).toString(16)}}else if(currArg<0){currArg=-currArg;argText=(currAbsArg-1).toString(16);var buffer=[];for(var i=0;i<argText.length;i++){buffer.push((15-parseInt(argText[i],16)).toString(16))}argText=buffer.join("");while(argText.length<argSize*2)argText="f"+argText}else{argText=currAbsArg.toString(16)}if(next==88){prefix=prefix.toUpperCase();argText=argText.toUpperCase()}}else if(next==112){if(currAbsArg===0){argText="(nil)"}else{prefix="0x";argText=currAbsArg.toString(16)}}if(precisionSet){while(argText.length<precision){argText="0"+argText}}if(currArg>=0){if(flagAlwaysSigned){prefix="+"+prefix}else if(flagPadSign){prefix=" "+prefix}}if(argText.charAt(0)=="-"){prefix="-"+prefix;argText=argText.substr(1)}while(prefix.length+argText.length<width){if(flagLeftAlign){argText+=" "}else{if(flagZeroPad){argText="0"+argText}else{prefix=" "+prefix}}}argText=prefix+argText;argText.split("").forEach((function(chr){ret.push(chr.charCodeAt(0))}));break};case"f":case"F":case"e":case"E":case"g":case"G":{var currArg=getNextArg("double");var argText;if(isNaN(currArg)){argText="nan";flagZeroPad=false}else if(!isFinite(currArg)){argText=(currArg<0?"-":"")+"inf";flagZeroPad=false}else{var isGeneral=false;var effectivePrecision=Math.min(precision,20);if(next==103||next==71){isGeneral=true;precision=precision||1;var exponent=parseInt(currArg.toExponential(effectivePrecision).split("e")[1],10);if(precision>exponent&&exponent>=-4){next=(next==103?"f":"F").charCodeAt(0);precision-=exponent+1}else{next=(next==103?"e":"E").charCodeAt(0);precision--}effectivePrecision=Math.min(precision,20)}if(next==101||next==69){argText=currArg.toExponential(effectivePrecision);if(/[eE][-+]\d$/.test(argText)){argText=argText.slice(0,-1)+"0"+argText.slice(-1)}}else if(next==102||next==70){argText=currArg.toFixed(effectivePrecision);if(currArg===0&&__reallyNegative(currArg)){argText="-"+argText}}var parts=argText.split("e");if(isGeneral&&!flagAlternative){while(parts[0].length>1&&parts[0].indexOf(".")!=-1&&(parts[0].slice(-1)=="0"||parts[0].slice(-1)==".")){parts[0]=parts[0].slice(0,-1)}}else{if(flagAlternative&&argText.indexOf(".")==-1)parts[0]+=".";while(precision>effectivePrecision++)parts[0]+="0"}argText=parts[0]+(parts.length>1?"e"+parts[1]:"");if(next==69)argText=argText.toUpperCase();if(currArg>=0){if(flagAlwaysSigned){argText="+"+argText}else if(flagPadSign){argText=" "+argText}}}while(argText.length<width){if(flagLeftAlign){argText+=" "}else{if(flagZeroPad&&(argText[0]=="-"||argText[0]=="+")){argText=argText[0]+"0"+argText.slice(1)}else{argText=(flagZeroPad?"0":" ")+argText}}}if(next<97)argText=argText.toUpperCase();argText.split("").forEach((function(chr){ret.push(chr.charCodeAt(0))}));break};case"s":{var arg=getNextArg("i8*");var argLength=arg?_strlen(arg):"(null)".length;if(precisionSet)argLength=Math.min(argLength,precision);if(!flagLeftAlign){while(argLength<width--){ret.push(32)}}if(arg){for(var i=0;i<argLength;i++){ret.push(HEAPU8[arg++>>0])}}else{ret=ret.concat(intArrayFromString("(null)".substr(0,argLength),true))}if(flagLeftAlign){while(argLength<width--){ret.push(32)}}break};case"c":{if(flagLeftAlign)ret.push(getNextArg("i8"));while(--width>0){ret.push(32)}if(!flagLeftAlign)ret.push(getNextArg("i8"));break};case"n":{var ptr=getNextArg("i32*");HEAP32[ptr>>2]=ret.length;break};case"%":{ret.push(curr);break};default:{for(var i=startTextIndex;i<textIndex+2;i++){ret.push(HEAP8[i>>0])}}}textIndex+=2}else{ret.push(curr);textIndex+=1}}return ret}function _fprintf(stream,format,varargs){var result=__formatString(format,varargs);var stack=Runtime.stackSave();var ret=_fwrite(allocate(result,"i8",ALLOC_STACK),1,result.length,stream);Runtime.stackRestore(stack);return ret}function _printf(format,varargs){var result=__formatString(format,varargs);var string=intArrayToString(result);if(string[string.length-1]==="\n")string=string.substr(0,string.length-1);Module.print(string);return result.length}function _pthread_once(ptr,func){if(!_pthread_once.seen)_pthread_once.seen={};if(ptr in _pthread_once.seen)return;Runtime.dynCall("v",func);_pthread_once.seen[ptr]=1}function _fputc(c,stream){var chr=unSign(c&255);HEAP8[_fputc.ret>>0]=chr;var fd=_fileno(stream);var ret=_write(fd,_fputc.ret,1);if(ret==-1){var streamObj=FS.getStreamFromPtr(stream);if(streamObj)streamObj.error=true;return-1}else{return chr}}var PTHREAD_SPECIFIC={};function _pthread_getspecific(key){return PTHREAD_SPECIFIC[key]||0}Module["_i64Add"]=_i64Add;function _fputs(s,stream){var fd=_fileno(stream);return _write(fd,s,_strlen(s))}var _stdout=allocate(1,"i32*",ALLOC_STATIC);function _puts(s){var result=Pointer_stringify(s);var string=result.substr(0);if(string[string.length-1]==="\n")string=string.substr(0,string.length-1);Module.print(string);return result.length}function _pthread_setspecific(key,value){if(!(key in PTHREAD_SPECIFIC)){return ERRNO_CODES.EINVAL}PTHREAD_SPECIFIC[key]=value;return 0}function __exit(status){Module["exit"](status)}function _exit(status){__exit(status)}var _UItoD=true;function _malloc(bytes){var ptr=Runtime.dynamicAlloc(bytes+8);return ptr+8&4294967288}Module["_malloc"]=_malloc;function ___cxa_allocate_exception(size){return _malloc(size)}function _fmod(x,y){return x%y}function _fmodl(){return _fmod.apply(null,arguments)}Module["_bitshift64Lshr"]=_bitshift64Lshr;function ___cxa_pure_virtual(){ABORT=true;throw"Pure virtual function called!"}function _time(ptr){var ret=Date.now()/1e3|0;if(ptr){HEAP32[ptr>>2]=ret}return ret}var PTHREAD_SPECIFIC_NEXT_KEY=1;function _pthread_key_create(key,destructor){if(key==0){return ERRNO_CODES.EINVAL}HEAP32[key>>2]=PTHREAD_SPECIFIC_NEXT_KEY;PTHREAD_SPECIFIC[PTHREAD_SPECIFIC_NEXT_KEY]=0;PTHREAD_SPECIFIC_NEXT_KEY++;return 0}function ___cxa_guard_acquire(variable){if(!HEAP8[variable>>0]){HEAP8[variable>>0]=1;return 1}return 0}function ___cxa_guard_release(){}function _vfprintf(s,f,va_arg){return _fprintf(s,f,HEAP32[va_arg>>2])}function ___cxa_begin_catch(ptr){__ZSt18uncaught_exceptionv.uncaught_exception--;EXCEPTIONS.caught.push(ptr);EXCEPTIONS.addRef(EXCEPTIONS.deAdjust(ptr));return ptr}function _emscripten_memcpy_big(dest,src,num){HEAPU8.set(HEAPU8.subarray(src,src+num),dest);return dest}Module["_memcpy"]=_memcpy;var _llvm_pow_f64=Math_pow;function _sbrk(bytes){var self=_sbrk;if(!self.called){DYNAMICTOP=alignMemoryPage(DYNAMICTOP);self.called=true;assert(Runtime.dynamicAlloc);self.alloc=Runtime.dynamicAlloc;Runtime.dynamicAlloc=(function(){abort("cannot dynamically allocate, sbrk now has control")})}var ret=DYNAMICTOP;if(bytes!=0)self.alloc(bytes);return ret}var _fabs=Math_abs;function ___errno_location(){return ___errno_state}var _BItoD=true;function _copysign(a,b){return __reallyNegative(a)===__reallyNegative(b)?a:-a}function _copysignl(){return _copysign.apply(null,arguments)}var ___dso_handle=allocate(1,"i32*",ALLOC_STATIC);var _stderr=allocate(1,"i32*",ALLOC_STATIC);___errno_state=Runtime.staticAlloc(4);HEAP32[___errno_state>>2]=0;_fputc.ret=allocate([0],"i8",ALLOC_STATIC);STACK_BASE=STACKTOP=Runtime.alignMemory(STATICTOP);staticSealed=true;STACK_MAX=STACK_BASE+TOTAL_STACK;DYNAMIC_BASE=DYNAMICTOP=Runtime.alignMemory(STACK_MAX);assert(DYNAMIC_BASE<TOTAL_MEMORY,"TOTAL_MEMORY not big enough for stack");var ctlz_i8=allocate([8,7,6,6,5,5,5,5,4,4,4,4,4,4,4,4,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"i8",ALLOC_DYNAMIC);var cttz_i8=allocate([8,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0],"i8",ALLOC_DYNAMIC);function invoke_iiii(index,a1,a2,a3){try{return Module["dynCall_iiii"](index,a1,a2,a3)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}function invoke_viiiii(index,a1,a2,a3,a4,a5){try{Module["dynCall_viiiii"](index,a1,a2,a3,a4,a5)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}function invoke_vi(index,a1){try{Module["dynCall_vi"](index,a1)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}function invoke_vii(index,a1,a2){try{Module["dynCall_vii"](index,a1,a2)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}function invoke_ii(index,a1){try{return Module["dynCall_ii"](index,a1)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}function invoke_v(index){try{Module["dynCall_v"](index)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}function invoke_viiiiii(index,a1,a2,a3,a4,a5,a6){try{Module["dynCall_viiiiii"](index,a1,a2,a3,a4,a5,a6)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}function invoke_iii(index,a1,a2){try{return Module["dynCall_iii"](index,a1,a2)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}function invoke_viiii(index,a1,a2,a3,a4){try{Module["dynCall_viiii"](index,a1,a2,a3,a4)}catch(e){if(typeof e!=="number"&&e!=="longjmp")throw e;asm["setThrew"](1,0)}}Module.asmGlobalArg={"Math":Math,"Int8Array":Int8Array,"Int16Array":Int16Array,"Int32Array":Int32Array,"Uint8Array":Uint8Array,"Uint16Array":Uint16Array,"Uint32Array":Uint32Array,"Float32Array":Float32Array,"Float64Array":Float64Array};Module.asmLibraryArg={"abort":abort,"assert":assert,"min":Math_min,"invoke_iiii":invoke_iiii,"invoke_viiiii":invoke_viiiii,"invoke_vi":invoke_vi,"invoke_vii":invoke_vii,"invoke_ii":invoke_ii,"invoke_v":invoke_v,"invoke_viiiiii":invoke_viiiiii,"invoke_iii":invoke_iii,"invoke_viiii":invoke_viiii,"_fabs":_fabs,"_llvm_pow_f64":_llvm_pow_f64,"_send":_send,"_fmod":_fmod,"___cxa_guard_acquire":___cxa_guard_acquire,"___setErrNo":___setErrNo,"_vfprintf":_vfprintf,"___cxa_allocate_exception":___cxa_allocate_exception,"___cxa_find_matching_catch":___cxa_find_matching_catch,"___cxa_guard_release":___cxa_guard_release,"_pwrite":_pwrite,"__reallyNegative":__reallyNegative,"_sbrk":_sbrk,"___cxa_begin_catch":___cxa_begin_catch,"_emscripten_memcpy_big":_emscripten_memcpy_big,"_fileno":_fileno,"___resumeException":___resumeException,"__ZSt18uncaught_exceptionv":__ZSt18uncaught_exceptionv,"_sysconf":_sysconf,"_pthread_getspecific":_pthread_getspecific,"_atexit":_atexit,"_pthread_once":_pthread_once,"_puts":_puts,"_printf":_printf,"_pthread_key_create":_pthread_key_create,"_write":_write,"___errno_location":___errno_location,"_pthread_setspecific":_pthread_setspecific,"___cxa_atexit":___cxa_atexit,"_copysign":_copysign,"_fputc":_fputc,"___cxa_throw":___cxa_throw,"__exit":__exit,"_copysignl":_copysignl,"_abort":_abort,"_fwrite":_fwrite,"_time":_time,"_fprintf":_fprintf,"__formatString":__formatString,"_fputs":_fputs,"_exit":_exit,"___cxa_pure_virtual":___cxa_pure_virtual,"_fmodl":_fmodl,"STACKTOP":STACKTOP,"STACK_MAX":STACK_MAX,"tempDoublePtr":tempDoublePtr,"ABORT":ABORT,"cttz_i8":cttz_i8,"ctlz_i8":ctlz_i8,"NaN":NaN,"Infinity":Infinity,"___dso_handle":___dso_handle,"_stderr":_stderr};// EMSCRIPTEN_START_ASM
-var asm=(function(global,env,buffer) {
-"use asm";var a=new global.Int8Array(buffer);var b=new global.Int16Array(buffer);var c=new global.Int32Array(buffer);var d=new global.Uint8Array(buffer);var e=new global.Uint16Array(buffer);var f=new global.Uint32Array(buffer);var g=new global.Float32Array(buffer);var h=new global.Float64Array(buffer);var i=env.STACKTOP|0;var j=env.STACK_MAX|0;var k=env.tempDoublePtr|0;var l=env.ABORT|0;var m=env.cttz_i8|0;var n=env.ctlz_i8|0;var o=env.___dso_handle|0;var p=env._stderr|0;var q=0;var r=0;var s=0;var t=0;var u=+env.NaN,v=+env.Infinity;var w=0,x=0,y=0,z=0,A=0.0,B=0,C=0,D=0,E=0.0;var F=0;var G=0;var H=0;var I=0;var J=0;var K=0;var L=0;var M=0;var N=0;var O=0;var P=global.Math.floor;var Q=global.Math.abs;var R=global.Math.sqrt;var S=global.Math.pow;var T=global.Math.cos;var U=global.Math.sin;var V=global.Math.tan;var W=global.Math.acos;var X=global.Math.asin;var Y=global.Math.atan;var Z=global.Math.atan2;var _=global.Math.exp;var $=global.Math.log;var aa=global.Math.ceil;var ba=global.Math.imul;var ca=env.abort;var da=env.assert;var ea=env.min;var fa=env.invoke_iiii;var ga=env.invoke_viiiii;var ha=env.invoke_vi;var ia=env.invoke_vii;var ja=env.invoke_ii;var ka=env.invoke_v;var la=env.invoke_viiiiii;var ma=env.invoke_iii;var na=env.invoke_viiii;var oa=env._fabs;var pa=env._llvm_pow_f64;var qa=env._send;var ra=env._fmod;var sa=env.___cxa_guard_acquire;var ta=env.___setErrNo;var ua=env._vfprintf;var va=env.___cxa_allocate_exception;var wa=env.___cxa_find_matching_catch;var xa=env.___cxa_guard_release;var ya=env._pwrite;var za=env.__reallyNegative;var Aa=env._sbrk;var Ba=env.___cxa_begin_catch;var Ca=env._emscripten_memcpy_big;var Da=env._fileno;var Ea=env.___resumeException;var Fa=env.__ZSt18uncaught_exceptionv;var Ga=env._sysconf;var Ha=env._pthread_getspecific;var Ia=env._atexit;var Ja=env._pthread_once;var Ka=env._puts;var La=env._printf;var Ma=env._pthread_key_create;var Na=env._write;var Oa=env.___errno_location;var Pa=env._pthread_setspecific;var Qa=env.___cxa_atexit;var Ra=env._copysign;var Sa=env._fputc;var Ta=env.___cxa_throw;var Ua=env.__exit;var Va=env._copysignl;var Wa=env._abort;var Xa=env._fwrite;var Ya=env._time;var Za=env._fprintf;var _a=env.__formatString;var $a=env._fputs;var ab=env._exit;var bb=env.___cxa_pure_virtual;var cb=env._fmodl;var db=0.0;
+// (start of meteor/extern-preamble.js)
+// provide stubs or proxies for nodejs APIs referenced by emscripten.
+const proc = require('process');
+const perfHooks = require('perf_hooks');
+const nodever = proc.versions.node;
+const noderelease = { ...(proc.release) }
+// Put emscripten in "node mode" but don't give it the real `process`
+// object.  It does have access to `console`.
+// This is to avoid emscripten causing memory leaks.
+
+require = function (mod) {
+  // mock 'fs' module
+  if (mod === 'fs') {
+    return {
+      readFileSync: function (filename) {
+        ; // no-op
+      }
+    };
+  } else if (mod === 'perf_hooks') {
+    return perfHooks;
+  }
+};
+const process = {
+  argv: ['node', 'minisat'],
+  on: function () { },
+  stdout: {
+    write: function (str) {
+      console.log("MINISAT-out:", str.replace(/\n$/, ''));
+    }
+  },
+  stderr: {
+    write: function (str) {
+      console.log("MINISAT-err:", str.replace(/\n$/, ''));
+    }
+  },
+  versions: {
+    node: nodever
+  },
+  release: noderelease,
+  exit: proc.exit
+};
+var window = 0;
+// (end of meteor/extern-preamble.js)
+
+var Module = (() => {
+  var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
+  if (typeof __filename != 'undefined') _scriptName = _scriptName || __filename;
+  return (
+function(moduleArg = {}) {
+  var moduleRtn;
+
+function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==typeof i?i:i+""}function _toPrimitive(t,r){if("object"!=typeof t||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=typeof i)return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}var c=moduleArg,aa,f,ba=new Promise((a,b)=>{aa=a;f=b});"_addClause _createTheSolver _ensureVar _free _getConflictClause _getConflictClauseSize _getNumVars _getSolution _malloc _retireVar _solve _solveAssuming _unyo _yo allocate ccall cwrap UTF8ToString stringToUTF8 UTF16ToString stringToUTF16 UTF32ToString stringToUTF32 AsciiToString intArrayFromString intArrayToString writeArrayToMemory stackTrace stackSave stackAlloc stackRestore getValue setValue _memory ___indirect_function_table ___em_lib_deps_deps onRuntimeInitialized".split(" ").forEach(a=>{Object.getOwnPropertyDescriptor(ba,a)||Object.defineProperty(ba,a,{get:()=>l("You are getting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js"),set:()=>l("You are setting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js")})});var ca=Object.assign({},c),da=(a,b)=>{throw b},m;if("undefined"==typeof process||!process.release||"node"!==process.release.name)throw Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)");var ea=process.versions.node,n=ea.split(".").slice(0,3);n=1e4*n[0]+100*n[1]+1*n[2].split("-")[0];if(14e4>n)throw Error("This emscripten-generated code requires node v14.0.0 (detected v"+ea+")");var fs=require("fs");require("path");m=a=>{a=fa(a)?new URL(a):a;a=fs.readFileSync(a);p(Buffer.isBuffer(a));return a};process.argv.slice(2);da=(a,b)=>{process.exitCode=a;throw b};var t=c.print||console.log.bind(console),u=c.printErr||console.error.bind(console);Object.assign(c,ca);ca=null;Object.getOwnPropertyDescriptor(c,"fetchSettings")&&l("`Module.fetchSettings` was supplied but `fetchSettings` not included in INCOMING_MODULE_JS_API");v("arguments","arguments_");v("thisProgram","thisProgram");p("undefined"==typeof c.memoryInitializerPrefixURL,"Module.memoryInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.pthreadMainPrefixURL,"Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.cdInitializerPrefixURL,"Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.filePackagePrefixURL,"Module.filePackagePrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.read,"Module.read option was removed");p("undefined"==typeof c.readAsync,"Module.readAsync option was removed (modify readAsync in JS)");p("undefined"==typeof c.readBinary,"Module.readBinary option was removed (modify readBinary in JS)");p("undefined"==typeof c.setWindowTitle,"Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)");p("undefined"==typeof c.TOTAL_MEMORY,"Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY");v("asm","wasmExports");v("readAsync","readAsync");v("readBinary","readBinary");v("setWindowTitle","setWindowTitle");p(!0,"web environment detected but not enabled at build time.  Add `web` to `-sENVIRONMENT` to enable.");p(!0,"worker environment detected but not enabled at build time.  Add `worker` to `-sENVIRONMENT` to enable.");p(!0,"shell environment detected but not enabled at build time.  Add `shell` to `-sENVIRONMENT` to enable.");var w=c.wasmBinary;v("wasmBinary","wasmBinary");function ha(){}function ia(a){this.exports=(
+// EMSCRIPTEN_START_ASM
+function instantiate(ya){function c(d){d.set=function(a,b){this[a]=b};d.get=function(a){return this[a]};return d}var e;var f=new Uint8Array(123);for(var a=25;a>=0;--a){f[48+a]=52+a;f[65+a]=a;f[97+a]=26+a}f[43]=62;f[47]=63;function l(m,n,o){var g,h,a=0,i=n,j=o.length,k=n+(j*3>>2)-(o[j-2]=="=")-(o[j-1]=="=");for(;a<j;a+=4){g=f[o.charCodeAt(a+1)];h=f[o.charCodeAt(a+2)];m[i++]=f[o.charCodeAt(a)]<<2|g>>4;if(i<k)m[i++]=g<<4|h>>2;if(i<k)m[i++]=h<<6|f[o.charCodeAt(a+3)]}}function p(q){l(e,1024,"KDUAAAgEAABON01pbmlzYXQyME91dE9mTWVtb3J5RXhjZXB0aW9uRQB8IENvbmZsaWN0cyB8ICAgICAgICAgIE9SSUdJTkFMICAgICAgICAgfCAgICAgICAgICBMRUFSTlQgICAgICAgICAgfCBQcm9ncmVzcyB8AHwgICAgICAgICAgIHwgICAgVmFycyAgQ2xhdXNlcyBMaXRlcmFscyB8ICAgIExpbWl0ICBDbGF1c2VzIExpdC9DbCB8ICAgICAgICAgIHwAfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfABSYW5kb21pemUgdGhlIGluaXRpYWwgYWN0aXZpdHkAaW5maW5pdHkAbHVieQB2YXItZGVjYXkAY2xhLWRlY2F5AGltYXgALSsgICAwWDB4AC0wWCswWCAwWC0weCsweCAweABncm93AHJmaXJzdABybmQtaW5pdABWYXJpYWJsZXMgYXJlIG5vdCBlbGltaW5hdGVkIGlmIGl0IHByb2R1Y2VzIGEgcmVzb2x2ZW50IHdpdGggYSBsZW5ndGggYWJvdmUgdGhpcyBsaW1pdC4gLTEgbWVhbnMgbm8gbGltaXQATWluaW11bSBsZWFybnQgY2xhdXNlIGxpbWl0AHN0cmljdAAvcHJvYy8lZC9zdGF0dXMAbWluLWxlYXJudHMAUEFSU0UgRVJST1IhIERJTUFDUyBoZWFkZXIgbWlzbWF0Y2g6IHdyb25nIG51bWJlciBvZiBjbGF1c2VzAGRpbWFjcwAgIC0lcywgLW5vLSVzAHdyAFRoZSBjbGF1c2UgYWN0aXZpdHkgZGVjYXkgZmFjdG9yAFRoZSB2YXJpYWJsZSBhY3Rpdml0eSBkZWNheSBmYWN0b3IAUmVzdGFydCBpbnRlcnZhbCBpbmNyZWFzZSBmYWN0b3IAcm5kLWZyZXEALi4vLi4vLi4vc3lzdGVtL2xpYi9saWJjeHhhYmkvc3JjL3ByaXZhdGVfdHlwZWluZm8uY3BwAFVzZWQgYnkgdGhlIHJhbmRvbSB2YXJpYWJsZSBzZWxlY3Rpb24AU29sdmVkIGJ5IHNpbXBsaWZpY2F0aW9uAGltaW4AbmFuAC9wcm9jLyVkL3N0YXRtAGFzeW1tAGVsaW0AY3B1LWxpbQBtZW0tbGltAGNsLWxpbQBzdWItbGltAFRoZSBiYXNlIHJlc3RhcnQgaW50ZXJ2YWwAcmNoZWNrAGNhbl9jYXRjaABwaGFzZS1zYXZpbmcAaW5mAG9mZgBzb2x2ZQBwcmUAVGhlIGZyZXF1ZW5jeSB3aXRoIHdoaWNoIHRoZSBkZWNpc2lvbiBoZXVyaXN0aWMgdHJpZXMgdG8gY2hvb3NlIGEgcmFuZG9tIHZhcmlhYmxlAGNjbWluLW1vZGUAVXNlIHRoZSBMdWJ5IHJlc3RhcnQgc2VxdWVuY2UAVGhlIGZyYWN0aW9uIG9mIHdhc3RlZCBtZW1vcnkgYWxsb3dlZCBiZWZvcmUgYSBnYXJiYWdlIGNvbGxlY3Rpb24gaXMgdHJpZ2dlcmVkAHJuZC1zZWVkACU0ZAAlcyVzJWQAcmluYwBzaW1wLWdjLWZyYWMAd2IAdmVyYgByd2EAICAtJS0xMnMgPSAlLThzIFsAU0lNUABNQUlOAE5BTgBJTkYAQ09SRQBVTlNBVElTRklBQkxFAFZtUGVhazogJWQga0IAPHN0ZGluPgA8Ym9vbD4APHN0cmluZz4APGRvdWJsZT4APGludDMyPgA9PT09PT09PT09PT09PT09PT09PT09PT09PT09WyBQcm9ibGVtIFN0YXRpc3RpY3MgXT09PT09PT09PT09PT09PT09PT09PT09PT09PT09AD09PT09PT09PT09PT09PT09PT09PT09PT09PT1bIFNlYXJjaCBTdGF0aXN0aWNzIF09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0APT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQBXQVJOSU5HISBDb3VsZCBub3Qgc2V0IHJlc291cmNlIGxpbWl0OiBWaXJ0dWFsIG1lbW9yeS4ARG8gbm90IGNoZWNrIGlmIHN1YnN1bXB0aW9uIGFnYWluc3QgYSBjbGF1c2UgbGFyZ2VyIHRoYW4gdGhpcy4gLTEgbWVhbnMgbm8gbGltaXQuAEFsbG93IGEgdmFyaWFibGUgZWxpbWluYXRpb24gc3RlcCB0byBncm93IGJ5IGEgbnVtYmVyIG9mIGNsYXVzZXMuAFJlYWRpbmcgZnJvbSBzdGFuZGFyZCBpbnB1dC4uLiBVc2UgJy0taGVscCcgZm9yIGhlbHAuAFBlcmZvcm0gdmFyaWFibGUgZWxpbWluYXRpb24uAFRoZSBmcmFjdGlvbiBvZiB3YXN0ZWQgbWVtb3J5IGFsbG93ZWQgYmVmb3JlIGEgZ2FyYmFnZSBjb2xsZWN0aW9uIGlzIHRyaWdnZXJlZCBkdXJpbmcgc2ltcGxpZmljYXRpb24uAENvbXBsZXRlbHkgdHVybiBvbi9vZmYgYW55IHByZXByb2Nlc3NpbmcuAENvbXBsZXRlbHkgdHVybiBvbi9vZmYgc29sdmluZyBhZnRlciBwcmVwcm9jZXNzaW5nLgBWYWxpZGF0ZSBESU1BQ1MgaGVhZGVyIGR1cmluZyBwYXJzaW5nLgBTaHJpbmsgY2xhdXNlcyBieSBhc3ltbWV0cmljIGJyYW5jaGluZy4AV0FSTklORyEgQ291bGQgbm90IHNldCByZXNvdXJjZSBsaW1pdDogQ1BVLXRpbWUuAElmIGdpdmVuLCBzdG9wIGFmdGVyIHByZXByb2Nlc3NpbmcgYW5kIHdyaXRlIHRoZSByZXN1bHQgdG8gdGhpcyBmaWxlLgBWZXJib3NpdHkgbGV2ZWwgKDA9c2lsZW50LCAxPXNvbWUsIDI9bW9yZSkuAEVSUk9SISBGYWlsZWQgdG8gcGFyc2UgbWVtb3J5IHN0YXRpc3RpY3MgZnJvbSAiL3Byb2MiLgAtACoqKiBJTlRFUlJVUFRFRCAqKioAQ2hlY2sgaWYgYSBjbGF1c2UgaXMgYWxyZWFkeSBpbXBsaWVkLiAoY29zdGx5KQBDb250cm9scyBjb25mbGljdCBjbGF1c2UgbWluaW1pemF0aW9uICgwPW5vbmUsIDE9YmFzaWMsIDI9ZGVlcCkAKG51bGwpAENvbnRyb2xzIHRoZSBsZXZlbCBvZiBwaGFzZSBzYXZpbmcgKDA9bm9uZSwgMT1saW1pdGVkLCAyPWZ1bGwpAGFkanVzdGVkUHRyICYmICJjYXRjaGluZyBhIGNsYXNzIHdpdGhvdXQgYW4gb2JqZWN0PyIAUHVyZSB2aXJ0dWFsIGZ1bmN0aW9uIGNhbGxlZCEAWU8hACVzJWQgAGxpYmMrK2FiaTogACAuLiAAZWxpbWluYXRpb24gbGVmdDogJTEwZA0Ac3Vic3VtcHRpb24gbGVmdDogJTEwZCAoJTEwZCBzdWJzdW1lZCwgJTEwZCBkZWxldGVkIGxpdGVyYWxzKQ0AfCAlOWQgfCAlN2QgJThkICU4ZCB8ICU4ZCAlOGQgJTYuMGYgfCAlNi4zZiAlJSB8CgB8ICBHYXJiYWdlIGNvbGxlY3Rpb246ICAgJTEyZCBieXRlcyA9PiAlMTJkIGJ5dGVzICAgICAgICAgICAgIHwKAHwgIEVsaW1pbmF0ZWQgY2xhdXNlczogICAgICUxMC4yZiBNYiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfAoAfCAgU2ltcGxpZmljYXRpb24gdGltZTogICUxMi4yZiBzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfAoAfCAgUGFyc2UgdGltZTogICAgICAgICAgICUxMi4yZiBzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfAoAfCAgTnVtYmVyIG9mIHZhcmlhYmxlczogICUxMmQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwKAHwgIE51bWJlciBvZiBjbGF1c2VzOiAgICAlMTJkICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8CgByZXN0YXJ0cyAgICAgICAgICAgICAgOiAlbGx1CgB3YXJuaW5nOiB1bnN1cHBvcnRlZCBzeXNjYWxsOiBfX3N5c2NhbGxfdWdldHJsaW1pdAoAICAtJS0xMHMgPSAlOHMKAGNvdWxkIG5vdCBvcGVuIGZpbGUgJXMKAEVSUk9SISBDb3VsZCBub3Qgb3BlbiBmaWxlOiAlcwoACiAgICAgICAgJXMKAENQVSB0aW1lICAgICAgICAgICAgICA6ICVnIHMKAHdhcm5pbmc6IHVuc3VwcG9ydGVkIHN5c2NhbGw6IF9fc3lzY2FsbF9nZXRydXNhZ2UKAHAgY25mICVkICVkCgBQQVJTRSBFUlJPUiEgVW5leHBlY3RlZCBjaGFyOiAlYwoASU5ERVQKAFVOU0FUCgBJTkRFVEVSTUlOQVRFCgBVTlNBVElTRklBQkxFCgBNZW1vcnkgdXNlZCAgICAgICAgICAgOiAlLjJmIE1CCgB3YXJuaW5nOiB1bnN1cHBvcnRlZCBzeXNjYWxsOiBfX3N5c2NhbGxfcHJsaW1pdDY0CgAlcyVkIDAKAHAgY25mIDEgMgoxIDAKLTEgMAoATGltaXQgb24gbWVtb3J5IHVzYWdlIGluIG1lZ2FieXRlcy4KAFdyb3RlIERJTUFDUyB3aXRoICVkIHZhcmlhYmxlcyBhbmQgJWQgY2xhdXNlcy4KAExpbWl0IG9uIENQVSB0aW1lIGFsbG93ZWQgaW4gc2Vjb25kcy4KAEVSUk9SISBVbmtub3duIGZsYWcgIiVzIi4gVXNlICctLSVzaGVscCcgZm9yIGhlbHAuCgAgIC0tJXNoZWxwICAgICAgICBQcmludCBoZWxwIG1lc3NhZ2UuCgAgIC0tJXNoZWxwLXZlcmIgICBQcmludCB2ZXJib3NlIGhlbHAgbWVzc2FnZS4KAFVTQUdFOiAlcyBbb3B0aW9uc10gPGlucHV0LWZpbGU+IDxyZXN1bHQtb3V0cHV0LWZpbGU+CgogIHdoZXJlIGlucHV0IG1heSBiZSBlaXRoZXIgaW4gcGxhaW4gb3IgZ3ppcHBlZCBESU1BQ1MuCgBFUlJPUiEgdmFsdWUgPCVzPiBpcyB0b28gc21hbGwgZm9yIG9wdGlvbiAiJXMiLgoARVJST1IhIHZhbHVlIDwlcz4gaXMgdG9vIGxhcmdlIGZvciBvcHRpb24gIiVzIi4KAChkZWZhdWx0OiAlcykKACAgLSUtMTJzID0gJS04cyAlYyU0LjJnIC4uICU0LjJnJWMgKGRlZmF1bHQ6ICVnKQoAY29uZmxpY3QgbGl0ZXJhbHMgICAgIDogJS0xMmxsdSAgICglNC4yZiAlJSBkZWxldGVkKQoAXSAoZGVmYXVsdDogJWQpCgBkZWNpc2lvbnMgICAgICAgICAgICAgOiAlLTEybGx1ICAgKCU0LjJmICUlIHJhbmRvbSkgKCUuMGYgL3NlYykKAHByb3BhZ2F0aW9ucyAgICAgICAgICA6ICUtMTJsbHUgICAoJS4wZiAvc2VjKQoAY29uZmxpY3RzICAgICAgICAgICAgIDogJS0xMmxsdSAgICglLjBmIC9zZWMpCgAKJXMgT1BUSU9OUzoKCgAKSEVMUCBPUFRJT05TOgoKAAAAAAAA2BUAAAQAAAAFAAAABgAAAAcAAABQNQAA5BUAAPwVAABON01pbmlzYXQ5SW50T3B0aW9uRQAAAAAoNQAABBYAAE43TWluaXNhdDZPcHRpb25FAAAAAAAAAPwVAAAEAAAACAAAAAkAAAAJAAAAAAAAAEgWAAAEAAAACgAAAAsAAAAMAAAAUDUAAFQWAAD8FQAATjdNaW5pc2F0MTBCb29sT3B0aW9uRQAAAAAAAIQWAAAEAAAADQAAAA4AAAAPAAAAUDUAAJAWAAD8FQAATjdNaW5pc2F0MTJTdHJpbmdPcHRpb25FAAAAAAAAAADAFgAAEAAAABEAAAASAAAAKDUAAMgWAABON01pbmlzYXQ2U29sdmVyRQAAAAAAAAD0FgAABAAAABMAAAAUAAAAFQAAAFA1AAAAFwAA/BUAAE43TWluaXNhdDEyRG91YmxlT3B0aW9uRQAAAAAAAAAAMBcAABYAAAAXAAAAGAAAAFA1AAA8FwAAwBYAAE43TWluaXNhdDEwU2ltcFNvbHZlckUAAAAAAAD+gitlRxVnQAAAAAAAADhDAAD6/kIudr86O568mvcMvb39/////98/PFRVVVVVxT+RKxfPVVWlPxfQpGcREYE/AAAAAAAAyELvOfr+Qi7mPyTEgv+9v84/tfQM1whrrD/MUEbSq7KDP4Q6Tpvg11U/");l(e,6102,"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");l(e,8225,"yLnygizWv4BWNygktPo8AAAAAACA9j8=");l(e,8257,"CFi/vdHVvyD34NgIpRy9AAAAAABg9j8=");l(e,8289,"WEUXd3bVv21QttWkYiO9AAAAAABA9j8=");l(e,8321,"+C2HrRrVv9VnsJ7khOa8AAAAAAAg9j8=");l(e,8353,"eHeVX77Uv+A+KZNpGwS9AAAAAAAA9j8=");l(e,8385,"YBzCi2HUv8yETEgv2BM9AAAAAADg9T8=");l(e,8417,"qIaGMATUvzoLgu3zQtw8AAAAAADA9T8=");l(e,8449,"SGlVTKbTv2CUUYbGsSA9AAAAAACg9T8=");l(e,8481,"gJia3UfTv5KAxdRNWSU9AAAAAACA9T8=");l(e,8513,"IOG64ujSv9grt5keeyY9AAAAAABg9T8=");l(e,8545,"iN4TWonSvz+wz7YUyhU9AAAAAABg9T8=");l(e,8577,"iN4TWonSvz+wz7YUyhU9AAAAAABA9T8=");l(e,8609,"eM/7QSnSv3baUygkWha9AAAAAAAg9T8=");l(e,8641,"mGnBmMjRvwRU52i8rx+9AAAAAAAA9T8=");l(e,8673,"qKurXGfRv/CogjPGHx89AAAAAADg9D8=");l(e,8705,"SK75iwXRv2ZaBf3EqCa9AAAAAADA9D8=");l(e,8737,"kHPiJKPQvw4D9H7uawy9AAAAAACg9D8=");l(e,8769,"0LSUJUDQv38t9J64NvC8AAAAAACg9D8=");l(e,8801,"0LSUJUDQv38t9J64NvC8AAAAAACA9D8=");l(e,8833,"QF5tGLnPv4c8masqVw09AAAAAABg9D8=");l(e,8865,"YNzLrfDOvySvhpy3Jis9AAAAAABA9D8=");l(e,8897,"8CpuByfOvxD/P1RPLxe9AAAAAAAg9D8=");l(e,8929,"wE9rIVzNvxtoyruRuiE9AAAAAAAA9D8=");l(e,8961,"oJrH94/MvzSEn2hPeSc9AAAAAAAA9D8=");l(e,8993,"oJrH94/MvzSEn2hPeSc9AAAAAADg8z8=");l(e,9025,"kC10hsLLv4+3izGwThk9AAAAAADA8z8=");l(e,9057,"wIBOyfPKv2aQzT9jTro8AAAAAACg8z8=");l(e,9089,"sOIfvCPKv+rBRtxkjCW9AAAAAACg8z8=");l(e,9121,"sOIfvCPKv+rBRtxkjCW9AAAAAACA8z8=");l(e,9153,"UPScWlLJv+PUwQTZ0Sq9AAAAAABg8z8=");l(e,9185,"0CBloH/Ivwn623+/vSs9AAAAAABA8z8=");l(e,9217,"4BACiavHv1hKU3KQ2ys9AAAAAABA8z8=");l(e,9249,"4BACiavHv1hKU3KQ2ys9AAAAAAAg8z8=");l(e,9281,"0BnnD9bGv2bisqNq5BC9AAAAAAAA8z8=");l(e,9313,"kKdwMP/FvzlQEJ9Dnh69AAAAAAAA8z8=");l(e,9345,"kKdwMP/FvzlQEJ9Dnh69AAAAAADg8j8=");l(e,9377,"sKHj5SbFv49bB5CL3iC9AAAAAADA8j8=");l(e,9409,"gMtsK03Evzx4NWHBDBc9AAAAAADA8j8=");l(e,9441,"gMtsK03Evzx4NWHBDBc9AAAAAACg8j8=");l(e,9473,"kB4g/HHDvzpUJ02GePE8AAAAAACA8j8=");l(e,9505,"8B/4UpXCvwjEcRcwjSS9AAAAAABg8j8=");l(e,9537,"YC/VKrfBv5ajERikgC69AAAAAABg8j8=");l(e,9569,"YC/VKrfBv5ajERikgC69AAAAAABA8j8=");l(e,9601,"kNB8ftfAv/Rb6IiWaQo9AAAAAABA8j8=");l(e,9633,"kNB8ftfAv/Rb6IiWaQo9AAAAAAAg8j8=");l(e,9665,"4Nsxkey/v/Izo1xUdSW9AAAAAAAA8j8=");l(e,9698,"K24HJ76/PADwKiw0Kj0AAAAAAADyPw==");l(e,9730,"K24HJ76/PADwKiw0Kj0AAAAAAODxPw==");l(e,9761,"wFuPVF68vwa+X1hXDB29AAAAAADA8T8=");l(e,9793,"4Eo6bZK6v8iqW+g1OSU9AAAAAADA8T8=");l(e,9825,"4Eo6bZK6v8iqW+g1OSU9AAAAAACg8T8=");l(e,9857,"oDHWRcO4v2hWL00pfBM9AAAAAACg8T8=");l(e,9889,"oDHWRcO4v2hWL00pfBM9AAAAAACA8T8=");l(e,9921,"YOWK0vC2v9pzM8k3lya9AAAAAABg8T8=");l(e,9953,"IAY/Bxu1v1dexmFbAh89AAAAAABg8T8=");l(e,9985,"IAY/Bxu1v1dexmFbAh89AAAAAABA8T8=");l(e,10017,"4BuW10Gzv98T+czaXiw9AAAAAABA8T8=");l(e,10049,"4BuW10Gzv98T+czaXiw9AAAAAAAg8T8=");l(e,10081,"gKPuNmWxvwmjj3ZefBQ9AAAAAAAA8T8=");l(e,10113,"gBHAMAqvv5GONoOeWS09AAAAAAAA8T8=");l(e,10145,"gBHAMAqvv5GONoOeWS09AAAAAADg8D8=");l(e,10177,"gBlx3UKrv0xw1uV6ghw9AAAAAADg8D8=");l(e,10209,"gBlx3UKrv0xw1uV6ghw9AAAAAADA8D8=");l(e,10241,"wDL2WHSnv+6h8jRG/Cy9AAAAAADA8D8=");l(e,10273,"wDL2WHSnv+6h8jRG/Cy9AAAAAACg8D8=");l(e,10305,"wP65h56jv6r+JvW3AvU8AAAAAACg8D8=");l(e,10337,"wP65h56jv6r+JvW3AvU8AAAAAACA8D8=");l(e,10370,"eA6bgp+/5Al+fCaAKb0AAAAAAIDwPw==");l(e,10402,"eA6bgp+/5Al+fCaAKb0AAAAAAGDwPw==");l(e,10433,"gNUHG7mXvzmm+pNUjSi9AAAAAABA8D8=");l(e,10466,"/LCowI+/nKbT9nwe37wAAAAAAEDwPw==");l(e,10498,"/LCowI+/nKbT9nwe37wAAAAAACDwPw==");l(e,10530,"EGsq4H+/5EDaDT/iGb0AAAAAACDwPw==");l(e,10562,"EGsq4H+/5EDaDT/iGb0AAAAAAADwPw==");l(e,10614,"8D8=");l(e,10645,"wO8/");l(e,10658,"iXUVEIA/6CudmWvHEL0AAAAAAIDvPw==");l(e,10689,"gJNYViCQP9L34gZb3CO9AAAAAABA7z8=");l(e,10722,"ySglSZg/NAxaMrqgKr0AAAAAAADvPw==");l(e,10753,"QOeJXUGgP1PX8VzAEQE9AAAAAADA7j8=");l(e,10786,"LtSuZqQ/KP29dXMWLL0AAAAAAIDuPw==");l(e,10817,"wJ8UqpSoP30mWtCVeRm9AAAAAABA7j8=");l(e,10849,"wN3Nc8usPwco2EfyaBq9AAAAAAAg7j8=");l(e,10881,"wAbAMequP3s7yU8+EQ69AAAAAADg7T8=");l(e,10913,"YEbRO5exP5ueDVZdMiW9AAAAAACg7T8=");l(e,10945,"4NGn9b2zP9dO26VeyCw9AAAAAABg7T8=");l(e,10977,"oJdNWum1Px4dXTwGaSy9AAAAAABA7T8=");l(e,11009,"wOoK0wC3PzLtnamNHuw8AAAAAAAA7T8=");l(e,11041,"QFldXjO5P9pHvTpcESM9AAAAAADA7D8=");l(e,11073,"YK2NyGq7P+Vo9yuAkBO9AAAAAACg7D8=");l(e,11105,"QLwBWIi8P9OsWsbRRiY9AAAAAABg7D8=");l(e,11137,"IAqDOce+P+BF5q9owC29AAAAAABA7D8=");l(e,11169,"4Ns5kei/P/0KoU/WNCW9AAAAAAAA7D8=");l(e,11201,"4CeCjhfBP/IHLc547yE9AAAAAADg6z8=");l(e,11233,"8CN+K6rBPzSZOESOpyw9AAAAAACg6z8=");l(e,11265,"gIYMYdHCP6G0gctsnQM9AAAAAACA6z8=");l(e,11297,"kBWw/GXDP4lySyOoL8Y8AAAAAABA6z8=");l(e,11329,"sDODPZHEP3i2/VR5gyU9AAAAAAAg6z8=");l(e,11361,"sKHk5SfFP8d9aeXoMyY9AAAAAADg6j8=");l(e,11393,"EIy+TlfGP3guPCyLzxk9AAAAAADA6j8=");l(e,11425,"cHWLEvDGP+EhnOWNESW9AAAAAACg6j8=");l(e,11457,"UESFjYnHPwVDkXAQZhy9AAAAAABg6j8=");l(e,11490,"Oeuvvsg/0SzpqlQ9B70AAAAAAEDqPw==");l(e,11522,"99xaWsk/b/+gWCjyBz0AAAAAAADqPw==");l(e,11553,"4Io87ZPKP2khVlBDcii9AAAAAADg6T8=");l(e,11585,"0FtX2DHLP6rhrE6NNQy9AAAAAADA6T8=");l(e,11617,"4Ds4h9DLP7YSVFnESy29AAAAAACg6T8=");l(e,11649,"EPDG+2/MP9IrlsVy7PG8AAAAAABg6T8=");l(e,11681,"kNSwPbHNPzWwFfcq/yq9AAAAAABA6T8=");l(e,11713,"EOf/DlPOPzD0QWAnEsI8AAAAAAAg6T8=");l(e,11746,"3eSt9c4/EY67ZRUhyrwAAAAAAADpPw==");l(e,11777,"sLNsHJnPPzDfDMrsyxs9AAAAAADA6D8=");l(e,11809,"WE1gOHHQP5FO7RbbnPg8AAAAAACg6D8=");l(e,11841,"YGFnLcTQP+nqPBaLGCc9AAAAAACA6D8=");l(e,11873,"6CeCjhfRPxzwpWMOISy9AAAAAABg6D8=");l(e,11905,"+KzLXGvRP4EWpffNmis9AAAAAABA6D8=");l(e,11937,"aFpjmb/RP7e9R1Htpiw9AAAAAAAg6D8=");l(e,11969,"uA5tRRTSP+q6Rrrehwo9AAAAAADg5z8=");l(e,12001,"kNx88L7SP/QEUEr6nCo9AAAAAADA5z8=");l(e,12033,"YNPh8RTTP7g8IdN64ii9AAAAAACg5z8=");l(e,12065,"EL52Z2vTP8h38bDNbhE9AAAAAACA5z8=");l(e,12097,"MDN3UsLTP1y9BrZUOxg9AAAAAABg5z8=");l(e,12129,"6NUjtBnUP53gkOw25Ag9AAAAAABA5z8=");l(e,12161,"yHHCjXHUP3XWZwnOJy+9AAAAAAAg5z8=");l(e,12193,"MBee4MnUP6TYChuJIC69AAAAAAAA5z8=");l(e,12225,"oDgHriLVP1nHZIFwvi49AAAAAADg5j8=");l(e,12257,"0MhT93vVP+9AXe7trR89AAAAAADA5j8=");l(e,12289,"YFnfvdXVP9xlpAgqCwq9yDU=");l(e,12320,"0XSeAFedvSqAcFIP//8+JwoAAABkAAAA6AMAABAnAACghgEAQEIPAICWmAAA4fUFGAAAADUAAABxAAAAa////877//+Sv///AAAAAAAAAAAZAAsAGRkZAAAAAAUAAAAAAAAJAAAAAAsAAAAAAAAAABkACgoZGRkDCgcAAQAJCxgAAAkGCwAACwAGGQAAABkZGQ==");l(e,12481,"DgAAAAAAAAAAGQALDRkZGQANAAACAAkOAAAACQAOAAAO");l(e,12539,"DA==");l(e,12551,"EwAAAAATAAAAAAkMAAAAAAAMAAAM");l(e,12597,"EA==");l(e,12609,"DwAAAAQPAAAAAAkQAAAAAAAQAAAQ");l(e,12655,"Eg==");l(e,12667,"EQAAAAARAAAAAAkSAAAAAAASAAASAAAaAAAAGhoa");l(e,12722,"GgAAABoaGgAAAAAAAAk=");l(e,12771,"FA==");l(e,12783,"FwAAAAAXAAAAAAkUAAAAAAAUAAAU");l(e,12829,"Fg==");l(e,12841,"FQAAAAAVAAAAAAkWAAAAAAAWAAAWAAAwMTIzNDU2Nzg5QUJDREVG/////////////////////////////////////////////////////////////////wABAgMEBQYHCAn/////////CgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiP///////8KCwwNDg8QERITFBUWFxgZGhscHR4fICEiI/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AAQIEBwMGBQAAAAAAAAACAADAAwAAwAQAAMAFAADABgAAwAcAAMAIAADACQAAwAoAAMALAADADAAAwA0AAMAOAADADwAAwBAAAMARAADAEgAAwBMAAMAUAADAFQAAwBYAAMAXAADAGAAAwBkAAMAaAADAGwAAwBwAAMAdAADAHgAAwB8AAMAAAACzAQAAwwIAAMMDAADDBAAAwwUAAMMGAADDBwAAwwgAAMMJAADDCgAAwwsAAMMMAADDDQAA0w4AAMMPAADDAAAMuwEADMMCAAzDAwAMwwQADNs=");l(e,13396,"Iw==");l(e,13436,"//////////8=");l(e,13504,"UDUAAMw0AACkNQAATjEwX19jeHhhYml2MTE2X19zaGltX3R5cGVfaW5mb0UAAAAAUDUAAPw0AADANAAATjEwX19jeHhhYml2MTE3X19jbGFzc190eXBlX2luZm9FAAAAAAAAAPA0AAAkAAAAJQAAACYAAAAnAAAAKAAAACkAAAAqAAAAKwAAAAAAAABwNQAAJAAAACwAAAAmAAAAJwAAACgAAAAtAAAALgAAAC8AAABQNQAAfDUAAPA0AABOMTBfX2N4eGFiaXYxMjBfX3NpX2NsYXNzX3R5cGVfaW5mb0UAAAAAKDUAAKw1AABTdDl0eXBlX2luZm8=");l(e,13760,"vhUAAAAAAAAF");l(e,13780,"HQ==");l(e,13804,"GwAAABoAAACEXg==");l(e,13828,"Ag==");l(e,13844,"//////////8=");l(e,13912,"yDUAAAAAAAAF");l(e,13932,"Hw==");l(e,13956,"GwAAACAAAACYXgAAAAQ=");l(e,13980,"AQ==");l(e,13996,"/////wo=");l(e,14064,"YDYAAMBmAQ==")}var r=new ArrayBuffer(16);var s=new Int32Array(r);var t=new Float32Array(r);var u=new Float64Array(r);function v(w){return s[w]}function x(w,y){s[w]=y}function z(){return u[0]}function A(y){u[0]=y}function B(){throw new Error("abort")}function C(y){t[2]=y}function xa(q){var D=new ArrayBuffer(16908288);var E=new Int8Array(D);var F=new Int16Array(D);var G=new Int32Array(D);var H=new Uint8Array(D);var I=new Uint16Array(D);var J=new Uint32Array(D);var K=new Float32Array(D);var L=new Float64Array(D);var M=Math.imul;var N=Math.fround;var O=Math.abs;var P=Math.clz32;var Q=Math.min;var R=Math.max;var S=Math.floor;var T=Math.ceil;var U=Math.trunc;var V=Math.sqrt;var W=q.env;var X=W.exit;var Y=W.__cxa_throw;var Z=q.wasi_snapshot_preview1;var _=Z.proc_exit;var $=W.__syscall_openat;var aa=W.__syscall_fcntl64;var ba=W.__syscall_ioctl;var ca=Z.fd_write;var da=Z.fd_read;var ea=Z.fd_close;var fa=W._emscripten_memcpy_js;var ga=W.emscripten_err;var ha=W.emscripten_resize_heap;var ia=W._abort_js;var ja=W.__assert_fail;var ka=Z.fd_seek;var la=91840;var ma=0;var na=0;var oa=0;
 // EMSCRIPTEN_START_FUNCS
-function nb(a){a=a|0;var b=0;b=i;i=i+a|0;i=i+15&-16;return b|0}function ob(){return i|0}function pb(a){a=a|0;i=a}function qb(a,b){a=a|0;b=b|0;if(!q){q=a;r=b}}function rb(b){b=b|0;a[k>>0]=a[b>>0];a[k+1>>0]=a[b+1>>0];a[k+2>>0]=a[b+2>>0];a[k+3>>0]=a[b+3>>0]}function sb(b){b=b|0;a[k>>0]=a[b>>0];a[k+1>>0]=a[b+1>>0];a[k+2>>0]=a[b+2>>0];a[k+3>>0]=a[b+3>>0];a[k+4>>0]=a[b+4>>0];a[k+5>>0]=a[b+5>>0];a[k+6>>0]=a[b+6>>0];a[k+7>>0]=a[b+7>>0]}function tb(a){a=a|0;F=a}function ub(){return F|0}function vb(a){a=a|0;Ba(a|0)|0;ud()}function wb(a){a=a|0;return}function xb(b,d,e,f,g){b=b|0;d=d|0;e=e|0;f=f|0;g=g|0;var h=0;h=i;c[b>>2]=112;c[b+4>>2]=d;c[b+8>>2]=e;c[b+12>>2]=f;c[b+16>>2]=g;if((a[144]|0)==0?(sa(144)|0)!=0:0){c[32]=0;c[33]=0;c[34]=0;Qa(19,128,o|0)|0;xa(144)}g=c[33]|0;if((g|0)==(c[34]|0)){f=(g>>1)+2&-2;f=(f|0)<2?2:f;if((f|0)>(2147483647-g|0)){d=va(1)|0;Ta(d|0,48,0)}e=c[32]|0;d=f+g|0;c[34]=d;d=Ud(e,d<<2)|0;c[32]=d;if((d|0)==0?(c[(Oa()|0)>>2]|0)==12:0){d=va(1)|0;Ta(d|0,48,0)}g=c[33]|0}c[33]=g+1;g=(c[32]|0)+(g<<2)|0;if(!g){i=h;return}c[g>>2]=b;i=h;return}function yb(a){a=a|0;var b=0;b=i;pd(a);i=b;return}function zb(a){a=a|0;var b=0,d=0;b=i;d=c[a>>2]|0;if(!d){i=b;return}c[a+4>>2]=0;Td(d);c[a>>2]=0;c[a+8>>2]=0;i=b;return}function Ab(a){a=a|0;var b=0;b=i;pd(a);i=b;return}function Bb(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0;e=i;if((a[d>>0]|0)!=45){k=0;i=e;return k|0}f=d+1|0;g=110;j=f;k=0;while(1){h=k+1|0;if((a[j>>0]|0)!=g<<24>>24){g=1;break}j=d+(k+2)|0;if((h|0)==3){g=0;f=j;break}else{g=a[264+h>>0]|0;k=h}}if(ee(f,c[b+4>>2]|0)|0){k=0;i=e;return k|0}a[b+20>>0]=g;k=1;i=e;return k|0}function Cb(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0;h=i;i=i+16|0;e=h;f=c[p>>2]|0;g=b+4|0;j=c[g>>2]|0;c[e>>2]=j;c[e+4>>2]=j;Za(f|0,216,e|0)|0;j=0;while(1){k=j>>>0<(32-((me(c[g>>2]|0)|0)<<1)|0)>>>0;Sa(32,f|0)|0;if(k)j=j+1|0;else break}c[e>>2]=(a[b+20>>0]|0)!=0?248:256;Za(f|0,232,e|0)|0;if(!d){i=h;return}c[e>>2]=c[b+8>>2];Za(f|0,88,e|0)|0;Sa(10,f|0)|0;i=h;return}function Db(a){a=a|0;var b=0;b=i;pd(a);i=b;return}function Eb(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0;e=i;i=i+16|0;h=e;g=e+8|0;if((a[d>>0]|0)!=45){n=0;i=e;return n|0}l=d+1|0;f=b+4|0;j=c[f>>2]|0;k=a[j>>0]|0;a:do if(k<<24>>24){m=0;while(1){n=m;m=m+1|0;if((a[l>>0]|0)!=k<<24>>24){b=0;break}k=a[j+m>>0]|0;l=d+(n+2)|0;if(!(k<<24>>24))break a}i=e;return b|0}while(0);if((a[l>>0]|0)!=61){n=0;i=e;return n|0}d=l+1|0;j=de(d,g,10)|0;if(!(c[g>>2]|0)){n=0;i=e;return n|0}if((j|0)>(c[b+24>>2]|0)){n=c[p>>2]|0;m=c[f>>2]|0;c[h>>2]=d;c[h+4>>2]=m;Za(n|0,416,h|0)|0;ab(1)}if((j|0)<(c[b+20>>2]|0)){n=c[p>>2]|0;m=c[f>>2]|0;c[h>>2]=d;c[h+4>>2]=m;Za(n|0,472,h|0)|0;ab(1)}c[b+28>>2]=j;n=1;i=e;return n|0}function Fb(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0;d=i;i=i+16|0;e=d;f=c[p>>2]|0;g=c[a+16>>2]|0;c[e>>2]=c[a+4>>2];c[e+4>>2]=g;Za(f|0,336,e|0)|0;g=c[a+20>>2]|0;if((g|0)==-2147483648)Xa(360,4,1,f|0)|0;else{c[e>>2]=g;Za(f|0,368,e|0)|0}Xa(376,4,1,f|0)|0;g=c[a+24>>2]|0;if((g|0)==2147483647)Xa(384,4,1,f|0)|0;else{c[e>>2]=g;Za(f|0,368,e|0)|0}c[e>>2]=c[a+28>>2];Za(f|0,392,e|0)|0;if(!b){i=d;return}c[e>>2]=c[a+8>>2];Za(f|0,88,e|0)|0;Sa(10,f|0)|0;i=d;return}function Gb(b){b=b|0;var d=0,e=0,f=0,g=0,j=0;g=i;c[b>>2]=1816;f=b+4|0;e=b+32|0;j=b+48|0;c[f+0>>2]=0;c[f+4>>2]=0;c[f+8>>2]=0;c[f+12>>2]=0;c[f+16>>2]=0;c[f+20>>2]=0;c[e+0>>2]=0;c[e+4>>2]=0;c[e+8>>2]=0;c[e+12>>2]=0;h[j>>3]=+h[75];h[b+56>>3]=+h[89];h[b+64>>3]=+h[103];h[b+72>>3]=+h[123];a[b+80>>0]=a[1364]|0;c[b+84>>2]=c[269];c[b+88>>2]=c[297];a[b+92>>0]=0;a[b+93>>0]=a[1292]|0;h[b+96>>3]=+h[204];c[b+104>>2]=c[439];c[b+108>>2]=c[359];h[b+112>>3]=+h[191];h[b+120>>3]=.3333333333333333;h[b+128>>3]=1.1;c[b+136>>2]=100;h[b+144>>3]=1.5;j=b+316|0;c[b+332>>2]=0;c[b+336>>2]=0;c[b+340>>2]=0;c[b+348>>2]=0;c[b+352>>2]=0;c[b+356>>2]=0;c[b+364>>2]=0;c[b+368>>2]=0;c[b+372>>2]=0;c[b+380>>2]=0;c[b+384>>2]=0;c[b+388>>2]=0;c[b+396>>2]=0;c[b+400>>2]=0;c[b+404>>2]=0;e=b+544|0;c[b+412>>2]=0;c[b+416>>2]=0;c[b+420>>2]=0;c[b+428>>2]=0;c[b+432>>2]=0;c[b+436>>2]=0;c[b+444>>2]=0;c[b+448>>2]=0;c[b+452>>2]=0;ke(b+152|0,0,176)|0;c[b+456>>2]=e;f=b+460|0;c[f+0>>2]=0;c[f+4>>2]=0;c[f+8>>2]=0;c[f+12>>2]=0;c[f+16>>2]=0;c[f+20>>2]=0;c[b+488>>2]=j;a[b+492>>0]=1;h[b+496>>3]=1.0;h[b+504>>3]=1.0;c[b+512>>2]=0;c[b+516>>2]=-1;j=b+520|0;f=b+536|0;c[j+0>>2]=0;c[j+4>>2]=0;c[j+8>>2]=0;c[j+12>>2]=0;a[f>>0]=1;f=b+540|0;c[f+0>>2]=0;c[f+4>>2]=0;c[f+8>>2]=0;c[f+12>>2]=0;c[f+16>>2]=0;gc(e,1048576);a[b+560>>0]=0;e=b+604|0;f=b+664|0;j=b+564|0;d=j+36|0;do{c[j>>2]=0;j=j+4|0}while((j|0)<(d|0));j=e+0|0;d=j+36|0;do{c[j>>2]=0;j=j+4|0}while((j|0)<(d|0));j=b+680|0;c[f+0>>2]=-1;c[f+4>>2]=-1;c[f+8>>2]=-1;c[f+12>>2]=-1;a[j>>0]=0;i=g;return}function Hb(a){a=a|0;var b=0;b=i;Ib(a);pd(a);i=b;return}function Ib(a){a=a|0;var b=0,d=0,e=0;b=i;c[a>>2]=1816;d=a+628|0;e=c[d>>2]|0;if(e){c[a+632>>2]=0;Td(e);c[d>>2]=0;c[a+636>>2]=0}d=a+616|0;e=c[d>>2]|0;if(e){c[a+620>>2]=0;Td(e);c[d>>2]=0;c[a+624>>2]=0}d=a+604|0;e=c[d>>2]|0;if(e){c[a+608>>2]=0;Td(e);c[d>>2]=0;c[a+612>>2]=0}d=a+588|0;e=c[d>>2]|0;if(e){c[a+592>>2]=0;Td(e);c[d>>2]=0;c[a+596>>2]=0}d=a+576|0;e=c[d>>2]|0;if(e){c[a+580>>2]=0;Td(e);c[d>>2]=0;c[a+584>>2]=0}d=a+564|0;e=c[d>>2]|0;if(e){c[a+568>>2]=0;Td(e);c[d>>2]=0;c[a+572>>2]=0}d=c[a+544>>2]|0;if(d)Td(d);d=a+472|0;e=c[d>>2]|0;if(e){c[a+476>>2]=0;Td(e);c[d>>2]=0;c[a+480>>2]=0}d=a+460|0;e=c[d>>2]|0;if(e){c[a+464>>2]=0;Td(e);c[d>>2]=0;c[a+468>>2]=0}hc(a+412|0);d=a+396|0;e=c[d>>2]|0;if(e){c[a+400>>2]=0;Td(e);c[d>>2]=0;c[a+404>>2]=0}d=a+380|0;e=c[d>>2]|0;if(e){c[a+384>>2]=0;Td(e);c[d>>2]=0;c[a+388>>2]=0}e=a+364|0;d=c[e>>2]|0;if(d){c[a+368>>2]=0;Td(d);c[e>>2]=0;c[a+372>>2]=0}d=a+348|0;e=c[d>>2]|0;if(e){c[a+352>>2]=0;Td(e);c[d>>2]=0;c[a+356>>2]=0}d=a+332|0;e=c[d>>2]|0;if(e){c[a+336>>2]=0;Td(e);c[d>>2]=0;c[a+340>>2]=0}d=a+316|0;e=c[d>>2]|0;if(e){c[a+320>>2]=0;Td(e);c[d>>2]=0;c[a+324>>2]=0}d=a+304|0;e=c[d>>2]|0;if(e){c[a+308>>2]=0;Td(e);c[d>>2]=0;c[a+312>>2]=0}d=a+292|0;e=c[d>>2]|0;if(e){c[a+296>>2]=0;Td(e);c[d>>2]=0;c[a+300>>2]=0}d=a+280|0;e=c[d>>2]|0;if(e){c[a+284>>2]=0;Td(e);c[d>>2]=0;c[a+288>>2]=0}d=a+268|0;e=c[d>>2]|0;if(e){c[a+272>>2]=0;Td(e);c[d>>2]=0;c[a+276>>2]=0}d=a+256|0;e=c[d>>2]|0;if(e){c[a+260>>2]=0;Td(e);c[d>>2]=0;c[a+264>>2]=0}d=a+32|0;e=c[d>>2]|0;if(e){c[a+36>>2]=0;Td(e);c[d>>2]=0;c[a+40>>2]=0}d=a+16|0;e=c[d>>2]|0;if(e){c[a+20>>2]=0;Td(e);c[d>>2]=0;c[a+24>>2]=0}e=a+4|0;d=c[e>>2]|0;if(!d){i=b;return}c[a+8>>2]=0;Td(d);c[e>>2]=0;c[a+12>>2]=0;i=b;return}function Jb(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,j=0,k=0,l=0.0,m=0,n=0,o=0,p=0,q=0,r=0;f=i;i=i+16|0;k=f+4|0;j=f;g=b+580|0;m=c[g>>2]|0;if((m|0)>0){o=m+ -1|0;p=c[(c[b+576>>2]|0)+(o<<2)>>2]|0;c[g>>2]=o;g=p}else{p=b+540|0;g=c[p>>2]|0;c[p>>2]=g+1}m=b+412|0;p=g<<1;c[k>>2]=p;ic(m,k);c[j>>2]=p|1;ic(m,j);k=b+332|0;m=a[544]|0;j=g+1|0;jc(k,j);a[(c[k>>2]|0)+g>>0]=m;k=b+396|0;m=b+400|0;if((c[m>>2]|0)<(j|0)){o=b+404|0;p=c[o>>2]|0;if((p|0)<(j|0)){q=g+2-p&-2;n=(p>>1)+2&-2;n=(q|0)>(n|0)?q:n;if((n|0)>(2147483647-p|0)){q=va(1)|0;Ta(q|0,48,0)}r=c[k>>2]|0;q=n+p|0;c[o>>2]=q;q=Ud(r,q<<3)|0;c[k>>2]=q;if((q|0)==0?(c[(Oa()|0)>>2]|0)==12:0){r=va(1)|0;Ta(r|0,48,0)}}o=c[m>>2]|0;if((o|0)<(j|0))do{n=(c[k>>2]|0)+(o<<3)|0;if(n){r=n;c[r>>2]=0;c[r+4>>2]=0}o=o+1|0}while((o|0)!=(j|0));c[m>>2]=j}m=(c[k>>2]|0)+(g<<3)|0;c[m>>2]=-1;c[m+4>>2]=0;m=b+316|0;if(!(a[b+93>>0]|0))l=0.0;else{r=b+72|0;l=+h[r>>3]*1389796.0;l=l- +(~~(l/2147483647.0)|0)*2147483647.0;h[r>>3]=l;l=l/2147483647.0*1.0e-5}k=b+320|0;if((c[k>>2]|0)<(j|0)){n=b+324|0;o=c[n>>2]|0;if((o|0)<(j|0)){r=g+2-o&-2;p=(o>>1)+2&-2;p=(r|0)>(p|0)?r:p;if((p|0)>(2147483647-o|0)){r=va(1)|0;Ta(r|0,48,0)}q=c[m>>2]|0;r=p+o|0;c[n>>2]=r;r=Ud(q,r<<3)|0;c[m>>2]=r;if((r|0)==0?(c[(Oa()|0)>>2]|0)==12:0){r=va(1)|0;Ta(r|0,48,0)}}p=c[k>>2]|0;if((p|0)<(j|0)){n=c[m>>2]|0;do{o=n+(p<<3)|0;if(o)h[o>>3]=0.0;p=p+1|0}while((p|0)!=(j|0))}c[k>>2]=j}h[(c[m>>2]|0)+(g<<3)>>3]=l;kc(b+588|0,g,0);kc(b+348|0,g,1);k=b+364|0;d=a[d>>0]|0;jc(k,j);a[(c[k>>2]|0)+g>>0]=d;k=b+380|0;d=b+384|0;if((c[d>>2]|0)<(j|0)){m=b+388|0;o=c[m>>2]|0;if((o|0)<(j|0)){r=g+2-o&-2;n=(o>>1)+2&-2;n=(r|0)>(n|0)?r:n;if((n|0)>(2147483647-o|0)){r=va(1)|0;Ta(r|0,48,0)}q=c[k>>2]|0;r=n+o|0;c[m>>2]=r;r=Ud(q,r)|0;c[k>>2]=r;if((r|0)==0?(c[(Oa()|0)>>2]|0)==12:0){r=va(1)|0;Ta(r|0,48,0)}}m=c[d>>2]|0;if((m|0)<(j|0))do{n=(c[k>>2]|0)+m|0;if(n)a[n>>0]=0;m=m+1|0}while((m|0)!=(j|0));c[d>>2]=j}d=b+288|0;k=c[d>>2]|0;if((k|0)<(j|0)){r=g+2-k&-2;j=(k>>1)+2&-2;j=(r|0)>(j|0)?r:j;if((j|0)>(2147483647-k|0)){r=va(1)|0;Ta(r|0,48,0)}q=b+280|0;p=c[q>>2]|0;r=j+k|0;c[d>>2]=r;r=Ud(p,r<<2)|0;c[q>>2]=r;if((r|0)==0?(c[(Oa()|0)>>2]|0)==12:0){r=va(1)|0;Ta(r|0,48,0)}}j=b+380|0;d=(c[j>>2]|0)+g|0;k=(a[d>>0]|0)==0;if(e){if(k){r=b+200|0;q=r;q=ne(c[q>>2]|0,c[q+4>>2]|0,1,0)|0;c[r>>2]=q;c[r+4>>2]=F}}else if(!k){r=b+200|0;q=r;q=ne(c[q>>2]|0,c[q+4>>2]|0,-1,-1)|0;c[r>>2]=q;c[r+4>>2]=F}a[d>>0]=e&1;e=b+460|0;if((c[b+476>>2]|0)>(g|0)?(c[(c[b+472>>2]|0)+(g<<2)>>2]|0)>-1:0){i=f;return g|0}if(!(a[(c[j>>2]|0)+g>>0]|0)){i=f;return g|0}lc(e,g);i=f;return g|0}function Kb(b,e){b=b|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0;f=i;i=i+16|0;k=f+1|0;j=f;g=b+492|0;if(!(a[g>>0]|0)){s=0;i=f;return s|0}s=c[e>>2]|0;h=e+4|0;l=c[h>>2]|0;a[k+0>>0]=a[j+0>>0]|0;oc(s,l,k);l=c[h>>2]|0;a:do if((l|0)>0){k=b+332|0;j=a[528]|0;m=0;n=0;p=-2;while(1){s=c[e>>2]|0;o=c[s+(m<<2)>>2]|0;r=d[(c[k>>2]|0)+(o>>1)>>0]|0;t=r^o&1;q=t&255;u=j&255;if((o|0)==(p^1|0)?1:(q<<24>>24==j<<24>>24&(u>>>1^1)|u&2&t|0)!=0){b=1;break}t=a[536]|0;u=t&255;if((o|0)!=(p|0)?((u>>>1^1)&q<<24>>24==t<<24>>24|r&2&u|0)==0:0){c[s+(n<<2)>>2]=o;l=c[h>>2]|0;n=n+1|0}else o=p;m=m+1|0;if((m|0)<(l|0))p=o;else break a}i=f;return b|0}else{m=0;n=0}while(0);j=m-n|0;if((j|0)>0){l=l-j|0;c[h>>2]=l}if(!l){a[g>>0]=0;u=0;i=f;return u|0}else if((l|0)==1){t=c[c[e>>2]>>2]|0;s=t>>1;a[(c[b+332>>2]|0)+s>>0]=(t&1^1)&255^1;u=c[b+296>>2]|0;s=(c[b+396>>2]|0)+(s<<3)|0;c[s>>2]=-1;c[s+4>>2]=u;s=b+284|0;u=c[s>>2]|0;c[s>>2]=u+1;c[(c[b+280>>2]|0)+(u<<2)>>2]=t;u=(Mb(b)|0)==-1;a[g>>0]=u&1;i=f;return u|0}else{e=pc(b+544|0,e,0)|0;h=b+256|0;g=b+260|0;k=c[g>>2]|0;j=b+264|0;if((k|0)==(c[j>>2]|0)){l=(k>>1)+2&-2;l=(l|0)<2?2:l;if((l|0)>(2147483647-k|0)){u=va(1)|0;Ta(u|0,48,0)}t=c[h>>2]|0;u=l+k|0;c[j>>2]=u;u=Ud(t,u<<2)|0;c[h>>2]=u;if((u|0)==0?(c[(Oa()|0)>>2]|0)==12:0){u=va(1)|0;Ta(u|0,48,0)}k=c[g>>2]|0}c[g>>2]=k+1;g=(c[h>>2]|0)+(k<<2)|0;if(g)c[g>>2]=e;Nb(b,e);u=1;i=f;return u|0}return 0}function Lb(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0;f=c[d>>2]|0;d=f>>1;a[(c[b+332>>2]|0)+d>>0]=(f&1^1)&255^1;g=c[b+296>>2]|0;d=(c[b+396>>2]|0)+(d<<3)|0;c[d>>2]=e;c[d+4>>2]=g;e=b+284|0;d=c[e>>2]|0;c[e>>2]=d+1;c[(c[b+280>>2]|0)+(d<<2)>>2]=f;return}function Mb(b){b=b|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=0,O=0,P=0;k=i;i=i+16|0;r=k;h=b+512|0;t=c[h>>2]|0;q=b+284|0;if((t|0)>=(c[q>>2]|0)){M=0;K=0;O=-1;N=b+184|0;I=N;L=I;L=c[L>>2]|0;I=I+4|0;I=c[I>>2]|0;I=ne(L|0,I|0,M|0,K|0)|0;L=F;J=N;c[J>>2]=I;N=N+4|0;c[N>>2]=L;N=b+520|0;L=N;J=L;J=c[J>>2]|0;L=L+4|0;L=c[L>>2]|0;K=je(J|0,L|0,M|0,K|0)|0;M=F;L=N;c[L>>2]=K;N=N+4|0;c[N>>2]=M;i=k;return O|0}o=b+280|0;j=b+428|0;g=b+412|0;l=b+332|0;m=b+544|0;n=r+4|0;e=b+396|0;p=b+296|0;f=b+456|0;z=-1;s=0;do{c[h>>2]=t+1;w=c[(c[o>>2]|0)+(t<<2)>>2]|0;if(a[(c[j>>2]|0)+w>>0]|0){u=c[g>>2]|0;t=u+(w*12|0)+4|0;y=c[t>>2]|0;if((y|0)>0){u=u+(w*12|0)|0;v=0;x=0;do{B=c[u>>2]|0;A=B+(v<<3)|0;if((c[(c[c[f>>2]>>2]|0)+(c[A>>2]<<2)>>2]&3|0)!=1){N=A;O=c[N+4>>2]|0;y=B+(x<<3)|0;c[y>>2]=c[N>>2];c[y+4>>2]=O;y=c[t>>2]|0;x=x+1|0}v=v+1|0}while((v|0)<(y|0))}else{v=0;x=0}u=v-x|0;if((u|0)>0)c[t>>2]=y-u;a[(c[j>>2]|0)+w>>0]=0}t=c[g>>2]|0;s=s+1|0;u=c[t+(w*12|0)>>2]|0;t=t+(w*12|0)+4|0;x=c[t>>2]|0;v=u+(x<<3)|0;a:do if(!x){v=u;y=u}else{w=w^1;x=(x<<3)+ -1|0;B=u;y=u;while(1){while(1){b:while(1){H=c[B+4>>2]|0;O=d[(c[l>>2]|0)+(H>>1)>>0]^H&1;J=a[528]|0;I=J&255;K=I&2;I=I>>>1^1;if((O&255)<<24>>24==J<<24>>24&I|K&O){E=19;break}A=c[B>>2]|0;E=c[m>>2]|0;G=E+(A<<2)|0;C=E+(A+1<<2)|0;D=c[C>>2]|0;if((D|0)==(w|0)){O=E+(A+2<<2)|0;D=c[O>>2]|0;c[C>>2]=D;c[O>>2]=w}C=B+8|0;c[r>>2]=A;c[n>>2]=D;if((D|0)!=(H|0)?(O=d[(c[l>>2]|0)+(D>>1)>>0]^D&1,((O&255)<<24>>24==J<<24>>24&I|K&O|0)!=0):0){E=27;break}K=c[G>>2]|0;if(K>>>0<=95){E=31;break}I=c[l>>2]|0;J=a[536]|0;H=J&255;O=H&2;H=H>>>1^1;N=2;while(1){L=G+(N<<2)+4|0;M=c[L>>2]|0;P=d[I+(M>>1)>>0]^M&1;N=N+1|0;if(!((P&255)<<24>>24==J<<24>>24&H|O&P))break;if((N|0)>=(K>>>5|0)){E=32;break b}}P=E+(A+2<<2)|0;c[P>>2]=M;c[L>>2]=w;qc((c[g>>2]|0)+((c[P>>2]^1)*12|0)|0,r);if((C|0)==(v|0))break a;else B=C}if((E|0)==19){E=0;N=B;O=c[N+4>>2]|0;P=y;c[P>>2]=c[N>>2];c[P+4>>2]=O;B=B+8|0;y=y+8|0}else if((E|0)==27){E=0;O=r;P=c[O+4>>2]|0;B=y;c[B>>2]=c[O>>2];c[B+4>>2]=P;B=C;y=y+8|0}else if((E|0)==31){J=a[536]|0;E=32}if((E|0)==32){E=y+8|0;G=r;I=c[G+4>>2]|0;H=y;c[H>>2]=c[G>>2];c[H+4>>2]=I;H=D>>1;I=D&1;G=(c[l>>2]|0)+H|0;P=d[G>>0]^I;O=J&255;if((P&255)<<24>>24==J<<24>>24&(O>>>1^1)|O&2&P)break;a[G>>0]=(I^1)&255^1;y=c[p>>2]|0;B=(c[e>>2]|0)+(H<<3)|0;c[B>>2]=A;c[B+4>>2]=y;B=c[q>>2]|0;c[q>>2]=B+1;c[(c[o>>2]|0)+(B<<2)>>2]=D;B=C;y=E}if((B|0)==(v|0))break a}c[h>>2]=c[q>>2];if(C>>>0<v>>>0){z=(u+(x-C)|0)>>>3;while(1){N=C;C=C+8|0;O=c[N+4>>2]|0;P=E;c[P>>2]=c[N>>2];c[P+4>>2]=O;if(C>>>0>=v>>>0)break;else E=E+8|0}B=B+(z+2<<3)|0;y=y+(z+2<<3)|0}else{B=C;y=E}if((B|0)==(v|0)){z=A;break}else z=A}}while(0);u=v-y|0;if((u|0)>0)c[t>>2]=(c[t>>2]|0)-(u>>3);t=c[h>>2]|0}while((t|0)<(c[q>>2]|0));N=s;L=((s|0)<0)<<31>>31;P=z;O=b+184|0;J=O;M=J;M=c[M>>2]|0;J=J+4|0;J=c[J>>2]|0;J=ne(M|0,J|0,N|0,L|0)|0;M=F;K=O;c[K>>2]=J;O=O+4|0;c[O>>2]=M;O=b+520|0;M=O;K=M;K=c[K>>2]|0;M=M+4|0;M=c[M>>2]|0;L=je(K|0,M|0,N|0,L|0)|0;N=F;M=O;c[M>>2]=L;O=O+4|0;c[O>>2]=N;i=k;return P|0}function Nb(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0;d=i;i=i+16|0;k=d+8|0;f=d;g=c[a+544>>2]|0;e=g+(b<<2)|0;h=g+(b+1<<2)|0;j=a+412|0;l=(c[j>>2]|0)+((c[h>>2]^1)*12|0)|0;g=g+(b+2<<2)|0;m=c[g>>2]|0;c[k>>2]=b;c[k+4>>2]=m;qc(l,k);g=(c[j>>2]|0)+((c[g>>2]^1)*12|0)|0;h=c[h>>2]|0;c[f>>2]=b;c[f+4>>2]=h;qc(g,f);if(!(c[e>>2]&4)){m=a+208|0;l=m;l=ne(c[l>>2]|0,c[l+4>>2]|0,1,0)|0;c[m>>2]=l;c[m+4>>2]=F;m=a+224|0;l=m;l=ne((c[e>>2]|0)>>>5|0,0,c[l>>2]|0,c[l+4>>2]|0)|0;c[m>>2]=l;c[m+4>>2]=F;i=d;return}else{m=a+216|0;l=m;l=ne(c[l>>2]|0,c[l+4>>2]|0,1,0)|0;c[m>>2]=l;c[m+4>>2]=F;m=a+232|0;l=m;l=ne((c[e>>2]|0)>>>5|0,0,c[l>>2]|0,c[l+4>>2]|0)|0;c[m>>2]=l;c[m+4>>2]=F;i=d;return}}function Ob(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;g=i;i=i+16|0;l=g+4|0;j=g;h=c[b+544>>2]|0;f=h+(d<<2)|0;k=c[h+(d+1<<2)>>2]^1;if(!e){c[l>>2]=k;e=b+428|0;m=c[e>>2]|0;k=m+k|0;if(!(a[k>>0]|0)){a[k>>0]=1;mc(b+444|0,l);m=c[e>>2]|0}d=c[h+(d+2<<2)>>2]^1;c[j>>2]=d;d=m+d|0;if(!(a[d>>0]|0)){a[d>>0]=1;mc(b+444|0,j)}}else{j=b+412|0;e=c[j>>2]|0;l=e+(k*12|0)|0;h=h+(d+2<<2)|0;k=e+(k*12|0)+4|0;m=c[k>>2]|0;a:do if((m|0)>0){p=c[l>>2]|0;o=0;while(1){n=o+1|0;if((c[p+(o<<3)>>2]|0)==(d|0)){n=o;break a}if((n|0)<(m|0))o=n;else break}}else n=0;while(0);m=m+ -1|0;if((n|0)<(m|0)){do{e=c[l>>2]|0;m=n;n=n+1|0;o=e+(n<<3)|0;p=c[o+4>>2]|0;m=e+(m<<3)|0;c[m>>2]=c[o>>2];c[m+4>>2]=p;m=(c[k>>2]|0)+ -1|0}while((n|0)<(m|0));e=c[j>>2]|0}c[k>>2]=m;j=c[h>>2]^1;h=e+(j*12|0)|0;j=e+(j*12|0)+4|0;k=c[j>>2]|0;b:do if((k|0)>0){e=c[h>>2]|0;m=0;while(1){l=m+1|0;if((c[e+(m<<3)>>2]|0)==(d|0)){l=m;break b}if((l|0)<(k|0))m=l;else break}}else l=0;while(0);d=k+ -1|0;if((l|0)<(d|0))do{n=c[h>>2]|0;d=l;l=l+1|0;o=n+(l<<3)|0;p=c[o+4>>2]|0;d=n+(d<<3)|0;c[d>>2]=c[o>>2];c[d+4>>2]=p;d=(c[j>>2]|0)+ -1|0}while((l|0)<(d|0));c[j>>2]=d}if(!(c[f>>2]&4)){p=b+208|0;o=p;o=ne(c[o>>2]|0,c[o+4>>2]|0,-1,-1)|0;c[p>>2]=o;c[p+4>>2]=F;p=b+224|0;o=p;o=je(c[o>>2]|0,c[o+4>>2]|0,(c[f>>2]|0)>>>5|0,0)|0;c[p>>2]=o;c[p+4>>2]=F;i=g;return}else{p=b+216|0;o=p;o=ne(c[o>>2]|0,c[o+4>>2]|0,-1,-1)|0;c[p>>2]=o;c[p+4>>2]=F;p=b+232|0;o=p;o=je(c[o>>2]|0,c[o+4>>2]|0,(c[f>>2]|0)>>>5|0,0)|0;c[p>>2]=o;c[p+4>>2]=F;i=g;return}}function Pb(b,e){b=b|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0;h=i;g=b+544|0;m=c[g>>2]|0;f=m+(e<<2)|0;Ob(b,e,0);m=c[m+(e+1<<2)>>2]|0;j=m>>1;m=(d[(c[b+332>>2]|0)+j>>0]|0)^m&1;o=a[528]|0;n=o&255;if((((m&255)<<24>>24==o<<24>>24&(n>>>1^1)|n&2&m|0)!=0?(k=(c[b+396>>2]|0)+(j<<3)|0,l=c[k>>2]|0,(l|0)!=-1):0)?((c[g>>2]|0)+(l<<2)|0)==(f|0):0)c[k>>2]=-1;c[f>>2]=c[f>>2]&-4|1;n=c[(c[g>>2]|0)+(e<<2)>>2]|0;o=b+556|0;c[o>>2]=((((n>>>3&1)+(n>>>5)<<2)+4|0)>>>2)+(c[o>>2]|0);i=h;return}function Qb(b,e){b=b|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0;f=i;g=c[e>>2]|0;if(g>>>0<=31){l=0;i=f;return l|0}h=c[b+332>>2]|0;j=a[528]|0;k=j&255;l=k&2;k=k>>>1^1;b=0;while(1){m=c[e+(b<<2)+4>>2]|0;m=(d[h+(m>>1)>>0]|0)^m&1;b=b+1|0;if((m&255)<<24>>24==j<<24>>24&k|l&m){g=1;e=5;break}if((b|0)>=(g>>>5|0)){g=0;e=5;break}}if((e|0)==5){i=f;return g|0}return 0}function Rb(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0;g=i;e=b+296|0;if((c[e>>2]|0)<=(d|0)){i=g;return}f=b+284|0;s=c[f>>2]|0;j=b+292|0;t=c[j>>2]|0;u=c[t+(d<<2)>>2]|0;if((s|0)>(u|0)){r=b+280|0;m=b+332|0;l=b+88|0;k=b+348|0;n=b+460|0;p=b+476|0;q=b+472|0;o=b+380|0;do{s=s+ -1|0;u=c[(c[r>>2]|0)+(s<<2)>>2]>>1;a[(c[m>>2]|0)+u>>0]=a[544]|0;t=c[l>>2]|0;if((t|0)<=1){if((t|0)==1?(s|0)>(c[(c[j>>2]|0)+((c[e>>2]|0)+ -1<<2)>>2]|0):0)h=7}else h=7;if((h|0)==7){h=0;a[(c[k>>2]|0)+u>>0]=c[(c[r>>2]|0)+(s<<2)>>2]&1}if(!((c[p>>2]|0)>(u|0)?(c[(c[q>>2]|0)+(u<<2)>>2]|0)>-1:0))h=11;if((h|0)==11?(h=0,(a[(c[o>>2]|0)+u>>0]|0)!=0):0)lc(n,u);t=c[j>>2]|0;u=c[t+(d<<2)>>2]|0}while((s|0)>(u|0));s=c[f>>2]|0}c[b+512>>2]=u;b=c[t+(d<<2)>>2]|0;if((s-b|0)>0)c[f>>2]=b;if(((c[e>>2]|0)-d|0)<=0){i=g;return}c[e>>2]=d;i=g;return}function Sb(b){b=b|0;var d=0,e=0,f=0,g=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0.0,r=0;d=i;f=b+72|0;q=+h[f>>3]*1389796.0;q=q- +(~~(q/2147483647.0)|0)*2147483647.0;h[f>>3]=q;l=b+464|0;if(q/2147483647.0<+h[b+64>>3]?(m=c[l>>2]|0,(m|0)!=0):0){q=q*1389796.0;q=q- +(~~(q/2147483647.0)|0)*2147483647.0;h[f>>3]=q;m=c[(c[b+460>>2]|0)+(~~(+(m|0)*(q/2147483647.0))<<2)>>2]|0;o=a[(c[b+332>>2]|0)+m>>0]|0;n=a[544]|0;p=n&255;if(((p>>>1^1)&o<<24>>24==n<<24>>24|o&2&p|0)!=0?(a[(c[b+380>>2]|0)+m>>0]|0)!=0:0){p=b+176|0;o=p;o=ne(c[o>>2]|0,c[o+4>>2]|0,1,0)|0;c[p>>2]=o;c[p+4>>2]=F}}else m=-1;n=b+460|0;p=b+332|0;o=b+380|0;while(1){if(((m|0)!=-1?(r=a[(c[p>>2]|0)+m>>0]|0,j=a[544]|0,e=j&255,g=e>>>1^1,(g&r<<24>>24==j<<24>>24|r&2&e|0)!=0):0)?(a[(c[o>>2]|0)+m>>0]|0)!=0:0)break;if(!(c[l>>2]|0)){e=-2;k=17;break}m=rc(n)|0}if((k|0)==17){i=d;return e|0}l=a[(c[b+364>>2]|0)+m>>0]|0;k=l&255;if(!(g&l<<24>>24==j<<24>>24|e&2&k)){p=a[528]|0;r=p&255;r=((r>>>1^1)&l<<24>>24==p<<24>>24|k&2&r|0)!=0|m<<1;i=d;return r|0}if(!(a[b+92>>0]|0)){r=(a[(c[b+348>>2]|0)+m>>0]|0)!=0|m<<1;i=d;return r|0}else{q=+h[f>>3]*1389796.0;q=q- +(~~(q/2147483647.0)|0)*2147483647.0;h[f>>3]=q;r=q/2147483647.0<.5|m<<1;i=d;return r|0}return 0}function Tb(b,d,e,f){b=b|0;d=d|0;e=e|0;f=f|0;var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0.0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=0,O=0,P=0,Q=0,R=0,S=0,T=0.0,U=0;j=i;i=i+16|0;p=j+8|0;t=j+4|0;n=j;m=e+4|0;k=c[m>>2]|0;l=e+8|0;if((k|0)==(c[l>>2]|0)){q=(k>>1)+2&-2;q=(q|0)<2?2:q;if((q|0)>(2147483647-k|0)){S=va(1)|0;Ta(S|0,48,0)}R=c[e>>2]|0;S=q+k|0;c[l>>2]=S;S=Ud(R,S<<2)|0;c[e>>2]=S;if((S|0)==0?(c[(Oa()|0)>>2]|0)==12:0){S=va(1)|0;Ta(S|0,48,0)}k=c[m>>2]|0}l=(c[e>>2]|0)+(k<<2)|0;if(l){c[l>>2]=0;k=c[m>>2]|0}c[m>>2]=k+1;q=b+544|0;H=b+280|0;k=b+588|0;l=b+396|0;C=b+504|0;E=b+316|0;D=b+540|0;B=b+476|0;A=b+472|0;z=b+460|0;y=b+488|0;x=b+296|0;v=b+496|0;w=b+272|0;G=b+268|0;J=-2;I=(c[b+284>>2]|0)+ -1|0;K=0;do{L=c[q>>2]|0;d=L+(d<<2)|0;M=c[d>>2]|0;if((M&4|0)!=0?(r=+h[v>>3],S=d+(M>>>5<<2)+4|0,T=r+ +g[S>>2],g[S>>2]=T,T>1.0e20):0){O=c[w>>2]|0;if((O|0)>0){N=c[G>>2]|0;M=0;do{S=L+(c[N+(M<<2)>>2]<<2)|0;S=S+((c[S>>2]|0)>>>5<<2)+4|0;g[S>>2]=+g[S>>2]*1.0e-20;M=M+1|0}while((M|0)!=(O|0))}h[v>>3]=r*1.0e-20}J=(J|0)!=-2&1;if(J>>>0<(c[d>>2]|0)>>>5>>>0)do{M=c[d+(J<<2)+4>>2]|0;c[t>>2]=M;M=M>>1;L=(c[k>>2]|0)+M|0;do if((a[L>>0]|0)==0?(c[(c[l>>2]|0)+(M<<3)+4>>2]|0)>0:0){O=c[E>>2]|0;S=O+(M<<3)|0;T=+h[C>>3]+ +h[S>>3];h[S>>3]=T;if(T>1.0e+100){P=c[D>>2]|0;if((P|0)>0){N=0;do{S=O+(N<<3)|0;h[S>>3]=+h[S>>3]*1.0e-100;N=N+1|0}while((N|0)!=(P|0))}h[C>>3]=+h[C>>3]*1.0e-100}if((c[B>>2]|0)>(M|0)?(u=c[A>>2]|0,s=c[u+(M<<2)>>2]|0,(s|0)>-1):0){N=c[z>>2]|0;O=c[N+(s<<2)>>2]|0;a:do if(!s)R=0;else{S=s;while(1){R=S;S=S+ -1>>1;Q=N+(S<<2)|0;P=c[Q>>2]|0;U=c[c[y>>2]>>2]|0;if(!(+h[U+(O<<3)>>3]>+h[U+(P<<3)>>3]))break a;c[N+(R<<2)>>2]=P;c[u+(c[Q>>2]<<2)>>2]=R;if(!S){R=0;break}}}while(0);c[N+(R<<2)>>2]=O;c[u+(O<<2)>>2]=R}a[L>>0]=1;if((c[(c[l>>2]|0)+(M<<3)+4>>2]|0)<(c[x>>2]|0)){mc(e,t);break}else{K=K+1|0;break}}while(0);J=J+1|0}while((J|0)<((c[d>>2]|0)>>>5|0));d=c[H>>2]|0;L=c[k>>2]|0;do{J=I;I=I+ -1|0;J=c[d+(J<<2)>>2]|0;N=J>>1;M=L+N|0}while((a[M>>0]|0)==0);d=c[(c[l>>2]|0)+(N<<3)>>2]|0;a[M>>0]=0;K=K+ -1|0}while((K|0)>0);c[c[e>>2]>>2]=J^1;t=b+616|0;v=c[t>>2]|0;s=b+620|0;if(!v)w=c[s>>2]|0;else{c[s>>2]=0;w=0}u=c[m>>2]|0;if((w|0)<(u|0)){y=b+624|0;x=c[y>>2]|0;if((x|0)<(u|0)){U=u+1-x&-2;w=(x>>1)+2&-2;w=(U|0)>(w|0)?U:w;if((w|0)>(2147483647-x|0)){U=va(1)|0;Ta(U|0,48,0)}U=w+x|0;c[y>>2]=U;v=Ud(v,U<<2)|0;c[t>>2]=v;if((v|0)==0?(c[(Oa()|0)>>2]|0)==12:0){U=va(1)|0;Ta(U|0,48,0)}}w=c[s>>2]|0;b:do if((w|0)<(u|0))while(1){v=v+(w<<2)|0;if(v)c[v>>2]=0;w=w+1|0;if((w|0)==(u|0))break b;v=c[t>>2]|0}while(0);c[s>>2]=u;u=c[m>>2]|0}if((u|0)>0){w=c[t>>2]|0;v=c[e>>2]|0;x=0;do{c[w+(x<<2)>>2]=c[v+(x<<2)>>2];x=x+1|0;u=c[m>>2]|0}while((x|0)<(u|0))}v=c[b+84>>2]|0;if((v|0)==1)if((u|0)>1){n=c[e>>2]|0;o=1;v=1;while(1){u=c[n+(o<<2)>>2]|0;p=c[l>>2]|0;w=c[p+(u>>1<<3)>>2]|0;c:do if((w|0)!=-1){x=(c[q>>2]|0)+(w<<2)|0;y=c[x>>2]|0;if(y>>>0>63){w=c[k>>2]|0;z=1;while(1){U=c[x+(z<<2)+4>>2]>>1;if((a[w+U>>0]|0)==0?(c[p+(U<<3)+4>>2]|0)>0:0)break;z=z+1|0;if((z|0)>=(y>>>5|0))break c}c[n+(v<<2)>>2]=u;v=v+1|0}}else{c[n+(v<<2)>>2]=u;v=v+1|0}while(0);o=o+1|0;p=c[m>>2]|0;if((o|0)>=(p|0)){n=p;break}}}else{n=u;o=1;v=1}else if((v|0)==2)if((u|0)>1){q=1;v=1;do{w=c[e>>2]|0;u=c[w+(q<<2)>>2]|0;if((c[(c[l>>2]|0)+(u>>1<<3)>>2]|0)!=-1){c[n>>2]=u;c[p+0>>2]=c[n+0>>2];if(!(Ub(b,p)|0)){u=c[e>>2]|0;w=u;u=c[u+(q<<2)>>2]|0;o=62}}else o=62;if((o|0)==62){o=0;c[w+(v<<2)>>2]=u;v=v+1|0}q=q+1|0;u=c[m>>2]|0}while((q|0)<(u|0));n=u;o=q}else{n=u;o=1;v=1}else{n=u;o=u;v=u}U=b+240|0;S=U;S=ne(c[S>>2]|0,c[S+4>>2]|0,n|0,((n|0)<0)<<31>>31|0)|0;c[U>>2]=S;c[U+4>>2]=F;o=o-v|0;if((o|0)>0){n=n-o|0;c[m>>2]=n}U=b+248|0;S=U;S=ne(c[S>>2]|0,c[S+4>>2]|0,n|0,((n|0)<0)<<31>>31|0)|0;c[U>>2]=S;c[U+4>>2]=F;if((n|0)==1)e=0;else{e=c[e>>2]|0;if((n|0)>2){b=c[l>>2]|0;m=2;o=1;do{o=(c[b+(c[e+(m<<2)>>2]>>1<<3)+4>>2]|0)>(c[b+(c[e+(o<<2)>>2]>>1<<3)+4>>2]|0)?m:o;m=m+1|0}while((m|0)<(n|0))}else o=1;S=e+(o<<2)|0;U=c[S>>2]|0;e=e+4|0;c[S>>2]=c[e>>2];c[e>>2]=U;e=c[(c[l>>2]|0)+(U>>1<<3)+4>>2]|0}c[f>>2]=e;if((c[s>>2]|0)>0)f=0;else{i=j;return}do{a[(c[k>>2]|0)+(c[(c[t>>2]|0)+(f<<2)>>2]>>1)>>0]=0;f=f+1|0}while((f|0)<(c[s>>2]|0));i=j;return}function Ub(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0;e=i;n=c[d>>2]|0;l=b+396|0;q=c[l>>2]|0;k=b+544|0;s=(c[k>>2]|0)+(c[q+(n>>1<<3)>>2]<<2)|0;h=b+604|0;f=b+608|0;if(c[h>>2]|0)c[f>>2]=0;g=b+588|0;j=b+612|0;b=b+616|0;o=1;while(1){if(o>>>0<(c[s>>2]|0)>>>5>>>0){r=c[s+(o<<2)+4>>2]|0;p=r>>1;if((c[q+(p<<3)+4>>2]|0)!=0?(m=a[(c[g>>2]|0)+p>>0]|0,(m+ -1<<24>>24&255)>=2):0){s=c[f>>2]|0;t=(s|0)==(c[j>>2]|0);if(m<<24>>24==3?1:(c[q+(p<<3)>>2]|0)==-1){k=8;break}if(t){q=(s>>1)+2&-2;q=(q|0)<2?2:q;if((q|0)>(2147483647-s|0)){k=24;break}u=c[h>>2]|0;t=q+s|0;c[j>>2]=t;t=Ud(u,t<<3)|0;c[h>>2]=t;if((t|0)==0?(c[(Oa()|0)>>2]|0)==12:0){k=24;break}s=c[f>>2]|0}c[f>>2]=s+1;q=(c[h>>2]|0)+(s<<3)|0;if(q){u=q;c[u>>2]=o;c[u+4>>2]=n}c[d>>2]=r;s=c[l>>2]|0;n=r;q=s;s=(c[k>>2]|0)+(c[s+(p<<3)>>2]<<2)|0;o=0}}else{n=(c[g>>2]|0)+(n>>1)|0;if(!(a[n>>0]|0)){a[n>>0]=2;mc(b,d)}n=c[f>>2]|0;if(!n){f=1;k=34;break}u=n+ -1|0;n=c[h>>2]|0;o=c[n+(u<<3)>>2]|0;n=c[n+(u<<3)+4>>2]|0;c[d>>2]=n;q=c[l>>2]|0;s=(c[k>>2]|0)+(c[q+(n>>1<<3)>>2]<<2)|0;c[f>>2]=u}o=o+1|0}if((k|0)==8){if(t){k=(s>>1)+2&-2;k=(k|0)<2?2:k;if((k|0)>(2147483647-s|0)){u=va(1)|0;Ta(u|0,48,0)}t=c[h>>2]|0;u=k+s|0;c[j>>2]=u;u=Ud(t,u<<3)|0;c[h>>2]=u;if((u|0)==0?(c[(Oa()|0)>>2]|0)==12:0){u=va(1)|0;Ta(u|0,48,0)}s=c[f>>2]|0}j=s+1|0;c[f>>2]=j;k=(c[h>>2]|0)+(s<<3)|0;if(k){j=k;c[j>>2]=0;c[j+4>>2]=n;j=c[f>>2]|0}if((j|0)>0)k=0;else{u=0;i=e;return u|0}do{l=(c[g>>2]|0)+(c[(c[h>>2]|0)+(k<<3)+4>>2]>>1)|0;if(!(a[l>>0]|0)){a[l>>0]=3;mc(b,(c[h>>2]|0)+(k<<3)+4|0);j=c[f>>2]|0}k=k+1|0}while((k|0)<(j|0));f=0;i=e;return f|0}else if((k|0)==24)Ta(va(1)|0,48,0);else if((k|0)==34){i=e;return f|0}return 0}function Vb(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0;j=i;i=i+32|0;h=j+16|0;g=j+12|0;k=j+8|0;f=j;n=e+20|0;l=e+16|0;if((c[n>>2]|0)>0){m=0;do{a[(c[e>>2]|0)+(c[(c[l>>2]|0)+(m<<2)>>2]|0)>>0]=0;m=m+1|0}while((m|0)<(c[n>>2]|0))}if(c[l>>2]|0)c[n>>2]=0;m=c[d>>2]|0;c[k>>2]=m;c[g>>2]=m;c[h+0>>2]=c[g+0>>2];sc(e,h,0);l=(c[e>>2]|0)+m|0;if(!(a[l>>0]|0)){a[l>>0]=1;mc(e+16|0,k)}if(!(c[b+296>>2]|0)){i=j;return}d=m>>1;o=b+588|0;a[(c[o>>2]|0)+d>>0]=1;p=c[b+284>>2]|0;n=b+292|0;s=c[c[n>>2]>>2]|0;if((p|0)>(s|0)){k=b+280|0;l=b+396|0;m=e+16|0;b=b+544|0;do{p=p+ -1|0;r=c[(c[k>>2]|0)+(p<<2)>>2]|0;q=r>>1;if(a[(c[o>>2]|0)+q>>0]|0){s=c[l>>2]|0;t=c[s+(q<<3)>>2]|0;a:do if((t|0)==-1){r=r^1;c[f>>2]=r;c[g>>2]=r;c[h+0>>2]=c[g+0>>2];sc(e,h,0);r=(c[e>>2]|0)+r|0;if(!(a[r>>0]|0)){a[r>>0]=1;mc(m,f)}}else{r=(c[b>>2]|0)+(t<<2)|0;t=c[r>>2]|0;if(t>>>0>63){u=1;while(1){v=c[r+(u<<2)+4>>2]>>1;if((c[s+(v<<3)+4>>2]|0)>0){a[(c[o>>2]|0)+v>>0]=1;t=c[r>>2]|0}u=u+1|0;if((u|0)>=(t>>>5|0))break a;s=c[l>>2]|0}}}while(0);a[(c[o>>2]|0)+q>>0]=0;s=c[c[n>>2]>>2]|0}}while((p|0)>(s|0))}a[(c[o>>2]|0)+d>>0]=0;i=j;return}function Wb(b){b=b|0;var e=0,f=0,j=0,k=0,l=0,m=0,n=0.0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0;f=i;i=i+16|0;p=f+4|0;u=f;e=b+272|0;w=c[e>>2]|0;n=+h[b+496>>3]/+(w|0);k=b+544|0;l=b+268|0;v=c[l>>2]|0;c[u>>2]=k;c[p+0>>2]=c[u+0>>2];tc(v,w,p);p=c[e>>2]|0;if((p|0)>0){m=b+332|0;o=b+396|0;q=0;v=0;do{t=c[l>>2]|0;u=c[t+(q<<2)>>2]|0;w=c[k>>2]|0;r=w+(u<<2)|0;s=c[r>>2]|0;do if(s>>>0>95){x=c[w+(u+1<<2)>>2]|0;w=x>>1;x=(d[(c[m>>2]|0)+w>>0]|0)^x&1;z=a[528]|0;y=z&255;if(((x&255)<<24>>24==z<<24>>24&(y>>>1^1)|y&2&x|0)!=0?(z=c[(c[o>>2]|0)+(w<<3)>>2]|0,(z|0)!=-1&(z|0)==(u|0)):0){j=9;break}if((q|0)>=((p|0)/2|0|0)?!(+g[r+(s>>>5<<2)+4>>2]<n):0){j=9;break}Pb(b,u)}else j=9;while(0);if((j|0)==9){j=0;c[t+(v<<2)>>2]=u;v=v+1|0}q=q+1|0;p=c[e>>2]|0}while((q|0)<(p|0))}else{q=0;v=0}j=q-v|0;if((j|0)>0)c[e>>2]=p-j;if(!(+((c[b+556>>2]|0)>>>0)>+h[b+96>>3]*+((c[b+548>>2]|0)>>>0))){i=f;return}gb[c[(c[b>>2]|0)+8>>2]&31](b);i=f;return}function Xb(b,e){b=b|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0;f=i;g=e+4|0;m=c[g>>2]|0;if((m|0)>0){j=b+544|0;h=b+332|0;k=0;l=0;do{u=c[e>>2]|0;p=c[u+(k<<2)>>2]|0;m=(c[j>>2]|0)+(p<<2)|0;o=c[m>>2]|0;do if(o>>>0>31){v=c[h>>2]|0;r=a[528]|0;q=r&255;w=q&2;q=q>>>1^1;s=o>>>5;t=0;do{x=c[m+(t<<2)+4>>2]|0;x=(d[v+(x>>1)>>0]|0)^x&1;t=t+1|0;if((x&255)<<24>>24==r<<24>>24&q|w&x){n=7;break}}while((t|0)<(s|0));if((n|0)==7){n=0;Pb(b,p);break}if(o>>>0>95){n=a[536]|0;q=o>>>5;p=2;do{r=m+(p<<2)+4|0;x=c[r>>2]|0;x=(d[(c[h>>2]|0)+(x>>1)>>0]|0)^x&1;w=n&255;if((x&255)<<24>>24==n<<24>>24&(w>>>1^1)|w&2&x){c[r>>2]=c[m+(q+ -1<<2)+4>>2];o=c[m>>2]|0;if(o&8){o=o>>>5;c[m+(o+ -1<<2)+4>>2]=c[m+(o<<2)+4>>2];o=c[m>>2]|0}o=o+ -32|0;c[m>>2]=o;p=p+ -1|0}p=p+1|0;q=o>>>5}while((p|0)<(q|0));p=c[e>>2]|0;u=p;p=c[p+(k<<2)>>2]|0;n=16}else n=16}else n=16;while(0);if((n|0)==16){n=0;c[u+(l<<2)>>2]=p;l=l+1|0}k=k+1|0;m=c[g>>2]|0}while((k|0)<(m|0))}else{k=0;l=0}e=k-l|0;if((e|0)<=0){i=f;return}c[g>>2]=m-e;i=f;return}function Yb(b){b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0;g=i;i=i+16|0;e=g+4|0;h=g;c[e>>2]=0;d=e+4|0;c[d>>2]=0;f=e+8|0;c[f>>2]=0;c[h>>2]=0;j=b+540|0;n=c[j>>2]|0;if((n|0)>0){l=b+380|0;k=b+332|0;m=0;do{if((a[(c[l>>2]|0)+m>>0]|0)!=0?(p=a[(c[k>>2]|0)+m>>0]|0,q=a[544]|0,o=q&255,((o>>>1^1)&p<<24>>24==q<<24>>24|p&2&o|0)!=0):0){nc(e,h);n=c[j>>2]|0}m=m+1|0;c[h>>2]=m}while((m|0)<(n|0))}uc(b+460|0,e);b=c[e>>2]|0;if(!b){i=g;return}c[d>>2]=0;Td(b);c[e>>2]=0;c[f>>2]=0;i=g;return}function Zb(b){b=b|0;var d=0,e=0,f=0,g=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0;d=i;f=b+492|0;if((a[f>>0]|0)!=0?(Mb(b)|0)==-1:0){f=b+284|0;g=b+516|0;if((c[f>>2]|0)==(c[g>>2]|0)){s=1;i=d;return s|0}j=b+520|0;s=j;r=c[s+4>>2]|0;if((r|0)>0|(r|0)==0&(c[s>>2]|0)>>>0>0){s=1;i=d;return s|0}Xb(b,b+268|0);if(a[b+536>>0]|0){Xb(b,b+256|0);l=b+564|0;k=b+568|0;if((c[k>>2]|0)>0){n=b+588|0;m=0;do{a[(c[n>>2]|0)+(c[(c[l>>2]|0)+(m<<2)>>2]|0)>>0]=1;m=m+1|0}while((m|0)<(c[k>>2]|0))}p=c[f>>2]|0;if((p|0)>0){m=c[b+280>>2]|0;n=c[b+588>>2]|0;q=0;o=0;do{r=c[m+(q<<2)>>2]|0;if(!(a[n+(r>>1)>>0]|0)){c[m+(o<<2)>>2]=r;p=c[f>>2]|0;o=o+1|0}q=q+1|0}while((q|0)<(p|0))}else{q=0;o=0}m=q-o|0;if((m|0)>0){p=p-m|0;c[f>>2]=p}c[b+512>>2]=p;a:do if((c[k>>2]|0)>0){o=b+588|0;m=0;do{a[(c[o>>2]|0)+(c[(c[l>>2]|0)+(m<<2)>>2]|0)>>0]=0;m=m+1|0;n=c[k>>2]|0}while((m|0)<(n|0));if((n|0)>0){n=b+580|0;o=b+584|0;m=b+576|0;p=0;while(1){r=c[n>>2]|0;if((r|0)==(c[o>>2]|0)){q=(r>>1)+2&-2;q=(q|0)<2?2:q;if((q|0)>(2147483647-r|0)){e=28;break}s=c[m>>2]|0;q=q+r|0;c[o>>2]=q;q=Ud(s,q<<2)|0;c[m>>2]=q;if((q|0)==0?(c[(Oa()|0)>>2]|0)==12:0){e=28;break}r=c[n>>2]|0}else q=c[m>>2]|0;s=q+(r<<2)|0;if(s){c[s>>2]=0;r=c[n>>2]|0}c[n>>2]=r+1;s=c[l>>2]|0;c[q+(r<<2)>>2]=c[s+(p<<2)>>2];p=p+1|0;if((p|0)>=(c[k>>2]|0))break a}if((e|0)==28)Ta(va(1)|0,48,0)}else e=21}else e=21;while(0);if((e|0)==21)s=c[l>>2]|0;if(s)c[k>>2]=0}if(+((c[b+556>>2]|0)>>>0)>+h[b+96>>3]*+((c[b+548>>2]|0)>>>0))gb[c[(c[b>>2]|0)+8>>2]&31](b);Yb(b);c[g>>2]=c[f>>2];r=b+224|0;s=b+232|0;r=ne(c[s>>2]|0,c[s+4>>2]|0,c[r>>2]|0,c[r+4>>2]|0)|0;s=j;c[s>>2]=r;c[s+4>>2]=F;s=1;i=d;return s|0}a[f>>0]=0;s=0;i=d;return s|0}function _b(b,e,f){b=b|0;e=e|0;f=f|0;var j=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=0,O=0,P=0,Q=0,R=0,T=0,U=0,V=0,W=0,X=0,Y=0,Z=0,_=0,$=0,aa=0,ba=0,ca=0,da=0,ea=0,fa=0.0,ga=0,ha=0,ia=0,ja=0.0,ka=0,la=0,ma=0,na=0,oa=0,pa=0,qa=0.0,ra=0,sa=0,ta=0.0;n=i;i=i+64|0;_=n;G=n+60|0;B=n+56|0;j=n+44|0;$=n+40|0;c[j>>2]=0;m=j+4|0;c[m>>2]=0;l=j+8|0;c[l>>2]=0;N=e+160|0;M=N;M=ne(c[M>>2]|0,c[M+4>>2]|0,1,0)|0;c[N>>2]=M;c[N+4>>2]=F;N=(f|0)<0;M=e+680|0;L=e+664|0;K=e+672|0;q=e+296|0;w=e+272|0;o=e+284|0;I=e+640|0;E=e+308|0;D=e+304|0;r=e+332|0;H=e+292|0;ba=e+168|0;t=e+396|0;v=e+280|0;J=e+184|0;C=e+192|0;u=e+48|0;U=e+504|0;Y=e+56|0;aa=e+496|0;ca=e+656|0;O=e+144|0;P=e+648|0;Q=e+128|0;R=e+44|0;T=e+200|0;V=e+208|0;W=e+224|0;X=e+216|0;s=e+232|0;Z=e+540|0;p=e+292|0;x=e+544|0;z=e+276|0;y=e+268|0;A=e+268|0;da=0;a:while(1){ea=N|(da|0)<(f|0);while(1){ga=Mb(e)|0;if((ga|0)!=-1)break;if(!ea){ga=41;break a}if(a[M>>0]|0){ga=41;break a}ga=L;ha=c[ga+4>>2]|0;if((ha|0)>=0?(sa=C,ra=c[sa+4>>2]|0,!(ra>>>0<ha>>>0|((ra|0)==(ha|0)?(c[sa>>2]|0)>>>0<(c[ga>>2]|0)>>>0:0))):0){ga=41;break a}ga=K;ha=c[ga+4>>2]|0;if((ha|0)>=0?(sa=J,ra=c[sa+4>>2]|0,!(ra>>>0<ha>>>0|((ra|0)==(ha|0)?(c[sa>>2]|0)>>>0<(c[ga>>2]|0)>>>0:0))):0){ga=41;break a}if((c[q>>2]|0)==0?!(Zb(e)|0):0){ga=50;break a}if(+((c[w>>2]|0)-(c[o>>2]|0)|0)>=+h[I>>3])Wb(e);while(1){ga=c[q>>2]|0;if((ga|0)>=(c[E>>2]|0)){ga=59;break}ka=c[(c[D>>2]|0)+(ga<<2)>>2]|0;ha=d[(c[r>>2]|0)+(ka>>1)>>0]|0;sa=ha^ka&1;ia=sa&255;pa=a[528]|0;ra=pa&255;if(!(ia<<24>>24==pa<<24>>24&(ra>>>1^1)|ra&2&sa)){ga=56;break}c[G>>2]=c[o>>2];nc(H,G)}if((ga|0)==56){ga=0;ra=a[536]|0;sa=ra&255;if((sa>>>1^1)&ia<<24>>24==ra<<24>>24|ha&2&sa){ga=57;break a}if((ka|0)==-2)ga=59}if((ga|0)==59){sa=ba;sa=ne(c[sa>>2]|0,c[sa+4>>2]|0,1,0)|0;ka=ba;c[ka>>2]=sa;c[ka+4>>2]=F;ka=Sb(e)|0;if((ka|0)==-2){ga=60;break a}}c[_>>2]=c[o>>2];nc(H,_);sa=ka>>1;a[(c[r>>2]|0)+sa>>0]=(ka&1^1)&255^1;ra=c[q>>2]|0;sa=(c[t>>2]|0)+(sa<<3)|0;c[sa>>2]=-1;c[sa+4>>2]=ra;sa=c[o>>2]|0;c[o>>2]=sa+1;c[(c[v>>2]|0)+(sa<<2)>>2]=ka}ra=C;ra=ne(c[ra>>2]|0,c[ra+4>>2]|0,1,0)|0;sa=C;c[sa>>2]=ra;c[sa+4>>2]=F;da=da+1|0;if(!(c[q>>2]|0)){ga=5;break}if(c[j>>2]|0)c[m>>2]=0;Tb(e,ga,j,B);Rb(e,c[B>>2]|0);if((c[m>>2]|0)==1){ra=c[c[j>>2]>>2]|0;sa=ra>>1;a[(c[r>>2]|0)+sa>>0]=(ra&1^1)&255^1;pa=c[q>>2]|0;sa=(c[t>>2]|0)+(sa<<3)|0;c[sa>>2]=-1;c[sa+4>>2]=pa;sa=c[o>>2]|0;c[o>>2]=sa+1;c[(c[v>>2]|0)+(sa<<2)>>2]=ra}else{ea=pc(x,j,1)|0;ga=c[w>>2]|0;if((ga|0)==(c[z>>2]|0)){ha=(ga>>1)+2&-2;ha=(ha|0)<2?2:ha;if((ha|0)>(2147483647-ga|0)){ga=14;break}ra=c[y>>2]|0;sa=ha+ga|0;c[z>>2]=sa;sa=Ud(ra,sa<<2)|0;c[y>>2]=sa;if((sa|0)==0?(c[(Oa()|0)>>2]|0)==12:0){ga=14;break}ga=c[w>>2]|0}c[w>>2]=ga+1;ga=(c[y>>2]|0)+(ga<<2)|0;if(ga)c[ga>>2]=ea;Nb(e,ea);ia=c[x>>2]|0;sa=ia+(ea<<2)|0;fa=+h[aa>>3];sa=sa+((c[sa>>2]|0)>>>5<<2)+4|0;ta=fa+ +g[sa>>2];g[sa>>2]=ta;if(ta>1.0e20){ha=c[w>>2]|0;if((ha|0)>0){ga=c[A>>2]|0;ka=0;do{sa=ia+(c[ga+(ka<<2)>>2]<<2)|0;sa=sa+((c[sa>>2]|0)>>>5<<2)+4|0;g[sa>>2]=+g[sa>>2]*1.0e-20;ka=ka+1|0}while((ka|0)!=(ha|0))}h[aa>>3]=fa*1.0e-20}ra=c[c[j>>2]>>2]|0;sa=ra>>1;a[(c[r>>2]|0)+sa>>0]=(ra&1^1)&255^1;pa=c[q>>2]|0;sa=(c[t>>2]|0)+(sa<<3)|0;c[sa>>2]=ea;c[sa+4>>2]=pa;sa=c[o>>2]|0;c[o>>2]=sa+1;c[(c[v>>2]|0)+(sa<<2)>>2]=ra}h[U>>3]=1.0/+h[u>>3]*+h[U>>3];h[aa>>3]=1.0/+h[Y>>3]*+h[aa>>3];sa=(c[ca>>2]|0)+ -1|0;c[ca>>2]=sa;if(sa)continue;fa=+h[O>>3]*+h[P>>3];h[P>>3]=fa;c[ca>>2]=~~fa;fa=+h[Q>>3]*+h[I>>3];h[I>>3]=fa;if((c[R>>2]|0)<=0)continue;ga=c[C>>2]|0;ea=c[T>>2]|0;oa=c[q>>2]|0;if(!oa)ha=o;else ha=c[p>>2]|0;ha=c[ha>>2]|0;na=c[V>>2]|0;ma=c[W>>2]|0;la=c[X>>2]|0;ka=s;ia=c[ka>>2]|0;ka=c[ka+4>>2]|0;ja=+(c[Z>>2]|0);qa=1.0/ja;if((oa|0)<0)ta=0.0;else{pa=0;ta=0.0;while(1){if(!pa)ra=0;else ra=c[(c[p>>2]|0)+(pa+ -1<<2)>>2]|0;if((pa|0)==(oa|0))sa=o;else sa=(c[p>>2]|0)+(pa<<2)|0;ta=ta+ +S(+qa,+(+(pa|0)))*+((c[sa>>2]|0)-ra|0);if((pa|0)==(oa|0))break;else pa=pa+1|0}}c[_>>2]=ga;c[_+4>>2]=ea-ha;c[_+8>>2]=na;c[_+12>>2]=ma;c[_+16>>2]=~~fa;c[_+20>>2]=la;sa=_+24|0;h[k>>3]=(+(ia>>>0)+4294967296.0*+(ka>>>0))/+(la|0);c[sa>>2]=c[k>>2];c[sa+4>>2]=c[k+4>>2];sa=_+32|0;h[k>>3]=ta/ja*100.0;c[sa>>2]=c[k>>2];c[sa+4>>2]=c[k+4>>2];La(1832,_|0)|0}if((ga|0)==5)a[b>>0]=a[536]|0;else if((ga|0)==14)Ta(va(1)|0,48,0);else if((ga|0)==41){fa=+(c[Z>>2]|0);ja=1.0/fa;r=c[q>>2]|0;if((r|0)<0)qa=0.0;else{q=0;qa=0.0;while(1){if(!q)s=0;else s=c[(c[p>>2]|0)+(q+ -1<<2)>>2]|0;if((q|0)==(r|0))t=o;else t=(c[p>>2]|0)+(q<<2)|0;qa=qa+ +S(+ja,+(+(q|0)))*+((c[t>>2]|0)-s|0);if((q|0)==(r|0))break;else q=q+1|0}}h[e+528>>3]=qa/fa;Rb(e,0);a[b>>0]=a[544]|0}else if((ga|0)==50)a[b>>0]=a[536]|0;else if((ga|0)==57){c[$>>2]=ka^1;sa=e+16|0;c[_+0>>2]=c[$+0>>2];Vb(e,_,sa);a[b>>0]=a[536]|0}else if((ga|0)==60)a[b>>0]=a[528]|0;b=c[j>>2]|0;if(!b){i=n;return}c[m>>2]=0;Td(b);c[j>>2]=0;c[l>>2]=0;i=n;return}function $b(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0.0,w=0,x=0,y=0,z=0.0,A=0,B=0;f=i;i=i+16|0;j=f;e=d+4|0;if(c[e>>2]|0)c[d+8>>2]=0;g=d+36|0;k=d+32|0;if((c[g>>2]|0)>0){l=d+16|0;m=0;do{a[(c[l>>2]|0)+(c[(c[k>>2]|0)+(m<<2)>>2]|0)>>0]=0;m=m+1|0}while((m|0)<(c[g>>2]|0))}if(c[k>>2]|0)c[g>>2]=0;k=d+492|0;if(!(a[k>>0]|0)){a[b>>0]=a[536]|0;i=f;return}l=d+152|0;y=l;y=ne(c[y>>2]|0,c[y+4>>2]|0,1,0)|0;c[l>>2]=y;c[l+4>>2]=F;z=+h[d+120>>3]*+(c[d+208>>2]|0);l=d+640|0;h[l>>3]=z;v=+(c[d+104>>2]|0);if(z<v)h[l>>3]=v;w=c[d+136>>2]|0;h[d+648>>3]=+(w|0);c[d+656>>2]=w;w=a[544]|0;l=d+44|0;if((c[l>>2]|0)>0){Ka(2288)|0;Ka(2368)|0;Ka(2448)|0;Ka(2528)|0;o=a[544]|0}else o=w;n=d+192|0;m=d+184|0;y=o&255;a:do if((y>>>1^1)&w<<24>>24==o<<24>>24|w&2&y){q=d+80|0;t=d+112|0;p=d+108|0;o=d+680|0;r=d+664|0;s=d+672|0;u=0;while(1){v=+h[t>>3];if(!(a[q>>0]|0))v=+S(+v,+(+(u|0)));else{y=u+1|0;if((u|0)>0){x=0;w=1;do{x=x+1|0;w=w<<1|1}while((w|0)<(y|0));y=w+ -1|0}else{x=0;y=0}if((y|0)!=(u|0)){w=u;do{A=y>>1;x=x+ -1|0;w=(w|0)%(A|0)|0;y=A+ -1|0}while((y|0)!=(w|0))}v=+S(+v,+(+(x|0)))}_b(j,d,~~(v*+(c[p>>2]|0)));w=a[j>>0]|0;if(a[o>>0]|0)break a;y=r;x=c[y+4>>2]|0;if((x|0)>=0?(A=n,B=c[A+4>>2]|0,!(B>>>0<x>>>0|((B|0)==(x|0)?(c[A>>2]|0)>>>0<(c[y>>2]|0)>>>0:0))):0)break a;y=s;x=c[y+4>>2]|0;if((x|0)>=0?(B=m,A=c[B+4>>2]|0,!(A>>>0<x>>>0|((A|0)==(x|0)?(c[B>>2]|0)>>>0<(c[y>>2]|0)>>>0:0))):0)break a;A=a[544]|0;B=A&255;if(!((B>>>1^1)&w<<24>>24==A<<24>>24|w&2&B))break;else u=u+1|0}}while(0);if((c[l>>2]|0)>0)Ka(2528)|0;A=a[528]|0;B=A&255;j=w&2;if(!((B>>>1^1)&w<<24>>24==A<<24>>24|j&B)){A=a[536]|0;B=A&255;if(((B>>>1^1)&w<<24>>24==A<<24>>24|j&B|0)!=0?(c[g>>2]|0)==0:0)a[k>>0]=0}else{g=d+540|0;jc(e,c[g>>2]|0);if((c[g>>2]|0)>0){j=d+332|0;k=0;do{a[(c[e>>2]|0)+k>>0]=a[(c[j>>2]|0)+k>>0]|0;k=k+1|0}while((k|0)<(c[g>>2]|0))}}Rb(d,0);a[b>>0]=w;i=f;return}function ac(b,e){b=b|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0;f=i;h=b+412|0;vc(h);k=b+540|0;if((c[k>>2]|0)>0){j=b+544|0;g=0;do{l=g<<1;n=c[h>>2]|0;m=n+(l*12|0)+4|0;if((c[m>>2]|0)>0){p=n+(l*12|0)|0;o=0;do{s=(c[p>>2]|0)+(o<<3)|0;n=c[s>>2]|0;q=c[j>>2]|0;r=q+(n<<2)|0;if(!(c[r>>2]&16)){t=wc(e,r)|0;c[s>>2]=t;c[r>>2]=c[r>>2]|16;c[q+(n+1<<2)>>2]=t}else c[s>>2]=c[q+(n+1<<2)>>2];o=o+1|0}while((o|0)<(c[m>>2]|0));m=c[h>>2]|0}else m=n;n=l|1;l=m+(n*12|0)+4|0;if((c[l>>2]|0)>0){r=m+(n*12|0)|0;q=0;do{m=(c[r>>2]|0)+(q<<3)|0;p=c[m>>2]|0;o=c[j>>2]|0;n=o+(p<<2)|0;if(!(c[n>>2]&16)){t=wc(e,n)|0;c[m>>2]=t;c[n>>2]=c[n>>2]|16;c[o+(p+1<<2)>>2]=t}else c[m>>2]=c[o+(p+1<<2)>>2];q=q+1|0}while((q|0)<(c[l>>2]|0))}g=g+1|0}while((g|0)<(c[k>>2]|0))}g=b+284|0;if((c[g>>2]|0)>0){l=b+280|0;k=b+396|0;j=b+544|0;h=b+332|0;m=0;do{r=c[k>>2]|0;p=r+(c[(c[l>>2]|0)+(m<<2)>>2]>>1<<3)|0;q=c[p>>2]|0;do if((q|0)!=-1){t=c[j>>2]|0;s=t+(q<<2)|0;o=(c[s>>2]&16|0)==0;if(o){u=c[t+(q+1<<2)>>2]|0;n=u>>1;u=(d[(c[h>>2]|0)+n>>0]|0)^u&1;w=a[528]|0;v=w&255;if(!((u&255)<<24>>24==w<<24>>24&(v>>>1^1)|v&2&u))break;w=c[r+(n<<3)>>2]|0;if(!((w|0)!=-1&(w|0)==(q|0)))break;if(o){w=wc(e,s)|0;c[p>>2]=w;c[s>>2]=c[s>>2]|16;c[t+(q+1<<2)>>2]=w;break}}c[p>>2]=c[t+(q+1<<2)>>2]}while(0);m=m+1|0}while((m|0)<(c[g>>2]|0))}g=b+272|0;n=c[g>>2]|0;if((n|0)>0){j=b+268|0;h=b+544|0;m=c[j>>2]|0;k=0;l=0;do{p=m+(k<<2)|0;o=c[p>>2]|0;r=c[h>>2]|0;q=r+(o<<2)|0;s=c[q>>2]|0;if((s&3|0)!=1){if(!(s&16)){n=wc(e,q)|0;c[p>>2]=n;c[q>>2]=c[q>>2]|16;c[r+(o+1<<2)>>2]=n;n=c[j>>2]|0;m=n;n=c[n+(k<<2)>>2]|0}else{n=c[r+(o+1<<2)>>2]|0;c[p>>2]=n}c[m+(l<<2)>>2]=n;n=c[g>>2]|0;l=l+1|0}k=k+1|0}while((k|0)<(n|0))}else{k=0;l=0}h=k-l|0;if((h|0)>0)c[g>>2]=n-h;g=b+260|0;m=c[g>>2]|0;if((m|0)>0){h=b+256|0;b=b+544|0;l=c[h>>2]|0;j=0;k=0;do{n=l+(j<<2)|0;p=c[n>>2]|0;o=c[b>>2]|0;r=o+(p<<2)|0;q=c[r>>2]|0;if((q&3|0)!=1){if(!(q&16)){m=wc(e,r)|0;c[n>>2]=m;c[r>>2]=c[r>>2]|16;c[o+(p+1<<2)>>2]=m;m=c[h>>2]|0;l=m;m=c[m+(j<<2)>>2]|0}else{m=c[o+(p+1<<2)>>2]|0;c[n>>2]=m}c[l+(k<<2)>>2]=m;m=c[g>>2]|0;k=k+1|0}j=j+1|0}while((j|0)<(m|0))}else{j=0;k=0}e=j-k|0;if((e|0)<=0){i=f;return}c[g>>2]=m-e;i=f;return}function bc(b){b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0;g=i;i=i+32|0;j=g;d=g+8|0;e=b+548|0;f=b+556|0;h=(c[e>>2]|0)-(c[f>>2]|0)|0;c[d+0>>2]=0;c[d+4>>2]=0;c[d+8>>2]=0;c[d+12>>2]=0;gc(d,h);h=d+16|0;a[h>>0]=0;ac(b,d);if((c[b+44>>2]|0)>1){k=c[d+4>>2]<<2;c[j>>2]=c[e>>2]<<2;c[j+4>>2]=k;La(1888,j|0)|0}a[b+560>>0]=a[h>>0]|0;h=b+544|0;j=c[h>>2]|0;if(j)Td(j);c[h>>2]=c[d>>2];c[e>>2]=c[d+4>>2];c[b+552>>2]=c[d+8>>2];c[f>>2]=c[d+12>>2];i=g;return}function cc(){var d=0,e=0,f=0;d=i;i=i+16|0;e=d;a[528]=0;a[536]=1;a[544]=2;xb(552,608,624,2136,2144);c[138]=2168;h[72]=0.0;h[73]=1.0;a[592]=0;a[593]=0;b[297]=b[e+0>>1]|0;b[298]=b[e+2>>1]|0;b[299]=b[e+4>>1]|0;h[75]=.95;xb(664,720,736,2136,2144);c[166]=2168;h[86]=0.0;h[87]=1.0;a[704]=0;a[705]=0;b[353]=b[e+0>>1]|0;b[354]=b[e+2>>1]|0;b[355]=b[e+4>>1]|0;h[89]=.999;xb(776,832,848,2136,2144);c[194]=2168;h[100]=0.0;h[101]=1.0;a[816]=1;a[817]=1;b[409]=b[e+0>>1]|0;b[410]=b[e+2>>1]|0;b[411]=b[e+4>>1]|0;h[103]=0.0;xb(936,992,1008,2136,2144);c[234]=2168;h[120]=0.0;h[121]=v;a[976]=0;a[977]=0;b[489]=b[e+0>>1]|0;b[490]=b[e+2>>1]|0;b[491]=b[e+4>>1]|0;h[123]=91648253.0;xb(1048,1080,1096,2136,2016);c[262]=280;f=1068|0;c[f>>2]=0;c[f+4>>2]=2;c[269]=2;xb(1160,1192,1208,2136,2016);c[290]=280;f=1180|0;c[f>>2]=0;c[f+4>>2]=2;c[297]=2;xb(1272,1296,1312,2136,1992);c[318]=160;a[1292]=0;xb(1344,1368,1376,2136,1992);c[336]=160;a[1364]=1;xb(1408,1440,1448,2136,2016);c[352]=280;f=1428|0;c[f>>2]=1;c[f+4>>2]=2147483647;c[359]=100;xb(1480,1536,1544,2136,2144);c[370]=2168;h[188]=1.0;h[189]=v;a[1520]=0;a[1521]=0;b[761]=b[e+0>>1]|0;b[762]=b[e+2>>1]|0;b[763]=b[e+4>>1]|0;h[191]=2.0;xb(1584,1640,1648,2136,2144);c[396]=2168;h[201]=0.0;h[202]=v;a[1624]=0;a[1625]=0;b[813]=b[e+0>>1]|0;b[814]=b[e+2>>1]|0;b[815]=b[e+4>>1]|0;h[204]=.2;xb(1728,1760,1776,2136,2016);c[432]=280;e=1748|0;c[e>>2]=0;c[e+4>>2]=2147483647;c[439]=0;i=d;return}function dc(a){a=a|0;var b=0;b=i;pd(a);i=b;return}function ec(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,j=0,k=0,l=0,m=0,n=0,o=0,q=0.0,r=0.0;e=i;i=i+16|0;j=e;g=e+8|0;if((a[d>>0]|0)!=45){o=0;i=e;return o|0}m=d+1|0;f=b+4|0;k=c[f>>2]|0;l=a[k>>0]|0;a:do if(l<<24>>24){n=0;while(1){o=n;n=n+1|0;if((a[m>>0]|0)!=l<<24>>24){b=0;break}l=a[k+n>>0]|0;m=d+(o+2)|0;if(!(l<<24>>24))break a}i=e;return b|0}while(0);if((a[m>>0]|0)!=61){o=0;i=e;return o|0}k=m+1|0;q=+ce(k,g);if(!(c[g>>2]|0)){o=0;i=e;return o|0}r=+h[b+32>>3];if(q>=r?(a[b+41>>0]|0)==0|q!=r:0){o=c[p>>2]|0;n=c[f>>2]|0;c[j>>2]=k;c[j+4>>2]=n;Za(o|0,2024,j|0)|0;ab(1)}r=+h[b+24>>3];if(q<=r?(a[b+40>>0]|0)==0|q!=r:0){o=c[p>>2]|0;n=c[f>>2]|0;c[j>>2]=k;c[j+4>>2]=n;Za(o|0,2080,j|0)|0;ab(1)}h[b+48>>3]=q;o=1;i=e;return o|0}function fc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,j=0,l=0.0,m=0,n=0.0,o=0.0,q=0;e=i;i=i+48|0;f=e;g=c[p>>2]|0;q=c[b+16>>2]|0;m=(a[b+40>>0]|0)!=0?91:40;o=+h[b+24>>3];n=+h[b+32>>3];j=(a[b+41>>0]|0)!=0?93:41;l=+h[b+48>>3];c[f>>2]=c[b+4>>2];c[f+4>>2]=q;c[f+8>>2]=m;m=f+12|0;h[k>>3]=o;c[m>>2]=c[k>>2];c[m+4>>2]=c[k+4>>2];m=f+20|0;h[k>>3]=n;c[m>>2]=c[k>>2];c[m+4>>2]=c[k+4>>2];c[f+28>>2]=j;j=f+32|0;h[k>>3]=l;c[j>>2]=c[k>>2];c[j+4>>2]=c[k+4>>2];Za(g|0,2232,f|0)|0;if(!d){i=e;return}c[f>>2]=c[b+8>>2];Za(g|0,2e3,f|0)|0;Sa(10,g|0)|0;i=e;return}function gc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0;d=i;e=a+8|0;f=c[e>>2]|0;if(f>>>0<b>>>0)h=f;else{i=d;return}while(1){if(h>>>0>=b>>>0)break;h=((h>>>3)+2+(h>>>1)&-2)+h|0;c[e>>2]=h;if(h>>>0<=f>>>0){g=4;break}}if((g|0)==4)Ta(va(1)|0,48,0);e=Ud(c[a>>2]|0,h<<2)|0;if((e|0)==0?(c[(Oa()|0)>>2]|0)==12:0)Ta(va(1)|0,48,0);c[a>>2]=e;i=d;return}function hc(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,h=0,j=0;b=i;e=a+32|0;d=c[e>>2]|0;if(d){c[a+36>>2]=0;Td(d);c[e>>2]=0;c[a+40>>2]=0}e=a+16|0;d=c[e>>2]|0;if(d){c[a+20>>2]=0;Td(d);c[e>>2]=0;c[a+24>>2]=0}e=c[a>>2]|0;if(!e){i=b;return}d=a+4|0;g=c[d>>2]|0;if((g|0)>0){f=0;do{j=e+(f*12|0)|0;h=c[j>>2]|0;if(h){c[e+(f*12|0)+4>>2]=0;Td(h);c[j>>2]=0;c[e+(f*12|0)+8>>2]=0;e=c[a>>2]|0;g=c[d>>2]|0}f=f+1|0}while((f|0)<(g|0))}c[d>>2]=0;Td(e);c[a>>2]=0;c[a+8>>2]=0;i=b;return}function ic(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0;f=i;i=i+16|0;e=f+4|0;d=f;l=c[b>>2]|0;h=l+1|0;g=a+4|0;if((c[g>>2]|0)<(h|0)){k=a+8|0;j=c[k>>2]|0;if((j|0)<(h|0)){m=l+2-j&-2;l=(j>>1)+2&-2;l=(m|0)>(l|0)?m:l;if((l|0)>(2147483647-j|0)){m=va(1)|0;Ta(m|0,48,0)}n=c[a>>2]|0;m=l+j|0;c[k>>2]=m;m=Ud(n,m*12|0)|0;c[a>>2]=m;if((m|0)==0?(c[(Oa()|0)>>2]|0)==12:0){n=va(1)|0;Ta(n|0,48,0)}}k=c[g>>2]|0;if((k|0)<(h|0)){j=c[a>>2]|0;do{l=j+(k*12|0)|0;if(l){c[l>>2]=0;c[j+(k*12|0)+4>>2]=0;c[j+(k*12|0)+8>>2]=0}k=k+1|0}while((k|0)!=(h|0))}c[g>>2]=h;l=c[b>>2]|0}g=c[a>>2]|0;if(!(c[g+(l*12|0)>>2]|0)){m=l;n=a+16|0;c[d>>2]=m;c[e+0>>2]=c[d+0>>2];sc(n,e,0);i=f;return}c[g+(l*12|0)+4>>2]=0;m=c[b>>2]|0;n=a+16|0;c[d>>2]=m;c[e+0>>2]=c[d+0>>2];sc(n,e,0);i=f;return}function jc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0;f=i;e=b+4|0;if((c[e>>2]|0)>=(d|0)){i=f;return}h=b+8|0;g=c[h>>2]|0;if((g|0)<(d|0)){k=d+1-g&-2;j=(g>>1)+2&-2;j=(k|0)>(j|0)?k:j;if((j|0)>(2147483647-g|0)){k=va(1)|0;Ta(k|0,48,0)}l=c[b>>2]|0;k=j+g|0;c[h>>2]=k;k=Ud(l,k)|0;c[b>>2]=k;if((k|0)==0?(c[(Oa()|0)>>2]|0)==12:0){l=va(1)|0;Ta(l|0,48,0)}}g=c[e>>2]|0;if((g|0)<(d|0)){b=c[b>>2]|0;do{h=b+g|0;if(h)a[h>>0]=0;g=g+1|0}while((g|0)!=(d|0))}c[e>>2]=d;i=f;return}function kc(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0;h=i;g=d+1|0;f=b+4|0;if((c[f>>2]|0)>=(g|0)){l=c[b>>2]|0;l=l+d|0;a[l>>0]=e;i=h;return}k=b+8|0;j=c[k>>2]|0;if((j|0)<(g|0)){m=d+2-j&-2;l=(j>>1)+2&-2;l=(m|0)>(l|0)?m:l;if((l|0)>(2147483647-j|0)){m=va(1)|0;Ta(m|0,48,0)}n=c[b>>2]|0;m=l+j|0;c[k>>2]=m;m=Ud(n,m)|0;c[b>>2]=m;if((m|0)==0?(c[(Oa()|0)>>2]|0)==12:0){n=va(1)|0;Ta(n|0,48,0)}}j=c[f>>2]|0;if((j|0)<(g|0))do{k=(c[b>>2]|0)+j|0;if(k)a[k>>0]=0;j=j+1|0}while((j|0)!=(g|0));c[f>>2]=g;n=c[b>>2]|0;n=n+d|0;a[n>>0]=e;i=h;return}function lc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,j=0,k=0,l=0,m=0,n=0,o=0;d=i;i=i+16|0;g=d;c[g>>2]=b;j=a+12|0;f=b+1|0;e=a+16|0;if((c[e>>2]|0)<(f|0)){l=a+20|0;k=c[l>>2]|0;if((k|0)<(f|0)){n=b+2-k&-2;m=(k>>1)+2&-2;m=(n|0)>(m|0)?n:m;if((m|0)>(2147483647-k|0)){n=va(1)|0;Ta(n|0,48,0)}o=c[j>>2]|0;n=m+k|0;c[l>>2]=n;n=Ud(o,n<<2)|0;c[j>>2]=n;if((n|0)==0?(c[(Oa()|0)>>2]|0)==12:0){o=va(1)|0;Ta(o|0,48,0)}}k=c[e>>2]|0;if((f|0)>(k|0))ke((c[j>>2]|0)+(k<<2)|0,-1,f-k<<2|0)|0;c[e>>2]=f}c[(c[j>>2]|0)+(b<<2)>>2]=c[a+4>>2];nc(a,g);e=c[j>>2]|0;g=c[e+(b<<2)>>2]|0;b=c[a>>2]|0;f=c[b+(g<<2)>>2]|0;if(!g){n=0;o=b+(n<<2)|0;c[o>>2]=f;o=e+(f<<2)|0;c[o>>2]=n;i=d;return}a=a+28|0;while(1){j=g;g=g+ -1>>1;k=b+(g<<2)|0;l=c[k>>2]|0;o=c[c[a>>2]>>2]|0;if(!(+h[o+(f<<3)>>3]>+h[o+(l<<3)>>3])){a=14;break}c[b+(j<<2)>>2]=l;c[e+(c[k>>2]<<2)>>2]=j;if(!g){j=0;a=14;break}}if((a|0)==14){o=b+(j<<2)|0;c[o>>2]=f;o=e+(f<<2)|0;c[o>>2]=j;i=d;return}}function mc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0;d=i;e=a+4|0;f=c[e>>2]|0;g=a+8|0;h=c[g>>2]|0;if((f|0)==(h|0)&(h|0)<(f+1|0)){h=(f>>1)+2&-2;h=(h|0)<2?2:h;if((h|0)>(2147483647-f|0)){h=va(1)|0;Ta(h|0,48,0)}j=c[a>>2]|0;f=h+f|0;c[g>>2]=f;f=Ud(j,f<<2)|0;c[a>>2]=f;if((f|0)==0?(c[(Oa()|0)>>2]|0)==12:0){j=va(1)|0;Ta(j|0,48,0)}}else f=c[a>>2]|0;j=c[e>>2]|0;c[e>>2]=j+1;e=f+(j<<2)|0;if(!e){i=d;return}c[e>>2]=c[b>>2];i=d;return}function nc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0;d=i;e=a+4|0;f=c[e>>2]|0;g=a+8|0;h=c[g>>2]|0;if((f|0)==(h|0)&(h|0)<(f+1|0)){h=(f>>1)+2&-2;h=(h|0)<2?2:h;if((h|0)>(2147483647-f|0)){h=va(1)|0;Ta(h|0,48,0)}j=c[a>>2]|0;f=h+f|0;c[g>>2]=f;f=Ud(j,f<<2)|0;c[a>>2]=f;if((f|0)==0?(c[(Oa()|0)>>2]|0)==12:0){j=va(1)|0;Ta(j|0,48,0)}}else f=c[a>>2]|0;j=c[e>>2]|0;c[e>>2]=j+1;e=f+(j<<2)|0;if(!e){i=d;return}c[e>>2]=c[b>>2];i=d;return}function oc(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;e=i;i=i+16|0;f=e+2|0;h=e+1|0;g=e;if((d|0)<16){g=d+ -1|0;if((g|0)>0)h=0;else{i=e;return}do{f=h;h=h+1|0;if((h|0)<(d|0)){k=f;j=h;do{k=(c[b+(j<<2)>>2]|0)<(c[b+(k<<2)>>2]|0)?j:k;j=j+1|0}while((j|0)!=(d|0))}else k=f;n=b+(f<<2)|0;o=c[n>>2]|0;p=b+(k<<2)|0;c[n>>2]=c[p>>2];c[p>>2]=o}while((h|0)!=(g|0));i=e;return}j=c[b+(((d|0)/2|0)<<2)>>2]|0;m=-1;n=d;while(1){do{m=m+1|0;l=b+(m<<2)|0;k=c[l>>2]|0}while((k|0)<(j|0));do{n=n+ -1|0;o=b+(n<<2)|0;p=c[o>>2]|0}while((j|0)<(p|0));if((m|0)>=(n|0))break;c[l>>2]=p;c[o>>2]=k}a[f+0>>0]=a[h+0>>0]|0;oc(b,m,f);p=d-m|0;a[f+0>>0]=a[g+0>>0]|0;oc(l,p,f);i=e;return}function pc(a,b,e){a=a|0;b=b|0;e=e|0;var f=0,h=0,j=0,k=0,l=0,m=0;f=i;k=e&1;j=d[a+16>>0]|0|k;h=b+4|0;l=((j+(c[h>>2]|0)<<2)+4|0)>>>2;m=a+4|0;gc(a,l+(c[m>>2]|0)|0);e=c[m>>2]|0;l=l+e|0;c[m>>2]=l;if(l>>>0<e>>>0)Ta(va(1)|0,48,0);a=(c[a>>2]|0)+(e<<2)|0;if(!a){i=f;return e|0}j=j<<3|k<<2;c[a>>2]=c[a>>2]&-32|j;j=c[h>>2]<<5|j;c[a>>2]=j;if((c[h>>2]|0)>0){j=c[b>>2]|0;b=0;do{c[a+(b<<2)+4>>2]=c[j+(b<<2)>>2];b=b+1|0}while((b|0)<(c[h>>2]|0));j=c[a>>2]|0}if(!(j&8)){i=f;return e|0}h=j>>>5;if(j&4){g[a+(h<<2)+4>>2]=0.0;i=f;return e|0}if(!h){h=0;j=0}else{j=0;b=0;do{j=1<<((c[a+(b<<2)+4>>2]|0)>>>1&31)|j;b=b+1|0}while((b|0)<(h|0))}c[a+(h<<2)+4>>2]=j;i=f;return e|0}function qc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0;d=i;e=a+4|0;f=c[e>>2]|0;g=a+8|0;h=c[g>>2]|0;if((f|0)==(h|0)&(h|0)<(f+1|0)){h=(f>>1)+2&-2;h=(h|0)<2?2:h;if((h|0)>(2147483647-f|0)){h=va(1)|0;Ta(h|0,48,0)}j=c[a>>2]|0;f=h+f|0;c[g>>2]=f;f=Ud(j,f<<3)|0;c[a>>2]=f;if((f|0)==0?(c[(Oa()|0)>>2]|0)==12:0){j=va(1)|0;Ta(j|0,48,0)}}else f=c[a>>2]|0;j=c[e>>2]|0;c[e>>2]=j+1;e=f+(j<<3)|0;if(!e){i=d;return}g=b;h=c[g+4>>2]|0;j=e;c[j>>2]=c[g>>2];c[j+4>>2]=h;i=d;return}function rc(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0.0,r=0.0,s=0;b=i;d=c[a>>2]|0;f=c[d>>2]|0;k=a+4|0;o=c[d+((c[k>>2]|0)+ -1<<2)>>2]|0;c[d>>2]=o;e=c[a+12>>2]|0;c[e+(o<<2)>>2]=0;c[e+(f<<2)>>2]=-1;o=(c[k>>2]|0)+ -1|0;c[k>>2]=o;if((o|0)<=1){i=b;return f|0}g=c[d>>2]|0;l=a+28|0;a=0;m=1;while(1){n=(a<<1)+2|0;if((n|0)<(o|0)){p=c[d+(n<<2)>>2]|0;s=c[d+(m<<2)>>2]|0;o=c[c[l>>2]>>2]|0;q=+h[o+(p<<3)>>3];r=+h[o+(s<<3)>>3];if(!(q>r)){p=s;q=r;j=6}}else{o=c[c[l>>2]>>2]|0;j=c[d+(m<<2)>>2]|0;p=j;q=+h[o+(j<<3)>>3];j=6}if((j|0)==6){j=0;n=m}if(!(q>+h[o+(g<<3)>>3]))break;c[d+(a<<2)>>2]=p;c[e+(p<<2)>>2]=a;m=n<<1|1;o=c[k>>2]|0;if((m|0)>=(o|0)){a=n;break}else a=n}c[d+(a<<2)>>2]=g;c[e+(g<<2)>>2]=a;i=b;return f|0}function sc(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0;f=i;k=c[d>>2]|0;d=k+1|0;g=b+4|0;if((c[g>>2]|0)>=(d|0)){i=f;return}j=b+8|0;h=c[j>>2]|0;if((h|0)<(d|0)){l=k+2-h&-2;k=(h>>1)+2&-2;k=(l|0)>(k|0)?l:k;if((k|0)>(2147483647-h|0)){l=va(1)|0;Ta(l|0,48,0)}m=c[b>>2]|0;l=k+h|0;c[j>>2]=l;l=Ud(m,l)|0;c[b>>2]=l;if((l|0)==0?(c[(Oa()|0)>>2]|0)==12:0){m=va(1)|0;Ta(m|0,48,0)}}h=c[g>>2]|0;if((h|0)<(d|0))do{a[(c[b>>2]|0)+h>>0]=e;h=h+1|0}while((h|0)!=(d|0));c[g>>2]=d;i=f;return}function tc(a,b,d){a=a|0;b=b|0;d=d|0;var e=0,f=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0;e=i;i=i+16|0;h=e+8|0;f=e+4|0;j=e;if((b|0)<16){f=b+ -1|0;if((f|0)<=0){i=e;return}h=c[d>>2]|0;d=0;do{j=d;d=d+1|0;if((d|0)<(b|0)){k=c[h>>2]|0;m=j;l=d;do{n=k+(c[a+(l<<2)>>2]<<2)|0;u=c[n>>2]|0;q=u>>>5;if(u>>>0>95){o=k+(c[a+(m<<2)>>2]<<2)|0;p=(c[o>>2]|0)>>>5;if((p|0)==2)m=l;else m=+g[n+(q<<2)+4>>2]<+g[o+(p<<2)+4>>2]?l:m}l=l+1|0}while((l|0)!=(b|0))}else m=j;s=a+(j<<2)|0;t=c[s>>2]|0;u=a+(m<<2)|0;c[s>>2]=c[u>>2];c[u>>2]=t}while((d|0)!=(f|0));i=e;return}k=c[a+(((b|0)/2|0)<<2)>>2]|0;q=-1;o=b;while(1){t=q+1|0;p=a+(t<<2)|0;u=c[p>>2]|0;l=c[d>>2]|0;m=c[l>>2]|0;s=m+(u<<2)|0;r=c[s>>2]|0;q=m+(k<<2)|0;n=c[q>>2]|0;a:do if(r>>>0>95)while(1){v=n>>>5;if((v|0)!=2?!(+g[s+(r>>>5<<2)+4>>2]<+g[q+(v<<2)+4>>2]):0){q=t;break a}t=t+1|0;p=a+(t<<2)|0;u=c[p>>2]|0;s=m+(u<<2)|0;r=c[s>>2]|0;if(r>>>0<=95){q=t;break}}else q=t;while(0);o=o+ -1|0;s=a+(o<<2)|0;r=m+(k<<2)|0;b:do if(n>>>0>95)while(1){t=m+(c[s>>2]<<2)|0;v=(c[t>>2]|0)>>>5;if((v|0)!=2?!(+g[r+(n>>>5<<2)+4>>2]<+g[t+(v<<2)+4>>2]):0)break b;v=o+ -1|0;s=a+(v<<2)|0;o=v}while(0);if((q|0)>=(o|0))break;c[p>>2]=c[s>>2];c[s>>2]=u}c[f>>2]=l;c[h+0>>2]=c[f+0>>2];tc(a,q,h);v=b-q|0;c[j>>2]=l;c[h+0>>2]=c[j+0>>2];tc(p,v,h);i=e;return}function uc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0.0,r=0.0,s=0;e=i;f=a+4|0;j=c[f>>2]|0;g=c[a>>2]|0;if((j|0)>0){l=c[a+12>>2]|0;k=0;do{c[l+(c[g+(k<<2)>>2]<<2)>>2]=-1;k=k+1|0;j=c[f>>2]|0}while((k|0)<(j|0))}if(g){c[f>>2]=0;j=0}g=b+4|0;if((c[g>>2]|0)>0){k=a+12|0;j=0;do{s=(c[b>>2]|0)+(j<<2)|0;c[(c[k>>2]|0)+(c[s>>2]<<2)>>2]=j;nc(a,s);j=j+1|0}while((j|0)<(c[g>>2]|0));j=c[f>>2]|0}if((j|0)<=1){i=e;return}g=c[a>>2]|0;b=a+28|0;a=a+12|0;o=j;k=(j|0)/2|0;while(1){k=k+ -1|0;j=c[g+(k<<2)>>2]|0;m=k<<1|1;a:do if((m|0)<(o|0)){l=k;while(1){n=(l<<1)+2|0;if((n|0)<(o|0)){p=c[g+(n<<2)>>2]|0;s=c[g+(m<<2)>>2]|0;o=c[c[b>>2]>>2]|0;q=+h[o+(p<<3)>>3];r=+h[o+(s<<3)>>3];if(!(q>r)){p=s;q=r;d=16}}else{o=c[c[b>>2]>>2]|0;d=c[g+(m<<2)>>2]|0;p=d;q=+h[o+(d<<3)>>3];d=16}if((d|0)==16){d=0;n=m}if(!(q>+h[o+(j<<3)>>3]))break a;c[g+(l<<2)>>2]=p;c[(c[a>>2]|0)+(p<<2)>>2]=l;m=n<<1|1;o=c[f>>2]|0;if((m|0)>=(o|0)){l=n;break}else l=n}}else l=k;while(0);c[g+(l<<2)>>2]=j;c[(c[a>>2]|0)+(j<<2)>>2]=l;if((k|0)<=0)break;o=c[f>>2]|0}i=e;return}function vc(b){b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0;e=i;d=b+36|0;l=c[d>>2]|0;f=b+32|0;n=c[f>>2]|0;if((l|0)>0){h=b+16|0;g=b+44|0;j=0;do{k=n+(j<<2)|0;m=c[k>>2]|0;if(a[(c[h>>2]|0)+m>>0]|0){n=c[b>>2]|0;l=n+(m*12|0)+4|0;p=c[l>>2]|0;if((p|0)>0){m=n+(m*12|0)|0;n=0;o=0;do{q=c[m>>2]|0;r=q+(n<<3)|0;if((c[(c[c[g>>2]>>2]|0)+(c[r>>2]<<2)>>2]&3|0)!=1){s=r;r=c[s+4>>2]|0;p=q+(o<<3)|0;c[p>>2]=c[s>>2];c[p+4>>2]=r;p=c[l>>2]|0;o=o+1|0}n=n+1|0}while((n|0)<(p|0))}else{n=0;o=0}m=n-o|0;if((m|0)>0)c[l>>2]=p-m;a[(c[h>>2]|0)+(c[k>>2]|0)>>0]=0;l=c[d>>2]|0;n=c[f>>2]|0}j=j+1|0}while((j|0)<(l|0))}if(!n){i=e;return}c[d>>2]=0;i=e;return}function wc(a,b){a=a|0;b=b|0;var e=0,f=0,h=0,j=0,k=0;f=i;j=c[b>>2]|0;h=j>>>2&1|(d[a+16>>0]|0);j=((h+(j>>>5)<<2)+4|0)>>>2;k=a+4|0;gc(a,j+(c[k>>2]|0)|0);e=c[k>>2]|0;j=j+e|0;c[k>>2]=j;if(j>>>0<e>>>0)Ta(va(1)|0,48,0);a=(c[a>>2]|0)+(e<<2)|0;if(!a){i=f;return e|0}h=c[b>>2]&-9|h<<3;c[a>>2]=h;if((c[b>>2]|0)>>>0>31){h=0;do{c[a+(h<<2)+4>>2]=c[b+(h<<2)+4>>2];h=h+1|0}while((h|0)<((c[b>>2]|0)>>>5|0));h=c[a>>2]|0}if(!(h&8)){i=f;return e|0}j=h>>>5;b=b+(j<<2)+4|0;if(!(h&4)){c[a+(j<<2)+4>>2]=c[b>>2];i=f;return e|0}else{g[a+(j<<2)+4>>2]=+g[b>>2];i=f;return e|0}return 0}function xc(b){b=b|0;var d=0,e=0,f=0,g=0,j=0,k=0;d=i;i=i+16|0;g=d;Gb(b);c[b>>2]=3424;c[b+684>>2]=c[719];c[b+688>>2]=c[747];c[b+692>>2]=c[785];h[b+696>>3]=+h[411];a[b+704>>0]=a[2652]|0;a[b+705>>0]=a[2724]|0;a[b+706>>0]=a[2804]|0;a[b+707>>0]=1;c[b+708>>2]=0;c[b+712>>2]=0;c[b+716>>2]=0;c[b+720>>2]=1;a[b+724>>0]=1;e=b+732|0;k=b+544|0;c[b+760>>2]=0;c[b+764>>2]=0;c[b+768>>2]=0;c[b+776>>2]=0;c[b+780>>2]=0;c[b+784>>2]=0;c[b+792>>2]=0;c[b+796>>2]=0;c[b+800>>2]=0;j=b+804|0;c[e+0>>2]=0;c[e+4>>2]=0;c[e+8>>2]=0;c[e+12>>2]=0;c[e+16>>2]=0;c[e+20>>2]=0;c[j>>2]=k;j=b+808|0;c[j>>2]=0;c[b+812>>2]=0;c[b+816>>2]=0;e=b+824|0;c[e+0>>2]=0;c[e+4>>2]=0;c[e+8>>2]=0;c[e+12>>2]=0;c[e+16>>2]=0;c[e+20>>2]=0;c[b+852>>2]=j;Qc(b+856|0,1);j=b+868|0;e=b+892|0;c[b+920>>2]=0;c[b+924>>2]=0;c[j+0>>2]=0;c[j+4>>2]=0;c[j+8>>2]=0;c[j+12>>2]=0;c[j+16>>2]=0;c[e+0>>2]=0;c[e+4>>2]=0;c[e+8>>2]=0;c[e+12>>2]=0;c[e+16>>2]=0;c[e+20>>2]=0;e=g+4|0;c[e>>2]=0;j=g+8|0;c[j>>2]=2;f=Ud(0,8)|0;c[g>>2]=f;if((f|0)==0?(c[(Oa()|0)>>2]|0)==12:0)Ta(va(1)|0,48,0);c[f>>2]=-2;c[e>>2]=1;a[b+560>>0]=1;c[b+928>>2]=pc(k,g,0)|0;a[b+536>>0]=0;if(!f){i=d;return}c[e>>2]=0;Td(f);c[g>>2]=0;c[j>>2]=0;i=d;return}function yc(a){a=a|0;var b=0;b=i;zc(a);pd(a);i=b;return}function zc(a){a=a|0;var b=0,d=0,e=0;b=i;c[a>>2]=3424;d=a+904|0;e=c[d>>2]|0;if(e){c[a+908>>2]=0;Td(e);c[d>>2]=0;c[a+912>>2]=0}d=a+892|0;e=c[d>>2]|0;if(e){c[a+896>>2]=0;Td(e);c[d>>2]=0;c[a+900>>2]=0}d=a+876|0;e=c[d>>2]|0;if(e){c[a+880>>2]=0;Td(e);c[d>>2]=0;c[a+884>>2]=0}d=a+856|0;e=c[d>>2]|0;if(e){c[a+860>>2]=0;Td(e);c[d>>2]=0;c[a+864>>2]=0}e=a+836|0;d=c[e>>2]|0;if(d){c[a+840>>2]=0;Td(d);c[e>>2]=0;c[a+844>>2]=0}d=a+824|0;e=c[d>>2]|0;if(e){c[a+828>>2]=0;Td(e);c[d>>2]=0;c[a+832>>2]=0}d=a+808|0;e=c[d>>2]|0;if(e){c[a+812>>2]=0;Td(e);c[d>>2]=0;c[a+816>>2]=0}Rc(a+760|0);d=a+744|0;e=c[d>>2]|0;if(e){c[a+748>>2]=0;Td(e);c[d>>2]=0;c[a+752>>2]=0}d=a+732|0;e=c[d>>2]|0;if(!e){Ib(a);i=b;return}c[a+736>>2]=0;Td(e);c[d>>2]=0;c[a+740>>2]=0;Ib(a);i=b;return}function Ac(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0;f=i;i=i+32|0;h=f+12|0;k=f+8|0;l=f+16|0;g=f+4|0;j=f;a[l>>0]=a[d>>0]|0;a[h+0>>0]=a[l+0>>0]|0;e=Jb(b,h,e)|0;c[k>>2]=e;kc(b+876|0,e,0);kc(b+904|0,e,0);if(!(a[b+724>>0]|0)){i=f;return e|0}l=b+808|0;d=e<<1;c[g>>2]=d;c[h+0>>2]=c[g+0>>2];Sc(l,h,0);c[j>>2]=d|1;c[h+0>>2]=c[j+0>>2];Sc(l,h,0);Tc(b+760|0,k);kc(b+744|0,e,0);Uc(b+824|0,e);i=f;return e|0}function Bc(b,e,f,g){b=b|0;e=e|0;f=f|0;g=g|0;var h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0;k=i;i=i+32|0;h=k+4|0;r=k;p=k+16|0;c[h>>2]=0;j=h+4|0;c[j>>2]=0;l=h+8|0;c[l>>2]=0;s=a[2608]|0;a[b>>0]=s;m=e+724|0;f=(d[m>>0]&(f&1)|0)!=0;if(f){u=e+308|0;x=c[u>>2]|0;if((x|0)>0){t=e+304|0;s=e+876|0;v=0;do{w=c[(c[t>>2]|0)+(v<<2)>>2]>>1;c[r>>2]=w;w=(c[s>>2]|0)+w|0;if(!(a[w>>0]|0)){a[w>>0]=1;nc(h,r);x=c[u>>2]|0}v=v+1|0}while((v|0)<(x|0))}r=(Cc(e,g)|0)&1^1;a[b>>0]=r;g=a[2608]|0}else{g=s;r=s}x=g&255;if(!((x>>>1^1)&r<<24>>24==g<<24>>24|x&2&(r&255))){if((c[e+44>>2]|0)>0)Ka(3760)|0}else{$b(p,e);r=a[p>>0]|0;a[b>>0]=r}w=a[2608]|0;x=w&255;if((((x>>>1^1)&r<<24>>24==w<<24>>24|x&2&(r&255)|0)!=0?(a[e+707>>0]|0)!=0:0)?(q=(c[e+736>>2]|0)+ -1|0,(q|0)>0):0){b=e+732|0;p=e+4|0;do{g=c[b>>2]|0;u=c[g+(q<<2)>>2]|0;v=q+ -1|0;w=c[g+(v<<2)>>2]|0;q=c[p>>2]|0;a:do if((u|0)>1){s=a[2616]|0;r=s&255;t=r&2;r=r>>>1^1;x=v;while(1){w=d[q+(w>>1)>>0]^w&1;v=u+ -1|0;if(!((w&255)<<24>>24==s<<24>>24&r|t&w))break a;u=x+ -1|0;w=c[g+(u<<2)>>2]|0;if((v|0)>1){x=u;u=v}else{x=u;u=v;o=20;break}}}else{x=v;o=20}while(0);if((o|0)==20){o=0;a[q+(w>>1)>>0]=(w&1^1)&255^1}q=x-u|0}while((q|0)>0)}if(f?(n=c[j>>2]|0,(n|0)>0):0){o=c[h>>2]|0;f=e+876|0;p=0;do{b=c[o+(p<<2)>>2]|0;a[(c[f>>2]|0)+b>>0]=0;if(a[m>>0]|0)Vc(e,b);p=p+1|0}while((p|0)<(n|0))}e=c[h>>2]|0;if(!e){i=k;return}c[j>>2]=0;Td(e);c[h>>2]=0;c[l>>2]=0;i=k;return}function Cc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,j=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,G=0,H=0,I=0,J=0;m=i;i=i+16|0;j=m;if(!(Zb(b)|0)){H=0;i=m;return H|0}l=b+724|0;if(!(a[l>>0]|0)){H=1;i=m;return H|0}x=b+924|0;v=b+872|0;w=b+868|0;u=b+860|0;r=b+680|0;y=b+824|0;g=b+828|0;o=b+836|0;z=b+904|0;A=b+332|0;e=b+44|0;B=b+704|0;D=b+706|0;E=b+696|0;p=b+556|0;q=b+548|0;C=b+876|0;s=b+920|0;t=b+284|0;a:while(1){if(((c[x>>2]|0)<=0?(c[s>>2]|0)>=(c[t>>2]|0):0)?(c[g>>2]|0)<=0:0)break;Ic(b);G=c[v>>2]|0;H=c[w>>2]|0;F=G-H|0;if((G|0)<(H|0))F=(c[u>>2]|0)+F|0;if(!((F|0)<=0?(c[s>>2]|0)>=(c[t>>2]|0):0))n=11;if((n|0)==11?(n=0,!(Jc(b,1)|0)):0){n=12;break}H=c[g>>2]|0;if(a[r>>0]|0){n=15;break}if(!H)continue;else F=0;while(1){J=c[y>>2]|0;G=c[J>>2]|0;I=c[J+(H+ -1<<2)>>2]|0;c[J>>2]=I;H=c[o>>2]|0;c[H+(I<<2)>>2]=0;c[H+(G<<2)>>2]=-1;H=(c[g>>2]|0)+ -1|0;c[g>>2]=H;if((H|0)>1)Wc(y,0);if(a[r>>0]|0)continue a;if((a[(c[z>>2]|0)+G>>0]|0)==0?(I=a[(c[A>>2]|0)+G>>0]|0,H=a[2624]|0,J=H&255,((J>>>1^1)&I<<24>>24==H<<24>>24|I&2&J|0)!=0):0){if((c[e>>2]|0)>1&((F|0)%100|0|0)==0){c[j>>2]=c[g>>2];La(3504,j|0)|0}if(a[B>>0]|0){J=(c[C>>2]|0)+G|0;H=a[J>>0]|0;a[J>>0]=1;if(!(Lc(b,G)|0)){n=29;break a}a[(c[C>>2]|0)+G>>0]=H<<24>>24!=0&1}if((((a[D>>0]|0)!=0?(I=a[(c[A>>2]|0)+G>>0]|0,H=a[2624]|0,J=H&255,((J>>>1^1)&I<<24>>24==H<<24>>24|I&2&J|0)!=0):0)?(a[(c[C>>2]|0)+G>>0]|0)==0:0)?!(Mc(b,G)|0):0){n=35;break a}if(+((c[p>>2]|0)>>>0)>+h[E>>3]*+((c[q>>2]|0)>>>0))gb[c[(c[b>>2]|0)+8>>2]&31](b)}H=c[g>>2]|0;if(!H)continue a;else F=F+1|0}}do if((n|0)==12)a[b+492>>0]=0;else if((n|0)==15){r=c[b+824>>2]|0;if((H|0)<=0){if(!r)break}else{t=c[o>>2]|0;s=0;do{c[t+(c[r+(s<<2)>>2]<<2)>>2]=-1;s=s+1|0}while((s|0)<(c[g>>2]|0))}c[g>>2]=0}else if((n|0)==29)a[b+492>>0]=0;else if((n|0)==35)a[b+492>>0]=0;while(0);if(!d){if(+((c[p>>2]|0)>>>0)>+h[b+96>>3]*+((c[q>>2]|0)>>>0))gb[c[(c[b>>2]|0)+8>>2]&31](b)}else{d=b+744|0;p=c[d>>2]|0;if(p){c[b+748>>2]=0;Td(p);c[d>>2]=0;c[b+752>>2]=0}Xc(b+760|0,1);d=b+808|0;p=c[d>>2]|0;if(p){c[b+812>>2]=0;Td(p);c[d>>2]=0;c[b+816>>2]=0}p=b+824|0;d=c[p>>2]|0;if((c[g>>2]|0)<=0){if(d)n=48}else{n=c[o>>2]|0;o=0;do{c[n+(c[d+(o<<2)>>2]<<2)>>2]=-1;o=o+1|0}while((o|0)<(c[g>>2]|0));n=48}if((n|0)==48){c[g>>2]=0;Td(d);c[p>>2]=0;c[b+832>>2]=0}Yc(b+856|0,1);a[l>>0]=0;a[b+536>>0]=1;a[b+560>>0]=0;c[b+728>>2]=c[b+540>>2];Yb(b);gb[c[(c[b>>2]|0)+8>>2]&31](b)}if((c[e>>2]|0)>0?(f=c[b+736>>2]|0,(f|0)>0):0){h[k>>3]=+(f<<2>>>0)*9.5367431640625e-7;c[j>>2]=c[k>>2];c[j+4>>2]=c[k+4>>2];La(3528,j|0)|0}J=(a[b+492>>0]|0)!=0;i=m;return J|0}function Dc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0;e=i;i=i+16|0;g=e;j=b+256|0;k=b+260|0;h=c[k>>2]|0;if((a[b+705>>0]|0)!=0?Ec(b,d)|0:0){p=1;i=e;return p|0}if(!(Kb(b,d)|0)){p=0;i=e;return p|0}if(!(a[b+724>>0]|0)){p=1;i=e;return p|0}d=c[k>>2]|0;if((d|0)!=(h+1|0)){p=1;i=e;return p|0}p=c[(c[j>>2]|0)+(d+ -1<<2)>>2]|0;c[g>>2]=p;m=(c[b+544>>2]|0)+(p<<2)|0;Zc(b+856|0,p);if((c[m>>2]|0)>>>0<=31){p=1;i=e;return p|0}l=b+760|0;k=b+808|0;j=b+744|0;h=b+924|0;d=b+824|0;n=b+840|0;b=b+836|0;o=0;do{p=m+(o<<2)+4|0;_c((c[l>>2]|0)+((c[p>>2]>>1)*12|0)|0,g);q=(c[k>>2]|0)+(c[p>>2]<<2)|0;c[q>>2]=(c[q>>2]|0)+1;a[(c[j>>2]|0)+(c[p>>2]>>1)>>0]=1;c[h>>2]=(c[h>>2]|0)+1;p=c[p>>2]>>1;if((c[n>>2]|0)>(p|0)?(f=c[(c[b>>2]|0)+(p<<2)>>2]|0,(f|0)>-1):0)Wc(d,f);o=o+1|0}while((o|0)<((c[m>>2]|0)>>>5|0));f=1;i=e;return f|0}function Ec(b,e){b=b|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0;k=i;i=i+16|0;h=k+8|0;j=k+4|0;g=k;c[j>>2]=c[b+284>>2];nc(b+292|0,j);j=e+4|0;m=c[j>>2]|0;a:do if((m|0)>0){f=b+332|0;l=0;while(1){n=c[(c[e>>2]|0)+(l<<2)>>2]|0;p=d[(c[f>>2]|0)+(n>>1)>>0]|0;q=p^n&1;o=q&255;s=a[2608]|0;r=s&255;if(o<<24>>24==s<<24>>24&(r>>>1^1)|r&2&q)break;r=a[2616]|0;s=r&255;if(!((s>>>1^1)&o<<24>>24==r<<24>>24|p&2&s)){c[g>>2]=n^1;c[h+0>>2]=c[g+0>>2];Lb(b,h,-1);m=c[j>>2]|0}l=l+1|0;if((l|0)>=(m|0))break a}Rb(b,0);s=1;i=k;return s|0}while(0);s=(Mb(b)|0)!=-1;Rb(b,0);i=k;return s|0}function Fc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0;e=i;i=i+16|0;g=e;f=(c[b+544>>2]|0)+(d<<2)|0;if(!(a[b+724>>0]|0)){Pb(b,d);i=e;return}if((c[f>>2]|0)>>>0<=31){Pb(b,d);i=e;return}j=b+808|0;k=b+776|0;h=b+792|0;l=0;do{m=f+(l<<2)+4|0;n=(c[j>>2]|0)+(c[m>>2]<<2)|0;c[n>>2]=(c[n>>2]|0)+ -1;Vc(b,c[m>>2]>>1);m=c[m>>2]>>1;c[g>>2]=m;m=(c[k>>2]|0)+m|0;if(!(a[m>>0]|0)){a[m>>0]=1;nc(h,g)}l=l+1|0}while((l|0)<((c[f>>2]|0)>>>5|0));Pb(b,d);i=e;return}function Gc(b,e,f){b=b|0;e=e|0;f=f|0;var g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0;g=i;i=i+16|0;j=g+4|0;h=g;l=c[b+544>>2]|0;k=l+(e<<2)|0;Zc(b+856|0,e);if((c[k>>2]&-32|0)==64){Fc(b,e);p=c[f>>2]|0;f=c[k>>2]|0;a:do if(f>>>0>31){m=f>>>5;n=0;while(1){o=n+1|0;if((c[k+(n<<2)+4>>2]|0)==(p|0)){o=n;break a}if((o|0)<(m|0))n=o;else break}}else{m=0;o=0}while(0);n=m+ -1|0;if((o|0)<(n|0))do{f=o;o=o+1|0;c[k+(f<<2)+4>>2]=c[k+(o<<2)+4>>2];f=c[k>>2]|0;m=f>>>5;n=m+ -1|0}while((o|0)<(n|0));if(f&8){c[k+(n<<2)+4>>2]=c[k+(m<<2)+4>>2];f=c[k>>2]|0}m=f+ -32|0;c[k>>2]=m;m=m>>>5;if(!m){m=0;f=0}else{f=0;n=0;do{f=1<<((c[k+(n<<2)+4>>2]|0)>>>1&31)|f;n=n+1|0}while((n|0)<(m|0))}c[k+(m<<2)+4>>2]=f}else{Ob(b,e,1);f=c[f>>2]|0;n=c[k>>2]|0;b:do if(n>>>0>31){m=n>>>5;o=0;while(1){p=o+1|0;if((c[k+(o<<2)+4>>2]|0)==(f|0)){p=o;break b}if((p|0)<(m|0))o=p;else break}}else{m=0;p=0}while(0);o=m+ -1|0;if((p|0)<(o|0))do{n=p;p=p+1|0;c[k+(n<<2)+4>>2]=c[k+(p<<2)+4>>2];n=c[k>>2]|0;m=n>>>5;o=m+ -1|0}while((p|0)<(o|0));if(n&8){c[k+(o<<2)+4>>2]=c[k+(m<<2)+4>>2];n=c[k>>2]|0}o=n+ -32|0;c[k>>2]=o;o=o>>>5;if(!o){o=0;m=0}else{m=0;n=0;do{m=1<<((c[k+(n<<2)+4>>2]|0)>>>1&31)|m;n=n+1|0}while((n|0)<(o|0))}c[k+(o<<2)+4>>2]=m;Nb(b,e);m=f>>1;n=c[b+760>>2]|0;o=n+(m*12|0)|0;n=n+(m*12|0)+4|0;p=c[n>>2]|0;c:do if((p|0)>0){s=c[o>>2]|0;q=0;while(1){r=q+1|0;if((c[s+(q<<2)>>2]|0)==(e|0))break c;if((r|0)<(p|0))q=r;else{q=r;break}}}else q=0;while(0);p=p+ -1|0;if((q|0)<(p|0)){o=c[o>>2]|0;do{p=q;q=q+1|0;c[o+(p<<2)>>2]=c[o+(q<<2)>>2];p=(c[n>>2]|0)+ -1|0}while((q|0)<(p|0))}c[n>>2]=p;s=(c[b+808>>2]|0)+(f<<2)|0;c[s>>2]=(c[s>>2]|0)+ -1;Vc(b,m)}if((c[k>>2]&-32|0)!=32){s=1;i=g;return s|0}l=c[l+(e+1<<2)>>2]|0;k=d[(c[b+332>>2]|0)+(l>>1)>>0]|0;s=k^l&1;e=s&255;q=a[2624]|0;r=q&255;if(!(e<<24>>24==q<<24>>24&(r>>>1^1)|r&2&s)){r=a[2616]|0;s=r&255;if((s>>>1^1)&e<<24>>24==r<<24>>24|k&2&s){s=0;i=g;return s|0}}else{c[h>>2]=l;c[j+0>>2]=c[h+0>>2];Lb(b,j,-1)}s=(Mb(b)|0)==-1;i=g;return s|0}function Hc(a,b,d,e,f){a=a|0;b=b|0;d=d|0;e=e|0;f=f|0;var g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0;g=i;i=i+16|0;j=g+4|0;h=g;o=a+708|0;c[o>>2]=(c[o>>2]|0)+1;if(c[f>>2]|0)c[f+4>>2]=0;k=(c[b>>2]|0)>>>5>>>0<(c[d>>2]|0)>>>5>>>0;a=k?d:b;b=k?b:d;k=c[b>>2]|0;a:do if(k>>>0>31){d=0;b:while(1){l=c[b+(d<<2)+4>>2]|0;c:do if((l>>1|0)!=(e|0)){m=c[a>>2]|0;d:do if(m>>>0>31){n=0;while(1){o=c[a+(n<<2)+4>>2]|0;n=n+1|0;if((l^o)>>>0<2)break;if((n|0)>=(m>>>5|0))break d}if((o|0)==(l^1|0)){f=0;break b}else break c}while(0);c[j>>2]=l;mc(f,j);k=c[b>>2]|0}while(0);d=d+1|0;if((d|0)>=(k>>>5|0))break a}i=g;return f|0}while(0);d=c[a>>2]|0;if(d>>>0<=31){o=1;i=g;return o|0}j=0;do{b=c[a+(j<<2)+4>>2]|0;if((b>>1|0)!=(e|0)){c[h>>2]=b;mc(f,h);d=c[a>>2]|0}j=j+1|0}while((j|0)<(d>>>5|0));f=1;i=g;return f|0}function Ic(b){b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0;d=i;k=b+924|0;if(!(c[k>>2]|0)){i=d;return}h=b+856|0;e=b+872|0;f=b+868|0;j=b+860|0;g=b+544|0;l=0;while(1){w=c[e>>2]|0;m=c[f>>2]|0;n=w-m|0;if((w|0)<(m|0))n=(c[j>>2]|0)+n|0;if((l|0)>=(n|0))break;n=(c[g>>2]|0)+(c[(c[h>>2]|0)+(((m+l|0)%(c[j>>2]|0)|0)<<2)>>2]<<2)|0;m=c[n>>2]|0;if(!(m&3))c[n>>2]=m&-4|2;l=l+1|0}l=b+540|0;q=c[l>>2]|0;if((q|0)>0){n=b+744|0;o=b+776|0;m=b+760|0;b=b+804|0;p=0;do{if(a[(c[n>>2]|0)+p>>0]|0){r=(c[o>>2]|0)+p|0;if(a[r>>0]|0){s=c[m>>2]|0;q=s+(p*12|0)+4|0;u=c[q>>2]|0;if((u|0)>0){s=c[s+(p*12|0)>>2]|0;v=0;t=0;do{w=c[s+(v<<2)>>2]|0;if((c[(c[c[b>>2]>>2]|0)+(w<<2)>>2]&3|0)!=1){c[s+(t<<2)>>2]=w;u=c[q>>2]|0;t=t+1|0}v=v+1|0}while((v|0)<(u|0))}else{v=0;t=0}s=v-t|0;if((s|0)>0)c[q>>2]=u-s;a[r>>0]=0}r=c[m>>2]|0;q=r+(p*12|0)+4|0;t=c[q>>2]|0;if((t|0)>0){r=r+(p*12|0)|0;s=0;do{u=c[(c[r>>2]|0)+(s<<2)>>2]|0;if(!(c[(c[g>>2]|0)+(u<<2)>>2]&3)){Zc(h,u);t=(c[g>>2]|0)+(c[(c[r>>2]|0)+(s<<2)>>2]<<2)|0;c[t>>2]=c[t>>2]&-4|2;t=c[q>>2]|0}s=s+1|0}while((s|0)<(t|0))}a[(c[n>>2]|0)+p>>0]=0;q=c[l>>2]|0}p=p+1|0}while((p|0)<(q|0));l=0}else l=0;while(1){w=c[e>>2]|0;m=c[f>>2]|0;n=w-m|0;if((w|0)<(m|0))n=(c[j>>2]|0)+n|0;if((l|0)>=(n|0))break;m=(c[g>>2]|0)+(c[(c[h>>2]|0)+(((m+l|0)%(c[j>>2]|0)|0)<<2)>>2]<<2)|0;n=c[m>>2]|0;if((n&3|0)==2)c[m>>2]=n&-4;l=l+1|0}c[k>>2]=0;i=d;return}function Jc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=0,O=0,P=0;e=i;i=i+16|0;m=e;x=e+12|0;g=b+856|0;l=b+872|0;q=b+868|0;j=b+860|0;u=b+680|0;f=b+920|0;h=b+284|0;t=b+280|0;r=b+544|0;s=b+928|0;o=b+44|0;n=b+776|0;v=b+692|0;p=b+804|0;k=b+760|0;C=0;F=0;D=0;a:while(1){E=c[q>>2]|0;do{A=c[l>>2]|0;B=(A|0)<(E|0);A=A-E|0;if(B)G=(c[j>>2]|0)+A|0;else G=A;if((G|0)<=0?(c[f>>2]|0)>=(c[h>>2]|0):0){f=1;j=53;break a}if(a[u>>0]|0){j=8;break a}if(B)A=(c[j>>2]|0)+A|0;if((A|0)==0?(z=c[f>>2]|0,(z|0)<(c[h>>2]|0)):0){c[f>>2]=z+1;c[(c[r>>2]|0)+((c[s>>2]|0)+1<<2)>>2]=c[(c[t>>2]|0)+(z<<2)>>2];A=(c[r>>2]|0)+(c[s>>2]<<2)|0;B=(c[A>>2]|0)>>>5;if(!B){B=0;G=0}else{G=0;E=0;do{G=1<<((c[A+(E<<2)+4>>2]|0)>>>1&31)|G;E=E+1|0}while((E|0)<(B|0))}c[A+(B<<2)+4>>2]=G;Zc(g,c[s>>2]|0);E=c[q>>2]|0}A=c[(c[g>>2]|0)+(E<<2)>>2]|0;E=E+1|0;J=c[j>>2]|0;E=(E|0)==(J|0)?0:E;c[q>>2]=E;G=c[r>>2]|0;B=G+(A<<2)|0;I=c[B>>2]|0}while((I&3|0)!=0);if(d?(c[o>>2]|0)>1:0){H=C+1|0;if(!((C|0)%1e3|0)){I=c[l>>2]|0;c[m>>2]=I-E+((I|0)<(E|0)?J:0);c[m+4>>2]=D;c[m+8>>2]=F;La(3440,m|0)|0;I=c[B>>2]|0;C=H}else C=H}E=G+(A+1<<2)|0;G=c[E>>2]>>1;if(I>>>0>63){H=c[k>>2]|0;I=I>>>5;J=1;do{P=c[B+(J<<2)+4>>2]>>1;G=(c[H+(P*12|0)+4>>2]|0)<(c[H+(G*12|0)+4>>2]|0)?P:G;J=J+1|0}while((J|0)<(I|0))}I=(c[n>>2]|0)+G|0;if(a[I>>0]|0){J=c[k>>2]|0;H=J+(G*12|0)+4|0;M=c[H>>2]|0;if((M|0)>0){J=c[J+(G*12|0)>>2]|0;L=0;K=0;do{N=c[J+(L<<2)>>2]|0;if((c[(c[c[p>>2]>>2]|0)+(N<<2)>>2]&3|0)!=1){c[J+(K<<2)>>2]=N;M=c[H>>2]|0;K=K+1|0}L=L+1|0}while((L|0)<(M|0))}else{L=0;K=0}J=L-K|0;if((J|0)>0)c[H>>2]=M-J;a[I>>0]=0}I=c[k>>2]|0;H=c[I+(G*12|0)>>2]|0;I=I+(G*12|0)+4|0;if((c[I>>2]|0)>0)J=0;else continue;while(1){N=c[B>>2]|0;if(N&3)continue a;K=c[H+(J<<2)>>2]|0;L=c[r>>2]|0;O=L+(K<<2)|0;M=c[O>>2]|0;b:do if(((!((M&3|0)!=0|(K|0)==(A|0))?(P=c[v>>2]|0,y=M>>>5,(P|0)==-1|(y|0)<(P|0)):0)?(w=N>>>5,y>>>0>=w>>>0):0)?(c[B+(w<<2)+4>>2]&~c[O+(y<<2)+4>>2]|0)==0:0){L=L+(K+1<<2)|0;do if(N>>>0>31){if(M>>>0>31){O=-2;M=0}else break b;while(1){N=c[E+(M<<2)>>2]|0;c:do if((O|0)==-2){P=0;while(1){O=c[L+(P<<2)>>2]|0;if((N|0)==(O|0)){N=-2;break c}P=P+1|0;if((N|0)==(O^1|0))break c;if(P>>>0>=y>>>0)break b}}else{P=0;while(1){if((N|0)==(c[L+(P<<2)>>2]|0)){N=O;break c}P=P+1|0;if(P>>>0>=y>>>0)break b}}while(0);M=M+1|0;if(M>>>0>=w>>>0)break;else O=N}if((N|0)==-2)break;else if((N|0)==-1)break b;c[x>>2]=N^1;c[m+0>>2]=c[x+0>>2];if(!(Gc(b,K,m)|0)){f=0;j=53;break a}F=F+1|0;J=(((N>>1|0)==(G|0))<<31>>31)+J|0;break b}while(0);Fc(b,K);D=D+1|0}while(0);J=J+1|0;if((J|0)>=(c[I>>2]|0))continue a}}if((j|0)==8){Yc(g,0);c[f>>2]=c[h>>2];P=1;i=e;return P|0}else if((j|0)==53){i=e;return f|0}return 0}function Kc(b,e,f){b=b|0;e=e|0;f=f|0;var g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;h=i;i=i+16|0;g=h+12|0;m=h+8|0;k=h+4|0;j=h;l=(c[b+544>>2]|0)+(f<<2)|0;if(c[l>>2]&3){r=1;i=h;return r|0}if(Qb(b,l)|0){r=1;i=h;return r|0}c[m>>2]=c[b+284>>2];nc(b+292|0,m);p=c[l>>2]|0;if(p>>>0>31){m=b+332|0;n=0;o=-2;do{q=c[l+(n<<2)+4>>2]|0;r=q>>1;if((r|0)!=(e|0)?(r=(d[(c[m>>2]|0)+r>>0]|0)^q&1,t=a[2616]|0,s=t&255,((r&255)<<24>>24==t<<24>>24&(s>>>1^1)|s&2&r|0)==0):0){c[k>>2]=q^1;c[g+0>>2]=c[k+0>>2];Lb(b,g,-1);p=c[l>>2]|0}else o=q;n=n+1|0}while((n|0)<(p>>>5|0))}else o=-2;t=(Mb(b)|0)==-1;Rb(b,0);if(!t){t=b+712|0;c[t>>2]=(c[t>>2]|0)+1;c[j>>2]=o;c[g+0>>2]=c[j+0>>2];if(!(Gc(b,f,g)|0)){t=0;i=h;return t|0}}t=1;i=h;return t|0}function Lc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0;e=i;h=(c[b+776>>2]|0)+d|0;f=b+760|0;if(a[h>>0]|0){k=c[f>>2]|0;g=k+(d*12|0)+4|0;n=c[g>>2]|0;if((n|0)>0){j=b+804|0;k=c[k+(d*12|0)>>2]|0;m=0;l=0;do{o=c[k+(m<<2)>>2]|0;if((c[(c[c[j>>2]>>2]|0)+(o<<2)>>2]&3|0)!=1){c[k+(l<<2)>>2]=o;n=c[g>>2]|0;l=l+1|0}m=m+1|0}while((m|0)<(n|0))}else{m=0;l=0}j=m-l|0;if((j|0)>0)c[g>>2]=n-j;a[h>>0]=0}g=c[f>>2]|0;n=a[(c[b+332>>2]|0)+d>>0]|0;m=a[2624]|0;o=m&255;if(!((o>>>1^1)&n<<24>>24==m<<24>>24|n&2&o)){o=1;i=e;return o|0}f=g+(d*12|0)+4|0;h=c[f>>2]|0;if(!h){o=1;i=e;return o|0}a:do if((h|0)>0){g=g+(d*12|0)|0;h=0;while(1){if(!(Kc(b,d,c[(c[g>>2]|0)+(h<<2)>>2]|0)|0)){b=0;break}h=h+1|0;if((h|0)>=(c[f>>2]|0))break a}i=e;return b|0}while(0);o=Jc(b,0)|0;i=e;return o|0}function Mc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=0,O=0,P=0,Q=0,R=0,S=0,T=0,U=0,V=0,W=0,X=0,Y=0,Z=0;e=i;i=i+48|0;s=e+36|0;r=e+32|0;t=e+28|0;u=e+24|0;f=e+12|0;g=e;n=(c[b+776>>2]|0)+d|0;m=b+760|0;if(a[n>>0]|0){q=c[m>>2]|0;o=q+(d*12|0)+4|0;y=c[o>>2]|0;if((y|0)>0){p=b+804|0;q=c[q+(d*12|0)>>2]|0;w=0;v=0;do{z=c[q+(w<<2)>>2]|0;if((c[(c[c[p>>2]>>2]|0)+(z<<2)>>2]&3|0)!=1){c[q+(v<<2)>>2]=z;y=c[o>>2]|0;v=v+1|0}w=w+1|0}while((w|0)<(y|0))}else{w=0;v=0}p=w-v|0;if((p|0)>0)c[o>>2]=y-p;a[n>>0]=0}v=c[m>>2]|0;w=v+(d*12|0)|0;c[f>>2]=0;n=f+4|0;c[n>>2]=0;o=f+8|0;c[o>>2]=0;c[g>>2]=0;q=g+4|0;c[q>>2]=0;p=g+8|0;c[p>>2]=0;v=v+(d*12|0)+4|0;a:do if((c[v>>2]|0)>0){y=b+544|0;B=d<<1;A=0;do{C=(c[w>>2]|0)+(A<<2)|0;E=(c[y>>2]|0)+(c[C>>2]<<2)|0;Z=c[E>>2]|0;z=Z>>>5;b:do if(Z>>>0>31){G=0;while(1){D=G+1|0;if((c[E+(G<<2)+4>>2]|0)==(B|0)){D=G;break b}if((D|0)<(z|0))G=D;else break}}else D=0;while(0);_c((D|0)<(z|0)?f:g,C);A=A+1|0;z=c[v>>2]|0}while((A|0)<(z|0));y=c[n>>2]|0;B=(y|0)>0;if(B){C=c[q>>2]|0;K=(C|0)>0;J=b+544|0;D=c[f>>2]|0;A=c[g>>2]|0;E=b+708|0;I=b+684|0;H=b+688|0;P=0;G=0;while(1){if(K){M=D+(G<<2)|0;L=c[J>>2]|0;N=c[E>>2]|0;O=0;do{S=L+(c[M>>2]<<2)|0;U=L+(c[A+(O<<2)>>2]<<2)|0;N=N+1|0;c[E>>2]=N;Q=(c[S>>2]|0)>>>5>>>0<(c[U>>2]|0)>>>5>>>0;R=Q?U:S;U=Q?S:U;S=R+4|0;Q=U+4|0;R=c[R>>2]|0;T=R>>>5;W=T+ -1|0;U=c[U>>2]|0;c:do if(U>>>0>31){V=0;while(1){Z=c[Q+(V<<2)>>2]|0;d:do if((Z>>1|0)!=(d|0)){e:do if(R>>>0>31){Y=0;while(1){X=c[S+(Y<<2)>>2]|0;Y=Y+1|0;if((X^Z)>>>0<2)break;if((Y|0)>=(T|0))break e}if((X|0)==(Z^1|0))break c;else break d}while(0);W=W+1|0}while(0);V=V+1|0;if((V|0)>=(U>>>5|0)){x=28;break}}}else x=28;while(0);if((x|0)==28){x=0;if((P|0)>=((c[I>>2]|0)+z|0)){b=1;break a}Z=c[H>>2]|0;if((Z|0)!=-1&(W|0)>(Z|0)){b=1;break a}else P=P+1|0}O=O+1|0}while((O|0)<(C|0))}G=G+1|0;if((G|0)>=(y|0)){x=32;break}}}else{B=0;x=32}}else{y=0;B=0;x=32}while(0);f:do if((x|0)==32){a[(c[b+904>>2]|0)+d>>0]=1;z=b+380|0;A=(c[z>>2]|0)+d|0;if(a[A>>0]|0){Z=b+200|0;Y=Z;Y=ne(c[Y>>2]|0,c[Y+4>>2]|0,-1,-1)|0;c[Z>>2]=Y;c[Z+4>>2]=F}a[A>>0]=0;A=b+460|0;if(!((c[b+476>>2]|0)>(d|0)?(c[(c[b+472>>2]|0)+(d<<2)>>2]|0)>-1:0))x=36;if((x|0)==36?(a[(c[z>>2]|0)+d>>0]|0)!=0:0)lc(A,d);x=b+716|0;c[x>>2]=(c[x>>2]|0)+1;x=c[q>>2]|0;if((y|0)>(x|0)){A=b+732|0;if((x|0)>0){u=b+544|0;t=c[g>>2]|0;E=b+736|0;D=0;do{C=(c[u>>2]|0)+(c[t+(D<<2)>>2]<<2)|0;z=c[E>>2]|0;if((c[C>>2]|0)>>>0>31){G=0;H=-1;do{Z=C+(G<<2)+4|0;c[s>>2]=c[Z>>2];_c(A,s);H=(c[Z>>2]>>1|0)==(d|0)?G+z|0:H;G=G+1|0}while((G|0)<((c[C>>2]|0)>>>5|0))}else H=-1;Z=c[A>>2]|0;X=Z+(H<<2)|0;Y=c[X>>2]|0;Z=Z+(z<<2)|0;c[X>>2]=c[Z>>2];c[Z>>2]=Y;c[r>>2]=(c[C>>2]|0)>>>5;_c(A,r);D=D+1|0}while((D|0)<(x|0))}c[s>>2]=d<<1;_c(A,s);c[r>>2]=1;_c(A,r)}else{D=b+732|0;if(B){G=b+544|0;E=c[f>>2]|0;z=b+736|0;H=0;do{C=(c[G>>2]|0)+(c[E+(H<<2)>>2]<<2)|0;A=c[z>>2]|0;if((c[C>>2]|0)>>>0>31){I=0;J=-1;do{Z=C+(I<<2)+4|0;c[s>>2]=c[Z>>2];_c(D,s);J=(c[Z>>2]>>1|0)==(d|0)?I+A|0:J;I=I+1|0}while((I|0)<((c[C>>2]|0)>>>5|0))}else J=-1;Z=c[D>>2]|0;X=Z+(J<<2)|0;Y=c[X>>2]|0;Z=Z+(A<<2)|0;c[X>>2]=c[Z>>2];c[Z>>2]=Y;c[r>>2]=(c[C>>2]|0)>>>5;_c(D,r);H=H+1|0}while((H|0)<(y|0))}c[t>>2]=d<<1|1;_c(D,t);c[u>>2]=1;_c(D,u)}if((c[v>>2]|0)>0){r=0;do{Fc(b,c[(c[w>>2]|0)+(r<<2)>>2]|0);r=r+1|0}while((r|0)<(c[v>>2]|0))}r=b+628|0;g:do if(B){s=b+544|0;w=c[f>>2]|0;A=c[g>>2]|0;if((x|0)>0)v=0;else{r=0;while(1){r=r+1|0;if((r|0)>=(y|0))break g}}do{u=w+(v<<2)|0;t=0;do{Z=c[s>>2]|0;if(Hc(b,Z+(c[u>>2]<<2)|0,Z+(c[A+(t<<2)>>2]<<2)|0,d,r)|0?!(Dc(b,r)|0):0){b=0;break f}t=t+1|0}while((t|0)<(x|0));v=v+1|0}while((v|0)<(y|0))}while(0);r=c[m>>2]|0;m=r+(d*12|0)|0;s=c[m>>2]|0;if(s){c[r+(d*12|0)+4>>2]=0;Td(s);c[m>>2]=0;c[r+(d*12|0)+8>>2]=0}m=b+412|0;d=d<<1;s=c[m>>2]|0;r=s+(d*12|0)+4|0;if((c[r>>2]|0)==0?(l=s+(d*12|0)|0,k=c[l>>2]|0,(k|0)!=0):0){c[r>>2]=0;Td(k);c[l>>2]=0;c[s+(d*12|0)+8>>2]=0;s=c[m>>2]|0}k=d|1;l=s+(k*12|0)+4|0;if((c[l>>2]|0)==0?(j=s+(k*12|0)|0,h=c[j>>2]|0,(h|0)!=0):0){c[l>>2]=0;Td(h);c[j>>2]=0;c[s+(k*12|0)+8>>2]=0}b=Jc(b,0)|0;A=c[g>>2]|0}while(0);if(A){c[q>>2]=0;Td(A);c[g>>2]=0;c[p>>2]=0}g=c[f>>2]|0;if(!g){i=e;return b|0}c[n>>2]=0;Td(g);c[f>>2]=0;c[o>>2]=0;i=e;return b|0}function Nc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;e=i;if(!(a[b+724>>0]|0)){i=e;return}l=b+540|0;if((c[l>>2]|0)>0){j=b+760|0;f=b+804|0;g=b+776|0;k=b+544|0;h=0;do{n=c[j>>2]|0;m=n+(h*12|0)+4|0;p=c[m>>2]|0;if((p|0)>0){n=c[n+(h*12|0)>>2]|0;q=0;o=0;do{r=c[n+(q<<2)>>2]|0;if((c[(c[c[f>>2]>>2]|0)+(r<<2)>>2]&3|0)!=1){c[n+(o<<2)>>2]=r;p=c[m>>2]|0;o=o+1|0}q=q+1|0}while((q|0)<(p|0))}else{q=0;o=0}n=q-o|0;if((n|0)>0)c[m>>2]=p-n;a[(c[g>>2]|0)+h>>0]=0;n=c[j>>2]|0;m=n+(h*12|0)+4|0;if((c[m>>2]|0)>0){r=n+(h*12|0)|0;p=0;do{n=(c[r>>2]|0)+(p<<2)|0;o=c[n>>2]|0;q=c[k>>2]|0;s=q+(o<<2)|0;if(!(c[s>>2]&16)){t=wc(d,s)|0;c[n>>2]=t;c[s>>2]=c[s>>2]|16;c[q+(o+1<<2)>>2]=t}else c[n>>2]=c[q+(o+1<<2)>>2];p=p+1|0}while((p|0)<(c[m>>2]|0))}h=h+1|0}while((h|0)<(c[l>>2]|0))}f=b+856|0;t=c[b+872>>2]|0;g=b+868|0;m=c[g>>2]|0;k=t-m|0;if((t|0)<(m|0))k=(c[b+860>>2]|0)+k|0;a:do if((k|0)>0){h=b+860|0;j=b+544|0;while(1){l=c[(c[f>>2]|0)+(m<<2)>>2]|0;n=m+1|0;c[g>>2]=(n|0)==(c[h>>2]|0)?0:n;n=c[j>>2]|0;o=n+(l<<2)|0;m=c[o>>2]|0;if(!(m&3)){if(!(m&16)){t=wc(d,o)|0;c[o>>2]=c[o>>2]|16;c[n+(l+1<<2)>>2]=t;l=t}else l=c[n+(l+1<<2)>>2]|0;Zc(f,l)}k=k+ -1|0;if((k|0)<=0)break a;m=c[g>>2]|0}}else j=b+544|0;while(0);b=b+928|0;f=c[b>>2]|0;h=c[j>>2]|0;g=h+(f<<2)|0;if(!(c[g>>2]&16)){t=wc(d,g)|0;c[b>>2]=t;c[g>>2]=c[g>>2]|16;c[h+(f+1<<2)>>2]=t;i=e;return}else{c[b>>2]=c[h+(f+1<<2)>>2];i=e;return}}function Oc(b){b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0;h=i;i=i+32|0;l=h;d=h+8|0;e=b+544|0;f=b+548|0;g=b+556|0;j=(c[f>>2]|0)-(c[g>>2]|0)|0;c[d+0>>2]=0;c[d+4>>2]=0;c[d+8>>2]=0;c[d+12>>2]=0;gc(d,j);j=d+16|0;k=b+560|0;a[j>>0]=a[k>>0]|0;Nc(b,d);ac(b,d);if((c[b+44>>2]|0)>1){m=c[d+4>>2]<<2;c[l>>2]=c[f>>2]<<2;c[l+4>>2]=m;La(3608,l|0)|0}a[k>>0]=a[j>>0]|0;j=c[e>>2]|0;if(j)Td(j);c[e>>2]=c[d>>2];c[f>>2]=c[d+4>>2];c[b+552>>2]=c[d+8>>2];c[g>>2]=c[d+12>>2];i=h;return}function Pc(){var d=0,e=0,f=0;d=i;i=i+16|0;e=d;a[2608]=0;a[2616]=1;a[2624]=2;xb(2632,2656,2664,3744,3752);c[658]=160;a[2652]=0;xb(2704,2728,2736,3744,3752);c[676]=160;a[2724]=0;xb(2784,2808,2816,3744,3752);c[696]=160;a[2804]=1;xb(2848,2880,2888,3744,3736);c[712]=280;f=2868|0;c[f>>2]=-2147483648;c[f+4>>2]=2147483647;c[719]=0;xb(2960,2992,3e3,3744,3736);c[740]=280;f=2980|0;c[f>>2]=-1;c[f+4>>2]=2147483647;c[747]=20;xb(3112,3144,3152,3744,3736);c[778]=280;f=3132|0;c[f>>2]=-1;c[f+4>>2]=2147483647;c[785]=1e3;xb(3240,3296,3312,3744,3720);c[810]=2168;h[408]=0.0;h[409]=v;a[3280]=0;a[3281]=0;b[1641]=b[e+0>>1]|0;b[1642]=b[e+2>>1]|0;b[1643]=b[e+4>>1]|0;h[411]=.5;i=d;return}function Qc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0;d=i;c[a>>2]=0;e=a+4|0;c[e>>2]=0;f=a+8|0;c[f>>2]=0;if((b|0)<=0){i=d;return}g=b+1&-2;g=(g|0)>2?g:2;c[f>>2]=g;f=Ud(0,g<<2)|0;c[a>>2]=f;if((f|0)==0?(c[(Oa()|0)>>2]|0)==12:0)Ta(va(1)|0,48,0);a=c[e>>2]|0;if((a|0)<(b|0))do{g=f+(a<<2)|0;if(g)c[g>>2]=0;a=a+1|0}while((a|0)!=(b|0));c[e>>2]=b;i=d;return}function Rc(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,h=0,j=0;b=i;e=a+32|0;d=c[e>>2]|0;if(d){c[a+36>>2]=0;Td(d);c[e>>2]=0;c[a+40>>2]=0}e=a+16|0;d=c[e>>2]|0;if(d){c[a+20>>2]=0;Td(d);c[e>>2]=0;c[a+24>>2]=0}e=c[a>>2]|0;if(!e){i=b;return}d=a+4|0;g=c[d>>2]|0;if((g|0)>0){f=0;do{j=e+(f*12|0)|0;h=c[j>>2]|0;if(h){c[e+(f*12|0)+4>>2]=0;Td(h);c[j>>2]=0;c[e+(f*12|0)+8>>2]=0;e=c[a>>2]|0;g=c[d>>2]|0}f=f+1|0}while((f|0)<(g|0))}c[d>>2]=0;Td(e);c[a>>2]=0;c[a+8>>2]=0;i=b;return}function Sc(a,b,d){a=a|0;b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0;e=i;b=c[b>>2]|0;g=b+1|0;f=a+4|0;if((c[f>>2]|0)>=(g|0)){k=c[a>>2]|0;k=k+(b<<2)|0;c[k>>2]=d;i=e;return}h=a+8|0;k=c[h>>2]|0;if((k|0)<(g|0)){l=b+2-k&-2;j=(k>>1)+2&-2;j=(l|0)>(j|0)?l:j;if((j|0)>(2147483647-k|0)){l=va(1)|0;Ta(l|0,48,0)}m=c[a>>2]|0;l=j+k|0;c[h>>2]=l;l=Ud(m,l<<2)|0;c[a>>2]=l;if((l|0)==0?(c[(Oa()|0)>>2]|0)==12:0){m=va(1)|0;Ta(m|0,48,0)}}k=c[f>>2]|0;if((k|0)<(g|0)){h=c[a>>2]|0;do{j=h+(k<<2)|0;if(j)c[j>>2]=0;k=k+1|0}while((k|0)!=(g|0))}c[f>>2]=g;m=c[a>>2]|0;m=m+(b<<2)|0;c[m>>2]=d;i=e;return}function Tc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0;e=i;k=c[d>>2]|0;g=k+1|0;f=b+4|0;if((c[f>>2]|0)<(g|0)){j=b+8|0;h=c[j>>2]|0;if((h|0)<(g|0)){l=k+2-h&-2;k=(h>>1)+2&-2;k=(l|0)>(k|0)?l:k;if((k|0)>(2147483647-h|0)){l=va(1)|0;Ta(l|0,48,0)}m=c[b>>2]|0;l=k+h|0;c[j>>2]=l;l=Ud(m,l*12|0)|0;c[b>>2]=l;if((l|0)==0?(c[(Oa()|0)>>2]|0)==12:0){m=va(1)|0;Ta(m|0,48,0)}}j=c[f>>2]|0;if((j|0)<(g|0)){h=c[b>>2]|0;do{k=h+(j*12|0)|0;if(k){c[k>>2]=0;c[h+(j*12|0)+4>>2]=0;c[h+(j*12|0)+8>>2]=0}j=j+1|0}while((j|0)!=(g|0))}c[f>>2]=g;h=c[d>>2]|0}else h=k;f=c[b>>2]|0;if(c[f+(h*12|0)>>2]|0){c[f+(h*12|0)+4>>2]=0;h=c[d>>2]|0}d=b+16|0;f=h+1|0;g=b+20|0;if((c[g>>2]|0)>=(f|0)){i=e;return}j=b+24|0;b=c[j>>2]|0;if((b|0)<(f|0)){m=h+2-b&-2;h=(b>>1)+2&-2;h=(m|0)>(h|0)?m:h;if((h|0)>(2147483647-b|0)){m=va(1)|0;Ta(m|0,48,0)}l=c[d>>2]|0;m=h+b|0;c[j>>2]=m;m=Ud(l,m)|0;c[d>>2]=m;if((m|0)==0?(c[(Oa()|0)>>2]|0)==12:0){m=va(1)|0;Ta(m|0,48,0)}}b=c[g>>2]|0;if((b|0)<(f|0))do{a[(c[d>>2]|0)+b>>0]=0;b=b+1|0}while((b|0)!=(f|0));c[g>>2]=f;i=e;return}function Uc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0;d=i;i=i+16|0;g=d;c[g>>2]=b;f=a+12|0;e=b+1|0;h=a+16|0;if((c[h>>2]|0)<(e|0)){k=a+20|0;j=c[k>>2]|0;if((j|0)<(e|0)){m=b+2-j&-2;l=(j>>1)+2&-2;l=(m|0)>(l|0)?m:l;if((l|0)>(2147483647-j|0)){m=va(1)|0;Ta(m|0,48,0)}n=c[f>>2]|0;m=l+j|0;c[k>>2]=m;m=Ud(n,m<<2)|0;c[f>>2]=m;if((m|0)==0?(c[(Oa()|0)>>2]|0)==12:0){n=va(1)|0;Ta(n|0,48,0)}}j=c[h>>2]|0;if((e|0)>(j|0))ke((c[f>>2]|0)+(j<<2)|0,-1,e-j<<2|0)|0;c[h>>2]=e}c[(c[f>>2]|0)+(b<<2)>>2]=c[a+4>>2];nc(a,g);e=c[f>>2]|0;j=c[e+(b<<2)>>2]|0;b=c[a>>2]|0;f=c[b+(j<<2)>>2]|0;if(!j){m=0;n=b+(m<<2)|0;c[n>>2]=f;n=e+(f<<2)|0;c[n>>2]=m;i=d;return}a=a+28|0;g=f<<1;h=g|1;while(1){m=j;j=j+ -1>>1;l=b+(j<<2)|0;k=c[l>>2]|0;r=c[c[a>>2]>>2]|0;o=c[r+(g<<2)>>2]|0;q=c[r+(h<<2)>>2]|0;o=we(q|0,((q|0)<0)<<31>>31|0,o|0,((o|0)<0)<<31>>31|0)|0;q=F;p=k<<1;n=c[r+(p<<2)>>2]|0;p=c[r+((p|1)<<2)>>2]|0;n=we(p|0,((p|0)<0)<<31>>31|0,n|0,((n|0)<0)<<31>>31|0)|0;p=F;if(!(q>>>0<p>>>0|(q|0)==(p|0)&o>>>0<n>>>0)){a=14;break}c[b+(m<<2)>>2]=k;c[e+(c[l>>2]<<2)>>2]=m;if(!j){m=0;a=14;break}}if((a|0)==14){r=b+(m<<2)|0;c[r>>2]=f;r=e+(f<<2)|0;c[r>>2]=m;i=d;return}}function Vc(b,d){b=b|0;d=d|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0;e=i;h=b+824|0;l=(c[b+840>>2]|0)>(d|0);if(l?(c[(c[b+836>>2]|0)+(d<<2)>>2]|0)>-1:0)j=7;else j=3;do if((j|0)==3){if(a[(c[b+876>>2]|0)+d>>0]|0){i=e;return}if(a[(c[b+904>>2]|0)+d>>0]|0){i=e;return}o=a[(c[b+332>>2]|0)+d>>0]|0;n=a[2624]|0;p=n&255;if((p>>>1^1)&o<<24>>24==n<<24>>24|o&2&p)if(l){j=7;break}else break;else{i=e;return}}while(0);if((j|0)==7?(f=c[b+836>>2]|0,g=f+(d<<2)|0,k=c[g>>2]|0,(k|0)>-1):0){d=c[h>>2]|0;j=c[d+(k<<2)>>2]|0;a:do if(!k)o=0;else{l=b+852|0;m=j<<1;b=m|1;while(1){o=k;k=k+ -1>>1;p=d+(k<<2)|0;n=c[p>>2]|0;u=c[c[l>>2]>>2]|0;r=c[u+(m<<2)>>2]|0;t=c[u+(b<<2)>>2]|0;r=we(t|0,((t|0)<0)<<31>>31|0,r|0,((r|0)<0)<<31>>31|0)|0;t=F;s=n<<1;q=c[u+(s<<2)>>2]|0;s=c[u+((s|1)<<2)>>2]|0;q=we(s|0,((s|0)<0)<<31>>31|0,q|0,((q|0)<0)<<31>>31|0)|0;s=F;if(!(t>>>0<s>>>0|(t|0)==(s|0)&r>>>0<q>>>0))break a;c[d+(o<<2)>>2]=n;c[f+(c[p>>2]<<2)>>2]=o;if(!k){o=0;break}}}while(0);c[d+(o<<2)>>2]=j;c[f+(j<<2)>>2]=o;Wc(h,c[g>>2]|0);i=e;return}Uc(h,d);i=e;return}function Wc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0;d=i;e=c[a>>2]|0;f=c[e+(b<<2)>>2]|0;m=b<<1|1;l=a+4|0;o=c[l>>2]|0;if((m|0)>=(o|0)){p=b;q=a+12|0;o=e+(p<<2)|0;c[o>>2]=f;q=c[q>>2]|0;q=q+(f<<2)|0;c[q>>2]=p;i=d;return}h=a+28|0;k=f<<1;j=k|1;a=a+12|0;while(1){n=(b<<1)+2|0;if((n|0)<(o|0)){p=c[e+(n<<2)>>2]|0;q=c[e+(m<<2)>>2]|0;u=p<<1;o=c[c[h>>2]>>2]|0;s=c[o+(u<<2)>>2]|0;u=c[o+((u|1)<<2)>>2]|0;s=we(u|0,((u|0)<0)<<31>>31|0,s|0,((s|0)<0)<<31>>31|0)|0;u=F;t=q<<1;r=c[o+(t<<2)>>2]|0;t=c[o+((t|1)<<2)>>2]|0;r=we(t|0,((t|0)<0)<<31>>31|0,r|0,((r|0)<0)<<31>>31|0)|0;t=F;if(!(u>>>0<t>>>0|(u|0)==(t|0)&s>>>0<r>>>0)){p=q;g=7}}else{p=c[e+(m<<2)>>2]|0;o=c[c[h>>2]>>2]|0;g=7}if((g|0)==7){g=0;n=m}r=p<<1;t=c[o+(r<<2)>>2]|0;r=c[o+((r|1)<<2)>>2]|0;t=we(r|0,((r|0)<0)<<31>>31|0,t|0,((t|0)<0)<<31>>31|0)|0;r=F;u=c[o+(k<<2)>>2]|0;s=c[o+(j<<2)>>2]|0;u=we(s|0,((s|0)<0)<<31>>31|0,u|0,((u|0)<0)<<31>>31|0)|0;s=F;if(!(r>>>0<s>>>0|(r|0)==(s|0)&t>>>0<u>>>0)){g=10;break}c[e+(b<<2)>>2]=p;c[(c[a>>2]|0)+(p<<2)>>2]=b;m=n<<1|1;o=c[l>>2]|0;if((m|0)>=(o|0)){b=n;g=10;break}else b=n}if((g|0)==10){u=e+(b<<2)|0;c[u>>2]=f;u=c[a>>2]|0;u=u+(f<<2)|0;c[u>>2]=b;i=d;return}}function Xc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0;d=i;h=c[a>>2]|0;if(h){e=a+4|0;f=c[e>>2]|0;a:do if((f|0)>0){g=0;while(1){j=h+(g*12|0)|0;k=c[j>>2]|0;if(k){c[h+(g*12|0)+4>>2]=0;Td(k);c[j>>2]=0;c[h+(g*12|0)+8>>2]=0;f=c[e>>2]|0}g=g+1|0;if((g|0)>=(f|0))break a;h=c[a>>2]|0}}while(0);c[e>>2]=0;if(b){Td(c[a>>2]|0);c[a>>2]=0;c[a+8>>2]=0}}e=a+16|0;f=c[e>>2]|0;if((f|0)!=0?(c[a+20>>2]=0,b):0){Td(f);c[e>>2]=0;c[a+24>>2]=0}f=a+32|0;e=c[f>>2]|0;if(!e){i=d;return}c[a+36>>2]=0;if(!b){i=d;return}Td(e);c[f>>2]=0;c[a+40>>2]=0;i=d;return}function Yc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0;e=i;f=c[a>>2]|0;d=a+4|0;if(f){c[d>>2]=0;if(b){Td(f);c[a>>2]=0;c[a+8>>2]=0;f=0}}else f=0;if((c[d>>2]|0)>=1){h=a+16|0;c[h>>2]=0;h=a+12|0;c[h>>2]=0;i=e;return}h=a+8|0;g=c[h>>2]|0;if((g|0)<1){j=2-g&-2;b=(g>>1)+2&-2;b=(j|0)>(b|0)?j:b;if((b|0)>(2147483647-g|0)){j=va(1)|0;Ta(j|0,48,0)}j=b+g|0;c[h>>2]=j;f=Ud(f,j<<2)|0;c[a>>2]=f;if((f|0)==0?(c[(Oa()|0)>>2]|0)==12:0){j=va(1)|0;Ta(j|0,48,0)}}b=c[d>>2]|0;if((b|0)<1)while(1){g=f+(b<<2)|0;if(g)c[g>>2]=0;if(!b)break;else b=b+1|0}c[d>>2]=1;j=a+16|0;c[j>>2]=0;j=a+12|0;c[j>>2]=0;i=e;return}function Zc(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0;e=i;i=i+16|0;d=e;f=a+16|0;j=c[f>>2]|0;c[f>>2]=j+1;c[(c[a>>2]|0)+(j<<2)>>2]=b;j=c[f>>2]|0;b=a+4|0;h=c[b>>2]|0;if((j|0)==(h|0)){c[f>>2]=0;j=0}g=a+12|0;if((c[g>>2]|0)!=(j|0)){i=e;return}Qc(d,(h*3|0)+1>>1);l=c[g>>2]|0;m=c[b>>2]|0;if((l|0)<(m|0)){j=c[a>>2]|0;k=c[d>>2]|0;m=0;while(1){h=m+1|0;c[k+(m<<2)>>2]=c[j+(l<<2)>>2];l=l+1|0;m=c[b>>2]|0;if((l|0)>=(m|0)){k=h;break}else m=h}}else k=0;h=c[a>>2]|0;if((c[f>>2]|0)>0){j=c[d>>2]|0;l=0;while(1){c[j+(k<<2)>>2]=c[h+(l<<2)>>2];l=l+1|0;if((l|0)>=(c[f>>2]|0))break;else k=k+1|0}m=c[b>>2]|0}c[g>>2]=0;c[f>>2]=m;if(!h)f=a+8|0;else{c[b>>2]=0;Td(h);c[a>>2]=0;f=a+8|0;c[f>>2]=0}c[a>>2]=c[d>>2];l=d+4|0;c[b>>2]=c[l>>2];m=d+8|0;c[f>>2]=c[m>>2];c[d>>2]=0;c[l>>2]=0;c[m>>2]=0;i=e;return}function _c(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0;d=i;e=a+4|0;f=c[e>>2]|0;g=a+8|0;h=c[g>>2]|0;if((f|0)==(h|0)&(h|0)<(f+1|0)){h=(f>>1)+2&-2;h=(h|0)<2?2:h;if((h|0)>(2147483647-f|0)){h=va(1)|0;Ta(h|0,48,0)}j=c[a>>2]|0;f=h+f|0;c[g>>2]=f;f=Ud(j,f<<2)|0;c[a>>2]=f;if((f|0)==0?(c[(Oa()|0)>>2]|0)==12:0){j=va(1)|0;Ta(j|0,48,0)}}else f=c[a>>2]|0;j=c[e>>2]|0;c[e>>2]=j+1;e=f+(j<<2)|0;if(!e){i=d;return}c[e>>2]=c[b>>2];i=d;return}function $c(){var a=0,b=0;b=i;Ka(3864)|0;a=od(936)|0;xc(a);i=b;return a|0}function ad(a){a=a|0;var b=0;b=i;if(!a){i=b;return}gb[c[(c[a>>2]|0)+4>>2]&31](a);i=b;return}function bd(){var b=0,d=0,e=0;b=i;i=i+16|0;d=b;e=od(936)|0;xc(e);c[964]=e;Cc(e,1)|0;e=c[964]|0;a[d+0>>0]=a[3840]|0;Ac(e,d,1)|0;i=b;return}function cd(b){b=b|0;var d=0,e=0,f=0;d=i;i=i+16|0;e=d;if((c[962]|0)>=(b|0)){i=d;return}do{f=c[964]|0;a[e+0>>0]=a[3840]|0;Ac(f,e,1)|0;f=(c[962]|0)+1|0;c[962]=f}while((f|0)<(b|0));i=d;return}function dd(b){b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0;g=i;i=i+32|0;h=g+16|0;e=g+4|0;j=g;c[e>>2]=0;f=e+4|0;c[f>>2]=0;d=e+8|0;c[d>>2]=0;k=c[b>>2]|0;if(k)do{l=(k|0)<0?0-k|0:k;if((c[962]|0)<(l|0))do{m=c[964]|0;a[h+0>>0]=a[3840]|0;Ac(m,h,1)|0;m=(c[962]|0)+1|0;c[962]=m}while((m|0)<(l|0));c[j>>2]=l<<1|k>>>31;mc(e,j);b=b+4|0;k=c[b>>2]|0}while((k|0)!=0);j=c[964]|0;h=j+628|0;ld(e,h);h=Dc(j,h)|0;j=c[e>>2]|0;if(!j){i=g;return h|0}c[f>>2]=0;Td(j);c[e>>2]=0;c[d>>2]=0;i=g;return h|0}function ed(){var b=0,d=0,e=0,f=0;d=i;i=i+16|0;b=d;e=c[964]|0;f=e+664|0;c[f+0>>2]=-1;c[f+4>>2]=-1;c[f+8>>2]=-1;c[f+12>>2]=-1;if(c[e+304>>2]|0)c[e+308>>2]=0;Bc(b,e,1,0);i=d;return(a[b>>0]|0)==0|0}function fd(){return(c[(c[964]|0)+4>>2]|0)+1|0}function gd(){return c[962]|0}function hd(b){b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0;d=i;i=i+32|0;h=d+16|0;f=d+4|0;j=d;c[f>>2]=0;e=f+4|0;c[e>>2]=0;g=f+8|0;c[g>>2]=0;c[j>>2]=b<<1;mc(f,j);b=c[964]|0;j=b+664|0;c[j+0>>2]=-1;c[j+4>>2]=-1;c[j+8>>2]=-1;c[j+12>>2]=-1;ld(f,b+304|0);Bc(h,b,1,0);b=(a[h>>0]|0)==0;h=c[f>>2]|0;if(!h){i=d;return b|0}c[e>>2]=0;Td(h);c[f>>2]=0;c[g>>2]=0;i=d;return b|0}function id(a){a=a|0;var b=0,d=0,e=0;b=i;i=i+16|0;e=b;d=c[964]|0;c[e>>2]=a<<1|1;a=d+628|0;if(c[a>>2]|0)c[d+632>>2]=0;mc(a,e);Dc(d,a)|0;i=b;return}function jd(){return c[(c[964]|0)+36>>2]|0}function kd(){return c[(c[964]|0)+32>>2]|0}function ld(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0;d=i;h=c[b>>2]|0;e=b+4|0;if(!h)j=c[e>>2]|0;else{c[e>>2]=0;j=0}e=a+4|0;f=c[e>>2]|0;g=b+4|0;if((j|0)<(f|0)){k=b+8|0;j=c[k>>2]|0;if((j|0)<(f|0)){m=f+1-j&-2;l=(j>>1)+2&-2;l=(m|0)>(l|0)?m:l;if((l|0)>(2147483647-j|0)){m=va(1)|0;Ta(m|0,48,0)}m=l+j|0;c[k>>2]=m;h=Ud(h,m<<2)|0;c[b>>2]=h;if((h|0)==0?(c[(Oa()|0)>>2]|0)==12:0){m=va(1)|0;Ta(m|0,48,0)}}j=c[g>>2]|0;a:do if((j|0)<(f|0))while(1){h=h+(j<<2)|0;if(h)c[h>>2]=0;j=j+1|0;if((j|0)==(f|0))break a;h=c[b>>2]|0}while(0);c[g>>2]=f;f=c[e>>2]|0}if((f|0)<=0){i=d;return}b=c[b>>2]|0;a=c[a>>2]|0;f=0;do{c[b+(f<<2)>>2]=c[a+(f<<2)>>2];f=f+1|0}while((f|0)<(c[e>>2]|0));i=d;return}function md(a,b){a=a|0;b=b|0;var d=0;d=i;i=i+16|0;c[d>>2]=b;b=c[p>>2]|0;ua(b|0,a|0,d|0)|0;Sa(10,b|0)|0;Wa()}function nd(){var a=0,b=0;a=i;i=i+16|0;if(!(Ja(4064,3)|0)){b=Ha(c[1014]|0)|0;i=a;return b|0}else md(4072,a);return 0}function od(a){a=a|0;var b=0,d=0;b=i;a=(a|0)==0?1:a;d=Sd(a)|0;if(d){i=b;return d|0}while(1){d=vd()|0;if(!d){a=4;break}jb[d&3]();d=Sd(a)|0;if(d){a=5;break}}if((a|0)==4){d=va(4)|0;c[d>>2]=4248;Ta(d|0,4296,12)}else if((a|0)==5){i=b;return d|0}return 0}function pd(a){a=a|0;var b=0;b=i;Td(a);i=b;return}function qd(a){a=a|0;var b=0;b=i;pd(a);i=b;return}function rd(a){a=a|0;return}function sd(a){a=a|0;return 4264}function td(a){a=a|0;var b=0;b=i;i=i+16|0;jb[a&3]();md(4312,b)}function ud(){var a=0,b=0;b=nd()|0;if(((b|0)!=0?(a=c[b>>2]|0,(a|0)!=0):0)?(b=a+48|0,(c[b>>2]&-256|0)==1126902528?(c[b+4>>2]|0)==1129074247:0):0)td(c[a+12>>2]|0);b=c[968]|0;c[968]=b+0;td(b)}function vd(){var a=0;a=c[1102]|0;c[1102]=a+0;return a|0}function wd(a){a=a|0;return}function xd(a){a=a|0;return}function yd(a){a=a|0;return}function zd(a){a=a|0;return}function Ad(a){a=a|0;return}function Bd(a){a=a|0;var b=0;b=i;pd(a);i=b;return}function Cd(a){a=a|0;var b=0;b=i;pd(a);i=b;return}function Dd(a,b,d){a=a|0;b=b|0;d=d|0;var e=0,f=0,g=0,h=0;e=i;i=i+64|0;f=e;if((a|0)==(b|0)){h=1;i=e;return h|0}if(!b){h=0;i=e;return h|0}b=Hd(b,4504,4560,0)|0;if(!b){h=0;i=e;return h|0}h=f+0|0;g=h+56|0;do{c[h>>2]=0;h=h+4|0}while((h|0)<(g|0));c[f>>2]=b;c[f+8>>2]=a;c[f+12>>2]=-1;c[f+48>>2]=1;mb[c[(c[b>>2]|0)+28>>2]&3](b,f,c[d>>2]|0,1);if((c[f+24>>2]|0)!=1){h=0;i=e;return h|0}c[d>>2]=c[f+16>>2];h=1;i=e;return h|0}function Ed(b,d,e,f){b=b|0;d=d|0;e=e|0;f=f|0;var g=0,h=0;b=i;g=d+16|0;h=c[g>>2]|0;if(!h){c[g>>2]=e;c[d+24>>2]=f;c[d+36>>2]=1;i=b;return}if((h|0)!=(e|0)){h=d+36|0;c[h>>2]=(c[h>>2]|0)+1;c[d+24>>2]=2;a[d+54>>0]=1;i=b;return}e=d+24|0;if((c[e>>2]|0)!=2){i=b;return}c[e>>2]=f;i=b;return}function Fd(a,b,d,e){a=a|0;b=b|0;d=d|0;e=e|0;var f=0;f=i;if((c[b+8>>2]|0)!=(a|0)){i=f;return}Ed(0,b,d,e);i=f;return}function Gd(a,b,d,e){a=a|0;b=b|0;d=d|0;e=e|0;var f=0;f=i;if((a|0)==(c[b+8>>2]|0)){Ed(0,b,d,e);i=f;return}else{a=c[a+8>>2]|0;mb[c[(c[a>>2]|0)+28>>2]&3](a,b,d,e);i=f;return}}function Hd(d,e,f,g){d=d|0;e=e|0;f=f|0;g=g|0;var h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0;h=i;i=i+64|0;j=h;k=c[d>>2]|0;l=d+(c[k+ -8>>2]|0)|0;k=c[k+ -4>>2]|0;c[j>>2]=f;c[j+4>>2]=d;c[j+8>>2]=e;c[j+12>>2]=g;n=j+16|0;o=j+20|0;e=j+24|0;m=j+28|0;g=j+32|0;d=j+40|0;p=(k|0)==(f|0);q=n+0|0;f=q+36|0;do{c[q>>2]=0;q=q+4|0}while((q|0)<(f|0));b[n+36>>1]=0;a[n+38>>0]=0;if(p){c[j+48>>2]=1;kb[c[(c[k>>2]|0)+20>>2]&3](k,j,l,l,1,0);q=(c[e>>2]|0)==1?l:0;i=h;return q|0}fb[c[(c[k>>2]|0)+24>>2]&3](k,j,l,1,0);j=c[j+36>>2]|0;if(!j){q=(c[d>>2]|0)==1&(c[m>>2]|0)==1&(c[g>>2]|0)==1?c[o>>2]|0:0;i=h;return q|0}else if((j|0)==1){if((c[e>>2]|0)!=1?!((c[d>>2]|0)==0&(c[m>>2]|0)==1&(c[g>>2]|0)==1):0){q=0;i=h;return q|0}q=c[n>>2]|0;i=h;return q|0}else{q=0;i=h;return q|0}return 0}function Id(b,d,e,f,g){b=b|0;d=d|0;e=e|0;f=f|0;g=g|0;var h=0;b=i;a[d+53>>0]=1;if((c[d+4>>2]|0)!=(f|0)){i=b;return}a[d+52>>0]=1;f=d+16|0;h=c[f>>2]|0;if(!h){c[f>>2]=e;c[d+24>>2]=g;c[d+36>>2]=1;if(!((g|0)==1?(c[d+48>>2]|0)==1:0)){i=b;return}a[d+54>>0]=1;i=b;return}if((h|0)!=(e|0)){h=d+36|0;c[h>>2]=(c[h>>2]|0)+1;a[d+54>>0]=1;i=b;return}e=d+24|0;f=c[e>>2]|0;if((f|0)==2)c[e>>2]=g;else g=f;if(!((g|0)==1?(c[d+48>>2]|0)==1:0)){i=b;return}a[d+54>>0]=1;i=b;return}function Jd(b,d,e,f,g){b=b|0;d=d|0;e=e|0;f=f|0;g=g|0;var h=0,j=0,k=0,l=0,m=0;h=i;if((b|0)==(c[d+8>>2]|0)){if((c[d+4>>2]|0)!=(e|0)){i=h;return}j=d+28|0;if((c[j>>2]|0)==1){i=h;return}c[j>>2]=f;i=h;return}if((b|0)!=(c[d>>2]|0)){l=c[b+8>>2]|0;fb[c[(c[l>>2]|0)+24>>2]&3](l,d,e,f,g);i=h;return}if((c[d+16>>2]|0)!=(e|0)?(k=d+20|0,(c[k>>2]|0)!=(e|0)):0){c[d+32>>2]=f;f=d+44|0;if((c[f>>2]|0)==4){i=h;return}l=d+52|0;a[l>>0]=0;m=d+53|0;a[m>>0]=0;b=c[b+8>>2]|0;kb[c[(c[b>>2]|0)+20>>2]&3](b,d,e,e,1,g);if(a[m>>0]|0){if(!(a[l>>0]|0)){b=1;j=13}}else{b=0;j=13}do if((j|0)==13){c[k>>2]=e;m=d+40|0;c[m>>2]=(c[m>>2]|0)+1;if((c[d+36>>2]|0)==1?(c[d+24>>2]|0)==2:0){a[d+54>>0]=1;if(b)break}else j=16;if((j|0)==16?b:0)break;c[f>>2]=4;i=h;return}while(0);c[f>>2]=3;i=h;return}if((f|0)!=1){i=h;return}c[d+32>>2]=1;i=h;return}function Kd(b,d,e,f,g){b=b|0;d=d|0;e=e|0;f=f|0;g=g|0;var h=0;g=i;if((c[d+8>>2]|0)==(b|0)){if((c[d+4>>2]|0)!=(e|0)){i=g;return}d=d+28|0;if((c[d>>2]|0)==1){i=g;return}c[d>>2]=f;i=g;return}if((c[d>>2]|0)!=(b|0)){i=g;return}if((c[d+16>>2]|0)!=(e|0)?(h=d+20|0,(c[h>>2]|0)!=(e|0)):0){c[d+32>>2]=f;c[h>>2]=e;b=d+40|0;c[b>>2]=(c[b>>2]|0)+1;if((c[d+36>>2]|0)==1?(c[d+24>>2]|0)==2:0)a[d+54>>0]=1;c[d+44>>2]=4;i=g;return}if((f|0)!=1){i=g;return}c[d+32>>2]=1;i=g;return}function Ld(a,b,d,e,f,g){a=a|0;b=b|0;d=d|0;e=e|0;f=f|0;g=g|0;var h=0;h=i;if((a|0)==(c[b+8>>2]|0)){Id(0,b,d,e,f);i=h;return}else{a=c[a+8>>2]|0;kb[c[(c[a>>2]|0)+20>>2]&3](a,b,d,e,f,g);i=h;return}}function Md(a,b,d,e,f,g){a=a|0;b=b|0;d=d|0;e=e|0;f=f|0;g=g|0;g=i;if((c[b+8>>2]|0)!=(a|0)){i=g;return}Id(0,b,d,e,f);i=g;return}function Nd(a,b,d){a=a|0;b=b|0;d=d|0;var e=0,f=0;e=i;i=i+16|0;f=e;c[f>>2]=c[d>>2];a=eb[c[(c[a>>2]|0)+16>>2]&1](a,b,f)|0;b=a&1;if(!a){i=e;return b|0}c[d>>2]=c[f>>2];i=e;return b|0}function Od(a){a=a|0;var b=0;b=i;if(!a)a=0;else a=(Hd(a,4504,4672,0)|0)!=0;i=b;return a&1|0}function Pd(){var a=0,b=0,d=0,e=0,f=0;a=i;i=i+16|0;b=a;a=a+12|0;d=nd()|0;if(!d)md(4040,b);d=c[d>>2]|0;if(!d)md(4040,b);f=d+48|0;e=c[f>>2]|0;f=c[f+4>>2]|0;if(!((e&-256|0)==1126902528&(f|0)==1129074247)){c[b>>2]=c[970];md(4e3,b)}if((e|0)==1126902529&(f|0)==1129074247)e=c[d+44>>2]|0;else e=d+80|0;c[a>>2]=e;f=c[d>>2]|0;d=c[f+4>>2]|0;if(eb[c[(c[4432>>2]|0)+16>>2]&1](4432,f,a)|0){f=c[a>>2]|0;e=c[970]|0;f=ib[c[(c[f>>2]|0)+8>>2]&1](f)|0;c[b>>2]=e;c[b+4>>2]=d;c[b+8>>2]=f;md(3904,b)}else{c[b>>2]=c[970];c[b+4>>2]=d;md(3952,b)}}function Qd(){var a=0;a=i;i=i+16|0;if(!(Ma(4056,20)|0)){i=a;return}else md(4128,a)}function Rd(a){a=a|0;var b=0;b=i;i=i+16|0;Td(a);if(!(Pa(c[1014]|0,0)|0)){i=b;return}else md(4184,b)}function Sd(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,G=0,H=0;b=i;do if(a>>>0<245){if(a>>>0<11)a=16;else a=a+11&-8;x=a>>>3;p=c[1206]|0;w=p>>>x;if(w&3){g=(w&1^1)+x|0;f=g<<1;d=4864+(f<<2)|0;f=4864+(f+2<<2)|0;h=c[f>>2]|0;j=h+8|0;e=c[j>>2]|0;do if((d|0)!=(e|0)){if(e>>>0<(c[1210]|0)>>>0)Wa();k=e+12|0;if((c[k>>2]|0)==(h|0)){c[k>>2]=d;c[f>>2]=e;break}else Wa()}else c[1206]=p&~(1<<g);while(0);H=g<<3;c[h+4>>2]=H|3;H=h+(H|4)|0;c[H>>2]=c[H>>2]|1;H=j;i=b;return H|0}v=c[1208]|0;if(a>>>0>v>>>0){if(w){h=2<<x;h=w<<x&(h|0-h);h=(h&0-h)+ -1|0;d=h>>>12&16;h=h>>>d;j=h>>>5&8;h=h>>>j;f=h>>>2&4;h=h>>>f;g=h>>>1&2;h=h>>>g;e=h>>>1&1;e=(j|d|f|g|e)+(h>>>e)|0;h=e<<1;g=4864+(h<<2)|0;h=4864+(h+2<<2)|0;f=c[h>>2]|0;d=f+8|0;j=c[d>>2]|0;do if((g|0)!=(j|0)){if(j>>>0<(c[1210]|0)>>>0)Wa();k=j+12|0;if((c[k>>2]|0)==(f|0)){c[k>>2]=g;c[h>>2]=j;E=c[1208]|0;break}else Wa()}else{c[1206]=p&~(1<<e);E=v}while(0);H=e<<3;e=H-a|0;c[f+4>>2]=a|3;g=f+a|0;c[f+(a|4)>>2]=e|1;c[f+H>>2]=e;if(E){f=c[1211]|0;l=E>>>3;j=l<<1;h=4864+(j<<2)|0;k=c[1206]|0;l=1<<l;if(k&l){j=4864+(j+2<<2)|0;k=c[j>>2]|0;if(k>>>0<(c[1210]|0)>>>0)Wa();else{D=j;C=k}}else{c[1206]=k|l;D=4864+(j+2<<2)|0;C=h}c[D>>2]=f;c[C+12>>2]=f;c[f+8>>2]=C;c[f+12>>2]=h}c[1208]=e;c[1211]=g;H=d;i=b;return H|0}p=c[1207]|0;if(p){d=(p&0-p)+ -1|0;G=d>>>12&16;d=d>>>G;F=d>>>5&8;d=d>>>F;H=d>>>2&4;d=d>>>H;f=d>>>1&2;d=d>>>f;e=d>>>1&1;e=c[5128+((F|G|H|f|e)+(d>>>e)<<2)>>2]|0;d=(c[e+4>>2]&-8)-a|0;f=e;while(1){g=c[f+16>>2]|0;if(!g){g=c[f+20>>2]|0;if(!g)break}f=(c[g+4>>2]&-8)-a|0;H=f>>>0<d>>>0;d=H?f:d;f=g;e=H?g:e}h=c[1210]|0;if(e>>>0<h>>>0)Wa();f=e+a|0;if(e>>>0>=f>>>0)Wa();g=c[e+24>>2]|0;k=c[e+12>>2]|0;do if((k|0)==(e|0)){k=e+20|0;j=c[k>>2]|0;if(!j){k=e+16|0;j=c[k>>2]|0;if(!j){B=0;break}}while(1){l=j+20|0;m=c[l>>2]|0;if(m){j=m;k=l;continue}l=j+16|0;m=c[l>>2]|0;if(!m)break;else{j=m;k=l}}if(k>>>0<h>>>0)Wa();else{c[k>>2]=0;B=j;break}}else{j=c[e+8>>2]|0;if(j>>>0<h>>>0)Wa();h=j+12|0;if((c[h>>2]|0)!=(e|0))Wa();l=k+8|0;if((c[l>>2]|0)==(e|0)){c[h>>2]=k;c[l>>2]=j;B=k;break}else Wa()}while(0);do if(g){j=c[e+28>>2]|0;h=5128+(j<<2)|0;if((e|0)==(c[h>>2]|0)){c[h>>2]=B;if(!B){c[1207]=c[1207]&~(1<<j);break}}else{if(g>>>0<(c[1210]|0)>>>0)Wa();h=g+16|0;if((c[h>>2]|0)==(e|0))c[h>>2]=B;else c[g+20>>2]=B;if(!B)break}h=c[1210]|0;if(B>>>0<h>>>0)Wa();c[B+24>>2]=g;g=c[e+16>>2]|0;do if(g)if(g>>>0<h>>>0)Wa();else{c[B+16>>2]=g;c[g+24>>2]=B;break}while(0);g=c[e+20>>2]|0;if(g)if(g>>>0<(c[1210]|0)>>>0)Wa();else{c[B+20>>2]=g;c[g+24>>2]=B;break}}while(0);if(d>>>0<16){H=d+a|0;c[e+4>>2]=H|3;H=e+(H+4)|0;c[H>>2]=c[H>>2]|1}else{c[e+4>>2]=a|3;c[e+(a|4)>>2]=d|1;c[e+(d+a)>>2]=d;h=c[1208]|0;if(h){g=c[1211]|0;k=h>>>3;l=k<<1;h=4864+(l<<2)|0;j=c[1206]|0;k=1<<k;if(j&k){j=4864+(l+2<<2)|0;k=c[j>>2]|0;if(k>>>0<(c[1210]|0)>>>0)Wa();else{A=j;z=k}}else{c[1206]=j|k;A=4864+(l+2<<2)|0;z=h}c[A>>2]=g;c[z+12>>2]=g;c[g+8>>2]=z;c[g+12>>2]=h}c[1208]=d;c[1211]=f}H=e+8|0;i=b;return H|0}}}else if(a>>>0<=4294967231){z=a+11|0;a=z&-8;B=c[1207]|0;if(B){A=0-a|0;z=z>>>8;if(z)if(a>>>0>16777215)C=31;else{G=(z+1048320|0)>>>16&8;H=z<<G;F=(H+520192|0)>>>16&4;H=H<<F;C=(H+245760|0)>>>16&2;C=14-(F|G|C)+(H<<C>>>15)|0;C=a>>>(C+7|0)&1|C<<1}else C=0;D=c[5128+(C<<2)>>2]|0;a:do if(!D){F=0;z=0}else{if((C|0)==31)z=0;else z=25-(C>>>1)|0;F=0;E=a<<z;z=0;while(1){G=c[D+4>>2]&-8;H=G-a|0;if(H>>>0<A>>>0)if((G|0)==(a|0)){A=H;F=D;z=D;break a}else{A=H;z=D}H=c[D+20>>2]|0;D=c[D+(E>>>31<<2)+16>>2]|0;F=(H|0)==0|(H|0)==(D|0)?F:H;if(!D)break;else E=E<<1}}while(0);if((F|0)==0&(z|0)==0){H=2<<C;B=B&(H|0-H);if(!B)break;H=(B&0-B)+ -1|0;D=H>>>12&16;H=H>>>D;C=H>>>5&8;H=H>>>C;E=H>>>2&4;H=H>>>E;G=H>>>1&2;H=H>>>G;F=H>>>1&1;F=c[5128+((C|D|E|G|F)+(H>>>F)<<2)>>2]|0}if(F)while(1){H=(c[F+4>>2]&-8)-a|0;B=H>>>0<A>>>0;A=B?H:A;z=B?F:z;B=c[F+16>>2]|0;if(B){F=B;continue}F=c[F+20>>2]|0;if(!F)break}if((z|0)!=0?A>>>0<((c[1208]|0)-a|0)>>>0:0){f=c[1210]|0;if(z>>>0<f>>>0)Wa();d=z+a|0;if(z>>>0>=d>>>0)Wa();e=c[z+24>>2]|0;g=c[z+12>>2]|0;do if((g|0)==(z|0)){h=z+20|0;g=c[h>>2]|0;if(!g){h=z+16|0;g=c[h>>2]|0;if(!g){x=0;break}}while(1){j=g+20|0;k=c[j>>2]|0;if(k){g=k;h=j;continue}j=g+16|0;k=c[j>>2]|0;if(!k)break;else{g=k;h=j}}if(h>>>0<f>>>0)Wa();else{c[h>>2]=0;x=g;break}}else{h=c[z+8>>2]|0;if(h>>>0<f>>>0)Wa();j=h+12|0;if((c[j>>2]|0)!=(z|0))Wa();f=g+8|0;if((c[f>>2]|0)==(z|0)){c[j>>2]=g;c[f>>2]=h;x=g;break}else Wa()}while(0);do if(e){f=c[z+28>>2]|0;g=5128+(f<<2)|0;if((z|0)==(c[g>>2]|0)){c[g>>2]=x;if(!x){c[1207]=c[1207]&~(1<<f);break}}else{if(e>>>0<(c[1210]|0)>>>0)Wa();f=e+16|0;if((c[f>>2]|0)==(z|0))c[f>>2]=x;else c[e+20>>2]=x;if(!x)break}f=c[1210]|0;if(x>>>0<f>>>0)Wa();c[x+24>>2]=e;e=c[z+16>>2]|0;do if(e)if(e>>>0<f>>>0)Wa();else{c[x+16>>2]=e;c[e+24>>2]=x;break}while(0);e=c[z+20>>2]|0;if(e)if(e>>>0<(c[1210]|0)>>>0)Wa();else{c[x+20>>2]=e;c[e+24>>2]=x;break}}while(0);b:do if(A>>>0>=16){c[z+4>>2]=a|3;c[z+(a|4)>>2]=A|1;c[z+(A+a)>>2]=A;f=A>>>3;if(A>>>0<256){h=f<<1;e=4864+(h<<2)|0;g=c[1206]|0;f=1<<f;do if(!(g&f)){c[1206]=g|f;w=4864+(h+2<<2)|0;v=e}else{f=4864+(h+2<<2)|0;g=c[f>>2]|0;if(g>>>0>=(c[1210]|0)>>>0){w=f;v=g;break}Wa()}while(0);c[w>>2]=d;c[v+12>>2]=d;c[z+(a+8)>>2]=v;c[z+(a+12)>>2]=e;break}e=A>>>8;if(e)if(A>>>0>16777215)e=31;else{G=(e+1048320|0)>>>16&8;H=e<<G;F=(H+520192|0)>>>16&4;H=H<<F;e=(H+245760|0)>>>16&2;e=14-(F|G|e)+(H<<e>>>15)|0;e=A>>>(e+7|0)&1|e<<1}else e=0;f=5128+(e<<2)|0;c[z+(a+28)>>2]=e;c[z+(a+20)>>2]=0;c[z+(a+16)>>2]=0;g=c[1207]|0;h=1<<e;if(!(g&h)){c[1207]=g|h;c[f>>2]=d;c[z+(a+24)>>2]=f;c[z+(a+12)>>2]=d;c[z+(a+8)>>2]=d;break}h=c[f>>2]|0;if((e|0)==31)e=0;else e=25-(e>>>1)|0;c:do if((c[h+4>>2]&-8|0)!=(A|0)){e=A<<e;while(1){g=h+(e>>>31<<2)+16|0;f=c[g>>2]|0;if(!f)break;if((c[f+4>>2]&-8|0)==(A|0)){p=f;break c}else{e=e<<1;h=f}}if(g>>>0<(c[1210]|0)>>>0)Wa();else{c[g>>2]=d;c[z+(a+24)>>2]=h;c[z+(a+12)>>2]=d;c[z+(a+8)>>2]=d;break b}}else p=h;while(0);f=p+8|0;e=c[f>>2]|0;H=c[1210]|0;if(p>>>0>=H>>>0&e>>>0>=H>>>0){c[e+12>>2]=d;c[f>>2]=d;c[z+(a+8)>>2]=e;c[z+(a+12)>>2]=p;c[z+(a+24)>>2]=0;break}else Wa()}else{H=A+a|0;c[z+4>>2]=H|3;H=z+(H+4)|0;c[H>>2]=c[H>>2]|1}while(0);H=z+8|0;i=b;return H|0}}}else a=-1;while(0);p=c[1208]|0;if(p>>>0>=a>>>0){e=p-a|0;d=c[1211]|0;if(e>>>0>15){c[1211]=d+a;c[1208]=e;c[d+(a+4)>>2]=e|1;c[d+p>>2]=e;c[d+4>>2]=a|3}else{c[1208]=0;c[1211]=0;c[d+4>>2]=p|3;H=d+(p+4)|0;c[H>>2]=c[H>>2]|1}H=d+8|0;i=b;return H|0}p=c[1209]|0;if(p>>>0>a>>>0){G=p-a|0;c[1209]=G;H=c[1212]|0;c[1212]=H+a;c[H+(a+4)>>2]=G|1;c[H+4>>2]=a|3;H=H+8|0;i=b;return H|0}do if(!(c[1324]|0)){p=Ga(30)|0;if(!(p+ -1&p)){c[1326]=p;c[1325]=p;c[1327]=-1;c[1328]=-1;c[1329]=0;c[1317]=0;c[1324]=(Ya(0)|0)&-16^1431655768;break}else Wa()}while(0);x=a+48|0;p=c[1326]|0;w=a+47|0;A=p+w|0;p=0-p|0;v=A&p;if(v>>>0<=a>>>0){H=0;i=b;return H|0}z=c[1316]|0;if((z|0)!=0?(G=c[1314]|0,H=G+v|0,H>>>0<=G>>>0|H>>>0>z>>>0):0){H=0;i=b;return H|0}d:do if(!(c[1317]&4)){B=c[1212]|0;e:do if(B){z=5272|0;while(1){C=c[z>>2]|0;if(C>>>0<=B>>>0?(y=z+4|0,(C+(c[y>>2]|0)|0)>>>0>B>>>0):0)break;z=c[z+8>>2]|0;if(!z){o=181;break e}}if(z){A=A-(c[1209]|0)&p;if(A>>>0<2147483647){p=Aa(A|0)|0;if((p|0)==((c[z>>2]|0)+(c[y>>2]|0)|0)){z=A;o=190}else{z=A;o=191}}else z=0}else o=181}else o=181;while(0);do if((o|0)==181){y=Aa(0)|0;if((y|0)!=(-1|0)){A=y;z=c[1325]|0;p=z+ -1|0;if(!(p&A))z=v;else z=v-A+(p+A&0-z)|0;p=c[1314]|0;A=p+z|0;if(z>>>0>a>>>0&z>>>0<2147483647){H=c[1316]|0;if((H|0)!=0?A>>>0<=p>>>0|A>>>0>H>>>0:0){z=0;break}p=Aa(z|0)|0;if((p|0)==(y|0)){p=y;o=190}else o=191}else z=0}else z=0}while(0);f:do if((o|0)==190){if((p|0)!=(-1|0)){q=z;o=201;break d}}else if((o|0)==191){o=0-z|0;do if((p|0)!=(-1|0)&z>>>0<2147483647&x>>>0>z>>>0?(u=c[1326]|0,u=w-z+u&0-u,u>>>0<2147483647):0)if((Aa(u|0)|0)==(-1|0)){Aa(o|0)|0;z=0;break f}else{z=u+z|0;break}while(0);if((p|0)==(-1|0))z=0;else{q=z;o=201;break d}}while(0);c[1317]=c[1317]|4;o=198}else{z=0;o=198}while(0);if((((o|0)==198?v>>>0<2147483647:0)?(t=Aa(v|0)|0,s=Aa(0)|0,(t|0)!=(-1|0)&(s|0)!=(-1|0)&t>>>0<s>>>0):0)?(r=s-t|0,q=r>>>0>(a+40|0)>>>0,q):0){p=t;q=q?r:z;o=201}if((o|0)==201){r=(c[1314]|0)+q|0;c[1314]=r;if(r>>>0>(c[1315]|0)>>>0)c[1315]=r;r=c[1212]|0;g:do if(r){t=5272|0;while(1){s=c[t>>2]|0;v=t+4|0;w=c[v>>2]|0;if((p|0)==(s+w|0)){o=213;break}u=c[t+8>>2]|0;if(!u)break;else t=u}if(((o|0)==213?(c[t+12>>2]&8|0)==0:0)?r>>>0>=s>>>0&r>>>0<p>>>0:0){c[v>>2]=w+q;d=(c[1209]|0)+q|0;e=r+8|0;if(!(e&7))e=0;else e=0-e&7;H=d-e|0;c[1212]=r+e;c[1209]=H;c[r+(e+4)>>2]=H|1;c[r+(d+4)>>2]=40;c[1213]=c[1328];break}s=c[1210]|0;if(p>>>0<s>>>0){c[1210]=p;s=p}v=p+q|0;t=5272|0;while(1){if((c[t>>2]|0)==(v|0)){o=223;break}u=c[t+8>>2]|0;if(!u)break;else t=u}if((o|0)==223?(c[t+12>>2]&8|0)==0:0){c[t>>2]=p;h=t+4|0;c[h>>2]=(c[h>>2]|0)+q;h=p+8|0;if(!(h&7))h=0;else h=0-h&7;j=p+(q+8)|0;if(!(j&7))n=0;else n=0-j&7;o=p+(n+q)|0;k=h+a|0;j=p+k|0;m=o-(p+h)-a|0;c[p+(h+4)>>2]=a|3;h:do if((o|0)!=(r|0)){if((o|0)==(c[1211]|0)){H=(c[1208]|0)+m|0;c[1208]=H;c[1211]=j;c[p+(k+4)>>2]=H|1;c[p+(H+k)>>2]=H;break}r=q+4|0;u=c[p+(r+n)>>2]|0;if((u&3|0)==1){a=u&-8;t=u>>>3;i:do if(u>>>0>=256){l=c[p+((n|24)+q)>>2]|0;t=c[p+(q+12+n)>>2]|0;do if((t|0)==(o|0)){v=n|16;u=p+(r+v)|0;t=c[u>>2]|0;if(!t){u=p+(v+q)|0;t=c[u>>2]|0;if(!t){g=0;break}}while(1){w=t+20|0;v=c[w>>2]|0;if(v){t=v;u=w;continue}w=t+16|0;v=c[w>>2]|0;if(!v)break;else{t=v;u=w}}if(u>>>0<s>>>0)Wa();else{c[u>>2]=0;g=t;break}}else{u=c[p+((n|8)+q)>>2]|0;if(u>>>0<s>>>0)Wa();v=u+12|0;if((c[v>>2]|0)!=(o|0))Wa();s=t+8|0;if((c[s>>2]|0)==(o|0)){c[v>>2]=t;c[s>>2]=u;g=t;break}else Wa()}while(0);if(!l)break;s=c[p+(q+28+n)>>2]|0;t=5128+(s<<2)|0;do if((o|0)!=(c[t>>2]|0)){if(l>>>0<(c[1210]|0)>>>0)Wa();s=l+16|0;if((c[s>>2]|0)==(o|0))c[s>>2]=g;else c[l+20>>2]=g;if(!g)break i}else{c[t>>2]=g;if(g)break;c[1207]=c[1207]&~(1<<s);break i}while(0);o=c[1210]|0;if(g>>>0<o>>>0)Wa();c[g+24>>2]=l;s=n|16;l=c[p+(s+q)>>2]|0;do if(l)if(l>>>0<o>>>0)Wa();else{c[g+16>>2]=l;c[l+24>>2]=g;break}while(0);l=c[p+(r+s)>>2]|0;if(!l)break;if(l>>>0<(c[1210]|0)>>>0)Wa();else{c[g+20>>2]=l;c[l+24>>2]=g;break}}else{g=c[p+((n|8)+q)>>2]|0;r=c[p+(q+12+n)>>2]|0;u=4864+(t<<1<<2)|0;do if((g|0)!=(u|0)){if(g>>>0<s>>>0)Wa();if((c[g+12>>2]|0)==(o|0))break;Wa()}while(0);if((r|0)==(g|0)){c[1206]=c[1206]&~(1<<t);break}do if((r|0)==(u|0))l=r+8|0;else{if(r>>>0<s>>>0)Wa();s=r+8|0;if((c[s>>2]|0)==(o|0)){l=s;break}Wa()}while(0);c[g+12>>2]=r;c[l>>2]=g}while(0);o=p+((a|n)+q)|0;m=a+m|0}g=o+4|0;c[g>>2]=c[g>>2]&-2;c[p+(k+4)>>2]=m|1;c[p+(m+k)>>2]=m;g=m>>>3;if(m>>>0<256){l=g<<1;d=4864+(l<<2)|0;m=c[1206]|0;g=1<<g;do if(!(m&g)){c[1206]=m|g;f=4864+(l+2<<2)|0;e=d}else{l=4864+(l+2<<2)|0;g=c[l>>2]|0;if(g>>>0>=(c[1210]|0)>>>0){f=l;e=g;break}Wa()}while(0);c[f>>2]=j;c[e+12>>2]=j;c[p+(k+8)>>2]=e;c[p+(k+12)>>2]=d;break}e=m>>>8;do if(!e)e=0;else{if(m>>>0>16777215){e=31;break}G=(e+1048320|0)>>>16&8;H=e<<G;F=(H+520192|0)>>>16&4;H=H<<F;e=(H+245760|0)>>>16&2;e=14-(F|G|e)+(H<<e>>>15)|0;e=m>>>(e+7|0)&1|e<<1}while(0);l=5128+(e<<2)|0;c[p+(k+28)>>2]=e;c[p+(k+20)>>2]=0;c[p+(k+16)>>2]=0;g=c[1207]|0;f=1<<e;if(!(g&f)){c[1207]=g|f;c[l>>2]=j;c[p+(k+24)>>2]=l;c[p+(k+12)>>2]=j;c[p+(k+8)>>2]=j;break}f=c[l>>2]|0;if((e|0)==31)e=0;else e=25-(e>>>1)|0;j:do if((c[f+4>>2]&-8|0)!=(m|0)){e=m<<e;while(1){g=f+(e>>>31<<2)+16|0;l=c[g>>2]|0;if(!l)break;if((c[l+4>>2]&-8|0)==(m|0)){d=l;break j}else{e=e<<1;f=l}}if(g>>>0<(c[1210]|0)>>>0)Wa();else{c[g>>2]=j;c[p+(k+24)>>2]=f;c[p+(k+12)>>2]=j;c[p+(k+8)>>2]=j;break h}}else d=f;while(0);e=d+8|0;f=c[e>>2]|0;H=c[1210]|0;if(d>>>0>=H>>>0&f>>>0>=H>>>0){c[f+12>>2]=j;c[e>>2]=j;c[p+(k+8)>>2]=f;c[p+(k+12)>>2]=d;c[p+(k+24)>>2]=0;break}else Wa()}else{H=(c[1209]|0)+m|0;c[1209]=H;c[1212]=j;c[p+(k+4)>>2]=H|1}while(0);H=p+(h|8)|0;i=b;return H|0}e=5272|0;while(1){d=c[e>>2]|0;if(d>>>0<=r>>>0?(n=c[e+4>>2]|0,m=d+n|0,m>>>0>r>>>0):0)break;e=c[e+8>>2]|0}e=d+(n+ -39)|0;if(!(e&7))e=0;else e=0-e&7;d=d+(n+ -47+e)|0;d=d>>>0<(r+16|0)>>>0?r:d;e=d+8|0;f=p+8|0;if(!(f&7))f=0;else f=0-f&7;H=q+ -40-f|0;c[1212]=p+f;c[1209]=H;c[p+(f+4)>>2]=H|1;c[p+(q+ -36)>>2]=40;c[1213]=c[1328];c[d+4>>2]=27;c[e+0>>2]=c[1318];c[e+4>>2]=c[1319];c[e+8>>2]=c[1320];c[e+12>>2]=c[1321];c[1318]=p;c[1319]=q;c[1321]=0;c[1320]=e;e=d+28|0;c[e>>2]=7;if((d+32|0)>>>0<m>>>0)do{H=e;e=e+4|0;c[e>>2]=7}while((H+8|0)>>>0<m>>>0);if((d|0)!=(r|0)){d=d-r|0;e=r+(d+4)|0;c[e>>2]=c[e>>2]&-2;c[r+4>>2]=d|1;c[r+d>>2]=d;e=d>>>3;if(d>>>0<256){f=e<<1;d=4864+(f<<2)|0;g=c[1206]|0;e=1<<e;do if(!(g&e)){c[1206]=g|e;k=4864+(f+2<<2)|0;j=d}else{f=4864+(f+2<<2)|0;e=c[f>>2]|0;if(e>>>0>=(c[1210]|0)>>>0){k=f;j=e;break}Wa()}while(0);c[k>>2]=r;c[j+12>>2]=r;c[r+8>>2]=j;c[r+12>>2]=d;break}e=d>>>8;if(e)if(d>>>0>16777215)e=31;else{G=(e+1048320|0)>>>16&8;H=e<<G;F=(H+520192|0)>>>16&4;H=H<<F;e=(H+245760|0)>>>16&2;e=14-(F|G|e)+(H<<e>>>15)|0;e=d>>>(e+7|0)&1|e<<1}else e=0;j=5128+(e<<2)|0;c[r+28>>2]=e;c[r+20>>2]=0;c[r+16>>2]=0;f=c[1207]|0;g=1<<e;if(!(f&g)){c[1207]=f|g;c[j>>2]=r;c[r+24>>2]=j;c[r+12>>2]=r;c[r+8>>2]=r;break}f=c[j>>2]|0;if((e|0)==31)e=0;else e=25-(e>>>1)|0;k:do if((c[f+4>>2]&-8|0)!=(d|0)){e=d<<e;j=f;while(1){f=j+(e>>>31<<2)+16|0;g=c[f>>2]|0;if(!g)break;if((c[g+4>>2]&-8|0)==(d|0)){h=g;break k}else{e=e<<1;j=g}}if(f>>>0<(c[1210]|0)>>>0)Wa();else{c[f>>2]=r;c[r+24>>2]=j;c[r+12>>2]=r;c[r+8>>2]=r;break g}}else h=f;while(0);e=h+8|0;d=c[e>>2]|0;H=c[1210]|0;if(h>>>0>=H>>>0&d>>>0>=H>>>0){c[d+12>>2]=r;c[e>>2]=r;c[r+8>>2]=d;c[r+12>>2]=h;c[r+24>>2]=0;break}else Wa()}}else{H=c[1210]|0;if((H|0)==0|p>>>0<H>>>0)c[1210]=p;c[1318]=p;c[1319]=q;c[1321]=0;c[1215]=c[1324];c[1214]=-1;d=0;do{H=d<<1;G=4864+(H<<2)|0;c[4864+(H+3<<2)>>2]=G;c[4864+(H+2<<2)>>2]=G;d=d+1|0}while((d|0)!=32);d=p+8|0;if(!(d&7))d=0;else d=0-d&7;H=q+ -40-d|0;c[1212]=p+d;c[1209]=H;c[p+(d+4)>>2]=H|1;c[p+(q+ -36)>>2]=40;c[1213]=c[1328]}while(0);d=c[1209]|0;if(d>>>0>a>>>0){G=d-a|0;c[1209]=G;H=c[1212]|0;c[1212]=H+a;c[H+(a+4)>>2]=G|1;c[H+4>>2]=a|3;H=H+8|0;i=b;return H|0}}c[(Oa()|0)>>2]=12;H=0;i=b;return H|0}function Td(a){a=a|0;var b=0,d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0;b=i;if(!a){i=b;return}q=a+ -8|0;r=c[1210]|0;if(q>>>0<r>>>0)Wa();n=c[a+ -4>>2]|0;m=n&3;if((m|0)==1)Wa();j=n&-8;h=a+(j+ -8)|0;do if(!(n&1)){u=c[q>>2]|0;if(!m){i=b;return}q=-8-u|0;n=a+q|0;m=u+j|0;if(n>>>0<r>>>0)Wa();if((n|0)==(c[1211]|0)){e=a+(j+ -4)|0;o=c[e>>2]|0;if((o&3|0)!=3){e=n;o=m;break}c[1208]=m;c[e>>2]=o&-2;c[a+(q+4)>>2]=m|1;c[h>>2]=m;i=b;return}t=u>>>3;if(u>>>0<256){e=c[a+(q+8)>>2]|0;o=c[a+(q+12)>>2]|0;p=4864+(t<<1<<2)|0;if((e|0)!=(p|0)){if(e>>>0<r>>>0)Wa();if((c[e+12>>2]|0)!=(n|0))Wa()}if((o|0)==(e|0)){c[1206]=c[1206]&~(1<<t);e=n;o=m;break}if((o|0)!=(p|0)){if(o>>>0<r>>>0)Wa();p=o+8|0;if((c[p>>2]|0)==(n|0))s=p;else Wa()}else s=o+8|0;c[e+12>>2]=o;c[s>>2]=e;e=n;o=m;break}s=c[a+(q+24)>>2]|0;t=c[a+(q+12)>>2]|0;do if((t|0)==(n|0)){u=a+(q+20)|0;t=c[u>>2]|0;if(!t){u=a+(q+16)|0;t=c[u>>2]|0;if(!t){p=0;break}}while(1){v=t+20|0;w=c[v>>2]|0;if(w){t=w;u=v;continue}v=t+16|0;w=c[v>>2]|0;if(!w)break;else{t=w;u=v}}if(u>>>0<r>>>0)Wa();else{c[u>>2]=0;p=t;break}}else{u=c[a+(q+8)>>2]|0;if(u>>>0<r>>>0)Wa();r=u+12|0;if((c[r>>2]|0)!=(n|0))Wa();v=t+8|0;if((c[v>>2]|0)==(n|0)){c[r>>2]=t;c[v>>2]=u;p=t;break}else Wa()}while(0);if(s){r=c[a+(q+28)>>2]|0;t=5128+(r<<2)|0;if((n|0)==(c[t>>2]|0)){c[t>>2]=p;if(!p){c[1207]=c[1207]&~(1<<r);e=n;o=m;break}}else{if(s>>>0<(c[1210]|0)>>>0)Wa();r=s+16|0;if((c[r>>2]|0)==(n|0))c[r>>2]=p;else c[s+20>>2]=p;if(!p){e=n;o=m;break}}r=c[1210]|0;if(p>>>0<r>>>0)Wa();c[p+24>>2]=s;s=c[a+(q+16)>>2]|0;do if(s)if(s>>>0<r>>>0)Wa();else{c[p+16>>2]=s;c[s+24>>2]=p;break}while(0);q=c[a+(q+20)>>2]|0;if(q)if(q>>>0<(c[1210]|0)>>>0)Wa();else{c[p+20>>2]=q;c[q+24>>2]=p;e=n;o=m;break}else{e=n;o=m}}else{e=n;o=m}}else{e=q;o=j}while(0);if(e>>>0>=h>>>0)Wa();m=a+(j+ -4)|0;n=c[m>>2]|0;if(!(n&1))Wa();if(!(n&2)){if((h|0)==(c[1212]|0)){w=(c[1209]|0)+o|0;c[1209]=w;c[1212]=e;c[e+4>>2]=w|1;if((e|0)!=(c[1211]|0)){i=b;return}c[1211]=0;c[1208]=0;i=b;return}if((h|0)==(c[1211]|0)){w=(c[1208]|0)+o|0;c[1208]=w;c[1211]=e;c[e+4>>2]=w|1;c[e+w>>2]=w;i=b;return}o=(n&-8)+o|0;m=n>>>3;do if(n>>>0>=256){l=c[a+(j+16)>>2]|0;m=c[a+(j|4)>>2]|0;do if((m|0)==(h|0)){n=a+(j+12)|0;m=c[n>>2]|0;if(!m){n=a+(j+8)|0;m=c[n>>2]|0;if(!m){k=0;break}}while(1){q=m+20|0;p=c[q>>2]|0;if(p){m=p;n=q;continue}p=m+16|0;q=c[p>>2]|0;if(!q)break;else{m=q;n=p}}if(n>>>0<(c[1210]|0)>>>0)Wa();else{c[n>>2]=0;k=m;break}}else{n=c[a+j>>2]|0;if(n>>>0<(c[1210]|0)>>>0)Wa();p=n+12|0;if((c[p>>2]|0)!=(h|0))Wa();q=m+8|0;if((c[q>>2]|0)==(h|0)){c[p>>2]=m;c[q>>2]=n;k=m;break}else Wa()}while(0);if(l){m=c[a+(j+20)>>2]|0;n=5128+(m<<2)|0;if((h|0)==(c[n>>2]|0)){c[n>>2]=k;if(!k){c[1207]=c[1207]&~(1<<m);break}}else{if(l>>>0<(c[1210]|0)>>>0)Wa();m=l+16|0;if((c[m>>2]|0)==(h|0))c[m>>2]=k;else c[l+20>>2]=k;if(!k)break}h=c[1210]|0;if(k>>>0<h>>>0)Wa();c[k+24>>2]=l;l=c[a+(j+8)>>2]|0;do if(l)if(l>>>0<h>>>0)Wa();else{c[k+16>>2]=l;c[l+24>>2]=k;break}while(0);h=c[a+(j+12)>>2]|0;if(h)if(h>>>0<(c[1210]|0)>>>0)Wa();else{c[k+20>>2]=h;c[h+24>>2]=k;break}}}else{k=c[a+j>>2]|0;j=c[a+(j|4)>>2]|0;a=4864+(m<<1<<2)|0;if((k|0)!=(a|0)){if(k>>>0<(c[1210]|0)>>>0)Wa();if((c[k+12>>2]|0)!=(h|0))Wa()}if((j|0)==(k|0)){c[1206]=c[1206]&~(1<<m);break}if((j|0)!=(a|0)){if(j>>>0<(c[1210]|0)>>>0)Wa();a=j+8|0;if((c[a>>2]|0)==(h|0))l=a;else Wa()}else l=j+8|0;c[k+12>>2]=j;c[l>>2]=k}while(0);c[e+4>>2]=o|1;c[e+o>>2]=o;if((e|0)==(c[1211]|0)){c[1208]=o;i=b;return}}else{c[m>>2]=n&-2;c[e+4>>2]=o|1;c[e+o>>2]=o}h=o>>>3;if(o>>>0<256){j=h<<1;d=4864+(j<<2)|0;k=c[1206]|0;h=1<<h;if(k&h){j=4864+(j+2<<2)|0;h=c[j>>2]|0;if(h>>>0<(c[1210]|0)>>>0)Wa();else{f=j;g=h}}else{c[1206]=k|h;f=4864+(j+2<<2)|0;g=d}c[f>>2]=e;c[g+12>>2]=e;c[e+8>>2]=g;c[e+12>>2]=d;i=b;return}f=o>>>8;if(f)if(o>>>0>16777215)f=31;else{v=(f+1048320|0)>>>16&8;w=f<<v;u=(w+520192|0)>>>16&4;w=w<<u;f=(w+245760|0)>>>16&2;f=14-(u|v|f)+(w<<f>>>15)|0;f=o>>>(f+7|0)&1|f<<1}else f=0;g=5128+(f<<2)|0;c[e+28>>2]=f;c[e+20>>2]=0;c[e+16>>2]=0;j=c[1207]|0;h=1<<f;a:do if(j&h){g=c[g>>2]|0;if((f|0)==31)f=0;else f=25-(f>>>1)|0;b:do if((c[g+4>>2]&-8|0)!=(o|0)){f=o<<f;while(1){j=g+(f>>>31<<2)+16|0;h=c[j>>2]|0;if(!h)break;if((c[h+4>>2]&-8|0)==(o|0)){d=h;break b}else{f=f<<1;g=h}}if(j>>>0<(c[1210]|0)>>>0)Wa();else{c[j>>2]=e;c[e+24>>2]=g;c[e+12>>2]=e;c[e+8>>2]=e;break a}}else d=g;while(0);g=d+8|0;f=c[g>>2]|0;w=c[1210]|0;if(d>>>0>=w>>>0&f>>>0>=w>>>0){c[f+12>>2]=e;c[g>>2]=e;c[e+8>>2]=f;c[e+12>>2]=d;c[e+24>>2]=0;break}else Wa()}else{c[1207]=j|h;c[g>>2]=e;c[e+24>>2]=g;c[e+12>>2]=e;c[e+8>>2]=e}while(0);w=(c[1214]|0)+ -1|0;c[1214]=w;if(!w)d=5280|0;else{i=b;return}while(1){d=c[d>>2]|0;if(!d)break;else d=d+8|0}c[1214]=-1;i=b;return}function Ud(a,b){a=a|0;b=b|0;var d=0,e=0,f=0;d=i;do if(a){if(b>>>0>4294967231){c[(Oa()|0)>>2]=12;e=0;break}if(b>>>0<11)e=16;else e=b+11&-8;e=fe(a+ -8|0,e)|0;if(e){e=e+8|0;break}e=Sd(b)|0;if(!e)e=0;else{f=c[a+ -4>>2]|0;f=(f&-8)-((f&3|0)==0?8:4)|0;pe(e|0,a|0,(f>>>0<b>>>0?f:b)|0)|0;Td(a)}}else e=Sd(b)|0;while(0);i=d;return e|0}function Vd(a){a=a|0;if((a|0)==32)a=1;else a=(a+ -9|0)>>>0<5;return a&1|0}function Wd(b,e,f,g,h){b=b|0;e=e|0;f=f|0;g=g|0;h=h|0;var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;j=i;if(e>>>0>36){c[(Oa()|0)>>2]=22;s=0;t=0;F=s;i=j;return t|0}k=b+4|0;l=b+100|0;do{m=c[k>>2]|0;if(m>>>0<(c[l>>2]|0)>>>0){c[k>>2]=m+1;o=d[m>>0]|0}else o=Zd(b)|0}while((Vd(o)|0)!=0);do if((o|0)==43|(o|0)==45){m=((o|0)==45)<<31>>31;n=c[k>>2]|0;if(n>>>0<(c[l>>2]|0)>>>0){c[k>>2]=n+1;o=d[n>>0]|0;break}else{o=Zd(b)|0;break}}else m=0;while(0);n=(e|0)==0;do if((e&-17|0)==0&(o|0)==48){o=c[k>>2]|0;if(o>>>0<(c[l>>2]|0)>>>0){c[k>>2]=o+1;o=d[o>>0]|0}else o=Zd(b)|0;if((o|32|0)!=120)if(n){e=8;f=46;break}else{f=32;break}e=c[k>>2]|0;if(e>>>0<(c[l>>2]|0)>>>0){c[k>>2]=e+1;o=d[e>>0]|0}else o=Zd(b)|0;if((d[o+5321>>0]|0)>15){g=(c[l>>2]|0)==0;if(!g)c[k>>2]=(c[k>>2]|0)+ -1;if(!f){Yd(b,0);s=0;t=0;F=s;i=j;return t|0}if(g){s=0;t=0;F=s;i=j;return t|0}c[k>>2]=(c[k>>2]|0)+ -1;s=0;t=0;F=s;i=j;return t|0}else{e=16;f=46}}else{e=n?10:e;if((d[o+5321>>0]|0)>>>0<e>>>0)f=32;else{if(c[l>>2]|0)c[k>>2]=(c[k>>2]|0)+ -1;Yd(b,0);c[(Oa()|0)>>2]=22;s=0;t=0;F=s;i=j;return t|0}}while(0);if((f|0)==32)if((e|0)==10){e=o+ -48|0;if(e>>>0<10){n=0;do{n=(n*10|0)+e|0;e=c[k>>2]|0;if(e>>>0<(c[l>>2]|0)>>>0){c[k>>2]=e+1;o=d[e>>0]|0}else o=Zd(b)|0;e=o+ -48|0}while(e>>>0<10&n>>>0<429496729);p=0}else{n=0;p=0}e=o+ -48|0;if(e>>>0<10){do{q=we(n|0,p|0,10,0)|0;r=F;s=((e|0)<0)<<31>>31;t=~s;if(r>>>0>t>>>0|(r|0)==(t|0)&q>>>0>~e>>>0)break;n=ne(q|0,r|0,e|0,s|0)|0;p=F;e=c[k>>2]|0;if(e>>>0<(c[l>>2]|0)>>>0){c[k>>2]=e+1;o=d[e>>0]|0}else o=Zd(b)|0;e=o+ -48|0}while(e>>>0<10&(p>>>0<429496729|(p|0)==429496729&n>>>0<2576980378));if(e>>>0<=9){e=10;f=72}}}else f=46;a:do if((f|0)==46){if(!(e+ -1&e)){f=a[5584+((e*23|0)>>>5&7)>>0]|0;r=a[o+5321>>0]|0;n=r&255;if(n>>>0<e>>>0){o=n;n=0;do{n=o|n<<f;o=c[k>>2]|0;if(o>>>0<(c[l>>2]|0)>>>0){c[k>>2]=o+1;s=d[o>>0]|0}else s=Zd(b)|0;r=a[s+5321>>0]|0;o=r&255}while(o>>>0<e>>>0&n>>>0<134217728);p=0}else{p=0;n=0;s=o}o=oe(-1,-1,f|0)|0;q=F;if((r&255)>>>0>=e>>>0|(p>>>0>q>>>0|(p|0)==(q|0)&n>>>0>o>>>0)){o=s;f=72;break}while(1){n=le(n|0,p|0,f|0)|0;p=F;n=r&255|n;r=c[k>>2]|0;if(r>>>0<(c[l>>2]|0)>>>0){c[k>>2]=r+1;s=d[r>>0]|0}else s=Zd(b)|0;r=a[s+5321>>0]|0;if((r&255)>>>0>=e>>>0|(p>>>0>q>>>0|(p|0)==(q|0)&n>>>0>o>>>0)){o=s;f=72;break a}}}r=a[o+5321>>0]|0;f=r&255;if(f>>>0<e>>>0){n=0;do{n=f+(ba(n,e)|0)|0;f=c[k>>2]|0;if(f>>>0<(c[l>>2]|0)>>>0){c[k>>2]=f+1;q=d[f>>0]|0}else q=Zd(b)|0;r=a[q+5321>>0]|0;f=r&255}while(f>>>0<e>>>0&n>>>0<119304647);p=0}else{n=0;p=0;q=o}if((r&255)>>>0<e>>>0){f=xe(-1,-1,e|0,0)|0;o=F;while(1){if(p>>>0>o>>>0|(p|0)==(o|0)&n>>>0>f>>>0){o=q;f=72;break a}s=we(n|0,p|0,e|0,0)|0;t=F;r=r&255;if(t>>>0>4294967295|(t|0)==-1&s>>>0>~r>>>0){o=q;f=72;break a}n=ne(r|0,0,s|0,t|0)|0;p=F;q=c[k>>2]|0;if(q>>>0<(c[l>>2]|0)>>>0){c[k>>2]=q+1;q=d[q>>0]|0}else q=Zd(b)|0;r=a[q+5321>>0]|0;if((r&255)>>>0>=e>>>0){o=q;f=72;break}}}else{o=q;f=72}}while(0);if((f|0)==72)if((d[o+5321>>0]|0)>>>0<e>>>0){do{f=c[k>>2]|0;if(f>>>0<(c[l>>2]|0)>>>0){c[k>>2]=f+1;f=d[f>>0]|0}else f=Zd(b)|0}while((d[f+5321>>0]|0)>>>0<e>>>0);c[(Oa()|0)>>2]=34;p=h;n=g}if(c[l>>2]|0)c[k>>2]=(c[k>>2]|0)+ -1;if(!(p>>>0<h>>>0|(p|0)==(h|0)&n>>>0<g>>>0)){if(!((g&1|0)!=0|0!=0|(m|0)!=0)){c[(Oa()|0)>>2]=34;t=ne(g|0,h|0,-1,-1)|0;s=F;F=s;i=j;return t|0}if(p>>>0>h>>>0|(p|0)==(h|0)&n>>>0>g>>>0){c[(Oa()|0)>>2]=34;s=h;t=g;F=s;i=j;return t|0}}t=((m|0)<0)<<31>>31;t=je(n^m|0,p^t|0,m|0,t|0)|0;s=F;F=s;i=j;return t|0}
-
-
-
-function Xd(b,e,f){b=b|0;e=e|0;f=f|0;var g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0.0,r=0,s=0,t=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,G=0.0,H=0,I=0.0,J=0.0,K=0.0,L=0.0;g=i;i=i+512|0;k=g;if(!e){e=24;j=-149}else if((e|0)==2){e=53;j=-1074}else if((e|0)==1){e=53;j=-1074}else{J=0.0;i=g;return+J}n=b+4|0;o=b+100|0;do{h=c[n>>2]|0;if(h>>>0<(c[o>>2]|0)>>>0){c[n>>2]=h+1;w=d[h>>0]|0}else w=Zd(b)|0}while((Vd(w)|0)!=0);do if((w|0)==43|(w|0)==45){h=1-(((w|0)==45&1)<<1)|0;m=c[n>>2]|0;if(m>>>0<(c[o>>2]|0)>>>0){c[n>>2]=m+1;w=d[m>>0]|0;break}else{w=Zd(b)|0;break}}else h=1;while(0);r=0;do{if((w|32|0)!=(a[5600+r>>0]|0))break;do if(r>>>0<7){m=c[n>>2]|0;if(m>>>0<(c[o>>2]|0)>>>0){c[n>>2]=m+1;w=d[m>>0]|0;break}else{w=Zd(b)|0;break}}while(0);r=r+1|0}while(r>>>0<8);do if((r|0)==3)p=23;else if((r|0)!=8){m=(f|0)!=0;if(r>>>0>3&m)if((r|0)==8)break;else{p=23;break}a:do if(!r){r=0;do{if((w|32|0)!=(a[5616+r>>0]|0))break a;do if(r>>>0<2){s=c[n>>2]|0;if(s>>>0<(c[o>>2]|0)>>>0){c[n>>2]=s+1;w=d[s>>0]|0;break}else{w=Zd(b)|0;break}}while(0);r=r+1|0}while(r>>>0<3)}while(0);if(!r){do if((w|0)==48){m=c[n>>2]|0;if(m>>>0<(c[o>>2]|0)>>>0){c[n>>2]=m+1;m=d[m>>0]|0}else m=Zd(b)|0;if((m|32|0)!=120){if(!(c[o>>2]|0)){w=48;break}c[n>>2]=(c[n>>2]|0)+ -1;w=48;break}k=c[n>>2]|0;if(k>>>0<(c[o>>2]|0)>>>0){c[n>>2]=k+1;z=d[k>>0]|0;x=0}else{z=Zd(b)|0;x=0}while(1){if((z|0)==46){p=70;break}else if((z|0)!=48){k=0;m=0;s=0;r=0;w=0;y=0;G=1.0;t=0;q=0.0;break}k=c[n>>2]|0;if(k>>>0<(c[o>>2]|0)>>>0){c[n>>2]=k+1;z=d[k>>0]|0;x=1;continue}else{z=Zd(b)|0;x=1;continue}}if((p|0)==70){k=c[n>>2]|0;if(k>>>0<(c[o>>2]|0)>>>0){c[n>>2]=k+1;z=d[k>>0]|0}else z=Zd(b)|0;if((z|0)==48){s=0;r=0;do{k=c[n>>2]|0;if(k>>>0<(c[o>>2]|0)>>>0){c[n>>2]=k+1;z=d[k>>0]|0}else z=Zd(b)|0;s=ne(s|0,r|0,-1,-1)|0;r=F}while((z|0)==48);k=0;m=0;x=1;w=1;y=0;G=1.0;t=0;q=0.0}else{k=0;m=0;s=0;r=0;w=1;y=0;G=1.0;t=0;q=0.0}}b:while(1){B=z+ -48|0;do if(B>>>0>=10){A=z|32;C=(z|0)==46;if(!((A+ -97|0)>>>0<6|C))break b;if(C)if(!w){s=m;r=k;w=1;break}else{z=46;break b}else{B=(z|0)>57?A+ -87|0:B;p=83;break}}else p=83;while(0);if((p|0)==83){p=0;do if(!((k|0)<0|(k|0)==0&m>>>0<8)){if((k|0)<0|(k|0)==0&m>>>0<14){J=G*.0625;I=J;q=q+J*+(B|0);break}if((B|0)==0|(y|0)!=0)I=G;else{y=1;I=G;q=q+G*.5}}else{I=G;t=B+(t<<4)|0}while(0);m=ne(m|0,k|0,1,0)|0;k=F;x=1;G=I}z=c[n>>2]|0;if(z>>>0<(c[o>>2]|0)>>>0){c[n>>2]=z+1;z=d[z>>0]|0;continue}else{z=Zd(b)|0;continue}}if(!x){e=(c[o>>2]|0)==0;if(!e)c[n>>2]=(c[n>>2]|0)+ -1;if(f){if(!e?(l=c[n>>2]|0,c[n>>2]=l+ -1,(w|0)!=0):0)c[n>>2]=l+ -2}else Yd(b,0);J=+(h|0)*0.0;i=g;return+J}p=(w|0)==0;l=p?m:s;p=p?k:r;if((k|0)<0|(k|0)==0&m>>>0<8)do{t=t<<4;m=ne(m|0,k|0,1,0)|0;k=F}while((k|0)<0|(k|0)==0&m>>>0<8);do if((z|32|0)==112){m=he(b,f)|0;k=F;if((m|0)==0&(k|0)==-2147483648)if(!f){Yd(b,0);J=0.0;i=g;return+J}else{if(!(c[o>>2]|0)){m=0;k=0;break}c[n>>2]=(c[n>>2]|0)+ -1;m=0;k=0;break}}else if(!(c[o>>2]|0)){m=0;k=0}else{c[n>>2]=(c[n>>2]|0)+ -1;m=0;k=0}while(0);l=le(l|0,p|0,2)|0;l=ne(l|0,F|0,-32,-1)|0;k=ne(l|0,F|0,m|0,k|0)|0;l=F;if(!t){J=+(h|0)*0.0;i=g;return+J}if((l|0)>0|(l|0)==0&k>>>0>(0-j|0)>>>0){c[(Oa()|0)>>2]=34;J=+(h|0)*1.7976931348623157e+308*1.7976931348623157e+308;i=g;return+J}H=j+ -106|0;E=((H|0)<0)<<31>>31;if((l|0)<(E|0)|(l|0)==(E|0)&k>>>0<H>>>0){c[(Oa()|0)>>2]=34;J=+(h|0)*2.2250738585072014e-308*2.2250738585072014e-308;i=g;return+J}if((t|0)>-1)do{t=t<<1;if(!(q>=.5))G=q;else{G=q+-1.0;t=t|1}q=q+G;k=ne(k|0,l|0,-1,-1)|0;l=F}while((t|0)>-1);j=je(32,0,j|0,((j|0)<0)<<31>>31|0)|0;j=ne(k|0,l|0,j|0,F|0)|0;H=F;if(0>(H|0)|0==(H|0)&e>>>0>j>>>0)if((j|0)<0){e=0;p=126}else{e=j;p=124}else p=124;if((p|0)==124)if((e|0)<53)p=126;else{j=e;G=+(h|0);I=0.0}if((p|0)==126){I=+(h|0);j=e;G=I;I=+Va(+(+_d(1.0,84-e|0)),+I)}H=(j|0)<32&q!=0.0&(t&1|0)==0;q=G*(H?0.0:q)+(I+G*+(((H&1)+t|0)>>>0))-I;if(!(q!=0.0))c[(Oa()|0)>>2]=34;J=+$d(q,k);i=g;return+J}while(0);m=j+e|0;l=0-m|0;B=0;while(1){if((w|0)==46){p=137;break}else if((w|0)!=48){D=0;C=0;A=0;break}r=c[n>>2]|0;if(r>>>0<(c[o>>2]|0)>>>0){c[n>>2]=r+1;w=d[r>>0]|0;B=1;continue}else{w=Zd(b)|0;B=1;continue}}if((p|0)==137){p=c[n>>2]|0;if(p>>>0<(c[o>>2]|0)>>>0){c[n>>2]=p+1;w=d[p>>0]|0}else w=Zd(b)|0;if((w|0)==48){D=0;C=0;do{D=ne(D|0,C|0,-1,-1)|0;C=F;p=c[n>>2]|0;if(p>>>0<(c[o>>2]|0)>>>0){c[n>>2]=p+1;w=d[p>>0]|0}else w=Zd(b)|0}while((w|0)==48);B=1;A=1}else{D=0;C=0;A=1}}c[k>>2]=0;z=w+ -48|0;E=(w|0)==46;c:do if(z>>>0<10|E){p=k+496|0;y=0;x=0;t=0;s=0;r=0;d:while(1){do if(E)if(!A){D=y;C=x;A=1}else break d;else{E=ne(y|0,x|0,1,0)|0;x=F;H=(w|0)!=48;if((s|0)>=125){if(!H){y=E;break}c[p>>2]=c[p>>2]|1;y=E;break}y=k+(s<<2)|0;if(t)z=w+ -48+((c[y>>2]|0)*10|0)|0;c[y>>2]=z;t=t+1|0;z=(t|0)==9;y=E;B=1;t=z?0:t;s=(z&1)+s|0;r=H?E:r}while(0);w=c[n>>2]|0;if(w>>>0<(c[o>>2]|0)>>>0){c[n>>2]=w+1;w=d[w>>0]|0}else w=Zd(b)|0;z=w+ -48|0;E=(w|0)==46;if(!(z>>>0<10|E)){p=160;break c}}z=(B|0)!=0;p=168}else{y=0;x=0;t=0;s=0;r=0;p=160}while(0);do if((p|0)==160){z=(A|0)==0;D=z?y:D;C=z?x:C;z=(B|0)!=0;if(!(z&(w|32|0)==101))if((w|0)>-1){p=168;break}else{p=170;break}z=he(b,f)|0;w=F;do if((z|0)==0&(w|0)==-2147483648)if(!f){Yd(b,0);J=0.0;i=g;return+J}else{if(!(c[o>>2]|0)){z=0;w=0;break}c[n>>2]=(c[n>>2]|0)+ -1;z=0;w=0;break}while(0);b=ne(z|0,w|0,D|0,C|0)|0;C=F}while(0);if((p|0)==168)if(c[o>>2]|0){c[n>>2]=(c[n>>2]|0)+ -1;if(z)b=D;else p=171}else p=170;if((p|0)==170)if(z)b=D;else p=171;if((p|0)==171){c[(Oa()|0)>>2]=22;Yd(b,0);J=0.0;i=g;return+J}n=c[k>>2]|0;if(!n){J=+(h|0)*0.0;i=g;return+J}if((b|0)==(y|0)&(C|0)==(x|0)&((x|0)<0|(x|0)==0&y>>>0<10)?e>>>0>30|(n>>>e|0)==0:0){J=+(h|0)*+(n>>>0);i=g;return+J}H=(j|0)/-2|0;E=((H|0)<0)<<31>>31;if((C|0)>(E|0)|(C|0)==(E|0)&b>>>0>H>>>0){c[(Oa()|0)>>2]=34;J=+(h|0)*1.7976931348623157e+308*1.7976931348623157e+308;i=g;return+J}H=j+ -106|0;E=((H|0)<0)<<31>>31;if((C|0)<(E|0)|(C|0)==(E|0)&b>>>0<H>>>0){c[(Oa()|0)>>2]=34;J=+(h|0)*2.2250738585072014e-308*2.2250738585072014e-308;i=g;return+J}if(t){if((t|0)<9){n=k+(s<<2)|0;o=c[n>>2]|0;do{o=o*10|0;t=t+1|0}while((t|0)!=9);c[n>>2]=o}s=s+1|0}if((r|0)<9?(r|0)<=(b|0)&(b|0)<18:0){if((b|0)==9){J=+(h|0)*+((c[k>>2]|0)>>>0);i=g;return+J}if((b|0)<9){J=+(h|0)*+((c[k>>2]|0)>>>0)/+(c[5632+(8-b<<2)>>2]|0);i=g;return+J}H=e+27+(ba(b,-3)|0)|0;n=c[k>>2]|0;if((H|0)>30|(n>>>H|0)==0){J=+(h|0)*+(n>>>0)*+(c[5632+(b+ -10<<2)>>2]|0);i=g;return+J}}n=(b|0)%9|0;if(!n){n=0;o=0}else{f=(b|0)>-1?n:n+9|0;p=c[5632+(8-f<<2)>>2]|0;if(s){r=1e9/(p|0)|0;n=0;o=0;t=0;do{D=k+(t<<2)|0;E=c[D>>2]|0;H=((E>>>0)/(p>>>0)|0)+o|0;c[D>>2]=H;o=ba((E>>>0)%(p>>>0)|0,r)|0;E=t;t=t+1|0;if((E|0)==(n|0)&(H|0)==0){n=t&127;b=b+ -9|0}}while((t|0)!=(s|0));if(o){c[k+(s<<2)>>2]=o;s=s+1|0}}else{n=0;s=0}o=0;b=9-f+b|0}e:while(1){f=k+(n<<2)|0;if((b|0)<18){do{r=0;f=s+127|0;while(1){f=f&127;p=k+(f<<2)|0;t=le(c[p>>2]|0,0,29)|0;t=ne(t|0,F|0,r|0,0)|0;r=F;if(r>>>0>0|(r|0)==0&t>>>0>1e9){H=xe(t|0,r|0,1e9,0)|0;t=ye(t|0,r|0,1e9,0)|0;r=H}else r=0;c[p>>2]=t;p=(f|0)==(n|0);if(!((f|0)!=(s+127&127|0)|p))s=(t|0)==0?f:s;if(p)break;else f=f+ -1|0}o=o+ -29|0}while((r|0)==0)}else{if((b|0)!=18)break;do{if((c[f>>2]|0)>>>0>=9007199){b=18;break e}r=0;p=s+127|0;while(1){p=p&127;t=k+(p<<2)|0;w=le(c[t>>2]|0,0,29)|0;w=ne(w|0,F|0,r|0,0)|0;r=F;if(r>>>0>0|(r|0)==0&w>>>0>1e9){H=xe(w|0,r|0,1e9,0)|0;w=ye(w|0,r|0,1e9,0)|0;r=H}else r=0;c[t>>2]=w;t=(p|0)==(n|0);if(!((p|0)!=(s+127&127|0)|t))s=(w|0)==0?p:s;if(t)break;else p=p+ -1|0}o=o+ -29|0}while((r|0)==0)}n=n+127&127;if((n|0)==(s|0)){H=s+127&127;s=k+((s+126&127)<<2)|0;c[s>>2]=c[s>>2]|c[k+(H<<2)>>2];s=H}c[k+(n<<2)>>2]=r;b=b+9|0}f:while(1){f=s+1&127;p=k+((s+127&127)<<2)|0;while(1){t=(b|0)==18;r=(b|0)>27?9:1;while(1){w=0;while(1){x=w+n&127;if((x|0)==(s|0)){w=2;break}y=c[k+(x<<2)>>2]|0;z=c[5624+(w<<2)>>2]|0;if(y>>>0<z>>>0){w=2;break}x=w+1|0;if(y>>>0>z>>>0)break;if((x|0)<2)w=x;else{w=x;break}}if((w|0)==2&t)break f;o=r+o|0;if((n|0)==(s|0))n=s;else break}t=(1<<r)+ -1|0;w=1e9>>>r;x=n;y=0;do{D=k+(n<<2)|0;E=c[D>>2]|0;H=(E>>>r)+y|0;c[D>>2]=H;y=ba(E&t,w)|0;H=(n|0)==(x|0)&(H|0)==0;n=n+1&127;b=H?b+ -9|0:b;x=H?n:x}while((n|0)!=(s|0));if(!y){n=x;continue}if((f|0)!=(x|0))break;c[p>>2]=c[p>>2]|1;n=x}c[k+(s<<2)>>2]=y;n=x;s=f}b=n&127;if((b|0)==(s|0)){c[k+(f+ -1<<2)>>2]=0;s=f}G=+((c[k+(b<<2)>>2]|0)>>>0);b=n+1&127;if((b|0)==(s|0)){s=s+1&127;c[k+(s+ -1<<2)>>2]=0}q=+(h|0);I=q*(G*1.0e9+ +((c[k+(b<<2)>>2]|0)>>>0));h=o+53|0;j=h-j|0;if((j|0)<(e|0))if((j|0)<0){e=0;b=1;p=244}else{e=j;b=1;p=243}else{b=0;p=243}if((p|0)==243)if((e|0)<53)p=244;else{G=0.0;J=0.0}if((p|0)==244){L=+Va(+(+_d(1.0,105-e|0)),+I);K=+cb(+I,+(+_d(1.0,53-e|0)));G=L;J=K;I=L+(I-K)}f=n+2&127;do if((f|0)!=(s|0)){k=c[k+(f<<2)>>2]|0;do if(k>>>0>=5e8){if(k>>>0>5e8){J=q*.75+J;break}if((n+3&127|0)==(s|0)){J=q*.5+J;break}else{J=q*.75+J;break}}else{if((k|0)==0?(n+3&127|0)==(s|0):0)break;J=q*.25+J}while(0);if((53-e|0)<=1)break;if(+cb(+J,1.0)!=0.0)break;J=J+1.0}while(0);q=I+J-G;do if((h&2147483647|0)>(-2-m|0)){if(+Q(+q)>=9007199254740992.0){b=(b|0)!=0&(e|0)==(j|0)?0:b;o=o+1|0;q=q*.5}if((o+50|0)<=(l|0)?!((b|0)!=0&J!=0.0):0)break;c[(Oa()|0)>>2]=34}while(0);L=+$d(q,o);i=g;return+L}else if((r|0)==3){e=c[n>>2]|0;if(e>>>0<(c[o>>2]|0)>>>0){c[n>>2]=e+1;e=d[e>>0]|0}else e=Zd(b)|0;if((e|0)==40)e=1;else{if(!(c[o>>2]|0)){L=u;i=g;return+L}c[n>>2]=(c[n>>2]|0)+ -1;L=u;i=g;return+L}while(1){h=c[n>>2]|0;if(h>>>0<(c[o>>2]|0)>>>0){c[n>>2]=h+1;h=d[h>>0]|0}else h=Zd(b)|0;if(!((h+ -48|0)>>>0<10|(h+ -65|0)>>>0<26)?!((h+ -97|0)>>>0<26|(h|0)==95):0)break;e=e+1|0}if((h|0)==41){L=u;i=g;return+L}h=(c[o>>2]|0)==0;if(!h)c[n>>2]=(c[n>>2]|0)+ -1;if(!m){c[(Oa()|0)>>2]=22;Yd(b,0);L=0.0;i=g;return+L}if((e|0)==0|h){L=u;i=g;return+L}do{e=e+ -1|0;c[n>>2]=(c[n>>2]|0)+ -1}while((e|0)!=0);q=u;i=g;return+q}else{if(c[o>>2]|0)c[n>>2]=(c[n>>2]|0)+ -1;c[(Oa()|0)>>2]=22;Yd(b,0);L=0.0;i=g;return+L}}while(0);if((p|0)==23){e=(c[o>>2]|0)==0;if(!e)c[n>>2]=(c[n>>2]|0)+ -1;if(!(r>>>0<4|(f|0)==0|e))do{c[n>>2]=(c[n>>2]|0)+ -1;r=r+ -1|0}while(r>>>0>3)}L=+(h|0)*v;i=g;return+L}function Yd(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0;d=i;c[a+104>>2]=b;f=c[a+8>>2]|0;e=c[a+4>>2]|0;g=f-e|0;c[a+108>>2]=g;if((b|0)!=0&(g|0)>(b|0)){c[a+100>>2]=e+b;i=d;return}else{c[a+100>>2]=f;i=d;return}}function Zd(b){b=b|0;var e=0,f=0,g=0,h=0,j=0,k=0,l=0;f=i;j=b+104|0;l=c[j>>2]|0;if(!((l|0)!=0?(c[b+108>>2]|0)>=(l|0):0))k=3;if((k|0)==3?(e=be(b)|0,(e|0)>=0):0){k=c[j>>2]|0;j=c[b+8>>2]|0;if((k|0)!=0?(g=c[b+4>>2]|0,h=k-(c[b+108>>2]|0)+ -1|0,(j-g|0)>(h|0)):0)c[b+100>>2]=g+h;else c[b+100>>2]=j;g=c[b+4>>2]|0;if(j){l=b+108|0;c[l>>2]=j+1-g+(c[l>>2]|0)}b=g+ -1|0;if((d[b>>0]|0|0)==(e|0)){l=e;i=f;return l|0}a[b>>0]=e;l=e;i=f;return l|0}c[b+100>>2]=0;l=-1;i=f;return l|0}function _d(a,b){a=+a;b=b|0;var d=0,e=0;d=i;if((b|0)>1023){a=a*8.98846567431158e+307;e=b+ -1023|0;if((e|0)>1023){b=b+ -2046|0;b=(b|0)>1023?1023:b;a=a*8.98846567431158e+307}else b=e}else if((b|0)<-1022){a=a*2.2250738585072014e-308;e=b+1022|0;if((e|0)<-1022){b=b+2044|0;b=(b|0)<-1022?-1022:b;a=a*2.2250738585072014e-308}else b=e}b=le(b+1023|0,0,52)|0;e=F;c[k>>2]=b;c[k+4>>2]=e;a=a*+h[k>>3];i=d;return+a}function $d(a,b){a=+a;b=b|0;var c=0;c=i;a=+_d(a,b);i=c;return+a}function ae(b){b=b|0;var d=0,e=0,f=0;e=i;f=b+74|0;d=a[f>>0]|0;a[f>>0]=d+255|d;f=b+20|0;d=b+44|0;if((c[f>>2]|0)>>>0>(c[d>>2]|0)>>>0)eb[c[b+36>>2]&1](b,0,0)|0;c[b+16>>2]=0;c[b+28>>2]=0;c[f>>2]=0;f=c[b>>2]|0;if(!(f&20)){f=c[d>>2]|0;c[b+8>>2]=f;c[b+4>>2]=f;f=0;i=e;return f|0}if(!(f&4)){f=-1;i=e;return f|0}c[b>>2]=f|32;f=-1;i=e;return f|0}function be(a){a=a|0;var b=0,e=0;b=i;i=i+16|0;e=b;if((c[a+8>>2]|0)==0?(ae(a)|0)!=0:0)a=-1;else if((eb[c[a+32>>2]&1](a,e,1)|0)==1)a=d[e>>0]|0;else a=-1;i=b;return a|0}function ce(a,b){a=a|0;b=b|0;var d=0,e=0,f=0.0,g=0,h=0;d=i;i=i+112|0;e=d;h=e+0|0;g=h+112|0;do{c[h>>2]=0;h=h+4|0}while((h|0)<(g|0));g=e+4|0;c[g>>2]=a;h=e+8|0;c[h>>2]=-1;c[e+44>>2]=a;c[e+76>>2]=-1;Yd(e,0);f=+Xd(e,1,1);e=(c[g>>2]|0)-(c[h>>2]|0)+(c[e+108>>2]|0)|0;if(!b){i=d;return+f}if(e)a=a+e|0;c[b>>2]=a;i=d;return+f}function de(a,b,d){a=a|0;b=b|0;d=d|0;var e=0,f=0,g=0;e=i;i=i+112|0;g=e;c[g>>2]=0;f=g+4|0;c[f>>2]=a;c[g+44>>2]=a;if((a|0)<0)c[g+8>>2]=-1;else c[g+8>>2]=a+2147483647;c[g+76>>2]=-1;Yd(g,0);d=Wd(g,d,1,-2147483648,0)|0;if(!b){i=e;return d|0}c[b>>2]=a+((c[f>>2]|0)+(c[g+108>>2]|0)-(c[g+8>>2]|0));i=e;return d|0}function ee(b,c){b=b|0;c=c|0;var d=0,e=0,f=0;d=i;f=a[b>>0]|0;e=a[c>>0]|0;if(f<<24>>24==0?1:f<<24>>24!=e<<24>>24)c=f;else{do{b=b+1|0;c=c+1|0;f=a[b>>0]|0;e=a[c>>0]|0}while(!(f<<24>>24==0?1:f<<24>>24!=e<<24>>24));c=f}i=d;return(c&255)-(e&255)|0}function fe(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0;d=i;f=a+4|0;e=c[f>>2]|0;l=e&-8;j=a+l|0;m=c[1210]|0;h=e&3;if(!((h|0)!=1&a>>>0>=m>>>0&a>>>0<j>>>0))Wa();g=a+(l|4)|0;p=c[g>>2]|0;if(!(p&1))Wa();if(!h){if(b>>>0<256){r=0;i=d;return r|0}if(l>>>0>=(b+4|0)>>>0?(l-b|0)>>>0<=c[1326]<<1>>>0:0){r=a;i=d;return r|0}r=0;i=d;return r|0}if(l>>>0>=b>>>0){h=l-b|0;if(h>>>0<=15){r=a;i=d;return r|0}c[f>>2]=e&1|b|2;c[a+(b+4)>>2]=h|3;c[g>>2]=c[g>>2]|1;ge(a+b|0,h);r=a;i=d;return r|0}if((j|0)==(c[1212]|0)){g=(c[1209]|0)+l|0;if(g>>>0<=b>>>0){r=0;i=d;return r|0}r=g-b|0;c[f>>2]=e&1|b|2;c[a+(b+4)>>2]=r|1;c[1212]=a+b;c[1209]=r;r=a;i=d;return r|0}if((j|0)==(c[1211]|0)){h=(c[1208]|0)+l|0;if(h>>>0<b>>>0){r=0;i=d;return r|0}g=h-b|0;if(g>>>0>15){c[f>>2]=e&1|b|2;c[a+(b+4)>>2]=g|1;c[a+h>>2]=g;e=a+(h+4)|0;c[e>>2]=c[e>>2]&-2;e=a+b|0}else{c[f>>2]=e&1|h|2;e=a+(h+4)|0;c[e>>2]=c[e>>2]|1;e=0;g=0}c[1208]=g;c[1211]=e;r=a;i=d;return r|0}if(p&2){r=0;i=d;return r|0}g=(p&-8)+l|0;if(g>>>0<b>>>0){r=0;i=d;return r|0}h=g-b|0;o=p>>>3;do if(p>>>0>=256){n=c[a+(l+24)>>2]|0;o=c[a+(l+12)>>2]|0;do if((o|0)==(j|0)){p=a+(l+20)|0;o=c[p>>2]|0;if(!o){p=a+(l+16)|0;o=c[p>>2]|0;if(!o){k=0;break}}while(1){r=o+20|0;q=c[r>>2]|0;if(q){o=q;p=r;continue}q=o+16|0;r=c[q>>2]|0;if(!r)break;else{o=r;p=q}}if(p>>>0<m>>>0)Wa();else{c[p>>2]=0;k=o;break}}else{p=c[a+(l+8)>>2]|0;if(p>>>0<m>>>0)Wa();m=p+12|0;if((c[m>>2]|0)!=(j|0))Wa();q=o+8|0;if((c[q>>2]|0)==(j|0)){c[m>>2]=o;c[q>>2]=p;k=o;break}else Wa()}while(0);if(n){m=c[a+(l+28)>>2]|0;o=5128+(m<<2)|0;if((j|0)==(c[o>>2]|0)){c[o>>2]=k;if(!k){c[1207]=c[1207]&~(1<<m);break}}else{if(n>>>0<(c[1210]|0)>>>0)Wa();m=n+16|0;if((c[m>>2]|0)==(j|0))c[m>>2]=k;else c[n+20>>2]=k;if(!k)break}j=c[1210]|0;if(k>>>0<j>>>0)Wa();c[k+24>>2]=n;m=c[a+(l+16)>>2]|0;do if(m)if(m>>>0<j>>>0)Wa();else{c[k+16>>2]=m;c[m+24>>2]=k;break}while(0);j=c[a+(l+20)>>2]|0;if(j)if(j>>>0<(c[1210]|0)>>>0)Wa();else{c[k+20>>2]=j;c[j+24>>2]=k;break}}}else{k=c[a+(l+8)>>2]|0;l=c[a+(l+12)>>2]|0;p=4864+(o<<1<<2)|0;if((k|0)!=(p|0)){if(k>>>0<m>>>0)Wa();if((c[k+12>>2]|0)!=(j|0))Wa()}if((l|0)==(k|0)){c[1206]=c[1206]&~(1<<o);break}if((l|0)!=(p|0)){if(l>>>0<m>>>0)Wa();m=l+8|0;if((c[m>>2]|0)==(j|0))n=m;else Wa()}else n=l+8|0;c[k+12>>2]=l;c[n>>2]=k}while(0);if(h>>>0<16){c[f>>2]=g|e&1|2;r=a+(g|4)|0;c[r>>2]=c[r>>2]|1;r=a;i=d;return r|0}else{c[f>>2]=e&1|b|2;c[a+(b+4)>>2]=h|3;r=a+(g|4)|0;c[r>>2]=c[r>>2]|1;ge(a+b|0,h);r=a;i=d;return r|0}return 0}function ge(a,b){a=a|0;b=b|0;var d=0,e=0,f=0,g=0,h=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0;d=i;h=a+b|0;l=c[a+4>>2]|0;do if(!(l&1)){p=c[a>>2]|0;if(!(l&3)){i=d;return}l=a+(0-p)|0;m=p+b|0;r=c[1210]|0;if(l>>>0<r>>>0)Wa();if((l|0)==(c[1211]|0)){e=a+(b+4)|0;n=c[e>>2]|0;if((n&3|0)!=3){e=l;n=m;break}c[1208]=m;c[e>>2]=n&-2;c[a+(4-p)>>2]=m|1;c[h>>2]=m;i=d;return}s=p>>>3;if(p>>>0<256){e=c[a+(8-p)>>2]|0;n=c[a+(12-p)>>2]|0;o=4864+(s<<1<<2)|0;if((e|0)!=(o|0)){if(e>>>0<r>>>0)Wa();if((c[e+12>>2]|0)!=(l|0))Wa()}if((n|0)==(e|0)){c[1206]=c[1206]&~(1<<s);e=l;n=m;break}if((n|0)!=(o|0)){if(n>>>0<r>>>0)Wa();o=n+8|0;if((c[o>>2]|0)==(l|0))q=o;else Wa()}else q=n+8|0;c[e+12>>2]=n;c[q>>2]=e;e=l;n=m;break}q=c[a+(24-p)>>2]|0;s=c[a+(12-p)>>2]|0;do if((s|0)==(l|0)){u=16-p|0;t=a+(u+4)|0;s=c[t>>2]|0;if(!s){t=a+u|0;s=c[t>>2]|0;if(!s){o=0;break}}while(1){v=s+20|0;u=c[v>>2]|0;if(u){s=u;t=v;continue}u=s+16|0;v=c[u>>2]|0;if(!v)break;else{s=v;t=u}}if(t>>>0<r>>>0)Wa();else{c[t>>2]=0;o=s;break}}else{t=c[a+(8-p)>>2]|0;if(t>>>0<r>>>0)Wa();r=t+12|0;if((c[r>>2]|0)!=(l|0))Wa();u=s+8|0;if((c[u>>2]|0)==(l|0)){c[r>>2]=s;c[u>>2]=t;o=s;break}else Wa()}while(0);if(q){s=c[a+(28-p)>>2]|0;r=5128+(s<<2)|0;if((l|0)==(c[r>>2]|0)){c[r>>2]=o;if(!o){c[1207]=c[1207]&~(1<<s);e=l;n=m;break}}else{if(q>>>0<(c[1210]|0)>>>0)Wa();r=q+16|0;if((c[r>>2]|0)==(l|0))c[r>>2]=o;else c[q+20>>2]=o;if(!o){e=l;n=m;break}}r=c[1210]|0;if(o>>>0<r>>>0)Wa();c[o+24>>2]=q;p=16-p|0;q=c[a+p>>2]|0;do if(q)if(q>>>0<r>>>0)Wa();else{c[o+16>>2]=q;c[q+24>>2]=o;break}while(0);p=c[a+(p+4)>>2]|0;if(p)if(p>>>0<(c[1210]|0)>>>0)Wa();else{c[o+20>>2]=p;c[p+24>>2]=o;e=l;n=m;break}else{e=l;n=m}}else{e=l;n=m}}else{e=a;n=b}while(0);l=c[1210]|0;if(h>>>0<l>>>0)Wa();m=a+(b+4)|0;o=c[m>>2]|0;if(!(o&2)){if((h|0)==(c[1212]|0)){v=(c[1209]|0)+n|0;c[1209]=v;c[1212]=e;c[e+4>>2]=v|1;if((e|0)!=(c[1211]|0)){i=d;return}c[1211]=0;c[1208]=0;i=d;return}if((h|0)==(c[1211]|0)){v=(c[1208]|0)+n|0;c[1208]=v;c[1211]=e;c[e+4>>2]=v|1;c[e+v>>2]=v;i=d;return}n=(o&-8)+n|0;m=o>>>3;do if(o>>>0>=256){k=c[a+(b+24)>>2]|0;o=c[a+(b+12)>>2]|0;do if((o|0)==(h|0)){o=a+(b+20)|0;m=c[o>>2]|0;if(!m){o=a+(b+16)|0;m=c[o>>2]|0;if(!m){j=0;break}}while(1){p=m+20|0;q=c[p>>2]|0;if(q){m=q;o=p;continue}q=m+16|0;p=c[q>>2]|0;if(!p)break;else{m=p;o=q}}if(o>>>0<l>>>0)Wa();else{c[o>>2]=0;j=m;break}}else{m=c[a+(b+8)>>2]|0;if(m>>>0<l>>>0)Wa();p=m+12|0;if((c[p>>2]|0)!=(h|0))Wa();l=o+8|0;if((c[l>>2]|0)==(h|0)){c[p>>2]=o;c[l>>2]=m;j=o;break}else Wa()}while(0);if(k){m=c[a+(b+28)>>2]|0;l=5128+(m<<2)|0;if((h|0)==(c[l>>2]|0)){c[l>>2]=j;if(!j){c[1207]=c[1207]&~(1<<m);break}}else{if(k>>>0<(c[1210]|0)>>>0)Wa();l=k+16|0;if((c[l>>2]|0)==(h|0))c[l>>2]=j;else c[k+20>>2]=j;if(!j)break}h=c[1210]|0;if(j>>>0<h>>>0)Wa();c[j+24>>2]=k;k=c[a+(b+16)>>2]|0;do if(k)if(k>>>0<h>>>0)Wa();else{c[j+16>>2]=k;c[k+24>>2]=j;break}while(0);h=c[a+(b+20)>>2]|0;if(h)if(h>>>0<(c[1210]|0)>>>0)Wa();else{c[j+20>>2]=h;c[h+24>>2]=j;break}}}else{j=c[a+(b+8)>>2]|0;a=c[a+(b+12)>>2]|0;b=4864+(m<<1<<2)|0;if((j|0)!=(b|0)){if(j>>>0<l>>>0)Wa();if((c[j+12>>2]|0)!=(h|0))Wa()}if((a|0)==(j|0)){c[1206]=c[1206]&~(1<<m);break}if((a|0)!=(b|0)){if(a>>>0<l>>>0)Wa();b=a+8|0;if((c[b>>2]|0)==(h|0))k=b;else Wa()}else k=a+8|0;c[j+12>>2]=a;c[k>>2]=j}while(0);c[e+4>>2]=n|1;c[e+n>>2]=n;if((e|0)==(c[1211]|0)){c[1208]=n;i=d;return}}else{c[m>>2]=o&-2;c[e+4>>2]=n|1;c[e+n>>2]=n}b=n>>>3;if(n>>>0<256){a=b<<1;h=4864+(a<<2)|0;j=c[1206]|0;b=1<<b;if(j&b){a=4864+(a+2<<2)|0;j=c[a>>2]|0;if(j>>>0<(c[1210]|0)>>>0)Wa();else{g=a;f=j}}else{c[1206]=j|b;g=4864+(a+2<<2)|0;f=h}c[g>>2]=e;c[f+12>>2]=e;c[e+8>>2]=f;c[e+12>>2]=h;i=d;return}f=n>>>8;if(f)if(n>>>0>16777215)f=31;else{u=(f+1048320|0)>>>16&8;v=f<<u;t=(v+520192|0)>>>16&4;v=v<<t;f=(v+245760|0)>>>16&2;f=14-(t|u|f)+(v<<f>>>15)|0;f=n>>>(f+7|0)&1|f<<1}else f=0;g=5128+(f<<2)|0;c[e+28>>2]=f;c[e+20>>2]=0;c[e+16>>2]=0;a=c[1207]|0;h=1<<f;if(!(a&h)){c[1207]=a|h;c[g>>2]=e;c[e+24>>2]=g;c[e+12>>2]=e;c[e+8>>2]=e;i=d;return}g=c[g>>2]|0;if((f|0)==31)f=0;else f=25-(f>>>1)|0;a:do if((c[g+4>>2]&-8|0)!=(n|0)){f=n<<f;a=g;while(1){h=a+(f>>>31<<2)+16|0;g=c[h>>2]|0;if(!g)break;if((c[g+4>>2]&-8|0)==(n|0))break a;else{f=f<<1;a=g}}if(h>>>0<(c[1210]|0)>>>0)Wa();c[h>>2]=e;c[e+24>>2]=a;c[e+12>>2]=e;c[e+8>>2]=e;i=d;return}while(0);f=g+8|0;h=c[f>>2]|0;v=c[1210]|0;if(!(g>>>0>=v>>>0&h>>>0>=v>>>0))Wa();c[h+12>>2]=e;c[f>>2]=e;c[e+8>>2]=h;c[e+12>>2]=g;c[e+24>>2]=0;i=d;return}function he(a,b){a=a|0;b=b|0;var e=0,f=0,g=0,h=0,j=0,k=0;e=i;g=a+4|0;h=c[g>>2]|0;f=a+100|0;if(h>>>0<(c[f>>2]|0)>>>0){c[g>>2]=h+1;j=d[h>>0]|0}else j=Zd(a)|0;if((j|0)==43|(j|0)==45){k=c[g>>2]|0;h=(j|0)==45&1;if(k>>>0<(c[f>>2]|0)>>>0){c[g>>2]=k+1;j=d[k>>0]|0}else j=Zd(a)|0;if((j+ -48|0)>>>0>9&(b|0)!=0?(c[f>>2]|0)!=0:0)c[g>>2]=(c[g>>2]|0)+ -1}else h=0;if((j+ -48|0)>>>0>9){if(!(c[f>>2]|0)){j=-2147483648;k=0;F=j;i=e;return k|0}c[g>>2]=(c[g>>2]|0)+ -1;j=-2147483648;k=0;F=j;i=e;return k|0}else b=0;do{b=j+ -48+(b*10|0)|0;j=c[g>>2]|0;if(j>>>0<(c[f>>2]|0)>>>0){c[g>>2]=j+1;j=d[j>>0]|0}else j=Zd(a)|0}while((j+ -48|0)>>>0<10&(b|0)<214748364);k=((b|0)<0)<<31>>31;if((j+ -48|0)>>>0<10)do{k=we(b|0,k|0,10,0)|0;b=F;j=ne(j|0,((j|0)<0)<<31>>31|0,-48,-1)|0;b=ne(j|0,F|0,k|0,b|0)|0;k=F;j=c[g>>2]|0;if(j>>>0<(c[f>>2]|0)>>>0){c[g>>2]=j+1;j=d[j>>0]|0}else j=Zd(a)|0}while((j+ -48|0)>>>0<10&((k|0)<21474836|(k|0)==21474836&b>>>0<2061584302));if((j+ -48|0)>>>0<10)do{j=c[g>>2]|0;if(j>>>0<(c[f>>2]|0)>>>0){c[g>>2]=j+1;j=d[j>>0]|0}else j=Zd(a)|0}while((j+ -48|0)>>>0<10);if(c[f>>2]|0)c[g>>2]=(c[g>>2]|0)+ -1;g=(h|0)!=0;h=je(0,0,b|0,k|0)|0;j=g?F:k;k=g?h:b;F=j;i=e;return k|0}function ie(){}function je(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;b=b-d-(c>>>0>a>>>0|0)>>>0;return(F=b,a-c>>>0|0)|0}function ke(b,d,e){b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,i=0;f=b+e|0;if((e|0)>=20){d=d&255;i=b&3;h=d|d<<8|d<<16|d<<24;g=f&~3;if(i){i=b+4-i|0;while((b|0)<(i|0)){a[b>>0]=d;b=b+1|0}}while((b|0)<(g|0)){c[b>>2]=h;b=b+4|0}}while((b|0)<(f|0)){a[b>>0]=d;b=b+1|0}return b-e|0}function le(a,b,c){a=a|0;b=b|0;c=c|0;if((c|0)<32){F=b<<c|(a&(1<<c)-1<<32-c)>>>32-c;return a<<c}F=a<<c-32;return 0}function me(b){b=b|0;var c=0;c=b;while(a[c>>0]|0)c=c+1|0;return c-b|0}function ne(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;c=a+c>>>0;return(F=b+d+(c>>>0<a>>>0|0)>>>0,c|0)|0}function oe(a,b,c){a=a|0;b=b|0;c=c|0;if((c|0)<32){F=b>>>c;return a>>>c|(b&(1<<c)-1)<<32-c}F=0;return b>>>c-32|0}function pe(b,d,e){b=b|0;d=d|0;e=e|0;var f=0;if((e|0)>=4096)return Ca(b|0,d|0,e|0)|0;f=b|0;if((b&3)==(d&3)){while(b&3){if(!e)return f|0;a[b>>0]=a[d>>0]|0;b=b+1|0;d=d+1|0;e=e-1|0}while((e|0)>=4){c[b>>2]=c[d>>2];b=b+4|0;d=d+4|0;e=e-4|0}}while((e|0)>0){a[b>>0]=a[d>>0]|0;b=b+1|0;d=d+1|0;e=e-1|0}return f|0}function qe(a,b,c){a=a|0;b=b|0;c=c|0;if((c|0)<32){F=b>>c;return a>>>c|(b&(1<<c)-1)<<32-c}F=(b|0)<0?-1:0;return b>>c-32|0}function re(b){b=b|0;var c=0;c=a[n+(b>>>24)>>0]|0;if((c|0)<8)return c|0;c=a[n+(b>>16&255)>>0]|0;if((c|0)<8)return c+8|0;c=a[n+(b>>8&255)>>0]|0;if((c|0)<8)return c+16|0;return(a[n+(b&255)>>0]|0)+24|0}function se(b){b=b|0;var c=0;c=a[m+(b&255)>>0]|0;if((c|0)<8)return c|0;c=a[m+(b>>8&255)>>0]|0;if((c|0)<8)return c+8|0;c=a[m+(b>>16&255)>>0]|0;if((c|0)<8)return c+16|0;return(a[m+(b>>>24)>>0]|0)+24|0}function te(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0;f=a&65535;d=b&65535;c=ba(d,f)|0;e=a>>>16;d=(c>>>16)+(ba(d,e)|0)|0;b=b>>>16;a=ba(b,f)|0;return(F=(d>>>16)+(ba(b,e)|0)+(((d&65535)+a|0)>>>16)|0,d+a<<16|c&65535|0)|0}function ue(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;var e=0,f=0,g=0,h=0,i=0,j=0;j=b>>31|((b|0)<0?-1:0)<<1;i=((b|0)<0?-1:0)>>31|((b|0)<0?-1:0)<<1;f=d>>31|((d|0)<0?-1:0)<<1;e=((d|0)<0?-1:0)>>31|((d|0)<0?-1:0)<<1;h=je(j^a,i^b,j,i)|0;g=F;b=f^j;a=e^i;a=je((ze(h,g,je(f^c,e^d,f,e)|0,F,0)|0)^b,F^a,b,a)|0;return a|0}function ve(a,b,d,e){a=a|0;b=b|0;d=d|0;e=e|0;var f=0,g=0,h=0,j=0,k=0,l=0;f=i;i=i+8|0;j=f|0;h=b>>31|((b|0)<0?-1:0)<<1;g=((b|0)<0?-1:0)>>31|((b|0)<0?-1:0)<<1;l=e>>31|((e|0)<0?-1:0)<<1;k=((e|0)<0?-1:0)>>31|((e|0)<0?-1:0)<<1;b=je(h^a,g^b,h,g)|0;a=F;ze(b,a,je(l^d,k^e,l,k)|0,F,j)|0;a=je(c[j>>2]^h,c[j+4>>2]^g,h,g)|0;b=F;i=f;return(F=b,a)|0}function we(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;var e=0,f=0;e=a;f=c;a=te(e,f)|0;c=F;return(F=(ba(b,f)|0)+(ba(d,e)|0)+c|c&0,a|0|0)|0}function xe(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;a=ze(a,b,c,d,0)|0;return a|0}function ye(a,b,d,e){a=a|0;b=b|0;d=d|0;e=e|0;var f=0,g=0;g=i;i=i+8|0;f=g|0;ze(a,b,d,e,f)|0;i=g;return(F=c[f+4>>2]|0,c[f>>2]|0)|0}function ze(a,b,d,e,f){a=a|0;b=b|0;d=d|0;e=e|0;f=f|0;var g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;h=a;j=b;i=j;l=d;g=e;k=g;if(!i){g=(f|0)!=0;if(!k){if(g){c[f>>2]=(h>>>0)%(l>>>0);c[f+4>>2]=0}k=0;m=(h>>>0)/(l>>>0)>>>0;return(F=k,m)|0}else{if(!g){l=0;m=0;return(F=l,m)|0}c[f>>2]=a|0;c[f+4>>2]=b&0;l=0;m=0;return(F=l,m)|0}}m=(k|0)==0;do if(l){if(!m){k=(re(k|0)|0)-(re(i|0)|0)|0;if(k>>>0<=31){m=k+1|0;l=31-k|0;a=k-31>>31;j=m;b=h>>>(m>>>0)&a|i<<l;a=i>>>(m>>>0)&a;k=0;l=h<<l;break}if(!f){l=0;m=0;return(F=l,m)|0}c[f>>2]=a|0;c[f+4>>2]=j|b&0;l=0;m=0;return(F=l,m)|0}k=l-1|0;if(k&l){l=(re(l|0)|0)+33-(re(i|0)|0)|0;p=64-l|0;m=32-l|0;n=m>>31;o=l-32|0;a=o>>31;j=l;b=m-1>>31&i>>>(o>>>0)|(i<<m|h>>>(l>>>0))&a;a=a&i>>>(l>>>0);k=h<<p&n;l=(i<<p|h>>>(o>>>0))&n|h<<m&l-33>>31;break}if(f){c[f>>2]=k&h;c[f+4>>2]=0}if((l|0)==1){o=j|b&0;p=a|0|0;return(F=o,p)|0}else{p=se(l|0)|0;o=i>>>(p>>>0)|0;p=i<<32-p|h>>>(p>>>0)|0;return(F=o,p)|0}}else{if(m){if(f){c[f>>2]=(i>>>0)%(l>>>0);c[f+4>>2]=0}o=0;p=(i>>>0)/(l>>>0)>>>0;return(F=o,p)|0}if(!h){if(f){c[f>>2]=0;c[f+4>>2]=(i>>>0)%(k>>>0)}o=0;p=(i>>>0)/(k>>>0)>>>0;return(F=o,p)|0}l=k-1|0;if(!(l&k)){if(f){c[f>>2]=a|0;c[f+4>>2]=l&i|b&0}o=0;p=i>>>((se(k|0)|0)>>>0);return(F=o,p)|0}k=(re(k|0)|0)-(re(i|0)|0)|0;if(k>>>0<=30){a=k+1|0;l=31-k|0;j=a;b=i<<l|h>>>(a>>>0);a=i>>>(a>>>0);k=0;l=h<<l;break}if(!f){o=0;p=0;return(F=o,p)|0}c[f>>2]=a|0;c[f+4>>2]=j|b&0;o=0;p=0;return(F=o,p)|0}while(0);if(!j){g=l;e=0;i=0}else{h=d|0|0;g=g|e&0;e=ne(h,g,-1,-1)|0;d=F;i=0;do{m=l;l=k>>>31|l<<1;k=i|k<<1;m=b<<1|m>>>31|0;n=b>>>31|a<<1|0;je(e,d,m,n)|0;p=F;o=p>>31|((p|0)<0?-1:0)<<1;i=o&1;b=je(m,n,o&h,(((p|0)<0?-1:0)>>31|((p|0)<0?-1:0)<<1)&g)|0;a=F;j=j-1|0}while((j|0)!=0);g=l;e=0}h=0;if(f){c[f>>2]=b;c[f+4>>2]=a}o=(k|0)>>>31|(g|h)<<1|(h<<1|k>>>31)&0|e;p=(k<<1|0>>>31)&-2|i;return(F=o,p)|0}function Ae(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;return eb[a&1](b|0,c|0,d|0)|0}function Be(a,b,c,d,e,f){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;f=f|0;fb[a&3](b|0,c|0,d|0,e|0,f|0)}function Ce(a,b){a=a|0;b=b|0;gb[a&31](b|0)}function De(a,b,c){a=a|0;b=b|0;c=c|0;hb[a&3](b|0,c|0)}function Ee(a,b){a=a|0;b=b|0;return ib[a&1](b|0)|0}function Fe(a){a=a|0;jb[a&3]()}function Ge(a,b,c,d,e,f,g){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;f=f|0;g=g|0;kb[a&3](b|0,c|0,d|0,e|0,f|0,g|0)}function He(a,b,c){a=a|0;b=b|0;c=c|0;return lb[a&3](b|0,c|0)|0}function Ie(a,b,c,d,e){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;mb[a&3](b|0,c|0,d|0,e|0)}function Je(a,b,c){a=a|0;b=b|0;c=c|0;ca(0);return 0}function Ke(a,b,c,d,e){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;ca(1)}function Le(a){a=a|0;ca(2)}function Me(a,b){a=a|0;b=b|0;ca(3)}function Ne(a){a=a|0;ca(4);return 0}function Oe(){ca(5)}function Pe(){bb()}function Qe(a,b,c,d,e,f){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;f=f|0;ca(6)}function Re(a,b){a=a|0;b=b|0;ca(7);return 0}function Se(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;ca(8)}
-
-
-
-
+function vb(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,C=0,D=0,F=N(0),I=0,M=0,P=0,Q=0;a:{I=E[a+724|0]&1;b:{if(!I){c=H[14632];e=c;break b}c:{o=G[a+308>>2];if((o|0)<=0){break c}while(1){d:{b=G[G[a+304>>2]+(c<<2)>>2]>>1;d=b+G[a+876>>2]|0;if(!H[d|0]){E[d|0]=1;if((e|0)==(A|0)){d=e>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(e^2147483647)>>>0){break d}e=d+e|0;w=ed(w,e<<2);if(!w){break d}}G[(A<<2)+w>>2]=b;A=A+1|0;o=G[a+308>>2]}c=c+1|0;if((o|0)>(c|0)){continue}break c}break}break a}e=wb(a,0)^1;c=H[14632]}o=e&2;e:{if(((c^-1)&254)>>>1&(e&255)==(c&255)|o&c){c=0;if(G[a+4>>2]){G[a+8>>2]=0}f:{g:{if(G[a+36>>2]>0){while(1){E[G[a+16>>2]+G[G[a+32>>2]+(c<<2)>>2]|0]=0;c=c+1|0;if((c|0)<G[a+36>>2]){continue}break}if(G[a+32>>2]){break g}break f}if(!G[a+32>>2]){break f}}G[a+36>>2]=0}h:{if(!H[a+492|0]){e=H[14117];break h}c=G[a+156>>2];b=G[a+152>>2]+1|0;c=b?c:c+1|0;G[a+152>>2]=b;G[a+156>>2]=c;j=L[a+120>>3]*+G[a+208>>2];L[a+640>>3]=j;p=j;j=+G[a+104>>2];if(p<j){L[a+640>>3]=j}b=G[a+136>>2];G[a+656>>2]=b;L[a+648>>3]=b|0;e=H[14118];c=e;if(G[a+44>>2]>0){wc(2489);wc(1065);wc(1145);wc(2569);c=H[14118]}i:{if(!(((c^-1)&254)>>>1&(e&255)==(c&255)|c&e&2)){break i}o=0;while(1){d=G[a+108>>2];p=L[a+112>>3];j:{k:{l:{if(H[a+80|0]==1){b=1;c=0;e=0;if(o){break l}break k}j=+(o>>>0);break j}while(1){e=e+1|0;c=b<<1;b=c|1;if((c|0)<(o|0)){continue}break}}b=o;if((c|0)!=(b|0)){while(1){e=e-1|0;f=c>>1;c=f-1|0;b=(b|0)%(f|0)|0;if((c|0)!=(b|0)){continue}break}}j=+(e|0)}j=rc(p,j)*+(d|0);m:{if(O(j)<2147483648){s=~~j;break m}s=-2147483648}C=0;k=la+-64|0;la=k;G[k+56>>2]=0;G[k+48>>2]=0;G[k+52>>2]=0;b=G[a+164>>2];c=G[a+160>>2]+1|0;b=c?b:b+1|0;G[a+160>>2]=c;G[a+164>>2]=b;P=a+544|0;u=a+284|0;n:{o:{p:{while(1){q:{r:{b=Za(a);if((b|0)!=-1){break r}if((s|0)<=(C|0)&(s|0)>=0){break p}while(1){if(H[a+680|0]){break p}b=G[a+664>>2];c=G[a+668>>2];if((c|0)>=0|(c|0)>0){d=G[a+196>>2];if((c|0)==(d|0)&b>>>0<=J[a+192>>2]|c>>>0<d>>>0){break p}}b=G[a+672>>2];c=G[a+676>>2];if((c|0)>=0|(c|0)>0){d=G[a+188>>2];if((c|0)==(d|0)&b>>>0<=J[a+184>>2]|c>>>0<d>>>0){break p}}if(!G[a+296>>2]){if(!hb(a)){break q}}b=G[a+272>>2];if(L[a+640>>3]<=+(b-G[a+284>>2]|0)){e=0;j=L[a+496>>3];eb(G[a+268>>2],b,a+544|0);f=G[a+272>>2];s:{if((f|0)<=0){break s}j=j/+(b|0);g=G[a+544>>2];b=0;while(1){t:{u:{l=G[a+268>>2];d=G[l+(b<<2)>>2];m=d<<2;c=m+g|0;n=G[c>>2];if(n>>>0<96){break u}h=G[c+4>>2];q=h>>1;i=H[q+G[a+332>>2]|0];t=i^h&1;h=H[14116];v:{if(!((t|0)==(h|0)&((h^-1)&254)>>>1|h&i&2)){break v}i=G[G[a+396>>2]+(q<<3)>>2];if((i|0)==-1){break v}if((d|0)==(i|0)){break u}}i=c+4|0;if(((f|0)/2|0)<=(b|0)){if(!(j>+K[i+(n>>>5<<2)>>2])){break u}}bb(a,d,0);f=G[i>>2];i=f>>1;d=H[i+G[a+332>>2]|0];g=d^f&1;f=H[14116];w:{if(!((g|0)==(f|0)&((f^-1)&254)>>>1|d&f&2)){break w}d=G[a+396>>2]+(i<<3)|0;f=G[d>>2];if((f|0)==-1|(c|0)!=(G[a+544>>2]+(f<<2)|0)){break w}G[d>>2]=-1}G[c>>2]=G[c>>2]&-4|1;g=G[a+544>>2];c=G[m+g>>2];G[a+556>>2]=((G[a+556>>2]+(c>>>5|0)|0)+(c>>>3&1)|0)+1;break t}G[l+(e<<2)>>2]=d;e=e+1|0}b=b+1|0;f=G[a+272>>2];if((b|0)<(f|0)){continue}break}b=b-e|0;if((b|0)<=0){break s}G[a+272>>2]=f-b}if(+J[a+556>>2]>L[a+96>>3]*+J[a+548>>2]){pa[G[G[a>>2]+8>>2]](a)}}b=G[a+296>>2];x:{y:{if((b|0)>=G[a+308>>2]){break y}c=H[14116];while(1){e=G[G[a+304>>2]+(b<<2)>>2];d=H[G[a+332>>2]+(e>>1)|0];z:{f=d^e&1;d=d&2;if(((c^-1)&254)>>>1&(f|0)==(c&255)|d&c){d=G[a+284>>2];if(G[a+300>>2]!=(b|0)){e=G[a+292>>2];break z}A:{c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break A}b=b+c|0;G[a+300>>2]=b;e=ed(G[a+292>>2],b<<2);G[a+292>>2]=e;if(!e){break A}b=G[a+296>>2];c=H[14116];break z}break a}c=H[14117];if((c|0)==(f|0)&((c^-1)&254)>>>1|c&d){c=e^1;e=0;b=a+16|0;B:{C:{if(G[b+20>>2]>0){while(1){E[G[b>>2]+G[G[b+16>>2]+(e<<2)>>2]|0]=0;e=e+1|0;if((e|0)<G[b+20>>2]){continue}break}if(G[b+16>>2]){break C}break B}if(!G[b+16>>2]){break B}}G[b+20>>2]=0}db(b,c);if(G[a+296>>2]){i=c>>1;E[i+G[a+588>>2]|0]=1;c=G[a+284>>2];e=G[G[a+292>>2]>>2];if((c|0)>(e|0)){while(1){c=c-1|0;d=G[G[a+280>>2]+(c<<2)>>2];f=d>>1;if(H[f+G[a+588>>2]|0]){e=G[G[a+396>>2]+(f<<3)>>2];D:{if((e|0)==-1){db(b,d^1);break D}s=G[a+544>>2]+(e<<2)|0;d=G[s>>2];if(d>>>0<64){break D}g=s+4|0;e=1;while(1){h=G[g+(e<<2)>>2]>>1;if(G[(G[a+396>>2]+(h<<3)|0)+4>>2]>0){E[h+G[a+588>>2]|0]=1;d=G[s>>2]}e=e+1|0;if(e>>>0<d>>>5>>>0){continue}break}}E[f+G[a+588>>2]|0]=0;e=G[G[a+292>>2]>>2]}if((c|0)>(e|0)){continue}break}}E[i+G[a+588>>2]|0]=0}break q}if((e|0)!=-2){break x}break y}G[a+296>>2]=b+1;G[(b<<2)+e>>2]=d;b=G[a+296>>2];if((b|0)<G[a+308>>2]){continue}break}}f=G[a+172>>2];b=G[a+168>>2]+1|0;f=b?f:f+1|0;G[a+168>>2]=b;G[a+172>>2]=f;j=L[a+72>>3]*1389796;p=j/2147483647;E:{if(O(p)<2147483648){b=~~p;break E}b=-2147483648}r=j-+(b|0)*2147483647;L[a+72>>3]=r;F:{if(!(L[a+64>>3]>r/2147483647)){h=H[14118];g=-1;break F}h=H[14118];c=G[a+464>>2];if(!c){g=-1;break F}j=r*1389796;p=j/2147483647;G:{if(O(p)<2147483648){b=~~p;break G}b=-2147483648}r=j-+(b|0)*2147483647;L[a+72>>3]=r;e=((h^-1)&254)>>>1|0;f=G[a+460>>2];j=r/2147483647*+(c|0);H:{if(O(j)<2147483648){b=~~j;break H}b=-2147483648}g=G[f+(b<<2)>>2];b=H[g+G[a+332>>2]|0];if(!(e&(b|0)==(h|0)|b&h&2)|!H[G[a+380>>2]+g|0]){break F}c=G[a+180>>2];b=G[a+176>>2]+1|0;c=b?c:c+1|0;G[a+176>>2]=b;G[a+180>>2]=c}t=h&2;i=G[a+460>>2];x=i-4|0;m=(h^-1)>>>1&1;n=G[a+472>>2];v=G[a+380>>2];y=G[a+332>>2];I:{while(1){J:{K:{if((g|0)==-1){break K}b=H[g+y|0];if(!(m&(b|0)==(h|0)|b&t)){break K}if(H[g+v|0]){break J}}b=G[a+464>>2];e=-2;if(!b){break I}g=G[i>>2];b=G[x+(b<<2)>>2];G[i>>2]=b;G[n+(b<<2)>>2]=0;G[n+(g<<2)>>2]=-1;b=G[a+464>>2];e=b-1|0;G[a+464>>2]=e;if((b|0)<3){continue}l=G[G[a+488>>2]>>2];q=G[i>>2];D=L[l+(q<<3)>>3];z=G[a+472>>2];d=0;f=1;c=0;while(1){b=d+2|0;L:{M:{if((e|0)<=(b|0)){e=G[i+(f<<2)>>2];j=L[l+(e<<3)>>3];break M}e=G[i+(b<<2)>>2];j=L[l+(e<<3)>>3];d=G[i+(f<<2)>>2];p=L[l+(d<<3)>>3];if(j>p){break L}e=d;j=p}b=f}N:{if(!(j>D)){b=c;break N}G[i+(c<<2)>>2]=e;G[z+(e<<2)>>2]=c;e=G[a+464>>2];c=b;d=b<<1;f=d|1;if((e|0)>(f|0)){continue}}break}G[i+(b<<2)>>2]=q;G[z+(q<<2)>>2]=b;continue}break}b=H[G[a+364>>2]+g|0];c=b&2;if(!(m&(b|0)==(h|0)|c&h)){e=b;b=H[14116];e=g<<1|((e|0)==(b|0)&((b^-1)&254)>>>1|b&c)!=0;break I}if(H[a+92|0]==1){j=r*1389796;p=j/2147483647;O:{if(O(p)<2147483648){b=~~p;break O}b=-2147483648}j=j-+(b|0)*2147483647;L[a+72>>3]=j;e=g<<1|j/2147483647<.5;break I}e=g<<1|H[G[a+348>>2]+g|0]!=0}b=14116;if((e|0)==-2){break o}b=G[a+296>>2]}d=G[a+284>>2];P:{Q:{if(G[a+300>>2]!=(b|0)){c=G[a+292>>2];break Q}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break P}b=b+c|0;G[a+300>>2]=b;c=ed(G[a+292>>2],b<<2);G[a+292>>2]=c;if(!c){break P}b=G[a+296>>2]}G[a+296>>2]=b+1;G[(b<<2)+c>>2]=d;b=e>>1;E[b+G[a+332>>2]|0]=e&1;c=G[a+296>>2];b=G[a+396>>2]+(b<<3)|0;G[b>>2]=-1;G[b+4>>2]=c;b=G[a+284>>2];G[a+284>>2]=b+1;G[G[a+280>>2]+(b<<2)>>2]=e;b=Za(a);if((b|0)==-1){continue}break r}break}break a}c=G[a+196>>2];e=G[a+192>>2]+1|0;c=e?c:c+1|0;G[a+192>>2]=e;G[a+196>>2]=c;if(!G[a+296>>2]){break q}if(G[k+48>>2]){G[k+52>>2]=0}c=G[k+52>>2];R:{if((c|0)!=G[k+56>>2]){d=G[k+48>>2];break R}e=c>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(c^2147483647)>>>0){break a}c=c+e|0;G[k+56>>2]=c;d=ed(G[k+48>>2],c<<2);G[k+48>>2]=d;if(!d){break a}c=G[k+52>>2]}G[(c<<2)+d>>2]=0;G[k+52>>2]=G[k+52>>2]+1;d=G[a+284>>2]-1|0;c=-2;e=0;while(1){f=G[a+544>>2];l=f+(b<<2)|0;b=G[l>>2];S:{if(!(b&4)){break S}j=L[a+496>>3];i=l+(b>>>3&536870908)|0;F=N(j+ +K[i+4>>2]);K[i+4>>2]=F;if(!(+F>1e20)){break S}i=G[a+272>>2];T:{if((i|0)<=0){break T}h=G[a+268>>2];b=0;if((i|0)!=1){m=i&2147483646;g=0;while(1){n=h+(b<<2)|0;q=f+(G[n>>2]<<2)|0;q=(G[q>>2]>>>3&536870908)+q|0;K[q+4>>2]=+K[q+4>>2]*1e-20;n=f+(G[n+4>>2]<<2)|0;n=(G[n>>2]>>>3&536870908)+n|0;K[n+4>>2]=+K[n+4>>2]*1e-20;b=b+2|0;g=g+2|0;if((m|0)!=(g|0)){continue}break}}if(!(i&1)){break T}b=f+(G[h+(b<<2)>>2]<<2)|0;b=(G[b>>2]>>>3&536870908)+b|0;K[b+4>>2]=+K[b+4>>2]*1e-20}L[a+496>>3]=j*1e-20;b=G[l>>2]}U:{h=(c|0)!=-2;if(h>>>0>=b>>>5>>>0){f=e;break U}z=l+4|0;f=e;while(1){V:{t=G[z+(h<<2)>>2];i=t>>1;x=i+G[a+588>>2]|0;W:{if(H[x|0]){break W}n=i<<3;if(G[(n+G[a+396>>2]|0)+4>>2]<=0){break W}q=G[a+316>>2];b=q+n|0;j=L[a+504>>3]+L[b>>3];L[b>>3]=j;if(j>1e100){m=G[a+540>>2];X:{if((m|0)<=0){break X}g=0;c=0;if(m>>>0>=4){v=m&2147483644;b=0;while(1){e=q+(c<<3)|0;L[e>>3]=L[e>>3]*1e-100;L[e+8>>3]=L[e+8>>3]*1e-100;L[e+16>>3]=L[e+16>>3]*1e-100;L[e+24>>3]=L[e+24>>3]*1e-100;c=c+4|0;b=b+4|0;if((v|0)!=(b|0)){continue}break}}b=m&3;if(!b){break X}while(1){e=q+(c<<3)|0;L[e>>3]=L[e>>3]*1e-100;c=c+1|0;g=g+1|0;if((b|0)!=(g|0)){continue}break}}L[a+504>>3]=L[a+504>>3]*1e-100}Y:{if((i|0)>=G[a+476>>2]){break Y}m=G[a+472>>2];c=G[m+(i<<2)>>2];if((c|0)<0){break Y}b=G[a+460>>2];g=G[b+(c<<2)>>2];Z:{if(!c){c=0;break Z}q=G[G[a+488>>2]>>2];j=L[q+(g<<3)>>3];while(1){e=(c<<2)+b|0;v=c-1|0;i=v>>1;y=(i<<2)+b|0;M=G[y>>2];if(!(j>L[q+(M<<3)>>3])){b=e;break Z}G[e>>2]=M;G[m+(G[y>>2]<<2)>>2]=c;c=i;if(v>>>0>1){continue}break}}G[b>>2]=g;G[m+(g<<2)>>2]=c}E[x|0]=1;if(G[(n+G[a+396>>2]|0)+4>>2]>=G[a+296>>2]){f=f+1|0;break W}c=G[k+52>>2];_:{if((c|0)!=G[k+56>>2]){b=G[k+48>>2];break _}b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break V}b=b+c|0;G[k+56>>2]=b;b=ed(G[k+48>>2],b<<2);G[k+48>>2]=b;if(!b){break V}c=G[k+52>>2]}G[k+52>>2]=c+1;G[(c<<2)+b>>2]=t}h=h+1|0;if(h>>>0<G[l>>2]>>>5>>>0){continue}break U}break}break a}b=G[a+588>>2];e=G[a+280>>2];while(1){c=d<<2;d=d-1|0;c=G[c+e>>2];i=c>>1;g=i+b|0;if(!H[g|0]){continue}break}b=G[G[a+396>>2]+(i<<3)>>2];E[g|0]=0;e=f-1|0;if((f|0)>1){continue}break}G[G[k+48>>2]>>2]=c^1;if(G[a+616>>2]){G[a+620>>2]=0}Fa(a+616|0,G[k+52>>2]);d=G[k+52>>2];if((d|0)>0){b=G[a+616>>2];e=G[k+48>>2];c=0;while(1){d=c<<2;G[d+b>>2]=G[d+e>>2];c=c+1|0;d=G[k+52>>2];if((c|0)<(d|0)){continue}break}}b=d;e=b;$:{aa:{switch(G[a+84>>2]-1|0){case 0:b=1;e=1;if((d|0)<2){break $}g=G[a+588>>2];h=G[a+544>>2];f=G[a+396>>2];i=G[k+48>>2];while(1){ba:{ca:{d=G[i+(e<<2)>>2];c=G[f+(d<<2&-8)>>2];if((c|0)==-1){break ca}c=h+(c<<2)|0;l=G[c>>2];if(l>>>0<64){break ba}l=l>>>5|0;m=c+4|0;c=1;while(1){n=G[m+(c<<2)>>2]>>1;if(!H[n+g|0]&G[(f+(n<<3)|0)+4>>2]>0){break ca}c=c+1|0;if((l|0)!=(c|0)){continue}break}break ba}G[i+(b<<2)>>2]=d;b=b+1|0}e=e+1|0;d=G[k+52>>2];if((e|0)<(d|0)){continue}break};break $;case 1:break aa;default:break $}}e=1;if((d|0)<2){b=1;break $}b=1;while(1){h=G[a+396>>2];d=G[k+48>>2];l=e<<2;c=G[d+l>>2];da:{if(G[h+(c<<2&-8)>>2]!=-1){d=G[(c<<2&-8)+h>>2]<<2;f=G[a+544>>2];if(G[a+604>>2]){G[a+608>>2]=0}d=d+f|0;g=1;ea:{while(1){fa:{i=G[d>>2]>>>5>>>0<=g>>>0;ga:{if(!i){f=G[((g<<2)+d|0)+4>>2];m=f>>1;n=m<<3;q=n+h|0;if(!G[q+4>>2]){break ga}m=H[m+G[a+588>>2]|0];if((m-1&255)>>>0<2){break ga}h=G[a+612>>2];d=G[a+608>>2];if(!((m|0)!=3&G[q>>2]!=-1)){ha:{if((d|0)!=(h|0)){g=G[a+604>>2];break ha}f=d>>1&-2;f=((f|0)>0?f:0)+2|0;if(f>>>0>(d^2147483647)>>>0){break fa}d=d+f|0;G[a+612>>2]=d;g=ed(G[a+604>>2],d<<3);G[a+604>>2]=g;if(!g){break fa}d=G[a+608>>2]}G[a+608>>2]=d+1;d=(d<<3)+g|0;G[d>>2]=0;G[d+4>>2]=c;d=G[a+608>>2];if((d|0)<=0){break ea}g=0;while(1){f=g<<3;c=G[a+588>>2]+(G[(f+G[a+604>>2]|0)+4>>2]>>1)|0;if(!H[c|0]){E[c|0]=3;h=G[a+604>>2];d=G[a+620>>2];ia:{if((d|0)!=G[a+624>>2]){c=G[a+616>>2];break ia}c=d>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(d^2147483647)>>>0){break a}c=c+d|0;G[a+624>>2]=c;c=ed(G[a+616>>2],c<<2);G[a+616>>2]=c;if(!c){break a}d=G[a+620>>2]}G[a+620>>2]=d+1;G[(d<<2)+c>>2]=G[(f+h|0)+4>>2];d=G[a+608>>2]}g=g+1|0;if((g|0)<(d|0)){continue}break}break ea}ja:{if((d|0)!=(h|0)){h=G[a+604>>2];break ja}i=d>>1&-2;i=((i|0)>0?i:0)+2|0;if(i>>>0>(d^2147483647)>>>0){break a}d=d+i|0;G[a+612>>2]=d;h=ed(G[a+604>>2],d<<3);G[a+604>>2]=h;if(!h){break a}d=G[a+608>>2]}G[a+608>>2]=d+1;d=(d<<3)+h|0;G[d>>2]=g;G[d+4>>2]=c;h=G[a+396>>2];d=G[a+544>>2]+(G[n+h>>2]<<2)|0;c=f;g=1;continue}d=G[a+588>>2]+(c>>1)|0;if(!H[d|0]){E[d|0]=2;g=G[a+620>>2];ka:{if((g|0)!=G[a+624>>2]){d=G[a+616>>2];break ka}d=g>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(g^2147483647)>>>0){break a}d=d+g|0;G[a+624>>2]=d;d=ed(G[a+616>>2],d<<2);G[a+616>>2]=d;if(!d){break a}g=G[a+620>>2]}G[a+620>>2]=g+1;G[(g<<2)+d>>2]=c}d=G[a+608>>2];if(!d){break ea}c=G[a+604>>2]+(d<<3)|0;g=G[c-8>>2];h=G[a+396>>2];c=G[c-4>>2];f=G[h+(c<<2&-8)>>2];G[a+608>>2]=d-1;d=G[a+544>>2]+(f<<2)|0}g=g+1|0;continue}break}break a}if(i){break da}d=G[k+48>>2];c=G[l+d>>2]}G[(b<<2)+d>>2]=c;b=b+1|0}e=e+1|0;d=G[k+52>>2];if((e|0)<(d|0)){continue}break}}c=d>>31;f=c+G[a+244>>2]|0;g=G[a+240>>2];i=g+d|0;G[a+240>>2]=i;G[a+244>>2]=g>>>0>i>>>0?f+1|0:f;b=e-b|0;if((b|0)>0){d=d-b|0;G[k+52>>2]=d;c=d>>31}e=G[a+248>>2];b=e+d|0;c=G[a+252>>2]+c|0;G[a+248>>2]=b;G[a+252>>2]=b>>>0<e>>>0?c+1|0:c;c=0;if((d|0)!=1){b=2;f=G[a+396>>2];e=G[k+48>>2];h=1;if((d|0)>2){while(1){h=G[(f+(G[e+(b<<2)>>2]<<2&-8)|0)+4>>2]>G[(f+(G[e+(h<<2)>>2]<<2&-8)|0)+4>>2]?b:h;b=b+1|0;if((d|0)!=(b|0)){continue}break}}d=e+(h<<2)|0;b=G[d>>2];G[d>>2]=G[e+4>>2];G[e+4>>2]=b;b=G[(f+(b<<2&-8)|0)+4>>2]}else{b=0}G[k+60>>2]=b;if(G[a+620>>2]>0){while(1){E[G[a+588>>2]+(G[G[a+616>>2]+(c<<2)>>2]>>1)|0]=0;c=c+1|0;if((c|0)<G[a+620>>2]){continue}break}}cb(a,G[k+60>>2]);la:{if(G[k+52>>2]==1){b=G[G[k+48>>2]>>2];e=b>>1;E[e+G[a+332>>2]|0]=b&1;c=G[a+296>>2];e=G[a+396>>2]+(e<<3)|0;G[e>>2]=-1;G[e+4>>2]=c;break la}d=_a(P,k+48|0,1);b=G[a+272>>2];ma:{if((b|0)!=G[a+276>>2]){c=G[a+268>>2];break ma}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break a}b=b+c|0;G[a+276>>2]=b;c=ed(G[a+268>>2],b<<2);G[a+268>>2]=c;if(!c){break a}b=G[a+272>>2]}G[a+272>>2]=b+1;G[(b<<2)+c>>2]=d;$a(a,d);j=L[a+496>>3];c=G[a+544>>2];b=c+(d<<2)|0;b=(G[b>>2]>>>3&536870908)+b|0;F=N(j+ +K[b+4>>2]);K[b+4>>2]=F;if(+F>1e20){f=G[a+272>>2];na:{if((f|0)<=0){break na}i=G[a+268>>2];b=0;if((f|0)!=1){g=f&2147483646;e=0;while(1){h=i+(b<<2)|0;l=c+(G[h>>2]<<2)|0;l=(G[l>>2]>>>3&536870908)+l|0;K[l+4>>2]=+K[l+4>>2]*1e-20;h=c+(G[h+4>>2]<<2)|0;h=(G[h>>2]>>>3&536870908)+h|0;K[h+4>>2]=+K[h+4>>2]*1e-20;b=b+2|0;e=e+2|0;if((g|0)!=(e|0)){continue}break}}if(!(f&1)){break na}b=c+(G[i+(b<<2)>>2]<<2)|0;b=(G[b>>2]>>>3&536870908)+b|0;K[b+4>>2]=+K[b+4>>2]*1e-20}L[a+496>>3]=j*1e-20}b=G[G[k+48>>2]>>2];e=b>>1;E[e+G[a+332>>2]|0]=b&1;c=G[a+296>>2];e=G[a+396>>2]+(e<<3)|0;G[e>>2]=d;G[e+4>>2]=c}C=C+1|0;c=G[a+284>>2];G[a+284>>2]=c+1;G[G[a+280>>2]+(c<<2)>>2]=b;b=G[a+656>>2]-1|0;G[a+656>>2]=b;L[a+504>>3]=L[a+504>>3]*(1/L[a+48>>3]);L[a+496>>3]=L[a+496>>3]*(1/L[a+56>>3]);if(b){continue}j=L[a+144>>3]*L[a+648>>3];L[a+648>>3]=j;p=L[a+128>>3]*L[a+640>>3];L[a+640>>3]=p;if(O(j)<2147483648){b=~~j}else{b=-2147483648}G[a+656>>2]=b;if(G[a+44>>2]<=0){continue}f=G[a+292>>2];d=G[a+296>>2];i=G[(d?f:u)>>2];g=G[a+200>>2];h=G[a+540>>2];l=G[a+216>>2];j=+(l|0);c=G[a+232>>2];m=G[a+236>>2];n=(d|0)<0;if(O(p)<2147483648){e=~~p}else{e=-2147483648}p=+(h|0);h=g-i|0;D=(+(c>>>0)+ +(m>>>0)*4294967296)/j;m=G[a+224>>2];q=G[a+208>>2];z=G[a+192>>2];oa:{if(n){r=0;break oa}r=+(i|0);if(!d){break oa}j=1/p;i=f-4|0;b=1;if((d|0)!=1){n=d&2147483646;c=0;while(1){g=b<<2;t=g+f|0;x=G[((b|0)==(d|0)?u:t)>>2];v=G[g+i>>2];Q=rc(j,+(b>>>0));g=b+1|0;y=G[((d|0)==(g|0)?u:f+(g<<2)|0)>>2];t=G[t>>2];r=rc(j,+(g>>>0))*+(y-t|0)+(Q*+(x-v|0)+r);b=b+2|0;c=c+2|0;if((n|0)!=(c|0)){continue}break}}if(!(d&1)){break oa}c=b<<2;d=G[((b|0)==(d|0)?u:c+f|0)>>2];c=G[c+i>>2];r=rc(j,+(b>>>0))*+(d-c|0)+r}L[k+24>>3]=D;G[k+20>>2]=l;G[k+16>>2]=e;L[k+32>>3]=r/p*100;G[k+12>>2]=m;G[k+8>>2]=q;G[k+4>>2]=h;G[k>>2]=z;uc(3829,k);continue}break}b=14117;break o}p=+G[a+540>>2];e=G[a+296>>2];pa:{if((e|0)<0){r=0;break pa}d=G[a+292>>2];r=+G[(e?d:u)>>2];if(!e){break pa}j=1/p;f=d-4|0;b=1;if((e|0)!=1){i=e&2147483646;c=0;while(1){s=b<<2;g=s+d|0;h=G[((b|0)==(e|0)?u:g)>>2];l=G[f+s>>2];D=rc(j,+(b>>>0));s=b+1|0;C=G[((e|0)==(s|0)?u:d+(s<<2)|0)>>2];g=G[g>>2];r=rc(j,+(s>>>0))*+(C-g|0)+(D*+(h-l|0)+r);b=b+2|0;c=c+2|0;if((i|0)!=(c|0)){continue}break}}if(!(e&1)){break pa}c=b<<2;e=G[((b|0)==(e|0)?u:c+d|0)>>2];c=G[c+f>>2];r=rc(j,+(b>>>0))*+(e-c|0)+r}L[a+528>>3]=r/p;cb(a,0);b=14118}e=H[b|0];b=G[k+48>>2];if(b){G[k+52>>2]=0;dd(b)}la=k- -64|0;break n}if(H[a+680|0]){break i}b=G[a+664>>2];c=G[a+668>>2];if((c|0)>=0|(c|0)>0){f=G[a+196>>2];if((c|0)==(f|0)&b>>>0<=J[a+192>>2]|c>>>0<f>>>0){break i}}b=G[a+672>>2];c=G[a+676>>2];if((c|0)>=0|(c|0)>0){f=G[a+188>>2];if((c|0)==(f|0)&b>>>0<=J[a+184>>2]|c>>>0<f>>>0){break i}}o=o+1|0;b=H[14118];if((b|0)==(e&255)&((b^-1)&254)>>>1|b&e&2){continue}break}}if(G[a+44>>2]>0){wc(2569)}c=e&255;b=H[14116];d=e&2;qa:{if((c|0)==(b|0)&((b^-1)&254)>>>1|d&b){Va(a+4|0,G[a+540>>2]);if(G[a+540>>2]<=0){break qa}c=0;while(1){E[G[a+4>>2]+c|0]=H[G[a+332>>2]+c|0];c=c+1|0;if((c|0)<G[a+540>>2]){continue}break}break qa}b=H[14117];if(G[a+36>>2]|!((b|0)==(c|0)&((b^-1)&254)>>>1|b&d)){break qa}E[a+492|0]=0}cb(a,0)}o=e&2;break e}if(G[a+44>>2]<=0){break e}wc(2569)}b=H[14632];ra:{if(!((b|0)==(e&255)&((b^-1)&254)>>>1|b&o)|H[a+707|0]!=1){break ra}b=G[a+736>>2];if((b|0)<2){break ra}b=b-1|0;d=H[14633];i=d&2;g=(d^-1)>>>1&1;while(1){o=b-1|0;f=G[a+4>>2];k=G[a+732>>2];c=G[k+(b<<2)>>2];sa:{ta:{if((c|0)<2){b=o;break ta}b=b-c|0;while(1){h=G[k+(o<<2)>>2];s=H[f+(h>>1)|0];if(!(g&(d|0)==(s^h&1)|i&s)){b=o;break sa}o=o-1|0;s=(c|0)>2;c=c-1|0;if(s){continue}break}c=1}o=G[k+(b<<2)>>2];E[f+(o>>1)|0]=o&1}b=b-c|0;if((b|0)>0){continue}break}}ua:{va:{if((A|0)>0&I){o=a+824|0;c=0;while(1){b=G[(c<<2)+w>>2];E[b+G[a+876>>2]|0]=0;wa:{if(H[a+724|0]!=1){break wa}if(!((b|0)<G[a+840>>2]&G[G[a+836>>2]+(b<<2)>>2]>=0)){if(H[b+G[a+876>>2]|0]|H[b+G[a+904>>2]|0]){break wa}f=H[b+G[a+332>>2]|0];d=H[14634];if(!((f|0)==(d|0)&((d^-1)&254)>>>1|d&f&2)){break wa}}xb(o,b)}c=c+1|0;if((A|0)!=(c|0)){continue}break}break va}if(!w){break ua}}dd(w)}return e}Y(ud()|0,1024,0);B()}function Mc(a,b,c,d){var e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,w=0,y=0,B=0,D=0,F=0,I=0,K=0,L=0,O=0,Q=0;q=la-48|0;la=q;a:{b:{if(c>>>0>2){break b}c=c<<2;I=G[c+12380>>2];F=G[c+12368>>2];while(1){c=G[b+4>>2];c:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break c}c=Hc(b)}if((c|0)==32|c-9>>>0<5){continue}break}r=1;d:{e:{switch(c-43|0){case 0:case 2:break e;default:break d}}r=(c|0)==45?-1:1;c=G[b+4>>2];if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break d}c=Hc(b)}f:{g:{if((c&-33)==73){while(1){if((g|0)==7){break g}c=G[b+4>>2];h:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break h}c=Hc(b)}e=g+1337|0;g=g+1|0;if(E[e|0]==(c|32)){continue}break}}if((g|0)!=3){e=(g|0)==8;if(e){break g}if(!d|g>>>0<4){break f}if(e){break g}}c=G[b+116>>2];if((c|0)>=0|(c|0)>0){G[b+4>>2]=G[b+4>>2]-1}if(!d|g>>>0<4){break g}c=(c|0)<0;while(1){if(!c){G[b+4>>2]=G[b+4>>2]-1}g=g-1|0;if(g>>>0>3){continue}break}}i=la-16|0;la=i;d=(C(N(N(r|0)*N(Infinity))),v(2));b=d&8388607;o=d>>>23|0;c=o&255;i:{if(c){if((c|0)!=255){c=b;b=b>>>7|0;h=c<<25;f=b;c=(o&255)+16256|0;break i}c=b;b=b>>>7|0;h=c<<25;f=b;c=32767;break i}c=0;if(!b){break i}c=b;b=P(b);gd(i,c,0,0,0,b+81|0);h=G[i+8>>2];f=G[i+12>>2]^65536;j=G[i>>2];k=G[i+4>>2];c=16265-b|0}G[q>>2]=j;G[q+4>>2]=k;b=q;G[b+8>>2]=h;G[b+12>>2]=f|(d&-2147483648|c<<16);la=i+16|0;h=G[b+8>>2];f=G[b+12>>2];j=G[b>>2];k=G[b+4>>2];break a}j:{k:{l:{m:{n:{o:{if(g){break o}g=0;if((c&-33)!=78){break o}while(1){if((g|0)==2){break n}c=G[b+4>>2];p:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break p}c=Hc(b)}e=g+1913|0;g=g+1|0;if(E[e|0]==(c|32)){continue}break}}switch(g|0){case 3:break n;case 0:break k;default:break m}}q:{c=G[b+4>>2];r:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break r}c=Hc(b)}if((c|0)==40){g=1;break q}f=2147450880;if(G[b+116>>2]<0){break a}G[b+4>>2]=G[b+4>>2]-1;break a}while(1){s:{c=G[b+4>>2];t:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break t}c=Hc(b)}if(!(c-48>>>0<10|c-65>>>0<26|(c|0)==95)){if(c-97>>>0>=26){break s}}g=g+1|0;continue}break}f=2147450880;if((c|0)==41){break a}c=G[b+116>>2];if((c|0)>=0|(c|0)>0){G[b+4>>2]=G[b+4>>2]-1}u:{if(d){if(g){break u}break j}G[3719]=28;break l}while(1){if((c|0)>0|(c|0)>=0){G[b+4>>2]=G[b+4>>2]-1}g=g-1|0;if(g){continue}break}break j}c=G[b+116>>2];if((c|0)>0){c=1}else{c=(c|0)>=0}if(c){G[b+4>>2]=G[b+4>>2]-1}G[3719]=28}Gc(b,0,0);break b}v:{if((c|0)!=48){break v}g=G[b+4>>2];w:{if((g|0)!=G[b+104>>2]){G[b+4>>2]=g+1;g=H[g|0];break w}g=Hc(b)}if((g&-33)==88){e=la-432|0;la=e;c=G[b+4>>2];x:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break x}c=Hc(b)}y:{z:{while(1){if((c|0)!=48){A:{if((c|0)!=46){break y}c=G[b+4>>2];if((c|0)==G[b+104>>2]){break A}G[b+4>>2]=c+1;c=H[c|0];break z}}else{c=G[b+4>>2];if((c|0)!=G[b+104>>2]){s=1;G[b+4>>2]=c+1;c=H[c|0]}else{s=1;c=Hc(b)}continue}break}c=Hc(b)}if((c|0)!=48){y=1;break y}while(1){c=o;o=c-1|0;p=p-!c|0;c=G[b+4>>2];B:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break B}c=Hc(b)}if((c|0)==48){continue}break}y=1;s=1}k=1073676288;while(1){C:{g=c;D:{E:{K=c-48|0;if(K>>>0<10){break E}O=(c|0)!=46;g=c|32;if(O&g-97>>>0>5){break C}if(O){break E}if(y){break C}y=1;o=h;p=f;break D}c=(c|0)>57?g-87|0:K;F:{if((f|0)<=0&h>>>0<=7|(f|0)<0){l=c+(l<<4)|0;break F}if(!f&h>>>0<=28){ld(e+48|0,c);od(e+32|0,B,D,j,k,0,0,0,1073414144);B=G[e+32>>2];D=G[e+36>>2];j=G[e+40>>2];k=G[e+44>>2];od(e+16|0,G[e+48>>2],G[e+52>>2],G[e+56>>2],G[e+60>>2],B,D,j,k);fd(e,G[e+16>>2],G[e+20>>2],G[e+24>>2],G[e+28>>2],i,m,u,w);u=G[e+8>>2];w=G[e+12>>2];i=G[e>>2];m=G[e+4>>2];break F}if(n|!c){break F}od(e+80|0,B,D,j,k,0,0,0,1073610752);fd(e- -64|0,G[e+80>>2],G[e+84>>2],G[e+88>>2],G[e+92>>2],i,m,u,w);u=G[e+72>>2];w=G[e+76>>2];n=1;i=G[e+64>>2];m=G[e+68>>2]}h=h+1|0;f=h?f:f+1|0;s=1}c=G[b+4>>2];if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0]}else{c=Hc(b)}continue}break}G:{if(!s){c=G[b+116>>2];if((c|0)>0){c=1}else{c=(c|0)>=0}H:{I:{if(c){c=G[b+4>>2];G[b+4>>2]=c-1;if(!d){break I}G[b+4>>2]=c-2;if(!y){break H}G[b+4>>2]=c-3;break H}if(d){break H}}Gc(b,0,0)}A(0);b=v(1)|0;d=v(0)|0;A(+(r|0));c=v(1)|0;v(0)|0;x(0,d|0);x(1,b&2147483647|c&-2147483648);kd(e+96|0,+z());i=G[e+96>>2];m=G[e+100>>2];c=G[e+108>>2];b=G[e+104>>2];break G}if((f|0)<=0&h>>>0<=7|(f|0)<0){j=h;k=f;while(1){l=l<<4;j=j+1|0;k=j?k:k+1|0;if((j|0)!=8|k){continue}break}}J:{K:{L:{if((c&-33)==80){j=Nc(b,d);c=oa;k=c;if(j|(c|0)!=-2147483648){break J}if(d){c=G[b+116>>2];if((c|0)>0){c=1}else{c=(c|0)>=0}if(c){break L}break K}i=0;m=0;Gc(b,0,0);c=0;b=0;break G}j=0;k=0;if(G[b+116>>2]<0){break J}}G[b+4>>2]=G[b+4>>2]-1}j=0;k=0}if(!l){A(0);b=v(1)|0;d=v(0)|0;A(+(r|0));c=v(1)|0;v(0)|0;x(0,d|0);x(1,b&2147483647|c&-2147483648);kd(e+112|0,+z());i=G[e+112>>2];m=G[e+116>>2];c=G[e+124>>2];b=G[e+120>>2];break G}b=y?o:h;d=j+(b<<2)|0;b=k+((y?p:f)<<2|b>>>30)|0;h=d-32|0;c=0-I|0;f=(d>>>0<j>>>0?b+1|0:b)-(d>>>0<32)|0;b=f;if((b|0)>0){b=1}else{b=c>>>0<h>>>0&(b|0)>=0}if(b){G[3719]=68;ld(e+160|0,r);od(e+144|0,G[e+160>>2],G[e+164>>2],G[e+168>>2],G[e+172>>2],-1,-1,-1,2147418111);od(e+128|0,G[e+144>>2],G[e+148>>2],G[e+152>>2],G[e+156>>2],-1,-1,-1,2147418111);i=G[e+128>>2];m=G[e+132>>2];c=G[e+140>>2];b=G[e+136>>2];break G}b=I-226|0;c=b>>31;if((f|0)>=(c|0)&b>>>0<=h>>>0|(c|0)<(f|0)){if((l|0)>=0){while(1){fd(e+416|0,i,m,u,w,0,0,0,-1073807360);b=id(i,m,u,w,1073610752);b=(b|0)>=0;fd(e+400|0,i,m,u,w,b?G[e+416>>2]:i,b?G[e+420>>2]:m,b?G[e+424>>2]:u,b?G[e+428>>2]:w);c=l<<1;l=c|b;b=h;h=b-1|0;f=f-!b|0;u=G[e+408>>2];w=G[e+412>>2];i=G[e+400>>2];m=G[e+404>>2];if((c|0)>=0){continue}break}}b=32-I|0;c=b;b=b+h|0;k=c>>>0>b>>>0?f+1|0:f;c=b>>>0<F>>>0&(k|0)<=0|(k|0)<0?(b|0)>0?b:0:F;M:{if(c>>>0>=113){ld(e+384|0,r);o=G[e+392>>2];p=G[e+396>>2];B=G[e+384>>2];D=G[e+388>>2];f=0;b=0;break M}kd(e+352|0,Ic(144-c|0));ld(e+336|0,r);B=G[e+336>>2];D=G[e+340>>2];o=G[e+344>>2];p=G[e+348>>2];Jc(e+368|0,G[e+352>>2],G[e+356>>2],G[e+360>>2],G[e+364>>2],p);t=G[e+376>>2];L=G[e+380>>2];f=G[e+372>>2];b=G[e+368>>2]}d=!(l&1)&((hd(i,m,u,w,0,0,0,0)|0)!=0&c>>>0<32);md(e+320|0,d|l);od(e+304|0,B,D,o,p,G[e+320>>2],G[e+324>>2],G[e+328>>2],G[e+332>>2]);c=b;fd(e+272|0,G[e+304>>2],G[e+308>>2],G[e+312>>2],G[e+316>>2],b,f,t,L);b=d;od(e+288|0,B,D,o,p,b?0:i,b?0:m,b?0:u,b?0:w);fd(e+256|0,G[e+288>>2],G[e+292>>2],G[e+296>>2],G[e+300>>2],G[e+272>>2],G[e+276>>2],G[e+280>>2],G[e+284>>2]);qd(e+240|0,G[e+256>>2],G[e+260>>2],G[e+264>>2],G[e+268>>2],c,f,t,L);b=G[e+240>>2];d=G[e+244>>2];c=G[e+248>>2];f=G[e+252>>2];if(!hd(b,d,c,f,0,0,0,0)){G[3719]=68}Kc(e+224|0,b,d,c,f,h);i=G[e+224>>2];m=G[e+228>>2];c=G[e+236>>2];b=G[e+232>>2];break G}G[3719]=68;ld(e+208|0,r);od(e+192|0,G[e+208>>2],G[e+212>>2],G[e+216>>2],G[e+220>>2],0,0,0,65536);od(e+176|0,G[e+192>>2],G[e+196>>2],G[e+200>>2],G[e+204>>2],0,0,0,65536);i=G[e+176>>2];m=G[e+180>>2];c=G[e+188>>2];b=G[e+184>>2]}G[q+16>>2]=i;G[q+20>>2]=m;G[q+24>>2]=b;G[q+28>>2]=c;la=e+432|0;h=G[q+24>>2];f=G[q+28>>2];j=G[q+16>>2];k=G[q+20>>2];break a}if(G[b+116>>2]<0){break v}G[b+4>>2]=G[b+4>>2]-1}g=b;i=c;t=d;d=0;e=la-8976|0;la=e;K=0-I|0;L=K-F|0;N:{O:{while(1){if((i|0)!=48){P:{if((i|0)!=46){break N}b=G[g+4>>2];if((b|0)==G[g+104>>2]){break P}G[g+4>>2]=b+1;i=H[b|0];break O}}else{b=G[g+4>>2];if((b|0)!=G[g+104>>2]){G[g+4>>2]=b+1;i=H[b|0]}else{i=Hc(g)}d=1;continue}break}i=Hc(g)}if((i|0)==48){while(1){b=h;h=b-1|0;f=f-!b|0;b=G[g+4>>2];Q:{if((b|0)!=G[g+104>>2]){G[g+4>>2]=b+1;i=H[b|0];break Q}i=Hc(g)}if((i|0)==48){continue}break}d=1}y=1}G[e+784>>2]=0;R:{S:{b=(i|0)==46;c=i-48|0;T:{U:{V:{if(b|c>>>0<=9){while(1){W:{if(b&1){if(!y){h=j;f=k;y=1;break W}b=!d;break V}b=k;j=j+1|0;k=j?b:b+1|0;if((l|0)<=2044){s=(i|0)==48?s:j;b=(e+784|0)+(l<<2)|0;if(n){c=(M(G[b>>2],10)+i|0)-48|0}G[b>>2]=c;d=1;c=n+1|0;b=(c|0)==9;n=b?0:c;l=b+l|0;break W}if((i|0)==48){break W}G[e+8960>>2]=G[e+8960>>2]|1;s=18396}b=G[g+4>>2];X:{if((b|0)!=G[g+104>>2]){G[g+4>>2]=b+1;i=H[b|0];break X}i=Hc(g)}b=(i|0)==46;c=i-48|0;if(b|c>>>0<10){continue}break}}h=y?h:j;f=y?f:k;if(!(!d|(i&-33)!=69)){i=Nc(g,t);b=oa;m=b;Y:{if(i|(b|0)!=-2147483648){break Y}if(!t){break T}i=0;m=0;if(G[g+116>>2]<0){break Y}G[g+4>>2]=G[g+4>>2]-1}f=f+m|0;h=h+i|0;f=h>>>0<i>>>0?f+1|0:f;break S}b=!d;if((i|0)<0){break U}}if(G[g+116>>2]<0){break U}G[g+4>>2]=G[g+4>>2]-1}if(!b){break S}G[3719]=28}Gc(g,0,0);h=0;f=0;c=0;b=0;break R}b=G[e+784>>2];if(!b){A(0);b=v(1)|0;d=v(0)|0;A(+(r|0));c=v(1)|0;v(0)|0;x(0,d|0);x(1,b&2147483647|c&-2147483648);kd(e,+z());h=G[e+8>>2];f=G[e+12>>2];c=G[e+4>>2];b=G[e>>2];break R}if(!(j>>>0>9&(k|0)>=0|(k|0)>0|((h|0)!=(j|0)|(f|0)!=(k|0))|(b>>>F|0?F>>>0<=30:0))){ld(e+48|0,r);md(e+32|0,b);od(e+16|0,G[e+48>>2],G[e+52>>2],G[e+56>>2],G[e+60>>2],G[e+32>>2],G[e+36>>2],G[e+40>>2],G[e+44>>2]);h=G[e+24>>2];f=G[e+28>>2];c=G[e+20>>2];b=G[e+16>>2];break R}b=K>>>1|0;if(b>>>0<h>>>0&(f|0)>=0|(f|0)>0){G[3719]=68;ld(e+96|0,r);od(e+80|0,G[e+96>>2],G[e+100>>2],G[e+104>>2],G[e+108>>2],-1,-1,-1,2147418111);od(e- -64|0,G[e+80>>2],G[e+84>>2],G[e+88>>2],G[e+92>>2],-1,-1,-1,2147418111);h=G[e+72>>2];f=G[e+76>>2];c=G[e+68>>2];b=G[e+64>>2];break R}b=I-226|0;c=h>>>0<b>>>0;b=b>>31;if(c&(f|0)<=(b|0)|(b|0)>(f|0)){G[3719]=68;ld(e+144|0,r);od(e+128|0,G[e+144>>2],G[e+148>>2],G[e+152>>2],G[e+156>>2],0,0,0,65536);od(e+112|0,G[e+128>>2],G[e+132>>2],G[e+136>>2],G[e+140>>2],0,0,0,65536);h=G[e+120>>2];f=G[e+124>>2];c=G[e+116>>2];b=G[e+112>>2];break R}if(n){if((n|0)<=8){b=(e+784|0)+(l<<2)|0;g=G[b>>2];while(1){g=M(g,10);n=n+1|0;if((n|0)!=9){continue}break}G[b>>2]=g}l=l+1|0}n=h;Z:{if(h>>>0>17&(f|0)>=0|(f|0)>0|(s|0)>=9|(h|0)<(s|0)){break Z}if(!f&(h|0)==9){ld(e+192|0,r);md(e+176|0,G[e+784>>2]);od(e+160|0,G[e+192>>2],G[e+196>>2],G[e+200>>2],G[e+204>>2],G[e+176>>2],G[e+180>>2],G[e+184>>2],G[e+188>>2]);h=G[e+168>>2];f=G[e+172>>2];c=G[e+164>>2];b=G[e+160>>2];break R}if((f|0)<=0&h>>>0<=8|(f|0)<0){ld(e+272|0,r);md(e+256|0,G[e+784>>2]);od(e+240|0,G[e+272>>2],G[e+276>>2],G[e+280>>2],G[e+284>>2],G[e+256>>2],G[e+260>>2],G[e+264>>2],G[e+268>>2]);ld(e+224|0,G[(0-n<<2)+12368>>2]);jd(e+208|0,G[e+240>>2],G[e+244>>2],G[e+248>>2],G[e+252>>2],G[e+224>>2],G[e+228>>2],G[e+232>>2],G[e+236>>2]);h=G[e+216>>2];f=G[e+220>>2];c=G[e+212>>2];b=G[e+208>>2];break R}b=(M(n,-3)+F|0)+27|0;c=G[e+784>>2];if(c>>>b|0?(b|0)<=30:0){break Z}ld(e+352|0,r);md(e+336|0,c);od(e+320|0,G[e+352>>2],G[e+356>>2],G[e+360>>2],G[e+364>>2],G[e+336>>2],G[e+340>>2],G[e+344>>2],G[e+348>>2]);ld(e+304|0,G[(n<<2)+12296>>2]);od(e+288|0,G[e+320>>2],G[e+324>>2],G[e+328>>2],G[e+332>>2],G[e+304>>2],G[e+308>>2],G[e+312>>2],G[e+316>>2]);h=G[e+296>>2];f=G[e+300>>2];c=G[e+292>>2];b=G[e+288>>2];break R}while(1){b=l;l=b-1|0;if(!G[(e+784|0)+(l<<2)>>2]){continue}break}s=0;c=(n|0)%9|0;_:{if(!c){c=0;break _}d=(f|0)<0?c+9|0:c;$:{if(!b){c=0;b=0;break $}h=G[(0-d<<2)+12368>>2];j=1e9/(h|0)|0;i=0;g=0;c=0;while(1){f=i;k=e+784|0;i=k+(g<<2)|0;l=G[i>>2];t=(l>>>0)/(h>>>0)|0;f=f+t|0;G[i>>2]=f;f=!f&(c|0)==(g|0);c=f?c+1&2047:c;n=f?n-9|0:n;i=M(j,l-M(h,t)|0);g=g+1|0;if((g|0)!=(b|0)){continue}break}if(!i){break $}G[k+(b<<2)>>2]=i;b=b+1|0}n=(n-d|0)+9|0}while(1){k=(e+784|0)+(c<<2)|0;g=(n|0)<36;aa:{while(1){if(!g&((n|0)!=36|J[k>>2]>=10384593)){break aa}l=b+2047|0;d=0;while(1){j=b;h=d;i=l&2047;l=(e+784|0)+(i<<2)|0;d=G[l>>2];b=d>>>3|0;d=d<<29;h=h+d|0;f=d>>>0>h>>>0?b+1|0:b;if(!f&h>>>0<1000000001){d=0}else{b=h;d=Pd(b,f,1e9);t=Od(d,oa,1e9,0);h=b-t|0;f=f-(oa+(b>>>0<t>>>0)|0)|0}G[l>>2]=h;b=(c|0)==(i|0)?j:f|h?j:i;h=j-1&2047;b=(h|0)!=(i|0)?j:b;l=i-1|0;if((c|0)!=(i|0)){continue}break}s=s-29|0;b=j;if(!d){continue}break}c=c-1&2047;if((c|0)==(b|0)){f=(b+2046&2047)<<2;b=e+784|0;f=f+b|0;G[f>>2]=G[f>>2]|G[b+(h<<2)>>2];b=h}n=n+9|0;G[(e+784|0)+(c<<2)>>2]=d;continue}break}ba:{ca:while(1){h=b+1&2047;j=(e+784|0)+((b-1&2047)<<2)|0;while(1){f=(n|0)>45?9:1;da:{while(1){d=c;g=0;ea:{while(1){fa:{c=d+g&2047;if((c|0)==(b|0)){break fa}c=G[(e+784|0)+(c<<2)>>2];i=G[(g<<2)+12320>>2];if(c>>>0<i>>>0){break fa}if(c>>>0>i>>>0){break ea}g=g+1|0;if((g|0)!=4){continue}}break}if((n|0)!=36){break ea}h=0;f=0;g=0;j=0;k=0;while(1){c=d+g&2047;if((c|0)==(b|0)){b=b+1&2047;G[((b<<2)+e|0)+780>>2]=0}md(e+768|0,G[(e+784|0)+(c<<2)>>2]);od(e+752|0,h,f,j,k,0,0,1342177280,1075633366);fd(e+736|0,G[e+752>>2],G[e+756>>2],G[e+760>>2],G[e+764>>2],G[e+768>>2],G[e+772>>2],G[e+776>>2],G[e+780>>2]);j=G[e+744>>2];k=G[e+748>>2];h=G[e+736>>2];f=G[e+740>>2];g=g+1|0;if((g|0)!=4){continue}break}ld(e+720|0,r);od(e+704|0,h,f,j,k,G[e+720>>2],G[e+724>>2],G[e+728>>2],G[e+732>>2]);j=G[e+712>>2];k=G[e+716>>2];h=0;f=0;i=G[e+704>>2];m=G[e+708>>2];t=s+113|0;g=t-I|0;n=(g|0)<(F|0);c=n?(g|0)>0?g:0:F;if(c>>>0<=112){break da}break ba}s=f+s|0;c=b;if((b|0)==(d|0)){continue}break}k=1e9>>>f|0;l=-1<<f^-1;g=0;c=d;while(1){i=g;t=e+784|0;g=t+(d<<2)|0;m=G[g>>2];i=i+(m>>>f|0)|0;G[g>>2]=i;i=!i&(c|0)==(d|0);c=i?c+1&2047:c;n=i?n-9|0:n;g=M(k,l&m);d=d+1&2047;if((d|0)!=(b|0)){continue}break}if(!g){continue}if((c|0)!=(h|0)){G[t+(b<<2)>>2]=g;b=h;continue ca}G[j>>2]=G[j>>2]|1;continue}break}break}kd(e+656|0,Ic(225-c|0));Jc(e+688|0,G[e+656>>2],G[e+660>>2],G[e+664>>2],G[e+668>>2],k);B=G[e+696>>2];D=G[e+700>>2];u=G[e+688>>2];w=G[e+692>>2];kd(e+640|0,Ic(113-c|0));Lc(e+672|0,i,m,j,k,G[e+640>>2],G[e+644>>2],G[e+648>>2],G[e+652>>2]);h=G[e+672>>2];f=G[e+676>>2];o=G[e+680>>2];p=G[e+684>>2];qd(e+624|0,i,m,j,k,h,f,o,p);fd(e+608|0,u,w,B,D,G[e+624>>2],G[e+628>>2],G[e+632>>2],G[e+636>>2]);j=G[e+616>>2];k=G[e+620>>2];i=G[e+608>>2];m=G[e+612>>2]}l=d+4&2047;ga:{if((l|0)==(b|0)){break ga}l=G[(e+784|0)+(l<<2)>>2];ha:{if(l>>>0<=499999999){if(!l&(d+5&2047)==(b|0)){break ha}kd(e+496|0,+(r|0)*.25);fd(e+480|0,h,f,o,p,G[e+496>>2],G[e+500>>2],G[e+504>>2],G[e+508>>2]);o=G[e+488>>2];p=G[e+492>>2];h=G[e+480>>2];f=G[e+484>>2];break ha}if((l|0)!=5e8){kd(e+592|0,+(r|0)*.75);fd(e+576|0,h,f,o,p,G[e+592>>2],G[e+596>>2],G[e+600>>2],G[e+604>>2]);o=G[e+584>>2];p=G[e+588>>2];h=G[e+576>>2];f=G[e+580>>2];break ha}Q=+(r|0);if((d+5&2047)==(b|0)){kd(e+528|0,Q*.5);fd(e+512|0,h,f,o,p,G[e+528>>2],G[e+532>>2],G[e+536>>2],G[e+540>>2]);o=G[e+520>>2];p=G[e+524>>2];h=G[e+512>>2];f=G[e+516>>2];break ha}kd(e+560|0,Q*.75);fd(e+544|0,h,f,o,p,G[e+560>>2],G[e+564>>2],G[e+568>>2],G[e+572>>2]);o=G[e+552>>2];p=G[e+556>>2];h=G[e+544>>2];f=G[e+548>>2]}if(c>>>0>111){break ga}Lc(e+464|0,h,f,o,p,0,0,0,1073676288);if(hd(G[e+464>>2],G[e+468>>2],G[e+472>>2],G[e+476>>2],0,0,0,0)){break ga}fd(e+448|0,h,f,o,p,0,0,0,1073676288);o=G[e+456>>2];p=G[e+460>>2];h=G[e+448>>2];f=G[e+452>>2]}fd(e+432|0,i,m,j,k,h,f,o,p);qd(e+416|0,G[e+432>>2],G[e+436>>2],G[e+440>>2],G[e+444>>2],u,w,B,D);j=G[e+424>>2];k=G[e+428>>2];i=G[e+416>>2];m=G[e+420>>2];ia:{if((L-2|0)>=(t&2147483647)){break ia}G[e+408>>2]=j;G[e+412>>2]=k&2147483647;G[e+400>>2]=i;G[e+404>>2]=m;od(e+384|0,i,m,j,k,0,0,0,1073610752);d=id(G[e+400>>2],G[e+404>>2],G[e+408>>2],G[e+412>>2],1081081856);b=(d|0)>=0;j=b?G[e+392>>2]:j;k=b?G[e+396>>2]:k;i=b?G[e+384>>2]:i;m=b?G[e+388>>2]:m;h=hd(h,f,o,p,0,0,0,0);s=b+s|0;if((s+110|0)<=(L|0)){if(!(n&((c|0)!=(g|0)|(d|0)<0)&(h|0)!=0)){break ia}}G[3719]=68}Kc(e+368|0,i,m,j,k,s);h=G[e+376>>2];f=G[e+380>>2];c=G[e+372>>2];b=G[e+368>>2]}G[q+40>>2]=h;G[q+44>>2]=f;G[q+32>>2]=b;G[q+36>>2]=c;la=e+8976|0;h=G[q+40>>2];f=G[q+44>>2];j=G[q+32>>2];k=G[q+36>>2];break a}break a}f=0}G[a>>2]=j;G[a+4>>2]=k;G[a+8>>2]=h;G[a+12>>2]=f;la=q+48|0}function wb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,C=0,D=0,F=0;w=la-32|0;la=w;a:{c=0;b:{if(!hb(a)){break b}c=1;if(H[a+724|0]!=1){break b}z=a+824|0;c:{d:{e:while(1){if(!(G[a+920>>2]<G[a+284>>2]|G[a+924>>2]>0)&G[a+828>>2]<=0){break c}i=0;if(G[a+924>>2]){c=G[a+872>>2];e=G[a+868>>2];d=G[a+860>>2];if(((c-e|0)+((c|0)<(e|0)?d:0)|0)>0){while(1){h=G[a+544>>2]+(G[G[a+856>>2]+((e+i|0)%(d|0)<<2)>>2]<<2)|0;g=G[h>>2];if(!(g&3)){G[h>>2]=g|2;d=G[a+860>>2];e=G[a+868>>2];c=G[a+872>>2]}i=i+1|0;if((i|0)<((c-e|0)+((c|0)<(e|0)?d:0)|0)){continue}break}}i=G[a+540>>2];if((i|0)>0){h=0;while(1){if(H[G[a+744>>2]+h|0]){l=G[a+776>>2]+h|0;if(H[l|0]){g=G[a+760>>2]+M(h,12)|0;c=G[g+4>>2];f:{if((c|0)<=0){break f}f=G[g>>2];i=G[G[a+804>>2]>>2];d=0;e=0;while(1){j=G[f+(e<<2)>>2];if((G[i+(j<<2)>>2]&3)!=1){G[f+(d<<2)>>2]=j;d=d+1|0;c=G[g+4>>2]}e=e+1|0;if((e|0)<(c|0)){continue}break}d=e-d|0;if((d|0)<=0){break f}G[g+4>>2]=c-d}E[l|0]=0}f=0;j=G[a+760>>2]+M(h,12)|0;d=G[j+4>>2];if((d|0)>0){while(1){e=G[a+544>>2];c=G[j>>2];k=f<<2;l=G[c+k>>2];if(!(H[e+(l<<2)|0]&3)){d=G[a+872>>2];G[a+872>>2]=d+1;g=G[a+856>>2];G[g+(d<<2)>>2]=l;d=G[a+872>>2];l=G[a+860>>2];if((d|0)==(l|0)){G[a+872>>2]=0;d=0}if(G[a+868>>2]==(d|0)){e=0;o=M(l,3)+1>>1;g:{if((o|0)<=0){n=0;o=0;i=0;break g}c=o+1&2147483646;n=c>>>0<=2?2:c;i=ad(n<<2);if(!i&G[3719]==48){break a}Wb(i,0,o<<2)}h:{if((d|0)>=(l|0)){break h}q=l-d|0;p=q&3;r=0;c=d;if(c-l>>>0<=4294967292){t=g+12|0;s=g+8|0;u=g+4|0;x=q&-4;q=0;while(1){m=(e<<2)+i|0;v=c<<2;G[m>>2]=G[v+g>>2];G[m+4>>2]=G[u+v>>2];G[m+8>>2]=G[s+v>>2];G[m+12>>2]=G[t+v>>2];c=c+4|0;e=e+4|0;q=q+4|0;if((x|0)!=(q|0)){continue}break}}if(!p){break h}while(1){G[(e<<2)+i>>2]=G[g+(c<<2)>>2];c=c+1|0;e=e+1|0;r=r+1|0;if((p|0)!=(r|0)){continue}break}}i:{if((d|0)<=0){break i}v=d&3;r=0;j:{if(d>>>0<4){c=0;break j}p=i+12|0;t=i+8|0;s=i+4|0;u=d&2147483644;c=0;q=0;while(1){d=e<<2;m=g+(c<<2)|0;G[d+i>>2]=G[m>>2];G[d+s>>2]=G[m+4>>2];G[d+t>>2]=G[m+8>>2];G[d+p>>2]=G[m+12>>2];c=c+4|0;e=e+4|0;q=q+4|0;if((u|0)!=(q|0)){continue}break}}if(!v){break i}while(1){G[(e<<2)+i>>2]=G[g+(c<<2)>>2];c=c+1|0;e=e+1|0;r=r+1|0;if((v|0)!=(r|0)){continue}break}}G[a+872>>2]=l;G[a+868>>2]=0;G[a+860>>2]=0;dd(g);G[a+864>>2]=n;G[a+860>>2]=o;G[a+856>>2]=i;e=G[a+544>>2];c=G[j>>2]}c=(G[c+k>>2]<<2)+e|0;G[c>>2]=G[c>>2]&-4|2;d=G[j+4>>2]}f=f+1|0;if((f|0)<(d|0)){continue}break}}E[G[a+744>>2]+h|0]=0;i=G[a+540>>2]}h=h+1|0;if((h|0)<(i|0)){continue}break}d=G[a+860>>2];e=G[a+868>>2];c=G[a+872>>2]}if(((c-e|0)+((c|0)<(e|0)?d:0)|0)>0){i=0;while(1){h=G[a+544>>2]+(G[G[a+856>>2]+((e+i|0)%(d|0)<<2)>>2]<<2)|0;g=G[h>>2];if((g&3)==2){G[h>>2]=g&-4;d=G[a+860>>2];e=G[a+868>>2];c=G[a+872>>2]}i=i+1|0;if((i|0)<((c-e|0)+((c|0)<(e|0)?d:0)|0)){continue}break}}G[a+924>>2]=0}k:{c=G[a+872>>2];d=G[a+868>>2];if(((c-d|0)+((c|0)<(d|0)?G[a+860>>2]:0)|0)<=0&G[a+920>>2]>=G[a+284>>2]){break k}if(yb(a,1)){break k}E[a+492|0]=0;break c}c=G[a+828>>2];if(H[a+680|0]){break d}v=0;if(!c){continue}while(1){d=G[a+824>>2];j=G[d>>2];c=G[(d+(c<<2)|0)-4>>2];G[d>>2]=c;e=c<<2;c=G[a+836>>2];G[e+c>>2]=0;G[c+(j<<2)>>2]=-1;c=G[a+828>>2];G[a+828>>2]=c-1;if((c|0)>=3){zb(z,0)}if(H[a+680|0]){continue e}l:{m:{if(H[j+G[a+904>>2]|0]){break m}d=H[j+G[a+332>>2]|0];c=H[14634];if(!((d|0)==(c|0)&((c^-1)&254)>>>1|c&d&2)){break m}if(!((v>>>0)%100|G[a+44>>2]<2)){G[w+16>>2]=G[a+828>>2];tc(3742,w+16|0)}if(H[a+704|0]==1){c=j+G[a+876>>2]|0;r=H[c|0];E[c|0]=1;c=0;e=0;g=j+G[a+776>>2]|0;if(H[g|0]){d=G[a+760>>2]+M(j,12)|0;l=G[d+4>>2];n:{if((l|0)<=0){break n}h=G[d>>2];f=G[G[a+804>>2]>>2];while(1){i=G[h+(c<<2)>>2];if((G[f+(i<<2)>>2]&3)!=1){G[h+(e<<2)>>2]=i;l=G[d+4>>2];e=e+1|0}c=c+1|0;if((l|0)>(c|0)){continue}break}c=c-e|0;if((c|0)<=0){break n}G[d+4>>2]=l-c}E[g|0]=0}e=1;d=H[j+G[a+332>>2]|0];c=H[14634];o:{if(!((d|0)==(c|0)&((c^-1)&254)>>>1|c&d&2)){break o}l=G[a+760>>2]+M(j,12)|0;d=G[l+4>>2];if(!d){break o}c=0;p:{if((d|0)<=0){break p}while(1){g=0;f=1;q:{q=G[G[l>>2]+(c<<2)>>2];e=G[a+544>>2]+(q<<2)|0;if(H[e|0]&3){break q}d=G[e>>2];r:{if(d>>>0<32){break r}i=e+4|0;o=d>>>5|0;h=H[14116];n=h&2;m=(h^-1)>>>1&1;p=G[a+332>>2];d=0;while(1){k=G[i+(d<<2)>>2];g=H[p+(k>>1)|0];k=m&(h|0)==(g^k&1)|g&n;g=(k|0)!=0;if(k){break r}d=d+1|0;if((o|0)!=(d|0)){continue}break}}if(g){break q}h=G[a+284>>2];f=G[a+296>>2];s:{if((f|0)!=G[a+300>>2]){d=G[a+292>>2];break s}d=f>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(f^2147483647)>>>0){break a}d=d+f|0;G[a+300>>2]=d;d=ed(G[a+292>>2],d<<2);G[a+292>>2]=d;if(!d){break a}f=G[a+296>>2]}G[a+296>>2]=f+1;G[(f<<2)+d>>2]=h;d=-2;g=G[e>>2];if(g>>>0>=32){o=e+4|0;f=0;while(1){h=G[o+(f<<2)>>2];i=h>>1;t:{if((i|0)==(j|0)){d=h;break t}n=H[i+G[a+332>>2]|0];i=H[14633];if((n^h&1)==(i|0)&((i^-1)&254)>>>1|i&n&2){d=h;break t}ab(a,h^1);g=G[e>>2]}f=f+1|0;if(f>>>0<g>>>5>>>0){continue}break}}f=0;h=Za(a);cb(a,0);if((h|0)!=-1){G[a+712>>2]=G[a+712>>2]+1;if(!Db(a,q,d)){break q}}f=1;break q}if(f){c=c+1|0;if((c|0)<G[l+4>>2]){continue}break p}break}e=0;break o}e=yb(a,0)}if(!e){break l}E[j+G[a+876>>2]|0]=(r|0)!=0}u:{if(H[a+706|0]!=1){break u}d=H[j+G[a+332>>2]|0];c=H[14634];if(H[j+G[a+876>>2]|0]|!((d|0)==(c|0)&((c^-1)&254)>>>1|c&d&2)){break u}c=0;e=0;r=0;q=0;o=0;p=0;n=0;f=j+G[a+776>>2]|0;if(H[f|0]){d=G[a+760>>2]+M(j,12)|0;h=G[d+4>>2];v:{if((h|0)<=0){break v}g=G[d>>2];l=G[G[a+804>>2]>>2];while(1){i=G[g+(c<<2)>>2];if((G[l+(i<<2)>>2]&3)!=1){G[g+(e<<2)>>2]=i;e=e+1|0;h=G[d+4>>2]}c=c+1|0;if((h|0)>(c|0)){continue}break}c=c-e|0;if((c|0)<=0){break v}G[d+4>>2]=h-c}E[f|0]=0}m=G[a+760>>2]+M(j,12)|0;w:{x:{y:{z:{if(G[m+4>>2]<=0){e=0;l=0;d=0;break z}i=j<<1;g=0;l=0;d=0;h=0;A:{while(1){f=0;B:{e=h;t=G[m>>2]+(o<<2)|0;k=G[t>>2];s=G[a+544>>2]+(k<<2)|0;u=G[s>>2];c=d;C:{if(u>>>0<=31){break C}e=s+4|0;s=u>>>5|0;c=0;D:{while(1){u=G[e+(c<<2)>>2];f=(u|0)==(i|0);if((i|0)==(u|0)){break D}c=c+1|0;if((s|0)!=(c|0)){continue}break}e=h;c=d;break C}e=g;c=l}E:{if((c|0)!=(e|0)){e=f?r:q;break E}e=c>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(c^2147483647)>>>0){break B}e=c+e|0;k=e<<2;F:{if(f){g=e;e=ed(r,k);r=e;break F}h=e;e=ed(q,k);q=e}if(!e){break B}k=G[t>>2]}G[(c<<2)+e>>2]=k;c=c+1|0;l=f?c:l;d=f?d:c;o=o+1|0;c=G[m+4>>2];if((o|0)>=(c|0)){break A}continue}break}break a}e=1;if((l|0)<=0){e=0;break z}if((d|0)<=0){break z}u=c+G[a+684>>2]|0;f=G[a+688>>2];o=G[a+544>>2];i=G[a+708>>2];while(1){x=(n<<2)+r|0;e=0;while(1){c=G[(e<<2)+q>>2];h=G[x>>2];i=i+1|0;G[a+708>>2]=i;g=o+(h<<2)|0;k=G[g>>2];t=o+(c<<2)|0;s=G[t>>2];c=k>>>5>>>0<s>>>5>>>0;y=c?s:k;A=y>>>5|0;h=A-1|0;k=c?k:s;G:{if(k>>>0>=32){s=(c?g:t)+4|0;t=(c?t:g)+4|0;k=k>>>5|0;g=0;while(1){C=G[s+(g<<2)>>2];D=C>>1;H:{if((D|0)==(j|0)){break H}c=0;I:{if(y>>>0>=32){while(1){F=G[t+(c<<2)>>2];if((D|0)==F>>1){break I}c=c+1|0;if((A|0)!=(c|0)){continue}break}}h=h+1|0;break H}if((C^F)==1){break G}}g=g+1|0;if((k|0)!=(g|0)){continue}break}}c=1;if((p|0)>=(u|0)){break y}p=p+1|0;if((f|0)==-1){break G}if((f|0)<(h|0)){break y}}e=e+1|0;if((e|0)!=(d|0)){continue}break}e=1;n=n+1|0;if((n|0)!=(l|0)){continue}break}}E[j+G[a+904>>2]|0]=1;h=j+G[a+380>>2]|0;if(H[h|0]){c=G[a+200>>2];g=G[a+204>>2]-!c|0;c=c-1|0;G[a+200>>2]=c;G[a+204>>2]=g}E[h|0]=0;if(!(!H[j+G[a+380>>2]|0]|(j|0)<G[a+476>>2]&G[G[a+472>>2]+(j<<2)>>2]>=0)){Xa(a+460|0,j)}G[a+716>>2]=G[a+716>>2]+1;J:{if((d|0)>=(l|0)){if(e){h=a+732|0;c=0;while(1){Eb(h,j,G[a+544>>2]+(G[(c<<2)+r>>2]<<2)|0);c=c+1|0;if((l|0)!=(c|0)){continue}break}}Fb(a+732|0,j<<1|1);break J}if((d|0)>0){h=a+732|0;c=0;while(1){Eb(h,j,G[a+544>>2]+(G[(c<<2)+q>>2]<<2)|0);c=c+1|0;if((d|0)!=(c|0)){continue}break}}Fb(a+732|0,j<<1)}c=0;if(G[m+4>>2]>0){while(1){Cb(a,G[G[m>>2]+(c<<2)>>2]);c=c+1|0;if((c|0)<G[m+4>>2]){continue}break}}if(!(!e|(d|0)<=0)){g=a+628|0;h=0;while(1){t=(h<<2)+r|0;c=0;while(1){f=G[a+544>>2];e=f+(G[t>>2]<<2)|0;f=f+(G[(c<<2)+q>>2]<<2)|0;G[a+708>>2]=G[a+708>>2]+1;i=G[g>>2];if(i){G[g+4>>2]=0}m=G[e>>2];p=G[f>>2];n=m>>>5>>>0<p>>>5>>>0;o=n?f:e;K:{k=n?m:p;if(k>>>0<32){e=n?p:m}else{m=o+4|0;p=n?e:f;s=p+4|0;e=0;L:{while(1){M:{n=G[s+(e<<2)>>2];u=n>>1;N:{if((u|0)==(j|0)){break N}O:{f=G[o>>2];if(f>>>0<32){break O}x=f>>>5|0;f=0;while(1){y=G[m+(f<<2)>>2];if((u|0)!=y>>1){f=f+1|0;if((x|0)!=(f|0)){continue}break O}break}if((n^y)!=1){break N}f=0;break K}f=G[g+4>>2];if((f|0)==G[g+8>>2]){k=f>>1&-2;k=((k|0)>0?k:0)+2|0;if(k>>>0>(f^2147483647)>>>0){break M}f=f+k|0;G[g+8>>2]=f;i=ed(i,f<<2);G[g>>2]=i;if(!i){break M}f=G[g+4>>2]}G[g+4>>2]=f+1;G[(f<<2)+i>>2]=n;k=G[p>>2]}e=e+1|0;if(e>>>0<k>>>5>>>0){continue}break L}break}break a}e=G[o>>2]}f=1;if(e>>>0<32){break K}n=o+4|0;f=0;P:{while(1){m=G[n+(f<<2)>>2];if((j|0)!=m>>1){e=G[g+4>>2];if((e|0)==G[g+8>>2]){p=e>>1&-2;p=((p|0)>0?p:0)+2|0;if(p>>>0>(e^2147483647)>>>0){break P}e=e+p|0;G[g+8>>2]=e;i=ed(i,e<<2);G[g>>2]=i;if(!i){break P}e=G[g+4>>2]}G[g+4>>2]=e+1;G[(e<<2)+i>>2]=m;e=G[o>>2]}f=f+1|0;if(f>>>0<e>>>5>>>0){continue}break}f=1;break K}break a}Q:{if(!f){break Q}if(Ab(a,g)){break Q}c=0;break x}c=c+1|0;if((d|0)!=(c|0)){continue}break}h=h+1|0;if((l|0)!=(h|0)){continue}break}}c=G[a+760>>2]+M(j,12)|0;d=G[c>>2];if(d){G[c+4>>2]=0;dd(d);G[c+8>>2]=0;G[c>>2]=0}h=j<<1;c=G[a+412>>2];d=c+M(j,24)|0;R:{if(G[d+4>>2]){break R}e=G[d>>2];if(!e){break R}G[d+4>>2]=0;dd(e);G[d+8>>2]=0;G[d>>2]=0;c=G[a+412>>2]}c=M(h|1,12)+c|0;S:{if(G[c+4>>2]){break S}d=G[c>>2];if(!d){break S}G[c+4>>2]=0;dd(d);G[c+8>>2]=0;G[c>>2]=0}c=yb(a,0)}if(!q){break w}}dd(q)}if(r){dd(r)}if(c){break u}E[a+492|0]=0;break c}if(!(+J[a+556>>2]>L[a+696>>3]*+J[a+548>>2])){break m}pa[G[G[a>>2]+8>>2]](a)}v=v+1|0;c=G[a+828>>2];if(!c){continue e}continue}break}break}E[a+492|0]=0;break c}d=G[z>>2];T:{if((c|0)>0){h=G[a+836>>2];c=0;while(1){G[h+(G[d+(c<<2)>>2]<<2)>>2]=-1;c=c+1|0;if((c|0)<G[a+828>>2]){continue}break}break T}if(!d){break c}}G[a+828>>2]=0}U:{V:{if(b){b=G[a+744>>2];if(b){G[a+748>>2]=0;dd(b);G[a+752>>2]=0;G[a+744>>2]=0}c=0;if(G[a+760>>2]){e=G[a+764>>2];if((e|0)>0){while(1){b=G[a+760>>2]+M(c,12)|0;d=G[b>>2];if(d){G[b+4>>2]=0;dd(d);G[b+8>>2]=0;G[b>>2]=0;e=G[a+764>>2]}c=c+1|0;if((e|0)>(c|0)){continue}break}}G[a+764>>2]=0;dd(G[a+760>>2]);G[a+768>>2]=0;G[a+760>>2]=0}b=G[a+776>>2];if(b){G[a+780>>2]=0;dd(b);G[a+776>>2]=0;G[a+784>>2]=0}b=G[a+792>>2];if(b){G[a+796>>2]=0;dd(b);G[a+800>>2]=0;G[a+792>>2]=0}b=G[a+808>>2];if(b){G[a+812>>2]=0;dd(b);G[a+816>>2]=0;G[a+808>>2]=0}b=G[a+824>>2];W:{X:{if(G[a+828>>2]>0){d=G[a+836>>2];c=0;while(1){G[d+(G[b+(c<<2)>>2]<<2)>>2]=-1;c=c+1|0;if((c|0)<G[a+828>>2]){continue}break}break X}if(!b){break W}}G[a+828>>2]=0;dd(b);G[a+832>>2]=0;G[a+824>>2]=0}b=G[a+856>>2];if(b){G[a+860>>2]=0;dd(b);G[a+864>>2]=0;G[a+856>>2]=0}qb(a+856|0,1);G[a+868>>2]=0;G[a+872>>2]=0;E[a+724|0]=0;E[a+560|0]=0;E[a+536|0]=1;G[a+728>>2]=G[a+540>>2];gb(a);break V}if(!(+J[a+556>>2]>L[a+96>>3]*+J[a+548>>2])){break U}}pa[G[G[a>>2]+8>>2]](a)}Y:{if(G[a+44>>2]<=0){break Y}b=G[a+736>>2];if((b|0)<=0){break Y}L[w>>3]=+(b<<2>>>0)*9.5367431640625e-7;uc(3944,w)}c=H[a+492|0]}la=w+32|0;return c&1}Y(ud()|0,1024,0);B()}function lc(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0;x=la-16|0;la=x;G[x+12>>2]=c;e=b;w=c;j=la-304|0;la=j;a:{b:{d=a;if(!G[a+4>>2]){_b(a);if(!G[a+4>>2]){break b}}b=H[e|0];if(!b){break a}c:{d:{while(1){e:{a=b&255;f:{if((a|0)==32|a-9>>>0<5){while(1){b=e;e=e+1|0;a=H[b+1|0];if((a|0)==32|a-9>>>0<5){continue}break}Gc(d,0,0);while(1){a=G[d+4>>2];g:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break g}a=Hc(d)}if((a|0)==32|a-9>>>0<5){continue}break}e=G[d+4>>2];a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){e=e-1|0;G[d+4>>2]=e}a=e-G[d+44>>2]|0;c=a;g=r+G[d+124>>2]|0;e=a>>31;a=o+G[d+120>>2]|0;g=e+(a>>>0<o>>>0?g+1|0:g)|0;o=a+c|0;r=o>>>0<a>>>0?g+1|0:g;break f}h:{i:{j:{if((a|0)==37){a=H[e+1|0];if((a|0)==42){break j}if((a|0)!=37){break i}}Gc(d,0,0);k:{if(H[e|0]==37){while(1){a=G[d+4>>2];l:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;b=H[a|0];break l}b=Hc(d)}if((b|0)==32|b-9>>>0<5){continue}break}e=e+1|0;break k}a=G[d+4>>2];if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;b=H[a|0];break k}b=Hc(d)}if(H[e|0]!=(b|0)){a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}if(v|(b|0)>=0){break a}break b}a=G[d+4>>2]-G[d+44>>2]|0;c=a;f=a>>31;a=r+G[d+124>>2]|0;b=o+G[d+120>>2]|0;h=(b>>>0<o>>>0?a+1|0:a)+f|0;o=b+c|0;r=o>>>0<b>>>0?h+1|0:h;b=e;break f}l=0;b=e+2|0;break h}a=a-48|0;if(!(H[e+2|0]!=36|a>>>0>9)){b=la-16|0;G[b+12>>2]=w;a=a>>>0>1?((a<<2)+w|0)-4|0:w;G[b+8>>2]=a+4;l=G[a>>2];b=e+3|0;break h}l=G[w>>2];w=w+4|0;b=e+1|0}q=0;c=0;e=H[b|0];if((e-48&255)>>>0<=9){while(1){c=(M(c,10)+(e&255)|0)-48|0;e=H[b+1|0];b=b+1|0;if((e-48&255)>>>0<10){continue}break}}if((e&255)==109){n=0;q=(l|0)!=0;e=H[b+1|0];k=0;b=b+1|0}f=b;b=f+1|0;a=3;m:{n:{switch((e&255)-65|0){case 39:a=H[f+1|0]==104;b=a?f+2|0:b;a=a?-2:-1;break m;case 43:a=H[f+1|0]==108;b=a?f+2|0:b;a=a?3:1;break m;case 51:case 57:a=1;break m;case 11:a=2;break m;case 0:case 2:case 4:case 5:case 6:case 18:case 23:case 26:case 32:case 34:case 35:case 36:case 37:case 38:case 40:case 45:case 46:case 47:case 50:case 52:case 55:break n;case 41:break m;default:break d}}a=0;b=f}f=a;a=H[b|0];e=(a&47)==3;s=e?1:f;p=e?a|32:a;o:{if((p|0)==91){break o}p:{if((p|0)!=110){if((p|0)!=99){break p}c=(c|0)<=1?1:c;break o}Yc(l,s,o,r);break f}Gc(d,0,0);while(1){a=G[d+4>>2];q:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break q}a=Hc(d)}if((a|0)==32|a-9>>>0<5){continue}break}e=G[d+4>>2];a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){e=e-1|0;G[d+4>>2]=e}a=e-G[d+44>>2]|0;e=a;g=r+G[d+124>>2]|0;f=a>>31;a=o+G[d+120>>2]|0;r=f+(a>>>0<o>>>0?g+1|0:g)|0;o=a+e|0;r=o>>>0<a>>>0?r+1|0:r}m=c;t=c>>31;Gc(d,c,t);a=G[d+4>>2];r:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;break r}if((Hc(d)|0)<0){break d}}a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}e=16;s:{t:{u:{v:{w:{x:{y:{switch(p-88|0){default:a=p-65|0;if(a>>>0>6|!(1<<a&113)){break s}case 9:case 13:case 14:case 15:Mc(j+8|0,d,s,0);a=G[d+4>>2]-G[d+44>>2]|0;if(G[d+120>>2]==(0-a|0)&G[d+124>>2]==(0-((a>>31)+((a|0)!=0)|0)|0)){break c}if(!l){break s}c=G[j+16>>2];g=G[j+20>>2];f=G[j+8>>2];m=G[j+12>>2];switch(s|0){case 0:break w;case 1:break v;case 2:break u;default:break s};case 3:case 11:case 27:if((p|16)==115){Wb(j+32|0,-1,257);E[j+32|0]=0;if((p|0)!=115){break t}E[j+65|0]=0;E[j+46|0]=0;F[j+42>>1]=0;F[j+44>>1]=0;break t}e=H[b+1|0];f=(e|0)==94;Wb(j+32|0,f,257);E[j+32|0]=0;a=f?b+2|0:b+1|0;z:{A:{B:{b=H[(f?2:1)+b|0];if((b|0)!=45){if((b|0)==93){break B}i=(e|0)!=94;break z}i=(e|0)!=94;E[j+78|0]=i;break A}i=(e|0)!=94;E[j+126|0]=i}a=a+1|0}b=a;while(1){a=H[b|0];C:{if((a|0)!=45){if(!a){break d}if((a|0)==93){break t}break C}a=45;f=H[b+1|0];if(!f|(f|0)==93){break C}g=b+1|0;e=H[b-1|0];D:{if(f>>>0<=e>>>0){a=f;break D}while(1){e=e+1|0;E[e+(j+32|0)|0]=i;a=H[g|0];if(e>>>0<a>>>0){continue}break}}b=g}E[((j+32|0)+a|0)+1|0]=i;b=b+1|0;continue};case 23:e=8;break x;case 12:case 29:e=10;break x;case 0:case 24:case 32:break x;case 1:case 2:case 4:case 5:case 6:case 7:case 8:case 10:case 16:case 18:case 19:case 20:case 21:case 22:case 25:case 26:case 28:case 30:case 31:break s;case 17:break y}}e=0}f=0;g=0;c=0;h=0;m=0;u=la-16|0;la=u;E:{if(!((e|0)!=1&e>>>0<=36)){G[3719]=28;break E}while(1){a=G[d+4>>2];F:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break F}a=Hc(d)}if((a|0)==32|a-9>>>0<5){continue}break}G:{H:{switch(a-43|0){case 0:case 2:break H;default:break G}}m=(a|0)==45?-1:0;a=G[d+4>>2];if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break G}a=Hc(d)}I:{J:{K:{L:{if(!((e|0)!=0&(e|0)!=16|(a|0)!=48)){a=G[d+4>>2];M:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break M}a=Hc(d)}if((a&-33)==88){e=16;a=G[d+4>>2];N:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break N}a=Hc(d)}if(H[a+12881|0]<16){break K}a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}Gc(d,0,0);break E}if(e){break L}e=8;break K}e=e?e:10;if(e>>>0>H[a+12881|0]){break L}a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}Gc(d,0,0);G[3719]=28;break E}if((e|0)!=10){break K}c=a-48|0;if(c>>>0<=9){a=0;while(1){a=M(a,10)+c|0;e=a>>>0<429496729;c=G[d+4>>2];O:{if((c|0)!=G[d+104>>2]){G[d+4>>2]=c+1;c=H[c|0];break O}c=Hc(d)}c=c-48|0;if(e&c>>>0<=9){continue}break}f=a}if(c>>>0>9){break I}e=Od(f,0,10,0);i=oa;while(1){P:{g=i;f=c+e|0;g=f>>>0<c>>>0?g+1|0:g;c=(g|0)==429496729&f>>>0<2576980378|g>>>0<429496729;a=G[d+4>>2];Q:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break Q}a=Hc(d)}h=a-48|0;if(!(c&h>>>0<=9)){if(h>>>0<=9){break P}break I}e=Od(f,g,10,0);i=oa;c=h;if((i|0)==-1&(c^-1)>>>0>=e>>>0|(i|0)!=-1){continue}}break}e=10;break J}if(e-1&e){h=H[a+12881|0];if(h>>>0<e>>>0){while(1){c=M(c,e)+h|0;f=c>>>0<119304647;a=G[d+4>>2];R:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break R}a=Hc(d)}h=H[a+12881|0];if(f&h>>>0<e>>>0){continue}break}f=c}if(e>>>0<=h>>>0){break J}while(1){c=Od(f,g,e,0);i=oa;h=h&255;if((i|0)==-1&(h^-1)>>>0<c>>>0){break J}g=i;f=c+h|0;g=f>>>0<h>>>0?g+1|0:g;c=e;a=G[d+4>>2];S:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break S}a=Hc(d)}h=H[a+12881|0];if(c>>>0<=h>>>0){break J}pd(u,e,0,0,0,f,g,0,0);if(!(G[u+8>>2]|G[u+12>>2])){continue}break}break J}i=E[(M(e,23)>>>5&7)+13137|0];c=H[a+12881|0];if(e>>>0>c>>>0){while(1){a=h<<i;h=a|c;f=a>>>0<134217728;a=G[d+4>>2];T:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break T}a=Hc(d)}c=H[a+12881|0];if(f&e>>>0>c>>>0){continue}break}f=h}if(c>>>0>=e>>>0){break J}t=i&31;if((i&63)>>>0>=32){h=0;t=-1>>>t|0}else{h=-1>>>t|0;t=h|(1<<t)-1<<32-t}if(!h&f>>>0>t>>>0){break J}while(1){y=c&255;c=f;a=i&31;if((i&63)>>>0>=32){g=c<<a;a=0}else{g=(1<<a)-1&c>>>32-a|g<<a;a=c<<a}f=y|a;a=G[d+4>>2];U:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break U}a=Hc(d)}c=H[a+12881|0];if(e>>>0<=c>>>0){break J}if((g|0)==(h|0)&f>>>0<=t>>>0|g>>>0<h>>>0){continue}break}}if(H[a+12881|0]>=e>>>0){break I}while(1){a=G[d+4>>2];V:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break V}a=Hc(d)}if(H[a+12881|0]<e>>>0){continue}break}G[3719]=68;m=0;f=-1;g=-1}a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}W:{if((f&g)!=-1){break W}}a=f^m;f=a-m|0;c=m>>31;g=(c^g)-((a>>>0<m>>>0)+c|0)|0}la=u+16|0;a=G[d+4>>2]-G[d+44>>2]|0;if(G[d+120>>2]==(0-a|0)&G[d+124>>2]==(0-((a>>31)+((a|0)!=0)|0)|0)){break c}if(!(!l|(p|0)!=112)){G[l>>2]=f;break s}Yc(l,s,f,g);break s}h=la-32|0;la=h;e=g&65535;a=0;i=g>>>16&32767;X:{if(i-16257>>>0<=253){a=(e&33554431)<<7|c>>>25;e=0;c=c&33554431;Y:{if(!(!e&(c|0)==16777216?!(f|m):!e&c>>>0<16777216)){a=a+1|0;break Y}if(c^16777216|f|(e|m)){break Y}a=(a&1)+a|0}c=a>>>0>8388607;a=c?0:a;e=i+(c?-16255:-16256)|0;break X}if(!(!(c|f|(e|m))|((i|0)!=32767|(a|0)!=0))){a=(e&33554431)<<7|c>>>25|4194304;e=255;break X}if(i>>>0>16510){e=255;break X}q=!(a|i);s=q?16256:16257;p=s-i|0;if((p|0)>112){e=0;break X}a=c;c=q?e:e|65536;gd(h+16|0,f,m,a,c,128-p|0);nd(h,f,m,a,c,p);a=G[h+8>>2];c=a;a=(G[h+12>>2]&33554431)<<7|a>>>25;f=G[h>>2]|(i|0)!=(s|0)&(G[h+16>>2]|G[h+24>>2]|(G[h+20>>2]|G[h+28>>2]))!=0;m=G[h+4>>2];e=0;c=c&33554431;Z:{if(!(!e&(c|0)==16777216?!(f|m):!e&c>>>0<16777216)){a=a+1|0;break Z}if(c^16777216|f|(e|m)){break Z}a=(a&1)+a|0}e=a>>>0>8388607;a=e?a^8388608:a}la=h+32|0;G[l>>2]=g&-2147483648|e<<23|a;break s}z=l,A=rd(f,m,c,g),L[z>>3]=A;break s}G[l>>2]=f;G[l+4>>2]=m;G[l+8>>2]=c;G[l+12>>2]=g;break s}u=(p|0)!=99;i=u?31:c+1|0;_:{if((s|0)==1){c=l;if(q){c=ad(i<<2);if(!c){break e}}G[j+296>>2]=0;G[j+300>>2]=0;e=0;$:{aa:{while(1){a=c;while(1){c=G[d+4>>2];ba:{if((c|0)!=G[d+104>>2]){G[d+4>>2]=c+1;c=H[c|0];break ba}c=Hc(d)}if(!H[(c+j|0)+33|0]){break aa}E[j+27|0]=c;f=j+28|0;c=j+296|0;g=c?c:25240;c=G[g>>2];ca:{da:{k=j+27|0;ea:{fa:{if(!k){if(c){break fa}c=0;break ca}ga:{if(c){h=1;break ga}c=H[k|0];k=c<<24>>24;if((k|0)>=0){if(f){G[f>>2]=c}c=(k|0)!=0;break ca}if(!G[G[3760]>>2]){c=1;if(!f){break ea}G[f>>2]=k&57343;c=1;break ca}c=c-194|0;if(c>>>0>50){break fa}c=G[(c<<2)+13152>>2];break da}n=H[k|0];s=n>>>3|0;if((s-16|(c>>26)+s)>>>0>7){break fa}while(1){h=h-1|0;c=(n&255)-128|c<<6;if((c|0)>=0){G[g>>2]=0;if(f){G[f>>2]=c}c=1-h|0;break ca}if(!h){break da}k=k+1|0;n=E[k|0];if((n|0)<-64){continue}break}}G[g>>2]=0;G[3719]=25;c=-1}break ca}G[g>>2]=c;c=-2}if((c|0)==-2){continue}if((c|0)==-1){n=0;break $}if(a){G[(e<<2)+a>>2]=G[j+28>>2];e=e+1|0}if(!q|(e|0)!=(i|0)){continue}break}i=i<<1|1;c=ed(a,i<<2);if(c){continue}break}n=0;k=a;q=1;break d}n=0;c=j+296|0;if(c){c=G[c>>2]}else{c=0}k=a;if(!c){break _}}k=a;break d}if(q){e=0;c=ad(i);if(!c){break e}while(1){a=c;while(1){c=G[d+4>>2];ha:{if((c|0)!=G[d+104>>2]){G[d+4>>2]=c+1;c=H[c|0];break ha}c=Hc(d)}if(!H[(c+j|0)+33|0]){n=a;k=0;break _}E[a+e|0]=c;e=e+1|0;if((i|0)!=(e|0)){continue}break}i=i<<1|1;c=ed(a,i);if(c){continue}break}k=0;n=a;q=1;break d}e=0;if(l){while(1){a=G[d+4>>2];ia:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break ia}a=Hc(d)}if(H[(a+j|0)+33|0]){E[e+l|0]=a;e=e+1|0;continue}else{a=l;n=a;k=0;break _}}}while(1){a=G[d+4>>2];ja:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break ja}a=Hc(d)}if(H[(a+j|0)+33|0]){continue}break}a=0;n=0;k=0}c=G[d+4>>2];f=G[d+116>>2];if((f|0)>0){f=1}else{f=(f|0)>=0}if(f){c=c-1|0;G[d+4>>2]=c}f=c-G[d+44>>2]|0;c=f+G[d+120>>2]|0;g=G[d+124>>2]+(f>>31)|0;g=c>>>0<f>>>0?g+1|0:g;if(!(g|c)|!(u|(c|0)==(m|0)&(g|0)==(t|0))){break c}if(q){G[l>>2]=a}if((p|0)==99){break s}if(k){G[(e<<2)+k>>2]=0}if(!n){n=0;break s}E[e+n|0]=0}a=G[d+4>>2]-G[d+44>>2]|0;e=a;f=a>>31;a=r+G[d+124>>2]|0;c=o+G[d+120>>2]|0;h=(c>>>0<o>>>0?a+1|0:a)+f|0;o=c+e|0;r=o>>>0<c>>>0?h+1|0:h;v=((l|0)!=0)+v|0}e=b+1|0;b=H[b+1|0];if(b){continue}break a}break}q=1;n=0;k=0}v=v?v:-1}if(!q){break a}dd(n);dd(k);break a}v=-1}la=j+304|0;la=x+16|0;return v}function Aa(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,C=0,D=0;c=la-1424|0;la=c;G[c+1248>>2]=a;G[3716]=5030;h=Ba(c+1216|0,2290,3330,2322,2401);G[h+28>>2]=1;G[h+20>>2]=0;G[h+24>>2]=2;G[h>>2]=5576;j=Ba(c+1192|0,2043,3038,2322,2376);E[j+20|0]=1;G[j>>2]=5688;o=Ba(c+1168|0,2037,3080,2322,2376);E[o+20|0]=1;G[o>>2]=5688;i=Ba(c+1144|0,1655,3260,2322,2383);G[i+20>>2]=0;G[i>>2]=5748;k=Ba(c+1112|0,1942,4853,2322,2401);G[k+28>>2]=0;G[k+20>>2]=0;G[k+24>>2]=2147483647;G[k>>2]=5576;l=Ba(c+1080|0,1950,4768,2322,2401);G[l+28>>2]=0;G[l+20>>2]=0;G[l+24>>2]=2147483647;G[l>>2]=5576;u=Ba(c+1056|0,1559,3132,2322,2376);E[u+20|0]=0;G[u>>2]=5688;g=la-16|0;la=g;a:{b:{r=c+1248|0;d=G[r>>2];if((d|0)>=2){e=1;a=1;while(1){f=a;c:{d:{e:{p=b+(a<<2)|0;a=G[p>>2];f:{if(H[a|0]!=45|H[a+1|0]!=45){break f}s=a+2|0;a=0;m=G[3440];d=H[m|0];if(d){while(1){if(H[a+s|0]!=(d&255)){break f}a=a+1|0;d=H[m+a|0];if(d){continue}break}}a=a+s|0;if(H[a|0]!=104|H[a+1|0]!=101|H[a+2|0]!=108){break f}if(H[a+3|0]==112){break e}}a=0;while(1){d=H[14112];if(!(d&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1;d=1}if(G[3526]<=(a|0)){break d}if(!(d&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}d=a<<2;a=a+1|0;d=G[G[3525]+d>>2];if(!(pa[G[G[d>>2]+8>>2]](d,G[p>>2])|0)){continue}break}break c}d=H[a+4|0];if((d|0)!=45){if(d){break c}Hb(b,0);B()}if(H[a+5|0]!=118|H[a+6|0]!=101|(H[a+7|0]!=114|H[a+8|0]!=98)){break c}Hb(b,1);B()}a=G[p>>2];if(H[a|0]==45){break b}G[b+(e<<2)>>2]=a;e=e+1|0}a=f+1|0;d=G[r>>2];if((a|0)<(d|0)){continue}break}a=(f^-1)+e|0}else{a=0}G[r>>2]=a+d;la=g+16|0;break a}a=a+1|0;G[p>>2]=a;G[g>>2]=a;G[g+4>>2]=G[3440];fc(G[3076],4892,g);X(1);B()}g=pb(c+120|0);qc(c+1272|0);f=G[c+1272>>2];r=G[c+1276>>2];s=G[c+1280>>2];if(!H[j+20|0]){wb(g,1)}G[g+44>>2]=G[h+28>>2];G[3524]=g;Jb(1);d=G[k+28>>2];if(d){a=la-16|0;la=a;g:{if(!d){break g}pc(a);if(!G[a+12>>2]&J[a+8>>2]<=d>>>0){break g}G[a>>2]=d;G[a+4>>2]=0;if((xc(0,a)|0)!=-1){break g}wc(3211)}la=a+16|0}e=G[l+28>>2];if(e){d=la-16|0;la=d;a=e>>31;h:{if(!(a|e)){break h}pc(d);a=a<<20|e>>>12;e=e<<20;h=G[d+12>>2];if((h|0)==(a|0)&J[d+8>>2]<=e>>>0|a>>>0>h>>>0){break h}G[d>>2]=e;G[d+4>>2]=a;if((xc(9,d)|0)!=-1){break h}wc(2649)}la=d+16|0}i:{if(G[c+1248>>2]==1){wc(2852);a=0;if(G[c+1248>>2]==1){break i}}a=G[b+4>>2]}p=ec(a,2292);if(!p){G[c>>2]=G[c+1248>>2]==1?2368:G[b+4>>2];tc(4439,c);X(1);B()}if(G[g+44>>2]>0){wc(2409);wc(1225)}j=H[u+20|0];G[c+1272>>2]=p;j:{a=ad(65536);if(!a&G[3719]==48){break j}z=+(s|0)/1e6+(+(f>>>0)+ +(r|0)*4294967296);G[c+1280>>2]=0;G[c+1276>>2]=a;d=kc(a,p);G[c+1284>>2]=d;G[c+1264>>2]=0;G[c+1256>>2]=0;G[c+1260>>2]=0;E[c+1255|0]=0;a=0;l=0;h=0;while(1){if((a|0)<(d|0)){f=G[c+1276>>2];e=H[f+a|0];k:{if(e>>>0<9){break k}k=G[c+1272>>2];while(1){e=e&255;if(e>>>0>=14&(e|0)!=32){break k}a=a+1|0;if((d|0)<=(a|0)){d=kc(f,k);a=0}if((a|0)>=(d|0)){break k}e=H[a+f|0];if(e>>>0>=9){continue}break}}G[c+1284>>2]=d;G[c+1280>>2]=a}if(!(H[c+1255|0]|(a|0)>=(d|0))){l:{m:{f=G[c+1276>>2];e=H[f+a|0]-99|0;if(e){if((e|0)!=13){break m}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;d=kc(f,G[c+1272>>2]);G[c+1284>>2]=d;a=0}n:{if(H[a+f|0]!=32|(a|0)>=(d|0)){break n}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;d=kc(f,G[c+1272>>2]);G[c+1284>>2]=d;a=0}if(H[a+f|0]!=99|(a|0)>=(d|0)){break n}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;d=kc(f,G[c+1272>>2]);G[c+1284>>2]=d;a=0}if(H[a+f|0]!=110|(a|0)>=(d|0)){break n}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;d=kc(f,G[c+1272>>2]);G[c+1284>>2]=d;a=0}if(H[a+f|0]!=102|(a|0)>=(d|0)){break n}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;C=c,D=kc(f,G[c+1272>>2]),G[C+1284>>2]=D}a=c+1272|0;f=c+1255|0;Da(a,f);l=Da(a,f);break l}G[c+112>>2]=(a|0)>=(d|0)?-1:H[a+f|0];tc(4578,c+112|0);E[c+1255|0]=1;break l}e=G[c+1272>>2];o:{while(1){a=a+1|0;if((d|0)<=(a|0)){d=kc(f,e);a=0}if((a|0)>=(d|0)){break o}if(H[a+f|0]!=10){continue}break}G[c+1284>>2]=d;a=a+1|0;G[c+1280>>2]=a;if((a|0)<(d|0)){break l}G[c+1280>>2]=0;C=c,D=kc(f,e),G[C+1284>>2]=D;break l}G[c+1284>>2]=d;G[c+1280>>2]=a;break l}E[c+1271|0]=0;if(G[c+1256>>2]){G[c+1260>>2]=0}e=Da(c+1272|0,c+1271|0);p:{if(!e){break p}while(1){if(H[c+1271|0]){break p}a=e>>31;a=(a^e)-a|0;if((a|0)>G[g+540>>2]){while(1){tb(g);if((a|0)>G[g+540>>2]){continue}break}}d=G[c+1260>>2];q:{if((d|0)!=G[c+1264>>2]){k=G[c+1256>>2];break q}f=d>>1&-2;f=((f|0)>0?f:0)+2|0;if(f>>>0>(d^2147483647)>>>0){break j}f=d+f|0;G[c+1264>>2]=f;k=ed(G[c+1256>>2],f<<2);G[c+1256>>2]=k;if(!k){break j}d=G[c+1260>>2]}G[c+1260>>2]=d+1;G[(d<<2)+k>>2]=(a<<1|(e|0)<=0)-2;e=Da(c+1272|0,c+1271|0);if(e){continue}break}}h=h+1|0;E[c+1255|0]=H[c+1271|0];Ab(g,c+1256|0)}d=G[c+1284>>2];a=G[c+1280>>2];continue}break}if(!(!(j&1)|(h|0)==(l|0))){wc(1594)}a=G[c+1256>>2];if(a){G[c+1260>>2]=0;dd(a)}dd(G[c+1276>>2]);Yb(p);k=0;if(G[c+1248>>2]>=3){k=ec(G[b+8>>2],2287)}if(G[g+44>>2]>0){G[c+96>>2]=G[g+540>>2];tc(4171,c+96|0);G[c+80>>2]=G[g+208>>2];tc(4244,c+80|0)}qc(c+1272|0);x=+G[c+1280>>2]/1e6+(+J[c+1272>>2]+ +G[c+1276>>2]*4294967296);if(G[g+44>>2]>0){L[c+64>>3]=x-z;uc(4096,c- -64|0)}Jb(2);wb(g,1);qc(c+1272|0);if(G[g+44>>2]>0){L[c+48>>3]=+G[c+1280>>2]/1e6+(+J[c+1272>>2]+ +G[c+1276>>2]*4294967296)-x;uc(4021,c+48|0);wc(1225)}if(!H[g+492|0]){if(k){nc(4619,6,1,k);Yb(k)}if(G[g+44>>2]>0){wc(2569);wc(1882);jb(g);vc()}wc(2340);X(20);B()}r:{if(H[o+20|0]==1){if(G[g+304>>2]){G[g+308>>2]=0}Fa(g+304|0,0);a=vb(g);break r}a=2;if(G[g+44>>2]<=0){break r}wc(2569)}b=G[i+20>>2];s:{if(!b|!(a&2)){break s}G[c+1280>>2]=0;G[c+1272>>2]=0;G[c+1276>>2]=0;u=la-16|0;la=u;p=ec(b,1676);if(!p){G[u>>2]=b;fc(G[3076],4415,u);X(1);B()}o=c+1272|0;h=0;l=0;r=0;f=la+-64|0;la=f;t:{u:{v:{if(!H[g+492|0]){nc(4748,19,1,p);break v}G[f+60>>2]=0;G[f+52>>2]=0;G[f+56>>2]=0;G[f+48>>2]=0;j=G[g+260>>2];if((j|0)<=0){b=0}else{b=H[14116];i=b&2;s=(b^-1)>>>1&1;m=G[g+332>>2];q=G[g+544>>2];n=G[g+256>>2];while(1){d=q+(G[n+(h<<2)>>2]<<2)|0;e=G[d>>2];w:{if(e>>>0>31){t=d+4|0;v=e>>>5|0;e=0;while(1){w=G[t+(e<<2)>>2];d=H[m+(w>>1)|0];if(s&(b|0)==(d^w&1)|d&i){break w}e=e+1|0;if((v|0)!=(e|0)){continue}break}}l=l+1|0}h=h+1|0;if((j|0)!=(h|0)){continue}break}h=0;d=0;b=0;x:{while(1){y:{s=G[g+544>>2]+(G[G[g+256>>2]+(d<<2)>>2]<<2)|0;i=G[s>>2];z:{if(i>>>0>=32){m=s+4|0;t=i>>>5|0;e=0;q=H[14116];v=q&2;w=(q^-1)>>>1&1;A=G[g+332>>2];while(1){y=G[m+(e<<2)>>2];n=H[(y>>1)+A|0];if(w&(q|0)==(n^y&1)|n&v){break z}e=e+1|0;if((t|0)!=(e|0)){continue}break}e=0;while(1){n=G[m+(e<<2)>>2];j=n>>1;q=H[j+G[g+332>>2]|0];t=q^n&1;n=H[14117];A:{if((t|0)==(n|0)&((n^-1)&254)>>>1|n&q&2){break A}q=G[f+56>>2];B:{if((q|0)>(j|0)){if(G[(j<<2)+b>>2]==-1){break B}break A}i=G[f+60>>2];C:{if((i|0)>(j|0)){break C}n=(j-i|0)+2&-2;t=(i>>1&-2)+2|0;n=(n|0)>(t|0)?n:t;if((n|0)>(i^2147483647)){break y}i=i+n|0;G[f+60>>2]=i;b=ed(b,i<<2);G[f+52>>2]=b;if(b){break C}b=0;if(G[3719]==48){break y}}i=j+1|0;Wb((q<<2)+b|0,255,i-q<<2);G[f+56>>2]=i}G[(j<<2)+b>>2]=h;h=h+1|0;i=G[s>>2]}e=e+1|0;if(e>>>0<i>>>5>>>0){continue}break}j=G[g+260>>2]}G[f+48>>2]=h}d=d+1|0;if((d|0)<(j|0)){continue}break x}break}break u}b=G[f+52>>2]}d=G[o+4>>2];G[f+32>>2]=h;s=d+l|0;G[f+36>>2]=s;fc(p,4565,f+32|0);D:{if(G[o+4>>2]<=0){break D}while(1){E:{l=G[f+56>>2];j=G[G[o>>2]+(r<<2)>>2];d=j>>1;F:{G:{if((l|0)>(d|0)){e=G[(d<<2)+b>>2];if((e|0)==-1){break G}e=e+1|0;break F}e=G[f+60>>2];H:{if((e|0)>(d|0)){break H}i=(d-e|0)+2&-2;m=(e>>1&-2)+2|0;i=(i|0)>(m|0)?i:m;if((i|0)>(e^2147483647)){break E}e=e+i|0;G[f+60>>2]=e;b=ed(b,e<<2);if(b){break H}b=0;if(G[3719]==48){break E}}e=d+1|0;Wb((l<<2)+b|0,255,e-l<<2);G[f+56>>2]=e}G[(d<<2)+b>>2]=h;e=h+1|0;h=e}G[f+20>>2]=e;G[f+16>>2]=j&1?3429:5566;fc(p,4740,f+16|0);r=r+1|0;if((r|0)<G[o+4>>2]){continue}break D}break}break u}G[f+48>>2]=h;G[f+52>>2]=b;if(G[g+260>>2]>0){e=0;while(1){j=f+52|0;b=0;h=la-16|0;la=h;i=G[g+544>>2]+(G[G[g+256>>2]+(e<<2)>>2]<<2)|0;d=G[i>>2];I:{if(d>>>0>=32){r=i+4|0;m=d>>>5|0;l=H[14116];q=l&2;n=(l^-1)>>>1&1;t=G[g+332>>2];while(1){v=G[r+(b<<2)>>2];o=H[t+(v>>1)|0];if(n&(l|0)==(o^v&1)|o&q){break I}b=b+1|0;if((m|0)!=(b|0)){continue}break}b=H[14117];l=0;while(1){m=G[r+(l<<2)>>2];o=m>>1;q=H[o+G[g+332>>2]|0];m=m&1;if(!(((b^-1)&254)>>>1&(b&255)==(q^m)|b&q&2)){d=m?3429:5566;J:{K:{if((o|0)>=G[j+4>>2]){break K}b=G[G[j>>2]+(o<<2)>>2];if((b|0)==-1){break K}b=b+1|0;break J}G[h+12>>2]=-1;ib(j,o+1|0,h+12|0);m=G[f+48>>2];b=m+1|0;G[f+48>>2]=b;G[G[j>>2]+(o<<2)>>2]=m}G[h+4>>2]=b;G[h>>2]=d;fc(p,3719,h);d=G[i>>2];b=H[14117]}l=l+1|0;if(l>>>0<d>>>5>>>0){continue}break}}nc(4765,2,1,p)}la=h+16|0;e=e+1|0;if((e|0)<G[g+260>>2]){continue}break}}if(G[g+44>>2]>0){G[f>>2]=G[f+48>>2];G[f+4>>2]=s;tc(4805,f)}b=G[f+52>>2];if(!b){break v}G[f+56>>2]=0;dd(b)}la=f- -64|0;break t}Y(ud()|0,1024,0);B()}Yb(p);la=u+16|0;b=G[c+1272>>2];if(!b){break s}G[c+1276>>2]=0;dd(b)}if(G[g+44>>2]>0){jb(g);vc()}b=a&255;L:{if(!b){tc(4643,0);a=10;if(!k){break L}nc(4621,4,1,k);d=G[g+540>>2];M:{if((d|0)<=0){break M}a=H[G[g+4>>2]];if(!(a&2)){G[c+40>>2]=1;G[c+32>>2]=5566;G[c+36>>2]=a?3429:5566;fc(k,2262,c+32|0);d=G[g+540>>2]}if((d|0)<2){break M}a=1;while(1){b=H[G[g+4>>2]+a|0];N:{if(b&2){a=a+1|0;break N}G[c+16>>2]=3740;a=a+1|0;G[c+24>>2]=a;G[c+20>>2]=b?3429:5566;fc(k,2262,c+16|0);d=G[g+540>>2]}if((a|0)<(d|0)){continue}break}}nc(4764,3,1,k);Yb(k);X(10);B()}tc((b|0)==1?4641:4626,0);if(k){nc((a&255)==1?4619:4612,6,1,k);Yb(k)}a=(a&255)==1?20:0}X(a|0);B()}Y(ud()|0,1024,0);B()}function jd(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,H=0,I=0,K=0,L=0,M=0,N=0,O=0,Q=0,R=0,S=0;k=la-336|0;la=k;m=h;n=i&65535;o=d;p=e&65535;s=(e^i)&-2147483648;x=i>>>16&32767;u=e>>>16&32767;a:{b:{if(x-32767>>>0>4294934529&u-32767>>>0>=4294934530){break b}j=e&2147483647;if(!(!d&(j|0)==2147418112?!(b|c):j>>>0<2147418112)){r=d;s=e|32768;break a}e=i&2147483647;if(!(!h&(e|0)==2147418112?!(f|g):e>>>0<2147418112)){r=h;s=i|32768;b=f;c=g;break a}if(!(b|d|(j^2147418112|c))){if(!(f|h|(e^2147418112|g))){b=0;c=0;s=2147450880;break a}s=s|2147418112;b=0;c=0;break a}if(!(f|h|(e^2147418112|g))){b=0;c=0;break a}if(!(b|d|(c|j))){b=!(f|h|(e|g));r=b?0:r;s=b?2147450880:s;b=0;c=0;break a}if(!(f|h|(e|g))){s=s|2147418112;b=0;c=0;break a}if((j|0)==65535|j>>>0<65535){d=!(o|p);i=d;j=d?b:o;d=d<<6;i=P(i?c:p);d=d+((i|0)==32?P(j)+32|0:i)|0;gd(k+320|0,b,c,o,p,d-15|0);q=16-d|0;o=G[k+328>>2];p=G[k+332>>2];c=G[k+324>>2];b=G[k+320>>2]}if(e>>>0>65535){break b}d=!(n|m);h=d;i=d?f:m;d=d<<6;h=P(h?g:n);d=d+((h|0)==32?P(i)+32|0:h)|0;gd(k+304|0,f,g,m,n,d-15|0);q=(d+q|0)-16|0;m=G[k+312>>2];n=G[k+316>>2];f=G[k+304>>2];g=G[k+308>>2]}e=n|65536;y=e;z=m;d=m;j=e<<15|d>>>17;e=d<<15|g>>>17;d=e;i=0-d|0;h=j;j=1963258675-(j+((d|0)!=0)|0)|0;pd(k+288|0,d,h,0,0,i,j,0,0);d=G[k+296>>2];pd(k+272|0,0-d|0,0-(G[k+300>>2]+((d|0)!=0)|0)|0,0,0,i,j,0,0);d=G[k+280>>2];i=d<<1|G[k+276>>2]>>>31;d=G[k+284>>2]<<1|d>>>31;pd(k+256|0,i,d,0,0,e,h,0,0);j=G[k+264>>2];pd(k+240|0,i,d,0,0,0-j|0,0-(G[k+268>>2]+((j|0)!=0)|0)|0,0,0);i=G[k+248>>2];j=i<<1|G[k+244>>2]>>>31;d=G[k+252>>2]<<1|i>>>31;pd(k+224|0,j,d,0,0,e,h,0,0);i=G[k+232>>2];pd(k+208|0,j,d,0,0,0-i|0,0-(G[k+236>>2]+((i|0)!=0)|0)|0,0,0);d=G[k+216>>2];i=d<<1|G[k+212>>2]>>>31;d=G[k+220>>2]<<1|d>>>31;pd(k+192|0,i,d,0,0,e,h,0,0);j=G[k+200>>2];pd(k+176|0,i,d,0,0,0-j|0,0-(G[k+204>>2]+((j|0)!=0)|0)|0,0,0);i=e;e=G[k+184>>2];d=h;m=e<<1|G[k+180>>2]>>>31;h=m-1|0;e=(G[k+188>>2]<<1|e>>>31)-!m|0;pd(k+160|0,i,d,0,0,h,e,0,0);d=h;pd(k+144|0,f<<15,g<<15|f>>>17,0,0,d,e,0,0);v=k+112|0;A=G[k+168>>2];h=G[k+172>>2];m=G[k+160>>2];i=G[k+152>>2];l=m+i|0;n=G[k+164>>2];j=n+G[k+156>>2]|0;j=i>>>0>l>>>0?j+1|0:j;i=j;j=(n|0)==(j|0)&l>>>0<m>>>0|j>>>0<n>>>0;n=j+A|0;j=j>>>0>n>>>0?h+1|0:h;m=!i&l>>>0>1|(i|0)!=0;h=n+m|0;j=m>>>0>h>>>0?j+1|0:j;pd(v,d,e,0,0,0-h|0,0-(((h|0)!=0)+j|0)|0,0,0);pd(k+128|0,1-l|0,0-((l>>>0>1)+i|0)|0,0,0,d,e,0,0);L=(u-x|0)+q|0;e=G[k+116>>2];u=e;d=G[k+112>>2];j=e<<1|d>>>31;i=d<<1;n=j;d=j;h=G[k+140>>2];w=h;e=G[k+136>>2];j=h<<1|e>>>31;l=e<<1|G[k+132>>2]>>>31;h=l+i|0;d=d+j|0;d=h>>>0<l>>>0?d+1|0:d;e=d;d=d-(h>>>0<13927)|0;t=d;v=d;l=0;j=p|65536;M=j;N=o;d=o;j=j<<1|d>>>31;Q=d<<1;R=j;E=j;d=Od(t,l,j,0);j=oa;B=d;C=j;H=b<<1;d=c<<1|b>>>31;x=d;A=d;j=0;q=j;m=h-13927|0;t=(e|0)==(t|0)&m>>>0<h>>>0|e>>>0>t>>>0;e=(e|0)==(n|0)&h>>>0<i>>>0|e>>>0<n>>>0;d=G[k+120>>2];h=G[k+124>>2]<<1|d>>>31;d=d<<1|u>>>31;l=w>>>31|0;d=l+d|0;j=h;j=d>>>0<l>>>0?j+1|0:j;h=d;d=d+e|0;j=h>>>0>d>>>0?j+1|0:j;e=d;d=d+t|0;l=e>>>0>d>>>0?j+1|0:j;e=d-1|0;D=l-!d|0;w=0;i=Od(A,q,D,w);d=i+B|0;h=oa+C|0;h=d>>>0<i>>>0?h+1|0:h;n=(C|0)==(h|0)&d>>>0<B>>>0|h>>>0<C>>>0;B=e;O=c>>>31|0;F=O|o<<1;t=0;e=Od(e,0,F,t);o=e+d|0;j=oa+h|0;l=0;j=e>>>0>o>>>0?j+1|0:j;p=j;d=(j|0)==(h|0)&d>>>0>o>>>0|h>>>0>j>>>0;e=d;d=d+n|0;l=e>>>0>d>>>0?1:l;e=Od(E,q,D,w);d=e+d|0;j=oa+l|0;n=d;d=d>>>0<e>>>0?j+1|0:j;e=Od(E,q,B,t);l=oa;h=e;e=Od(F,t,D,w);i=h+e|0;j=oa+l|0;j=e>>>0>i>>>0?j+1|0:j;e=j;j=(l|0)==(j|0)&h>>>0>i>>>0|j>>>0<l>>>0;l=n+e|0;d=d+j|0;d=l>>>0<e>>>0?d+1|0:d;n=l;l=d;e=0;d=e+o|0;j=i+p|0;j=d>>>0<e>>>0?j+1|0:j;e=j;h=(j|0)==(p|0)&d>>>0<o>>>0|j>>>0<p>>>0;j=l;i=h;h=h+n|0;j=i>>>0>h>>>0?j+1|0:j;u=h;l=j;o=d;C=m;d=Od(m,0,F,t);i=oa;h=d;m=Od(v,r,A,r);d=d+m|0;j=oa+i|0;j=d>>>0<m>>>0?j+1|0:j;m=(i|0)==(j|0)&d>>>0<h>>>0|i>>>0>j>>>0;h=j;I=H&-2;i=Od(B,t,I,0);p=i+d|0;j=oa+j|0;j=i>>>0>p>>>0?j+1|0:j;i=j;d=(j|0)==(h|0)&d>>>0>p>>>0|h>>>0>j>>>0;h=0;j=d+m|0;d=(j>>>0<d>>>0?1:h)+e|0;n=j+o|0;d=n>>>0<j>>>0?d+1|0:d;j=l;m=d;d=(d|0)==(e|0)&n>>>0<o>>>0|d>>>0<e>>>0;e=d;d=d+u|0;j=e>>>0>d>>>0?j+1|0:j;S=d;u=j;d=Od(E,q,C,r);K=oa;E=d;e=Od(D,w,I,r);d=d+e|0;j=oa+K|0;j=d>>>0<e>>>0?j+1|0:j;o=d;l=Od(v,r,F,t);e=d+l|0;h=j;d=j+oa|0;d=e>>>0<l>>>0?d+1|0:d;q=e;j=Od(A,r,B,t);e=e+j|0;l=oa+d|0;l=e>>>0<j>>>0?l+1|0:l;D=(d|0)==(l|0)&e>>>0<q>>>0|d>>>0>l>>>0;j=(h|0)==(K|0)&o>>>0<E>>>0|h>>>0<K>>>0;d=(d|0)==(h|0)&o>>>0>q>>>0|d>>>0<h>>>0;d=d+j|0;d=d+D|0;h=l;q=h+n|0;j=(d|w)+m|0;j=h>>>0>q>>>0?j+1|0:j;o=j;d=(m|0)==(j|0)&n>>>0>q>>>0|j>>>0<m>>>0;j=u;h=d;d=d+S|0;j=h>>>0>d>>>0?j+1|0:j;w=d;m=j;d=Od(v,r,I,r);v=oa;n=d;h=Od(A,r,C,r);d=d+h|0;j=oa+v|0;j=d>>>0<h>>>0?j+1|0:j;u=0;h=(j|0)==(v|0)&d>>>0<n>>>0|j>>>0<v>>>0;n=j;d=j+p|0;j=(h|u)+i|0;j=d>>>0<n>>>0?j+1|0:j;i=(i|0)==(j|0)&d>>>0<p>>>0|i>>>0>j>>>0;h=j;j=e;p=0;e=p+d|0;l=h+j|0;j=0;l=e>>>0<p>>>0?l+1|0:l;d=(h|0)==(l|0)&d>>>0>e>>>0|h>>>0>l>>>0;e=d;d=d+i|0;j=(e>>>0>d>>>0?1:j)+o|0;l=m;e=d;d=d+q|0;j=e>>>0>d>>>0?j+1|0:j;e=j;h=(o|0)==(j|0)&d>>>0<q>>>0|j>>>0<o>>>0;i=h;h=h+w|0;l=i>>>0>h>>>0?l+1|0:l;i=l;c:{if((l|0)==131071|l>>>0<131071){N=Q|O;M=t|R;pd(k+80|0,d,j,h,l,f,g,z,y);l=G[k+84>>2];q=l;j=b<<17;o=0;p=G[k+88>>2];c=o-p|0;b=G[k+80>>2];l=(l|b)!=0;m=c-l|0;n=(j-(G[k+92>>2]+(o>>>0<p>>>0)|0)|0)-(c>>>0<l>>>0)|0;p=0-(((b|0)!=0)+q|0)|0;q=L+16382|0;o=0-b|0;break c}d=(e&1)<<31|d>>>1;e=h<<31|e>>>1;h=(i&1)<<31|h>>>1;i=i>>>1|0;pd(k+96|0,d,e,h,i,f,g,z,y);m=G[k+100>>2];x=m;n=0;q=G[k+104>>2];o=n-q|0;l=G[k+96>>2];p=(m|l)!=0;m=o-p|0;n=((b<<16)-(G[k+108>>2]+(n>>>0<q>>>0)|0)|0)-(o>>>0<p>>>0)|0;p=0-(((l|0)!=0)+x|0)|0;H=b;x=c;q=L+16383|0;o=0-l|0}if((q|0)>=32767){s=s|2147418112;b=0;c=0;break a}d:{if((q|0)>0){b=m<<1|p>>>31;c=n<<1|m>>>31;m=h;n=i&65535|q<<16;l=p<<1|o>>>31;h=o<<1;break d}if((q|0)<=-113){b=0;c=0;break a}nd(k- -64|0,d,e,h,i,1-q|0);gd(k+48|0,H,x,N,M,q+112|0);d=G[k+64>>2];e=G[k+68>>2];m=G[k+72>>2];n=G[k+76>>2];pd(k+32|0,f,g,z,y,d,e,m,n);b=G[k+40>>2];c=G[k+56>>2];i=G[k+36>>2];p=b<<1|i>>>31;l=c-p|0;p=G[k+60>>2]-((G[k+44>>2]<<1|b>>>31)+(c>>>0<p>>>0)|0)|0;c=G[k+52>>2];q=c;b=G[k+32>>2];h=i<<1|b>>>31;o=b<<1;b=o;j=G[k+48>>2];c=(c|0)==(h|0)&b>>>0>j>>>0|c>>>0<h>>>0;b=l-c|0;c=p-(c>>>0>l>>>0)|0;l=q-((j>>>0<o>>>0)+h|0)|0;h=j-o|0}pd(k+16|0,f,g,z,y,3,0,0,0);pd(k,f,g,z,y,5,0,0,0);o=d;p=d&1;i=p;d=h+i|0;j=0;h=j+l|0;h=d>>>0<i>>>0?h+1|0:h;i=d;g=(g|0)==(h|0)&d>>>0>f>>>0|g>>>0<h>>>0;l=c;d=(h|0)==(j|0)&d>>>0<p>>>0|h>>>0<j>>>0;f=b+d|0;l=d>>>0>f>>>0?l+1|0:l;j=e;b=(l|0)==(y|0);b=b&(f|0)==(z|0)?g:b&f>>>0>z>>>0|l>>>0>y>>>0;c=b;b=b+o|0;j=c>>>0>b>>>0?j+1|0:j;c=j;d=(e|0)==(j|0)&b>>>0<o>>>0|e>>>0>j>>>0;j=n;e=d;d=d+m|0;j=e>>>0>d>>>0?j+1|0:j;g=d;e=G[k+20>>2];m=(e|0)==(h|0)&J[k+16>>2]<i>>>0|e>>>0<h>>>0;e=G[k+28>>2];d=G[k+24>>2];e=j>>>0<2147418112&((d|0)==(f|0)&(e|0)==(l|0)?m:(e|0)==(l|0)&d>>>0<f>>>0|e>>>0<l>>>0);d=c;m=e;e=b+e|0;d=m>>>0>e>>>0?d+1|0:d;b=(c|0)==(d|0)&b>>>0>e>>>0|c>>>0>d>>>0;c=b;b=b+g|0;j=c>>>0>b>>>0?j+1|0:j;g=b;c=G[k+4>>2];h=(c|0)==(h|0)&J[k>>2]<i>>>0|c>>>0<h>>>0;c=G[k+12>>2];b=G[k+8>>2];b=j>>>0<2147418112&((b|0)==(f|0)&(c|0)==(l|0)?h:(c|0)==(l|0)&b>>>0<f>>>0|c>>>0<l>>>0);c=b;b=b+e|0;l=c>>>0>b>>>0?d+1|0:d;c=l;e=(d|0)==(l|0)&b>>>0<e>>>0|d>>>0>l>>>0;d=j;f=e;e=e+g|0;d=f>>>0>e>>>0?d+1|0:d;r=e|r;s=d|s}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=r;G[a+12>>2]=s;la=k+336|0}function Qc(a,b,c,d,e,f,g){var h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0;j=la+-64|0;la=j;G[j+60>>2]=b;z=j+39|0;t=j+40|0;a:{b:{c:{d:{e:while(1){h=0;f:while(1){k=b;if((o^2147483647)<(h|0)){break d}o=h+o|0;g:{h:{i:{j:{h=b;i=H[h|0];if(i){while(1){k:{b=i&255;l:{if(!b){b=h;break l}if((b|0)!=37){break k}i=h;while(1){if(H[i+1|0]!=37){b=i;break l}h=h+1|0;m=H[i+2|0];b=i+2|0;i=b;if((m|0)==37){continue}break}}h=h-k|0;y=o^2147483647;if((h|0)>(y|0)){break d}if(a){Rc(a,k,h)}if(h){continue f}G[j+60>>2]=b;h=b+1|0;q=-1;i=E[b+1|0]-48|0;if(!(H[b+2|0]!=36|i>>>0>9)){x=1;q=i;h=b+3|0}G[j+60>>2]=h;n=0;i=E[h|0];b=i-32|0;m:{if(b>>>0>31){m=h;break m}m=h;b=1<<b;if(!(b&75913)){break m}while(1){m=h+1|0;G[j+60>>2]=m;n=b|n;i=E[h+1|0];b=i-32|0;if(b>>>0>=32){break m}h=m;b=1<<b;if(b&75913){continue}break}}n:{if((i|0)==42){b=E[m+1|0]-48|0;o:{if(!(H[m+2|0]!=36|b>>>0>9)){p:{if(!a){G[(b<<2)+e>>2]=10;b=0;break p}b=G[(b<<3)+d>>2]}p=b;b=m+3|0;i=1;break o}if(x){break j}b=m+1|0;if(!a){G[j+60>>2]=b;x=0;p=0;break n}h=G[c>>2];G[c>>2]=h+4;p=G[h>>2];i=0}x=i;G[j+60>>2]=b;if((p|0)>=0){break n}p=0-p|0;n=n|8192;break n}p=Sc(j+60|0);if((p|0)<0){break d}b=G[j+60>>2]}h=0;l=-1;u=0;q:{if(H[b|0]!=46){break q}if(H[b+1|0]==42){i=E[b+2|0]-48|0;r:{if(!(H[b+3|0]!=36|i>>>0>9)){b=b+4|0;s:{if(!a){G[(i<<2)+e>>2]=10;l=0;break s}l=G[(i<<3)+d>>2]}break r}if(x){break j}b=b+2|0;l=0;if(!a){break r}i=G[c>>2];G[c>>2]=i+4;l=G[i>>2]}G[j+60>>2]=b;u=(l|0)>=0;break q}G[j+60>>2]=b+1;l=Sc(j+60|0);b=G[j+60>>2];u=1}while(1){v=h;m=28;r=b;i=E[b|0];if(i-123>>>0<4294967238){break c}b=b+1|0;h=H[(i+M(h,58)|0)+12335|0];if((h-1&255)>>>0<8){continue}break}G[j+60>>2]=b;t:{if((h|0)!=27){if(!h){break c}if((q|0)>=0){if(!a){G[(q<<2)+e>>2]=h;continue e}h=(q<<3)+d|0;i=G[h+4>>2];G[j+48>>2]=G[h>>2];G[j+52>>2]=i;break t}if(!a){break g}Tc(j+48|0,h,c,g);break t}if((q|0)>=0){break c}h=0;if(!a){continue f}}if(H[a|0]&32){break b}i=n&-65537;n=n&8192?i:n;q=0;w=1375;m=t;u:{v:{w:{x:{y:{z:{A:{B:{C:{D:{E:{F:{G:{H:{I:{J:{K:{r=H[r|0];h=r<<24>>24;h=v?(r&15)==3?h&-45:h:h;switch(h-88|0){case 0:case 32:break G;case 1:case 2:case 3:case 4:case 5:case 6:case 7:case 8:case 10:case 16:case 18:case 19:case 20:case 21:case 25:case 26:case 28:case 30:case 31:break h;case 9:case 13:case 14:case 15:break u;case 11:break B;case 12:case 17:break E;case 22:break I;case 23:break F;case 24:break H;case 27:break A;case 29:break J;default:break K}}L:{switch(h-65|0){case 1:case 3:break h;case 0:case 4:case 5:case 6:break u;case 2:break z;default:break L}}if((h|0)==83){break y}break h}i=G[j+48>>2];r=G[j+52>>2];w=1375;break D}h=0;M:{switch(v|0){case 0:G[G[j+48>>2]>>2]=o;continue f;case 1:G[G[j+48>>2]>>2]=o;continue f;case 2:k=G[j+48>>2];G[k>>2]=o;G[k+4>>2]=o>>31;continue f;case 3:F[G[j+48>>2]>>1]=o;continue f;case 4:E[G[j+48>>2]]=o;continue f;case 6:G[G[j+48>>2]>>2]=o;continue f;case 7:break M;default:continue f}}k=G[j+48>>2];G[k>>2]=o;G[k+4>>2]=o>>31;continue f}l=l>>>0<=8?8:l;n=n|8;h=120}b=t;k=G[j+52>>2];r=k;i=G[j+48>>2];s=i;if(i|k){A=h&32;while(1){b=b-1|0;E[b|0]=A|H[(s&15)+12864|0];v=!k&s>>>0>15|(k|0)!=0;s=(k&15)<<28|s>>>4;k=k>>>4|0;if(v){continue}break}}k=b;if(!(i|r)|!(n&8)){break C}w=(h>>>4|0)+1375|0;q=2;break C}b=t;k=G[j+52>>2];r=k;i=G[j+48>>2];s=i;if(i|k){while(1){b=b-1|0;E[b|0]=s&7|48;v=!k&s>>>0>7|(k|0)!=0;s=(k&7)<<29|s>>>3;k=k>>>3|0;if(v){continue}break}}k=b;if(!(n&8)){break C}b=t-b|0;l=(b|0)<(l|0)?l:b+1|0;break C}i=G[j+48>>2];b=G[j+52>>2];r=b;if((b|0)<0){h=0-(b+((i|0)!=0)|0)|0;r=h;i=0-i|0;G[j+48>>2]=i;G[j+52>>2]=h;q=1;w=1375;break D}if(n&2048){q=1;w=1376;break D}q=n&1;w=q?1377:1375}k=Uc(i,r,t)}if((l|0)<0&u){break d}n=u?n&-65537:n;if(!(l|(i|r)!=0)){k=t;l=0;break h}b=!(i|r)+(t-k|0)|0;l=(b|0)<(l|0)?l:b;break h}h=H[j+48|0];break i}n=l>>>0>=2147483647?2147483647:l;h=n;m=(h|0)!=0;b=G[j+48>>2];k=b?b:3562;b=k;N:{O:{P:{Q:{if(!(b&3)|!h){break Q}while(1){if(!H[b|0]){break P}h=h-1|0;m=(h|0)!=0;b=b+1|0;if(!(b&3)){break Q}if(h){continue}break}}if(!m){break O}if(!(!H[b|0]|h>>>0<4)){while(1){m=G[b>>2];if(((16843008-m|m)&-2139062144)!=-2139062144){break P}b=b+4|0;h=h-4|0;if(h>>>0>3){continue}break}}if(!h){break O}}while(1){if(!H[b|0]){break N}b=b+1|0;h=h-1|0;if(h){continue}break}}b=0}b=b?b-k|0:n;m=b+k|0;if((l|0)>=0){n=i;l=b;break h}n=i;l=b;if(H[m|0]){break d}break h}h=G[j+48>>2];if(h|G[j+52>>2]){break x}h=0;break i}if(l){i=G[j+48>>2];break w}h=0;Vc(a,32,p,0,n);break v}G[j+12>>2]=0;G[j+8>>2]=h;i=j+8|0;G[j+48>>2]=i;l=-1}h=0;while(1){R:{k=G[i>>2];if(!k){break R}k=_c(j+4|0,k);if((k|0)<0){break b}if(k>>>0>l-h>>>0){break R}i=i+4|0;h=h+k|0;if(l>>>0>h>>>0){continue}}break}m=61;if((h|0)<0){break c}Vc(a,32,p,h,n);if(!h){h=0;break v}m=0;i=G[j+48>>2];while(1){k=G[i>>2];if(!k){break v}l=j+4|0;k=_c(l,k);m=k+m|0;if(m>>>0>h>>>0){break v}Rc(a,l,k);i=i+4|0;if(h>>>0>m>>>0){continue}break}}Vc(a,32,p,h,n^8192);h=(h|0)<(p|0)?p:h;continue f}if((l|0)<0&u){break d}m=61;h=pa[f|0](a,L[j+48>>3],p,l,n,h)|0;if((h|0)>=0){continue f}break c}i=H[h+1|0];h=h+1|0;continue}}if(a){break a}if(!x){break g}h=1;while(1){a=G[(h<<2)+e>>2];if(a){Tc((h<<3)+d|0,a,c,g);o=1;h=h+1|0;if((h|0)!=10){continue}break a}break}if(h>>>0>=10){o=1;break a}while(1){if(G[(h<<2)+e>>2]){break j}o=1;h=h+1|0;if((h|0)!=10){continue}break}break a}m=28;break c}E[j+39|0]=h;l=1;k=z;n=i}i=m-k|0;l=(i|0)<(l|0)?l:i;if((l|0)>(q^2147483647)){break d}m=61;b=l+q|0;h=(b|0)<(p|0)?p:b;if((y|0)<(h|0)){break c}Vc(a,32,h,b,n);Rc(a,w,q);Vc(a,48,h,b,n^65536);Vc(a,48,l,i,0);Rc(a,k,i);Vc(a,32,h,b,n^8192);b=G[j+60>>2];continue}break}break}o=0;break a}m=61}G[3719]=m}o=-1}la=j- -64|0;return o}function Wc(a,b,c,d,e,f){a=a|0;b=+b;c=c|0;d=d|0;e=e|0;f=f|0;var g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,w=0,x=0,y=0,z=0,B=0,C=0;n=la-560|0;la=n;G[n+44>>2]=0;A(+b);h=v(1)|0;v(0)|0;a:{if((h|0)<0){s=1;x=1385;b=-b;A(+b);h=v(1)|0;v(0)|0;break a}if(e&2048){s=1;x=1388;break a}s=e&1;x=s?1391:1386;z=!s}b:{if((h&2146435072)==2146435072){h=s+3|0;Vc(a,32,c,h,e&-65537);Rc(a,x,s);d=f&32;Rc(a,b!=b?d?1912:2327:d?2029:2331,3);Vc(a,32,c,h,e^8192);l=(c|0)>(h|0)?c:h;break b}u=n+16|0;c:{d:{e:{b=Oc(b,n+44|0);b=b+b;if(b!=0){h=G[n+44>>2];G[n+44>>2]=h-1;w=f|32;if((w|0)!=97){break e}break c}w=f|32;if((w|0)==97){break c}m=G[n+44>>2];break d}m=h-29|0;G[n+44>>2]=m;b=b*268435456}k=(d|0)<0?6:d;q=(n+48|0)+((m|0)>=0?288:0)|0;h=q;while(1){if(b<4294967296&b>=0){d=~~b>>>0}else{d=0}G[h>>2]=d;h=h+4|0;b=(b-+(d>>>0))*1e9;if(b!=0){continue}break}f:{if((m|0)<=0){i=m;g=h;j=q;break f}j=q;i=m;while(1){i=i>>>0>=29?29:i;g=h-4|0;g:{if(j>>>0>g>>>0){break g}o=0;while(1){d=G[g>>2];p=i&31;l=o;if((i&63)>>>0>=32){o=d<<p;d=0}else{o=(1<<p)-1&d>>>32-p;d=d<<p}l=l+d|0;p=o+y|0;p=d>>>0>l>>>0?p+1|0:p;o=Pd(l,p,1e9);B=g,C=l-Od(o,oa,1e9,0)|0,G[B>>2]=C;g=g-4|0;if(j>>>0<=g>>>0){continue}break}if(!p&l>>>0<1e9){break g}j=j-4|0;G[j>>2]=o}while(1){g=h;if(j>>>0<g>>>0){h=g-4|0;if(!G[h>>2]){continue}}break}i=G[n+44>>2]-i|0;G[n+44>>2]=i;h=g;if((i|0)>0){continue}break}}if((i|0)<0){t=((k+25>>>0)/9|0)+1|0;p=(w|0)==102;while(1){d=0-i|0;l=d>>>0>=9?9:d;h:{if(g>>>0<=j>>>0){h=!G[j>>2]<<2;break h}y=1e9>>>l|0;o=-1<<l^-1;i=0;h=j;while(1){d=G[h>>2];G[h>>2]=(d>>>l|0)+i;i=M(y,d&o);h=h+4|0;if(h>>>0<g>>>0){continue}break}h=!G[j>>2]<<2;if(!i){break h}G[g>>2]=i;g=g+4|0}i=l+G[n+44>>2]|0;G[n+44>>2]=i;j=h+j|0;d=p?q:j;g=g-d>>2>(t|0)?d+(t<<2)|0:g;if((i|0)<0){continue}break}}i=0;i:{if(g>>>0<=j>>>0){break i}i=M(q-j>>2,9);h=10;d=G[j>>2];if(d>>>0<10){break i}while(1){i=i+1|0;h=M(h,10);if(d>>>0>=h>>>0){continue}break}}d=(k-((w|0)!=102?i:0)|0)-((w|0)==103&(k|0)!=0)|0;if((d|0)<(M(g-q>>2,9)-9|0)){h=(n+48|0)+((m|0)<0?-4092:-3804)|0;m=d+9216|0;d=(m|0)/9|0;l=h+(d<<2)|0;h=10;d=m-M(d,9)|0;if((d|0)<=7){while(1){h=M(h,10);d=d+1|0;if((d|0)!=8){continue}break}}m=G[l>>2];t=(m>>>0)/(h>>>0)|0;o=m-M(h,t)|0;d=l+4|0;j:{if(!o&(d|0)==(g|0)){break j}k:{if(!(t&1)){b=9007199254740992;if(!(E[l-4|0]&1)|((h|0)!=1e9|j>>>0>=l>>>0)){break k}}b=9007199254740994}r=(d|0)==(g|0)?1:1.5;d=h>>>1|0;r=d>>>0>o>>>0?.5:(d|0)==(o|0)?r:1.5;if(!(H[x|0]!=45|z)){r=-r;b=-b}d=m-o|0;G[l>>2]=d;if(b+r==b){break j}d=d+h|0;G[l>>2]=d;if(d>>>0>=1e9){while(1){G[l>>2]=0;l=l-4|0;if(l>>>0<j>>>0){j=j-4|0;G[j>>2]=0}d=G[l>>2]+1|0;G[l>>2]=d;if(d>>>0>999999999){continue}break}}i=M(q-j>>2,9);h=10;d=G[j>>2];if(d>>>0<10){break j}while(1){i=i+1|0;h=M(h,10);if(d>>>0>=h>>>0){continue}break}}d=l+4|0;g=d>>>0<g>>>0?d:g}while(1){m=g;o=g>>>0<=j>>>0;if(!o){g=g-4|0;if(!G[g>>2]){continue}}break}l:{if((w|0)!=103){p=e&8;break l}h=k?k:1;d=(h|0)>(i|0)&(i|0)>-5;k=(d?i^-1:-1)+h|0;f=(d?-1:-2)+f|0;p=e&8;if(p){break l}g=-9;m:{if(o){break m}o=G[m-4>>2];if(!o){break m}d=10;g=0;if((o>>>0)%10|0){break m}while(1){h=g;g=g+1|0;d=M(d,10);if(!((o>>>0)%(d>>>0)|0)){continue}break}g=h^-1}d=M(m-q>>2,9);if((f&-33)==70){p=0;d=(d+g|0)-9|0;d=(d|0)>0?d:0;k=(d|0)>(k|0)?k:d;break l}p=0;d=((d+i|0)+g|0)-9|0;d=(d|0)>0?d:0;k=(d|0)>(k|0)?k:d}l=-1;o=k|p;if(((o?2147483645:2147483646)|0)<(k|0)){break b}y=(((o|0)!=0)+k|0)+1|0;h=f&-33;n:{if((h|0)==70){if((y^2147483647)<(i|0)){break b}g=(i|0)>0?i:0;break n}d=i>>31;g=Uc((d^i)-d|0,0,u);if((u-g|0)<=1){while(1){g=g-1|0;E[g|0]=48;if((u-g|0)<2){continue}break}}t=g-2|0;E[t|0]=f;E[g-1|0]=(i|0)<0?45:43;g=u-t|0;if((g|0)>(y^2147483647)){break b}}d=g+y|0;if((d|0)>(s^2147483647)){break b}i=d+s|0;Vc(a,32,c,i,e);Rc(a,x,s);Vc(a,48,c,i,e^65536);o:{p:{q:{if((h|0)==70){h=n+16|9;f=j>>>0>q>>>0?q:j;j=f;while(1){g=Uc(G[j>>2],0,h);r:{if((f|0)!=(j|0)){if(n+16>>>0>=g>>>0){break r}while(1){g=g-1|0;E[g|0]=48;if(n+16>>>0<g>>>0){continue}break}break r}if((g|0)!=(h|0)){break r}g=g-1|0;E[g|0]=48}Rc(a,g,h-g|0);j=j+4|0;if(q>>>0>=j>>>0){continue}break}if(o){Rc(a,3427,1)}if((k|0)<=0|j>>>0>=m>>>0){break q}while(1){g=Uc(G[j>>2],0,h);if(g>>>0>n+16>>>0){while(1){g=g-1|0;E[g|0]=48;if(n+16>>>0<g>>>0){continue}break}}Rc(a,g,(k|0)>=9?9:k);g=k-9|0;j=j+4|0;if(m>>>0<=j>>>0){break p}d=(k|0)>9;k=g;if(d){continue}break}break p}s:{if((k|0)<0){break s}f=j>>>0<m>>>0?m:j+4|0;m=n+16|9;h=j;while(1){g=Uc(G[h>>2],0,m);if((m|0)==(g|0)){g=g-1|0;E[g|0]=48}t:{if((h|0)!=(j|0)){if(n+16>>>0>=g>>>0){break t}while(1){g=g-1|0;E[g|0]=48;if(n+16>>>0<g>>>0){continue}break}break t}Rc(a,g,1);g=g+1|0;if(!(k|p)){break t}Rc(a,3427,1)}d=m-g|0;Rc(a,g,(d|0)<(k|0)?d:k);k=k-d|0;h=h+4|0;if(f>>>0<=h>>>0){break s}if((k|0)>=0){continue}break}}Vc(a,48,k+18|0,18,0);Rc(a,t,u-t|0);break o}g=k}Vc(a,48,g+9|0,9,0)}Vc(a,32,c,i,e^8192);l=(c|0)>(i|0)?c:i;break b}k=(f<<26>>31&9)+x|0;u:{if(d>>>0>11){break u}g=12-d|0;r=16;while(1){r=r*16;g=g-1|0;if(g){continue}break}if(H[k|0]==45){b=-(r+(-b-r));break u}b=b+r-r}h=G[n+44>>2];g=h>>31;g=Uc((g^h)-g|0,0,u);if((u|0)==(g|0)){g=g-1|0;E[g|0]=48;h=G[n+44>>2]}q=s|2;j=f&32;m=g-2|0;E[m|0]=f+15;E[g-1|0]=(h|0)<0?45:43;g=!(e&8)&(d|0)<=0;h=n+16|0;while(1){f=h;if(O(b)<2147483648){i=~~b}else{i=-2147483648}E[h|0]=j|H[i+12864|0];b=(b-+(i|0))*16;h=f+1|0;if(!(g&b==0|(h-(n+16|0)|0)!=1)){E[f+1|0]=46;h=f+2|0}if(b!=0){continue}break}l=-1;g=u-m|0;f=g+q|0;if((2147483645-f|0)<(d|0)){break b}i=f;f=n+16|0;j=h-f|0;d=d?(j-2|0)<(d|0)?d+2|0:j:j;h=i+d|0;Vc(a,32,c,h,e);Rc(a,k,q);Vc(a,48,c,h,e^65536);Rc(a,f,j);Vc(a,48,d-j|0,0,0);Rc(a,m,g);Vc(a,32,c,h,e^8192);l=(c|0)>(h|0)?c:h}la=n+560|0;return l|0}function od(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,H=0,I=0,J=0,K=0,L=0,M=0,N=0,O=0,Q=0,R=0,S=0;k=la-96|0;la=k;u=i&65535;o=(e^i)&-2147483648;r=e&65535;y=r;R=i>>>16&32767;S=e>>>16&32767;a:{b:{if(R-32767>>>0>4294934529&S-32767>>>0>=4294934530){break b}s=e&2147483647;q=s;j=d;if(!(!d&(q|0)==2147418112?!(b|c):q>>>0<2147418112)){m=d;o=e|32768;break a}s=i&2147483647;p=s;e=h;if(!(!e&(p|0)==2147418112?!(f|g):p>>>0<2147418112)){m=e;o=i|32768;b=f;c=g;break a}if(!(b|j|(q^2147418112|c))){if(!(e|f|(g|p))){o=2147450880;b=0;c=0;break a}o=o|2147418112;b=0;c=0;break a}if(!(e|f|(p^2147418112|g))){e=b|j;d=c|q;b=0;c=0;if(!(d|e)){o=2147450880;break a}o=o|2147418112;break a}if(!(b|j|(c|q))){b=0;c=0;break a}if(!(e|f|(g|p))){b=0;c=0;break a}if((q|0)==65535|q>>>0<65535){j=!(d|r);i=j?b:d;s=j<<6;e=P(i)+32|0;i=P(j?c:r);i=s+((i|0)==32?e:i)|0;gd(k+80|0,b,c,d,r,i-15|0);t=16-i|0;d=G[k+88>>2];y=G[k+92>>2];c=G[k+84>>2];b=G[k+80>>2]}if(p>>>0>65535){break b}i=!(h|u);e=i?f:h;r=i<<6;j=P(e)+32|0;e=P(i?g:u);e=r+((e|0)==32?j:e)|0;gd(k- -64|0,f,g,h,u,e-15|0);t=(t-e|0)+16|0;h=G[k+72>>2];u=G[k+76>>2];f=G[k+64>>2];g=G[k+68>>2]}e=f;f=g<<15|f>>>17;i=e<<15;e=0;v=i&-32768;K=c;s=Od(v,e,c,0);e=oa;z=e;L=f;q=b;c=Od(f,0,b,0);b=c+s|0;f=oa+e|0;i=b;c=b>>>0<c>>>0?f+1|0:f;f=b;j=0;b=Od(q,l,v,l);p=j+b|0;e=oa+f|0;e=b>>>0>p>>>0?e+1|0:e;r=e;M=(f|0)==(e|0)&j>>>0>p>>>0|e>>>0<f>>>0;N=d;w=Od(v,l,d,0);O=oa;b=Od(K,l,L,l);x=b+w|0;j=oa+O|0;j=b>>>0>x>>>0?j+1|0:j;b=u<<15|h>>>17;A=h<<15|g>>>17;d=Od(A,0,q,l);B=d+x|0;f=oa+j|0;f=d>>>0>B>>>0?f+1|0:f;C=f;d=(c|0)==(z|0)&i>>>0<s>>>0|c>>>0<z>>>0;D=c+B|0;f=d+f|0;f=c>>>0>D>>>0?f+1|0:f;u=f;g=D;c=f;E=y|65536;y=Od(v,l,E,n);Q=oa;d=Od(N,m,L,l);F=d+y|0;e=oa+Q|0;e=d>>>0>F>>>0?e+1|0:e;i=e;H=b|-2147483648;b=Od(H,0,q,l);I=b+F|0;f=oa+e|0;f=b>>>0>I>>>0?f+1|0:f;d=Od(A,m,K,l);b=d+I|0;J=f;f=f+oa|0;z=b;s=b>>>0<d>>>0?f+1|0:f;f=b;b=0;q=b+g|0;e=c+f|0;e=b>>>0>q>>>0?e+1|0:e;v=e;f=e;b=q+M|0;c=b>>>0<q>>>0?f+1|0:f;t=((S+R|0)+t|0)-16383|0;d=Od(H,m,K,l);h=oa;e=Od(E,m,L,l);g=e+d|0;f=oa+h|0;f=e>>>0>g>>>0?f+1|0:f;n=(h|0)==(f|0)&d>>>0>g>>>0|f>>>0<h>>>0;h=f;e=Od(A,m,N,m);d=e+g|0;f=oa+f|0;f=d>>>0<e>>>0?f+1|0:f;e=f;g=(f|0)==(h|0)&d>>>0<g>>>0|f>>>0<h>>>0;f=0;h=g;g=g+n|0;f=h>>>0>g>>>0?1:f;h=g;g=Od(H,m,E,m);h=h+g|0;f=oa+f|0;M=h;g=g>>>0>h>>>0?f+1|0:f;h=d;l=e;e=(j|0)==(O|0)&w>>>0>x>>>0|j>>>0<O>>>0;f=0;j=(j|0)==(C|0)&x>>>0>B>>>0|j>>>0>C>>>0;n=j;j=e+j|0;e=(n>>>0>j>>>0?1:f)+l|0;f=g;d=d+j|0;e=d>>>0<j>>>0?e+1|0:e;n=e;w=d;d=(e|0)==(l|0)&d>>>0<h>>>0|e>>>0<l>>>0;e=d;d=d+M|0;f=e>>>0>d>>>0?f+1|0:f;j=d;h=f;e=Od(A,m,E,m);l=oa;g=Od(H,m,N,m);d=g+e|0;f=oa+l|0;f=d>>>0<g>>>0?f+1|0:f;g=f;f=(l|0)==(f|0)&d>>>0<e>>>0|f>>>0<l>>>0;x=g+j|0;e=f+h|0;e=g>>>0>x>>>0?e+1|0:e;l=x;h=e;j=d;e=0;d=e+w|0;f=j+n|0;f=d>>>0<e>>>0?f+1|0:f;e=f;g=(n|0)==(f|0)&d>>>0<w>>>0|f>>>0<n>>>0;f=h;h=g;g=g+l|0;f=h>>>0>g>>>0?f+1|0:f;w=g;g=f;h=d;j=e;e=(s|0)==(J|0)&z>>>0<I>>>0|s>>>0<J>>>0;d=(i|0)==(Q|0)&y>>>0>F>>>0|i>>>0<Q>>>0;i=(i|0)==(J|0)&F>>>0>I>>>0|i>>>0>J>>>0;d=d+i|0;d=d+e|0;n=s;i=n+h|0;e=d+j|0;f=g;d=i;e=d>>>0<n>>>0?e+1|0:e;h=(e|0)==(j|0)&h>>>0>d>>>0|e>>>0<j>>>0;g=h+w|0;f=h>>>0>g>>>0?f+1|0:f;j=g;g=f;h=d;f=0;i=e;n=(u|0)==(v|0)&q>>>0<D>>>0|u>>>0>v>>>0;l=n;n=n+((u|0)==(C|0)&B>>>0>D>>>0|u>>>0<C>>>0)|0;e=e+(l>>>0>n>>>0?1:f)|0;f=g;d=d+n|0;e=d>>>0<n>>>0?e+1|0:e;h=(e|0)==(i|0)&d>>>0<h>>>0|e>>>0<i>>>0;g=h;h=h+j|0;f=g>>>0>h>>>0?f+1|0:f;i=f;c:{if(f&65536){t=t+1|0;break c}j=r>>>31|0;g=0;f=i<<1|h>>>31;h=h<<1|e>>>31;i=f;f=e<<1|d>>>31;d=d<<1|c>>>31;e=f;f=r<<1|p>>>31;p=p<<1;r=f;f=c<<1|b>>>31;b=b<<1|j;c=f|g}if((t|0)>=32767){o=o|2147418112;b=0;c=0;break a}d:{if((t|0)<=0){g=1-t|0;if(g>>>0<=127){f=t+127|0;gd(k+48|0,p,r,b,c,f);gd(k+32|0,d,e,h,i,f);nd(k+16|0,p,r,b,c,g);nd(k,d,e,h,i,g);p=G[k+32>>2]|G[k+16>>2]|(G[k+48>>2]|G[k+56>>2]|(G[k+52>>2]|G[k+60>>2]))!=0;r=G[k+36>>2]|G[k+20>>2];b=G[k+40>>2]|G[k+24>>2];c=G[k+44>>2]|G[k+28>>2];d=G[k>>2];e=G[k+4>>2];g=G[k+8>>2];f=G[k+12>>2];break d}b=0;c=0;break a}g=h;f=i&65535|t<<16}m=g|m;o=f|o;if(!(!b&(c|0)==-2147483648?!(p|r):(c|0)>0|(c|0)>=0)){b=d+1|0;j=b?e:e+1|0;e=o;c=j;d=!(j|b);m=d+m|0;o=d>>>0>m>>>0?e+1|0:e;break a}if(b|p|(c^-2147483648|r)){b=d;c=e;break a}f=e;b=d&1;c=b;b=b+d|0;c=c>>>0>b>>>0?f+1|0:f;d=(f|0)==(c|0)&b>>>0<d>>>0|c>>>0<f>>>0;f=o;m=d+m|0;o=m>>>0<d>>>0?f+1|0:f}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=m;G[a+12>>2]=o;la=k+96|0}function kb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;c=G[a+448>>2];if((c|0)>0){while(1){i=G[a+444>>2]+(f<<2)|0;e=G[i>>2];if(H[e+G[a+428>>2]|0]){c=0;d=0;g=G[a+412>>2]+M(e,12)|0;e=G[g+4>>2];a:{if((e|0)<=0){break a}while(1){h=G[g>>2];j=h+(c<<3)|0;if((G[G[G[a+456>>2]>>2]+(G[j>>2]<<2)>>2]&3)!=1){e=h+(d<<3)|0;h=G[j+4>>2];G[e>>2]=G[j>>2];G[e+4>>2]=h;e=G[g+4>>2];d=d+1|0}c=c+1|0;if((e|0)>(c|0)){continue}break}c=c-d|0;if((c|0)<=0){break a}G[g+4>>2]=e-c}E[G[a+428>>2]+G[i>>2]|0]=0;c=G[a+448>>2]}f=f+1|0;if((f|0)<(c|0)){continue}break}}if(G[a+444>>2]){G[a+448>>2]=0}b:{c:{if(G[a+540>>2]<=0){break c}j=0;d:{while(1){e:{g=0;c=G[a+412>>2];l=M(j,24);i=c+l|0;if(G[i+4>>2]>0){while(1){h=G[i>>2]+(g<<3)|0;e=G[a+544>>2]+(G[h>>2]<<2)|0;d=G[e>>2];f:{if(d&16){G[h>>2]=G[e+4>>2];break f}k=G[b+8>>2];c=k;f=G[b+4>>2];m=H[b+16|0]|d>>>2&1;n=((m&1)+(d>>>5|0)|0)+1|0;d=f+n|0;if(c>>>0<d>>>0){while(1){if(c>>>0<d>>>0){c=(((c>>>1)+(c>>>3)&-2)+c|0)+2|0;G[b+8>>2]=c;if(c>>>0>k>>>0){continue}break d}break}c=ed(G[b>>2],c<<2);if(!c&G[3719]==48){break b}G[b>>2]=c;f=G[b+4>>2];d=n+f|0}G[b+4>>2]=d;if(d>>>0<f>>>0){break e}d=G[b>>2]+(f<<2)|0;k=G[e>>2];G[d>>2]=k&-9|((m|0)!=0)<<3;if(J[e>>2]>=32){n=d+4|0;o=e+4|0;c=0;while(1){p=c<<2;G[n+p>>2]=G[o+p>>2];c=c+1|0;if(c>>>0<G[e>>2]>>>5>>>0){continue}break}}g:{if(!m){break g}c=d;d=k>>>3&536870908;c=c+d|0;d=d+e|0;if(k&4){K[c+4>>2]=K[d+4>>2];break g}G[c+4>>2]=G[d+4>>2]}G[h>>2]=f;G[e+4>>2]=f;G[e>>2]=G[e>>2]|16}g=g+1|0;if((g|0)<G[i+4>>2]){continue}break}c=G[a+412>>2]}i=c+l|0;if(G[i+16>>2]>0){g=0;while(1){h=G[i+12>>2]+(g<<3)|0;e=G[a+544>>2]+(G[h>>2]<<2)|0;d=G[e>>2];h:{if(d&16){G[h>>2]=G[e+4>>2];break h}i:{k=G[b+8>>2];c=k;f=G[b+4>>2];m=H[b+16|0]|d>>>2&1;l=((m&1)+(d>>>5|0)|0)+1|0;d=f+l|0;if(c>>>0>=d>>>0){break i}while(1){if(c>>>0>=d>>>0){c=ed(G[b>>2],c<<2);if(!c&G[3719]==48){break b}G[b>>2]=c;f=G[b+4>>2];d=l+f|0;break i}c=(((c>>>1)+(c>>>3)&-2)+c|0)+2|0;G[b+8>>2]=c;if(c>>>0>k>>>0){continue}break}break d}G[b+4>>2]=d;if(d>>>0<f>>>0){break e}d=G[b>>2]+(f<<2)|0;k=G[e>>2];G[d>>2]=k&-9|((m|0)!=0)<<3;if(J[e>>2]>=32){l=d+4|0;n=e+4|0;c=0;while(1){o=c<<2;G[o+l>>2]=G[n+o>>2];c=c+1|0;if(c>>>0<G[e>>2]>>>5>>>0){continue}break}}j:{if(!m){break j}c=d;d=k>>>3&536870908;c=c+d|0;d=d+e|0;if(k&4){K[c+4>>2]=K[d+4>>2];break j}G[c+4>>2]=G[d+4>>2]}G[h>>2]=f;G[e+4>>2]=f;G[e>>2]=G[e>>2]|16}g=g+1|0;if((g|0)<G[i+16>>2]){continue}break}}j=j+1|0;if((j|0)<G[a+540>>2]){continue}break c}break}break b}break b}if(G[a+284>>2]>0){c=0;while(1){j=G[a+396>>2];e=j+(G[G[a+280>>2]+(c<<2)>>2]<<2&-8)|0;g=G[e>>2];k:{if((g|0)==-1){break k}f=G[a+544>>2]+(g<<2)|0;d=G[f+4>>2];if(!(H[f|0]&16)){i=d>>1;h=H[i+G[a+332>>2]|0];k=h^d&1;d=H[14116];if(!((k|0)==(d|0)&((d^-1)&254)>>>1|d&h&2)){break k}d=G[j+(i<<3)>>2];if((d|0)==-1|(d|0)!=(g|0)){break k}d=lb(b,f);G[e>>2]=d;G[f+4>>2]=d;G[f>>2]=G[f>>2]|16;break k}G[e>>2]=d}c=c+1|0;if((c|0)<G[a+284>>2]){continue}break}}e=G[a+272>>2];l:{if((e|0)<=0){break l}d=G[a+268>>2];f=0;c=0;while(1){i=c<<2;j=i+d|0;g=G[a+544>>2]+(G[j>>2]<<2)|0;h=G[g>>2];if((h&3)!=1){m:{if(h&16){G[j>>2]=G[g+4>>2];break m}d=lb(b,g);G[j>>2]=d;G[g+4>>2]=d;G[g>>2]=G[g>>2]|16;d=G[a+268>>2]}G[(f<<2)+d>>2]=G[d+i>>2];e=G[a+272>>2];f=f+1|0}c=c+1|0;if((e|0)>(c|0)){continue}break}c=c-f|0;if((c|0)<=0){break l}G[a+272>>2]=e-c}e=G[a+260>>2];n:{if((e|0)<=0){break n}d=G[a+256>>2];f=0;c=0;while(1){i=c<<2;j=i+d|0;g=G[a+544>>2]+(G[j>>2]<<2)|0;h=G[g>>2];if((h&3)!=1){o:{if(h&16){G[j>>2]=G[g+4>>2];break o}d=lb(b,g);G[j>>2]=d;G[g+4>>2]=d;G[g>>2]=G[g>>2]|16;d=G[a+256>>2]}G[(f<<2)+d>>2]=G[d+i>>2];e=G[a+260>>2];f=f+1|0}c=c+1|0;if((e|0)>(c|0)){continue}break}b=c-f|0;if((b|0)<=0){break n}G[a+260>>2]=e-b}return}Y(ud()|0,1024,0);B()}function rc(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,w=0,y=0,B=0,C=0,D=0,E=0;o=la-16|0;la=o;A(+b);g=v(1)|0;m=v(0)|0;A(+a);e=v(1)|0;c=v(0)|0;r=g>>>20|0;s=r&2047;t=s-1086|0;j=e>>>20|0;a:{b:{if(t>>>0>4294967167&j-2047>>>0>=4294965250){break b}q=m<<1;f=g<<1|m>>>31;h=f+2097152|0;if(!q&(h|0)==2097152|h>>>0<2097152){d=1;if(!(f|q)|!c&(e|0)==1072693248){break a}h=e<<1;e=c;c=h|c>>>31;e=e<<1;if(!((!q&(f|0)==-2097152|f>>>0<4292870144)&(!e&(c|0)==-2097152|c>>>0<4292870144))){d=a+b;break a}if(!e&(c|0)==2145386496){break a}d=(g|0)<0^c>>>0<2145386496?0:b*b;break a}f=(e<<1|c>>>31)+2097152|0;if(!(c<<1)&(f|0)==2097152|f>>>0<2097152){d=a*a;if((e|0)<0){d=(sc(m,g)|0)==1?-d:d}if((g|0)>0|(g|0)>=0){break a}c=la-16|0;L[c+8>>3]=1/d;d=L[c+8>>3];break a}if((e|0)<0){c=sc(m,g);if(!c){a=a-a;d=a/a;break a}j=j&2047;p=((c|0)==1)<<18;A(+a);e=v(1)|0;c=v(0)|0;e=e&2147483647}if(t>>>0<=4294967167){d=1;f=(e|0)==1072693248;if(f&!c){break a}if(s>>>0<=957){d=((c|0)!=0&f|e>>>0>1072693248?b:-b)+1;break a}if(((e|0)==1072693248&(c|0)!=0|e>>>0>1072693248)!=(r>>>0>2047|0)){c=la-16|0;L[c+8>>3]=3105036184601418e216;d=L[c+8>>3]*3105036184601418e216;break a}c=la-16|0;L[c+8>>3]=12882297539194267e-247;d=L[c+8>>3]*12882297539194267e-247;break a}if(j){break b}A(+(a*4503599627370496));e=v(1)|0;c=v(0)|0;e=(e&2147483647)-54525952|0}x(0,m&-134217728);x(1,g|0);u=+z();g=e-1072076117|0;f=g;l=+(f>>20);h=(f>>>13&127)<<5;B=l*L[1018]+L[h+8232>>3];m=0;g=c-m|0;f=e-((f&-1048576)+(c>>>0<m>>>0)|0)|0;c=f;x(0,0);x(1,(g- -2147483648>>>0<2147483648?c+1|0:c)|0);a=+z();i=L[h+8208>>3];d=a*i+-1;x(0,g|0);x(1,c|0);w=(+z()-a)*i;a=d+w;n=L[1019];i=a*n;y=l*L[1017]+L[h+8224>>3];l=a+y;k=d;d=d*n;k=k*d;n=l+k;k=B+(a+(y-l))+w*(i+d)+(k+(l-n));d=a*i;a=k+a*d*(d*(d*(a*L[1025]+L[1024])+(a*L[1023]+L[1022]))+(a*L[1021]+L[1020]));d=n+a;L[o+8>>3]=a+(n-d);A(+d);c=v(1)|0;x(0,v(0)&-134217728);x(1,c|0);i=+z();a=u*i;b=(b-u)*i+b*(L[o+8>>3]+(d-i));A(+a);c=v(1)|0;v(0)|0;c:{d:{j=c>>>20&2047;if(j-969>>>0<63){break d}if(j>>>0<969){a=a+1;d=p?-a:a;break c}c=j>>>0<1033;j=0;if(c){break d}A(+a);c=v(1)|0;v(0)|0;if((c|0)<0){c=la-16|0;L[c+8>>3]=p?-12882297539194267e-247:12882297539194267e-247;d=L[c+8>>3]*12882297539194267e-247;break c}c=la-16|0;L[c+8>>3]=p?-3105036184601418e216:3105036184601418e216;d=L[c+8>>3]*3105036184601418e216;break c}k=b;b=L[748];d=a*L[747]+b;b=d-b;a=k+(b*L[750]+(b*L[749]+a));b=a*a;k=b*b*(a*L[754]+L[753]);b=b*(a*L[752]+L[751]);A(+d);v(1)|0;g=v(0)|0;e=g<<4&2032;a=k+(b+(L[e+6088>>3]+a));e=e+6096|0;f=G[e>>2];h=G[e+4>>2];e=g+p|0;c=f;f=e<<13;e=0;c=c+e|0;h=f+h|0;h=c>>>0<e>>>0?h+1|0:h;if(!j){e:{if(!(g&-2147483648)){x(0,c|0);x(1,h-1058013184|0);b=+z();d=(b*a+b)*5486124068793689e288;break e}x(0,c|0);f=h+1071644672|0;x(1,f|0);b=+z();i=b*a;a=i+b;if(O(a)<1){c=la-16|0;L[c+8>>3]=22250738585072014e-324;L[c+8>>3]=L[c+8>>3]*22250738585072014e-324;x(0,0);x(1,f&-2147483648);d=a<0?-1:1;l=a+d;a=l+(i+(b-a)+(a+(d-l)))-d;a=(C=+z(),D=a,E=a==0,E?C:D)}d=a*22250738585072014e-324}break c}x(0,c|0);x(1,h|0);b=+z();d=b*a+b}}la=o+16|0;return d}function fd(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;k=la-112|0;la=k;j=i&2147483647;a:{b:{m=e&2147483647;l=2147418112;n=!(b|c);if(!(d|m?m-l>>>0<2147549184:n)){r=j-l|0;if(!h&(r|0)==-2147418112?f|g:(r|0)==-2147418112&(h|0)!=0|r>>>0>2147549184){break b}}if(!(!d&(m|0)==2147418112?n:m>>>0<2147418112)){h=d;i=e|32768;f=b;g=c;break a}if(!(!h&(j|0)==2147418112?!(f|g):j>>>0<2147418112)){i=i|32768;break a}if(!(b|d|(m^2147418112|c))){j=d;d=!(b^f|d^h|(c^g|e^i^-2147483648));h=d?0:j;i=d?2147450880:e;f=d?0:b;g=d?0:c;break a}l=f|h;if(!(l|(j^2147418112|g))){break a}if(!(b|d|(c|m))){if(g|j|l){break a}f=b&f;g=c&g;h=d&h;i=e&i;break a}if(f|h|(g|j)){break b}f=b;g=c;h=d;i=e;break a}l=(j|0)==(m|0);p=l&(d|0)==(h|0)?(c|0)==(g|0)&b>>>0<f>>>0|c>>>0<g>>>0:l&d>>>0<h>>>0|j>>>0>m>>>0;n=p;m=n?f:b;r=n?g:c;l=n?i:e;s=l;n=n?h:d;q=l&65535;j=p?d:h;l=p?e:i;d=l;l=d>>>16&32767;o=s>>>16&32767;if(!o){o=!(n|q);h=o;o=h<<6;t=P(h?m:n)+32|0;h=P(h?r:q);o=o+((h|0)==32?t:h)|0;gd(k+96|0,m,r,n,q,o-15|0);n=G[k+104>>2];q=G[k+108>>2];r=G[k+100>>2];o=16-o|0;m=G[k+96>>2]}f=p?b:f;g=p?c:g;b=j;c=d&65535;if(!l){j=!(b|c);p=j;d=j?f:b;j=j<<6;p=P(p?g:c);j=j+((p|0)==32?P(d)+32|0:p)|0;gd(k+80|0,f,g,b,c,j-15|0);l=16-j|0;f=G[k+80>>2];g=G[k+84>>2];b=G[k+88>>2];c=G[k+92>>2]}d=c<<3;c=b;b=d|b>>>29;j=c<<3;c=b;b=g>>>29|j;c=c|524288;j=q<<3|n>>>29;q=n<<3|r>>>29;p=j;h=e^i;j=g<<3|f>>>29;d=f<<3;c:{if((l|0)==(o|0)){break c}e=o-l|0;if(e>>>0>127){b=0;c=0;j=0;d=1;break c}gd(k- -64|0,d,j,b,c,128-e|0);nd(k+48|0,d,j,b,c,e);b=G[k+56>>2];c=G[k+60>>2];j=G[k+52>>2];d=G[k+48>>2]|(G[k+64>>2]|G[k+72>>2]|(G[k+68>>2]|G[k+76>>2]))!=0}n=d;l=j;p=p|524288;j=r<<3|m>>>29;m=m<<3;d:{if((h|0)<0){f=0;g=0;h=0;i=0;if(!(m^n|b^q|(j^l|c^p))){break a}d=m-n|0;e=j-((m>>>0<n>>>0)+l|0)|0;f=q-b|0;g=(j|0)==(l|0)&m>>>0<n>>>0|j>>>0<l>>>0;h=f-g|0;b=(p-((b>>>0>q>>>0)+c|0)|0)-(f>>>0<g>>>0)|0;i=b;if(b>>>0>524287){break d}c=!(b|h);g=c;i=c?d:h;c=c<<6;g=P(g?e:b);c=c+((g|0)==32?P(i)+32|0:g)|0;f=b;b=c-12|0;gd(k+32|0,d,e,h,f,b);o=o-b|0;h=G[k+40>>2];i=G[k+44>>2];d=G[k+32>>2];e=G[k+36>>2];break d}j=j+l|0;d=m+n|0;e=d>>>0<m>>>0?j+1|0:j;f=(l|0)==(e|0)&d>>>0<n>>>0|e>>>0<l>>>0;j=c+p|0;b=b+q|0;j=b>>>0<q>>>0?j+1|0:j;h=b+f|0;i=h>>>0<b>>>0?j+1|0:j;if(!(i&1048576)){break d}d=n&1|((e&1)<<31|d>>>1);e=h<<31|e>>>1;o=o+1|0;h=(i&1)<<31|h>>>1;i=i>>>1|0}f=0;b=s&-2147483648;m=b;if((o|0)>=32767){h=f;i=b|2147418112;g=0;break a}l=0;e:{if((o|0)>0){l=o;break e}gd(k+16|0,d,e,h,i,o+127|0);nd(k,d,e,h,i,1-o|0);d=G[k>>2]|(G[k+16>>2]|G[k+24>>2]|(G[k+20>>2]|G[k+28>>2]))!=0;e=G[k+4>>2];h=G[k+8>>2];i=G[k+12>>2]}c=(e&7)<<29|d>>>3;b=h<<29|e>>>3;e=f|((i&7)<<29|h>>>3);f=m|(i>>>3&65535|l<<16);f:{g:{d=d&7;if((d|0)!=4){i=f;f=d>>>0>4;g=f;f=c+f|0;g=g>>>0>f>>>0?b+1|0:b;b=(g|0)==(b|0)&c>>>0>f>>>0|b>>>0>g>>>0;h=b+e|0;i=b>>>0>h>>>0?i+1|0:i;break g}j=f;d=c&1;f=c+d|0;g=d>>>0>f>>>0?b+1|0:b;b=(g|0)==(b|0)&c>>>0>f>>>0|b>>>0>g>>>0;h=b+e|0;i=b>>>0>h>>>0?j+1|0:j;break f}if(!d){break a}}}G[a>>2]=f;G[a+4>>2]=g;G[a+8>>2]=h;G[a+12>>2]=i;la=k+112|0}function yb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0;m=la-16|0;la=m;p=a+856|0;a:while(1){b:{g=G[a+860>>2];c=G[a+868>>2];d=G[a+872>>2];d=((c|0)>(d|0)?g:0)+(d-c|0)|0;if(!(G[a+920>>2]<G[a+284>>2]|(d|0)>0)){c=1;break b}if(H[a+680|0]==1){if(G[p>>2]){G[a+860>>2]=0}c=1;qb(p,1);G[a+868>>2]=0;G[a+872>>2]=0;G[a+920>>2]=G[a+284>>2];break b}c:{if(d){break c}d=G[a+920>>2];if((d|0)>=G[a+284>>2]){break c}G[a+920>>2]=d+1;c=G[a+544>>2];G[(c+(G[a+928>>2]<<2)|0)+4>>2]=G[G[a+280>>2]+(d<<2)>>2];k=c+(G[a+928>>2]<<2)|0;c=G[k>>2];e=c>>>5|0;g=0;d:{if(c>>>0<32){break d}l=k+4|0;h=0;c=0;if(e-1>>>0>=3){i=e&134217724;d=0;while(1){f=l+(c<<2)|0;g=1<<(G[f+12>>2]>>>1)|(1<<(G[f>>2]>>>1)|g|1<<(G[f+4>>2]>>>1)|1<<(G[f+8>>2]>>>1));c=c+4|0;d=d+4|0;if((i|0)!=(d|0)){continue}break}}d=e&3;if(!d){break d}while(1){g=1<<(G[l+(c<<2)>>2]>>>1)|g;c=c+1|0;h=h+1|0;if((d|0)!=(h|0)){continue}break}}G[(k+(e<<2)|0)+4>>2]=g;Bb(p,G[a+928>>2]);g=G[a+860>>2];c=G[a+868>>2]}r=G[G[a+856>>2]+(c<<2)>>2];c=c+1|0;c=(c|0)!=(g|0)?c:0;G[a+868>>2]=c;k=G[a+544>>2]+(r<<2)|0;e=G[k>>2];if(e&3){continue}if(!(!b|G[a+44>>2]<2)){if(!((s|0)%1e3|0)){d=G[a+872>>2];G[m+8>>2]=t;G[m+4>>2]=u;G[m>>2]=(d-c|0)+((c|0)>(d|0)?g:0);tc(3766,m);e=G[k>>2]}s=s+1|0}l=k+4|0;g=G[k+4>>2]>>1;c=G[a+760>>2];e:{if(e>>>0<64){break e}d=1;e=e>>>5|0;f=e-1|0;h=f&1;if((e|0)!=2){f=f&-2;e=0;while(1){i=l+(d<<2)|0;j=G[i+4>>2]>>1;i=G[i>>2]>>1;g=G[(c+M(i,12)|0)+4>>2]<G[(c+M(g,12)|0)+4>>2]?i:g;g=G[(c+M(j,12)|0)+4>>2]<G[(c+M(g,12)|0)+4>>2]?j:g;d=d+2|0;e=e+2|0;if((f|0)!=(e|0)){continue}break}}if(!h){break e}d=G[l+(d<<2)>>2]>>1;g=G[(c+M(d,12)|0)+4>>2]<G[(c+M(g,12)|0)+4>>2]?d:g}i=G[a+776>>2]+g|0;if(H[i|0]){f=c+M(g,12)|0;e=G[f+4>>2];f:{if((e|0)<=0){break f}h=G[f>>2];j=G[G[a+804>>2]>>2];d=0;c=0;while(1){n=G[h+(c<<2)>>2];if((G[j+(n<<2)>>2]&3)!=1){G[h+(d<<2)>>2]=n;e=G[f+4>>2];d=d+1|0}c=c+1|0;if((e|0)>(c|0)){continue}break}c=c-d|0;if((c|0)<=0){break f}G[f+4>>2]=e-c}E[i|0]=0;c=G[a+760>>2]}n=M(g,12)+c|0;if(G[n+4>>2]<=0){continue}v=G[n>>2];e=0;while(1){c=G[k>>2];if(c&3){continue a}i=G[(e<<2)+v>>2];g:{if((i|0)==(r|0)){break g}f=G[a+544>>2]+(i<<2)|0;d=G[f>>2];if(d&3){break g}h=G[a+692>>2];o=(h|0)!=-1;j=h;h=d>>>5|0;if(o&(j|0)<=(h|0)){break g}o=c>>>5|0;if(h>>>0<o>>>0){break g}q=f+4|0;if(G[l+(o<<2)>>2]&(G[q+(h<<2)>>2]^-1)){break g}h:{i:{if(c>>>0<32){break i}c=-2;j=0;if(d>>>0<32){break g}while(1){d=G[l+(j<<2)>>2];f=0;j:{if((c|0)!=-2){while(1){if((d|0)==G[(f<<2)+q>>2]){break j}f=f+1|0;if((h|0)!=(f|0)){continue}break g}}while(1){c=G[(f<<2)+q>>2];if((c|0)==(d|0)){c=-2;break j}if((c^d)!=1){f=f+1|0;if((h|0)==(f|0)){break g}continue}break}c=d}j=j+1|0;if((o|0)!=(j|0)){continue}break}switch(c+2|0){case 1:break g;case 0:break i;default:break h}}Cb(a,i);u=u+1|0;break g}if(!Db(a,i,c^1)){c=0;break b}t=t+1|0;e=e-(c>>1==(g|0))|0}e=e+1|0;if((e|0)<G[n+4>>2]){continue}break}continue}break}la=m+16|0;return c}function Db(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0;d=G[a+544>>2];Bb(a+856|0,b);j=(b<<2)+d|0;g=j+4|0;a:{if((G[j>>2]&-32)==64){Cb(a,b);e=G[j>>2];b=e>>>5|0;d=0;b:{c:{if(e>>>0<32){break c}while(1){if(G[g+(d<<2)>>2]==(c|0)){break c}d=d+1|0;if((b|0)!=(d|0)){continue}break}i=b-1|0;break b}i=b-1|0;if((i|0)<=(d|0)){break b}c=(b-d|0)-2|0;h=b+(d^-1)&3;if(h){while(1){k=g+(d<<2)|0;d=d+1|0;G[k>>2]=G[g+(d<<2)>>2];f=f+1|0;if((h|0)!=(f|0)){continue}break}}if(c>>>0<3){break b}while(1){c=g+(d<<2)|0;f=G[c+8>>2];G[c>>2]=G[c+4>>2];G[c+4>>2]=f;G[c+8>>2]=G[c+12>>2];d=d+4|0;G[c+12>>2]=G[g+(d<<2)>>2];if((d|0)!=(i|0)){continue}break}}if(e&8){G[g+(i<<2)>>2]=G[g+(b<<2)>>2];e=G[j>>2]}b=(e&-32)-32|0;G[j>>2]=b|e&31;c=b>>>5|0;d:{if(!b){f=0;break d}e=0;f=0;d=0;if(b>>>0>=128){h=c&134217724;i=0;while(1){b=g+(d<<2)|0;f=1<<(G[b+12>>2]>>>1)|(1<<(G[b>>2]>>>1)|f|1<<(G[b+4>>2]>>>1)|1<<(G[b+8>>2]>>>1));d=d+4|0;i=i+4|0;if((h|0)!=(i|0)){continue}break}}b=c&3;if(!b){break d}while(1){f=1<<(G[g+(d<<2)>>2]>>>1)|f;d=d+1|0;e=e+1|0;if((b|0)!=(e|0)){continue}break}}G[g+(c<<2)>>2]=f;break a}bb(a,b,1);e=G[j>>2];h=e>>>5|0;d=0;e:{f:{if(e>>>0<32){break f}while(1){if(G[g+(d<<2)>>2]==(c|0)){break f}d=d+1|0;if((h|0)!=(d|0)){continue}break}i=h-1|0;break e}i=h-1|0;if((i|0)<=(d|0)){break e}k=(h-d|0)-2|0;l=h+(d^-1)&3;if(l){while(1){m=g+(d<<2)|0;d=d+1|0;G[m>>2]=G[g+(d<<2)>>2];f=f+1|0;if((l|0)!=(f|0)){continue}break}}if(k>>>0<3){break e}while(1){f=g+(d<<2)|0;k=G[f+8>>2];G[f>>2]=G[f+4>>2];G[f+4>>2]=k;G[f+8>>2]=G[f+12>>2];d=d+4|0;G[f+12>>2]=G[g+(d<<2)>>2];if((d|0)!=(i|0)){continue}break}}if(e&8){G[g+(i<<2)>>2]=G[g+(h<<2)>>2];e=G[j>>2]}d=e&31;e=(e&-32)-32|0;G[j>>2]=d|e;k=e>>>5|0;d=0;h=0;g:{if(!e){break g}i=0;f=0;if(e>>>0>=128){m=k&134217724;e=0;while(1){l=g+(f<<2)|0;h=1<<(G[l+12>>2]>>>1)|(1<<(G[l>>2]>>>1)|h|1<<(G[l+4>>2]>>>1)|1<<(G[l+8>>2]>>>1));f=f+4|0;e=e+4|0;if((m|0)!=(e|0)){continue}break}}e=k&3;if(!e){break g}while(1){h=1<<(G[g+(f<<2)>>2]>>>1)|h;f=f+1|0;i=i+1|0;if((e|0)!=(i|0)){continue}break}}G[g+(k<<2)>>2]=h;$a(a,b);h:{i:{g=c>>1;e=G[a+760>>2]+M(g,12)|0;f=G[e+4>>2];if((f|0)<=0){break i}i=G[e>>2];while(1){if(G[i+(d<<2)>>2]==(b|0)){break i}d=d+1|0;if((f|0)!=(d|0)){continue}break}h=f-1|0;break h}h=f-1|0;if((h|0)<=(d|0)){break h}b=G[e>>2];while(1){f=b+(d<<2)|0;d=d+1|0;G[f>>2]=G[b+(d<<2)>>2];h=G[e+4>>2]-1|0;if((h|0)>(d|0)){continue}break}}G[e+4>>2]=h;b=G[a+808>>2]+(c<<2)|0;G[b>>2]=G[b>>2]-1;if(!((g|0)<G[a+840>>2]&G[G[a+836>>2]+(g<<2)>>2]>=0)){if(H[g+G[a+876>>2]|0]|H[g+G[a+904>>2]|0]){break a}c=H[g+G[a+332>>2]|0];b=H[14634];if(!((c|0)==(b|0)&((b^-1)&254)>>>1|b&c&2)){break a}}xb(a+824|0,g)}b=1;j:{if((G[j>>2]&-32)!=32){break j}b=0;c=G[j+4>>2];d=H[G[a+332>>2]+(c>>1)|0];e=d^c&1;g=H[14634];d=d&2;k:{if((e|0)==(g|0)&((g^-1)&254)>>>1|d&g){ab(a,c);break k}c=H[14633];if((c|0)==(e|0)&((c^-1)&254)>>>1|c&d){break j}}b=(Za(a)|0)==-1}return b}function pb(a){var b=0,c=0,d=0,e=0;c=la-16|0;la=c;G[a+4>>2]=0;G[a+8>>2]=0;G[a>>2]=5812;G[a+32>>2]=0;G[a+36>>2]=0;G[a+12>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;G[a+24>>2]=0;G[a+40>>2]=0;G[a+44>>2]=0;L[a+48>>3]=L[1771];L[a+56>>3]=L[1778];L[a+64>>3]=L[1785];L[a+72>>3]=L[1792];E[a+80|0]=H[14452];G[a+84>>2]=G[3593];b=G[3601];E[a+92|0]=0;G[a+88>>2]=b;E[a+93|0]=H[14428];L[a+96>>3]=L[1824];G[a+104>>2]=G[3657];G[a+108>>2]=G[3621];e=L[1817];G[a+452>>2]=0;G[a+444>>2]=0;G[a+448>>2]=0;G[a+436>>2]=0;G[a+428>>2]=0;G[a+432>>2]=0;G[a+420>>2]=0;G[a+412>>2]=0;G[a+416>>2]=0;G[a+404>>2]=0;G[a+396>>2]=0;G[a+400>>2]=0;G[a+388>>2]=0;G[a+380>>2]=0;G[a+384>>2]=0;G[a+372>>2]=0;G[a+364>>2]=0;G[a+368>>2]=0;G[a+356>>2]=0;G[a+348>>2]=0;G[a+352>>2]=0;G[a+340>>2]=0;G[a+332>>2]=0;G[a+336>>2]=0;G[a+144>>2]=0;G[a+148>>2]=1073217536;G[a+136>>2]=100;G[a+128>>2]=-1717986918;G[a+132>>2]=1072798105;G[a+120>>2]=1431655765;G[a+124>>2]=1070945621;L[a+112>>3]=e;Wb(a+152|0,0,176);G[a+460>>2]=0;G[a+464>>2]=0;b=a+544|0;G[a+456>>2]=b;G[a+468>>2]=0;G[a+472>>2]=0;G[a+476>>2]=0;G[a+480>>2]=0;G[a+520>>2]=0;G[a+524>>2]=0;G[a+512>>2]=0;G[a+516>>2]=-1;G[a+504>>2]=0;G[a+508>>2]=1072693248;G[a+496>>2]=0;G[a+500>>2]=1072693248;E[a+492|0]=1;G[a+488>>2]=a+316;G[a+528>>2]=0;G[a+532>>2]=0;G[a+540>>2]=0;G[a+544>>2]=0;E[a+536|0]=1;G[a+548>>2]=0;G[a+552>>2]=0;G[a+556>>2]=0;Qa(b,1048576);G[a+564>>2]=0;G[a+568>>2]=0;E[a+560|0]=0;G[a+572>>2]=0;G[a+576>>2]=0;G[a+580>>2]=0;G[a+584>>2]=0;G[a+588>>2]=0;G[a+592>>2]=0;G[a+596>>2]=0;G[a+604>>2]=0;G[a+608>>2]=0;G[a+612>>2]=0;G[a+616>>2]=0;G[a+620>>2]=0;G[a+624>>2]=0;G[a+628>>2]=0;G[a+632>>2]=0;G[a+636>>2]=0;G[a+664>>2]=-1;G[a+668>>2]=-1;G[a+672>>2]=-1;G[a+676>>2]=-1;E[a+680|0]=0;G[a>>2]=5924;G[a+684>>2]=G[3684];G[a+688>>2]=G[3692];G[a+692>>2]=G[3700];L[a+696>>3]=L[1857];E[a+704|0]=H[14656];E[a+705|0]=H[14680];d=H[14704];G[a+800>>2]=0;G[a+792>>2]=0;G[a+796>>2]=0;G[a+784>>2]=0;G[a+776>>2]=0;G[a+780>>2]=0;G[a+768>>2]=0;G[a+760>>2]=0;G[a+764>>2]=0;E[a+724|0]=1;G[a+716>>2]=0;G[a+720>>2]=1;G[a+708>>2]=0;G[a+712>>2]=0;E[a+707|0]=1;E[a+706|0]=d;G[a+732>>2]=0;G[a+736>>2]=0;G[a+740>>2]=0;G[a+744>>2]=0;G[a+748>>2]=0;G[a+752>>2]=0;G[a+808>>2]=0;G[a+812>>2]=0;G[a+816>>2]=0;G[a+804>>2]=b;G[a+824>>2]=0;G[a+828>>2]=0;G[a+832>>2]=0;G[a+836>>2]=0;G[a+840>>2]=0;G[a+844>>2]=0;G[a+864>>2]=0;G[a+856>>2]=0;G[a+860>>2]=0;G[a+852>>2]=a+808;qb(a+856|0,1);G[a+868>>2]=0;G[a+872>>2]=0;G[a+920>>2]=0;G[a+924>>2]=0;G[a+876>>2]=0;G[a+880>>2]=0;G[a+884>>2]=0;G[a+892>>2]=0;G[a+896>>2]=0;G[a+900>>2]=0;G[a+904>>2]=0;G[a+908>>2]=0;G[a+912>>2]=0;G[c+12>>2]=2;d=ad(8);G[c+4>>2]=d;if(!(!d&G[3719]==48)){G[d>>2]=-2;G[c+8>>2]=1;E[a+560|0]=1;b=_a(b,c+4|0,0);E[a+536|0]=0;G[a+928>>2]=b;b=G[c+4>>2];if(b){G[c+8>>2]=0;dd(b)}la=c+16|0;return a}Y(ud()|0,1024,0);B()}function tb(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0;j=la-16|0;la=j;m=a+876|0;g=la-16|0;la=g;b=G[a+580>>2];a:{if((b|0)>0){e=G[(G[a+576>>2]+(b<<2)|0)-4>>2];G[a+580>>2]=b-1;break a}e=G[a+540>>2];G[a+540>>2]=e+1}c=a+412|0;d=e<<1;b=d|1;Ta(c,b);f=G[a+412>>2]+M(e,24)|0;if(G[f>>2]){G[f+4>>2]=0}E[g+14|0]=0;f=a+428|0;Ua(f,b,g+14|0);k=c;c=d+2|0;Ta(k,c);b=G[a+412>>2]+M(b,12)|0;if(G[b>>2]){G[b+4>>2]=0}E[g+15|0]=0;Ua(f,c,g+15|0);b=H[14118];d=e+1|0;Va(a+332|0,d);E[G[a+332>>2]+e|0]=b;f=0;b:{c:{if((d|0)>G[a+400>>2]){b=G[a+404>>2];d:{if((b|0)>=(d|0)){break d}c=(d-b|0)+1&-2;h=(b>>1&-2)+2|0;c=(c|0)>(h|0)?c:h;if((c|0)>(b^2147483647)){break c}b=b+c|0;G[a+404>>2]=b;b=ed(G[a+396>>2],b<<3);G[a+396>>2]=b;if(b){break d}if(G[3719]==48){break c}}c=G[a+400>>2];e:{if((c|0)>=(d|0)){break e}b=c;h=d-b&3;if(h){while(1){k=G[a+396>>2]+(b<<3)|0;G[k>>2]=0;G[k+4>>2]=0;b=b+1|0;f=f+1|0;if((h|0)!=(f|0)){continue}break}}if(c-d>>>0>=4294967293){break e}while(1){c=b<<3;f=c+G[a+396>>2]|0;G[f>>2]=0;G[f+4>>2]=0;f=c+G[a+396>>2]|0;G[f+8>>2]=0;G[f+12>>2]=0;f=c+G[a+396>>2]|0;G[f+16>>2]=0;G[f+20>>2]=0;c=c+G[a+396>>2]|0;G[c+24>>2]=0;G[c+28>>2]=0;b=b+4|0;if((d|0)!=(b|0)){continue}break}}G[a+400>>2]=d}c=e<<3;b=c+G[a+396>>2]|0;G[b>>2]=-1;G[b+4>>2]=0;if(H[a+93|0]==1){i=L[a+72>>3]*1389796;l=i/2147483647;f:{if(O(l)<2147483648){b=~~l;break f}b=-2147483648}i=i-+(b|0)*2147483647;L[a+72>>3]=i;i=i/2147483647*1e-5}if((d|0)>G[a+320>>2]){b=G[a+324>>2];g:{if((b|0)>=(d|0)){break g}f=(d-b|0)+1&-2;h=(b>>1&-2)+2|0;f=(f|0)>(h|0)?f:h;if((f|0)>(b^2147483647)){break c}b=b+f|0;G[a+324>>2]=b;b=ed(G[a+316>>2],b<<3);G[a+316>>2]=b;if(b){break g}if(G[3719]==48){break c}}b=G[a+320>>2];if((b|0)<(d|0)){Wb(G[a+316>>2]+(b<<3)|0,0,d-b<<3)}G[a+320>>2]=d}L[c+G[a+316>>2]>>3]=i;Wa(a+588|0,d);E[G[a+588>>2]+e|0]=0;Wa(a+348|0,d);E[G[a+348>>2]+e|0]=1;Va(a+364|0,d);E[G[a+364>>2]+e|0]=2;Wa(a+380|0,d);h:{b=G[a+288>>2];i:{if((b|0)>(e|0)){break i}c=(e-b|0)+2&-2;d=(b>>1&-2)+2|0;c=(c|0)>(d|0)?c:d;if((c|0)>(b^2147483647)){break h}b=b+c|0;G[a+288>>2]=b;b=ed(G[a+280>>2],b<<2);G[a+280>>2]=b;if(b){break i}if(G[3719]==48){break h}}c=G[a+380>>2]+e|0;if(!H[c|0]){b=G[a+204>>2];d=G[a+200>>2]+1|0;b=d?b:b+1|0;G[a+200>>2]=d;G[a+204>>2]=b}E[c|0]=1;if(!(!H[G[a+380>>2]+e|0]|G[a+476>>2]>(e|0)&G[G[a+472>>2]+(e<<2)>>2]>=0)){Xa(a+460|0,e)}la=g+16|0;break b}}Y(ud()|0,1024,0);B()}b=e+1|0;Wa(m,b);E[e+G[a+876>>2]|0]=0;Wa(a+904|0,b);E[e+G[a+904>>2]|0]=0;if(H[a+724|0]==1){c=a+808|0;d=e<<1;g=d|1;qb(c,g);G[G[a+808>>2]+(e<<3)>>2]=0;qb(c,d+2|0);G[G[a+808>>2]+(g<<2)>>2]=0;Ta(a+760|0,b);c=G[a+760>>2]+M(e,12)|0;if(G[c>>2]){G[c+4>>2]=0}E[j+15|0]=0;Ua(a+776|0,b,j+15|0);Wa(a+744|0,b);E[e+G[a+744>>2]|0]=0;ub(a+824|0,e)}la=j+16|0}function Ab(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;m=1;s=G[a+260>>2];a:{b:{if(H[a+705|0]==1){d=G[a+284>>2];c:{e=G[a+296>>2];d:{if((e|0)!=G[a+300>>2]){f=G[a+292>>2];break d}c=e>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(e^2147483647)>>>0){break a}c=c+e|0;G[a+300>>2]=c;f=ed(G[a+292>>2],c<<2);G[a+292>>2]=f;if(!f){break a}e=G[a+296>>2]}G[a+296>>2]=e+1;G[(e<<2)+f>>2]=d;g=G[b+4>>2];e:{if((g|0)>0){e=H[14632];f=0;while(1){i=G[G[b>>2]+(f<<2)>>2];d=H[G[a+332>>2]+(i>>1)|0];j=d^i&1;d=d&2;c=1;if(((e^-1)&254)>>>1&(j|0)==(e&255)|d&e){break e}c=H[14633];if(!((c|0)==(j|0)&((c^-1)&254)>>>1|c&d)){ab(a,i^1);g=G[b+4>>2];e=H[14632]}f=f+1|0;if((g|0)>(f|0)){continue}break}}c=(Za(a)|0)!=-1}cb(a,0);break c}if(c){break b}}m=0;c=0;f:{g:{if(H[a+492|0]!=1){break g}Ya(G[b>>2],G[b+4>>2]);g=G[b+4>>2];h:{if((g|0)<=0){break h}n=H[14117];t=n&2;o=H[14116];h=o&2;c=1;k=(n^-1)>>>1&1;e=(o^-1)>>>1&1;i=G[a+332>>2];r=G[b>>2];f=-2;while(1){d=G[(l<<2)+r>>2];p=H[(d>>1)+i|0];j=p^d&1;if((j|0)==(o|0)&e|h&p|(d^f)==1){break g}if(!((j|0)==(n|0)&k|p&t|(d|0)==(f|0))){G[(q<<2)+r>>2]=d;q=q+1|0;g=G[b+4>>2];f=d}l=l+1|0;if((l|0)<(g|0)){continue}break}c=l-q|0;if((c|0)<=0){break h}g=g-c|0;G[b+4>>2]=g}i:{switch(g|0){case 0:E[a+492|0]=0;b=0;break f;case 1:d=G[G[b>>2]>>2];c=d>>1;E[c+G[a+332>>2]|0]=d&1;b=G[a+296>>2];c=G[a+396>>2]+(c<<3)|0;G[c>>2]=-1;G[c+4>>2]=b;b=G[a+284>>2];G[a+284>>2]=b+1;G[G[a+280>>2]+(b<<2)>>2]=d;b=(Za(a)|0)==-1;E[a+492|0]=b;break f;default:break i}}d=_a(a+544|0,b,0);b=G[a+260>>2];j:{if((b|0)!=G[a+264>>2]){e=G[a+256>>2];break j}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break a}b=b+c|0;G[a+264>>2]=b;e=ed(G[a+256>>2],b<<2);G[a+256>>2]=e;if(!e){break a}b=G[a+260>>2]}c=1;G[a+260>>2]=b+1;G[(b<<2)+e>>2]=d;$a(a,d)}b=c;break f}if(!b){break b}m=1;if(H[a+724|0]!=1){break b}c=G[a+260>>2];if((c|0)!=(s+1|0)){break b}b=G[a+544>>2];e=G[(G[a+256>>2]+(c<<2)|0)-4>>2];Bb(a+856|0,e);i=(e<<2)+b|0;if(J[i>>2]<32){break b}j=a+824|0;d=i+4|0;f=0;while(1){k=d+(f<<2)|0;h=G[a+760>>2]+M(G[k>>2]>>>1|0,12)|0;b=G[h+4>>2];k:{if((b|0)!=G[h+8>>2]){g=G[h>>2];break k}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break a}b=b+c|0;G[h+8>>2]=b;g=ed(G[h>>2],b<<2);G[h>>2]=g;if(!g){break a}b=G[h+4>>2]}G[h+4>>2]=b+1;G[(b<<2)+g>>2]=e;b=G[a+808>>2]+(G[k>>2]<<2)|0;G[b>>2]=G[b>>2]+1;E[G[a+744>>2]+(G[k>>2]>>1)|0]=1;G[a+924>>2]=G[a+924>>2]+1;b=G[k>>2]>>1;l:{if((b|0)>=G[a+840>>2]){break l}b=G[G[a+836>>2]+(b<<2)>>2];if((b|0)<0){break l}zb(j,b)}f=f+1|0;if(f>>>0<G[i>>2]>>>5>>>0){continue}break}}return m}Y(ud()|0,1024,0);B()}function Za(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0;a:{c=G[a+512>>2];b:{if((c|0)>=G[a+284>>2]){m=-1;b=0;break b}m=-1;while(1){G[a+512>>2]=c+1;b=G[a+412>>2];d=G[G[a+280>>2]+(c<<2)>>2];if(H[d+G[a+428>>2]|0]){c=0;e=0;h=M(d,12)+b|0;b=G[h+4>>2];c:{if((b|0)<=0){break c}while(1){f=G[h>>2];i=f+(c<<3)|0;if((G[G[G[a+456>>2]>>2]+(G[i>>2]<<2)>>2]&3)!=1){b=f+(e<<3)|0;f=G[i+4>>2];G[b>>2]=G[i>>2];G[b+4>>2]=f;b=G[h+4>>2];e=e+1|0}c=c+1|0;if((b|0)>(c|0)){continue}break}e=c-e|0;if((e|0)<=0){break c}G[h+4>>2]=b-e}E[d+G[a+428>>2]|0]=0;b=G[a+412>>2]}n=b+M(d,12)|0;c=G[n>>2];e=G[n+4>>2];d:{if(!e){i=c;break d}i=(e<<3)+c|0;p=d^1;e=c;while(1){l=G[a+332>>2];g=G[c+4>>2];d=H[l+(g>>1)|0];b=H[14116];j=((b^-1)&254)>>>1|0;k=b&2;e:{if(j&(b|0)==(d^g&1)|k&d){d=G[c+4>>2];G[e>>2]=G[c>>2];G[e+4>>2]=d;e=e+8|0;c=c+8|0;break e}h=G[c>>2];f=G[a+544>>2]+(h<<2)|0;d=G[f+4>>2];if((p|0)==(d|0)){d=G[f+8>>2];G[f+8>>2]=p;G[f+4>>2]=d}c=c+8|0;f:{if((d|0)==(g|0)){break f}g=H[l+(d>>1)|0];if(!(j&1&(b|0)==(g^d&1)|g&k)){break f}G[e>>2]=h;G[e+4>>2]=d;e=e+8|0;break e}g=H[14117];b=G[f>>2];g:{if(b>>>0<=95){j=(g^-1)>>>1&1;break g}s=f+4|0;t=b>>>5|0;b=2;u=g&2;j=(g^-1)>>>1&1;while(1){o=(b<<2)+s|0;k=G[o>>2];q=H[l+(k>>1)|0];if(!((g|0)==(q^k&1)&j|u&q)){G[f+8>>2]=k;G[o>>2]=p;f=G[a+412>>2]+M(G[f+8>>2]^1,12)|0;b=G[f+4>>2];h:{if((b|0)!=G[f+8>>2]){g=G[f>>2];break h}g=b>>1&-2;g=((g|0)>0?g:0)+2|0;if(g>>>0>(b^2147483647)>>>0){break a}b=b+g|0;G[f+8>>2]=b;g=ed(G[f>>2],b<<3);G[f>>2]=g;if(!g){break a}b=G[f+4>>2]}G[f+4>>2]=b+1;b=(b<<3)+g|0;G[b>>2]=h;G[b+4>>2]=d;break e}b=b+1|0;if((t|0)!=(b|0)){continue}break}}b=h;G[e>>2]=b;G[e+4>>2]=d;e=e+8|0;o=j;f=d>>1;j=f+G[a+332>>2]|0;l=H[j|0];k=d&1;if(o&(g|0)==(l^k)|g&l&2){G[a+512>>2]=G[a+284>>2];if(c>>>0>=i>>>0){m=b;break e}while(1){d=G[c+4>>2];G[e>>2]=G[c>>2];G[e+4>>2]=d;e=e+8|0;c=c+8|0;if(i>>>0>c>>>0){continue}break}m=h;break e}E[j|0]=k;h=G[a+296>>2];f=G[a+396>>2]+(f<<3)|0;G[f>>2]=b;G[f+4>>2]=h;h=G[a+284>>2];G[a+284>>2]=h+1;G[G[a+280>>2]+(h<<2)>>2]=d}if((c|0)!=(i|0)){continue}break}c=e}d=i-c>>3;if((d|0)>0){G[n+4>>2]=G[n+4>>2]-d}r=r+1|0;c=G[a+512>>2];if((c|0)<G[a+284>>2]){continue}break}b=r}d=b;h=G[a+184>>2];c=d+h|0;e=G[a+188>>2];G[a+184>>2]=c;G[a+188>>2]=c>>>0<h>>>0?e+1|0:e;e=G[a+520>>2];c=G[a+524>>2]-(d>>>0>e>>>0)|0;d=e-d|0;G[a+520>>2]=d;G[a+524>>2]=c;return m}Y(ud()|0,1024,0);B()}function Gb(a){a=a|0;var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;e=la-32|0;la=e;b=G[a+556>>2];c=G[a+548>>2];G[e+16>>2]=0;G[e+20>>2]=0;G[e+8>>2]=0;G[e+12>>2]=0;g=e+8|0;Qa(g,c-b|0);E[e+24|0]=H[a+560|0];a:{b:{if(H[a+724|0]==1){if(G[a+540>>2]>0){while(1){i=M(m,12);f=i+G[a+760>>2]|0;d=G[f+4>>2];c:{if((d|0)<=0){break c}h=G[f>>2];l=G[G[a+804>>2]>>2];c=0;b=0;while(1){j=G[h+(b<<2)>>2];if((G[l+(j<<2)>>2]&3)!=1){G[h+(c<<2)>>2]=j;d=G[f+4>>2];c=c+1|0}b=b+1|0;if((d|0)>(b|0)){continue}break}b=b-c|0;if((b|0)<=0){break c}G[f+4>>2]=d-b}h=0;E[G[a+776>>2]+m|0]=0;d:{i=i+G[a+760>>2]|0;if(G[i+4>>2]<=0){break d}e:{while(1){f:{l=G[i>>2]+(h<<2)|0;c=G[a+544>>2]+(G[l>>2]<<2)|0;d=G[c>>2];g:{if(d&16){G[l>>2]=G[c+4>>2];break g}k=G[g+8>>2];b=k;f=G[g+4>>2];j=H[g+16|0]|d>>>2&1;n=((j&1)+(d>>>5|0)|0)+1|0;d=f+n|0;if(b>>>0<d>>>0){h:{while(1){if(b>>>0>=d>>>0){break h}b=(((b>>>1)+(b>>>3)&-2)+b|0)+2|0;G[g+8>>2]=b;if(b>>>0>k>>>0){continue}break}break b}b=ed(G[g>>2],b<<2);if(!b&G[3719]==48){break f}G[g>>2]=b;f=G[g+4>>2];d=n+f|0}G[g+4>>2]=d;if(d>>>0<f>>>0){break e}d=G[g>>2]+(f<<2)|0;k=G[c>>2];G[d>>2]=k&-9|((j|0)!=0)<<3;if(J[c>>2]>=32){n=d+4|0;p=c+4|0;b=0;while(1){o=b<<2;G[n+o>>2]=G[p+o>>2];b=b+1|0;if(b>>>0<G[c>>2]>>>5>>>0){continue}break}}i:{if(!j){break i}b=d;d=k>>>3&536870908;b=b+d|0;d=c+d|0;if(k&4){K[b+4>>2]=K[d+4>>2];break i}G[b+4>>2]=G[d+4>>2]}G[l>>2]=f;G[c+4>>2]=f;G[c>>2]=G[c>>2]|16}h=h+1|0;if((h|0)<G[i+4>>2]){continue}break d}break}break b}break b}m=m+1|0;if((m|0)<G[a+540>>2]){continue}break}}b=G[a+872>>2];c=G[a+868>>2];b=(b-c|0)+((b|0)<(c|0)?G[a+860>>2]:0)|0;if((b|0)>0){f=a+856|0;while(1){c=G[a+868>>2];d=G[G[a+856>>2]+(c<<2)>>2];c=c+1|0;G[a+868>>2]=(c|0)!=G[a+860>>2]?c:0;d=G[a+544>>2]+(d<<2)|0;c=G[d>>2];if(!(c&3)){j:{if(c&16){c=G[d+4>>2];break j}c=lb(g,d);G[d+4>>2]=c;G[d>>2]=G[d>>2]|16}Bb(f,c)}c=(b|0)>1;b=b-1|0;if(c){continue}break}}b=G[a+544>>2]+(G[a+928>>2]<<2)|0;if(H[b|0]&16){G[a+928>>2]=G[b+4>>2];break a}c=lb(g,b);G[a+928>>2]=c;G[b+4>>2]=c;G[b>>2]=G[b>>2]|16}break a}Y(ud()|0,1024,0);B()}kb(a,g);if(G[a+44>>2]>=2){b=G[a+548>>2];G[e+4>>2]=G[e+12>>2]<<2;G[e>>2]=b<<2;tc(3879,e)}E[a+560|0]=H[e+24|0];b=G[a+544>>2];if(b){dd(b)}G[a+544>>2]=G[e+8>>2];G[a+548>>2]=G[e+12>>2];G[a+552>>2]=G[e+16>>2];G[a+556>>2]=G[e+20>>2];la=e+32|0}function Lc(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;j=la-128|0;la=j;a:{b:{c:{if(!hd(f,g,h,i,0,0,0,0)){break c}k=i&65535;m=i>>>16&32767;d:{e:{if((m|0)!=32767){n=4;if(m){break e}n=f|h|(g|k)?3:2;break d}n=!(f|h|(g|k))}}if(!n){break c}s=e>>>16|0;p=s&32767;if((p|0)!=32767){break b}}od(j+16|0,b,c,d,e,f,g,h,i);b=G[j+16>>2];d=G[j+20>>2];e=G[j+24>>2];c=G[j+28>>2];jd(j,b,d,e,c,b,d,e,c);d=G[j+8>>2];e=G[j+12>>2];h=G[j>>2];i=G[j+4>>2];break a}o=d;n=e&2147483647;k=n;m=h;l=i&2147483647;if((hd(b,c,o,k,f,g,h,l)|0)<=0){if(hd(b,c,o,k,f,g,h,l)){h=b;i=c;break a}od(j+112|0,b,c,d,e,0,0,0,0);d=G[j+120>>2];e=G[j+124>>2];h=G[j+112>>2];i=G[j+116>>2];break a}q=i>>>16&32767;if(p){i=c;h=b}else{od(j+96|0,b,c,o,n,0,0,0,1081540608);o=G[j+104>>2];h=G[j+108>>2];n=h;p=(h>>>16|0)-120|0;i=G[j+100>>2];h=G[j+96>>2]}if(!q){od(j+80|0,f,g,m,l,0,0,0,1081540608);m=G[j+88>>2];f=G[j+92>>2];l=f;q=(f>>>16|0)-120|0;g=G[j+84>>2];f=G[j+80>>2]}r=m;t=l&65535|65536;n=n&65535|65536;if((p|0)>(q|0)){while(1){l=o-r|0;k=(g|0)==(i|0)&f>>>0>h>>>0|g>>>0>i>>>0;m=l-k|0;k=(n-((o>>>0<r>>>0)+t|0)|0)-(k>>>0>l>>>0)|0;f:{if((k|0)>=0|(k|0)>0){o=h;h=h-f|0;i=i-((f>>>0>o>>>0)+g|0)|0;if(!(h|m|(i|k))){od(j+32|0,b,c,d,e,0,0,0,0);d=G[j+40>>2];e=G[j+44>>2];h=G[j+32>>2];i=G[j+36>>2];break a}k=k<<1|m>>>31;o=m<<1|i>>>31;break f}k=n<<1|o>>>31;o=o<<1|i>>>31}n=k;k=i<<1|h>>>31;h=h<<1;i=k;p=p-1|0;if((q|0)<(p|0)){continue}break}p=q}l=o-r|0;k=(g|0)==(i|0)&f>>>0>h>>>0|g>>>0>i>>>0;m=l-k|0;k=(n-((o>>>0<r>>>0)+t|0)|0)-(k>>>0>l>>>0)|0;l=k;g:{if((k|0)<0){m=o;l=n;break g}o=h;h=h-f|0;i=i-((f>>>0>o>>>0)+g|0)|0;if(h|m|(i|l)){break g}od(j+48|0,b,c,d,e,0,0,0,0);d=G[j+56>>2];e=G[j+60>>2];h=G[j+48>>2];i=G[j+52>>2];break a}if((l|0)==65535|l>>>0<65535){while(1){b=i>>>31|0;p=p-1|0;n=i<<1|h>>>31;h=h<<1;i=n;c=b;b=l<<1|m>>>31;m=c|m<<1;l=b;if(b>>>0<65536){continue}break}}b=s&32768;if((p|0)<=0){od(j- -64|0,h,i,m,l&65535|(b|p+120)<<16,0,0,0,1065811968);d=G[j+72>>2];e=G[j+76>>2];h=G[j+64>>2];i=G[j+68>>2];break a}d=m;e=l&65535|(b|p)<<16}G[a>>2]=h;G[a+4>>2]=i;G[a+8>>2]=d;G[a+12>>2]=e;la=j+128|0}function za(){var a=0,b=0,c=0;na=91840;ma=26304;while(1){b=a<<4;c=b+25248|0;G[b+25252>>2]=c;G[b+25256>>2]=c;a=a+1|0;if((a|0)!=64){continue}break}$c(48);E[14117]=1;E[14118]=2;E[14116]=0;Ba(14120,1350,1712,2335,2392);G[3542]=1717986918;G[3543]=1072588390;G[3538]=0;G[3539]=1072693248;G[3536]=0;G[3537]=0;G[3530]=5860;F[7080]=0;Ba(14176,1360,1679,2335,2392);G[3556]=-652835029;G[3557]=1072691150;G[3552]=0;G[3553]=1072693248;G[3550]=0;G[3551]=0;G[3544]=5860;F[7108]=0;Ba(14232,1780,2047,2335,2392);G[3570]=0;G[3571]=0;F[7136]=257;G[3566]=0;G[3567]=1072693248;G[3564]=0;G[3565]=0;G[3558]=5860;Ba(14288,2249,1844,2335,2392);G[3584]=-201326592;G[3585]=1100339651;G[3580]=0;G[3581]=2146435072;G[3578]=0;G[3579]=0;G[3572]=5860;F[7164]=0;Ba(14344,2129,3498,2335,2401);G[3593]=2;G[3591]=0;G[3592]=2;G[3586]=5576;Ba(14376,2016,3569,2335,2401);G[3601]=2;G[3599]=0;G[3600]=2;G[3594]=5576;Ba(14408,1416,1305,2335,2376);G[3602]=5688;E[14428]=0;Ba(14432,1345,2140,2335,2376);E[14452]=1;G[3608]=5688;Ba(14456,1409,1973,2335,2401);G[3621]=100;G[3619]=1;G[3620]=2147483647;G[3614]=5576;Ba(14488,2269,1747,2335,2392);G[3634]=0;G[3635]=1073741824;G[3630]=0;G[3631]=2146435072;G[3628]=0;G[3629]=1072693248;G[3622]=5860;F[7264]=0;Ba(14544,2279,2170,2335,2392);G[3648]=-1717986918;G[3649]=1070176665;G[3644]=0;G[3645]=2146435072;G[3642]=0;G[3643]=0;G[3636]=5860;F[7292]=0;Ba(14600,1582,1531,2335,2401);G[3655]=0;G[3656]=2147483647;G[3650]=5576;G[3657]=0;E[14633]=1;E[14634]=2;E[14632]=0;Ba(14636,1931,3171,2317,2376);G[3659]=5688;E[14656]=0;Ba(14660,1999,3451,2317,2376);G[3665]=5688;E[14680]=0;Ba(14684,1937,2906,2317,2376);E[14704]=1;G[3671]=5688;Ba(14708,1404,2786,2317,2401);G[3682]=-2147483648;G[3683]=2147483647;G[3677]=5576;G[3684]=0;Ba(14740,1958,1425,2317,2401);G[3692]=20;G[3690]=-1;G[3691]=2147483647;G[3685]=5576;Ba(14772,1965,2704,2317,2401);G[3700]=1e3;G[3698]=-1;G[3699]=2147483647;G[3693]=5576;Ba(14808,2274,2936,2317,2392);G[3714]=0;G[3715]=1071644672;G[3710]=0;G[3711]=2146435072;G[3708]=0;G[3709]=0;G[3702]=5860;F[7424]=0;G[3760]=14912;G[3742]=42}function Ra(a){a=a|0;var b=0,c=0,d=0,e=0;G[a>>2]=5812;b=G[a+628>>2];if(b){G[a+632>>2]=0;dd(b);G[a+636>>2]=0;G[a+628>>2]=0}b=G[a+616>>2];if(b){G[a+620>>2]=0;dd(b);G[a+624>>2]=0;G[a+616>>2]=0}b=G[a+604>>2];if(b){G[a+608>>2]=0;dd(b);G[a+612>>2]=0;G[a+604>>2]=0}b=G[a+588>>2];if(b){G[a+592>>2]=0;dd(b);G[a+596>>2]=0;G[a+588>>2]=0}b=G[a+576>>2];if(b){G[a+580>>2]=0;dd(b);G[a+584>>2]=0;G[a+576>>2]=0}b=G[a+564>>2];if(b){G[a+568>>2]=0;dd(b);G[a+572>>2]=0;G[a+564>>2]=0}b=G[a+544>>2];if(b){dd(b)}b=G[a+472>>2];if(b){G[a+476>>2]=0;dd(b);G[a+480>>2]=0;G[a+472>>2]=0}b=G[a+460>>2];if(b){G[a+464>>2]=0;dd(b);G[a+468>>2]=0;G[a+460>>2]=0}b=G[a+444>>2];if(b){G[a+448>>2]=0;dd(b);G[a+452>>2]=0;G[a+444>>2]=0}b=G[a+428>>2];if(b){G[a+432>>2]=0;dd(b);G[a+436>>2]=0;G[a+428>>2]=0}c=G[a+412>>2];if(c){b=0;d=G[a+416>>2];if((d|0)>0){while(1){c=G[a+412>>2]+M(b,12)|0;e=G[c>>2];if(e){G[c+4>>2]=0;dd(e);G[c+8>>2]=0;G[c>>2]=0;d=G[a+416>>2]}b=b+1|0;if((d|0)>(b|0)){continue}break}c=G[a+412>>2]}G[a+416>>2]=0;dd(c);G[a+420>>2]=0;G[a+412>>2]=0}b=G[a+396>>2];if(b){G[a+400>>2]=0;dd(b);G[a+404>>2]=0;G[a+396>>2]=0}b=G[a+380>>2];if(b){G[a+384>>2]=0;dd(b);G[a+388>>2]=0;G[a+380>>2]=0}b=G[a+364>>2];if(b){G[a+368>>2]=0;dd(b);G[a+372>>2]=0;G[a+364>>2]=0}b=G[a+348>>2];if(b){G[a+352>>2]=0;dd(b);G[a+356>>2]=0;G[a+348>>2]=0}b=G[a+332>>2];if(b){G[a+336>>2]=0;dd(b);G[a+340>>2]=0;G[a+332>>2]=0}b=G[a+316>>2];if(b){G[a+320>>2]=0;dd(b);G[a+324>>2]=0;G[a+316>>2]=0}b=G[a+304>>2];if(b){G[a+308>>2]=0;dd(b);G[a+312>>2]=0;G[a+304>>2]=0}b=G[a+292>>2];if(b){G[a+296>>2]=0;dd(b);G[a+300>>2]=0;G[a+292>>2]=0}b=G[a+280>>2];if(b){G[a+284>>2]=0;dd(b);G[a+288>>2]=0;G[a+280>>2]=0}b=G[a+268>>2];if(b){G[a+272>>2]=0;dd(b);G[a+276>>2]=0;G[a+268>>2]=0}b=G[a+256>>2];if(b){G[a+260>>2]=0;dd(b);G[a+264>>2]=0;G[a+256>>2]=0}b=G[a+32>>2];if(b){G[a+36>>2]=0;dd(b);G[a+40>>2]=0;G[a+32>>2]=0}b=G[a+16>>2];if(b){G[a+20>>2]=0;dd(b);G[a+24>>2]=0;G[a+16>>2]=0}b=G[a+4>>2];if(b){G[a+8>>2]=0;dd(b);G[a+12>>2]=0;G[a+4>>2]=0}return a|0}function jb(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0;d=la-272|0;la=d;qc(d+120|0);e=G[d+120>>2];g=G[d+124>>2];i=G[d+128>>2];f=la-288|0;la=f;G[f+16>>2]=42;b=f+32|0;Ac(b,1566,f+16|0);c=ec(b,2292);if(c){G[f+28>>2]=0;if(G[c+76>>2]<0){b=G[c>>2]}else{b=G[c>>2]}a:{if(b>>>4&1){break a}while(1){G[f>>2]=f+28;if((lc(c,2354,f)|0)==1){break a}while(1){if(G[c+76>>2]<0){b=G[c>>2]}else{b=G[c>>2]}if(!(b>>>4&1)){b=G[c+76>>2];b:{if(!((b|0)>=0&(!b|G[3742]!=(b&1073741823)))){b=G[c+4>>2];if((b|0)!=G[c+8>>2]){G[c+4>>2]=b+1;b=H[b|0];break b}b=$b(c);break b}b=G[c+76>>2];G[c+76>>2]=b?b:1073741823;b=G[c+4>>2];c:{if((b|0)!=G[c+8>>2]){G[c+4>>2]=b+1;b=H[b|0];break c}b=$b(c)}G[c+76>>2]=0}if((b|0)!=10){continue}}break}if(G[c+76>>2]<0){b=G[c>>2]}else{b=G[c>>2]}if(!(b>>>4&1)){continue}break}}Yb(c);h=+G[f+28>>2]*.0009765625}else{h=0}if(h==0){d:{c=la-288|0;la=c;G[c+16>>2]=42;b=c+32|0;Ac(b,1916,c+16|0);e:{b=ec(b,2292);if(b){G[c>>2]=c+28;if((lc(b,2266,c)|0)!=1){break e}Yb(b);h=+G[c+28>>2]}else{h=0}la=c+288|0;h=h*65536*9.5367431640625e-7;break d}wc(3374);X(1);B()}}la=f+288|0;b=G[a+164>>2];G[d+112>>2]=G[a+160>>2];G[d+116>>2]=b;tc(4317,d+112|0);b=G[a+196>>2];c=G[a+192>>2];G[d+96>>2]=c;G[d+100>>2]=b;j=+(i|0)/1e6+(+(e>>>0)+ +(g|0)*4294967296);L[d+104>>3]=(+(c>>>0)+ +(b>>>0)*4294967296)/j;uc(5488,d+96|0);b=G[a+176>>2];e=G[a+180>>2];g=G[a+168>>2];i=G[a+172>>2];L[d+80>>3]=(+(g>>>0)+ +(i>>>0)*4294967296)/j;G[d+64>>2]=g;G[d+68>>2]=i;L[d+72>>3]=N(N(N(+(b>>>0)+ +(e>>>0)*4294967296)*N(100))/N(+(g>>>0)+ +(i>>>0)*4294967296));uc(5376,d- -64|0);e=G[a+188>>2];b=G[a+184>>2];G[d+48>>2]=b;G[d+52>>2]=e;L[d+56>>3]=(+(b>>>0)+ +(e>>>0)*4294967296)/j;uc(5441,d+48|0);b=G[a+240>>2];g=G[a+244>>2];e=G[a+248>>2];a=G[a+252>>2];G[d+32>>2]=e;G[d+36>>2]=a;k=d,l=(+(Od(b-e|0,g-(a+(b>>>0<e>>>0)|0)|0,100,0)>>>0)+ +(oa>>>0)*4294967296)/(+(b>>>0)+ +(g>>>0)*4294967296),L[k+40>>3]=l;uc(5305,d+32|0);if(h!=0){L[d+16>>3]=h;uc(4656,d+16|0)}L[d>>3]=j;uc(4484,d);la=d+272|0}function ad(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0;i=8;a:{b:{while(1){if(i-1&i|a>>>0>4294967239){break b}l=i>>>0>8;i=l?i:8;c=G[6571];d=c;e=G[6570];a=a>>>0<=8?8:a+3&-4;c:{if(a>>>0<=127){g=(a>>>3|0)-1|0;break c}b=P(a);g=((a>>>29-b^4)-(b<<2)|0)+110|0;if(a>>>0<=4095){break c}b=((a>>>30-b^2)-(b<<1)|0)+71|0;g=b>>>0>=63?63:b}b=g&31;if((g&63)>>>0>=32){f=0;b=c>>>b|0}else{f=c>>>b|0;b=((1<<b)-1&c)<<32-b|e>>>b}if(b|f){while(1){e=b;d:{if(b|f){c=f-1|0;d=b-1|0;c=(d|0)!=-1?c+1|0:c;d=P(b^d)+32|0;b=P(c^f);c=(b|0)==32?d:b;b=63-c|0;oa=0-(c>>>0>63)|0;break d}oa=0;b=64}c=b;d=c&31;if((c&63)>>>0>=32){b=0;k=f>>>d|0}else{b=f>>>d|0;k=((1<<d)-1&f)<<32-d|e>>>d}f=b;g=c+g|0;b=g<<4;d=G[b+25256>>2];c=b+25248|0;e:{if((d|0)!=(c|0)){b=bd(d,i,a);if(b){break a}e=G[d+4>>2];b=G[d+8>>2];G[e+8>>2]=b;G[b+4>>2]=e;G[d+8>>2]=c;G[d+4>>2]=G[c+4>>2];G[c+4>>2]=d;G[G[d+4>>2]+8>>2]=d;g=g+1|0;b=(f&1)<<31|k>>>1;f=f>>>1|0;break e}m=G[6571];e=g;b=e&63;d=b&31;if(b>>>0>=32){c=0;d=-1>>>d|0}else{c=-1>>>d|0;d=c|(1<<d)-1<<32-d}d=d&-2;h=b&31;if(b>>>0>=32){c=d<<h;d=0}else{c=(1<<h)-1&d>>>32-h|c<<h;d=d<<h}b=c;h=0-e&63;e=h;c=e&31;if(e>>>0>=32){c=-1<<c;e=0}else{e=-1<<c;c=e|(1<<c)-1&-1>>>32-c}e=e&-2;j=h&31;if(h>>>0>=32){h=0;e=c>>>j|0}else{h=c>>>j|0;e=((1<<j)-1&c)<<32-j|e>>>j}e=e|d;oa=b|h;G[6570]=G[6570]&e;G[6571]=oa&m;b=k^1}if(b|f){continue}break}d=G[6571];e=G[6570]}b=P(d);c=63-((b|0)==32?P(e)+32|0:b)|0;f:{if(!(d|e)){f=0;break f}b=c<<4;f=G[b+25256>>2];if(!d&e>>>0<1073741824){break f}g=99;e=b+25248|0;if((e|0)==(f|0)){break f}while(1){if(!g){break f}b=bd(f,i,a);if(b){break a}g=g-1|0;f=G[f+8>>2];if((e|0)!=(f|0)){continue}break}}if($c((l?i+48|0:48)+a|0)){continue}break}if(!f){break b}e=(c<<4)+25248|0;if((e|0)==(f|0)){break b}while(1){b=bd(f,i,a);if(b){break a}f=G[f+8>>2];if((e|0)!=(f|0)){continue}break}}b=0}return b}function gb(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0;f=la-16|0;la=f;G[f+12>>2]=0;G[f+4>>2]=0;G[f+8>>2]=0;b=G[a+540>>2];if((b|0)>0){while(1){a:{if(!H[G[a+380>>2]+e|0]){break a}d=H[G[a+332>>2]+e|0];j=H[14118];if(!((d|0)==(j|0)&((j^-1)&254)>>>1|d&j&2)){break a}b:{d=G[f+8>>2];if((d|0)!=G[f+12>>2]){break b}b=d>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0<=(d^2147483647)>>>0){b=b+d|0;G[f+12>>2]=b;c=ed(c,b<<2);G[f+4>>2]=c;if(c){break b}}Y(ud()|0,1024,0);B()}G[f+8>>2]=d+1;G[(d<<2)+c>>2]=e;b=G[a+540>>2]}e=e+1|0;if((e|0)<(b|0)){continue}break}}b=0;g=G[a+460>>2];c:{d:{if(G[a+464>>2]>0){c=G[a+472>>2];while(1){G[c+(G[(b<<2)+g>>2]<<2)>>2]=-1;b=b+1|0;if((b|0)<G[a+464>>2]){continue}break}break d}if(!g){break c}}G[a+464>>2]=0}e:{if(G[f+8>>2]<=0){break e}e=0;f:{while(1){d=G[f+4>>2]+(e<<2)|0;G[G[a+472>>2]+(G[d>>2]<<2)>>2]=e;b=G[a+464>>2];if((b|0)==G[a+468>>2]){c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break f}c=b+c|0;G[a+468>>2]=c;g=ed(g,c<<2);G[a+460>>2]=g;if(!g){break f}b=G[a+464>>2]}G[a+464>>2]=b+1;G[(b<<2)+g>>2]=G[d>>2];e=e+1|0;if((e|0)<G[f+8>>2]){continue}break}c=G[a+464>>2];if((c|0)<2){break e}c=c>>>1|0;p=G[a+472>>2];while(1){j=c;c=c-1|0;l=G[(c<<2)+g>>2];m=p;d=G[a+464>>2];e=c;h=c<<1;i=h|1;g:{if((d|0)<=(i|0)){break g}k=G[G[a+488>>2]>>2];q=L[k+(l<<3)>>3];m=G[a+472>>2];while(1){b=h+2|0;h:{i:{if((d|0)<=(b|0)){h=G[(i<<2)+g>>2];n=L[(h<<3)+k>>3];break i}h=G[(b<<2)+g>>2];o=L[(h<<3)+k>>3];d=G[(i<<2)+g>>2];n=L[(d<<3)+k>>3];if(o>n){break h}h=d}o=n;b=i}if(!(o>q)){break g}G[(e<<2)+g>>2]=h;G[(h<<2)+m>>2]=e;d=G[a+464>>2];e=b;h=b<<1;i=h|1;if((d|0)>(i|0)){continue}break}}G[(e<<2)+g>>2]=l;G[(l<<2)+m>>2]=e;if((j|0)>1){continue}break}break e}Y(ud()|0,1024,0);B()}a=G[f+4>>2];if(a){G[f+8>>2]=0;dd(a)}la=f+16|0}function bb(a,b,c){var d=0,e=0,f=0,g=0,h=0;g=G[a+544>>2]+(b<<2)|0;a:{b:{c:{d:{if(c){f=G[a+412>>2];e=f+M(G[g+4>>2]^1,12)|0;d=G[e+4>>2];if((d|0)<=0){c=0;break d}h=G[e>>2];c=0;while(1){if(G[(c<<3)+h>>2]==(b|0)){break d}c=c+1|0;if((d|0)!=(c|0)){continue}break}d=d-1|0;break c}c=G[a+428>>2];e=G[g+4>>2]^1;b=c+e|0;if(!H[b|0]){E[b|0]=1;c=G[a+448>>2];e:{if((c|0)!=G[a+452>>2]){b=G[a+444>>2];break e}b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break a}b=b+c|0;G[a+452>>2]=b;b=ed(G[a+444>>2],b<<2);G[a+444>>2]=b;if(!b){break a}c=G[a+448>>2]}G[a+448>>2]=c+1;G[(c<<2)+b>>2]=e;c=G[a+428>>2]}e=G[g+8>>2]^1;b=c+e|0;if(H[b|0]){break b}E[b|0]=1;f:{c=G[a+448>>2];g:{if((c|0)!=G[a+452>>2]){b=G[a+444>>2];break g}b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break f}b=b+c|0;G[a+452>>2]=b;b=ed(G[a+444>>2],b<<2);G[a+444>>2]=b;if(!b){break f}c=G[a+448>>2]}G[a+448>>2]=c+1;G[(c<<2)+b>>2]=e;break b}break a}d=d-1|0;if((d|0)<=(c|0)){break c}while(1){d=G[e>>2];f=d+(c<<3)|0;c=c+1|0;d=d+(c<<3)|0;h=G[d+4>>2];G[f>>2]=G[d>>2];G[f+4>>2]=h;d=G[e+4>>2]-1|0;if((d|0)>(c|0)){continue}break}f=G[a+412>>2]}G[e+4>>2]=d;h:{i:{e=M(G[g+8>>2]^1,12)+f|0;d=G[e+4>>2];if((d|0)<=0){c=0;break i}f=G[e>>2];c=0;while(1){if(G[f+(c<<3)>>2]==(b|0)){break i}c=c+1|0;if((d|0)!=(c|0)){continue}break}b=d-1|0;break h}b=d-1|0;if((c|0)>=(b|0)){break h}while(1){b=G[e>>2];d=b+(c<<3)|0;c=c+1|0;b=b+(c<<3)|0;f=G[b+4>>2];G[d>>2]=G[b>>2];G[d+4>>2]=f;b=G[e+4>>2]-1|0;if((c|0)<(b|0)){continue}break}}G[e+4>>2]=b}e=G[g>>2]&4;b=(e?216:208)+a|0;c=G[b>>2];d=G[b+4>>2]-!c|0;c=c-1|0;G[b>>2]=c;G[b+4>>2]=d;a=(e?232:224)+a|0;b=G[a>>2];c=G[g>>2]>>>5|0;g=G[a+4>>2]-(c>>>0>b>>>0)|0;b=b-c|0;G[a>>2]=b;G[a+4>>2]=g;return}Y(ud()|0,1024,0);B()}function ed(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;if(!a){return ad(b)}if(!b){dd(a);return 0}a:{if(b>>>0>4294967239){break a}h=b>>>0<=8?8:b+3&-4;b=h+8|0;b:{c:{j=a-4|0;f=j;c=G[f>>2];e=c+f|0;i=G[e>>2];g=i+e|0;d:{e:{if(G[g-4>>2]!=(i|0)){d=b+f|0;if(d+16>>>0<=g>>>0){c=G[e+4>>2];e=G[e+8>>2];G[c+8>>2]=e;G[e+4>>2]=c;c=g-d|0;G[d>>2]=c;G[(d+(c&-4)|0)-4>>2]=c|1;e=G[d>>2]-8|0;f:{if(e>>>0<=127){c=(e>>>3|0)-1|0;break f}g=P(e);c=((e>>>29-g^4)-(g<<2)|0)+110|0;if(e>>>0<=4095){break f}c=((e>>>30-g^2)-(g<<1)|0)+71|0;c=c>>>0>=63?63:c}e=c<<4;G[d+4>>2]=e+25248;e=e+25256|0;G[d+8>>2]=G[e>>2];G[e>>2]=d;G[G[d+8>>2]+4>>2]=d;e=G[6571];d=c&31;if((c&63)>>>0>=32){c=1<<d;g=0}else{g=1<<d;c=g-1&1>>>32-d}G[6570]=g|G[6570];G[6571]=c|e;G[f>>2]=b;break c}if(d>>>0>g>>>0){break e}b=G[e+4>>2];d=G[e+8>>2];G[b+8>>2]=d;G[d+4>>2]=b;b=c+i|0;G[f>>2]=b;break c}if(c>>>0>=b+16>>>0){G[f>>2]=b;G[(f+(b&-4)|0)-4>>2]=b;d=b+f|0;b=c-b|0;G[d>>2]=b;G[(d+(b&-4)|0)-4>>2]=b|1;c=G[d>>2]-8|0;g:{if(c>>>0<=127){b=(c>>>3|0)-1|0;break g}f=P(c);b=((c>>>29-f^4)-(f<<2)|0)+110|0;if(c>>>0<=4095){break g}b=((c>>>30-f^2)-(f<<1)|0)+71|0;b=b>>>0>=63?63:b}c=b<<4;G[d+4>>2]=c+25248;c=c+25256|0;G[d+8>>2]=G[c>>2];G[c>>2]=d;G[G[d+8>>2]+4>>2]=d;c=G[6571];d=b&31;if((b&63)>>>0>=32){b=1<<d;e=0}else{e=1<<d;b=e-1&1>>>32-d}G[6570]=e|G[6570];G[6571]=b|c;b=1;break b}d=1;if(b>>>0<=c>>>0){break d}}d=0}b=d;break b}G[(f+(b&-4)|0)-4>>2]=b;b=1}if(b){return a}b=ad(h);if(!b){break a}d=G[j>>2]-8|0;jc(b,a,d>>>0>h>>>0?h:d);dd(a);k=b}return k}function hb(a){var b=0,c=0,d=0,e=0,f=0,g=0;a:{if(H[a+492|0]==1){if((Za(a)|0)==-1){break a}}E[a+492|0]=0;return 0}b:{if(G[a+284>>2]==G[a+516>>2]){break b}c=G[a+520>>2];e=G[a+524>>2];if((e|0)>0){c=1}else{c=!!c&(e|0)>=0}if(c){break b}fb(a,a+268|0);c:{if(H[a+536|0]!=1){break c}fb(a,a+256|0);if(G[a+568>>2]>0){while(1){E[G[a+588>>2]+G[G[a+564>>2]+(b<<2)>>2]|0]=1;b=b+1|0;if((b|0)<G[a+568>>2]){continue}break}}c=G[a+284>>2];d:{if((c|0)<=0){break d}g=G[a+588>>2];e=G[a+280>>2];b=0;while(1){f=G[(b<<2)+e>>2];if(!H[(f>>1)+g|0]){G[(d<<2)+e>>2]=f;d=d+1|0;c=G[a+284>>2]}b=b+1|0;if((c|0)>(b|0)){continue}break}b=b-d|0;if((b|0)<=0){break d}c=c-b|0;G[a+284>>2]=c}G[a+512>>2]=c;if(G[a+568>>2]>0){b=0;while(1){E[G[a+588>>2]+G[G[a+564>>2]+(b<<2)>>2]|0]=0;b=b+1|0;if((b|0)<G[a+568>>2]){continue}break}}d=0;e:{f:{if(G[a+568>>2]>0){while(1){b=G[a+580>>2];g:{if((b|0)!=G[a+584>>2]){c=G[a+576>>2];break g}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break f}b=b+c|0;G[a+584>>2]=b;c=ed(G[a+576>>2],b<<2);G[a+576>>2]=c;if(!c){break f}b=G[a+580>>2]}G[(b<<2)+c>>2]=0;b=G[a+580>>2]+1|0;G[a+580>>2]=b;G[((b<<2)+c|0)-4>>2]=G[G[a+564>>2]+(d<<2)>>2];d=d+1|0;if((d|0)<G[a+568>>2]){continue}break}}break e}Y(ud()|0,1024,0);B()}if(!G[a+564>>2]){break c}G[a+568>>2]=0}if(+J[a+556>>2]>L[a+96>>3]*+J[a+548>>2]){pa[G[G[a>>2]+8>>2]](a)}gb(a);G[a+516>>2]=G[a+284>>2];b=G[a+236>>2]+G[a+228>>2]|0;c=G[a+224>>2];d=c+G[a+232>>2]|0;b=d>>>0<c>>>0?b+1|0:b;G[a+520>>2]=d;G[a+524>>2]=b}return 1}function Ia(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;f=la-32|0;la=f;a:{b:{c:{if(H[b|0]!=45){break c}e=b+1|0;b=0;g=G[a+4>>2];d=H[g|0];if(d){while(1){if(H[b+e|0]!=(d|0)){break c}b=b+1|0;d=H[g+b|0];if(d){continue}break}}b=b+e|0;if(H[b|0]!=61){break c}m=f+28|0;i=-2147483648;j=la-16|0;la=j;g=b+1|0;c=H[g|0];d:{if(!c){d=g;break d}d=g;e:{while(1){b=c<<24>>24;if(!((b|0)==32|b-9>>>0<5)){break e}c=H[d+1|0];d=d+1|0;if(c){continue}break}break d}f:{b=c&255;switch(b-43|0){case 0:case 2:break f;default:break d}}l=(b|0)==45?-1:0;d=d+1|0}b=0;while(1){g:{e=H[d|0];c=e-48|0;h:{if((c&255)>>>0<10){break h}if((e-97&255)>>>0<=25){c=e-87|0;break h}if((e-65&255)>>>0>25){break g}c=e-55|0}c=c&255;if(c>>>0>=10){break g}pd(j,10,0,0,0,h,k,0,0);e=1;i:{if(G[j+8>>2]|G[j+12>>2]){break i}n=Od(h,k,10,0);o=oa;if((o|0)==-1&(c^-1)>>>0<n>>>0){break i}e=o;h=c+n|0;k=h>>>0<c>>>0?e+1|0:e;p=1;e=b}d=d+1|0;b=e;continue}break}if(m){G[m>>2]=p?d:g}j:{k:{l:{if(b){G[3719]=68;h=-2147483648;k=0;break l}if(!k&h>>>0<2147483648){break k}}if(!l){G[3719]=68;i=2147483647;break j}if(!k&h>>>0<=2147483648){break k}G[3719]=68;break j}i=(h^l)-l|0}la=j+16|0;b=G[f+28>>2];if(b){if((i|0)>G[a+24>>2]){break b}if((i|0)<G[a+20>>2]){break a}G[a+28>>2]=i}c=(b|0)!=0}la=f+32|0;return c|0}G[f+4>>2]=G[a+4>>2];G[f>>2]=g;fc(G[3076],5191,f);X(1);B()}G[f+20>>2]=G[a+4>>2];G[f+16>>2]=g;fc(G[3076],5142,f+16|0);X(1);B()}function xd(a,b,c){a=a|0;b=b|0;c=c|0;var d=0,e=0,f=0,g=0,h=0,i=0;g=la+-64|0;la=g;a:{f=1;b:{if(wd(a,b,0)){break b}f=0;if(!b){break b}h=la-16|0;la=h;f=G[b>>2];e=G[f-8>>2];G[h+12>>2]=e;G[h+4>>2]=b+e;G[h+8>>2]=G[f-4>>2];f=G[h+8>>2];e=wd(f,13552,0);i=G[h+4>>2];c:{if(e){b=la+-64|0;la=b;la=b- -64|0;d=G[h+12>>2]?0:i;break c}e=la+-64|0;la=e;if((b|0)>=(i|0)){G[e+28>>2]=0;G[e+32>>2]=0;G[e+36>>2]=0;G[e+40>>2]=0;G[e+44>>2]=0;G[e+48>>2]=0;G[e+20>>2]=0;G[e+24>>2]=0;G[e+16>>2]=0;G[e+12>>2]=13552;G[e+4>>2]=f;G[e+60>>2]=0;G[e+52>>2]=1;G[e+56>>2]=16777216;G[e+8>>2]=b;pa[G[G[f>>2]+20>>2]](f,e+4|0,i,i,1,0);d=G[e+28>>2]?b:0}la=e- -64|0;if(d){break c}d=la+-64|0;la=d;G[d+16>>2]=0;G[d+12>>2]=13504;G[d+8>>2]=b;G[d+4>>2]=13552;b=0;Wb(d+20|0,0,39);G[d+60>>2]=0;E[d+59|0]=1;pa[G[G[f>>2]+24>>2]](f,d+4|0,i,1,0);d:{e:{switch(G[d+40>>2]){case 0:b=G[d+44>>2]==1?G[d+32>>2]==1?G[d+36>>2]==1?G[d+24>>2]:0:0:0;break d;case 1:break e;default:break d}}if(G[d+28>>2]!=1){if(G[d+44>>2]|G[d+32>>2]!=1|G[d+36>>2]!=1){break d}}b=G[d+20>>2]}la=d- -64|0;d=b}la=h+16|0;f=0;if(!d){break b}b=G[c>>2];if(!b){break a}Wb(g+8|0,0,56);E[g+59|0]=1;G[g+16>>2]=-1;G[g+12>>2]=a;G[g+4>>2]=d;G[g+52>>2]=1;pa[G[G[d>>2]+28>>2]](d,g+4|0,b,1);a=G[g+28>>2];if((a|0)==1){G[c>>2]=G[g+20>>2]}f=(a|0)==1}la=g- -64|0;return f|0}ja(3632,1789,473,2006);B()}function eb(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=N(0),p=0;a:{if((b|0)<=15){g=a;break a}while(1){j=G[c>>2];n=j+(G[(b<<1&-4)+a>>2]<<2)|0;l=n+4|0;e=b;d=-1;while(1){k=G[n>>2];d=d+1|0;g=(d<<2)+a|0;i=G[g>>2];h=j+(i<<2)|0;f=G[h>>2];b:{if(f>>>0<96){break b}m=k>>>5|0;if((m|0)==2){while(1){d=d+1|0;g=(d<<2)+a|0;i=G[g>>2];if(J[j+(i<<2)>>2]>95){continue}break b}}o=K[l+(m<<2)>>2];if(!(o>K[(h+(f>>>5<<2)|0)+4>>2])){break b}while(1){d=d+1|0;g=(d<<2)+a|0;i=G[g>>2];h=j+(i<<2)|0;f=G[h>>2];if(f>>>0<=95){break b}if(K[(h+(f>>>3&536870908)|0)+4>>2]<o){continue}break}}e=e-1|0;f=(e<<2)+a|0;h=G[f>>2];c:{if(k>>>0<96){break c}k=l+(k>>>3&536870908)|0;while(1){m=j+(h<<2)|0;p=G[m>>2]>>>5|0;if((p|0)!=2&!(K[k>>2]<K[(m+(p<<2)|0)+4>>2])){break c}e=e-1|0;f=(e<<2)+a|0;h=G[f>>2];continue}}if((d|0)<(e|0)){G[g>>2]=h;G[f>>2]=i;continue}break}eb(a,d,c);a=g;b=b-d|0;if((b|0)>=16){continue}break}}if((b|0)>=2){k=b-2|0;j=G[c>>2];d=0;while(1){a=d;c=a+1|0;e=c;while(1){i=j+(G[(e<<2)+g>>2]<<2)|0;h=G[i>>2];d:{if(h>>>0<96){break d}l=j+(G[(a<<2)+g>>2]<<2)|0;f=G[l>>2]>>>5|0;if((f|0)!=2){if(!(K[(i+(h>>>5<<2)|0)+4>>2]<K[(l+(f<<2)|0)+4>>2])){break d}}a=e}e=e+1|0;if((e|0)!=(b|0)){continue}break}e=(d<<2)+g|0;i=G[e>>2];a=(a<<2)+g|0;G[e>>2]=G[a>>2];G[a>>2]=i;a=(d|0)==(k|0);d=c;if(!a){continue}break}}}function Nc(a,b){var c=0,d=0,e=0,f=0,g=0;a:{b:{c:{d:{e:{c=G[a+4>>2];f:{if((c|0)!=G[a+104>>2]){G[a+4>>2]=c+1;c=H[c|0];break f}c=Hc(a)}switch(c-43|0){case 0:case 2:break e;default:break d}}g=(c|0)==45;b=!b;c=G[a+4>>2];g:{if((c|0)!=G[a+104>>2]){G[a+4>>2]=c+1;c=H[c|0];break g}c=Hc(a)}d=c-58|0;if(b|d>>>0>4294967285){break c}if(G[a+116>>2]<0){break b}G[a+4>>2]=G[a+4>>2]-1;break b}d=c-58|0}if(d>>>0<4294967286){break b}h:{if(c-48>>>0>=10){break h}while(1){e=(M(e,10)+c|0)-48|0;f=(e|0)<214748364;c=G[a+4>>2];i:{if((c|0)!=G[a+104>>2]){G[a+4>>2]=c+1;c=H[c|0];break i}c=Hc(a)}b=c-48|0;if(f&b>>>0<=9){continue}break}f=e>>31;if(b>>>0>=10){break h}while(1){b=c;c=Od(e,f,10,0);d=b+c|0;b=oa;e=d-48|0;d=(c>>>0>d>>>0?b+1|0:b)-(d>>>0<48)|0;f=d;d=e>>>0<2061584302&(d|0)<=21474836|(d|0)<21474836;c=G[a+4>>2];j:{if((c|0)!=G[a+104>>2]){G[a+4>>2]=c+1;c=H[c|0];break j}c=Hc(a)}b=c-48|0;if(d&b>>>0<=9){continue}break}if(b>>>0>=10){break h}while(1){b=G[a+4>>2];k:{if((b|0)!=G[a+104>>2]){G[a+4>>2]=b+1;b=H[b|0];break k}b=Hc(a)}if(b-48>>>0<10){continue}break}}b=G[a+116>>2];if((b|0)>0){b=1}else{b=(b|0)>=0}if(b){G[a+4>>2]=G[a+4>>2]-1}a=e;e=g?0-a|0:a;f=g?0-(((a|0)!=0)+f|0)|0:f;break a}f=-2147483648;if(G[a+116>>2]<0){break a}G[a+4>>2]=G[a+4>>2]-1;oa=-2147483648;return 0}oa=f;return e}function fb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0;a:{if(G[b+4>>2]<=0){break a}while(1){h=G[b>>2];p=k<<2;e=G[h+p>>2];i=e<<2;f=i+G[a+544>>2]|0;c=G[f>>2];b:{c:{if(c>>>0<32){break c}g=f+4|0;l=c>>>5|0;d=0;j=H[14116];m=j&2;r=(j^-1)>>>1&1;s=G[a+332>>2];d:{while(1){q=G[g+(d<<2)>>2];n=H[(q>>1)+s|0];if(!(r&(j|0)==(n^q&1)|n&m)){d=d+1|0;if((l|0)!=(d|0)){continue}break d}break}bb(a,e,0);c=G[g>>2];g=c>>1;d=H[g+G[a+332>>2]|0];e=d^c&1;c=H[14116];e:{if(!((e|0)==(c|0)&((c^-1)&254)>>>1|d&c&2)){break e}d=G[a+396>>2]+(g<<3)|0;c=G[d>>2];if((c|0)==-1|(G[a+544>>2]+(c<<2)|0)!=(f|0)){break e}G[d>>2]=-1}G[f>>2]=G[f>>2]&-4|1;d=G[i+G[a+544>>2]>>2];G[a+556>>2]=((G[a+556>>2]+(d>>>5|0)|0)+(d>>>3&1)|0)+1;break b}if(c>>>0<96){break c}d=2;e=H[14117];j=e&2;n=(e^-1)>>>1&1;while(1){i=g+(d<<2)|0;m=G[i>>2];h=H[G[a+332>>2]+(m>>1)|0];if(n&(e|0)==(h^m&1)|h&j){G[i>>2]=G[(g+(l<<2)|0)-4>>2];c=G[f>>2];if(c&8){c=g+(c>>>3&536870908)|0;G[c-4>>2]=G[c>>2];c=G[f>>2]}c=c-32|0;G[f>>2]=c;d=d-1|0}d=d+1|0;l=c>>>5|0;if((d|0)<(l|0)){continue}break}h=G[b>>2];e=G[p+h>>2]}G[(o<<2)+h>>2]=e;o=o+1|0}k=k+1|0;d=G[b+4>>2];if((k|0)<(d|0)){continue}break}a=k-o|0;if((a|0)<=0){break a}G[b+4>>2]=d-a}}function Cb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0;a:{b:{if(H[a+724|0]!=1){break b}f=G[a+544>>2]+(b<<2)|0;if(J[f>>2]<32){break b}i=a+824|0;j=f+4|0;while(1){c=(g<<2)+j|0;d=G[a+808>>2]+(G[c>>2]<<2)|0;G[d>>2]=G[d>>2]-1;d=G[c>>2]>>1;c:{if(!((d|0)<G[a+840>>2]&G[G[a+836>>2]+(d<<2)>>2]>=0)){if(H[G[a+876>>2]+d|0]|H[G[a+904>>2]+d|0]){break c}h=H[G[a+332>>2]+d|0];e=H[14634];if(!((h|0)==(e|0)&((e^-1)&254)>>>1|e&h&2)){break c}}xb(i,d);d=G[c>>2]>>1}c=G[a+776>>2]+d|0;if(!H[c|0]){E[c|0]=1;c=G[a+796>>2];d:{if((c|0)!=G[a+800>>2]){e=G[a+792>>2];break d}e=c>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(c^2147483647)>>>0){break a}c=c+e|0;G[a+800>>2]=c;e=ed(G[a+792>>2],c<<2);G[a+792>>2]=e;if(!e){break a}c=G[a+796>>2]}G[a+796>>2]=c+1;G[(c<<2)+e>>2]=d}g=g+1|0;if(g>>>0<G[f>>2]>>>5>>>0){continue}break}}d=G[a+544>>2];bb(a,b,0);e=b<<2;b=e+d|0;c=G[b+4>>2];f=c>>1;d=H[f+G[a+332>>2]|0];g=d^c&1;c=H[14116];e:{if(!((g|0)==(c|0)&((c^-1)&254)>>>1|c&d&2)){break e}d=G[a+396>>2]+(f<<3)|0;c=G[d>>2];if((c|0)==-1|(b|0)!=(G[a+544>>2]+(c<<2)|0)){break e}G[d>>2]=-1}G[b>>2]=G[b>>2]&-4|1;b=a;c=G[a+556>>2];a=G[e+G[a+544>>2]>>2];G[b+556>>2]=((c+(a>>>5|0)|0)+(a>>>3&1)|0)+1;return}Y(ud()|0,1024,0);B()}function jc(a,b,c){var d=0,e=0;if(c>>>0>=512){fa(a|0,b|0,c|0);return}d=a+c|0;a:{if(!((a^b)&3)){b:{if(!(a&3)){c=a;break b}if(!c){c=a;break b}c=a;while(1){E[c|0]=H[b|0];b=b+1|0;c=c+1|0;if(!(c&3)){break b}if(c>>>0<d>>>0){continue}break}}a=d&-4;c:{if(d>>>0<64){break c}e=a+-64|0;if(e>>>0<c>>>0){break c}while(1){G[c>>2]=G[b>>2];G[c+4>>2]=G[b+4>>2];G[c+8>>2]=G[b+8>>2];G[c+12>>2]=G[b+12>>2];G[c+16>>2]=G[b+16>>2];G[c+20>>2]=G[b+20>>2];G[c+24>>2]=G[b+24>>2];G[c+28>>2]=G[b+28>>2];G[c+32>>2]=G[b+32>>2];G[c+36>>2]=G[b+36>>2];G[c+40>>2]=G[b+40>>2];G[c+44>>2]=G[b+44>>2];G[c+48>>2]=G[b+48>>2];G[c+52>>2]=G[b+52>>2];G[c+56>>2]=G[b+56>>2];G[c+60>>2]=G[b+60>>2];b=b- -64|0;c=c- -64|0;if(e>>>0>=c>>>0){continue}break}}if(a>>>0<=c>>>0){break a}while(1){G[c>>2]=G[b>>2];b=b+4|0;c=c+4|0;if(a>>>0>c>>>0){continue}break}break a}if(d>>>0<4){c=a;break a}e=d-4|0;if(e>>>0<a>>>0){c=a;break a}c=a;while(1){E[c|0]=H[b|0];E[c+1|0]=H[b+1|0];E[c+2|0]=H[b+2|0];E[c+3|0]=H[b+3|0];b=b+4|0;c=c+4|0;if(e>>>0>=c>>>0){continue}break}}if(c>>>0<d>>>0){while(1){E[c|0]=H[b|0];b=b+1|0;c=c+1|0;if((d|0)!=(c|0)){continue}break}}}function rd(a,b,c,d){var e=0,f=0,g=0,h=0,i=0,j=0;g=la-32|0;la=g;e=d&65535;f=d>>>16&32767;i=f;a:{if(f-15361>>>0<=2045){e=e<<4|c>>>28;c=c<<4;f=e;e=b>>>28|c;c=f;f=i-15360|0;b=b&268435455;b:{if((b|0)==134217728&(a|0)!=0|b>>>0>134217728){e=e+1|0;c=e?c:c+1|0;break b}if(a|(b|0)!=134217728){break b}a=e;e=e+(e&1)|0;c=a>>>0>e>>>0?c+1|0:c}h=c>>>0>1048575;a=h?0:e;b=h?0:c;e=0;c=f+h|0;f=c>>>0<f>>>0?1:e;break a}if(!(!(a|c|(b|e))|((f|0)!=32767|(h|0)!=0))){a=c;c=e<<4|c>>>28;a=a<<4|b>>>28;b=c|524288;c=2047;f=0;break a}if(i>>>0>17406){a=0;b=0;c=2047;f=0;break a}h=!(f|h);j=h?15360:15361;f=j-i|0;if((f|0)>112){a=0;b=0;c=0;f=0;break a}e=h?e:e|65536;gd(g+16|0,a,b,c,e,128-f|0);nd(g,a,b,c,e,f);a=G[g+8>>2];h=a<<4;b=G[g+12>>2]<<4|a>>>28;a=G[g+4>>2];f=a;a=a>>>28|h;f=f&268435455;c=G[g>>2]|(i|0)!=(j|0)&(G[g+16>>2]|G[g+24>>2]|(G[g+20>>2]|G[g+28>>2]))!=0;c:{if((f|0)==134217728&(c|0)!=0|f>>>0>134217728){a=a+1|0;b=a?b:b+1|0;break c}if(c|(f|0)!=134217728){break c}e=b;b=a;a=a+(a&1)|0;b=b>>>0>a>>>0?e+1|0:e}c=b>>>0>1048575;b=c?b^1048576:b;f=0}la=g+32|0;x(0,a|0);x(1,b|(d&-2147483648|c<<20));return+z()}function rb(a){a=a|0;var b=0,c=0,d=0,e=0;G[a>>2]=5924;b=G[a+904>>2];if(b){G[a+908>>2]=0;dd(b);G[a+912>>2]=0;G[a+904>>2]=0}b=G[a+892>>2];if(b){G[a+896>>2]=0;dd(b);G[a+900>>2]=0;G[a+892>>2]=0}b=G[a+876>>2];if(b){G[a+880>>2]=0;dd(b);G[a+884>>2]=0;G[a+876>>2]=0}b=G[a+856>>2];if(b){G[a+860>>2]=0;dd(b);G[a+864>>2]=0;G[a+856>>2]=0}b=G[a+836>>2];if(b){G[a+840>>2]=0;dd(b);G[a+844>>2]=0;G[a+836>>2]=0}b=G[a+824>>2];if(b){G[a+828>>2]=0;dd(b);G[a+832>>2]=0;G[a+824>>2]=0}b=G[a+808>>2];if(b){G[a+812>>2]=0;dd(b);G[a+816>>2]=0;G[a+808>>2]=0}b=G[a+792>>2];if(b){G[a+796>>2]=0;dd(b);G[a+800>>2]=0;G[a+792>>2]=0}b=G[a+776>>2];if(b){G[a+780>>2]=0;dd(b);G[a+784>>2]=0;G[a+776>>2]=0}c=G[a+760>>2];if(c){b=0;d=G[a+764>>2];if((d|0)>0){while(1){c=G[a+760>>2]+M(b,12)|0;e=G[c>>2];if(e){G[c+4>>2]=0;dd(e);G[c+8>>2]=0;G[c>>2]=0;d=G[a+764>>2]}b=b+1|0;if((d|0)>(b|0)){continue}break}c=G[a+760>>2]}G[a+764>>2]=0;dd(c);G[a+768>>2]=0;G[a+760>>2]=0}b=G[a+744>>2];if(b){G[a+748>>2]=0;dd(b);G[a+752>>2]=0;G[a+744>>2]=0}b=G[a+732>>2];if(b){G[a+736>>2]=0;dd(b);G[a+740>>2]=0;G[a+732>>2]=0}return Ra(a)|0}function Da(a,b){var c=0,d=0,e=0,f=0,g=0,h=0;g=la-16|0;la=g;c=G[a+8>>2];d=G[a+12>>2];a:{if((c|0)>=(d|0)){break a}while(1){e=G[a+4>>2];f=H[e+c|0];if(f>>>0<9|(f|0)!=32&f>>>0>=14){break a}c=c+1|0;G[a+8>>2]=c;if((c|0)>=(d|0)){G[a+8>>2]=0;d=kc(e,G[a>>2]);G[a+12>>2]=d;c=G[a+8>>2]}if((c|0)<(d|0)){continue}break}}f=0;b:{if((c|0)>=(d|0)){break b}c:{d:{e:{e=G[a+4>>2];switch(H[e+c|0]-43|0){case 0:break d;case 2:break e;default:break b}}f=1;c=c+1|0;G[a+8>>2]=c;if((c|0)>=(d|0)){break c}break b}c=c+1|0;G[a+8>>2]=c;if((c|0)<(d|0)){break b}}G[a+8>>2]=0;d=kc(e,G[a>>2]);G[a+12>>2]=d}c=-1;f:{g:{e=d;d=G[a+8>>2];if((e|0)>(d|0)){c=H[d+G[a+4>>2]|0];if((c-58&255)>>>0>245){break g}}G[g>>2]=c;tc(4578,g);E[b|0]=1;c=0;break f}c=0;if(E[b|0]&1){break f}b=0;c=G[a+8>>2];d=G[a+12>>2];h:{if((c|0)>=(d|0)){break h}while(1){e=G[a+4>>2];h=H[e+c|0];if((h-48&255)>>>0>9){break h}c=c+1|0;G[a+8>>2]=c;b=(M(b,10)+h|0)-48|0;if((c|0)>=(d|0)){G[a+8>>2]=0;d=kc(e,G[a>>2]);G[a+12>>2]=d;c=G[a+8>>2]}if((c|0)<(d|0)){continue}break}}c=f?0-b|0:b}la=g+16|0;return c}function ec(a,b){var c=0,d=0,e=0,f=0,g=0;f=la-16|0;la=f;a:{b:{if(!Dc(2295,E[b|0])){G[3719]=28;break b}d=2;if(!Dc(b,43)){d=H[b|0]!=114}d=Dc(b,120)?d|128:d;d=Dc(b,101)?d|524288:d;e=d;g=d|64;d=H[b|0];e=(d|0)==114?e:g;e=(d|0)==119?e|512:e;G[f>>2]=438;G[f+4>>2]=0;a=$(-100,a|0,((d|0)==97?e|1024:e)|32768,f|0)|0;if(a>>>0>=4294963201){G[3719]=0-a;a=-1}if((a|0)<0){break a}d=la-32|0;la=d;c:{d:{e:{if(!Dc(2295,E[b|0])){G[3719]=28;break e}c=ad(1176);if(c){break d}}b=0;break c}Wb(c,0,144);if(!Dc(b,43)){G[c>>2]=H[b|0]==114?8:4}f:{if(H[b|0]!=97){b=G[c>>2];break f}b=aa(a|0,3,0)|0;if(!(b&1024)){b=b|1024;G[d+16>>2]=b;G[d+20>>2]=b>>31;aa(a|0,4,d+16|0)|0}b=G[c>>2]|128;G[c>>2]=b}G[c+80>>2]=-1;G[c+48>>2]=1024;G[c+60>>2]=a;G[c+44>>2]=c+152;g:{if(b&8){break g}G[d>>2]=d+24;G[d+4>>2]=0;if(ba(a|0,21523,d|0)|0){break g}G[c+80>>2]=10}G[c+40>>2]=26;G[c+36>>2]=27;G[c+32>>2]=28;G[c+12>>2]=29;if(!H[14881]){G[c+76>>2]=-1}b=G[3735];G[c+56>>2]=b;if(b){G[b+52>>2]=c}G[3735]=c;b=c}la=d+32|0;c=b;if(c){break a}ea(a|0)|0}c=0}la=f+16|0;return c}function $c(a){var b=0,c=0,d=0,e=0,f=0;d=G[3517];b=a+7&-8;c=b+7&-8;a=d+c|0;a:{b:{if(!(a>>>0<=d>>>0?c:0)){if(a>>>0<=qa()<<16>>>0){break b}if(ha(a|0)|0){break b}}G[3719]=48;d=-1;break a}G[3517]=a}if((d|0)!=-1){a=b+d|0;G[a-4>>2]=16;c=a-16|0;G[c>>2]=16;b=G[6568];if(b){f=G[b+8>>2]}else{f=0}c:{d:{if((f|0)==(d|0)){e=d-(G[d-4>>2]&-2)|0;f=G[e-4>>2];G[b+8>>2]=a;a=e-(f&-2)|0;if(E[(a+G[a>>2]|0)-4|0]&1){b=G[a+4>>2];e=G[a+8>>2];G[b+8>>2]=e;G[e+4>>2]=b;b=c-a|0;G[a>>2]=b;break c}a=d-16|0;break d}G[d>>2]=16;G[d+8>>2]=a;G[d+4>>2]=b;G[d+12>>2]=16;G[6568]=d;a=d+16|0}b=c-a|0;G[a>>2]=b}G[((b&-4)+a|0)-4>>2]=b|1;c=G[a>>2]-8|0;e:{if(c>>>0<=127){b=(c>>>3|0)-1|0;break e}e=P(c);b=((c>>>29-e^4)-(e<<2)|0)+110|0;if(c>>>0<=4095){break e}b=((c>>>30-e^2)-(e<<1)|0)+71|0;b=b>>>0>=63?63:b}c=b<<4;G[a+4>>2]=c+25248;c=c+25256|0;G[a+8>>2]=G[c>>2];G[c>>2]=a;G[G[a+8>>2]+4>>2]=a;c=G[6570];e=G[6571];a=b&31;if((b&63)>>>0>=32){b=1<<a;f=0}else{f=1<<a;b=f-1&1>>>32-a}G[6570]=f|c;G[6571]=b|e}return(d|0)!=-1}function $a(a,b){var c=0,d=0,e=0,f=0,g=0;g=G[a+544>>2]+(b<<2)|0;e=g;f=G[e+8>>2];a:{e=G[a+412>>2]+M(G[e+4>>2]^1,12)|0;c=G[e+4>>2];b:{if((c|0)!=G[e+8>>2]){d=G[e>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[e+8>>2]=c;d=ed(G[e>>2],c<<3);G[e>>2]=d;if(!d){break a}c=G[e+4>>2]}G[e+4>>2]=c+1;e=b;c=(c<<3)+d|0;G[c>>2]=b;G[c+4>>2]=f;f=G[g+4>>2];d=G[a+412>>2]+M(G[g+8>>2]^1,12)|0;c=G[d+4>>2];c:{if((c|0)!=G[d+8>>2]){b=G[d>>2];break c}b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break a}b=b+c|0;G[d+8>>2]=b;b=ed(G[d>>2],b<<3);G[d>>2]=b;if(!b){break a}c=G[d+4>>2]}G[d+4>>2]=c+1;b=(c<<3)+b|0;G[b>>2]=e;G[b+4>>2]=f;e=G[g>>2]&4;b=(e?216:208)+a|0;f=b;c=G[b>>2];b=G[b+4>>2];c=c+1|0;b=c?b:b+1|0;G[f>>2]=c;G[f+4>>2]=b;a=(e?232:224)+a|0;b=a;e=G[b>>2];a=G[b+4>>2];f=G[g>>2]>>>5|0;g=f;f=e+f|0;a=g>>>0>f>>>0?a+1|0:a;G[b>>2]=f;G[b+4>>2]=a;return}Y(ud()|0,1024,0);B()}function nb(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0;e=la-32|0;la=e;a:{b:{c:{if(H[b|0]!=45){break c}i=b+1|0;b=0;d=G[a+4>>2];c=H[d|0];if(c){while(1){if(H[b+i|0]!=(c|0)){break c}b=b+1|0;c=H[d+b|0];if(c){continue}break}}b=b+i|0;if(H[b|0]!=61){break c}d=la-16|0;la=d;c=la-160|0;la=c;f=b+1|0;G[c+60>>2]=f;G[c+20>>2]=f;G[c+24>>2]=-1;b=c+16|0;Gc(b,0,0);Mc(c,b,1,1);b=G[c+8>>2];k=G[c+12>>2];i=G[c>>2];l=G[c+4>>2];j=e+28|0;if(j){G[j>>2]=G[c+136>>2]+(f+(G[c+20>>2]-G[c+60>>2]|0)|0)}G[d+8>>2]=b;G[d+12>>2]=k;G[d>>2]=i;G[d+4>>2]=l;la=c+160|0;g=rd(G[d>>2],G[d+4>>2],G[d+8>>2],G[d+12>>2]);la=d+16|0;b=G[e+28>>2];if(b){h=L[a+32>>3];if(h<=g&(H[a+41|0]!=1|g!=h)){break b}h=L[a+24>>3];if(h>=g&(H[a+40|0]!=1|g!=h)){break a}L[a+48>>3]=g}f=(b|0)!=0}la=e+32|0;return f|0}G[e+20>>2]=G[a+4>>2];G[e+16>>2]=f;fc(G[3076],5191,e+16|0);X(1);B()}G[e+4>>2]=G[a+4>>2];G[e>>2]=f;fc(G[3076],5142,e);X(1);B()}function Ya(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0;a:{if((b|0)<=15){e=a;break a}while(1){f=G[(b<<1&-4)+a>>2];c=b;d=-1;while(1){d=d+1|0;e=(d<<2)+a|0;h=G[e>>2];if((h|0)<(f|0)){continue}while(1){c=c-1|0;i=(c<<2)+a|0;g=G[i>>2];if((g|0)>(f|0)){continue}break}if((d|0)<(c|0)){G[e>>2]=g;G[i>>2]=h;continue}break}Ya(a,d);a=e;b=b-d|0;if((b|0)>=16){continue}break}}if((b|0)>=2){i=b-2|0;f=0;while(1){h=f+1|0;d=h;a=0;c=f;g=(c^-1)+b&3;if(g){while(1){c=G[(d<<2)+e>>2]<G[(c<<2)+e>>2]?d:c;d=d+1|0;a=a+1|0;if((g|0)!=(a|0)){continue}break}}if(i-f>>>0>=3){while(1){a=d+3|0;g=d+2|0;j=d+1|0;c=G[(d<<2)+e>>2]<G[(c<<2)+e>>2]?d:c;c=G[(j<<2)+e>>2]<G[(c<<2)+e>>2]?j:c;c=G[(g<<2)+e>>2]<G[(c<<2)+e>>2]?g:c;c=G[(a<<2)+e>>2]<G[(c<<2)+e>>2]?a:c;d=d+4|0;if((d|0)!=(b|0)){continue}break}}a=(f<<2)+e|0;d=G[a>>2];j=a;a=(c<<2)+e|0;G[j>>2]=G[a>>2];G[a>>2]=d;a=(f|0)==(i|0);f=h;if(!a){continue}break}}}function _a(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;f=H[a+16|0]|c;d=(G[b+4>>2]+(f&1)|0)+1&1073741823;Qa(a,d+G[a+4>>2]|0);i=G[a+4>>2];d=d+i|0;G[a+4>>2]=d;if(d>>>0>=i>>>0){d=0;g=G[a>>2]+(i<<2)|0;f=f&255;e=((f|0)!=0)<<3;a=c?4:0;G[g>>2]=e|(a|G[g>>2]&-32);h=a|e;a=G[b+4>>2];e=a<<5;G[g>>2]=h|e;if(G[b+4>>2]>0){j=g+4|0;h=G[b>>2];while(1){k=d<<2;G[k+j>>2]=G[h+k>>2];d=d+1|0;if((d|0)<G[b+4>>2]){continue}break}}if(f){if(c){G[(((a&134217727)<<2)+g|0)+4>>2]=0;return i}b=a&134217727;a:{if(!e){a=0;break a}f=a&3;j=g+4|0;h=0;a=0;d=0;if(b-1>>>0>=3){k=b-f|0;c=0;while(1){e=j+(d<<2)|0;a=1<<(G[e+12>>2]>>>1)|(1<<(G[e>>2]>>>1)|a|1<<(G[e+4>>2]>>>1)|1<<(G[e+8>>2]>>>1));d=d+4|0;c=c+4|0;if((k|0)!=(c|0)){continue}break}}if(!f){break a}while(1){a=1<<(G[j+(d<<2)>>2]>>>1)|a;d=d+1|0;h=h+1|0;if((f|0)!=(h|0)){continue}break}}G[((b<<2)+g|0)+4>>2]=a}return i}Y(ud()|0,1024,0);B()}function Ob(a){a=a|0;var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;a:{b=G[a>>2];if(b){while(1){d=b>>31;d=(d^b)-d|0;if((d|0)>G[3717]){while(1){tb(G[3718]);f=G[3717]+1|0;G[3717]=f;if((d|0)>(f|0)){continue}break}}if((c|0)==(e|0)){f=(e>>>1&1073741822)+2|0;if(f>>>0>(e^2147483647)>>>0){break a}e=e+f|0;g=ed(g,e<<2);if(!g){break a}}G[(c<<2)+g>>2]=d<<1|b>>>31;c=c+1|0;b=G[a+4>>2];a=a+4|0;if(b){continue}break}}d=G[3718];f=d+628|0;if(G[d+628>>2]){G[d+632>>2]=0}Fa(f,c);b:{c:{if(c){j=c&3;e=G[f>>2];a=0;b=0;if(c>>>0>=4){k=c&-4;c=0;while(1){h=b<<2;G[h+e>>2]=G[g+h>>2];i=h|4;G[i+e>>2]=G[g+i>>2];i=h|8;G[i+e>>2]=G[g+i>>2];h=h|12;G[h+e>>2]=G[g+h>>2];b=b+4|0;c=c+4|0;if((k|0)!=(c|0)){continue}break}}if(j){while(1){c=b<<2;G[c+e>>2]=G[c+g>>2];b=b+1|0;a=a+1|0;if((j|0)!=(a|0)){continue}break}}b=Ab(d,f);break c}b=Ab(d,f);if(!g){break b}}dd(g)}return b|0}Y(ud()|0,1024,0);B()}function Ib(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;a:{if((b|0)<=15){f=a;break a}while(1){h=G[(b<<1&-4)+a>>2];j=G[h+12>>2];c=-1;d=b;while(1){c=c+1|0;f=(c<<2)+a|0;g=G[f>>2];e=Ec(G[g+12>>2],j);if((e|0)<0){continue}if(!e){if((Ec(G[g+16>>2],G[h+16>>2])|0)<0){continue}}while(1){d=d-1|0;i=(d<<2)+a|0;e=G[i>>2];k=Ec(j,G[e+12>>2]);if((k|0)<0){continue}if(!k){if((Ec(G[h+16>>2],G[e+16>>2])|0)<0){continue}}break}if((c|0)<(d|0)){G[f>>2]=e;G[i>>2]=g;continue}break}Ib(a,c);a=f;b=b-c|0;if((b|0)>=16){continue}break}}if((b|0)>=2){j=b-2|0;a=0;while(1){d=a;h=a+1|0;c=h;while(1){g=G[(c<<2)+f>>2];e=G[(d<<2)+f>>2];i=Ec(G[g+12>>2],G[e+12>>2]);b:{if((i|0)>=0){if(i){break b}if((Ec(G[g+16>>2],G[e+16>>2])|0)>=0){break b}}d=c}c=c+1|0;if((c|0)!=(b|0)){continue}break}c=(a<<2)+f|0;g=G[c>>2];d=(d<<2)+f|0;G[c>>2]=G[d>>2];G[d>>2]=g;d=(a|0)==(j|0);a=h;if(!d){continue}break}}}function ub(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;h=la-16|0;la=h;G[h+12>>2]=-1;ib(a+12|0,b+1|0,h+12|0);g=G[a+12>>2];c=G[a+4>>2];G[g+(b<<2)>>2]=c;a:{b:{if(G[a+8>>2]!=(c|0)){d=G[a>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[a+8>>2]=c;d=ed(G[a>>2],c<<2);G[a>>2]=d;if(!d){break a}g=G[a+12>>2];c=G[a+4>>2]}G[a+4>>2]=c+1;G[(c<<2)+d>>2]=b;c=G[(b<<2)+g>>2];i=G[(c<<2)+d>>2];c:{if(!c){c=0;break c}j=G[G[a+28>>2]>>2];k=j+(i<<3)|0;while(1){a=(c<<2)+d|0;b=G[k+4>>2];e=b;f=b>>31;b=G[k>>2];p=Od(e,f,b,b>>31);l=oa;m=c-1|0;b=m>>1;n=(b<<2)+d|0;o=G[n>>2];e=(o<<3)+j|0;f=G[e+4>>2];e=G[e>>2];e=Od(f,f>>31,e,e>>31);f=oa;if((f|0)==(l|0)&e>>>0<=p>>>0|f>>>0<l>>>0){d=a;break c}G[a>>2]=o;G[(G[n>>2]<<2)+g>>2]=c;c=b;if(m>>>0>1){continue}break}}G[d>>2]=i;G[(i<<2)+g>>2]=c;la=h+16|0;return}Y(ud()|0,1024,0);B()}function Pd(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0;a:{b:{c:{d:{e:{f:{g:{h:{i:{j:{if(b){if(!c){break j}break i}oa=0;a=(a>>>0)/(c>>>0)|0;break a}if(!a){break h}break g}if(!(c-1&c)){break f}f=(P(c)+33|0)-P(b)|0;g=0-f|0;break d}oa=0;a=(b>>>0)/0|0;break a}d=32-P(b)|0;if(d>>>0<31){break e}break c}if((c|0)==1){break b}f=c?31-P(c-1^c)|0:32;c=f&31;if((f&63)>>>0>=32){a=b>>>c|0}else{d=b>>>c|0;a=((1<<c)-1&b)<<32-c|a>>>c}oa=d;break a}f=d+1|0;g=63-d|0}d=f&63;e=d&31;if(d>>>0>=32){d=0;h=b>>>e|0}else{d=b>>>e|0;h=((1<<e)-1&b)<<32-e|a>>>e}g=g&63;e=g&31;if(g>>>0>=32){b=a<<e;a=0}else{b=(1<<e)-1&a>>>32-e|b<<e;a=a<<e}if(f){g=c-1|0;l=(g|0)==-1?-1:0;while(1){i=d<<1|h>>>31;d=h<<1|b>>>31;e=l-(i+(d>>>0>g>>>0)|0)>>31;j=c&e;h=d-j|0;d=i-(d>>>0<j>>>0)|0;b=b<<1|a>>>31;a=k|a<<1;k=e&1;f=f-1|0;if(f){continue}break}}oa=b<<1|a>>>31;a=k|a<<1;break a}a=0;b=0}oa=b}return a}
+function Hb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0;d=la+-64|0;la=d;e=G[3716];if(e){G[d+48>>2]=G[a>>2];fc(G[3076],e,d+48|0)}if(!(E[14112]&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}Ib(G[3525],G[3526]);e=G[3076];c=H[14112];a=0;while(1){if(!(c&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1;c=1}if(G[3526]>(a|0)){if(!(c&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}g=f;f=a<<2;c=G[G[f+G[3525]>>2]+12>>2];a:{if((g|0)!=(c|0)){G[d>>2]=c;fc(e,5535,d);break a}if(G[G[f+G[3525]>>2]+16>>2]==(h|0)){break a}ic(10,e)}if(!(E[14112]&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}c=G[f+G[3525]>>2];pa[G[G[c>>2]+12>>2]](c,b);c=H[14112];if(!(c&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1;c=1}a=a+1|0;f=G[f+G[3525]>>2];h=G[f+16>>2];f=G[f+12>>2];continue}break}nc(5550,16,1,e);G[d+32>>2]=G[3440];fc(e,4944,d+32|0);G[d+16>>2]=G[3440];fc(e,4983,d+16|0);ic(10,e);X(0);B()}function zb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0;j=G[a>>2];m=G[j+(b<<2)>>2];c=G[a+4>>2];e=b<<1;h=e|1;a:{if((c|0)<=(h|0)){n=G[a+12>>2];break a}k=G[G[a+28>>2]>>2];o=k+(m<<3)|0;n=G[a+12>>2];while(1){f=e+2|0;b:{c:{if((f|0)>=(c|0)){e=G[(h<<2)+j>>2];g=(e<<3)+k|0;c=G[g+4>>2];f=c;d=c>>31;c=G[g>>2];c=Od(f,d,c,c>>31);f=oa;break c}e=G[(f<<2)+j>>2];g=(e<<3)+k|0;c=G[g+4>>2];d=c;i=c>>31;c=G[g>>2];g=Od(d,i,c,c>>31);i=oa;l=G[(h<<2)+j>>2];d=(l<<3)+k|0;c=G[d+4>>2];p=c;q=c>>31;c=G[d>>2];c=Od(p,q,c,c>>31);d=oa;if((d|0)==(i|0)&c>>>0>g>>>0|i>>>0<d>>>0){break b}e=l;f=d}g=c;i=f;f=h}c=G[o+4>>2];h=c;d=c>>31;c=G[o>>2];l=Od(h,d,c,c>>31);c=oa;if((c|0)==(i|0)&g>>>0>=l>>>0|c>>>0<i>>>0){break a}G[(b<<2)+j>>2]=e;G[(e<<2)+n>>2]=b;c=G[a+4>>2];b=f;e=b<<1;h=e|1;if((c|0)>(h|0)){continue}break}}G[(b<<2)+j>>2]=m;G[(m<<2)+n>>2]=b}function bd(a,b,c){var d=0,e=0,f=0,g=0;e=a+4|0;d=(e+b|0)-1&0-b;b=G[a>>2];if(d+c>>>0<=(b+a|0)-4>>>0){f=G[a+4>>2];g=G[a+8>>2];G[f+8>>2]=g;G[g+4>>2]=f;if((d|0)!=(e|0)){d=d-e|0;f=a-(G[a-4>>2]&-2)|0;e=d+G[f>>2]|0;G[f>>2]=e;G[(f+(e&-4)|0)-4>>2]=e;a=a+d|0;b=b-d|0;G[a>>2]=b}a:{if(c+24>>>0<=b>>>0){e=a+c|0;b=(b-c|0)-8|0;G[e+8>>2]=b;g=e+8|0;G[(g+(b&-4)|0)-4>>2]=b|1;d=G[e+8>>2]-8|0;b:{if(d>>>0<=127){b=(d>>>3|0)-1|0;break b}f=P(d);b=((d>>>29-f^4)-(f<<2)|0)+110|0;if(d>>>0<=4095){break b}b=((d>>>30-f^2)-(f<<1)|0)+71|0;b=b>>>0>=63?63:b}d=b<<4;G[e+12>>2]=d+25248;d=d+25256|0;G[e+16>>2]=G[d>>2];G[d>>2]=g;G[G[e+16>>2]+4>>2]=g;d=G[6570];f=G[6571];e=b&31;if((b&63)>>>0>=32){b=1<<e;g=0}else{g=1<<e;b=g-1&1>>>32-e}G[6570]=g|d;G[6571]=b|f;b=c+8|0;G[a>>2]=b;c=(b&-4)+a|0;break a}c=a+b|0}G[c-4>>2]=b;a=a+4|0}else{a=0}return a}function Eb(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;h=G[a+4>>2];a:{b:{if(J[c>>2]<=31){e=G[a>>2];f=-1;break b}j=c+4|0;f=-1;while(1){c:{i=(g<<2)+j|0;k=G[i>>2];d=G[a+4>>2];d:{if((d|0)!=G[a+8>>2]){e=G[a>>2];break d}e=d>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(d^2147483647)>>>0){break c}d=d+e|0;G[a+8>>2]=d;e=ed(G[a>>2],d<<2);G[a>>2]=e;if(!e){break c}d=G[a+4>>2]}G[a+4>>2]=d+1;G[(d<<2)+e>>2]=k;f=G[i>>2]>>1==(b|0)?g+h|0:f;g=g+1|0;if(g>>>0<G[c>>2]>>>5>>>0){continue}break b}break}break a}b=(f<<2)+e|0;d=G[b>>2];f=b;b=(h<<2)+e|0;G[f>>2]=G[b>>2];G[b>>2]=d;b=G[c>>2];e:{d=G[a+4>>2];if((d|0)==G[a+8>>2]){c=d>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(d^2147483647)>>>0){break e}c=c+d|0;G[a+8>>2]=c;e=ed(e,c<<2);G[a>>2]=e;if(!e){break e}d=G[a+4>>2]}G[a+4>>2]=d+1;G[(d<<2)+e>>2]=b>>>5;return}}Y(ud()|0,1024,0);B()}function Hc(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0;b=G[a+112>>2];d=G[a+116>>2];i=(b|d)!=0;h=b;e=G[a+4>>2];f=G[a+44>>2];b=e-f|0;g=b;c=b+G[a+120>>2]|0;b=G[a+124>>2]+(b>>31)|0;a:{b=c>>>0<g>>>0?b+1|0:b;if(!(((b|0)>=(d|0)&c>>>0>=h>>>0|(b|0)>(d|0))&i)){i=$b(a);if((i|0)>=0){break a}e=G[a+4>>2];f=G[a+44>>2]}G[a+112>>2]=-1;G[a+116>>2]=-1;G[a+104>>2]=e;g=c;c=f-e|0;d=g+c|0;b=(c>>31)+b|0;G[a+120>>2]=d;G[a+124>>2]=c>>>0>d>>>0?b+1|0:b;return-1}d=c+1|0;b=d?b:b+1|0;h=G[a+4>>2];f=G[a+8>>2];c=G[a+116>>2];g=c;e=G[a+112>>2];b:{if(!(c|e)){break b}c=e-d|0;e=g-(b+(d>>>0>e>>>0)|0)|0;j=f-h|0;g=j>>31;if((e|0)>=(g|0)&c>>>0>=j>>>0|(e|0)>(g|0)){break b}f=c+h|0}G[a+104>>2]=f;c=G[a+44>>2];f=c-h|0;d=f+d|0;b=(f>>31)+b|0;G[a+120>>2]=d;G[a+124>>2]=d>>>0<f>>>0?b+1|0:b;if(c>>>0>=h>>>0){E[h-1|0]=i}return i}function bc(a,b,c){a=a|0;b=b|0;c=c|0;var d=0,e=0,f=0,g=0,h=0,i=0,j=0;f=la-32|0;la=f;d=G[a+28>>2];G[f+16>>2]=d;g=G[a+20>>2];G[f+28>>2]=c;G[f+24>>2]=b;b=g-d|0;G[f+20>>2]=b;g=b+c|0;i=2;a:{b:{b=f+16|0;d=ca(G[a+60>>2],b|0,2,f+12|0)|0;if(d){G[3719]=d;d=-1}else{d=0}c:{d:{if(d){d=b;break d}while(1){e=G[f+12>>2];if((e|0)==(g|0)){break c}if((e|0)<0){d=b;break b}h=G[b+4>>2];j=h>>>0<e>>>0;d=(j<<3)+b|0;h=e-(j?h:0)|0;G[d>>2]=h+G[d>>2];b=(j?12:4)+b|0;G[b>>2]=G[b>>2]-h;g=g-e|0;b=d;i=i-j|0;e=ca(G[a+60>>2],b|0,i|0,f+12|0)|0;if(e){G[3719]=e;e=-1}else{e=0}if(!e){continue}break}}if((g|0)!=-1){break b}}b=G[a+44>>2];G[a+28>>2]=b;G[a+20>>2]=b;G[a+16>>2]=b+G[a+48>>2];a=c;break a}G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;G[a>>2]=G[a>>2]|32;a=0;if((i|0)==2){break a}a=c-G[d+4>>2]|0}la=f+32|0;return a|0}function ib(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0;a:{if(G[a+4>>2]<(b|0)){d=G[a+8>>2];b:{if((d|0)>=(b|0)){break b}f=(b-d|0)+1&-2;e=(d>>1&-2)+2|0;f=(e|0)<(f|0)?f:e;if((f|0)>(d^2147483647)){break a}d=d+f|0;G[a+8>>2]=d;d=ed(G[a>>2],d<<2);G[a>>2]=d;if(d){break b}if(G[3719]==48){break a}}f=G[a+4>>2];c:{if((f|0)>=(b|0)){break c}e=G[c>>2];g=G[a>>2];d=f;h=b-d&7;if(h){c=0;while(1){G[(d<<2)+g>>2]=e;d=d+1|0;c=c+1|0;if((h|0)!=(c|0)){continue}break}}if(f-b>>>0>4294967288){break c}f=g+28|0;h=g+24|0;i=g+20|0;j=g+16|0;k=g+12|0;l=g+8|0;m=g+4|0;while(1){c=d<<2;G[c+g>>2]=e;G[c+m>>2]=e;G[c+l>>2]=e;G[c+k>>2]=e;G[c+j>>2]=e;G[c+i>>2]=e;G[c+h>>2]=e;G[c+f>>2]=e;d=d+8|0;if((d|0)!=(b|0)){continue}break}}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function Tc(a,b,c,d){a:{switch(b-9|0){case 0:b=G[c>>2];G[c>>2]=b+4;G[a>>2]=G[b>>2];return;case 6:b=G[c>>2];G[c>>2]=b+4;b=F[b>>1];G[a>>2]=b;G[a+4>>2]=b>>31;return;case 7:b=G[c>>2];G[c>>2]=b+4;G[a>>2]=I[b>>1];G[a+4>>2]=0;return;case 8:b=G[c>>2];G[c>>2]=b+4;b=E[b|0];G[a>>2]=b;G[a+4>>2]=b>>31;return;case 9:b=G[c>>2];G[c>>2]=b+4;G[a>>2]=H[b|0];G[a+4>>2]=0;return;case 16:b=G[c>>2]+7&-8;G[c>>2]=b+8;L[a>>3]=L[b>>3];return;case 17:pa[d|0](a,c);default:return;case 1:case 4:case 14:b=G[c>>2];G[c>>2]=b+4;b=G[b>>2];G[a>>2]=b;G[a+4>>2]=b>>31;return;case 2:case 5:case 11:case 15:b=G[c>>2];G[c>>2]=b+4;G[a>>2]=G[b>>2];G[a+4>>2]=0;return;case 3:case 10:case 12:case 13:break a}}b=G[c>>2]+7&-8;G[c>>2]=b+8;c=G[b+4>>2];G[a>>2]=G[b>>2];G[a+4>>2]=c}function Kc(a,b,c,d,e,f){var g=0;g=la-80|0;la=g;a:{if((f|0)>=16384){od(g+32|0,b,c,d,e,0,0,0,2147352576);d=G[g+40>>2];e=G[g+44>>2];b=G[g+32>>2];c=G[g+36>>2];if(f>>>0<32767){f=f-16383|0;break a}od(g+16|0,b,c,d,e,0,0,0,2147352576);f=(f>>>0>=49149?49149:f)-32766|0;d=G[g+24>>2];e=G[g+28>>2];b=G[g+16>>2];c=G[g+20>>2];break a}if((f|0)>-16383){break a}od(g- -64|0,b,c,d,e,0,0,0,7471104);d=G[g+72>>2];e=G[g+76>>2];b=G[g+64>>2];c=G[g+68>>2];if(f>>>0>4294934644){f=f+16269|0;break a}od(g+48|0,b,c,d,e,0,0,0,7471104);f=(f>>>0<=4294918376?-48920:f)+32538|0;d=G[g+56>>2];e=G[g+60>>2];b=G[g+48>>2];c=G[g+52>>2]}od(g,b,c,d,e,0,0,0,f+16383<<16);b=G[g+12>>2];G[a+8>>2]=G[g+8>>2];G[a+12>>2]=b;b=G[g+4>>2];G[a>>2]=G[g>>2];G[a+4>>2]=b;la=g+80|0}function Bb(a,b){var c=0,d=0,e=0,f=0,g=0;d=la-16|0;la=d;c=G[a+16>>2];G[a+16>>2]=c+1;G[G[a>>2]+(c<<2)>>2]=b;b=G[a+16>>2];c=G[a+4>>2];if((b|0)==(c|0)){G[a+16>>2]=0;b=0}if((b|0)==G[a+12>>2]){b=0;G[d+12>>2]=0;G[d+4>>2]=0;G[d+8>>2]=0;qb(d+4|0,M(c,3)+1>>1);f=G[a>>2];c=G[a+12>>2];e=G[a+4>>2];if((c|0)<(e|0)){g=G[d+4>>2];while(1){G[(b<<2)+g>>2]=G[(c<<2)+f>>2];b=b+1|0;c=c+1|0;e=G[a+4>>2];if((c|0)<(e|0)){continue}break}}a:{b:{if(G[a+16>>2]>0){c=0;e=G[d+4>>2];while(1){G[e+(b<<2)>>2]=G[(c<<2)+f>>2];b=b+1|0;c=c+1|0;if((c|0)<G[a+16>>2]){continue}break}G[a+12>>2]=0;G[a+16>>2]=G[a+4>>2];break b}G[a+16>>2]=e;G[a+12>>2]=0;if(!f){break a}}G[a+4>>2]=0;dd(f)}G[a>>2]=G[d+4>>2];G[a+4>>2]=G[d+8>>2];G[a+8>>2]=G[d+12>>2]}la=d+16|0}function Xa(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0;f=la-16|0;la=f;G[f+12>>2]=-1;ib(a+12|0,b+1|0,f+12|0);e=G[a+12>>2];c=G[a+4>>2];G[e+(b<<2)>>2]=c;a:{b:{if(G[a+8>>2]!=(c|0)){d=G[a>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[a+8>>2]=c;d=ed(G[a>>2],c<<2);G[a>>2]=d;if(!d){break a}e=G[a+12>>2];c=G[a+4>>2]}G[a+4>>2]=c+1;G[(c<<2)+d>>2]=b;c=G[(b<<2)+e>>2];g=G[(c<<2)+d>>2];c:{if(!c){c=0;break c}h=G[G[a+28>>2]>>2];l=L[h+(g<<3)>>3];while(1){a=(c<<2)+d|0;i=c-1|0;b=i>>1;j=(b<<2)+d|0;k=G[j>>2];if(!(L[(k<<3)+h>>3]<l)){d=a;break c}G[a>>2]=k;G[(G[j>>2]<<2)+e>>2]=c;c=b;if(i>>>0>1){continue}break}}G[d>>2]=g;G[(g<<2)+e>>2]=c;la=f+16|0;return}Y(ud()|0,1024,0);B()}function Wb(a,b,c){var d=0,e=0;a:{if(!c){break a}E[a|0]=b;d=a+c|0;E[d-1|0]=b;if(c>>>0<3){break a}E[a+2|0]=b;E[a+1|0]=b;E[d-3|0]=b;E[d-2|0]=b;if(c>>>0<7){break a}E[a+3|0]=b;E[d-4|0]=b;if(c>>>0<9){break a}d=0-a&3;e=d+a|0;a=M(b&255,16843009);G[e>>2]=a;c=c-d&-4;b=c+e|0;G[b-4>>2]=a;if(c>>>0<9){break a}G[e+8>>2]=a;G[e+4>>2]=a;G[b-8>>2]=a;G[b-12>>2]=a;if(c>>>0<25){break a}G[e+24>>2]=a;G[e+20>>2]=a;G[e+16>>2]=a;G[e+12>>2]=a;G[b-16>>2]=a;G[b-20>>2]=a;G[b-24>>2]=a;G[b-28>>2]=a;b=e&4|24;c=c-b|0;if(c>>>0<32){break a}a=Od(a,0,1,1);d=oa;b=b+e|0;while(1){G[b+24>>2]=a;G[b+28>>2]=d;G[b+16>>2]=a;G[b+20>>2]=d;G[b+8>>2]=a;G[b+12>>2]=d;G[b>>2]=a;G[b+4>>2]=d;b=b+32|0;c=c-32|0;if(c>>>0>31){continue}break}}}function dd(a){a=a|0;var b=0,c=0,d=0,e=0,f=0;if(a){b=a-4|0;f=G[b>>2];c=f;d=b;e=G[a-8>>2];a=e&-2;if((a|0)!=(e|0)){d=b-a|0;c=G[d+4>>2];e=G[d+8>>2];G[c+8>>2]=e;G[e+4>>2]=c;c=a+f|0}a=b+f|0;b=G[a>>2];if((b|0)!=G[(a+b|0)-4>>2]){f=G[a+4>>2];a=G[a+8>>2];G[f+8>>2]=a;G[a+4>>2]=f;c=b+c|0}G[d>>2]=c;G[((c&-4)+d|0)-4>>2]=c|1;b=G[d>>2]-8|0;a:{if(b>>>0<=127){a=(b>>>3|0)-1|0;break a}c=P(b);a=((b>>>29-c^4)-(c<<2)|0)+110|0;if(b>>>0<=4095){break a}a=((b>>>30-c^2)-(c<<1)|0)+71|0;a=a>>>0>=63?63:a}b=a<<4;G[d+4>>2]=b+25248;b=b+25256|0;G[d+8>>2]=G[b>>2];G[b>>2]=d;G[G[d+8>>2]+4>>2]=d;b=G[6570];c=G[6571];d=a&31;if((a&63)>>>0>=32){a=1<<d;e=0}else{e=1<<d;a=e-1&1>>>32-d}G[6570]=e|b;G[6571]=a|c}}function Fa(a,b){var c=0,d=0,e=0,f=0;a:{if(G[a+4>>2]<(b|0)){e=G[a+8>>2];b:{if((e|0)>=(b|0)){break b}d=(b-e|0)+1&-2;c=(e>>1&-2)+2|0;c=(c|0)<(d|0)?d:c;if((c|0)>(e^2147483647)){break a}c=c+e|0;G[a+8>>2]=c;c=ed(G[a>>2],c<<2);G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];c:{if((c|0)>=(b|0)){break c}d=c;e=b-c&3;if(e){while(1){G[G[a>>2]+(d<<2)>>2]=0;d=d+1|0;f=f+1|0;if((e|0)!=(f|0)){continue}break}}if(c-b>>>0>=4294967293){break c}while(1){c=d<<2;G[c+G[a>>2]>>2]=0;G[(c+G[a>>2]|0)+4>>2]=0;G[(c+G[a>>2]|0)+8>>2]=0;G[(c+G[a>>2]|0)+12>>2]=0;d=d+4|0;if((d|0)!=(b|0)){continue}break}}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function cb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0;a:{if(G[a+296>>2]<=(b|0)){break a}c=G[a+284>>2];g=b<<2;d=g+G[a+292>>2]|0;e=G[d>>2];if((c|0)>(e|0)){f=a+460|0;while(1){c=c-1|0;e=c<<2;d=G[e+G[a+280>>2]>>2]>>1;E[d+G[a+332>>2]|0]=H[14118];h=G[a+88>>2];b:{if((h|0)<=1){if((h|0)!=1|G[(G[a+292>>2]+(G[a+296>>2]<<2)|0)-4>>2]>=(c|0)){break b}}E[d+G[a+348>>2]|0]=E[e+G[a+280>>2]|0]&1}if(!(!H[d+G[a+380>>2]|0]|(d|0)<G[a+476>>2]&G[G[a+472>>2]+(d<<2)>>2]>=0)){Xa(f,d)}d=G[a+292>>2]+g|0;e=G[d>>2];if((e|0)<(c|0)){continue}break}c=G[a+284>>2]}G[a+512>>2]=e;f=c;c=G[d>>2];if((f|0)>(c|0)){G[a+284>>2]=c}if(G[a+296>>2]<=(b|0)){break a}G[a+296>>2]=b}}function Ua(a,b,c){var d=0,e=0,f=0,g=0;a:{if(G[a+4>>2]<(b|0)){d=G[a+8>>2];b:{if((d|0)>=(b|0)){break b}e=(b-d|0)+1&-2;f=(d>>1&-2)+2|0;e=(e|0)>(f|0)?e:f;if((e|0)>(d^2147483647)){break a}d=d+e|0;G[a+8>>2]=d;d=ed(G[a>>2],d);G[a>>2]=d;if(d){break b}if(G[3719]==48){break a}}d=G[a+4>>2];c:{if((d|0)>=(b|0)){break c}e=H[c|0];c=d;g=b-d&3;if(g){f=0;while(1){E[G[a>>2]+c|0]=e;c=c+1|0;f=f+1|0;if((g|0)!=(f|0)){continue}break}}if(d-b>>>0>=4294967293){break c}while(1){E[G[a>>2]+c|0]=e;E[(G[a>>2]+c|0)+1|0]=e;E[(G[a>>2]+c|0)+2|0]=e;E[(G[a>>2]+c|0)+3|0]=e;c=c+4|0;if((c|0)!=(b|0)){continue}break}}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function xb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0;a:{if(G[a+16>>2]>(b|0)){g=G[a+12>>2];j=g+(b<<2)|0;d=G[j>>2];if((d|0)>=0){break a}}ub(a,b);return}b=G[a>>2];h=G[b+(d<<2)>>2];b:{if(!d){d=0;break b}k=G[G[a+28>>2]>>2];l=k+(h<<3)|0;while(1){m=(d<<2)+b|0;e=G[l+4>>2];c=e;i=e>>31;e=G[l>>2];r=Od(c,i,e,e>>31);n=oa;o=d-1|0;e=o>>1;p=(e<<2)+b|0;q=G[p>>2];f=(q<<3)+k|0;c=G[f+4>>2];i=c;s=c>>31;c=G[f>>2];f=Od(i,s,c,c>>31);c=oa;if((c|0)==(n|0)&f>>>0<=r>>>0|c>>>0<n>>>0){b=m;break b}G[m>>2]=q;G[(G[p>>2]<<2)+g>>2]=d;d=e;if(o>>>0>1){continue}break}}G[b>>2]=h;G[(h<<2)+g>>2]=d;zb(a,G[j>>2])}function hd(a,b,c,d,e,f,g,h){var i=0,j=0,k=0,l=0;k=1;i=d&2147483647;j=i;l=(i|0)==2147418112;a:{if(l&!c?a|b:l&(c|0)!=0|i>>>0>2147418112){break a}i=h&2147483647;if(!g&(i|0)==2147418112?e|f:(i|0)==2147418112&(g|0)!=0|i>>>0>2147418112){break a}if(!(a|e|(c|g)|(b|f|(i|j)))){return 0}i=d&h;if((i|0)>0){j=1}else{j=(i|0)>=0}if(j){if((c|0)==(g|0)&(d|0)==(h|0)?(b|0)==(f|0)&a>>>0<e>>>0|b>>>0<f>>>0:c>>>0<g>>>0&(d|0)<=(h|0)|(d|0)<(h|0)){return-1}return(a^e|c^g|(b^f|d^h))!=0}if((c|0)==(g|0)&(d|0)==(h|0)?(b|0)==(f|0)&a>>>0>e>>>0|b>>>0>f>>>0:c>>>0>g>>>0&(d|0)>=(h|0)|(d|0)>(h|0)){return-1}k=(a^e|c^g|(b^f|d^h))!=0}return k}function Wa(a,b){var c=0,d=0,e=0,f=0;a:{if(G[a+4>>2]<(b|0)){e=G[a+8>>2];b:{if((e|0)>=(b|0)){break b}d=(b-e|0)+1&-2;c=(e>>1&-2)+2|0;c=(d|0)>(c|0)?d:c;if((c|0)>(e^2147483647)){break a}c=c+e|0;G[a+8>>2]=c;c=ed(G[a>>2],c);G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];c:{if((c|0)>=(b|0)){break c}d=c;e=b-c&3;if(e){while(1){E[G[a>>2]+d|0]=0;d=d+1|0;f=f+1|0;if((e|0)!=(f|0)){continue}break}}if(c-b>>>0>=4294967293){break c}while(1){E[G[a>>2]+d|0]=0;E[(G[a>>2]+d|0)+1|0]=0;E[(G[a>>2]+d|0)+2|0]=0;E[(G[a>>2]+d|0)+3|0]=0;d=d+4|0;if((d|0)!=(b|0)){continue}break}}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function Cd(a,b,c,d,e){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;if(wd(a,G[b+8>>2],e)){if(!(G[b+28>>2]==1|G[b+4>>2]!=(c|0))){G[b+28>>2]=d}return}a:{if(wd(a,G[b>>2],e)){if(!(G[b+16>>2]!=(c|0)&G[b+20>>2]!=(c|0))){if((d|0)!=1){break a}G[b+32>>2]=1;return}G[b+32>>2]=d;b:{if(G[b+44>>2]==4){break b}F[b+52>>1]=0;a=G[a+8>>2];pa[G[G[a>>2]+20>>2]](a,b,c,c,1,e);if(H[b+53|0]==1){G[b+44>>2]=3;if(!H[b+52|0]){break b}break a}G[b+44>>2]=4}G[b+20>>2]=c;G[b+40>>2]=G[b+40>>2]+1;if(G[b+36>>2]!=1|G[b+24>>2]!=2){break a}E[b+54|0]=1;return}a=G[a+8>>2];pa[G[G[a>>2]+24>>2]](a,b,c,d,e)}}function Pc(a,b,c,d,e){var f=0,g=0,h=0;f=la-208|0;la=f;G[f+204>>2]=c;c=f+160|0;Wb(c,0,40);G[f+200>>2]=G[f+204>>2];a:{if((Qc(0,b,f+200|0,f+80|0,c,d,e)|0)<0){break a}c=G[a+76>>2]<0;g=G[a>>2];G[a>>2]=g&-33;b:{c:{d:{if(!G[a+48>>2]){G[a+48>>2]=80;G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;h=G[a+44>>2];G[a+44>>2]=f;break d}if(G[a+16>>2]){break c}}if(gc(a)){break b}}Qc(a,b,f+200|0,f+80|0,f+160|0,d,e)}if(h){pa[G[a+36>>2]](a,0,0)|0;G[a+48>>2]=0;G[a+44>>2]=h;G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0}G[a>>2]=G[a>>2]|g&32;if(c){break a}}la=f+208|0}function Dc(a,b){var c=0,d=0,e=0;d=b;a:{b:{c:{b=b&255;if(b){if(a&3){while(1){c=H[a|0];if(!c|(b|0)==(c|0)){break a}a=a+1|0;if(a&3){continue}break}}c=G[a>>2];if(((c|16843008-c)&-2139062144)!=-2139062144){break c}e=M(b,16843009);while(1){b=c^e;if(((16843008-b|b)&-2139062144)!=-2139062144){break c}c=G[a+4>>2];b=a+4|0;a=b;if(((16843008-c|c)&-2139062144)==-2139062144){continue}break}break b}a=Fc(a)+a|0;break a}b=a}while(1){a=b;c=H[a|0];if(!c){break a}b=a+1|0;if((c|0)!=(d&255)){continue}break}}return H[a|0]==(d&255)?a:0}function nd(a,b,c,d,e,f){var g=0,h=0,i=0,j=0;a:{if(f&64){c=f+-64|0;b=c&31;if((c&63)>>>0>=32){c=0;b=e>>>b|0}else{c=e>>>b|0;b=((1<<b)-1&e)<<32-b|d>>>b}d=0;e=0;break a}if(!f){break a}i=d;h=64-f|0;g=h&31;if((h&63)>>>0>=32){h=d<<g;j=0}else{h=(1<<g)-1&i>>>32-g|e<<g;j=i<<g}i=b;b=f&31;if((f&63)>>>0>=32){g=0;b=c>>>b|0}else{g=c>>>b|0;b=((1<<b)-1&c)<<32-b|i>>>b}b=j|b;c=g|h;g=d;d=f&31;if((f&63)>>>0>=32){h=0;d=e>>>d|0}else{h=e>>>d|0;d=((1<<d)-1&e)<<32-d|g>>>d}e=h}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=d;G[a+12>>2]=e}function Zb(a){a=a|0;var b=0,c=0,d=0;if(!a){a=G[3516];if(a){b=Zb(a)}a=G[3478];if(a){b=Zb(a)|b}a=G[3735];if(a){while(1){if(G[a+20>>2]!=G[a+28>>2]){b=Zb(a)|b}a=G[a+56>>2];if(a){continue}break}}return b|0}d=G[a+76>>2]<0;a:{b:{if(G[a+20>>2]==G[a+28>>2]){break b}pa[G[a+36>>2]](a,0,0)|0;if(G[a+20>>2]){break b}b=-1;break a}b=G[a+8>>2];c=G[a+4>>2];if((b|0)!=(c|0)){b=c-b|0;pa[G[a+40>>2]](a,b,b>>31,1)|0}b=0;G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;G[a+4>>2]=0;G[a+8>>2]=0;if(d){break a}}return b|0}function Fb(a,b){var c=0,d=0;a:{c=G[a+4>>2];b:{if((c|0)!=G[a+8>>2]){d=G[a>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[a+8>>2]=c;d=ed(G[a>>2],c<<2);G[a>>2]=d;if(!d){break a}c=G[a+4>>2]}G[a+4>>2]=c+1;G[(c<<2)+d>>2]=b;c=G[a+4>>2];if((c|0)==G[a+8>>2]){b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break a}b=b+c|0;G[a+8>>2]=b;d=ed(d,b<<2);G[a>>2]=d;if(!d){break a}c=G[a+4>>2]}G[a+4>>2]=c+1;G[(c<<2)+d>>2]=1;return}Y(ud()|0,1024,0);B()}function gd(a,b,c,d,e,f){var g=0,h=0,i=0;a:{if(f&64){e=f+-64|0;f=b;d=e&31;if((e&63)>>>0>=32){e=f<<d;d=0}else{e=(1<<d)-1&f>>>32-d|c<<d;d=f<<d}b=0;c=0;break a}if(!f){break a}h=d;g=f&31;if((f&63)>>>0>=32){i=d<<g;h=0}else{i=(1<<g)-1&h>>>32-g|e<<g;h=h<<g}g=b;e=64-f|0;d=e&31;if((e&63)>>>0>=32){e=0;d=c>>>d|0}else{e=c>>>d|0;d=((1<<d)-1&c)<<32-d|g>>>d}d=h|d;e=e|i;h=b;g=f&31;if((f&63)>>>0>=32){i=b<<g;b=0}else{i=(1<<g)-1&h>>>32-g|c<<g;b=h<<g}c=i}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=d;G[a+12>>2]=e}function kd(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0;e=la-16|0;la=e;A(+b);d=v(1)|0;f=v(0)|0;j=d;c=d&1048575;d=d>>>20&2047;a:{if(d|0){if((d|0)!=2047|g){h=(c&15)<<28|f>>>4;i=c>>>4|0;g=d+15360|0;d=f<<28;c=0;break a}h=(c&15)<<28|f>>>4;i=c>>>4|0;g=32767;d=f<<28;c=0;break a}if(!(c|f)){d=0;c=0;break a}d=c;c=c?P(c):P(f)|32;gd(e,f,d,0,0,c+49|0);g=15372-c|0;h=G[e+8>>2];i=G[e+12>>2]^65536;d=G[e+4>>2];c=G[e>>2]}G[a>>2]=c;G[a+4>>2]=d;G[a+8>>2]=h;G[a+12>>2]=i|(j&-2147483648|g<<16);la=e+16|0}function cc(a,b,c){a=a|0;b=b|0;c=c|0;var d=0,e=0,f=0,g=0;e=la-32|0;la=e;G[e+16>>2]=b;d=G[a+48>>2];G[e+20>>2]=c-((d|0)!=0);g=G[a+44>>2];G[e+28>>2]=d;G[e+24>>2]=g;a:{b:{d=da(G[a+60>>2],e+16|0,2,e+12|0)|0;if(d){G[3719]=d;d=-1}else{d=0}if(d){b=32}else{d=G[e+12>>2];if((d|0)>0){break b}b=d?32:16}G[a>>2]=b|G[a>>2];break a}f=d;g=G[e+20>>2];if(g>>>0>=d>>>0){break a}f=G[a+44>>2];G[a+4>>2]=f;G[a+8>>2]=f+(d-g|0);if(G[a+48>>2]){G[a+4>>2]=f+1;E[(b+c|0)-1|0]=H[f|0]}f=c}la=e+32|0;return f|0}function lb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0;d=G[b>>2];e=H[a+16|0]|d>>>2&1;c=((e&1)+(d>>>5|0)|0)+1|0;Qa(a,c+G[a+4>>2]|0);d=G[a+4>>2];f=c+d|0;G[a+4>>2]=f;if(c>>>0<=f>>>0){c=0;a=G[a>>2]+(d<<2)|0;f=G[b>>2];G[a>>2]=f&-9|((e|0)!=0)<<3;if(J[b>>2]>=32){h=a+4|0;i=b+4|0;while(1){g=c<<2;G[g+h>>2]=G[i+g>>2];c=c+1|0;if(c>>>0<G[b>>2]>>>5>>>0){continue}break}}if(e){e=f>>>3&536870908;a=e+a|0;b=b+e|0;if(f&4){K[a+4>>2]=K[b+4>>2];return d}G[a+4>>2]=G[b+4>>2]}return d}Y(ud()|0,1024,0);B()}function _c(a,b){if(!a){return 0}a:{b:{if(a){if(b>>>0<=127){break b}c:{if(!G[G[3760]>>2]){if((b&-128)==57216){break b}break c}if(b>>>0<=2047){E[a+1|0]=b&63|128;E[a|0]=b>>>6|192;a=2;break a}if(!((b&-8192)!=57344&b>>>0>=55296)){E[a+2|0]=b&63|128;E[a|0]=b>>>12|224;E[a+1|0]=b>>>6&63|128;a=3;break a}if(b-65536>>>0<=1048575){E[a+3|0]=b&63|128;E[a|0]=b>>>18|240;E[a+2|0]=b>>>6&63|128;E[a+1|0]=b>>>12&63|128;a=4;break a}}G[3719]=25;a=-1}else{a=1}break a}E[a|0]=b;a=1}return a}function id(a,b,c,d,e){var f=0,g=0,h=0;h=-1;g=d&2147483647;f=(g|0)==2147418112;a:{if(f&!c?a|b:f&(c|0)!=0|g>>>0>2147418112){break a}f=e&2147483647;if(((f|0)==2147418112&0|f>>>0>2147418112)&(f|0)!=2147418112){break a}if(!(a|c|(f|g|b))){return 0}f=d&e;if((f|0)>0){f=1}else{f=(f|0)>=0}if(f){if(((c|0)!=0|(d|0)!=(e|0))&(d|0)<(e|0)){break a}return(a|c|(d^e|b))!=0}if(!c&(d|0)==(e|0)?a|b:(c|0)!=0&(d|0)>=(e|0)|(d|0)>(e|0)){break a}h=(a|c|(d^e|b))!=0}return h}
+function Ja(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;c=la-80|0;la=c;d=G[a+4>>2];G[c+68>>2]=G[a+16>>2];G[c+64>>2]=d;d=G[3076];fc(d,2299,c- -64|0);e=G[a+20>>2];a:{if((e|0)==-2147483648){nc(1907,4,1,d);break a}G[c+48>>2]=e;fc(d,2258,c+48|0)}nc(3737,4,1,d);e=G[a+24>>2];b:{if((e|0)==2147483647){nc(1370,4,1,d);break b}G[c+32>>2]=e;fc(d,2258,c+32|0)}G[c+16>>2]=G[a+28>>2];fc(d,5359,c+16|0);if(b){G[c>>2]=G[a+8>>2];fc(d,4471,c);ic(10,d)}la=c+80|0}function pd(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0;i=Od(b,c,h,i);h=oa;e=Od(d,e,f,g);i=e+i|0;d=oa+h|0;h=e>>>0>i>>>0?d+1|0:d;j=g;e=0;k=c;d=0;c=Od(g,e,c,d);g=c+i|0;i=oa+h|0;l=g;c=c>>>0>g>>>0?i+1|0:i;g=Od(f,0,b,0);h=oa;i=0;d=Od(f,i,k,d);h=h+d|0;f=oa+i|0;f=d>>>0>h>>>0?f+1|0:f;i=f+l|0;d=c;f=f>>>0>i>>>0?d+1|0:d;b=Od(b,m,j,e)+h|0;e=oa;e=b>>>0<h>>>0?e+1|0:e;h=e+i|0;i=f;G[a+8>>2]=h;G[a+12>>2]=e>>>0>h>>>0?i+1|0:i;G[a>>2]=g;G[a+4>>2]=b}function pc(a){var b=0,c=0,d=0,e=0;c=la-16|0;la=c;b=oc(a);if(b>>>0>=4294963201){G[3719]=0-b;b=-1}a:{if(!b|G[3719]!=52){break a}ga(4347);G[c+16>>2]=-1;G[c+20>>2]=-1;G[c+8>>2]=-1;G[c+12>>2]=-1;b=G[c+8>>2];d=b;e=(b|0)==-1;b=e;G[a>>2]=b?-1:d;G[a+4>>2]=b?-1:0;b=G[c+12>>2];d=(b|0)==-1;G[a+8>>2]=d?-1:b;G[a+12>>2]=d?-1:0;if(e){G[a>>2]=-1;G[a+4>>2]=-1}if((b|0)!=-1){break a}G[a+8>>2]=-1;G[a+12>>2]=-1}la=c+16|0}function mb(a){a=a|0;var b=0,c=0,d=0,e=0;b=la-32|0;la=b;c=G[a+556>>2];e=G[a+548>>2];G[b+16>>2]=0;G[b+20>>2]=0;G[b+8>>2]=0;G[b+12>>2]=0;d=b+8|0;Qa(d,e-c|0);E[b+24|0]=0;kb(a,d);if(G[a+44>>2]>=2){c=G[a+548>>2];G[b+4>>2]=G[b+12>>2]<<2;G[b>>2]=c<<2;tc(3879,b)}E[a+560|0]=H[b+24|0];c=G[a+544>>2];if(c){dd(c)}G[a+544>>2]=G[b+8>>2];G[a+548>>2]=G[b+12>>2];G[a+552>>2]=G[b+16>>2];G[a+556>>2]=G[b+20>>2];la=b+32|0}function mc(a,b,c){var d=0,e=0,f=0;d=G[c+16>>2];a:{if(!d){if(gc(c)){break a}d=G[c+16>>2]}e=G[c+20>>2];if(d-e>>>0<b>>>0){return pa[G[c+36>>2]](c,a,b)|0}b:{c:{if(!b|G[c+80>>2]<0){break c}d=b;while(1){f=a+d|0;if(H[f-1|0]!=10){d=d-1|0;if(d){continue}break c}break}e=pa[G[c+36>>2]](c,a,d)|0;if(e>>>0<d>>>0){break a}b=b-d|0;e=G[c+20>>2];break b}f=a;d=0}jc(e,f,b);G[c+20>>2]=G[c+20>>2]+b;e=b+d|0}return e}function ob(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0,g=0,h=0,i=0;c=la+-64|0;la=c;d=H[a+40|0];e=G[a+4>>2];f=G[a+16>>2];g=H[a+41|0];h=L[a+24>>3];i=L[a+32>>3];L[c+56>>3]=L[a+48>>3];L[c+40>>3]=i;L[c+32>>3]=h;G[c+48>>2]=g?93:41;G[c+20>>2]=f;G[c+16>>2]=e;G[c+24>>2]=d?91:40;d=G[3076];e=la-16|0;la=e;f=c+16|0;G[e+12>>2]=f;Pc(d,5255,f,33,0);la=e+16|0;if(b){G[c>>2]=G[a+8>>2];fc(d,4471,c);ic(10,d)}la=c- -64|0}function db(a,b){var c=0,d=0,e=0;e=la-16|0;la=e;E[e+15|0]=0;Ua(a,b+1|0,e+15|0);a:{c=G[a>>2]+b|0;if(!H[c|0]){E[c|0]=1;c=G[a+20>>2];b:{if((c|0)!=G[a+24>>2]){d=G[a+16>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[a+24>>2]=c;d=ed(G[a+16>>2],c<<2);G[a+16>>2]=d;if(!d){break a}c=G[a+20>>2]}G[a+20>>2]=c+1;G[(c<<2)+d>>2]=b}la=e+16|0;return}Y(ud()|0,1024,0);B()}function ic(a,b){var c=0,d=0;c=G[b+76>>2];if(!((c|0)>=0&(!c|G[3742]!=(c&1073741823)))){a:{d=a&255;if((d|0)==G[b+80>>2]){break a}c=G[b+20>>2];if((c|0)==G[b+16>>2]){break a}G[b+20>>2]=c+1;E[c|0]=a;return}hc(b,d);return}c=G[b+76>>2];G[b+76>>2]=c?c:1073741823;b:{c:{d=a&255;if((d|0)==G[b+80>>2]){break c}c=G[b+20>>2];if((c|0)==G[b+16>>2]){break c}G[b+20>>2]=c+1;E[c|0]=a;break b}hc(b,d)}G[b+76>>2]=0}function Ba(a,b,c,d,e){G[a+16>>2]=e;G[a+12>>2]=d;G[a+8>>2]=c;G[a+4>>2]=b;G[a>>2]=5664;if(!(E[14112]&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}a:{e=G[3526];b:{if((e|0)!=G[3527]){d=G[3525];break b}b=e>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(e^2147483647)>>>0){break a}b=b+e|0;G[3527]=b;d=ed(G[3525],b<<2);G[3525]=d;if(!d){break a}e=G[3526]}G[3526]=e+1;G[(e<<2)+d>>2]=a;return a}Y(ud()|0,1024,0);B()}function Ta(a,b){var c=0,d=0,e=0;a:{if(G[a+4>>2]<(b|0)){c=G[a+8>>2];b:{if((c|0)>=(b|0)){break b}d=(b-c|0)+1&-2;e=(c>>1&-2)+2|0;d=(d|0)>(e|0)?d:e;if((d|0)>(c^2147483647)){break a}c=c+d|0;G[a+8>>2]=c;c=ed(G[a>>2],M(c,12));G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];if((c|0)<(b|0)){Wb(G[a>>2]+M(c,12)|0,0,M(b-c|0,12))}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function qb(a,b){var c=0,d=0,e=0;a:{if(G[a+4>>2]<(b|0)){c=G[a+8>>2];b:{if((c|0)>=(b|0)){break b}d=(b-c|0)+1&-2;e=(c>>1&-2)+2|0;d=(d|0)>(e|0)?d:e;if((d|0)>(c^2147483647)){break a}c=c+d|0;G[a+8>>2]=c;c=ed(G[a>>2],c<<2);G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];if((c|0)<(b|0)){Wb(G[a>>2]+(c<<2)|0,0,b-c<<2)}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function Tb(a){a=a|0;var b=0,c=0,d=0,e=0;b=G[3718];d=G[b+628>>2];a:{if(!d){c=G[b+632>>2];break a}G[b+632>>2]=0}b:{if(G[b+636>>2]==(c|0)){e=c>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(c^2147483647)>>>0){break b}c=c+e|0;G[b+636>>2]=c;d=ed(d,c<<2);G[b+628>>2]=d;if(!d){break b}c=G[b+632>>2]}G[b+632>>2]=c+1;G[(c<<2)+d>>2]=a<<1|1;Ab(b,b+628|0);return}Y(ud()|0,1024,0);B()}function Dd(a,b,c,d,e){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;if(wd(a,G[b+8>>2],e)){if(!(G[b+28>>2]==1|G[b+4>>2]!=(c|0))){G[b+28>>2]=d}return}a:{if(!wd(a,G[b>>2],e)){break a}if(!(G[b+16>>2]!=(c|0)&G[b+20>>2]!=(c|0))){if((d|0)!=1){break a}G[b+32>>2]=1;return}G[b+20>>2]=c;G[b+32>>2]=d;G[b+40>>2]=G[b+40>>2]+1;if(!(G[b+36>>2]!=1|G[b+24>>2]!=2)){E[b+54|0]=1}G[b+44>>2]=4}}function Va(a,b){var c=0,d=0,e=0;a:{if(G[a+4>>2]<(b|0)){c=G[a+8>>2];b:{if((c|0)>=(b|0)){break b}d=(b-c|0)+1&-2;e=(c>>1&-2)+2|0;d=(d|0)>(e|0)?d:e;if((d|0)>(c^2147483647)){break a}c=c+d|0;G[a+8>>2]=c;c=ed(G[a>>2],c);G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];if((c|0)<(b|0)){Wb(c+G[a>>2]|0,0,b-c|0)}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function Ma(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;c=la-48|0;la=c;d=G[a+4>>2];G[c+36>>2]=d;G[c+32>>2]=d;d=G[3076];fc(d,1662,c+32|0);if((Fc(G[a+4>>2])&2147483647)!=16){while(1){ic(32,d);e=e+1|0;if(e>>>0<32-(Fc(G[a+4>>2])<<1)>>>0){continue}break}}ic(32,d);G[c+16>>2]=H[a+20|0]?1904:2033;fc(d,5240,c+16|0);if(b){G[c>>2]=G[a+8>>2];fc(d,4471,c);ic(10,d)}la=c+48|0}function Zc(a,b,c){a=a|0;b=b|0;c=c|0;var d=0,e=0,f=0,g=0,h=0;e=G[a+84>>2];f=G[e>>2];d=G[e+4>>2];h=G[a+28>>2];g=G[a+20>>2]-h|0;g=d>>>0<g>>>0?d:g;if(g){jc(f,h,g);f=g+G[e>>2]|0;G[e>>2]=f;d=G[e+4>>2]-g|0;G[e+4>>2]=d}d=c>>>0>d>>>0?d:c;if(d){jc(f,b,d);f=d+G[e>>2]|0;G[e>>2]=f;G[e+4>>2]=G[e+4>>2]-d}E[f|0]=0;b=G[a+44>>2];G[a+28>>2]=b;G[a+20>>2]=b;return c|0}function Bd(a,b,c,d){E[a+53|0]=1;a:{if(G[a+4>>2]!=(c|0)){break a}E[a+52|0]=1;c=G[a+16>>2];b:{if(!c){G[a+36>>2]=1;G[a+24>>2]=d;G[a+16>>2]=b;if((d|0)!=1){break a}if(G[a+48>>2]==1){break b}break a}if((b|0)==(c|0)){c=G[a+24>>2];if((c|0)==2){G[a+24>>2]=d;c=d}if(G[a+48>>2]!=1){break a}if((c|0)==1){break b}break a}G[a+36>>2]=G[a+36>>2]+1}E[a+54|0]=1}}function xc(a,b){var c=0,d=0,e=0,f=0;c=la-16|0;la=c;d=oc(0);a:{if((d|0)!=-52){a=d;if(a>>>0>=4294963201){G[3719]=0-a;a=-1}e=a;break a}d=G[b>>2];f=G[b+4>>2];G[c>>2]=!f&(d|0)==-1|f?-1:d;d=G[b+12>>2];b=G[b+8>>2];G[c+12>>2]=-1;G[c+8>>2]=a;G[c+4>>2]=!d&(b|0)==-1|d?-1:b;yc(c);a=G[c+12>>2];if(!a){break a}if((a|0)>0){G[3719]=a}e=-1}la=c+16|0;return e}function vc(){var a=0;a=G[3499];if(!((a|0)>=0&(!a|G[3742]!=(a&1073741823)))){a:{if(G[3500]==10){break a}a=G[3485];if((a|0)==G[3484]){break a}G[3485]=a+1;E[a|0]=10;return}hc(13920,10);return}a=G[3499];G[3499]=a?a:1073741823;b:{c:{if(G[3500]==10){break c}a=G[3485];if((a|0)==G[3484]){break c}G[3485]=a+1;E[a|0]=10;break b}hc(13920,10)}G[3499]=0}function kc(a,b){var c=0,d=0;c=G[b+72>>2];G[b+72>>2]=c-1|c;d=G[b+4>>2];c=G[b+8>>2];if((d|0)==(c|0)){c=65536}else{c=c-d|0;c=c>>>0>=65536?65536:c;jc(a,d,c);G[b+4>>2]=c+G[b+4>>2];a=a+c|0;c=65536-c|0}if(c){while(1){a:{if(!_b(b)){d=pa[G[b+32>>2]](b,a,c)|0;if(d){break a}}return 65536-c|0}a=a+d|0;c=c-d|0;if(c){continue}break}}return 65536}function qc(a){var b=0,c=0,d=0;c=la-16|0;la=c;ga(4514);b=a+16|0;Wb(b+8|0,0,144);G[b+24>>2]=4;G[b+16>>2]=3;G[b+20>>2]=0;G[b+8>>2]=2;G[b>>2]=1;G[b+4>>2]=0;jc(c,b,16);b=G[c>>2];d=G[c+4>>2];G[a+12>>2]=0;G[a+8>>2]=d;G[a>>2]=b;G[a+4>>2]=b>>31;b=G[c+8>>2];d=G[c+12>>2];G[a+28>>2]=0;G[a+24>>2]=d;G[a+16>>2]=b;G[a+20>>2]=b>>31;la=c+16|0}function Ic(a){var b=0;b=1;a:{if((a|0)>=1024){b=898846567431158e293;if(a>>>0<2047){a=a-1023|0;break a}b=Infinity;a=(a>>>0>=3069?3069:a)-2046|0;break a}if((a|0)>-1023){break a}b=2004168360008973e-307;if(a>>>0>4294965304){a=a+969|0;break a}b=0;a=(a>>>0<=4294964336?-2960:a)+1938|0}x(0,0);x(1,a+1023<<20);return b*+z()}function Ac(a,b,c){var d=0,e=0,f=0,g=0;f=la-16|0;la=f;G[f+12>>2]=c;d=la-160|0;la=d;g=d+8|0;jc(g,13360,144);G[d+52>>2]=a;G[d+28>>2]=a;e=-2-a|0;e=e>>>0>2147483647?2147483647:e;G[d+56>>2]=e;e=a+e|0;G[d+36>>2]=e;G[d+24>>2]=e;Pc(g,b,c,0,0);if((a|0)!=-2){a=G[d+28>>2];E[a-((a|0)==G[d+24>>2])|0]=0}la=d+160|0;la=f+16|0}function Fc(a){var b=0,c=0,d=0;a:{b:{b=a;if(!(b&3)){break b}if(!H[b|0]){return 0}while(1){b=b+1|0;if(!(b&3)){break b}if(H[b|0]){continue}break}break a}while(1){c=b;b=b+4|0;d=G[c>>2];if(((d|16843008-d)&-2139062144)==-2139062144){continue}break}while(1){b=c;c=b+1|0;if(H[b|0]){continue}break}}return b-a|0}function ld(a,b){var c=0,d=0,e=0,f=0;d=la-16|0;la=d;a:{if(!b){b=0;break a}c=b>>31;e=(c^b)-c|0;c=P(e);gd(d,e,0,0,0,c+81|0);e=0+G[d+8>>2]|0;c=(G[d+12>>2]^65536)+(16414-c<<16)|0;c=e>>>0<f>>>0?c+1|0:c;f=b&-2147483648|c;c=G[d+4>>2];b=G[d>>2]}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=e;G[a+12>>2]=f;la=d+16|0}function Uc(a,b,c){var d=0,e=0,f=0,g=0;a:{if(!b){d=b;break a}while(1){c=c-1|0;e=a;a=Pd(a,b,10);d=oa;f=c,g=e-Od(a,d,10,0)|48,E[f|0]=g;e=b>>>0>9;b=d;if(e){continue}break}}if(a|d){while(1){c=c-1|0;b=(a>>>0)/10|0;E[c|0]=a-M(b,10)|48;d=a>>>0>9;a=b;if(d){continue}break}}return c}function Qa(a,b){var c=0,d=0;a:{d=G[a+8>>2];if(d>>>0<b>>>0){c=d;b:{while(1){if(b>>>0<=c>>>0){break b}c=(((c>>>1)+(c>>>3)&-2)+c|0)+2|0;G[a+8>>2]=c;if(c>>>0>d>>>0){continue}break}break a}b=ed(G[a>>2],c<<2);if(!b&G[3719]==48){break a}G[a>>2]=b}return}Y(ud()|0,1024,0);B()}function md(a,b){var c=0,d=0,e=0,f=0;c=la-16|0;la=c;a:{if(!b){b=0;break a}d=b;b=P(b);gd(c,d,0,0,0,112-(b^31)|0);d=0+G[c+8>>2]|0;b=(G[c+12>>2]^65536)+(16414-b<<16)|0;f=e>>>0>d>>>0?b+1|0:b;e=G[c+4>>2];b=G[c>>2]}G[a>>2]=b;G[a+4>>2]=e;G[a+8>>2]=d;G[a+12>>2]=f;la=c+16|0}function hc(a,b){var c=0,d=0,e=0;d=la-16|0;la=d;E[d+15|0]=b;c=G[a+16>>2];a:{if(!c){if(gc(a)){break a}c=G[a+16>>2]}e=c;c=G[a+20>>2];if(!((e|0)==(c|0)|G[a+80>>2]==(b&255))){G[a+20>>2]=c+1;E[c|0]=b;break a}if((pa[G[a+36>>2]](a,d+15|0,1)|0)!=1){break a}}la=d+16|0}function _b(a){var b=0,c=0;b=G[a+72>>2];G[a+72>>2]=b-1|b;if(G[a+20>>2]!=G[a+28>>2]){pa[G[a+36>>2]](a,0,0)|0}G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;b=G[a>>2];if(b&4){G[a>>2]=b|32;return-1}c=G[a+44>>2]+G[a+48>>2]|0;G[a+8>>2]=c;G[a+4>>2]=c;return b<<27>>31}function Gc(a,b,c){var d=0,e=0,f=0,g=0;G[a+112>>2]=b;G[a+116>>2]=c;f=G[a+4>>2];d=G[a+44>>2]-f|0;G[a+120>>2]=d;G[a+124>>2]=d>>31;d=G[a+8>>2];a:{if(!(b|c)){break a}e=d-f|0;g=b>>>0>=e>>>0;e=e>>31;if(g&(e|0)<=(c|0)|(c|0)>(e|0)){break a}d=b+f|0}G[a+104>>2]=d}function yd(a,b,c){var d=0;d=G[a+36>>2];if(!d){G[a+24>>2]=c;G[a+16>>2]=b;G[a+36>>2]=1;G[a+20>>2]=G[a+56>>2];return}a:{if(!(G[a+20>>2]!=G[a+56>>2]|G[a+16>>2]!=(b|0))){if(G[a+24>>2]!=2){break a}G[a+24>>2]=c;return}E[a+54|0]=1;G[a+24>>2]=2;G[a+36>>2]=d+1}}function Oa(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;if(H[b|0]!=45){return 0}d=b+1|0;b=0;e=G[a+4>>2];c=H[e|0];if(c){while(1){if(H[b+d|0]!=(c|0)){return 0}b=b+1|0;c=H[e+b|0];if(c){continue}break}}b=b+d|0;if(H[b|0]==61){G[a+20>>2]=b+1;a=1}else{a=0}return a|0}function Sc(a){var b=0,c=0,d=0,e=0,f=0;d=G[a>>2];b=E[d|0]-48|0;if(b>>>0>9){return 0}while(1){e=-1;if(c>>>0<=214748364){c=M(c,10);e=(c^2147483647)>>>0<b>>>0?-1:c+b|0}b=d+1|0;G[a>>2]=b;f=E[d+1|0];c=e;d=b;b=f-48|0;if(b>>>0<10){continue}break}return c}function Oc(a,b){var c=0,d=0,e=0;A(+a);d=v(1)|0;e=v(0)|0;c=d>>>20&2047;if((c|0)!=2047){if(!c){if(a==0){c=0}else{a=Oc(a*0x10000000000000000,b);c=G[b>>2]+-64|0}G[b>>2]=c;return a}G[b>>2]=c-1022;x(0,e|0);x(1,d&-2146435073|1071644672);a=+z()}return a}function sc(a,b){var c=0,d=0,e=0,f=0;c=b>>>20&2047;e=0;a:{if(c>>>0<1023){break a}e=2;if(c>>>0>1075){break a}c=1075-c|0;d=c&31;if((c&63)>>>0>=32){c=1<<d;d=0}else{f=1<<d;c=f-1&1>>>32-d;d=f}f=d-1|0;e=0;if(a&f|b&c-!d){break a}e=a&d|b&c?1:2}return e}function zc(a,b){var c=0,d=0;c=la-288|0;la=c;Wb(c+12|0,0,136);G[c+140>>2]=268435456;G[c+8>>2]=b;b=c+8|0;d=c+148|0;a:{if(a>>>0>=65){G[3719]=28;break a}if(d){jc(d,M(a,140)+15088|0,140)}if(b){jc(M(a,140)+15088|0,b,140)}}la=c+288|0}function Od(a,b,c,d){var e=0,f=0,g=0,h=0,i=0,j=0;e=c>>>16|0;f=a>>>16|0;j=M(e,f);g=c&65535;h=a&65535;i=M(g,h);f=(i>>>16|0)+M(f,g)|0;e=(f&65535)+M(e,h)|0;oa=(M(b,c)+j|0)+M(a,d)+(f>>>16)+(e>>>16)|0;return i&65535|e<<16}function Vc(a,b,c,d,e){var f=0;f=la-256|0;la=f;if(!(e&73728|(c|0)<=(d|0))){d=c-d|0;c=d>>>0<256;Wb(f,b,c?d:256);if(!c){while(1){Rc(a,f,256);d=d-256|0;if(d>>>0>255){continue}break}}Rc(a,f,d)}la=f+256|0}function La(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;a:{if(H[b|0]!=45){break a}c=1;d=b+1|0;if(!(H[b+1|0]!=110|H[b+2|0]!=111)){c=H[b+3|0]!=45;d=c?d:b+4|0}if(Ec(d,G[a+4>>2])){break a}E[a+20|0]=c;e=1}return e|0}function ac(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;var e=0;e=la-16|0;la=e;a=ka(G[a+60>>2],b|0,c|0,d&255,e+8|0)|0;if(a){G[3719]=a;a=-1}else{a=0}la=e+16|0;oa=a?-1:G[e+12>>2];return(a?-1:G[e+8>>2])|0}function gc(a){var b=0;b=G[a+72>>2];G[a+72>>2]=b-1|b;b=G[a>>2];if(b&8){G[a>>2]=b|32;return-1}G[a+4>>2]=0;G[a+8>>2]=0;b=G[a+44>>2];G[a+28>>2]=b;G[a+20>>2]=b;G[a+16>>2]=b+G[a+48>>2];return 0}function Yc(a,b,c,d){a:{if(!a){break a}b:{switch(b+2|0){case 0:E[a|0]=c;return;case 1:F[a>>1]=c;return;case 2:case 3:G[a>>2]=c;return;case 5:break b;default:break a}}G[a>>2]=c;G[a+4>>2]=d}}function qd(a,b,c,d,e,f,g,h,i){var j=0;j=la-16|0;la=j;fd(j,b,c,d,e,f,g,h,i^-2147483648);d=G[j>>2];c=G[j+4>>2];b=G[j+12>>2];G[a+8>>2]=G[j+8>>2];G[a+12>>2]=b;G[a>>2]=d;G[a+4>>2]=c;la=j+16|0}function Sb(a){a=a|0;var b=0;b=G[3718];G[b+664>>2]=-1;G[b+668>>2]=-1;G[b+672>>2]=-1;G[b+676>>2]=-1;if(G[b+304>>2]){G[b+308>>2]=0}Fa(b+304|0,1);G[G[b+304>>2]>>2]=a<<1;return!(vb(b)&255)|0}function Pa(a,b){a=a|0;b=b|0;var c=0,d=0;c=la-32|0;la=c;d=G[a+4>>2];G[c+20>>2]=G[a+16>>2];G[c+16>>2]=d;d=G[3076];fc(d,4399,c+16|0);if(b){G[c>>2]=G[a+8>>2];fc(d,4471,c);ic(10,d)}la=c+32|0}function Ec(a,b){var c=0,d=0;c=H[a|0];d=H[b|0];a:{if(!c|(c|0)!=(d|0)){break a}while(1){d=H[b+1|0];c=H[a+1|0];if(!c){break a}b=b+1|0;a=a+1|0;if((c|0)==(d|0)){continue}break}}return c-d|0}function wc(a){var b=0;a:{b=a;a=Fc(a);if((nc(b,1,a,13920)|0)!=(a|0)){break a}b:{if(G[3500]==10){break b}a=G[3485];if((a|0)==G[3484]){break b}G[3485]=a+1;E[a|0]=10;break a}hc(13920,10)}}function Yb(a){var b=0,c=0;Zb(a);pa[G[a+12>>2]](a)|0;if(!(E[a|0]&1)){b=G[a+56>>2];c=G[a+52>>2];if(c){G[c+56>>2]=b}if(b){G[b+52>>2]=c}if(G[3735]==(a|0)){G[3735]=b}dd(G[a+96>>2]);dd(a)}}function ab(a,b){var c=0,d=0;c=b>>1;E[c+G[a+332>>2]|0]=b&1;d=G[a+296>>2];c=G[a+396>>2]+(c<<3)|0;G[c>>2]=-1;G[c+4>>2]=d;d=G[a+284>>2];G[a+284>>2]=d+1;G[G[a+280>>2]+(d<<2)>>2]=b}function Ed(a,b,c,d,e,f){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;f=f|0;if(wd(a,G[b+8>>2],f)){Bd(b,c,d,e);return}a=G[a+8>>2];pa[G[G[a>>2]+20>>2]](a,b,c,d,e,f)}function $b(a){var b=0,c=0;b=la-16|0;la=b;c=-1;a:{if(_b(a)){break a}if((pa[G[a+32>>2]](a,b+15|0,1)|0)!=1){break a}c=H[b+15|0]}la=b+16|0;return c}function nc(a,b,c,d){var e=0;e=M(b,c);a:{if(G[d+76>>2]<0){a=mc(a,e,d);break a}a=mc(a,e,d)}if((e|0)==(a|0)){return b?c:0}return(a>>>0)/(b>>>0)|0}function Pb(){var a=0;a=G[3718];G[a+664>>2]=-1;G[a+668>>2]=-1;G[a+672>>2]=-1;G[a+676>>2]=-1;if(G[a+304>>2]){G[a+308>>2]=0}return!(vb(a)&255)|0}function sd(){var a=0,b=0;while(1){a:{a=ad(936);if(a){break a}b=G[6572];if(!b){break a}pa[b|0]();continue}break}if(!a){td();B()}return a}function Xc(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;c=b;b=G[b>>2]+7&-8;G[c>>2]=b+16;d=a,e=rd(G[b>>2],G[b+4>>2],G[b+8>>2],G[b+12>>2]),L[d>>3]=e}function Ad(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;if(wd(a,G[b+8>>2],0)){yd(b,c,d);return}a=G[a+8>>2];pa[G[G[a>>2]+28>>2]](a,b,c,d)}function Nb(a){a=a|0;var b=0;if(G[3717]<(a|0)){while(1){tb(G[3718]);b=G[3717]+1|0;G[3717]=b;if((a|0)>(b|0)){continue}break}}}function vd(){var a=0,b=0;b=la-16|0;la=b;a=G[3076];nc(3725,11,1,a);G[b+12>>2]=0;Pc(a,3685,0,33,34);ic(10,a);td();B()}function Jc(a,b,c,d,e,f){G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=d;G[a+12>>2]=e&65535|(f>>>16&32768|(e&2147418112)>>>16)<<16}function wd(a,b,c){if(!c){return G[a+4>>2]==G[b+4>>2]}if((a|0)==(b|0)){return 1}return!Ec(G[a+4>>2],G[b+4>>2])}function Fd(a,b,c,d,e,f){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;f=f|0;if(wd(a,G[b+8>>2],f)){Bd(b,c,d,e)}}function Ca(a){a=a|0;vc();wc(3431);a=G[3524];if(G[a+44>>2]>0){jb(a);vc();wc(3431)}_(1);B()}function oc(a){ga(4689);if(a){G[a>>2]=-1;G[a+4>>2]=-1;G[a+8>>2]=-1;G[a+12>>2]=-1}return 0}function uc(a,b){var c=0;c=la-16|0;la=c;G[c+12>>2]=b;Pc(13920,a,b,33,0);la=c+16|0}function tc(a,b){var c=0;c=la-16|0;la=c;G[c+12>>2]=b;Pc(13920,a,b,0,0);la=c+16|0}function dc(a){a=a|0;a=ea(G[a+60>>2])|0;if(a){G[3719]=a;a=-1}else{a=0}return a|0}function fc(a,b,c){var d=0;d=la-16|0;la=d;G[d+12>>2]=c;Pc(a,b,c,0,0);la=d+16|0}function Nd(a,b,c,d,e){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;return pa[a|0](b,c,d,e)|0}function zd(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;if(wd(a,G[b+8>>2],0)){yd(b,c,d)}}function Ga(a){a=a|0;a=G[3525];if(a){G[3526]=0;dd(a);G[3527]=0;G[3525]=0}}function Mb(){var a=0;a=pb(sd());G[3718]=a;wb(a,1);tb(G[3718])}function Cc(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;oa=0;return 0}function yc(a){a=a|0;if(G[a+12>>2]<=0){G[a+12>>2]=0}}function Lb(a){a=a|0;if(a){pa[G[G[a>>2]+4>>2]](a)}}function Ld(a){a=a|0;a=la-a&-16;la=a;return a|0}function Rc(a,b,c){if(!(H[a|0]&32)){mc(b,c,a)}}function Qb(){return G[G[3718]+4>>2]+1|0}function Kb(){wc(3715);return pb(sd())|0}function Jb(a){zc(2,a);zc(15,a);zc(24,a)}function Ea(a){a=a|0;E[G[3524]+680|0]=1}function Vb(){return G[G[3718]+32>>2]}function Ub(){return G[G[3718]+36>>2]}function cd(a){a=a|0;return ad(a)|0}function ud(){return ad(81)+80|0}function Na(a){a=a|0;return a|0}function Gd(){na=91840;ma=26304}function sb(a){a=a|0;dd(rb(a))}function Sa(a){a=a|0;dd(Ra(a))}function Bc(a){a=a|0;return 0}function Rb(){return G[3717]}function Hd(){return la-ma|0}function Ha(a){a=a|0;dd(a)}function Md(){return la|0}function Kd(a){a=a|0;la=a}function Jd(){return ma|0}function Id(){return na|0}function Ka(a){a=a|0;B()}function td(){ia();B()}function Xb(a){a=a|0}
 // EMSCRIPTEN_END_FUNCS
-// (start of meteor/midamble.js)
-// This "midamble" is hacked into the output JS in a place
-// where it has access to the inner function generated
-// by Emscripten, the one that starts with "use asm".
-// NOTE: This doesn't work with minification on!
-/////setInnerMalloc = function (hookedMalloc) {
-/////  _malloc = hookedMalloc;
-/////};
-/////setInnerFree = function (hookedFree) {
-/////  _free = hookedFree;
-/////};
-// (end of meteor/midamble.js)
-var eb=[Je,Dd];var fb=[Ke,Kd,Jd,Ke];var gb=[Le,wb,yb,Ab,Db,Ib,Hb,bc,dc,zc,yc,Oc,rd,qd,yd,Bd,zd,Ad,Cd,zb,Rd,Le,Le,Le,Le,Le,Le,Le,Le,Le,Le,Le];var hb=[Me,Cb,Fb,fc];var ib=[Ne,sd];var jb=[Oe,Pe,Pd,Qd];var kb=[Qe,Md,Ld,Qe];var lb=[Re,Bb,Eb,ec];var mb=[Se,Fd,Gd,Se];return{_yo:$c,_strlen:me,_retireVar:id,_bitshift64Lshr:oe,_unyo:ad,_solve:ed,_bitshift64Shl:le,_getSolution:fd,___cxa_is_pointer_type:Od,_memset:ke,_getNumVars:gd,_memcpy:pe,_getConflictClauseSize:jd,_addClause:dd,_i64Subtract:je,_createTheSolver:bd,_realloc:Ud,_i64Add:ne,_solveAssuming:hd,___cxa_can_catch:Nd,_ensureVar:cd,_getConflictClause:kd,_free:Td,_malloc:Sd,__GLOBAL__I_a:cc,__GLOBAL__I_a127:Pc,runPostSets:ie,stackAlloc:nb,stackSave:ob,stackRestore:pb,setThrew:qb,setTempRet0:tb,getTempRet0:ub,dynCall_iiii:Ae,dynCall_viiiii:Be,dynCall_vi:Ce,dynCall_vii:De,dynCall_ii:Ee,dynCall_v:Fe,dynCall_viiiiii:Ge,dynCall_iii:He,dynCall_viiii:Ie}})
-
-
+e=H;p(q);var pa=c([null,Ca,Ea,Ga,Na,Ha,Ia,Ja,Ka,vd,Ha,La,Ma,Ha,Oa,Pa,Ra,Sa,mb,Ha,nb,ob,rb,sb,Gb,Ga,ac,bc,cc,dc,yc,Bc,Cc,Wc,Xc,Zc,Na,Ha,Xb,Xb,xd,Fd,Dd,zd,Ha,Ed,Cd,Ad]);function qa(){return D.byteLength/65536|0}function va(wa){wa=wa|0;var ra=qa()|0;var sa=ra+wa|0;if(ra<sa&&sa<65536){var ta=new ArrayBuffer(M(sa,65536));var ua=new Int8Array(ta);ua.set(E);E=new Int8Array(ta);F=new Int16Array(ta);G=new Int32Array(ta);H=new Uint8Array(ta);I=new Uint16Array(ta);J=new Uint32Array(ta);K=new Float32Array(ta);L=new Float64Array(ta);D=ta;e=H}return ra}return{memory:Object.create(Object.prototype,{grow:{value:va},buffer:{get:function(){return D}}}),__wasm_call_ctors:za,__main_argc_argv:Aa,malloc:cd,free:dd,__indirect_function_table:pa,yo:Kb,unyo:Lb,createTheSolver:Mb,ensureVar:Nb,addClause:Ob,solve:Pb,getSolution:Qb,getNumVars:Rb,solveAssuming:Sb,retireVar:Tb,getConflictClauseSize:Ub,getConflictClause:Vb,fflush:Zb,emscripten_stack_init:Gd,emscripten_stack_get_free:Hd,emscripten_stack_get_base:Id,emscripten_stack_get_end:Jd,_emscripten_stack_restore:Kd,_emscripten_stack_alloc:Ld,emscripten_stack_get_current:Md,dynCall_jiji:Nd}}return xa(ya)}
 // EMSCRIPTEN_END_ASM
-(Module.asmGlobalArg,Module.asmLibraryArg,buffer);var _yo=Module["_yo"]=asm["_yo"];var _strlen=Module["_strlen"]=asm["_strlen"];var _retireVar=Module["_retireVar"]=asm["_retireVar"];var _bitshift64Lshr=Module["_bitshift64Lshr"]=asm["_bitshift64Lshr"];var _unyo=Module["_unyo"]=asm["_unyo"];var _solve=Module["_solve"]=asm["_solve"];var _bitshift64Shl=Module["_bitshift64Shl"]=asm["_bitshift64Shl"];var _getSolution=Module["_getSolution"]=asm["_getSolution"];var ___cxa_is_pointer_type=Module["___cxa_is_pointer_type"]=asm["___cxa_is_pointer_type"];var _memset=Module["_memset"]=asm["_memset"];var _getNumVars=Module["_getNumVars"]=asm["_getNumVars"];var _memcpy=Module["_memcpy"]=asm["_memcpy"];var _getConflictClauseSize=Module["_getConflictClauseSize"]=asm["_getConflictClauseSize"];var _addClause=Module["_addClause"]=asm["_addClause"];var _i64Subtract=Module["_i64Subtract"]=asm["_i64Subtract"];var _createTheSolver=Module["_createTheSolver"]=asm["_createTheSolver"];var _realloc=Module["_realloc"]=asm["_realloc"];var _i64Add=Module["_i64Add"]=asm["_i64Add"];var _solveAssuming=Module["_solveAssuming"]=asm["_solveAssuming"];var ___cxa_can_catch=Module["___cxa_can_catch"]=asm["___cxa_can_catch"];var _ensureVar=Module["_ensureVar"]=asm["_ensureVar"];var _getConflictClause=Module["_getConflictClause"]=asm["_getConflictClause"];var _free=Module["_free"]=asm["_free"];var _malloc=Module["_malloc"]=asm["_malloc"];var __GLOBAL__I_a=Module["__GLOBAL__I_a"]=asm["__GLOBAL__I_a"];var __GLOBAL__I_a127=Module["__GLOBAL__I_a127"]=asm["__GLOBAL__I_a127"];var runPostSets=Module["runPostSets"]=asm["runPostSets"];var dynCall_iiii=Module["dynCall_iiii"]=asm["dynCall_iiii"];var dynCall_viiiii=Module["dynCall_viiiii"]=asm["dynCall_viiiii"];var dynCall_vi=Module["dynCall_vi"]=asm["dynCall_vi"];var dynCall_vii=Module["dynCall_vii"]=asm["dynCall_vii"];var dynCall_ii=Module["dynCall_ii"]=asm["dynCall_ii"];var dynCall_v=Module["dynCall_v"]=asm["dynCall_v"];var dynCall_viiiiii=Module["dynCall_viiiiii"]=asm["dynCall_viiiiii"];var dynCall_iii=Module["dynCall_iii"]=asm["dynCall_iii"];var dynCall_viiii=Module["dynCall_viiii"]=asm["dynCall_viiii"];Runtime.stackAlloc=asm["stackAlloc"];Runtime.stackSave=asm["stackSave"];Runtime.stackRestore=asm["stackRestore"];Runtime.setTempRet0=asm["setTempRet0"];Runtime.getTempRet0=asm["getTempRet0"];var i64Math=(function(){var goog={math:{}};goog.math.Long=(function(low,high){this.low_=low|0;this.high_=high|0});goog.math.Long.IntCache_={};goog.math.Long.fromInt=(function(value){if(-128<=value&&value<128){var cachedObj=goog.math.Long.IntCache_[value];if(cachedObj){return cachedObj}}var obj=new goog.math.Long(value|0,value<0?-1:0);if(-128<=value&&value<128){goog.math.Long.IntCache_[value]=obj}return obj});goog.math.Long.fromNumber=(function(value){if(isNaN(value)||!isFinite(value)){return goog.math.Long.ZERO}else if(value<=-goog.math.Long.TWO_PWR_63_DBL_){return goog.math.Long.MIN_VALUE}else if(value+1>=goog.math.Long.TWO_PWR_63_DBL_){return goog.math.Long.MAX_VALUE}else if(value<0){return goog.math.Long.fromNumber(-value).negate()}else{return new goog.math.Long(value%goog.math.Long.TWO_PWR_32_DBL_|0,value/goog.math.Long.TWO_PWR_32_DBL_|0)}});goog.math.Long.fromBits=(function(lowBits,highBits){return new goog.math.Long(lowBits,highBits)});goog.math.Long.fromString=(function(str,opt_radix){if(str.length==0){throw Error("number format error: empty string")}var radix=opt_radix||10;if(radix<2||36<radix){throw Error("radix out of range: "+radix)}if(str.charAt(0)=="-"){return goog.math.Long.fromString(str.substring(1),radix).negate()}else if(str.indexOf("-")>=0){throw Error('number format error: interior "-" character: '+str)}var radixToPower=goog.math.Long.fromNumber(Math.pow(radix,8));var result=goog.math.Long.ZERO;for(var i=0;i<str.length;i+=8){var size=Math.min(8,str.length-i);var value=parseInt(str.substring(i,i+size),radix);if(size<8){var power=goog.math.Long.fromNumber(Math.pow(radix,size));result=result.multiply(power).add(goog.math.Long.fromNumber(value))}else{result=result.multiply(radixToPower);result=result.add(goog.math.Long.fromNumber(value))}}return result});goog.math.Long.TWO_PWR_16_DBL_=1<<16;goog.math.Long.TWO_PWR_24_DBL_=1<<24;goog.math.Long.TWO_PWR_32_DBL_=goog.math.Long.TWO_PWR_16_DBL_*goog.math.Long.TWO_PWR_16_DBL_;goog.math.Long.TWO_PWR_31_DBL_=goog.math.Long.TWO_PWR_32_DBL_/2;goog.math.Long.TWO_PWR_48_DBL_=goog.math.Long.TWO_PWR_32_DBL_*goog.math.Long.TWO_PWR_16_DBL_;goog.math.Long.TWO_PWR_64_DBL_=goog.math.Long.TWO_PWR_32_DBL_*goog.math.Long.TWO_PWR_32_DBL_;goog.math.Long.TWO_PWR_63_DBL_=goog.math.Long.TWO_PWR_64_DBL_/2;goog.math.Long.ZERO=goog.math.Long.fromInt(0);goog.math.Long.ONE=goog.math.Long.fromInt(1);goog.math.Long.NEG_ONE=goog.math.Long.fromInt(-1);goog.math.Long.MAX_VALUE=goog.math.Long.fromBits(4294967295|0,2147483647|0);goog.math.Long.MIN_VALUE=goog.math.Long.fromBits(0,2147483648|0);goog.math.Long.TWO_PWR_24_=goog.math.Long.fromInt(1<<24);goog.math.Long.prototype.toInt=(function(){return this.low_});goog.math.Long.prototype.toNumber=(function(){return this.high_*goog.math.Long.TWO_PWR_32_DBL_+this.getLowBitsUnsigned()});goog.math.Long.prototype.toString=(function(opt_radix){var radix=opt_radix||10;if(radix<2||36<radix){throw Error("radix out of range: "+radix)}if(this.isZero()){return"0"}if(this.isNegative()){if(this.equals(goog.math.Long.MIN_VALUE)){var radixLong=goog.math.Long.fromNumber(radix);var div=this.div(radixLong);var rem=div.multiply(radixLong).subtract(this);return div.toString(radix)+rem.toInt().toString(radix)}else{return"-"+this.negate().toString(radix)}}var radixToPower=goog.math.Long.fromNumber(Math.pow(radix,6));var rem=this;var result="";while(true){var remDiv=rem.div(radixToPower);var intval=rem.subtract(remDiv.multiply(radixToPower)).toInt();var digits=intval.toString(radix);rem=remDiv;if(rem.isZero()){return digits+result}else{while(digits.length<6){digits="0"+digits}result=""+digits+result}}});goog.math.Long.prototype.getHighBits=(function(){return this.high_});goog.math.Long.prototype.getLowBits=(function(){return this.low_});goog.math.Long.prototype.getLowBitsUnsigned=(function(){return this.low_>=0?this.low_:goog.math.Long.TWO_PWR_32_DBL_+this.low_});goog.math.Long.prototype.getNumBitsAbs=(function(){if(this.isNegative()){if(this.equals(goog.math.Long.MIN_VALUE)){return 64}else{return this.negate().getNumBitsAbs()}}else{var val=this.high_!=0?this.high_:this.low_;for(var bit=31;bit>0;bit--){if((val&1<<bit)!=0){break}}return this.high_!=0?bit+33:bit+1}});goog.math.Long.prototype.isZero=(function(){return this.high_==0&&this.low_==0});goog.math.Long.prototype.isNegative=(function(){return this.high_<0});goog.math.Long.prototype.isOdd=(function(){return(this.low_&1)==1});goog.math.Long.prototype.equals=(function(other){return this.high_==other.high_&&this.low_==other.low_});goog.math.Long.prototype.notEquals=(function(other){return this.high_!=other.high_||this.low_!=other.low_});goog.math.Long.prototype.lessThan=(function(other){return this.compare(other)<0});goog.math.Long.prototype.lessThanOrEqual=(function(other){return this.compare(other)<=0});goog.math.Long.prototype.greaterThan=(function(other){return this.compare(other)>0});goog.math.Long.prototype.greaterThanOrEqual=(function(other){return this.compare(other)>=0});goog.math.Long.prototype.compare=(function(other){if(this.equals(other)){return 0}var thisNeg=this.isNegative();var otherNeg=other.isNegative();if(thisNeg&&!otherNeg){return-1}if(!thisNeg&&otherNeg){return 1}if(this.subtract(other).isNegative()){return-1}else{return 1}});goog.math.Long.prototype.negate=(function(){if(this.equals(goog.math.Long.MIN_VALUE)){return goog.math.Long.MIN_VALUE}else{return this.not().add(goog.math.Long.ONE)}});goog.math.Long.prototype.add=(function(other){var a48=this.high_>>>16;var a32=this.high_&65535;var a16=this.low_>>>16;var a00=this.low_&65535;var b48=other.high_>>>16;var b32=other.high_&65535;var b16=other.low_>>>16;var b00=other.low_&65535;var c48=0,c32=0,c16=0,c00=0;c00+=a00+b00;c16+=c00>>>16;c00&=65535;c16+=a16+b16;c32+=c16>>>16;c16&=65535;c32+=a32+b32;c48+=c32>>>16;c32&=65535;c48+=a48+b48;c48&=65535;return goog.math.Long.fromBits(c16<<16|c00,c48<<16|c32)});goog.math.Long.prototype.subtract=(function(other){return this.add(other.negate())});goog.math.Long.prototype.multiply=(function(other){if(this.isZero()){return goog.math.Long.ZERO}else if(other.isZero()){return goog.math.Long.ZERO}if(this.equals(goog.math.Long.MIN_VALUE)){return other.isOdd()?goog.math.Long.MIN_VALUE:goog.math.Long.ZERO}else if(other.equals(goog.math.Long.MIN_VALUE)){return this.isOdd()?goog.math.Long.MIN_VALUE:goog.math.Long.ZERO}if(this.isNegative()){if(other.isNegative()){return this.negate().multiply(other.negate())}else{return this.negate().multiply(other).negate()}}else if(other.isNegative()){return this.multiply(other.negate()).negate()}if(this.lessThan(goog.math.Long.TWO_PWR_24_)&&other.lessThan(goog.math.Long.TWO_PWR_24_)){return goog.math.Long.fromNumber(this.toNumber()*other.toNumber())}var a48=this.high_>>>16;var a32=this.high_&65535;var a16=this.low_>>>16;var a00=this.low_&65535;var b48=other.high_>>>16;var b32=other.high_&65535;var b16=other.low_>>>16;var b00=other.low_&65535;var c48=0,c32=0,c16=0,c00=0;c00+=a00*b00;c16+=c00>>>16;c00&=65535;c16+=a16*b00;c32+=c16>>>16;c16&=65535;c16+=a00*b16;c32+=c16>>>16;c16&=65535;c32+=a32*b00;c48+=c32>>>16;c32&=65535;c32+=a16*b16;c48+=c32>>>16;c32&=65535;c32+=a00*b32;c48+=c32>>>16;c32&=65535;c48+=a48*b00+a32*b16+a16*b32+a00*b48;c48&=65535;return goog.math.Long.fromBits(c16<<16|c00,c48<<16|c32)});goog.math.Long.prototype.div=(function(other){if(other.isZero()){throw Error("division by zero")}else if(this.isZero()){return goog.math.Long.ZERO}if(this.equals(goog.math.Long.MIN_VALUE)){if(other.equals(goog.math.Long.ONE)||other.equals(goog.math.Long.NEG_ONE)){return goog.math.Long.MIN_VALUE}else if(other.equals(goog.math.Long.MIN_VALUE)){return goog.math.Long.ONE}else{var halfThis=this.shiftRight(1);var approx=halfThis.div(other).shiftLeft(1);if(approx.equals(goog.math.Long.ZERO)){return other.isNegative()?goog.math.Long.ONE:goog.math.Long.NEG_ONE}else{var rem=this.subtract(other.multiply(approx));var result=approx.add(rem.div(other));return result}}}else if(other.equals(goog.math.Long.MIN_VALUE)){return goog.math.Long.ZERO}if(this.isNegative()){if(other.isNegative()){return this.negate().div(other.negate())}else{return this.negate().div(other).negate()}}else if(other.isNegative()){return this.div(other.negate()).negate()}var res=goog.math.Long.ZERO;var rem=this;while(rem.greaterThanOrEqual(other)){var approx=Math.max(1,Math.floor(rem.toNumber()/other.toNumber()));var log2=Math.ceil(Math.log(approx)/Math.LN2);var delta=log2<=48?1:Math.pow(2,log2-48);var approxRes=goog.math.Long.fromNumber(approx);var approxRem=approxRes.multiply(other);while(approxRem.isNegative()||approxRem.greaterThan(rem)){approx-=delta;approxRes=goog.math.Long.fromNumber(approx);approxRem=approxRes.multiply(other)}if(approxRes.isZero()){approxRes=goog.math.Long.ONE}res=res.add(approxRes);rem=rem.subtract(approxRem)}return res});goog.math.Long.prototype.modulo=(function(other){return this.subtract(this.div(other).multiply(other))});goog.math.Long.prototype.not=(function(){return goog.math.Long.fromBits(~this.low_,~this.high_)});goog.math.Long.prototype.and=(function(other){return goog.math.Long.fromBits(this.low_&other.low_,this.high_&other.high_)});goog.math.Long.prototype.or=(function(other){return goog.math.Long.fromBits(this.low_|other.low_,this.high_|other.high_)});goog.math.Long.prototype.xor=(function(other){return goog.math.Long.fromBits(this.low_^other.low_,this.high_^other.high_)});goog.math.Long.prototype.shiftLeft=(function(numBits){numBits&=63;if(numBits==0){return this}else{var low=this.low_;if(numBits<32){var high=this.high_;return goog.math.Long.fromBits(low<<numBits,high<<numBits|low>>>32-numBits)}else{return goog.math.Long.fromBits(0,low<<numBits-32)}}});goog.math.Long.prototype.shiftRight=(function(numBits){numBits&=63;if(numBits==0){return this}else{var high=this.high_;if(numBits<32){var low=this.low_;return goog.math.Long.fromBits(low>>>numBits|high<<32-numBits,high>>numBits)}else{return goog.math.Long.fromBits(high>>numBits-32,high>=0?0:-1)}}});goog.math.Long.prototype.shiftRightUnsigned=(function(numBits){numBits&=63;if(numBits==0){return this}else{var high=this.high_;if(numBits<32){var low=this.low_;return goog.math.Long.fromBits(low>>>numBits|high<<32-numBits,high>>>numBits)}else if(numBits==32){return goog.math.Long.fromBits(high,0)}else{return goog.math.Long.fromBits(high>>>numBits-32,0)}}});var navigator={appName:"Modern Browser"};var dbits;var canary=0xdeadbeefcafe;var j_lm=(canary&16777215)==15715070;function BigInteger(a,b,c){if(a!=null)if("number"==typeof a)this.fromNumber(a,b,c);else if(b==null&&"string"!=typeof a)this.fromString(a,256);else this.fromString(a,b)}function nbi(){return new BigInteger(null)}function am1(i,x,w,j,c,n){while(--n>=0){var v=x*this[i++]+w[j]+c;c=Math.floor(v/67108864);w[j++]=v&67108863}return c}function am2(i,x,w,j,c,n){var xl=x&32767,xh=x>>15;while(--n>=0){var l=this[i]&32767;var h=this[i++]>>15;var m=xh*l+h*xl;l=xl*l+((m&32767)<<15)+w[j]+(c&1073741823);c=(l>>>30)+(m>>>15)+xh*h+(c>>>30);w[j++]=l&1073741823}return c}function am3(i,x,w,j,c,n){var xl=x&16383,xh=x>>14;while(--n>=0){var l=this[i]&16383;var h=this[i++]>>14;var m=xh*l+h*xl;l=xl*l+((m&16383)<<14)+w[j]+c;c=(l>>28)+(m>>14)+xh*h;w[j++]=l&268435455}return c}if(j_lm&&navigator.appName=="Microsoft Internet Explorer"){BigInteger.prototype.am=am2;dbits=30}else if(j_lm&&navigator.appName!="Netscape"){BigInteger.prototype.am=am1;dbits=26}else{BigInteger.prototype.am=am3;dbits=28}BigInteger.prototype.DB=dbits;BigInteger.prototype.DM=(1<<dbits)-1;BigInteger.prototype.DV=1<<dbits;var BI_FP=52;BigInteger.prototype.FV=Math.pow(2,BI_FP);BigInteger.prototype.F1=BI_FP-dbits;BigInteger.prototype.F2=2*dbits-BI_FP;var BI_RM="0123456789abcdefghijklmnopqrstuvwxyz";var BI_RC=new Array;var rr,vv;rr="0".charCodeAt(0);for(vv=0;vv<=9;++vv)BI_RC[rr++]=vv;rr="a".charCodeAt(0);for(vv=10;vv<36;++vv)BI_RC[rr++]=vv;rr="A".charCodeAt(0);for(vv=10;vv<36;++vv)BI_RC[rr++]=vv;function int2char(n){return BI_RM.charAt(n)}function intAt(s,i){var c=BI_RC[s.charCodeAt(i)];return c==null?-1:c}function bnpCopyTo(r){for(var i=this.t-1;i>=0;--i)r[i]=this[i];r.t=this.t;r.s=this.s}function bnpFromInt(x){this.t=1;this.s=x<0?-1:0;if(x>0)this[0]=x;else if(x<-1)this[0]=x+DV;else this.t=0}function nbv(i){var r=nbi();r.fromInt(i);return r}function bnpFromString(s,b){var k;if(b==16)k=4;else if(b==8)k=3;else if(b==256)k=8;else if(b==2)k=1;else if(b==32)k=5;else if(b==4)k=2;else{this.fromRadix(s,b);return}this.t=0;this.s=0;var i=s.length,mi=false,sh=0;while(--i>=0){var x=k==8?s[i]&255:intAt(s,i);if(x<0){if(s.charAt(i)=="-")mi=true;continue}mi=false;if(sh==0)this[this.t++]=x;else if(sh+k>this.DB){this[this.t-1]|=(x&(1<<this.DB-sh)-1)<<sh;this[this.t++]=x>>this.DB-sh}else this[this.t-1]|=x<<sh;sh+=k;if(sh>=this.DB)sh-=this.DB}if(k==8&&(s[0]&128)!=0){this.s=-1;if(sh>0)this[this.t-1]|=(1<<this.DB-sh)-1<<sh}this.clamp();if(mi)BigInteger.ZERO.subTo(this,this)}function bnpClamp(){var c=this.s&this.DM;while(this.t>0&&this[this.t-1]==c)--this.t}function bnToString(b){if(this.s<0)return"-"+this.negate().toString(b);var k;if(b==16)k=4;else if(b==8)k=3;else if(b==2)k=1;else if(b==32)k=5;else if(b==4)k=2;else return this.toRadix(b);var km=(1<<k)-1,d,m=false,r="",i=this.t;var p=this.DB-i*this.DB%k;if(i-->0){if(p<this.DB&&(d=this[i]>>p)>0){m=true;r=int2char(d)}while(i>=0){if(p<k){d=(this[i]&(1<<p)-1)<<k-p;d|=this[--i]>>(p+=this.DB-k)}else{d=this[i]>>(p-=k)&km;if(p<=0){p+=this.DB;--i}}if(d>0)m=true;if(m)r+=int2char(d)}}return m?r:"0"}function bnNegate(){var r=nbi();BigInteger.ZERO.subTo(this,r);return r}function bnAbs(){return this.s<0?this.negate():this}function bnCompareTo(a){var r=this.s-a.s;if(r!=0)return r;var i=this.t;r=i-a.t;if(r!=0)return this.s<0?-r:r;while(--i>=0)if((r=this[i]-a[i])!=0)return r;return 0}function nbits(x){var r=1,t;if((t=x>>>16)!=0){x=t;r+=16}if((t=x>>8)!=0){x=t;r+=8}if((t=x>>4)!=0){x=t;r+=4}if((t=x>>2)!=0){x=t;r+=2}if((t=x>>1)!=0){x=t;r+=1}return r}function bnBitLength(){if(this.t<=0)return 0;return this.DB*(this.t-1)+nbits(this[this.t-1]^this.s&this.DM)}function bnpDLShiftTo(n,r){var i;for(i=this.t-1;i>=0;--i)r[i+n]=this[i];for(i=n-1;i>=0;--i)r[i]=0;r.t=this.t+n;r.s=this.s}function bnpDRShiftTo(n,r){for(var i=n;i<this.t;++i)r[i-n]=this[i];r.t=Math.max(this.t-n,0);r.s=this.s}function bnpLShiftTo(n,r){var bs=n%this.DB;var cbs=this.DB-bs;var bm=(1<<cbs)-1;var ds=Math.floor(n/this.DB),c=this.s<<bs&this.DM,i;for(i=this.t-1;i>=0;--i){r[i+ds+1]=this[i]>>cbs|c;c=(this[i]&bm)<<bs}for(i=ds-1;i>=0;--i)r[i]=0;r[ds]=c;r.t=this.t+ds+1;r.s=this.s;r.clamp()}function bnpRShiftTo(n,r){r.s=this.s;var ds=Math.floor(n/this.DB);if(ds>=this.t){r.t=0;return}var bs=n%this.DB;var cbs=this.DB-bs;var bm=(1<<bs)-1;r[0]=this[ds]>>bs;for(var i=ds+1;i<this.t;++i){r[i-ds-1]|=(this[i]&bm)<<cbs;r[i-ds]=this[i]>>bs}if(bs>0)r[this.t-ds-1]|=(this.s&bm)<<cbs;r.t=this.t-ds;r.clamp()}function bnpSubTo(a,r){var i=0,c=0,m=Math.min(a.t,this.t);while(i<m){c+=this[i]-a[i];r[i++]=c&this.DM;c>>=this.DB}if(a.t<this.t){c-=a.s;while(i<this.t){c+=this[i];r[i++]=c&this.DM;c>>=this.DB}c+=this.s}else{c+=this.s;while(i<a.t){c-=a[i];r[i++]=c&this.DM;c>>=this.DB}c-=a.s}r.s=c<0?-1:0;if(c<-1)r[i++]=this.DV+c;else if(c>0)r[i++]=c;r.t=i;r.clamp()}function bnpMultiplyTo(a,r){var x=this.abs(),y=a.abs();var i=x.t;r.t=i+y.t;while(--i>=0)r[i]=0;for(i=0;i<y.t;++i)r[i+x.t]=x.am(0,y[i],r,i,0,x.t);r.s=0;r.clamp();if(this.s!=a.s)BigInteger.ZERO.subTo(r,r)}function bnpSquareTo(r){var x=this.abs();var i=r.t=2*x.t;while(--i>=0)r[i]=0;for(i=0;i<x.t-1;++i){var c=x.am(i,x[i],r,2*i,0,1);if((r[i+x.t]+=x.am(i+1,2*x[i],r,2*i+1,c,x.t-i-1))>=x.DV){r[i+x.t]-=x.DV;r[i+x.t+1]=1}}if(r.t>0)r[r.t-1]+=x.am(i,x[i],r,2*i,0,1);r.s=0;r.clamp()}function bnpDivRemTo(m,q,r){var pm=m.abs();if(pm.t<=0)return;var pt=this.abs();if(pt.t<pm.t){if(q!=null)q.fromInt(0);if(r!=null)this.copyTo(r);return}if(r==null)r=nbi();var y=nbi(),ts=this.s,ms=m.s;var nsh=this.DB-nbits(pm[pm.t-1]);if(nsh>0){pm.lShiftTo(nsh,y);pt.lShiftTo(nsh,r)}else{pm.copyTo(y);pt.copyTo(r)}var ys=y.t;var y0=y[ys-1];if(y0==0)return;var yt=y0*(1<<this.F1)+(ys>1?y[ys-2]>>this.F2:0);var d1=this.FV/yt,d2=(1<<this.F1)/yt,e=1<<this.F2;var i=r.t,j=i-ys,t=q==null?nbi():q;y.dlShiftTo(j,t);if(r.compareTo(t)>=0){r[r.t++]=1;r.subTo(t,r)}BigInteger.ONE.dlShiftTo(ys,t);t.subTo(y,y);while(y.t<ys)y[y.t++]=0;while(--j>=0){var qd=r[--i]==y0?this.DM:Math.floor(r[i]*d1+(r[i-1]+e)*d2);if((r[i]+=y.am(0,qd,r,j,0,ys))<qd){y.dlShiftTo(j,t);r.subTo(t,r);while(r[i]<--qd)r.subTo(t,r)}}if(q!=null){r.drShiftTo(ys,q);if(ts!=ms)BigInteger.ZERO.subTo(q,q)}r.t=ys;r.clamp();if(nsh>0)r.rShiftTo(nsh,r);if(ts<0)BigInteger.ZERO.subTo(r,r)}function bnMod(a){var r=nbi();this.abs().divRemTo(a,null,r);if(this.s<0&&r.compareTo(BigInteger.ZERO)>0)a.subTo(r,r);return r}function Classic(m){this.m=m}function cConvert(x){if(x.s<0||x.compareTo(this.m)>=0)return x.mod(this.m);else return x}function cRevert(x){return x}function cReduce(x){x.divRemTo(this.m,null,x)}function cMulTo(x,y,r){x.multiplyTo(y,r);this.reduce(r)}function cSqrTo(x,r){x.squareTo(r);this.reduce(r)}Classic.prototype.convert=cConvert;Classic.prototype.revert=cRevert;Classic.prototype.reduce=cReduce;Classic.prototype.mulTo=cMulTo;Classic.prototype.sqrTo=cSqrTo;function bnpInvDigit(){if(this.t<1)return 0;var x=this[0];if((x&1)==0)return 0;var y=x&3;y=y*(2-(x&15)*y)&15;y=y*(2-(x&255)*y)&255;y=y*(2-((x&65535)*y&65535))&65535;y=y*(2-x*y%this.DV)%this.DV;return y>0?this.DV-y:-y}function Montgomery(m){this.m=m;this.mp=m.invDigit();this.mpl=this.mp&32767;this.mph=this.mp>>15;this.um=(1<<m.DB-15)-1;this.mt2=2*m.t}function montConvert(x){var r=nbi();x.abs().dlShiftTo(this.m.t,r);r.divRemTo(this.m,null,r);if(x.s<0&&r.compareTo(BigInteger.ZERO)>0)this.m.subTo(r,r);return r}function montRevert(x){var r=nbi();x.copyTo(r);this.reduce(r);return r}function montReduce(x){while(x.t<=this.mt2)x[x.t++]=0;for(var i=0;i<this.m.t;++i){var j=x[i]&32767;var u0=j*this.mpl+((j*this.mph+(x[i]>>15)*this.mpl&this.um)<<15)&x.DM;j=i+this.m.t;x[j]+=this.m.am(0,u0,x,i,0,this.m.t);while(x[j]>=x.DV){x[j]-=x.DV;x[++j]++}}x.clamp();x.drShiftTo(this.m.t,x);if(x.compareTo(this.m)>=0)x.subTo(this.m,x)}function montSqrTo(x,r){x.squareTo(r);this.reduce(r)}function montMulTo(x,y,r){x.multiplyTo(y,r);this.reduce(r)}Montgomery.prototype.convert=montConvert;Montgomery.prototype.revert=montRevert;Montgomery.prototype.reduce=montReduce;Montgomery.prototype.mulTo=montMulTo;Montgomery.prototype.sqrTo=montSqrTo;function bnpIsEven(){return(this.t>0?this[0]&1:this.s)==0}function bnpExp(e,z){if(e>4294967295||e<1)return BigInteger.ONE;var r=nbi(),r2=nbi(),g=z.convert(this),i=nbits(e)-1;g.copyTo(r);while(--i>=0){z.sqrTo(r,r2);if((e&1<<i)>0)z.mulTo(r2,g,r);else{var t=r;r=r2;r2=t}}return z.revert(r)}function bnModPowInt(e,m){var z;if(e<256||m.isEven())z=new Classic(m);else z=new Montgomery(m);return this.exp(e,z)}BigInteger.prototype.copyTo=bnpCopyTo;BigInteger.prototype.fromInt=bnpFromInt;BigInteger.prototype.fromString=bnpFromString;BigInteger.prototype.clamp=bnpClamp;BigInteger.prototype.dlShiftTo=bnpDLShiftTo;BigInteger.prototype.drShiftTo=bnpDRShiftTo;BigInteger.prototype.lShiftTo=bnpLShiftTo;BigInteger.prototype.rShiftTo=bnpRShiftTo;BigInteger.prototype.subTo=bnpSubTo;BigInteger.prototype.multiplyTo=bnpMultiplyTo;BigInteger.prototype.squareTo=bnpSquareTo;BigInteger.prototype.divRemTo=bnpDivRemTo;BigInteger.prototype.invDigit=bnpInvDigit;BigInteger.prototype.isEven=bnpIsEven;BigInteger.prototype.exp=bnpExp;BigInteger.prototype.toString=bnToString;BigInteger.prototype.negate=bnNegate;BigInteger.prototype.abs=bnAbs;BigInteger.prototype.compareTo=bnCompareTo;BigInteger.prototype.bitLength=bnBitLength;BigInteger.prototype.mod=bnMod;BigInteger.prototype.modPowInt=bnModPowInt;BigInteger.ZERO=nbv(0);BigInteger.ONE=nbv(1);function bnpFromRadix(s,b){this.fromInt(0);if(b==null)b=10;var cs=this.chunkSize(b);var d=Math.pow(b,cs),mi=false,j=0,w=0;for(var i=0;i<s.length;++i){var x=intAt(s,i);if(x<0){if(s.charAt(i)=="-"&&this.signum()==0)mi=true;continue}w=b*w+x;if(++j>=cs){this.dMultiply(d);this.dAddOffset(w,0);j=0;w=0}}if(j>0){this.dMultiply(Math.pow(b,j));this.dAddOffset(w,0)}if(mi)BigInteger.ZERO.subTo(this,this)}function bnpChunkSize(r){return Math.floor(Math.LN2*this.DB/Math.log(r))}function bnSigNum(){if(this.s<0)return-1;else if(this.t<=0||this.t==1&&this[0]<=0)return 0;else return 1}function bnpDMultiply(n){this[this.t]=this.am(0,n-1,this,0,0,this.t);++this.t;this.clamp()}function bnpDAddOffset(n,w){if(n==0)return;while(this.t<=w)this[this.t++]=0;this[w]+=n;while(this[w]>=this.DV){this[w]-=this.DV;if(++w>=this.t)this[this.t++]=0;++this[w]}}function bnpToRadix(b){if(b==null)b=10;if(this.signum()==0||b<2||b>36)return"0";var cs=this.chunkSize(b);var a=Math.pow(b,cs);var d=nbv(a),y=nbi(),z=nbi(),r="";this.divRemTo(d,y,z);while(y.signum()>0){r=(a+z.intValue()).toString(b).substr(1)+r;y.divRemTo(d,y,z)}return z.intValue().toString(b)+r}function bnIntValue(){if(this.s<0){if(this.t==1)return this[0]-this.DV;else if(this.t==0)return-1}else if(this.t==1)return this[0];else if(this.t==0)return 0;return(this[1]&(1<<32-this.DB)-1)<<this.DB|this[0]}function bnpAddTo(a,r){var i=0,c=0,m=Math.min(a.t,this.t);while(i<m){c+=this[i]+a[i];r[i++]=c&this.DM;c>>=this.DB}if(a.t<this.t){c+=a.s;while(i<this.t){c+=this[i];r[i++]=c&this.DM;c>>=this.DB}c+=this.s}else{c+=this.s;while(i<a.t){c+=a[i];r[i++]=c&this.DM;c>>=this.DB}c+=a.s}r.s=c<0?-1:0;if(c>0)r[i++]=c;else if(c<-1)r[i++]=this.DV+c;r.t=i;r.clamp()}BigInteger.prototype.fromRadix=bnpFromRadix;BigInteger.prototype.chunkSize=bnpChunkSize;BigInteger.prototype.signum=bnSigNum;BigInteger.prototype.dMultiply=bnpDMultiply;BigInteger.prototype.dAddOffset=bnpDAddOffset;BigInteger.prototype.toRadix=bnpToRadix;BigInteger.prototype.intValue=bnIntValue;BigInteger.prototype.addTo=bnpAddTo;var Wrapper={abs:(function(l,h){var x=new goog.math.Long(l,h);var ret;if(x.isNegative()){ret=x.negate()}else{ret=x}HEAP32[tempDoublePtr>>2]=ret.low_;HEAP32[tempDoublePtr+4>>2]=ret.high_}),ensureTemps:(function(){if(Wrapper.ensuredTemps)return;Wrapper.ensuredTemps=true;Wrapper.two32=new BigInteger;Wrapper.two32.fromString("4294967296",10);Wrapper.two64=new BigInteger;Wrapper.two64.fromString("18446744073709551616",10);Wrapper.temp1=new BigInteger;Wrapper.temp2=new BigInteger}),lh2bignum:(function(l,h){var a=new BigInteger;a.fromString(h.toString(),10);var b=new BigInteger;a.multiplyTo(Wrapper.two32,b);var c=new BigInteger;c.fromString(l.toString(),10);var d=new BigInteger;c.addTo(b,d);return d}),stringify:(function(l,h,unsigned){var ret=(new goog.math.Long(l,h)).toString();if(unsigned&&ret[0]=="-"){Wrapper.ensureTemps();var bignum=new BigInteger;bignum.fromString(ret,10);ret=new BigInteger;Wrapper.two64.addTo(bignum,ret);ret=ret.toString(10)}return ret}),fromString:(function(str,base,min,max,unsigned){Wrapper.ensureTemps();var bignum=new BigInteger;bignum.fromString(str,base);var bigmin=new BigInteger;bigmin.fromString(min,10);var bigmax=new BigInteger;bigmax.fromString(max,10);if(unsigned&&bignum.compareTo(BigInteger.ZERO)<0){var temp=new BigInteger;bignum.addTo(Wrapper.two64,temp);bignum=temp}var error=false;if(bignum.compareTo(bigmin)<0){bignum=bigmin;error=true}else if(bignum.compareTo(bigmax)>0){bignum=bigmax;error=true}var ret=goog.math.Long.fromString(bignum.toString());HEAP32[tempDoublePtr>>2]=ret.low_;HEAP32[tempDoublePtr+4>>2]=ret.high_;if(error)throw"range error"})};return Wrapper})();if(memoryInitializer){if(typeof Module["locateFile"]==="function"){memoryInitializer=Module["locateFile"](memoryInitializer)}else if(Module["memoryInitializerPrefixURL"]){memoryInitializer=Module["memoryInitializerPrefixURL"]+memoryInitializer}if(ENVIRONMENT_IS_NODE||ENVIRONMENT_IS_SHELL){var data=Module["readBinary"](memoryInitializer);HEAPU8.set(data,STATIC_BASE)}else{addRunDependency("memory initializer");Browser.asyncLoad(memoryInitializer,(function(data){HEAPU8.set(data,STATIC_BASE);removeRunDependency("memory initializer")}),(function(data){throw"could not load memory initializer "+memoryInitializer}))}}function ExitStatus(status){this.name="ExitStatus";this.message="Program terminated with exit("+status+")";this.status=status}ExitStatus.prototype=new Error;ExitStatus.prototype.constructor=ExitStatus;var initialStackTop;var preloadStartTime=null;var calledMain=false;dependenciesFulfilled=function runCaller(){if(!Module["calledRun"]&&shouldRunNow)run();if(!Module["calledRun"])dependenciesFulfilled=runCaller};Module["callMain"]=Module.callMain=function callMain(args){assert(runDependencies==0,"cannot call main when async dependencies remain! (listen on __ATMAIN__)");assert(__ATPRERUN__.length==0,"cannot call main when preRun functions remain to be called");args=args||[];ensureInitRuntime();var argc=args.length+1;function pad(){for(var i=0;i<4-1;i++){argv.push(0)}}var argv=[allocate(intArrayFromString(Module["thisProgram"]),"i8",ALLOC_NORMAL)];pad();for(var i=0;i<argc-1;i=i+1){argv.push(allocate(intArrayFromString(args[i]),"i8",ALLOC_NORMAL));pad()}argv.push(0);argv=allocate(argv,"i32",ALLOC_NORMAL);initialStackTop=STACKTOP;try{var ret=Module["_main"](argc,argv,0);exit(ret)}catch(e){if(e instanceof ExitStatus){return}else if(e=="SimulateInfiniteLoop"){Module["noExitRuntime"]=true;return}else{if(e&&typeof e==="object"&&e.stack)Module.printErr("exception thrown: "+[e,e.stack]);throw e}}finally{calledMain=true}};function run(args){args=args||Module["arguments"];if(preloadStartTime===null)preloadStartTime=Date.now();if(runDependencies>0){return}preRun();if(runDependencies>0)return;if(Module["calledRun"])return;function doRun(){if(Module["calledRun"])return;Module["calledRun"]=true;if(ABORT)return;ensureInitRuntime();preMain();if(ENVIRONMENT_IS_WEB&&preloadStartTime!==null){Module.printErr("pre-main prep time: "+(Date.now()-preloadStartTime)+" ms")}if(Module["_main"]&&shouldRunNow){Module["callMain"](args)}postRun()}if(Module["setStatus"]){Module["setStatus"]("Running...");setTimeout((function(){setTimeout((function(){Module["setStatus"]("")}),1);doRun()}),1)}else{doRun()}}Module["run"]=Module.run=run;function exit(status){if(Module["noExitRuntime"]){return}ABORT=true;EXITSTATUS=status;STACKTOP=initialStackTop;exitRuntime();if(ENVIRONMENT_IS_NODE){process["stdout"]["once"]("drain",(function(){process["exit"](status)}));console.log(" ");setTimeout((function(){process["exit"](status)}),500)}else if(ENVIRONMENT_IS_SHELL&&typeof quit==="function"){quit(status)}throw new ExitStatus(status)}Module["exit"]=Module.exit=exit;function abort(text){if(text){Module.print(text);Module.printErr(text)}ABORT=true;EXITSTATUS=1;var extra="\nIf this abort() is unexpected, build with -s ASSERTIONS=1 which can give more information.";throw"abort() at "+stackTrace()+extra}Module["abort"]=Module.abort=abort;if(Module["preInit"]){if(typeof Module["preInit"]=="function")Module["preInit"]=[Module["preInit"]];while(Module["preInit"].length>0){Module["preInit"].pop()()}}var shouldRunNow=true;if(Module["noInitialRun"]){shouldRunNow=false}run();var origMalloc=Module._malloc;var origFree=Module._free;var MEMSTATS={totalMemory:Module.HEAPU8.length,heapUsed:0};var MEMSTATS_DATA={pointerToSizeMap:{},getSizeOfPointer:(function(ptr){return MEMSTATS_DATA.pointerToSizeMap[ptr]})};Module.MEMSTATS=MEMSTATS;Module.MEMSTATS_DATA=MEMSTATS_DATA;var hookedMalloc=(function(size){var ptr=origMalloc(size);if(!ptr){return 0}MEMSTATS.heapUsed+=size;MEMSTATS_DATA.pointerToSizeMap[ptr]=size;return ptr});var hookedFree=(function(ptr){if(ptr){MEMSTATS.heapUsed-=MEMSTATS_DATA.getSizeOfPointer(ptr)||0;delete MEMSTATS_DATA.pointerToSizeMap[ptr]}return origFree(ptr)});Module._malloc=hookedMalloc;Module._free=hookedFree;_malloc=hookedMalloc;_free=hookedFree;var setInnerMalloc,setInnerFree;if(setInnerMalloc){setInnerMalloc(hookedMalloc);setInnerFree(hookedFree)}return module.exports});if(typeof module!=="undefined"){module.exports=C_MINISAT}
 
 
+)(a)}var ja=Error,WebAssembly={};w=[];"object"!=typeof WebAssembly&&u("no native wasm support detected");var x,y=!1;function p(a,b){a||l("Assertion failed"+(b?": "+b:""))}var z,A,B,ka,C,D,E,G;function la(){var a=x.buffer;c.HEAP8=z=new Int8Array(a);c.HEAP16=B=new Int16Array(a);c.HEAPU8=A=new Uint8Array(a);c.HEAPU16=ka=new Uint16Array(a);c.HEAP32=C=new Int32Array(a);c.HEAPU32=D=new Uint32Array(a);c.HEAPF32=E=new Float32Array(a);c.HEAPF64=G=new Float64Array(a)}let ma;(ma=global).performance??(ma.performance=require("perf_hooks").performance);p(!c.STACK_SIZE,"STACK_SIZE can no longer be set at runtime.  Use -sSTACK_SIZE at link time");p("undefined"!=typeof Int32Array&&"undefined"!==typeof Float64Array&&void 0!=Int32Array.prototype.subarray&&void 0!=Int32Array.prototype.set,"JS engine does not provide full typed array support");p(!c.wasmMemory,"Use of `wasmMemory` detected.  Use -sIMPORTED_MEMORY to define wasmMemory externally");p(!c.INITIAL_MEMORY,"Detected runtime INITIAL_MEMORY setting.  Use -sIMPORTED_MEMORY to define wasmMemory dynamically");function na(){var a=oa();p(0==(a&3));0==a&&(a+=4);D[a>>2]=34821223;D[a+4>>2]=2310721022;D[0]=1668509029}function H(){if(!y){var a=oa();0==a&&(a+=4);var b=D[a>>2],d=D[a+4>>2];34821223==b&&2310721022==d||l(`Stack overflow! Stack cookie has been overwritten at ${I(a)}, expected hex dwords 0x89BACDFE and 0x2135467, but received ${I(d)} ${I(b)}`);1668509029!=D[0]&&l("Runtime error: The application has corrupted its heap memory area (address zero)!")}}var pa=[],qa=[],ra=[],sa=!1;function ta(){var a=c.preRun.shift();pa.unshift(a)}p(Math.imul,"This browser does not support Math.imul(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.fround,"This browser does not support Math.fround(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.clz32,"This browser does not support Math.clz32(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.trunc,"This browser does not support Math.trunc(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");var J=0,K=null,M={},N=null;function ua(){var _c$monitorRunDependen;J++;(_c$monitorRunDependen=c.monitorRunDependencies)===null||_c$monitorRunDependen===void 0||_c$monitorRunDependen.call(c,J);p(!M["wasm-instantiate"]);M["wasm-instantiate"]=1;null===N&&"undefined"!=typeof setInterval&&(N=setInterval(()=>{if(y)clearInterval(N),N=null;else{var a=!1,b;for(b in M)a||(a=!0,u("still waiting on run dependencies:")),u(`dependency: ${b}`);a&&u("(end of list)")}},1e4))}function l(a){var _c$onAbort;(_c$onAbort=c.onAbort)===null||_c$onAbort===void 0||_c$onAbort.call(c,a);a="Aborted("+a+")";u(a);y=!0;a=new ja(a);f(a);throw a}function va(){l("Filesystem support (FS) was not included. The problem is that you are using files from JS, but files were not used from C/C++, so filesystem support was not auto-included. You can force-include filesystem support with -sFORCE_FILESYSTEM")}c.FS_createDataFile=function(){va()};c.FS_createPreloadedFile=function(){va()};var fa=a=>a.startsWith("file://");function O(a,b){return function(){p(sa,`native function \`${a}\` called before runtime initialization`);var e=P[a];p(e,`exported native function \`${a}\` not found`);p(arguments.length<=b,`native function \`${a}\` called with ${arguments.length} args but expects ${b}`);return e(...arguments)}}var Q;function wa(a){if(Q==Q&&w)new Uint8Array(w);else if(m)m(Q);else throw'sync fetching of the wasm failed: you can preload it to Module["wasmBinary"] manually, or emcc.py will do that for you when generating HTML (but not JS)';var b=new ha;return[new ia(a),b]}var xa=new Int16Array(1),ya=new Int8Array(xa.buffer);xa[0]=25459;if(115!==ya[0]||99!==ya[1])throw"Runtime error: expected the system to be little-endian! (Run with -sSUPPORT_BIG_ENDIAN to bypass)";if(c.ENVIRONMENT)throw Error("Module.ENVIRONMENT has been deprecated. To force the environment, use the ENVIRONMENT compile-time option (for example, -sENVIRONMENT=web or -sENVIRONMENT=node)");function v(a,b){Object.getOwnPropertyDescriptor(c,a)||Object.defineProperty(c,a,{configurable:!0,get(){l(`\`Module.${a}\` has been replaced by \`${b}\``+" (the initial value can be provided on Module, but after startup the value is only looked for on a local variable of that name)")}})}class za{constructor(a){_defineProperty(this,"name","ExitStatus");this.message=`Program terminated with exit(${a})`;this.status=a}}c.ExitStatus=za;var R=a=>{for(;0<a.length;)a.shift()(c)};c.callRuntimeCallbacks=R;c.getValue=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:"i8";b.endsWith("*")&&(b="*");switch(b){case"i1":return z[a];case"i8":return z[a];case"i16":return B[a>>1];case"i32":return C[a>>2];case"i64":l("to do getValue(i64) use WASM_BIGINT");case"float":return E[a>>2];case"double":return G[a>>3];case"*":return D[a>>2];default:l(`invalid type for getValue: ${b}`)}};var S=c.noExitRuntime||!0;c.noExitRuntime=S;var I=a=>{p("number"===typeof a);return"0x"+(a>>>0).toString(16).padStart(8,"0")};c.ptrToString=I;c.setValue=function(a,b){let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"i8";d.endsWith("*")&&(d="*");switch(d){case"i1":z[a]=b;break;case"i8":z[a]=b;break;case"i16":B[a>>1]=b;break;case"i32":C[a>>2]=b;break;case"i64":l("to do setValue(i64) use WASM_BIGINT");case"float":E[a>>2]=b;break;case"double":G[a>>3]=b;break;case"*":D[a>>2]=b;break;default:l(`invalid type for setValue: ${d}`)}};c.stackRestore=a=>Aa(a);c.stackSave=()=>Ba();var T=a=>{T.i||(T.i={});T.i[a]||(T.i[a]=1,u("warning: "+a))};c.warnOnce=T;var Ca="undefined"!=typeof TextDecoder?new TextDecoder:void 0;c.UTF8Decoder=Ca;var Da=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:0;let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:NaN;var e=b+d;for(d=b;a[d]&&!(d>=e);)++d;if(16<d-b&&a.buffer&&Ca)return Ca.decode(a.subarray(b,d));for(e="";b<d;){var g=a[b++];if(g&128){var k=a[b++]&63;if(192==(g&224))e+=String.fromCharCode((g&31)<<6|k);else{var h=a[b++]&63;224==(g&240)?g=(g&15)<<12|k<<6|h:(240!=(g&248)&&T("Invalid UTF-8 leading byte "+I(g)+" encountered when deserializing a UTF-8 string in wasm memory to a JS string!"),g=(g&7)<<18|k<<12|h<<6|a[b++]&63);65536>g?e+=String.fromCharCode(g):(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023))}}else e+=String.fromCharCode(g)}return e};c.UTF8ArrayToString=Da;var U=(a,b)=>{p("number"==typeof a,`UTF8ToString expects a number (got ${typeof a})`);return a?Da(A,a,b):""};c.UTF8ToString=U;var Ea=(a,b,d,e)=>l(`Assertion failed: ${U(a)}, at: `+[b?U(b):"unknown filename",d,e?U(e):"unknown function"]);c.___assert_fail=Ea;class Fa{constructor(a){this.h=a-24}}c.ExceptionInfo=Fa;var Ga=0;c.exceptionLast=Ga;var Ha=0;c.uncaughtExceptionCount=Ha;var Ia=(a,b,d)=>{var e=new Fa(a);D[e.h+16>>2]=0;D[e.h+4>>2]=b;D[e.h+8>>2]=d;Ga=a;Ha++;p(!1,"Exception thrown, but exception catching is not enabled. Compile with -sNO_DISABLE_EXCEPTION_CATCHING or -sEXCEPTION_CATCHING_ALLOWED=[..] to catch.")};c.___cxa_throw=Ia;var V={g:void 0,j(a){return U(a)}};c.SYSCALLS=V;function Ja(a,b,d){V.g=d;return 0}c.___syscall_fcntl64=Ja;function Ka(a,b,d){V.g=d;return 0}c.___syscall_ioctl=Ka;c.syscallGetVarargI=()=>{p(void 0!=V.g);var a=C[+V.g>>2];V.g+=4;return a};function La(a,b,d,e){V.g=e;l("it should not be possible to operate on streams when !SYSCALLS_REQUIRE_FILESYSTEM")}c.___syscall_openat=La;var Ma=()=>l("native code called abort()");c.__abort_js=Ma;var Na=(a,b,d)=>A.copyWithin(a,b,b+d);c.__emscripten_memcpy_js=Na;var Oa=a=>u(U(a));c._emscripten_err=Oa;c.getHeapMax=()=>2147483648;var Pa=(a,b)=>{p(b,"alignment argument is required");return Math.ceil(a/b)*b};c.alignMemory=Pa;var Qa=a=>{var b=x.buffer,d=(a-b.byteLength+65535)/65536|0;try{return x.grow(d),la(),1}catch(e){u(`growMemory: Attempted to grow heap from ${b.byteLength} bytes to ${a} bytes, but got error: ${e}`)}};c.growMemory=Qa;var Ra=a=>{var b=A.length;a>>>=0;p(a>b);if(2147483648<a)return u(`Cannot enlarge memory, requested ${a} bytes, but the limit is ${2147483648} bytes!`),!1;for(var d=1;4>=d;d*=2){var e=b*(1+.2/d);e=Math.min(e,a+100663296);e=Math.min(2147483648,Pa(Math.max(a,e),65536));if(Qa(e))return u("Warning: Enlarging memory arrays, this is not fast! "+[b,e]),!0}u(`Failed to grow the heap from ${b} bytes to ${e} bytes, not enough memory!`);return!1};c._emscripten_resize_heap=Ra;c.runtimeKeepaliveCounter=0;c.keepRuntimeAlive=()=>S||!1;var Sa=a=>{var _c$onExit;S||((_c$onExit=c.onExit)!==null&&_c$onExit!==void 0&&_c$onExit.call(c,a),y=!0);da(a,new za(a))};c._proc_exit=Sa;var Ua=(a,b)=>{Ta();S&&!b&&(b=`program exited (with status: ${a}), but keepRuntimeAlive() is set (counter=${0}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`,f(b),u(b));Sa(a)};c.exitJS=Ua;c._exit=Ua;var Va=()=>{l("fd_close called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_close=Va;var Wa=()=>{l("fd_read called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_read=Wa;var Xa=(a,b)=>{p(a==a>>>0||a==(a|0));p(b===(b|0));return b+2097152>>>0<4194305-!!a?(a>>>0)+4294967296*b:NaN};c.convertI32PairToI53Checked=Xa;function Ya(a,b,d){Xa(b,d);return 70}c._fd_seek=Ya;var W=[null,[],[]];c.printCharBuffers=W;var X=(a,b)=>{var d=W[a];p(d);0===b||10===b?((1===a?t:u)(Da(d)),d.length=0):d.push(b)};c.printChar=X;var $a=()=>{Za(0);W[1].length&&X(1,10);W[2].length&&X(2,10)};c.flush_NO_FILESYSTEM=$a;var ab=(a,b,d,e)=>{for(var g=0,k=0;k<d;k++){var h=D[b>>2],q=D[b+4>>2];b+=8;for(var F=0;F<q;F++)X(a,A[h+F]);g+=q}D[e>>2]=g;return 0};c._fd_write=ab;var bb=a=>{for(var b=0,d=0;d<a.length;++d){var e=a.charCodeAt(d);127>=e?b++:2047>=e?b+=2:55296<=e&&57343>=e?(b+=4,++d):b+=3}return b};c.lengthBytesUTF8=bb;var cb=(a,b,d,e)=>{p("string"===typeof a,`stringToUTF8Array expects a string (got ${typeof a})`);if(!(0<e))return 0;var g=d;e=d+e-1;for(var k=0;k<a.length;++k){var h=a.charCodeAt(k);if(55296<=h&&57343>=h){var q=a.charCodeAt(++k);h=65536+((h&1023)<<10)|q&1023}if(127>=h){if(d>=e)break;b[d++]=h}else{if(2047>=h){if(d+1>=e)break;b[d++]=192|h>>6}else{if(65535>=h){if(d+2>=e)break;b[d++]=224|h>>12}else{if(d+3>=e)break;1114111<h&&T("Invalid Unicode code point "+I(h)+" encountered when serializing a JS string to a UTF-8 string in wasm memory! (Valid unicode code points should be in range 0-0x10FFFF).");b[d++]=240|h>>18;b[d++]=128|h>>12&63}b[d++]=128|h>>6&63}b[d++]=128|h&63}}b[d]=0;return d-g};c.stringToUTF8Array=cb;var db=(a,b,d)=>{p("number"==typeof d,"stringToUTF8(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");return cb(a,A,b,d)};c.stringToUTF8=db;c.stackAlloc=a=>Y(a);var eb=a=>{var b=bb(a)+1,d=Y(b);db(a,d,b);return d};c.stringToUTF8OnStack=eb;var fb=a=>{var b=c["_"+a];p(b,"Cannot call unknown function "+a+", make sure it is exported");return b};c.getCFunc=fb;var gb=(a,b)=>{p(0<=a.length,"writeArrayToMemory array must have a length (should be an array or typed array)");z.set(a,b)};c.writeArrayToMemory=gb;var hb=(a,b,d,e)=>{var g={string:r=>{var L=0;null!==r&&void 0!==r&&0!==r&&(L=eb(r));return L},array:r=>{var L=Y(r.length);gb(r,L);return L}};a=fb(a);var k=[],h=0;p("array"!==b,'Return type should not be "array".');if(e)for(var q=0;q<e.length;q++){var F=g[d[q]];F?(0===h&&(h=Ba()),k[q]=F(e[q])):k[q]=e[q]}d=a(...k);return d=function(r){0!==h&&Aa(h);return"string"===b?U(r):"boolean"===b?!!r:r}(d)};c.ccall=hb;c.cwrap=(a,b,d,e)=>function(){for(var _len=arguments.length,g=new Array(_len),_key=0;_key<_len;_key++){g[_key]=arguments[_key]}return hb(a,b,d,g,e)};c.intArrayFromString=function(a,b,d){d=Array(0<d?d:bb(a)+1);a=cb(a,d,0,d.length);b&&(d.length=a);return d};c.intArrayToString=function(a){for(var b=[],d=0;d<a.length;d++){var e=a[d];255<e&&(p(!1,`Character code ${e} (${String.fromCharCode(e)}) at offset ${d} not in 0x00-0xFF.`),e&=255);b.push(String.fromCharCode(e))}return b.join("")};c.AsciiToString=a=>{for(var b="";;){var d=A[a++];if(!d)return b;b+=String.fromCharCode(d)}};var ib="undefined"!=typeof TextDecoder?new TextDecoder("utf-16le"):void 0;c.UTF16Decoder=ib;c.UTF16ToString=(a,b)=>{p(0==a%2,"Pointer passed to UTF16ToString must be aligned to two bytes!");var d=a>>1;for(var e=d+b/2;!(d>=e)&&ka[d];)++d;d<<=1;if(32<d-a&&ib)return ib.decode(A.subarray(a,d));d="";for(e=0;!(e>=b/2);++e){var g=B[a+2*e>>1];if(0==g)break;d+=String.fromCharCode(g)}return d};c.stringToUTF16=(a,b,d)=>{p(0==b%2,"Pointer passed to stringToUTF16 must be aligned to two bytes!");p("number"==typeof d,"stringToUTF16(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(2>d)return 0;d-=2;var e=b;d=d<2*a.length?d/2:a.length;for(var g=0;g<d;++g)B[b>>1]=a.charCodeAt(g),b+=2;B[b>>1]=0;return b-e};c.UTF32ToString=(a,b)=>{p(0==a%4,"Pointer passed to UTF32ToString must be aligned to four bytes!");for(var d=0,e="";!(d>=b/4);){var g=C[a+4*d>>2];if(0==g)break;++d;65536<=g?(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023)):e+=String.fromCharCode(g)}return e};c.stringToUTF32=(a,b,d)=>{p(0==b%4,"Pointer passed to stringToUTF32 must be aligned to four bytes!");p("number"==typeof d,"stringToUTF32(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(4>d)return 0;var e=b;d=e+d-4;for(var g=0;g<a.length;++g){var k=a.charCodeAt(g);if(55296<=k&&57343>=k){var h=a.charCodeAt(++g);k=65536+((k&1023)<<10)|h&1023}C[b>>2]=k;b+=4;if(b+4>d)break}C[b>>2]=0;return b-e};c.ALLOC_NORMAL=0;c.ALLOC_STACK=1;c.allocate=(a,b)=>{p("number"==typeof b,"allocate no longer takes a type argument");p("number"!=typeof a,"allocate no longer takes a number as arg0");b=1==b?Y(a.length):jb(a.length);a.subarray||a.slice||(a=new Uint8Array(a));A.set(a,b);return b};c.jsStackTrace=()=>Error().stack.toString();c.stackTrace=()=>{var a=Error().stack.toString();c.extraStackTrace&&(a+="\n"+c.extraStackTrace());return a};var kb={__assert_fail:Ea,__cxa_throw:Ia,__syscall_fcntl64:Ja,__syscall_ioctl:Ka,__syscall_openat:La,_abort_js:Ma,_emscripten_memcpy_js:Na,emscripten_err:Oa,emscripten_resize_heap:Ra,exit:Ua,fd_close:Va,fd_read:Wa,fd_seek:Ya,fd_write:ab,proc_exit:Sa},P=function(){function a(d){var _c$monitorRunDependen2;P=d.exports;x=P.memory;p(x,"memory not found in wasm exports");la();qa.unshift(P.__wasm_call_ctors);J--;(_c$monitorRunDependen2=c.monitorRunDependencies)===null||_c$monitorRunDependen2===void 0||_c$monitorRunDependen2.call(c,J);p(M["wasm-instantiate"]);delete M["wasm-instantiate"];0==J&&(null!==N&&(clearInterval(N),N=null),K&&(d=K,K=null,d()));return P}ua();var b={env:kb,wasi_snapshot_preview1:kb};if(c.instantiateWasm)try{return c.instantiateWasm(b,a)}catch(d){u(`Module.instantiateWasm callback failed with error: ${d}`),f(d)}Q??(Q="<<< WASM_BINARY_FILE >>>");b=wa(b);return a(b[0])}(),jb=c._malloc=O("malloc",1);c._free=O("free",1);c._yo=O("yo",0);c._unyo=O("unyo",1);c._createTheSolver=O("createTheSolver",0);c._ensureVar=O("ensureVar",1);c._addClause=O("addClause",1);c._solve=O("solve",0);c._getSolution=O("getSolution",0);c._getNumVars=O("getNumVars",0);c._solveAssuming=O("solveAssuming",1);c._retireVar=O("retireVar",1);c._getConflictClauseSize=O("getConflictClauseSize",0);c._getConflictClause=O("getConflictClause",0);var Za=O("fflush",1),lb=P.emscripten_stack_init,oa=P.emscripten_stack_get_end,Aa=P._emscripten_stack_restore,Y=P._emscripten_stack_alloc,Ba=P.emscripten_stack_get_current;c.dynCall_jiji=O("dynCall_jiji",5);var Z;K=function mb(){Z||nb();Z||(K=mb)};function nb(){function a(){if(!Z&&(Z=!0,c.calledRun=!0,!y)){var _c$onRuntimeInitializ;p(!sa);sa=!0;H();R(qa);aa(c);(_c$onRuntimeInitializ=c.onRuntimeInitialized)===null||_c$onRuntimeInitializ===void 0||_c$onRuntimeInitializ.call(c);p(!c._main,'compiled without a main, but one is present. if you added it from JS, use Module["onRuntimeInitialized"]');H();if(c.postRun)for("function"==typeof c.postRun&&(c.postRun=[c.postRun]);c.postRun.length;){var b=c.postRun.shift();ra.unshift(b)}R(ra)}}if(!(0<J)){lb();na();if(c.preRun)for("function"==typeof c.preRun&&(c.preRun=[c.preRun]);c.preRun.length;)ta();R(pa);0<J||(c.setStatus?(c.setStatus("Running..."),setTimeout(()=>{setTimeout(()=>c.setStatus(""),1);a()},1)):a(),H())}}function Ta(){var a=t,b=u,d=!1;t=u=()=>{d=!0};try{$a()}catch(e){}t=a;u=b;d&&(T("stdio streams had content in them that was not flushed. you should set EXIT_RUNTIME to 1 (see the Emscripten FAQ), or make sure to emit a newline when you printf etc."),T("(this may also be due to not including full filesystem support - try building with -sFORCE_FILESYSTEM)"))}if(c.preInit)for("function"==typeof c.preInit&&(c.preInit=[c.preInit]);0<c.preInit.length;)c.preInit.pop()();nb();moduleRtn=c;for(const a of Object.keys(c))a in moduleArg||Object.defineProperty(moduleArg,a,{configurable:!0,get(){l(`Access to module property ('${a}') is no longer possible via the module constructor argument; Instead, use the result of the module constructor.`)}});
 
 
+  return moduleRtn;
+}
+);
+})();
+if (typeof exports === 'object' && typeof module === 'object') {
+  module.exports = Module;
+  // This default export looks redundant, but it allows TS to import this
+  // commonjs style module.
+  module.exports.default = Module;
+} else if (typeof define === 'function' && define['amd'])
+  define([], () => Module);
diff --git a/packages/logic-solver/minisat_wrapper.js b/packages/logic-solver/minisat_wrapper.js
index 497e7fe563..913e845aa5 100644
--- a/packages/logic-solver/minisat_wrapper.js
+++ b/packages/logic-solver/minisat_wrapper.js
@@ -1,3 +1,4 @@
+import C_MINISAT from "./minisat.js"
 MiniSat = function () {
   // A MiniSat object wraps an instance of "native" MiniSat.  You can
   // have as many MiniSat objects as you want, and they are all
@@ -20,13 +21,13 @@ MiniSat = function () {
 
   this._native = {
     getStackPointer: function () {
-      return C.Runtime.stackSave();
+      return C.stackSave();
     },
     setStackPointer: function (ptr) {
-      C.Runtime.stackRestore(ptr);
+      C.stackRestore(ptr);
     },
     allocateBytes: function (len) {
-      return C.allocate(len, 'i8', C.ALLOC_STACK);
+      return C.stackAlloc(len);
     },
     pushString: function (str) {
       return this.allocateBytes(C.intArrayFromString(str));
@@ -66,11 +67,11 @@ MiniSat.prototype.addClause = function (terms) {
   Logic._assertIfEnabled(terms, Logic._isArrayWhere(Logic.isNumTerm));
   this._clauses.push(terms);
   return this._native.savingStack(function (native, C) {
-    var termsPtr = C.allocate((terms.length+1)*4, 'i32', C.ALLOC_STACK);
+    var termsPtr = C.stackAlloc((terms.length + 1) * 4);
     terms.forEach(function (t, i) {
-      C.setValue(termsPtr + i*4, t, 'i32');
+      C.setValue(termsPtr + i * 4, t, 'i32');
     });
-    C.setValue(termsPtr + terms.length*4, 0, 'i32'); // 0-terminate
+    C.setValue(termsPtr + terms.length * 4, 0, 'i32'); // 0-terminate
     return C._addClause(termsPtr) ? true : false;
   });
 };
@@ -94,7 +95,7 @@ MiniSat.prototype.getSolution = function () {
     // true, false, and undetermined.  It doesn't distinguish
     // between "false" and "undetermined" in solutions though
     // (I think it sets undetermined variables to false).
-    solution[i+1] = (C.getValue(solPtr+i, 'i8') === 0);
+    solution[i + 1] = (C.getValue(solPtr + i, 'i8') === 0);
   }
   return solution;
 };
@@ -114,7 +115,7 @@ MiniSat.prototype.getConflictClause = function () {
   var clausePtr = C._getConflictClause();
   var terms = [];
   for (var i = 0; i < numTerms; i++) {
-    var t = C.getValue(clausePtr + i*4, 'i32');
+    var t = C.getValue(clausePtr + i * 4, 'i32');
     var v = (t >>> 1);
     var s = (t & 1) ? -1 : 1;
     terms[i] = v * s;
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index c2be5d8b26..3a211a0eee 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '3.0.0',
+  version: '3.0.1',
 });
 
 Npm.depends({

From 1859048f29e3b04a4e9c21b2322c8e60d4ced431 Mon Sep 17 00:00:00 2001
From: Mike Cunneen <mike@appworkshop.net>
Date: Mon, 3 Feb 2025 11:27:33 +0800
Subject: [PATCH 1029/1140] perf(logic-solver): :zap: minisat.js 236KB => 116KB
 new minisat.js file, built from new meteor/minisat emscripten compiler
 optimizations, to reduce minisat.js file size from 236KB to 116KB .
 Recompiled minisat.js as at https://github.com/cunneen/minisat/commit/8dc794e

Related to #12902 :"Cannot enlarge memory arrays"
---
 packages/logic-solver/minisat.js | 39 ++++++++++++--------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/packages/logic-solver/minisat.js b/packages/logic-solver/minisat.js
index f0d5fcc947..105703d7dc 100644
--- a/packages/logic-solver/minisat.js
+++ b/packages/logic-solver/minisat.js
@@ -1,25 +1,25 @@
 // This file is generated by the meteor/minisat repo.
 // See that repo's README for instructions for building it.
 // (start of meteor/extern-preamble.js)
+// 
 // provide stubs or proxies for nodejs APIs referenced by emscripten.
-const proc = require('process');
-const perfHooks = require('perf_hooks');
-const nodever = proc.versions.node;
-const noderelease = { ...(proc.release) }
 // Put emscripten in "node mode" but don't give it the real `process`
-// object.  It does have access to `console`.
+// object.  
 // This is to avoid emscripten causing memory leaks.
-
+// It *does* have access to `console`.
 require = function (mod) {
   // mock 'fs' module
   if (mod === 'fs') {
     return {
       readFileSync: function (filename) {
+        throw new Error(`github.com/meteor/minisat: meteor > extern-preamble.js > require > readFileSync not implemented`);
         ; // no-op
       }
     };
   } else if (mod === 'perf_hooks') {
-    return perfHooks;
+    return {
+      now: () => Date.now()
+    };
   }
 };
 const process = {
@@ -36,14 +36,15 @@ const process = {
     }
   },
   versions: {
-    node: nodever
+    "node": "14.21.3"
   },
-  release: noderelease,
-  exit: proc.exit
+  release: {
+    "name": "node",
+  },
+  exit: (code) => { console?.error(`github.com/meteor/minisat meteor > extern-preamble.js > process > exit not implemented.`); }
 };
-var window = 0;
+const window = 0;
 // (end of meteor/extern-preamble.js)
-
 var Module = (() => {
   var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
   if (typeof __filename != 'undefined') _scriptName = _scriptName || __filename;
@@ -51,19 +52,7 @@ var Module = (() => {
 function(moduleArg = {}) {
   var moduleRtn;
 
-function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==typeof i?i:i+""}function _toPrimitive(t,r){if("object"!=typeof t||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=typeof i)return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}var c=moduleArg,aa,f,ba=new Promise((a,b)=>{aa=a;f=b});"_addClause _createTheSolver _ensureVar _free _getConflictClause _getConflictClauseSize _getNumVars _getSolution _malloc _retireVar _solve _solveAssuming _unyo _yo allocate ccall cwrap UTF8ToString stringToUTF8 UTF16ToString stringToUTF16 UTF32ToString stringToUTF32 AsciiToString intArrayFromString intArrayToString writeArrayToMemory stackTrace stackSave stackAlloc stackRestore getValue setValue _memory ___indirect_function_table ___em_lib_deps_deps onRuntimeInitialized".split(" ").forEach(a=>{Object.getOwnPropertyDescriptor(ba,a)||Object.defineProperty(ba,a,{get:()=>l("You are getting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js"),set:()=>l("You are setting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js")})});var ca=Object.assign({},c),da=(a,b)=>{throw b},m;if("undefined"==typeof process||!process.release||"node"!==process.release.name)throw Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)");var ea=process.versions.node,n=ea.split(".").slice(0,3);n=1e4*n[0]+100*n[1]+1*n[2].split("-")[0];if(14e4>n)throw Error("This emscripten-generated code requires node v14.0.0 (detected v"+ea+")");var fs=require("fs");require("path");m=a=>{a=fa(a)?new URL(a):a;a=fs.readFileSync(a);p(Buffer.isBuffer(a));return a};process.argv.slice(2);da=(a,b)=>{process.exitCode=a;throw b};var t=c.print||console.log.bind(console),u=c.printErr||console.error.bind(console);Object.assign(c,ca);ca=null;Object.getOwnPropertyDescriptor(c,"fetchSettings")&&l("`Module.fetchSettings` was supplied but `fetchSettings` not included in INCOMING_MODULE_JS_API");v("arguments","arguments_");v("thisProgram","thisProgram");p("undefined"==typeof c.memoryInitializerPrefixURL,"Module.memoryInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.pthreadMainPrefixURL,"Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.cdInitializerPrefixURL,"Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.filePackagePrefixURL,"Module.filePackagePrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.read,"Module.read option was removed");p("undefined"==typeof c.readAsync,"Module.readAsync option was removed (modify readAsync in JS)");p("undefined"==typeof c.readBinary,"Module.readBinary option was removed (modify readBinary in JS)");p("undefined"==typeof c.setWindowTitle,"Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)");p("undefined"==typeof c.TOTAL_MEMORY,"Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY");v("asm","wasmExports");v("readAsync","readAsync");v("readBinary","readBinary");v("setWindowTitle","setWindowTitle");p(!0,"web environment detected but not enabled at build time.  Add `web` to `-sENVIRONMENT` to enable.");p(!0,"worker environment detected but not enabled at build time.  Add `worker` to `-sENVIRONMENT` to enable.");p(!0,"shell environment detected but not enabled at build time.  Add `shell` to `-sENVIRONMENT` to enable.");var w=c.wasmBinary;v("wasmBinary","wasmBinary");function ha(){}function ia(a){this.exports=(
-// EMSCRIPTEN_START_ASM
-function instantiate(ya){function c(d){d.set=function(a,b){this[a]=b};d.get=function(a){return this[a]};return d}var e;var f=new Uint8Array(123);for(var a=25;a>=0;--a){f[48+a]=52+a;f[65+a]=a;f[97+a]=26+a}f[43]=62;f[47]=63;function l(m,n,o){var g,h,a=0,i=n,j=o.length,k=n+(j*3>>2)-(o[j-2]=="=")-(o[j-1]=="=");for(;a<j;a+=4){g=f[o.charCodeAt(a+1)];h=f[o.charCodeAt(a+2)];m[i++]=f[o.charCodeAt(a)]<<2|g>>4;if(i<k)m[i++]=g<<4|h>>2;if(i<k)m[i++]=h<<6|f[o.charCodeAt(a+3)]}}function p(q){l(e,1024,"KDUAAAgEAABON01pbmlzYXQyME91dE9mTWVtb3J5RXhjZXB0aW9uRQB8IENvbmZsaWN0cyB8ICAgICAgICAgIE9SSUdJTkFMICAgICAgICAgfCAgICAgICAgICBMRUFSTlQgICAgICAgICAgfCBQcm9ncmVzcyB8AHwgICAgICAgICAgIHwgICAgVmFycyAgQ2xhdXNlcyBMaXRlcmFscyB8ICAgIExpbWl0ICBDbGF1c2VzIExpdC9DbCB8ICAgICAgICAgIHwAfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfABSYW5kb21pemUgdGhlIGluaXRpYWwgYWN0aXZpdHkAaW5maW5pdHkAbHVieQB2YXItZGVjYXkAY2xhLWRlY2F5AGltYXgALSsgICAwWDB4AC0wWCswWCAwWC0weCsweCAweABncm93AHJmaXJzdABybmQtaW5pdABWYXJpYWJsZXMgYXJlIG5vdCBlbGltaW5hdGVkIGlmIGl0IHByb2R1Y2VzIGEgcmVzb2x2ZW50IHdpdGggYSBsZW5ndGggYWJvdmUgdGhpcyBsaW1pdC4gLTEgbWVhbnMgbm8gbGltaXQATWluaW11bSBsZWFybnQgY2xhdXNlIGxpbWl0AHN0cmljdAAvcHJvYy8lZC9zdGF0dXMAbWluLWxlYXJudHMAUEFSU0UgRVJST1IhIERJTUFDUyBoZWFkZXIgbWlzbWF0Y2g6IHdyb25nIG51bWJlciBvZiBjbGF1c2VzAGRpbWFjcwAgIC0lcywgLW5vLSVzAHdyAFRoZSBjbGF1c2UgYWN0aXZpdHkgZGVjYXkgZmFjdG9yAFRoZSB2YXJpYWJsZSBhY3Rpdml0eSBkZWNheSBmYWN0b3IAUmVzdGFydCBpbnRlcnZhbCBpbmNyZWFzZSBmYWN0b3IAcm5kLWZyZXEALi4vLi4vLi4vc3lzdGVtL2xpYi9saWJjeHhhYmkvc3JjL3ByaXZhdGVfdHlwZWluZm8uY3BwAFVzZWQgYnkgdGhlIHJhbmRvbSB2YXJpYWJsZSBzZWxlY3Rpb24AU29sdmVkIGJ5IHNpbXBsaWZpY2F0aW9uAGltaW4AbmFuAC9wcm9jLyVkL3N0YXRtAGFzeW1tAGVsaW0AY3B1LWxpbQBtZW0tbGltAGNsLWxpbQBzdWItbGltAFRoZSBiYXNlIHJlc3RhcnQgaW50ZXJ2YWwAcmNoZWNrAGNhbl9jYXRjaABwaGFzZS1zYXZpbmcAaW5mAG9mZgBzb2x2ZQBwcmUAVGhlIGZyZXF1ZW5jeSB3aXRoIHdoaWNoIHRoZSBkZWNpc2lvbiBoZXVyaXN0aWMgdHJpZXMgdG8gY2hvb3NlIGEgcmFuZG9tIHZhcmlhYmxlAGNjbWluLW1vZGUAVXNlIHRoZSBMdWJ5IHJlc3RhcnQgc2VxdWVuY2UAVGhlIGZyYWN0aW9uIG9mIHdhc3RlZCBtZW1vcnkgYWxsb3dlZCBiZWZvcmUgYSBnYXJiYWdlIGNvbGxlY3Rpb24gaXMgdHJpZ2dlcmVkAHJuZC1zZWVkACU0ZAAlcyVzJWQAcmluYwBzaW1wLWdjLWZyYWMAd2IAdmVyYgByd2EAICAtJS0xMnMgPSAlLThzIFsAU0lNUABNQUlOAE5BTgBJTkYAQ09SRQBVTlNBVElTRklBQkxFAFZtUGVhazogJWQga0IAPHN0ZGluPgA8Ym9vbD4APHN0cmluZz4APGRvdWJsZT4APGludDMyPgA9PT09PT09PT09PT09PT09PT09PT09PT09PT09WyBQcm9ibGVtIFN0YXRpc3RpY3MgXT09PT09PT09PT09PT09PT09PT09PT09PT09PT09AD09PT09PT09PT09PT09PT09PT09PT09PT09PT1bIFNlYXJjaCBTdGF0aXN0aWNzIF09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0APT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQBXQVJOSU5HISBDb3VsZCBub3Qgc2V0IHJlc291cmNlIGxpbWl0OiBWaXJ0dWFsIG1lbW9yeS4ARG8gbm90IGNoZWNrIGlmIHN1YnN1bXB0aW9uIGFnYWluc3QgYSBjbGF1c2UgbGFyZ2VyIHRoYW4gdGhpcy4gLTEgbWVhbnMgbm8gbGltaXQuAEFsbG93IGEgdmFyaWFibGUgZWxpbWluYXRpb24gc3RlcCB0byBncm93IGJ5IGEgbnVtYmVyIG9mIGNsYXVzZXMuAFJlYWRpbmcgZnJvbSBzdGFuZGFyZCBpbnB1dC4uLiBVc2UgJy0taGVscCcgZm9yIGhlbHAuAFBlcmZvcm0gdmFyaWFibGUgZWxpbWluYXRpb24uAFRoZSBmcmFjdGlvbiBvZiB3YXN0ZWQgbWVtb3J5IGFsbG93ZWQgYmVmb3JlIGEgZ2FyYmFnZSBjb2xsZWN0aW9uIGlzIHRyaWdnZXJlZCBkdXJpbmcgc2ltcGxpZmljYXRpb24uAENvbXBsZXRlbHkgdHVybiBvbi9vZmYgYW55IHByZXByb2Nlc3NpbmcuAENvbXBsZXRlbHkgdHVybiBvbi9vZmYgc29sdmluZyBhZnRlciBwcmVwcm9jZXNzaW5nLgBWYWxpZGF0ZSBESU1BQ1MgaGVhZGVyIGR1cmluZyBwYXJzaW5nLgBTaHJpbmsgY2xhdXNlcyBieSBhc3ltbWV0cmljIGJyYW5jaGluZy4AV0FSTklORyEgQ291bGQgbm90IHNldCByZXNvdXJjZSBsaW1pdDogQ1BVLXRpbWUuAElmIGdpdmVuLCBzdG9wIGFmdGVyIHByZXByb2Nlc3NpbmcgYW5kIHdyaXRlIHRoZSByZXN1bHQgdG8gdGhpcyBmaWxlLgBWZXJib3NpdHkgbGV2ZWwgKDA9c2lsZW50LCAxPXNvbWUsIDI9bW9yZSkuAEVSUk9SISBGYWlsZWQgdG8gcGFyc2UgbWVtb3J5IHN0YXRpc3RpY3MgZnJvbSAiL3Byb2MiLgAtACoqKiBJTlRFUlJVUFRFRCAqKioAQ2hlY2sgaWYgYSBjbGF1c2UgaXMgYWxyZWFkeSBpbXBsaWVkLiAoY29zdGx5KQBDb250cm9scyBjb25mbGljdCBjbGF1c2UgbWluaW1pemF0aW9uICgwPW5vbmUsIDE9YmFzaWMsIDI9ZGVlcCkAKG51bGwpAENvbnRyb2xzIHRoZSBsZXZlbCBvZiBwaGFzZSBzYXZpbmcgKDA9bm9uZSwgMT1saW1pdGVkLCAyPWZ1bGwpAGFkanVzdGVkUHRyICYmICJjYXRjaGluZyBhIGNsYXNzIHdpdGhvdXQgYW4gb2JqZWN0PyIAUHVyZSB2aXJ0dWFsIGZ1bmN0aW9uIGNhbGxlZCEAWU8hACVzJWQgAGxpYmMrK2FiaTogACAuLiAAZWxpbWluYXRpb24gbGVmdDogJTEwZA0Ac3Vic3VtcHRpb24gbGVmdDogJTEwZCAoJTEwZCBzdWJzdW1lZCwgJTEwZCBkZWxldGVkIGxpdGVyYWxzKQ0AfCAlOWQgfCAlN2QgJThkICU4ZCB8ICU4ZCAlOGQgJTYuMGYgfCAlNi4zZiAlJSB8CgB8ICBHYXJiYWdlIGNvbGxlY3Rpb246ICAgJTEyZCBieXRlcyA9PiAlMTJkIGJ5dGVzICAgICAgICAgICAgIHwKAHwgIEVsaW1pbmF0ZWQgY2xhdXNlczogICAgICUxMC4yZiBNYiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfAoAfCAgU2ltcGxpZmljYXRpb24gdGltZTogICUxMi4yZiBzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfAoAfCAgUGFyc2UgdGltZTogICAgICAgICAgICUxMi4yZiBzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfAoAfCAgTnVtYmVyIG9mIHZhcmlhYmxlczogICUxMmQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwKAHwgIE51bWJlciBvZiBjbGF1c2VzOiAgICAlMTJkICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8CgByZXN0YXJ0cyAgICAgICAgICAgICAgOiAlbGx1CgB3YXJuaW5nOiB1bnN1cHBvcnRlZCBzeXNjYWxsOiBfX3N5c2NhbGxfdWdldHJsaW1pdAoAICAtJS0xMHMgPSAlOHMKAGNvdWxkIG5vdCBvcGVuIGZpbGUgJXMKAEVSUk9SISBDb3VsZCBub3Qgb3BlbiBmaWxlOiAlcwoACiAgICAgICAgJXMKAENQVSB0aW1lICAgICAgICAgICAgICA6ICVnIHMKAHdhcm5pbmc6IHVuc3VwcG9ydGVkIHN5c2NhbGw6IF9fc3lzY2FsbF9nZXRydXNhZ2UKAHAgY25mICVkICVkCgBQQVJTRSBFUlJPUiEgVW5leHBlY3RlZCBjaGFyOiAlYwoASU5ERVQKAFVOU0FUCgBJTkRFVEVSTUlOQVRFCgBVTlNBVElTRklBQkxFCgBNZW1vcnkgdXNlZCAgICAgICAgICAgOiAlLjJmIE1CCgB3YXJuaW5nOiB1bnN1cHBvcnRlZCBzeXNjYWxsOiBfX3N5c2NhbGxfcHJsaW1pdDY0CgAlcyVkIDAKAHAgY25mIDEgMgoxIDAKLTEgMAoATGltaXQgb24gbWVtb3J5IHVzYWdlIGluIG1lZ2FieXRlcy4KAFdyb3RlIERJTUFDUyB3aXRoICVkIHZhcmlhYmxlcyBhbmQgJWQgY2xhdXNlcy4KAExpbWl0IG9uIENQVSB0aW1lIGFsbG93ZWQgaW4gc2Vjb25kcy4KAEVSUk9SISBVbmtub3duIGZsYWcgIiVzIi4gVXNlICctLSVzaGVscCcgZm9yIGhlbHAuCgAgIC0tJXNoZWxwICAgICAgICBQcmludCBoZWxwIG1lc3NhZ2UuCgAgIC0tJXNoZWxwLXZlcmIgICBQcmludCB2ZXJib3NlIGhlbHAgbWVzc2FnZS4KAFVTQUdFOiAlcyBbb3B0aW9uc10gPGlucHV0LWZpbGU+IDxyZXN1bHQtb3V0cHV0LWZpbGU+CgogIHdoZXJlIGlucHV0IG1heSBiZSBlaXRoZXIgaW4gcGxhaW4gb3IgZ3ppcHBlZCBESU1BQ1MuCgBFUlJPUiEgdmFsdWUgPCVzPiBpcyB0b28gc21hbGwgZm9yIG9wdGlvbiAiJXMiLgoARVJST1IhIHZhbHVlIDwlcz4gaXMgdG9vIGxhcmdlIGZvciBvcHRpb24gIiVzIi4KAChkZWZhdWx0OiAlcykKACAgLSUtMTJzID0gJS04cyAlYyU0LjJnIC4uICU0LjJnJWMgKGRlZmF1bHQ6ICVnKQoAY29uZmxpY3QgbGl0ZXJhbHMgICAgIDogJS0xMmxsdSAgICglNC4yZiAlJSBkZWxldGVkKQoAXSAoZGVmYXVsdDogJWQpCgBkZWNpc2lvbnMgICAgICAgICAgICAgOiAlLTEybGx1ICAgKCU0LjJmICUlIHJhbmRvbSkgKCUuMGYgL3NlYykKAHByb3BhZ2F0aW9ucyAgICAgICAgICA6ICUtMTJsbHUgICAoJS4wZiAvc2VjKQoAY29uZmxpY3RzICAgICAgICAgICAgIDogJS0xMmxsdSAgICglLjBmIC9zZWMpCgAKJXMgT1BUSU9OUzoKCgAKSEVMUCBPUFRJT05TOgoKAAAAAAAA2BUAAAQAAAAFAAAABgAAAAcAAABQNQAA5BUAAPwVAABON01pbmlzYXQ5SW50T3B0aW9uRQAAAAAoNQAABBYAAE43TWluaXNhdDZPcHRpb25FAAAAAAAAAPwVAAAEAAAACAAAAAkAAAAJAAAAAAAAAEgWAAAEAAAACgAAAAsAAAAMAAAAUDUAAFQWAAD8FQAATjdNaW5pc2F0MTBCb29sT3B0aW9uRQAAAAAAAIQWAAAEAAAADQAAAA4AAAAPAAAAUDUAAJAWAAD8FQAATjdNaW5pc2F0MTJTdHJpbmdPcHRpb25FAAAAAAAAAADAFgAAEAAAABEAAAASAAAAKDUAAMgWAABON01pbmlzYXQ2U29sdmVyRQAAAAAAAAD0FgAABAAAABMAAAAUAAAAFQAAAFA1AAAAFwAA/BUAAE43TWluaXNhdDEyRG91YmxlT3B0aW9uRQAAAAAAAAAAMBcAABYAAAAXAAAAGAAAAFA1AAA8FwAAwBYAAE43TWluaXNhdDEwU2ltcFNvbHZlckUAAAAAAAD+gitlRxVnQAAAAAAAADhDAAD6/kIudr86O568mvcMvb39/////98/PFRVVVVVxT+RKxfPVVWlPxfQpGcREYE/AAAAAAAAyELvOfr+Qi7mPyTEgv+9v84/tfQM1whrrD/MUEbSq7KDP4Q6Tpvg11U/");l(e,6102,"8D9uv4gaTzubPDUz+6k99u8/XdzYnBNgcbxhgHc+muzvP9FmhxB6XpC8hX9u6BXj7z8T9mc1UtKMPHSFFdOw2e8/+o75I4DOi7ze9t0pa9DvP2HI5mFO92A8yJt1GEXH7z+Z0zNb5KOQPIPzxso+vu8/bXuDXaaalzwPiflsWLXvP/zv/ZIatY4890dyK5Ks7z/RnC9wPb4+PKLR0zLso+8/C26QiTQDarwb0/6vZpvvPw69LypSVpW8UVsS0AGT7z9V6k6M74BQvMwxbMC9iu8/FvTVuSPJkbzgLamumoLvP69VXOnj04A8UY6lyJh67z9Ik6XqFRuAvHtRfTy4cu8/PTLeVfAfj7zqjYw4+WrvP79TEz+MiYs8dctv61tj7z8m6xF2nNmWvNRcBITgW+8/YC86PvfsmjyquWgxh1TvP504hsuC54+8Hdn8IlBN7z+Nw6ZEQW+KPNaMYog7Ru8/fQTksAV6gDyW3H2RST/vP5SoqOP9jpY8OGJ1bno47z99SHTyGF6HPD+msk/OMe8/8ucfmCtHgDzdfOJlRSvvP14IcT97uJa8gWP14d8k7z8xqwlt4feCPOHeH/WdHu8/+r9vGpshPbyQ2drQfxjvP7QKDHKCN4s8CwPkpoUS7z+Py86JkhRuPFYvPqmvDO8/tquwTXVNgzwVtzEK/gbvP0x0rOIBQoY8MdhM/HAB7z9K+NNdOd2PPP8WZLII/O4/BFuOO4Cjhrzxn5JfxfbuP2hQS8ztSpK8y6k6N6fx7j+OLVEb+AeZvGbYBW2u7O4/0jaUPujRcbz3n+U02+fuPxUbzrMZGZm85agTwy3j7j9tTCqnSJ+FPCI0Ekym3u4/imkoemASk7wcgKwERdruP1uJF0iPp1i8Ki73IQrW7j8bmklnmyx8vJeoUNn10e4/EazCYO1jQzwtiWFgCM7uP+9kBjsJZpY8VwAd7UHK7j95A6Ha4cxuPNA8wbWixu4/MBIPP47/kzze09fwKsPuP7CvervOkHY8Jyo21dq/7j934FTrvR2TPA3d/ZmyvO4/jqNxADSUj7ynLJ12srnuP0mjk9zM3oe8QmbPotq27j9fOA+9xt54vIJPnVYrtO4/9lx77EYShrwPkl3KpLHuP47X/RgFNZM82ie1Nkev7j8Fm4ovt5h7PP3Hl9QSre4/CVQc4uFjkDwpVEjdB6vuP+rGGVCFxzQ8t0ZZiiap7j81wGQr5jKUPEghrRVvp+4/n3aZYUrkjLwJ3Ha54aXuP6hN7zvFM4y8hVU6sH6k7j+u6SuJeFOEvCDDzDRGo+4/WFhWeN3Ok7wlIlWCOKLuP2QZfoCqEFc8c6lM1FWh7j8oIl6/77OTvM07f2aeoO4/grk0h60Sary/2gt1EqDuP+6pbbjvZ2O8LxplPLKf7j9RiOBUPdyAvISUUfl9n+4/zz5afmQfeLx0X+zodZ/uP7B9i8BK7oa8dIGlSJqf7j+K5lUeMhmGvMlnQlbrn+4/09QJXsuckDw/Xd5PaaDuPx2lTbncMnu8hwHrcxSh7j9rwGdU/eyUPDLBMAHtoe4/VWzWq+HrZTxiTs8286LuP0LPsy/FoYi8Eho+VCek7j80NzvxtmmTvBPOTJmJpe4/Hv8ZOoRegLytxyNGGqfuP25XcthQ1JS87ZJEm9mo7j8Aig5bZ62QPJlmitnHqu4/tOrwwS+3jTzboCpC5azuP//nxZxgtmW8jES1FjKv7j9EX/NZg/Z7PDZ3FZmuse4/gz0epx8Jk7zG/5ELW7TuPykebIu4qV285cXNsDe37j9ZuZB8+SNsvA9SyMtEuu4/qvn0IkNDkrxQTt6fgr3uP0uOZtdsyoW8ugfKcPHA7j8nzpEr/K9xPJDwo4KRxO4/u3MK4TXSbTwjI+MZY8juP2MiYiIExYe8ZeVde2bM7j/VMeLjhhyLPDMtSuyb0O4/Fbu809G7kbxdJT6yA9XuP9Ix7pwxzJA8WLMwE57Z7j+zWnNuhGmEPL/9eVVr3u4/tJ2Ol83fgrx689O/a+PuP4czy5J3Gow8rdNamZ/o7j/62dFKj3uQvGa2jSkH7u4/uq7cVtnDVbz7FU+4ovPuP0D2pj0OpJC8OlnljXL57j80k6049NZovEde+/J2/+4/NYpYa+LukbxKBqEwsAXvP83dXwrX/3Q80sFLkB4M7z+smJL6+72RvAke11vCEu8/swyvMK5uczycUoXdmxnvP5T9n1wy4448etD/X6sg7z+sWQnRj+CEPEvRVy7xJ+8/ZxpOOK/NYzy15waUbS/vP2gZkmwsa2c8aZDv3CA37z/StcyDGIqAvPrDXVULP+8/b/r/P12tj7x8iQdKLUfvP0mpdTiuDZC88okNCIdP7z+nBz2mhaN0PIek+9wYWO8/DyJAIJ6RgryYg8kW42DvP6ySwdVQWo48hTLbA+Zp7z9LawGsWTqEPGC0AfMhc+8/Hz60ByHVgrxfm3szl3zvP8kNRzu5Kom8KaH1FEaG7z/TiDpgBLZ0PPY/i+cukO8/cXKdUezFgzyDTMf7UZrvP/CR048S94+82pCkoq+k7z99dCPimK6NvPFnji1Ir+8/CCCqQbzDjjwnWmHuG7rvPzLrqcOUK4Q8l7prNyvF7z/uhdExqWSKPEBFblt20O8/7eM75Lo3jrwUvpyt/dvvP53NkU07iXc82JCegcHn7z+JzGBBwQVTPPFxjyvC8+8/ADj6/kIu5j8wZ8eTV/MuPQAAAAAAAOC/YFVVVVVV5b8GAAAAAADgP05VWZmZmek/eqQpVVVV5b/pRUibW0nyv8M/JosrAPA/AAAAAACg9j8=");l(e,8225,"yLnygizWv4BWNygktPo8AAAAAACA9j8=");l(e,8257,"CFi/vdHVvyD34NgIpRy9AAAAAABg9j8=");l(e,8289,"WEUXd3bVv21QttWkYiO9AAAAAABA9j8=");l(e,8321,"+C2HrRrVv9VnsJ7khOa8AAAAAAAg9j8=");l(e,8353,"eHeVX77Uv+A+KZNpGwS9AAAAAAAA9j8=");l(e,8385,"YBzCi2HUv8yETEgv2BM9AAAAAADg9T8=");l(e,8417,"qIaGMATUvzoLgu3zQtw8AAAAAADA9T8=");l(e,8449,"SGlVTKbTv2CUUYbGsSA9AAAAAACg9T8=");l(e,8481,"gJia3UfTv5KAxdRNWSU9AAAAAACA9T8=");l(e,8513,"IOG64ujSv9grt5keeyY9AAAAAABg9T8=");l(e,8545,"iN4TWonSvz+wz7YUyhU9AAAAAABg9T8=");l(e,8577,"iN4TWonSvz+wz7YUyhU9AAAAAABA9T8=");l(e,8609,"eM/7QSnSv3baUygkWha9AAAAAAAg9T8=");l(e,8641,"mGnBmMjRvwRU52i8rx+9AAAAAAAA9T8=");l(e,8673,"qKurXGfRv/CogjPGHx89AAAAAADg9D8=");l(e,8705,"SK75iwXRv2ZaBf3EqCa9AAAAAADA9D8=");l(e,8737,"kHPiJKPQvw4D9H7uawy9AAAAAACg9D8=");l(e,8769,"0LSUJUDQv38t9J64NvC8AAAAAACg9D8=");l(e,8801,"0LSUJUDQv38t9J64NvC8AAAAAACA9D8=");l(e,8833,"QF5tGLnPv4c8masqVw09AAAAAABg9D8=");l(e,8865,"YNzLrfDOvySvhpy3Jis9AAAAAABA9D8=");l(e,8897,"8CpuByfOvxD/P1RPLxe9AAAAAAAg9D8=");l(e,8929,"wE9rIVzNvxtoyruRuiE9AAAAAAAA9D8=");l(e,8961,"oJrH94/MvzSEn2hPeSc9AAAAAAAA9D8=");l(e,8993,"oJrH94/MvzSEn2hPeSc9AAAAAADg8z8=");l(e,9025,"kC10hsLLv4+3izGwThk9AAAAAADA8z8=");l(e,9057,"wIBOyfPKv2aQzT9jTro8AAAAAACg8z8=");l(e,9089,"sOIfvCPKv+rBRtxkjCW9AAAAAACg8z8=");l(e,9121,"sOIfvCPKv+rBRtxkjCW9AAAAAACA8z8=");l(e,9153,"UPScWlLJv+PUwQTZ0Sq9AAAAAABg8z8=");l(e,9185,"0CBloH/Ivwn623+/vSs9AAAAAABA8z8=");l(e,9217,"4BACiavHv1hKU3KQ2ys9AAAAAABA8z8=");l(e,9249,"4BACiavHv1hKU3KQ2ys9AAAAAAAg8z8=");l(e,9281,"0BnnD9bGv2bisqNq5BC9AAAAAAAA8z8=");l(e,9313,"kKdwMP/FvzlQEJ9Dnh69AAAAAAAA8z8=");l(e,9345,"kKdwMP/FvzlQEJ9Dnh69AAAAAADg8j8=");l(e,9377,"sKHj5SbFv49bB5CL3iC9AAAAAADA8j8=");l(e,9409,"gMtsK03Evzx4NWHBDBc9AAAAAADA8j8=");l(e,9441,"gMtsK03Evzx4NWHBDBc9AAAAAACg8j8=");l(e,9473,"kB4g/HHDvzpUJ02GePE8AAAAAACA8j8=");l(e,9505,"8B/4UpXCvwjEcRcwjSS9AAAAAABg8j8=");l(e,9537,"YC/VKrfBv5ajERikgC69AAAAAABg8j8=");l(e,9569,"YC/VKrfBv5ajERikgC69AAAAAABA8j8=");l(e,9601,"kNB8ftfAv/Rb6IiWaQo9AAAAAABA8j8=");l(e,9633,"kNB8ftfAv/Rb6IiWaQo9AAAAAAAg8j8=");l(e,9665,"4Nsxkey/v/Izo1xUdSW9AAAAAAAA8j8=");l(e,9698,"K24HJ76/PADwKiw0Kj0AAAAAAADyPw==");l(e,9730,"K24HJ76/PADwKiw0Kj0AAAAAAODxPw==");l(e,9761,"wFuPVF68vwa+X1hXDB29AAAAAADA8T8=");l(e,9793,"4Eo6bZK6v8iqW+g1OSU9AAAAAADA8T8=");l(e,9825,"4Eo6bZK6v8iqW+g1OSU9AAAAAACg8T8=");l(e,9857,"oDHWRcO4v2hWL00pfBM9AAAAAACg8T8=");l(e,9889,"oDHWRcO4v2hWL00pfBM9AAAAAACA8T8=");l(e,9921,"YOWK0vC2v9pzM8k3lya9AAAAAABg8T8=");l(e,9953,"IAY/Bxu1v1dexmFbAh89AAAAAABg8T8=");l(e,9985,"IAY/Bxu1v1dexmFbAh89AAAAAABA8T8=");l(e,10017,"4BuW10Gzv98T+czaXiw9AAAAAABA8T8=");l(e,10049,"4BuW10Gzv98T+czaXiw9AAAAAAAg8T8=");l(e,10081,"gKPuNmWxvwmjj3ZefBQ9AAAAAAAA8T8=");l(e,10113,"gBHAMAqvv5GONoOeWS09AAAAAAAA8T8=");l(e,10145,"gBHAMAqvv5GONoOeWS09AAAAAADg8D8=");l(e,10177,"gBlx3UKrv0xw1uV6ghw9AAAAAADg8D8=");l(e,10209,"gBlx3UKrv0xw1uV6ghw9AAAAAADA8D8=");l(e,10241,"wDL2WHSnv+6h8jRG/Cy9AAAAAADA8D8=");l(e,10273,"wDL2WHSnv+6h8jRG/Cy9AAAAAACg8D8=");l(e,10305,"wP65h56jv6r+JvW3AvU8AAAAAACg8D8=");l(e,10337,"wP65h56jv6r+JvW3AvU8AAAAAACA8D8=");l(e,10370,"eA6bgp+/5Al+fCaAKb0AAAAAAIDwPw==");l(e,10402,"eA6bgp+/5Al+fCaAKb0AAAAAAGDwPw==");l(e,10433,"gNUHG7mXvzmm+pNUjSi9AAAAAABA8D8=");l(e,10466,"/LCowI+/nKbT9nwe37wAAAAAAEDwPw==");l(e,10498,"/LCowI+/nKbT9nwe37wAAAAAACDwPw==");l(e,10530,"EGsq4H+/5EDaDT/iGb0AAAAAACDwPw==");l(e,10562,"EGsq4H+/5EDaDT/iGb0AAAAAAADwPw==");l(e,10614,"8D8=");l(e,10645,"wO8/");l(e,10658,"iXUVEIA/6CudmWvHEL0AAAAAAIDvPw==");l(e,10689,"gJNYViCQP9L34gZb3CO9AAAAAABA7z8=");l(e,10722,"ySglSZg/NAxaMrqgKr0AAAAAAADvPw==");l(e,10753,"QOeJXUGgP1PX8VzAEQE9AAAAAADA7j8=");l(e,10786,"LtSuZqQ/KP29dXMWLL0AAAAAAIDuPw==");l(e,10817,"wJ8UqpSoP30mWtCVeRm9AAAAAABA7j8=");l(e,10849,"wN3Nc8usPwco2EfyaBq9AAAAAAAg7j8=");l(e,10881,"wAbAMequP3s7yU8+EQ69AAAAAADg7T8=");l(e,10913,"YEbRO5exP5ueDVZdMiW9AAAAAACg7T8=");l(e,10945,"4NGn9b2zP9dO26VeyCw9AAAAAABg7T8=");l(e,10977,"oJdNWum1Px4dXTwGaSy9AAAAAABA7T8=");l(e,11009,"wOoK0wC3PzLtnamNHuw8AAAAAAAA7T8=");l(e,11041,"QFldXjO5P9pHvTpcESM9AAAAAADA7D8=");l(e,11073,"YK2NyGq7P+Vo9yuAkBO9AAAAAACg7D8=");l(e,11105,"QLwBWIi8P9OsWsbRRiY9AAAAAABg7D8=");l(e,11137,"IAqDOce+P+BF5q9owC29AAAAAABA7D8=");l(e,11169,"4Ns5kei/P/0KoU/WNCW9AAAAAAAA7D8=");l(e,11201,"4CeCjhfBP/IHLc547yE9AAAAAADg6z8=");l(e,11233,"8CN+K6rBPzSZOESOpyw9AAAAAACg6z8=");l(e,11265,"gIYMYdHCP6G0gctsnQM9AAAAAACA6z8=");l(e,11297,"kBWw/GXDP4lySyOoL8Y8AAAAAABA6z8=");l(e,11329,"sDODPZHEP3i2/VR5gyU9AAAAAAAg6z8=");l(e,11361,"sKHk5SfFP8d9aeXoMyY9AAAAAADg6j8=");l(e,11393,"EIy+TlfGP3guPCyLzxk9AAAAAADA6j8=");l(e,11425,"cHWLEvDGP+EhnOWNESW9AAAAAACg6j8=");l(e,11457,"UESFjYnHPwVDkXAQZhy9AAAAAABg6j8=");l(e,11490,"Oeuvvsg/0SzpqlQ9B70AAAAAAEDqPw==");l(e,11522,"99xaWsk/b/+gWCjyBz0AAAAAAADqPw==");l(e,11553,"4Io87ZPKP2khVlBDcii9AAAAAADg6T8=");l(e,11585,"0FtX2DHLP6rhrE6NNQy9AAAAAADA6T8=");l(e,11617,"4Ds4h9DLP7YSVFnESy29AAAAAACg6T8=");l(e,11649,"EPDG+2/MP9IrlsVy7PG8AAAAAABg6T8=");l(e,11681,"kNSwPbHNPzWwFfcq/yq9AAAAAABA6T8=");l(e,11713,"EOf/DlPOPzD0QWAnEsI8AAAAAAAg6T8=");l(e,11746,"3eSt9c4/EY67ZRUhyrwAAAAAAADpPw==");l(e,11777,"sLNsHJnPPzDfDMrsyxs9AAAAAADA6D8=");l(e,11809,"WE1gOHHQP5FO7RbbnPg8AAAAAACg6D8=");l(e,11841,"YGFnLcTQP+nqPBaLGCc9AAAAAACA6D8=");l(e,11873,"6CeCjhfRPxzwpWMOISy9AAAAAABg6D8=");l(e,11905,"+KzLXGvRP4EWpffNmis9AAAAAABA6D8=");l(e,11937,"aFpjmb/RP7e9R1Htpiw9AAAAAAAg6D8=");l(e,11969,"uA5tRRTSP+q6Rrrehwo9AAAAAADg5z8=");l(e,12001,"kNx88L7SP/QEUEr6nCo9AAAAAADA5z8=");l(e,12033,"YNPh8RTTP7g8IdN64ii9AAAAAACg5z8=");l(e,12065,"EL52Z2vTP8h38bDNbhE9AAAAAACA5z8=");l(e,12097,"MDN3UsLTP1y9BrZUOxg9AAAAAABg5z8=");l(e,12129,"6NUjtBnUP53gkOw25Ag9AAAAAABA5z8=");l(e,12161,"yHHCjXHUP3XWZwnOJy+9AAAAAAAg5z8=");l(e,12193,"MBee4MnUP6TYChuJIC69AAAAAAAA5z8=");l(e,12225,"oDgHriLVP1nHZIFwvi49AAAAAADg5j8=");l(e,12257,"0MhT93vVP+9AXe7trR89AAAAAADA5j8=");l(e,12289,"YFnfvdXVP9xlpAgqCwq9yDU=");l(e,12320,"0XSeAFedvSqAcFIP//8+JwoAAABkAAAA6AMAABAnAACghgEAQEIPAICWmAAA4fUFGAAAADUAAABxAAAAa////877//+Sv///AAAAAAAAAAAZAAsAGRkZAAAAAAUAAAAAAAAJAAAAAAsAAAAAAAAAABkACgoZGRkDCgcAAQAJCxgAAAkGCwAACwAGGQAAABkZGQ==");l(e,12481,"DgAAAAAAAAAAGQALDRkZGQANAAACAAkOAAAACQAOAAAO");l(e,12539,"DA==");l(e,12551,"EwAAAAATAAAAAAkMAAAAAAAMAAAM");l(e,12597,"EA==");l(e,12609,"DwAAAAQPAAAAAAkQAAAAAAAQAAAQ");l(e,12655,"Eg==");l(e,12667,"EQAAAAARAAAAAAkSAAAAAAASAAASAAAaAAAAGhoa");l(e,12722,"GgAAABoaGgAAAAAAAAk=");l(e,12771,"FA==");l(e,12783,"FwAAAAAXAAAAAAkUAAAAAAAUAAAU");l(e,12829,"Fg==");l(e,12841,"FQAAAAAVAAAAAAkWAAAAAAAWAAAWAAAwMTIzNDU2Nzg5QUJDREVG/////////////////////////////////////////////////////////////////wABAgMEBQYHCAn/////////CgsMDQ4PEBESExQVFhcYGRobHB0eHyAhIiP///////8KCwwNDg8QERITFBUWFxgZGhscHR4fICEiI/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AAQIEBwMGBQAAAAAAAAACAADAAwAAwAQAAMAFAADABgAAwAcAAMAIAADACQAAwAoAAMALAADADAAAwA0AAMAOAADADwAAwBAAAMARAADAEgAAwBMAAMAUAADAFQAAwBYAAMAXAADAGAAAwBkAAMAaAADAGwAAwBwAAMAdAADAHgAAwB8AAMAAAACzAQAAwwIAAMMDAADDBAAAwwUAAMMGAADDBwAAwwgAAMMJAADDCgAAwwsAAMMMAADDDQAA0w4AAMMPAADDAAAMuwEADMMCAAzDAwAMwwQADNs=");l(e,13396,"Iw==");l(e,13436,"//////////8=");l(e,13504,"UDUAAMw0AACkNQAATjEwX19jeHhhYml2MTE2X19zaGltX3R5cGVfaW5mb0UAAAAAUDUAAPw0AADANAAATjEwX19jeHhhYml2MTE3X19jbGFzc190eXBlX2luZm9FAAAAAAAAAPA0AAAkAAAAJQAAACYAAAAnAAAAKAAAACkAAAAqAAAAKwAAAAAAAABwNQAAJAAAACwAAAAmAAAAJwAAACgAAAAtAAAALgAAAC8AAABQNQAAfDUAAPA0AABOMTBfX2N4eGFiaXYxMjBfX3NpX2NsYXNzX3R5cGVfaW5mb0UAAAAAKDUAAKw1AABTdDl0eXBlX2luZm8=");l(e,13760,"vhUAAAAAAAAF");l(e,13780,"HQ==");l(e,13804,"GwAAABoAAACEXg==");l(e,13828,"Ag==");l(e,13844,"//////////8=");l(e,13912,"yDUAAAAAAAAF");l(e,13932,"Hw==");l(e,13956,"GwAAACAAAACYXgAAAAQ=");l(e,13980,"AQ==");l(e,13996,"/////wo=");l(e,14064,"YDYAAMBmAQ==")}var r=new ArrayBuffer(16);var s=new Int32Array(r);var t=new Float32Array(r);var u=new Float64Array(r);function v(w){return s[w]}function x(w,y){s[w]=y}function z(){return u[0]}function A(y){u[0]=y}function B(){throw new Error("abort")}function C(y){t[2]=y}function xa(q){var D=new ArrayBuffer(16908288);var E=new Int8Array(D);var F=new Int16Array(D);var G=new Int32Array(D);var H=new Uint8Array(D);var I=new Uint16Array(D);var J=new Uint32Array(D);var K=new Float32Array(D);var L=new Float64Array(D);var M=Math.imul;var N=Math.fround;var O=Math.abs;var P=Math.clz32;var Q=Math.min;var R=Math.max;var S=Math.floor;var T=Math.ceil;var U=Math.trunc;var V=Math.sqrt;var W=q.env;var X=W.exit;var Y=W.__cxa_throw;var Z=q.wasi_snapshot_preview1;var _=Z.proc_exit;var $=W.__syscall_openat;var aa=W.__syscall_fcntl64;var ba=W.__syscall_ioctl;var ca=Z.fd_write;var da=Z.fd_read;var ea=Z.fd_close;var fa=W._emscripten_memcpy_js;var ga=W.emscripten_err;var ha=W.emscripten_resize_heap;var ia=W._abort_js;var ja=W.__assert_fail;var ka=Z.fd_seek;var la=91840;var ma=0;var na=0;var oa=0;
-// EMSCRIPTEN_START_FUNCS
-function vb(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,C=0,D=0,F=N(0),I=0,M=0,P=0,Q=0;a:{I=E[a+724|0]&1;b:{if(!I){c=H[14632];e=c;break b}c:{o=G[a+308>>2];if((o|0)<=0){break c}while(1){d:{b=G[G[a+304>>2]+(c<<2)>>2]>>1;d=b+G[a+876>>2]|0;if(!H[d|0]){E[d|0]=1;if((e|0)==(A|0)){d=e>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(e^2147483647)>>>0){break d}e=d+e|0;w=ed(w,e<<2);if(!w){break d}}G[(A<<2)+w>>2]=b;A=A+1|0;o=G[a+308>>2]}c=c+1|0;if((o|0)>(c|0)){continue}break c}break}break a}e=wb(a,0)^1;c=H[14632]}o=e&2;e:{if(((c^-1)&254)>>>1&(e&255)==(c&255)|o&c){c=0;if(G[a+4>>2]){G[a+8>>2]=0}f:{g:{if(G[a+36>>2]>0){while(1){E[G[a+16>>2]+G[G[a+32>>2]+(c<<2)>>2]|0]=0;c=c+1|0;if((c|0)<G[a+36>>2]){continue}break}if(G[a+32>>2]){break g}break f}if(!G[a+32>>2]){break f}}G[a+36>>2]=0}h:{if(!H[a+492|0]){e=H[14117];break h}c=G[a+156>>2];b=G[a+152>>2]+1|0;c=b?c:c+1|0;G[a+152>>2]=b;G[a+156>>2]=c;j=L[a+120>>3]*+G[a+208>>2];L[a+640>>3]=j;p=j;j=+G[a+104>>2];if(p<j){L[a+640>>3]=j}b=G[a+136>>2];G[a+656>>2]=b;L[a+648>>3]=b|0;e=H[14118];c=e;if(G[a+44>>2]>0){wc(2489);wc(1065);wc(1145);wc(2569);c=H[14118]}i:{if(!(((c^-1)&254)>>>1&(e&255)==(c&255)|c&e&2)){break i}o=0;while(1){d=G[a+108>>2];p=L[a+112>>3];j:{k:{l:{if(H[a+80|0]==1){b=1;c=0;e=0;if(o){break l}break k}j=+(o>>>0);break j}while(1){e=e+1|0;c=b<<1;b=c|1;if((c|0)<(o|0)){continue}break}}b=o;if((c|0)!=(b|0)){while(1){e=e-1|0;f=c>>1;c=f-1|0;b=(b|0)%(f|0)|0;if((c|0)!=(b|0)){continue}break}}j=+(e|0)}j=rc(p,j)*+(d|0);m:{if(O(j)<2147483648){s=~~j;break m}s=-2147483648}C=0;k=la+-64|0;la=k;G[k+56>>2]=0;G[k+48>>2]=0;G[k+52>>2]=0;b=G[a+164>>2];c=G[a+160>>2]+1|0;b=c?b:b+1|0;G[a+160>>2]=c;G[a+164>>2]=b;P=a+544|0;u=a+284|0;n:{o:{p:{while(1){q:{r:{b=Za(a);if((b|0)!=-1){break r}if((s|0)<=(C|0)&(s|0)>=0){break p}while(1){if(H[a+680|0]){break p}b=G[a+664>>2];c=G[a+668>>2];if((c|0)>=0|(c|0)>0){d=G[a+196>>2];if((c|0)==(d|0)&b>>>0<=J[a+192>>2]|c>>>0<d>>>0){break p}}b=G[a+672>>2];c=G[a+676>>2];if((c|0)>=0|(c|0)>0){d=G[a+188>>2];if((c|0)==(d|0)&b>>>0<=J[a+184>>2]|c>>>0<d>>>0){break p}}if(!G[a+296>>2]){if(!hb(a)){break q}}b=G[a+272>>2];if(L[a+640>>3]<=+(b-G[a+284>>2]|0)){e=0;j=L[a+496>>3];eb(G[a+268>>2],b,a+544|0);f=G[a+272>>2];s:{if((f|0)<=0){break s}j=j/+(b|0);g=G[a+544>>2];b=0;while(1){t:{u:{l=G[a+268>>2];d=G[l+(b<<2)>>2];m=d<<2;c=m+g|0;n=G[c>>2];if(n>>>0<96){break u}h=G[c+4>>2];q=h>>1;i=H[q+G[a+332>>2]|0];t=i^h&1;h=H[14116];v:{if(!((t|0)==(h|0)&((h^-1)&254)>>>1|h&i&2)){break v}i=G[G[a+396>>2]+(q<<3)>>2];if((i|0)==-1){break v}if((d|0)==(i|0)){break u}}i=c+4|0;if(((f|0)/2|0)<=(b|0)){if(!(j>+K[i+(n>>>5<<2)>>2])){break u}}bb(a,d,0);f=G[i>>2];i=f>>1;d=H[i+G[a+332>>2]|0];g=d^f&1;f=H[14116];w:{if(!((g|0)==(f|0)&((f^-1)&254)>>>1|d&f&2)){break w}d=G[a+396>>2]+(i<<3)|0;f=G[d>>2];if((f|0)==-1|(c|0)!=(G[a+544>>2]+(f<<2)|0)){break w}G[d>>2]=-1}G[c>>2]=G[c>>2]&-4|1;g=G[a+544>>2];c=G[m+g>>2];G[a+556>>2]=((G[a+556>>2]+(c>>>5|0)|0)+(c>>>3&1)|0)+1;break t}G[l+(e<<2)>>2]=d;e=e+1|0}b=b+1|0;f=G[a+272>>2];if((b|0)<(f|0)){continue}break}b=b-e|0;if((b|0)<=0){break s}G[a+272>>2]=f-b}if(+J[a+556>>2]>L[a+96>>3]*+J[a+548>>2]){pa[G[G[a>>2]+8>>2]](a)}}b=G[a+296>>2];x:{y:{if((b|0)>=G[a+308>>2]){break y}c=H[14116];while(1){e=G[G[a+304>>2]+(b<<2)>>2];d=H[G[a+332>>2]+(e>>1)|0];z:{f=d^e&1;d=d&2;if(((c^-1)&254)>>>1&(f|0)==(c&255)|d&c){d=G[a+284>>2];if(G[a+300>>2]!=(b|0)){e=G[a+292>>2];break z}A:{c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break A}b=b+c|0;G[a+300>>2]=b;e=ed(G[a+292>>2],b<<2);G[a+292>>2]=e;if(!e){break A}b=G[a+296>>2];c=H[14116];break z}break a}c=H[14117];if((c|0)==(f|0)&((c^-1)&254)>>>1|c&d){c=e^1;e=0;b=a+16|0;B:{C:{if(G[b+20>>2]>0){while(1){E[G[b>>2]+G[G[b+16>>2]+(e<<2)>>2]|0]=0;e=e+1|0;if((e|0)<G[b+20>>2]){continue}break}if(G[b+16>>2]){break C}break B}if(!G[b+16>>2]){break B}}G[b+20>>2]=0}db(b,c);if(G[a+296>>2]){i=c>>1;E[i+G[a+588>>2]|0]=1;c=G[a+284>>2];e=G[G[a+292>>2]>>2];if((c|0)>(e|0)){while(1){c=c-1|0;d=G[G[a+280>>2]+(c<<2)>>2];f=d>>1;if(H[f+G[a+588>>2]|0]){e=G[G[a+396>>2]+(f<<3)>>2];D:{if((e|0)==-1){db(b,d^1);break D}s=G[a+544>>2]+(e<<2)|0;d=G[s>>2];if(d>>>0<64){break D}g=s+4|0;e=1;while(1){h=G[g+(e<<2)>>2]>>1;if(G[(G[a+396>>2]+(h<<3)|0)+4>>2]>0){E[h+G[a+588>>2]|0]=1;d=G[s>>2]}e=e+1|0;if(e>>>0<d>>>5>>>0){continue}break}}E[f+G[a+588>>2]|0]=0;e=G[G[a+292>>2]>>2]}if((c|0)>(e|0)){continue}break}}E[i+G[a+588>>2]|0]=0}break q}if((e|0)!=-2){break x}break y}G[a+296>>2]=b+1;G[(b<<2)+e>>2]=d;b=G[a+296>>2];if((b|0)<G[a+308>>2]){continue}break}}f=G[a+172>>2];b=G[a+168>>2]+1|0;f=b?f:f+1|0;G[a+168>>2]=b;G[a+172>>2]=f;j=L[a+72>>3]*1389796;p=j/2147483647;E:{if(O(p)<2147483648){b=~~p;break E}b=-2147483648}r=j-+(b|0)*2147483647;L[a+72>>3]=r;F:{if(!(L[a+64>>3]>r/2147483647)){h=H[14118];g=-1;break F}h=H[14118];c=G[a+464>>2];if(!c){g=-1;break F}j=r*1389796;p=j/2147483647;G:{if(O(p)<2147483648){b=~~p;break G}b=-2147483648}r=j-+(b|0)*2147483647;L[a+72>>3]=r;e=((h^-1)&254)>>>1|0;f=G[a+460>>2];j=r/2147483647*+(c|0);H:{if(O(j)<2147483648){b=~~j;break H}b=-2147483648}g=G[f+(b<<2)>>2];b=H[g+G[a+332>>2]|0];if(!(e&(b|0)==(h|0)|b&h&2)|!H[G[a+380>>2]+g|0]){break F}c=G[a+180>>2];b=G[a+176>>2]+1|0;c=b?c:c+1|0;G[a+176>>2]=b;G[a+180>>2]=c}t=h&2;i=G[a+460>>2];x=i-4|0;m=(h^-1)>>>1&1;n=G[a+472>>2];v=G[a+380>>2];y=G[a+332>>2];I:{while(1){J:{K:{if((g|0)==-1){break K}b=H[g+y|0];if(!(m&(b|0)==(h|0)|b&t)){break K}if(H[g+v|0]){break J}}b=G[a+464>>2];e=-2;if(!b){break I}g=G[i>>2];b=G[x+(b<<2)>>2];G[i>>2]=b;G[n+(b<<2)>>2]=0;G[n+(g<<2)>>2]=-1;b=G[a+464>>2];e=b-1|0;G[a+464>>2]=e;if((b|0)<3){continue}l=G[G[a+488>>2]>>2];q=G[i>>2];D=L[l+(q<<3)>>3];z=G[a+472>>2];d=0;f=1;c=0;while(1){b=d+2|0;L:{M:{if((e|0)<=(b|0)){e=G[i+(f<<2)>>2];j=L[l+(e<<3)>>3];break M}e=G[i+(b<<2)>>2];j=L[l+(e<<3)>>3];d=G[i+(f<<2)>>2];p=L[l+(d<<3)>>3];if(j>p){break L}e=d;j=p}b=f}N:{if(!(j>D)){b=c;break N}G[i+(c<<2)>>2]=e;G[z+(e<<2)>>2]=c;e=G[a+464>>2];c=b;d=b<<1;f=d|1;if((e|0)>(f|0)){continue}}break}G[i+(b<<2)>>2]=q;G[z+(q<<2)>>2]=b;continue}break}b=H[G[a+364>>2]+g|0];c=b&2;if(!(m&(b|0)==(h|0)|c&h)){e=b;b=H[14116];e=g<<1|((e|0)==(b|0)&((b^-1)&254)>>>1|b&c)!=0;break I}if(H[a+92|0]==1){j=r*1389796;p=j/2147483647;O:{if(O(p)<2147483648){b=~~p;break O}b=-2147483648}j=j-+(b|0)*2147483647;L[a+72>>3]=j;e=g<<1|j/2147483647<.5;break I}e=g<<1|H[G[a+348>>2]+g|0]!=0}b=14116;if((e|0)==-2){break o}b=G[a+296>>2]}d=G[a+284>>2];P:{Q:{if(G[a+300>>2]!=(b|0)){c=G[a+292>>2];break Q}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break P}b=b+c|0;G[a+300>>2]=b;c=ed(G[a+292>>2],b<<2);G[a+292>>2]=c;if(!c){break P}b=G[a+296>>2]}G[a+296>>2]=b+1;G[(b<<2)+c>>2]=d;b=e>>1;E[b+G[a+332>>2]|0]=e&1;c=G[a+296>>2];b=G[a+396>>2]+(b<<3)|0;G[b>>2]=-1;G[b+4>>2]=c;b=G[a+284>>2];G[a+284>>2]=b+1;G[G[a+280>>2]+(b<<2)>>2]=e;b=Za(a);if((b|0)==-1){continue}break r}break}break a}c=G[a+196>>2];e=G[a+192>>2]+1|0;c=e?c:c+1|0;G[a+192>>2]=e;G[a+196>>2]=c;if(!G[a+296>>2]){break q}if(G[k+48>>2]){G[k+52>>2]=0}c=G[k+52>>2];R:{if((c|0)!=G[k+56>>2]){d=G[k+48>>2];break R}e=c>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(c^2147483647)>>>0){break a}c=c+e|0;G[k+56>>2]=c;d=ed(G[k+48>>2],c<<2);G[k+48>>2]=d;if(!d){break a}c=G[k+52>>2]}G[(c<<2)+d>>2]=0;G[k+52>>2]=G[k+52>>2]+1;d=G[a+284>>2]-1|0;c=-2;e=0;while(1){f=G[a+544>>2];l=f+(b<<2)|0;b=G[l>>2];S:{if(!(b&4)){break S}j=L[a+496>>3];i=l+(b>>>3&536870908)|0;F=N(j+ +K[i+4>>2]);K[i+4>>2]=F;if(!(+F>1e20)){break S}i=G[a+272>>2];T:{if((i|0)<=0){break T}h=G[a+268>>2];b=0;if((i|0)!=1){m=i&2147483646;g=0;while(1){n=h+(b<<2)|0;q=f+(G[n>>2]<<2)|0;q=(G[q>>2]>>>3&536870908)+q|0;K[q+4>>2]=+K[q+4>>2]*1e-20;n=f+(G[n+4>>2]<<2)|0;n=(G[n>>2]>>>3&536870908)+n|0;K[n+4>>2]=+K[n+4>>2]*1e-20;b=b+2|0;g=g+2|0;if((m|0)!=(g|0)){continue}break}}if(!(i&1)){break T}b=f+(G[h+(b<<2)>>2]<<2)|0;b=(G[b>>2]>>>3&536870908)+b|0;K[b+4>>2]=+K[b+4>>2]*1e-20}L[a+496>>3]=j*1e-20;b=G[l>>2]}U:{h=(c|0)!=-2;if(h>>>0>=b>>>5>>>0){f=e;break U}z=l+4|0;f=e;while(1){V:{t=G[z+(h<<2)>>2];i=t>>1;x=i+G[a+588>>2]|0;W:{if(H[x|0]){break W}n=i<<3;if(G[(n+G[a+396>>2]|0)+4>>2]<=0){break W}q=G[a+316>>2];b=q+n|0;j=L[a+504>>3]+L[b>>3];L[b>>3]=j;if(j>1e100){m=G[a+540>>2];X:{if((m|0)<=0){break X}g=0;c=0;if(m>>>0>=4){v=m&2147483644;b=0;while(1){e=q+(c<<3)|0;L[e>>3]=L[e>>3]*1e-100;L[e+8>>3]=L[e+8>>3]*1e-100;L[e+16>>3]=L[e+16>>3]*1e-100;L[e+24>>3]=L[e+24>>3]*1e-100;c=c+4|0;b=b+4|0;if((v|0)!=(b|0)){continue}break}}b=m&3;if(!b){break X}while(1){e=q+(c<<3)|0;L[e>>3]=L[e>>3]*1e-100;c=c+1|0;g=g+1|0;if((b|0)!=(g|0)){continue}break}}L[a+504>>3]=L[a+504>>3]*1e-100}Y:{if((i|0)>=G[a+476>>2]){break Y}m=G[a+472>>2];c=G[m+(i<<2)>>2];if((c|0)<0){break Y}b=G[a+460>>2];g=G[b+(c<<2)>>2];Z:{if(!c){c=0;break Z}q=G[G[a+488>>2]>>2];j=L[q+(g<<3)>>3];while(1){e=(c<<2)+b|0;v=c-1|0;i=v>>1;y=(i<<2)+b|0;M=G[y>>2];if(!(j>L[q+(M<<3)>>3])){b=e;break Z}G[e>>2]=M;G[m+(G[y>>2]<<2)>>2]=c;c=i;if(v>>>0>1){continue}break}}G[b>>2]=g;G[m+(g<<2)>>2]=c}E[x|0]=1;if(G[(n+G[a+396>>2]|0)+4>>2]>=G[a+296>>2]){f=f+1|0;break W}c=G[k+52>>2];_:{if((c|0)!=G[k+56>>2]){b=G[k+48>>2];break _}b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break V}b=b+c|0;G[k+56>>2]=b;b=ed(G[k+48>>2],b<<2);G[k+48>>2]=b;if(!b){break V}c=G[k+52>>2]}G[k+52>>2]=c+1;G[(c<<2)+b>>2]=t}h=h+1|0;if(h>>>0<G[l>>2]>>>5>>>0){continue}break U}break}break a}b=G[a+588>>2];e=G[a+280>>2];while(1){c=d<<2;d=d-1|0;c=G[c+e>>2];i=c>>1;g=i+b|0;if(!H[g|0]){continue}break}b=G[G[a+396>>2]+(i<<3)>>2];E[g|0]=0;e=f-1|0;if((f|0)>1){continue}break}G[G[k+48>>2]>>2]=c^1;if(G[a+616>>2]){G[a+620>>2]=0}Fa(a+616|0,G[k+52>>2]);d=G[k+52>>2];if((d|0)>0){b=G[a+616>>2];e=G[k+48>>2];c=0;while(1){d=c<<2;G[d+b>>2]=G[d+e>>2];c=c+1|0;d=G[k+52>>2];if((c|0)<(d|0)){continue}break}}b=d;e=b;$:{aa:{switch(G[a+84>>2]-1|0){case 0:b=1;e=1;if((d|0)<2){break $}g=G[a+588>>2];h=G[a+544>>2];f=G[a+396>>2];i=G[k+48>>2];while(1){ba:{ca:{d=G[i+(e<<2)>>2];c=G[f+(d<<2&-8)>>2];if((c|0)==-1){break ca}c=h+(c<<2)|0;l=G[c>>2];if(l>>>0<64){break ba}l=l>>>5|0;m=c+4|0;c=1;while(1){n=G[m+(c<<2)>>2]>>1;if(!H[n+g|0]&G[(f+(n<<3)|0)+4>>2]>0){break ca}c=c+1|0;if((l|0)!=(c|0)){continue}break}break ba}G[i+(b<<2)>>2]=d;b=b+1|0}e=e+1|0;d=G[k+52>>2];if((e|0)<(d|0)){continue}break};break $;case 1:break aa;default:break $}}e=1;if((d|0)<2){b=1;break $}b=1;while(1){h=G[a+396>>2];d=G[k+48>>2];l=e<<2;c=G[d+l>>2];da:{if(G[h+(c<<2&-8)>>2]!=-1){d=G[(c<<2&-8)+h>>2]<<2;f=G[a+544>>2];if(G[a+604>>2]){G[a+608>>2]=0}d=d+f|0;g=1;ea:{while(1){fa:{i=G[d>>2]>>>5>>>0<=g>>>0;ga:{if(!i){f=G[((g<<2)+d|0)+4>>2];m=f>>1;n=m<<3;q=n+h|0;if(!G[q+4>>2]){break ga}m=H[m+G[a+588>>2]|0];if((m-1&255)>>>0<2){break ga}h=G[a+612>>2];d=G[a+608>>2];if(!((m|0)!=3&G[q>>2]!=-1)){ha:{if((d|0)!=(h|0)){g=G[a+604>>2];break ha}f=d>>1&-2;f=((f|0)>0?f:0)+2|0;if(f>>>0>(d^2147483647)>>>0){break fa}d=d+f|0;G[a+612>>2]=d;g=ed(G[a+604>>2],d<<3);G[a+604>>2]=g;if(!g){break fa}d=G[a+608>>2]}G[a+608>>2]=d+1;d=(d<<3)+g|0;G[d>>2]=0;G[d+4>>2]=c;d=G[a+608>>2];if((d|0)<=0){break ea}g=0;while(1){f=g<<3;c=G[a+588>>2]+(G[(f+G[a+604>>2]|0)+4>>2]>>1)|0;if(!H[c|0]){E[c|0]=3;h=G[a+604>>2];d=G[a+620>>2];ia:{if((d|0)!=G[a+624>>2]){c=G[a+616>>2];break ia}c=d>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(d^2147483647)>>>0){break a}c=c+d|0;G[a+624>>2]=c;c=ed(G[a+616>>2],c<<2);G[a+616>>2]=c;if(!c){break a}d=G[a+620>>2]}G[a+620>>2]=d+1;G[(d<<2)+c>>2]=G[(f+h|0)+4>>2];d=G[a+608>>2]}g=g+1|0;if((g|0)<(d|0)){continue}break}break ea}ja:{if((d|0)!=(h|0)){h=G[a+604>>2];break ja}i=d>>1&-2;i=((i|0)>0?i:0)+2|0;if(i>>>0>(d^2147483647)>>>0){break a}d=d+i|0;G[a+612>>2]=d;h=ed(G[a+604>>2],d<<3);G[a+604>>2]=h;if(!h){break a}d=G[a+608>>2]}G[a+608>>2]=d+1;d=(d<<3)+h|0;G[d>>2]=g;G[d+4>>2]=c;h=G[a+396>>2];d=G[a+544>>2]+(G[n+h>>2]<<2)|0;c=f;g=1;continue}d=G[a+588>>2]+(c>>1)|0;if(!H[d|0]){E[d|0]=2;g=G[a+620>>2];ka:{if((g|0)!=G[a+624>>2]){d=G[a+616>>2];break ka}d=g>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(g^2147483647)>>>0){break a}d=d+g|0;G[a+624>>2]=d;d=ed(G[a+616>>2],d<<2);G[a+616>>2]=d;if(!d){break a}g=G[a+620>>2]}G[a+620>>2]=g+1;G[(g<<2)+d>>2]=c}d=G[a+608>>2];if(!d){break ea}c=G[a+604>>2]+(d<<3)|0;g=G[c-8>>2];h=G[a+396>>2];c=G[c-4>>2];f=G[h+(c<<2&-8)>>2];G[a+608>>2]=d-1;d=G[a+544>>2]+(f<<2)|0}g=g+1|0;continue}break}break a}if(i){break da}d=G[k+48>>2];c=G[l+d>>2]}G[(b<<2)+d>>2]=c;b=b+1|0}e=e+1|0;d=G[k+52>>2];if((e|0)<(d|0)){continue}break}}c=d>>31;f=c+G[a+244>>2]|0;g=G[a+240>>2];i=g+d|0;G[a+240>>2]=i;G[a+244>>2]=g>>>0>i>>>0?f+1|0:f;b=e-b|0;if((b|0)>0){d=d-b|0;G[k+52>>2]=d;c=d>>31}e=G[a+248>>2];b=e+d|0;c=G[a+252>>2]+c|0;G[a+248>>2]=b;G[a+252>>2]=b>>>0<e>>>0?c+1|0:c;c=0;if((d|0)!=1){b=2;f=G[a+396>>2];e=G[k+48>>2];h=1;if((d|0)>2){while(1){h=G[(f+(G[e+(b<<2)>>2]<<2&-8)|0)+4>>2]>G[(f+(G[e+(h<<2)>>2]<<2&-8)|0)+4>>2]?b:h;b=b+1|0;if((d|0)!=(b|0)){continue}break}}d=e+(h<<2)|0;b=G[d>>2];G[d>>2]=G[e+4>>2];G[e+4>>2]=b;b=G[(f+(b<<2&-8)|0)+4>>2]}else{b=0}G[k+60>>2]=b;if(G[a+620>>2]>0){while(1){E[G[a+588>>2]+(G[G[a+616>>2]+(c<<2)>>2]>>1)|0]=0;c=c+1|0;if((c|0)<G[a+620>>2]){continue}break}}cb(a,G[k+60>>2]);la:{if(G[k+52>>2]==1){b=G[G[k+48>>2]>>2];e=b>>1;E[e+G[a+332>>2]|0]=b&1;c=G[a+296>>2];e=G[a+396>>2]+(e<<3)|0;G[e>>2]=-1;G[e+4>>2]=c;break la}d=_a(P,k+48|0,1);b=G[a+272>>2];ma:{if((b|0)!=G[a+276>>2]){c=G[a+268>>2];break ma}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break a}b=b+c|0;G[a+276>>2]=b;c=ed(G[a+268>>2],b<<2);G[a+268>>2]=c;if(!c){break a}b=G[a+272>>2]}G[a+272>>2]=b+1;G[(b<<2)+c>>2]=d;$a(a,d);j=L[a+496>>3];c=G[a+544>>2];b=c+(d<<2)|0;b=(G[b>>2]>>>3&536870908)+b|0;F=N(j+ +K[b+4>>2]);K[b+4>>2]=F;if(+F>1e20){f=G[a+272>>2];na:{if((f|0)<=0){break na}i=G[a+268>>2];b=0;if((f|0)!=1){g=f&2147483646;e=0;while(1){h=i+(b<<2)|0;l=c+(G[h>>2]<<2)|0;l=(G[l>>2]>>>3&536870908)+l|0;K[l+4>>2]=+K[l+4>>2]*1e-20;h=c+(G[h+4>>2]<<2)|0;h=(G[h>>2]>>>3&536870908)+h|0;K[h+4>>2]=+K[h+4>>2]*1e-20;b=b+2|0;e=e+2|0;if((g|0)!=(e|0)){continue}break}}if(!(f&1)){break na}b=c+(G[i+(b<<2)>>2]<<2)|0;b=(G[b>>2]>>>3&536870908)+b|0;K[b+4>>2]=+K[b+4>>2]*1e-20}L[a+496>>3]=j*1e-20}b=G[G[k+48>>2]>>2];e=b>>1;E[e+G[a+332>>2]|0]=b&1;c=G[a+296>>2];e=G[a+396>>2]+(e<<3)|0;G[e>>2]=d;G[e+4>>2]=c}C=C+1|0;c=G[a+284>>2];G[a+284>>2]=c+1;G[G[a+280>>2]+(c<<2)>>2]=b;b=G[a+656>>2]-1|0;G[a+656>>2]=b;L[a+504>>3]=L[a+504>>3]*(1/L[a+48>>3]);L[a+496>>3]=L[a+496>>3]*(1/L[a+56>>3]);if(b){continue}j=L[a+144>>3]*L[a+648>>3];L[a+648>>3]=j;p=L[a+128>>3]*L[a+640>>3];L[a+640>>3]=p;if(O(j)<2147483648){b=~~j}else{b=-2147483648}G[a+656>>2]=b;if(G[a+44>>2]<=0){continue}f=G[a+292>>2];d=G[a+296>>2];i=G[(d?f:u)>>2];g=G[a+200>>2];h=G[a+540>>2];l=G[a+216>>2];j=+(l|0);c=G[a+232>>2];m=G[a+236>>2];n=(d|0)<0;if(O(p)<2147483648){e=~~p}else{e=-2147483648}p=+(h|0);h=g-i|0;D=(+(c>>>0)+ +(m>>>0)*4294967296)/j;m=G[a+224>>2];q=G[a+208>>2];z=G[a+192>>2];oa:{if(n){r=0;break oa}r=+(i|0);if(!d){break oa}j=1/p;i=f-4|0;b=1;if((d|0)!=1){n=d&2147483646;c=0;while(1){g=b<<2;t=g+f|0;x=G[((b|0)==(d|0)?u:t)>>2];v=G[g+i>>2];Q=rc(j,+(b>>>0));g=b+1|0;y=G[((d|0)==(g|0)?u:f+(g<<2)|0)>>2];t=G[t>>2];r=rc(j,+(g>>>0))*+(y-t|0)+(Q*+(x-v|0)+r);b=b+2|0;c=c+2|0;if((n|0)!=(c|0)){continue}break}}if(!(d&1)){break oa}c=b<<2;d=G[((b|0)==(d|0)?u:c+f|0)>>2];c=G[c+i>>2];r=rc(j,+(b>>>0))*+(d-c|0)+r}L[k+24>>3]=D;G[k+20>>2]=l;G[k+16>>2]=e;L[k+32>>3]=r/p*100;G[k+12>>2]=m;G[k+8>>2]=q;G[k+4>>2]=h;G[k>>2]=z;uc(3829,k);continue}break}b=14117;break o}p=+G[a+540>>2];e=G[a+296>>2];pa:{if((e|0)<0){r=0;break pa}d=G[a+292>>2];r=+G[(e?d:u)>>2];if(!e){break pa}j=1/p;f=d-4|0;b=1;if((e|0)!=1){i=e&2147483646;c=0;while(1){s=b<<2;g=s+d|0;h=G[((b|0)==(e|0)?u:g)>>2];l=G[f+s>>2];D=rc(j,+(b>>>0));s=b+1|0;C=G[((e|0)==(s|0)?u:d+(s<<2)|0)>>2];g=G[g>>2];r=rc(j,+(s>>>0))*+(C-g|0)+(D*+(h-l|0)+r);b=b+2|0;c=c+2|0;if((i|0)!=(c|0)){continue}break}}if(!(e&1)){break pa}c=b<<2;e=G[((b|0)==(e|0)?u:c+d|0)>>2];c=G[c+f>>2];r=rc(j,+(b>>>0))*+(e-c|0)+r}L[a+528>>3]=r/p;cb(a,0);b=14118}e=H[b|0];b=G[k+48>>2];if(b){G[k+52>>2]=0;dd(b)}la=k- -64|0;break n}if(H[a+680|0]){break i}b=G[a+664>>2];c=G[a+668>>2];if((c|0)>=0|(c|0)>0){f=G[a+196>>2];if((c|0)==(f|0)&b>>>0<=J[a+192>>2]|c>>>0<f>>>0){break i}}b=G[a+672>>2];c=G[a+676>>2];if((c|0)>=0|(c|0)>0){f=G[a+188>>2];if((c|0)==(f|0)&b>>>0<=J[a+184>>2]|c>>>0<f>>>0){break i}}o=o+1|0;b=H[14118];if((b|0)==(e&255)&((b^-1)&254)>>>1|b&e&2){continue}break}}if(G[a+44>>2]>0){wc(2569)}c=e&255;b=H[14116];d=e&2;qa:{if((c|0)==(b|0)&((b^-1)&254)>>>1|d&b){Va(a+4|0,G[a+540>>2]);if(G[a+540>>2]<=0){break qa}c=0;while(1){E[G[a+4>>2]+c|0]=H[G[a+332>>2]+c|0];c=c+1|0;if((c|0)<G[a+540>>2]){continue}break}break qa}b=H[14117];if(G[a+36>>2]|!((b|0)==(c|0)&((b^-1)&254)>>>1|b&d)){break qa}E[a+492|0]=0}cb(a,0)}o=e&2;break e}if(G[a+44>>2]<=0){break e}wc(2569)}b=H[14632];ra:{if(!((b|0)==(e&255)&((b^-1)&254)>>>1|b&o)|H[a+707|0]!=1){break ra}b=G[a+736>>2];if((b|0)<2){break ra}b=b-1|0;d=H[14633];i=d&2;g=(d^-1)>>>1&1;while(1){o=b-1|0;f=G[a+4>>2];k=G[a+732>>2];c=G[k+(b<<2)>>2];sa:{ta:{if((c|0)<2){b=o;break ta}b=b-c|0;while(1){h=G[k+(o<<2)>>2];s=H[f+(h>>1)|0];if(!(g&(d|0)==(s^h&1)|i&s)){b=o;break sa}o=o-1|0;s=(c|0)>2;c=c-1|0;if(s){continue}break}c=1}o=G[k+(b<<2)>>2];E[f+(o>>1)|0]=o&1}b=b-c|0;if((b|0)>0){continue}break}}ua:{va:{if((A|0)>0&I){o=a+824|0;c=0;while(1){b=G[(c<<2)+w>>2];E[b+G[a+876>>2]|0]=0;wa:{if(H[a+724|0]!=1){break wa}if(!((b|0)<G[a+840>>2]&G[G[a+836>>2]+(b<<2)>>2]>=0)){if(H[b+G[a+876>>2]|0]|H[b+G[a+904>>2]|0]){break wa}f=H[b+G[a+332>>2]|0];d=H[14634];if(!((f|0)==(d|0)&((d^-1)&254)>>>1|d&f&2)){break wa}}xb(o,b)}c=c+1|0;if((A|0)!=(c|0)){continue}break}break va}if(!w){break ua}}dd(w)}return e}Y(ud()|0,1024,0);B()}function Mc(a,b,c,d){var e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,w=0,y=0,B=0,D=0,F=0,I=0,K=0,L=0,O=0,Q=0;q=la-48|0;la=q;a:{b:{if(c>>>0>2){break b}c=c<<2;I=G[c+12380>>2];F=G[c+12368>>2];while(1){c=G[b+4>>2];c:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break c}c=Hc(b)}if((c|0)==32|c-9>>>0<5){continue}break}r=1;d:{e:{switch(c-43|0){case 0:case 2:break e;default:break d}}r=(c|0)==45?-1:1;c=G[b+4>>2];if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break d}c=Hc(b)}f:{g:{if((c&-33)==73){while(1){if((g|0)==7){break g}c=G[b+4>>2];h:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break h}c=Hc(b)}e=g+1337|0;g=g+1|0;if(E[e|0]==(c|32)){continue}break}}if((g|0)!=3){e=(g|0)==8;if(e){break g}if(!d|g>>>0<4){break f}if(e){break g}}c=G[b+116>>2];if((c|0)>=0|(c|0)>0){G[b+4>>2]=G[b+4>>2]-1}if(!d|g>>>0<4){break g}c=(c|0)<0;while(1){if(!c){G[b+4>>2]=G[b+4>>2]-1}g=g-1|0;if(g>>>0>3){continue}break}}i=la-16|0;la=i;d=(C(N(N(r|0)*N(Infinity))),v(2));b=d&8388607;o=d>>>23|0;c=o&255;i:{if(c){if((c|0)!=255){c=b;b=b>>>7|0;h=c<<25;f=b;c=(o&255)+16256|0;break i}c=b;b=b>>>7|0;h=c<<25;f=b;c=32767;break i}c=0;if(!b){break i}c=b;b=P(b);gd(i,c,0,0,0,b+81|0);h=G[i+8>>2];f=G[i+12>>2]^65536;j=G[i>>2];k=G[i+4>>2];c=16265-b|0}G[q>>2]=j;G[q+4>>2]=k;b=q;G[b+8>>2]=h;G[b+12>>2]=f|(d&-2147483648|c<<16);la=i+16|0;h=G[b+8>>2];f=G[b+12>>2];j=G[b>>2];k=G[b+4>>2];break a}j:{k:{l:{m:{n:{o:{if(g){break o}g=0;if((c&-33)!=78){break o}while(1){if((g|0)==2){break n}c=G[b+4>>2];p:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break p}c=Hc(b)}e=g+1913|0;g=g+1|0;if(E[e|0]==(c|32)){continue}break}}switch(g|0){case 3:break n;case 0:break k;default:break m}}q:{c=G[b+4>>2];r:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break r}c=Hc(b)}if((c|0)==40){g=1;break q}f=2147450880;if(G[b+116>>2]<0){break a}G[b+4>>2]=G[b+4>>2]-1;break a}while(1){s:{c=G[b+4>>2];t:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break t}c=Hc(b)}if(!(c-48>>>0<10|c-65>>>0<26|(c|0)==95)){if(c-97>>>0>=26){break s}}g=g+1|0;continue}break}f=2147450880;if((c|0)==41){break a}c=G[b+116>>2];if((c|0)>=0|(c|0)>0){G[b+4>>2]=G[b+4>>2]-1}u:{if(d){if(g){break u}break j}G[3719]=28;break l}while(1){if((c|0)>0|(c|0)>=0){G[b+4>>2]=G[b+4>>2]-1}g=g-1|0;if(g){continue}break}break j}c=G[b+116>>2];if((c|0)>0){c=1}else{c=(c|0)>=0}if(c){G[b+4>>2]=G[b+4>>2]-1}G[3719]=28}Gc(b,0,0);break b}v:{if((c|0)!=48){break v}g=G[b+4>>2];w:{if((g|0)!=G[b+104>>2]){G[b+4>>2]=g+1;g=H[g|0];break w}g=Hc(b)}if((g&-33)==88){e=la-432|0;la=e;c=G[b+4>>2];x:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break x}c=Hc(b)}y:{z:{while(1){if((c|0)!=48){A:{if((c|0)!=46){break y}c=G[b+4>>2];if((c|0)==G[b+104>>2]){break A}G[b+4>>2]=c+1;c=H[c|0];break z}}else{c=G[b+4>>2];if((c|0)!=G[b+104>>2]){s=1;G[b+4>>2]=c+1;c=H[c|0]}else{s=1;c=Hc(b)}continue}break}c=Hc(b)}if((c|0)!=48){y=1;break y}while(1){c=o;o=c-1|0;p=p-!c|0;c=G[b+4>>2];B:{if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0];break B}c=Hc(b)}if((c|0)==48){continue}break}y=1;s=1}k=1073676288;while(1){C:{g=c;D:{E:{K=c-48|0;if(K>>>0<10){break E}O=(c|0)!=46;g=c|32;if(O&g-97>>>0>5){break C}if(O){break E}if(y){break C}y=1;o=h;p=f;break D}c=(c|0)>57?g-87|0:K;F:{if((f|0)<=0&h>>>0<=7|(f|0)<0){l=c+(l<<4)|0;break F}if(!f&h>>>0<=28){ld(e+48|0,c);od(e+32|0,B,D,j,k,0,0,0,1073414144);B=G[e+32>>2];D=G[e+36>>2];j=G[e+40>>2];k=G[e+44>>2];od(e+16|0,G[e+48>>2],G[e+52>>2],G[e+56>>2],G[e+60>>2],B,D,j,k);fd(e,G[e+16>>2],G[e+20>>2],G[e+24>>2],G[e+28>>2],i,m,u,w);u=G[e+8>>2];w=G[e+12>>2];i=G[e>>2];m=G[e+4>>2];break F}if(n|!c){break F}od(e+80|0,B,D,j,k,0,0,0,1073610752);fd(e- -64|0,G[e+80>>2],G[e+84>>2],G[e+88>>2],G[e+92>>2],i,m,u,w);u=G[e+72>>2];w=G[e+76>>2];n=1;i=G[e+64>>2];m=G[e+68>>2]}h=h+1|0;f=h?f:f+1|0;s=1}c=G[b+4>>2];if((c|0)!=G[b+104>>2]){G[b+4>>2]=c+1;c=H[c|0]}else{c=Hc(b)}continue}break}G:{if(!s){c=G[b+116>>2];if((c|0)>0){c=1}else{c=(c|0)>=0}H:{I:{if(c){c=G[b+4>>2];G[b+4>>2]=c-1;if(!d){break I}G[b+4>>2]=c-2;if(!y){break H}G[b+4>>2]=c-3;break H}if(d){break H}}Gc(b,0,0)}A(0);b=v(1)|0;d=v(0)|0;A(+(r|0));c=v(1)|0;v(0)|0;x(0,d|0);x(1,b&2147483647|c&-2147483648);kd(e+96|0,+z());i=G[e+96>>2];m=G[e+100>>2];c=G[e+108>>2];b=G[e+104>>2];break G}if((f|0)<=0&h>>>0<=7|(f|0)<0){j=h;k=f;while(1){l=l<<4;j=j+1|0;k=j?k:k+1|0;if((j|0)!=8|k){continue}break}}J:{K:{L:{if((c&-33)==80){j=Nc(b,d);c=oa;k=c;if(j|(c|0)!=-2147483648){break J}if(d){c=G[b+116>>2];if((c|0)>0){c=1}else{c=(c|0)>=0}if(c){break L}break K}i=0;m=0;Gc(b,0,0);c=0;b=0;break G}j=0;k=0;if(G[b+116>>2]<0){break J}}G[b+4>>2]=G[b+4>>2]-1}j=0;k=0}if(!l){A(0);b=v(1)|0;d=v(0)|0;A(+(r|0));c=v(1)|0;v(0)|0;x(0,d|0);x(1,b&2147483647|c&-2147483648);kd(e+112|0,+z());i=G[e+112>>2];m=G[e+116>>2];c=G[e+124>>2];b=G[e+120>>2];break G}b=y?o:h;d=j+(b<<2)|0;b=k+((y?p:f)<<2|b>>>30)|0;h=d-32|0;c=0-I|0;f=(d>>>0<j>>>0?b+1|0:b)-(d>>>0<32)|0;b=f;if((b|0)>0){b=1}else{b=c>>>0<h>>>0&(b|0)>=0}if(b){G[3719]=68;ld(e+160|0,r);od(e+144|0,G[e+160>>2],G[e+164>>2],G[e+168>>2],G[e+172>>2],-1,-1,-1,2147418111);od(e+128|0,G[e+144>>2],G[e+148>>2],G[e+152>>2],G[e+156>>2],-1,-1,-1,2147418111);i=G[e+128>>2];m=G[e+132>>2];c=G[e+140>>2];b=G[e+136>>2];break G}b=I-226|0;c=b>>31;if((f|0)>=(c|0)&b>>>0<=h>>>0|(c|0)<(f|0)){if((l|0)>=0){while(1){fd(e+416|0,i,m,u,w,0,0,0,-1073807360);b=id(i,m,u,w,1073610752);b=(b|0)>=0;fd(e+400|0,i,m,u,w,b?G[e+416>>2]:i,b?G[e+420>>2]:m,b?G[e+424>>2]:u,b?G[e+428>>2]:w);c=l<<1;l=c|b;b=h;h=b-1|0;f=f-!b|0;u=G[e+408>>2];w=G[e+412>>2];i=G[e+400>>2];m=G[e+404>>2];if((c|0)>=0){continue}break}}b=32-I|0;c=b;b=b+h|0;k=c>>>0>b>>>0?f+1|0:f;c=b>>>0<F>>>0&(k|0)<=0|(k|0)<0?(b|0)>0?b:0:F;M:{if(c>>>0>=113){ld(e+384|0,r);o=G[e+392>>2];p=G[e+396>>2];B=G[e+384>>2];D=G[e+388>>2];f=0;b=0;break M}kd(e+352|0,Ic(144-c|0));ld(e+336|0,r);B=G[e+336>>2];D=G[e+340>>2];o=G[e+344>>2];p=G[e+348>>2];Jc(e+368|0,G[e+352>>2],G[e+356>>2],G[e+360>>2],G[e+364>>2],p);t=G[e+376>>2];L=G[e+380>>2];f=G[e+372>>2];b=G[e+368>>2]}d=!(l&1)&((hd(i,m,u,w,0,0,0,0)|0)!=0&c>>>0<32);md(e+320|0,d|l);od(e+304|0,B,D,o,p,G[e+320>>2],G[e+324>>2],G[e+328>>2],G[e+332>>2]);c=b;fd(e+272|0,G[e+304>>2],G[e+308>>2],G[e+312>>2],G[e+316>>2],b,f,t,L);b=d;od(e+288|0,B,D,o,p,b?0:i,b?0:m,b?0:u,b?0:w);fd(e+256|0,G[e+288>>2],G[e+292>>2],G[e+296>>2],G[e+300>>2],G[e+272>>2],G[e+276>>2],G[e+280>>2],G[e+284>>2]);qd(e+240|0,G[e+256>>2],G[e+260>>2],G[e+264>>2],G[e+268>>2],c,f,t,L);b=G[e+240>>2];d=G[e+244>>2];c=G[e+248>>2];f=G[e+252>>2];if(!hd(b,d,c,f,0,0,0,0)){G[3719]=68}Kc(e+224|0,b,d,c,f,h);i=G[e+224>>2];m=G[e+228>>2];c=G[e+236>>2];b=G[e+232>>2];break G}G[3719]=68;ld(e+208|0,r);od(e+192|0,G[e+208>>2],G[e+212>>2],G[e+216>>2],G[e+220>>2],0,0,0,65536);od(e+176|0,G[e+192>>2],G[e+196>>2],G[e+200>>2],G[e+204>>2],0,0,0,65536);i=G[e+176>>2];m=G[e+180>>2];c=G[e+188>>2];b=G[e+184>>2]}G[q+16>>2]=i;G[q+20>>2]=m;G[q+24>>2]=b;G[q+28>>2]=c;la=e+432|0;h=G[q+24>>2];f=G[q+28>>2];j=G[q+16>>2];k=G[q+20>>2];break a}if(G[b+116>>2]<0){break v}G[b+4>>2]=G[b+4>>2]-1}g=b;i=c;t=d;d=0;e=la-8976|0;la=e;K=0-I|0;L=K-F|0;N:{O:{while(1){if((i|0)!=48){P:{if((i|0)!=46){break N}b=G[g+4>>2];if((b|0)==G[g+104>>2]){break P}G[g+4>>2]=b+1;i=H[b|0];break O}}else{b=G[g+4>>2];if((b|0)!=G[g+104>>2]){G[g+4>>2]=b+1;i=H[b|0]}else{i=Hc(g)}d=1;continue}break}i=Hc(g)}if((i|0)==48){while(1){b=h;h=b-1|0;f=f-!b|0;b=G[g+4>>2];Q:{if((b|0)!=G[g+104>>2]){G[g+4>>2]=b+1;i=H[b|0];break Q}i=Hc(g)}if((i|0)==48){continue}break}d=1}y=1}G[e+784>>2]=0;R:{S:{b=(i|0)==46;c=i-48|0;T:{U:{V:{if(b|c>>>0<=9){while(1){W:{if(b&1){if(!y){h=j;f=k;y=1;break W}b=!d;break V}b=k;j=j+1|0;k=j?b:b+1|0;if((l|0)<=2044){s=(i|0)==48?s:j;b=(e+784|0)+(l<<2)|0;if(n){c=(M(G[b>>2],10)+i|0)-48|0}G[b>>2]=c;d=1;c=n+1|0;b=(c|0)==9;n=b?0:c;l=b+l|0;break W}if((i|0)==48){break W}G[e+8960>>2]=G[e+8960>>2]|1;s=18396}b=G[g+4>>2];X:{if((b|0)!=G[g+104>>2]){G[g+4>>2]=b+1;i=H[b|0];break X}i=Hc(g)}b=(i|0)==46;c=i-48|0;if(b|c>>>0<10){continue}break}}h=y?h:j;f=y?f:k;if(!(!d|(i&-33)!=69)){i=Nc(g,t);b=oa;m=b;Y:{if(i|(b|0)!=-2147483648){break Y}if(!t){break T}i=0;m=0;if(G[g+116>>2]<0){break Y}G[g+4>>2]=G[g+4>>2]-1}f=f+m|0;h=h+i|0;f=h>>>0<i>>>0?f+1|0:f;break S}b=!d;if((i|0)<0){break U}}if(G[g+116>>2]<0){break U}G[g+4>>2]=G[g+4>>2]-1}if(!b){break S}G[3719]=28}Gc(g,0,0);h=0;f=0;c=0;b=0;break R}b=G[e+784>>2];if(!b){A(0);b=v(1)|0;d=v(0)|0;A(+(r|0));c=v(1)|0;v(0)|0;x(0,d|0);x(1,b&2147483647|c&-2147483648);kd(e,+z());h=G[e+8>>2];f=G[e+12>>2];c=G[e+4>>2];b=G[e>>2];break R}if(!(j>>>0>9&(k|0)>=0|(k|0)>0|((h|0)!=(j|0)|(f|0)!=(k|0))|(b>>>F|0?F>>>0<=30:0))){ld(e+48|0,r);md(e+32|0,b);od(e+16|0,G[e+48>>2],G[e+52>>2],G[e+56>>2],G[e+60>>2],G[e+32>>2],G[e+36>>2],G[e+40>>2],G[e+44>>2]);h=G[e+24>>2];f=G[e+28>>2];c=G[e+20>>2];b=G[e+16>>2];break R}b=K>>>1|0;if(b>>>0<h>>>0&(f|0)>=0|(f|0)>0){G[3719]=68;ld(e+96|0,r);od(e+80|0,G[e+96>>2],G[e+100>>2],G[e+104>>2],G[e+108>>2],-1,-1,-1,2147418111);od(e- -64|0,G[e+80>>2],G[e+84>>2],G[e+88>>2],G[e+92>>2],-1,-1,-1,2147418111);h=G[e+72>>2];f=G[e+76>>2];c=G[e+68>>2];b=G[e+64>>2];break R}b=I-226|0;c=h>>>0<b>>>0;b=b>>31;if(c&(f|0)<=(b|0)|(b|0)>(f|0)){G[3719]=68;ld(e+144|0,r);od(e+128|0,G[e+144>>2],G[e+148>>2],G[e+152>>2],G[e+156>>2],0,0,0,65536);od(e+112|0,G[e+128>>2],G[e+132>>2],G[e+136>>2],G[e+140>>2],0,0,0,65536);h=G[e+120>>2];f=G[e+124>>2];c=G[e+116>>2];b=G[e+112>>2];break R}if(n){if((n|0)<=8){b=(e+784|0)+(l<<2)|0;g=G[b>>2];while(1){g=M(g,10);n=n+1|0;if((n|0)!=9){continue}break}G[b>>2]=g}l=l+1|0}n=h;Z:{if(h>>>0>17&(f|0)>=0|(f|0)>0|(s|0)>=9|(h|0)<(s|0)){break Z}if(!f&(h|0)==9){ld(e+192|0,r);md(e+176|0,G[e+784>>2]);od(e+160|0,G[e+192>>2],G[e+196>>2],G[e+200>>2],G[e+204>>2],G[e+176>>2],G[e+180>>2],G[e+184>>2],G[e+188>>2]);h=G[e+168>>2];f=G[e+172>>2];c=G[e+164>>2];b=G[e+160>>2];break R}if((f|0)<=0&h>>>0<=8|(f|0)<0){ld(e+272|0,r);md(e+256|0,G[e+784>>2]);od(e+240|0,G[e+272>>2],G[e+276>>2],G[e+280>>2],G[e+284>>2],G[e+256>>2],G[e+260>>2],G[e+264>>2],G[e+268>>2]);ld(e+224|0,G[(0-n<<2)+12368>>2]);jd(e+208|0,G[e+240>>2],G[e+244>>2],G[e+248>>2],G[e+252>>2],G[e+224>>2],G[e+228>>2],G[e+232>>2],G[e+236>>2]);h=G[e+216>>2];f=G[e+220>>2];c=G[e+212>>2];b=G[e+208>>2];break R}b=(M(n,-3)+F|0)+27|0;c=G[e+784>>2];if(c>>>b|0?(b|0)<=30:0){break Z}ld(e+352|0,r);md(e+336|0,c);od(e+320|0,G[e+352>>2],G[e+356>>2],G[e+360>>2],G[e+364>>2],G[e+336>>2],G[e+340>>2],G[e+344>>2],G[e+348>>2]);ld(e+304|0,G[(n<<2)+12296>>2]);od(e+288|0,G[e+320>>2],G[e+324>>2],G[e+328>>2],G[e+332>>2],G[e+304>>2],G[e+308>>2],G[e+312>>2],G[e+316>>2]);h=G[e+296>>2];f=G[e+300>>2];c=G[e+292>>2];b=G[e+288>>2];break R}while(1){b=l;l=b-1|0;if(!G[(e+784|0)+(l<<2)>>2]){continue}break}s=0;c=(n|0)%9|0;_:{if(!c){c=0;break _}d=(f|0)<0?c+9|0:c;$:{if(!b){c=0;b=0;break $}h=G[(0-d<<2)+12368>>2];j=1e9/(h|0)|0;i=0;g=0;c=0;while(1){f=i;k=e+784|0;i=k+(g<<2)|0;l=G[i>>2];t=(l>>>0)/(h>>>0)|0;f=f+t|0;G[i>>2]=f;f=!f&(c|0)==(g|0);c=f?c+1&2047:c;n=f?n-9|0:n;i=M(j,l-M(h,t)|0);g=g+1|0;if((g|0)!=(b|0)){continue}break}if(!i){break $}G[k+(b<<2)>>2]=i;b=b+1|0}n=(n-d|0)+9|0}while(1){k=(e+784|0)+(c<<2)|0;g=(n|0)<36;aa:{while(1){if(!g&((n|0)!=36|J[k>>2]>=10384593)){break aa}l=b+2047|0;d=0;while(1){j=b;h=d;i=l&2047;l=(e+784|0)+(i<<2)|0;d=G[l>>2];b=d>>>3|0;d=d<<29;h=h+d|0;f=d>>>0>h>>>0?b+1|0:b;if(!f&h>>>0<1000000001){d=0}else{b=h;d=Pd(b,f,1e9);t=Od(d,oa,1e9,0);h=b-t|0;f=f-(oa+(b>>>0<t>>>0)|0)|0}G[l>>2]=h;b=(c|0)==(i|0)?j:f|h?j:i;h=j-1&2047;b=(h|0)!=(i|0)?j:b;l=i-1|0;if((c|0)!=(i|0)){continue}break}s=s-29|0;b=j;if(!d){continue}break}c=c-1&2047;if((c|0)==(b|0)){f=(b+2046&2047)<<2;b=e+784|0;f=f+b|0;G[f>>2]=G[f>>2]|G[b+(h<<2)>>2];b=h}n=n+9|0;G[(e+784|0)+(c<<2)>>2]=d;continue}break}ba:{ca:while(1){h=b+1&2047;j=(e+784|0)+((b-1&2047)<<2)|0;while(1){f=(n|0)>45?9:1;da:{while(1){d=c;g=0;ea:{while(1){fa:{c=d+g&2047;if((c|0)==(b|0)){break fa}c=G[(e+784|0)+(c<<2)>>2];i=G[(g<<2)+12320>>2];if(c>>>0<i>>>0){break fa}if(c>>>0>i>>>0){break ea}g=g+1|0;if((g|0)!=4){continue}}break}if((n|0)!=36){break ea}h=0;f=0;g=0;j=0;k=0;while(1){c=d+g&2047;if((c|0)==(b|0)){b=b+1&2047;G[((b<<2)+e|0)+780>>2]=0}md(e+768|0,G[(e+784|0)+(c<<2)>>2]);od(e+752|0,h,f,j,k,0,0,1342177280,1075633366);fd(e+736|0,G[e+752>>2],G[e+756>>2],G[e+760>>2],G[e+764>>2],G[e+768>>2],G[e+772>>2],G[e+776>>2],G[e+780>>2]);j=G[e+744>>2];k=G[e+748>>2];h=G[e+736>>2];f=G[e+740>>2];g=g+1|0;if((g|0)!=4){continue}break}ld(e+720|0,r);od(e+704|0,h,f,j,k,G[e+720>>2],G[e+724>>2],G[e+728>>2],G[e+732>>2]);j=G[e+712>>2];k=G[e+716>>2];h=0;f=0;i=G[e+704>>2];m=G[e+708>>2];t=s+113|0;g=t-I|0;n=(g|0)<(F|0);c=n?(g|0)>0?g:0:F;if(c>>>0<=112){break da}break ba}s=f+s|0;c=b;if((b|0)==(d|0)){continue}break}k=1e9>>>f|0;l=-1<<f^-1;g=0;c=d;while(1){i=g;t=e+784|0;g=t+(d<<2)|0;m=G[g>>2];i=i+(m>>>f|0)|0;G[g>>2]=i;i=!i&(c|0)==(d|0);c=i?c+1&2047:c;n=i?n-9|0:n;g=M(k,l&m);d=d+1&2047;if((d|0)!=(b|0)){continue}break}if(!g){continue}if((c|0)!=(h|0)){G[t+(b<<2)>>2]=g;b=h;continue ca}G[j>>2]=G[j>>2]|1;continue}break}break}kd(e+656|0,Ic(225-c|0));Jc(e+688|0,G[e+656>>2],G[e+660>>2],G[e+664>>2],G[e+668>>2],k);B=G[e+696>>2];D=G[e+700>>2];u=G[e+688>>2];w=G[e+692>>2];kd(e+640|0,Ic(113-c|0));Lc(e+672|0,i,m,j,k,G[e+640>>2],G[e+644>>2],G[e+648>>2],G[e+652>>2]);h=G[e+672>>2];f=G[e+676>>2];o=G[e+680>>2];p=G[e+684>>2];qd(e+624|0,i,m,j,k,h,f,o,p);fd(e+608|0,u,w,B,D,G[e+624>>2],G[e+628>>2],G[e+632>>2],G[e+636>>2]);j=G[e+616>>2];k=G[e+620>>2];i=G[e+608>>2];m=G[e+612>>2]}l=d+4&2047;ga:{if((l|0)==(b|0)){break ga}l=G[(e+784|0)+(l<<2)>>2];ha:{if(l>>>0<=499999999){if(!l&(d+5&2047)==(b|0)){break ha}kd(e+496|0,+(r|0)*.25);fd(e+480|0,h,f,o,p,G[e+496>>2],G[e+500>>2],G[e+504>>2],G[e+508>>2]);o=G[e+488>>2];p=G[e+492>>2];h=G[e+480>>2];f=G[e+484>>2];break ha}if((l|0)!=5e8){kd(e+592|0,+(r|0)*.75);fd(e+576|0,h,f,o,p,G[e+592>>2],G[e+596>>2],G[e+600>>2],G[e+604>>2]);o=G[e+584>>2];p=G[e+588>>2];h=G[e+576>>2];f=G[e+580>>2];break ha}Q=+(r|0);if((d+5&2047)==(b|0)){kd(e+528|0,Q*.5);fd(e+512|0,h,f,o,p,G[e+528>>2],G[e+532>>2],G[e+536>>2],G[e+540>>2]);o=G[e+520>>2];p=G[e+524>>2];h=G[e+512>>2];f=G[e+516>>2];break ha}kd(e+560|0,Q*.75);fd(e+544|0,h,f,o,p,G[e+560>>2],G[e+564>>2],G[e+568>>2],G[e+572>>2]);o=G[e+552>>2];p=G[e+556>>2];h=G[e+544>>2];f=G[e+548>>2]}if(c>>>0>111){break ga}Lc(e+464|0,h,f,o,p,0,0,0,1073676288);if(hd(G[e+464>>2],G[e+468>>2],G[e+472>>2],G[e+476>>2],0,0,0,0)){break ga}fd(e+448|0,h,f,o,p,0,0,0,1073676288);o=G[e+456>>2];p=G[e+460>>2];h=G[e+448>>2];f=G[e+452>>2]}fd(e+432|0,i,m,j,k,h,f,o,p);qd(e+416|0,G[e+432>>2],G[e+436>>2],G[e+440>>2],G[e+444>>2],u,w,B,D);j=G[e+424>>2];k=G[e+428>>2];i=G[e+416>>2];m=G[e+420>>2];ia:{if((L-2|0)>=(t&2147483647)){break ia}G[e+408>>2]=j;G[e+412>>2]=k&2147483647;G[e+400>>2]=i;G[e+404>>2]=m;od(e+384|0,i,m,j,k,0,0,0,1073610752);d=id(G[e+400>>2],G[e+404>>2],G[e+408>>2],G[e+412>>2],1081081856);b=(d|0)>=0;j=b?G[e+392>>2]:j;k=b?G[e+396>>2]:k;i=b?G[e+384>>2]:i;m=b?G[e+388>>2]:m;h=hd(h,f,o,p,0,0,0,0);s=b+s|0;if((s+110|0)<=(L|0)){if(!(n&((c|0)!=(g|0)|(d|0)<0)&(h|0)!=0)){break ia}}G[3719]=68}Kc(e+368|0,i,m,j,k,s);h=G[e+376>>2];f=G[e+380>>2];c=G[e+372>>2];b=G[e+368>>2]}G[q+40>>2]=h;G[q+44>>2]=f;G[q+32>>2]=b;G[q+36>>2]=c;la=e+8976|0;h=G[q+40>>2];f=G[q+44>>2];j=G[q+32>>2];k=G[q+36>>2];break a}break a}f=0}G[a>>2]=j;G[a+4>>2]=k;G[a+8>>2]=h;G[a+12>>2]=f;la=q+48|0}function wb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,C=0,D=0,F=0;w=la-32|0;la=w;a:{c=0;b:{if(!hb(a)){break b}c=1;if(H[a+724|0]!=1){break b}z=a+824|0;c:{d:{e:while(1){if(!(G[a+920>>2]<G[a+284>>2]|G[a+924>>2]>0)&G[a+828>>2]<=0){break c}i=0;if(G[a+924>>2]){c=G[a+872>>2];e=G[a+868>>2];d=G[a+860>>2];if(((c-e|0)+((c|0)<(e|0)?d:0)|0)>0){while(1){h=G[a+544>>2]+(G[G[a+856>>2]+((e+i|0)%(d|0)<<2)>>2]<<2)|0;g=G[h>>2];if(!(g&3)){G[h>>2]=g|2;d=G[a+860>>2];e=G[a+868>>2];c=G[a+872>>2]}i=i+1|0;if((i|0)<((c-e|0)+((c|0)<(e|0)?d:0)|0)){continue}break}}i=G[a+540>>2];if((i|0)>0){h=0;while(1){if(H[G[a+744>>2]+h|0]){l=G[a+776>>2]+h|0;if(H[l|0]){g=G[a+760>>2]+M(h,12)|0;c=G[g+4>>2];f:{if((c|0)<=0){break f}f=G[g>>2];i=G[G[a+804>>2]>>2];d=0;e=0;while(1){j=G[f+(e<<2)>>2];if((G[i+(j<<2)>>2]&3)!=1){G[f+(d<<2)>>2]=j;d=d+1|0;c=G[g+4>>2]}e=e+1|0;if((e|0)<(c|0)){continue}break}d=e-d|0;if((d|0)<=0){break f}G[g+4>>2]=c-d}E[l|0]=0}f=0;j=G[a+760>>2]+M(h,12)|0;d=G[j+4>>2];if((d|0)>0){while(1){e=G[a+544>>2];c=G[j>>2];k=f<<2;l=G[c+k>>2];if(!(H[e+(l<<2)|0]&3)){d=G[a+872>>2];G[a+872>>2]=d+1;g=G[a+856>>2];G[g+(d<<2)>>2]=l;d=G[a+872>>2];l=G[a+860>>2];if((d|0)==(l|0)){G[a+872>>2]=0;d=0}if(G[a+868>>2]==(d|0)){e=0;o=M(l,3)+1>>1;g:{if((o|0)<=0){n=0;o=0;i=0;break g}c=o+1&2147483646;n=c>>>0<=2?2:c;i=ad(n<<2);if(!i&G[3719]==48){break a}Wb(i,0,o<<2)}h:{if((d|0)>=(l|0)){break h}q=l-d|0;p=q&3;r=0;c=d;if(c-l>>>0<=4294967292){t=g+12|0;s=g+8|0;u=g+4|0;x=q&-4;q=0;while(1){m=(e<<2)+i|0;v=c<<2;G[m>>2]=G[v+g>>2];G[m+4>>2]=G[u+v>>2];G[m+8>>2]=G[s+v>>2];G[m+12>>2]=G[t+v>>2];c=c+4|0;e=e+4|0;q=q+4|0;if((x|0)!=(q|0)){continue}break}}if(!p){break h}while(1){G[(e<<2)+i>>2]=G[g+(c<<2)>>2];c=c+1|0;e=e+1|0;r=r+1|0;if((p|0)!=(r|0)){continue}break}}i:{if((d|0)<=0){break i}v=d&3;r=0;j:{if(d>>>0<4){c=0;break j}p=i+12|0;t=i+8|0;s=i+4|0;u=d&2147483644;c=0;q=0;while(1){d=e<<2;m=g+(c<<2)|0;G[d+i>>2]=G[m>>2];G[d+s>>2]=G[m+4>>2];G[d+t>>2]=G[m+8>>2];G[d+p>>2]=G[m+12>>2];c=c+4|0;e=e+4|0;q=q+4|0;if((u|0)!=(q|0)){continue}break}}if(!v){break i}while(1){G[(e<<2)+i>>2]=G[g+(c<<2)>>2];c=c+1|0;e=e+1|0;r=r+1|0;if((v|0)!=(r|0)){continue}break}}G[a+872>>2]=l;G[a+868>>2]=0;G[a+860>>2]=0;dd(g);G[a+864>>2]=n;G[a+860>>2]=o;G[a+856>>2]=i;e=G[a+544>>2];c=G[j>>2]}c=(G[c+k>>2]<<2)+e|0;G[c>>2]=G[c>>2]&-4|2;d=G[j+4>>2]}f=f+1|0;if((f|0)<(d|0)){continue}break}}E[G[a+744>>2]+h|0]=0;i=G[a+540>>2]}h=h+1|0;if((h|0)<(i|0)){continue}break}d=G[a+860>>2];e=G[a+868>>2];c=G[a+872>>2]}if(((c-e|0)+((c|0)<(e|0)?d:0)|0)>0){i=0;while(1){h=G[a+544>>2]+(G[G[a+856>>2]+((e+i|0)%(d|0)<<2)>>2]<<2)|0;g=G[h>>2];if((g&3)==2){G[h>>2]=g&-4;d=G[a+860>>2];e=G[a+868>>2];c=G[a+872>>2]}i=i+1|0;if((i|0)<((c-e|0)+((c|0)<(e|0)?d:0)|0)){continue}break}}G[a+924>>2]=0}k:{c=G[a+872>>2];d=G[a+868>>2];if(((c-d|0)+((c|0)<(d|0)?G[a+860>>2]:0)|0)<=0&G[a+920>>2]>=G[a+284>>2]){break k}if(yb(a,1)){break k}E[a+492|0]=0;break c}c=G[a+828>>2];if(H[a+680|0]){break d}v=0;if(!c){continue}while(1){d=G[a+824>>2];j=G[d>>2];c=G[(d+(c<<2)|0)-4>>2];G[d>>2]=c;e=c<<2;c=G[a+836>>2];G[e+c>>2]=0;G[c+(j<<2)>>2]=-1;c=G[a+828>>2];G[a+828>>2]=c-1;if((c|0)>=3){zb(z,0)}if(H[a+680|0]){continue e}l:{m:{if(H[j+G[a+904>>2]|0]){break m}d=H[j+G[a+332>>2]|0];c=H[14634];if(!((d|0)==(c|0)&((c^-1)&254)>>>1|c&d&2)){break m}if(!((v>>>0)%100|G[a+44>>2]<2)){G[w+16>>2]=G[a+828>>2];tc(3742,w+16|0)}if(H[a+704|0]==1){c=j+G[a+876>>2]|0;r=H[c|0];E[c|0]=1;c=0;e=0;g=j+G[a+776>>2]|0;if(H[g|0]){d=G[a+760>>2]+M(j,12)|0;l=G[d+4>>2];n:{if((l|0)<=0){break n}h=G[d>>2];f=G[G[a+804>>2]>>2];while(1){i=G[h+(c<<2)>>2];if((G[f+(i<<2)>>2]&3)!=1){G[h+(e<<2)>>2]=i;l=G[d+4>>2];e=e+1|0}c=c+1|0;if((l|0)>(c|0)){continue}break}c=c-e|0;if((c|0)<=0){break n}G[d+4>>2]=l-c}E[g|0]=0}e=1;d=H[j+G[a+332>>2]|0];c=H[14634];o:{if(!((d|0)==(c|0)&((c^-1)&254)>>>1|c&d&2)){break o}l=G[a+760>>2]+M(j,12)|0;d=G[l+4>>2];if(!d){break o}c=0;p:{if((d|0)<=0){break p}while(1){g=0;f=1;q:{q=G[G[l>>2]+(c<<2)>>2];e=G[a+544>>2]+(q<<2)|0;if(H[e|0]&3){break q}d=G[e>>2];r:{if(d>>>0<32){break r}i=e+4|0;o=d>>>5|0;h=H[14116];n=h&2;m=(h^-1)>>>1&1;p=G[a+332>>2];d=0;while(1){k=G[i+(d<<2)>>2];g=H[p+(k>>1)|0];k=m&(h|0)==(g^k&1)|g&n;g=(k|0)!=0;if(k){break r}d=d+1|0;if((o|0)!=(d|0)){continue}break}}if(g){break q}h=G[a+284>>2];f=G[a+296>>2];s:{if((f|0)!=G[a+300>>2]){d=G[a+292>>2];break s}d=f>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(f^2147483647)>>>0){break a}d=d+f|0;G[a+300>>2]=d;d=ed(G[a+292>>2],d<<2);G[a+292>>2]=d;if(!d){break a}f=G[a+296>>2]}G[a+296>>2]=f+1;G[(f<<2)+d>>2]=h;d=-2;g=G[e>>2];if(g>>>0>=32){o=e+4|0;f=0;while(1){h=G[o+(f<<2)>>2];i=h>>1;t:{if((i|0)==(j|0)){d=h;break t}n=H[i+G[a+332>>2]|0];i=H[14633];if((n^h&1)==(i|0)&((i^-1)&254)>>>1|i&n&2){d=h;break t}ab(a,h^1);g=G[e>>2]}f=f+1|0;if(f>>>0<g>>>5>>>0){continue}break}}f=0;h=Za(a);cb(a,0);if((h|0)!=-1){G[a+712>>2]=G[a+712>>2]+1;if(!Db(a,q,d)){break q}}f=1;break q}if(f){c=c+1|0;if((c|0)<G[l+4>>2]){continue}break p}break}e=0;break o}e=yb(a,0)}if(!e){break l}E[j+G[a+876>>2]|0]=(r|0)!=0}u:{if(H[a+706|0]!=1){break u}d=H[j+G[a+332>>2]|0];c=H[14634];if(H[j+G[a+876>>2]|0]|!((d|0)==(c|0)&((c^-1)&254)>>>1|c&d&2)){break u}c=0;e=0;r=0;q=0;o=0;p=0;n=0;f=j+G[a+776>>2]|0;if(H[f|0]){d=G[a+760>>2]+M(j,12)|0;h=G[d+4>>2];v:{if((h|0)<=0){break v}g=G[d>>2];l=G[G[a+804>>2]>>2];while(1){i=G[g+(c<<2)>>2];if((G[l+(i<<2)>>2]&3)!=1){G[g+(e<<2)>>2]=i;e=e+1|0;h=G[d+4>>2]}c=c+1|0;if((h|0)>(c|0)){continue}break}c=c-e|0;if((c|0)<=0){break v}G[d+4>>2]=h-c}E[f|0]=0}m=G[a+760>>2]+M(j,12)|0;w:{x:{y:{z:{if(G[m+4>>2]<=0){e=0;l=0;d=0;break z}i=j<<1;g=0;l=0;d=0;h=0;A:{while(1){f=0;B:{e=h;t=G[m>>2]+(o<<2)|0;k=G[t>>2];s=G[a+544>>2]+(k<<2)|0;u=G[s>>2];c=d;C:{if(u>>>0<=31){break C}e=s+4|0;s=u>>>5|0;c=0;D:{while(1){u=G[e+(c<<2)>>2];f=(u|0)==(i|0);if((i|0)==(u|0)){break D}c=c+1|0;if((s|0)!=(c|0)){continue}break}e=h;c=d;break C}e=g;c=l}E:{if((c|0)!=(e|0)){e=f?r:q;break E}e=c>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(c^2147483647)>>>0){break B}e=c+e|0;k=e<<2;F:{if(f){g=e;e=ed(r,k);r=e;break F}h=e;e=ed(q,k);q=e}if(!e){break B}k=G[t>>2]}G[(c<<2)+e>>2]=k;c=c+1|0;l=f?c:l;d=f?d:c;o=o+1|0;c=G[m+4>>2];if((o|0)>=(c|0)){break A}continue}break}break a}e=1;if((l|0)<=0){e=0;break z}if((d|0)<=0){break z}u=c+G[a+684>>2]|0;f=G[a+688>>2];o=G[a+544>>2];i=G[a+708>>2];while(1){x=(n<<2)+r|0;e=0;while(1){c=G[(e<<2)+q>>2];h=G[x>>2];i=i+1|0;G[a+708>>2]=i;g=o+(h<<2)|0;k=G[g>>2];t=o+(c<<2)|0;s=G[t>>2];c=k>>>5>>>0<s>>>5>>>0;y=c?s:k;A=y>>>5|0;h=A-1|0;k=c?k:s;G:{if(k>>>0>=32){s=(c?g:t)+4|0;t=(c?t:g)+4|0;k=k>>>5|0;g=0;while(1){C=G[s+(g<<2)>>2];D=C>>1;H:{if((D|0)==(j|0)){break H}c=0;I:{if(y>>>0>=32){while(1){F=G[t+(c<<2)>>2];if((D|0)==F>>1){break I}c=c+1|0;if((A|0)!=(c|0)){continue}break}}h=h+1|0;break H}if((C^F)==1){break G}}g=g+1|0;if((k|0)!=(g|0)){continue}break}}c=1;if((p|0)>=(u|0)){break y}p=p+1|0;if((f|0)==-1){break G}if((f|0)<(h|0)){break y}}e=e+1|0;if((e|0)!=(d|0)){continue}break}e=1;n=n+1|0;if((n|0)!=(l|0)){continue}break}}E[j+G[a+904>>2]|0]=1;h=j+G[a+380>>2]|0;if(H[h|0]){c=G[a+200>>2];g=G[a+204>>2]-!c|0;c=c-1|0;G[a+200>>2]=c;G[a+204>>2]=g}E[h|0]=0;if(!(!H[j+G[a+380>>2]|0]|(j|0)<G[a+476>>2]&G[G[a+472>>2]+(j<<2)>>2]>=0)){Xa(a+460|0,j)}G[a+716>>2]=G[a+716>>2]+1;J:{if((d|0)>=(l|0)){if(e){h=a+732|0;c=0;while(1){Eb(h,j,G[a+544>>2]+(G[(c<<2)+r>>2]<<2)|0);c=c+1|0;if((l|0)!=(c|0)){continue}break}}Fb(a+732|0,j<<1|1);break J}if((d|0)>0){h=a+732|0;c=0;while(1){Eb(h,j,G[a+544>>2]+(G[(c<<2)+q>>2]<<2)|0);c=c+1|0;if((d|0)!=(c|0)){continue}break}}Fb(a+732|0,j<<1)}c=0;if(G[m+4>>2]>0){while(1){Cb(a,G[G[m>>2]+(c<<2)>>2]);c=c+1|0;if((c|0)<G[m+4>>2]){continue}break}}if(!(!e|(d|0)<=0)){g=a+628|0;h=0;while(1){t=(h<<2)+r|0;c=0;while(1){f=G[a+544>>2];e=f+(G[t>>2]<<2)|0;f=f+(G[(c<<2)+q>>2]<<2)|0;G[a+708>>2]=G[a+708>>2]+1;i=G[g>>2];if(i){G[g+4>>2]=0}m=G[e>>2];p=G[f>>2];n=m>>>5>>>0<p>>>5>>>0;o=n?f:e;K:{k=n?m:p;if(k>>>0<32){e=n?p:m}else{m=o+4|0;p=n?e:f;s=p+4|0;e=0;L:{while(1){M:{n=G[s+(e<<2)>>2];u=n>>1;N:{if((u|0)==(j|0)){break N}O:{f=G[o>>2];if(f>>>0<32){break O}x=f>>>5|0;f=0;while(1){y=G[m+(f<<2)>>2];if((u|0)!=y>>1){f=f+1|0;if((x|0)!=(f|0)){continue}break O}break}if((n^y)!=1){break N}f=0;break K}f=G[g+4>>2];if((f|0)==G[g+8>>2]){k=f>>1&-2;k=((k|0)>0?k:0)+2|0;if(k>>>0>(f^2147483647)>>>0){break M}f=f+k|0;G[g+8>>2]=f;i=ed(i,f<<2);G[g>>2]=i;if(!i){break M}f=G[g+4>>2]}G[g+4>>2]=f+1;G[(f<<2)+i>>2]=n;k=G[p>>2]}e=e+1|0;if(e>>>0<k>>>5>>>0){continue}break L}break}break a}e=G[o>>2]}f=1;if(e>>>0<32){break K}n=o+4|0;f=0;P:{while(1){m=G[n+(f<<2)>>2];if((j|0)!=m>>1){e=G[g+4>>2];if((e|0)==G[g+8>>2]){p=e>>1&-2;p=((p|0)>0?p:0)+2|0;if(p>>>0>(e^2147483647)>>>0){break P}e=e+p|0;G[g+8>>2]=e;i=ed(i,e<<2);G[g>>2]=i;if(!i){break P}e=G[g+4>>2]}G[g+4>>2]=e+1;G[(e<<2)+i>>2]=m;e=G[o>>2]}f=f+1|0;if(f>>>0<e>>>5>>>0){continue}break}f=1;break K}break a}Q:{if(!f){break Q}if(Ab(a,g)){break Q}c=0;break x}c=c+1|0;if((d|0)!=(c|0)){continue}break}h=h+1|0;if((l|0)!=(h|0)){continue}break}}c=G[a+760>>2]+M(j,12)|0;d=G[c>>2];if(d){G[c+4>>2]=0;dd(d);G[c+8>>2]=0;G[c>>2]=0}h=j<<1;c=G[a+412>>2];d=c+M(j,24)|0;R:{if(G[d+4>>2]){break R}e=G[d>>2];if(!e){break R}G[d+4>>2]=0;dd(e);G[d+8>>2]=0;G[d>>2]=0;c=G[a+412>>2]}c=M(h|1,12)+c|0;S:{if(G[c+4>>2]){break S}d=G[c>>2];if(!d){break S}G[c+4>>2]=0;dd(d);G[c+8>>2]=0;G[c>>2]=0}c=yb(a,0)}if(!q){break w}}dd(q)}if(r){dd(r)}if(c){break u}E[a+492|0]=0;break c}if(!(+J[a+556>>2]>L[a+696>>3]*+J[a+548>>2])){break m}pa[G[G[a>>2]+8>>2]](a)}v=v+1|0;c=G[a+828>>2];if(!c){continue e}continue}break}break}E[a+492|0]=0;break c}d=G[z>>2];T:{if((c|0)>0){h=G[a+836>>2];c=0;while(1){G[h+(G[d+(c<<2)>>2]<<2)>>2]=-1;c=c+1|0;if((c|0)<G[a+828>>2]){continue}break}break T}if(!d){break c}}G[a+828>>2]=0}U:{V:{if(b){b=G[a+744>>2];if(b){G[a+748>>2]=0;dd(b);G[a+752>>2]=0;G[a+744>>2]=0}c=0;if(G[a+760>>2]){e=G[a+764>>2];if((e|0)>0){while(1){b=G[a+760>>2]+M(c,12)|0;d=G[b>>2];if(d){G[b+4>>2]=0;dd(d);G[b+8>>2]=0;G[b>>2]=0;e=G[a+764>>2]}c=c+1|0;if((e|0)>(c|0)){continue}break}}G[a+764>>2]=0;dd(G[a+760>>2]);G[a+768>>2]=0;G[a+760>>2]=0}b=G[a+776>>2];if(b){G[a+780>>2]=0;dd(b);G[a+776>>2]=0;G[a+784>>2]=0}b=G[a+792>>2];if(b){G[a+796>>2]=0;dd(b);G[a+800>>2]=0;G[a+792>>2]=0}b=G[a+808>>2];if(b){G[a+812>>2]=0;dd(b);G[a+816>>2]=0;G[a+808>>2]=0}b=G[a+824>>2];W:{X:{if(G[a+828>>2]>0){d=G[a+836>>2];c=0;while(1){G[d+(G[b+(c<<2)>>2]<<2)>>2]=-1;c=c+1|0;if((c|0)<G[a+828>>2]){continue}break}break X}if(!b){break W}}G[a+828>>2]=0;dd(b);G[a+832>>2]=0;G[a+824>>2]=0}b=G[a+856>>2];if(b){G[a+860>>2]=0;dd(b);G[a+864>>2]=0;G[a+856>>2]=0}qb(a+856|0,1);G[a+868>>2]=0;G[a+872>>2]=0;E[a+724|0]=0;E[a+560|0]=0;E[a+536|0]=1;G[a+728>>2]=G[a+540>>2];gb(a);break V}if(!(+J[a+556>>2]>L[a+96>>3]*+J[a+548>>2])){break U}}pa[G[G[a>>2]+8>>2]](a)}Y:{if(G[a+44>>2]<=0){break Y}b=G[a+736>>2];if((b|0)<=0){break Y}L[w>>3]=+(b<<2>>>0)*9.5367431640625e-7;uc(3944,w)}c=H[a+492|0]}la=w+32|0;return c&1}Y(ud()|0,1024,0);B()}function lc(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0;x=la-16|0;la=x;G[x+12>>2]=c;e=b;w=c;j=la-304|0;la=j;a:{b:{d=a;if(!G[a+4>>2]){_b(a);if(!G[a+4>>2]){break b}}b=H[e|0];if(!b){break a}c:{d:{while(1){e:{a=b&255;f:{if((a|0)==32|a-9>>>0<5){while(1){b=e;e=e+1|0;a=H[b+1|0];if((a|0)==32|a-9>>>0<5){continue}break}Gc(d,0,0);while(1){a=G[d+4>>2];g:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break g}a=Hc(d)}if((a|0)==32|a-9>>>0<5){continue}break}e=G[d+4>>2];a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){e=e-1|0;G[d+4>>2]=e}a=e-G[d+44>>2]|0;c=a;g=r+G[d+124>>2]|0;e=a>>31;a=o+G[d+120>>2]|0;g=e+(a>>>0<o>>>0?g+1|0:g)|0;o=a+c|0;r=o>>>0<a>>>0?g+1|0:g;break f}h:{i:{j:{if((a|0)==37){a=H[e+1|0];if((a|0)==42){break j}if((a|0)!=37){break i}}Gc(d,0,0);k:{if(H[e|0]==37){while(1){a=G[d+4>>2];l:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;b=H[a|0];break l}b=Hc(d)}if((b|0)==32|b-9>>>0<5){continue}break}e=e+1|0;break k}a=G[d+4>>2];if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;b=H[a|0];break k}b=Hc(d)}if(H[e|0]!=(b|0)){a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}if(v|(b|0)>=0){break a}break b}a=G[d+4>>2]-G[d+44>>2]|0;c=a;f=a>>31;a=r+G[d+124>>2]|0;b=o+G[d+120>>2]|0;h=(b>>>0<o>>>0?a+1|0:a)+f|0;o=b+c|0;r=o>>>0<b>>>0?h+1|0:h;b=e;break f}l=0;b=e+2|0;break h}a=a-48|0;if(!(H[e+2|0]!=36|a>>>0>9)){b=la-16|0;G[b+12>>2]=w;a=a>>>0>1?((a<<2)+w|0)-4|0:w;G[b+8>>2]=a+4;l=G[a>>2];b=e+3|0;break h}l=G[w>>2];w=w+4|0;b=e+1|0}q=0;c=0;e=H[b|0];if((e-48&255)>>>0<=9){while(1){c=(M(c,10)+(e&255)|0)-48|0;e=H[b+1|0];b=b+1|0;if((e-48&255)>>>0<10){continue}break}}if((e&255)==109){n=0;q=(l|0)!=0;e=H[b+1|0];k=0;b=b+1|0}f=b;b=f+1|0;a=3;m:{n:{switch((e&255)-65|0){case 39:a=H[f+1|0]==104;b=a?f+2|0:b;a=a?-2:-1;break m;case 43:a=H[f+1|0]==108;b=a?f+2|0:b;a=a?3:1;break m;case 51:case 57:a=1;break m;case 11:a=2;break m;case 0:case 2:case 4:case 5:case 6:case 18:case 23:case 26:case 32:case 34:case 35:case 36:case 37:case 38:case 40:case 45:case 46:case 47:case 50:case 52:case 55:break n;case 41:break m;default:break d}}a=0;b=f}f=a;a=H[b|0];e=(a&47)==3;s=e?1:f;p=e?a|32:a;o:{if((p|0)==91){break o}p:{if((p|0)!=110){if((p|0)!=99){break p}c=(c|0)<=1?1:c;break o}Yc(l,s,o,r);break f}Gc(d,0,0);while(1){a=G[d+4>>2];q:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break q}a=Hc(d)}if((a|0)==32|a-9>>>0<5){continue}break}e=G[d+4>>2];a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){e=e-1|0;G[d+4>>2]=e}a=e-G[d+44>>2]|0;e=a;g=r+G[d+124>>2]|0;f=a>>31;a=o+G[d+120>>2]|0;r=f+(a>>>0<o>>>0?g+1|0:g)|0;o=a+e|0;r=o>>>0<a>>>0?r+1|0:r}m=c;t=c>>31;Gc(d,c,t);a=G[d+4>>2];r:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;break r}if((Hc(d)|0)<0){break d}}a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}e=16;s:{t:{u:{v:{w:{x:{y:{switch(p-88|0){default:a=p-65|0;if(a>>>0>6|!(1<<a&113)){break s}case 9:case 13:case 14:case 15:Mc(j+8|0,d,s,0);a=G[d+4>>2]-G[d+44>>2]|0;if(G[d+120>>2]==(0-a|0)&G[d+124>>2]==(0-((a>>31)+((a|0)!=0)|0)|0)){break c}if(!l){break s}c=G[j+16>>2];g=G[j+20>>2];f=G[j+8>>2];m=G[j+12>>2];switch(s|0){case 0:break w;case 1:break v;case 2:break u;default:break s};case 3:case 11:case 27:if((p|16)==115){Wb(j+32|0,-1,257);E[j+32|0]=0;if((p|0)!=115){break t}E[j+65|0]=0;E[j+46|0]=0;F[j+42>>1]=0;F[j+44>>1]=0;break t}e=H[b+1|0];f=(e|0)==94;Wb(j+32|0,f,257);E[j+32|0]=0;a=f?b+2|0:b+1|0;z:{A:{B:{b=H[(f?2:1)+b|0];if((b|0)!=45){if((b|0)==93){break B}i=(e|0)!=94;break z}i=(e|0)!=94;E[j+78|0]=i;break A}i=(e|0)!=94;E[j+126|0]=i}a=a+1|0}b=a;while(1){a=H[b|0];C:{if((a|0)!=45){if(!a){break d}if((a|0)==93){break t}break C}a=45;f=H[b+1|0];if(!f|(f|0)==93){break C}g=b+1|0;e=H[b-1|0];D:{if(f>>>0<=e>>>0){a=f;break D}while(1){e=e+1|0;E[e+(j+32|0)|0]=i;a=H[g|0];if(e>>>0<a>>>0){continue}break}}b=g}E[((j+32|0)+a|0)+1|0]=i;b=b+1|0;continue};case 23:e=8;break x;case 12:case 29:e=10;break x;case 0:case 24:case 32:break x;case 1:case 2:case 4:case 5:case 6:case 7:case 8:case 10:case 16:case 18:case 19:case 20:case 21:case 22:case 25:case 26:case 28:case 30:case 31:break s;case 17:break y}}e=0}f=0;g=0;c=0;h=0;m=0;u=la-16|0;la=u;E:{if(!((e|0)!=1&e>>>0<=36)){G[3719]=28;break E}while(1){a=G[d+4>>2];F:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break F}a=Hc(d)}if((a|0)==32|a-9>>>0<5){continue}break}G:{H:{switch(a-43|0){case 0:case 2:break H;default:break G}}m=(a|0)==45?-1:0;a=G[d+4>>2];if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break G}a=Hc(d)}I:{J:{K:{L:{if(!((e|0)!=0&(e|0)!=16|(a|0)!=48)){a=G[d+4>>2];M:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break M}a=Hc(d)}if((a&-33)==88){e=16;a=G[d+4>>2];N:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break N}a=Hc(d)}if(H[a+12881|0]<16){break K}a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}Gc(d,0,0);break E}if(e){break L}e=8;break K}e=e?e:10;if(e>>>0>H[a+12881|0]){break L}a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}Gc(d,0,0);G[3719]=28;break E}if((e|0)!=10){break K}c=a-48|0;if(c>>>0<=9){a=0;while(1){a=M(a,10)+c|0;e=a>>>0<429496729;c=G[d+4>>2];O:{if((c|0)!=G[d+104>>2]){G[d+4>>2]=c+1;c=H[c|0];break O}c=Hc(d)}c=c-48|0;if(e&c>>>0<=9){continue}break}f=a}if(c>>>0>9){break I}e=Od(f,0,10,0);i=oa;while(1){P:{g=i;f=c+e|0;g=f>>>0<c>>>0?g+1|0:g;c=(g|0)==429496729&f>>>0<2576980378|g>>>0<429496729;a=G[d+4>>2];Q:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break Q}a=Hc(d)}h=a-48|0;if(!(c&h>>>0<=9)){if(h>>>0<=9){break P}break I}e=Od(f,g,10,0);i=oa;c=h;if((i|0)==-1&(c^-1)>>>0>=e>>>0|(i|0)!=-1){continue}}break}e=10;break J}if(e-1&e){h=H[a+12881|0];if(h>>>0<e>>>0){while(1){c=M(c,e)+h|0;f=c>>>0<119304647;a=G[d+4>>2];R:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break R}a=Hc(d)}h=H[a+12881|0];if(f&h>>>0<e>>>0){continue}break}f=c}if(e>>>0<=h>>>0){break J}while(1){c=Od(f,g,e,0);i=oa;h=h&255;if((i|0)==-1&(h^-1)>>>0<c>>>0){break J}g=i;f=c+h|0;g=f>>>0<h>>>0?g+1|0:g;c=e;a=G[d+4>>2];S:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break S}a=Hc(d)}h=H[a+12881|0];if(c>>>0<=h>>>0){break J}pd(u,e,0,0,0,f,g,0,0);if(!(G[u+8>>2]|G[u+12>>2])){continue}break}break J}i=E[(M(e,23)>>>5&7)+13137|0];c=H[a+12881|0];if(e>>>0>c>>>0){while(1){a=h<<i;h=a|c;f=a>>>0<134217728;a=G[d+4>>2];T:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break T}a=Hc(d)}c=H[a+12881|0];if(f&e>>>0>c>>>0){continue}break}f=h}if(c>>>0>=e>>>0){break J}t=i&31;if((i&63)>>>0>=32){h=0;t=-1>>>t|0}else{h=-1>>>t|0;t=h|(1<<t)-1<<32-t}if(!h&f>>>0>t>>>0){break J}while(1){y=c&255;c=f;a=i&31;if((i&63)>>>0>=32){g=c<<a;a=0}else{g=(1<<a)-1&c>>>32-a|g<<a;a=c<<a}f=y|a;a=G[d+4>>2];U:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break U}a=Hc(d)}c=H[a+12881|0];if(e>>>0<=c>>>0){break J}if((g|0)==(h|0)&f>>>0<=t>>>0|g>>>0<h>>>0){continue}break}}if(H[a+12881|0]>=e>>>0){break I}while(1){a=G[d+4>>2];V:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break V}a=Hc(d)}if(H[a+12881|0]<e>>>0){continue}break}G[3719]=68;m=0;f=-1;g=-1}a=G[d+116>>2];if((a|0)>0){a=1}else{a=(a|0)>=0}if(a){G[d+4>>2]=G[d+4>>2]-1}W:{if((f&g)!=-1){break W}}a=f^m;f=a-m|0;c=m>>31;g=(c^g)-((a>>>0<m>>>0)+c|0)|0}la=u+16|0;a=G[d+4>>2]-G[d+44>>2]|0;if(G[d+120>>2]==(0-a|0)&G[d+124>>2]==(0-((a>>31)+((a|0)!=0)|0)|0)){break c}if(!(!l|(p|0)!=112)){G[l>>2]=f;break s}Yc(l,s,f,g);break s}h=la-32|0;la=h;e=g&65535;a=0;i=g>>>16&32767;X:{if(i-16257>>>0<=253){a=(e&33554431)<<7|c>>>25;e=0;c=c&33554431;Y:{if(!(!e&(c|0)==16777216?!(f|m):!e&c>>>0<16777216)){a=a+1|0;break Y}if(c^16777216|f|(e|m)){break Y}a=(a&1)+a|0}c=a>>>0>8388607;a=c?0:a;e=i+(c?-16255:-16256)|0;break X}if(!(!(c|f|(e|m))|((i|0)!=32767|(a|0)!=0))){a=(e&33554431)<<7|c>>>25|4194304;e=255;break X}if(i>>>0>16510){e=255;break X}q=!(a|i);s=q?16256:16257;p=s-i|0;if((p|0)>112){e=0;break X}a=c;c=q?e:e|65536;gd(h+16|0,f,m,a,c,128-p|0);nd(h,f,m,a,c,p);a=G[h+8>>2];c=a;a=(G[h+12>>2]&33554431)<<7|a>>>25;f=G[h>>2]|(i|0)!=(s|0)&(G[h+16>>2]|G[h+24>>2]|(G[h+20>>2]|G[h+28>>2]))!=0;m=G[h+4>>2];e=0;c=c&33554431;Z:{if(!(!e&(c|0)==16777216?!(f|m):!e&c>>>0<16777216)){a=a+1|0;break Z}if(c^16777216|f|(e|m)){break Z}a=(a&1)+a|0}e=a>>>0>8388607;a=e?a^8388608:a}la=h+32|0;G[l>>2]=g&-2147483648|e<<23|a;break s}z=l,A=rd(f,m,c,g),L[z>>3]=A;break s}G[l>>2]=f;G[l+4>>2]=m;G[l+8>>2]=c;G[l+12>>2]=g;break s}u=(p|0)!=99;i=u?31:c+1|0;_:{if((s|0)==1){c=l;if(q){c=ad(i<<2);if(!c){break e}}G[j+296>>2]=0;G[j+300>>2]=0;e=0;$:{aa:{while(1){a=c;while(1){c=G[d+4>>2];ba:{if((c|0)!=G[d+104>>2]){G[d+4>>2]=c+1;c=H[c|0];break ba}c=Hc(d)}if(!H[(c+j|0)+33|0]){break aa}E[j+27|0]=c;f=j+28|0;c=j+296|0;g=c?c:25240;c=G[g>>2];ca:{da:{k=j+27|0;ea:{fa:{if(!k){if(c){break fa}c=0;break ca}ga:{if(c){h=1;break ga}c=H[k|0];k=c<<24>>24;if((k|0)>=0){if(f){G[f>>2]=c}c=(k|0)!=0;break ca}if(!G[G[3760]>>2]){c=1;if(!f){break ea}G[f>>2]=k&57343;c=1;break ca}c=c-194|0;if(c>>>0>50){break fa}c=G[(c<<2)+13152>>2];break da}n=H[k|0];s=n>>>3|0;if((s-16|(c>>26)+s)>>>0>7){break fa}while(1){h=h-1|0;c=(n&255)-128|c<<6;if((c|0)>=0){G[g>>2]=0;if(f){G[f>>2]=c}c=1-h|0;break ca}if(!h){break da}k=k+1|0;n=E[k|0];if((n|0)<-64){continue}break}}G[g>>2]=0;G[3719]=25;c=-1}break ca}G[g>>2]=c;c=-2}if((c|0)==-2){continue}if((c|0)==-1){n=0;break $}if(a){G[(e<<2)+a>>2]=G[j+28>>2];e=e+1|0}if(!q|(e|0)!=(i|0)){continue}break}i=i<<1|1;c=ed(a,i<<2);if(c){continue}break}n=0;k=a;q=1;break d}n=0;c=j+296|0;if(c){c=G[c>>2]}else{c=0}k=a;if(!c){break _}}k=a;break d}if(q){e=0;c=ad(i);if(!c){break e}while(1){a=c;while(1){c=G[d+4>>2];ha:{if((c|0)!=G[d+104>>2]){G[d+4>>2]=c+1;c=H[c|0];break ha}c=Hc(d)}if(!H[(c+j|0)+33|0]){n=a;k=0;break _}E[a+e|0]=c;e=e+1|0;if((i|0)!=(e|0)){continue}break}i=i<<1|1;c=ed(a,i);if(c){continue}break}k=0;n=a;q=1;break d}e=0;if(l){while(1){a=G[d+4>>2];ia:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break ia}a=Hc(d)}if(H[(a+j|0)+33|0]){E[e+l|0]=a;e=e+1|0;continue}else{a=l;n=a;k=0;break _}}}while(1){a=G[d+4>>2];ja:{if((a|0)!=G[d+104>>2]){G[d+4>>2]=a+1;a=H[a|0];break ja}a=Hc(d)}if(H[(a+j|0)+33|0]){continue}break}a=0;n=0;k=0}c=G[d+4>>2];f=G[d+116>>2];if((f|0)>0){f=1}else{f=(f|0)>=0}if(f){c=c-1|0;G[d+4>>2]=c}f=c-G[d+44>>2]|0;c=f+G[d+120>>2]|0;g=G[d+124>>2]+(f>>31)|0;g=c>>>0<f>>>0?g+1|0:g;if(!(g|c)|!(u|(c|0)==(m|0)&(g|0)==(t|0))){break c}if(q){G[l>>2]=a}if((p|0)==99){break s}if(k){G[(e<<2)+k>>2]=0}if(!n){n=0;break s}E[e+n|0]=0}a=G[d+4>>2]-G[d+44>>2]|0;e=a;f=a>>31;a=r+G[d+124>>2]|0;c=o+G[d+120>>2]|0;h=(c>>>0<o>>>0?a+1|0:a)+f|0;o=c+e|0;r=o>>>0<c>>>0?h+1|0:h;v=((l|0)!=0)+v|0}e=b+1|0;b=H[b+1|0];if(b){continue}break a}break}q=1;n=0;k=0}v=v?v:-1}if(!q){break a}dd(n);dd(k);break a}v=-1}la=j+304|0;la=x+16|0;return v}function Aa(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,C=0,D=0;c=la-1424|0;la=c;G[c+1248>>2]=a;G[3716]=5030;h=Ba(c+1216|0,2290,3330,2322,2401);G[h+28>>2]=1;G[h+20>>2]=0;G[h+24>>2]=2;G[h>>2]=5576;j=Ba(c+1192|0,2043,3038,2322,2376);E[j+20|0]=1;G[j>>2]=5688;o=Ba(c+1168|0,2037,3080,2322,2376);E[o+20|0]=1;G[o>>2]=5688;i=Ba(c+1144|0,1655,3260,2322,2383);G[i+20>>2]=0;G[i>>2]=5748;k=Ba(c+1112|0,1942,4853,2322,2401);G[k+28>>2]=0;G[k+20>>2]=0;G[k+24>>2]=2147483647;G[k>>2]=5576;l=Ba(c+1080|0,1950,4768,2322,2401);G[l+28>>2]=0;G[l+20>>2]=0;G[l+24>>2]=2147483647;G[l>>2]=5576;u=Ba(c+1056|0,1559,3132,2322,2376);E[u+20|0]=0;G[u>>2]=5688;g=la-16|0;la=g;a:{b:{r=c+1248|0;d=G[r>>2];if((d|0)>=2){e=1;a=1;while(1){f=a;c:{d:{e:{p=b+(a<<2)|0;a=G[p>>2];f:{if(H[a|0]!=45|H[a+1|0]!=45){break f}s=a+2|0;a=0;m=G[3440];d=H[m|0];if(d){while(1){if(H[a+s|0]!=(d&255)){break f}a=a+1|0;d=H[m+a|0];if(d){continue}break}}a=a+s|0;if(H[a|0]!=104|H[a+1|0]!=101|H[a+2|0]!=108){break f}if(H[a+3|0]==112){break e}}a=0;while(1){d=H[14112];if(!(d&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1;d=1}if(G[3526]<=(a|0)){break d}if(!(d&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}d=a<<2;a=a+1|0;d=G[G[3525]+d>>2];if(!(pa[G[G[d>>2]+8>>2]](d,G[p>>2])|0)){continue}break}break c}d=H[a+4|0];if((d|0)!=45){if(d){break c}Hb(b,0);B()}if(H[a+5|0]!=118|H[a+6|0]!=101|(H[a+7|0]!=114|H[a+8|0]!=98)){break c}Hb(b,1);B()}a=G[p>>2];if(H[a|0]==45){break b}G[b+(e<<2)>>2]=a;e=e+1|0}a=f+1|0;d=G[r>>2];if((a|0)<(d|0)){continue}break}a=(f^-1)+e|0}else{a=0}G[r>>2]=a+d;la=g+16|0;break a}a=a+1|0;G[p>>2]=a;G[g>>2]=a;G[g+4>>2]=G[3440];fc(G[3076],4892,g);X(1);B()}g=pb(c+120|0);qc(c+1272|0);f=G[c+1272>>2];r=G[c+1276>>2];s=G[c+1280>>2];if(!H[j+20|0]){wb(g,1)}G[g+44>>2]=G[h+28>>2];G[3524]=g;Jb(1);d=G[k+28>>2];if(d){a=la-16|0;la=a;g:{if(!d){break g}pc(a);if(!G[a+12>>2]&J[a+8>>2]<=d>>>0){break g}G[a>>2]=d;G[a+4>>2]=0;if((xc(0,a)|0)!=-1){break g}wc(3211)}la=a+16|0}e=G[l+28>>2];if(e){d=la-16|0;la=d;a=e>>31;h:{if(!(a|e)){break h}pc(d);a=a<<20|e>>>12;e=e<<20;h=G[d+12>>2];if((h|0)==(a|0)&J[d+8>>2]<=e>>>0|a>>>0>h>>>0){break h}G[d>>2]=e;G[d+4>>2]=a;if((xc(9,d)|0)!=-1){break h}wc(2649)}la=d+16|0}i:{if(G[c+1248>>2]==1){wc(2852);a=0;if(G[c+1248>>2]==1){break i}}a=G[b+4>>2]}p=ec(a,2292);if(!p){G[c>>2]=G[c+1248>>2]==1?2368:G[b+4>>2];tc(4439,c);X(1);B()}if(G[g+44>>2]>0){wc(2409);wc(1225)}j=H[u+20|0];G[c+1272>>2]=p;j:{a=ad(65536);if(!a&G[3719]==48){break j}z=+(s|0)/1e6+(+(f>>>0)+ +(r|0)*4294967296);G[c+1280>>2]=0;G[c+1276>>2]=a;d=kc(a,p);G[c+1284>>2]=d;G[c+1264>>2]=0;G[c+1256>>2]=0;G[c+1260>>2]=0;E[c+1255|0]=0;a=0;l=0;h=0;while(1){if((a|0)<(d|0)){f=G[c+1276>>2];e=H[f+a|0];k:{if(e>>>0<9){break k}k=G[c+1272>>2];while(1){e=e&255;if(e>>>0>=14&(e|0)!=32){break k}a=a+1|0;if((d|0)<=(a|0)){d=kc(f,k);a=0}if((a|0)>=(d|0)){break k}e=H[a+f|0];if(e>>>0>=9){continue}break}}G[c+1284>>2]=d;G[c+1280>>2]=a}if(!(H[c+1255|0]|(a|0)>=(d|0))){l:{m:{f=G[c+1276>>2];e=H[f+a|0]-99|0;if(e){if((e|0)!=13){break m}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;d=kc(f,G[c+1272>>2]);G[c+1284>>2]=d;a=0}n:{if(H[a+f|0]!=32|(a|0)>=(d|0)){break n}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;d=kc(f,G[c+1272>>2]);G[c+1284>>2]=d;a=0}if(H[a+f|0]!=99|(a|0)>=(d|0)){break n}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;d=kc(f,G[c+1272>>2]);G[c+1284>>2]=d;a=0}if(H[a+f|0]!=110|(a|0)>=(d|0)){break n}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;d=kc(f,G[c+1272>>2]);G[c+1284>>2]=d;a=0}if(H[a+f|0]!=102|(a|0)>=(d|0)){break n}a=a+1|0;G[c+1280>>2]=a;if((a|0)>=(d|0)){G[c+1280>>2]=0;C=c,D=kc(f,G[c+1272>>2]),G[C+1284>>2]=D}a=c+1272|0;f=c+1255|0;Da(a,f);l=Da(a,f);break l}G[c+112>>2]=(a|0)>=(d|0)?-1:H[a+f|0];tc(4578,c+112|0);E[c+1255|0]=1;break l}e=G[c+1272>>2];o:{while(1){a=a+1|0;if((d|0)<=(a|0)){d=kc(f,e);a=0}if((a|0)>=(d|0)){break o}if(H[a+f|0]!=10){continue}break}G[c+1284>>2]=d;a=a+1|0;G[c+1280>>2]=a;if((a|0)<(d|0)){break l}G[c+1280>>2]=0;C=c,D=kc(f,e),G[C+1284>>2]=D;break l}G[c+1284>>2]=d;G[c+1280>>2]=a;break l}E[c+1271|0]=0;if(G[c+1256>>2]){G[c+1260>>2]=0}e=Da(c+1272|0,c+1271|0);p:{if(!e){break p}while(1){if(H[c+1271|0]){break p}a=e>>31;a=(a^e)-a|0;if((a|0)>G[g+540>>2]){while(1){tb(g);if((a|0)>G[g+540>>2]){continue}break}}d=G[c+1260>>2];q:{if((d|0)!=G[c+1264>>2]){k=G[c+1256>>2];break q}f=d>>1&-2;f=((f|0)>0?f:0)+2|0;if(f>>>0>(d^2147483647)>>>0){break j}f=d+f|0;G[c+1264>>2]=f;k=ed(G[c+1256>>2],f<<2);G[c+1256>>2]=k;if(!k){break j}d=G[c+1260>>2]}G[c+1260>>2]=d+1;G[(d<<2)+k>>2]=(a<<1|(e|0)<=0)-2;e=Da(c+1272|0,c+1271|0);if(e){continue}break}}h=h+1|0;E[c+1255|0]=H[c+1271|0];Ab(g,c+1256|0)}d=G[c+1284>>2];a=G[c+1280>>2];continue}break}if(!(!(j&1)|(h|0)==(l|0))){wc(1594)}a=G[c+1256>>2];if(a){G[c+1260>>2]=0;dd(a)}dd(G[c+1276>>2]);Yb(p);k=0;if(G[c+1248>>2]>=3){k=ec(G[b+8>>2],2287)}if(G[g+44>>2]>0){G[c+96>>2]=G[g+540>>2];tc(4171,c+96|0);G[c+80>>2]=G[g+208>>2];tc(4244,c+80|0)}qc(c+1272|0);x=+G[c+1280>>2]/1e6+(+J[c+1272>>2]+ +G[c+1276>>2]*4294967296);if(G[g+44>>2]>0){L[c+64>>3]=x-z;uc(4096,c- -64|0)}Jb(2);wb(g,1);qc(c+1272|0);if(G[g+44>>2]>0){L[c+48>>3]=+G[c+1280>>2]/1e6+(+J[c+1272>>2]+ +G[c+1276>>2]*4294967296)-x;uc(4021,c+48|0);wc(1225)}if(!H[g+492|0]){if(k){nc(4619,6,1,k);Yb(k)}if(G[g+44>>2]>0){wc(2569);wc(1882);jb(g);vc()}wc(2340);X(20);B()}r:{if(H[o+20|0]==1){if(G[g+304>>2]){G[g+308>>2]=0}Fa(g+304|0,0);a=vb(g);break r}a=2;if(G[g+44>>2]<=0){break r}wc(2569)}b=G[i+20>>2];s:{if(!b|!(a&2)){break s}G[c+1280>>2]=0;G[c+1272>>2]=0;G[c+1276>>2]=0;u=la-16|0;la=u;p=ec(b,1676);if(!p){G[u>>2]=b;fc(G[3076],4415,u);X(1);B()}o=c+1272|0;h=0;l=0;r=0;f=la+-64|0;la=f;t:{u:{v:{if(!H[g+492|0]){nc(4748,19,1,p);break v}G[f+60>>2]=0;G[f+52>>2]=0;G[f+56>>2]=0;G[f+48>>2]=0;j=G[g+260>>2];if((j|0)<=0){b=0}else{b=H[14116];i=b&2;s=(b^-1)>>>1&1;m=G[g+332>>2];q=G[g+544>>2];n=G[g+256>>2];while(1){d=q+(G[n+(h<<2)>>2]<<2)|0;e=G[d>>2];w:{if(e>>>0>31){t=d+4|0;v=e>>>5|0;e=0;while(1){w=G[t+(e<<2)>>2];d=H[m+(w>>1)|0];if(s&(b|0)==(d^w&1)|d&i){break w}e=e+1|0;if((v|0)!=(e|0)){continue}break}}l=l+1|0}h=h+1|0;if((j|0)!=(h|0)){continue}break}h=0;d=0;b=0;x:{while(1){y:{s=G[g+544>>2]+(G[G[g+256>>2]+(d<<2)>>2]<<2)|0;i=G[s>>2];z:{if(i>>>0>=32){m=s+4|0;t=i>>>5|0;e=0;q=H[14116];v=q&2;w=(q^-1)>>>1&1;A=G[g+332>>2];while(1){y=G[m+(e<<2)>>2];n=H[(y>>1)+A|0];if(w&(q|0)==(n^y&1)|n&v){break z}e=e+1|0;if((t|0)!=(e|0)){continue}break}e=0;while(1){n=G[m+(e<<2)>>2];j=n>>1;q=H[j+G[g+332>>2]|0];t=q^n&1;n=H[14117];A:{if((t|0)==(n|0)&((n^-1)&254)>>>1|n&q&2){break A}q=G[f+56>>2];B:{if((q|0)>(j|0)){if(G[(j<<2)+b>>2]==-1){break B}break A}i=G[f+60>>2];C:{if((i|0)>(j|0)){break C}n=(j-i|0)+2&-2;t=(i>>1&-2)+2|0;n=(n|0)>(t|0)?n:t;if((n|0)>(i^2147483647)){break y}i=i+n|0;G[f+60>>2]=i;b=ed(b,i<<2);G[f+52>>2]=b;if(b){break C}b=0;if(G[3719]==48){break y}}i=j+1|0;Wb((q<<2)+b|0,255,i-q<<2);G[f+56>>2]=i}G[(j<<2)+b>>2]=h;h=h+1|0;i=G[s>>2]}e=e+1|0;if(e>>>0<i>>>5>>>0){continue}break}j=G[g+260>>2]}G[f+48>>2]=h}d=d+1|0;if((d|0)<(j|0)){continue}break x}break}break u}b=G[f+52>>2]}d=G[o+4>>2];G[f+32>>2]=h;s=d+l|0;G[f+36>>2]=s;fc(p,4565,f+32|0);D:{if(G[o+4>>2]<=0){break D}while(1){E:{l=G[f+56>>2];j=G[G[o>>2]+(r<<2)>>2];d=j>>1;F:{G:{if((l|0)>(d|0)){e=G[(d<<2)+b>>2];if((e|0)==-1){break G}e=e+1|0;break F}e=G[f+60>>2];H:{if((e|0)>(d|0)){break H}i=(d-e|0)+2&-2;m=(e>>1&-2)+2|0;i=(i|0)>(m|0)?i:m;if((i|0)>(e^2147483647)){break E}e=e+i|0;G[f+60>>2]=e;b=ed(b,e<<2);if(b){break H}b=0;if(G[3719]==48){break E}}e=d+1|0;Wb((l<<2)+b|0,255,e-l<<2);G[f+56>>2]=e}G[(d<<2)+b>>2]=h;e=h+1|0;h=e}G[f+20>>2]=e;G[f+16>>2]=j&1?3429:5566;fc(p,4740,f+16|0);r=r+1|0;if((r|0)<G[o+4>>2]){continue}break D}break}break u}G[f+48>>2]=h;G[f+52>>2]=b;if(G[g+260>>2]>0){e=0;while(1){j=f+52|0;b=0;h=la-16|0;la=h;i=G[g+544>>2]+(G[G[g+256>>2]+(e<<2)>>2]<<2)|0;d=G[i>>2];I:{if(d>>>0>=32){r=i+4|0;m=d>>>5|0;l=H[14116];q=l&2;n=(l^-1)>>>1&1;t=G[g+332>>2];while(1){v=G[r+(b<<2)>>2];o=H[t+(v>>1)|0];if(n&(l|0)==(o^v&1)|o&q){break I}b=b+1|0;if((m|0)!=(b|0)){continue}break}b=H[14117];l=0;while(1){m=G[r+(l<<2)>>2];o=m>>1;q=H[o+G[g+332>>2]|0];m=m&1;if(!(((b^-1)&254)>>>1&(b&255)==(q^m)|b&q&2)){d=m?3429:5566;J:{K:{if((o|0)>=G[j+4>>2]){break K}b=G[G[j>>2]+(o<<2)>>2];if((b|0)==-1){break K}b=b+1|0;break J}G[h+12>>2]=-1;ib(j,o+1|0,h+12|0);m=G[f+48>>2];b=m+1|0;G[f+48>>2]=b;G[G[j>>2]+(o<<2)>>2]=m}G[h+4>>2]=b;G[h>>2]=d;fc(p,3719,h);d=G[i>>2];b=H[14117]}l=l+1|0;if(l>>>0<d>>>5>>>0){continue}break}}nc(4765,2,1,p)}la=h+16|0;e=e+1|0;if((e|0)<G[g+260>>2]){continue}break}}if(G[g+44>>2]>0){G[f>>2]=G[f+48>>2];G[f+4>>2]=s;tc(4805,f)}b=G[f+52>>2];if(!b){break v}G[f+56>>2]=0;dd(b)}la=f- -64|0;break t}Y(ud()|0,1024,0);B()}Yb(p);la=u+16|0;b=G[c+1272>>2];if(!b){break s}G[c+1276>>2]=0;dd(b)}if(G[g+44>>2]>0){jb(g);vc()}b=a&255;L:{if(!b){tc(4643,0);a=10;if(!k){break L}nc(4621,4,1,k);d=G[g+540>>2];M:{if((d|0)<=0){break M}a=H[G[g+4>>2]];if(!(a&2)){G[c+40>>2]=1;G[c+32>>2]=5566;G[c+36>>2]=a?3429:5566;fc(k,2262,c+32|0);d=G[g+540>>2]}if((d|0)<2){break M}a=1;while(1){b=H[G[g+4>>2]+a|0];N:{if(b&2){a=a+1|0;break N}G[c+16>>2]=3740;a=a+1|0;G[c+24>>2]=a;G[c+20>>2]=b?3429:5566;fc(k,2262,c+16|0);d=G[g+540>>2]}if((a|0)<(d|0)){continue}break}}nc(4764,3,1,k);Yb(k);X(10);B()}tc((b|0)==1?4641:4626,0);if(k){nc((a&255)==1?4619:4612,6,1,k);Yb(k)}a=(a&255)==1?20:0}X(a|0);B()}Y(ud()|0,1024,0);B()}function jd(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,H=0,I=0,K=0,L=0,M=0,N=0,O=0,Q=0,R=0,S=0;k=la-336|0;la=k;m=h;n=i&65535;o=d;p=e&65535;s=(e^i)&-2147483648;x=i>>>16&32767;u=e>>>16&32767;a:{b:{if(x-32767>>>0>4294934529&u-32767>>>0>=4294934530){break b}j=e&2147483647;if(!(!d&(j|0)==2147418112?!(b|c):j>>>0<2147418112)){r=d;s=e|32768;break a}e=i&2147483647;if(!(!h&(e|0)==2147418112?!(f|g):e>>>0<2147418112)){r=h;s=i|32768;b=f;c=g;break a}if(!(b|d|(j^2147418112|c))){if(!(f|h|(e^2147418112|g))){b=0;c=0;s=2147450880;break a}s=s|2147418112;b=0;c=0;break a}if(!(f|h|(e^2147418112|g))){b=0;c=0;break a}if(!(b|d|(c|j))){b=!(f|h|(e|g));r=b?0:r;s=b?2147450880:s;b=0;c=0;break a}if(!(f|h|(e|g))){s=s|2147418112;b=0;c=0;break a}if((j|0)==65535|j>>>0<65535){d=!(o|p);i=d;j=d?b:o;d=d<<6;i=P(i?c:p);d=d+((i|0)==32?P(j)+32|0:i)|0;gd(k+320|0,b,c,o,p,d-15|0);q=16-d|0;o=G[k+328>>2];p=G[k+332>>2];c=G[k+324>>2];b=G[k+320>>2]}if(e>>>0>65535){break b}d=!(n|m);h=d;i=d?f:m;d=d<<6;h=P(h?g:n);d=d+((h|0)==32?P(i)+32|0:h)|0;gd(k+304|0,f,g,m,n,d-15|0);q=(d+q|0)-16|0;m=G[k+312>>2];n=G[k+316>>2];f=G[k+304>>2];g=G[k+308>>2]}e=n|65536;y=e;z=m;d=m;j=e<<15|d>>>17;e=d<<15|g>>>17;d=e;i=0-d|0;h=j;j=1963258675-(j+((d|0)!=0)|0)|0;pd(k+288|0,d,h,0,0,i,j,0,0);d=G[k+296>>2];pd(k+272|0,0-d|0,0-(G[k+300>>2]+((d|0)!=0)|0)|0,0,0,i,j,0,0);d=G[k+280>>2];i=d<<1|G[k+276>>2]>>>31;d=G[k+284>>2]<<1|d>>>31;pd(k+256|0,i,d,0,0,e,h,0,0);j=G[k+264>>2];pd(k+240|0,i,d,0,0,0-j|0,0-(G[k+268>>2]+((j|0)!=0)|0)|0,0,0);i=G[k+248>>2];j=i<<1|G[k+244>>2]>>>31;d=G[k+252>>2]<<1|i>>>31;pd(k+224|0,j,d,0,0,e,h,0,0);i=G[k+232>>2];pd(k+208|0,j,d,0,0,0-i|0,0-(G[k+236>>2]+((i|0)!=0)|0)|0,0,0);d=G[k+216>>2];i=d<<1|G[k+212>>2]>>>31;d=G[k+220>>2]<<1|d>>>31;pd(k+192|0,i,d,0,0,e,h,0,0);j=G[k+200>>2];pd(k+176|0,i,d,0,0,0-j|0,0-(G[k+204>>2]+((j|0)!=0)|0)|0,0,0);i=e;e=G[k+184>>2];d=h;m=e<<1|G[k+180>>2]>>>31;h=m-1|0;e=(G[k+188>>2]<<1|e>>>31)-!m|0;pd(k+160|0,i,d,0,0,h,e,0,0);d=h;pd(k+144|0,f<<15,g<<15|f>>>17,0,0,d,e,0,0);v=k+112|0;A=G[k+168>>2];h=G[k+172>>2];m=G[k+160>>2];i=G[k+152>>2];l=m+i|0;n=G[k+164>>2];j=n+G[k+156>>2]|0;j=i>>>0>l>>>0?j+1|0:j;i=j;j=(n|0)==(j|0)&l>>>0<m>>>0|j>>>0<n>>>0;n=j+A|0;j=j>>>0>n>>>0?h+1|0:h;m=!i&l>>>0>1|(i|0)!=0;h=n+m|0;j=m>>>0>h>>>0?j+1|0:j;pd(v,d,e,0,0,0-h|0,0-(((h|0)!=0)+j|0)|0,0,0);pd(k+128|0,1-l|0,0-((l>>>0>1)+i|0)|0,0,0,d,e,0,0);L=(u-x|0)+q|0;e=G[k+116>>2];u=e;d=G[k+112>>2];j=e<<1|d>>>31;i=d<<1;n=j;d=j;h=G[k+140>>2];w=h;e=G[k+136>>2];j=h<<1|e>>>31;l=e<<1|G[k+132>>2]>>>31;h=l+i|0;d=d+j|0;d=h>>>0<l>>>0?d+1|0:d;e=d;d=d-(h>>>0<13927)|0;t=d;v=d;l=0;j=p|65536;M=j;N=o;d=o;j=j<<1|d>>>31;Q=d<<1;R=j;E=j;d=Od(t,l,j,0);j=oa;B=d;C=j;H=b<<1;d=c<<1|b>>>31;x=d;A=d;j=0;q=j;m=h-13927|0;t=(e|0)==(t|0)&m>>>0<h>>>0|e>>>0>t>>>0;e=(e|0)==(n|0)&h>>>0<i>>>0|e>>>0<n>>>0;d=G[k+120>>2];h=G[k+124>>2]<<1|d>>>31;d=d<<1|u>>>31;l=w>>>31|0;d=l+d|0;j=h;j=d>>>0<l>>>0?j+1|0:j;h=d;d=d+e|0;j=h>>>0>d>>>0?j+1|0:j;e=d;d=d+t|0;l=e>>>0>d>>>0?j+1|0:j;e=d-1|0;D=l-!d|0;w=0;i=Od(A,q,D,w);d=i+B|0;h=oa+C|0;h=d>>>0<i>>>0?h+1|0:h;n=(C|0)==(h|0)&d>>>0<B>>>0|h>>>0<C>>>0;B=e;O=c>>>31|0;F=O|o<<1;t=0;e=Od(e,0,F,t);o=e+d|0;j=oa+h|0;l=0;j=e>>>0>o>>>0?j+1|0:j;p=j;d=(j|0)==(h|0)&d>>>0>o>>>0|h>>>0>j>>>0;e=d;d=d+n|0;l=e>>>0>d>>>0?1:l;e=Od(E,q,D,w);d=e+d|0;j=oa+l|0;n=d;d=d>>>0<e>>>0?j+1|0:j;e=Od(E,q,B,t);l=oa;h=e;e=Od(F,t,D,w);i=h+e|0;j=oa+l|0;j=e>>>0>i>>>0?j+1|0:j;e=j;j=(l|0)==(j|0)&h>>>0>i>>>0|j>>>0<l>>>0;l=n+e|0;d=d+j|0;d=l>>>0<e>>>0?d+1|0:d;n=l;l=d;e=0;d=e+o|0;j=i+p|0;j=d>>>0<e>>>0?j+1|0:j;e=j;h=(j|0)==(p|0)&d>>>0<o>>>0|j>>>0<p>>>0;j=l;i=h;h=h+n|0;j=i>>>0>h>>>0?j+1|0:j;u=h;l=j;o=d;C=m;d=Od(m,0,F,t);i=oa;h=d;m=Od(v,r,A,r);d=d+m|0;j=oa+i|0;j=d>>>0<m>>>0?j+1|0:j;m=(i|0)==(j|0)&d>>>0<h>>>0|i>>>0>j>>>0;h=j;I=H&-2;i=Od(B,t,I,0);p=i+d|0;j=oa+j|0;j=i>>>0>p>>>0?j+1|0:j;i=j;d=(j|0)==(h|0)&d>>>0>p>>>0|h>>>0>j>>>0;h=0;j=d+m|0;d=(j>>>0<d>>>0?1:h)+e|0;n=j+o|0;d=n>>>0<j>>>0?d+1|0:d;j=l;m=d;d=(d|0)==(e|0)&n>>>0<o>>>0|d>>>0<e>>>0;e=d;d=d+u|0;j=e>>>0>d>>>0?j+1|0:j;S=d;u=j;d=Od(E,q,C,r);K=oa;E=d;e=Od(D,w,I,r);d=d+e|0;j=oa+K|0;j=d>>>0<e>>>0?j+1|0:j;o=d;l=Od(v,r,F,t);e=d+l|0;h=j;d=j+oa|0;d=e>>>0<l>>>0?d+1|0:d;q=e;j=Od(A,r,B,t);e=e+j|0;l=oa+d|0;l=e>>>0<j>>>0?l+1|0:l;D=(d|0)==(l|0)&e>>>0<q>>>0|d>>>0>l>>>0;j=(h|0)==(K|0)&o>>>0<E>>>0|h>>>0<K>>>0;d=(d|0)==(h|0)&o>>>0>q>>>0|d>>>0<h>>>0;d=d+j|0;d=d+D|0;h=l;q=h+n|0;j=(d|w)+m|0;j=h>>>0>q>>>0?j+1|0:j;o=j;d=(m|0)==(j|0)&n>>>0>q>>>0|j>>>0<m>>>0;j=u;h=d;d=d+S|0;j=h>>>0>d>>>0?j+1|0:j;w=d;m=j;d=Od(v,r,I,r);v=oa;n=d;h=Od(A,r,C,r);d=d+h|0;j=oa+v|0;j=d>>>0<h>>>0?j+1|0:j;u=0;h=(j|0)==(v|0)&d>>>0<n>>>0|j>>>0<v>>>0;n=j;d=j+p|0;j=(h|u)+i|0;j=d>>>0<n>>>0?j+1|0:j;i=(i|0)==(j|0)&d>>>0<p>>>0|i>>>0>j>>>0;h=j;j=e;p=0;e=p+d|0;l=h+j|0;j=0;l=e>>>0<p>>>0?l+1|0:l;d=(h|0)==(l|0)&d>>>0>e>>>0|h>>>0>l>>>0;e=d;d=d+i|0;j=(e>>>0>d>>>0?1:j)+o|0;l=m;e=d;d=d+q|0;j=e>>>0>d>>>0?j+1|0:j;e=j;h=(o|0)==(j|0)&d>>>0<q>>>0|j>>>0<o>>>0;i=h;h=h+w|0;l=i>>>0>h>>>0?l+1|0:l;i=l;c:{if((l|0)==131071|l>>>0<131071){N=Q|O;M=t|R;pd(k+80|0,d,j,h,l,f,g,z,y);l=G[k+84>>2];q=l;j=b<<17;o=0;p=G[k+88>>2];c=o-p|0;b=G[k+80>>2];l=(l|b)!=0;m=c-l|0;n=(j-(G[k+92>>2]+(o>>>0<p>>>0)|0)|0)-(c>>>0<l>>>0)|0;p=0-(((b|0)!=0)+q|0)|0;q=L+16382|0;o=0-b|0;break c}d=(e&1)<<31|d>>>1;e=h<<31|e>>>1;h=(i&1)<<31|h>>>1;i=i>>>1|0;pd(k+96|0,d,e,h,i,f,g,z,y);m=G[k+100>>2];x=m;n=0;q=G[k+104>>2];o=n-q|0;l=G[k+96>>2];p=(m|l)!=0;m=o-p|0;n=((b<<16)-(G[k+108>>2]+(n>>>0<q>>>0)|0)|0)-(o>>>0<p>>>0)|0;p=0-(((l|0)!=0)+x|0)|0;H=b;x=c;q=L+16383|0;o=0-l|0}if((q|0)>=32767){s=s|2147418112;b=0;c=0;break a}d:{if((q|0)>0){b=m<<1|p>>>31;c=n<<1|m>>>31;m=h;n=i&65535|q<<16;l=p<<1|o>>>31;h=o<<1;break d}if((q|0)<=-113){b=0;c=0;break a}nd(k- -64|0,d,e,h,i,1-q|0);gd(k+48|0,H,x,N,M,q+112|0);d=G[k+64>>2];e=G[k+68>>2];m=G[k+72>>2];n=G[k+76>>2];pd(k+32|0,f,g,z,y,d,e,m,n);b=G[k+40>>2];c=G[k+56>>2];i=G[k+36>>2];p=b<<1|i>>>31;l=c-p|0;p=G[k+60>>2]-((G[k+44>>2]<<1|b>>>31)+(c>>>0<p>>>0)|0)|0;c=G[k+52>>2];q=c;b=G[k+32>>2];h=i<<1|b>>>31;o=b<<1;b=o;j=G[k+48>>2];c=(c|0)==(h|0)&b>>>0>j>>>0|c>>>0<h>>>0;b=l-c|0;c=p-(c>>>0>l>>>0)|0;l=q-((j>>>0<o>>>0)+h|0)|0;h=j-o|0}pd(k+16|0,f,g,z,y,3,0,0,0);pd(k,f,g,z,y,5,0,0,0);o=d;p=d&1;i=p;d=h+i|0;j=0;h=j+l|0;h=d>>>0<i>>>0?h+1|0:h;i=d;g=(g|0)==(h|0)&d>>>0>f>>>0|g>>>0<h>>>0;l=c;d=(h|0)==(j|0)&d>>>0<p>>>0|h>>>0<j>>>0;f=b+d|0;l=d>>>0>f>>>0?l+1|0:l;j=e;b=(l|0)==(y|0);b=b&(f|0)==(z|0)?g:b&f>>>0>z>>>0|l>>>0>y>>>0;c=b;b=b+o|0;j=c>>>0>b>>>0?j+1|0:j;c=j;d=(e|0)==(j|0)&b>>>0<o>>>0|e>>>0>j>>>0;j=n;e=d;d=d+m|0;j=e>>>0>d>>>0?j+1|0:j;g=d;e=G[k+20>>2];m=(e|0)==(h|0)&J[k+16>>2]<i>>>0|e>>>0<h>>>0;e=G[k+28>>2];d=G[k+24>>2];e=j>>>0<2147418112&((d|0)==(f|0)&(e|0)==(l|0)?m:(e|0)==(l|0)&d>>>0<f>>>0|e>>>0<l>>>0);d=c;m=e;e=b+e|0;d=m>>>0>e>>>0?d+1|0:d;b=(c|0)==(d|0)&b>>>0>e>>>0|c>>>0>d>>>0;c=b;b=b+g|0;j=c>>>0>b>>>0?j+1|0:j;g=b;c=G[k+4>>2];h=(c|0)==(h|0)&J[k>>2]<i>>>0|c>>>0<h>>>0;c=G[k+12>>2];b=G[k+8>>2];b=j>>>0<2147418112&((b|0)==(f|0)&(c|0)==(l|0)?h:(c|0)==(l|0)&b>>>0<f>>>0|c>>>0<l>>>0);c=b;b=b+e|0;l=c>>>0>b>>>0?d+1|0:d;c=l;e=(d|0)==(l|0)&b>>>0<e>>>0|d>>>0>l>>>0;d=j;f=e;e=e+g|0;d=f>>>0>e>>>0?d+1|0:d;r=e|r;s=d|s}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=r;G[a+12>>2]=s;la=k+336|0}function Qc(a,b,c,d,e,f,g){var h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0;j=la+-64|0;la=j;G[j+60>>2]=b;z=j+39|0;t=j+40|0;a:{b:{c:{d:{e:while(1){h=0;f:while(1){k=b;if((o^2147483647)<(h|0)){break d}o=h+o|0;g:{h:{i:{j:{h=b;i=H[h|0];if(i){while(1){k:{b=i&255;l:{if(!b){b=h;break l}if((b|0)!=37){break k}i=h;while(1){if(H[i+1|0]!=37){b=i;break l}h=h+1|0;m=H[i+2|0];b=i+2|0;i=b;if((m|0)==37){continue}break}}h=h-k|0;y=o^2147483647;if((h|0)>(y|0)){break d}if(a){Rc(a,k,h)}if(h){continue f}G[j+60>>2]=b;h=b+1|0;q=-1;i=E[b+1|0]-48|0;if(!(H[b+2|0]!=36|i>>>0>9)){x=1;q=i;h=b+3|0}G[j+60>>2]=h;n=0;i=E[h|0];b=i-32|0;m:{if(b>>>0>31){m=h;break m}m=h;b=1<<b;if(!(b&75913)){break m}while(1){m=h+1|0;G[j+60>>2]=m;n=b|n;i=E[h+1|0];b=i-32|0;if(b>>>0>=32){break m}h=m;b=1<<b;if(b&75913){continue}break}}n:{if((i|0)==42){b=E[m+1|0]-48|0;o:{if(!(H[m+2|0]!=36|b>>>0>9)){p:{if(!a){G[(b<<2)+e>>2]=10;b=0;break p}b=G[(b<<3)+d>>2]}p=b;b=m+3|0;i=1;break o}if(x){break j}b=m+1|0;if(!a){G[j+60>>2]=b;x=0;p=0;break n}h=G[c>>2];G[c>>2]=h+4;p=G[h>>2];i=0}x=i;G[j+60>>2]=b;if((p|0)>=0){break n}p=0-p|0;n=n|8192;break n}p=Sc(j+60|0);if((p|0)<0){break d}b=G[j+60>>2]}h=0;l=-1;u=0;q:{if(H[b|0]!=46){break q}if(H[b+1|0]==42){i=E[b+2|0]-48|0;r:{if(!(H[b+3|0]!=36|i>>>0>9)){b=b+4|0;s:{if(!a){G[(i<<2)+e>>2]=10;l=0;break s}l=G[(i<<3)+d>>2]}break r}if(x){break j}b=b+2|0;l=0;if(!a){break r}i=G[c>>2];G[c>>2]=i+4;l=G[i>>2]}G[j+60>>2]=b;u=(l|0)>=0;break q}G[j+60>>2]=b+1;l=Sc(j+60|0);b=G[j+60>>2];u=1}while(1){v=h;m=28;r=b;i=E[b|0];if(i-123>>>0<4294967238){break c}b=b+1|0;h=H[(i+M(h,58)|0)+12335|0];if((h-1&255)>>>0<8){continue}break}G[j+60>>2]=b;t:{if((h|0)!=27){if(!h){break c}if((q|0)>=0){if(!a){G[(q<<2)+e>>2]=h;continue e}h=(q<<3)+d|0;i=G[h+4>>2];G[j+48>>2]=G[h>>2];G[j+52>>2]=i;break t}if(!a){break g}Tc(j+48|0,h,c,g);break t}if((q|0)>=0){break c}h=0;if(!a){continue f}}if(H[a|0]&32){break b}i=n&-65537;n=n&8192?i:n;q=0;w=1375;m=t;u:{v:{w:{x:{y:{z:{A:{B:{C:{D:{E:{F:{G:{H:{I:{J:{K:{r=H[r|0];h=r<<24>>24;h=v?(r&15)==3?h&-45:h:h;switch(h-88|0){case 0:case 32:break G;case 1:case 2:case 3:case 4:case 5:case 6:case 7:case 8:case 10:case 16:case 18:case 19:case 20:case 21:case 25:case 26:case 28:case 30:case 31:break h;case 9:case 13:case 14:case 15:break u;case 11:break B;case 12:case 17:break E;case 22:break I;case 23:break F;case 24:break H;case 27:break A;case 29:break J;default:break K}}L:{switch(h-65|0){case 1:case 3:break h;case 0:case 4:case 5:case 6:break u;case 2:break z;default:break L}}if((h|0)==83){break y}break h}i=G[j+48>>2];r=G[j+52>>2];w=1375;break D}h=0;M:{switch(v|0){case 0:G[G[j+48>>2]>>2]=o;continue f;case 1:G[G[j+48>>2]>>2]=o;continue f;case 2:k=G[j+48>>2];G[k>>2]=o;G[k+4>>2]=o>>31;continue f;case 3:F[G[j+48>>2]>>1]=o;continue f;case 4:E[G[j+48>>2]]=o;continue f;case 6:G[G[j+48>>2]>>2]=o;continue f;case 7:break M;default:continue f}}k=G[j+48>>2];G[k>>2]=o;G[k+4>>2]=o>>31;continue f}l=l>>>0<=8?8:l;n=n|8;h=120}b=t;k=G[j+52>>2];r=k;i=G[j+48>>2];s=i;if(i|k){A=h&32;while(1){b=b-1|0;E[b|0]=A|H[(s&15)+12864|0];v=!k&s>>>0>15|(k|0)!=0;s=(k&15)<<28|s>>>4;k=k>>>4|0;if(v){continue}break}}k=b;if(!(i|r)|!(n&8)){break C}w=(h>>>4|0)+1375|0;q=2;break C}b=t;k=G[j+52>>2];r=k;i=G[j+48>>2];s=i;if(i|k){while(1){b=b-1|0;E[b|0]=s&7|48;v=!k&s>>>0>7|(k|0)!=0;s=(k&7)<<29|s>>>3;k=k>>>3|0;if(v){continue}break}}k=b;if(!(n&8)){break C}b=t-b|0;l=(b|0)<(l|0)?l:b+1|0;break C}i=G[j+48>>2];b=G[j+52>>2];r=b;if((b|0)<0){h=0-(b+((i|0)!=0)|0)|0;r=h;i=0-i|0;G[j+48>>2]=i;G[j+52>>2]=h;q=1;w=1375;break D}if(n&2048){q=1;w=1376;break D}q=n&1;w=q?1377:1375}k=Uc(i,r,t)}if((l|0)<0&u){break d}n=u?n&-65537:n;if(!(l|(i|r)!=0)){k=t;l=0;break h}b=!(i|r)+(t-k|0)|0;l=(b|0)<(l|0)?l:b;break h}h=H[j+48|0];break i}n=l>>>0>=2147483647?2147483647:l;h=n;m=(h|0)!=0;b=G[j+48>>2];k=b?b:3562;b=k;N:{O:{P:{Q:{if(!(b&3)|!h){break Q}while(1){if(!H[b|0]){break P}h=h-1|0;m=(h|0)!=0;b=b+1|0;if(!(b&3)){break Q}if(h){continue}break}}if(!m){break O}if(!(!H[b|0]|h>>>0<4)){while(1){m=G[b>>2];if(((16843008-m|m)&-2139062144)!=-2139062144){break P}b=b+4|0;h=h-4|0;if(h>>>0>3){continue}break}}if(!h){break O}}while(1){if(!H[b|0]){break N}b=b+1|0;h=h-1|0;if(h){continue}break}}b=0}b=b?b-k|0:n;m=b+k|0;if((l|0)>=0){n=i;l=b;break h}n=i;l=b;if(H[m|0]){break d}break h}h=G[j+48>>2];if(h|G[j+52>>2]){break x}h=0;break i}if(l){i=G[j+48>>2];break w}h=0;Vc(a,32,p,0,n);break v}G[j+12>>2]=0;G[j+8>>2]=h;i=j+8|0;G[j+48>>2]=i;l=-1}h=0;while(1){R:{k=G[i>>2];if(!k){break R}k=_c(j+4|0,k);if((k|0)<0){break b}if(k>>>0>l-h>>>0){break R}i=i+4|0;h=h+k|0;if(l>>>0>h>>>0){continue}}break}m=61;if((h|0)<0){break c}Vc(a,32,p,h,n);if(!h){h=0;break v}m=0;i=G[j+48>>2];while(1){k=G[i>>2];if(!k){break v}l=j+4|0;k=_c(l,k);m=k+m|0;if(m>>>0>h>>>0){break v}Rc(a,l,k);i=i+4|0;if(h>>>0>m>>>0){continue}break}}Vc(a,32,p,h,n^8192);h=(h|0)<(p|0)?p:h;continue f}if((l|0)<0&u){break d}m=61;h=pa[f|0](a,L[j+48>>3],p,l,n,h)|0;if((h|0)>=0){continue f}break c}i=H[h+1|0];h=h+1|0;continue}}if(a){break a}if(!x){break g}h=1;while(1){a=G[(h<<2)+e>>2];if(a){Tc((h<<3)+d|0,a,c,g);o=1;h=h+1|0;if((h|0)!=10){continue}break a}break}if(h>>>0>=10){o=1;break a}while(1){if(G[(h<<2)+e>>2]){break j}o=1;h=h+1|0;if((h|0)!=10){continue}break}break a}m=28;break c}E[j+39|0]=h;l=1;k=z;n=i}i=m-k|0;l=(i|0)<(l|0)?l:i;if((l|0)>(q^2147483647)){break d}m=61;b=l+q|0;h=(b|0)<(p|0)?p:b;if((y|0)<(h|0)){break c}Vc(a,32,h,b,n);Rc(a,w,q);Vc(a,48,h,b,n^65536);Vc(a,48,l,i,0);Rc(a,k,i);Vc(a,32,h,b,n^8192);b=G[j+60>>2];continue}break}break}o=0;break a}m=61}G[3719]=m}o=-1}la=j- -64|0;return o}function Wc(a,b,c,d,e,f){a=a|0;b=+b;c=c|0;d=d|0;e=e|0;f=f|0;var g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,w=0,x=0,y=0,z=0,B=0,C=0;n=la-560|0;la=n;G[n+44>>2]=0;A(+b);h=v(1)|0;v(0)|0;a:{if((h|0)<0){s=1;x=1385;b=-b;A(+b);h=v(1)|0;v(0)|0;break a}if(e&2048){s=1;x=1388;break a}s=e&1;x=s?1391:1386;z=!s}b:{if((h&2146435072)==2146435072){h=s+3|0;Vc(a,32,c,h,e&-65537);Rc(a,x,s);d=f&32;Rc(a,b!=b?d?1912:2327:d?2029:2331,3);Vc(a,32,c,h,e^8192);l=(c|0)>(h|0)?c:h;break b}u=n+16|0;c:{d:{e:{b=Oc(b,n+44|0);b=b+b;if(b!=0){h=G[n+44>>2];G[n+44>>2]=h-1;w=f|32;if((w|0)!=97){break e}break c}w=f|32;if((w|0)==97){break c}m=G[n+44>>2];break d}m=h-29|0;G[n+44>>2]=m;b=b*268435456}k=(d|0)<0?6:d;q=(n+48|0)+((m|0)>=0?288:0)|0;h=q;while(1){if(b<4294967296&b>=0){d=~~b>>>0}else{d=0}G[h>>2]=d;h=h+4|0;b=(b-+(d>>>0))*1e9;if(b!=0){continue}break}f:{if((m|0)<=0){i=m;g=h;j=q;break f}j=q;i=m;while(1){i=i>>>0>=29?29:i;g=h-4|0;g:{if(j>>>0>g>>>0){break g}o=0;while(1){d=G[g>>2];p=i&31;l=o;if((i&63)>>>0>=32){o=d<<p;d=0}else{o=(1<<p)-1&d>>>32-p;d=d<<p}l=l+d|0;p=o+y|0;p=d>>>0>l>>>0?p+1|0:p;o=Pd(l,p,1e9);B=g,C=l-Od(o,oa,1e9,0)|0,G[B>>2]=C;g=g-4|0;if(j>>>0<=g>>>0){continue}break}if(!p&l>>>0<1e9){break g}j=j-4|0;G[j>>2]=o}while(1){g=h;if(j>>>0<g>>>0){h=g-4|0;if(!G[h>>2]){continue}}break}i=G[n+44>>2]-i|0;G[n+44>>2]=i;h=g;if((i|0)>0){continue}break}}if((i|0)<0){t=((k+25>>>0)/9|0)+1|0;p=(w|0)==102;while(1){d=0-i|0;l=d>>>0>=9?9:d;h:{if(g>>>0<=j>>>0){h=!G[j>>2]<<2;break h}y=1e9>>>l|0;o=-1<<l^-1;i=0;h=j;while(1){d=G[h>>2];G[h>>2]=(d>>>l|0)+i;i=M(y,d&o);h=h+4|0;if(h>>>0<g>>>0){continue}break}h=!G[j>>2]<<2;if(!i){break h}G[g>>2]=i;g=g+4|0}i=l+G[n+44>>2]|0;G[n+44>>2]=i;j=h+j|0;d=p?q:j;g=g-d>>2>(t|0)?d+(t<<2)|0:g;if((i|0)<0){continue}break}}i=0;i:{if(g>>>0<=j>>>0){break i}i=M(q-j>>2,9);h=10;d=G[j>>2];if(d>>>0<10){break i}while(1){i=i+1|0;h=M(h,10);if(d>>>0>=h>>>0){continue}break}}d=(k-((w|0)!=102?i:0)|0)-((w|0)==103&(k|0)!=0)|0;if((d|0)<(M(g-q>>2,9)-9|0)){h=(n+48|0)+((m|0)<0?-4092:-3804)|0;m=d+9216|0;d=(m|0)/9|0;l=h+(d<<2)|0;h=10;d=m-M(d,9)|0;if((d|0)<=7){while(1){h=M(h,10);d=d+1|0;if((d|0)!=8){continue}break}}m=G[l>>2];t=(m>>>0)/(h>>>0)|0;o=m-M(h,t)|0;d=l+4|0;j:{if(!o&(d|0)==(g|0)){break j}k:{if(!(t&1)){b=9007199254740992;if(!(E[l-4|0]&1)|((h|0)!=1e9|j>>>0>=l>>>0)){break k}}b=9007199254740994}r=(d|0)==(g|0)?1:1.5;d=h>>>1|0;r=d>>>0>o>>>0?.5:(d|0)==(o|0)?r:1.5;if(!(H[x|0]!=45|z)){r=-r;b=-b}d=m-o|0;G[l>>2]=d;if(b+r==b){break j}d=d+h|0;G[l>>2]=d;if(d>>>0>=1e9){while(1){G[l>>2]=0;l=l-4|0;if(l>>>0<j>>>0){j=j-4|0;G[j>>2]=0}d=G[l>>2]+1|0;G[l>>2]=d;if(d>>>0>999999999){continue}break}}i=M(q-j>>2,9);h=10;d=G[j>>2];if(d>>>0<10){break j}while(1){i=i+1|0;h=M(h,10);if(d>>>0>=h>>>0){continue}break}}d=l+4|0;g=d>>>0<g>>>0?d:g}while(1){m=g;o=g>>>0<=j>>>0;if(!o){g=g-4|0;if(!G[g>>2]){continue}}break}l:{if((w|0)!=103){p=e&8;break l}h=k?k:1;d=(h|0)>(i|0)&(i|0)>-5;k=(d?i^-1:-1)+h|0;f=(d?-1:-2)+f|0;p=e&8;if(p){break l}g=-9;m:{if(o){break m}o=G[m-4>>2];if(!o){break m}d=10;g=0;if((o>>>0)%10|0){break m}while(1){h=g;g=g+1|0;d=M(d,10);if(!((o>>>0)%(d>>>0)|0)){continue}break}g=h^-1}d=M(m-q>>2,9);if((f&-33)==70){p=0;d=(d+g|0)-9|0;d=(d|0)>0?d:0;k=(d|0)>(k|0)?k:d;break l}p=0;d=((d+i|0)+g|0)-9|0;d=(d|0)>0?d:0;k=(d|0)>(k|0)?k:d}l=-1;o=k|p;if(((o?2147483645:2147483646)|0)<(k|0)){break b}y=(((o|0)!=0)+k|0)+1|0;h=f&-33;n:{if((h|0)==70){if((y^2147483647)<(i|0)){break b}g=(i|0)>0?i:0;break n}d=i>>31;g=Uc((d^i)-d|0,0,u);if((u-g|0)<=1){while(1){g=g-1|0;E[g|0]=48;if((u-g|0)<2){continue}break}}t=g-2|0;E[t|0]=f;E[g-1|0]=(i|0)<0?45:43;g=u-t|0;if((g|0)>(y^2147483647)){break b}}d=g+y|0;if((d|0)>(s^2147483647)){break b}i=d+s|0;Vc(a,32,c,i,e);Rc(a,x,s);Vc(a,48,c,i,e^65536);o:{p:{q:{if((h|0)==70){h=n+16|9;f=j>>>0>q>>>0?q:j;j=f;while(1){g=Uc(G[j>>2],0,h);r:{if((f|0)!=(j|0)){if(n+16>>>0>=g>>>0){break r}while(1){g=g-1|0;E[g|0]=48;if(n+16>>>0<g>>>0){continue}break}break r}if((g|0)!=(h|0)){break r}g=g-1|0;E[g|0]=48}Rc(a,g,h-g|0);j=j+4|0;if(q>>>0>=j>>>0){continue}break}if(o){Rc(a,3427,1)}if((k|0)<=0|j>>>0>=m>>>0){break q}while(1){g=Uc(G[j>>2],0,h);if(g>>>0>n+16>>>0){while(1){g=g-1|0;E[g|0]=48;if(n+16>>>0<g>>>0){continue}break}}Rc(a,g,(k|0)>=9?9:k);g=k-9|0;j=j+4|0;if(m>>>0<=j>>>0){break p}d=(k|0)>9;k=g;if(d){continue}break}break p}s:{if((k|0)<0){break s}f=j>>>0<m>>>0?m:j+4|0;m=n+16|9;h=j;while(1){g=Uc(G[h>>2],0,m);if((m|0)==(g|0)){g=g-1|0;E[g|0]=48}t:{if((h|0)!=(j|0)){if(n+16>>>0>=g>>>0){break t}while(1){g=g-1|0;E[g|0]=48;if(n+16>>>0<g>>>0){continue}break}break t}Rc(a,g,1);g=g+1|0;if(!(k|p)){break t}Rc(a,3427,1)}d=m-g|0;Rc(a,g,(d|0)<(k|0)?d:k);k=k-d|0;h=h+4|0;if(f>>>0<=h>>>0){break s}if((k|0)>=0){continue}break}}Vc(a,48,k+18|0,18,0);Rc(a,t,u-t|0);break o}g=k}Vc(a,48,g+9|0,9,0)}Vc(a,32,c,i,e^8192);l=(c|0)>(i|0)?c:i;break b}k=(f<<26>>31&9)+x|0;u:{if(d>>>0>11){break u}g=12-d|0;r=16;while(1){r=r*16;g=g-1|0;if(g){continue}break}if(H[k|0]==45){b=-(r+(-b-r));break u}b=b+r-r}h=G[n+44>>2];g=h>>31;g=Uc((g^h)-g|0,0,u);if((u|0)==(g|0)){g=g-1|0;E[g|0]=48;h=G[n+44>>2]}q=s|2;j=f&32;m=g-2|0;E[m|0]=f+15;E[g-1|0]=(h|0)<0?45:43;g=!(e&8)&(d|0)<=0;h=n+16|0;while(1){f=h;if(O(b)<2147483648){i=~~b}else{i=-2147483648}E[h|0]=j|H[i+12864|0];b=(b-+(i|0))*16;h=f+1|0;if(!(g&b==0|(h-(n+16|0)|0)!=1)){E[f+1|0]=46;h=f+2|0}if(b!=0){continue}break}l=-1;g=u-m|0;f=g+q|0;if((2147483645-f|0)<(d|0)){break b}i=f;f=n+16|0;j=h-f|0;d=d?(j-2|0)<(d|0)?d+2|0:j:j;h=i+d|0;Vc(a,32,c,h,e);Rc(a,k,q);Vc(a,48,c,h,e^65536);Rc(a,f,j);Vc(a,48,d-j|0,0,0);Rc(a,m,g);Vc(a,32,c,h,e^8192);l=(c|0)>(h|0)?c:h}la=n+560|0;return l|0}function od(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0,w=0,x=0,y=0,z=0,A=0,B=0,C=0,D=0,E=0,F=0,H=0,I=0,J=0,K=0,L=0,M=0,N=0,O=0,Q=0,R=0,S=0;k=la-96|0;la=k;u=i&65535;o=(e^i)&-2147483648;r=e&65535;y=r;R=i>>>16&32767;S=e>>>16&32767;a:{b:{if(R-32767>>>0>4294934529&S-32767>>>0>=4294934530){break b}s=e&2147483647;q=s;j=d;if(!(!d&(q|0)==2147418112?!(b|c):q>>>0<2147418112)){m=d;o=e|32768;break a}s=i&2147483647;p=s;e=h;if(!(!e&(p|0)==2147418112?!(f|g):p>>>0<2147418112)){m=e;o=i|32768;b=f;c=g;break a}if(!(b|j|(q^2147418112|c))){if(!(e|f|(g|p))){o=2147450880;b=0;c=0;break a}o=o|2147418112;b=0;c=0;break a}if(!(e|f|(p^2147418112|g))){e=b|j;d=c|q;b=0;c=0;if(!(d|e)){o=2147450880;break a}o=o|2147418112;break a}if(!(b|j|(c|q))){b=0;c=0;break a}if(!(e|f|(g|p))){b=0;c=0;break a}if((q|0)==65535|q>>>0<65535){j=!(d|r);i=j?b:d;s=j<<6;e=P(i)+32|0;i=P(j?c:r);i=s+((i|0)==32?e:i)|0;gd(k+80|0,b,c,d,r,i-15|0);t=16-i|0;d=G[k+88>>2];y=G[k+92>>2];c=G[k+84>>2];b=G[k+80>>2]}if(p>>>0>65535){break b}i=!(h|u);e=i?f:h;r=i<<6;j=P(e)+32|0;e=P(i?g:u);e=r+((e|0)==32?j:e)|0;gd(k- -64|0,f,g,h,u,e-15|0);t=(t-e|0)+16|0;h=G[k+72>>2];u=G[k+76>>2];f=G[k+64>>2];g=G[k+68>>2]}e=f;f=g<<15|f>>>17;i=e<<15;e=0;v=i&-32768;K=c;s=Od(v,e,c,0);e=oa;z=e;L=f;q=b;c=Od(f,0,b,0);b=c+s|0;f=oa+e|0;i=b;c=b>>>0<c>>>0?f+1|0:f;f=b;j=0;b=Od(q,l,v,l);p=j+b|0;e=oa+f|0;e=b>>>0>p>>>0?e+1|0:e;r=e;M=(f|0)==(e|0)&j>>>0>p>>>0|e>>>0<f>>>0;N=d;w=Od(v,l,d,0);O=oa;b=Od(K,l,L,l);x=b+w|0;j=oa+O|0;j=b>>>0>x>>>0?j+1|0:j;b=u<<15|h>>>17;A=h<<15|g>>>17;d=Od(A,0,q,l);B=d+x|0;f=oa+j|0;f=d>>>0>B>>>0?f+1|0:f;C=f;d=(c|0)==(z|0)&i>>>0<s>>>0|c>>>0<z>>>0;D=c+B|0;f=d+f|0;f=c>>>0>D>>>0?f+1|0:f;u=f;g=D;c=f;E=y|65536;y=Od(v,l,E,n);Q=oa;d=Od(N,m,L,l);F=d+y|0;e=oa+Q|0;e=d>>>0>F>>>0?e+1|0:e;i=e;H=b|-2147483648;b=Od(H,0,q,l);I=b+F|0;f=oa+e|0;f=b>>>0>I>>>0?f+1|0:f;d=Od(A,m,K,l);b=d+I|0;J=f;f=f+oa|0;z=b;s=b>>>0<d>>>0?f+1|0:f;f=b;b=0;q=b+g|0;e=c+f|0;e=b>>>0>q>>>0?e+1|0:e;v=e;f=e;b=q+M|0;c=b>>>0<q>>>0?f+1|0:f;t=((S+R|0)+t|0)-16383|0;d=Od(H,m,K,l);h=oa;e=Od(E,m,L,l);g=e+d|0;f=oa+h|0;f=e>>>0>g>>>0?f+1|0:f;n=(h|0)==(f|0)&d>>>0>g>>>0|f>>>0<h>>>0;h=f;e=Od(A,m,N,m);d=e+g|0;f=oa+f|0;f=d>>>0<e>>>0?f+1|0:f;e=f;g=(f|0)==(h|0)&d>>>0<g>>>0|f>>>0<h>>>0;f=0;h=g;g=g+n|0;f=h>>>0>g>>>0?1:f;h=g;g=Od(H,m,E,m);h=h+g|0;f=oa+f|0;M=h;g=g>>>0>h>>>0?f+1|0:f;h=d;l=e;e=(j|0)==(O|0)&w>>>0>x>>>0|j>>>0<O>>>0;f=0;j=(j|0)==(C|0)&x>>>0>B>>>0|j>>>0>C>>>0;n=j;j=e+j|0;e=(n>>>0>j>>>0?1:f)+l|0;f=g;d=d+j|0;e=d>>>0<j>>>0?e+1|0:e;n=e;w=d;d=(e|0)==(l|0)&d>>>0<h>>>0|e>>>0<l>>>0;e=d;d=d+M|0;f=e>>>0>d>>>0?f+1|0:f;j=d;h=f;e=Od(A,m,E,m);l=oa;g=Od(H,m,N,m);d=g+e|0;f=oa+l|0;f=d>>>0<g>>>0?f+1|0:f;g=f;f=(l|0)==(f|0)&d>>>0<e>>>0|f>>>0<l>>>0;x=g+j|0;e=f+h|0;e=g>>>0>x>>>0?e+1|0:e;l=x;h=e;j=d;e=0;d=e+w|0;f=j+n|0;f=d>>>0<e>>>0?f+1|0:f;e=f;g=(n|0)==(f|0)&d>>>0<w>>>0|f>>>0<n>>>0;f=h;h=g;g=g+l|0;f=h>>>0>g>>>0?f+1|0:f;w=g;g=f;h=d;j=e;e=(s|0)==(J|0)&z>>>0<I>>>0|s>>>0<J>>>0;d=(i|0)==(Q|0)&y>>>0>F>>>0|i>>>0<Q>>>0;i=(i|0)==(J|0)&F>>>0>I>>>0|i>>>0>J>>>0;d=d+i|0;d=d+e|0;n=s;i=n+h|0;e=d+j|0;f=g;d=i;e=d>>>0<n>>>0?e+1|0:e;h=(e|0)==(j|0)&h>>>0>d>>>0|e>>>0<j>>>0;g=h+w|0;f=h>>>0>g>>>0?f+1|0:f;j=g;g=f;h=d;f=0;i=e;n=(u|0)==(v|0)&q>>>0<D>>>0|u>>>0>v>>>0;l=n;n=n+((u|0)==(C|0)&B>>>0>D>>>0|u>>>0<C>>>0)|0;e=e+(l>>>0>n>>>0?1:f)|0;f=g;d=d+n|0;e=d>>>0<n>>>0?e+1|0:e;h=(e|0)==(i|0)&d>>>0<h>>>0|e>>>0<i>>>0;g=h;h=h+j|0;f=g>>>0>h>>>0?f+1|0:f;i=f;c:{if(f&65536){t=t+1|0;break c}j=r>>>31|0;g=0;f=i<<1|h>>>31;h=h<<1|e>>>31;i=f;f=e<<1|d>>>31;d=d<<1|c>>>31;e=f;f=r<<1|p>>>31;p=p<<1;r=f;f=c<<1|b>>>31;b=b<<1|j;c=f|g}if((t|0)>=32767){o=o|2147418112;b=0;c=0;break a}d:{if((t|0)<=0){g=1-t|0;if(g>>>0<=127){f=t+127|0;gd(k+48|0,p,r,b,c,f);gd(k+32|0,d,e,h,i,f);nd(k+16|0,p,r,b,c,g);nd(k,d,e,h,i,g);p=G[k+32>>2]|G[k+16>>2]|(G[k+48>>2]|G[k+56>>2]|(G[k+52>>2]|G[k+60>>2]))!=0;r=G[k+36>>2]|G[k+20>>2];b=G[k+40>>2]|G[k+24>>2];c=G[k+44>>2]|G[k+28>>2];d=G[k>>2];e=G[k+4>>2];g=G[k+8>>2];f=G[k+12>>2];break d}b=0;c=0;break a}g=h;f=i&65535|t<<16}m=g|m;o=f|o;if(!(!b&(c|0)==-2147483648?!(p|r):(c|0)>0|(c|0)>=0)){b=d+1|0;j=b?e:e+1|0;e=o;c=j;d=!(j|b);m=d+m|0;o=d>>>0>m>>>0?e+1|0:e;break a}if(b|p|(c^-2147483648|r)){b=d;c=e;break a}f=e;b=d&1;c=b;b=b+d|0;c=c>>>0>b>>>0?f+1|0:f;d=(f|0)==(c|0)&b>>>0<d>>>0|c>>>0<f>>>0;f=o;m=d+m|0;o=m>>>0<d>>>0?f+1|0:f}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=m;G[a+12>>2]=o;la=k+96|0}function kb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;c=G[a+448>>2];if((c|0)>0){while(1){i=G[a+444>>2]+(f<<2)|0;e=G[i>>2];if(H[e+G[a+428>>2]|0]){c=0;d=0;g=G[a+412>>2]+M(e,12)|0;e=G[g+4>>2];a:{if((e|0)<=0){break a}while(1){h=G[g>>2];j=h+(c<<3)|0;if((G[G[G[a+456>>2]>>2]+(G[j>>2]<<2)>>2]&3)!=1){e=h+(d<<3)|0;h=G[j+4>>2];G[e>>2]=G[j>>2];G[e+4>>2]=h;e=G[g+4>>2];d=d+1|0}c=c+1|0;if((e|0)>(c|0)){continue}break}c=c-d|0;if((c|0)<=0){break a}G[g+4>>2]=e-c}E[G[a+428>>2]+G[i>>2]|0]=0;c=G[a+448>>2]}f=f+1|0;if((f|0)<(c|0)){continue}break}}if(G[a+444>>2]){G[a+448>>2]=0}b:{c:{if(G[a+540>>2]<=0){break c}j=0;d:{while(1){e:{g=0;c=G[a+412>>2];l=M(j,24);i=c+l|0;if(G[i+4>>2]>0){while(1){h=G[i>>2]+(g<<3)|0;e=G[a+544>>2]+(G[h>>2]<<2)|0;d=G[e>>2];f:{if(d&16){G[h>>2]=G[e+4>>2];break f}k=G[b+8>>2];c=k;f=G[b+4>>2];m=H[b+16|0]|d>>>2&1;n=((m&1)+(d>>>5|0)|0)+1|0;d=f+n|0;if(c>>>0<d>>>0){while(1){if(c>>>0<d>>>0){c=(((c>>>1)+(c>>>3)&-2)+c|0)+2|0;G[b+8>>2]=c;if(c>>>0>k>>>0){continue}break d}break}c=ed(G[b>>2],c<<2);if(!c&G[3719]==48){break b}G[b>>2]=c;f=G[b+4>>2];d=n+f|0}G[b+4>>2]=d;if(d>>>0<f>>>0){break e}d=G[b>>2]+(f<<2)|0;k=G[e>>2];G[d>>2]=k&-9|((m|0)!=0)<<3;if(J[e>>2]>=32){n=d+4|0;o=e+4|0;c=0;while(1){p=c<<2;G[n+p>>2]=G[o+p>>2];c=c+1|0;if(c>>>0<G[e>>2]>>>5>>>0){continue}break}}g:{if(!m){break g}c=d;d=k>>>3&536870908;c=c+d|0;d=d+e|0;if(k&4){K[c+4>>2]=K[d+4>>2];break g}G[c+4>>2]=G[d+4>>2]}G[h>>2]=f;G[e+4>>2]=f;G[e>>2]=G[e>>2]|16}g=g+1|0;if((g|0)<G[i+4>>2]){continue}break}c=G[a+412>>2]}i=c+l|0;if(G[i+16>>2]>0){g=0;while(1){h=G[i+12>>2]+(g<<3)|0;e=G[a+544>>2]+(G[h>>2]<<2)|0;d=G[e>>2];h:{if(d&16){G[h>>2]=G[e+4>>2];break h}i:{k=G[b+8>>2];c=k;f=G[b+4>>2];m=H[b+16|0]|d>>>2&1;l=((m&1)+(d>>>5|0)|0)+1|0;d=f+l|0;if(c>>>0>=d>>>0){break i}while(1){if(c>>>0>=d>>>0){c=ed(G[b>>2],c<<2);if(!c&G[3719]==48){break b}G[b>>2]=c;f=G[b+4>>2];d=l+f|0;break i}c=(((c>>>1)+(c>>>3)&-2)+c|0)+2|0;G[b+8>>2]=c;if(c>>>0>k>>>0){continue}break}break d}G[b+4>>2]=d;if(d>>>0<f>>>0){break e}d=G[b>>2]+(f<<2)|0;k=G[e>>2];G[d>>2]=k&-9|((m|0)!=0)<<3;if(J[e>>2]>=32){l=d+4|0;n=e+4|0;c=0;while(1){o=c<<2;G[o+l>>2]=G[n+o>>2];c=c+1|0;if(c>>>0<G[e>>2]>>>5>>>0){continue}break}}j:{if(!m){break j}c=d;d=k>>>3&536870908;c=c+d|0;d=d+e|0;if(k&4){K[c+4>>2]=K[d+4>>2];break j}G[c+4>>2]=G[d+4>>2]}G[h>>2]=f;G[e+4>>2]=f;G[e>>2]=G[e>>2]|16}g=g+1|0;if((g|0)<G[i+16>>2]){continue}break}}j=j+1|0;if((j|0)<G[a+540>>2]){continue}break c}break}break b}break b}if(G[a+284>>2]>0){c=0;while(1){j=G[a+396>>2];e=j+(G[G[a+280>>2]+(c<<2)>>2]<<2&-8)|0;g=G[e>>2];k:{if((g|0)==-1){break k}f=G[a+544>>2]+(g<<2)|0;d=G[f+4>>2];if(!(H[f|0]&16)){i=d>>1;h=H[i+G[a+332>>2]|0];k=h^d&1;d=H[14116];if(!((k|0)==(d|0)&((d^-1)&254)>>>1|d&h&2)){break k}d=G[j+(i<<3)>>2];if((d|0)==-1|(d|0)!=(g|0)){break k}d=lb(b,f);G[e>>2]=d;G[f+4>>2]=d;G[f>>2]=G[f>>2]|16;break k}G[e>>2]=d}c=c+1|0;if((c|0)<G[a+284>>2]){continue}break}}e=G[a+272>>2];l:{if((e|0)<=0){break l}d=G[a+268>>2];f=0;c=0;while(1){i=c<<2;j=i+d|0;g=G[a+544>>2]+(G[j>>2]<<2)|0;h=G[g>>2];if((h&3)!=1){m:{if(h&16){G[j>>2]=G[g+4>>2];break m}d=lb(b,g);G[j>>2]=d;G[g+4>>2]=d;G[g>>2]=G[g>>2]|16;d=G[a+268>>2]}G[(f<<2)+d>>2]=G[d+i>>2];e=G[a+272>>2];f=f+1|0}c=c+1|0;if((e|0)>(c|0)){continue}break}c=c-f|0;if((c|0)<=0){break l}G[a+272>>2]=e-c}e=G[a+260>>2];n:{if((e|0)<=0){break n}d=G[a+256>>2];f=0;c=0;while(1){i=c<<2;j=i+d|0;g=G[a+544>>2]+(G[j>>2]<<2)|0;h=G[g>>2];if((h&3)!=1){o:{if(h&16){G[j>>2]=G[g+4>>2];break o}d=lb(b,g);G[j>>2]=d;G[g+4>>2]=d;G[g>>2]=G[g>>2]|16;d=G[a+256>>2]}G[(f<<2)+d>>2]=G[d+i>>2];e=G[a+260>>2];f=f+1|0}c=c+1|0;if((e|0)>(c|0)){continue}break}b=c-f|0;if((b|0)<=0){break n}G[a+260>>2]=e-b}return}Y(ud()|0,1024,0);B()}function rc(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,w=0,y=0,B=0,C=0,D=0,E=0;o=la-16|0;la=o;A(+b);g=v(1)|0;m=v(0)|0;A(+a);e=v(1)|0;c=v(0)|0;r=g>>>20|0;s=r&2047;t=s-1086|0;j=e>>>20|0;a:{b:{if(t>>>0>4294967167&j-2047>>>0>=4294965250){break b}q=m<<1;f=g<<1|m>>>31;h=f+2097152|0;if(!q&(h|0)==2097152|h>>>0<2097152){d=1;if(!(f|q)|!c&(e|0)==1072693248){break a}h=e<<1;e=c;c=h|c>>>31;e=e<<1;if(!((!q&(f|0)==-2097152|f>>>0<4292870144)&(!e&(c|0)==-2097152|c>>>0<4292870144))){d=a+b;break a}if(!e&(c|0)==2145386496){break a}d=(g|0)<0^c>>>0<2145386496?0:b*b;break a}f=(e<<1|c>>>31)+2097152|0;if(!(c<<1)&(f|0)==2097152|f>>>0<2097152){d=a*a;if((e|0)<0){d=(sc(m,g)|0)==1?-d:d}if((g|0)>0|(g|0)>=0){break a}c=la-16|0;L[c+8>>3]=1/d;d=L[c+8>>3];break a}if((e|0)<0){c=sc(m,g);if(!c){a=a-a;d=a/a;break a}j=j&2047;p=((c|0)==1)<<18;A(+a);e=v(1)|0;c=v(0)|0;e=e&2147483647}if(t>>>0<=4294967167){d=1;f=(e|0)==1072693248;if(f&!c){break a}if(s>>>0<=957){d=((c|0)!=0&f|e>>>0>1072693248?b:-b)+1;break a}if(((e|0)==1072693248&(c|0)!=0|e>>>0>1072693248)!=(r>>>0>2047|0)){c=la-16|0;L[c+8>>3]=3105036184601418e216;d=L[c+8>>3]*3105036184601418e216;break a}c=la-16|0;L[c+8>>3]=12882297539194267e-247;d=L[c+8>>3]*12882297539194267e-247;break a}if(j){break b}A(+(a*4503599627370496));e=v(1)|0;c=v(0)|0;e=(e&2147483647)-54525952|0}x(0,m&-134217728);x(1,g|0);u=+z();g=e-1072076117|0;f=g;l=+(f>>20);h=(f>>>13&127)<<5;B=l*L[1018]+L[h+8232>>3];m=0;g=c-m|0;f=e-((f&-1048576)+(c>>>0<m>>>0)|0)|0;c=f;x(0,0);x(1,(g- -2147483648>>>0<2147483648?c+1|0:c)|0);a=+z();i=L[h+8208>>3];d=a*i+-1;x(0,g|0);x(1,c|0);w=(+z()-a)*i;a=d+w;n=L[1019];i=a*n;y=l*L[1017]+L[h+8224>>3];l=a+y;k=d;d=d*n;k=k*d;n=l+k;k=B+(a+(y-l))+w*(i+d)+(k+(l-n));d=a*i;a=k+a*d*(d*(d*(a*L[1025]+L[1024])+(a*L[1023]+L[1022]))+(a*L[1021]+L[1020]));d=n+a;L[o+8>>3]=a+(n-d);A(+d);c=v(1)|0;x(0,v(0)&-134217728);x(1,c|0);i=+z();a=u*i;b=(b-u)*i+b*(L[o+8>>3]+(d-i));A(+a);c=v(1)|0;v(0)|0;c:{d:{j=c>>>20&2047;if(j-969>>>0<63){break d}if(j>>>0<969){a=a+1;d=p?-a:a;break c}c=j>>>0<1033;j=0;if(c){break d}A(+a);c=v(1)|0;v(0)|0;if((c|0)<0){c=la-16|0;L[c+8>>3]=p?-12882297539194267e-247:12882297539194267e-247;d=L[c+8>>3]*12882297539194267e-247;break c}c=la-16|0;L[c+8>>3]=p?-3105036184601418e216:3105036184601418e216;d=L[c+8>>3]*3105036184601418e216;break c}k=b;b=L[748];d=a*L[747]+b;b=d-b;a=k+(b*L[750]+(b*L[749]+a));b=a*a;k=b*b*(a*L[754]+L[753]);b=b*(a*L[752]+L[751]);A(+d);v(1)|0;g=v(0)|0;e=g<<4&2032;a=k+(b+(L[e+6088>>3]+a));e=e+6096|0;f=G[e>>2];h=G[e+4>>2];e=g+p|0;c=f;f=e<<13;e=0;c=c+e|0;h=f+h|0;h=c>>>0<e>>>0?h+1|0:h;if(!j){e:{if(!(g&-2147483648)){x(0,c|0);x(1,h-1058013184|0);b=+z();d=(b*a+b)*5486124068793689e288;break e}x(0,c|0);f=h+1071644672|0;x(1,f|0);b=+z();i=b*a;a=i+b;if(O(a)<1){c=la-16|0;L[c+8>>3]=22250738585072014e-324;L[c+8>>3]=L[c+8>>3]*22250738585072014e-324;x(0,0);x(1,f&-2147483648);d=a<0?-1:1;l=a+d;a=l+(i+(b-a)+(a+(d-l)))-d;a=(C=+z(),D=a,E=a==0,E?C:D)}d=a*22250738585072014e-324}break c}x(0,c|0);x(1,h|0);b=+z();d=b*a+b}}la=o+16|0;return d}function fd(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;k=la-112|0;la=k;j=i&2147483647;a:{b:{m=e&2147483647;l=2147418112;n=!(b|c);if(!(d|m?m-l>>>0<2147549184:n)){r=j-l|0;if(!h&(r|0)==-2147418112?f|g:(r|0)==-2147418112&(h|0)!=0|r>>>0>2147549184){break b}}if(!(!d&(m|0)==2147418112?n:m>>>0<2147418112)){h=d;i=e|32768;f=b;g=c;break a}if(!(!h&(j|0)==2147418112?!(f|g):j>>>0<2147418112)){i=i|32768;break a}if(!(b|d|(m^2147418112|c))){j=d;d=!(b^f|d^h|(c^g|e^i^-2147483648));h=d?0:j;i=d?2147450880:e;f=d?0:b;g=d?0:c;break a}l=f|h;if(!(l|(j^2147418112|g))){break a}if(!(b|d|(c|m))){if(g|j|l){break a}f=b&f;g=c&g;h=d&h;i=e&i;break a}if(f|h|(g|j)){break b}f=b;g=c;h=d;i=e;break a}l=(j|0)==(m|0);p=l&(d|0)==(h|0)?(c|0)==(g|0)&b>>>0<f>>>0|c>>>0<g>>>0:l&d>>>0<h>>>0|j>>>0>m>>>0;n=p;m=n?f:b;r=n?g:c;l=n?i:e;s=l;n=n?h:d;q=l&65535;j=p?d:h;l=p?e:i;d=l;l=d>>>16&32767;o=s>>>16&32767;if(!o){o=!(n|q);h=o;o=h<<6;t=P(h?m:n)+32|0;h=P(h?r:q);o=o+((h|0)==32?t:h)|0;gd(k+96|0,m,r,n,q,o-15|0);n=G[k+104>>2];q=G[k+108>>2];r=G[k+100>>2];o=16-o|0;m=G[k+96>>2]}f=p?b:f;g=p?c:g;b=j;c=d&65535;if(!l){j=!(b|c);p=j;d=j?f:b;j=j<<6;p=P(p?g:c);j=j+((p|0)==32?P(d)+32|0:p)|0;gd(k+80|0,f,g,b,c,j-15|0);l=16-j|0;f=G[k+80>>2];g=G[k+84>>2];b=G[k+88>>2];c=G[k+92>>2]}d=c<<3;c=b;b=d|b>>>29;j=c<<3;c=b;b=g>>>29|j;c=c|524288;j=q<<3|n>>>29;q=n<<3|r>>>29;p=j;h=e^i;j=g<<3|f>>>29;d=f<<3;c:{if((l|0)==(o|0)){break c}e=o-l|0;if(e>>>0>127){b=0;c=0;j=0;d=1;break c}gd(k- -64|0,d,j,b,c,128-e|0);nd(k+48|0,d,j,b,c,e);b=G[k+56>>2];c=G[k+60>>2];j=G[k+52>>2];d=G[k+48>>2]|(G[k+64>>2]|G[k+72>>2]|(G[k+68>>2]|G[k+76>>2]))!=0}n=d;l=j;p=p|524288;j=r<<3|m>>>29;m=m<<3;d:{if((h|0)<0){f=0;g=0;h=0;i=0;if(!(m^n|b^q|(j^l|c^p))){break a}d=m-n|0;e=j-((m>>>0<n>>>0)+l|0)|0;f=q-b|0;g=(j|0)==(l|0)&m>>>0<n>>>0|j>>>0<l>>>0;h=f-g|0;b=(p-((b>>>0>q>>>0)+c|0)|0)-(f>>>0<g>>>0)|0;i=b;if(b>>>0>524287){break d}c=!(b|h);g=c;i=c?d:h;c=c<<6;g=P(g?e:b);c=c+((g|0)==32?P(i)+32|0:g)|0;f=b;b=c-12|0;gd(k+32|0,d,e,h,f,b);o=o-b|0;h=G[k+40>>2];i=G[k+44>>2];d=G[k+32>>2];e=G[k+36>>2];break d}j=j+l|0;d=m+n|0;e=d>>>0<m>>>0?j+1|0:j;f=(l|0)==(e|0)&d>>>0<n>>>0|e>>>0<l>>>0;j=c+p|0;b=b+q|0;j=b>>>0<q>>>0?j+1|0:j;h=b+f|0;i=h>>>0<b>>>0?j+1|0:j;if(!(i&1048576)){break d}d=n&1|((e&1)<<31|d>>>1);e=h<<31|e>>>1;o=o+1|0;h=(i&1)<<31|h>>>1;i=i>>>1|0}f=0;b=s&-2147483648;m=b;if((o|0)>=32767){h=f;i=b|2147418112;g=0;break a}l=0;e:{if((o|0)>0){l=o;break e}gd(k+16|0,d,e,h,i,o+127|0);nd(k,d,e,h,i,1-o|0);d=G[k>>2]|(G[k+16>>2]|G[k+24>>2]|(G[k+20>>2]|G[k+28>>2]))!=0;e=G[k+4>>2];h=G[k+8>>2];i=G[k+12>>2]}c=(e&7)<<29|d>>>3;b=h<<29|e>>>3;e=f|((i&7)<<29|h>>>3);f=m|(i>>>3&65535|l<<16);f:{g:{d=d&7;if((d|0)!=4){i=f;f=d>>>0>4;g=f;f=c+f|0;g=g>>>0>f>>>0?b+1|0:b;b=(g|0)==(b|0)&c>>>0>f>>>0|b>>>0>g>>>0;h=b+e|0;i=b>>>0>h>>>0?i+1|0:i;break g}j=f;d=c&1;f=c+d|0;g=d>>>0>f>>>0?b+1|0:b;b=(g|0)==(b|0)&c>>>0>f>>>0|b>>>0>g>>>0;h=b+e|0;i=b>>>0>h>>>0?j+1|0:j;break f}if(!d){break a}}}G[a>>2]=f;G[a+4>>2]=g;G[a+8>>2]=h;G[a+12>>2]=i;la=k+112|0}function yb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0,v=0;m=la-16|0;la=m;p=a+856|0;a:while(1){b:{g=G[a+860>>2];c=G[a+868>>2];d=G[a+872>>2];d=((c|0)>(d|0)?g:0)+(d-c|0)|0;if(!(G[a+920>>2]<G[a+284>>2]|(d|0)>0)){c=1;break b}if(H[a+680|0]==1){if(G[p>>2]){G[a+860>>2]=0}c=1;qb(p,1);G[a+868>>2]=0;G[a+872>>2]=0;G[a+920>>2]=G[a+284>>2];break b}c:{if(d){break c}d=G[a+920>>2];if((d|0)>=G[a+284>>2]){break c}G[a+920>>2]=d+1;c=G[a+544>>2];G[(c+(G[a+928>>2]<<2)|0)+4>>2]=G[G[a+280>>2]+(d<<2)>>2];k=c+(G[a+928>>2]<<2)|0;c=G[k>>2];e=c>>>5|0;g=0;d:{if(c>>>0<32){break d}l=k+4|0;h=0;c=0;if(e-1>>>0>=3){i=e&134217724;d=0;while(1){f=l+(c<<2)|0;g=1<<(G[f+12>>2]>>>1)|(1<<(G[f>>2]>>>1)|g|1<<(G[f+4>>2]>>>1)|1<<(G[f+8>>2]>>>1));c=c+4|0;d=d+4|0;if((i|0)!=(d|0)){continue}break}}d=e&3;if(!d){break d}while(1){g=1<<(G[l+(c<<2)>>2]>>>1)|g;c=c+1|0;h=h+1|0;if((d|0)!=(h|0)){continue}break}}G[(k+(e<<2)|0)+4>>2]=g;Bb(p,G[a+928>>2]);g=G[a+860>>2];c=G[a+868>>2]}r=G[G[a+856>>2]+(c<<2)>>2];c=c+1|0;c=(c|0)!=(g|0)?c:0;G[a+868>>2]=c;k=G[a+544>>2]+(r<<2)|0;e=G[k>>2];if(e&3){continue}if(!(!b|G[a+44>>2]<2)){if(!((s|0)%1e3|0)){d=G[a+872>>2];G[m+8>>2]=t;G[m+4>>2]=u;G[m>>2]=(d-c|0)+((c|0)>(d|0)?g:0);tc(3766,m);e=G[k>>2]}s=s+1|0}l=k+4|0;g=G[k+4>>2]>>1;c=G[a+760>>2];e:{if(e>>>0<64){break e}d=1;e=e>>>5|0;f=e-1|0;h=f&1;if((e|0)!=2){f=f&-2;e=0;while(1){i=l+(d<<2)|0;j=G[i+4>>2]>>1;i=G[i>>2]>>1;g=G[(c+M(i,12)|0)+4>>2]<G[(c+M(g,12)|0)+4>>2]?i:g;g=G[(c+M(j,12)|0)+4>>2]<G[(c+M(g,12)|0)+4>>2]?j:g;d=d+2|0;e=e+2|0;if((f|0)!=(e|0)){continue}break}}if(!h){break e}d=G[l+(d<<2)>>2]>>1;g=G[(c+M(d,12)|0)+4>>2]<G[(c+M(g,12)|0)+4>>2]?d:g}i=G[a+776>>2]+g|0;if(H[i|0]){f=c+M(g,12)|0;e=G[f+4>>2];f:{if((e|0)<=0){break f}h=G[f>>2];j=G[G[a+804>>2]>>2];d=0;c=0;while(1){n=G[h+(c<<2)>>2];if((G[j+(n<<2)>>2]&3)!=1){G[h+(d<<2)>>2]=n;e=G[f+4>>2];d=d+1|0}c=c+1|0;if((e|0)>(c|0)){continue}break}c=c-d|0;if((c|0)<=0){break f}G[f+4>>2]=e-c}E[i|0]=0;c=G[a+760>>2]}n=M(g,12)+c|0;if(G[n+4>>2]<=0){continue}v=G[n>>2];e=0;while(1){c=G[k>>2];if(c&3){continue a}i=G[(e<<2)+v>>2];g:{if((i|0)==(r|0)){break g}f=G[a+544>>2]+(i<<2)|0;d=G[f>>2];if(d&3){break g}h=G[a+692>>2];o=(h|0)!=-1;j=h;h=d>>>5|0;if(o&(j|0)<=(h|0)){break g}o=c>>>5|0;if(h>>>0<o>>>0){break g}q=f+4|0;if(G[l+(o<<2)>>2]&(G[q+(h<<2)>>2]^-1)){break g}h:{i:{if(c>>>0<32){break i}c=-2;j=0;if(d>>>0<32){break g}while(1){d=G[l+(j<<2)>>2];f=0;j:{if((c|0)!=-2){while(1){if((d|0)==G[(f<<2)+q>>2]){break j}f=f+1|0;if((h|0)!=(f|0)){continue}break g}}while(1){c=G[(f<<2)+q>>2];if((c|0)==(d|0)){c=-2;break j}if((c^d)!=1){f=f+1|0;if((h|0)==(f|0)){break g}continue}break}c=d}j=j+1|0;if((o|0)!=(j|0)){continue}break}switch(c+2|0){case 1:break g;case 0:break i;default:break h}}Cb(a,i);u=u+1|0;break g}if(!Db(a,i,c^1)){c=0;break b}t=t+1|0;e=e-(c>>1==(g|0))|0}e=e+1|0;if((e|0)<G[n+4>>2]){continue}break}continue}break}la=m+16|0;return c}function Db(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0;d=G[a+544>>2];Bb(a+856|0,b);j=(b<<2)+d|0;g=j+4|0;a:{if((G[j>>2]&-32)==64){Cb(a,b);e=G[j>>2];b=e>>>5|0;d=0;b:{c:{if(e>>>0<32){break c}while(1){if(G[g+(d<<2)>>2]==(c|0)){break c}d=d+1|0;if((b|0)!=(d|0)){continue}break}i=b-1|0;break b}i=b-1|0;if((i|0)<=(d|0)){break b}c=(b-d|0)-2|0;h=b+(d^-1)&3;if(h){while(1){k=g+(d<<2)|0;d=d+1|0;G[k>>2]=G[g+(d<<2)>>2];f=f+1|0;if((h|0)!=(f|0)){continue}break}}if(c>>>0<3){break b}while(1){c=g+(d<<2)|0;f=G[c+8>>2];G[c>>2]=G[c+4>>2];G[c+4>>2]=f;G[c+8>>2]=G[c+12>>2];d=d+4|0;G[c+12>>2]=G[g+(d<<2)>>2];if((d|0)!=(i|0)){continue}break}}if(e&8){G[g+(i<<2)>>2]=G[g+(b<<2)>>2];e=G[j>>2]}b=(e&-32)-32|0;G[j>>2]=b|e&31;c=b>>>5|0;d:{if(!b){f=0;break d}e=0;f=0;d=0;if(b>>>0>=128){h=c&134217724;i=0;while(1){b=g+(d<<2)|0;f=1<<(G[b+12>>2]>>>1)|(1<<(G[b>>2]>>>1)|f|1<<(G[b+4>>2]>>>1)|1<<(G[b+8>>2]>>>1));d=d+4|0;i=i+4|0;if((h|0)!=(i|0)){continue}break}}b=c&3;if(!b){break d}while(1){f=1<<(G[g+(d<<2)>>2]>>>1)|f;d=d+1|0;e=e+1|0;if((b|0)!=(e|0)){continue}break}}G[g+(c<<2)>>2]=f;break a}bb(a,b,1);e=G[j>>2];h=e>>>5|0;d=0;e:{f:{if(e>>>0<32){break f}while(1){if(G[g+(d<<2)>>2]==(c|0)){break f}d=d+1|0;if((h|0)!=(d|0)){continue}break}i=h-1|0;break e}i=h-1|0;if((i|0)<=(d|0)){break e}k=(h-d|0)-2|0;l=h+(d^-1)&3;if(l){while(1){m=g+(d<<2)|0;d=d+1|0;G[m>>2]=G[g+(d<<2)>>2];f=f+1|0;if((l|0)!=(f|0)){continue}break}}if(k>>>0<3){break e}while(1){f=g+(d<<2)|0;k=G[f+8>>2];G[f>>2]=G[f+4>>2];G[f+4>>2]=k;G[f+8>>2]=G[f+12>>2];d=d+4|0;G[f+12>>2]=G[g+(d<<2)>>2];if((d|0)!=(i|0)){continue}break}}if(e&8){G[g+(i<<2)>>2]=G[g+(h<<2)>>2];e=G[j>>2]}d=e&31;e=(e&-32)-32|0;G[j>>2]=d|e;k=e>>>5|0;d=0;h=0;g:{if(!e){break g}i=0;f=0;if(e>>>0>=128){m=k&134217724;e=0;while(1){l=g+(f<<2)|0;h=1<<(G[l+12>>2]>>>1)|(1<<(G[l>>2]>>>1)|h|1<<(G[l+4>>2]>>>1)|1<<(G[l+8>>2]>>>1));f=f+4|0;e=e+4|0;if((m|0)!=(e|0)){continue}break}}e=k&3;if(!e){break g}while(1){h=1<<(G[g+(f<<2)>>2]>>>1)|h;f=f+1|0;i=i+1|0;if((e|0)!=(i|0)){continue}break}}G[g+(k<<2)>>2]=h;$a(a,b);h:{i:{g=c>>1;e=G[a+760>>2]+M(g,12)|0;f=G[e+4>>2];if((f|0)<=0){break i}i=G[e>>2];while(1){if(G[i+(d<<2)>>2]==(b|0)){break i}d=d+1|0;if((f|0)!=(d|0)){continue}break}h=f-1|0;break h}h=f-1|0;if((h|0)<=(d|0)){break h}b=G[e>>2];while(1){f=b+(d<<2)|0;d=d+1|0;G[f>>2]=G[b+(d<<2)>>2];h=G[e+4>>2]-1|0;if((h|0)>(d|0)){continue}break}}G[e+4>>2]=h;b=G[a+808>>2]+(c<<2)|0;G[b>>2]=G[b>>2]-1;if(!((g|0)<G[a+840>>2]&G[G[a+836>>2]+(g<<2)>>2]>=0)){if(H[g+G[a+876>>2]|0]|H[g+G[a+904>>2]|0]){break a}c=H[g+G[a+332>>2]|0];b=H[14634];if(!((c|0)==(b|0)&((b^-1)&254)>>>1|b&c&2)){break a}}xb(a+824|0,g)}b=1;j:{if((G[j>>2]&-32)!=32){break j}b=0;c=G[j+4>>2];d=H[G[a+332>>2]+(c>>1)|0];e=d^c&1;g=H[14634];d=d&2;k:{if((e|0)==(g|0)&((g^-1)&254)>>>1|d&g){ab(a,c);break k}c=H[14633];if((c|0)==(e|0)&((c^-1)&254)>>>1|c&d){break j}}b=(Za(a)|0)==-1}return b}function pb(a){var b=0,c=0,d=0,e=0;c=la-16|0;la=c;G[a+4>>2]=0;G[a+8>>2]=0;G[a>>2]=5812;G[a+32>>2]=0;G[a+36>>2]=0;G[a+12>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;G[a+24>>2]=0;G[a+40>>2]=0;G[a+44>>2]=0;L[a+48>>3]=L[1771];L[a+56>>3]=L[1778];L[a+64>>3]=L[1785];L[a+72>>3]=L[1792];E[a+80|0]=H[14452];G[a+84>>2]=G[3593];b=G[3601];E[a+92|0]=0;G[a+88>>2]=b;E[a+93|0]=H[14428];L[a+96>>3]=L[1824];G[a+104>>2]=G[3657];G[a+108>>2]=G[3621];e=L[1817];G[a+452>>2]=0;G[a+444>>2]=0;G[a+448>>2]=0;G[a+436>>2]=0;G[a+428>>2]=0;G[a+432>>2]=0;G[a+420>>2]=0;G[a+412>>2]=0;G[a+416>>2]=0;G[a+404>>2]=0;G[a+396>>2]=0;G[a+400>>2]=0;G[a+388>>2]=0;G[a+380>>2]=0;G[a+384>>2]=0;G[a+372>>2]=0;G[a+364>>2]=0;G[a+368>>2]=0;G[a+356>>2]=0;G[a+348>>2]=0;G[a+352>>2]=0;G[a+340>>2]=0;G[a+332>>2]=0;G[a+336>>2]=0;G[a+144>>2]=0;G[a+148>>2]=1073217536;G[a+136>>2]=100;G[a+128>>2]=-1717986918;G[a+132>>2]=1072798105;G[a+120>>2]=1431655765;G[a+124>>2]=1070945621;L[a+112>>3]=e;Wb(a+152|0,0,176);G[a+460>>2]=0;G[a+464>>2]=0;b=a+544|0;G[a+456>>2]=b;G[a+468>>2]=0;G[a+472>>2]=0;G[a+476>>2]=0;G[a+480>>2]=0;G[a+520>>2]=0;G[a+524>>2]=0;G[a+512>>2]=0;G[a+516>>2]=-1;G[a+504>>2]=0;G[a+508>>2]=1072693248;G[a+496>>2]=0;G[a+500>>2]=1072693248;E[a+492|0]=1;G[a+488>>2]=a+316;G[a+528>>2]=0;G[a+532>>2]=0;G[a+540>>2]=0;G[a+544>>2]=0;E[a+536|0]=1;G[a+548>>2]=0;G[a+552>>2]=0;G[a+556>>2]=0;Qa(b,1048576);G[a+564>>2]=0;G[a+568>>2]=0;E[a+560|0]=0;G[a+572>>2]=0;G[a+576>>2]=0;G[a+580>>2]=0;G[a+584>>2]=0;G[a+588>>2]=0;G[a+592>>2]=0;G[a+596>>2]=0;G[a+604>>2]=0;G[a+608>>2]=0;G[a+612>>2]=0;G[a+616>>2]=0;G[a+620>>2]=0;G[a+624>>2]=0;G[a+628>>2]=0;G[a+632>>2]=0;G[a+636>>2]=0;G[a+664>>2]=-1;G[a+668>>2]=-1;G[a+672>>2]=-1;G[a+676>>2]=-1;E[a+680|0]=0;G[a>>2]=5924;G[a+684>>2]=G[3684];G[a+688>>2]=G[3692];G[a+692>>2]=G[3700];L[a+696>>3]=L[1857];E[a+704|0]=H[14656];E[a+705|0]=H[14680];d=H[14704];G[a+800>>2]=0;G[a+792>>2]=0;G[a+796>>2]=0;G[a+784>>2]=0;G[a+776>>2]=0;G[a+780>>2]=0;G[a+768>>2]=0;G[a+760>>2]=0;G[a+764>>2]=0;E[a+724|0]=1;G[a+716>>2]=0;G[a+720>>2]=1;G[a+708>>2]=0;G[a+712>>2]=0;E[a+707|0]=1;E[a+706|0]=d;G[a+732>>2]=0;G[a+736>>2]=0;G[a+740>>2]=0;G[a+744>>2]=0;G[a+748>>2]=0;G[a+752>>2]=0;G[a+808>>2]=0;G[a+812>>2]=0;G[a+816>>2]=0;G[a+804>>2]=b;G[a+824>>2]=0;G[a+828>>2]=0;G[a+832>>2]=0;G[a+836>>2]=0;G[a+840>>2]=0;G[a+844>>2]=0;G[a+864>>2]=0;G[a+856>>2]=0;G[a+860>>2]=0;G[a+852>>2]=a+808;qb(a+856|0,1);G[a+868>>2]=0;G[a+872>>2]=0;G[a+920>>2]=0;G[a+924>>2]=0;G[a+876>>2]=0;G[a+880>>2]=0;G[a+884>>2]=0;G[a+892>>2]=0;G[a+896>>2]=0;G[a+900>>2]=0;G[a+904>>2]=0;G[a+908>>2]=0;G[a+912>>2]=0;G[c+12>>2]=2;d=ad(8);G[c+4>>2]=d;if(!(!d&G[3719]==48)){G[d>>2]=-2;G[c+8>>2]=1;E[a+560|0]=1;b=_a(b,c+4|0,0);E[a+536|0]=0;G[a+928>>2]=b;b=G[c+4>>2];if(b){G[c+8>>2]=0;dd(b)}la=c+16|0;return a}Y(ud()|0,1024,0);B()}function tb(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0;j=la-16|0;la=j;m=a+876|0;g=la-16|0;la=g;b=G[a+580>>2];a:{if((b|0)>0){e=G[(G[a+576>>2]+(b<<2)|0)-4>>2];G[a+580>>2]=b-1;break a}e=G[a+540>>2];G[a+540>>2]=e+1}c=a+412|0;d=e<<1;b=d|1;Ta(c,b);f=G[a+412>>2]+M(e,24)|0;if(G[f>>2]){G[f+4>>2]=0}E[g+14|0]=0;f=a+428|0;Ua(f,b,g+14|0);k=c;c=d+2|0;Ta(k,c);b=G[a+412>>2]+M(b,12)|0;if(G[b>>2]){G[b+4>>2]=0}E[g+15|0]=0;Ua(f,c,g+15|0);b=H[14118];d=e+1|0;Va(a+332|0,d);E[G[a+332>>2]+e|0]=b;f=0;b:{c:{if((d|0)>G[a+400>>2]){b=G[a+404>>2];d:{if((b|0)>=(d|0)){break d}c=(d-b|0)+1&-2;h=(b>>1&-2)+2|0;c=(c|0)>(h|0)?c:h;if((c|0)>(b^2147483647)){break c}b=b+c|0;G[a+404>>2]=b;b=ed(G[a+396>>2],b<<3);G[a+396>>2]=b;if(b){break d}if(G[3719]==48){break c}}c=G[a+400>>2];e:{if((c|0)>=(d|0)){break e}b=c;h=d-b&3;if(h){while(1){k=G[a+396>>2]+(b<<3)|0;G[k>>2]=0;G[k+4>>2]=0;b=b+1|0;f=f+1|0;if((h|0)!=(f|0)){continue}break}}if(c-d>>>0>=4294967293){break e}while(1){c=b<<3;f=c+G[a+396>>2]|0;G[f>>2]=0;G[f+4>>2]=0;f=c+G[a+396>>2]|0;G[f+8>>2]=0;G[f+12>>2]=0;f=c+G[a+396>>2]|0;G[f+16>>2]=0;G[f+20>>2]=0;c=c+G[a+396>>2]|0;G[c+24>>2]=0;G[c+28>>2]=0;b=b+4|0;if((d|0)!=(b|0)){continue}break}}G[a+400>>2]=d}c=e<<3;b=c+G[a+396>>2]|0;G[b>>2]=-1;G[b+4>>2]=0;if(H[a+93|0]==1){i=L[a+72>>3]*1389796;l=i/2147483647;f:{if(O(l)<2147483648){b=~~l;break f}b=-2147483648}i=i-+(b|0)*2147483647;L[a+72>>3]=i;i=i/2147483647*1e-5}if((d|0)>G[a+320>>2]){b=G[a+324>>2];g:{if((b|0)>=(d|0)){break g}f=(d-b|0)+1&-2;h=(b>>1&-2)+2|0;f=(f|0)>(h|0)?f:h;if((f|0)>(b^2147483647)){break c}b=b+f|0;G[a+324>>2]=b;b=ed(G[a+316>>2],b<<3);G[a+316>>2]=b;if(b){break g}if(G[3719]==48){break c}}b=G[a+320>>2];if((b|0)<(d|0)){Wb(G[a+316>>2]+(b<<3)|0,0,d-b<<3)}G[a+320>>2]=d}L[c+G[a+316>>2]>>3]=i;Wa(a+588|0,d);E[G[a+588>>2]+e|0]=0;Wa(a+348|0,d);E[G[a+348>>2]+e|0]=1;Va(a+364|0,d);E[G[a+364>>2]+e|0]=2;Wa(a+380|0,d);h:{b=G[a+288>>2];i:{if((b|0)>(e|0)){break i}c=(e-b|0)+2&-2;d=(b>>1&-2)+2|0;c=(c|0)>(d|0)?c:d;if((c|0)>(b^2147483647)){break h}b=b+c|0;G[a+288>>2]=b;b=ed(G[a+280>>2],b<<2);G[a+280>>2]=b;if(b){break i}if(G[3719]==48){break h}}c=G[a+380>>2]+e|0;if(!H[c|0]){b=G[a+204>>2];d=G[a+200>>2]+1|0;b=d?b:b+1|0;G[a+200>>2]=d;G[a+204>>2]=b}E[c|0]=1;if(!(!H[G[a+380>>2]+e|0]|G[a+476>>2]>(e|0)&G[G[a+472>>2]+(e<<2)>>2]>=0)){Xa(a+460|0,e)}la=g+16|0;break b}}Y(ud()|0,1024,0);B()}b=e+1|0;Wa(m,b);E[e+G[a+876>>2]|0]=0;Wa(a+904|0,b);E[e+G[a+904>>2]|0]=0;if(H[a+724|0]==1){c=a+808|0;d=e<<1;g=d|1;qb(c,g);G[G[a+808>>2]+(e<<3)>>2]=0;qb(c,d+2|0);G[G[a+808>>2]+(g<<2)>>2]=0;Ta(a+760|0,b);c=G[a+760>>2]+M(e,12)|0;if(G[c>>2]){G[c+4>>2]=0}E[j+15|0]=0;Ua(a+776|0,b,j+15|0);Wa(a+744|0,b);E[e+G[a+744>>2]|0]=0;ub(a+824|0,e)}la=j+16|0}function Ab(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;m=1;s=G[a+260>>2];a:{b:{if(H[a+705|0]==1){d=G[a+284>>2];c:{e=G[a+296>>2];d:{if((e|0)!=G[a+300>>2]){f=G[a+292>>2];break d}c=e>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(e^2147483647)>>>0){break a}c=c+e|0;G[a+300>>2]=c;f=ed(G[a+292>>2],c<<2);G[a+292>>2]=f;if(!f){break a}e=G[a+296>>2]}G[a+296>>2]=e+1;G[(e<<2)+f>>2]=d;g=G[b+4>>2];e:{if((g|0)>0){e=H[14632];f=0;while(1){i=G[G[b>>2]+(f<<2)>>2];d=H[G[a+332>>2]+(i>>1)|0];j=d^i&1;d=d&2;c=1;if(((e^-1)&254)>>>1&(j|0)==(e&255)|d&e){break e}c=H[14633];if(!((c|0)==(j|0)&((c^-1)&254)>>>1|c&d)){ab(a,i^1);g=G[b+4>>2];e=H[14632]}f=f+1|0;if((g|0)>(f|0)){continue}break}}c=(Za(a)|0)!=-1}cb(a,0);break c}if(c){break b}}m=0;c=0;f:{g:{if(H[a+492|0]!=1){break g}Ya(G[b>>2],G[b+4>>2]);g=G[b+4>>2];h:{if((g|0)<=0){break h}n=H[14117];t=n&2;o=H[14116];h=o&2;c=1;k=(n^-1)>>>1&1;e=(o^-1)>>>1&1;i=G[a+332>>2];r=G[b>>2];f=-2;while(1){d=G[(l<<2)+r>>2];p=H[(d>>1)+i|0];j=p^d&1;if((j|0)==(o|0)&e|h&p|(d^f)==1){break g}if(!((j|0)==(n|0)&k|p&t|(d|0)==(f|0))){G[(q<<2)+r>>2]=d;q=q+1|0;g=G[b+4>>2];f=d}l=l+1|0;if((l|0)<(g|0)){continue}break}c=l-q|0;if((c|0)<=0){break h}g=g-c|0;G[b+4>>2]=g}i:{switch(g|0){case 0:E[a+492|0]=0;b=0;break f;case 1:d=G[G[b>>2]>>2];c=d>>1;E[c+G[a+332>>2]|0]=d&1;b=G[a+296>>2];c=G[a+396>>2]+(c<<3)|0;G[c>>2]=-1;G[c+4>>2]=b;b=G[a+284>>2];G[a+284>>2]=b+1;G[G[a+280>>2]+(b<<2)>>2]=d;b=(Za(a)|0)==-1;E[a+492|0]=b;break f;default:break i}}d=_a(a+544|0,b,0);b=G[a+260>>2];j:{if((b|0)!=G[a+264>>2]){e=G[a+256>>2];break j}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break a}b=b+c|0;G[a+264>>2]=b;e=ed(G[a+256>>2],b<<2);G[a+256>>2]=e;if(!e){break a}b=G[a+260>>2]}c=1;G[a+260>>2]=b+1;G[(b<<2)+e>>2]=d;$a(a,d)}b=c;break f}if(!b){break b}m=1;if(H[a+724|0]!=1){break b}c=G[a+260>>2];if((c|0)!=(s+1|0)){break b}b=G[a+544>>2];e=G[(G[a+256>>2]+(c<<2)|0)-4>>2];Bb(a+856|0,e);i=(e<<2)+b|0;if(J[i>>2]<32){break b}j=a+824|0;d=i+4|0;f=0;while(1){k=d+(f<<2)|0;h=G[a+760>>2]+M(G[k>>2]>>>1|0,12)|0;b=G[h+4>>2];k:{if((b|0)!=G[h+8>>2]){g=G[h>>2];break k}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break a}b=b+c|0;G[h+8>>2]=b;g=ed(G[h>>2],b<<2);G[h>>2]=g;if(!g){break a}b=G[h+4>>2]}G[h+4>>2]=b+1;G[(b<<2)+g>>2]=e;b=G[a+808>>2]+(G[k>>2]<<2)|0;G[b>>2]=G[b>>2]+1;E[G[a+744>>2]+(G[k>>2]>>1)|0]=1;G[a+924>>2]=G[a+924>>2]+1;b=G[k>>2]>>1;l:{if((b|0)>=G[a+840>>2]){break l}b=G[G[a+836>>2]+(b<<2)>>2];if((b|0)<0){break l}zb(j,b)}f=f+1|0;if(f>>>0<G[i>>2]>>>5>>>0){continue}break}}return m}Y(ud()|0,1024,0);B()}function Za(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0,u=0;a:{c=G[a+512>>2];b:{if((c|0)>=G[a+284>>2]){m=-1;b=0;break b}m=-1;while(1){G[a+512>>2]=c+1;b=G[a+412>>2];d=G[G[a+280>>2]+(c<<2)>>2];if(H[d+G[a+428>>2]|0]){c=0;e=0;h=M(d,12)+b|0;b=G[h+4>>2];c:{if((b|0)<=0){break c}while(1){f=G[h>>2];i=f+(c<<3)|0;if((G[G[G[a+456>>2]>>2]+(G[i>>2]<<2)>>2]&3)!=1){b=f+(e<<3)|0;f=G[i+4>>2];G[b>>2]=G[i>>2];G[b+4>>2]=f;b=G[h+4>>2];e=e+1|0}c=c+1|0;if((b|0)>(c|0)){continue}break}e=c-e|0;if((e|0)<=0){break c}G[h+4>>2]=b-e}E[d+G[a+428>>2]|0]=0;b=G[a+412>>2]}n=b+M(d,12)|0;c=G[n>>2];e=G[n+4>>2];d:{if(!e){i=c;break d}i=(e<<3)+c|0;p=d^1;e=c;while(1){l=G[a+332>>2];g=G[c+4>>2];d=H[l+(g>>1)|0];b=H[14116];j=((b^-1)&254)>>>1|0;k=b&2;e:{if(j&(b|0)==(d^g&1)|k&d){d=G[c+4>>2];G[e>>2]=G[c>>2];G[e+4>>2]=d;e=e+8|0;c=c+8|0;break e}h=G[c>>2];f=G[a+544>>2]+(h<<2)|0;d=G[f+4>>2];if((p|0)==(d|0)){d=G[f+8>>2];G[f+8>>2]=p;G[f+4>>2]=d}c=c+8|0;f:{if((d|0)==(g|0)){break f}g=H[l+(d>>1)|0];if(!(j&1&(b|0)==(g^d&1)|g&k)){break f}G[e>>2]=h;G[e+4>>2]=d;e=e+8|0;break e}g=H[14117];b=G[f>>2];g:{if(b>>>0<=95){j=(g^-1)>>>1&1;break g}s=f+4|0;t=b>>>5|0;b=2;u=g&2;j=(g^-1)>>>1&1;while(1){o=(b<<2)+s|0;k=G[o>>2];q=H[l+(k>>1)|0];if(!((g|0)==(q^k&1)&j|u&q)){G[f+8>>2]=k;G[o>>2]=p;f=G[a+412>>2]+M(G[f+8>>2]^1,12)|0;b=G[f+4>>2];h:{if((b|0)!=G[f+8>>2]){g=G[f>>2];break h}g=b>>1&-2;g=((g|0)>0?g:0)+2|0;if(g>>>0>(b^2147483647)>>>0){break a}b=b+g|0;G[f+8>>2]=b;g=ed(G[f>>2],b<<3);G[f>>2]=g;if(!g){break a}b=G[f+4>>2]}G[f+4>>2]=b+1;b=(b<<3)+g|0;G[b>>2]=h;G[b+4>>2]=d;break e}b=b+1|0;if((t|0)!=(b|0)){continue}break}}b=h;G[e>>2]=b;G[e+4>>2]=d;e=e+8|0;o=j;f=d>>1;j=f+G[a+332>>2]|0;l=H[j|0];k=d&1;if(o&(g|0)==(l^k)|g&l&2){G[a+512>>2]=G[a+284>>2];if(c>>>0>=i>>>0){m=b;break e}while(1){d=G[c+4>>2];G[e>>2]=G[c>>2];G[e+4>>2]=d;e=e+8|0;c=c+8|0;if(i>>>0>c>>>0){continue}break}m=h;break e}E[j|0]=k;h=G[a+296>>2];f=G[a+396>>2]+(f<<3)|0;G[f>>2]=b;G[f+4>>2]=h;h=G[a+284>>2];G[a+284>>2]=h+1;G[G[a+280>>2]+(h<<2)>>2]=d}if((c|0)!=(i|0)){continue}break}c=e}d=i-c>>3;if((d|0)>0){G[n+4>>2]=G[n+4>>2]-d}r=r+1|0;c=G[a+512>>2];if((c|0)<G[a+284>>2]){continue}break}b=r}d=b;h=G[a+184>>2];c=d+h|0;e=G[a+188>>2];G[a+184>>2]=c;G[a+188>>2]=c>>>0<h>>>0?e+1|0:e;e=G[a+520>>2];c=G[a+524>>2]-(d>>>0>e>>>0)|0;d=e-d|0;G[a+520>>2]=d;G[a+524>>2]=c;return m}Y(ud()|0,1024,0);B()}function Gb(a){a=a|0;var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;e=la-32|0;la=e;b=G[a+556>>2];c=G[a+548>>2];G[e+16>>2]=0;G[e+20>>2]=0;G[e+8>>2]=0;G[e+12>>2]=0;g=e+8|0;Qa(g,c-b|0);E[e+24|0]=H[a+560|0];a:{b:{if(H[a+724|0]==1){if(G[a+540>>2]>0){while(1){i=M(m,12);f=i+G[a+760>>2]|0;d=G[f+4>>2];c:{if((d|0)<=0){break c}h=G[f>>2];l=G[G[a+804>>2]>>2];c=0;b=0;while(1){j=G[h+(b<<2)>>2];if((G[l+(j<<2)>>2]&3)!=1){G[h+(c<<2)>>2]=j;d=G[f+4>>2];c=c+1|0}b=b+1|0;if((d|0)>(b|0)){continue}break}b=b-c|0;if((b|0)<=0){break c}G[f+4>>2]=d-b}h=0;E[G[a+776>>2]+m|0]=0;d:{i=i+G[a+760>>2]|0;if(G[i+4>>2]<=0){break d}e:{while(1){f:{l=G[i>>2]+(h<<2)|0;c=G[a+544>>2]+(G[l>>2]<<2)|0;d=G[c>>2];g:{if(d&16){G[l>>2]=G[c+4>>2];break g}k=G[g+8>>2];b=k;f=G[g+4>>2];j=H[g+16|0]|d>>>2&1;n=((j&1)+(d>>>5|0)|0)+1|0;d=f+n|0;if(b>>>0<d>>>0){h:{while(1){if(b>>>0>=d>>>0){break h}b=(((b>>>1)+(b>>>3)&-2)+b|0)+2|0;G[g+8>>2]=b;if(b>>>0>k>>>0){continue}break}break b}b=ed(G[g>>2],b<<2);if(!b&G[3719]==48){break f}G[g>>2]=b;f=G[g+4>>2];d=n+f|0}G[g+4>>2]=d;if(d>>>0<f>>>0){break e}d=G[g>>2]+(f<<2)|0;k=G[c>>2];G[d>>2]=k&-9|((j|0)!=0)<<3;if(J[c>>2]>=32){n=d+4|0;p=c+4|0;b=0;while(1){o=b<<2;G[n+o>>2]=G[p+o>>2];b=b+1|0;if(b>>>0<G[c>>2]>>>5>>>0){continue}break}}i:{if(!j){break i}b=d;d=k>>>3&536870908;b=b+d|0;d=c+d|0;if(k&4){K[b+4>>2]=K[d+4>>2];break i}G[b+4>>2]=G[d+4>>2]}G[l>>2]=f;G[c+4>>2]=f;G[c>>2]=G[c>>2]|16}h=h+1|0;if((h|0)<G[i+4>>2]){continue}break d}break}break b}break b}m=m+1|0;if((m|0)<G[a+540>>2]){continue}break}}b=G[a+872>>2];c=G[a+868>>2];b=(b-c|0)+((b|0)<(c|0)?G[a+860>>2]:0)|0;if((b|0)>0){f=a+856|0;while(1){c=G[a+868>>2];d=G[G[a+856>>2]+(c<<2)>>2];c=c+1|0;G[a+868>>2]=(c|0)!=G[a+860>>2]?c:0;d=G[a+544>>2]+(d<<2)|0;c=G[d>>2];if(!(c&3)){j:{if(c&16){c=G[d+4>>2];break j}c=lb(g,d);G[d+4>>2]=c;G[d>>2]=G[d>>2]|16}Bb(f,c)}c=(b|0)>1;b=b-1|0;if(c){continue}break}}b=G[a+544>>2]+(G[a+928>>2]<<2)|0;if(H[b|0]&16){G[a+928>>2]=G[b+4>>2];break a}c=lb(g,b);G[a+928>>2]=c;G[b+4>>2]=c;G[b>>2]=G[b>>2]|16}break a}Y(ud()|0,1024,0);B()}kb(a,g);if(G[a+44>>2]>=2){b=G[a+548>>2];G[e+4>>2]=G[e+12>>2]<<2;G[e>>2]=b<<2;tc(3879,e)}E[a+560|0]=H[e+24|0];b=G[a+544>>2];if(b){dd(b)}G[a+544>>2]=G[e+8>>2];G[a+548>>2]=G[e+12>>2];G[a+552>>2]=G[e+16>>2];G[a+556>>2]=G[e+20>>2];la=e+32|0}function Lc(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0,t=0;j=la-128|0;la=j;a:{b:{c:{if(!hd(f,g,h,i,0,0,0,0)){break c}k=i&65535;m=i>>>16&32767;d:{e:{if((m|0)!=32767){n=4;if(m){break e}n=f|h|(g|k)?3:2;break d}n=!(f|h|(g|k))}}if(!n){break c}s=e>>>16|0;p=s&32767;if((p|0)!=32767){break b}}od(j+16|0,b,c,d,e,f,g,h,i);b=G[j+16>>2];d=G[j+20>>2];e=G[j+24>>2];c=G[j+28>>2];jd(j,b,d,e,c,b,d,e,c);d=G[j+8>>2];e=G[j+12>>2];h=G[j>>2];i=G[j+4>>2];break a}o=d;n=e&2147483647;k=n;m=h;l=i&2147483647;if((hd(b,c,o,k,f,g,h,l)|0)<=0){if(hd(b,c,o,k,f,g,h,l)){h=b;i=c;break a}od(j+112|0,b,c,d,e,0,0,0,0);d=G[j+120>>2];e=G[j+124>>2];h=G[j+112>>2];i=G[j+116>>2];break a}q=i>>>16&32767;if(p){i=c;h=b}else{od(j+96|0,b,c,o,n,0,0,0,1081540608);o=G[j+104>>2];h=G[j+108>>2];n=h;p=(h>>>16|0)-120|0;i=G[j+100>>2];h=G[j+96>>2]}if(!q){od(j+80|0,f,g,m,l,0,0,0,1081540608);m=G[j+88>>2];f=G[j+92>>2];l=f;q=(f>>>16|0)-120|0;g=G[j+84>>2];f=G[j+80>>2]}r=m;t=l&65535|65536;n=n&65535|65536;if((p|0)>(q|0)){while(1){l=o-r|0;k=(g|0)==(i|0)&f>>>0>h>>>0|g>>>0>i>>>0;m=l-k|0;k=(n-((o>>>0<r>>>0)+t|0)|0)-(k>>>0>l>>>0)|0;f:{if((k|0)>=0|(k|0)>0){o=h;h=h-f|0;i=i-((f>>>0>o>>>0)+g|0)|0;if(!(h|m|(i|k))){od(j+32|0,b,c,d,e,0,0,0,0);d=G[j+40>>2];e=G[j+44>>2];h=G[j+32>>2];i=G[j+36>>2];break a}k=k<<1|m>>>31;o=m<<1|i>>>31;break f}k=n<<1|o>>>31;o=o<<1|i>>>31}n=k;k=i<<1|h>>>31;h=h<<1;i=k;p=p-1|0;if((q|0)<(p|0)){continue}break}p=q}l=o-r|0;k=(g|0)==(i|0)&f>>>0>h>>>0|g>>>0>i>>>0;m=l-k|0;k=(n-((o>>>0<r>>>0)+t|0)|0)-(k>>>0>l>>>0)|0;l=k;g:{if((k|0)<0){m=o;l=n;break g}o=h;h=h-f|0;i=i-((f>>>0>o>>>0)+g|0)|0;if(h|m|(i|l)){break g}od(j+48|0,b,c,d,e,0,0,0,0);d=G[j+56>>2];e=G[j+60>>2];h=G[j+48>>2];i=G[j+52>>2];break a}if((l|0)==65535|l>>>0<65535){while(1){b=i>>>31|0;p=p-1|0;n=i<<1|h>>>31;h=h<<1;i=n;c=b;b=l<<1|m>>>31;m=c|m<<1;l=b;if(b>>>0<65536){continue}break}}b=s&32768;if((p|0)<=0){od(j- -64|0,h,i,m,l&65535|(b|p+120)<<16,0,0,0,1065811968);d=G[j+72>>2];e=G[j+76>>2];h=G[j+64>>2];i=G[j+68>>2];break a}d=m;e=l&65535|(b|p)<<16}G[a>>2]=h;G[a+4>>2]=i;G[a+8>>2]=d;G[a+12>>2]=e;la=j+128|0}function za(){var a=0,b=0,c=0;na=91840;ma=26304;while(1){b=a<<4;c=b+25248|0;G[b+25252>>2]=c;G[b+25256>>2]=c;a=a+1|0;if((a|0)!=64){continue}break}$c(48);E[14117]=1;E[14118]=2;E[14116]=0;Ba(14120,1350,1712,2335,2392);G[3542]=1717986918;G[3543]=1072588390;G[3538]=0;G[3539]=1072693248;G[3536]=0;G[3537]=0;G[3530]=5860;F[7080]=0;Ba(14176,1360,1679,2335,2392);G[3556]=-652835029;G[3557]=1072691150;G[3552]=0;G[3553]=1072693248;G[3550]=0;G[3551]=0;G[3544]=5860;F[7108]=0;Ba(14232,1780,2047,2335,2392);G[3570]=0;G[3571]=0;F[7136]=257;G[3566]=0;G[3567]=1072693248;G[3564]=0;G[3565]=0;G[3558]=5860;Ba(14288,2249,1844,2335,2392);G[3584]=-201326592;G[3585]=1100339651;G[3580]=0;G[3581]=2146435072;G[3578]=0;G[3579]=0;G[3572]=5860;F[7164]=0;Ba(14344,2129,3498,2335,2401);G[3593]=2;G[3591]=0;G[3592]=2;G[3586]=5576;Ba(14376,2016,3569,2335,2401);G[3601]=2;G[3599]=0;G[3600]=2;G[3594]=5576;Ba(14408,1416,1305,2335,2376);G[3602]=5688;E[14428]=0;Ba(14432,1345,2140,2335,2376);E[14452]=1;G[3608]=5688;Ba(14456,1409,1973,2335,2401);G[3621]=100;G[3619]=1;G[3620]=2147483647;G[3614]=5576;Ba(14488,2269,1747,2335,2392);G[3634]=0;G[3635]=1073741824;G[3630]=0;G[3631]=2146435072;G[3628]=0;G[3629]=1072693248;G[3622]=5860;F[7264]=0;Ba(14544,2279,2170,2335,2392);G[3648]=-1717986918;G[3649]=1070176665;G[3644]=0;G[3645]=2146435072;G[3642]=0;G[3643]=0;G[3636]=5860;F[7292]=0;Ba(14600,1582,1531,2335,2401);G[3655]=0;G[3656]=2147483647;G[3650]=5576;G[3657]=0;E[14633]=1;E[14634]=2;E[14632]=0;Ba(14636,1931,3171,2317,2376);G[3659]=5688;E[14656]=0;Ba(14660,1999,3451,2317,2376);G[3665]=5688;E[14680]=0;Ba(14684,1937,2906,2317,2376);E[14704]=1;G[3671]=5688;Ba(14708,1404,2786,2317,2401);G[3682]=-2147483648;G[3683]=2147483647;G[3677]=5576;G[3684]=0;Ba(14740,1958,1425,2317,2401);G[3692]=20;G[3690]=-1;G[3691]=2147483647;G[3685]=5576;Ba(14772,1965,2704,2317,2401);G[3700]=1e3;G[3698]=-1;G[3699]=2147483647;G[3693]=5576;Ba(14808,2274,2936,2317,2392);G[3714]=0;G[3715]=1071644672;G[3710]=0;G[3711]=2146435072;G[3708]=0;G[3709]=0;G[3702]=5860;F[7424]=0;G[3760]=14912;G[3742]=42}function Ra(a){a=a|0;var b=0,c=0,d=0,e=0;G[a>>2]=5812;b=G[a+628>>2];if(b){G[a+632>>2]=0;dd(b);G[a+636>>2]=0;G[a+628>>2]=0}b=G[a+616>>2];if(b){G[a+620>>2]=0;dd(b);G[a+624>>2]=0;G[a+616>>2]=0}b=G[a+604>>2];if(b){G[a+608>>2]=0;dd(b);G[a+612>>2]=0;G[a+604>>2]=0}b=G[a+588>>2];if(b){G[a+592>>2]=0;dd(b);G[a+596>>2]=0;G[a+588>>2]=0}b=G[a+576>>2];if(b){G[a+580>>2]=0;dd(b);G[a+584>>2]=0;G[a+576>>2]=0}b=G[a+564>>2];if(b){G[a+568>>2]=0;dd(b);G[a+572>>2]=0;G[a+564>>2]=0}b=G[a+544>>2];if(b){dd(b)}b=G[a+472>>2];if(b){G[a+476>>2]=0;dd(b);G[a+480>>2]=0;G[a+472>>2]=0}b=G[a+460>>2];if(b){G[a+464>>2]=0;dd(b);G[a+468>>2]=0;G[a+460>>2]=0}b=G[a+444>>2];if(b){G[a+448>>2]=0;dd(b);G[a+452>>2]=0;G[a+444>>2]=0}b=G[a+428>>2];if(b){G[a+432>>2]=0;dd(b);G[a+436>>2]=0;G[a+428>>2]=0}c=G[a+412>>2];if(c){b=0;d=G[a+416>>2];if((d|0)>0){while(1){c=G[a+412>>2]+M(b,12)|0;e=G[c>>2];if(e){G[c+4>>2]=0;dd(e);G[c+8>>2]=0;G[c>>2]=0;d=G[a+416>>2]}b=b+1|0;if((d|0)>(b|0)){continue}break}c=G[a+412>>2]}G[a+416>>2]=0;dd(c);G[a+420>>2]=0;G[a+412>>2]=0}b=G[a+396>>2];if(b){G[a+400>>2]=0;dd(b);G[a+404>>2]=0;G[a+396>>2]=0}b=G[a+380>>2];if(b){G[a+384>>2]=0;dd(b);G[a+388>>2]=0;G[a+380>>2]=0}b=G[a+364>>2];if(b){G[a+368>>2]=0;dd(b);G[a+372>>2]=0;G[a+364>>2]=0}b=G[a+348>>2];if(b){G[a+352>>2]=0;dd(b);G[a+356>>2]=0;G[a+348>>2]=0}b=G[a+332>>2];if(b){G[a+336>>2]=0;dd(b);G[a+340>>2]=0;G[a+332>>2]=0}b=G[a+316>>2];if(b){G[a+320>>2]=0;dd(b);G[a+324>>2]=0;G[a+316>>2]=0}b=G[a+304>>2];if(b){G[a+308>>2]=0;dd(b);G[a+312>>2]=0;G[a+304>>2]=0}b=G[a+292>>2];if(b){G[a+296>>2]=0;dd(b);G[a+300>>2]=0;G[a+292>>2]=0}b=G[a+280>>2];if(b){G[a+284>>2]=0;dd(b);G[a+288>>2]=0;G[a+280>>2]=0}b=G[a+268>>2];if(b){G[a+272>>2]=0;dd(b);G[a+276>>2]=0;G[a+268>>2]=0}b=G[a+256>>2];if(b){G[a+260>>2]=0;dd(b);G[a+264>>2]=0;G[a+256>>2]=0}b=G[a+32>>2];if(b){G[a+36>>2]=0;dd(b);G[a+40>>2]=0;G[a+32>>2]=0}b=G[a+16>>2];if(b){G[a+20>>2]=0;dd(b);G[a+24>>2]=0;G[a+16>>2]=0}b=G[a+4>>2];if(b){G[a+8>>2]=0;dd(b);G[a+12>>2]=0;G[a+4>>2]=0}return a|0}function jb(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0;d=la-272|0;la=d;qc(d+120|0);e=G[d+120>>2];g=G[d+124>>2];i=G[d+128>>2];f=la-288|0;la=f;G[f+16>>2]=42;b=f+32|0;Ac(b,1566,f+16|0);c=ec(b,2292);if(c){G[f+28>>2]=0;if(G[c+76>>2]<0){b=G[c>>2]}else{b=G[c>>2]}a:{if(b>>>4&1){break a}while(1){G[f>>2]=f+28;if((lc(c,2354,f)|0)==1){break a}while(1){if(G[c+76>>2]<0){b=G[c>>2]}else{b=G[c>>2]}if(!(b>>>4&1)){b=G[c+76>>2];b:{if(!((b|0)>=0&(!b|G[3742]!=(b&1073741823)))){b=G[c+4>>2];if((b|0)!=G[c+8>>2]){G[c+4>>2]=b+1;b=H[b|0];break b}b=$b(c);break b}b=G[c+76>>2];G[c+76>>2]=b?b:1073741823;b=G[c+4>>2];c:{if((b|0)!=G[c+8>>2]){G[c+4>>2]=b+1;b=H[b|0];break c}b=$b(c)}G[c+76>>2]=0}if((b|0)!=10){continue}}break}if(G[c+76>>2]<0){b=G[c>>2]}else{b=G[c>>2]}if(!(b>>>4&1)){continue}break}}Yb(c);h=+G[f+28>>2]*.0009765625}else{h=0}if(h==0){d:{c=la-288|0;la=c;G[c+16>>2]=42;b=c+32|0;Ac(b,1916,c+16|0);e:{b=ec(b,2292);if(b){G[c>>2]=c+28;if((lc(b,2266,c)|0)!=1){break e}Yb(b);h=+G[c+28>>2]}else{h=0}la=c+288|0;h=h*65536*9.5367431640625e-7;break d}wc(3374);X(1);B()}}la=f+288|0;b=G[a+164>>2];G[d+112>>2]=G[a+160>>2];G[d+116>>2]=b;tc(4317,d+112|0);b=G[a+196>>2];c=G[a+192>>2];G[d+96>>2]=c;G[d+100>>2]=b;j=+(i|0)/1e6+(+(e>>>0)+ +(g|0)*4294967296);L[d+104>>3]=(+(c>>>0)+ +(b>>>0)*4294967296)/j;uc(5488,d+96|0);b=G[a+176>>2];e=G[a+180>>2];g=G[a+168>>2];i=G[a+172>>2];L[d+80>>3]=(+(g>>>0)+ +(i>>>0)*4294967296)/j;G[d+64>>2]=g;G[d+68>>2]=i;L[d+72>>3]=N(N(N(+(b>>>0)+ +(e>>>0)*4294967296)*N(100))/N(+(g>>>0)+ +(i>>>0)*4294967296));uc(5376,d- -64|0);e=G[a+188>>2];b=G[a+184>>2];G[d+48>>2]=b;G[d+52>>2]=e;L[d+56>>3]=(+(b>>>0)+ +(e>>>0)*4294967296)/j;uc(5441,d+48|0);b=G[a+240>>2];g=G[a+244>>2];e=G[a+248>>2];a=G[a+252>>2];G[d+32>>2]=e;G[d+36>>2]=a;k=d,l=(+(Od(b-e|0,g-(a+(b>>>0<e>>>0)|0)|0,100,0)>>>0)+ +(oa>>>0)*4294967296)/(+(b>>>0)+ +(g>>>0)*4294967296),L[k+40>>3]=l;uc(5305,d+32|0);if(h!=0){L[d+16>>3]=h;uc(4656,d+16|0)}L[d>>3]=j;uc(4484,d);la=d+272|0}function ad(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0;i=8;a:{b:{while(1){if(i-1&i|a>>>0>4294967239){break b}l=i>>>0>8;i=l?i:8;c=G[6571];d=c;e=G[6570];a=a>>>0<=8?8:a+3&-4;c:{if(a>>>0<=127){g=(a>>>3|0)-1|0;break c}b=P(a);g=((a>>>29-b^4)-(b<<2)|0)+110|0;if(a>>>0<=4095){break c}b=((a>>>30-b^2)-(b<<1)|0)+71|0;g=b>>>0>=63?63:b}b=g&31;if((g&63)>>>0>=32){f=0;b=c>>>b|0}else{f=c>>>b|0;b=((1<<b)-1&c)<<32-b|e>>>b}if(b|f){while(1){e=b;d:{if(b|f){c=f-1|0;d=b-1|0;c=(d|0)!=-1?c+1|0:c;d=P(b^d)+32|0;b=P(c^f);c=(b|0)==32?d:b;b=63-c|0;oa=0-(c>>>0>63)|0;break d}oa=0;b=64}c=b;d=c&31;if((c&63)>>>0>=32){b=0;k=f>>>d|0}else{b=f>>>d|0;k=((1<<d)-1&f)<<32-d|e>>>d}f=b;g=c+g|0;b=g<<4;d=G[b+25256>>2];c=b+25248|0;e:{if((d|0)!=(c|0)){b=bd(d,i,a);if(b){break a}e=G[d+4>>2];b=G[d+8>>2];G[e+8>>2]=b;G[b+4>>2]=e;G[d+8>>2]=c;G[d+4>>2]=G[c+4>>2];G[c+4>>2]=d;G[G[d+4>>2]+8>>2]=d;g=g+1|0;b=(f&1)<<31|k>>>1;f=f>>>1|0;break e}m=G[6571];e=g;b=e&63;d=b&31;if(b>>>0>=32){c=0;d=-1>>>d|0}else{c=-1>>>d|0;d=c|(1<<d)-1<<32-d}d=d&-2;h=b&31;if(b>>>0>=32){c=d<<h;d=0}else{c=(1<<h)-1&d>>>32-h|c<<h;d=d<<h}b=c;h=0-e&63;e=h;c=e&31;if(e>>>0>=32){c=-1<<c;e=0}else{e=-1<<c;c=e|(1<<c)-1&-1>>>32-c}e=e&-2;j=h&31;if(h>>>0>=32){h=0;e=c>>>j|0}else{h=c>>>j|0;e=((1<<j)-1&c)<<32-j|e>>>j}e=e|d;oa=b|h;G[6570]=G[6570]&e;G[6571]=oa&m;b=k^1}if(b|f){continue}break}d=G[6571];e=G[6570]}b=P(d);c=63-((b|0)==32?P(e)+32|0:b)|0;f:{if(!(d|e)){f=0;break f}b=c<<4;f=G[b+25256>>2];if(!d&e>>>0<1073741824){break f}g=99;e=b+25248|0;if((e|0)==(f|0)){break f}while(1){if(!g){break f}b=bd(f,i,a);if(b){break a}g=g-1|0;f=G[f+8>>2];if((e|0)!=(f|0)){continue}break}}if($c((l?i+48|0:48)+a|0)){continue}break}if(!f){break b}e=(c<<4)+25248|0;if((e|0)==(f|0)){break b}while(1){b=bd(f,i,a);if(b){break a}f=G[f+8>>2];if((e|0)!=(f|0)){continue}break}}b=0}return b}function gb(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0;f=la-16|0;la=f;G[f+12>>2]=0;G[f+4>>2]=0;G[f+8>>2]=0;b=G[a+540>>2];if((b|0)>0){while(1){a:{if(!H[G[a+380>>2]+e|0]){break a}d=H[G[a+332>>2]+e|0];j=H[14118];if(!((d|0)==(j|0)&((j^-1)&254)>>>1|d&j&2)){break a}b:{d=G[f+8>>2];if((d|0)!=G[f+12>>2]){break b}b=d>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0<=(d^2147483647)>>>0){b=b+d|0;G[f+12>>2]=b;c=ed(c,b<<2);G[f+4>>2]=c;if(c){break b}}Y(ud()|0,1024,0);B()}G[f+8>>2]=d+1;G[(d<<2)+c>>2]=e;b=G[a+540>>2]}e=e+1|0;if((e|0)<(b|0)){continue}break}}b=0;g=G[a+460>>2];c:{d:{if(G[a+464>>2]>0){c=G[a+472>>2];while(1){G[c+(G[(b<<2)+g>>2]<<2)>>2]=-1;b=b+1|0;if((b|0)<G[a+464>>2]){continue}break}break d}if(!g){break c}}G[a+464>>2]=0}e:{if(G[f+8>>2]<=0){break e}e=0;f:{while(1){d=G[f+4>>2]+(e<<2)|0;G[G[a+472>>2]+(G[d>>2]<<2)>>2]=e;b=G[a+464>>2];if((b|0)==G[a+468>>2]){c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break f}c=b+c|0;G[a+468>>2]=c;g=ed(g,c<<2);G[a+460>>2]=g;if(!g){break f}b=G[a+464>>2]}G[a+464>>2]=b+1;G[(b<<2)+g>>2]=G[d>>2];e=e+1|0;if((e|0)<G[f+8>>2]){continue}break}c=G[a+464>>2];if((c|0)<2){break e}c=c>>>1|0;p=G[a+472>>2];while(1){j=c;c=c-1|0;l=G[(c<<2)+g>>2];m=p;d=G[a+464>>2];e=c;h=c<<1;i=h|1;g:{if((d|0)<=(i|0)){break g}k=G[G[a+488>>2]>>2];q=L[k+(l<<3)>>3];m=G[a+472>>2];while(1){b=h+2|0;h:{i:{if((d|0)<=(b|0)){h=G[(i<<2)+g>>2];n=L[(h<<3)+k>>3];break i}h=G[(b<<2)+g>>2];o=L[(h<<3)+k>>3];d=G[(i<<2)+g>>2];n=L[(d<<3)+k>>3];if(o>n){break h}h=d}o=n;b=i}if(!(o>q)){break g}G[(e<<2)+g>>2]=h;G[(h<<2)+m>>2]=e;d=G[a+464>>2];e=b;h=b<<1;i=h|1;if((d|0)>(i|0)){continue}break}}G[(e<<2)+g>>2]=l;G[(l<<2)+m>>2]=e;if((j|0)>1){continue}break}break e}Y(ud()|0,1024,0);B()}a=G[f+4>>2];if(a){G[f+8>>2]=0;dd(a)}la=f+16|0}function bb(a,b,c){var d=0,e=0,f=0,g=0,h=0;g=G[a+544>>2]+(b<<2)|0;a:{b:{c:{d:{if(c){f=G[a+412>>2];e=f+M(G[g+4>>2]^1,12)|0;d=G[e+4>>2];if((d|0)<=0){c=0;break d}h=G[e>>2];c=0;while(1){if(G[(c<<3)+h>>2]==(b|0)){break d}c=c+1|0;if((d|0)!=(c|0)){continue}break}d=d-1|0;break c}c=G[a+428>>2];e=G[g+4>>2]^1;b=c+e|0;if(!H[b|0]){E[b|0]=1;c=G[a+448>>2];e:{if((c|0)!=G[a+452>>2]){b=G[a+444>>2];break e}b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break a}b=b+c|0;G[a+452>>2]=b;b=ed(G[a+444>>2],b<<2);G[a+444>>2]=b;if(!b){break a}c=G[a+448>>2]}G[a+448>>2]=c+1;G[(c<<2)+b>>2]=e;c=G[a+428>>2]}e=G[g+8>>2]^1;b=c+e|0;if(H[b|0]){break b}E[b|0]=1;f:{c=G[a+448>>2];g:{if((c|0)!=G[a+452>>2]){b=G[a+444>>2];break g}b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break f}b=b+c|0;G[a+452>>2]=b;b=ed(G[a+444>>2],b<<2);G[a+444>>2]=b;if(!b){break f}c=G[a+448>>2]}G[a+448>>2]=c+1;G[(c<<2)+b>>2]=e;break b}break a}d=d-1|0;if((d|0)<=(c|0)){break c}while(1){d=G[e>>2];f=d+(c<<3)|0;c=c+1|0;d=d+(c<<3)|0;h=G[d+4>>2];G[f>>2]=G[d>>2];G[f+4>>2]=h;d=G[e+4>>2]-1|0;if((d|0)>(c|0)){continue}break}f=G[a+412>>2]}G[e+4>>2]=d;h:{i:{e=M(G[g+8>>2]^1,12)+f|0;d=G[e+4>>2];if((d|0)<=0){c=0;break i}f=G[e>>2];c=0;while(1){if(G[f+(c<<3)>>2]==(b|0)){break i}c=c+1|0;if((d|0)!=(c|0)){continue}break}b=d-1|0;break h}b=d-1|0;if((c|0)>=(b|0)){break h}while(1){b=G[e>>2];d=b+(c<<3)|0;c=c+1|0;b=b+(c<<3)|0;f=G[b+4>>2];G[d>>2]=G[b>>2];G[d+4>>2]=f;b=G[e+4>>2]-1|0;if((c|0)<(b|0)){continue}break}}G[e+4>>2]=b}e=G[g>>2]&4;b=(e?216:208)+a|0;c=G[b>>2];d=G[b+4>>2]-!c|0;c=c-1|0;G[b>>2]=c;G[b+4>>2]=d;a=(e?232:224)+a|0;b=G[a>>2];c=G[g>>2]>>>5|0;g=G[a+4>>2]-(c>>>0>b>>>0)|0;b=b-c|0;G[a>>2]=b;G[a+4>>2]=g;return}Y(ud()|0,1024,0);B()}function ed(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;if(!a){return ad(b)}if(!b){dd(a);return 0}a:{if(b>>>0>4294967239){break a}h=b>>>0<=8?8:b+3&-4;b=h+8|0;b:{c:{j=a-4|0;f=j;c=G[f>>2];e=c+f|0;i=G[e>>2];g=i+e|0;d:{e:{if(G[g-4>>2]!=(i|0)){d=b+f|0;if(d+16>>>0<=g>>>0){c=G[e+4>>2];e=G[e+8>>2];G[c+8>>2]=e;G[e+4>>2]=c;c=g-d|0;G[d>>2]=c;G[(d+(c&-4)|0)-4>>2]=c|1;e=G[d>>2]-8|0;f:{if(e>>>0<=127){c=(e>>>3|0)-1|0;break f}g=P(e);c=((e>>>29-g^4)-(g<<2)|0)+110|0;if(e>>>0<=4095){break f}c=((e>>>30-g^2)-(g<<1)|0)+71|0;c=c>>>0>=63?63:c}e=c<<4;G[d+4>>2]=e+25248;e=e+25256|0;G[d+8>>2]=G[e>>2];G[e>>2]=d;G[G[d+8>>2]+4>>2]=d;e=G[6571];d=c&31;if((c&63)>>>0>=32){c=1<<d;g=0}else{g=1<<d;c=g-1&1>>>32-d}G[6570]=g|G[6570];G[6571]=c|e;G[f>>2]=b;break c}if(d>>>0>g>>>0){break e}b=G[e+4>>2];d=G[e+8>>2];G[b+8>>2]=d;G[d+4>>2]=b;b=c+i|0;G[f>>2]=b;break c}if(c>>>0>=b+16>>>0){G[f>>2]=b;G[(f+(b&-4)|0)-4>>2]=b;d=b+f|0;b=c-b|0;G[d>>2]=b;G[(d+(b&-4)|0)-4>>2]=b|1;c=G[d>>2]-8|0;g:{if(c>>>0<=127){b=(c>>>3|0)-1|0;break g}f=P(c);b=((c>>>29-f^4)-(f<<2)|0)+110|0;if(c>>>0<=4095){break g}b=((c>>>30-f^2)-(f<<1)|0)+71|0;b=b>>>0>=63?63:b}c=b<<4;G[d+4>>2]=c+25248;c=c+25256|0;G[d+8>>2]=G[c>>2];G[c>>2]=d;G[G[d+8>>2]+4>>2]=d;c=G[6571];d=b&31;if((b&63)>>>0>=32){b=1<<d;e=0}else{e=1<<d;b=e-1&1>>>32-d}G[6570]=e|G[6570];G[6571]=b|c;b=1;break b}d=1;if(b>>>0<=c>>>0){break d}}d=0}b=d;break b}G[(f+(b&-4)|0)-4>>2]=b;b=1}if(b){return a}b=ad(h);if(!b){break a}d=G[j>>2]-8|0;jc(b,a,d>>>0>h>>>0?h:d);dd(a);k=b}return k}function hb(a){var b=0,c=0,d=0,e=0,f=0,g=0;a:{if(H[a+492|0]==1){if((Za(a)|0)==-1){break a}}E[a+492|0]=0;return 0}b:{if(G[a+284>>2]==G[a+516>>2]){break b}c=G[a+520>>2];e=G[a+524>>2];if((e|0)>0){c=1}else{c=!!c&(e|0)>=0}if(c){break b}fb(a,a+268|0);c:{if(H[a+536|0]!=1){break c}fb(a,a+256|0);if(G[a+568>>2]>0){while(1){E[G[a+588>>2]+G[G[a+564>>2]+(b<<2)>>2]|0]=1;b=b+1|0;if((b|0)<G[a+568>>2]){continue}break}}c=G[a+284>>2];d:{if((c|0)<=0){break d}g=G[a+588>>2];e=G[a+280>>2];b=0;while(1){f=G[(b<<2)+e>>2];if(!H[(f>>1)+g|0]){G[(d<<2)+e>>2]=f;d=d+1|0;c=G[a+284>>2]}b=b+1|0;if((c|0)>(b|0)){continue}break}b=b-d|0;if((b|0)<=0){break d}c=c-b|0;G[a+284>>2]=c}G[a+512>>2]=c;if(G[a+568>>2]>0){b=0;while(1){E[G[a+588>>2]+G[G[a+564>>2]+(b<<2)>>2]|0]=0;b=b+1|0;if((b|0)<G[a+568>>2]){continue}break}}d=0;e:{f:{if(G[a+568>>2]>0){while(1){b=G[a+580>>2];g:{if((b|0)!=G[a+584>>2]){c=G[a+576>>2];break g}c=b>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(b^2147483647)>>>0){break f}b=b+c|0;G[a+584>>2]=b;c=ed(G[a+576>>2],b<<2);G[a+576>>2]=c;if(!c){break f}b=G[a+580>>2]}G[(b<<2)+c>>2]=0;b=G[a+580>>2]+1|0;G[a+580>>2]=b;G[((b<<2)+c|0)-4>>2]=G[G[a+564>>2]+(d<<2)>>2];d=d+1|0;if((d|0)<G[a+568>>2]){continue}break}}break e}Y(ud()|0,1024,0);B()}if(!G[a+564>>2]){break c}G[a+568>>2]=0}if(+J[a+556>>2]>L[a+96>>3]*+J[a+548>>2]){pa[G[G[a>>2]+8>>2]](a)}gb(a);G[a+516>>2]=G[a+284>>2];b=G[a+236>>2]+G[a+228>>2]|0;c=G[a+224>>2];d=c+G[a+232>>2]|0;b=d>>>0<c>>>0?b+1|0:b;G[a+520>>2]=d;G[a+524>>2]=b}return 1}function Ia(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;f=la-32|0;la=f;a:{b:{c:{if(H[b|0]!=45){break c}e=b+1|0;b=0;g=G[a+4>>2];d=H[g|0];if(d){while(1){if(H[b+e|0]!=(d|0)){break c}b=b+1|0;d=H[g+b|0];if(d){continue}break}}b=b+e|0;if(H[b|0]!=61){break c}m=f+28|0;i=-2147483648;j=la-16|0;la=j;g=b+1|0;c=H[g|0];d:{if(!c){d=g;break d}d=g;e:{while(1){b=c<<24>>24;if(!((b|0)==32|b-9>>>0<5)){break e}c=H[d+1|0];d=d+1|0;if(c){continue}break}break d}f:{b=c&255;switch(b-43|0){case 0:case 2:break f;default:break d}}l=(b|0)==45?-1:0;d=d+1|0}b=0;while(1){g:{e=H[d|0];c=e-48|0;h:{if((c&255)>>>0<10){break h}if((e-97&255)>>>0<=25){c=e-87|0;break h}if((e-65&255)>>>0>25){break g}c=e-55|0}c=c&255;if(c>>>0>=10){break g}pd(j,10,0,0,0,h,k,0,0);e=1;i:{if(G[j+8>>2]|G[j+12>>2]){break i}n=Od(h,k,10,0);o=oa;if((o|0)==-1&(c^-1)>>>0<n>>>0){break i}e=o;h=c+n|0;k=h>>>0<c>>>0?e+1|0:e;p=1;e=b}d=d+1|0;b=e;continue}break}if(m){G[m>>2]=p?d:g}j:{k:{l:{if(b){G[3719]=68;h=-2147483648;k=0;break l}if(!k&h>>>0<2147483648){break k}}if(!l){G[3719]=68;i=2147483647;break j}if(!k&h>>>0<=2147483648){break k}G[3719]=68;break j}i=(h^l)-l|0}la=j+16|0;b=G[f+28>>2];if(b){if((i|0)>G[a+24>>2]){break b}if((i|0)<G[a+20>>2]){break a}G[a+28>>2]=i}c=(b|0)!=0}la=f+32|0;return c|0}G[f+4>>2]=G[a+4>>2];G[f>>2]=g;fc(G[3076],5191,f);X(1);B()}G[f+20>>2]=G[a+4>>2];G[f+16>>2]=g;fc(G[3076],5142,f+16|0);X(1);B()}function xd(a,b,c){a=a|0;b=b|0;c=c|0;var d=0,e=0,f=0,g=0,h=0,i=0;g=la+-64|0;la=g;a:{f=1;b:{if(wd(a,b,0)){break b}f=0;if(!b){break b}h=la-16|0;la=h;f=G[b>>2];e=G[f-8>>2];G[h+12>>2]=e;G[h+4>>2]=b+e;G[h+8>>2]=G[f-4>>2];f=G[h+8>>2];e=wd(f,13552,0);i=G[h+4>>2];c:{if(e){b=la+-64|0;la=b;la=b- -64|0;d=G[h+12>>2]?0:i;break c}e=la+-64|0;la=e;if((b|0)>=(i|0)){G[e+28>>2]=0;G[e+32>>2]=0;G[e+36>>2]=0;G[e+40>>2]=0;G[e+44>>2]=0;G[e+48>>2]=0;G[e+20>>2]=0;G[e+24>>2]=0;G[e+16>>2]=0;G[e+12>>2]=13552;G[e+4>>2]=f;G[e+60>>2]=0;G[e+52>>2]=1;G[e+56>>2]=16777216;G[e+8>>2]=b;pa[G[G[f>>2]+20>>2]](f,e+4|0,i,i,1,0);d=G[e+28>>2]?b:0}la=e- -64|0;if(d){break c}d=la+-64|0;la=d;G[d+16>>2]=0;G[d+12>>2]=13504;G[d+8>>2]=b;G[d+4>>2]=13552;b=0;Wb(d+20|0,0,39);G[d+60>>2]=0;E[d+59|0]=1;pa[G[G[f>>2]+24>>2]](f,d+4|0,i,1,0);d:{e:{switch(G[d+40>>2]){case 0:b=G[d+44>>2]==1?G[d+32>>2]==1?G[d+36>>2]==1?G[d+24>>2]:0:0:0;break d;case 1:break e;default:break d}}if(G[d+28>>2]!=1){if(G[d+44>>2]|G[d+32>>2]!=1|G[d+36>>2]!=1){break d}}b=G[d+20>>2]}la=d- -64|0;d=b}la=h+16|0;f=0;if(!d){break b}b=G[c>>2];if(!b){break a}Wb(g+8|0,0,56);E[g+59|0]=1;G[g+16>>2]=-1;G[g+12>>2]=a;G[g+4>>2]=d;G[g+52>>2]=1;pa[G[G[d>>2]+28>>2]](d,g+4|0,b,1);a=G[g+28>>2];if((a|0)==1){G[c>>2]=G[g+20>>2]}f=(a|0)==1}la=g- -64|0;return f|0}ja(3632,1789,473,2006);B()}function eb(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=N(0),p=0;a:{if((b|0)<=15){g=a;break a}while(1){j=G[c>>2];n=j+(G[(b<<1&-4)+a>>2]<<2)|0;l=n+4|0;e=b;d=-1;while(1){k=G[n>>2];d=d+1|0;g=(d<<2)+a|0;i=G[g>>2];h=j+(i<<2)|0;f=G[h>>2];b:{if(f>>>0<96){break b}m=k>>>5|0;if((m|0)==2){while(1){d=d+1|0;g=(d<<2)+a|0;i=G[g>>2];if(J[j+(i<<2)>>2]>95){continue}break b}}o=K[l+(m<<2)>>2];if(!(o>K[(h+(f>>>5<<2)|0)+4>>2])){break b}while(1){d=d+1|0;g=(d<<2)+a|0;i=G[g>>2];h=j+(i<<2)|0;f=G[h>>2];if(f>>>0<=95){break b}if(K[(h+(f>>>3&536870908)|0)+4>>2]<o){continue}break}}e=e-1|0;f=(e<<2)+a|0;h=G[f>>2];c:{if(k>>>0<96){break c}k=l+(k>>>3&536870908)|0;while(1){m=j+(h<<2)|0;p=G[m>>2]>>>5|0;if((p|0)!=2&!(K[k>>2]<K[(m+(p<<2)|0)+4>>2])){break c}e=e-1|0;f=(e<<2)+a|0;h=G[f>>2];continue}}if((d|0)<(e|0)){G[g>>2]=h;G[f>>2]=i;continue}break}eb(a,d,c);a=g;b=b-d|0;if((b|0)>=16){continue}break}}if((b|0)>=2){k=b-2|0;j=G[c>>2];d=0;while(1){a=d;c=a+1|0;e=c;while(1){i=j+(G[(e<<2)+g>>2]<<2)|0;h=G[i>>2];d:{if(h>>>0<96){break d}l=j+(G[(a<<2)+g>>2]<<2)|0;f=G[l>>2]>>>5|0;if((f|0)!=2){if(!(K[(i+(h>>>5<<2)|0)+4>>2]<K[(l+(f<<2)|0)+4>>2])){break d}}a=e}e=e+1|0;if((e|0)!=(b|0)){continue}break}e=(d<<2)+g|0;i=G[e>>2];a=(a<<2)+g|0;G[e>>2]=G[a>>2];G[a>>2]=i;a=(d|0)==(k|0);d=c;if(!a){continue}break}}}function Nc(a,b){var c=0,d=0,e=0,f=0,g=0;a:{b:{c:{d:{e:{c=G[a+4>>2];f:{if((c|0)!=G[a+104>>2]){G[a+4>>2]=c+1;c=H[c|0];break f}c=Hc(a)}switch(c-43|0){case 0:case 2:break e;default:break d}}g=(c|0)==45;b=!b;c=G[a+4>>2];g:{if((c|0)!=G[a+104>>2]){G[a+4>>2]=c+1;c=H[c|0];break g}c=Hc(a)}d=c-58|0;if(b|d>>>0>4294967285){break c}if(G[a+116>>2]<0){break b}G[a+4>>2]=G[a+4>>2]-1;break b}d=c-58|0}if(d>>>0<4294967286){break b}h:{if(c-48>>>0>=10){break h}while(1){e=(M(e,10)+c|0)-48|0;f=(e|0)<214748364;c=G[a+4>>2];i:{if((c|0)!=G[a+104>>2]){G[a+4>>2]=c+1;c=H[c|0];break i}c=Hc(a)}b=c-48|0;if(f&b>>>0<=9){continue}break}f=e>>31;if(b>>>0>=10){break h}while(1){b=c;c=Od(e,f,10,0);d=b+c|0;b=oa;e=d-48|0;d=(c>>>0>d>>>0?b+1|0:b)-(d>>>0<48)|0;f=d;d=e>>>0<2061584302&(d|0)<=21474836|(d|0)<21474836;c=G[a+4>>2];j:{if((c|0)!=G[a+104>>2]){G[a+4>>2]=c+1;c=H[c|0];break j}c=Hc(a)}b=c-48|0;if(d&b>>>0<=9){continue}break}if(b>>>0>=10){break h}while(1){b=G[a+4>>2];k:{if((b|0)!=G[a+104>>2]){G[a+4>>2]=b+1;b=H[b|0];break k}b=Hc(a)}if(b-48>>>0<10){continue}break}}b=G[a+116>>2];if((b|0)>0){b=1}else{b=(b|0)>=0}if(b){G[a+4>>2]=G[a+4>>2]-1}a=e;e=g?0-a|0:a;f=g?0-(((a|0)!=0)+f|0)|0:f;break a}f=-2147483648;if(G[a+116>>2]<0){break a}G[a+4>>2]=G[a+4>>2]-1;oa=-2147483648;return 0}oa=f;return e}function fb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0;a:{if(G[b+4>>2]<=0){break a}while(1){h=G[b>>2];p=k<<2;e=G[h+p>>2];i=e<<2;f=i+G[a+544>>2]|0;c=G[f>>2];b:{c:{if(c>>>0<32){break c}g=f+4|0;l=c>>>5|0;d=0;j=H[14116];m=j&2;r=(j^-1)>>>1&1;s=G[a+332>>2];d:{while(1){q=G[g+(d<<2)>>2];n=H[(q>>1)+s|0];if(!(r&(j|0)==(n^q&1)|n&m)){d=d+1|0;if((l|0)!=(d|0)){continue}break d}break}bb(a,e,0);c=G[g>>2];g=c>>1;d=H[g+G[a+332>>2]|0];e=d^c&1;c=H[14116];e:{if(!((e|0)==(c|0)&((c^-1)&254)>>>1|d&c&2)){break e}d=G[a+396>>2]+(g<<3)|0;c=G[d>>2];if((c|0)==-1|(G[a+544>>2]+(c<<2)|0)!=(f|0)){break e}G[d>>2]=-1}G[f>>2]=G[f>>2]&-4|1;d=G[i+G[a+544>>2]>>2];G[a+556>>2]=((G[a+556>>2]+(d>>>5|0)|0)+(d>>>3&1)|0)+1;break b}if(c>>>0<96){break c}d=2;e=H[14117];j=e&2;n=(e^-1)>>>1&1;while(1){i=g+(d<<2)|0;m=G[i>>2];h=H[G[a+332>>2]+(m>>1)|0];if(n&(e|0)==(h^m&1)|h&j){G[i>>2]=G[(g+(l<<2)|0)-4>>2];c=G[f>>2];if(c&8){c=g+(c>>>3&536870908)|0;G[c-4>>2]=G[c>>2];c=G[f>>2]}c=c-32|0;G[f>>2]=c;d=d-1|0}d=d+1|0;l=c>>>5|0;if((d|0)<(l|0)){continue}break}h=G[b>>2];e=G[p+h>>2]}G[(o<<2)+h>>2]=e;o=o+1|0}k=k+1|0;d=G[b+4>>2];if((k|0)<(d|0)){continue}break}a=k-o|0;if((a|0)<=0){break a}G[b+4>>2]=d-a}}function Cb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0;a:{b:{if(H[a+724|0]!=1){break b}f=G[a+544>>2]+(b<<2)|0;if(J[f>>2]<32){break b}i=a+824|0;j=f+4|0;while(1){c=(g<<2)+j|0;d=G[a+808>>2]+(G[c>>2]<<2)|0;G[d>>2]=G[d>>2]-1;d=G[c>>2]>>1;c:{if(!((d|0)<G[a+840>>2]&G[G[a+836>>2]+(d<<2)>>2]>=0)){if(H[G[a+876>>2]+d|0]|H[G[a+904>>2]+d|0]){break c}h=H[G[a+332>>2]+d|0];e=H[14634];if(!((h|0)==(e|0)&((e^-1)&254)>>>1|e&h&2)){break c}}xb(i,d);d=G[c>>2]>>1}c=G[a+776>>2]+d|0;if(!H[c|0]){E[c|0]=1;c=G[a+796>>2];d:{if((c|0)!=G[a+800>>2]){e=G[a+792>>2];break d}e=c>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(c^2147483647)>>>0){break a}c=c+e|0;G[a+800>>2]=c;e=ed(G[a+792>>2],c<<2);G[a+792>>2]=e;if(!e){break a}c=G[a+796>>2]}G[a+796>>2]=c+1;G[(c<<2)+e>>2]=d}g=g+1|0;if(g>>>0<G[f>>2]>>>5>>>0){continue}break}}d=G[a+544>>2];bb(a,b,0);e=b<<2;b=e+d|0;c=G[b+4>>2];f=c>>1;d=H[f+G[a+332>>2]|0];g=d^c&1;c=H[14116];e:{if(!((g|0)==(c|0)&((c^-1)&254)>>>1|c&d&2)){break e}d=G[a+396>>2]+(f<<3)|0;c=G[d>>2];if((c|0)==-1|(b|0)!=(G[a+544>>2]+(c<<2)|0)){break e}G[d>>2]=-1}G[b>>2]=G[b>>2]&-4|1;b=a;c=G[a+556>>2];a=G[e+G[a+544>>2]>>2];G[b+556>>2]=((c+(a>>>5|0)|0)+(a>>>3&1)|0)+1;return}Y(ud()|0,1024,0);B()}function jc(a,b,c){var d=0,e=0;if(c>>>0>=512){fa(a|0,b|0,c|0);return}d=a+c|0;a:{if(!((a^b)&3)){b:{if(!(a&3)){c=a;break b}if(!c){c=a;break b}c=a;while(1){E[c|0]=H[b|0];b=b+1|0;c=c+1|0;if(!(c&3)){break b}if(c>>>0<d>>>0){continue}break}}a=d&-4;c:{if(d>>>0<64){break c}e=a+-64|0;if(e>>>0<c>>>0){break c}while(1){G[c>>2]=G[b>>2];G[c+4>>2]=G[b+4>>2];G[c+8>>2]=G[b+8>>2];G[c+12>>2]=G[b+12>>2];G[c+16>>2]=G[b+16>>2];G[c+20>>2]=G[b+20>>2];G[c+24>>2]=G[b+24>>2];G[c+28>>2]=G[b+28>>2];G[c+32>>2]=G[b+32>>2];G[c+36>>2]=G[b+36>>2];G[c+40>>2]=G[b+40>>2];G[c+44>>2]=G[b+44>>2];G[c+48>>2]=G[b+48>>2];G[c+52>>2]=G[b+52>>2];G[c+56>>2]=G[b+56>>2];G[c+60>>2]=G[b+60>>2];b=b- -64|0;c=c- -64|0;if(e>>>0>=c>>>0){continue}break}}if(a>>>0<=c>>>0){break a}while(1){G[c>>2]=G[b>>2];b=b+4|0;c=c+4|0;if(a>>>0>c>>>0){continue}break}break a}if(d>>>0<4){c=a;break a}e=d-4|0;if(e>>>0<a>>>0){c=a;break a}c=a;while(1){E[c|0]=H[b|0];E[c+1|0]=H[b+1|0];E[c+2|0]=H[b+2|0];E[c+3|0]=H[b+3|0];b=b+4|0;c=c+4|0;if(e>>>0>=c>>>0){continue}break}}if(c>>>0<d>>>0){while(1){E[c|0]=H[b|0];b=b+1|0;c=c+1|0;if((d|0)!=(c|0)){continue}break}}}function rd(a,b,c,d){var e=0,f=0,g=0,h=0,i=0,j=0;g=la-32|0;la=g;e=d&65535;f=d>>>16&32767;i=f;a:{if(f-15361>>>0<=2045){e=e<<4|c>>>28;c=c<<4;f=e;e=b>>>28|c;c=f;f=i-15360|0;b=b&268435455;b:{if((b|0)==134217728&(a|0)!=0|b>>>0>134217728){e=e+1|0;c=e?c:c+1|0;break b}if(a|(b|0)!=134217728){break b}a=e;e=e+(e&1)|0;c=a>>>0>e>>>0?c+1|0:c}h=c>>>0>1048575;a=h?0:e;b=h?0:c;e=0;c=f+h|0;f=c>>>0<f>>>0?1:e;break a}if(!(!(a|c|(b|e))|((f|0)!=32767|(h|0)!=0))){a=c;c=e<<4|c>>>28;a=a<<4|b>>>28;b=c|524288;c=2047;f=0;break a}if(i>>>0>17406){a=0;b=0;c=2047;f=0;break a}h=!(f|h);j=h?15360:15361;f=j-i|0;if((f|0)>112){a=0;b=0;c=0;f=0;break a}e=h?e:e|65536;gd(g+16|0,a,b,c,e,128-f|0);nd(g,a,b,c,e,f);a=G[g+8>>2];h=a<<4;b=G[g+12>>2]<<4|a>>>28;a=G[g+4>>2];f=a;a=a>>>28|h;f=f&268435455;c=G[g>>2]|(i|0)!=(j|0)&(G[g+16>>2]|G[g+24>>2]|(G[g+20>>2]|G[g+28>>2]))!=0;c:{if((f|0)==134217728&(c|0)!=0|f>>>0>134217728){a=a+1|0;b=a?b:b+1|0;break c}if(c|(f|0)!=134217728){break c}e=b;b=a;a=a+(a&1)|0;b=b>>>0>a>>>0?e+1|0:e}c=b>>>0>1048575;b=c?b^1048576:b;f=0}la=g+32|0;x(0,a|0);x(1,b|(d&-2147483648|c<<20));return+z()}function rb(a){a=a|0;var b=0,c=0,d=0,e=0;G[a>>2]=5924;b=G[a+904>>2];if(b){G[a+908>>2]=0;dd(b);G[a+912>>2]=0;G[a+904>>2]=0}b=G[a+892>>2];if(b){G[a+896>>2]=0;dd(b);G[a+900>>2]=0;G[a+892>>2]=0}b=G[a+876>>2];if(b){G[a+880>>2]=0;dd(b);G[a+884>>2]=0;G[a+876>>2]=0}b=G[a+856>>2];if(b){G[a+860>>2]=0;dd(b);G[a+864>>2]=0;G[a+856>>2]=0}b=G[a+836>>2];if(b){G[a+840>>2]=0;dd(b);G[a+844>>2]=0;G[a+836>>2]=0}b=G[a+824>>2];if(b){G[a+828>>2]=0;dd(b);G[a+832>>2]=0;G[a+824>>2]=0}b=G[a+808>>2];if(b){G[a+812>>2]=0;dd(b);G[a+816>>2]=0;G[a+808>>2]=0}b=G[a+792>>2];if(b){G[a+796>>2]=0;dd(b);G[a+800>>2]=0;G[a+792>>2]=0}b=G[a+776>>2];if(b){G[a+780>>2]=0;dd(b);G[a+784>>2]=0;G[a+776>>2]=0}c=G[a+760>>2];if(c){b=0;d=G[a+764>>2];if((d|0)>0){while(1){c=G[a+760>>2]+M(b,12)|0;e=G[c>>2];if(e){G[c+4>>2]=0;dd(e);G[c+8>>2]=0;G[c>>2]=0;d=G[a+764>>2]}b=b+1|0;if((d|0)>(b|0)){continue}break}c=G[a+760>>2]}G[a+764>>2]=0;dd(c);G[a+768>>2]=0;G[a+760>>2]=0}b=G[a+744>>2];if(b){G[a+748>>2]=0;dd(b);G[a+752>>2]=0;G[a+744>>2]=0}b=G[a+732>>2];if(b){G[a+736>>2]=0;dd(b);G[a+740>>2]=0;G[a+732>>2]=0}return Ra(a)|0}function Da(a,b){var c=0,d=0,e=0,f=0,g=0,h=0;g=la-16|0;la=g;c=G[a+8>>2];d=G[a+12>>2];a:{if((c|0)>=(d|0)){break a}while(1){e=G[a+4>>2];f=H[e+c|0];if(f>>>0<9|(f|0)!=32&f>>>0>=14){break a}c=c+1|0;G[a+8>>2]=c;if((c|0)>=(d|0)){G[a+8>>2]=0;d=kc(e,G[a>>2]);G[a+12>>2]=d;c=G[a+8>>2]}if((c|0)<(d|0)){continue}break}}f=0;b:{if((c|0)>=(d|0)){break b}c:{d:{e:{e=G[a+4>>2];switch(H[e+c|0]-43|0){case 0:break d;case 2:break e;default:break b}}f=1;c=c+1|0;G[a+8>>2]=c;if((c|0)>=(d|0)){break c}break b}c=c+1|0;G[a+8>>2]=c;if((c|0)<(d|0)){break b}}G[a+8>>2]=0;d=kc(e,G[a>>2]);G[a+12>>2]=d}c=-1;f:{g:{e=d;d=G[a+8>>2];if((e|0)>(d|0)){c=H[d+G[a+4>>2]|0];if((c-58&255)>>>0>245){break g}}G[g>>2]=c;tc(4578,g);E[b|0]=1;c=0;break f}c=0;if(E[b|0]&1){break f}b=0;c=G[a+8>>2];d=G[a+12>>2];h:{if((c|0)>=(d|0)){break h}while(1){e=G[a+4>>2];h=H[e+c|0];if((h-48&255)>>>0>9){break h}c=c+1|0;G[a+8>>2]=c;b=(M(b,10)+h|0)-48|0;if((c|0)>=(d|0)){G[a+8>>2]=0;d=kc(e,G[a>>2]);G[a+12>>2]=d;c=G[a+8>>2]}if((c|0)<(d|0)){continue}break}}c=f?0-b|0:b}la=g+16|0;return c}function ec(a,b){var c=0,d=0,e=0,f=0,g=0;f=la-16|0;la=f;a:{b:{if(!Dc(2295,E[b|0])){G[3719]=28;break b}d=2;if(!Dc(b,43)){d=H[b|0]!=114}d=Dc(b,120)?d|128:d;d=Dc(b,101)?d|524288:d;e=d;g=d|64;d=H[b|0];e=(d|0)==114?e:g;e=(d|0)==119?e|512:e;G[f>>2]=438;G[f+4>>2]=0;a=$(-100,a|0,((d|0)==97?e|1024:e)|32768,f|0)|0;if(a>>>0>=4294963201){G[3719]=0-a;a=-1}if((a|0)<0){break a}d=la-32|0;la=d;c:{d:{e:{if(!Dc(2295,E[b|0])){G[3719]=28;break e}c=ad(1176);if(c){break d}}b=0;break c}Wb(c,0,144);if(!Dc(b,43)){G[c>>2]=H[b|0]==114?8:4}f:{if(H[b|0]!=97){b=G[c>>2];break f}b=aa(a|0,3,0)|0;if(!(b&1024)){b=b|1024;G[d+16>>2]=b;G[d+20>>2]=b>>31;aa(a|0,4,d+16|0)|0}b=G[c>>2]|128;G[c>>2]=b}G[c+80>>2]=-1;G[c+48>>2]=1024;G[c+60>>2]=a;G[c+44>>2]=c+152;g:{if(b&8){break g}G[d>>2]=d+24;G[d+4>>2]=0;if(ba(a|0,21523,d|0)|0){break g}G[c+80>>2]=10}G[c+40>>2]=26;G[c+36>>2]=27;G[c+32>>2]=28;G[c+12>>2]=29;if(!H[14881]){G[c+76>>2]=-1}b=G[3735];G[c+56>>2]=b;if(b){G[b+52>>2]=c}G[3735]=c;b=c}la=d+32|0;c=b;if(c){break a}ea(a|0)|0}c=0}la=f+16|0;return c}function $c(a){var b=0,c=0,d=0,e=0,f=0;d=G[3517];b=a+7&-8;c=b+7&-8;a=d+c|0;a:{b:{if(!(a>>>0<=d>>>0?c:0)){if(a>>>0<=qa()<<16>>>0){break b}if(ha(a|0)|0){break b}}G[3719]=48;d=-1;break a}G[3517]=a}if((d|0)!=-1){a=b+d|0;G[a-4>>2]=16;c=a-16|0;G[c>>2]=16;b=G[6568];if(b){f=G[b+8>>2]}else{f=0}c:{d:{if((f|0)==(d|0)){e=d-(G[d-4>>2]&-2)|0;f=G[e-4>>2];G[b+8>>2]=a;a=e-(f&-2)|0;if(E[(a+G[a>>2]|0)-4|0]&1){b=G[a+4>>2];e=G[a+8>>2];G[b+8>>2]=e;G[e+4>>2]=b;b=c-a|0;G[a>>2]=b;break c}a=d-16|0;break d}G[d>>2]=16;G[d+8>>2]=a;G[d+4>>2]=b;G[d+12>>2]=16;G[6568]=d;a=d+16|0}b=c-a|0;G[a>>2]=b}G[((b&-4)+a|0)-4>>2]=b|1;c=G[a>>2]-8|0;e:{if(c>>>0<=127){b=(c>>>3|0)-1|0;break e}e=P(c);b=((c>>>29-e^4)-(e<<2)|0)+110|0;if(c>>>0<=4095){break e}b=((c>>>30-e^2)-(e<<1)|0)+71|0;b=b>>>0>=63?63:b}c=b<<4;G[a+4>>2]=c+25248;c=c+25256|0;G[a+8>>2]=G[c>>2];G[c>>2]=a;G[G[a+8>>2]+4>>2]=a;c=G[6570];e=G[6571];a=b&31;if((b&63)>>>0>=32){b=1<<a;f=0}else{f=1<<a;b=f-1&1>>>32-a}G[6570]=f|c;G[6571]=b|e}return(d|0)!=-1}function $a(a,b){var c=0,d=0,e=0,f=0,g=0;g=G[a+544>>2]+(b<<2)|0;e=g;f=G[e+8>>2];a:{e=G[a+412>>2]+M(G[e+4>>2]^1,12)|0;c=G[e+4>>2];b:{if((c|0)!=G[e+8>>2]){d=G[e>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[e+8>>2]=c;d=ed(G[e>>2],c<<3);G[e>>2]=d;if(!d){break a}c=G[e+4>>2]}G[e+4>>2]=c+1;e=b;c=(c<<3)+d|0;G[c>>2]=b;G[c+4>>2]=f;f=G[g+4>>2];d=G[a+412>>2]+M(G[g+8>>2]^1,12)|0;c=G[d+4>>2];c:{if((c|0)!=G[d+8>>2]){b=G[d>>2];break c}b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break a}b=b+c|0;G[d+8>>2]=b;b=ed(G[d>>2],b<<3);G[d>>2]=b;if(!b){break a}c=G[d+4>>2]}G[d+4>>2]=c+1;b=(c<<3)+b|0;G[b>>2]=e;G[b+4>>2]=f;e=G[g>>2]&4;b=(e?216:208)+a|0;f=b;c=G[b>>2];b=G[b+4>>2];c=c+1|0;b=c?b:b+1|0;G[f>>2]=c;G[f+4>>2]=b;a=(e?232:224)+a|0;b=a;e=G[b>>2];a=G[b+4>>2];f=G[g>>2]>>>5|0;g=f;f=e+f|0;a=g>>>0>f>>>0?a+1|0:a;G[b>>2]=f;G[b+4>>2]=a;return}Y(ud()|0,1024,0);B()}function nb(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0;e=la-32|0;la=e;a:{b:{c:{if(H[b|0]!=45){break c}i=b+1|0;b=0;d=G[a+4>>2];c=H[d|0];if(c){while(1){if(H[b+i|0]!=(c|0)){break c}b=b+1|0;c=H[d+b|0];if(c){continue}break}}b=b+i|0;if(H[b|0]!=61){break c}d=la-16|0;la=d;c=la-160|0;la=c;f=b+1|0;G[c+60>>2]=f;G[c+20>>2]=f;G[c+24>>2]=-1;b=c+16|0;Gc(b,0,0);Mc(c,b,1,1);b=G[c+8>>2];k=G[c+12>>2];i=G[c>>2];l=G[c+4>>2];j=e+28|0;if(j){G[j>>2]=G[c+136>>2]+(f+(G[c+20>>2]-G[c+60>>2]|0)|0)}G[d+8>>2]=b;G[d+12>>2]=k;G[d>>2]=i;G[d+4>>2]=l;la=c+160|0;g=rd(G[d>>2],G[d+4>>2],G[d+8>>2],G[d+12>>2]);la=d+16|0;b=G[e+28>>2];if(b){h=L[a+32>>3];if(h<=g&(H[a+41|0]!=1|g!=h)){break b}h=L[a+24>>3];if(h>=g&(H[a+40|0]!=1|g!=h)){break a}L[a+48>>3]=g}f=(b|0)!=0}la=e+32|0;return f|0}G[e+20>>2]=G[a+4>>2];G[e+16>>2]=f;fc(G[3076],5191,e+16|0);X(1);B()}G[e+4>>2]=G[a+4>>2];G[e>>2]=f;fc(G[3076],5142,e);X(1);B()}function Ya(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0;a:{if((b|0)<=15){e=a;break a}while(1){f=G[(b<<1&-4)+a>>2];c=b;d=-1;while(1){d=d+1|0;e=(d<<2)+a|0;h=G[e>>2];if((h|0)<(f|0)){continue}while(1){c=c-1|0;i=(c<<2)+a|0;g=G[i>>2];if((g|0)>(f|0)){continue}break}if((d|0)<(c|0)){G[e>>2]=g;G[i>>2]=h;continue}break}Ya(a,d);a=e;b=b-d|0;if((b|0)>=16){continue}break}}if((b|0)>=2){i=b-2|0;f=0;while(1){h=f+1|0;d=h;a=0;c=f;g=(c^-1)+b&3;if(g){while(1){c=G[(d<<2)+e>>2]<G[(c<<2)+e>>2]?d:c;d=d+1|0;a=a+1|0;if((g|0)!=(a|0)){continue}break}}if(i-f>>>0>=3){while(1){a=d+3|0;g=d+2|0;j=d+1|0;c=G[(d<<2)+e>>2]<G[(c<<2)+e>>2]?d:c;c=G[(j<<2)+e>>2]<G[(c<<2)+e>>2]?j:c;c=G[(g<<2)+e>>2]<G[(c<<2)+e>>2]?g:c;c=G[(a<<2)+e>>2]<G[(c<<2)+e>>2]?a:c;d=d+4|0;if((d|0)!=(b|0)){continue}break}}a=(f<<2)+e|0;d=G[a>>2];j=a;a=(c<<2)+e|0;G[j>>2]=G[a>>2];G[a>>2]=d;a=(f|0)==(i|0);f=h;if(!a){continue}break}}}function _a(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;f=H[a+16|0]|c;d=(G[b+4>>2]+(f&1)|0)+1&1073741823;Qa(a,d+G[a+4>>2]|0);i=G[a+4>>2];d=d+i|0;G[a+4>>2]=d;if(d>>>0>=i>>>0){d=0;g=G[a>>2]+(i<<2)|0;f=f&255;e=((f|0)!=0)<<3;a=c?4:0;G[g>>2]=e|(a|G[g>>2]&-32);h=a|e;a=G[b+4>>2];e=a<<5;G[g>>2]=h|e;if(G[b+4>>2]>0){j=g+4|0;h=G[b>>2];while(1){k=d<<2;G[k+j>>2]=G[h+k>>2];d=d+1|0;if((d|0)<G[b+4>>2]){continue}break}}if(f){if(c){G[(((a&134217727)<<2)+g|0)+4>>2]=0;return i}b=a&134217727;a:{if(!e){a=0;break a}f=a&3;j=g+4|0;h=0;a=0;d=0;if(b-1>>>0>=3){k=b-f|0;c=0;while(1){e=j+(d<<2)|0;a=1<<(G[e+12>>2]>>>1)|(1<<(G[e>>2]>>>1)|a|1<<(G[e+4>>2]>>>1)|1<<(G[e+8>>2]>>>1));d=d+4|0;c=c+4|0;if((k|0)!=(c|0)){continue}break}}if(!f){break a}while(1){a=1<<(G[j+(d<<2)>>2]>>>1)|a;d=d+1|0;h=h+1|0;if((f|0)!=(h|0)){continue}break}}G[((b<<2)+g|0)+4>>2]=a}return i}Y(ud()|0,1024,0);B()}function Ob(a){a=a|0;var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;a:{b=G[a>>2];if(b){while(1){d=b>>31;d=(d^b)-d|0;if((d|0)>G[3717]){while(1){tb(G[3718]);f=G[3717]+1|0;G[3717]=f;if((d|0)>(f|0)){continue}break}}if((c|0)==(e|0)){f=(e>>>1&1073741822)+2|0;if(f>>>0>(e^2147483647)>>>0){break a}e=e+f|0;g=ed(g,e<<2);if(!g){break a}}G[(c<<2)+g>>2]=d<<1|b>>>31;c=c+1|0;b=G[a+4>>2];a=a+4|0;if(b){continue}break}}d=G[3718];f=d+628|0;if(G[d+628>>2]){G[d+632>>2]=0}Fa(f,c);b:{c:{if(c){j=c&3;e=G[f>>2];a=0;b=0;if(c>>>0>=4){k=c&-4;c=0;while(1){h=b<<2;G[h+e>>2]=G[g+h>>2];i=h|4;G[i+e>>2]=G[g+i>>2];i=h|8;G[i+e>>2]=G[g+i>>2];h=h|12;G[h+e>>2]=G[g+h>>2];b=b+4|0;c=c+4|0;if((k|0)!=(c|0)){continue}break}}if(j){while(1){c=b<<2;G[c+e>>2]=G[c+g>>2];b=b+1|0;a=a+1|0;if((j|0)!=(a|0)){continue}break}}b=Ab(d,f);break c}b=Ab(d,f);if(!g){break b}}dd(g)}return b|0}Y(ud()|0,1024,0);B()}function Ib(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;a:{if((b|0)<=15){f=a;break a}while(1){h=G[(b<<1&-4)+a>>2];j=G[h+12>>2];c=-1;d=b;while(1){c=c+1|0;f=(c<<2)+a|0;g=G[f>>2];e=Ec(G[g+12>>2],j);if((e|0)<0){continue}if(!e){if((Ec(G[g+16>>2],G[h+16>>2])|0)<0){continue}}while(1){d=d-1|0;i=(d<<2)+a|0;e=G[i>>2];k=Ec(j,G[e+12>>2]);if((k|0)<0){continue}if(!k){if((Ec(G[h+16>>2],G[e+16>>2])|0)<0){continue}}break}if((c|0)<(d|0)){G[f>>2]=e;G[i>>2]=g;continue}break}Ib(a,c);a=f;b=b-c|0;if((b|0)>=16){continue}break}}if((b|0)>=2){j=b-2|0;a=0;while(1){d=a;h=a+1|0;c=h;while(1){g=G[(c<<2)+f>>2];e=G[(d<<2)+f>>2];i=Ec(G[g+12>>2],G[e+12>>2]);b:{if((i|0)>=0){if(i){break b}if((Ec(G[g+16>>2],G[e+16>>2])|0)>=0){break b}}d=c}c=c+1|0;if((c|0)!=(b|0)){continue}break}c=(a<<2)+f|0;g=G[c>>2];d=(d<<2)+f|0;G[c>>2]=G[d>>2];G[d>>2]=g;d=(a|0)==(j|0);a=h;if(!d){continue}break}}}function ub(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0;h=la-16|0;la=h;G[h+12>>2]=-1;ib(a+12|0,b+1|0,h+12|0);g=G[a+12>>2];c=G[a+4>>2];G[g+(b<<2)>>2]=c;a:{b:{if(G[a+8>>2]!=(c|0)){d=G[a>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[a+8>>2]=c;d=ed(G[a>>2],c<<2);G[a>>2]=d;if(!d){break a}g=G[a+12>>2];c=G[a+4>>2]}G[a+4>>2]=c+1;G[(c<<2)+d>>2]=b;c=G[(b<<2)+g>>2];i=G[(c<<2)+d>>2];c:{if(!c){c=0;break c}j=G[G[a+28>>2]>>2];k=j+(i<<3)|0;while(1){a=(c<<2)+d|0;b=G[k+4>>2];e=b;f=b>>31;b=G[k>>2];p=Od(e,f,b,b>>31);l=oa;m=c-1|0;b=m>>1;n=(b<<2)+d|0;o=G[n>>2];e=(o<<3)+j|0;f=G[e+4>>2];e=G[e>>2];e=Od(f,f>>31,e,e>>31);f=oa;if((f|0)==(l|0)&e>>>0<=p>>>0|f>>>0<l>>>0){d=a;break c}G[a>>2]=o;G[(G[n>>2]<<2)+g>>2]=c;c=b;if(m>>>0>1){continue}break}}G[d>>2]=i;G[(i<<2)+g>>2]=c;la=h+16|0;return}Y(ud()|0,1024,0);B()}function Pd(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0;a:{b:{c:{d:{e:{f:{g:{h:{i:{j:{if(b){if(!c){break j}break i}oa=0;a=(a>>>0)/(c>>>0)|0;break a}if(!a){break h}break g}if(!(c-1&c)){break f}f=(P(c)+33|0)-P(b)|0;g=0-f|0;break d}oa=0;a=(b>>>0)/0|0;break a}d=32-P(b)|0;if(d>>>0<31){break e}break c}if((c|0)==1){break b}f=c?31-P(c-1^c)|0:32;c=f&31;if((f&63)>>>0>=32){a=b>>>c|0}else{d=b>>>c|0;a=((1<<c)-1&b)<<32-c|a>>>c}oa=d;break a}f=d+1|0;g=63-d|0}d=f&63;e=d&31;if(d>>>0>=32){d=0;h=b>>>e|0}else{d=b>>>e|0;h=((1<<e)-1&b)<<32-e|a>>>e}g=g&63;e=g&31;if(g>>>0>=32){b=a<<e;a=0}else{b=(1<<e)-1&a>>>32-e|b<<e;a=a<<e}if(f){g=c-1|0;l=(g|0)==-1?-1:0;while(1){i=d<<1|h>>>31;d=h<<1|b>>>31;e=l-(i+(d>>>0>g>>>0)|0)>>31;j=c&e;h=d-j|0;d=i-(d>>>0<j>>>0)|0;b=b<<1|a>>>31;a=k|a<<1;k=e&1;f=f-1|0;if(f){continue}break}}oa=b<<1|a>>>31;a=k|a<<1;break a}a=0;b=0}oa=b}return a}
-function Hb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0;d=la+-64|0;la=d;e=G[3716];if(e){G[d+48>>2]=G[a>>2];fc(G[3076],e,d+48|0)}if(!(E[14112]&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}Ib(G[3525],G[3526]);e=G[3076];c=H[14112];a=0;while(1){if(!(c&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1;c=1}if(G[3526]>(a|0)){if(!(c&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}g=f;f=a<<2;c=G[G[f+G[3525]>>2]+12>>2];a:{if((g|0)!=(c|0)){G[d>>2]=c;fc(e,5535,d);break a}if(G[G[f+G[3525]>>2]+16>>2]==(h|0)){break a}ic(10,e)}if(!(E[14112]&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}c=G[f+G[3525]>>2];pa[G[G[c>>2]+12>>2]](c,b);c=H[14112];if(!(c&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1;c=1}a=a+1|0;f=G[f+G[3525]>>2];h=G[f+16>>2];f=G[f+12>>2];continue}break}nc(5550,16,1,e);G[d+32>>2]=G[3440];fc(e,4944,d+32|0);G[d+16>>2]=G[3440];fc(e,4983,d+16|0);ic(10,e);X(0);B()}function zb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0;j=G[a>>2];m=G[j+(b<<2)>>2];c=G[a+4>>2];e=b<<1;h=e|1;a:{if((c|0)<=(h|0)){n=G[a+12>>2];break a}k=G[G[a+28>>2]>>2];o=k+(m<<3)|0;n=G[a+12>>2];while(1){f=e+2|0;b:{c:{if((f|0)>=(c|0)){e=G[(h<<2)+j>>2];g=(e<<3)+k|0;c=G[g+4>>2];f=c;d=c>>31;c=G[g>>2];c=Od(f,d,c,c>>31);f=oa;break c}e=G[(f<<2)+j>>2];g=(e<<3)+k|0;c=G[g+4>>2];d=c;i=c>>31;c=G[g>>2];g=Od(d,i,c,c>>31);i=oa;l=G[(h<<2)+j>>2];d=(l<<3)+k|0;c=G[d+4>>2];p=c;q=c>>31;c=G[d>>2];c=Od(p,q,c,c>>31);d=oa;if((d|0)==(i|0)&c>>>0>g>>>0|i>>>0<d>>>0){break b}e=l;f=d}g=c;i=f;f=h}c=G[o+4>>2];h=c;d=c>>31;c=G[o>>2];l=Od(h,d,c,c>>31);c=oa;if((c|0)==(i|0)&g>>>0>=l>>>0|c>>>0<i>>>0){break a}G[(b<<2)+j>>2]=e;G[(e<<2)+n>>2]=b;c=G[a+4>>2];b=f;e=b<<1;h=e|1;if((c|0)>(h|0)){continue}break}}G[(b<<2)+j>>2]=m;G[(m<<2)+n>>2]=b}function bd(a,b,c){var d=0,e=0,f=0,g=0;e=a+4|0;d=(e+b|0)-1&0-b;b=G[a>>2];if(d+c>>>0<=(b+a|0)-4>>>0){f=G[a+4>>2];g=G[a+8>>2];G[f+8>>2]=g;G[g+4>>2]=f;if((d|0)!=(e|0)){d=d-e|0;f=a-(G[a-4>>2]&-2)|0;e=d+G[f>>2]|0;G[f>>2]=e;G[(f+(e&-4)|0)-4>>2]=e;a=a+d|0;b=b-d|0;G[a>>2]=b}a:{if(c+24>>>0<=b>>>0){e=a+c|0;b=(b-c|0)-8|0;G[e+8>>2]=b;g=e+8|0;G[(g+(b&-4)|0)-4>>2]=b|1;d=G[e+8>>2]-8|0;b:{if(d>>>0<=127){b=(d>>>3|0)-1|0;break b}f=P(d);b=((d>>>29-f^4)-(f<<2)|0)+110|0;if(d>>>0<=4095){break b}b=((d>>>30-f^2)-(f<<1)|0)+71|0;b=b>>>0>=63?63:b}d=b<<4;G[e+12>>2]=d+25248;d=d+25256|0;G[e+16>>2]=G[d>>2];G[d>>2]=g;G[G[e+16>>2]+4>>2]=g;d=G[6570];f=G[6571];e=b&31;if((b&63)>>>0>=32){b=1<<e;g=0}else{g=1<<e;b=g-1&1>>>32-e}G[6570]=g|d;G[6571]=b|f;b=c+8|0;G[a>>2]=b;c=(b&-4)+a|0;break a}c=a+b|0}G[c-4>>2]=b;a=a+4|0}else{a=0}return a}function Eb(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0;h=G[a+4>>2];a:{b:{if(J[c>>2]<=31){e=G[a>>2];f=-1;break b}j=c+4|0;f=-1;while(1){c:{i=(g<<2)+j|0;k=G[i>>2];d=G[a+4>>2];d:{if((d|0)!=G[a+8>>2]){e=G[a>>2];break d}e=d>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(d^2147483647)>>>0){break c}d=d+e|0;G[a+8>>2]=d;e=ed(G[a>>2],d<<2);G[a>>2]=e;if(!e){break c}d=G[a+4>>2]}G[a+4>>2]=d+1;G[(d<<2)+e>>2]=k;f=G[i>>2]>>1==(b|0)?g+h|0:f;g=g+1|0;if(g>>>0<G[c>>2]>>>5>>>0){continue}break b}break}break a}b=(f<<2)+e|0;d=G[b>>2];f=b;b=(h<<2)+e|0;G[f>>2]=G[b>>2];G[b>>2]=d;b=G[c>>2];e:{d=G[a+4>>2];if((d|0)==G[a+8>>2]){c=d>>1&-2;c=((c|0)>0?c:0)+2|0;if(c>>>0>(d^2147483647)>>>0){break e}c=c+d|0;G[a+8>>2]=c;e=ed(e,c<<2);G[a>>2]=e;if(!e){break e}d=G[a+4>>2]}G[a+4>>2]=d+1;G[(d<<2)+e>>2]=b>>>5;return}}Y(ud()|0,1024,0);B()}function Hc(a){var b=0,c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0;b=G[a+112>>2];d=G[a+116>>2];i=(b|d)!=0;h=b;e=G[a+4>>2];f=G[a+44>>2];b=e-f|0;g=b;c=b+G[a+120>>2]|0;b=G[a+124>>2]+(b>>31)|0;a:{b=c>>>0<g>>>0?b+1|0:b;if(!(((b|0)>=(d|0)&c>>>0>=h>>>0|(b|0)>(d|0))&i)){i=$b(a);if((i|0)>=0){break a}e=G[a+4>>2];f=G[a+44>>2]}G[a+112>>2]=-1;G[a+116>>2]=-1;G[a+104>>2]=e;g=c;c=f-e|0;d=g+c|0;b=(c>>31)+b|0;G[a+120>>2]=d;G[a+124>>2]=c>>>0>d>>>0?b+1|0:b;return-1}d=c+1|0;b=d?b:b+1|0;h=G[a+4>>2];f=G[a+8>>2];c=G[a+116>>2];g=c;e=G[a+112>>2];b:{if(!(c|e)){break b}c=e-d|0;e=g-(b+(d>>>0>e>>>0)|0)|0;j=f-h|0;g=j>>31;if((e|0)>=(g|0)&c>>>0>=j>>>0|(e|0)>(g|0)){break b}f=c+h|0}G[a+104>>2]=f;c=G[a+44>>2];f=c-h|0;d=f+d|0;b=(f>>31)+b|0;G[a+120>>2]=d;G[a+124>>2]=d>>>0<f>>>0?b+1|0:b;if(c>>>0>=h>>>0){E[h-1|0]=i}return i}function bc(a,b,c){a=a|0;b=b|0;c=c|0;var d=0,e=0,f=0,g=0,h=0,i=0,j=0;f=la-32|0;la=f;d=G[a+28>>2];G[f+16>>2]=d;g=G[a+20>>2];G[f+28>>2]=c;G[f+24>>2]=b;b=g-d|0;G[f+20>>2]=b;g=b+c|0;i=2;a:{b:{b=f+16|0;d=ca(G[a+60>>2],b|0,2,f+12|0)|0;if(d){G[3719]=d;d=-1}else{d=0}c:{d:{if(d){d=b;break d}while(1){e=G[f+12>>2];if((e|0)==(g|0)){break c}if((e|0)<0){d=b;break b}h=G[b+4>>2];j=h>>>0<e>>>0;d=(j<<3)+b|0;h=e-(j?h:0)|0;G[d>>2]=h+G[d>>2];b=(j?12:4)+b|0;G[b>>2]=G[b>>2]-h;g=g-e|0;b=d;i=i-j|0;e=ca(G[a+60>>2],b|0,i|0,f+12|0)|0;if(e){G[3719]=e;e=-1}else{e=0}if(!e){continue}break}}if((g|0)!=-1){break b}}b=G[a+44>>2];G[a+28>>2]=b;G[a+20>>2]=b;G[a+16>>2]=b+G[a+48>>2];a=c;break a}G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;G[a>>2]=G[a>>2]|32;a=0;if((i|0)==2){break a}a=c-G[d+4>>2]|0}la=f+32|0;return a|0}function ib(a,b,c){var d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0;a:{if(G[a+4>>2]<(b|0)){d=G[a+8>>2];b:{if((d|0)>=(b|0)){break b}f=(b-d|0)+1&-2;e=(d>>1&-2)+2|0;f=(e|0)<(f|0)?f:e;if((f|0)>(d^2147483647)){break a}d=d+f|0;G[a+8>>2]=d;d=ed(G[a>>2],d<<2);G[a>>2]=d;if(d){break b}if(G[3719]==48){break a}}f=G[a+4>>2];c:{if((f|0)>=(b|0)){break c}e=G[c>>2];g=G[a>>2];d=f;h=b-d&7;if(h){c=0;while(1){G[(d<<2)+g>>2]=e;d=d+1|0;c=c+1|0;if((h|0)!=(c|0)){continue}break}}if(f-b>>>0>4294967288){break c}f=g+28|0;h=g+24|0;i=g+20|0;j=g+16|0;k=g+12|0;l=g+8|0;m=g+4|0;while(1){c=d<<2;G[c+g>>2]=e;G[c+m>>2]=e;G[c+l>>2]=e;G[c+k>>2]=e;G[c+j>>2]=e;G[c+i>>2]=e;G[c+h>>2]=e;G[c+f>>2]=e;d=d+8|0;if((d|0)!=(b|0)){continue}break}}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function Tc(a,b,c,d){a:{switch(b-9|0){case 0:b=G[c>>2];G[c>>2]=b+4;G[a>>2]=G[b>>2];return;case 6:b=G[c>>2];G[c>>2]=b+4;b=F[b>>1];G[a>>2]=b;G[a+4>>2]=b>>31;return;case 7:b=G[c>>2];G[c>>2]=b+4;G[a>>2]=I[b>>1];G[a+4>>2]=0;return;case 8:b=G[c>>2];G[c>>2]=b+4;b=E[b|0];G[a>>2]=b;G[a+4>>2]=b>>31;return;case 9:b=G[c>>2];G[c>>2]=b+4;G[a>>2]=H[b|0];G[a+4>>2]=0;return;case 16:b=G[c>>2]+7&-8;G[c>>2]=b+8;L[a>>3]=L[b>>3];return;case 17:pa[d|0](a,c);default:return;case 1:case 4:case 14:b=G[c>>2];G[c>>2]=b+4;b=G[b>>2];G[a>>2]=b;G[a+4>>2]=b>>31;return;case 2:case 5:case 11:case 15:b=G[c>>2];G[c>>2]=b+4;G[a>>2]=G[b>>2];G[a+4>>2]=0;return;case 3:case 10:case 12:case 13:break a}}b=G[c>>2]+7&-8;G[c>>2]=b+8;c=G[b+4>>2];G[a>>2]=G[b>>2];G[a+4>>2]=c}function Kc(a,b,c,d,e,f){var g=0;g=la-80|0;la=g;a:{if((f|0)>=16384){od(g+32|0,b,c,d,e,0,0,0,2147352576);d=G[g+40>>2];e=G[g+44>>2];b=G[g+32>>2];c=G[g+36>>2];if(f>>>0<32767){f=f-16383|0;break a}od(g+16|0,b,c,d,e,0,0,0,2147352576);f=(f>>>0>=49149?49149:f)-32766|0;d=G[g+24>>2];e=G[g+28>>2];b=G[g+16>>2];c=G[g+20>>2];break a}if((f|0)>-16383){break a}od(g- -64|0,b,c,d,e,0,0,0,7471104);d=G[g+72>>2];e=G[g+76>>2];b=G[g+64>>2];c=G[g+68>>2];if(f>>>0>4294934644){f=f+16269|0;break a}od(g+48|0,b,c,d,e,0,0,0,7471104);f=(f>>>0<=4294918376?-48920:f)+32538|0;d=G[g+56>>2];e=G[g+60>>2];b=G[g+48>>2];c=G[g+52>>2]}od(g,b,c,d,e,0,0,0,f+16383<<16);b=G[g+12>>2];G[a+8>>2]=G[g+8>>2];G[a+12>>2]=b;b=G[g+4>>2];G[a>>2]=G[g>>2];G[a+4>>2]=b;la=g+80|0}function Bb(a,b){var c=0,d=0,e=0,f=0,g=0;d=la-16|0;la=d;c=G[a+16>>2];G[a+16>>2]=c+1;G[G[a>>2]+(c<<2)>>2]=b;b=G[a+16>>2];c=G[a+4>>2];if((b|0)==(c|0)){G[a+16>>2]=0;b=0}if((b|0)==G[a+12>>2]){b=0;G[d+12>>2]=0;G[d+4>>2]=0;G[d+8>>2]=0;qb(d+4|0,M(c,3)+1>>1);f=G[a>>2];c=G[a+12>>2];e=G[a+4>>2];if((c|0)<(e|0)){g=G[d+4>>2];while(1){G[(b<<2)+g>>2]=G[(c<<2)+f>>2];b=b+1|0;c=c+1|0;e=G[a+4>>2];if((c|0)<(e|0)){continue}break}}a:{b:{if(G[a+16>>2]>0){c=0;e=G[d+4>>2];while(1){G[e+(b<<2)>>2]=G[(c<<2)+f>>2];b=b+1|0;c=c+1|0;if((c|0)<G[a+16>>2]){continue}break}G[a+12>>2]=0;G[a+16>>2]=G[a+4>>2];break b}G[a+16>>2]=e;G[a+12>>2]=0;if(!f){break a}}G[a+4>>2]=0;dd(f)}G[a>>2]=G[d+4>>2];G[a+4>>2]=G[d+8>>2];G[a+8>>2]=G[d+12>>2]}la=d+16|0}function Xa(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0;f=la-16|0;la=f;G[f+12>>2]=-1;ib(a+12|0,b+1|0,f+12|0);e=G[a+12>>2];c=G[a+4>>2];G[e+(b<<2)>>2]=c;a:{b:{if(G[a+8>>2]!=(c|0)){d=G[a>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[a+8>>2]=c;d=ed(G[a>>2],c<<2);G[a>>2]=d;if(!d){break a}e=G[a+12>>2];c=G[a+4>>2]}G[a+4>>2]=c+1;G[(c<<2)+d>>2]=b;c=G[(b<<2)+e>>2];g=G[(c<<2)+d>>2];c:{if(!c){c=0;break c}h=G[G[a+28>>2]>>2];l=L[h+(g<<3)>>3];while(1){a=(c<<2)+d|0;i=c-1|0;b=i>>1;j=(b<<2)+d|0;k=G[j>>2];if(!(L[(k<<3)+h>>3]<l)){d=a;break c}G[a>>2]=k;G[(G[j>>2]<<2)+e>>2]=c;c=b;if(i>>>0>1){continue}break}}G[d>>2]=g;G[(g<<2)+e>>2]=c;la=f+16|0;return}Y(ud()|0,1024,0);B()}function Wb(a,b,c){var d=0,e=0;a:{if(!c){break a}E[a|0]=b;d=a+c|0;E[d-1|0]=b;if(c>>>0<3){break a}E[a+2|0]=b;E[a+1|0]=b;E[d-3|0]=b;E[d-2|0]=b;if(c>>>0<7){break a}E[a+3|0]=b;E[d-4|0]=b;if(c>>>0<9){break a}d=0-a&3;e=d+a|0;a=M(b&255,16843009);G[e>>2]=a;c=c-d&-4;b=c+e|0;G[b-4>>2]=a;if(c>>>0<9){break a}G[e+8>>2]=a;G[e+4>>2]=a;G[b-8>>2]=a;G[b-12>>2]=a;if(c>>>0<25){break a}G[e+24>>2]=a;G[e+20>>2]=a;G[e+16>>2]=a;G[e+12>>2]=a;G[b-16>>2]=a;G[b-20>>2]=a;G[b-24>>2]=a;G[b-28>>2]=a;b=e&4|24;c=c-b|0;if(c>>>0<32){break a}a=Od(a,0,1,1);d=oa;b=b+e|0;while(1){G[b+24>>2]=a;G[b+28>>2]=d;G[b+16>>2]=a;G[b+20>>2]=d;G[b+8>>2]=a;G[b+12>>2]=d;G[b>>2]=a;G[b+4>>2]=d;b=b+32|0;c=c-32|0;if(c>>>0>31){continue}break}}}function dd(a){a=a|0;var b=0,c=0,d=0,e=0,f=0;if(a){b=a-4|0;f=G[b>>2];c=f;d=b;e=G[a-8>>2];a=e&-2;if((a|0)!=(e|0)){d=b-a|0;c=G[d+4>>2];e=G[d+8>>2];G[c+8>>2]=e;G[e+4>>2]=c;c=a+f|0}a=b+f|0;b=G[a>>2];if((b|0)!=G[(a+b|0)-4>>2]){f=G[a+4>>2];a=G[a+8>>2];G[f+8>>2]=a;G[a+4>>2]=f;c=b+c|0}G[d>>2]=c;G[((c&-4)+d|0)-4>>2]=c|1;b=G[d>>2]-8|0;a:{if(b>>>0<=127){a=(b>>>3|0)-1|0;break a}c=P(b);a=((b>>>29-c^4)-(c<<2)|0)+110|0;if(b>>>0<=4095){break a}a=((b>>>30-c^2)-(c<<1)|0)+71|0;a=a>>>0>=63?63:a}b=a<<4;G[d+4>>2]=b+25248;b=b+25256|0;G[d+8>>2]=G[b>>2];G[b>>2]=d;G[G[d+8>>2]+4>>2]=d;b=G[6570];c=G[6571];d=a&31;if((a&63)>>>0>=32){a=1<<d;e=0}else{e=1<<d;a=e-1&1>>>32-d}G[6570]=e|b;G[6571]=a|c}}function Fa(a,b){var c=0,d=0,e=0,f=0;a:{if(G[a+4>>2]<(b|0)){e=G[a+8>>2];b:{if((e|0)>=(b|0)){break b}d=(b-e|0)+1&-2;c=(e>>1&-2)+2|0;c=(c|0)<(d|0)?d:c;if((c|0)>(e^2147483647)){break a}c=c+e|0;G[a+8>>2]=c;c=ed(G[a>>2],c<<2);G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];c:{if((c|0)>=(b|0)){break c}d=c;e=b-c&3;if(e){while(1){G[G[a>>2]+(d<<2)>>2]=0;d=d+1|0;f=f+1|0;if((e|0)!=(f|0)){continue}break}}if(c-b>>>0>=4294967293){break c}while(1){c=d<<2;G[c+G[a>>2]>>2]=0;G[(c+G[a>>2]|0)+4>>2]=0;G[(c+G[a>>2]|0)+8>>2]=0;G[(c+G[a>>2]|0)+12>>2]=0;d=d+4|0;if((d|0)!=(b|0)){continue}break}}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function cb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0;a:{if(G[a+296>>2]<=(b|0)){break a}c=G[a+284>>2];g=b<<2;d=g+G[a+292>>2]|0;e=G[d>>2];if((c|0)>(e|0)){f=a+460|0;while(1){c=c-1|0;e=c<<2;d=G[e+G[a+280>>2]>>2]>>1;E[d+G[a+332>>2]|0]=H[14118];h=G[a+88>>2];b:{if((h|0)<=1){if((h|0)!=1|G[(G[a+292>>2]+(G[a+296>>2]<<2)|0)-4>>2]>=(c|0)){break b}}E[d+G[a+348>>2]|0]=E[e+G[a+280>>2]|0]&1}if(!(!H[d+G[a+380>>2]|0]|(d|0)<G[a+476>>2]&G[G[a+472>>2]+(d<<2)>>2]>=0)){Xa(f,d)}d=G[a+292>>2]+g|0;e=G[d>>2];if((e|0)<(c|0)){continue}break}c=G[a+284>>2]}G[a+512>>2]=e;f=c;c=G[d>>2];if((f|0)>(c|0)){G[a+284>>2]=c}if(G[a+296>>2]<=(b|0)){break a}G[a+296>>2]=b}}function Ua(a,b,c){var d=0,e=0,f=0,g=0;a:{if(G[a+4>>2]<(b|0)){d=G[a+8>>2];b:{if((d|0)>=(b|0)){break b}e=(b-d|0)+1&-2;f=(d>>1&-2)+2|0;e=(e|0)>(f|0)?e:f;if((e|0)>(d^2147483647)){break a}d=d+e|0;G[a+8>>2]=d;d=ed(G[a>>2],d);G[a>>2]=d;if(d){break b}if(G[3719]==48){break a}}d=G[a+4>>2];c:{if((d|0)>=(b|0)){break c}e=H[c|0];c=d;g=b-d&3;if(g){f=0;while(1){E[G[a>>2]+c|0]=e;c=c+1|0;f=f+1|0;if((g|0)!=(f|0)){continue}break}}if(d-b>>>0>=4294967293){break c}while(1){E[G[a>>2]+c|0]=e;E[(G[a>>2]+c|0)+1|0]=e;E[(G[a>>2]+c|0)+2|0]=e;E[(G[a>>2]+c|0)+3|0]=e;c=c+4|0;if((c|0)!=(b|0)){continue}break}}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function xb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0,k=0,l=0,m=0,n=0,o=0,p=0,q=0,r=0,s=0;a:{if(G[a+16>>2]>(b|0)){g=G[a+12>>2];j=g+(b<<2)|0;d=G[j>>2];if((d|0)>=0){break a}}ub(a,b);return}b=G[a>>2];h=G[b+(d<<2)>>2];b:{if(!d){d=0;break b}k=G[G[a+28>>2]>>2];l=k+(h<<3)|0;while(1){m=(d<<2)+b|0;e=G[l+4>>2];c=e;i=e>>31;e=G[l>>2];r=Od(c,i,e,e>>31);n=oa;o=d-1|0;e=o>>1;p=(e<<2)+b|0;q=G[p>>2];f=(q<<3)+k|0;c=G[f+4>>2];i=c;s=c>>31;c=G[f>>2];f=Od(i,s,c,c>>31);c=oa;if((c|0)==(n|0)&f>>>0<=r>>>0|c>>>0<n>>>0){b=m;break b}G[m>>2]=q;G[(G[p>>2]<<2)+g>>2]=d;d=e;if(o>>>0>1){continue}break}}G[b>>2]=h;G[(h<<2)+g>>2]=d;zb(a,G[j>>2])}function hd(a,b,c,d,e,f,g,h){var i=0,j=0,k=0,l=0;k=1;i=d&2147483647;j=i;l=(i|0)==2147418112;a:{if(l&!c?a|b:l&(c|0)!=0|i>>>0>2147418112){break a}i=h&2147483647;if(!g&(i|0)==2147418112?e|f:(i|0)==2147418112&(g|0)!=0|i>>>0>2147418112){break a}if(!(a|e|(c|g)|(b|f|(i|j)))){return 0}i=d&h;if((i|0)>0){j=1}else{j=(i|0)>=0}if(j){if((c|0)==(g|0)&(d|0)==(h|0)?(b|0)==(f|0)&a>>>0<e>>>0|b>>>0<f>>>0:c>>>0<g>>>0&(d|0)<=(h|0)|(d|0)<(h|0)){return-1}return(a^e|c^g|(b^f|d^h))!=0}if((c|0)==(g|0)&(d|0)==(h|0)?(b|0)==(f|0)&a>>>0>e>>>0|b>>>0>f>>>0:c>>>0>g>>>0&(d|0)>=(h|0)|(d|0)>(h|0)){return-1}k=(a^e|c^g|(b^f|d^h))!=0}return k}function Wa(a,b){var c=0,d=0,e=0,f=0;a:{if(G[a+4>>2]<(b|0)){e=G[a+8>>2];b:{if((e|0)>=(b|0)){break b}d=(b-e|0)+1&-2;c=(e>>1&-2)+2|0;c=(d|0)>(c|0)?d:c;if((c|0)>(e^2147483647)){break a}c=c+e|0;G[a+8>>2]=c;c=ed(G[a>>2],c);G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];c:{if((c|0)>=(b|0)){break c}d=c;e=b-c&3;if(e){while(1){E[G[a>>2]+d|0]=0;d=d+1|0;f=f+1|0;if((e|0)!=(f|0)){continue}break}}if(c-b>>>0>=4294967293){break c}while(1){E[G[a>>2]+d|0]=0;E[(G[a>>2]+d|0)+1|0]=0;E[(G[a>>2]+d|0)+2|0]=0;E[(G[a>>2]+d|0)+3|0]=0;d=d+4|0;if((d|0)!=(b|0)){continue}break}}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function Cd(a,b,c,d,e){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;if(wd(a,G[b+8>>2],e)){if(!(G[b+28>>2]==1|G[b+4>>2]!=(c|0))){G[b+28>>2]=d}return}a:{if(wd(a,G[b>>2],e)){if(!(G[b+16>>2]!=(c|0)&G[b+20>>2]!=(c|0))){if((d|0)!=1){break a}G[b+32>>2]=1;return}G[b+32>>2]=d;b:{if(G[b+44>>2]==4){break b}F[b+52>>1]=0;a=G[a+8>>2];pa[G[G[a>>2]+20>>2]](a,b,c,c,1,e);if(H[b+53|0]==1){G[b+44>>2]=3;if(!H[b+52|0]){break b}break a}G[b+44>>2]=4}G[b+20>>2]=c;G[b+40>>2]=G[b+40>>2]+1;if(G[b+36>>2]!=1|G[b+24>>2]!=2){break a}E[b+54|0]=1;return}a=G[a+8>>2];pa[G[G[a>>2]+24>>2]](a,b,c,d,e)}}function Pc(a,b,c,d,e){var f=0,g=0,h=0;f=la-208|0;la=f;G[f+204>>2]=c;c=f+160|0;Wb(c,0,40);G[f+200>>2]=G[f+204>>2];a:{if((Qc(0,b,f+200|0,f+80|0,c,d,e)|0)<0){break a}c=G[a+76>>2]<0;g=G[a>>2];G[a>>2]=g&-33;b:{c:{d:{if(!G[a+48>>2]){G[a+48>>2]=80;G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;h=G[a+44>>2];G[a+44>>2]=f;break d}if(G[a+16>>2]){break c}}if(gc(a)){break b}}Qc(a,b,f+200|0,f+80|0,f+160|0,d,e)}if(h){pa[G[a+36>>2]](a,0,0)|0;G[a+48>>2]=0;G[a+44>>2]=h;G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0}G[a>>2]=G[a>>2]|g&32;if(c){break a}}la=f+208|0}function Dc(a,b){var c=0,d=0,e=0;d=b;a:{b:{c:{b=b&255;if(b){if(a&3){while(1){c=H[a|0];if(!c|(b|0)==(c|0)){break a}a=a+1|0;if(a&3){continue}break}}c=G[a>>2];if(((c|16843008-c)&-2139062144)!=-2139062144){break c}e=M(b,16843009);while(1){b=c^e;if(((16843008-b|b)&-2139062144)!=-2139062144){break c}c=G[a+4>>2];b=a+4|0;a=b;if(((16843008-c|c)&-2139062144)==-2139062144){continue}break}break b}a=Fc(a)+a|0;break a}b=a}while(1){a=b;c=H[a|0];if(!c){break a}b=a+1|0;if((c|0)!=(d&255)){continue}break}}return H[a|0]==(d&255)?a:0}function nd(a,b,c,d,e,f){var g=0,h=0,i=0,j=0;a:{if(f&64){c=f+-64|0;b=c&31;if((c&63)>>>0>=32){c=0;b=e>>>b|0}else{c=e>>>b|0;b=((1<<b)-1&e)<<32-b|d>>>b}d=0;e=0;break a}if(!f){break a}i=d;h=64-f|0;g=h&31;if((h&63)>>>0>=32){h=d<<g;j=0}else{h=(1<<g)-1&i>>>32-g|e<<g;j=i<<g}i=b;b=f&31;if((f&63)>>>0>=32){g=0;b=c>>>b|0}else{g=c>>>b|0;b=((1<<b)-1&c)<<32-b|i>>>b}b=j|b;c=g|h;g=d;d=f&31;if((f&63)>>>0>=32){h=0;d=e>>>d|0}else{h=e>>>d|0;d=((1<<d)-1&e)<<32-d|g>>>d}e=h}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=d;G[a+12>>2]=e}function Zb(a){a=a|0;var b=0,c=0,d=0;if(!a){a=G[3516];if(a){b=Zb(a)}a=G[3478];if(a){b=Zb(a)|b}a=G[3735];if(a){while(1){if(G[a+20>>2]!=G[a+28>>2]){b=Zb(a)|b}a=G[a+56>>2];if(a){continue}break}}return b|0}d=G[a+76>>2]<0;a:{b:{if(G[a+20>>2]==G[a+28>>2]){break b}pa[G[a+36>>2]](a,0,0)|0;if(G[a+20>>2]){break b}b=-1;break a}b=G[a+8>>2];c=G[a+4>>2];if((b|0)!=(c|0)){b=c-b|0;pa[G[a+40>>2]](a,b,b>>31,1)|0}b=0;G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;G[a+4>>2]=0;G[a+8>>2]=0;if(d){break a}}return b|0}function Fb(a,b){var c=0,d=0;a:{c=G[a+4>>2];b:{if((c|0)!=G[a+8>>2]){d=G[a>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[a+8>>2]=c;d=ed(G[a>>2],c<<2);G[a>>2]=d;if(!d){break a}c=G[a+4>>2]}G[a+4>>2]=c+1;G[(c<<2)+d>>2]=b;c=G[a+4>>2];if((c|0)==G[a+8>>2]){b=c>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(c^2147483647)>>>0){break a}b=b+c|0;G[a+8>>2]=b;d=ed(d,b<<2);G[a>>2]=d;if(!d){break a}c=G[a+4>>2]}G[a+4>>2]=c+1;G[(c<<2)+d>>2]=1;return}Y(ud()|0,1024,0);B()}function gd(a,b,c,d,e,f){var g=0,h=0,i=0;a:{if(f&64){e=f+-64|0;f=b;d=e&31;if((e&63)>>>0>=32){e=f<<d;d=0}else{e=(1<<d)-1&f>>>32-d|c<<d;d=f<<d}b=0;c=0;break a}if(!f){break a}h=d;g=f&31;if((f&63)>>>0>=32){i=d<<g;h=0}else{i=(1<<g)-1&h>>>32-g|e<<g;h=h<<g}g=b;e=64-f|0;d=e&31;if((e&63)>>>0>=32){e=0;d=c>>>d|0}else{e=c>>>d|0;d=((1<<d)-1&c)<<32-d|g>>>d}d=h|d;e=e|i;h=b;g=f&31;if((f&63)>>>0>=32){i=b<<g;b=0}else{i=(1<<g)-1&h>>>32-g|c<<g;b=h<<g}c=i}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=d;G[a+12>>2]=e}function kd(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0,j=0;e=la-16|0;la=e;A(+b);d=v(1)|0;f=v(0)|0;j=d;c=d&1048575;d=d>>>20&2047;a:{if(d|0){if((d|0)!=2047|g){h=(c&15)<<28|f>>>4;i=c>>>4|0;g=d+15360|0;d=f<<28;c=0;break a}h=(c&15)<<28|f>>>4;i=c>>>4|0;g=32767;d=f<<28;c=0;break a}if(!(c|f)){d=0;c=0;break a}d=c;c=c?P(c):P(f)|32;gd(e,f,d,0,0,c+49|0);g=15372-c|0;h=G[e+8>>2];i=G[e+12>>2]^65536;d=G[e+4>>2];c=G[e>>2]}G[a>>2]=c;G[a+4>>2]=d;G[a+8>>2]=h;G[a+12>>2]=i|(j&-2147483648|g<<16);la=e+16|0}function cc(a,b,c){a=a|0;b=b|0;c=c|0;var d=0,e=0,f=0,g=0;e=la-32|0;la=e;G[e+16>>2]=b;d=G[a+48>>2];G[e+20>>2]=c-((d|0)!=0);g=G[a+44>>2];G[e+28>>2]=d;G[e+24>>2]=g;a:{b:{d=da(G[a+60>>2],e+16|0,2,e+12|0)|0;if(d){G[3719]=d;d=-1}else{d=0}if(d){b=32}else{d=G[e+12>>2];if((d|0)>0){break b}b=d?32:16}G[a>>2]=b|G[a>>2];break a}f=d;g=G[e+20>>2];if(g>>>0>=d>>>0){break a}f=G[a+44>>2];G[a+4>>2]=f;G[a+8>>2]=f+(d-g|0);if(G[a+48>>2]){G[a+4>>2]=f+1;E[(b+c|0)-1|0]=H[f|0]}f=c}la=e+32|0;return f|0}function lb(a,b){var c=0,d=0,e=0,f=0,g=0,h=0,i=0;d=G[b>>2];e=H[a+16|0]|d>>>2&1;c=((e&1)+(d>>>5|0)|0)+1|0;Qa(a,c+G[a+4>>2]|0);d=G[a+4>>2];f=c+d|0;G[a+4>>2]=f;if(c>>>0<=f>>>0){c=0;a=G[a>>2]+(d<<2)|0;f=G[b>>2];G[a>>2]=f&-9|((e|0)!=0)<<3;if(J[b>>2]>=32){h=a+4|0;i=b+4|0;while(1){g=c<<2;G[g+h>>2]=G[i+g>>2];c=c+1|0;if(c>>>0<G[b>>2]>>>5>>>0){continue}break}}if(e){e=f>>>3&536870908;a=e+a|0;b=b+e|0;if(f&4){K[a+4>>2]=K[b+4>>2];return d}G[a+4>>2]=G[b+4>>2]}return d}Y(ud()|0,1024,0);B()}function _c(a,b){if(!a){return 0}a:{b:{if(a){if(b>>>0<=127){break b}c:{if(!G[G[3760]>>2]){if((b&-128)==57216){break b}break c}if(b>>>0<=2047){E[a+1|0]=b&63|128;E[a|0]=b>>>6|192;a=2;break a}if(!((b&-8192)!=57344&b>>>0>=55296)){E[a+2|0]=b&63|128;E[a|0]=b>>>12|224;E[a+1|0]=b>>>6&63|128;a=3;break a}if(b-65536>>>0<=1048575){E[a+3|0]=b&63|128;E[a|0]=b>>>18|240;E[a+2|0]=b>>>6&63|128;E[a+1|0]=b>>>12&63|128;a=4;break a}}G[3719]=25;a=-1}else{a=1}break a}E[a|0]=b;a=1}return a}function id(a,b,c,d,e){var f=0,g=0,h=0;h=-1;g=d&2147483647;f=(g|0)==2147418112;a:{if(f&!c?a|b:f&(c|0)!=0|g>>>0>2147418112){break a}f=e&2147483647;if(((f|0)==2147418112&0|f>>>0>2147418112)&(f|0)!=2147418112){break a}if(!(a|c|(f|g|b))){return 0}f=d&e;if((f|0)>0){f=1}else{f=(f|0)>=0}if(f){if(((c|0)!=0|(d|0)!=(e|0))&(d|0)<(e|0)){break a}return(a|c|(d^e|b))!=0}if(!c&(d|0)==(e|0)?a|b:(c|0)!=0&(d|0)>=(e|0)|(d|0)>(e|0)){break a}h=(a|c|(d^e|b))!=0}return h}
-function Ja(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;c=la-80|0;la=c;d=G[a+4>>2];G[c+68>>2]=G[a+16>>2];G[c+64>>2]=d;d=G[3076];fc(d,2299,c- -64|0);e=G[a+20>>2];a:{if((e|0)==-2147483648){nc(1907,4,1,d);break a}G[c+48>>2]=e;fc(d,2258,c+48|0)}nc(3737,4,1,d);e=G[a+24>>2];b:{if((e|0)==2147483647){nc(1370,4,1,d);break b}G[c+32>>2]=e;fc(d,2258,c+32|0)}G[c+16>>2]=G[a+28>>2];fc(d,5359,c+16|0);if(b){G[c>>2]=G[a+8>>2];fc(d,4471,c);ic(10,d)}la=c+80|0}function pd(a,b,c,d,e,f,g,h,i){var j=0,k=0,l=0,m=0;i=Od(b,c,h,i);h=oa;e=Od(d,e,f,g);i=e+i|0;d=oa+h|0;h=e>>>0>i>>>0?d+1|0:d;j=g;e=0;k=c;d=0;c=Od(g,e,c,d);g=c+i|0;i=oa+h|0;l=g;c=c>>>0>g>>>0?i+1|0:i;g=Od(f,0,b,0);h=oa;i=0;d=Od(f,i,k,d);h=h+d|0;f=oa+i|0;f=d>>>0>h>>>0?f+1|0:f;i=f+l|0;d=c;f=f>>>0>i>>>0?d+1|0:d;b=Od(b,m,j,e)+h|0;e=oa;e=b>>>0<h>>>0?e+1|0:e;h=e+i|0;i=f;G[a+8>>2]=h;G[a+12>>2]=e>>>0>h>>>0?i+1|0:i;G[a>>2]=g;G[a+4>>2]=b}function pc(a){var b=0,c=0,d=0,e=0;c=la-16|0;la=c;b=oc(a);if(b>>>0>=4294963201){G[3719]=0-b;b=-1}a:{if(!b|G[3719]!=52){break a}ga(4347);G[c+16>>2]=-1;G[c+20>>2]=-1;G[c+8>>2]=-1;G[c+12>>2]=-1;b=G[c+8>>2];d=b;e=(b|0)==-1;b=e;G[a>>2]=b?-1:d;G[a+4>>2]=b?-1:0;b=G[c+12>>2];d=(b|0)==-1;G[a+8>>2]=d?-1:b;G[a+12>>2]=d?-1:0;if(e){G[a>>2]=-1;G[a+4>>2]=-1}if((b|0)!=-1){break a}G[a+8>>2]=-1;G[a+12>>2]=-1}la=c+16|0}function mb(a){a=a|0;var b=0,c=0,d=0,e=0;b=la-32|0;la=b;c=G[a+556>>2];e=G[a+548>>2];G[b+16>>2]=0;G[b+20>>2]=0;G[b+8>>2]=0;G[b+12>>2]=0;d=b+8|0;Qa(d,e-c|0);E[b+24|0]=0;kb(a,d);if(G[a+44>>2]>=2){c=G[a+548>>2];G[b+4>>2]=G[b+12>>2]<<2;G[b>>2]=c<<2;tc(3879,b)}E[a+560|0]=H[b+24|0];c=G[a+544>>2];if(c){dd(c)}G[a+544>>2]=G[b+8>>2];G[a+548>>2]=G[b+12>>2];G[a+552>>2]=G[b+16>>2];G[a+556>>2]=G[b+20>>2];la=b+32|0}function mc(a,b,c){var d=0,e=0,f=0;d=G[c+16>>2];a:{if(!d){if(gc(c)){break a}d=G[c+16>>2]}e=G[c+20>>2];if(d-e>>>0<b>>>0){return pa[G[c+36>>2]](c,a,b)|0}b:{c:{if(!b|G[c+80>>2]<0){break c}d=b;while(1){f=a+d|0;if(H[f-1|0]!=10){d=d-1|0;if(d){continue}break c}break}e=pa[G[c+36>>2]](c,a,d)|0;if(e>>>0<d>>>0){break a}b=b-d|0;e=G[c+20>>2];break b}f=a;d=0}jc(e,f,b);G[c+20>>2]=G[c+20>>2]+b;e=b+d|0}return e}function ob(a,b){a=a|0;b=b|0;var c=0,d=0,e=0,f=0,g=0,h=0,i=0;c=la+-64|0;la=c;d=H[a+40|0];e=G[a+4>>2];f=G[a+16>>2];g=H[a+41|0];h=L[a+24>>3];i=L[a+32>>3];L[c+56>>3]=L[a+48>>3];L[c+40>>3]=i;L[c+32>>3]=h;G[c+48>>2]=g?93:41;G[c+20>>2]=f;G[c+16>>2]=e;G[c+24>>2]=d?91:40;d=G[3076];e=la-16|0;la=e;f=c+16|0;G[e+12>>2]=f;Pc(d,5255,f,33,0);la=e+16|0;if(b){G[c>>2]=G[a+8>>2];fc(d,4471,c);ic(10,d)}la=c- -64|0}function db(a,b){var c=0,d=0,e=0;e=la-16|0;la=e;E[e+15|0]=0;Ua(a,b+1|0,e+15|0);a:{c=G[a>>2]+b|0;if(!H[c|0]){E[c|0]=1;c=G[a+20>>2];b:{if((c|0)!=G[a+24>>2]){d=G[a+16>>2];break b}d=c>>1&-2;d=((d|0)>0?d:0)+2|0;if(d>>>0>(c^2147483647)>>>0){break a}c=c+d|0;G[a+24>>2]=c;d=ed(G[a+16>>2],c<<2);G[a+16>>2]=d;if(!d){break a}c=G[a+20>>2]}G[a+20>>2]=c+1;G[(c<<2)+d>>2]=b}la=e+16|0;return}Y(ud()|0,1024,0);B()}function ic(a,b){var c=0,d=0;c=G[b+76>>2];if(!((c|0)>=0&(!c|G[3742]!=(c&1073741823)))){a:{d=a&255;if((d|0)==G[b+80>>2]){break a}c=G[b+20>>2];if((c|0)==G[b+16>>2]){break a}G[b+20>>2]=c+1;E[c|0]=a;return}hc(b,d);return}c=G[b+76>>2];G[b+76>>2]=c?c:1073741823;b:{c:{d=a&255;if((d|0)==G[b+80>>2]){break c}c=G[b+20>>2];if((c|0)==G[b+16>>2]){break c}G[b+20>>2]=c+1;E[c|0]=a;break b}hc(b,d)}G[b+76>>2]=0}function Ba(a,b,c,d,e){G[a+16>>2]=e;G[a+12>>2]=d;G[a+8>>2]=c;G[a+4>>2]=b;G[a>>2]=5664;if(!(E[14112]&1)){G[3525]=0;G[3526]=0;G[3527]=0;E[14112]=1}a:{e=G[3526];b:{if((e|0)!=G[3527]){d=G[3525];break b}b=e>>1&-2;b=((b|0)>0?b:0)+2|0;if(b>>>0>(e^2147483647)>>>0){break a}b=b+e|0;G[3527]=b;d=ed(G[3525],b<<2);G[3525]=d;if(!d){break a}e=G[3526]}G[3526]=e+1;G[(e<<2)+d>>2]=a;return a}Y(ud()|0,1024,0);B()}function Ta(a,b){var c=0,d=0,e=0;a:{if(G[a+4>>2]<(b|0)){c=G[a+8>>2];b:{if((c|0)>=(b|0)){break b}d=(b-c|0)+1&-2;e=(c>>1&-2)+2|0;d=(d|0)>(e|0)?d:e;if((d|0)>(c^2147483647)){break a}c=c+d|0;G[a+8>>2]=c;c=ed(G[a>>2],M(c,12));G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];if((c|0)<(b|0)){Wb(G[a>>2]+M(c,12)|0,0,M(b-c|0,12))}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function qb(a,b){var c=0,d=0,e=0;a:{if(G[a+4>>2]<(b|0)){c=G[a+8>>2];b:{if((c|0)>=(b|0)){break b}d=(b-c|0)+1&-2;e=(c>>1&-2)+2|0;d=(d|0)>(e|0)?d:e;if((d|0)>(c^2147483647)){break a}c=c+d|0;G[a+8>>2]=c;c=ed(G[a>>2],c<<2);G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];if((c|0)<(b|0)){Wb(G[a>>2]+(c<<2)|0,0,b-c<<2)}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function Tb(a){a=a|0;var b=0,c=0,d=0,e=0;b=G[3718];d=G[b+628>>2];a:{if(!d){c=G[b+632>>2];break a}G[b+632>>2]=0}b:{if(G[b+636>>2]==(c|0)){e=c>>1&-2;e=((e|0)>0?e:0)+2|0;if(e>>>0>(c^2147483647)>>>0){break b}c=c+e|0;G[b+636>>2]=c;d=ed(d,c<<2);G[b+628>>2]=d;if(!d){break b}c=G[b+632>>2]}G[b+632>>2]=c+1;G[(c<<2)+d>>2]=a<<1|1;Ab(b,b+628|0);return}Y(ud()|0,1024,0);B()}function Dd(a,b,c,d,e){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;if(wd(a,G[b+8>>2],e)){if(!(G[b+28>>2]==1|G[b+4>>2]!=(c|0))){G[b+28>>2]=d}return}a:{if(!wd(a,G[b>>2],e)){break a}if(!(G[b+16>>2]!=(c|0)&G[b+20>>2]!=(c|0))){if((d|0)!=1){break a}G[b+32>>2]=1;return}G[b+20>>2]=c;G[b+32>>2]=d;G[b+40>>2]=G[b+40>>2]+1;if(!(G[b+36>>2]!=1|G[b+24>>2]!=2)){E[b+54|0]=1}G[b+44>>2]=4}}function Va(a,b){var c=0,d=0,e=0;a:{if(G[a+4>>2]<(b|0)){c=G[a+8>>2];b:{if((c|0)>=(b|0)){break b}d=(b-c|0)+1&-2;e=(c>>1&-2)+2|0;d=(d|0)>(e|0)?d:e;if((d|0)>(c^2147483647)){break a}c=c+d|0;G[a+8>>2]=c;c=ed(G[a>>2],c);G[a>>2]=c;if(c){break b}if(G[3719]==48){break a}}c=G[a+4>>2];if((c|0)<(b|0)){Wb(c+G[a>>2]|0,0,b-c|0)}G[a+4>>2]=b}return}Y(ud()|0,1024,0);B()}function Ma(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;c=la-48|0;la=c;d=G[a+4>>2];G[c+36>>2]=d;G[c+32>>2]=d;d=G[3076];fc(d,1662,c+32|0);if((Fc(G[a+4>>2])&2147483647)!=16){while(1){ic(32,d);e=e+1|0;if(e>>>0<32-(Fc(G[a+4>>2])<<1)>>>0){continue}break}}ic(32,d);G[c+16>>2]=H[a+20|0]?1904:2033;fc(d,5240,c+16|0);if(b){G[c>>2]=G[a+8>>2];fc(d,4471,c);ic(10,d)}la=c+48|0}function Zc(a,b,c){a=a|0;b=b|0;c=c|0;var d=0,e=0,f=0,g=0,h=0;e=G[a+84>>2];f=G[e>>2];d=G[e+4>>2];h=G[a+28>>2];g=G[a+20>>2]-h|0;g=d>>>0<g>>>0?d:g;if(g){jc(f,h,g);f=g+G[e>>2]|0;G[e>>2]=f;d=G[e+4>>2]-g|0;G[e+4>>2]=d}d=c>>>0>d>>>0?d:c;if(d){jc(f,b,d);f=d+G[e>>2]|0;G[e>>2]=f;G[e+4>>2]=G[e+4>>2]-d}E[f|0]=0;b=G[a+44>>2];G[a+28>>2]=b;G[a+20>>2]=b;return c|0}function Bd(a,b,c,d){E[a+53|0]=1;a:{if(G[a+4>>2]!=(c|0)){break a}E[a+52|0]=1;c=G[a+16>>2];b:{if(!c){G[a+36>>2]=1;G[a+24>>2]=d;G[a+16>>2]=b;if((d|0)!=1){break a}if(G[a+48>>2]==1){break b}break a}if((b|0)==(c|0)){c=G[a+24>>2];if((c|0)==2){G[a+24>>2]=d;c=d}if(G[a+48>>2]!=1){break a}if((c|0)==1){break b}break a}G[a+36>>2]=G[a+36>>2]+1}E[a+54|0]=1}}function xc(a,b){var c=0,d=0,e=0,f=0;c=la-16|0;la=c;d=oc(0);a:{if((d|0)!=-52){a=d;if(a>>>0>=4294963201){G[3719]=0-a;a=-1}e=a;break a}d=G[b>>2];f=G[b+4>>2];G[c>>2]=!f&(d|0)==-1|f?-1:d;d=G[b+12>>2];b=G[b+8>>2];G[c+12>>2]=-1;G[c+8>>2]=a;G[c+4>>2]=!d&(b|0)==-1|d?-1:b;yc(c);a=G[c+12>>2];if(!a){break a}if((a|0)>0){G[3719]=a}e=-1}la=c+16|0;return e}function vc(){var a=0;a=G[3499];if(!((a|0)>=0&(!a|G[3742]!=(a&1073741823)))){a:{if(G[3500]==10){break a}a=G[3485];if((a|0)==G[3484]){break a}G[3485]=a+1;E[a|0]=10;return}hc(13920,10);return}a=G[3499];G[3499]=a?a:1073741823;b:{c:{if(G[3500]==10){break c}a=G[3485];if((a|0)==G[3484]){break c}G[3485]=a+1;E[a|0]=10;break b}hc(13920,10)}G[3499]=0}function kc(a,b){var c=0,d=0;c=G[b+72>>2];G[b+72>>2]=c-1|c;d=G[b+4>>2];c=G[b+8>>2];if((d|0)==(c|0)){c=65536}else{c=c-d|0;c=c>>>0>=65536?65536:c;jc(a,d,c);G[b+4>>2]=c+G[b+4>>2];a=a+c|0;c=65536-c|0}if(c){while(1){a:{if(!_b(b)){d=pa[G[b+32>>2]](b,a,c)|0;if(d){break a}}return 65536-c|0}a=a+d|0;c=c-d|0;if(c){continue}break}}return 65536}function qc(a){var b=0,c=0,d=0;c=la-16|0;la=c;ga(4514);b=a+16|0;Wb(b+8|0,0,144);G[b+24>>2]=4;G[b+16>>2]=3;G[b+20>>2]=0;G[b+8>>2]=2;G[b>>2]=1;G[b+4>>2]=0;jc(c,b,16);b=G[c>>2];d=G[c+4>>2];G[a+12>>2]=0;G[a+8>>2]=d;G[a>>2]=b;G[a+4>>2]=b>>31;b=G[c+8>>2];d=G[c+12>>2];G[a+28>>2]=0;G[a+24>>2]=d;G[a+16>>2]=b;G[a+20>>2]=b>>31;la=c+16|0}function Ic(a){var b=0;b=1;a:{if((a|0)>=1024){b=898846567431158e293;if(a>>>0<2047){a=a-1023|0;break a}b=Infinity;a=(a>>>0>=3069?3069:a)-2046|0;break a}if((a|0)>-1023){break a}b=2004168360008973e-307;if(a>>>0>4294965304){a=a+969|0;break a}b=0;a=(a>>>0<=4294964336?-2960:a)+1938|0}x(0,0);x(1,a+1023<<20);return b*+z()}function Ac(a,b,c){var d=0,e=0,f=0,g=0;f=la-16|0;la=f;G[f+12>>2]=c;d=la-160|0;la=d;g=d+8|0;jc(g,13360,144);G[d+52>>2]=a;G[d+28>>2]=a;e=-2-a|0;e=e>>>0>2147483647?2147483647:e;G[d+56>>2]=e;e=a+e|0;G[d+36>>2]=e;G[d+24>>2]=e;Pc(g,b,c,0,0);if((a|0)!=-2){a=G[d+28>>2];E[a-((a|0)==G[d+24>>2])|0]=0}la=d+160|0;la=f+16|0}function Fc(a){var b=0,c=0,d=0;a:{b:{b=a;if(!(b&3)){break b}if(!H[b|0]){return 0}while(1){b=b+1|0;if(!(b&3)){break b}if(H[b|0]){continue}break}break a}while(1){c=b;b=b+4|0;d=G[c>>2];if(((d|16843008-d)&-2139062144)==-2139062144){continue}break}while(1){b=c;c=b+1|0;if(H[b|0]){continue}break}}return b-a|0}function ld(a,b){var c=0,d=0,e=0,f=0;d=la-16|0;la=d;a:{if(!b){b=0;break a}c=b>>31;e=(c^b)-c|0;c=P(e);gd(d,e,0,0,0,c+81|0);e=0+G[d+8>>2]|0;c=(G[d+12>>2]^65536)+(16414-c<<16)|0;c=e>>>0<f>>>0?c+1|0:c;f=b&-2147483648|c;c=G[d+4>>2];b=G[d>>2]}G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=e;G[a+12>>2]=f;la=d+16|0}function Uc(a,b,c){var d=0,e=0,f=0,g=0;a:{if(!b){d=b;break a}while(1){c=c-1|0;e=a;a=Pd(a,b,10);d=oa;f=c,g=e-Od(a,d,10,0)|48,E[f|0]=g;e=b>>>0>9;b=d;if(e){continue}break}}if(a|d){while(1){c=c-1|0;b=(a>>>0)/10|0;E[c|0]=a-M(b,10)|48;d=a>>>0>9;a=b;if(d){continue}break}}return c}function Qa(a,b){var c=0,d=0;a:{d=G[a+8>>2];if(d>>>0<b>>>0){c=d;b:{while(1){if(b>>>0<=c>>>0){break b}c=(((c>>>1)+(c>>>3)&-2)+c|0)+2|0;G[a+8>>2]=c;if(c>>>0>d>>>0){continue}break}break a}b=ed(G[a>>2],c<<2);if(!b&G[3719]==48){break a}G[a>>2]=b}return}Y(ud()|0,1024,0);B()}function md(a,b){var c=0,d=0,e=0,f=0;c=la-16|0;la=c;a:{if(!b){b=0;break a}d=b;b=P(b);gd(c,d,0,0,0,112-(b^31)|0);d=0+G[c+8>>2]|0;b=(G[c+12>>2]^65536)+(16414-b<<16)|0;f=e>>>0>d>>>0?b+1|0:b;e=G[c+4>>2];b=G[c>>2]}G[a>>2]=b;G[a+4>>2]=e;G[a+8>>2]=d;G[a+12>>2]=f;la=c+16|0}function hc(a,b){var c=0,d=0,e=0;d=la-16|0;la=d;E[d+15|0]=b;c=G[a+16>>2];a:{if(!c){if(gc(a)){break a}c=G[a+16>>2]}e=c;c=G[a+20>>2];if(!((e|0)==(c|0)|G[a+80>>2]==(b&255))){G[a+20>>2]=c+1;E[c|0]=b;break a}if((pa[G[a+36>>2]](a,d+15|0,1)|0)!=1){break a}}la=d+16|0}function _b(a){var b=0,c=0;b=G[a+72>>2];G[a+72>>2]=b-1|b;if(G[a+20>>2]!=G[a+28>>2]){pa[G[a+36>>2]](a,0,0)|0}G[a+28>>2]=0;G[a+16>>2]=0;G[a+20>>2]=0;b=G[a>>2];if(b&4){G[a>>2]=b|32;return-1}c=G[a+44>>2]+G[a+48>>2]|0;G[a+8>>2]=c;G[a+4>>2]=c;return b<<27>>31}function Gc(a,b,c){var d=0,e=0,f=0,g=0;G[a+112>>2]=b;G[a+116>>2]=c;f=G[a+4>>2];d=G[a+44>>2]-f|0;G[a+120>>2]=d;G[a+124>>2]=d>>31;d=G[a+8>>2];a:{if(!(b|c)){break a}e=d-f|0;g=b>>>0>=e>>>0;e=e>>31;if(g&(e|0)<=(c|0)|(c|0)>(e|0)){break a}d=b+f|0}G[a+104>>2]=d}function yd(a,b,c){var d=0;d=G[a+36>>2];if(!d){G[a+24>>2]=c;G[a+16>>2]=b;G[a+36>>2]=1;G[a+20>>2]=G[a+56>>2];return}a:{if(!(G[a+20>>2]!=G[a+56>>2]|G[a+16>>2]!=(b|0))){if(G[a+24>>2]!=2){break a}G[a+24>>2]=c;return}E[a+54|0]=1;G[a+24>>2]=2;G[a+36>>2]=d+1}}function Oa(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;if(H[b|0]!=45){return 0}d=b+1|0;b=0;e=G[a+4>>2];c=H[e|0];if(c){while(1){if(H[b+d|0]!=(c|0)){return 0}b=b+1|0;c=H[e+b|0];if(c){continue}break}}b=b+d|0;if(H[b|0]==61){G[a+20>>2]=b+1;a=1}else{a=0}return a|0}function Sc(a){var b=0,c=0,d=0,e=0,f=0;d=G[a>>2];b=E[d|0]-48|0;if(b>>>0>9){return 0}while(1){e=-1;if(c>>>0<=214748364){c=M(c,10);e=(c^2147483647)>>>0<b>>>0?-1:c+b|0}b=d+1|0;G[a>>2]=b;f=E[d+1|0];c=e;d=b;b=f-48|0;if(b>>>0<10){continue}break}return c}function Oc(a,b){var c=0,d=0,e=0;A(+a);d=v(1)|0;e=v(0)|0;c=d>>>20&2047;if((c|0)!=2047){if(!c){if(a==0){c=0}else{a=Oc(a*0x10000000000000000,b);c=G[b>>2]+-64|0}G[b>>2]=c;return a}G[b>>2]=c-1022;x(0,e|0);x(1,d&-2146435073|1071644672);a=+z()}return a}function sc(a,b){var c=0,d=0,e=0,f=0;c=b>>>20&2047;e=0;a:{if(c>>>0<1023){break a}e=2;if(c>>>0>1075){break a}c=1075-c|0;d=c&31;if((c&63)>>>0>=32){c=1<<d;d=0}else{f=1<<d;c=f-1&1>>>32-d;d=f}f=d-1|0;e=0;if(a&f|b&c-!d){break a}e=a&d|b&c?1:2}return e}function zc(a,b){var c=0,d=0;c=la-288|0;la=c;Wb(c+12|0,0,136);G[c+140>>2]=268435456;G[c+8>>2]=b;b=c+8|0;d=c+148|0;a:{if(a>>>0>=65){G[3719]=28;break a}if(d){jc(d,M(a,140)+15088|0,140)}if(b){jc(M(a,140)+15088|0,b,140)}}la=c+288|0}function Od(a,b,c,d){var e=0,f=0,g=0,h=0,i=0,j=0;e=c>>>16|0;f=a>>>16|0;j=M(e,f);g=c&65535;h=a&65535;i=M(g,h);f=(i>>>16|0)+M(f,g)|0;e=(f&65535)+M(e,h)|0;oa=(M(b,c)+j|0)+M(a,d)+(f>>>16)+(e>>>16)|0;return i&65535|e<<16}function Vc(a,b,c,d,e){var f=0;f=la-256|0;la=f;if(!(e&73728|(c|0)<=(d|0))){d=c-d|0;c=d>>>0<256;Wb(f,b,c?d:256);if(!c){while(1){Rc(a,f,256);d=d-256|0;if(d>>>0>255){continue}break}}Rc(a,f,d)}la=f+256|0}function La(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;a:{if(H[b|0]!=45){break a}c=1;d=b+1|0;if(!(H[b+1|0]!=110|H[b+2|0]!=111)){c=H[b+3|0]!=45;d=c?d:b+4|0}if(Ec(d,G[a+4>>2])){break a}E[a+20|0]=c;e=1}return e|0}function ac(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;var e=0;e=la-16|0;la=e;a=ka(G[a+60>>2],b|0,c|0,d&255,e+8|0)|0;if(a){G[3719]=a;a=-1}else{a=0}la=e+16|0;oa=a?-1:G[e+12>>2];return(a?-1:G[e+8>>2])|0}function gc(a){var b=0;b=G[a+72>>2];G[a+72>>2]=b-1|b;b=G[a>>2];if(b&8){G[a>>2]=b|32;return-1}G[a+4>>2]=0;G[a+8>>2]=0;b=G[a+44>>2];G[a+28>>2]=b;G[a+20>>2]=b;G[a+16>>2]=b+G[a+48>>2];return 0}function Yc(a,b,c,d){a:{if(!a){break a}b:{switch(b+2|0){case 0:E[a|0]=c;return;case 1:F[a>>1]=c;return;case 2:case 3:G[a>>2]=c;return;case 5:break b;default:break a}}G[a>>2]=c;G[a+4>>2]=d}}function qd(a,b,c,d,e,f,g,h,i){var j=0;j=la-16|0;la=j;fd(j,b,c,d,e,f,g,h,i^-2147483648);d=G[j>>2];c=G[j+4>>2];b=G[j+12>>2];G[a+8>>2]=G[j+8>>2];G[a+12>>2]=b;G[a>>2]=d;G[a+4>>2]=c;la=j+16|0}function Sb(a){a=a|0;var b=0;b=G[3718];G[b+664>>2]=-1;G[b+668>>2]=-1;G[b+672>>2]=-1;G[b+676>>2]=-1;if(G[b+304>>2]){G[b+308>>2]=0}Fa(b+304|0,1);G[G[b+304>>2]>>2]=a<<1;return!(vb(b)&255)|0}function Pa(a,b){a=a|0;b=b|0;var c=0,d=0;c=la-32|0;la=c;d=G[a+4>>2];G[c+20>>2]=G[a+16>>2];G[c+16>>2]=d;d=G[3076];fc(d,4399,c+16|0);if(b){G[c>>2]=G[a+8>>2];fc(d,4471,c);ic(10,d)}la=c+32|0}function Ec(a,b){var c=0,d=0;c=H[a|0];d=H[b|0];a:{if(!c|(c|0)!=(d|0)){break a}while(1){d=H[b+1|0];c=H[a+1|0];if(!c){break a}b=b+1|0;a=a+1|0;if((c|0)==(d|0)){continue}break}}return c-d|0}function wc(a){var b=0;a:{b=a;a=Fc(a);if((nc(b,1,a,13920)|0)!=(a|0)){break a}b:{if(G[3500]==10){break b}a=G[3485];if((a|0)==G[3484]){break b}G[3485]=a+1;E[a|0]=10;break a}hc(13920,10)}}function Yb(a){var b=0,c=0;Zb(a);pa[G[a+12>>2]](a)|0;if(!(E[a|0]&1)){b=G[a+56>>2];c=G[a+52>>2];if(c){G[c+56>>2]=b}if(b){G[b+52>>2]=c}if(G[3735]==(a|0)){G[3735]=b}dd(G[a+96>>2]);dd(a)}}function ab(a,b){var c=0,d=0;c=b>>1;E[c+G[a+332>>2]|0]=b&1;d=G[a+296>>2];c=G[a+396>>2]+(c<<3)|0;G[c>>2]=-1;G[c+4>>2]=d;d=G[a+284>>2];G[a+284>>2]=d+1;G[G[a+280>>2]+(d<<2)>>2]=b}function Ed(a,b,c,d,e,f){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;f=f|0;if(wd(a,G[b+8>>2],f)){Bd(b,c,d,e);return}a=G[a+8>>2];pa[G[G[a>>2]+20>>2]](a,b,c,d,e,f)}function $b(a){var b=0,c=0;b=la-16|0;la=b;c=-1;a:{if(_b(a)){break a}if((pa[G[a+32>>2]](a,b+15|0,1)|0)!=1){break a}c=H[b+15|0]}la=b+16|0;return c}function nc(a,b,c,d){var e=0;e=M(b,c);a:{if(G[d+76>>2]<0){a=mc(a,e,d);break a}a=mc(a,e,d)}if((e|0)==(a|0)){return b?c:0}return(a>>>0)/(b>>>0)|0}function Pb(){var a=0;a=G[3718];G[a+664>>2]=-1;G[a+668>>2]=-1;G[a+672>>2]=-1;G[a+676>>2]=-1;if(G[a+304>>2]){G[a+308>>2]=0}return!(vb(a)&255)|0}function sd(){var a=0,b=0;while(1){a:{a=ad(936);if(a){break a}b=G[6572];if(!b){break a}pa[b|0]();continue}break}if(!a){td();B()}return a}function Xc(a,b){a=a|0;b=b|0;var c=0,d=0,e=0;c=b;b=G[b>>2]+7&-8;G[c>>2]=b+16;d=a,e=rd(G[b>>2],G[b+4>>2],G[b+8>>2],G[b+12>>2]),L[d>>3]=e}function Ad(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;if(wd(a,G[b+8>>2],0)){yd(b,c,d);return}a=G[a+8>>2];pa[G[G[a>>2]+28>>2]](a,b,c,d)}function Nb(a){a=a|0;var b=0;if(G[3717]<(a|0)){while(1){tb(G[3718]);b=G[3717]+1|0;G[3717]=b;if((a|0)>(b|0)){continue}break}}}function vd(){var a=0,b=0;b=la-16|0;la=b;a=G[3076];nc(3725,11,1,a);G[b+12>>2]=0;Pc(a,3685,0,33,34);ic(10,a);td();B()}function Jc(a,b,c,d,e,f){G[a>>2]=b;G[a+4>>2]=c;G[a+8>>2]=d;G[a+12>>2]=e&65535|(f>>>16&32768|(e&2147418112)>>>16)<<16}function wd(a,b,c){if(!c){return G[a+4>>2]==G[b+4>>2]}if((a|0)==(b|0)){return 1}return!Ec(G[a+4>>2],G[b+4>>2])}function Fd(a,b,c,d,e,f){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;f=f|0;if(wd(a,G[b+8>>2],f)){Bd(b,c,d,e)}}function Ca(a){a=a|0;vc();wc(3431);a=G[3524];if(G[a+44>>2]>0){jb(a);vc();wc(3431)}_(1);B()}function oc(a){ga(4689);if(a){G[a>>2]=-1;G[a+4>>2]=-1;G[a+8>>2]=-1;G[a+12>>2]=-1}return 0}function uc(a,b){var c=0;c=la-16|0;la=c;G[c+12>>2]=b;Pc(13920,a,b,33,0);la=c+16|0}function tc(a,b){var c=0;c=la-16|0;la=c;G[c+12>>2]=b;Pc(13920,a,b,0,0);la=c+16|0}function dc(a){a=a|0;a=ea(G[a+60>>2])|0;if(a){G[3719]=a;a=-1}else{a=0}return a|0}function fc(a,b,c){var d=0;d=la-16|0;la=d;G[d+12>>2]=c;Pc(a,b,c,0,0);la=d+16|0}function Nd(a,b,c,d,e){a=a|0;b=b|0;c=c|0;d=d|0;e=e|0;return pa[a|0](b,c,d,e)|0}function zd(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;if(wd(a,G[b+8>>2],0)){yd(b,c,d)}}function Ga(a){a=a|0;a=G[3525];if(a){G[3526]=0;dd(a);G[3527]=0;G[3525]=0}}function Mb(){var a=0;a=pb(sd());G[3718]=a;wb(a,1);tb(G[3718])}function Cc(a,b,c,d){a=a|0;b=b|0;c=c|0;d=d|0;oa=0;return 0}function yc(a){a=a|0;if(G[a+12>>2]<=0){G[a+12>>2]=0}}function Lb(a){a=a|0;if(a){pa[G[G[a>>2]+4>>2]](a)}}function Ld(a){a=a|0;a=la-a&-16;la=a;return a|0}function Rc(a,b,c){if(!(H[a|0]&32)){mc(b,c,a)}}function Qb(){return G[G[3718]+4>>2]+1|0}function Kb(){wc(3715);return pb(sd())|0}function Jb(a){zc(2,a);zc(15,a);zc(24,a)}function Ea(a){a=a|0;E[G[3524]+680|0]=1}function Vb(){return G[G[3718]+32>>2]}function Ub(){return G[G[3718]+36>>2]}function cd(a){a=a|0;return ad(a)|0}function ud(){return ad(81)+80|0}function Na(a){a=a|0;return a|0}function Gd(){na=91840;ma=26304}function sb(a){a=a|0;dd(rb(a))}function Sa(a){a=a|0;dd(Ra(a))}function Bc(a){a=a|0;return 0}function Rb(){return G[3717]}function Hd(){return la-ma|0}function Ha(a){a=a|0;dd(a)}function Md(){return la|0}function Kd(a){a=a|0;la=a}function Jd(){return ma|0}function Id(){return na|0}function Ka(a){a=a|0;B()}function td(){ia();B()}function Xb(a){a=a|0}
-// EMSCRIPTEN_END_FUNCS
-e=H;p(q);var pa=c([null,Ca,Ea,Ga,Na,Ha,Ia,Ja,Ka,vd,Ha,La,Ma,Ha,Oa,Pa,Ra,Sa,mb,Ha,nb,ob,rb,sb,Gb,Ga,ac,bc,cc,dc,yc,Bc,Cc,Wc,Xc,Zc,Na,Ha,Xb,Xb,xd,Fd,Dd,zd,Ha,Ed,Cd,Ad]);function qa(){return D.byteLength/65536|0}function va(wa){wa=wa|0;var ra=qa()|0;var sa=ra+wa|0;if(ra<sa&&sa<65536){var ta=new ArrayBuffer(M(sa,65536));var ua=new Int8Array(ta);ua.set(E);E=new Int8Array(ta);F=new Int16Array(ta);G=new Int32Array(ta);H=new Uint8Array(ta);I=new Uint16Array(ta);J=new Uint32Array(ta);K=new Float32Array(ta);L=new Float64Array(ta);D=ta;e=H}return ra}return{memory:Object.create(Object.prototype,{grow:{value:va},buffer:{get:function(){return D}}}),__wasm_call_ctors:za,__main_argc_argv:Aa,malloc:cd,free:dd,__indirect_function_table:pa,yo:Kb,unyo:Lb,createTheSolver:Mb,ensureVar:Nb,addClause:Ob,solve:Pb,getSolution:Qb,getNumVars:Rb,solveAssuming:Sb,retireVar:Tb,getConflictClauseSize:Ub,getConflictClause:Vb,fflush:Zb,emscripten_stack_init:Gd,emscripten_stack_get_free:Hd,emscripten_stack_get_base:Id,emscripten_stack_get_end:Jd,_emscripten_stack_restore:Kd,_emscripten_stack_alloc:Ld,emscripten_stack_get_current:Md,dynCall_jiji:Nd}}return xa(ya)}
-// EMSCRIPTEN_END_ASM
-
-
-)(a)}var ja=Error,WebAssembly={};w=[];"object"!=typeof WebAssembly&&u("no native wasm support detected");var x,y=!1;function p(a,b){a||l("Assertion failed"+(b?": "+b:""))}var z,A,B,ka,C,D,E,G;function la(){var a=x.buffer;c.HEAP8=z=new Int8Array(a);c.HEAP16=B=new Int16Array(a);c.HEAPU8=A=new Uint8Array(a);c.HEAPU16=ka=new Uint16Array(a);c.HEAP32=C=new Int32Array(a);c.HEAPU32=D=new Uint32Array(a);c.HEAPF32=E=new Float32Array(a);c.HEAPF64=G=new Float64Array(a)}let ma;(ma=global).performance??(ma.performance=require("perf_hooks").performance);p(!c.STACK_SIZE,"STACK_SIZE can no longer be set at runtime.  Use -sSTACK_SIZE at link time");p("undefined"!=typeof Int32Array&&"undefined"!==typeof Float64Array&&void 0!=Int32Array.prototype.subarray&&void 0!=Int32Array.prototype.set,"JS engine does not provide full typed array support");p(!c.wasmMemory,"Use of `wasmMemory` detected.  Use -sIMPORTED_MEMORY to define wasmMemory externally");p(!c.INITIAL_MEMORY,"Detected runtime INITIAL_MEMORY setting.  Use -sIMPORTED_MEMORY to define wasmMemory dynamically");function na(){var a=oa();p(0==(a&3));0==a&&(a+=4);D[a>>2]=34821223;D[a+4>>2]=2310721022;D[0]=1668509029}function H(){if(!y){var a=oa();0==a&&(a+=4);var b=D[a>>2],d=D[a+4>>2];34821223==b&&2310721022==d||l(`Stack overflow! Stack cookie has been overwritten at ${I(a)}, expected hex dwords 0x89BACDFE and 0x2135467, but received ${I(d)} ${I(b)}`);1668509029!=D[0]&&l("Runtime error: The application has corrupted its heap memory area (address zero)!")}}var pa=[],qa=[],ra=[],sa=!1;function ta(){var a=c.preRun.shift();pa.unshift(a)}p(Math.imul,"This browser does not support Math.imul(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.fround,"This browser does not support Math.fround(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.clz32,"This browser does not support Math.clz32(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.trunc,"This browser does not support Math.trunc(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");var J=0,K=null,M={},N=null;function ua(){var _c$monitorRunDependen;J++;(_c$monitorRunDependen=c.monitorRunDependencies)===null||_c$monitorRunDependen===void 0||_c$monitorRunDependen.call(c,J);p(!M["wasm-instantiate"]);M["wasm-instantiate"]=1;null===N&&"undefined"!=typeof setInterval&&(N=setInterval(()=>{if(y)clearInterval(N),N=null;else{var a=!1,b;for(b in M)a||(a=!0,u("still waiting on run dependencies:")),u(`dependency: ${b}`);a&&u("(end of list)")}},1e4))}function l(a){var _c$onAbort;(_c$onAbort=c.onAbort)===null||_c$onAbort===void 0||_c$onAbort.call(c,a);a="Aborted("+a+")";u(a);y=!0;a=new ja(a);f(a);throw a}function va(){l("Filesystem support (FS) was not included. The problem is that you are using files from JS, but files were not used from C/C++, so filesystem support was not auto-included. You can force-include filesystem support with -sFORCE_FILESYSTEM")}c.FS_createDataFile=function(){va()};c.FS_createPreloadedFile=function(){va()};var fa=a=>a.startsWith("file://");function O(a,b){return function(){p(sa,`native function \`${a}\` called before runtime initialization`);var e=P[a];p(e,`exported native function \`${a}\` not found`);p(arguments.length<=b,`native function \`${a}\` called with ${arguments.length} args but expects ${b}`);return e(...arguments)}}var Q;function wa(a){if(Q==Q&&w)new Uint8Array(w);else if(m)m(Q);else throw'sync fetching of the wasm failed: you can preload it to Module["wasmBinary"] manually, or emcc.py will do that for you when generating HTML (but not JS)';var b=new ha;return[new ia(a),b]}var xa=new Int16Array(1),ya=new Int8Array(xa.buffer);xa[0]=25459;if(115!==ya[0]||99!==ya[1])throw"Runtime error: expected the system to be little-endian! (Run with -sSUPPORT_BIG_ENDIAN to bypass)";if(c.ENVIRONMENT)throw Error("Module.ENVIRONMENT has been deprecated. To force the environment, use the ENVIRONMENT compile-time option (for example, -sENVIRONMENT=web or -sENVIRONMENT=node)");function v(a,b){Object.getOwnPropertyDescriptor(c,a)||Object.defineProperty(c,a,{configurable:!0,get(){l(`\`Module.${a}\` has been replaced by \`${b}\``+" (the initial value can be provided on Module, but after startup the value is only looked for on a local variable of that name)")}})}class za{constructor(a){_defineProperty(this,"name","ExitStatus");this.message=`Program terminated with exit(${a})`;this.status=a}}c.ExitStatus=za;var R=a=>{for(;0<a.length;)a.shift()(c)};c.callRuntimeCallbacks=R;c.getValue=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:"i8";b.endsWith("*")&&(b="*");switch(b){case"i1":return z[a];case"i8":return z[a];case"i16":return B[a>>1];case"i32":return C[a>>2];case"i64":l("to do getValue(i64) use WASM_BIGINT");case"float":return E[a>>2];case"double":return G[a>>3];case"*":return D[a>>2];default:l(`invalid type for getValue: ${b}`)}};var S=c.noExitRuntime||!0;c.noExitRuntime=S;var I=a=>{p("number"===typeof a);return"0x"+(a>>>0).toString(16).padStart(8,"0")};c.ptrToString=I;c.setValue=function(a,b){let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"i8";d.endsWith("*")&&(d="*");switch(d){case"i1":z[a]=b;break;case"i8":z[a]=b;break;case"i16":B[a>>1]=b;break;case"i32":C[a>>2]=b;break;case"i64":l("to do setValue(i64) use WASM_BIGINT");case"float":E[a>>2]=b;break;case"double":G[a>>3]=b;break;case"*":D[a>>2]=b;break;default:l(`invalid type for setValue: ${d}`)}};c.stackRestore=a=>Aa(a);c.stackSave=()=>Ba();var T=a=>{T.i||(T.i={});T.i[a]||(T.i[a]=1,u("warning: "+a))};c.warnOnce=T;var Ca="undefined"!=typeof TextDecoder?new TextDecoder:void 0;c.UTF8Decoder=Ca;var Da=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:0;let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:NaN;var e=b+d;for(d=b;a[d]&&!(d>=e);)++d;if(16<d-b&&a.buffer&&Ca)return Ca.decode(a.subarray(b,d));for(e="";b<d;){var g=a[b++];if(g&128){var k=a[b++]&63;if(192==(g&224))e+=String.fromCharCode((g&31)<<6|k);else{var h=a[b++]&63;224==(g&240)?g=(g&15)<<12|k<<6|h:(240!=(g&248)&&T("Invalid UTF-8 leading byte "+I(g)+" encountered when deserializing a UTF-8 string in wasm memory to a JS string!"),g=(g&7)<<18|k<<12|h<<6|a[b++]&63);65536>g?e+=String.fromCharCode(g):(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023))}}else e+=String.fromCharCode(g)}return e};c.UTF8ArrayToString=Da;var U=(a,b)=>{p("number"==typeof a,`UTF8ToString expects a number (got ${typeof a})`);return a?Da(A,a,b):""};c.UTF8ToString=U;var Ea=(a,b,d,e)=>l(`Assertion failed: ${U(a)}, at: `+[b?U(b):"unknown filename",d,e?U(e):"unknown function"]);c.___assert_fail=Ea;class Fa{constructor(a){this.h=a-24}}c.ExceptionInfo=Fa;var Ga=0;c.exceptionLast=Ga;var Ha=0;c.uncaughtExceptionCount=Ha;var Ia=(a,b,d)=>{var e=new Fa(a);D[e.h+16>>2]=0;D[e.h+4>>2]=b;D[e.h+8>>2]=d;Ga=a;Ha++;p(!1,"Exception thrown, but exception catching is not enabled. Compile with -sNO_DISABLE_EXCEPTION_CATCHING or -sEXCEPTION_CATCHING_ALLOWED=[..] to catch.")};c.___cxa_throw=Ia;var V={g:void 0,j(a){return U(a)}};c.SYSCALLS=V;function Ja(a,b,d){V.g=d;return 0}c.___syscall_fcntl64=Ja;function Ka(a,b,d){V.g=d;return 0}c.___syscall_ioctl=Ka;c.syscallGetVarargI=()=>{p(void 0!=V.g);var a=C[+V.g>>2];V.g+=4;return a};function La(a,b,d,e){V.g=e;l("it should not be possible to operate on streams when !SYSCALLS_REQUIRE_FILESYSTEM")}c.___syscall_openat=La;var Ma=()=>l("native code called abort()");c.__abort_js=Ma;var Na=(a,b,d)=>A.copyWithin(a,b,b+d);c.__emscripten_memcpy_js=Na;var Oa=a=>u(U(a));c._emscripten_err=Oa;c.getHeapMax=()=>2147483648;var Pa=(a,b)=>{p(b,"alignment argument is required");return Math.ceil(a/b)*b};c.alignMemory=Pa;var Qa=a=>{var b=x.buffer,d=(a-b.byteLength+65535)/65536|0;try{return x.grow(d),la(),1}catch(e){u(`growMemory: Attempted to grow heap from ${b.byteLength} bytes to ${a} bytes, but got error: ${e}`)}};c.growMemory=Qa;var Ra=a=>{var b=A.length;a>>>=0;p(a>b);if(2147483648<a)return u(`Cannot enlarge memory, requested ${a} bytes, but the limit is ${2147483648} bytes!`),!1;for(var d=1;4>=d;d*=2){var e=b*(1+.2/d);e=Math.min(e,a+100663296);e=Math.min(2147483648,Pa(Math.max(a,e),65536));if(Qa(e))return u("Warning: Enlarging memory arrays, this is not fast! "+[b,e]),!0}u(`Failed to grow the heap from ${b} bytes to ${e} bytes, not enough memory!`);return!1};c._emscripten_resize_heap=Ra;c.runtimeKeepaliveCounter=0;c.keepRuntimeAlive=()=>S||!1;var Sa=a=>{var _c$onExit;S||((_c$onExit=c.onExit)!==null&&_c$onExit!==void 0&&_c$onExit.call(c,a),y=!0);da(a,new za(a))};c._proc_exit=Sa;var Ua=(a,b)=>{Ta();S&&!b&&(b=`program exited (with status: ${a}), but keepRuntimeAlive() is set (counter=${0}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`,f(b),u(b));Sa(a)};c.exitJS=Ua;c._exit=Ua;var Va=()=>{l("fd_close called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_close=Va;var Wa=()=>{l("fd_read called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_read=Wa;var Xa=(a,b)=>{p(a==a>>>0||a==(a|0));p(b===(b|0));return b+2097152>>>0<4194305-!!a?(a>>>0)+4294967296*b:NaN};c.convertI32PairToI53Checked=Xa;function Ya(a,b,d){Xa(b,d);return 70}c._fd_seek=Ya;var W=[null,[],[]];c.printCharBuffers=W;var X=(a,b)=>{var d=W[a];p(d);0===b||10===b?((1===a?t:u)(Da(d)),d.length=0):d.push(b)};c.printChar=X;var $a=()=>{Za(0);W[1].length&&X(1,10);W[2].length&&X(2,10)};c.flush_NO_FILESYSTEM=$a;var ab=(a,b,d,e)=>{for(var g=0,k=0;k<d;k++){var h=D[b>>2],q=D[b+4>>2];b+=8;for(var F=0;F<q;F++)X(a,A[h+F]);g+=q}D[e>>2]=g;return 0};c._fd_write=ab;var bb=a=>{for(var b=0,d=0;d<a.length;++d){var e=a.charCodeAt(d);127>=e?b++:2047>=e?b+=2:55296<=e&&57343>=e?(b+=4,++d):b+=3}return b};c.lengthBytesUTF8=bb;var cb=(a,b,d,e)=>{p("string"===typeof a,`stringToUTF8Array expects a string (got ${typeof a})`);if(!(0<e))return 0;var g=d;e=d+e-1;for(var k=0;k<a.length;++k){var h=a.charCodeAt(k);if(55296<=h&&57343>=h){var q=a.charCodeAt(++k);h=65536+((h&1023)<<10)|q&1023}if(127>=h){if(d>=e)break;b[d++]=h}else{if(2047>=h){if(d+1>=e)break;b[d++]=192|h>>6}else{if(65535>=h){if(d+2>=e)break;b[d++]=224|h>>12}else{if(d+3>=e)break;1114111<h&&T("Invalid Unicode code point "+I(h)+" encountered when serializing a JS string to a UTF-8 string in wasm memory! (Valid unicode code points should be in range 0-0x10FFFF).");b[d++]=240|h>>18;b[d++]=128|h>>12&63}b[d++]=128|h>>6&63}b[d++]=128|h&63}}b[d]=0;return d-g};c.stringToUTF8Array=cb;var db=(a,b,d)=>{p("number"==typeof d,"stringToUTF8(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");return cb(a,A,b,d)};c.stringToUTF8=db;c.stackAlloc=a=>Y(a);var eb=a=>{var b=bb(a)+1,d=Y(b);db(a,d,b);return d};c.stringToUTF8OnStack=eb;var fb=a=>{var b=c["_"+a];p(b,"Cannot call unknown function "+a+", make sure it is exported");return b};c.getCFunc=fb;var gb=(a,b)=>{p(0<=a.length,"writeArrayToMemory array must have a length (should be an array or typed array)");z.set(a,b)};c.writeArrayToMemory=gb;var hb=(a,b,d,e)=>{var g={string:r=>{var L=0;null!==r&&void 0!==r&&0!==r&&(L=eb(r));return L},array:r=>{var L=Y(r.length);gb(r,L);return L}};a=fb(a);var k=[],h=0;p("array"!==b,'Return type should not be "array".');if(e)for(var q=0;q<e.length;q++){var F=g[d[q]];F?(0===h&&(h=Ba()),k[q]=F(e[q])):k[q]=e[q]}d=a(...k);return d=function(r){0!==h&&Aa(h);return"string"===b?U(r):"boolean"===b?!!r:r}(d)};c.ccall=hb;c.cwrap=(a,b,d,e)=>function(){for(var _len=arguments.length,g=new Array(_len),_key=0;_key<_len;_key++){g[_key]=arguments[_key]}return hb(a,b,d,g,e)};c.intArrayFromString=function(a,b,d){d=Array(0<d?d:bb(a)+1);a=cb(a,d,0,d.length);b&&(d.length=a);return d};c.intArrayToString=function(a){for(var b=[],d=0;d<a.length;d++){var e=a[d];255<e&&(p(!1,`Character code ${e} (${String.fromCharCode(e)}) at offset ${d} not in 0x00-0xFF.`),e&=255);b.push(String.fromCharCode(e))}return b.join("")};c.AsciiToString=a=>{for(var b="";;){var d=A[a++];if(!d)return b;b+=String.fromCharCode(d)}};var ib="undefined"!=typeof TextDecoder?new TextDecoder("utf-16le"):void 0;c.UTF16Decoder=ib;c.UTF16ToString=(a,b)=>{p(0==a%2,"Pointer passed to UTF16ToString must be aligned to two bytes!");var d=a>>1;for(var e=d+b/2;!(d>=e)&&ka[d];)++d;d<<=1;if(32<d-a&&ib)return ib.decode(A.subarray(a,d));d="";for(e=0;!(e>=b/2);++e){var g=B[a+2*e>>1];if(0==g)break;d+=String.fromCharCode(g)}return d};c.stringToUTF16=(a,b,d)=>{p(0==b%2,"Pointer passed to stringToUTF16 must be aligned to two bytes!");p("number"==typeof d,"stringToUTF16(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(2>d)return 0;d-=2;var e=b;d=d<2*a.length?d/2:a.length;for(var g=0;g<d;++g)B[b>>1]=a.charCodeAt(g),b+=2;B[b>>1]=0;return b-e};c.UTF32ToString=(a,b)=>{p(0==a%4,"Pointer passed to UTF32ToString must be aligned to four bytes!");for(var d=0,e="";!(d>=b/4);){var g=C[a+4*d>>2];if(0==g)break;++d;65536<=g?(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023)):e+=String.fromCharCode(g)}return e};c.stringToUTF32=(a,b,d)=>{p(0==b%4,"Pointer passed to stringToUTF32 must be aligned to four bytes!");p("number"==typeof d,"stringToUTF32(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(4>d)return 0;var e=b;d=e+d-4;for(var g=0;g<a.length;++g){var k=a.charCodeAt(g);if(55296<=k&&57343>=k){var h=a.charCodeAt(++g);k=65536+((k&1023)<<10)|h&1023}C[b>>2]=k;b+=4;if(b+4>d)break}C[b>>2]=0;return b-e};c.ALLOC_NORMAL=0;c.ALLOC_STACK=1;c.allocate=(a,b)=>{p("number"==typeof b,"allocate no longer takes a type argument");p("number"!=typeof a,"allocate no longer takes a number as arg0");b=1==b?Y(a.length):jb(a.length);a.subarray||a.slice||(a=new Uint8Array(a));A.set(a,b);return b};c.jsStackTrace=()=>Error().stack.toString();c.stackTrace=()=>{var a=Error().stack.toString();c.extraStackTrace&&(a+="\n"+c.extraStackTrace());return a};var kb={__assert_fail:Ea,__cxa_throw:Ia,__syscall_fcntl64:Ja,__syscall_ioctl:Ka,__syscall_openat:La,_abort_js:Ma,_emscripten_memcpy_js:Na,emscripten_err:Oa,emscripten_resize_heap:Ra,exit:Ua,fd_close:Va,fd_read:Wa,fd_seek:Ya,fd_write:ab,proc_exit:Sa},P=function(){function a(d){var _c$monitorRunDependen2;P=d.exports;x=P.memory;p(x,"memory not found in wasm exports");la();qa.unshift(P.__wasm_call_ctors);J--;(_c$monitorRunDependen2=c.monitorRunDependencies)===null||_c$monitorRunDependen2===void 0||_c$monitorRunDependen2.call(c,J);p(M["wasm-instantiate"]);delete M["wasm-instantiate"];0==J&&(null!==N&&(clearInterval(N),N=null),K&&(d=K,K=null,d()));return P}ua();var b={env:kb,wasi_snapshot_preview1:kb};if(c.instantiateWasm)try{return c.instantiateWasm(b,a)}catch(d){u(`Module.instantiateWasm callback failed with error: ${d}`),f(d)}Q??(Q="<<< WASM_BINARY_FILE >>>");b=wa(b);return a(b[0])}(),jb=c._malloc=O("malloc",1);c._free=O("free",1);c._yo=O("yo",0);c._unyo=O("unyo",1);c._createTheSolver=O("createTheSolver",0);c._ensureVar=O("ensureVar",1);c._addClause=O("addClause",1);c._solve=O("solve",0);c._getSolution=O("getSolution",0);c._getNumVars=O("getNumVars",0);c._solveAssuming=O("solveAssuming",1);c._retireVar=O("retireVar",1);c._getConflictClauseSize=O("getConflictClauseSize",0);c._getConflictClause=O("getConflictClause",0);var Za=O("fflush",1),lb=P.emscripten_stack_init,oa=P.emscripten_stack_get_end,Aa=P._emscripten_stack_restore,Y=P._emscripten_stack_alloc,Ba=P.emscripten_stack_get_current;c.dynCall_jiji=O("dynCall_jiji",5);var Z;K=function mb(){Z||nb();Z||(K=mb)};function nb(){function a(){if(!Z&&(Z=!0,c.calledRun=!0,!y)){var _c$onRuntimeInitializ;p(!sa);sa=!0;H();R(qa);aa(c);(_c$onRuntimeInitializ=c.onRuntimeInitialized)===null||_c$onRuntimeInitializ===void 0||_c$onRuntimeInitializ.call(c);p(!c._main,'compiled without a main, but one is present. if you added it from JS, use Module["onRuntimeInitialized"]');H();if(c.postRun)for("function"==typeof c.postRun&&(c.postRun=[c.postRun]);c.postRun.length;){var b=c.postRun.shift();ra.unshift(b)}R(ra)}}if(!(0<J)){lb();na();if(c.preRun)for("function"==typeof c.preRun&&(c.preRun=[c.preRun]);c.preRun.length;)ta();R(pa);0<J||(c.setStatus?(c.setStatus("Running..."),setTimeout(()=>{setTimeout(()=>c.setStatus(""),1);a()},1)):a(),H())}}function Ta(){var a=t,b=u,d=!1;t=u=()=>{d=!0};try{$a()}catch(e){}t=a;u=b;d&&(T("stdio streams had content in them that was not flushed. you should set EXIT_RUNTIME to 1 (see the Emscripten FAQ), or make sure to emit a newline when you printf etc."),T("(this may also be due to not including full filesystem support - try building with -sFORCE_FILESYSTEM)"))}if(c.preInit)for("function"==typeof c.preInit&&(c.preInit=[c.preInit]);0<c.preInit.length;)c.preInit.pop()();nb();moduleRtn=c;for(const a of Object.keys(c))a in moduleArg||Object.defineProperty(moduleArg,a,{configurable:!0,get(){l(`Access to module property ('${a}') is no longer possible via the module constructor argument; Instead, use the result of the module constructor.`)}});
+function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==typeof i?i:i+""}function _toPrimitive(t,r){if("object"!=typeof t||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=typeof i)return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}var c=moduleArg,aa,f,ba=new Promise((a,b)=>{aa=a;f=b});"_addClause _createTheSolver _ensureVar _free _getConflictClause _getConflictClauseSize _getNumVars _getSolution _malloc _retireVar _solve _solveAssuming _unyo _yo ccall cwrap UTF8ToString stringToUTF8 UTF16ToString stringToUTF16 UTF32ToString stringToUTF32 AsciiToString intArrayFromString intArrayToString writeArrayToMemory stackSave stackAlloc stackRestore getValue setValue _memory ___indirect_function_table onRuntimeInitialized".split(" ").forEach(a=>{Object.getOwnPropertyDescriptor(ba,a)||Object.defineProperty(ba,a,{get:()=>l("You are getting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js"),set:()=>l("You are setting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js")})});var ca=Object.assign({},c),m=(a,b)=>{throw b},da;if("undefined"==typeof process||!process.release||"node"!==process.release.name)throw Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)");var ea=process.versions.node,n=ea.split(".").slice(0,3);n=1e4*n[0]+100*n[1]+1*n[2].split("-")[0];if(14e4>n)throw Error("This emscripten-generated code requires node v14.0.0 (detected v"+ea+")");var fs=require("fs");require("path");da=a=>{a=fa(a)?new URL(a):a;a=fs.readFileSync(a);p(Buffer.isBuffer(a));return a};process.argv.slice(2);m=(a,b)=>{process.exitCode=a;throw b};var r=c.print||console.log.bind(console),u=c.printErr||console.error.bind(console);Object.assign(c,ca);ca=null;Object.getOwnPropertyDescriptor(c,"fetchSettings")&&l("`Module.fetchSettings` was supplied but `fetchSettings` not included in INCOMING_MODULE_JS_API");v("arguments","arguments_");v("thisProgram","thisProgram");p("undefined"==typeof c.memoryInitializerPrefixURL,"Module.memoryInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.pthreadMainPrefixURL,"Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.cdInitializerPrefixURL,"Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.filePackagePrefixURL,"Module.filePackagePrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.read,"Module.read option was removed");p("undefined"==typeof c.readAsync,"Module.readAsync option was removed (modify readAsync in JS)");p("undefined"==typeof c.readBinary,"Module.readBinary option was removed (modify readBinary in JS)");p("undefined"==typeof c.setWindowTitle,"Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)");p("undefined"==typeof c.TOTAL_MEMORY,"Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY");v("asm","wasmExports");v("readAsync","readAsync");v("readBinary","readBinary");v("setWindowTitle","setWindowTitle");p(!0,"web environment detected but not enabled at build time.  Add `web` to `-sENVIRONMENT` to enable.");p(!0,"worker environment detected but not enabled at build time.  Add `worker` to `-sENVIRONMENT` to enable.");p(!0,"shell environment detected but not enabled at build time.  Add `shell` to `-sENVIRONMENT` to enable.");var ha=c.wasmBinary;v("wasmBinary","wasmBinary");"object"!=typeof WebAssembly&&u("no native wasm support detected");"undefined"==typeof atob&&("undefined"!=typeof global&&"undefined"==typeof globalThis&&(globalThis=global),globalThis.atob=function(a){var b="",d=0;a=a.replace(/[^A-Za-z0-9\+\/=]/g,"");do{var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var g="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var k="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var h="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));e=e<<2|g>>4;g=(g&15)<<4|k>>2;var q=(k&3)<<6|h;b+=String.fromCharCode(e);64!==k&&(b+=String.fromCharCode(g));64!==h&&(b+=String.fromCharCode(q))}while(d<a.length);return b});var w,x=!1,y;function p(a,b){a||l("Assertion failed"+(b?": "+b:""))}var z,A,B,ia,C,D,ja,ka;function la(){var a=w.buffer;c.HEAP8=z=new Int8Array(a);c.HEAP16=B=new Int16Array(a);c.HEAPU8=A=new Uint8Array(a);c.HEAPU16=ia=new Uint16Array(a);c.HEAP32=C=new Int32Array(a);c.HEAPU32=D=new Uint32Array(a);c.HEAPF32=ja=new Float32Array(a);c.HEAPF64=ka=new Float64Array(a)}let ma;(ma=global).performance??(ma.performance=require("perf_hooks").performance);p(!c.STACK_SIZE,"STACK_SIZE can no longer be set at runtime.  Use -sSTACK_SIZE at link time");p("undefined"!=typeof Int32Array&&"undefined"!==typeof Float64Array&&void 0!=Int32Array.prototype.subarray&&void 0!=Int32Array.prototype.set,"JS engine does not provide full typed array support");p(!c.wasmMemory,"Use of `wasmMemory` detected.  Use -sIMPORTED_MEMORY to define wasmMemory externally");p(!c.INITIAL_MEMORY,"Detected runtime INITIAL_MEMORY setting.  Use -sIMPORTED_MEMORY to define wasmMemory dynamically");function na(){var a=oa();p(0==(a&3));0==a&&(a+=4);D[a>>2]=34821223;D[a+4>>2]=2310721022;D[0]=1668509029}function E(){if(!x){var a=oa();0==a&&(a+=4);var b=D[a>>2],d=D[a+4>>2];34821223==b&&2310721022==d||l(`Stack overflow! Stack cookie has been overwritten at ${F(a)}, expected hex dwords 0x89BACDFE and 0x2135467, but received ${F(d)} ${F(b)}`);1668509029!=D[0]&&l("Runtime error: The application has corrupted its heap memory area (address zero)!")}}var pa=[],qa=[],ra=[],sa=!1;function ta(){var a=c.preRun.shift();pa.unshift(a)}p(Math.imul,"This browser does not support Math.imul(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.fround,"This browser does not support Math.fround(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.clz32,"This browser does not support Math.clz32(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.trunc,"This browser does not support Math.trunc(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");var G=0,H=null,J={},K=null;function ua(){var _c$monitorRunDependen;G++;(_c$monitorRunDependen=c.monitorRunDependencies)===null||_c$monitorRunDependen===void 0||_c$monitorRunDependen.call(c,G);p(!J["wasm-instantiate"]);J["wasm-instantiate"]=1;null===K&&"undefined"!=typeof setInterval&&(K=setInterval(()=>{if(x)clearInterval(K),K=null;else{var a=!1,b;for(b in J)a||(a=!0,u("still waiting on run dependencies:")),u(`dependency: ${b}`);a&&u("(end of list)")}},1e4))}function l(a){var _c$onAbort;(_c$onAbort=c.onAbort)===null||_c$onAbort===void 0||_c$onAbort.call(c,a);a="Aborted("+a+")";u(a);x=!0;a=new WebAssembly.RuntimeError(a);f(a);throw a}function va(){l("Filesystem support (FS) was not included. The problem is that you are using files from JS, but files were not used from C/C++, so filesystem support was not auto-included. You can force-include filesystem support with -sFORCE_FILESYSTEM")}c.FS_createDataFile=function(){va()};c.FS_createPreloadedFile=function(){va()};var wa=a=>a.startsWith("data:application/octet-stream;base64,"),fa=a=>a.startsWith("file://");function L(a,b){return function(){p(sa,`native function \`${a}\` called before runtime initialization`);var e=M[a];p(e,`exported native function \`${a}\` not found`);p(arguments.length<=b,`native function \`${a}\` called with ${arguments.length} args but expects ${b}`);return e(...arguments)}}var N;function xa(a){if(N==N&&ha)var b=new Uint8Array(ha);else if(b=N,wa(b)?(b=b.slice(37),b=Buffer.from(b,"base64"),b=new Uint8Array(b.buffer,b.byteOffset,b.length)):b=void 0,!b)if(da)b=da(N);else throw'sync fetching of the wasm failed: you can preload it to Module["wasmBinary"] manually, or emcc.py will do that for you when generating HTML (but not JS)';b=new WebAssembly.Module(b);return[new WebAssembly.Instance(b,a),b]}var ya=new Int16Array(1),za=new Int8Array(ya.buffer);ya[0]=25459;if(115!==za[0]||99!==za[1])throw"Runtime error: expected the system to be little-endian! (Run with -sSUPPORT_BIG_ENDIAN to bypass)";if(c.ENVIRONMENT)throw Error("Module.ENVIRONMENT has been deprecated. To force the environment, use the ENVIRONMENT compile-time option (for example, -sENVIRONMENT=web or -sENVIRONMENT=node)");function v(a,b){Object.getOwnPropertyDescriptor(c,a)||Object.defineProperty(c,a,{configurable:!0,get(){l(`\`Module.${a}\` has been replaced by \`${b}\``+" (the initial value can be provided on Module, but after startup the value is only looked for on a local variable of that name)")}})}class Aa{constructor(a){_defineProperty(this,"name","ExitStatus");this.message=`Program terminated with exit(${a})`;this.status=a}}c.ExitStatus=Aa;var O=a=>{for(;0<a.length;)a.shift()(c)};c.callRuntimeCallbacks=O;c.getValue=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:"i8";b.endsWith("*")&&(b="*");switch(b){case"i1":return z[a];case"i8":return z[a];case"i16":return B[a>>1];case"i32":return C[a>>2];case"i64":l("to do getValue(i64) use WASM_BIGINT");case"float":return ja[a>>2];case"double":return ka[a>>3];case"*":return D[a>>2];default:l(`invalid type for getValue: ${b}`)}};var Q=c.noExitRuntime||!0;c.noExitRuntime=Q;var F=a=>{p("number"===typeof a);return"0x"+(a>>>0).toString(16).padStart(8,"0")};c.ptrToString=F;c.setValue=function(a,b){let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"i8";d.endsWith("*")&&(d="*");switch(d){case"i1":z[a]=b;break;case"i8":z[a]=b;break;case"i16":B[a>>1]=b;break;case"i32":C[a>>2]=b;break;case"i64":l("to do setValue(i64) use WASM_BIGINT");case"float":ja[a>>2]=b;break;case"double":ka[a>>3]=b;break;case"*":D[a>>2]=b;break;default:l(`invalid type for setValue: ${d}`)}};c.stackRestore=a=>Ba(a);c.stackSave=()=>Ca();var R=a=>{R.h||(R.h={});R.h[a]||(R.h[a]=1,u("warning: "+a))};c.warnOnce=R;var Da="undefined"!=typeof TextDecoder?new TextDecoder:void 0;c.UTF8Decoder=Da;var Ea=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:0;let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:NaN;var e=b+d;for(d=b;a[d]&&!(d>=e);)++d;if(16<d-b&&a.buffer&&Da)return Da.decode(a.subarray(b,d));for(e="";b<d;){var g=a[b++];if(g&128){var k=a[b++]&63;if(192==(g&224))e+=String.fromCharCode((g&31)<<6|k);else{var h=a[b++]&63;224==(g&240)?g=(g&15)<<12|k<<6|h:(240!=(g&248)&&R("Invalid UTF-8 leading byte "+F(g)+" encountered when deserializing a UTF-8 string in wasm memory to a JS string!"),g=(g&7)<<18|k<<12|h<<6|a[b++]&63);65536>g?e+=String.fromCharCode(g):(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023))}}else e+=String.fromCharCode(g)}return e};c.UTF8ArrayToString=Ea;var S=(a,b)=>{p("number"==typeof a,`UTF8ToString expects a number (got ${typeof a})`);return a?Ea(A,a,b):""};c.UTF8ToString=S;var Fa=(a,b,d,e)=>l(`Assertion failed: ${S(a)}, at: `+[b?S(b):"unknown filename",d,e?S(e):"unknown function"]);c.___assert_fail=Fa;var T;c.wasmTable=T;c.getWasmTableEntry=a=>T.get(a);var Ga=(a,b)=>T.get(a)(b);c.___call_sighandler=Ga;class Ha{constructor(a){this.g=a-24}}c.ExceptionInfo=Ha;var Ia=0;c.exceptionLast=Ia;var Ja=0;c.uncaughtExceptionCount=Ja;var Ka=(a,b,d)=>{var e=new Ha(a);D[e.g+16>>2]=0;D[e.g+4>>2]=b;D[e.g+8>>2]=d;Ia=a;Ja++;p(!1,"Exception thrown, but exception catching is not enabled. Compile with -sNO_DISABLE_EXCEPTION_CATCHING or -sEXCEPTION_CATCHING_ALLOWED=[..] to catch.")};c.___cxa_throw=Ka;var La=()=>l("native code called abort()");c.__abort_js=La;var U=0;c.runtimeKeepaliveCounter=U;var Ma=()=>{Q=!1;U=0};c.__emscripten_runtime_keepalive_clear=Ma;var V={};c.timers=V;var Na=a=>{if(a instanceof Aa||"unwind"==a)return y;E();a instanceof WebAssembly.RuntimeError&&0>=Ca()&&u("Stack overflow detected.  You can try increasing -sSTACK_SIZE (currently set to 65536)");m(1,a)};c.handleException=Na;c.keepRuntimeAlive=()=>Q||0<U;var Oa=a=>{var _c$onExit;y=a;Q||0<U||((_c$onExit=c.onExit)!==null&&_c$onExit!==void 0&&_c$onExit.call(c,a),x=!0);m(a,new Aa(a))};c._proc_exit=Oa;var W=(a,b)=>{y=a;Pa();(Q||0<U)&&!b&&(b=`program exited (with status: ${a}), but keepRuntimeAlive() is set (counter=${U}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`,f(b),u(b));Oa(a)};c.exitJS=W;c._exit=W;var Qa=()=>{if(!(Q||0<U))try{W(y)}catch(a){Na(a)}};c.maybeExit=Qa;var Ra=a=>{if(x)u("user callback triggered after runtime exited or application aborted.  Ignoring.");else try{a(),Qa()}catch(b){Na(b)}};c.callUserCallback=Ra;c._emscripten_get_now=()=>performance.now();var Ta=(a,b)=>{V[a]&&(clearTimeout(V[a].id),delete V[a]);if(!b)return 0;var d=setTimeout(()=>{p(a in V);delete V[a];Ra(()=>Sa(a,performance.now()))},b);V[a]={id:d,j:b};return 0};c.__setitimer_js=Ta;c.getHeapMax=()=>2147483648;var Ua=(a,b)=>{p(b,"alignment argument is required");return Math.ceil(a/b)*b};c.alignMemory=Ua;var Va=a=>{var b=w.buffer,d=(a-b.byteLength+65535)/65536|0;try{return w.grow(d),la(),1}catch(e){u(`growMemory: Attempted to grow heap from ${b.byteLength} bytes to ${a} bytes, but got error: ${e}`)}};c.growMemory=Va;var Wa=a=>{var b=A.length;a>>>=0;p(a>b);if(2147483648<a)return u(`Cannot enlarge memory, requested ${a} bytes, but the limit is ${2147483648} bytes!`),!1;for(var d=1;4>=d;d*=2){var e=b*(1+.2/d);e=Math.min(e,a+100663296);e=Math.min(2147483648,Ua(Math.max(a,e),65536));if(Va(e))return!0}u(`Failed to grow the heap from ${b} bytes to ${e} bytes, not enough memory!`);return!1};c._emscripten_resize_heap=Wa;c.SYSCALLS={l:void 0,i(a){return S(a)}};var Xa=()=>{l("fd_close called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_close=Xa;var Ya=(a,b)=>{p(a==a>>>0||a==(a|0));p(b===(b|0));return b+2097152>>>0<4194305-!!a?(a>>>0)+4294967296*b:NaN};c.convertI32PairToI53Checked=Ya;function Za(a,b,d){Ya(b,d);return 70}c._fd_seek=Za;var X=[null,[],[]];c.printCharBuffers=X;var Y=(a,b)=>{var d=X[a];p(d);0===b||10===b?((1===a?r:u)(Ea(d)),d.length=0):d.push(b)};c.printChar=Y;var ab=()=>{$a(0);X[1].length&&Y(1,10);X[2].length&&Y(2,10)};c.flush_NO_FILESYSTEM=ab;var bb=(a,b,d,e)=>{for(var g=0,k=0;k<d;k++){var h=D[b>>2],q=D[b+4>>2];b+=8;for(var I=0;I<q;I++)Y(a,A[h+I]);g+=q}D[e>>2]=g;return 0};c._fd_write=bb;c.stackAlloc=a=>cb(a);var db=a=>{var b=c["_"+a];p(b,"Cannot call unknown function "+a+", make sure it is exported");return b};c.getCFunc=db;var eb=(a,b)=>{p(0<=a.length,"writeArrayToMemory array must have a length (should be an array or typed array)");z.set(a,b)};c.writeArrayToMemory=eb;var fb=a=>{for(var b=0,d=0;d<a.length;++d){var e=a.charCodeAt(d);127>=e?b++:2047>=e?b+=2:55296<=e&&57343>=e?(b+=4,++d):b+=3}return b};c.lengthBytesUTF8=fb;var gb=(a,b,d,e)=>{p("string"===typeof a,`stringToUTF8Array expects a string (got ${typeof a})`);if(!(0<e))return 0;var g=d;e=d+e-1;for(var k=0;k<a.length;++k){var h=a.charCodeAt(k);if(55296<=h&&57343>=h){var q=a.charCodeAt(++k);h=65536+((h&1023)<<10)|q&1023}if(127>=h){if(d>=e)break;b[d++]=h}else{if(2047>=h){if(d+1>=e)break;b[d++]=192|h>>6}else{if(65535>=h){if(d+2>=e)break;b[d++]=224|h>>12}else{if(d+3>=e)break;1114111<h&&R("Invalid Unicode code point "+F(h)+" encountered when serializing a JS string to a UTF-8 string in wasm memory! (Valid unicode code points should be in range 0-0x10FFFF).");b[d++]=240|h>>18;b[d++]=128|h>>12&63}b[d++]=128|h>>6&63}b[d++]=128|h&63}}b[d]=0;return d-g};c.stringToUTF8Array=gb;var hb=(a,b,d)=>{p("number"==typeof d,"stringToUTF8(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");return gb(a,A,b,d)};c.stringToUTF8=hb;var ib=a=>{var b=fb(a)+1,d=cb(b);hb(a,d,b);return d};c.stringToUTF8OnStack=ib;var jb=(a,b,d,e)=>{var g={string:t=>{var P=0;null!==t&&void 0!==t&&0!==t&&(P=ib(t));return P},array:t=>{var P=cb(t.length);eb(t,P);return P}};a=db(a);var k=[],h=0;p("array"!==b,'Return type should not be "array".');if(e)for(var q=0;q<e.length;q++){var I=g[d[q]];I?(0===h&&(h=Ca()),k[q]=I(e[q])):k[q]=e[q]}d=a(...k);return d=function(t){0!==h&&Ba(h);return"string"===b?S(t):"boolean"===b?!!t:t}(d)};c.ccall=jb;c.cwrap=(a,b,d,e)=>function(){for(var _len=arguments.length,g=new Array(_len),_key=0;_key<_len;_key++){g[_key]=arguments[_key]}return jb(a,b,d,g,e)};c.intArrayFromString=function(a,b,d){d=Array(0<d?d:fb(a)+1);a=gb(a,d,0,d.length);b&&(d.length=a);return d};c.intArrayToString=function(a){for(var b=[],d=0;d<a.length;d++){var e=a[d];255<e&&(p(!1,`Character code ${e} (${String.fromCharCode(e)}) at offset ${d} not in 0x00-0xFF.`),e&=255);b.push(String.fromCharCode(e))}return b.join("")};c.AsciiToString=a=>{for(var b="";;){var d=A[a++];if(!d)return b;b+=String.fromCharCode(d)}};var kb="undefined"!=typeof TextDecoder?new TextDecoder("utf-16le"):void 0;c.UTF16Decoder=kb;c.UTF16ToString=(a,b)=>{p(0==a%2,"Pointer passed to UTF16ToString must be aligned to two bytes!");var d=a>>1;for(var e=d+b/2;!(d>=e)&&ia[d];)++d;d<<=1;if(32<d-a&&kb)return kb.decode(A.subarray(a,d));d="";for(e=0;!(e>=b/2);++e){var g=B[a+2*e>>1];if(0==g)break;d+=String.fromCharCode(g)}return d};c.stringToUTF16=(a,b,d)=>{p(0==b%2,"Pointer passed to stringToUTF16 must be aligned to two bytes!");p("number"==typeof d,"stringToUTF16(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(2>d)return 0;d-=2;var e=b;d=d<2*a.length?d/2:a.length;for(var g=0;g<d;++g)B[b>>1]=a.charCodeAt(g),b+=2;B[b>>1]=0;return b-e};c.UTF32ToString=(a,b)=>{p(0==a%4,"Pointer passed to UTF32ToString must be aligned to four bytes!");for(var d=0,e="";!(d>=b/4);){var g=C[a+4*d>>2];if(0==g)break;++d;65536<=g?(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023)):e+=String.fromCharCode(g)}return e};c.stringToUTF32=(a,b,d)=>{p(0==b%4,"Pointer passed to stringToUTF32 must be aligned to four bytes!");p("number"==typeof d,"stringToUTF32(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(4>d)return 0;var e=b;d=e+d-4;for(var g=0;g<a.length;++g){var k=a.charCodeAt(g);if(55296<=k&&57343>=k){var h=a.charCodeAt(++g);k=65536+((k&1023)<<10)|h&1023}C[b>>2]=k;b+=4;if(b+4>d)break}C[b>>2]=0;return b-e};var lb={__assert_fail:Fa,__call_sighandler:Ga,__cxa_throw:Ka,_abort_js:La,_emscripten_runtime_keepalive_clear:Ma,_setitimer_js:Ta,emscripten_resize_heap:Wa,exit:W,fd_close:Xa,fd_seek:Za,fd_write:bb,proc_exit:Oa},M=function(){function a(d){var _c$monitorRunDependen2;M=d.exports;w=M.memory;p(w,"memory not found in wasm exports");la();T=M.__indirect_function_table;p(T,"table not found in wasm exports");qa.unshift(M.__wasm_call_ctors);G--;(_c$monitorRunDependen2=c.monitorRunDependencies)===null||_c$monitorRunDependen2===void 0||_c$monitorRunDependen2.call(c,G);p(J["wasm-instantiate"]);delete J["wasm-instantiate"];0==G&&(null!==K&&(clearInterval(K),K=null),H&&(d=H,H=null,d()));return M}ua();var b={env:lb,wasi_snapshot_preview1:lb};if(c.instantiateWasm)try{return c.instantiateWasm(b,a)}catch(d){u(`Module.instantiateWasm callback failed with error: ${d}`),f(d)}N??(N="data:application/octet-stream;base64,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QX9GDQELIABBADoA7ANBAA8LAkAgACgCnAIgACgChARGDQAgACkDiARCAFUNACAAIABBjAJqECwCQCAALQCYBEEBRw0AIAAgAEGAAmoQLANAIAAoArgEIAFMBEAgAEGYAmogACgCzAQhBSAAKAKYAiEDQQAhAQNAIAEgACgCnAJORQRAIAUgAyABQQJ0aigCACIGQQF1ai0AAEUEQCADIAJBAnRqIAY2AgAgAkEBaiECCyABQQFqIQEMAQsLIAEgAmsQGCAAIAAoApwCNgKABEEAIQEDQCAAKAK4BCICIAFMBEAgAEHABGohA0EAIQEDQCABIAJORQRAIAMQJiAAKALABCAAKALEBEECdGpBBGsgACgCtAQgAUECdGooAgA2AgAgAUEBaiEBIAAoArgEIQIMAQsLIAAoArQERQ0EIABBADYCuAQFIAAoAswEIAAoArQEIAFBAnRqKAIAakEAOgAAIAFBAWohAQwBCwsFIAAoAswEIAAoArQEIAFBAnRqKAIAakEBOgAAIAFBAWohAQwBCwsLIAAQVSAAEC0gACAAKAKcAjYChAQgACAAKQPoASAAKQPgAXw3A4gEC0EBC6EBAgN8B38gAEGcAmohBSAAKAKkAiIGQQRrIQdEAAAAAAAA8D8gACgCnAS3IgKjIQNBfyAAKAKoAiIEIARBAEgbQQFqIQhBACEAA0AgACAIRkUEQCAABH8gByAAQQJ0aigCAAVBAAshCSAFIAYgAEECdGogACAERhsoAgAhCiADIAC4EIUBIAogCWu3oiABoCEBIABBAWohAAwBCwsgASACowtIAgF+AX8CQCAALQCoBQ0AIAApA5gFIgFCAFkEQCAAKQPAASABWg0BCyAAKQOgBSIBQgBTBEBBAQ8LIAApA7gBIAFUIQILIAILLAEBfyMAQRBrIgEkACABIAAoApwCNgIMIABBpAJqIAFBDGoQSSABQRBqJAALUwEDfyABIAAoAgRKBEAgACABEDMgACgCBCICIAEgASACSBshAyAAKAIAIQQDQCACIANGBEAgACABNgIEBSACIARqQQA6AAAgAkEBaiECDAELCwsLeQECfwJAIAAoAggiAiABTg0AIAEgAmtBAWpBfnEiASACQQF1QX5xQQJqIgMgASADShsiASACQf////8Hc0wEQCAAIAEgAmoiATYCCCAAIAAoAgAgARCVASIANgIAIAANAUHILygCAEEwRw0BCxDNAUHwHEEAEAAACwvWBAEGfyAAQZwDaiECA0ACQCACKAIgIQUgAigCJCADTARAIAUEQCACQQA2AiQLDAELIAIoAhAgBSADQQJ0aiIFKAIAai0AAARAIAIgBRAqCyADQQFqIQMMAQsLIABBoARqIQUDQCAAKAKcBCAESgRAIARBAXQhB0EAIQMDQCADQQJGBEAgBEEBaiEEDAMLIAAoApwDIAMgB3JBDGxqIQZBACECA0AgBigCBCACTARAIANBAWohAwwCBSAFIAYoAgAgAkEDdGogARBjIAJBAWohAgwBCwALAAsACwtBACECA0AgACgCnAIgAkwEQAJAIABBjAJqIQRBACECQQAhAwNAIAIgACgCkAJODQEgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAALAAsFAkAgACgCjAMiAyAAKAKYAiACQQJ0aigCAEEBdUEDdCIEaigCACIGQX9GDQAgBSAFKAIAIAZBAnRqIgYtAABBEHEEfyADBSAAIAYQIkUNASAAKAKMAwsgBGogARBjCyACQQFqIQIMAQsLIAQgAiADaxAYIABBgAJqIQRBACECQQAhAwNAIAAoAoQCIAJKBEAgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAELCyAEIAIgA2sQGAtyAQN/IwBBIGsiASQAIAAgAUEMaiAAKAKkBCAAKAKsBGsQZSICEDQgACgCLEECTgRAIAAoAqQEIQMgASACKAIEQQJ0NgIEIAEgA0ECdDYCAEHJFyABEI0BCyACIABBoARqEGYgAigCABCUASABQSBqJAALTgEBfyAAKAIABEADQCAAKAIEIAFMBEAgAEEANgIEIAAoAgAQlAEgAEEANgIIIABBADYCAAUgACgCACABQQxsahAPIAFBAWohAQwBCwsLC5YCAQd/A0AgAUEPSgRAIAAgAUEBdEF8cWooAgAhBEF/IQIgASEDA0AgACACQQFqIgJBAnRqIgYoAgAiByAESA0AA0AgBCAAIANBAWsiA0ECdGoiCCgCACIFSA0ACyACIANIBEAgBiAFNgIAIAggBzYCAAwBCwsgACACEDcgASACayEBIAYhAAwBCwsgACEFQQAhAEEBIAEiBiABQQFMG0EBayEHA0AgACAHRwRAIAAhAyAAQQFqIgEhAgNAIAUgA0ECdGoiCCgCACEEIAIgBkcEQCACIAMgBSACQQJ0aigCACAESBshAyACQQFqIQIMAQsLIAUgAEECdGoiAygCACEAIAMgBDYCACAIIAA2AgAgASEADAELCwtaAQF/IAAoAgAoAgAiACABQQJ0aiIBKAIAIgNB4ABJBEBBAA8LIAAgAkECdGoiACgCAEEFdiICQQJGBEBBAQ8LIAEgA0EFdkECdGoqAgQgACACQQJ0aioCBF0LHgAgACACIAMgAUGnEBA6IgAgBDoAFCAAQYwbNgIAC3ABAX8jAEEQayIFJAAgACAENgIQIAAgAzYCDCAAIAI2AgggACABNgIEIABB5Bs2AgBBvC8tAABBAXFFBEBBsC9CADcCAEG4L0EANgIAQbwvQQE6AAALIAUgADYCDEGwLyAFQQxqEEkgBUEQaiQAIAALBAAgAAuzBwIDfwF8IwBBEGsiAyQAIwBBEGsiASQAIABCADcCBCAAQaAaNgIAIABCADcDICAAQgA3AgwgAEIANwIUIABCADcDKCAAQfgpKwMAOQMwIABBsCorAwA5AzggAEHoKisDADkDQCAAQaArKwMAOQNIIABBlCwtAAA6AFAgAEHEKygCADYCVEHkKygCACECIABBADoAXCAAIAI2AlggAEH8Ky0AADoAXSAAQaAtKwMAOQNgIABBxC0oAgA2AmggAEG0LCgCADYCbEHoLCsDACEEIABBADYClAMgAEIANwKMAyAAQQA2AoQDIABCADcC/AIgAEEANgL0AiAAQgA3AuwCIABBADYC5AIgAEIANwLcAiAAQQA2AtQCIABCADcCzAIgAEKAgICAgICA/D83A5ABIABB5AA2AogBIABCmrPmzJmz5vg/NwOAASAAQtWq1arVqtXqPzcDeCAAIAQ5A3AgAEGYAWpBAEGwARCEARogASAAQaAEaiICNgIMIABBnANqIAFBDGoQDSAAQgA3AtwDIABCADcC1AMgAEIANwLMAyAAQgA3A4gEIABCgICAgHA3A4AEIABCgICAgICAgPg/NwP4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QoCAgICAgID/PxCdASADQUBrIAMpA1AgAykDWCAbIB0QpgEgAykDSCEdQQEhAiADKQNAIRsLIBlCAXwhGUEBIRILIAEoAgQiBCABKAJoRwR/IAEgBEEBajYCBCAELQAABSABELgBCyEEDAELC0EuIQQLAn4gEkUEQCABKQNwQgBZBEACQCABIAEoAgQiBEEBazYCBCABIARBAms2AgQgCkUNACABIARBA2s2AgQLCyADQeAAakQAAAAAAAAAACAGt6YQqgEgAykDYCEbIAMpA2gMAQsgGUIHVwRAIBkhGgNAIAdBBHQhByAaQgF8IhpCCFINAAsLAkACQAJAIARBX3FB0ABGBEAgARC6ASIaQoCAgICAgICAgH9SDQMgASkDcEIAWQ0BDAILQgAhGiABKQNwQgBTDQILIAEgASgCBEEBazYCBAtCACEaCyAHRQRAIANB8ABqRAAAAAAAAAAAIAa3phCqASADKQNwIRsgAykDeAwBCyAcIBkgChtCAoYgGnxCIH0iGUEAIAlrrVUEQEHIL0HEADYCACADQaABaiAGEKkBIANBkAFqIAMpA6ABIAMpA6gBQn9C////////v///ABCdASADQYABaiADKQOQASADKQOYAUJ/Qv///////7///wAQnQEgAykDgAEhGyADKQOIAQwBCyAJQeIBa6wgGVcEQCAHQQBOBEADQCADQaADaiAbIB1CAEKAgICAgIDA/79/EKYBIBsgHUKAgICAgICA/z8QmQEhASADQZADaiAbIB0gAykDoAMgGyABQQBOIgEbIAMpA6gDIB0gARsQpgEgASAHQQF0IgRyIQcgGUIBfSEZIAMpA5gDIR0gAykDkAMhGyAEQQBODQALCwJ+IBlBICAJa618IhqnIgFBACABQQBKGyAMIBogDK1TGyIBQfEATwRAIANBgANqIAYQqQEgAykDiAMhHCADKQOAAyEeQgAMAQsgA0HgAmpEAAAAAAAA8D9BkAEgAWsQkAEQqgEgA0HQAmogBhCpASADKQPQAiEeIANB8AJqIAMpA+ACIAMpA+gCIAMpA9gCIhwQuwEgAykD+AIhHyADKQPwAgshGiADQcACaiAHIAdBAXFFIBsgHUIAQgAQmAFBAEcgAUEgSXFxIgFyEKsBIANBsAJqIB4gHCADKQPAAiADKQPIAhCdASADQZACaiADKQOwAiAD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gMD/PxCmASACKQPIAyEcIAIpA8ADIRkLIAJBsANqIBsgGiAZIBwQpgEgAkGgA2ogAikDsAMgAikDuAMgHiAdEKcBIAIpA6gDIRogAikDoAMhGwJAIBdBAmsgBUH/////B3FODQAgAiAaQv///////////wCDNwOYAyACIBs3A5ADIAJBgANqIBsgGkIAQoCAgICAgID/PxCdASACKQOQAyACKQOYA0KAgICAgICAuMAAEJkBIQEgAikDiAMgGiABQQBOIgYbIRogAikDgAMgGyAGGyEbIAMgBCAJRyABQQBIcnEgGSAcQgBCABCYAUEAR3FFIBcgBiALaiILQe4Aak5xDQBByC9BxAA2AgALIAJB8AJqIBsgGiALELwBIAIpA/gCIRkgAikD8AILIRogDSAZNwMoIA0gGjcDICACQZDGAGokACANKQMoIRkgDSkDICEaDAELQgAhGgsgDyAaNwMAIA8gGTcDCCANQTBqJAAgDykDCCEZIA8pAwAhGiAWBEAgFiAPKAKIASATIA8oAhQgDygCPGtqajYCAAsgGCIBIBk3AwggASAaNwMAIA9BoAFqJAAgASkDACABKQMIEKgBISAgAUEQaiQAIA4oAhgiAQRAIAArAyAiISAgZQRAIAAtAClBAUcgICAhYnINAwsgACsDGCIhICBmBEAgAC0AKEEBRyAgICFicg0ECyAAICA5AzALIAFBAEchAQsgDkEgaiQAIAEPCyAOIAAoAgQ2AhQgDiATNgIQQYAiKAIAQZUZIA5BEGoQsQFBARABAAsgDiAAKAIENgIEIA4gEzYCAEGAIigCAEHkGCAOELEBQQEQAQALzgECBX8CfCMAQUBqIgIkACAALQAoIQMgACgCBCEEIAAoAhAhBSAALQApIQYgACsDGCEHIAArAyAhCCACIAArAzA5AzggAiAIOQMoIAIgBzkDICACQd0AQSkgBhs2AjAgAiAFNgIUIAIgBDYCECACQdsAQSggAxs2AhhBgCIoAgAhAyMAQRBrIgQkACAEIAJBEGoiBTYCDCADQdUZIAUQswEgBEEQaiQAIAEEQCACIAAoAgg2AgAgA0HXGCACELEBQQogAxCJAQsgAkFAayQAC3oBAn8CQCABIAAoAggiA0sEQCADIQICQANAIAEgAk0NASAAIAIgAkEBdiACQQN2akF+cWpBAmoiAjYCCCAC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AwAhBAwBCyABIAJC////////////AIMiCiADIARC////////////AIMiCRCYAUEATARAIAEgCiADIAkQmAEEQCABIQQMAgsgBUHwAGogASACQgBCABCdASAFKQN4IQIgBSkDcCEEDAELIARCMIinQf//AXEhByAGBH4gAQUgBUHgAGogASAKQgBCgICAgICAwLvAABCdASAFKQNoIgpCMIinQfgAayEGIAUpA2ALIQQgB0UEQCAFQdAAaiADIAlCAEKAgICAgIDAu8AAEJ0BIAUpA1giCUIwiKdB+ABrIQcgBSkDUCEDCyAJQv///////z+DQoCAgICAgMAAhCELIApC////////P4NCgICAgICAwACEIQogBiAHSgRAA0ACfiAKIAt9IAMgBFatfSIJQgBZBEAgCSAEIAN9IgSEUARAIAVBIGogASACQgBCABCdASAFKQMoIQIgBSkDICEEDAULIAlCAYYgBEI/iIQMAQsgCkIBhiAEQj+IhAshCiAEQgGGIQQgBkEBayIGIAdKDQALIAchBgsCQCAKIAt9IAMgBFatfSIJQgBTBEAgCiEJDAELIAkgBCADfSIEhEIAUg0AIAVBMGogASACQgBCABCdASAFKQM4IQIgBSkDMCEEDAELIAlC////////P1gEQANAIARCP4ggBkEBayEGIARCAYYhBCAJQgGGhCIJQoCAgICAgMAAVA0ACwsgCEGAgAJxIQcgBkEATARAIAVBQGsgBCAJQv///////z+DIAZB+ABqIAdyrUIwhoRCAEKAgICAgIDAwz8QnQEgBSkDSCECIAUpA0AhBAwBCyAJQv///////z+DIAYgB3KtQjCGhCECCyAAIAQ3AwAgACACNwMIIAVBgAFqJAAL1ycBC38jAEEQayIKJAACQAJAAkACQAJAAkACQAJAAkACQCAAQfQBTQRAQcwvKAIAIgRBECAAQQtqQfgDcSAAQQtJGyIGQQN2IgB2IgFBA3EEQAJAIAFBf3NBAXEgAGoiAkEDdCIBQfQvaiIAIAFB/C9qKAIAIgEoAggiBUYEQEHMLyAEQX4gAndxNgIADAELIAUgADYCDCAAIAU2AggLIAFBCGohACABIAJBA3QiAkEDcjYCBCABIAJqIgEgASgCBEEBcjYCBAwLCyAGQdQvKAIAIghNDQEgAQRAAkBBAiAAdCICQQAgAmty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QEEADwsgASADg0IAWQRAIAAgAlQgASADUyABIANRGwRAQX8PCyAAIAKFIAEgA4WEQgBSDwsgACACViABIANVIAEgA1EbBEBBfw8LIAAgAoUgASADhYRCAFIhBAsgBAvAAQIBfwJ+QX8hAwJAIABCAFIgAUL///////////8AgyIEQoCAgICAgMD//wBWIARCgICAgICAwP//AFEbDQAgAkL///////////8AgyIFQoCAgICAgMD//wBWIAVCgICAgICAwP//AFJxDQAgACAEIAWEhFAEQEEADwsgASACg0IAWQRAIAEgAlIgASACU3ENASAAIAEgAoWEQgBSDwsgAEIAUiABIAJVIAEgAlEbDQAgACABIAKFhEIAUiEDCyADC1ABAX4CQCADQcAAcQRAIAEgA0FAaq2GIQJCACEBDAELIANFDQAgAiADrSIEhiABQcAAIANrrYiEIQIgASAEhiEBCyAAIAE3AwAgACACNwMIC74PAgV/D34jAEHQAmsiBSQAIARC////////P4MhCiACQv///////z+DIQsgAiAEhUKAgICAgICAgIB/gyEMIARCMIinQf//AXEhCAJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAhB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiDUKAgICAgIDA//8AVCANQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQwMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhDCADIQEMAgsgASANQoCAgICAgMD//wCFhFAEQCADIAJCgICAgICAwP//AIWEUARAQgAhAUKAgICAgIDg//8AIQwMAwsgDEKAgICAgIDA//8AhCEMQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAQgAhAQwCCyABIA2EUARAQoCAgICAgOD//wAgDCACIAOEUBshDEIAIQEMAgsgAiADhFAEQCAMQoCAgICAgMD//wCEIQxCACEBDAILIA1C////////P1gEQCAFQcACaiABIAsgASALIAtQIgYbeSAGQQZ0rXynIgZBD2sQmgFBECAGayEGIAUpA8gCIQsgBSkDwAIhAQsgAkL///////8/Vg0AIAVBsAJqIAMgCiADIAogClAiBxt5IAdBBnStfKciB0EPaxCaASAGIAdqQRBrIQYgBSkDuAIhCiAFKQOwAiEDCyAFQaACaiAKQoCAgICAgMAAhCISQg+GIANCMYiEIgJCAEKAgICAsOa8gvUAIAJ9IgRCABCeASAFQZACakIAIAUpA6gCfUIAIARCABCeASAFQYACaiAFKQOYAkIBhiAFKQOQAkI/iIQiBEIAIAJCABCeASAFQfABaiAEQgBCACAFKQOIAn1CABCeASAFQeABaiAFKQP4AUIBhiAFKQPwAUI/iIQiBEIAIAJCABCeASAFQdABaiAEQgBCACAFKQPoAX1CABCeASAFQcABaiAFKQPYAUIBhiAFKQPQAUI/iIQiBEIAIAJCABCeASAFQbABaiAEQgBCACAFKQPIAX1CABCeASAFQaABaiACQgAgBSkDuAFCAYYgBSkDsAFCP4iEQgF9IgJCABCeASAFQZABaiADQg+GQgAgAkIAEJ4BIAVB8ABqIAJCAEIAIAUpA6gBIAUpA6ABIg0gBSkDmAF8IgQgDVStfCAEQgFWrXx9QgAQngEgBUGAAWpCASAEfUIAIAJCABCeASAGIAkgCGtqIQYCfyAFKQNwIhNCAYYiDiAFKQOIASIPQgGGIAUpA4ABQj+IhHwiEELn7AB9IhRCIIgiAiALQoCAgICAgMAAhCIVQgGGIhZCIIgiBH4iESABQgGGIg1CIIgiCiAQIBRWrSAOIBBWrSAFKQN4QgGGIBNCP4iEIA9CP4h8fHxCAX0iE0IgiCIQfnwiDiARVK0gDiAOIBNC/////w+DIhMgAUI/iCIXIAtCAYaEQv////8PgyILfnwiDlatfCAEIBB+fCAEIBN+IhEgCyAQfnwiDyARVK1CIIYgD0IgiIR8IA4gDiAPQiCGfCIOVq18IA4gDiAUQv////8PgyIUIAt+IhEgAiAKfnwiDyARVK0gDyAPIBMgDUL+////D4MiEX58Ig9WrXx8Ig5WrXwgDiAEIBR+IhggECARfnwiBCACIAt+fCILIAogE358IhBCIIggCyAQVq0gBCAYVK0gBCALVq18fEIghoR8IgQgDlStfCAEIA8gAiARfiICIAogFH58IgpCIIggAiAKVq1CIIaEfCICIA9UrSACIBBCIIZ8IAJUrXx8IgIgBFStfCIEQv////////8AWARAIBYgF4QhFSAFQdAAaiACIAQgAyASEJ4BIAFCMYYgBSkDWH0gBSkDUCIBQgBSrX0hCkIAIAF9IQsgBkH+/wBqDAELIAVB4ABqIARCP4YgAkIBiIQiAiAEQgGIIgQgAyASEJ4BIAFCMIYgBSkDaH0gBSkDYCINQgBSrX0hCkIAIA19IQsgASENIAZB//8AagsiBkH//wFOBEAgDEKAgICAgIDA//8AhCEMQgAhAQwBCwJ+IAZBAEoEQCAKQgGGIAtCP4iEIQEgBEL///////8/gyAGrUIwhoQhCiALQgGGDAELIAZBj39MBEBCACEBDAILIAVBQGsgAiAEQQEgBmsQnAEgBUEwaiANIBUgBkHwAGoQmgEgBUEgaiADIBIgBSkDQCICIAUpA0giChCeASAFKQM4IAUpAyhCAYYgBSkDICIBQj+IhH0gBSkDMCIEIAFCAYYiDVStfSEBIAQgDX0LIQQgBUEQaiADIBJCA0IAEJ4BIAUgAyASQgVCABCeASAKIAIgAiADIAQgAkIBgyIEfCIDVCABIAMgBFStfCIBIBJWIAEgElEbrXwiAlatfCIEIAIgAiAEQoCAgICAgMD//wBUIAMgBSkDEFYgASAFKQMYIgRWIAEgBFEbca18IgJWrXwiBCACIARCgICAgICAwP//AFQgAyAFKQMAViABIAUpAwgiA1YgASADURtxrXwiASACVK18IAyEIQwLIAAgATcDACAAIAw3AwggBUHQAmokAAtQAQF+AkAgA0HAAHEEQCACIANBQGqtiCEBQgAhAgwBCyADRQ0AIAJBwAAgA2uthiABIAOtIgSIhCEBIAIgBIghAgsgACABNwMAIAAgAjcDCAu/CgIFfw9+IwBB4ABrIgUkACAEQv///////z+DIQwgAiAEhUKAgICAgICAgIB/gyEKIAJC////////P4MiDUIgiCEOIARCMIinQf//AXEhBwJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAdB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiC0KAgICAgIDA//8AVCALQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQoMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhCiADIQEMAgsgASALQoCAgICAgMD//wCFhFAEQCACIAOEUARAQoCAgICAgOD//wAhCkIAIQEMAwsgCkKAgICAgIDA//8AhCEKQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAIAEgC4RCACEBUARAQoCAgICAgOD//wAhCgwDCyAKQoCAgICAgMD//wCEIQoMAgsgASALhFAEQEIAIQEMAgsgAiADhFAEQEIAIQEMAgsgC0L///////8/WARAIAVB0ABqIAEgDSABIA0gDVAiBht5IAZBBnStfKciBkEPaxCaAUEQIAZrIQYgBSkDWCINQiCIIQ4gBSkDUCEBCyACQv///////z9WDQAgBUFAayADIAwgAyAMIAxQIggbeSAIQQZ0rXynIghBD2sQmgEgBiAIa0EQaiEGIAUpA0ghDCAFKQNAIQMLIANCD4YiC0KAgP7/D4MiAiABQiCIIgR+IhAgC0IgiCITIAFC/////w+DIgF+fCIPQiCGIhEgASACfnwiCyARVK0gAiANQv////8PgyINfiIVIAQgE358IhEgDEIPhiISIANCMYiEQv////8PgyIDIAF+fCIUIA8gEFStQiCGIA9CIIiEfCIPIAIgDkKAgASEIgx+IhYgDSATfnwiDiASQiCIQoCAgIAIhCICIAF+fCIQIAMgBH58IhJCIIZ8Ihd8IQEgByAJaiAGakH//wBrIQYCQCACIAR+IhggDCATfnwiBCAYVK0gBCAEIAMgDX58IgRWrXwgAiAMfnwgBCAEIBEgFVStIBEgFFatfHwiBFatfCADIAx+IgMgAiANfnwiAiADVK1CIIYgAkIgiIR8IAQgAkIghnwiAiAEVK18IAIgAiAQIBJWrSAOIBZUrSAOIBBWrXx8QiCGIBJCIIiEfCICVq18IAIgAiAPIBRUrSAPIBdWrXx8IgJWrXwiBEKAgICAgIDAAINQRQRAIAZBAWohBgwBCyALQj+IIARCAYYgAkI/iIQhBCACQgGGIAFCP4iEIQIgC0IBhiELIAFCAYaEIQELIAZB//8BTgRAIApCgICAgICAwP//AIQhCkIAIQEMAQsCfiAGQQBMBEBBASAGayIHQf8ATQRAIAVBMGogCyABIAZB/wBqIgYQmgEgBUEgaiACIAQgBhCaASAFQRBqIAsgASAHEJwBIAUgAiAEIAcQnAEgBSkDMCAFKQM4hEIAUq0gBSkDICAFKQMQhIQhCyAFKQMoIAUpAxiEIQEgBSkDACECIAUpAwgMAgtCACEBDAILIARC////////P4MgBq1CMIaECyAKhCEKIAtQIAFCAFkgAUKAgICAgICAgIB/URtFBEAgCiACQgF8IgFQrXwhCgwBCyALIAFCgICAgICAgICAf4WEUEUEQCACIQEMAQsgCiACIAJCAYN8IgEgAlStfCEKCyAAIAE3AwAgACAKNwMIIAVB4ABqJAALdQEBfiAAIAEgBH4gAiADfnwgA0IgiCICIAFCIIgiBH58IANC/////w+DIgMgAUL/////D4MiAX4iBUIgiCADIAR+fCIDQiCIfCABIAJ+IANC/////w+DfCIBQiCIfDcDCCAAIAVC/////w+DIAFCIIaENwMACw4AQaCEBSQCQaCEASQBCwcAIwAjAWsLBAAjAgsEACMBCwYAIAAkAAsQACMAIABrQXBxIgAkACAACwQAIwALzgkCBH8EfiMAQfAAayIGJAAgBEL///////////8AgyEJAkACQCABUCIFIAJC////////////AIMiCkKAgICAgIDA//8AfUKAgICAgIDAgIB/VCAKUBtFBEAgA0IAUiAJQoCAgICAgMD//wB9IgtCgICAgICAwICAf1YgC0KAgICAgIDAgIB/URsNAQsgBSAKQoCAgICAgMD//wBUIApCgICAgICAwP//AFEbRQRAIAJCgICAgICAIIQhBCABIQMMAgsgA1AgCUKAgICAgIDA//8AVCAJQoCAgICAgMD//wBRG0UEQCAEQoCAgICAgCCEIQQMAgsgASAKQoCAgICAgMD//wCFhFAEQEKAgICAgIDg//8AIAIgASADhSACIASFQoCAgICAgICAgH+FhFAiBRshBEIAIAEgBRshAwwCCyADIAlCgICAgICAwP//AIWEUA0BIAEgCoRQBEAgAyAJhEIAUg0CIAEgA4MhAyACIASDIQQMAgsgAyAJhFBFDQAgASEDIAIhBAwBCyADIAEgASADVCAJIApWIAkgClEbIggbIQogBCACIAgbIgxC////////P4MhCSACIAQgCBsiC0IwiKdB//8BcSEHIAxCMIinQf//AXEiBUUEQCAGQeAAaiAKIAkgCiAJIAlQIgUbeSAFQQZ0rXynIgVBD2sQmgEgBikDaCEJIAYpA2AhCkEQIAVrIQULIAEgAyAIGyEDIAtC////////P4MhASAHBH4gAQUgBkHQAGogAyABIAMgASABUCIHG3kgB0EGdK18pyIHQQ9rEJoBQRAgB2shByAGKQNQIQMgBikDWAtCA4YgA0I9iIRCgICAgICAgASEIQEgCUIDhiAKQj2IhCACIASFIQQCfiADQgOGIgIgBSAHRg0AGiAFIAdrIgdB/wBLBEBCACEBQgEMAQsgBkFAayACIAFBgAEgB2sQmgEgBkEwaiACIAEgBxCcASAGKQM4IQEgBikDMCAGKQNAIAYpA0iEQgBSrYQLIQlCgICAgICAgASEIQsgCkIDhiEKAkAgBEIAUwRAQgAhA0IAIQQgCSAKhSABIAuFhFANAiAKIAl9IQIgCyABfSAJIApWrX0iBEL/////////A1YNASAGQSBqIAIgBCACIAQgBFAiBxt5IAdBBnStfKdBDGsiBxCaASAFIAdrIQUgBikDKCEEIAYpAyAhAgwBCyAJIAp8IgIgCVStIAEgC3x8IgRCgICAgICAgAiDUA0AIAlCAYMgBEI/hiACQgGIhIQhAiAFQQFqIQUgBEIBiCEECyAMQoCAgICAgICAgH+DIQMgBUH//wFOBEAgA0KAgICAgIDA//8AhCEEQgAhAwwBC0EAIQcCQCAFQQBKBEAgBSEHDAELIAZBEGogAiAEIAVB/wBqEJoBIAYgAiAEQQEgBWsQnAEgBikDACAGKQMQIAYpAxiEQgBSrYQhAiAGKQMIIQQLIARCPYYgAkIDiIQhASAEQgOIQv///////z+DIAetQjCGhCADhCEEAkACQCACp0EHcSIFQQRHBEAgBCABIAEgBUEES618IgNWrXwhBAwBCyAEIAEgASABQgGDfCIDVq18IQQMAQsgBUUNAQsLIAAgAzcDACAAIAQ3AwggBkHwAGokAAtFAQF/IwBBEGsiBSQAIAUgASACIAMgBEKAgICAgICAgIB/hRCmASAFKQMAIQEgACAFKQMINwMIIAAgATcDACAFQRBqJAAL8wMCAn4FfyMAQSBrIgUkACABQv///////z+DIQICfiABQjCIQv//AYMiA6ciBEGB+ABrQf0PTQRAIAJCBIYgAEI8iIQhAiAEQYD4AGutIQMCQCAAQv//////////D4MiAEKBgICAgICAgAhaBEAgAkIBfCECDAELIABCgICAgICAgIAIUg0AIAJCAYMgAnwhAgtCACACIAJC/////////wdWIgQbIQAgBK0gA3wMAQsgACAChFAgA0L//wFSckUEQCACQgSGIABCPIiEQoCAgICAgIAEhCEAQv8PDAELIARB/ocBSwRAQgAhAEL/DwwBC0GA+ABBgfgAIANQIgcbIgggBGsiBkHwAEoEQEIAIQBCAAwBCyAFQRBqIAAgAiACQoCAgICAgMAAhCAHGyICQYABIAZrEJoBIAUgACACIAYQnAEgBSkDCEIEhiAFKQMAIgJCPIiEIQACQCAEIAhHIAUpAxAgBSkDGIRCAFJxrSACQv//////////D4OEIgJCgYCAgICAgIAIWgRAIABCAXwhAAwBCyACQoCAgICAgICACFINACAAQgGDIAB8IQALIABCgICAgICAgAiFIAAgAEL/////////B1YiBBshACAErQshAiAFQSBqJAAgAUKAgICAgICAgIB/gyACQjSGhCAAhL8LfwICfwF+IwBBEGsiAyQAIAACfiABRQRAQgAMAQsgAyABIAFBH3UiAnMgAmsiAq1CACACZyICQdEAahCaASADKQMIQoCAgICAgMAAhUGegAEgAmutQjCGfCABQYCAgIB4ca1CIIaEIQQgAykDAAs3AwAgACAENwMIIANBEGokAAvjAQIEfgJ/IwBBEGsiBiQAIAG9IgVC/////////weDIQIgAAJ+IAVCNIhC/w+DIgNQRQRAIANC/w9SBEAgAkIEiCEEIANCgPgAfCEDIAJCPIYMAgsgAkIEiCEEQv//ASEDIAJCPIYMAQsgAlAEQEIAIQNCAAwBCyAGIAJCACAFp2dBIHIgAkIgiKdnIAJCgICAgBBUGyIHQTFqEJoBQYz4ACAHa60hAyAGKQMIQoCAgICAgMAAhSEEIAYpAwALNwMAIAAgBUKAgICAgICAgIB/gyADQjCGhCAEhDcDCCAGQRBqJAALZwIBfwF+IwBBEGsiAiQAIAACfiABRQRAQgAMAQsgAiABrUIAQfAAIAFnIgFBH3NrEJoBIAIpAwhCgICAgICAwACFQZ6AASABa61CMIZ8IQMgAikDAAs3AwAgACADNwMIIAJBEGokAAvxAQEDfwJAIABFBEBBuCkoAgAEQEG4KSgCABCsASEBC0GgKCgCAARAQaAoKAIAEKwBIAFyIQELQbwzKAIAIgBFDQEDQCAAKAJMGiAA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BEBBACEHDAELQQAhCyAIKAIwIQwDQCAMKAIAIg1FDQEgCEEEaiIKIA0QxAEiDSALaiILIAdLDQEgACAKIA0QvwEgDEEEaiEMIAcgC0sNAAsLIABBICAQIAcgCUGAwABzEMMBIBAgByAHIBBIGyEHDAgLIBQgCkEASHENCUE9IQsgACAIKwMwIBAgCiAJIAcgBRETACIHQQBODQcMCgsgBy0AASEMIAdBAWohBwwACwALIAANCSATRQ0DQQEhBwNAIAQgB0ECdGooAgAiAARAIAMgB0EDdGogACACIAYQwQFBASEOIAdBAWoiB0EKRw0BDAsLCyAHQQpPBEBBASEODAoLA0AgBCAHQQJ0aigCAA0BQQEhDiAHQQFqIgdBCkcNAAsMCQtBHCELDAYLIAggBzoAJ0EBIQogFyENIAwhCQsgCiALIA1rIgwgCiAMShsiASARQf////8Hc0oNA0E9IQsgECABIBFqIgogCiAQSBsiByAYSg0EIABBICAHIAogCRDDASAAIBYgERC/ASAAQTAgByAKIAlBgIAEcxDDASAAQTAgASAMQQAQwwEgACANIAwQvwEgAEEgIAcgCiAJQYDAAHMQwwEgCCgCPCEBDAELCwtBACEODAMLQT0hCwtByC8gCzYCAAtBfyEOCyAIQUBrJAAgDgsYACAALQAAQSBxRQRAIAEgAiAAEIsBGgsLbwEFfyAAKAIAIgMsAABBMGsiAUEJSwRAQQAPCwNAQX8hBCACQcyZs+YATQRAQX8gASACQQpsIgVqIAEgBUH/////B3NLGyEECyAAIANBAWoiBTYCACADLAABIAQhAiAFIQNBMGsiAUEKSQ0ACyACC7wCAAJAAkACQAJAAkACQAJAAkACQAJAAkAgAUEJaw4SAAgJCggJAQIDBAoJCgoICQUGBwsgAiACKAIAIgFBBGo2AgAgACABKAIANgIADwsgAiACKAIAIgFBBGo2AgAgACABMgEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMwEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMAAANwMADwsgAiACKAIAIgFBBGo2AgAgACABMQAANwMADwsgAiACKAIAQQdqQXhxIgFBCGo2AgAgACABKwMAOQMADwsgACACIAMRAAALDwsgAiACKAIAIgFBBGo2AgAgACABNAIANwMADwsg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ZWFucyBubyBsaW1pdABNaW5pbXVtIGxlYXJudCBjbGF1c2UgbGltaXQAbWluLWxlYXJudHMAICAtJXMsIC1uby0lcwBUaGUgY2xhdXNlIGFjdGl2aXR5IGRlY2F5IGZhY3RvcgBUaGUgdmFyaWFibGUgYWN0aXZpdHkgZGVjYXkgZmFjdG9yAFJlc3RhcnQgaW50ZXJ2YWwgaW5jcmVhc2UgZmFjdG9yAHJuZC1mcmVxAC4uLy4uLy4uL3N5c3RlbS9saWIvbGliY3h4YWJpL3NyYy9wcml2YXRlX3R5cGVpbmZvLmNwcABVc2VkIGJ5IHRoZSByYW5kb20gdmFyaWFibGUgc2VsZWN0aW9uAGltaW4AbmFuAGFzeW1tAGVsaW0AY2wtbGltAHN1Yi1saW0AVGhlIGJhc2UgcmVzdGFydCBpbnRlcnZhbAByY2hlY2sAY2FuX2NhdGNoAHBoYXNlLXNhdmluZwB0ZXJtaW5hdGluZwBpbmYAb2ZmAFRoZSBmcmVxdWVuY3kgd2l0aCB3aGljaCB0aGUgZGVjaXNpb24gaGV1cmlzdGljIHRyaWVzIHRvIGNob29zZSBhIHJhbmRvbSB2YXJpYWJsZQBjY21pbi1tb2RlAFVzZSB0aGUgTHVieSByZXN0YXJ0IHNlcXVlbmNlAFRoZSBmcmFjdGlvbiBvZiB3YXN0ZWQgbWVtb3J5IGFsbG93ZWQgYmVmb3JlIGEgZ2FyYmFnZSBjb2xsZWN0aW9uIGlzIHRyaWdnZXJlZAB0ZXJtaW5hdGVfaGFuZGxlciB1bmV4cGVjdGVkbHkgcmV0dXJuZWQAcm5kLXNlZWQAJTRkAHJpbmMAc2ltcC1nYy1mcmFjACAgLSUtMTJzID0gJS04cyBbAFNJTVAATkFOAElORgBDT1JFADxib29sPgA8ZG91YmxlPgA8aW50MzI+AD09PT09PT09PT09PT09PT09PT09PT09PT09PT1bIFNlYXJjaCBTdGF0aXN0aWNzIF09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0APT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQBEbyBub3QgY2hlY2sgaWYgc3Vic3VtcHRpb24gYWdhaW5zdCBhIGNsYXVzZSBsYXJnZXIgdGhhbiB0aGlzLiAtMSBtZWFucyBubyBsaW1pdC4AQWxsb3cgYSB2YXJpYWJsZSBlbGltaW5hdGlvbiBzdGVwIHRvIGdyb3cgYnkgYSBudW1iZXIgb2YgY2xhdXNlcy4AUGVyZm9ybSB2YXJpYWJsZSBlbGltaW5hdGlvbi4AVGhlIGZyYWN0aW9uIG9mIHdhc3RlZCBtZW1vcnkgYWxsb3dlZCBiZWZvcmUgYSBnYXJiYWdlIGNvbGxlY3Rpb24gaXMgdHJpZ2dlcmVkIGR1cmluZyBzaW1wbGlmaWNhdGlvbi4AU2hyaW5rIGNsYXVzZXMgYnkgYXN5bW1ldHJpYyBicmFuY2hpbmcuAG5vLQBDaGVjayBpZiBhIGNsYXVzZSBpcyBhbHJlYWR5IGltcGxpZWQuIChjb3N0bHkpAENvbnRyb2xzIGNvbmZsaWN0IGNsYXVzZSBtaW5pbWl6YXRpb24gKDA9bm9uZSwgMT1iYXNpYywgMj1kZWVwKQAobnVsbCkAQ29udHJvbHMgdGhlIGxldmVsIG9mIHBoYXNlIHNhdmluZyAoMD1ub25lLCAxPWxpbWl0ZWQsIDI9ZnVsbCkAYWRqdXN0ZWRQdHIgJiYgImNhdGNoaW5nIGEgY2xhc3Mgd2l0aG91dCBhbiBvYmplY3Q/IgBQdXJlIHZpcnR1YWwgZnVuY3Rpb24gY2FsbGVkIQBZTyEAbGliYysrYWJpOiAAIC4uIABlbGltaW5hdGlvbiBsZWZ0OiAlMTBkDQBzdWJzdW1wdGlvbiBsZWZ0OiAlMTBkICglMTBkIHN1YnN1bWVkLCAlMTBkIGRlbGV0ZWQgbGl0ZXJhbHMpDQB8ICU5ZCB8ICU3ZCAlOGQgJThkIHwgJThkICU4ZCAlNi4wZiB8ICU2LjNmICUlIHwKAHwgIEdhcmJhZ2UgY29sbGVjdGlvbjogICAlMTJkIGJ5dGVzID0+ICUxMmQgYnl0ZXMgICAgICAgICAgICAgfAoAfCAgRWxpbWluYXRlZCBjbGF1c2VzOiAgICAgJTEwLjJmIE1iICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8CgAKICAgICAgICAlcwoARVJST1IhIHZhbHVlIDwlcz4gaXMgdG9vIHNtYWxsIGZvciBvcHRpb24gIiVzIi4KAEVSUk9SISB2YWx1ZSA8JXM+IGlzIHRvbyBsYXJnZSBmb3Igb3B0aW9uICIlcyIuCgAoZGVmYXVsdDogJXMpCgAgIC0lLTEycyA9ICUtOHMgJWMlNC4yZyAuLiAlNC4yZyVjIChkZWZhdWx0OiAlZykKAF0gKGRlZmF1bHQ6ICVkKQoAAAAAACwNAAABAAAAAgAAAAMAAAC4EQAANA0AAE43TWluaXNhdDZTb2x2ZXJFAAAAAAAAAGANAAAFAAAABgAAAAcAAAD+////4BEAAGwNAAAsDQAATjdNaW5pc2F0MTBTaW1wU29sdmVyRQAAAAAAAJwNAAAIAAAACQAAAAoAAAALAAAA4BEAAKgNAADADQAATjdNaW5pc2F0MTBCb29sT3B0aW9uRQAAuBEAAMgNAABON01pbmlzYXQ2T3B0aW9uRQAAAAAAAADADQAACAAAAAwAAAANAAAADQAAAAAAAAAMDgAACAAAAA4AAAAPAAAAEAAAAOARAAAYDgAAwA0AAE43TWluaXNhdDlJbnRPcHRpb25FAAAAAAAAAABIDgAACAAAABEAAAASAAAAEwAAAOARAABUDgAAwA0AAE43TWluaXNhdDEyRG91YmxlT3B0aW9uRQAAAAC4EQAAeA4AAE43TWluaXNhdDIwT3V0T2ZNZW1vcnlFeGNlcHRpb25FAEGmHQsa8D8AAAAAAAD4PwAAAAAAAAAABtDPQ+v9TD4AQcsdC5YBQAO44j/RdJ4AV529KoBwUg///z4nCgAAAGQAAADoAwAAECcAAKCGAQBAQg8AgJaYAADh9QUYAAAANQAAAHEAAABr////zvv//5K///8AAAAAAAAAABkACwAZGRkAAAAABQAAAAAAAAkAAAAACwAAAAAAAAAAGQAKChkZGQMKBwABAAkLGAAACQYLAAALAAYZAAAAGRkZAEHxHgshDgAAAAAAAAAAGQALDRkZGQANAAACAAkOAAAACQAOAAAOAEGrHwsBDABBtx8LFRMAAAAAEwAAAAAJDAAAAAAADAAADABB5R8LARAAQfEfCxUPAAAABA8AAAAACRAAAAAAABAAABAAQZ8gCwESAEGrIAseEQAAAAARAAAAAAkSAAAAAAASAAASAAAaAAAAGhoaAEHiIAsOGgAAABoaGgAAAAAAAAkAQZMhCwEUAEGfIQsVFwAAAAAXAAAAAAkUAAAAAAAUAAAUAEHNIQsBFgBB2SEL5AIVAAAAABUAAAAACRYAAAAAABYAABYAADAxMjM0NTY3ODlBQkNERUaQEwAA4BEAABARAACYEQAATjEwX19jeHhhYml2MTE2X19zaGltX3R5cGVfaW5mb0UAAAAA4BEAAEARAAAEEQAATjEwX19jeHhhYml2MTE3X19jbGFzc190eXBlX2luZm9FAAAA4BEAAHARAAA0EQAATjEwX19jeHhhYml2MTIwX19zaV9jbGFzc190eXBlX2luZm9FAAAAALgRAACgEQAAU3Q5dHlwZV9pbmZvAAAAAAAAAAA0EQAAHAAAAB0AAAAeAAAAHwAAACAAAAAhAAAAIgAAACMAAAAAAAAAZBEAABwAAAAkAAAAHgAAAB8AAAAgAAAAJQAAACYAAAAnAAAAAAAAACgAAAAoAAAAKQAAACkAAAApAAAAKQAAACkAAAApAAAAKAAAACgAAAApAAAAKAAAACgAAAAoAAAAKABB4CQLHSkAAAApAAAAKAAAACgAAAAAAAAAKAAAAAAAAAApAEGIJgsDIEIBAEGkJgsBKgBB7CYLAuAZAEGQJwsBBQBBnCcLARYAQbQnCwoXAAAAGAAAAAAaAEHMJwsBAgBB3CcLCP//////////AEGgKAsJkBMAAAAAAAAFAEG0KAsBGQBBzCgLDhcAAAAaAAAACBoAAAAEAEHkKAsBAQBB9CgLBf////8KAEG4KQsFKBQAABs=");b=xa(b);return a(b[0])}();c._yo=L("yo",0);c._free=L("free",1);c._unyo=L("unyo",1);c._createTheSolver=L("createTheSolver",0);c._ensureVar=L("ensureVar",1);c._addClause=L("addClause",1);c._solve=L("solve",0);c._getSolution=L("getSolution",0);c._getNumVars=L("getNumVars",0);c._solveAssuming=L("solveAssuming",1);c._retireVar=L("retireVar",1);c._getConflictClauseSize=L("getConflictClauseSize",0);c._getConflictClause=L("getConflictClause",0);var $a=L("fflush",1);c._malloc=L("malloc",1);var Sa=L("_emscripten_timeout",2),mb=M.emscripten_stack_init,oa=M.emscripten_stack_get_end,Ba=M._emscripten_stack_restore,cb=M._emscripten_stack_alloc,Ca=M.emscripten_stack_get_current;c.dynCall_jiji=L("dynCall_jiji",5);var Z;H=function nb(){Z||ob();Z||(H=nb)};function ob(){function a(){if(!Z&&(Z=!0,c.calledRun=!0,!x)){var _c$onRuntimeInitializ;p(!sa);sa=!0;E();O(qa);aa(c);(_c$onRuntimeInitializ=c.onRuntimeInitialized)===null||_c$onRuntimeInitializ===void 0||_c$onRuntimeInitializ.call(c);p(!c._main,'compiled without a main, but one is present. if you added it from JS, use Module["onRuntimeInitialized"]');E();if(c.postRun)for("function"==typeof c.postRun&&(c.postRun=[c.postRun]);c.postRun.length;){var b=c.postRun.shift();ra.unshift(b)}O(ra)}}if(!(0<G)){mb();na();if(c.preRun)for("function"==typeof c.preRun&&(c.preRun=[c.preRun]);c.preRun.length;)ta();O(pa);0<G||(c.setStatus?(c.setStatus("Running..."),setTimeout(()=>{setTimeout(()=>c.setStatus(""),1);a()},1)):a(),E())}}function Pa(){var a=r,b=u,d=!1;r=u=()=>{d=!0};try{ab()}catch(e){}r=a;u=b;d&&(R("stdio streams had content in them that was not flushed. you should set EXIT_RUNTIME to 1 (see the Emscripten FAQ), or make sure to emit a newline when you printf etc."),R("(this may also be due to not including full filesystem support - try building with -sFORCE_FILESYSTEM)"))}if(c.preInit)for("function"==typeof c.preInit&&(c.preInit=[c.preInit]);0<c.preInit.length;)c.preInit.pop()();ob();moduleRtn=c;for(const a of Object.keys(c))a in moduleArg||Object.defineProperty(moduleArg,a,{configurable:!0,get(){l(`Access to module property ('${a}') is no longer possible via the module constructor argument; Instead, use the result of the module constructor.`)}});
 
 
   return moduleRtn;

From 451f42901dedf3cfbb9d652cf773dc39a69bd00a Mon Sep 17 00:00:00 2001
From: Gavin Buerk <gavin.buerk@gmail.com>
Date: Mon, 3 Feb 2025 09:50:19 -0500
Subject: [PATCH 1030/1140] 13599 - Removed the `waiting` variable in favor of
 using promises to keep track of fetch requests.  This was done to mitigate a
 race condition where a single fetch could increment `waiting` while the
 callback could be called twice, potentially decrementing  `waiting` to -1
 leaving the driver stuck in `PHASE.FETCHING`

---
 packages/mongo/oplog_observe_driver.js | 79 +++++++++++++-------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/packages/mongo/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js
index cb67ac7fc5..e9b7bcebeb 100644
--- a/packages/mongo/oplog_observe_driver.js
+++ b/packages/mongo/oplog_observe_driver.js
@@ -525,37 +525,30 @@ Object.assign(OplogObserveDriver.prototype, {
         self._currentlyFetching = self._needToFetch;
         var thisGeneration = ++self._fetchGeneration;
         self._needToFetch = new LocalCollection._IdMap;
-        var waiting = 0;
 
-        let promiseResolver = null;
-        const awaitablePromise = new Promise(r => promiseResolver = r);
-        // This loop is safe, because _currentlyFetching will not be updated
-        // during this loop (in fact, it is never mutated).
-        await self._currentlyFetching.forEachAsync(async function (op, id) {
-          waiting++;
-          await self._mongoHandle._docFetcher.fetch(
-            self._cursorDescription.collectionName,
-            id,
-            op,
-            finishIfNeedToPollQuery(function(err, doc) {
-              if (err) {
-                Meteor._debug('Got exception while fetching documents', err);
-                // If we get an error from the fetcher (eg, trouble
-                // connecting to Mongo), let's just abandon the fetch phase
-                // altogether and fall back to polling. It's not like we're
-                // getting live updates anyway.
-                if (self._phase !== PHASE.QUERYING) {
-                  self._needToPollQuery();
+        // Create an array of promises for all the fetch operations
+        const fetchPromises = [];
+
+        self._currentlyFetching.forEach(function (op, id) {
+          const fetchPromise = new Promise((resolve, reject) => {
+            self._mongoHandle._docFetcher.fetch(
+              self._cursorDescription.collectionName,
+              id,
+              op,
+              finishIfNeedToPollQuery(function(err, doc) {
+                if (err) {
+                  Meteor._debug('Got exception while fetching documents', err);
+                  // If we get an error from the fetcher (eg, trouble
+                  // connecting to Mongo), let's just abandon the fetch phase
+                  // altogether and fall back to polling. It's not like we're
+                  // getting live updates anyway.
+                  if (self._phase !== PHASE.QUERYING) {
+                    self._needToPollQuery();
+                  }
+                  reject(err);
+                  return;
                 }
-                waiting--;
-                // Because fetch() never calls its callback synchronously,
-                // this is safe (ie, we won't call fut.return() before the
-                // forEach is done).
-                if (waiting === 0) promiseResolver();
-                return;
-              }
 
-              try {
                 if (
                   !self._stopped &&
                   self._phase === PHASE.FETCHING &&
@@ -565,20 +558,26 @@ Object.assign(OplogObserveDriver.prototype, {
                   // _pollQuery call (eg, in another fiber) which should
                   // effectively cancel this round of fetches.  (_pollQuery
                   // increments the generation.)
-
-                  self._handleDoc(id, doc);
+                  try {
+                    self._handleDoc(id, doc);
+                    resolve();
+                  } catch (err) {
+                    reject(err);
+                  }
+                } else {
+                  resolve();
                 }
-              } finally {
-                waiting--;
-                // Because fetch() never calls its callback synchronously,
-                // this is safe (ie, we won't call fut.return() before the
-                // forEach is done).
-                if (waiting === 0) promiseResolver();
-              }
-            })
-          );
+              })
+            )
+          })
+          fetchPromises.push(fetchPromise);
         });
-        await awaitablePromise;
+        // Wait for all fetch operations to complete
+        try {
+          await Promise.all(fetchPromises);
+        } catch (err) {
+          Meteor._debug('Got an exception in a fetch query', err);
+        }
         // Exit now if we've had a _pollQuery call (here or in another fiber).
         if (self._phase === PHASE.QUERYING)
           return;

From cbbe3d411c23049777d808f013363ed40f9768ae Mon Sep 17 00:00:00 2001
From: Per Bergland <per@refapp.se>
Date: Tue, 4 Feb 2025 12:21:15 +0100
Subject: [PATCH 1031/1140] Implement #13605 to opt-in to legacy

---
 packages/modern-browsers/modern-tests.js | 25 ++++++++++++++++++++++++
 packages/modern-browsers/modern.js       | 18 ++++++++++-------
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/packages/modern-browsers/modern-tests.js b/packages/modern-browsers/modern-tests.js
index eaac754918..62f6d2af0b 100644
--- a/packages/modern-browsers/modern-tests.js
+++ b/packages/modern-browsers/modern-tests.js
@@ -36,4 +36,29 @@ Tinytest.add('modern-browsers - versions - basic', function (test) {
     minor: 1,
     patch: 15,
   }));
+
+  test.isFalse(isModern({
+    name: "unknownBrowser", 
+    major: 10, 
+    minor: 1,
+    patch: 0,
+  }));
+
+  const oldPackageSettings = Meteor.settings.packages;
+  
+  Meteor.settings.packages = {
+    "modern-browsers": {
+       "unknownBrowsersAssumedModern": true
+    }
+  };
+
+  test.isTrue(isModern({
+    name: "unknownBrowser", 
+    major: 10, 
+    minor: 1,
+    patch: 0,
+  }));
+
+
+  Meteor.settings.packages = oldPackageSettings;
 });
diff --git a/packages/modern-browsers/modern.js b/packages/modern-browsers/modern.js
index 19ff2734ae..ae2a32bdcc 100644
--- a/packages/modern-browsers/modern.js
+++ b/packages/modern-browsers/modern.js
@@ -73,14 +73,18 @@ function applyAliases(versions) {
 function isModern(browser) {
   const lowerCaseName =
     browser && typeof browser.name === 'string' && browser.name.toLowerCase();
-
-  return (
-    !!lowerCaseName &&
-    hasOwn.call(minimumVersions, lowerCaseName) &&
-    greaterThanOrEqualTo(
+  if (!lowerCaseName) {
+    return false;
+  }
+  const entry = hasOwn.call(minimumVersions, lowerCaseName) ? minimumVersions[lowerCaseName] : undefined;
+  if (!entry) {
+    const packageSettings = Meteor.settings.packages ? Meteor.settings.packages["modern-browsers"] : undefined;
+    // false if no package setting exists
+    return !!(packageSettings && packageSettings.unknownBrowsersAssumedModern);
+  }
+  return greaterThanOrEqualTo(
       [~~browser.major, ~~browser.minor, ~~browser.patch],
-      minimumVersions[lowerCaseName].version
-    )
+      entry.version
   );
 }
 

From 4f1eed23b9d1364b3e0ff459c9a5313191ed1047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Feb 2025 14:23:30 +0100
Subject: [PATCH 1032/1140] generate new dev bundle for next beta release

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 2da7aecc12..b65518ac20 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.13.1.0
+BUNDLE_VERSION=22.13.1.1
 
 
 # OS Check. Put here because here is where we download the precompiled

From fcc2c001e4d445f8872b37d55dfa1203a890bd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Feb 2025 14:39:01 +0100
Subject: [PATCH 1033/1140] re-run checks

---
 .../generators/changelog/versions/3.1.2.md    | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 v3-docs/docs/generators/changelog/versions/3.1.2.md

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.2.md b/v3-docs/docs/generators/changelog/versions/3.1.2.md
new file mode 100644
index 0000000000..e143fee669
--- /dev/null
+++ b/v3-docs/docs/generators/changelog/versions/3.1.2.md
@@ -0,0 +1,71 @@
+## v3.1.1, 2025-01-15
+
+### Highlights
+
+- Node upgrade: v22.13.0
+- Real-time Performance Boost: Refactored AsynchronousQueue for parallel processing and optimized MongoDB observers for faster initial document handling.
+- Allow/Deny Rules Update: Deprecated async rules and updated documentation and types.
+- Mongo Driver Downgrade: Reverted to a stable version to prevent issues in Meteor.
+- Support for Meteor.deprecate: Added deprecation warnings with stack trace for outdated code usage.
+- OAuth Fixes: Resolved issues with cancel popup event and callback.
+- Windows Fixes: Fixed issues with running from folders with spaces and post-npm install build errors on Windows.
+- Security Updates: Upgraded json5 and semver from babel compiler.
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.1.1
+
+```
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.0.4
+- accounts-oauth@1.4.6
+- accounts-passwordless@3.0.1
+- allow-deny@2.1.0
+- babel-compiler@7.11.3
+- ddp-client@3.1.0
+- ddp-server@3.1.0
+- meteor-tool@3.1.1
+- facebook-oauth@1.11.5
+- meteor@2.1.0
+- meteor-tool@3.1.1
+- mongo@2.1.0
+- npm-mongo@6.10.2
+- oauth@3.0.1
+- roles@@1.0.1
+- socket-stream-client@0.6.0
+
+#### Bumped NPM Packages
+
+N/A
+
+#### Special thanks to
+
+✨✨✨
+
+- [@leonardoventurini](https://github.com/leonardoventurini)
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@Grubba27](https://github.com/Grubba27)
+- [@9Morello](https://github.com/9Morello)
+- [@perbergland](https://github.com/perbergland)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+- [@MrSpark2591](https://github.com/MrSpark2591)
+- [@jstarpl](https://github.com/jstarpl)
+- [@minhna](https://github.com/minhna)
+- [@svolkomorov](https://github.com/svolkomorov)
+- [@quyetdgroup](https://github.com/quyetdgroup)
+
+✨✨✨

From 0288391d36a8be65d7798ec68ed3929a2a549fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Feb 2025 15:06:38 +0100
Subject: [PATCH 1034/1140] Meteor version to 3.1.2-beta.0 :comet:

---
 packages/email/package.js                     |  2 +-
 packages/meteor-tool/package.js               |  2 +-
 packages/modern-browsers/package.js           |  2 +-
 packages/webapp/package.js                    |  2 +-
 .../admin/meteor-release-experimental.json    |  2 +-
 .../generators/changelog/versions/3.1.2.md    | 44 +++++------------
 v3-docs/docs/history.md                       | 49 +++++++++++++++++++
 v3-docs/docs/packages/modern-browsers.md      | 14 ++++++
 8 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/packages/email/package.js b/packages/email/package.js
index 3152940a19..acbb8fcd73 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "3.1.1",
+  version: "3.1.2-beta312.0",
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 7ca44c0182..508f842915 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.1",
+  version: "3.1.2-beta.0",
 });
 
 Package.includeTool();
diff --git a/packages/modern-browsers/package.js b/packages/modern-browsers/package.js
index 10514c71a9..be438a18c3 100644
--- a/packages/modern-browsers/package.js
+++ b/packages/modern-browsers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'modern-browsers',
-  version: '0.1.11',
+  version: '0.2.0-beta312.0',
   summary:
     'API for defining the boundary between modern and legacy ' +
     'JavaScript clients',
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 43fc103fa4..aa25a18f10 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.4",
+  version: "2.0.5-beta312.0",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index e294c6eb83..4f0f40b147 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1.1-beta.2",
+  "version": "3.1.2-beta.0",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/v3-docs/docs/generators/changelog/versions/3.1.2.md b/v3-docs/docs/generators/changelog/versions/3.1.2.md
index e143fee669..7649389898 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.2.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.2.md
@@ -1,15 +1,11 @@
-## v3.1.1, 2025-01-15
+## v3.1.2, <date>
 
 ### Highlights
 
-- Node upgrade: v22.13.0
-- Real-time Performance Boost: Refactored AsynchronousQueue for parallel processing and optimized MongoDB observers for faster initial document handling.
-- Allow/Deny Rules Update: Deprecated async rules and updated documentation and types.
-- Mongo Driver Downgrade: Reverted to a stable version to prevent issues in Meteor.
-- Support for Meteor.deprecate: Added deprecation warnings with stack trace for outdated code usage.
-- OAuth Fixes: Resolved issues with cancel popup event and callback.
-- Windows Fixes: Fixed issues with running from folders with spaces and post-npm install build errors on Windows.
-- Security Updates: Upgraded json5 and semver from babel compiler.
+- Node upgrade: v22.13.1
+- Updated Meteor skeletons for Vue and Solid
+- Improved browser detection and related documentation
+- Security updates: nodemailer-openpgp and others in Meteor packages
 
 #### Breaking Changes
 
@@ -25,28 +21,16 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.1.1
+meteor update --release 3.1.2-beta.0
 
 ```
 
 #### Bumped Meteor Packages
 
-- accounts-base@3.0.4
-- accounts-oauth@1.4.6
-- accounts-passwordless@3.0.1
-- allow-deny@2.1.0
-- babel-compiler@7.11.3
-- ddp-client@3.1.0
-- ddp-server@3.1.0
-- meteor-tool@3.1.1
-- facebook-oauth@1.11.5
-- meteor@2.1.0
-- meteor-tool@3.1.1
-- mongo@2.1.0
-- npm-mongo@6.10.2
-- oauth@3.0.1
-- roles@@1.0.1
-- socket-stream-client@0.6.0
+- email@3.1.2
+- meteor-tool@3.1.2
+- modern-browsers@0.2.0
+- webapp@2.0.5
 
 #### Bumped NPM Packages
 
@@ -56,16 +40,10 @@ N/A
 
 ✨✨✨
 
-- [@leonardoventurini](https://github.com/leonardoventurini)
 - [@nachocodoner](https://github.com/nachocodoner)
 - [@Grubba27](https://github.com/Grubba27)
-- [@9Morello](https://github.com/9Morello)
 - [@perbergland](https://github.com/perbergland)
 - [@StorytellerCZ](https://github.com/StorytellerCZ)
-- [@MrSpark2591](https://github.com/MrSpark2591)
-- [@jstarpl](https://github.com/jstarpl)
-- [@minhna](https://github.com/minhna)
-- [@svolkomorov](https://github.com/svolkomorov)
-- [@quyetdgroup](https://github.com/quyetdgroup)
+- [@julio-rocketchat](https://github.com/julio-rocketchat)
 
 ✨✨✨
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 5316279451..89a358376e 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -10,6 +10,55 @@ This is a complete history of changes for Meteor releases.
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
+## v3.1.2, <date>
+
+### Highlights
+
+- Node upgrade: v22.13.1
+- Updated Meteor skeletons for Vue and Solid
+- Improved browser detection and related documentation
+- Security updates: nodemailer-openpgp and others in Meteor packages
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.1.2-beta.0
+
+```
+
+#### Bumped Meteor Packages
+
+- email@3.1.2
+- meteor-tool@3.1.2
+- modern-browsers@0.2.0
+- webapp@2.0.5
+
+#### Bumped NPM Packages
+
+N/A
+
+#### Special thanks to
+
+✨✨✨
+
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@Grubba27](https://github.com/Grubba27)
+- [@perbergland](https://github.com/perbergland)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+- [@julio-rocketchat](https://github.com/julio-rocketchat)
+
+✨✨✨
 
 ## v3.1.1, 2025-01-15
 
diff --git a/v3-docs/docs/packages/modern-browsers.md b/v3-docs/docs/packages/modern-browsers.md
index ae8d39d85d..5556a6326f 100644
--- a/v3-docs/docs/packages/modern-browsers.md
+++ b/v3-docs/docs/packages/modern-browsers.md
@@ -17,3 +17,17 @@ You can read more about this in [Meteor 1.7 announcement blog](https://blog.mete
 <ApiBox name="ModernBrowsers.getMinimumBrowserVersions" />
 
 <ApiBox name="ModernBrowsers.calculateHashOfMinimumVersions" />
+
+## Configure Unknown Browsers to default to Modern
+
+Browsers not explicitly listed in `setMinimumBrowserVersions` are considered "legacy" by default.
+
+To change this and treat unknown browsers as "modern," update the relevant option in your settings file:
+
+``` js
+Meteor.settings.packages = {
+    "modern-browsers": {
+        "unknownBrowsersAssumedModern": true
+    }
+};
+```

From b5a3a5d20290c11be728b7b4bb3b87572c734305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Feb 2025 15:12:39 +0100
Subject: [PATCH 1035/1140] fix docs

---
 v3-docs/docs/generators/changelog/versions/3.1.2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.2.md b/v3-docs/docs/generators/changelog/versions/3.1.2.md
index 7649389898..338447f1a1 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.2.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.2.md
@@ -1,4 +1,4 @@
-## v3.1.2, <date>
+## v3.1.2, /date/
 
 ### Highlights
 

From bc9e24e12be1668203c3556efc5d64378bc6c607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Feb 2025 17:51:38 +0100
Subject: [PATCH 1036/1140] fix waitUntil scenario

---
 packages/test-helpers/wait.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/test-helpers/wait.js b/packages/test-helpers/wait.js
index 955b17fb42..fd7c42c84e 100644
--- a/packages/test-helpers/wait.js
+++ b/packages/test-helpers/wait.js
@@ -5,7 +5,8 @@ function isPromise(obj) {
 waitUntil = function _waitUntil(checkFunction, { timeout = 15_000, interval = 200, leading = true, description = '' } = {}) {
   let waitTime = interval;
   return new Promise((resolve, reject) => {
-    if (leading && checkFunction()) {
+    const shouldWait = checkFunction();
+    if (leading && !isPromise(shouldWait) && shouldWait) {
       resolve();
       return;
     }

From aa3b2208bdf6fe524c695b6a6ae59f4c1865f01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Feb 2025 17:52:15 +0100
Subject: [PATCH 1037/1140] add waitUntil on brypt and argon2 migration to
 solve flakiness on slower execution contexts

---
 .../accounts-password/password_argon_tests.js | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/packages/accounts-password/password_argon_tests.js b/packages/accounts-password/password_argon_tests.js
index d580cf0512..c1fb806d9a 100644
--- a/packages/accounts-password/password_argon_tests.js
+++ b/packages/accounts-password/password_argon_tests.js
@@ -17,21 +17,22 @@ if (Meteor.isServer) {
         test.equal(isValid.userId, userId, "checkPassword with bcrypt - User ID should be returned");
         test.equal(typeof isValid.error, "undefined", "checkPassword with bcrypt - No error should be returned");
 
+        // wait for the migration to happen
+        await waitUntil(
+          async () => {
+            user = await Meteor.users.findOneAsync(userId);
+            return (
+              typeof user.services.password.bcrypt === "undefined" &&
+              typeof user.services.password.argon2 === "string"
+            );
+          },
+          { description: "bcrypt should be unset and argon2 should be set" }
+        );
 
-        // wait for defered execution of user update inside _checkPasswordAsync
-        await new Promise((resolve) => {
-            Meteor.setTimeout(async () => {
-                user = await Meteor.users.findOneAsync(userId);
-                // bcrypt has been unset and argon2 set
-                test.equal(typeof user.services.password.bcrypt, "undefined", "bcrypt should be unset");
-                test.equal(typeof user.services.password.argon2, "string", "argon2 should be set");
-                // password is still valid using argon2
-                const isValidArgon = await Accounts._checkPasswordAsync(user, password);
-                test.equal(isValidArgon.userId, userId, "checkPassword with argon2 - User ID should be returned");
-                test.equal(typeof isValidArgon.error, "undefined", "checkPassword with argon2 - No error should be returned");
-                resolve();
-            }, 100);
-        });
+        // password is still valid using argon2
+        const isValidArgon = await Accounts._checkPasswordAsync(user, password);
+        test.equal(isValidArgon.userId, userId, "checkPassword with argon2 - User ID should be returned");
+        test.equal(typeof isValidArgon.error, "undefined", "checkPassword with argon2 - No error should be returned");
 
         // cleanup
         Accounts._options.argon2Enabled = false;
@@ -110,21 +111,22 @@ if (Meteor.isServer) {
         test.equal(isValidArgon.userId, userId, "checkPassword with argon2 - User ID should be returned");
         test.equal(typeof isValidArgon.error, "undefined", "checkPassword with argon2 - No error should be returned");
 
+        // wait for the migration to happen
+        await waitUntil(
+          async () => {
+              user = await Meteor.users.findOneAsync(userId);
+              return (
+                typeof user.services.password.bcrypt === "string" &&
+                typeof user.services.password.argon2 === "undefined"
+              );
+          },
+          { description: "bcrypt should be string and argon2 should be undefined" }
+        );
 
-        // wait for defered execution of user update inside _checkPasswordAsync
-        await new Promise((resolve) => {
-            Meteor.setTimeout(async () => {
-                user = await Meteor.users.findOneAsync(userId);
-                // bcrypt has been unset and argon2 set
-                test.equal(typeof user.services.password.argon2, "undefined", "argon2 should be unset");
-                test.equal(typeof user.services.password.bcrypt, "string", "bcrypt should be set");
-                // password is still valid using argon2
-                const isValidBcrypt = await Accounts._checkPasswordAsync(user, password);
-                test.equal(isValidBcrypt.userId, userId, "checkPassword with argon2 - User ID should be returned");
-                test.equal(typeof isValidBcrypt.error, "undefined", "checkPassword with argon2 - No error should be returned");
-                resolve();
-            }, 100);
-        });
+        // password is still valid using bcrypt
+        const isValidBcrypt = await Accounts._checkPasswordAsync(user, password);
+        test.equal(isValidBcrypt.userId, userId, "checkPassword with argon2 - User ID should be returned");
+        test.equal(typeof isValidBcrypt.error, "undefined", "checkPassword with argon2 - No error should be returned");
 
         // cleanup
         await Meteor.users.removeAsync(userId);

From cb40b90a2b02d8c443de8b293c0ca41e9b8d13ae Mon Sep 17 00:00:00 2001
From: Gavin Buerk <gavin.buerk@gmail.com>
Date: Wed, 5 Feb 2025 09:37:52 -0500
Subject: [PATCH 1038/1140] Updates after code review to try to align closer
 with the original intent

---
 packages/mongo/oplog_observe_driver.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mongo/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js
index e9b7bcebeb..cdaf7e3da8 100644
--- a/packages/mongo/oplog_observe_driver.js
+++ b/packages/mongo/oplog_observe_driver.js
@@ -545,7 +545,7 @@ Object.assign(OplogObserveDriver.prototype, {
                   if (self._phase !== PHASE.QUERYING) {
                     self._needToPollQuery();
                   }
-                  reject(err);
+                  resolve();
                   return;
                 }
 
@@ -574,7 +574,7 @@ Object.assign(OplogObserveDriver.prototype, {
         });
         // Wait for all fetch operations to complete
         try {
-          await Promise.all(fetchPromises);
+          await Promise.allSettled(fetchPromises);
         } catch (err) {
           Meteor._debug('Got an exception in a fetch query', err);
         }

From 4e57697b1393f3838339a07217545044984c59d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 5 Feb 2025 17:16:42 +0100
Subject: [PATCH 1039/1140] specify alpha version for new feature

---
 packages/accounts-base/package.js     | 2 +-
 packages/accounts-password/package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index d9a2fd72ee..db96d4d13d 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.0.4",
+  version: "3.1.0-alpha.0",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index c4160683ba..d6be0e1ee4 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "4.0.0",
+  version: "4.0.0-alpha.0",
 });
 
 Npm.depends({

From c3805c7178933804e30dfd9b1d8f0c5d3f64df3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 5 Feb 2025 17:38:00 +0100
Subject: [PATCH 1040/1140] fix versions for next alpha

---
 packages/accounts-password/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index d6be0e1ee4..3eefb8a7f5 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -14,10 +14,10 @@ Npm.depends({
 });
 
 Package.onUse((api) => {
-  api.use(["accounts-base", "sha", "ejson", "ddp"], ["client", "server"]);
+  api.use(["accounts-base@3.1.0-alpha.0", "sha", "ejson", "ddp"], ["client", "server"]);
 
   // Export Accounts (etc) to packages using this one.
-  api.imply("accounts-base", ["client", "server"]);
+  api.imply("accounts-base@3.1.0-alpha.0", ["client", "server"]);
 
   api.use("email", "server");
   api.use("random", "server");

From f4e8985e63756a50e946b681baf81345575add31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 5 Feb 2025 18:17:04 +0100
Subject: [PATCH 1041/1140] update minisat to custom generated code

---
 packages/logic-solver/minisat.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/logic-solver/minisat.js b/packages/logic-solver/minisat.js
index 105703d7dc..124389b116 100644
--- a/packages/logic-solver/minisat.js
+++ b/packages/logic-solver/minisat.js
@@ -49,15 +49,15 @@ var Module = (() => {
   var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
   if (typeof __filename != 'undefined') _scriptName = _scriptName || __filename;
   return (
-function(moduleArg = {}) {
-  var moduleRtn;
+    function(moduleArg = {}) {
+      var moduleRtn;
 
-function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==typeof i?i:i+""}function _toPrimitive(t,r){if("object"!=typeof t||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=typeof i)return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}var c=moduleArg,aa,f,ba=new Promise((a,b)=>{aa=a;f=b});"_addClause _createTheSolver _ensureVar _free _getConflictClause _getConflictClauseSize _getNumVars _getSolution _malloc _retireVar _solve _solveAssuming _unyo _yo ccall cwrap UTF8ToString stringToUTF8 UTF16ToString stringToUTF16 UTF32ToString stringToUTF32 AsciiToString intArrayFromString intArrayToString writeArrayToMemory stackSave stackAlloc stackRestore getValue setValue _memory ___indirect_function_table onRuntimeInitialized".split(" ").forEach(a=>{Object.getOwnPropertyDescriptor(ba,a)||Object.defineProperty(ba,a,{get:()=>l("You are getting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js"),set:()=>l("You are setting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js")})});var ca=Object.assign({},c),m=(a,b)=>{throw b},da;if("undefined"==typeof process||!process.release||"node"!==process.release.name)throw Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)");var ea=process.versions.node,n=ea.split(".").slice(0,3);n=1e4*n[0]+100*n[1]+1*n[2].split("-")[0];if(14e4>n)throw Error("This emscripten-generated code requires node v14.0.0 (detected v"+ea+")");var fs=require("fs");require("path");da=a=>{a=fa(a)?new URL(a):a;a=fs.readFileSync(a);p(Buffer.isBuffer(a));return a};process.argv.slice(2);m=(a,b)=>{process.exitCode=a;throw b};var r=c.print||console.log.bind(console),u=c.printErr||console.error.bind(console);Object.assign(c,ca);ca=null;Object.getOwnPropertyDescriptor(c,"fetchSettings")&&l("`Module.fetchSettings` was supplied but `fetchSettings` not included in INCOMING_MODULE_JS_API");v("arguments","arguments_");v("thisProgram","thisProgram");p("undefined"==typeof c.memoryInitializerPrefixURL,"Module.memoryInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.pthreadMainPrefixURL,"Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.cdInitializerPrefixURL,"Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.filePackagePrefixURL,"Module.filePackagePrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.read,"Module.read option was removed");p("undefined"==typeof c.readAsync,"Module.readAsync option was removed (modify readAsync in JS)");p("undefined"==typeof c.readBinary,"Module.readBinary option was removed (modify readBinary in JS)");p("undefined"==typeof c.setWindowTitle,"Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)");p("undefined"==typeof c.TOTAL_MEMORY,"Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY");v("asm","wasmExports");v("readAsync","readAsync");v("readBinary","readBinary");v("setWindowTitle","setWindowTitle");p(!0,"web environment detected but not enabled at build time.  Add `web` to `-sENVIRONMENT` to enable.");p(!0,"worker environment detected but not enabled at build time.  Add `worker` to `-sENVIRONMENT` to enable.");p(!0,"shell environment detected but not enabled at build time.  Add `shell` to `-sENVIRONMENT` to enable.");var ha=c.wasmBinary;v("wasmBinary","wasmBinary");"object"!=typeof WebAssembly&&u("no native wasm support detected");"undefined"==typeof atob&&("undefined"!=typeof global&&"undefined"==typeof globalThis&&(globalThis=global),globalThis.atob=function(a){var b="",d=0;a=a.replace(/[^A-Za-z0-9\+\/=]/g,"");do{var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var g="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var k="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var h="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));e=e<<2|g>>4;g=(g&15)<<4|k>>2;var q=(k&3)<<6|h;b+=String.fromCharCode(e);64!==k&&(b+=String.fromCharCode(g));64!==h&&(b+=String.fromCharCode(q))}while(d<a.length);return b});var w,x=!1,y;function p(a,b){a||l("Assertion failed"+(b?": "+b:""))}var z,A,B,ia,C,D,ja,ka;function la(){var a=w.buffer;c.HEAP8=z=new Int8Array(a);c.HEAP16=B=new Int16Array(a);c.HEAPU8=A=new Uint8Array(a);c.HEAPU16=ia=new Uint16Array(a);c.HEAP32=C=new Int32Array(a);c.HEAPU32=D=new Uint32Array(a);c.HEAPF32=ja=new Float32Array(a);c.HEAPF64=ka=new Float64Array(a)}let ma;(ma=global).performance??(ma.performance=require("perf_hooks").performance);p(!c.STACK_SIZE,"STACK_SIZE can no longer be set at runtime.  Use -sSTACK_SIZE at link time");p("undefined"!=typeof Int32Array&&"undefined"!==typeof Float64Array&&void 0!=Int32Array.prototype.subarray&&void 0!=Int32Array.prototype.set,"JS engine does not provide full typed array support");p(!c.wasmMemory,"Use of `wasmMemory` detected.  Use -sIMPORTED_MEMORY to define wasmMemory externally");p(!c.INITIAL_MEMORY,"Detected runtime INITIAL_MEMORY setting.  Use -sIMPORTED_MEMORY to define wasmMemory dynamically");function na(){var a=oa();p(0==(a&3));0==a&&(a+=4);D[a>>2]=34821223;D[a+4>>2]=2310721022;D[0]=1668509029}function E(){if(!x){var a=oa();0==a&&(a+=4);var b=D[a>>2],d=D[a+4>>2];34821223==b&&2310721022==d||l(`Stack overflow! Stack cookie has been overwritten at ${F(a)}, expected hex dwords 0x89BACDFE and 0x2135467, but received ${F(d)} ${F(b)}`);1668509029!=D[0]&&l("Runtime error: The application has corrupted its heap memory area (address zero)!")}}var pa=[],qa=[],ra=[],sa=!1;function ta(){var a=c.preRun.shift();pa.unshift(a)}p(Math.imul,"This browser does not support Math.imul(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.fround,"This browser does not support Math.fround(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.clz32,"This browser does not support Math.clz32(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.trunc,"This browser does not support Math.trunc(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");var G=0,H=null,J={},K=null;function ua(){var _c$monitorRunDependen;G++;(_c$monitorRunDependen=c.monitorRunDependencies)===null||_c$monitorRunDependen===void 0||_c$monitorRunDependen.call(c,G);p(!J["wasm-instantiate"]);J["wasm-instantiate"]=1;null===K&&"undefined"!=typeof setInterval&&(K=setInterval(()=>{if(x)clearInterval(K),K=null;else{var a=!1,b;for(b in J)a||(a=!0,u("still waiting on run dependencies:")),u(`dependency: ${b}`);a&&u("(end of list)")}},1e4))}function l(a){var _c$onAbort;(_c$onAbort=c.onAbort)===null||_c$onAbort===void 0||_c$onAbort.call(c,a);a="Aborted("+a+")";u(a);x=!0;a=new WebAssembly.RuntimeError(a);f(a);throw a}function va(){l("Filesystem support (FS) was not included. The problem is that you are using files from JS, but files were not used from C/C++, so filesystem support was not auto-included. You can force-include filesystem support with -sFORCE_FILESYSTEM")}c.FS_createDataFile=function(){va()};c.FS_createPreloadedFile=function(){va()};var wa=a=>a.startsWith("data:application/octet-stream;base64,"),fa=a=>a.startsWith("file://");function L(a,b){return function(){p(sa,`native function \`${a}\` called before runtime initialization`);var e=M[a];p(e,`exported native function \`${a}\` not found`);p(arguments.length<=b,`native function \`${a}\` called with ${arguments.length} args but expects ${b}`);return e(...arguments)}}var N;function xa(a){if(N==N&&ha)var b=new Uint8Array(ha);else if(b=N,wa(b)?(b=b.slice(37),b=Buffer.from(b,"base64"),b=new Uint8Array(b.buffer,b.byteOffset,b.length)):b=void 0,!b)if(da)b=da(N);else throw'sync fetching of the wasm failed: you can preload it to Module["wasmBinary"] manually, or emcc.py will do that for you when generating HTML (but not JS)';b=new WebAssembly.Module(b);return[new WebAssembly.Instance(b,a),b]}var ya=new Int16Array(1),za=new Int8Array(ya.buffer);ya[0]=25459;if(115!==za[0]||99!==za[1])throw"Runtime error: expected the system to be little-endian! (Run with -sSUPPORT_BIG_ENDIAN to bypass)";if(c.ENVIRONMENT)throw Error("Module.ENVIRONMENT has been deprecated. To force the environment, use the ENVIRONMENT compile-time option (for example, -sENVIRONMENT=web or -sENVIRONMENT=node)");function v(a,b){Object.getOwnPropertyDescriptor(c,a)||Object.defineProperty(c,a,{configurable:!0,get(){l(`\`Module.${a}\` has been replaced by \`${b}\``+" (the initial value can be provided on Module, but after startup the value is only looked for on a local variable of that name)")}})}class Aa{constructor(a){_defineProperty(this,"name","ExitStatus");this.message=`Program terminated with exit(${a})`;this.status=a}}c.ExitStatus=Aa;var O=a=>{for(;0<a.length;)a.shift()(c)};c.callRuntimeCallbacks=O;c.getValue=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:"i8";b.endsWith("*")&&(b="*");switch(b){case"i1":return z[a];case"i8":return z[a];case"i16":return B[a>>1];case"i32":return C[a>>2];case"i64":l("to do getValue(i64) use WASM_BIGINT");case"float":return ja[a>>2];case"double":return ka[a>>3];case"*":return D[a>>2];default:l(`invalid type for getValue: ${b}`)}};var Q=c.noExitRuntime||!0;c.noExitRuntime=Q;var F=a=>{p("number"===typeof a);return"0x"+(a>>>0).toString(16).padStart(8,"0")};c.ptrToString=F;c.setValue=function(a,b){let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"i8";d.endsWith("*")&&(d="*");switch(d){case"i1":z[a]=b;break;case"i8":z[a]=b;break;case"i16":B[a>>1]=b;break;case"i32":C[a>>2]=b;break;case"i64":l("to do setValue(i64) use WASM_BIGINT");case"float":ja[a>>2]=b;break;case"double":ka[a>>3]=b;break;case"*":D[a>>2]=b;break;default:l(`invalid type for setValue: ${d}`)}};c.stackRestore=a=>Ba(a);c.stackSave=()=>Ca();var R=a=>{R.h||(R.h={});R.h[a]||(R.h[a]=1,u("warning: "+a))};c.warnOnce=R;var Da="undefined"!=typeof TextDecoder?new TextDecoder:void 0;c.UTF8Decoder=Da;var Ea=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:0;let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:NaN;var e=b+d;for(d=b;a[d]&&!(d>=e);)++d;if(16<d-b&&a.buffer&&Da)return Da.decode(a.subarray(b,d));for(e="";b<d;){var g=a[b++];if(g&128){var k=a[b++]&63;if(192==(g&224))e+=String.fromCharCode((g&31)<<6|k);else{var h=a[b++]&63;224==(g&240)?g=(g&15)<<12|k<<6|h:(240!=(g&248)&&R("Invalid UTF-8 leading byte "+F(g)+" encountered when deserializing a UTF-8 string in wasm memory to a JS string!"),g=(g&7)<<18|k<<12|h<<6|a[b++]&63);65536>g?e+=String.fromCharCode(g):(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023))}}else e+=String.fromCharCode(g)}return e};c.UTF8ArrayToString=Ea;var S=(a,b)=>{p("number"==typeof a,`UTF8ToString expects a number (got ${typeof a})`);return a?Ea(A,a,b):""};c.UTF8ToString=S;var Fa=(a,b,d,e)=>l(`Assertion failed: ${S(a)}, at: `+[b?S(b):"unknown filename",d,e?S(e):"unknown function"]);c.___assert_fail=Fa;var T;c.wasmTable=T;c.getWasmTableEntry=a=>T.get(a);var Ga=(a,b)=>T.get(a)(b);c.___call_sighandler=Ga;class Ha{constructor(a){this.g=a-24}}c.ExceptionInfo=Ha;var Ia=0;c.exceptionLast=Ia;var Ja=0;c.uncaughtExceptionCount=Ja;var Ka=(a,b,d)=>{var e=new Ha(a);D[e.g+16>>2]=0;D[e.g+4>>2]=b;D[e.g+8>>2]=d;Ia=a;Ja++;p(!1,"Exception thrown, but exception catching is not enabled. Compile with -sNO_DISABLE_EXCEPTION_CATCHING or -sEXCEPTION_CATCHING_ALLOWED=[..] to catch.")};c.___cxa_throw=Ka;var La=()=>l("native code called abort()");c.__abort_js=La;var U=0;c.runtimeKeepaliveCounter=U;var Ma=()=>{Q=!1;U=0};c.__emscripten_runtime_keepalive_clear=Ma;var V={};c.timers=V;var Na=a=>{if(a instanceof Aa||"unwind"==a)return y;E();a instanceof WebAssembly.RuntimeError&&0>=Ca()&&u("Stack overflow detected.  You can try increasing -sSTACK_SIZE (currently set to 65536)");m(1,a)};c.handleException=Na;c.keepRuntimeAlive=()=>Q||0<U;var Oa=a=>{var _c$onExit;y=a;Q||0<U||((_c$onExit=c.onExit)!==null&&_c$onExit!==void 0&&_c$onExit.call(c,a),x=!0);m(a,new Aa(a))};c._proc_exit=Oa;var W=(a,b)=>{y=a;Pa();(Q||0<U)&&!b&&(b=`program exited (with status: ${a}), but keepRuntimeAlive() is set (counter=${U}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`,f(b),u(b));Oa(a)};c.exitJS=W;c._exit=W;var Qa=()=>{if(!(Q||0<U))try{W(y)}catch(a){Na(a)}};c.maybeExit=Qa;var Ra=a=>{if(x)u("user callback triggered after runtime exited or application aborted.  Ignoring.");else try{a(),Qa()}catch(b){Na(b)}};c.callUserCallback=Ra;c._emscripten_get_now=()=>performance.now();var Ta=(a,b)=>{V[a]&&(clearTimeout(V[a].id),delete V[a]);if(!b)return 0;var d=setTimeout(()=>{p(a in V);delete V[a];Ra(()=>Sa(a,performance.now()))},b);V[a]={id:d,j:b};return 0};c.__setitimer_js=Ta;c.getHeapMax=()=>2147483648;var Ua=(a,b)=>{p(b,"alignment argument is required");return Math.ceil(a/b)*b};c.alignMemory=Ua;var Va=a=>{var b=w.buffer,d=(a-b.byteLength+65535)/65536|0;try{return w.grow(d),la(),1}catch(e){u(`growMemory: Attempted to grow heap from ${b.byteLength} bytes to ${a} bytes, but got error: ${e}`)}};c.growMemory=Va;var Wa=a=>{var b=A.length;a>>>=0;p(a>b);if(2147483648<a)return u(`Cannot enlarge memory, requested ${a} bytes, but the limit is ${2147483648} bytes!`),!1;for(var d=1;4>=d;d*=2){var e=b*(1+.2/d);e=Math.min(e,a+100663296);e=Math.min(2147483648,Ua(Math.max(a,e),65536));if(Va(e))return!0}u(`Failed to grow the heap from ${b} bytes to ${e} bytes, not enough memory!`);return!1};c._emscripten_resize_heap=Wa;c.SYSCALLS={l:void 0,i(a){return S(a)}};var Xa=()=>{l("fd_close called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_close=Xa;var Ya=(a,b)=>{p(a==a>>>0||a==(a|0));p(b===(b|0));return b+2097152>>>0<4194305-!!a?(a>>>0)+4294967296*b:NaN};c.convertI32PairToI53Checked=Ya;function Za(a,b,d){Ya(b,d);return 70}c._fd_seek=Za;var X=[null,[],[]];c.printCharBuffers=X;var Y=(a,b)=>{var d=X[a];p(d);0===b||10===b?((1===a?r:u)(Ea(d)),d.length=0):d.push(b)};c.printChar=Y;var ab=()=>{$a(0);X[1].length&&Y(1,10);X[2].length&&Y(2,10)};c.flush_NO_FILESYSTEM=ab;var bb=(a,b,d,e)=>{for(var g=0,k=0;k<d;k++){var h=D[b>>2],q=D[b+4>>2];b+=8;for(var I=0;I<q;I++)Y(a,A[h+I]);g+=q}D[e>>2]=g;return 0};c._fd_write=bb;c.stackAlloc=a=>cb(a);var db=a=>{var b=c["_"+a];p(b,"Cannot call unknown function "+a+", make sure it is exported");return b};c.getCFunc=db;var eb=(a,b)=>{p(0<=a.length,"writeArrayToMemory array must have a length (should be an array or typed array)");z.set(a,b)};c.writeArrayToMemory=eb;var fb=a=>{for(var b=0,d=0;d<a.length;++d){var e=a.charCodeAt(d);127>=e?b++:2047>=e?b+=2:55296<=e&&57343>=e?(b+=4,++d):b+=3}return b};c.lengthBytesUTF8=fb;var gb=(a,b,d,e)=>{p("string"===typeof a,`stringToUTF8Array expects a string (got ${typeof a})`);if(!(0<e))return 0;var g=d;e=d+e-1;for(var k=0;k<a.length;++k){var h=a.charCodeAt(k);if(55296<=h&&57343>=h){var q=a.charCodeAt(++k);h=65536+((h&1023)<<10)|q&1023}if(127>=h){if(d>=e)break;b[d++]=h}else{if(2047>=h){if(d+1>=e)break;b[d++]=192|h>>6}else{if(65535>=h){if(d+2>=e)break;b[d++]=224|h>>12}else{if(d+3>=e)break;1114111<h&&R("Invalid Unicode code point "+F(h)+" encountered when serializing a JS string to a UTF-8 string in wasm memory! (Valid unicode code points should be in range 0-0x10FFFF).");b[d++]=240|h>>18;b[d++]=128|h>>12&63}b[d++]=128|h>>6&63}b[d++]=128|h&63}}b[d]=0;return d-g};c.stringToUTF8Array=gb;var hb=(a,b,d)=>{p("number"==typeof d,"stringToUTF8(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");return gb(a,A,b,d)};c.stringToUTF8=hb;var ib=a=>{var b=fb(a)+1,d=cb(b);hb(a,d,b);return d};c.stringToUTF8OnStack=ib;var jb=(a,b,d,e)=>{var g={string:t=>{var P=0;null!==t&&void 0!==t&&0!==t&&(P=ib(t));return P},array:t=>{var P=cb(t.length);eb(t,P);return P}};a=db(a);var k=[],h=0;p("array"!==b,'Return type should not be "array".');if(e)for(var q=0;q<e.length;q++){var I=g[d[q]];I?(0===h&&(h=Ca()),k[q]=I(e[q])):k[q]=e[q]}d=a(...k);return d=function(t){0!==h&&Ba(h);return"string"===b?S(t):"boolean"===b?!!t:t}(d)};c.ccall=jb;c.cwrap=(a,b,d,e)=>function(){for(var _len=arguments.length,g=new Array(_len),_key=0;_key<_len;_key++){g[_key]=arguments[_key]}return jb(a,b,d,g,e)};c.intArrayFromString=function(a,b,d){d=Array(0<d?d:fb(a)+1);a=gb(a,d,0,d.length);b&&(d.length=a);return d};c.intArrayToString=function(a){for(var b=[],d=0;d<a.length;d++){var e=a[d];255<e&&(p(!1,`Character code ${e} (${String.fromCharCode(e)}) at offset ${d} not in 0x00-0xFF.`),e&=255);b.push(String.fromCharCode(e))}return b.join("")};c.AsciiToString=a=>{for(var b="";;){var d=A[a++];if(!d)return b;b+=String.fromCharCode(d)}};var kb="undefined"!=typeof TextDecoder?new TextDecoder("utf-16le"):void 0;c.UTF16Decoder=kb;c.UTF16ToString=(a,b)=>{p(0==a%2,"Pointer passed to UTF16ToString must be aligned to two bytes!");var d=a>>1;for(var e=d+b/2;!(d>=e)&&ia[d];)++d;d<<=1;if(32<d-a&&kb)return kb.decode(A.subarray(a,d));d="";for(e=0;!(e>=b/2);++e){var g=B[a+2*e>>1];if(0==g)break;d+=String.fromCharCode(g)}return d};c.stringToUTF16=(a,b,d)=>{p(0==b%2,"Pointer passed to stringToUTF16 must be aligned to two bytes!");p("number"==typeof d,"stringToUTF16(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(2>d)return 0;d-=2;var e=b;d=d<2*a.length?d/2:a.length;for(var g=0;g<d;++g)B[b>>1]=a.charCodeAt(g),b+=2;B[b>>1]=0;return b-e};c.UTF32ToString=(a,b)=>{p(0==a%4,"Pointer passed to UTF32ToString must be aligned to four bytes!");for(var d=0,e="";!(d>=b/4);){var g=C[a+4*d>>2];if(0==g)break;++d;65536<=g?(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023)):e+=String.fromCharCode(g)}return e};c.stringToUTF32=(a,b,d)=>{p(0==b%4,"Pointer passed to stringToUTF32 must be aligned to four bytes!");p("number"==typeof d,"stringToUTF32(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(4>d)return 0;var e=b;d=e+d-4;for(var g=0;g<a.length;++g){var k=a.charCodeAt(g);if(55296<=k&&57343>=k){var h=a.charCodeAt(++g);k=65536+((k&1023)<<10)|h&1023}C[b>>2]=k;b+=4;if(b+4>d)break}C[b>>2]=0;return b-e};var lb={__assert_fail:Fa,__call_sighandler:Ga,__cxa_throw:Ka,_abort_js:La,_emscripten_runtime_keepalive_clear:Ma,_setitimer_js:Ta,emscripten_resize_heap:Wa,exit:W,fd_close:Xa,fd_seek:Za,fd_write:bb,proc_exit:Oa},M=function(){function a(d){var _c$monitorRunDependen2;M=d.exports;w=M.memory;p(w,"memory not found in wasm exports");la();T=M.__indirect_function_table;p(T,"table not found in wasm exports");qa.unshift(M.__wasm_call_ctors);G--;(_c$monitorRunDependen2=c.monitorRunDependencies)===null||_c$monitorRunDependen2===void 0||_c$monitorRunDependen2.call(c,G);p(J["wasm-instantiate"]);delete J["wasm-instantiate"];0==G&&(null!==K&&(clearInterval(K),K=null),H&&(d=H,H=null,d()));return M}ua();var b={env:lb,wasi_snapshot_preview1:lb};if(c.instantiateWasm)try{return c.instantiateWasm(b,a)}catch(d){u(`Module.instantiateWasm callback failed with error: ${d}`),f(d)}N??(N="data:application/octet-stream;base64,AGFzbQEAAAABxgEeYAJ/fwBgAX8AYAF/AX9gA39/fwBgAn9/AX9gA39/fwF/YAABf2AAAGAEf39/fwBgBX9/f39/AGAFf35+fn4AYAZ/f39/f38AYAN/fn8BfmAFf39/f38Bf2ACf3wAYAR/fn5/AGAEf39/fwF/YAF/AXxgAnx/AXxgBn98f39/fwF/YAJ/fAF/YAJ/fwF+YAJ8fAF8YAR+fn5+AX9gA35+fgF/YAJ+fgF8YAF/AX5gBH9+fn4AYAd/f39/f39/AX9gAn5/AX8CvQIMA2VudgtfX2N4YV90aHJvdwADA2VudgRleGl0AAEWd2FzaV9zbmFwc2hvdF9wcmV2aWV3MQhmZF93cml0ZQAQFndhc2lfc25hcHNob3RfcHJldmlldzEIZmRfY2xvc2UAAgNlbnYWZW1zY3JpcHRlbl9yZXNpemVfaGVhcAACA2VudglfYWJvcnRfanMABwNlbnYNX19hc3NlcnRfZmFpbAAIA2Vudg1fc2V0aXRpbWVyX2pzABQDZW52I19lbXNjcmlwdGVuX3J1bnRpbWVfa2VlcGFsaXZlX2NsZWFyAAcWd2FzaV9zbmFwc2hvdF9wcmV2aWV3MQlwcm9jX2V4aXQAAQNlbnYRX19jYWxsX3NpZ2hhbmRsZXIAABZ3YXNpX3NuYXBzaG90X3ByZXZpZXcxB2ZkX3NlZWsADQPVAdMBBwACAQEBAAEAAxEAAAMCAAAAAwAAAAQEAAABAAEAAAMAAQIRAgEAAAABAQAFCQ0CAgUEAwQCAQEDAAAAAAAAAgQEAAAEAAQOAAEEAAAABQABBAAAAwMAAwEEAAQBBAQAAQEEAAQAAAUVAQAGAQcBAgAGBgYCAQYGBRYBAgAAAwUQAAABEgIKAgEEAAIXGA8KDwoKBwYGBgECBgoKGQAOAAIMBQICAwMDAgwEAQICGhsPCRwDAggdCQQTABIGBwEHAQYHBQULCAkDCAMICQsOAQENAwQFAXABKioFBwEBggKAgAIGEgN/AUGghAULfwFBAAt/AUEACwePBBwGbWVtb3J5AgARX193YXNtX2NhbGxfY3RvcnMADAJ5bwB3BGZyZWUAlAEZX19pbmRpcmVjdF9mdW5jdGlvbl90YWJsZQEABHVueW8AeA9jcmVhdGVUaGVTb2x2ZXIAeQllbnN1cmVWYXIAeglhZGRDbGF1c2UAewVzb2x2ZQB9C2dldFNvbHV0aW9uAH4KZ2V0TnVtVmFycwB/DXNvbHZlQXNzdW1pbmcAgAEJcmV0aXJlVmFyAIEBFWdldENvbmZsaWN0Q2xhdXNlU2l6ZQCCARFnZXRDb25mbGljdENsYXVzZQCDAQZmZmx1c2gArAEGbWFsbG9jAJMBE19lbXNjcmlwdGVuX3RpbWVvdXQA2gEVZW1zY3JpcHRlbl9zdGFja19pbml0AJ8BGWVtc2NyaXB0ZW5fc3RhY2tfZ2V0X2ZyZWUAoAEZZW1zY3JpcHRlbl9zdGFja19nZXRfYmFzZQChARhlbXNjcmlwdGVuX3N0YWNrX2dldF9lbmQAogEZX2Vtc2NyaXB0ZW5fc3RhY2tfcmVzdG9yZQCjARdfZW1zY3JpcHRlbl9zdGFja19hbGxvYwCkARxlbXNjcmlwdGVuX3N0YWNrX2dldF9jdXJyZW50AKUBIl9fY3hhX2luY3JlbWVudF9leGNlcHRpb25fcmVmY291bnQAzAEMZHluQ2FsbF9qaWppAN0BCUMBAEEBCykOEzVsQUJkO2hpa23OAWhub2hwccUBxgGvAa4BrQG0AbUBywE7aIYBhgHPAdkB2AHXAWjRAdMB1QHcAdsBCr3zA9MB/QcAEJ8BQcEpQQE6AABBwilBAjoAAEHAKUEAOgAAQcgpQc0JQdkLQaIQQa4QEDoaQfgpQubMmbPmzJn3PzcDAEHoKUKAgICAgICA+D83AwBB4ClCADcDAEHIKUG4HDYCAEHwKUEAOwEAQYAqQdcJQbgLQaIQQa4QEDoaQbAqQquO2sjt+f33PzcDAEGgKkKAgICAgICA+D83AwBBmCpCADcDAEGAKkG4HDYCAEGoKkEAOwEAQbgqQZ0MQfINQaIQQa4QEDoaQegqQgA3AwBB4CpBgQI7AQBB2CpCgICAgICAgPg/NwMAQdAqQgA3AwBBuCpBuBw2AgBB8CpB5A9B3QxBohBBrhAQOhpBoCtCgICAoL+49srBADcDAEGQK0KAgICAgICA+P8ANwMAQYgrQgA3AwBB8CpBuBw2AgBBmCtBADsBAEGoK0HEDkHSFEGiEEG3EBA6GkHEK0ECNgIAQbwrQoCAgIAgNwIAQagrQfwbNgIAQcgrQdENQZkVQaIQQbcQEDoaQeQrQQI2AgBB3CtCgICAgCA3AgBByCtB/Bs2AgBB6CtBohBBjwpBoAlBABA5QYAsQaIQQcgJQc8OQQEQOUGYLEGICkGmDUGiEEG3EBA6GkG0LEHkADYCAEGsLEKBgICA8P////8ANwIAQZgsQfwbNgIAQbgsQfEPQfwLQaIQQa4QEDoaQegsQoCAgICAgICAwAA3AwBB2CxCgICAgICAgPj/ADcDAEHQLEKAgICAgICA+D83AwBBuCxBuBw2AgBB4CxBADsBAEHwLEH7D0HtDkGiEEGuEBA6GkGgLUKas+bMmbPm5D83AwBBkC1CgICAgICAgPj/ADcDAEGILUIANwMAQfAsQbgcNgIAQZgtQQA7AQBBqC1BngtBggtBohBBtxAQOhpBvC1CgICAgPD/////ADcCAEGoLUH8GzYCAEHELUEANgIAQcktQQE6AABByi1BAjoAAEHILUEAOgAAQcwtQZUQQYwNQfcTQQAQOUHkLUGVEEHADUGjFEEAEDlB/C1BlRBBkg1B8xJBARA5QZQuQYMKQbESQZUQQbcQEDoaQaguQoCAgID4/////wA3AgBBlC5B/Bs2AgBBsC5BADYCAEG0LkGXDUGYCkGVEEG3EBA6GkHQLkEUNgIAQcguQv///////////wA3AgBBtC5B/Bs2AgBB1C5Bng1B3xFBlRBBtxAQOhpB8C5B6Ac2AgBB6C5C////////////ADcCAEHULkH8GzYCAEH4LkH2D0GRE0GVEEGuEBA6GkGoL0KAgICAgICA8D83AwBBmC9CgICAgICAgPj/ADcDAEGQL0IANwMAQfguQbgcNgIAQaAvQQA7AQALNgAgAEEANgIoIABCADcCICAAQQA2AhggAEIANwIQIABBADYCCCAAQgA3AgAgACABKAIANgIsC8YBAQF/IABBoBo2AgAgAEH0BGoQDyAAQegEahAPIABB3ARqEA8gAEHMBGoQDyAAQcAEahAPIABBtARqEA8gACgCoAQQlAEgAEHMA2oQECAAQZwDahARIABBjANqEA8gAEH8AmoQDyAAQewCahAPIABB3AJqEA8gAEHMAmoQDyAAQbwCahAPIABBsAJqEA8gAEGkAmoQDyAAQZgCahAPIABBjAJqEA8gAEGAAmoQDyAAQRBqIgFBEGoQDyABEA8gAEEEahAPIAALCAAgAEEBEBILDQAgAEEMahAPIAAQDwsUACAAQSBqEA8gAEEQahAPIAAQNgswAQF/AkAgACgCACICRQ0AIABBADYCBCABRQ0AIAIQlAEgAEEANgIIIABBADYCAAsLCQAgABAOEJQBC4cCAQV/IAEoAgBBAWoiAyAAKAIESgRAAkAgACgCCCICIANODQAgAyACa0EBakF+cSIEIAJBAXVBfnFBAmoiBSAEIAVKGyIEIAJB/////wdzTARAIAAgAiAEaiICNgIIIAAgACgCACACQQxsEJUBIgI2AgAgAg0BQcgvKAIAQTBHDQELEM0BQfAcQQAQAAALIAAoAgQiAiADIAIgA0obIQQgACgCACEFA0AgAiAERgRAIAAgAzYCBAUgBSACQQxsaiIGQQA2AgggBkIANwIAIAJBAWohAgwBCwsLIABBEGogACgCACABKAIAIgBBDGxqIgMoAgAEfyADQQA2AgQgASgCAAUgAAsQFwsYACAAIAFBAWoQMiAAKAIAIAFqIAI6AAALZAICfAF/An8gACsDAEQAAAAA5DQ1QaIiAUQAAMD////fQaMiAplEAAAAAAAA4EFjBEAgAqoMAQtBgICAgHgLIQMgACABIAO3RAAAwP///99BoqEiATkDACABRAAAwP///99BowtuAQN/IwBBEGsiAyQAIANBADoADyABQQFqIgIgACgCBEoEQCAAIAIQMyAAKAIEIgEgAiABIAJKGyEEA0AgASAERgRAIAAgAjYCBAUgACgCACABaiADLQAPOgAAIAFBAWohAQwBCwsLIANBEGokAAs3AQJ/IAFBACABQQBKGyEDIAAoAgQhAQNAIAIgA0cEQCAAIAFBAWsiATYCBCACQQFqIQIMAQsLC1gBAX8gAUEBdSIDIAAoAswCaiABQQFxOgAAIAAoAowDIANBA3RqIAKtIAA1AqgCQiCGhDcCACAAIAAoApwCIgJBAWo2ApwCIAAoApgCIAJBAnRqIAE2AgALxwUCEH8BfiMAQSBrIgIkACAAQZwDaiEIQX8hCgNAIAAoAoAEIgQgACgCnAJIBEAgACAEQQFqNgKABCACIAAoApgCIARBAnRqKAIANgIcIAJBHGoiBCgCACIBIAgoAhBqLQAABEAgCCAEECogBCgCACEBCyAIKAIAIAFBDGxqIgsoAgAiASALKAIEQQN0aiEJIAEhAwNAIAMgCUcEQCACIAAoAswCIAMoAgQiBkEBdWotAAAgBkEBcXM6ABAgAkEQakHAKS0AABBNBEAgASADKQIANwIAIAFBCGohASADQQhqIQMMAgsgACgCoAQgAygCACIEQQJ0aiIHKAIEIgUgAigCHEEBcyIMRgRAIAcoAgghBSAHIAw2AgggByAFNgIECyACIAQ2AhAgA0EIaiEDIAIgBTYCFAJAIAUgBkYNACACIAAoAswCIAVBAXVqLQAAIAVBAXFzOgAPIAJBD2pBwCktAAAQTUUNACABIAIpAxA3AgAgAUEIaiEBDAILIAdBBGohD0ECIQYCQANAIAYgBygCAEEFdk8NASACIAAoAswCIA8gBkECdGoiDSgCACIQQQF1ai0AACAQQQFxczoADyAGQQFqIQYgAkEPakHBKS0AABBSRQ0ACyAHIA0oAgA2AgggDSAMNgIAIAgoAgAgBygCCEEBc0EMbGogAkEQahAcDAILIAEgAikDEDcCACACIAAoAswCIAVBAXVqLQAAIAVBAXFzOgAPIAFBCGohASACQQ9qQcEpLQAAEE0EQCAAIAAoApwCNgKABANAIAMgCU8EQCAEIQoMBAUgASADKQIANwIAIAFBCGohASADQQhqIQMMAQsACwAFIAAgBSAEEBkMAgsACwsgCyAJIAFrQQN1EBggDkEBaiEODAELCyAAIA6tIhEgACkDuAF8NwO4ASAAIAApA4gEIBF9NwOIBCACQSBqJAAgCgu8AQEFfyMAQRBrIgIkACAAKAKgBCABQQJ0aiIDKAIEIQQgACgCnAMgAiADKAIINgIMIAIgATYCCCAEQQFzQQxsaiACQQhqIgYQHCADKAIIIQQgACgCnAMgAiADKAIENgIMIAIgATYCCCAEQQFzQQxsaiAGEBwgAEHYAUHQASADKAIAQQRxIgEbaiIEIAQpAwBCAXw3AwAgAEHoAUHgASABG2oiACAAKQMAIAMoAgBBBXatfDcDACACQRBqJAALQQEBfyAAKAIEIgIgACgCCEYEQCAAIAJBAWoQHSAAKAIEIQILIAAgAkEBajYCBCAAKAIAIAJBA3RqIAEpAgA3AgALCwAgACABQQMQ3gEL8QEBBH8jAEEQayIDJAAgAEGcA2ohBSAAKAKgBCABQQJ0aiEEAkAgAgRAIAUoAgAgBCgCBCADIAQoAgg2AgwgAyABNgIIQQFzQQxsaiADQQhqIgYQHyAFKAIAIAQoAgggAyAEKAIENgIMIAMgATYCCEEBc0EMbGogBhAfDAELIAMgBCgCBEEBczYCCCAFIANBCGoiARAgIAMgBCgCCEEBczYCCCAFIAEQIAsgAEHYAUHQASAEKAIAQQRxIgEbaiICIAIpAwBCAX03AwAgAEHoAUHgASABG2oiACAAKQMAIAQoAgBBBXatfTcDACADQRBqJAALkQEBBH8gACgCBCIEQQAgBEEAShshAiABKAIAIQUgACgCACEBA0ACQCACIANHBEAgASADQQN0aigCACAFRw0BIAMhAgsDQCACIARBAWsiAU5FBEAgACgCACIBIAJBA3RqIAEgAkEBaiICQQN0aikCADcCACAAKAIEIQQMAQsLIAAgATYCBA8LIANBAWohAwwACwALKAEBfyAAKAIQIAEoAgBqIgItAABFBEAgAkEBOgAAIABBIGogARBJCwt5AQF/IAAoAqAEIQIgACABQQAQHiAAIAIgAUECdGoiAhAiBEAgACgCjAMgAigCBEECdEF4cWpBfzYCAAsgAiACKAIAQXxxQQFyNgIAIAAgACgCrAQgACgCoAQgAUECdGooAgAiAEEFdmogAEEDdkEBcWpBAWo2AqwEC3kBA38jAEEQayIDJAAgAyAAKALMAiABKAIEIgJBAXVqLQAAIAJBAXFzOgAPQQAhAgJAIANBD2pBwCktAAAQTUUNACAAKAKMAyABKAIEQQJ0QXhxaigCACIEQX9GDQAgACgCoAQgBEECdGogAUYhAgsgA0EQaiQAIAILcQEFfyMAQRBrIgMkACABQQRqIQUDQCACIgQgASgCAEEFdiIGSQRAIAMgACgCzAIgBSAEQQJ0aigCACICQQF1ai0AACACQQFxczoADyAEQQFqIQIgA0EPakHAKS0AABBNRQ0BCwsgA0EQaiQAIAQgBkkL7QEBB38gASAAKAKoAkgEQCAAQaQCaiEFIABBmAJqIQYgACgCnAIhAiABQQJ0IQcDQCAFKAIAIAdqIgMoAgAiBCACTgRAIAAgBDYCgAQgBiAAKAKcAiADKAIAaxAYIAUgACgCqAIgAWsQGAUgAkEBayICQQJ0IgQgACgCmAJqKAIAQQF1IgMgACgCzAJqQcIpLQAAOgAAAkAgACgCWCIIQQFMBEAgCEEBRw0BIAIgACgCpAIgACgCqAJBAnRqQQRrKAIATA0BCyAAKALcAiADaiAAKAKYAiAEai0AAEEBcToAAAsgACADEGIMAQsLCwuBAgIJfwJ8IAAoAgAiAyABQQJ0aigCACEFIAAoAgwhCCAAKAIcIQkDQAJAIAFBAXQiAkEBciIEIAAoAgQiBk4NAAJAIAYgAkECaiIKTARAIAkoAgAiByADIARBAnRqKAIAIgJBA3RqKwMAIQsMAQsgCSgCACIHIAMgCkECdGooAgAiBkEDdGorAwAiDCAHIAMgBEECdGooAgAiAkEDdGorAwAiC2RFDQAgDCELIAYhAiAKIQQLIAsgByAFQQN0aisDAGRFDQAgAyABQQJ0aiACNgIAIAggAkECdGogATYCACAEIQEMAQsLIAMgAUECdGogBTYCACAIIAVBAnRqIAE2AgALQQEBfyAAKAIEIgEgACgCCEYEQCAAIAFBAWoQTyAAKAIEIQELIAAoAgAgAUECdGpBADYCACAAIAAoAgRBAWo2AgQLxwEDBH8BfAF9IAEgASgCAEEDdkH8////AXFqIgEgACsD8AMiBiABKgIEu6C2Igc4AgQgB7tEQIy1eB2vFURkBEBBACEBIAAoApACIgJBACACQQBKGyECIAAoAqAEIQQgACgCjAIhBQNAIAEgAkYEQCAAIAZEI0KSDKGcxzuiOQPwAwUgBCAFIAFBAnRqKAIAQQJ0aiIDIAMoAgBBA3ZB/P///wFxaiIDIAMqAgS7RCNCkgyhnMc7orY4AgQgAUEBaiEBDAELCwsLPgEBfwNAIAEgACgCFE5FBEAgACgCACAAKAIQIAFBAnRqKAIAakEAOgAAIAFBAWohAQwBCwsgAEEQakEAEBILRQEBfyMAQRBrIgIkACACIAE2AgwgACABEBcgACgCACABaiIBLQAARQRAIAFBAToAACAAQRBqIAJBDGoQSQsgAkEQaiQAC4YBAQV/IAAoAgAgASgCAEEMbGohBANAIAMgBCgCBE5FBEAgACgCLCgCACAEKAIAIgUgA0EDdGoiBigCAEECdGooAgBBA3FBAUcEQCAFIAJBA3RqIAYpAgA3AgAgAkEBaiECCyADQQFqIQMMAQsLIAQgAyACaxAYIAAoAhAgASgCAGpBADoAAAvkAgEIfyMAQRBrIgUkACAFIAI2AgwCQCABQQ9MBEAgACEEQQAhACMAQRBrIgYkACAGIAI2AgxBASABIgcgAUEBTBtBAWshCQNAIAAgCUcEQCAAQQFqIgEhAyAAIQIDQCAEIAJBAnRqIgooAgAhCCADIAdHBEAgAyACIAZBDGogBCADQQJ0aigCACAIEDgbIQIgA0EBaiEDDAELCyAEIABBAnRqIgAoAgAhAiAAIAg2AgAgCiACNgIAIAEhAAwBCwsgBkEQaiQADAELIAAgAUEBdEF8cWooAgAhAyABIQRBfyECA0AgBUEMaiAAIAJBAWoiAkECdGoiBygCACADEDgNAANAIAVBDGogAyAAIARBAWsiBEECdGoiBigCABA4DQALIAIgBEgEQCAHKAIAIQggByAGKAIANgIAIAYgCDYCAAwBCwsgACACIAUoAgwQKyAHIAEgAmsgBSgCDBArCyAFQRBqJAALkQIBCX8jAEEQayIFJAADQCABKAIEIANKBEACQCAAIAAoAqAEIANBAnQiByABKAIAaigCAEECdGoiBBAjRQRAIARBBGohCEECIQIDQCAEKAIAQQV2IAJMBEAgASgCACICIAZBAnRqIAIgB2ooAgA2AgAgBkEBaiEGDAMFIAUgACgCzAIgCCACQQJ0aiIJKAIAIgpBAXVqLQAAIApBAXFzOgAPIAVBD2pBwSktAAAQTQR/IAkgBCgCAEEDdkH8////AXEgCGpBBGsoAgA2AgAgBBB1IAJBAWsFIAILQQFqIQIMAQsACwALIAAgASgCACAHaigCABAhCyADQQFqIQMMAQsLIAEgAyAGaxAYIAVBEGokAAvFAgEFfyMAQSBrIgIkACACQQA2AhwgAkIANwIUA0AgAiABNgIQIAAoApwEIAFKBEACQCAAKAL8AiABai0AAEUNACACIAAoAswCIAFqLQAAOgAPIAJBD2pBwiktAAAQTUUNACACQRRqIAJBEGoQSQsgAigCEEEBaiEBDAELCyACQRRqIQRBACEBIABBzANqIgAoAgwhBSAAKAIAIQMDQCAAKAIEIAFMBEAgAwRAIABBADYCBAtBACEBA0AgBCgCBCABTARAAkAgACgCBEECbSEBA0AgAUEATA0BIAAgAUEBayIBECUMAAsACwUgACgCDCAEKAIAIAFBAnRqIgMoAgBBAnRqIAE2AgAgACADEEkgAUEBaiEBDAELCwUgBSADIAFBAnRqKAIAQQJ0akF/NgIAIAFBAWohAQwBCwsgBBAPIAJBIGokAAvUAwEGfwJAIAAtAOwDQQFGBEAgABAaQX9GDQELIABBADoA7ANBAA8LAkAgACgCnAIgACgChARGDQAgACkDiARCAFUNACAAIABBjAJqECwCQCAALQCYBEEBRw0AIAAgAEGAAmoQLANAIAAoArgEIAFMBEAgAEGYAmogACgCzAQhBSAAKAKYAiEDQQAhAQNAIAEgACgCnAJORQRAIAUgAyABQQJ0aigCACIGQQF1ai0AAEUEQCADIAJBAnRqIAY2AgAgAkEBaiECCyABQQFqIQEMAQsLIAEgAmsQGCAAIAAoApwCNgKABEEAIQEDQCAAKAK4BCICIAFMBEAgAEHABGohA0EAIQEDQCABIAJORQRAIAMQJiAAKALABCAAKALEBEECdGpBBGsgACgCtAQgAUECdGooAgA2AgAgAUEBaiEBIAAoArgEIQIMAQsLIAAoArQERQ0EIABBADYCuAQFIAAoAswEIAAoArQEIAFBAnRqKAIAakEAOgAAIAFBAWohAQwBCwsFIAAoAswEIAAoArQEIAFBAnRqKAIAakEBOgAAIAFBAWohAQwBCwsLIAAQVSAAEC0gACAAKAKcAjYChAQgACAAKQPoASAAKQPgAXw3A4gEC0EBC6EBAgN8B38gAEGcAmohBSAAKAKkAiIGQQRrIQdEAAAAAAAA8D8gACgCnAS3IgKjIQNBfyAAKAKoAiIEIARBAEgbQQFqIQhBACEAA0AgACAIRkUEQCAABH8gByAAQQJ0aigCAAVBAAshCSAFIAYgAEECdGogACAERhsoAgAhCiADIAC4EIUBIAogCWu3oiABoCEBIABBAWohAAwBCwsgASACowtIAgF+AX8CQCAALQCoBQ0AIAApA5gFIgFCAFkEQCAAKQPAASABWg0BCyAAKQOgBSIBQgBTBEBBAQ8LIAApA7gBIAFUIQILIAILLAEBfyMAQRBrIgEkACABIAAoApwCNgIMIABBpAJqIAFBDGoQSSABQRBqJAALUwEDfyABIAAoAgRKBEAgACABEDMgACgCBCICIAEgASACSBshAyAAKAIAIQQDQCACIANGBEAgACABNgIEBSACIARqQQA6AAAgAkEBaiECDAELCwsLeQECfwJAIAAoAggiAiABTg0AIAEgAmtBAWpBfnEiASACQQF1QX5xQQJqIgMgASADShsiASACQf////8Hc0wEQCAAIAEgAmoiATYCCCAAIAAoAgAgARCVASIANgIAIAANAUHILygCAEEwRw0BCxDNAUHwHEEAEAAACwvWBAEGfyAAQZwDaiECA0ACQCACKAIgIQUgAigCJCADTARAIAUEQCACQQA2AiQLDAELIAIoAhAgBSADQQJ0aiIFKAIAai0AAARAIAIgBRAqCyADQQFqIQMMAQsLIABBoARqIQUDQCAAKAKcBCAESgRAIARBAXQhB0EAIQMDQCADQQJGBEAgBEEBaiEEDAMLIAAoApwDIAMgB3JBDGxqIQZBACECA0AgBigCBCACTARAIANBAWohAwwCBSAFIAYoAgAgAkEDdGogARBjIAJBAWohAgwBCwALAAsACwtBACECA0AgACgCnAIgAkwEQAJAIABBjAJqIQRBACECQQAhAwNAIAIgACgCkAJODQEgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAALAAsFAkAgACgCjAMiAyAAKAKYAiACQQJ0aigCAEEBdUEDdCIEaigCACIGQX9GDQAgBSAFKAIAIAZBAnRqIgYtAABBEHEEfyADBSAAIAYQIkUNASAAKAKMAwsgBGogARBjCyACQQFqIQIMAQsLIAQgAiADaxAYIABBgAJqIQRBACECQQAhAwNAIAAoAoQCIAJKBEAgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAELCyAEIAIgA2sQGAtyAQN/IwBBIGsiASQAIAAgAUEMaiAAKAKkBCAAKAKsBGsQZSICEDQgACgCLEECTgRAIAAoAqQEIQMgASACKAIEQQJ0NgIEIAEgA0ECdDYCAEHJFyABEI0BCyACIABBoARqEGYgAigCABCUASABQSBqJAALTgEBfyAAKAIABEADQCAAKAIEIAFMBEAgAEEANgIEIAAoAgAQlAEgAEEANgIIIABBADYCAAUgACgCACABQQxsahAPIAFBAWohAQwBCwsLC5YCAQd/A0AgAUEPSgRAIAAgAUEBdEF8cWooAgAhBEF/IQIgASEDA0AgACACQQFqIgJBAnRqIgYoAgAiByAESA0AA0AgBCAAIANBAWsiA0ECdGoiCCgCACIFSA0ACyACIANIBEAgBiAFNgIAIAggBzYCAAwBCwsgACACEDcgASACayEBIAYhAAwBCwsgACEFQQAhAEEBIAEiBiABQQFMG0EBayEHA0AgACAHRwRAIAAhAyAAQQFqIgEhAgNAIAUgA0ECdGoiCCgCACEEIAIgBkcEQCACIAMgBSACQQJ0aigCACAESBshAyACQQFqIQIMAQsLIAUgAEECdGoiAygCACEAIAMgBDYCACAIIAA2AgAgASEADAELCwtaAQF/IAAoAgAoAgAiACABQQJ0aiIBKAIAIgNB4ABJBEBBAA8LIAAgAkECdGoiACgCAEEFdiICQQJGBEBBAQ8LIAEgA0EFdkECdGoqAgQgACACQQJ0aioCBF0LHgAgACACIAMgAUGnEBA6IgAgBDoAFCAAQYwbNgIAC3ABAX8jAEEQayIFJAAgACAENgIQIAAgAzYCDCAAIAI2AgggACABNgIEIABB5Bs2AgBBvC8tAABBAXFFBEBBsC9CADcCAEG4L0EANgIAQbwvQQE6AAALIAUgADYCDEGwLyAFQQxqEEkgBUEQaiQAIAALBAAgAAuzBwIDfwF8IwBBEGsiAyQAIwBBEGsiASQAIABCADcCBCAAQaAaNgIAIABCADcDICAAQgA3AgwgAEIANwIUIABCADcDKCAAQfgpKwMAOQMwIABBsCorAwA5AzggAEHoKisDADkDQCAAQaArKwMAOQNIIABBlCwtAAA6AFAgAEHEKygCADYCVEHkKygCACECIABBADoAXCAAIAI2AlggAEH8Ky0AADoAXSAAQaAtKwMAOQNgIABBxC0oAgA2AmggAEG0LCgCADYCbEHoLCsDACEEIABBADYClAMgAEIANwKMAyAAQQA2AoQDIABCADcC/AIgAEEANgL0AiAAQgA3AuwCIABBADYC5AIgAEIANwLcAiAAQQA2AtQCIABCADcCzAIgAEKAgICAgICA/D83A5ABIABB5AA2AogBIABCmrPmzJmz5vg/NwOAASAAQtWq1arVqtXqPzcDeCAAIAQ5A3AgAEGYAWpBAEGwARCEARogASAAQaAEaiICNgIMIABBnANqIAFBDGoQDSAAQgA3AtwDIABCADcC1AMgAEIANwLMAyAAQgA3A4gEIABCgICAgHA3A4AEIABCgICAgICAgPg/NwP4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QoCAgICAgID/PxCdASADQUBrIAMpA1AgAykDWCAbIB0QpgEgAykDSCEdQQEhAiADKQNAIRsLIBlCAXwhGUEBIRILIAEoAgQiBCABKAJoRwR/IAEgBEEBajYCBCAELQAABSABELgBCyEEDAELC0EuIQQLAn4gEkUEQCABKQNwQgBZBEACQCABIAEoAgQiBEEBazYCBCABIARBAms2AgQgCkUNACABIARBA2s2AgQLCyADQeAAakQAAAAAAAAAACAGt6YQqgEgAykDYCEbIAMpA2gMAQsgGUIHVwRAIBkhGgNAIAdBBHQhByAaQgF8IhpCCFINAAsLAkACQAJAIARBX3FB0ABGBEAgARC6ASIaQoCAgICAgICAgH9SDQMgASkDcEIAWQ0BDAILQgAhGiABKQNwQgBTDQILIAEgASgCBEEBazYCBAtCACEaCyAHRQRAIANB8ABqRAAAAAAAAAAAIAa3phCqASADKQNwIRsgAykDeAwBCyAcIBkgChtCAoYgGnxCIH0iGUEAIAlrrVUEQEHIL0HEADYCACADQaABaiAGEKkBIANBkAFqIAMpA6ABIAMpA6gBQn9C////////v///ABCdASADQYABaiADKQOQASADKQOYAUJ/Qv///////7///wAQnQEgAykDgAEhGyADKQOIAQwBCyAJQeIBa6wgGVcEQCAHQQBOBEADQCADQaADaiAbIB1CAEKAgICAgIDA/79/EKYBIBsgHUKAgICAgICA/z8QmQEhASADQZADaiAbIB0gAykDoAMgGyABQQBOIgEbIAMpA6gDIB0gARsQpgEgASAHQQF0IgRyIQcgGUIBfSEZIAMpA5gDIR0gAykDkAMhGyAEQQBODQALCwJ+IBlBICAJa618IhqnIgFBACABQQBKGyAMIBogDK1TGyIBQfEATwRAIANBgANqIAYQqQEgAykDiAMhHCADKQOAAyEeQgAMAQsgA0HgAmpEAAAAAAAA8D9BkAEgAWsQkAEQqgEgA0HQAmogBhCpASADKQPQAiEeIANB8AJqIAMpA+ACIAMpA+gCIAMpA9gCIhwQuwEgAykD+AIhHyADKQPwAgshGiADQcACaiAHIAdBAXFFIBsgHUIAQgAQmAFBAEcgAUEgSXFxIgFyEKsBIANBsAJqIB4gHCADKQPAAiADKQPIAhCdASADQZACaiADKQOwAiAD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gMD/PxCmASACKQPIAyEcIAIpA8ADIRkLIAJBsANqIBsgGiAZIBwQpgEgAkGgA2ogAikDsAMgAikDuAMgHiAdEKcBIAIpA6gDIRogAikDoAMhGwJAIBdBAmsgBUH/////B3FODQAgAiAaQv///////////wCDNwOYAyACIBs3A5ADIAJBgANqIBsgGkIAQoCAgICAgID/PxCdASACKQOQAyACKQOYA0KAgICAgICAuMAAEJkBIQEgAikDiAMgGiABQQBOIgYbIRogAikDgAMgGyAGGyEbIAMgBCAJRyABQQBIcnEgGSAcQgBCABCYAUEAR3FFIBcgBiALaiILQe4Aak5xDQBByC9BxAA2AgALIAJB8AJqIBsgGiALELwBIAIpA/gCIRkgAikD8AILIRogDSAZNwMoIA0gGjcDICACQZDGAGokACANKQMoIRkgDSkDICEaDAELQgAhGgsgDyAaNwMAIA8gGTcDCCANQTBqJAAgDykDCCEZIA8pAwAhGiAWBEAgFiAPKAKIASATIA8oAhQgDygCPGtqajYCAAsgGCIBIBk3AwggASAaNwMAIA9BoAFqJAAgASkDACABKQMIEKgBISAgAUEQaiQAIA4oAhgiAQRAIAArAyAiISAgZQRAIAAtAClBAUcgICAhYnINAwsgACsDGCIhICBmBEAgAC0AKEEBRyAgICFicg0ECyAAICA5AzALIAFBAEchAQsgDkEgaiQAIAEPCyAOIAAoAgQ2AhQgDiATNgIQQYAiKAIAQZUZIA5BEGoQsQFBARABAAsgDiAAKAIENgIEIA4gEzYCAEGAIigCAEHkGCAOELEBQQEQAQALzgECBX8CfCMAQUBqIgIkACAALQAoIQMgACgCBCEEIAAoAhAhBSAALQApIQYgACsDGCEHIAArAyAhCCACIAArAzA5AzggAiAIOQMoIAIgBzkDICACQd0AQSkgBhs2AjAgAiAFNgIUIAIgBDYCECACQdsAQSggAxs2AhhBgCIoAgAhAyMAQRBrIgQkACAEIAJBEGoiBTYCDCADQdUZIAUQswEgBEEQaiQAIAEEQCACIAAoAgg2AgAgA0HXGCACELEBQQogAxCJAQsgAkFAayQAC3oBAn8CQCABIAAoAggiA0sEQCADIQICQANAIAEgAk0NASAAIAIgAkEBdiACQQN2akF+cWpBAmoiAjYCCCAC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AwAhBAwBCyABIAJC////////////AIMiCiADIARC////////////AIMiCRCYAUEATARAIAEgCiADIAkQmAEEQCABIQQMAgsgBUHwAGogASACQgBCABCdASAFKQN4IQIgBSkDcCEEDAELIARCMIinQf//AXEhByAGBH4gAQUgBUHgAGogASAKQgBCgICAgICAwLvAABCdASAFKQNoIgpCMIinQfgAayEGIAUpA2ALIQQgB0UEQCAFQdAAaiADIAlCAEKAgICAgIDAu8AAEJ0BIAUpA1giCUIwiKdB+ABrIQcgBSkDUCEDCyAJQv///////z+DQoCAgICAgMAAhCELIApC////////P4NCgICAgICAwACEIQogBiAHSgRAA0ACfiAKIAt9IAMgBFatfSIJQgBZBEAgCSAEIAN9IgSEUARAIAVBIGogASACQgBCABCdASAFKQMoIQIgBSkDICEEDAULIAlCAYYgBEI/iIQMAQsgCkIBhiAEQj+IhAshCiAEQgGGIQQgBkEBayIGIAdKDQALIAchBgsCQCAKIAt9IAMgBFatfSIJQgBTBEAgCiEJDAELIAkgBCADfSIEhEIAUg0AIAVBMGogASACQgBCABCdASAFKQM4IQIgBSkDMCEEDAELIAlC////////P1gEQANAIARCP4ggBkEBayEGIARCAYYhBCAJQgGGhCIJQoCAgICAgMAAVA0ACwsgCEGAgAJxIQcgBkEATARAIAVBQGsgBCAJQv///////z+DIAZB+ABqIAdyrUIwhoRCAEKAgICAgIDAwz8QnQEgBSkDSCECIAUpA0AhBAwBCyAJQv///////z+DIAYgB3KtQjCGhCECCyAAIAQ3AwAgACACNwMIIAVBgAFqJAAL1ycBC38jAEEQayIKJAACQAJAAkACQAJAAkACQAJAAkACQCAAQfQBTQRAQcwvKAIAIgRBECAAQQtqQfgDcSAAQQtJGyIGQQN2IgB2IgFBA3EEQAJAIAFBf3NBAXEgAGoiAkEDdCIBQfQvaiIAIAFB/C9qKAIAIgEoAggiBUYEQEHMLyAEQX4gAndxNgIADAELIAUgADYCDCAAIAU2AggLIAFBCGohACABIAJBA3QiAkEDcjYCBCABIAJqIgEgASgCBEEBcjYCBAwLCyAGQdQvKAIAIghNDQEgAQRAAkBBAiAAdCICQQAgAmty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QEEADwsgASADg0IAWQRAIAAgAlQgASADUyABIANRGwRAQX8PCyAAIAKFIAEgA4WEQgBSDwsgACACViABIANVIAEgA1EbBEBBfw8LIAAgAoUgASADhYRCAFIhBAsgBAvAAQIBfwJ+QX8hAwJAIABCAFIgAUL///////////8AgyIEQoCAgICAgMD//wBWIARCgICAgICAwP//AFEbDQAgAkL///////////8AgyIFQoCAgICAgMD//wBWIAVCgICAgICAwP//AFJxDQAgACAEIAWEhFAEQEEADwsgASACg0IAWQRAIAEgAlIgASACU3ENASAAIAEgAoWEQgBSDwsgAEIAUiABIAJVIAEgAlEbDQAgACABIAKFhEIAUiEDCyADC1ABAX4CQCADQcAAcQRAIAEgA0FAaq2GIQJCACEBDAELIANFDQAgAiADrSIEhiABQcAAIANrrYiEIQIgASAEhiEBCyAAIAE3AwAgACACNwMIC74PAgV/D34jAEHQAmsiBSQAIARC////////P4MhCiACQv///////z+DIQsgAiAEhUKAgICAgICAgIB/gyEMIARCMIinQf//AXEhCAJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAhB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiDUKAgICAgIDA//8AVCANQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQwMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhDCADIQEMAgsgASANQoCAgICAgMD//wCFhFAEQCADIAJCgICAgICAwP//AIWEUARAQgAhAUKAgICAgIDg//8AIQwMAwsgDEKAgICAgIDA//8AhCEMQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAQgAhAQwCCyABIA2EUARAQoCAgICAgOD//wAgDCACIAOEUBshDEIAIQEMAgsgAiADhFAEQCAMQoCAgICAgMD//wCEIQxCACEBDAILIA1C////////P1gEQCAFQcACaiABIAsgASALIAtQIgYbeSAGQQZ0rXynIgZBD2sQmgFBECAGayEGIAUpA8gCIQsgBSkDwAIhAQsgAkL///////8/Vg0AIAVBsAJqIAMgCiADIAogClAiBxt5IAdBBnStfKciB0EPaxCaASAGIAdqQRBrIQYgBSkDuAIhCiAFKQOwAiEDCyAFQaACaiAKQoCAgICAgMAAhCISQg+GIANCMYiEIgJCAEKAgICAsOa8gvUAIAJ9IgRCABCeASAFQZACakIAIAUpA6gCfUIAIARCABCeASAFQYACaiAFKQOYAkIBhiAFKQOQAkI/iIQiBEIAIAJCABCeASAFQfABaiAEQgBCACAFKQOIAn1CABCeASAFQeABaiAFKQP4AUIBhiAFKQPwAUI/iIQiBEIAIAJCABCeASAFQdABaiAEQgBCACAFKQPoAX1CABCeASAFQcABaiAFKQPYAUIBhiAFKQPQAUI/iIQiBEIAIAJCABCeASAFQbABaiAEQgBCACAFKQPIAX1CABCeASAFQaABaiACQgAgBSkDuAFCAYYgBSkDsAFCP4iEQgF9IgJCABCeASAFQZABaiADQg+GQgAgAkIAEJ4BIAVB8ABqIAJCAEIAIAUpA6gBIAUpA6ABIg0gBSkDmAF8IgQgDVStfCAEQgFWrXx9QgAQngEgBUGAAWpCASAEfUIAIAJCABCeASAGIAkgCGtqIQYCfyAFKQNwIhNCAYYiDiAFKQOIASIPQgGGIAUpA4ABQj+IhHwiEELn7AB9IhRCIIgiAiALQoCAgICAgMAAhCIVQgGGIhZCIIgiBH4iESABQgGGIg1CIIgiCiAQIBRWrSAOIBBWrSAFKQN4QgGGIBNCP4iEIA9CP4h8fHxCAX0iE0IgiCIQfnwiDiARVK0gDiAOIBNC/////w+DIhMgAUI/iCIXIAtCAYaEQv////8PgyILfnwiDlatfCAEIBB+fCAEIBN+IhEgCyAQfnwiDyARVK1CIIYgD0IgiIR8IA4gDiAPQiCGfCIOVq18IA4gDiAUQv////8PgyIUIAt+IhEgAiAKfnwiDyARVK0gDyAPIBMgDUL+////D4MiEX58Ig9WrXx8Ig5WrXwgDiAEIBR+IhggECARfnwiBCACIAt+fCILIAogE358IhBCIIggCyAQVq0gBCAYVK0gBCALVq18fEIghoR8IgQgDlStfCAEIA8gAiARfiICIAogFH58IgpCIIggAiAKVq1CIIaEfCICIA9UrSACIBBCIIZ8IAJUrXx8IgIgBFStfCIEQv////////8AWARAIBYgF4QhFSAFQdAAaiACIAQgAyASEJ4BIAFCMYYgBSkDWH0gBSkDUCIBQgBSrX0hCkIAIAF9IQsgBkH+/wBqDAELIAVB4ABqIARCP4YgAkIBiIQiAiAEQgGIIgQgAyASEJ4BIAFCMIYgBSkDaH0gBSkDYCINQgBSrX0hCkIAIA19IQsgASENIAZB//8AagsiBkH//wFOBEAgDEKAgICAgIDA//8AhCEMQgAhAQwBCwJ+IAZBAEoEQCAKQgGGIAtCP4iEIQEgBEL///////8/gyAGrUIwhoQhCiALQgGGDAELIAZBj39MBEBCACEBDAILIAVBQGsgAiAEQQEgBmsQnAEgBUEwaiANIBUgBkHwAGoQmgEgBUEgaiADIBIgBSkDQCICIAUpA0giChCeASAFKQM4IAUpAyhCAYYgBSkDICIBQj+IhH0gBSkDMCIEIAFCAYYiDVStfSEBIAQgDX0LIQQgBUEQaiADIBJCA0IAEJ4BIAUgAyASQgVCABCeASAKIAIgAiADIAQgAkIBgyIEfCIDVCABIAMgBFStfCIBIBJWIAEgElEbrXwiAlatfCIEIAIgAiAEQoCAgICAgMD//wBUIAMgBSkDEFYgASAFKQMYIgRWIAEgBFEbca18IgJWrXwiBCACIARCgICAgICAwP//AFQgAyAFKQMAViABIAUpAwgiA1YgASADURtxrXwiASACVK18IAyEIQwLIAAgATcDACAAIAw3AwggBUHQAmokAAtQAQF+AkAgA0HAAHEEQCACIANBQGqtiCEBQgAhAgwBCyADRQ0AIAJBwAAgA2uthiABIAOtIgSIhCEBIAIgBIghAgsgACABNwMAIAAgAjcDCAu/CgIFfw9+IwBB4ABrIgUkACAEQv///////z+DIQwgAiAEhUKAgICAgICAgIB/gyEKIAJC////////P4MiDUIgiCEOIARCMIinQf//AXEhBwJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAdB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiC0KAgICAgIDA//8AVCALQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQoMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhCiADIQEMAgsgASALQoCAgICAgMD//wCFhFAEQCACIAOEUARAQoCAgICAgOD//wAhCkIAIQEMAwsgCkKAgICAgIDA//8AhCEKQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAIAEgC4RCACEBUARAQoCAgICAgOD//wAhCgwDCyAKQoCAgICAgMD//wCEIQoMAgsgASALhFAEQEIAIQEMAgsgAiADhFAEQEIAIQEMAgsgC0L///////8/WARAIAVB0ABqIAEgDSABIA0gDVAiBht5IAZBBnStfKciBkEPaxCaAUEQIAZrIQYgBSkDWCINQiCIIQ4gBSkDUCEBCyACQv///////z9WDQAgBUFAayADIAwgAyAMIAxQIggbeSAIQQZ0rXynIghBD2sQmgEgBiAIa0EQaiEGIAUpA0ghDCAFKQNAIQMLIANCD4YiC0KAgP7/D4MiAiABQiCIIgR+IhAgC0IgiCITIAFC/////w+DIgF+fCIPQiCGIhEgASACfnwiCyARVK0gAiANQv////8PgyINfiIVIAQgE358IhEgDEIPhiISIANCMYiEQv////8PgyIDIAF+fCIUIA8gEFStQiCGIA9CIIiEfCIPIAIgDkKAgASEIgx+IhYgDSATfnwiDiASQiCIQoCAgIAIhCICIAF+fCIQIAMgBH58IhJCIIZ8Ihd8IQEgByAJaiAGakH//wBrIQYCQCACIAR+IhggDCATfnwiBCAYVK0gBCAEIAMgDX58IgRWrXwgAiAMfnwgBCAEIBEgFVStIBEgFFatfHwiBFatfCADIAx+IgMgAiANfnwiAiADVK1CIIYgAkIgiIR8IAQgAkIghnwiAiAEVK18IAIgAiAQIBJWrSAOIBZUrSAOIBBWrXx8QiCGIBJCIIiEfCICVq18IAIgAiAPIBRUrSAPIBdWrXx8IgJWrXwiBEKAgICAgIDAAINQRQRAIAZBAWohBgwBCyALQj+IIARCAYYgAkI/iIQhBCACQgGGIAFCP4iEIQIgC0IBhiELIAFCAYaEIQELIAZB//8BTgRAIApCgICAgICAwP//AIQhCkIAIQEMAQsCfiAGQQBMBEBBASAGayIHQf8ATQRAIAVBMGogCyABIAZB/wBqIgYQmgEgBUEgaiACIAQgBhCaASAFQRBqIAsgASAHEJwBIAUgAiAEIAcQnAEgBSkDMCAFKQM4hEIAUq0gBSkDICAFKQMQhIQhCyAFKQMoIAUpAxiEIQEgBSkDACECIAUpAwgMAgtCACEBDAILIARC////////P4MgBq1CMIaECyAKhCEKIAtQIAFCAFkgAUKAgICAgICAgIB/URtFBEAgCiACQgF8IgFQrXwhCgwBCyALIAFCgICAgICAgICAf4WEUEUEQCACIQEMAQsgCiACIAJCAYN8IgEgAlStfCEKCyAAIAE3AwAgACAKNwMIIAVB4ABqJAALdQEBfiAAIAEgBH4gAiADfnwgA0IgiCICIAFCIIgiBH58IANC/////w+DIgMgAUL/////D4MiAX4iBUIgiCADIAR+fCIDQiCIfCABIAJ+IANC/////w+DfCIBQiCIfDcDCCAAIAVC/////w+DIAFCIIaENwMACw4AQaCEBSQCQaCEASQBCwcAIwAjAWsLBAAjAgsEACMBCwYAIAAkAAsQACMAIABrQXBxIgAkACAACwQAIwALzgkCBH8EfiMAQfAAayIGJAAgBEL///////////8AgyEJAkACQCABUCIFIAJC////////////AIMiCkKAgICAgIDA//8AfUKAgICAgIDAgIB/VCAKUBtFBEAgA0IAUiAJQoCAgICAgMD//wB9IgtCgICAgICAwICAf1YgC0KAgICAgIDAgIB/URsNAQsgBSAKQoCAgICAgMD//wBUIApCgICAgICAwP//AFEbRQRAIAJCgICAgICAIIQhBCABIQMMAgsgA1AgCUKAgICAgIDA//8AVCAJQoCAgICAgMD//wBRG0UEQCAEQoCAgICAgCCEIQQMAgsgASAKQoCAgICAgMD//wCFhFAEQEKAgICAgIDg//8AIAIgASADhSACIASFQoCAgICAgICAgH+FhFAiBRshBEIAIAEgBRshAwwCCyADIAlCgICAgICAwP//AIWEUA0BIAEgCoRQBEAgAyAJhEIAUg0CIAEgA4MhAyACIASDIQQMAgsgAyAJhFBFDQAgASEDIAIhBAwBCyADIAEgASADVCAJIApWIAkgClEbIggbIQogBCACIAgbIgxC////////P4MhCSACIAQgCBsiC0IwiKdB//8BcSEHIAxCMIinQf//AXEiBUUEQCAGQeAAaiAKIAkgCiAJIAlQIgUbeSAFQQZ0rXynIgVBD2sQmgEgBikDaCEJIAYpA2AhCkEQIAVrIQULIAEgAyAIGyEDIAtC////////P4MhASAHBH4gAQUgBkHQAGogAyABIAMgASABUCIHG3kgB0EGdK18pyIHQQ9rEJoBQRAgB2shByAGKQNQIQMgBikDWAtCA4YgA0I9iIRCgICAgICAgASEIQEgCUIDhiAKQj2IhCACIASFIQQCfiADQgOGIgIgBSAHRg0AGiAFIAdrIgdB/wBLBEBCACEBQgEMAQsgBkFAayACIAFBgAEgB2sQmgEgBkEwaiACIAEgBxCcASAGKQM4IQEgBikDMCAGKQNAIAYpA0iEQgBSrYQLIQlCgICAgICAgASEIQsgCkIDhiEKAkAgBEIAUwRAQgAhA0IAIQQgCSAKhSABIAuFhFANAiAKIAl9IQIgCyABfSAJIApWrX0iBEL/////////A1YNASAGQSBqIAIgBCACIAQgBFAiBxt5IAdBBnStfKdBDGsiBxCaASAFIAdrIQUgBikDKCEEIAYpAyAhAgwBCyAJIAp8IgIgCVStIAEgC3x8IgRCgICAgICAgAiDUA0AIAlCAYMgBEI/hiACQgGIhIQhAiAFQQFqIQUgBEIBiCEECyAMQoCAgICAgICAgH+DIQMgBUH//wFOBEAgA0KAgICAgIDA//8AhCEEQgAhAwwBC0EAIQcCQCAFQQBKBEAgBSEHDAELIAZBEGogAiAEIAVB/wBqEJoBIAYgAiAEQQEgBWsQnAEgBikDACAGKQMQIAYpAxiEQgBSrYQhAiAGKQMIIQQLIARCPYYgAkIDiIQhASAEQgOIQv///////z+DIAetQjCGhCADhCEEAkACQCACp0EHcSIFQQRHBEAgBCABIAEgBUEES618IgNWrXwhBAwBCyAEIAEgASABQgGDfCIDVq18IQQMAQsgBUUNAQsLIAAgAzcDACAAIAQ3AwggBkHwAGokAAtFAQF/IwBBEGsiBSQAIAUgASACIAMgBEKAgICAgICAgIB/hRCmASAFKQMAIQEgACAFKQMINwMIIAAgATcDACAFQRBqJAAL8wMCAn4FfyMAQSBrIgUkACABQv///////z+DIQICfiABQjCIQv//AYMiA6ciBEGB+ABrQf0PTQRAIAJCBIYgAEI8iIQhAiAEQYD4AGutIQMCQCAAQv//////////D4MiAEKBgICAgICAgAhaBEAgAkIBfCECDAELIABCgICAgICAgIAIUg0AIAJCAYMgAnwhAgtCACACIAJC/////////wdWIgQbIQAgBK0gA3wMAQsgACAChFAgA0L//wFSckUEQCACQgSGIABCPIiEQoCAgICAgIAEhCEAQv8PDAELIARB/ocBSwRAQgAhAEL/DwwBC0GA+ABBgfgAIANQIgcbIgggBGsiBkHwAEoEQEIAIQBCAAwBCyAFQRBqIAAgAiACQoCAgICAgMAAhCAHGyICQYABIAZrEJoBIAUgACACIAYQnAEgBSkDCEIEhiAFKQMAIgJCPIiEIQACQCAEIAhHIAUpAxAgBSkDGIRCAFJxrSACQv//////////D4OEIgJCgYCAgICAgIAIWgRAIABCAXwhAAwBCyACQoCAgICAgICACFINACAAQgGDIAB8IQALIABCgICAgICAgAiFIAAgAEL/////////B1YiBBshACAErQshAiAFQSBqJAAgAUKAgICAgICAgIB/gyACQjSGhCAAhL8LfwICfwF+IwBBEGsiAyQAIAACfiABRQRAQgAMAQsgAyABIAFBH3UiAnMgAmsiAq1CACACZyICQdEAahCaASADKQMIQoCAgICAgMAAhUGegAEgAmutQjCGfCABQYCAgIB4ca1CIIaEIQQgAykDAAs3AwAgACAENwMIIANBEGokAAvjAQIEfgJ/IwBBEGsiBiQAIAG9IgVC/////////weDIQIgAAJ+IAVCNIhC/w+DIgNQRQRAIANC/w9SBEAgAkIEiCEEIANCgPgAfCEDIAJCPIYMAgsgAkIEiCEEQv//ASEDIAJCPIYMAQsgAlAEQEIAIQNCAAwBCyAGIAJCACAFp2dBIHIgAkIgiKdnIAJCgICAgBBUGyIHQTFqEJoBQYz4ACAHa60hAyAGKQMIQoCAgICAgMAAhSEEIAYpAwALNwMAIAAgBUKAgICAgICAgIB/gyADQjCGhCAEhDcDCCAGQRBqJAALZwIBfwF+IwBBEGsiAiQAIAACfiABRQRAQgAMAQsgAiABrUIAQfAAIAFnIgFBH3NrEJoBIAIpAwhCgICAgICAwACFQZ6AASABa61CMIZ8IQMgAikDAAs3AwAgACADNwMIIAJBEGokAAvxAQEDfwJAIABFBEBBuCkoAgAEQEG4KSgCABCsASEBC0GgKCgCAARAQaAoKAIAEKwBIAFyIQELQbwzKAIAIgBFDQEDQCAAKAJMGiAA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BEBBACEHDAELQQAhCyAIKAIwIQwDQCAMKAIAIg1FDQEgCEEEaiIKIA0QxAEiDSALaiILIAdLDQEgACAKIA0QvwEgDEEEaiEMIAcgC0sNAAsLIABBICAQIAcgCUGAwABzEMMBIBAgByAHIBBIGyEHDAgLIBQgCkEASHENCUE9IQsgACAIKwMwIBAgCiAJIAcgBRETACIHQQBODQcMCgsgBy0AASEMIAdBAWohBwwACwALIAANCSATRQ0DQQEhBwNAIAQgB0ECdGooAgAiAARAIAMgB0EDdGogACACIAYQwQFBASEOIAdBAWoiB0EKRw0BDAsLCyAHQQpPBEBBASEODAoLA0AgBCAHQQJ0aigCAA0BQQEhDiAHQQFqIgdBCkcNAAsMCQtBHCELDAYLIAggBzoAJ0EBIQogFyENIAwhCQsgCiALIA1rIgwgCiAMShsiASARQf////8Hc0oNA0E9IQsgECABIBFqIgogCiAQSBsiByAYSg0EIABBICAHIAogCRDDASAAIBYgERC/ASAAQTAgByAKIAlBgIAEcxDDASAAQTAgASAMQQAQwwEgACANIAwQvwEgAEEgIAcgCiAJQYDAAHMQwwEgCCgCPCEBDAELCwtBACEODAMLQT0hCwtByC8gCzYCAAtBfyEOCyAIQUBrJAAgDgsYACAALQAAQSBxRQRAIAEgAiAAEIsBGgsLbwEFfyAAKAIAIgMsAABBMGsiAUEJSwRAQQAPCwNAQX8hBCACQcyZs+YATQRAQX8gASACQQpsIgVqIAEgBUH/////B3NLGyEECyAAIANBAWoiBTYCACADLAABIAQhAiAFIQNBMGsiAUEKSQ0ACyACC7wCAAJAAkACQAJAAkACQAJAAkACQAJAAkAgAUEJaw4SAAgJCggJAQIDBAoJCgoICQUGBwsgAiACKAIAIgFBBGo2AgAgACABKAIANgIADwsgAiACKAIAIgFBBGo2AgAgACABMgEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMwEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMAAANwMADwsgAiACKAIAIgFBBGo2AgAgACABMQAANwMADwsgAiACKAIAQQdqQXhxIgFBCGo2AgAgACABKwMAOQMADwsgACACIAMRAAALDwsgAiACKAIAIgFBBGo2AgAgACABNAIANwMADwsg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ZWFucyBubyBsaW1pdABNaW5pbXVtIGxlYXJudCBjbGF1c2UgbGltaXQAbWluLWxlYXJudHMAICAtJXMsIC1uby0lcwBUaGUgY2xhdXNlIGFjdGl2aXR5IGRlY2F5IGZhY3RvcgBUaGUgdmFyaWFibGUgYWN0aXZpdHkgZGVjYXkgZmFjdG9yAFJlc3RhcnQgaW50ZXJ2YWwgaW5jcmVhc2UgZmFjdG9yAHJuZC1mcmVxAC4uLy4uLy4uL3N5c3RlbS9saWIvbGliY3h4YWJpL3NyYy9wcml2YXRlX3R5cGVpbmZvLmNwcABVc2VkIGJ5IHRoZSByYW5kb20gdmFyaWFibGUgc2VsZWN0aW9uAGltaW4AbmFuAGFzeW1tAGVsaW0AY2wtbGltAHN1Yi1saW0AVGhlIGJhc2UgcmVzdGFydCBpbnRlcnZhbAByY2hlY2sAY2FuX2NhdGNoAHBoYXNlLXNhdmluZwB0ZXJtaW5hdGluZwBpbmYAb2ZmAFRoZSBmcmVxdWVuY3kgd2l0aCB3aGljaCB0aGUgZGVjaXNpb24gaGV1cmlzdGljIHRyaWVzIHRvIGNob29zZSBhIHJhbmRvbSB2YXJpYWJsZQBjY21pbi1tb2RlAFVzZSB0aGUgTHVieSByZXN0YXJ0IHNlcXVlbmNlAFRoZSBmcmFjdGlvbiBvZiB3YXN0ZWQgbWVtb3J5IGFsbG93ZWQgYmVmb3JlIGEgZ2FyYmFnZSBjb2xsZWN0aW9uIGlzIHRyaWdnZXJlZAB0ZXJtaW5hdGVfaGFuZGxlciB1bmV4cGVjdGVkbHkgcmV0dXJuZWQAcm5kLXNlZWQAJTRkAHJpbmMAc2ltcC1nYy1mcmFjACAgLSUtMTJzID0gJS04cyBbAFNJTVAATkFOAElORgBDT1JFADxib29sPgA8ZG91YmxlPgA8aW50MzI+AD09PT09PT09PT09PT09PT09PT09PT09PT09PT1bIFNlYXJjaCBTdGF0aXN0aWNzIF09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0APT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQBEbyBub3QgY2hlY2sgaWYgc3Vic3VtcHRpb24gYWdhaW5zdCBhIGNsYXVzZSBsYXJnZXIgdGhhbiB0aGlzLiAtMSBtZWFucyBubyBsaW1pdC4AQWxsb3cgYSB2YXJpYWJsZSBlbGltaW5hdGlvbiBzdGVwIHRvIGdyb3cgYnkgYSBudW1iZXIgb2YgY2xhdXNlcy4AUGVyZm9ybSB2YXJpYWJsZSBlbGltaW5hdGlvbi4AVGhlIGZyYWN0aW9uIG9mIHdhc3RlZCBtZW1vcnkgYWxsb3dlZCBiZWZvcmUgYSBnYXJiYWdlIGNvbGxlY3Rpb24gaXMgdHJpZ2dlcmVkIGR1cmluZyBzaW1wbGlmaWNhdGlvbi4AU2hyaW5rIGNsYXVzZXMgYnkgYXN5bW1ldHJpYyBicmFuY2hpbmcuAG5vLQBDaGVjayBpZiBhIGNsYXVzZSBpcyBhbHJlYWR5IGltcGxpZWQuIChjb3N0bHkpAENvbnRyb2xzIGNvbmZsaWN0IGNsYXVzZSBtaW5pbWl6YXRpb24gKDA9bm9uZSwgMT1iYXNpYywgMj1kZWVwKQAobnVsbCkAQ29udHJvbHMgdGhlIGxldmVsIG9mIHBoYXNlIHNhdmluZyAoMD1ub25lLCAxPWxpbWl0ZWQsIDI9ZnVsbCkAYWRqdXN0ZWRQdHIgJiYgImNhdGNoaW5nIGEgY2xhc3Mgd2l0aG91dCBhbiBvYmplY3Q/IgBQdXJlIHZpcnR1YWwgZnVuY3Rpb24gY2FsbGVkIQBZTyEAbGliYysrYWJpOiAAIC4uIABlbGltaW5hdGlvbiBsZWZ0OiAlMTBkDQBzdWJzdW1wdGlvbiBsZWZ0OiAlMTBkICglMTBkIHN1YnN1bWVkLCAlMTBkIGRlbGV0ZWQgbGl0ZXJhbHMpDQB8ICU5ZCB8ICU3ZCAlOGQgJThkIHwgJThkICU4ZCAlNi4wZiB8ICU2LjNmICUlIHwKAHwgIEdhcmJhZ2UgY29sbGVjdGlvbjogICAlMTJkIGJ5dGVzID0+ICUxMmQgYnl0ZXMgICAgICAgICAgICAgfAoAfCAgRWxpbWluYXRlZCBjbGF1c2VzOiAgICAgJTEwLjJmIE1iICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8CgAKICAgICAgICAlcwoARVJST1IhIHZhbHVlIDwlcz4gaXMgdG9vIHNtYWxsIGZvciBvcHRpb24gIiVzIi4KAEVSUk9SISB2YWx1ZSA8JXM+IGlzIHRvbyBsYXJnZSBmb3Igb3B0aW9uICIlcyIuCgAoZGVmYXVsdDogJXMpCgAgIC0lLTEycyA9ICUtOHMgJWMlNC4yZyAuLiAlNC4yZyVjIChkZWZhdWx0OiAlZykKAF0gKGRlZmF1bHQ6ICVkKQoAAAAAACwNAAABAAAAAgAAAAMAAAC4EQAANA0AAE43TWluaXNhdDZTb2x2ZXJFAAAAAAAAAGANAAAFAAAABgAAAAcAAAD+////4BEAAGwNAAAsDQAATjdNaW5pc2F0MTBTaW1wU29sdmVyRQAAAAAAAJwNAAAIAAAACQAAAAoAAAALAAAA4BEAAKgNAADADQAATjdNaW5pc2F0MTBCb29sT3B0aW9uRQAAuBEAAMgNAABON01pbmlzYXQ2T3B0aW9uRQAAAAAAAADADQAACAAAAAwAAAANAAAADQAAAAAAAAAMDgAACAAAAA4AAAAPAAAAEAAAAOARAAAYDgAAwA0AAE43TWluaXNhdDlJbnRPcHRpb25FAAAAAAAAAABIDgAACAAAABEAAAASAAAAEwAAAOARAABUDgAAwA0AAE43TWluaXNhdDEyRG91YmxlT3B0aW9uRQAAAAC4EQAAeA4AAE43TWluaXNhdDIwT3V0T2ZNZW1vcnlFeGNlcHRpb25FAEGmHQsa8D8AAAAAAAD4PwAAAAAAAAAABtDPQ+v9TD4AQcsdC5YBQAO44j/RdJ4AV529KoBwUg///z4nCgAAAGQAAADoAwAAECcAAKCGAQBAQg8AgJaYAADh9QUYAAAANQAAAHEAAABr////zvv//5K///8AAAAAAAAAABkACwAZGRkAAAAABQAAAAAAAAkAAAAACwAAAAAAAAAAGQAKChkZGQMKBwABAAkLGAAACQYLAAALAAYZAAAAGRkZAEHxHgshDgAAAAAAAAAAGQALDRkZGQANAAACAAkOAAAACQAOAAAOAEGrHwsBDABBtx8LFRMAAAAAEwAAAAAJDAAAAAAADAAADABB5R8LARAAQfEfCxUPAAAABA8AAAAACRAAAAAAABAAABAAQZ8gCwESAEGrIAseEQAAAAARAAAAAAkSAAAAAAASAAASAAAaAAAAGhoaAEHiIAsOGgAAABoaGgAAAAAAAAkAQZMhCwEUAEGfIQsVFwAAAAAXAAAAAAkUAAAAAAAUAAAUAEHNIQsBFgBB2SEL5AIVAAAAABUAAAAACRYAAAAAABYAABYAADAxMjM0NTY3ODlBQkNERUaQEwAA4BEAABARAACYEQAATjEwX19jeHhhYml2MTE2X19zaGltX3R5cGVfaW5mb0UAAAAA4BEAAEARAAAEEQAATjEwX19jeHhhYml2MTE3X19jbGFzc190eXBlX2luZm9FAAAA4BEAAHARAAA0EQAATjEwX19jeHhhYml2MTIwX19zaV9jbGFzc190eXBlX2luZm9FAAAAALgRAACgEQAAU3Q5dHlwZV9pbmZvAAAAAAAAAAA0EQAAHAAAAB0AAAAeAAAAHwAAACAAAAAhAAAAIgAAACMAAAAAAAAAZBEAABwAAAAkAAAAHgAAAB8AAAAgAAAAJQAAACYAAAAnAAAAAAAAACgAAAAoAAAAKQAAACkAAAApAAAAKQAAACkAAAApAAAAKAAAACgAAAApAAAAKAAAACgAAAAoAAAAKABB4CQLHSkAAAApAAAAKAAAACgAAAAAAAAAKAAAAAAAAAApAEGIJgsDIEIBAEGkJgsBKgBB7CYLAuAZAEGQJwsBBQBBnCcLARYAQbQnCwoXAAAAGAAAAAAaAEHMJwsBAgBB3CcLCP//////////AEGgKAsJkBMAAAAAAAAFAEG0KAsBGQBBzCgLDhcAAAAaAAAACBoAAAAEAEHkKAsBAQBB9CgLBf////8KAEG4KQsFKBQAABs=");b=xa(b);return a(b[0])}();c._yo=L("yo",0);c._free=L("free",1);c._unyo=L("unyo",1);c._createTheSolver=L("createTheSolver",0);c._ensureVar=L("ensureVar",1);c._addClause=L("addClause",1);c._solve=L("solve",0);c._getSolution=L("getSolution",0);c._getNumVars=L("getNumVars",0);c._solveAssuming=L("solveAssuming",1);c._retireVar=L("retireVar",1);c._getConflictClauseSize=L("getConflictClauseSize",0);c._getConflictClause=L("getConflictClause",0);var $a=L("fflush",1);c._malloc=L("malloc",1);var Sa=L("_emscripten_timeout",2),mb=M.emscripten_stack_init,oa=M.emscripten_stack_get_end,Ba=M._emscripten_stack_restore,cb=M._emscripten_stack_alloc,Ca=M.emscripten_stack_get_current;c.dynCall_jiji=L("dynCall_jiji",5);var Z;H=function nb(){Z||ob();Z||(H=nb)};function ob(){function a(){if(!Z&&(Z=!0,c.calledRun=!0,!x)){var _c$onRuntimeInitializ;p(!sa);sa=!0;E();O(qa);aa(c);(_c$onRuntimeInitializ=c.onRuntimeInitialized)===null||_c$onRuntimeInitializ===void 0||_c$onRuntimeInitializ.call(c);p(!c._main,'compiled without a main, but one is present. if you added it from JS, use Module["onRuntimeInitialized"]');E();if(c.postRun)for("function"==typeof c.postRun&&(c.postRun=[c.postRun]);c.postRun.length;){var b=c.postRun.shift();ra.unshift(b)}O(ra)}}if(!(0<G)){mb();na();if(c.preRun)for("function"==typeof c.preRun&&(c.preRun=[c.preRun]);c.preRun.length;)ta();O(pa);0<G||(c.setStatus?(c.setStatus("Running..."),setTimeout(()=>{setTimeout(()=>c.setStatus(""),1);a()},1)):a(),E())}}function Pa(){var a=r,b=u,d=!1;r=u=()=>{d=!0};try{ab()}catch(e){}r=a;u=b;d&&(R("stdio streams had content in them that was not flushed. you should set EXIT_RUNTIME to 1 (see the Emscripten FAQ), or make sure to emit a newline when you printf etc."),R("(this may also be due to not including full filesystem support - try building with -sFORCE_FILESYSTEM)"))}if(c.preInit)for("function"==typeof c.preInit&&(c.preInit=[c.preInit]);0<c.preInit.length;)c.preInit.pop()();ob();moduleRtn=c;for(const a of Object.keys(c))a in moduleArg||Object.defineProperty(moduleArg,a,{configurable:!0,get(){l(`Access to module property ('${a}') is no longer possible via the module constructor argument; Instead, use the result of the module constructor.`)}});
+      function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==typeof i?i:i+""}function _toPrimitive(t,r){if("object"!=typeof t||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=typeof i)return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}var c=moduleArg,aa,f,ba=new Promise((a,b)=>{aa=a;f=b});"_addClause _createTheSolver _ensureVar _free _getConflictClause _getConflictClauseSize _getNumVars _getSolution _malloc _retireVar _solve _solveAssuming _unyo _yo ccall cwrap UTF8ToString stringToUTF8 UTF16ToString stringToUTF16 UTF32ToString stringToUTF32 AsciiToString intArrayFromString intArrayToString writeArrayToMemory stackSave stackAlloc stackRestore getValue setValue _memory ___indirect_function_table onRuntimeInitialized".split(" ").forEach(a=>{Object.getOwnPropertyDescriptor(ba,a)||Object.defineProperty(ba,a,{get:()=>l("You are getting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js"),set:()=>l("You are setting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js")})});var ca=Object.assign({},c),m=(a,b)=>{throw b},da;if("undefined"==typeof process||!process.release||"node"!==process.release.name)throw Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)");var ea=process.versions.node,n=ea.split(".").slice(0,3);n=1e4*n[0]+100*n[1]+1*n[2].split("-")[0];if(14e4>n)throw Error("This emscripten-generated code requires node v14.0.0 (detected v"+ea+")");var fs=require("fs");require("path");da=a=>{a=fa(a)?new URL(a):a;a=fs.readFileSync(a);p(Buffer.isBuffer(a));return a};process.argv.slice(2);m=(a,b)=>{process.exitCode=a;throw b};var r=c.print||console.log.bind(console),u=c.printErr||console.error.bind(console);Object.assign(c,ca);ca=null;Object.getOwnPropertyDescriptor(c,"fetchSettings")&&l("`Module.fetchSettings` was supplied but `fetchSettings` not included in INCOMING_MODULE_JS_API");v("arguments","arguments_");v("thisProgram","thisProgram");p("undefined"==typeof c.memoryInitializerPrefixURL,"Module.memoryInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.pthreadMainPrefixURL,"Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.cdInitializerPrefixURL,"Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.filePackagePrefixURL,"Module.filePackagePrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.read,"Module.read option was removed");p("undefined"==typeof c.readAsync,"Module.readAsync option was removed (modify readAsync in JS)");p("undefined"==typeof c.readBinary,"Module.readBinary option was removed (modify readBinary in JS)");p("undefined"==typeof c.setWindowTitle,"Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)");p("undefined"==typeof c.TOTAL_MEMORY,"Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY");v("asm","wasmExports");v("readAsync","readAsync");v("readBinary","readBinary");v("setWindowTitle","setWindowTitle");p(!0,"web environment detected but not enabled at build time.  Add `web` to `-sENVIRONMENT` to enable.");p(!0,"worker environment detected but not enabled at build time.  Add `worker` to `-sENVIRONMENT` to enable.");p(!0,"shell environment detected but not enabled at build time.  Add `shell` to `-sENVIRONMENT` to enable.");var ha=c.wasmBinary;v("wasmBinary","wasmBinary");"object"!=typeof WebAssembly&&u("no native wasm support detected");"undefined"==typeof atob&&("undefined"!=typeof global&&"undefined"==typeof globalThis&&(globalThis=global),globalThis.atob=function(a){var b="",d=0;a=a.replace(/[^A-Za-z0-9\+\/=]/g,"");do{var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var g="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var k="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var h="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));e=e<<2|g>>4;g=(g&15)<<4|k>>2;var q=(k&3)<<6|h;b+=String.fromCharCode(e);64!==k&&(b+=String.fromCharCode(g));64!==h&&(b+=String.fromCharCode(q))}while(d<a.length);return b});var w,x=!1,y;function p(a,b){a||l("Assertion failed"+(b?": "+b:""))}var z,A,B,ia,C,D,ja,ka;function la(){var a=w.buffer;c.HEAP8=z=new Int8Array(a);c.HEAP16=B=new Int16Array(a);c.HEAPU8=A=new Uint8Array(a);c.HEAPU16=ia=new Uint16Array(a);c.HEAP32=C=new Int32Array(a);c.HEAPU32=D=new Uint32Array(a);c.HEAPF32=ja=new Float32Array(a);c.HEAPF64=ka=new Float64Array(a)}let ma;(ma=global).performance??(ma.performance=require("perf_hooks").performance);p(!c.STACK_SIZE,"STACK_SIZE can no longer be set at runtime.  Use -sSTACK_SIZE at link time");p("undefined"!=typeof Int32Array&&"undefined"!==typeof Float64Array&&void 0!=Int32Array.prototype.subarray&&void 0!=Int32Array.prototype.set,"JS engine does not provide full typed array support");p(!c.wasmMemory,"Use of `wasmMemory` detected.  Use -sIMPORTED_MEMORY to define wasmMemory externally");p(!c.INITIAL_MEMORY,"Detected runtime INITIAL_MEMORY setting.  Use -sIMPORTED_MEMORY to define wasmMemory dynamically");function na(){var a=oa();p(0==(a&3));0==a&&(a+=4);D[a>>2]=34821223;D[a+4>>2]=2310721022;D[0]=1668509029}function E(){if(!x){var a=oa();0==a&&(a+=4);var b=D[a>>2],d=D[a+4>>2];34821223==b&&2310721022==d||l(`Stack overflow! Stack cookie has been overwritten at ${F(a)}, expected hex dwords 0x89BACDFE and 0x2135467, but received ${F(d)} ${F(b)}`);1668509029!=D[0]&&l("Runtime error: The application has corrupted its heap memory area (address zero)!")}}var pa=[],qa=[],ra=[],sa=!1;function ta(){var a=c.preRun.shift();pa.unshift(a)}p(Math.imul,"This browser does not support Math.imul(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.fround,"This browser does not support Math.fround(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.clz32,"This browser does not support Math.clz32(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.trunc,"This browser does not support Math.trunc(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");var G=0,H=null,J={},K=null;function ua(){var _c$monitorRunDependen;G++;(_c$monitorRunDependen=c.monitorRunDependencies)===null||_c$monitorRunDependen===void 0||_c$monitorRunDependen.call(c,G);p(!J["wasm-instantiate"]);J["wasm-instantiate"]=1;null===K&&"undefined"!=typeof setInterval&&(K=setInterval(()=>{if(x)clearInterval(K),K=null;else{var a=!1,b;for(b in J)a||(a=!0,u("still waiting on run dependencies:")),u(`dependency: ${b}`);a&&u("(end of list)")}},1e4))}function l(a){var _c$onAbort;(_c$onAbort=c.onAbort)===null||_c$onAbort===void 0||_c$onAbort.call(c,a);a="Aborted("+a+")";u(a);x=!0;a=new WebAssembly.RuntimeError(a);f(a);throw a}function va(){l("Filesystem support (FS) was not included. The problem is that you are using files from JS, but files were not used from C/C++, so filesystem support was not auto-included. You can force-include filesystem support with -sFORCE_FILESYSTEM")}c.FS_createDataFile=function(){va()};c.FS_createPreloadedFile=function(){va()};var wa=a=>a.startsWith("data:application/octet-stream;base64,"),fa=a=>a.startsWith("file://");function L(a,b){return function(){p(sa,`native function \`${a}\` called before runtime initialization`);var e=M[a];p(e,`exported native function \`${a}\` not found`);p(arguments.length<=b,`native function \`${a}\` called with ${arguments.length} args but expects ${b}`);return e(...arguments)}}var N;function xa(a){if(N==N&&ha)var b=new Uint8Array(ha);else if(b=N,wa(b)?(b=b.slice(37),b=Buffer.from(b,"base64"),b=new Uint8Array(b.buffer,b.byteOffset,b.length)):b=void 0,!b)if(da)b=da(N);else throw'sync fetching of the wasm failed: you can preload it to Module["wasmBinary"] manually, or emcc.py will do that for you when generating HTML (but not JS)';b=new WebAssembly.Module(b);return[new WebAssembly.Instance(b,a),b]}var ya=new Int16Array(1),za=new Int8Array(ya.buffer);ya[0]=25459;if(115!==za[0]||99!==za[1])throw"Runtime error: expected the system to be little-endian! (Run with -sSUPPORT_BIG_ENDIAN to bypass)";if(c.ENVIRONMENT)throw Error("Module.ENVIRONMENT has been deprecated. To force the environment, use the ENVIRONMENT compile-time option (for example, -sENVIRONMENT=web or -sENVIRONMENT=node)");function v(a,b){Object.getOwnPropertyDescriptor(c,a)||Object.defineProperty(c,a,{configurable:!0,get(){l(`\`Module.${a}\` has been replaced by \`${b}\``+" (the initial value can be provided on Module, but after startup the value is only looked for on a local variable of that name)")}})}class Aa{constructor(a){_defineProperty(this,"name","ExitStatus");this.message=`Program terminated with exit(${a})`;this.status=a}}c.ExitStatus=Aa;var O=a=>{for(;0<a.length;)a.shift()(c)};c.callRuntimeCallbacks=O;c.getValue=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:"i8";b.endsWith("*")&&(b="*");switch(b){case"i1":return z[a];case"i8":return z[a];case"i16":return B[a>>1];case"i32":return C[a>>2];case"i64":l("to do getValue(i64) use WASM_BIGINT");case"float":return ja[a>>2];case"double":return ka[a>>3];case"*":return D[a>>2];default:l(`invalid type for getValue: ${b}`)}};var Q=c.noExitRuntime||!0;c.noExitRuntime=Q;var F=a=>{p("number"===typeof a);return"0x"+(a>>>0).toString(16).padStart(8,"0")};c.ptrToString=F;c.setValue=function(a,b){let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"i8";d.endsWith("*")&&(d="*");switch(d){case"i1":z[a]=b;break;case"i8":z[a]=b;break;case"i16":B[a>>1]=b;break;case"i32":C[a>>2]=b;break;case"i64":l("to do setValue(i64) use WASM_BIGINT");case"float":ja[a>>2]=b;break;case"double":ka[a>>3]=b;break;case"*":D[a>>2]=b;break;default:l(`invalid type for setValue: ${d}`)}};c.stackRestore=a=>Ba(a);c.stackSave=()=>Ca();var R=a=>{R.h||(R.h={});R.h[a]||(R.h[a]=1,u("warning: "+a))};c.warnOnce=R;var Da="undefined"!=typeof TextDecoder?new TextDecoder:void 0;c.UTF8Decoder=Da;var Ea=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:0;let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:NaN;var e=b+d;for(d=b;a[d]&&!(d>=e);)++d;if(16<d-b&&a.buffer&&Da)return Da.decode(a.subarray(b,d));for(e="";b<d;){var g=a[b++];if(g&128){var k=a[b++]&63;if(192==(g&224))e+=String.fromCharCode((g&31)<<6|k);else{var h=a[b++]&63;224==(g&240)?g=(g&15)<<12|k<<6|h:(240!=(g&248)&&R("Invalid UTF-8 leading byte "+F(g)+" encountered when deserializing a UTF-8 string in wasm memory to a JS string!"),g=(g&7)<<18|k<<12|h<<6|a[b++]&63);65536>g?e+=String.fromCharCode(g):(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023))}}else e+=String.fromCharCode(g)}return e};c.UTF8ArrayToString=Ea;var S=(a,b)=>{p("number"==typeof a,`UTF8ToString expects a number (got ${typeof a})`);return a?Ea(A,a,b):""};c.UTF8ToString=S;var Fa=(a,b,d,e)=>l(`Assertion failed: ${S(a)}, at: `+[b?S(b):"unknown filename",d,e?S(e):"unknown function"]);c.___assert_fail=Fa;var T;c.wasmTable=T;c.getWasmTableEntry=a=>T.get(a);var Ga=(a,b)=>T.get(a)(b);c.___call_sighandler=Ga;class Ha{constructor(a){this.g=a-24}}c.ExceptionInfo=Ha;var Ia=0;c.exceptionLast=Ia;var Ja=0;c.uncaughtExceptionCount=Ja;var Ka=(a,b,d)=>{var e=new Ha(a);D[e.g+16>>2]=0;D[e.g+4>>2]=b;D[e.g+8>>2]=d;Ia=a;Ja++;p(!1,"Exception thrown, but exception catching is not enabled. Compile with -sNO_DISABLE_EXCEPTION_CATCHING or -sEXCEPTION_CATCHING_ALLOWED=[..] to catch.")};c.___cxa_throw=Ka;var La=()=>l("native code called abort()");c.__abort_js=La;var U=0;c.runtimeKeepaliveCounter=U;var Ma=()=>{Q=!1;U=0};c.__emscripten_runtime_keepalive_clear=Ma;var V={};c.timers=V;var Na=a=>{if(a instanceof Aa||"unwind"==a)return y;E();a instanceof WebAssembly.RuntimeError&&0>=Ca()&&u("Stack overflow detected.  You can try increasing -sSTACK_SIZE (currently set to 65536)");m(1,a)};c.handleException=Na;c.keepRuntimeAlive=()=>Q||0<U;var Oa=a=>{var _c$onExit;y=a;Q||0<U||((_c$onExit=c.onExit)!==null&&_c$onExit!==void 0&&_c$onExit.call(c,a),x=!0);m(a,new Aa(a))};c._proc_exit=Oa;var W=(a,b)=>{y=a;Pa();(Q||0<U)&&!b&&(b=`program exited (with status: ${a}), but keepRuntimeAlive() is set (counter=${U}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`,f(b),u(b));Oa(a)};c.exitJS=W;c._exit=W;var Qa=()=>{if(!(Q||0<U))try{W(y)}catch(a){Na(a)}};c.maybeExit=Qa;var Ra=a=>{if(x)u("user callback triggered after runtime exited or application aborted.  Ignoring.");else try{a(),Qa()}catch(b){Na(b)}};c.callUserCallback=Ra;c._emscripten_get_now=()=>performance.now();var Ta=(a,b)=>{V[a]&&(clearTimeout(V[a].id),delete V[a]);if(!b)return 0;var d=setTimeout(()=>{p(a in V);delete V[a];Ra(()=>Sa(a,performance.now()))},b);V[a]={id:d,j:b};return 0};c.__setitimer_js=Ta;c.getHeapMax=()=>2147483648;var Ua=(a,b)=>{p(b,"alignment argument is required");return Math.ceil(a/b)*b};c.alignMemory=Ua;var Va=a=>{var b=w.buffer,d=(a-b.byteLength+65535)/65536|0;try{return w.grow(d),la(),1}catch(e){u(`growMemory: Attempted to grow heap from ${b.byteLength} bytes to ${a} bytes, but got error: ${e}`)}};c.growMemory=Va;var Wa=a=>{var b=A.length;a>>>=0;p(a>b);if(2147483648<a)return u(`Cannot enlarge memory, requested ${a} bytes, but the limit is ${2147483648} bytes!`),!1;for(var d=1;4>=d;d*=2){var e=b*(1+.2/d);e=Math.min(e,a+100663296);e=Math.min(2147483648,Ua(Math.max(a,e),65536));if(Va(e))return!0}u(`Failed to grow the heap from ${b} bytes to ${e} bytes, not enough memory!`);return!1};c._emscripten_resize_heap=Wa;c.SYSCALLS={l:void 0,i(a){return S(a)}};var Xa=()=>{l("fd_close called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_close=Xa;var Ya=(a,b)=>{p(a==a>>>0||a==(a|0));p(b===(b|0));return b+2097152>>>0<4194305-!!a?(a>>>0)+4294967296*b:NaN};c.convertI32PairToI53Checked=Ya;function Za(a,b,d){Ya(b,d);return 70}c._fd_seek=Za;var X=[null,[],[]];c.printCharBuffers=X;var Y=(a,b)=>{var d=X[a];p(d);0===b||10===b?((1===a?r:u)(Ea(d)),d.length=0):d.push(b)};c.printChar=Y;var ab=()=>{$a(0);X[1].length&&Y(1,10);X[2].length&&Y(2,10)};c.flush_NO_FILESYSTEM=ab;var bb=(a,b,d,e)=>{for(var g=0,k=0;k<d;k++){var h=D[b>>2],q=D[b+4>>2];b+=8;for(var I=0;I<q;I++)Y(a,A[h+I]);g+=q}D[e>>2]=g;return 0};c._fd_write=bb;c.stackAlloc=a=>cb(a);var db=a=>{var b=c["_"+a];p(b,"Cannot call unknown function "+a+", make sure it is exported");return b};c.getCFunc=db;var eb=(a,b)=>{p(0<=a.length,"writeArrayToMemory array must have a length (should be an array or typed array)");z.set(a,b)};c.writeArrayToMemory=eb;var fb=a=>{for(var b=0,d=0;d<a.length;++d){var e=a.charCodeAt(d);127>=e?b++:2047>=e?b+=2:55296<=e&&57343>=e?(b+=4,++d):b+=3}return b};c.lengthBytesUTF8=fb;var gb=(a,b,d,e)=>{p("string"===typeof a,`stringToUTF8Array expects a string (got ${typeof a})`);if(!(0<e))return 0;var g=d;e=d+e-1;for(var k=0;k<a.length;++k){var h=a.charCodeAt(k);if(55296<=h&&57343>=h){var q=a.charCodeAt(++k);h=65536+((h&1023)<<10)|q&1023}if(127>=h){if(d>=e)break;b[d++]=h}else{if(2047>=h){if(d+1>=e)break;b[d++]=192|h>>6}else{if(65535>=h){if(d+2>=e)break;b[d++]=224|h>>12}else{if(d+3>=e)break;1114111<h&&R("Invalid Unicode code point "+F(h)+" encountered when serializing a JS string to a UTF-8 string in wasm memory! (Valid unicode code points should be in range 0-0x10FFFF).");b[d++]=240|h>>18;b[d++]=128|h>>12&63}b[d++]=128|h>>6&63}b[d++]=128|h&63}}b[d]=0;return d-g};c.stringToUTF8Array=gb;var hb=(a,b,d)=>{p("number"==typeof d,"stringToUTF8(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");return gb(a,A,b,d)};c.stringToUTF8=hb;var ib=a=>{var b=fb(a)+1,d=cb(b);hb(a,d,b);return d};c.stringToUTF8OnStack=ib;var jb=(a,b,d,e)=>{var g={string:t=>{var P=0;null!==t&&void 0!==t&&0!==t&&(P=ib(t));return P},array:t=>{var P=cb(t.length);eb(t,P);return P}};a=db(a);var k=[],h=0;p("array"!==b,'Return type should not be "array".');if(e)for(var q=0;q<e.length;q++){var I=g[d[q]];I?(0===h&&(h=Ca()),k[q]=I(e[q])):k[q]=e[q]}d=a(...k);return d=function(t){0!==h&&Ba(h);return"string"===b?S(t):"boolean"===b?!!t:t}(d)};c.ccall=jb;c.cwrap=(a,b,d,e)=>function(){for(var _len=arguments.length,g=new Array(_len),_key=0;_key<_len;_key++){g[_key]=arguments[_key]}return jb(a,b,d,g,e)};c.intArrayFromString=function(a,b,d){d=Array(0<d?d:fb(a)+1);a=gb(a,d,0,d.length);b&&(d.length=a);return d};c.intArrayToString=function(a){for(var b=[],d=0;d<a.length;d++){var e=a[d];255<e&&(p(!1,`Character code ${e} (${String.fromCharCode(e)}) at offset ${d} not in 0x00-0xFF.`),e&=255);b.push(String.fromCharCode(e))}return b.join("")};c.AsciiToString=a=>{for(var b="";;){var d=A[a++];if(!d)return b;b+=String.fromCharCode(d)}};var kb="undefined"!=typeof TextDecoder?new TextDecoder("utf-16le"):void 0;c.UTF16Decoder=kb;c.UTF16ToString=(a,b)=>{p(0==a%2,"Pointer passed to UTF16ToString must be aligned to two bytes!");var d=a>>1;for(var e=d+b/2;!(d>=e)&&ia[d];)++d;d<<=1;if(32<d-a&&kb)return kb.decode(A.subarray(a,d));d="";for(e=0;!(e>=b/2);++e){var g=B[a+2*e>>1];if(0==g)break;d+=String.fromCharCode(g)}return d};c.stringToUTF16=(a,b,d)=>{p(0==b%2,"Pointer passed to stringToUTF16 must be aligned to two bytes!");p("number"==typeof d,"stringToUTF16(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(2>d)return 0;d-=2;var e=b;d=d<2*a.length?d/2:a.length;for(var g=0;g<d;++g)B[b>>1]=a.charCodeAt(g),b+=2;B[b>>1]=0;return b-e};c.UTF32ToString=(a,b)=>{p(0==a%4,"Pointer passed to UTF32ToString must be aligned to four bytes!");for(var d=0,e="";!(d>=b/4);){var g=C[a+4*d>>2];if(0==g)break;++d;65536<=g?(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023)):e+=String.fromCharCode(g)}return e};c.stringToUTF32=(a,b,d)=>{p(0==b%4,"Pointer passed to stringToUTF32 must be aligned to four bytes!");p("number"==typeof d,"stringToUTF32(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(4>d)return 0;var e=b;d=e+d-4;for(var g=0;g<a.length;++g){var k=a.charCodeAt(g);if(55296<=k&&57343>=k){var h=a.charCodeAt(++g);k=65536+((k&1023)<<10)|h&1023}C[b>>2]=k;b+=4;if(b+4>d)break}C[b>>2]=0;return b-e};var lb={__assert_fail:Fa,__call_sighandler:Ga,__cxa_throw:Ka,_abort_js:La,_emscripten_runtime_keepalive_clear:Ma,_setitimer_js:Ta,emscripten_resize_heap:Wa,exit:W,fd_close:Xa,fd_seek:Za,fd_write:bb,proc_exit:Oa},M=function(){function a(d){var _c$monitorRunDependen2;M=d.exports;w=M.memory;p(w,"memory not found in wasm exports");la();T=M.__indirect_function_table;p(T,"table not found in wasm exports");qa.unshift(M.__wasm_call_ctors);G--;(_c$monitorRunDependen2=c.monitorRunDependencies)===null||_c$monitorRunDependen2===void 0||_c$monitorRunDependen2.call(c,G);p(J["wasm-instantiate"]);delete J["wasm-instantiate"];0==G&&(null!==K&&(clearInterval(K),K=null),H&&(d=H,H=null,d()));return M}ua();var b={env:lb,wasi_snapshot_preview1:lb};if(c.instantiateWasm)try{return c.instantiateWasm(b,a)}catch(d){u(`Module.instantiateWasm callback failed with error: ${d}`),f(d)}N??(N="data:application/octet-stream;base64,AGFzbQEAAAABxgEeYAJ/fwBgAX8AYAF/AX9gA39/fwBgAn9/AX9gA39/fwF/YAABf2AAAGAEf39/fwBgBX9/f39/AGAFf35+fn4AYAZ/f39/f38AYAN/fn8BfmAFf39/f38Bf2ACf3wAYAR/fn5/AGAEf39/fwF/YAF/AXxgAnx/AXxgBn98f39/fwF/YAJ/fAF/YAJ/fwF+YAJ8fAF8YAR+fn5+AX9gA35+fgF/YAJ+fgF8YAF/AX5gBH9+fn4AYAd/f39/f39/AX9gAn5/AX8CvQIMA2VudgtfX2N4YV90aHJvdwADA2VudgRleGl0AAEWd2FzaV9zbmFwc2hvdF9wcmV2aWV3MQhmZF93cml0ZQAQFndhc2lfc25hcHNob3RfcHJldmlldzEIZmRfY2xvc2UAAgNlbnYWZW1zY3JpcHRlbl9yZXNpemVfaGVhcAACA2VudglfYWJvcnRfanMABwNlbnYNX19hc3NlcnRfZmFpbAAIA2Vudg1fc2V0aXRpbWVyX2pzABQDZW52I19lbXNjcmlwdGVuX3J1bnRpbWVfa2VlcGFsaXZlX2NsZWFyAAcWd2FzaV9zbmFwc2hvdF9wcmV2aWV3MQlwcm9jX2V4aXQAAQNlbnYRX19jYWxsX3NpZ2hhbmRsZXIAABZ3YXNpX3NuYXBzaG90X3ByZXZpZXcxB2ZkX3NlZWsADQPVAdMBBwACAQEBAAEAAxEAAAMCAAAAAwAAAAQEAAABAAEAAAMAAQIRAgEAAAABAQAFCQ0CAgUEAwQCAQEDAAAAAAAAAgQEAAAEAAQOAAEEAAAABQABBAAAAwMAAwEEAAQBBAQAAQEEAAQAAAUVAQAGAQcBAgAGBgYCAQYGBRYBAgAAAwUQAAABEgIKAgEEAAIXGA8KDwoKBwYGBgECBgoKGQAOAAIMBQICAwMDAgwEAQICGhsPCRwDAggdCQQTABIGBwEHAQYHBQULCAkDCAMICQsOAQENAwQFAXABKioFBwEBggKAgAIGEgN/AUGghAULfwFBAAt/AUEACwePBBwGbWVtb3J5AgARX193YXNtX2NhbGxfY3RvcnMADAJ5bwB3BGZyZWUAlAEZX19pbmRpcmVjdF9mdW5jdGlvbl90YWJsZQEABHVueW8AeA9jcmVhdGVUaGVTb2x2ZXIAeQllbnN1cmVWYXIAeglhZGRDbGF1c2UAewVzb2x2ZQB9C2dldFNvbHV0aW9uAH4KZ2V0TnVtVmFycwB/DXNvbHZlQXNzdW1pbmcAgAEJcmV0aXJlVmFyAIEBFWdldENvbmZsaWN0Q2xhdXNlU2l6ZQCCARFnZXRDb25mbGljdENsYXVzZQCDAQZmZmx1c2gArAEGbWFsbG9jAJMBE19lbXNjcmlwdGVuX3RpbWVvdXQA2gEVZW1zY3JpcHRlbl9zdGFja19pbml0AJ8BGWVtc2NyaXB0ZW5fc3RhY2tfZ2V0X2ZyZWUAoAEZZW1zY3JpcHRlbl9zdGFja19nZXRfYmFzZQChARhlbXNjcmlwdGVuX3N0YWNrX2dldF9lbmQAogEZX2Vtc2NyaXB0ZW5fc3RhY2tfcmVzdG9yZQCjARdfZW1zY3JpcHRlbl9zdGFja19hbGxvYwCkARxlbXNjcmlwdGVuX3N0YWNrX2dldF9jdXJyZW50AKUBIl9fY3hhX2luY3JlbWVudF9leGNlcHRpb25fcmVmY291bnQAzAEMZHluQ2FsbF9qaWppAN0BCUMBAEEBCykOEzVsQUJkO2hpa23OAWhub2hwccUBxgGvAa4BrQG0AbUBywE7aIYBhgHPAdkB2AHXAWjRAdMB1QHcAdsBCr3zA9MB/QcAEJ8BQcEpQQE6AABBwilBAjoAAEHAKUEAOgAAQcgpQc0JQdkLQaIQQa4QEDoaQfgpQubMmbPmzJn3PzcDAEHoKUKAgICAgICA+D83AwBB4ClCADcDAEHIKUG4HDYCAEHwKUEAOwEAQYAqQdcJQbgLQaIQQa4QEDoaQbAqQquO2sjt+f33PzcDAEGgKkKAgICAgICA+D83AwBBmCpCADcDAEGAKkG4HDYCAEGoKkEAOwEAQbgqQZ0MQfINQaIQQa4QEDoaQegqQgA3AwBB4CpBgQI7AQBB2CpCgICAgICAgPg/NwMAQdAqQgA3AwBBuCpBuBw2AgBB8CpB5A9B3QxBohBBrhAQOhpBoCtCgICAoL+49srBADcDAEGQK0KAgICAgICA+P8ANwMAQYgrQgA3AwBB8CpBuBw2AgBBmCtBADsBAEGoK0HEDkHSFEGiEEG3EBA6GkHEK0ECNgIAQbwrQoCAgIAgNwIAQagrQfwbNgIAQcgrQdENQZkVQaIQQbcQEDoaQeQrQQI2AgBB3CtCgICAgCA3AgBByCtB/Bs2AgBB6CtBohBBjwpBoAlBABA5QYAsQaIQQcgJQc8OQQEQOUGYLEGICkGmDUGiEEG3EBA6GkG0LEHkADYCAEGsLEKBgICA8P////8ANwIAQZgsQfwbNgIAQbgsQfEPQfwLQaIQQa4QEDoaQegsQoCAgICAgICAwAA3AwBB2CxCgICAgICAgPj/ADcDAEHQLEKAgICAgICA+D83AwBBuCxBuBw2AgBB4CxBADsBAEHwLEH7D0HtDkGiEEGuEBA6GkGgLUKas+bMmbPm5D83AwBBkC1CgICAgICAgPj/ADcDAEGILUIANwMAQfAsQbgcNgIAQZgtQQA7AQBBqC1BngtBggtBohBBtxAQOhpBvC1CgICAgPD/////ADcCAEGoLUH8GzYCAEHELUEANgIAQcktQQE6AABByi1BAjoAAEHILUEAOgAAQcwtQZUQQYwNQfcTQQAQOUHkLUGVEEHADUGjFEEAEDlB/C1BlRBBkg1B8xJBARA5QZQuQYMKQbESQZUQQbcQEDoaQaguQoCAgID4/////wA3AgBBlC5B/Bs2AgBBsC5BADYCAEG0LkGXDUGYCkGVEEG3EBA6GkHQLkEUNgIAQcguQv///////////wA3AgBBtC5B/Bs2AgBB1C5Bng1B3xFBlRBBtxAQOhpB8C5B6Ac2AgBB6C5C////////////ADcCAEHULkH8GzYCAEH4LkH2D0GRE0GVEEGuEBA6GkGoL0KAgICAgICA8D83AwBBmC9CgICAgICAgPj/ADcDAEGQL0IANwMAQfguQbgcNgIAQaAvQQA7AQALNgAgAEEANgIoIABCADcCICAAQQA2AhggAEIANwIQIABBADYCCCAAQgA3AgAgACABKAIANgIsC8YBAQF/IABBoBo2AgAgAEH0BGoQDyAAQegEahAPIABB3ARqEA8gAEHMBGoQDyAAQcAEahAPIABBtARqEA8gACgCoAQQlAEgAEHMA2oQECAAQZwDahARIABBjANqEA8gAEH8AmoQDyAAQewCahAPIABB3AJqEA8gAEHMAmoQDyAAQbwCahAPIABBsAJqEA8gAEGkAmoQDyAAQZgCahAPIABBjAJqEA8gAEGAAmoQDyAAQRBqIgFBEGoQDyABEA8gAEEEahAPIAALCAAgAEEBEBILDQAgAEEMahAPIAAQDwsUACAAQSBqEA8gAEEQahAPIAAQNgswAQF/AkAgACgCACICRQ0AIABBADYCBCABRQ0AIAIQlAEgAEEANgIIIABBADYCAAsLCQAgABAOEJQBC4cCAQV/IAEoAgBBAWoiAyAAKAIESgRAAkAgACgCCCICIANODQAgAyACa0EBakF+cSIEIAJBAXVBfnFBAmoiBSAEIAVKGyIEIAJB/////wdzTARAIAAgAiAEaiICNgIIIAAgACgCACACQQxsEJUBIgI2AgAgAg0BQcgvKAIAQTBHDQELEM0BQfAcQQAQAAALIAAoAgQiAiADIAIgA0obIQQgACgCACEFA0AgAiAERgRAIAAgAzYCBAUgBSACQQxsaiIGQQA2AgggBkIANwIAIAJBAWohAgwBCwsLIABBEGogACgCACABKAIAIgBBDGxqIgMoAgAEfyADQQA2AgQgASgCAAUgAAsQFwsYACAAIAFBAWoQMiAAKAIAIAFqIAI6AAALZAICfAF/An8gACsDAEQAAAAA5DQ1QaIiAUQAAMD////fQaMiAplEAAAAAAAA4EFjBEAgAqoMAQtBgICAgHgLIQMgACABIAO3RAAAwP///99BoqEiATkDACABRAAAwP///99BowtuAQN/IwBBEGsiAyQAIANBADoADyABQQFqIgIgACgCBEoEQCAAIAIQMyAAKAIEIgEgAiABIAJKGyEEA0AgASAERgRAIAAgAjYCBAUgACgCACABaiADLQAPOgAAIAFBAWohAQwBCwsLIANBEGokAAs3AQJ/IAFBACABQQBKGyEDIAAoAgQhAQNAIAIgA0cEQCAAIAFBAWsiATYCBCACQQFqIQIMAQsLC1gBAX8gAUEBdSIDIAAoAswCaiABQQFxOgAAIAAoAowDIANBA3RqIAKtIAA1AqgCQiCGhDcCACAAIAAoApwCIgJBAWo2ApwCIAAoApgCIAJBAnRqIAE2AgALxwUCEH8BfiMAQSBrIgIkACAAQZwDaiEIQX8hCgNAIAAoAoAEIgQgACgCnAJIBEAgACAEQQFqNgKABCACIAAoApgCIARBAnRqKAIANgIcIAJBHGoiBCgCACIBIAgoAhBqLQAABEAgCCAEECogBCgCACEBCyAIKAIAIAFBDGxqIgsoAgAiASALKAIEQQN0aiEJIAEhAwNAIAMgCUcEQCACIAAoAswCIAMoAgQiBkEBdWotAAAgBkEBcXM6ABAgAkEQakHAKS0AABBNBEAgASADKQIANwIAIAFBCGohASADQQhqIQMMAgsgACgCoAQgAygCACIEQQJ0aiIHKAIEIgUgAigCHEEBcyIMRgRAIAcoAgghBSAHIAw2AgggByAFNgIECyACIAQ2AhAgA0EIaiEDIAIgBTYCFAJAIAUgBkYNACACIAAoAswCIAVBAXVqLQAAIAVBAXFzOgAPIAJBD2pBwCktAAAQTUUNACABIAIpAxA3AgAgAUEIaiEBDAILIAdBBGohD0ECIQYCQANAIAYgBygCAEEFdk8NASACIAAoAswCIA8gBkECdGoiDSgCACIQQQF1ai0AACAQQQFxczoADyAGQQFqIQYgAkEPakHBKS0AABBSRQ0ACyAHIA0oAgA2AgggDSAMNgIAIAgoAgAgBygCCEEBc0EMbGogAkEQahAcDAILIAEgAikDEDcCACACIAAoAswCIAVBAXVqLQAAIAVBAXFzOgAPIAFBCGohASACQQ9qQcEpLQAAEE0EQCAAIAAoApwCNgKABANAIAMgCU8EQCAEIQoMBAUgASADKQIANwIAIAFBCGohASADQQhqIQMMAQsACwAFIAAgBSAEEBkMAgsACwsgCyAJIAFrQQN1EBggDkEBaiEODAELCyAAIA6tIhEgACkDuAF8NwO4ASAAIAApA4gEIBF9NwOIBCACQSBqJAAgCgu8AQEFfyMAQRBrIgIkACAAKAKgBCABQQJ0aiIDKAIEIQQgACgCnAMgAiADKAIINgIMIAIgATYCCCAEQQFzQQxsaiACQQhqIgYQHCADKAIIIQQgACgCnAMgAiADKAIENgIMIAIgATYCCCAEQQFzQQxsaiAGEBwgAEHYAUHQASADKAIAQQRxIgEbaiIEIAQpAwBCAXw3AwAgAEHoAUHgASABG2oiACAAKQMAIAMoAgBBBXatfDcDACACQRBqJAALQQEBfyAAKAIEIgIgACgCCEYEQCAAIAJBAWoQHSAAKAIEIQILIAAgAkEBajYCBCAAKAIAIAJBA3RqIAEpAgA3AgALCwAgACABQQMQ3gEL8QEBBH8jAEEQayIDJAAgAEGcA2ohBSAAKAKgBCABQQJ0aiEEAkAgAgRAIAUoAgAgBCgCBCADIAQoAgg2AgwgAyABNgIIQQFzQQxsaiADQQhqIgYQHyAFKAIAIAQoAgggAyAEKAIENgIMIAMgATYCCEEBc0EMbGogBhAfDAELIAMgBCgCBEEBczYCCCAFIANBCGoiARAgIAMgBCgCCEEBczYCCCAFIAEQIAsgAEHYAUHQASAEKAIAQQRxIgEbaiICIAIpAwBCAX03AwAgAEHoAUHgASABG2oiACAAKQMAIAQoAgBBBXatfTcDACADQRBqJAALkQEBBH8gACgCBCIEQQAgBEEAShshAiABKAIAIQUgACgCACEBA0ACQCACIANHBEAgASADQQN0aigCACAFRw0BIAMhAgsDQCACIARBAWsiAU5FBEAgACgCACIBIAJBA3RqIAEgAkEBaiICQQN0aikCADcCACAAKAIEIQQMAQsLIAAgATYCBA8LIANBAWohAwwACwALKAEBfyAAKAIQIAEoAgBqIgItAABFBEAgAkEBOgAAIABBIGogARBJCwt5AQF/IAAoAqAEIQIgACABQQAQHiAAIAIgAUECdGoiAhAiBEAgACgCjAMgAigCBEECdEF4cWpBfzYCAAsgAiACKAIAQXxxQQFyNgIAIAAgACgCrAQgACgCoAQgAUECdGooAgAiAEEFdmogAEEDdkEBcWpBAWo2AqwEC3kBA38jAEEQayIDJAAgAyAAKALMAiABKAIEIgJBAXVqLQAAIAJBAXFzOgAPQQAhAgJAIANBD2pBwCktAAAQTUUNACAAKAKMAyABKAIEQQJ0QXhxaigCACIEQX9GDQAgACgCoAQgBEECdGogAUYhAgsgA0EQaiQAIAILcQEFfyMAQRBrIgMkACABQQRqIQUDQCACIgQgASgCAEEFdiIGSQRAIAMgACgCzAIgBSAEQQJ0aigCACICQQF1ai0AACACQQFxczoADyAEQQFqIQIgA0EPakHAKS0AABBNRQ0BCwsgA0EQaiQAIAQgBkkL7QEBB38gASAAKAKoAkgEQCAAQaQCaiEFIABBmAJqIQYgACgCnAIhAiABQQJ0IQcDQCAFKAIAIAdqIgMoAgAiBCACTgRAIAAgBDYCgAQgBiAAKAKcAiADKAIAaxAYIAUgACgCqAIgAWsQGAUgAkEBayICQQJ0IgQgACgCmAJqKAIAQQF1IgMgACgCzAJqQcIpLQAAOgAAAkAgACgCWCIIQQFMBEAgCEEBRw0BIAIgACgCpAIgACgCqAJBAnRqQQRrKAIATA0BCyAAKALcAiADaiAAKAKYAiAEai0AAEEBcToAAAsgACADEGIMAQsLCwuBAgIJfwJ8IAAoAgAiAyABQQJ0aigCACEFIAAoAgwhCCAAKAIcIQkDQAJAIAFBAXQiAkEBciIEIAAoAgQiBk4NAAJAIAYgAkECaiIKTARAIAkoAgAiByADIARBAnRqKAIAIgJBA3RqKwMAIQsMAQsgCSgCACIHIAMgCkECdGooAgAiBkEDdGorAwAiDCAHIAMgBEECdGooAgAiAkEDdGorAwAiC2RFDQAgDCELIAYhAiAKIQQLIAsgByAFQQN0aisDAGRFDQAgAyABQQJ0aiACNgIAIAggAkECdGogATYCACAEIQEMAQsLIAMgAUECdGogBTYCACAIIAVBAnRqIAE2AgALQQEBfyAAKAIEIgEgACgCCEYEQCAAIAFBAWoQTyAAKAIEIQELIAAoAgAgAUECdGpBADYCACAAIAAoAgRBAWo2AgQLxwEDBH8BfAF9IAEgASgCAEEDdkH8////AXFqIgEgACsD8AMiBiABKgIEu6C2Igc4AgQgB7tEQIy1eB2vFURkBEBBACEBIAAoApACIgJBACACQQBKGyECIAAoAqAEIQQgACgCjAIhBQNAIAEgAkYEQCAAIAZEI0KSDKGcxzuiOQPwAwUgBCAFIAFBAnRqKAIAQQJ0aiIDIAMoAgBBA3ZB/P///wFxaiIDIAMqAgS7RCNCkgyhnMc7orY4AgQgAUEBaiEBDAELCwsLPgEBfwNAIAEgACgCFE5FBEAgACgCACAAKAIQIAFBAnRqKAIAakEAOgAAIAFBAWohAQwBCwsgAEEQakEAEBILRQEBfyMAQRBrIgIkACACIAE2AgwgACABEBcgACgCACABaiIBLQAARQRAIAFBAToAACAAQRBqIAJBDGoQSQsgAkEQaiQAC4YBAQV/IAAoAgAgASgCAEEMbGohBANAIAMgBCgCBE5FBEAgACgCLCgCACAEKAIAIgUgA0EDdGoiBigCAEECdGooAgBBA3FBAUcEQCAFIAJBA3RqIAYpAgA3AgAgAkEBaiECCyADQQFqIQMMAQsLIAQgAyACaxAYIAAoAhAgASgCAGpBADoAAAvkAgEIfyMAQRBrIgUkACAFIAI2AgwCQCABQQ9MBEAgACEEQQAhACMAQRBrIgYkACAGIAI2AgxBASABIgcgAUEBTBtBAWshCQNAIAAgCUcEQCAAQQFqIgEhAyAAIQIDQCAEIAJBAnRqIgooAgAhCCADIAdHBEAgAyACIAZBDGogBCADQQJ0aigCACAIEDgbIQIgA0EBaiEDDAELCyAEIABBAnRqIgAoAgAhAiAAIAg2AgAgCiACNgIAIAEhAAwBCwsgBkEQaiQADAELIAAgAUEBdEF8cWooAgAhAyABIQRBfyECA0AgBUEMaiAAIAJBAWoiAkECdGoiBygCACADEDgNAANAIAVBDGogAyAAIARBAWsiBEECdGoiBigCABA4DQALIAIgBEgEQCAHKAIAIQggByAGKAIANgIAIAYgCDYCAAwBCwsgACACIAUoAgwQKyAHIAEgAmsgBSgCDBArCyAFQRBqJAALkQIBCX8jAEEQayIFJAADQCABKAIEIANKBEACQCAAIAAoAqAEIANBAnQiByABKAIAaigCAEECdGoiBBAjRQRAIARBBGohCEECIQIDQCAEKAIAQQV2IAJMBEAgASgCACICIAZBAnRqIAIgB2ooAgA2AgAgBkEBaiEGDAMFIAUgACgCzAIgCCACQQJ0aiIJKAIAIgpBAXVqLQAAIApBAXFzOgAPIAVBD2pBwSktAAAQTQR/IAkgBCgCAEEDdkH8////AXEgCGpBBGsoAgA2AgAgBBB1IAJBAWsFIAILQQFqIQIMAQsACwALIAAgASgCACAHaigCABAhCyADQQFqIQMMAQsLIAEgAyAGaxAYIAVBEGokAAvFAgEFfyMAQSBrIgIkACACQQA2AhwgAkIANwIUA0AgAiABNgIQIAAoApwEIAFKBEACQCAAKAL8AiABai0AAEUNACACIAAoAswCIAFqLQAAOgAPIAJBD2pBwiktAAAQTUUNACACQRRqIAJBEGoQSQsgAigCEEEBaiEBDAELCyACQRRqIQRBACEBIABBzANqIgAoAgwhBSAAKAIAIQMDQCAAKAIEIAFMBEAgAwRAIABBADYCBAtBACEBA0AgBCgCBCABTARAAkAgACgCBEECbSEBA0AgAUEATA0BIAAgAUEBayIBECUMAAsACwUgACgCDCAEKAIAIAFBAnRqIgMoAgBBAnRqIAE2AgAgACADEEkgAUEBaiEBDAELCwUgBSADIAFBAnRqKAIAQQJ0akF/NgIAIAFBAWohAQwBCwsgBBAPIAJBIGokAAvUAwEGfwJAIAAtAOwDQQFGBEAgABAaQX9GDQELIABBADoA7ANBAA8LAkAgACgCnAIgACgChARGDQAgACkDiARCAFUNACAAIABBjAJqECwCQCAALQCYBEEBRw0AIAAgAEGAAmoQLANAIAAoArgEIAFMBEAgAEGYAmogACgCzAQhBSAAKAKYAiEDQQAhAQNAIAEgACgCnAJORQRAIAUgAyABQQJ0aigCACIGQQF1ai0AAEUEQCADIAJBAnRqIAY2AgAgAkEBaiECCyABQQFqIQEMAQsLIAEgAmsQGCAAIAAoApwCNgKABEEAIQEDQCAAKAK4BCICIAFMBEAgAEHABGohA0EAIQEDQCABIAJORQRAIAMQJiAAKALABCAAKALEBEECdGpBBGsgACgCtAQgAUECdGooAgA2AgAgAUEBaiEBIAAoArgEIQIMAQsLIAAoArQERQ0EIABBADYCuAQFIAAoAswEIAAoArQEIAFBAnRqKAIAakEAOgAAIAFBAWohAQwBCwsFIAAoAswEIAAoArQEIAFBAnRqKAIAakEBOgAAIAFBAWohAQwBCwsLIAAQVSAAEC0gACAAKAKcAjYChAQgACAAKQPoASAAKQPgAXw3A4gEC0EBC6EBAgN8B38gAEGcAmohBSAAKAKkAiIGQQRrIQdEAAAAAAAA8D8gACgCnAS3IgKjIQNBfyAAKAKoAiIEIARBAEgbQQFqIQhBACEAA0AgACAIRkUEQCAABH8gByAAQQJ0aigCAAVBAAshCSAFIAYgAEECdGogACAERhsoAgAhCiADIAC4EIUBIAogCWu3oiABoCEBIABBAWohAAwBCwsgASACowtIAgF+AX8CQCAALQCoBQ0AIAApA5gFIgFCAFkEQCAAKQPAASABWg0BCyAAKQOgBSIBQgBTBEBBAQ8LIAApA7gBIAFUIQILIAILLAEBfyMAQRBrIgEkACABIAAoApwCNgIMIABBpAJqIAFBDGoQSSABQRBqJAALUwEDfyABIAAoAgRKBEAgACABEDMgACgCBCICIAEgASACSBshAyAAKAIAIQQDQCACIANGBEAgACABNgIEBSACIARqQQA6AAAgAkEBaiECDAELCwsLeQECfwJAIAAoAggiAiABTg0AIAEgAmtBAWpBfnEiASACQQF1QX5xQQJqIgMgASADShsiASACQf////8Hc0wEQCAAIAEgAmoiATYCCCAAIAAoAgAgARCVASIANgIAIAANAUHILygCAEEwRw0BCxDNAUHwHEEAEAAACwvWBAEGfyAAQZwDaiECA0ACQCACKAIgIQUgAigCJCADTARAIAUEQCACQQA2AiQLDAELIAIoAhAgBSADQQJ0aiIFKAIAai0AAARAIAIgBRAqCyADQQFqIQMMAQsLIABBoARqIQUDQCAAKAKcBCAESgRAIARBAXQhB0EAIQMDQCADQQJGBEAgBEEBaiEEDAMLIAAoApwDIAMgB3JBDGxqIQZBACECA0AgBigCBCACTARAIANBAWohAwwCBSAFIAYoAgAgAkEDdGogARBjIAJBAWohAgwBCwALAAsACwtBACECA0AgACgCnAIgAkwEQAJAIABBjAJqIQRBACECQQAhAwNAIAIgACgCkAJODQEgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAALAAsFAkAgACgCjAMiAyAAKAKYAiACQQJ0aigCAEEBdUEDdCIEaigCACIGQX9GDQAgBSAFKAIAIAZBAnRqIgYtAABBEHEEfyADBSAAIAYQIkUNASAAKAKMAwsgBGogARBjCyACQQFqIQIMAQsLIAQgAiADaxAYIABBgAJqIQRBACECQQAhAwNAIAAoAoQCIAJKBEAgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAELCyAEIAIgA2sQGAtyAQN/IwBBIGsiASQAIAAgAUEMaiAAKAKkBCAAKAKsBGsQZSICEDQgACgCLEECTgRAIAAoAqQEIQMgASACKAIEQQJ0NgIEIAEgA0ECdDYCAEHJFyABEI0BCyACIABBoARqEGYgAigCABCUASABQSBqJAALTgEBfyAAKAIABEADQCAAKAIEIAFMBEAgAEEANgIEIAAoAgAQlAEgAEEANgIIIABBADYCAAUgACgCACABQQxsahAPIAFBAWohAQwBCwsLC5YCAQd/A0AgAUEPSgRAIAAgAUEBdEF8cWooAgAhBEF/IQIgASEDA0AgACACQQFqIgJBAnRqIgYoAgAiByAESA0AA0AgBCAAIANBAWsiA0ECdGoiCCgCACIFSA0ACyACIANIBEAgBiAFNgIAIAggBzYCAAwBCwsgACACEDcgASACayEBIAYhAAwBCwsgACEFQQAhAEEBIAEiBiABQQFMG0EBayEHA0AgACAHRwRAIAAhAyAAQQFqIgEhAgNAIAUgA0ECdGoiCCgCACEEIAIgBkcEQCACIAMgBSACQQJ0aigCACAESBshAyACQQFqIQIMAQsLIAUgAEECdGoiAygCACEAIAMgBDYCACAIIAA2AgAgASEADAELCwtaAQF/IAAoAgAoAgAiACABQQJ0aiIBKAIAIgNB4ABJBEBBAA8LIAAgAkECdGoiACgCAEEFdiICQQJGBEBBAQ8LIAEgA0EFdkECdGoqAgQgACACQQJ0aioCBF0LHgAgACACIAMgAUGnEBA6IgAgBDoAFCAAQYwbNgIAC3ABAX8jAEEQayIFJAAgACAENgIQIAAgAzYCDCAAIAI2AgggACABNgIEIABB5Bs2AgBBvC8tAABBAXFFBEBBsC9CADcCAEG4L0EANgIAQbwvQQE6AAALIAUgADYCDEGwLyAFQQxqEEkgBUEQaiQAIAALBAAgAAuzBwIDfwF8IwBBEGsiAyQAIwBBEGsiASQAIABCADcCBCAAQaAaNgIAIABCADcDICAAQgA3AgwgAEIANwIUIABCADcDKCAAQfgpKwMAOQMwIABBsCorAwA5AzggAEHoKisDADkDQCAAQaArKwMAOQNIIABBlCwtAAA6AFAgAEHEKygCADYCVEHkKygCACECIABBADoAXCAAIAI2AlggAEH8Ky0AADoAXSAAQaAtKwMAOQNgIABBxC0oAgA2AmggAEG0LCgCADYCbEHoLCsDACEEIABBADYClAMgAEIANwKMAyAAQQA2AoQDIABCADcC/AIgAEEANgL0AiAAQgA3AuwCIABBADYC5AIgAEIANwLcAiAAQQA2AtQCIABCADcCzAIgAEKAgICAgICA/D83A5ABIABB5AA2AogBIABCmrPmzJmz5vg/NwOAASAAQtWq1arVqtXqPzcDeCAAIAQ5A3AgAEGYAWpBAEGwARCEARogASAAQaAEaiICNgIMIABBnANqIAFBDGoQDSAAQgA3AtwDIABCADcC1AMgAEIANwLMAyAAQgA3A4gEIABCgICAgHA3A4AEIABCgICAgICAgPg/NwP4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QoCAgICAgID/PxCdASADQUBrIAMpA1AgAykDWCAbIB0QpgEgAykDSCEdQQEhAiADKQNAIRsLIBlCAXwhGUEBIRILIAEoAgQiBCABKAJoRwR/IAEgBEEBajYCBCAELQAABSABELgBCyEEDAELC0EuIQQLAn4gEkUEQCABKQNwQgBZBEACQCABIAEoAgQiBEEBazYCBCABIARBAms2AgQgCkUNACABIARBA2s2AgQLCyADQeAAakQAAAAAAAAAACAGt6YQqgEgAykDYCEbIAMpA2gMAQsgGUIHVwRAIBkhGgNAIAdBBHQhByAaQgF8IhpCCFINAAsLAkACQAJAIARBX3FB0ABGBEAgARC6ASIaQoCAgICAgICAgH9SDQMgASkDcEIAWQ0BDAILQgAhGiABKQNwQgBTDQILIAEgASgCBEEBazYCBAtCACEaCyAHRQRAIANB8ABqRAAAAAAAAAAAIAa3phCqASADKQNwIRsgAykDeAwBCyAcIBkgChtCAoYgGnxCIH0iGUEAIAlrrVUEQEHIL0HEADYCACADQaABaiAGEKkBIANBkAFqIAMpA6ABIAMpA6gBQn9C////////v///ABCdASADQYABaiADKQOQASADKQOYAUJ/Qv///////7///wAQnQEgAykDgAEhGyADKQOIAQwBCyAJQeIBa6wgGVcEQCAHQQBOBEADQCADQaADaiAbIB1CAEKAgICAgIDA/79/EKYBIBsgHUKAgICAgICA/z8QmQEhASADQZADaiAbIB0gAykDoAMgGyABQQBOIgEbIAMpA6gDIB0gARsQpgEgASAHQQF0IgRyIQcgGUIBfSEZIAMpA5gDIR0gAykDkAMhGyAEQQBODQALCwJ+IBlBICAJa618IhqnIgFBACABQQBKGyAMIBogDK1TGyIBQfEATwRAIANBgANqIAYQqQEgAykDiAMhHCADKQOAAyEeQgAMAQsgA0HgAmpEAAAAAAAA8D9BkAEgAWsQkAEQqgEgA0HQAmogBhCpASADKQPQAiEeIANB8AJqIAMpA+ACIAMpA+gCIAMpA9gCIhwQuwEgAykD+AIhHyADKQPwAgshGiADQcACaiAHIAdBAXFFIBsgHUIAQgAQmAFBAEcgAUEgSXFxIgFyEKsBIANBsAJqIB4gHCADKQPAAiADKQPIAhCdASADQZACaiADKQOwAiAD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gMD/PxCmASACKQPIAyEcIAIpA8ADIRkLIAJBsANqIBsgGiAZIBwQpgEgAkGgA2ogAikDsAMgAikDuAMgHiAdEKcBIAIpA6gDIRogAikDoAMhGwJAIBdBAmsgBUH/////B3FODQAgAiAaQv///////////wCDNwOYAyACIBs3A5ADIAJBgANqIBsgGkIAQoCAgICAgID/PxCdASACKQOQAyACKQOYA0KAgICAgICAuMAAEJkBIQEgAikDiAMgGiABQQBOIgYbIRogAikDgAMgGyAGGyEbIAMgBCAJRyABQQBIcnEgGSAcQgBCABCYAUEAR3FFIBcgBiALaiILQe4Aak5xDQBByC9BxAA2AgALIAJB8AJqIBsgGiALELwBIAIpA/gCIRkgAikD8AILIRogDSAZNwMoIA0gGjcDICACQZDGAGokACANKQMoIRkgDSkDICEaDAELQgAhGgsgDyAaNwMAIA8gGTcDCCANQTBqJAAgDykDCCEZIA8pAwAhGiAWBEAgFiAPKAKIASATIA8oAhQgDygCPGtqajYCAAsgGCIBIBk3AwggASAaNwMAIA9BoAFqJAAgASkDACABKQMIEKgBISAgAUEQaiQAIA4oAhgiAQRAIAArAyAiISAgZQRAIAAtAClBAUcgICAhYnINAwsgACsDGCIhICBmBEAgAC0AKEEBRyAgICFicg0ECyAAICA5AzALIAFBAEchAQsgDkEgaiQAIAEPCyAOIAAoAgQ2AhQgDiATNgIQQYAiKAIAQZUZIA5BEGoQsQFBARABAAsgDiAAKAIENgIEIA4gEzYCAEGAIigCAEHkGCAOELEBQQEQAQALzgECBX8CfCMAQUBqIgIkACAALQAoIQMgACgCBCEEIAAoAhAhBSAALQApIQYgACsDGCEHIAArAyAhCCACIAArAzA5AzggAiAIOQMoIAIgBzkDICACQd0AQSkgBhs2AjAgAiAFNgIUIAIgBDYCECACQdsAQSggAxs2AhhBgCIoAgAhAyMAQRBrIgQkACAEIAJBEGoiBTYCDCADQdUZIAUQswEgBEEQaiQAIAEEQCACIAAoAgg2AgAgA0HXGCACELEBQQogAxCJAQsgAkFAayQAC3oBAn8CQCABIAAoAggiA0sEQCADIQICQANAIAEgAk0NASAAIAIgAkEBdiACQQN2akF+cWpBAmoiAjYCCCAC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AwAhBAwBCyABIAJC////////////AIMiCiADIARC////////////AIMiCRCYAUEATARAIAEgCiADIAkQmAEEQCABIQQMAgsgBUHwAGogASACQgBCABCdASAFKQN4IQIgBSkDcCEEDAELIARCMIinQf//AXEhByAGBH4gAQUgBUHgAGogASAKQgBCgICAgICAwLvAABCdASAFKQNoIgpCMIinQfgAayEGIAUpA2ALIQQgB0UEQCAFQdAAaiADIAlCAEKAgICAgIDAu8AAEJ0BIAUpA1giCUIwiKdB+ABrIQcgBSkDUCEDCyAJQv///////z+DQoCAgICAgMAAhCELIApC////////P4NCgICAgICAwACEIQogBiAHSgRAA0ACfiAKIAt9IAMgBFatfSIJQgBZBEAgCSAEIAN9IgSEUARAIAVBIGogASACQgBCABCdASAFKQMoIQIgBSkDICEEDAULIAlCAYYgBEI/iIQMAQsgCkIBhiAEQj+IhAshCiAEQgGGIQQgBkEBayIGIAdKDQALIAchBgsCQCAKIAt9IAMgBFatfSIJQgBTBEAgCiEJDAELIAkgBCADfSIEhEIAUg0AIAVBMGogASACQgBCABCdASAFKQM4IQIgBSkDMCEEDAELIAlC////////P1gEQANAIARCP4ggBkEBayEGIARCAYYhBCAJQgGGhCIJQoCAgICAgMAAVA0ACwsgCEGAgAJxIQcgBkEATARAIAVBQGsgBCAJQv///////z+DIAZB+ABqIAdyrUIwhoRCAEKAgICAgIDAwz8QnQEgBSkDSCECIAUpA0AhBAwBCyAJQv///////z+DIAYgB3KtQjCGhCECCyAAIAQ3AwAgACACNwMIIAVBgAFqJAAL1ycBC38jAEEQayIKJAACQAJAAkACQAJAAkACQAJAAkACQCAAQfQBTQRAQcwvKAIAIgRBECAAQQtqQfgDcSAAQQtJGyIGQQN2IgB2IgFBA3EEQAJAIAFBf3NBAXEgAGoiAkEDdCIBQfQvaiIAIAFB/C9qKAIAIgEoAggiBUYEQEHMLyAEQX4gAndxNgIADAELIAUgADYCDCAAIAU2AggLIAFBCGohACABIAJBA3QiAkEDcjYCBCABIAJqIgEgASgCBEEBcjYCBAwLCyAGQdQvKAIAIghNDQEgAQRAAkBBAiAAdCICQQAgAmty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QEEADwsgASADg0IAWQRAIAAgAlQgASADUyABIANRGwRAQX8PCyAAIAKFIAEgA4WEQgBSDwsgACACViABIANVIAEgA1EbBEBBfw8LIAAgAoUgASADhYRCAFIhBAsgBAvAAQIBfwJ+QX8hAwJAIABCAFIgAUL///////////8AgyIEQoCAgICAgMD//wBWIARCgICAgICAwP//AFEbDQAgAkL///////////8AgyIFQoCAgICAgMD//wBWIAVCgICAgICAwP//AFJxDQAgACAEIAWEhFAEQEEADwsgASACg0IAWQRAIAEgAlIgASACU3ENASAAIAEgAoWEQgBSDwsgAEIAUiABIAJVIAEgAlEbDQAgACABIAKFhEIAUiEDCyADC1ABAX4CQCADQcAAcQRAIAEgA0FAaq2GIQJCACEBDAELIANFDQAgAiADrSIEhiABQcAAIANrrYiEIQIgASAEhiEBCyAAIAE3AwAgACACNwMIC74PAgV/D34jAEHQAmsiBSQAIARC////////P4MhCiACQv///////z+DIQsgAiAEhUKAgICAgICAgIB/gyEMIARCMIinQf//AXEhCAJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAhB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiDUKAgICAgIDA//8AVCANQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQwMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhDCADIQEMAgsgASANQoCAgICAgMD//wCFhFAEQCADIAJCgICAgICAwP//AIWEUARAQgAhAUKAgICAgIDg//8AIQwMAwsgDEKAgICAgIDA//8AhCEMQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAQgAhAQwCCyABIA2EUARAQoCAgICAgOD//wAgDCACIAOEUBshDEIAIQEMAgsgAiADhFAEQCAMQoCAgICAgMD//wCEIQxCACEBDAILIA1C////////P1gEQCAFQcACaiABIAsgASALIAtQIgYbeSAGQQZ0rXynIgZBD2sQmgFBECAGayEGIAUpA8gCIQsgBSkDwAIhAQsgAkL///////8/Vg0AIAVBsAJqIAMgCiADIAogClAiBxt5IAdBBnStfKciB0EPaxCaASAGIAdqQRBrIQYgBSkDuAIhCiAFKQOwAiEDCyAFQaACaiAKQoCAgICAgMAAhCISQg+GIANCMYiEIgJCAEKAgICAsOa8gvUAIAJ9IgRCABCeASAFQZACakIAIAUpA6gCfUIAIARCABCeASAFQYACaiAFKQOYAkIBhiAFKQOQAkI/iIQiBEIAIAJCABCeASAFQfABaiAEQgBCACAFKQOIAn1CABCeASAFQeABaiAFKQP4AUIBhiAFKQPwAUI/iIQiBEIAIAJCABCeASAFQdABaiAEQgBCACAFKQPoAX1CABCeASAFQcABaiAFKQPYAUIBhiAFKQPQAUI/iIQiBEIAIAJCABCeASAFQbABaiAEQgBCACAFKQPIAX1CABCeASAFQaABaiACQgAgBSkDuAFCAYYgBSkDsAFCP4iEQgF9IgJCABCeASAFQZABaiADQg+GQgAgAkIAEJ4BIAVB8ABqIAJCAEIAIAUpA6gBIAUpA6ABIg0gBSkDmAF8IgQgDVStfCAEQgFWrXx9QgAQngEgBUGAAWpCASAEfUIAIAJCABCeASAGIAkgCGtqIQYCfyAFKQNwIhNCAYYiDiAFKQOIASIPQgGGIAUpA4ABQj+IhHwiEELn7AB9IhRCIIgiAiALQoCAgICAgMAAhCIVQgGGIhZCIIgiBH4iESABQgGGIg1CIIgiCiAQIBRWrSAOIBBWrSAFKQN4QgGGIBNCP4iEIA9CP4h8fHxCAX0iE0IgiCIQfnwiDiARVK0gDiAOIBNC/////w+DIhMgAUI/iCIXIAtCAYaEQv////8PgyILfnwiDlatfCAEIBB+fCAEIBN+IhEgCyAQfnwiDyARVK1CIIYgD0IgiIR8IA4gDiAPQiCGfCIOVq18IA4gDiAUQv////8PgyIUIAt+IhEgAiAKfnwiDyARVK0gDyAPIBMgDUL+////D4MiEX58Ig9WrXx8Ig5WrXwgDiAEIBR+IhggECARfnwiBCACIAt+fCILIAogE358IhBCIIggCyAQVq0gBCAYVK0gBCALVq18fEIghoR8IgQgDlStfCAEIA8gAiARfiICIAogFH58IgpCIIggAiAKVq1CIIaEfCICIA9UrSACIBBCIIZ8IAJUrXx8IgIgBFStfCIEQv////////8AWARAIBYgF4QhFSAFQdAAaiACIAQgAyASEJ4BIAFCMYYgBSkDWH0gBSkDUCIBQgBSrX0hCkIAIAF9IQsgBkH+/wBqDAELIAVB4ABqIARCP4YgAkIBiIQiAiAEQgGIIgQgAyASEJ4BIAFCMIYgBSkDaH0gBSkDYCINQgBSrX0hCkIAIA19IQsgASENIAZB//8AagsiBkH//wFOBEAgDEKAgICAgIDA//8AhCEMQgAhAQwBCwJ+IAZBAEoEQCAKQgGGIAtCP4iEIQEgBEL///////8/gyAGrUIwhoQhCiALQgGGDAELIAZBj39MBEBCACEBDAILIAVBQGsgAiAEQQEgBmsQnAEgBUEwaiANIBUgBkHwAGoQmgEgBUEgaiADIBIgBSkDQCICIAUpA0giChCeASAFKQM4IAUpAyhCAYYgBSkDICIBQj+IhH0gBSkDMCIEIAFCAYYiDVStfSEBIAQgDX0LIQQgBUEQaiADIBJCA0IAEJ4BIAUgAyASQgVCABCeASAKIAIgAiADIAQgAkIBgyIEfCIDVCABIAMgBFStfCIBIBJWIAEgElEbrXwiAlatfCIEIAIgAiAEQoCAgICAgMD//wBUIAMgBSkDEFYgASAFKQMYIgRWIAEgBFEbca18IgJWrXwiBCACIARCgICAgICAwP//AFQgAyAFKQMAViABIAUpAwgiA1YgASADURtxrXwiASACVK18IAyEIQwLIAAgATcDACAAIAw3AwggBUHQAmokAAtQAQF+AkAgA0HAAHEEQCACIANBQGqtiCEBQgAhAgwBCyADRQ0AIAJBwAAgA2uthiABIAOtIgSIhCEBIAIgBIghAgsgACABNwMAIAAgAjcDCAu/CgIFfw9+IwBB4ABrIgUkACAEQv///////z+DIQwgAiAEhUKAgICAgICAgIB/gyEKIAJC////////P4MiDUIgiCEOIARCMIinQf//AXEhBwJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAdB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiC0KAgICAgIDA//8AVCALQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQoMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhCiADIQEMAgsgASALQoCAgICAgMD//wCFhFAEQCACIAOEUARAQoCAgICAgOD//wAhCkIAIQEMAwsgCkKAgICAgIDA//8AhCEKQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAIAEgC4RCACEBUARAQoCAgICAgOD//wAhCgwDCyAKQoCAgICAgMD//wCEIQoMAgsgASALhFAEQEIAIQEMAgsgAiADhFAEQEIAIQEMAgsgC0L///////8/WARAIAVB0ABqIAEgDSABIA0gDVAiBht5IAZBBnStfKciBkEPaxCaAUEQIAZrIQYgBSkDWCINQiCIIQ4gBSkDUCEBCyACQv///////z9WDQAgBUFAayADIAwgAyAMIAxQIggbeSAIQQZ0rXynIghBD2sQmgEgBiAIa0EQaiEGIAUpA0ghDCAFKQNAIQMLIANCD4YiC0KAgP7/D4MiAiABQiCIIgR+IhAgC0IgiCITIAFC/////w+DIgF+fCIPQiCGIhEgASACfnwiCyARVK0gAiANQv////8PgyINfiIVIAQgE358IhEgDEIPhiISIANCMYiEQv////8PgyIDIAF+fCIUIA8gEFStQiCGIA9CIIiEfCIPIAIgDkKAgASEIgx+IhYgDSATfnwiDiASQiCIQoCAgIAIhCICIAF+fCIQIAMgBH58IhJCIIZ8Ihd8IQEgByAJaiAGakH//wBrIQYCQCACIAR+IhggDCATfnwiBCAYVK0gBCAEIAMgDX58IgRWrXwgAiAMfnwgBCAEIBEgFVStIBEgFFatfHwiBFatfCADIAx+IgMgAiANfnwiAiADVK1CIIYgAkIgiIR8IAQgAkIghnwiAiAEVK18IAIgAiAQIBJWrSAOIBZUrSAOIBBWrXx8QiCGIBJCIIiEfCICVq18IAIgAiAPIBRUrSAPIBdWrXx8IgJWrXwiBEKAgICAgIDAAINQRQRAIAZBAWohBgwBCyALQj+IIARCAYYgAkI/iIQhBCACQgGGIAFCP4iEIQIgC0IBhiELIAFCAYaEIQELIAZB//8BTgRAIApCgICAgICAwP//AIQhCkIAIQEMAQsCfiAGQQBMBEBBASAGayIHQf8ATQRAIAVBMGogCyABIAZB/wBqIgYQmgEgBUEgaiACIAQgBhCaASAFQRBqIAsgASAHEJwBIAUgAiAEIAcQnAEgBSkDMCAFKQM4hEIAUq0gBSkDICAFKQMQhIQhCyAFKQMoIAUpAxiEIQEgBSkDACECIAUpAwgMAgtCACEBDAILIARC////////P4MgBq1CMIaECyAKhCEKIAtQIAFCAFkgAUKAgICAgICAgIB/URtFBEAgCiACQgF8IgFQrXwhCgwBCyALIAFCgICAgICAgICAf4WEUEUEQCACIQEMAQsgCiACIAJCAYN8IgEgAlStfCEKCyAAIAE3AwAgACAKNwMIIAVB4ABqJAALdQEBfiAAIAEgBH4gAiADfnwgA0IgiCICIAFCIIgiBH58IANC/////w+DIgMgAUL/////D4MiAX4iBUIgiCADIAR+fCIDQiCIfCABIAJ+IANC/////w+DfCIBQiCIfDcDCCAAIAVC/////w+DIAFCIIaENwMACw4AQaCEBSQCQaCEASQBCwcAIwAjAWsLBAAjAgsEACMBCwYAIAAkAAsQACMAIABrQXBxIgAkACAACwQAIwALzgkCBH8EfiMAQfAAayIGJAAgBEL///////////8AgyEJAkACQCABUCIFIAJC////////////AIMiCkKAgICAgIDA//8AfUKAgICAgIDAgIB/VCAKUBtFBEAgA0IAUiAJQoCAgICAgMD//wB9IgtCgICAgICAwICAf1YgC0KAgICAgIDAgIB/URsNAQsgBSAKQoCAgICAgMD//wBUIApCgICAgICAwP//AFEbRQRAIAJCgICAgICAIIQhBCABIQMMAgsgA1AgCUKAgICAgIDA//8AVCAJQoCAgICAgMD//wBRG0UEQCAEQoCAgICAgCCEIQQMAgsgASAKQoCAgICAgMD//wCFhFAEQEKAgICAgIDg//8AIAIgASADhSACIASFQoCAgICAgICAgH+FhFAiBRshBEIAIAEgBRshAwwCCyADIAlCgICAgICAwP//AIWEUA0BIAEgCoRQBEAgAyAJhEIAUg0CIAEgA4MhAyACIASDIQQMAgsgAyAJhFBFDQAgASEDIAIhBAwBCyADIAEgASADVCAJIApWIAkgClEbIggbIQogBCACIAgbIgxC////////P4MhCSACIAQgCBsiC0IwiKdB//8BcSEHIAxCMIinQf//AXEiBUUEQCAGQeAAaiAKIAkgCiAJIAlQIgUbeSAFQQZ0rXynIgVBD2sQmgEgBikDaCEJIAYpA2AhCkEQIAVrIQULIAEgAyAIGyEDIAtC////////P4MhASAHBH4gAQUgBkHQAGogAyABIAMgASABUCIHG3kgB0EGdK18pyIHQQ9rEJoBQRAgB2shByAGKQNQIQMgBikDWAtCA4YgA0I9iIRCgICAgICAgASEIQEgCUIDhiAKQj2IhCACIASFIQQCfiADQgOGIgIgBSAHRg0AGiAFIAdrIgdB/wBLBEBCACEBQgEMAQsgBkFAayACIAFBgAEgB2sQmgEgBkEwaiACIAEgBxCcASAGKQM4IQEgBikDMCAGKQNAIAYpA0iEQgBSrYQLIQlCgICAgICAgASEIQsgCkIDhiEKAkAgBEIAUwRAQgAhA0IAIQQgCSAKhSABIAuFhFANAiAKIAl9IQIgCyABfSAJIApWrX0iBEL/////////A1YNASAGQSBqIAIgBCACIAQgBFAiBxt5IAdBBnStfKdBDGsiBxCaASAFIAdrIQUgBikDKCEEIAYpAyAhAgwBCyAJIAp8IgIgCVStIAEgC3x8IgRCgICAgICAgAiDUA0AIAlCAYMgBEI/hiACQgGIhIQhAiAFQQFqIQUgBEIBiCEECyAMQoCAgICAgICAgH+DIQMgBUH//wFOBEAgA0KAgICAgIDA//8AhCEEQgAhAwwBC0EAIQcCQCAFQQBKBEAgBSEHDAELIAZBEGogAiAEIAVB/wBqEJoBIAYgAiAEQQEgBWsQnAEgBikDACAGKQMQIAYpAxiEQgBSrYQhAiAGKQMIIQQLIARCPYYgAkIDiIQhASAEQgOIQv///////z+DIAetQjCGhCADhCEEAkACQCACp0EHcSIFQQRHBEAgBCABIAEgBUEES618IgNWrXwhBAwBCyAEIAEgASABQgGDfCIDVq18IQQMAQsgBUUNAQsLIAAgAzcDACAAIAQ3AwggBkHwAGokAAtFAQF/IwBBEGsiBSQAIAUgASACIAMgBEKAgICAgICAgIB/hRCmASAFKQMAIQEgACAFKQMINwMIIAAgATcDACAFQRBqJAAL8wMCAn4FfyMAQSBrIgUkACABQv///////z+DIQICfiABQjCIQv//AYMiA6ciBEGB+ABrQf0PTQRAIAJCBIYgAEI8iIQhAiAEQYD4AGutIQMCQCAAQv//////////D4MiAEKBgICAgICAgAhaBEAgAkIBfCECDAELIABCgICAgICAgIAIUg0AIAJCAYMgAnwhAgtCACACIAJC/////////wdWIgQbIQAgBK0gA3wMAQsgACAChFAgA0L//wFSckUEQCACQgSGIABCPIiEQoCAgICAgIAEhCEAQv8PDAELIARB/ocBSwRAQgAhAEL/DwwBC0GA+ABBgfgAIANQIgcbIgggBGsiBkHwAEoEQEIAIQBCAAwBCyAFQRBqIAAgAiACQoCAgICAgMAAhCAHGyICQYABIAZrEJoBIAUgACACIAYQnAEgBSkDCEIEhiAFKQMAIgJCPIiEIQACQCAEIAhHIAUpAxAgBSkDGIRCAFJxrSACQv//////////D4OEIgJCgYCAgICAgIAIWgRAIABCAXwhAAwBCyACQoCAgICAgICACFINACAAQgGDIAB8IQALIABCgICAgICAgAiFIAAgAEL/////////B1YiBBshACAErQshAiAFQSBqJAAgAUKAgICAgICAgIB/gyACQjSGhCAAhL8LfwICfwF+IwBBEGsiAyQAIAACfiABRQRAQgAMAQsgAyABIAFBH3UiAnMgAmsiAq1CACACZyICQdEAahCaASADKQMIQoCAgICAgMAAhUGegAEgAmutQjCGfCABQYCAgIB4ca1CIIaEIQQgAykDAAs3AwAgACAENwMIIANBEGokAAvjAQIEfgJ/IwBBEGsiBiQAIAG9IgVC/////////weDIQIgAAJ+IAVCNIhC/w+DIgNQRQRAIANC/w9SBEAgAkIEiCEEIANCgPgAfCEDIAJCPIYMAgsgAkIEiCEEQv//ASEDIAJCPIYMAQsgAlAEQEIAIQNCAAwBCyAGIAJCACAFp2dBIHIgAkIgiKdnIAJCgICAgBBUGyIHQTFqEJoBQYz4ACAHa60hAyAGKQMIQoCAgICAgMAAhSEEIAYpAwALNwMAIAAgBUKAgICAgICAgIB/gyADQjCGhCAEhDcDCCAGQRBqJAALZwIBfwF+IwBBEGsiAiQAIAACfiABRQRAQgAMAQsgAiABrUIAQfAAIAFnIgFBH3NrEJoBIAIpAwhCgICAgICAwACFQZ6AASABa61CMIZ8IQMgAikDAAs3AwAgACADNwMIIAJBEGokAAvxAQEDfwJAIABFBEBBuCkoAgAEQEG4KSgCABCsASEBC0GgKCgCAARAQaAoKAIAEKwBIAFyIQELQbwzKAIAIgBFDQEDQCAAKAJMGiAA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BEBBACEHDAELQQAhCyAIKAIwIQwDQCAMKAIAIg1FDQEgCEEEaiIKIA0QxAEiDSALaiILIAdLDQEgACAKIA0QvwEgDEEEaiEMIAcgC0sNAAsLIABBICAQIAcgCUGAwABzEMMBIBAgByAHIBBIGyEHDAgLIBQgCkEASHENCUE9IQsgACAIKwMwIBAgCiAJIAcgBRETACIHQQBODQcMCgsgBy0AASEMIAdBAWohBwwACwALIAANCSATRQ0DQQEhBwNAIAQgB0ECdGooAgAiAARAIAMgB0EDdGogACACIAYQwQFBASEOIAdBAWoiB0EKRw0BDAsLCyAHQQpPBEBBASEODAoLA0AgBCAHQQJ0aigCAA0BQQEhDiAHQQFqIgdBCkcNAAsMCQtBHCELDAYLIAggBzoAJ0EBIQogFyENIAwhCQsgCiALIA1rIgwgCiAMShsiASARQf////8Hc0oNA0E9IQsgECABIBFqIgogCiAQSBsiByAYSg0EIABBICAHIAogCRDDASAAIBYgERC/ASAAQTAgByAKIAlBgIAEcxDDASAAQTAgASAMQQAQwwEgACANIAwQvwEgAEEgIAcgCiAJQYDAAHMQwwEgCCgCPCEBDAELCwtBACEODAMLQT0hCwtByC8gCzYCAAtBfyEOCyAIQUBrJAAgDgsYACAALQAAQSBxRQRAIAEgAiAAEIsBGgsLbwEFfyAAKAIAIgMsAABBMGsiAUEJSwRAQQAPCwNAQX8hBCACQcyZs+YATQRAQX8gASACQQpsIgVqIAEgBUH/////B3NLGyEECyAAIANBAWoiBTYCACADLAABIAQhAiAFIQNBMGsiAUEKSQ0ACyACC7wCAAJAAkACQAJAAkACQAJAAkACQAJAAkAgAUEJaw4SAAgJCggJAQIDBAoJCgoICQUGBwsgAiACKAIAIgFBBGo2AgAgACABKAIANgIADwsgAiACKAIAIgFBBGo2AgAgACABMgEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMwEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMAAANwMADwsgAiACKAIAIgFBBGo2AgAgACABMQAANwMADwsgAiACKAIAQQdqQXhxIgFBCGo2AgAgACABKwMAOQMADwsgACACIAMRAAALDwsgAiACKAIAIgFBBGo2AgAgACABNAIANwMADwsg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ZWFucyBubyBsaW1pdABNaW5pbXVtIGxlYXJudCBjbGF1c2UgbGltaXQAbWluLWxlYXJudHMAICAtJXMsIC1uby0lcwBUaGUgY2xhdXNlIGFjdGl2aXR5IGRlY2F5IGZhY3RvcgBUaGUgdmFyaWFibGUgYWN0aXZpdHkgZGVjYXkgZmFjdG9yAFJlc3RhcnQgaW50ZXJ2YWwgaW5jcmVhc2UgZmFjdG9yAHJuZC1mcmVxAC4uLy4uLy4uL3N5c3RlbS9saWIvbGliY3h4YWJpL3NyYy9wcml2YXRlX3R5cGVpbmZvLmNwcABVc2VkIGJ5IHRoZSByYW5kb20gdmFyaWFibGUgc2VsZWN0aW9uAGltaW4AbmFuAGFzeW1tAGVsaW0AY2wtbGltAHN1Yi1saW0AVGhlIGJhc2UgcmVzdGFydCBpbnRlcnZhbAByY2hlY2sAY2FuX2NhdGNoAHBoYXNlLXNhdmluZwB0ZXJtaW5hdGluZwBpbmYAb2ZmAFRoZSBmcmVxdWVuY3kgd2l0aCB3aGljaCB0aGUgZGVjaXNpb24gaGV1cmlzdGljIHRyaWVzIHRvIGNob29zZSBhIHJhbmRvbSB2YXJpYWJsZQBjY21pbi1tb2RlAFVzZSB0aGUgTHVieSByZXN0YXJ0IHNlcXVlbmNlAFRoZSBmcmFjdGlvbiBvZiB3YXN0ZWQgbWVtb3J5IGFsbG93ZWQgYmVmb3JlIGEgZ2FyYmFnZSBjb2xsZWN0aW9uIGlzIHRyaWdnZXJlZAB0ZXJtaW5hdGVfaGFuZGxlciB1bmV4cGVjdGVkbHkgcmV0dXJuZWQAcm5kLXNlZWQAJTRkAHJpbmMAc2ltcC1nYy1mcmFjACAgLSUtMTJzID0gJS04cyBbAFNJTVAATkFOAElORgBDT1JFADxib29sPgA8ZG91YmxlPgA8aW50MzI+AD09PT09PT09PT09PT09PT09PT09PT09PT09PT1bIFNlYXJjaCBTdGF0aXN0aWNzIF09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0APT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQBEbyBub3QgY2hlY2sgaWYgc3Vic3VtcHRpb24gYWdhaW5zdCBhIGNsYXVzZSBsYXJnZXIgdGhhbiB0aGlzLiAtMSBtZWFucyBubyBsaW1pdC4AQWxsb3cgYSB2YXJpYWJsZSBlbGltaW5hdGlvbiBzdGVwIHRvIGdyb3cgYnkgYSBudW1iZXIgb2YgY2xhdXNlcy4AUGVyZm9ybSB2YXJpYWJsZSBlbGltaW5hdGlvbi4AVGhlIGZyYWN0aW9uIG9mIHdhc3RlZCBtZW1vcnkgYWxsb3dlZCBiZWZvcmUgYSBnYXJiYWdlIGNvbGxlY3Rpb24gaXMgdHJpZ2dlcmVkIGR1cmluZyBzaW1wbGlmaWNhdGlvbi4AU2hyaW5rIGNsYXVzZXMgYnkgYXN5bW1ldHJpYyBicmFuY2hpbmcuAG5vLQBDaGVjayBpZiBhIGNsYXVzZSBpcyBhbHJlYWR5IGltcGxpZWQuIChjb3N0bHkpAENvbnRyb2xzIGNvbmZsaWN0IGNsYXVzZSBtaW5pbWl6YXRpb24gKDA9bm9uZSwgMT1iYXNpYywgMj1kZWVwKQAobnVsbCkAQ29udHJvbHMgdGhlIGxldmVsIG9mIHBoYXNlIHNhdmluZyAoMD1ub25lLCAxPWxpbWl0ZWQsIDI9ZnVsbCkAYWRqdXN0ZWRQdHIgJiYgImNhdGNoaW5nIGEgY2xhc3Mgd2l0aG91dCBhbiBvYmplY3Q/IgBQdXJlIHZpcnR1YWwgZnVuY3Rpb24gY2FsbGVkIQBZTyEAbGliYysrYWJpOiAAIC4uIABlbGltaW5hdGlvbiBsZWZ0OiAlMTBkDQBzdWJzdW1wdGlvbiBsZWZ0OiAlMTBkICglMTBkIHN1YnN1bWVkLCAlMTBkIGRlbGV0ZWQgbGl0ZXJhbHMpDQB8ICU5ZCB8ICU3ZCAlOGQgJThkIHwgJThkICU4ZCAlNi4wZiB8ICU2LjNmICUlIHwKAHwgIEdhcmJhZ2UgY29sbGVjdGlvbjogICAlMTJkIGJ5dGVzID0+ICUxMmQgYnl0ZXMgICAgICAgICAgICAgfAoAfCAgRWxpbWluYXRlZCBjbGF1c2VzOiAgICAgJTEwLjJmIE1iICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8CgAKICAgICAgICAlcwoARVJST1IhIHZhbHVlIDwlcz4gaXMgdG9vIHNtYWxsIGZvciBvcHRpb24gIiVzIi4KAEVSUk9SISB2YWx1ZSA8JXM+IGlzIHRvbyBsYXJnZSBmb3Igb3B0aW9uICIlcyIuCgAoZGVmYXVsdDogJXMpCgAgIC0lLTEycyA9ICUtOHMgJWMlNC4yZyAuLiAlNC4yZyVjIChkZWZhdWx0OiAlZykKAF0gKGRlZmF1bHQ6ICVkKQoAAAAAACwNAAABAAAAAgAAAAMAAAC4EQAANA0AAE43TWluaXNhdDZTb2x2ZXJFAAAAAAAAAGANAAAFAAAABgAAAAcAAAD+////4BEAAGwNAAAsDQAATjdNaW5pc2F0MTBTaW1wU29sdmVyRQAAAAAAAJwNAAAIAAAACQAAAAoAAAALAAAA4BEAAKgNAADADQAATjdNaW5pc2F0MTBCb29sT3B0aW9uRQAAuBEAAMgNAABON01pbmlzYXQ2T3B0aW9uRQAAAAAAAADADQAACAAAAAwAAAANAAAADQAAAAAAAAAMDgAACAAAAA4AAAAPAAAAEAAAAOARAAAYDgAAwA0AAE43TWluaXNhdDlJbnRPcHRpb25FAAAAAAAAAABIDgAACAAAABEAAAASAAAAEwAAAOARAABUDgAAwA0AAE43TWluaXNhdDEyRG91YmxlT3B0aW9uRQAAAAC4EQAAeA4AAE43TWluaXNhdDIwT3V0T2ZNZW1vcnlFeGNlcHRpb25FAEGmHQsa8D8AAAAAAAD4PwAAAAAAAAAABtDPQ+v9TD4AQcsdC5YBQAO44j/RdJ4AV529KoBwUg///z4nCgAAAGQAAADoAwAAECcAAKCGAQBAQg8AgJaYAADh9QUYAAAANQAAAHEAAABr////zvv//5K///8AAAAAAAAAABkACwAZGRkAAAAABQAAAAAAAAkAAAAACwAAAAAAAAAAGQAKChkZGQMKBwABAAkLGAAACQYLAAALAAYZAAAAGRkZAEHxHgshDgAAAAAAAAAAGQALDRkZGQANAAACAAkOAAAACQAOAAAOAEGrHwsBDABBtx8LFRMAAAAAEwAAAAAJDAAAAAAADAAADABB5R8LARAAQfEfCxUPAAAABA8AAAAACRAAAAAAABAAABAAQZ8gCwESAEGrIAseEQAAAAARAAAAAAkSAAAAAAASAAASAAAaAAAAGhoaAEHiIAsOGgAAABoaGgAAAAAAAAkAQZMhCwEUAEGfIQsVFwAAAAAXAAAAAAkUAAAAAAAUAAAUAEHNIQsBFgBB2SEL5AIVAAAAABUAAAAACRYAAAAAABYAABYAADAxMjM0NTY3ODlBQkNERUaQEwAA4BEAABARAACYEQAATjEwX19jeHhhYml2MTE2X19zaGltX3R5cGVfaW5mb0UAAAAA4BEAAEARAAAEEQAATjEwX19jeHhhYml2MTE3X19jbGFzc190eXBlX2luZm9FAAAA4BEAAHARAAA0EQAATjEwX19jeHhhYml2MTIwX19zaV9jbGFzc190eXBlX2luZm9FAAAAALgRAACgEQAAU3Q5dHlwZV9pbmZvAAAAAAAAAAA0EQAAHAAAAB0AAAAeAAAAHwAAACAAAAAhAAAAIgAAACMAAAAAAAAAZBEAABwAAAAkAAAAHgAAAB8AAAAgAAAAJQAAACYAAAAnAAAAAAAAACgAAAAoAAAAKQAAACkAAAApAAAAKQAAACkAAAApAAAAKAAAACgAAAApAAAAKAAAACgAAAAoAAAAKABB4CQLHSkAAAApAAAAKAAAACgAAAAAAAAAKAAAAAAAAAApAEGIJgsDIEIBAEGkJgsBKgBB7CYLAuAZAEGQJwsBBQBBnCcLARYAQbQnCwoXAAAAGAAAAAAaAEHMJwsBAgBB3CcLCP//////////AEGgKAsJkBMAAAAAAAAFAEG0KAsBGQBBzCgLDhcAAAAaAAAACBoAAAAEAEHkKAsBAQBB9CgLBf////8KAEG4KQsFKBQAABs=");b=xa(b);return a(b[0])}();c._yo=L("yo",0);c._free=L("free",1);c._unyo=L("unyo",1);c._createTheSolver=L("createTheSolver",0);c._ensureVar=L("ensureVar",1);c._addClause=L("addClause",1);c._solve=L("solve",0);c._getSolution=L("getSolution",0);c._getNumVars=L("getNumVars",0);c._solveAssuming=L("solveAssuming",1);c._retireVar=L("retireVar",1);c._getConflictClauseSize=L("getConflictClauseSize",0);c._getConflictClause=L("getConflictClause",0);var $a=L("fflush",1);c._malloc=L("malloc",1);var Sa=L("_emscripten_timeout",2),mb=M.emscripten_stack_init,oa=M.emscripten_stack_get_end,Ba=M._emscripten_stack_restore,cb=M._emscripten_stack_alloc,Ca=M.emscripten_stack_get_current;c.dynCall_jiji=L("dynCall_jiji",5);var Z;H=function nb(){Z||ob();Z||(H=nb)};function ob(){function a(){if(!Z&&(Z=!0,c.calledRun=!0,!x)){var _c$onRuntimeInitializ;p(!sa);sa=!0;E();O(qa);aa(c);(_c$onRuntimeInitializ=c.onRuntimeInitialized)===null||_c$onRuntimeInitializ===void 0||_c$onRuntimeInitializ.call(c);p(!c._main,'compiled without a main, but one is present. if you added it from JS, use Module["onRuntimeInitialized"]');E();if(c.postRun)for("function"==typeof c.postRun&&(c.postRun=[c.postRun]);c.postRun.length;){var b=c.postRun.shift();ra.unshift(b)}O(ra)}}if(!(0<G)){mb();na();if(c.preRun)for("function"==typeof c.preRun&&(c.preRun=[c.preRun]);c.preRun.length;)ta();O(pa);0<G||(c.setStatus?(c.setStatus("Running..."),setTimeout(()=>{setTimeout(()=>c.setStatus(""),1);a()},1)):a(),E())}}function Pa(){var a=r,b=u,d=!1;r=u=()=>{d=!0};try{ab()}catch(e){}r=a;u=b;d&&(R("stdio streams had content in them that was not flushed. you should set EXIT_RUNTIME to 1 (see the Emscripten FAQ), or make sure to emit a newline when you printf etc."),R("(this may also be due to not including full filesystem support - try building with -sFORCE_FILESYSTEM)"))}if(c.preInit)for("function"==typeof c.preInit&&(c.preInit=[c.preInit]);0<c.preInit.length;)c.preInit.pop()();ob();moduleRtn=c;for(const a of Object.keys(c))a in moduleArg||Object.defineProperty(moduleArg,a,{configurable:!0,get(){l(`Access to module property ('${a}') is no longer possible via the module constructor argument; Instead, use the result of the module constructor.`)}});
 
 
-  return moduleRtn;
-}
-);
+      return moduleRtn;
+    }
+  );
 })();
 if (typeof exports === 'object' && typeof module === 'object') {
   module.exports = Module;

From 7cf9c360890d09075f3857929fe6185b255a8ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 5 Feb 2025 18:21:12 +0100
Subject: [PATCH 1042/1140] update minisat to custom generated code

---
 packages/logic-solver/minisat.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/logic-solver/minisat.js b/packages/logic-solver/minisat.js
index 124389b116..105703d7dc 100644
--- a/packages/logic-solver/minisat.js
+++ b/packages/logic-solver/minisat.js
@@ -49,15 +49,15 @@ var Module = (() => {
   var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
   if (typeof __filename != 'undefined') _scriptName = _scriptName || __filename;
   return (
-    function(moduleArg = {}) {
-      var moduleRtn;
+function(moduleArg = {}) {
+  var moduleRtn;
 
-      function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==typeof i?i:i+""}function _toPrimitive(t,r){if("object"!=typeof t||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=typeof i)return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}var c=moduleArg,aa,f,ba=new Promise((a,b)=>{aa=a;f=b});"_addClause _createTheSolver _ensureVar _free _getConflictClause _getConflictClauseSize _getNumVars _getSolution _malloc _retireVar _solve _solveAssuming _unyo _yo ccall cwrap UTF8ToString stringToUTF8 UTF16ToString stringToUTF16 UTF32ToString stringToUTF32 AsciiToString intArrayFromString intArrayToString writeArrayToMemory stackSave stackAlloc stackRestore getValue setValue _memory ___indirect_function_table onRuntimeInitialized".split(" ").forEach(a=>{Object.getOwnPropertyDescriptor(ba,a)||Object.defineProperty(ba,a,{get:()=>l("You are getting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js"),set:()=>l("You are setting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js")})});var ca=Object.assign({},c),m=(a,b)=>{throw b},da;if("undefined"==typeof process||!process.release||"node"!==process.release.name)throw Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)");var ea=process.versions.node,n=ea.split(".").slice(0,3);n=1e4*n[0]+100*n[1]+1*n[2].split("-")[0];if(14e4>n)throw Error("This emscripten-generated code requires node v14.0.0 (detected v"+ea+")");var fs=require("fs");require("path");da=a=>{a=fa(a)?new URL(a):a;a=fs.readFileSync(a);p(Buffer.isBuffer(a));return a};process.argv.slice(2);m=(a,b)=>{process.exitCode=a;throw b};var r=c.print||console.log.bind(console),u=c.printErr||console.error.bind(console);Object.assign(c,ca);ca=null;Object.getOwnPropertyDescriptor(c,"fetchSettings")&&l("`Module.fetchSettings` was supplied but `fetchSettings` not included in INCOMING_MODULE_JS_API");v("arguments","arguments_");v("thisProgram","thisProgram");p("undefined"==typeof c.memoryInitializerPrefixURL,"Module.memoryInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.pthreadMainPrefixURL,"Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.cdInitializerPrefixURL,"Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.filePackagePrefixURL,"Module.filePackagePrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.read,"Module.read option was removed");p("undefined"==typeof c.readAsync,"Module.readAsync option was removed (modify readAsync in JS)");p("undefined"==typeof c.readBinary,"Module.readBinary option was removed (modify readBinary in JS)");p("undefined"==typeof c.setWindowTitle,"Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)");p("undefined"==typeof c.TOTAL_MEMORY,"Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY");v("asm","wasmExports");v("readAsync","readAsync");v("readBinary","readBinary");v("setWindowTitle","setWindowTitle");p(!0,"web environment detected but not enabled at build time.  Add `web` to `-sENVIRONMENT` to enable.");p(!0,"worker environment detected but not enabled at build time.  Add `worker` to `-sENVIRONMENT` to enable.");p(!0,"shell environment detected but not enabled at build time.  Add `shell` to `-sENVIRONMENT` to enable.");var ha=c.wasmBinary;v("wasmBinary","wasmBinary");"object"!=typeof WebAssembly&&u("no native wasm support detected");"undefined"==typeof atob&&("undefined"!=typeof global&&"undefined"==typeof globalThis&&(globalThis=global),globalThis.atob=function(a){var b="",d=0;a=a.replace(/[^A-Za-z0-9\+\/=]/g,"");do{var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var g="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var k="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var h="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));e=e<<2|g>>4;g=(g&15)<<4|k>>2;var q=(k&3)<<6|h;b+=String.fromCharCode(e);64!==k&&(b+=String.fromCharCode(g));64!==h&&(b+=String.fromCharCode(q))}while(d<a.length);return b});var w,x=!1,y;function p(a,b){a||l("Assertion failed"+(b?": "+b:""))}var z,A,B,ia,C,D,ja,ka;function la(){var a=w.buffer;c.HEAP8=z=new Int8Array(a);c.HEAP16=B=new Int16Array(a);c.HEAPU8=A=new Uint8Array(a);c.HEAPU16=ia=new Uint16Array(a);c.HEAP32=C=new Int32Array(a);c.HEAPU32=D=new Uint32Array(a);c.HEAPF32=ja=new Float32Array(a);c.HEAPF64=ka=new Float64Array(a)}let ma;(ma=global).performance??(ma.performance=require("perf_hooks").performance);p(!c.STACK_SIZE,"STACK_SIZE can no longer be set at runtime.  Use -sSTACK_SIZE at link time");p("undefined"!=typeof Int32Array&&"undefined"!==typeof Float64Array&&void 0!=Int32Array.prototype.subarray&&void 0!=Int32Array.prototype.set,"JS engine does not provide full typed array support");p(!c.wasmMemory,"Use of `wasmMemory` detected.  Use -sIMPORTED_MEMORY to define wasmMemory externally");p(!c.INITIAL_MEMORY,"Detected runtime INITIAL_MEMORY setting.  Use -sIMPORTED_MEMORY to define wasmMemory dynamically");function na(){var a=oa();p(0==(a&3));0==a&&(a+=4);D[a>>2]=34821223;D[a+4>>2]=2310721022;D[0]=1668509029}function E(){if(!x){var a=oa();0==a&&(a+=4);var b=D[a>>2],d=D[a+4>>2];34821223==b&&2310721022==d||l(`Stack overflow! Stack cookie has been overwritten at ${F(a)}, expected hex dwords 0x89BACDFE and 0x2135467, but received ${F(d)} ${F(b)}`);1668509029!=D[0]&&l("Runtime error: The application has corrupted its heap memory area (address zero)!")}}var pa=[],qa=[],ra=[],sa=!1;function ta(){var a=c.preRun.shift();pa.unshift(a)}p(Math.imul,"This browser does not support Math.imul(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.fround,"This browser does not support Math.fround(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.clz32,"This browser does not support Math.clz32(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.trunc,"This browser does not support Math.trunc(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");var G=0,H=null,J={},K=null;function ua(){var _c$monitorRunDependen;G++;(_c$monitorRunDependen=c.monitorRunDependencies)===null||_c$monitorRunDependen===void 0||_c$monitorRunDependen.call(c,G);p(!J["wasm-instantiate"]);J["wasm-instantiate"]=1;null===K&&"undefined"!=typeof setInterval&&(K=setInterval(()=>{if(x)clearInterval(K),K=null;else{var a=!1,b;for(b in J)a||(a=!0,u("still waiting on run dependencies:")),u(`dependency: ${b}`);a&&u("(end of list)")}},1e4))}function l(a){var _c$onAbort;(_c$onAbort=c.onAbort)===null||_c$onAbort===void 0||_c$onAbort.call(c,a);a="Aborted("+a+")";u(a);x=!0;a=new WebAssembly.RuntimeError(a);f(a);throw a}function va(){l("Filesystem support (FS) was not included. The problem is that you are using files from JS, but files were not used from C/C++, so filesystem support was not auto-included. You can force-include filesystem support with -sFORCE_FILESYSTEM")}c.FS_createDataFile=function(){va()};c.FS_createPreloadedFile=function(){va()};var wa=a=>a.startsWith("data:application/octet-stream;base64,"),fa=a=>a.startsWith("file://");function L(a,b){return function(){p(sa,`native function \`${a}\` called before runtime initialization`);var e=M[a];p(e,`exported native function \`${a}\` not found`);p(arguments.length<=b,`native function \`${a}\` called with ${arguments.length} args but expects ${b}`);return e(...arguments)}}var N;function xa(a){if(N==N&&ha)var b=new Uint8Array(ha);else if(b=N,wa(b)?(b=b.slice(37),b=Buffer.from(b,"base64"),b=new Uint8Array(b.buffer,b.byteOffset,b.length)):b=void 0,!b)if(da)b=da(N);else throw'sync fetching of the wasm failed: you can preload it to Module["wasmBinary"] manually, or emcc.py will do that for you when generating HTML (but not JS)';b=new WebAssembly.Module(b);return[new WebAssembly.Instance(b,a),b]}var ya=new Int16Array(1),za=new Int8Array(ya.buffer);ya[0]=25459;if(115!==za[0]||99!==za[1])throw"Runtime error: expected the system to be little-endian! (Run with -sSUPPORT_BIG_ENDIAN to bypass)";if(c.ENVIRONMENT)throw Error("Module.ENVIRONMENT has been deprecated. To force the environment, use the ENVIRONMENT compile-time option (for example, -sENVIRONMENT=web or -sENVIRONMENT=node)");function v(a,b){Object.getOwnPropertyDescriptor(c,a)||Object.defineProperty(c,a,{configurable:!0,get(){l(`\`Module.${a}\` has been replaced by \`${b}\``+" (the initial value can be provided on Module, but after startup the value is only looked for on a local variable of that name)")}})}class Aa{constructor(a){_defineProperty(this,"name","ExitStatus");this.message=`Program terminated with exit(${a})`;this.status=a}}c.ExitStatus=Aa;var O=a=>{for(;0<a.length;)a.shift()(c)};c.callRuntimeCallbacks=O;c.getValue=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:"i8";b.endsWith("*")&&(b="*");switch(b){case"i1":return z[a];case"i8":return z[a];case"i16":return B[a>>1];case"i32":return C[a>>2];case"i64":l("to do getValue(i64) use WASM_BIGINT");case"float":return ja[a>>2];case"double":return ka[a>>3];case"*":return D[a>>2];default:l(`invalid type for getValue: ${b}`)}};var Q=c.noExitRuntime||!0;c.noExitRuntime=Q;var F=a=>{p("number"===typeof a);return"0x"+(a>>>0).toString(16).padStart(8,"0")};c.ptrToString=F;c.setValue=function(a,b){let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"i8";d.endsWith("*")&&(d="*");switch(d){case"i1":z[a]=b;break;case"i8":z[a]=b;break;case"i16":B[a>>1]=b;break;case"i32":C[a>>2]=b;break;case"i64":l("to do setValue(i64) use WASM_BIGINT");case"float":ja[a>>2]=b;break;case"double":ka[a>>3]=b;break;case"*":D[a>>2]=b;break;default:l(`invalid type for setValue: ${d}`)}};c.stackRestore=a=>Ba(a);c.stackSave=()=>Ca();var R=a=>{R.h||(R.h={});R.h[a]||(R.h[a]=1,u("warning: "+a))};c.warnOnce=R;var Da="undefined"!=typeof TextDecoder?new TextDecoder:void 0;c.UTF8Decoder=Da;var Ea=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:0;let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:NaN;var e=b+d;for(d=b;a[d]&&!(d>=e);)++d;if(16<d-b&&a.buffer&&Da)return Da.decode(a.subarray(b,d));for(e="";b<d;){var g=a[b++];if(g&128){var k=a[b++]&63;if(192==(g&224))e+=String.fromCharCode((g&31)<<6|k);else{var h=a[b++]&63;224==(g&240)?g=(g&15)<<12|k<<6|h:(240!=(g&248)&&R("Invalid UTF-8 leading byte "+F(g)+" encountered when deserializing a UTF-8 string in wasm memory to a JS string!"),g=(g&7)<<18|k<<12|h<<6|a[b++]&63);65536>g?e+=String.fromCharCode(g):(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023))}}else e+=String.fromCharCode(g)}return e};c.UTF8ArrayToString=Ea;var S=(a,b)=>{p("number"==typeof a,`UTF8ToString expects a number (got ${typeof a})`);return a?Ea(A,a,b):""};c.UTF8ToString=S;var Fa=(a,b,d,e)=>l(`Assertion failed: ${S(a)}, at: `+[b?S(b):"unknown filename",d,e?S(e):"unknown function"]);c.___assert_fail=Fa;var T;c.wasmTable=T;c.getWasmTableEntry=a=>T.get(a);var Ga=(a,b)=>T.get(a)(b);c.___call_sighandler=Ga;class Ha{constructor(a){this.g=a-24}}c.ExceptionInfo=Ha;var Ia=0;c.exceptionLast=Ia;var Ja=0;c.uncaughtExceptionCount=Ja;var Ka=(a,b,d)=>{var e=new Ha(a);D[e.g+16>>2]=0;D[e.g+4>>2]=b;D[e.g+8>>2]=d;Ia=a;Ja++;p(!1,"Exception thrown, but exception catching is not enabled. Compile with -sNO_DISABLE_EXCEPTION_CATCHING or -sEXCEPTION_CATCHING_ALLOWED=[..] to catch.")};c.___cxa_throw=Ka;var La=()=>l("native code called abort()");c.__abort_js=La;var U=0;c.runtimeKeepaliveCounter=U;var Ma=()=>{Q=!1;U=0};c.__emscripten_runtime_keepalive_clear=Ma;var V={};c.timers=V;var Na=a=>{if(a instanceof Aa||"unwind"==a)return y;E();a instanceof WebAssembly.RuntimeError&&0>=Ca()&&u("Stack overflow detected.  You can try increasing -sSTACK_SIZE (currently set to 65536)");m(1,a)};c.handleException=Na;c.keepRuntimeAlive=()=>Q||0<U;var Oa=a=>{var _c$onExit;y=a;Q||0<U||((_c$onExit=c.onExit)!==null&&_c$onExit!==void 0&&_c$onExit.call(c,a),x=!0);m(a,new Aa(a))};c._proc_exit=Oa;var W=(a,b)=>{y=a;Pa();(Q||0<U)&&!b&&(b=`program exited (with status: ${a}), but keepRuntimeAlive() is set (counter=${U}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`,f(b),u(b));Oa(a)};c.exitJS=W;c._exit=W;var Qa=()=>{if(!(Q||0<U))try{W(y)}catch(a){Na(a)}};c.maybeExit=Qa;var Ra=a=>{if(x)u("user callback triggered after runtime exited or application aborted.  Ignoring.");else try{a(),Qa()}catch(b){Na(b)}};c.callUserCallback=Ra;c._emscripten_get_now=()=>performance.now();var Ta=(a,b)=>{V[a]&&(clearTimeout(V[a].id),delete V[a]);if(!b)return 0;var d=setTimeout(()=>{p(a in V);delete V[a];Ra(()=>Sa(a,performance.now()))},b);V[a]={id:d,j:b};return 0};c.__setitimer_js=Ta;c.getHeapMax=()=>2147483648;var Ua=(a,b)=>{p(b,"alignment argument is required");return Math.ceil(a/b)*b};c.alignMemory=Ua;var Va=a=>{var b=w.buffer,d=(a-b.byteLength+65535)/65536|0;try{return w.grow(d),la(),1}catch(e){u(`growMemory: Attempted to grow heap from ${b.byteLength} bytes to ${a} bytes, but got error: ${e}`)}};c.growMemory=Va;var Wa=a=>{var b=A.length;a>>>=0;p(a>b);if(2147483648<a)return u(`Cannot enlarge memory, requested ${a} bytes, but the limit is ${2147483648} bytes!`),!1;for(var d=1;4>=d;d*=2){var e=b*(1+.2/d);e=Math.min(e,a+100663296);e=Math.min(2147483648,Ua(Math.max(a,e),65536));if(Va(e))return!0}u(`Failed to grow the heap from ${b} bytes to ${e} bytes, not enough memory!`);return!1};c._emscripten_resize_heap=Wa;c.SYSCALLS={l:void 0,i(a){return S(a)}};var Xa=()=>{l("fd_close called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_close=Xa;var Ya=(a,b)=>{p(a==a>>>0||a==(a|0));p(b===(b|0));return b+2097152>>>0<4194305-!!a?(a>>>0)+4294967296*b:NaN};c.convertI32PairToI53Checked=Ya;function Za(a,b,d){Ya(b,d);return 70}c._fd_seek=Za;var X=[null,[],[]];c.printCharBuffers=X;var Y=(a,b)=>{var d=X[a];p(d);0===b||10===b?((1===a?r:u)(Ea(d)),d.length=0):d.push(b)};c.printChar=Y;var ab=()=>{$a(0);X[1].length&&Y(1,10);X[2].length&&Y(2,10)};c.flush_NO_FILESYSTEM=ab;var bb=(a,b,d,e)=>{for(var g=0,k=0;k<d;k++){var h=D[b>>2],q=D[b+4>>2];b+=8;for(var I=0;I<q;I++)Y(a,A[h+I]);g+=q}D[e>>2]=g;return 0};c._fd_write=bb;c.stackAlloc=a=>cb(a);var db=a=>{var b=c["_"+a];p(b,"Cannot call unknown function "+a+", make sure it is exported");return b};c.getCFunc=db;var eb=(a,b)=>{p(0<=a.length,"writeArrayToMemory array must have a length (should be an array or typed array)");z.set(a,b)};c.writeArrayToMemory=eb;var fb=a=>{for(var b=0,d=0;d<a.length;++d){var e=a.charCodeAt(d);127>=e?b++:2047>=e?b+=2:55296<=e&&57343>=e?(b+=4,++d):b+=3}return b};c.lengthBytesUTF8=fb;var gb=(a,b,d,e)=>{p("string"===typeof a,`stringToUTF8Array expects a string (got ${typeof a})`);if(!(0<e))return 0;var g=d;e=d+e-1;for(var k=0;k<a.length;++k){var h=a.charCodeAt(k);if(55296<=h&&57343>=h){var q=a.charCodeAt(++k);h=65536+((h&1023)<<10)|q&1023}if(127>=h){if(d>=e)break;b[d++]=h}else{if(2047>=h){if(d+1>=e)break;b[d++]=192|h>>6}else{if(65535>=h){if(d+2>=e)break;b[d++]=224|h>>12}else{if(d+3>=e)break;1114111<h&&R("Invalid Unicode code point "+F(h)+" encountered when serializing a JS string to a UTF-8 string in wasm memory! (Valid unicode code points should be in range 0-0x10FFFF).");b[d++]=240|h>>18;b[d++]=128|h>>12&63}b[d++]=128|h>>6&63}b[d++]=128|h&63}}b[d]=0;return d-g};c.stringToUTF8Array=gb;var hb=(a,b,d)=>{p("number"==typeof d,"stringToUTF8(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");return gb(a,A,b,d)};c.stringToUTF8=hb;var ib=a=>{var b=fb(a)+1,d=cb(b);hb(a,d,b);return d};c.stringToUTF8OnStack=ib;var jb=(a,b,d,e)=>{var g={string:t=>{var P=0;null!==t&&void 0!==t&&0!==t&&(P=ib(t));return P},array:t=>{var P=cb(t.length);eb(t,P);return P}};a=db(a);var k=[],h=0;p("array"!==b,'Return type should not be "array".');if(e)for(var q=0;q<e.length;q++){var I=g[d[q]];I?(0===h&&(h=Ca()),k[q]=I(e[q])):k[q]=e[q]}d=a(...k);return d=function(t){0!==h&&Ba(h);return"string"===b?S(t):"boolean"===b?!!t:t}(d)};c.ccall=jb;c.cwrap=(a,b,d,e)=>function(){for(var _len=arguments.length,g=new Array(_len),_key=0;_key<_len;_key++){g[_key]=arguments[_key]}return jb(a,b,d,g,e)};c.intArrayFromString=function(a,b,d){d=Array(0<d?d:fb(a)+1);a=gb(a,d,0,d.length);b&&(d.length=a);return d};c.intArrayToString=function(a){for(var b=[],d=0;d<a.length;d++){var e=a[d];255<e&&(p(!1,`Character code ${e} (${String.fromCharCode(e)}) at offset ${d} not in 0x00-0xFF.`),e&=255);b.push(String.fromCharCode(e))}return b.join("")};c.AsciiToString=a=>{for(var b="";;){var d=A[a++];if(!d)return b;b+=String.fromCharCode(d)}};var kb="undefined"!=typeof TextDecoder?new TextDecoder("utf-16le"):void 0;c.UTF16Decoder=kb;c.UTF16ToString=(a,b)=>{p(0==a%2,"Pointer passed to UTF16ToString must be aligned to two bytes!");var d=a>>1;for(var e=d+b/2;!(d>=e)&&ia[d];)++d;d<<=1;if(32<d-a&&kb)return kb.decode(A.subarray(a,d));d="";for(e=0;!(e>=b/2);++e){var g=B[a+2*e>>1];if(0==g)break;d+=String.fromCharCode(g)}return d};c.stringToUTF16=(a,b,d)=>{p(0==b%2,"Pointer passed to stringToUTF16 must be aligned to two bytes!");p("number"==typeof d,"stringToUTF16(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(2>d)return 0;d-=2;var e=b;d=d<2*a.length?d/2:a.length;for(var g=0;g<d;++g)B[b>>1]=a.charCodeAt(g),b+=2;B[b>>1]=0;return b-e};c.UTF32ToString=(a,b)=>{p(0==a%4,"Pointer passed to UTF32ToString must be aligned to four bytes!");for(var d=0,e="";!(d>=b/4);){var g=C[a+4*d>>2];if(0==g)break;++d;65536<=g?(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023)):e+=String.fromCharCode(g)}return e};c.stringToUTF32=(a,b,d)=>{p(0==b%4,"Pointer passed to stringToUTF32 must be aligned to four bytes!");p("number"==typeof d,"stringToUTF32(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(4>d)return 0;var e=b;d=e+d-4;for(var g=0;g<a.length;++g){var k=a.charCodeAt(g);if(55296<=k&&57343>=k){var h=a.charCodeAt(++g);k=65536+((k&1023)<<10)|h&1023}C[b>>2]=k;b+=4;if(b+4>d)break}C[b>>2]=0;return b-e};var lb={__assert_fail:Fa,__call_sighandler:Ga,__cxa_throw:Ka,_abort_js:La,_emscripten_runtime_keepalive_clear:Ma,_setitimer_js:Ta,emscripten_resize_heap:Wa,exit:W,fd_close:Xa,fd_seek:Za,fd_write:bb,proc_exit:Oa},M=function(){function a(d){var _c$monitorRunDependen2;M=d.exports;w=M.memory;p(w,"memory not found in wasm exports");la();T=M.__indirect_function_table;p(T,"table not found in wasm exports");qa.unshift(M.__wasm_call_ctors);G--;(_c$monitorRunDependen2=c.monitorRunDependencies)===null||_c$monitorRunDependen2===void 0||_c$monitorRunDependen2.call(c,G);p(J["wasm-instantiate"]);delete J["wasm-instantiate"];0==G&&(null!==K&&(clearInterval(K),K=null),H&&(d=H,H=null,d()));return M}ua();var b={env:lb,wasi_snapshot_preview1:lb};if(c.instantiateWasm)try{return c.instantiateWasm(b,a)}catch(d){u(`Module.instantiateWasm callback failed with error: ${d}`),f(d)}N??(N="data:application/octet-stream;base64,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QX9GDQELIABBADoA7ANBAA8LAkAgACgCnAIgACgChARGDQAgACkDiARCAFUNACAAIABBjAJqECwCQCAALQCYBEEBRw0AIAAgAEGAAmoQLANAIAAoArgEIAFMBEAgAEGYAmogACgCzAQhBSAAKAKYAiEDQQAhAQNAIAEgACgCnAJORQRAIAUgAyABQQJ0aigCACIGQQF1ai0AAEUEQCADIAJBAnRqIAY2AgAgAkEBaiECCyABQQFqIQEMAQsLIAEgAmsQGCAAIAAoApwCNgKABEEAIQEDQCAAKAK4BCICIAFMBEAgAEHABGohA0EAIQEDQCABIAJORQRAIAMQJiAAKALABCAAKALEBEECdGpBBGsgACgCtAQgAUECdGooAgA2AgAgAUEBaiEBIAAoArgEIQIMAQsLIAAoArQERQ0EIABBADYCuAQFIAAoAswEIAAoArQEIAFBAnRqKAIAakEAOgAAIAFBAWohAQwBCwsFIAAoAswEIAAoArQEIAFBAnRqKAIAakEBOgAAIAFBAWohAQwBCwsLIAAQVSAAEC0gACAAKAKcAjYChAQgACAAKQPoASAAKQPgAXw3A4gEC0EBC6EBAgN8B38gAEGcAmohBSAAKAKkAiIGQQRrIQdEAAAAAAAA8D8gACgCnAS3IgKjIQNBfyAAKAKoAiIEIARBAEgbQQFqIQhBACEAA0AgACAIRkUEQCAABH8gByAAQQJ0aigCAAVBAAshCSAFIAYgAEECdGogACAERhsoAgAhCiADIAC4EIUBIAogCWu3oiABoCEBIABBAWohAAwBCwsgASACowtIAgF+AX8CQCAALQCoBQ0AIAApA5gFIgFCAFkEQCAAKQPAASABWg0BCyAAKQOgBSIBQgBTBEBBAQ8LIAApA7gBIAFUIQILIAILLAEBfyMAQRBrIgEkACABIAAoApwCNgIMIABBpAJqIAFBDGoQSSABQRBqJAALUwEDfyABIAAoAgRKBEAgACABEDMgACgCBCICIAEgASACSBshAyAAKAIAIQQDQCACIANGBEAgACABNgIEBSACIARqQQA6AAAgAkEBaiECDAELCwsLeQECfwJAIAAoAggiAiABTg0AIAEgAmtBAWpBfnEiASACQQF1QX5xQQJqIgMgASADShsiASACQf////8Hc0wEQCAAIAEgAmoiATYCCCAAIAAoAgAgARCVASIANgIAIAANAUHILygCAEEwRw0BCxDNAUHwHEEAEAAACwvWBAEGfyAAQZwDaiECA0ACQCACKAIgIQUgAigCJCADTARAIAUEQCACQQA2AiQLDAELIAIoAhAgBSADQQJ0aiIFKAIAai0AAARAIAIgBRAqCyADQQFqIQMMAQsLIABBoARqIQUDQCAAKAKcBCAESgRAIARBAXQhB0EAIQMDQCADQQJGBEAgBEEBaiEEDAMLIAAoApwDIAMgB3JBDGxqIQZBACECA0AgBigCBCACTARAIANBAWohAwwCBSAFIAYoAgAgAkEDdGogARBjIAJBAWohAgwBCwALAAsACwtBACECA0AgACgCnAIgAkwEQAJAIABBjAJqIQRBACECQQAhAwNAIAIgACgCkAJODQEgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAALAAsFAkAgACgCjAMiAyAAKAKYAiACQQJ0aigCAEEBdUEDdCIEaigCACIGQX9GDQAgBSAFKAIAIAZBAnRqIgYtAABBEHEEfyADBSAAIAYQIkUNASAAKAKMAwsgBGogARBjCyACQQFqIQIMAQsLIAQgAiADaxAYIABBgAJqIQRBACECQQAhAwNAIAAoAoQCIAJKBEAgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAELCyAEIAIgA2sQGAtyAQN/IwBBIGsiASQAIAAgAUEMaiAAKAKkBCAAKAKsBGsQZSICEDQgACgCLEECTgRAIAAoAqQEIQMgASACKAIEQQJ0NgIEIAEgA0ECdDYCAEHJFyABEI0BCyACIABBoARqEGYgAigCABCUASABQSBqJAALTgEBfyAAKAIABEADQCAAKAIEIAFMBEAgAEEANgIEIAAoAgAQlAEgAEEANgIIIABBADYCAAUgACgCACABQQxsahAPIAFBAWohAQwBCwsLC5YCAQd/A0AgAUEPSgRAIAAgAUEBdEF8cWooAgAhBEF/IQIgASEDA0AgACACQQFqIgJBAnRqIgYoAgAiByAESA0AA0AgBCAAIANBAWsiA0ECdGoiCCgCACIFSA0ACyACIANIBEAgBiAFNgIAIAggBzYCAAwBCwsgACACEDcgASACayEBIAYhAAwBCwsgACEFQQAhAEEBIAEiBiABQQFMG0EBayEHA0AgACAHRwRAIAAhAyAAQQFqIgEhAgNAIAUgA0ECdGoiCCgCACEEIAIgBkcEQCACIAMgBSACQQJ0aigCACAESBshAyACQQFqIQIMAQsLIAUgAEECdGoiAygCACEAIAMgBDYCACAIIAA2AgAgASEADAELCwtaAQF/IAAoAgAoAgAiACABQQJ0aiIBKAIAIgNB4ABJBEBBAA8LIAAgAkECdGoiACgCAEEFdiICQQJGBEBBAQ8LIAEgA0EFdkECdGoqAgQgACACQQJ0aioCBF0LHgAgACACIAMgAUGnEBA6IgAgBDoAFCAAQYwbNgIAC3ABAX8jAEEQayIFJAAgACAENgIQIAAgAzYCDCAAIAI2AgggACABNgIEIABB5Bs2AgBBvC8tAABBAXFFBEBBsC9CADcCAEG4L0EANgIAQbwvQQE6AAALIAUgADYCDEGwLyAFQQxqEEkgBUEQaiQAIAALBAAgAAuzBwIDfwF8IwBBEGsiAyQAIwBBEGsiASQAIABCADcCBCAAQaAaNgIAIABCADcDICAAQgA3AgwgAEIANwIUIABCADcDKCAAQfgpKwMAOQMwIABBsCorAwA5AzggAEHoKisDADkDQCAAQaArKwMAOQNIIABBlCwtAAA6AFAgAEHEKygCADYCVEHkKygCACECIABBADoAXCAAIAI2AlggAEH8Ky0AADoAXSAAQaAtKwMAOQNgIABBxC0oAgA2AmggAEG0LCgCADYCbEHoLCsDACEEIABBADYClAMgAEIANwKMAyAAQQA2AoQDIABCADcC/AIgAEEANgL0AiAAQgA3AuwCIABBADYC5AIgAEIANwLcAiAAQQA2AtQCIABCADcCzAIgAEKAgICAgICA/D83A5ABIABB5AA2AogBIABCmrPmzJmz5vg/NwOAASAAQtWq1arVqtXqPzcDeCAAIAQ5A3AgAEGYAWpBAEGwARCEARogASAAQaAEaiICNgIMIABBnANqIAFBDGoQDSAAQgA3AtwDIABCADcC1AMgAEIANwLMAyAAQgA3A4gEIABCgICAgHA3A4AEIABCgICAgICAgPg/NwP4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QoCAgICAgID/PxCdASADQUBrIAMpA1AgAykDWCAbIB0QpgEgAykDSCEdQQEhAiADKQNAIRsLIBlCAXwhGUEBIRILIAEoAgQiBCABKAJoRwR/IAEgBEEBajYCBCAELQAABSABELgBCyEEDAELC0EuIQQLAn4gEkUEQCABKQNwQgBZBEACQCABIAEoAgQiBEEBazYCBCABIARBAms2AgQgCkUNACABIARBA2s2AgQLCyADQeAAakQAAAAAAAAAACAGt6YQqgEgAykDYCEbIAMpA2gMAQsgGUIHVwRAIBkhGgNAIAdBBHQhByAaQgF8IhpCCFINAAsLAkACQAJAIARBX3FB0ABGBEAgARC6ASIaQoCAgICAgICAgH9SDQMgASkDcEIAWQ0BDAILQgAhGiABKQNwQgBTDQILIAEgASgCBEEBazYCBAtCACEaCyAHRQRAIANB8ABqRAAAAAAAAAAAIAa3phCqASADKQNwIRsgAykDeAwBCyAcIBkgChtCAoYgGnxCIH0iGUEAIAlrrVUEQEHIL0HEADYCACADQaABaiAGEKkBIANBkAFqIAMpA6ABIAMpA6gBQn9C////////v///ABCdASADQYABaiADKQOQASADKQOYAUJ/Qv///////7///wAQnQEgAykDgAEhGyADKQOIAQwBCyAJQeIBa6wgGVcEQCAHQQBOBEADQCADQaADaiAbIB1CAEKAgICAgIDA/79/EKYBIBsgHUKAgICAgICA/z8QmQEhASADQZADaiAbIB0gAykDoAMgGyABQQBOIgEbIAMpA6gDIB0gARsQpgEgASAHQQF0IgRyIQcgGUIBfSEZIAMpA5gDIR0gAykDkAMhGyAEQQBODQALCwJ+IBlBICAJa618IhqnIgFBACABQQBKGyAMIBogDK1TGyIBQfEATwRAIANBgANqIAYQqQEgAykDiAMhHCADKQOAAyEeQgAMAQsgA0HgAmpEAAAAAAAA8D9BkAEgAWsQkAEQqgEgA0HQAmogBhCpASADKQPQAiEeIANB8AJqIAMpA+ACIAMpA+gCIAMpA9gCIhwQuwEgAykD+AIhHyADKQPwAgshGiADQcACaiAHIAdBAXFFIBsgHUIAQgAQmAFBAEcgAUEgSXFxIgFyEKsBIANBsAJqIB4gHCADKQPAAiADKQPIAhCdASADQZACaiADKQOwAiAD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gMD/PxCmASACKQPIAyEcIAIpA8ADIRkLIAJBsANqIBsgGiAZIBwQpgEgAkGgA2ogAikDsAMgAikDuAMgHiAdEKcBIAIpA6gDIRogAikDoAMhGwJAIBdBAmsgBUH/////B3FODQAgAiAaQv///////////wCDNwOYAyACIBs3A5ADIAJBgANqIBsgGkIAQoCAgICAgID/PxCdASACKQOQAyACKQOYA0KAgICAgICAuMAAEJkBIQEgAikDiAMgGiABQQBOIgYbIRogAikDgAMgGyAGGyEbIAMgBCAJRyABQQBIcnEgGSAcQgBCABCYAUEAR3FFIBcgBiALaiILQe4Aak5xDQBByC9BxAA2AgALIAJB8AJqIBsgGiALELwBIAIpA/gCIRkgAikD8AILIRogDSAZNwMoIA0gGjcDICACQZDGAGokACANKQMoIRkgDSkDICEaDAELQgAhGgsgDyAaNwMAIA8gGTcDCCANQTBqJAAgDykDCCEZIA8pAwAhGiAWBEAgFiAPKAKIASATIA8oAhQgDygCPGtqajYCAAsgGCIBIBk3AwggASAaNwMAIA9BoAFqJAAgASkDACABKQMIEKgBISAgAUEQaiQAIA4oAhgiAQRAIAArAyAiISAgZQRAIAAtAClBAUcgICAhYnINAwsgACsDGCIhICBmBEAgAC0AKEEBRyAgICFicg0ECyAAICA5AzALIAFBAEchAQsgDkEgaiQAIAEPCyAOIAAoAgQ2AhQgDiATNgIQQYAiKAIAQZUZIA5BEGoQsQFBARABAAsgDiAAKAIENgIEIA4gEzYCAEGAIigCAEHkGCAOELEBQQEQAQALzgECBX8CfCMAQUBqIgIkACAALQAoIQMgACgCBCEEIAAoAhAhBSAALQApIQYgACsDGCEHIAArAyAhCCACIAArAzA5AzggAiAIOQMoIAIgBzkDICACQd0AQSkgBhs2AjAgAiAFNgIUIAIgBDYCECACQdsAQSggAxs2AhhBgCIoAgAhAyMAQRBrIgQkACAEIAJBEGoiBTYCDCADQdUZIAUQswEgBEEQaiQAIAEEQCACIAAoAgg2AgAgA0HXGCACELEBQQogAxCJAQsgAkFAayQAC3oBAn8CQCABIAAoAggiA0sEQCADIQICQANAIAEgAk0NASAAIAIgAkEBdiACQQN2akF+cWpBAmoiAjYCCCACIANLDQALDAILIAAoAgAgAkECdBCVASIBRQRAQcgvKAIAQTBGDQILIAAgATYCAAsPCxDNAUHwHEEAEAAACw8AIAAgARB0IAAgAhB0VAsbACAAKAIAKAIAIAFBA3RqIgA0AgQgADQCAH4LTgECfyAAKAIAIgFBCHEEQCAAQQRqIgIgAUEFdiIBQQFrQQJ0aiACIAFBAnRqKAIANgIAIAAoAgAhAQsgACABQSBrQWBxIAFBH3FyNgIAC6ABAQd/IAAoAgAiAiABQQJ0aigCACEDIAAoAgwhBCAAKAIcIQUDQAJAIAFFDQAgBSgCACIGIANBA3RqKwMAIAYgAiABQQFrQQF1IgBBAnRqIgcoAgAiCEEDdGorAwBkRQ0AIAIgAUECdGogCDYCACAEIAcoAgBBAnRqIAE2AgAgACEBDAELCyACIAFBAnRqIAM2AgAgBCADQQJ0aiABNgIACw0AQasWEI8BEMgBEDwLFAAgAARAIAAgACgCACgCBBEBAAsLIAEBf0HELxDIARA8IgA2AgAgAEEBEEwaQcQvKAIAEEMLMwEBf0HALygCACEBA0AgACABTEUEQEHELygCABBDQcAvQcAvKAIAQQFqIgE2AgAMAQsLC4MBAQN/IwBBEGsiASQAIAFBADYCDCABQgA3AgQDQCAAKAIAIgIEQCACIAJBH3UiA3MgA2siAxB6IAEgA0EBdCACQR92cjYCACAAQQRqIQAgAUEEaiABEEkMAQsLIAFBBGoiAEHELygCACICQfQEaiIDEHwgAiADEFYgABAPIAFBEGokAAukAQEDfyABKAIABEAgAUEANgIECyAAKAIEIgMgASgCBEoEQCABIAMQTyABKAIEIgIgAyACIANKGyEEA0AgAiAERgRAIAEgAzYCBAUgASgCACACQQJ0akEANgIAIAJBAWohAgwBCwsLIAEoAgAhAiAAKAIAIQNBACEBA0AgASAAKAIESARAIAIgAUECdCIEaiADIARqKAIANgIAIAFBAWohAQwBCwsLNAEBf0HELygCACIAQn83A5gFIABCfzcDoAUgACgCsAIEQCAAQQA2ArQCCyAAEEtB/wFxRQsOAEHELygCACgCBEEBagsIAEHALygCAAtkAQJ/IwBBEGsiASQAIAFBADYCDCABQgA3AgQgASAAQQF0NgIAIAFBBGoiAiABEElBxC8oAgAiAEJ/NwOYBSAAQn83A6AFIAIgAEGwAmoQfCAAEEtB/wFxRSACEA8gAUEQaiQAC1ABAn9BxC8oAgAhASMAQRBrIgIkACACIABBAXRBAXI2AgwgASgC9AQEQCABQQA2AvgECyABQfQEaiIAIAJBDGoQSSABIAAQVhogAkEQaiQACwsAQcQvKAIAKAIkCwsAQcQvKAIAKAIgCykBAX8gAgRAIAAhAwNAIAMgAToAACADQQFqIQMgAkEBayICDQALCyAAC+oPAwd8CH8EfkQAAAAAAADwPyEDAkACQAJAIAG9IhFCIIgiE6ciEEH/////B3EiCSARpyIMckUNACAAvSISpyIPRSASQiCIIhRCgIDA/wNRcQ0AIBSnIgtB/////wdxIgpBgIDA/wdLIApBgIDA/wdGIA9BAEdxciAJQYCAwP8HS3JFIAxFIAlBgIDA/wdHcnFFBEAgACABoA8LAkACQAJAAkACQAJ/QQAgEkIAWQ0AGkECIAlB////mQRLDQAaQQAgCUGAgMD/A0kNABogCUEUdiENIAlBgICAigRJDQFBACAMQbMIIA1rIg52Ig0gDnQgDEcNABpBAiANQQFxawshDiAMDQIgCUGAgMD/B0cNASAKQYCAwP8DayAPckUNBSAKQYCAwP8DSQ0DIAFEAAAAAAAAAAAgEUIAWRsPCyAMDQEgCUGTCCANayIMdiINIAx0IAlHDQBBAiANQQFxayEOCyAJQYCAwP8DRgRAIBFCAFkEQCAADwtEAAAAAAAA8D8gAKMPCyATQoCAgIAEUQRAIAAgAKIPCyATQoCAgP8DUiASQgBTcg0AIACfDwsgAJkhAiAPDQECQCALQQBIBEAgC0GAgICAeEYgC0GAgMD/e0ZyIAtBgIBARnINAQwDCyALRSALQYCAwP8HRnINACALQYCAwP8DRw0CC0QAAAAAAADwPyACoyACIBFCAFMbIQMgEkIAWQ0CIA4gCkGAgMD/A2tyRQRAIAMgA6EiACAAow8LIAOaIAMgDkEBRhsPC0QAAAAAAAAAACABmiARQgBZGw8LAkAgEkIAWQ0AAkACQCAODgIAAQILIAAgAKEiACAAow8LRAAAAAAAAPC/IQMLAnwgCUGBgICPBE8EQCAJQYGAwJ8ETwRAIApB//+//wNNBEBEAAAAAAAA8H9EAAAAAAAAAAAgEUIAUxsPC0QAAAAAAADwf0QAAAAAAAAAACAQQQBKGw8LIApB/v+//wNNBEAgA0ScdQCIPOQ3fqJEnHUAiDzkN36iIANEWfP4wh9upQGiRFnz+MIfbqUBoiARQgBTGw8LIApBgYDA/wNPBEAgA0ScdQCIPOQ3fqJEnHUAiDzkN36iIANEWfP4wh9upQGiRFnz+MIfbqUBoiAQQQBKGw8LIAJEAAAAAAAA8L+gIgBERN9d+AuuVD6iIAAgAKJEAAAAAAAA4D8gACAARAAAAAAAANC/okRVVVVVVVXVP6CioaJE/oIrZUcV97+ioCICIAIgAEQAAABgRxX3P6IiAqC9QoCAgIBwg78iACACoaEMAQsgAkQAAAAAAABAQ6IiACACIApBgIDAAEkiCRshAiAAvUIgiKcgCiAJGyIMQf//P3EiCkGAgMD/A3IhCyAMQRR1Qcx3QYF4IAkbaiEMQQAhCQJAIApBj7EOSQ0AIApB+uwuSQRAQQEhCQwBCyAKQYCAgP8DciELIAxBAWohDAsgCUEDdCIKQbAdaisDACACvUL/////D4MgC61CIIaEvyIEIApBoB1qKwMAIgWhIgZEAAAAAAAA8D8gBSAEoKMiB6IiAr1CgICAgHCDvyIAIAAgAKIiCEQAAAAAAAAIQKAgByAGIAAgCUESdCALQQF2akGAgKCAAmqtQiCGvyIGoqEgACAFIAahIASgoqGiIgQgAiAAoKIgAiACoiIAIACiIAAgACAAIAAgAETvTkVKKH7KP6JEZdvJk0qGzT+gokQBQR2pYHTRP6CiRE0mj1FVVdU/oKJE/6tv27Zt2z+gokQDMzMzMzPjP6CioCIFoL1CgICAgHCDvyIAoiIGIAQgAKIgAiAFIABEAAAAAAAACMCgIAihoaKgIgKgvUKAgICAcIO/IgBE9QFbFOAvPr6iIAIgACAGoaFE/QM63AnH7j+ioKAiAiAKQcAdaisDACIEIAIgAEQAAADgCcfuP6IiAqCgIAy3IgWgvUKAgICAcIO/IgAgBaEgBKEgAqGhCyECIAEgEUKAgICAcIO/IgShIACiIAEgAqKgIgIgACAEoiIBoCIAvSIRpyEJAkAgEUIgiKciCkGAgMCEBE4EQCAKQYCAwIQEayAJcg0DIAJE/oIrZUcVlzygIAAgAaFkRQ0BDAMLIApBgPj//wdxQYCYw4QESQ0AIApBgOi8+wNqIAlyDQMgAiAAIAGhZUUNAAwDC0EAIQkgAwJ8IApB/////wdxIgtBgYCA/wNPBH5BAEGAgMAAIAtBFHZB/gdrdiAKaiIKQf//P3FBgIDAAHJBkwggCkEUdkH/D3EiC2t2IglrIAkgEUIAUxshCSACIAFBgIBAIAtB/wdrdSAKca1CIIa/oSIBoL0FIBELQoCAgIBwg78iAEQAAAAAQy7mP6IiAyACIAAgAaGhRO85+v5CLuY/oiAARDlsqAxhXCC+oqAiAqAiACAAIAAgACAAoiIBIAEgASABIAFE0KS+cmk3Zj6iRPFr0sVBvbu+oKJELN4lr2pWET+gokSTvb4WbMFmv6CiRD5VVVVVVcU/oKKhIgGiIAFEAAAAAAAAAMCgoyAAIAIgACADoaEiAKIgAKChoUQAAAAAAADwP6AiAL0iEUIgiKcgCUEUdGoiCkH//z9MBEAgACAJEJABDAELIBFC/////w+DIAqtQiCGhL8LoiEDCyADDwsgA0ScdQCIPOQ3fqJEnHUAiDzkN36iDwsgA0RZ8/jCH26lAaJEWfP4wh9upQGiCwIAC1kBAX8gACAAKAJIIgFBAWsgAXI2AkggACgCACIBQQhxBEAgACABQSByNgIAQX8PCyAAQgA3AgQgACAAKAIsIgE2AhwgACABNgIUIAAgASAAKAIwajYCEEEAC4EBAQJ/IwBBEGsiAiQAIAIgAToADwJAAkAgACgCECIDBH8gAwUgABCHAQ0CIAAoAhALIAAoAhQiA0YNACAAKAJQIAFB/wFxRg0AIAAgA0EBajYCFCADIAE6AAAMAQsgACACQQ9qQQEgACgCJBEFAEEBRw0AIAItAA8aCyACQRBqJAALzQEBAn8CQAJAIAEoAkwiAkEATgRAIAJFDQFBpCYoAgAgAkH/////A3FHDQELAkAgAEH/AXEiAyABKAJQRg0AIAEoAhQiAiABKAIQRg0AIAEgAkEBajYCFCACIAA6AAAMAgsgASADEIgBDAELIAEgASgCTCICQf////8DIAIbNgJMAkACQCAAQf8BcSIDIAEoAlBGDQAgASgCFCICIAEoAhBGDQAgASACQQFqNgIUIAIgADoAAAwBCyABIAMQiAELIAEoAkwaIAFBADYCTAsLKwAgAgRAA0AgACABLQAAOgAAIABBAWohACABQQFqIQEgAkEBayICDQALCwvCAQEDfwJAIAIoAhAiAwR/IAMFIAIQhwENASACKAIQCyACKAIUIgRrIAFJBEAgAiAAIAEgAigCJBEFAA8LAkACQCABRSACKAJQQQBIcg0AIAEhAwNAIAAgA2oiBUEBay0AAEEKRwRAIANBAWsiAw0BDAILCyACIAAgAyACKAIkEQUAIgQgA0kNAiABIANrIQEgAigCFCEEDAELIAAhBUEAIQMLIAQgBSABEIoBIAIgAigCFCABajYCFCABIANqIQQLIAQLQgEBfyABIAJsIQQgBAJ/IAMoAkxBAEgEQCAAIAQgAxCLAQwBCyAAIAQgAxCLAQsiAEYEQCACQQAgARsPCyAAIAFuCyUBAX8jAEEQayICJAAgAiABNgIMQagoIAAgARCyASACQRBqJAALJQEBfyMAQRBrIgIkACACIAE2AgxBqCggACABELMBIAJBEGokAAtdAEH0KCgCABoCQCAAQQEgABCRASIAQagoEIwBIABHDQACQEH4KCgCAEEKRg0AQbwoKAIAIgBBuCgoAgBGDQBBvCggAEEBajYCACAAQQo6AAAMAQtBqChBChCIAQsLqAEAAkAgAUGACE4EQCAARAAAAAAAAOB/oiEAIAFB/w9JBEAgAUH/B2shAQwCCyAARAAAAAAAAOB/oiEAQf0XIAEgAUH9F08bQf4PayEBDAELIAFBgXhKDQAgAEQAAAAAAABgA6IhACABQbhwSwRAIAFByQdqIQEMAQsgAEQAAAAAAABgA6IhAEHwaCABIAFB8GhNG0GSD2ohAQsgACABQf8Haq1CNIa/ogt9AQN/AkACQCAAIgFBA3FFDQAgAS0AAEUEQEEADwsDQCABQQFqIgFBA3FFDQEgAS0AAA0ACwwBCwNAIAEiAkEEaiEBQYCChAggAigCACIDayADckGAgYKEeHFBgIGChHhGDQALA0AgAiIBQQFqIQIgAS0AAA0ACwsgASAAawvKBgIEfwN+IwBBgAFrIgUkAAJAAkACQCADIARCAEIAEJgBRQ0AAn8gBEL///////8/gyEKAn8gBEIwiKdB//8BcSIHQf//AUcEQEEEIAcNARpBAkEDIAMgCoRQGwwCCyADIAqEUAsLRQ0AIAJCMIinIghB//8BcSIGQf//AUcNAQsgBUEQaiABIAIgAyAEEJ0BIAUgBSkDECICIAUpAxgiASACIAEQmwEgBSkDCCECIAUpAwAhBAwBCyABIAJC////////////AIMiCiADIARC////////////AIMiCRCYAUEATARAIAEgCiADIAkQmAEEQCABIQQMAgsgBUHwAGogASACQgBCABCdASAFKQN4IQIgBSkDcCEEDAELIARCMIinQf//AXEhByAGBH4gAQUgBUHgAGogASAKQgBCgICAgICAwLvAABCdASAFKQNoIgpCMIinQfgAayEGIAUpA2ALIQQgB0UEQCAFQdAAaiADIAlCAEKAgICAgIDAu8AAEJ0BIAUpA1giCUIwiKdB+ABrIQcgBSkDUCEDCyAJQv///////z+DQoCAgICAgMAAhCELIApC////////P4NCgICAgICAwACEIQogBiAHSgRAA0ACfiAKIAt9IAMgBFatfSIJQgBZBEAgCSAEIAN9IgSEUARAIAVBIGogASACQgBCABCdASAFKQMoIQIgBSkDICEEDAULIAlCAYYgBEI/iIQMAQsgCkIBhiAEQj+IhAshCiAEQgGGIQQgBkEBayIGIAdKDQALIAchBgsCQCAKIAt9IAMgBFatfSIJQgBTBEAgCiEJDAELIAkgBCADfSIEhEIAUg0AIAVBMGogASACQgBCABCdASAFKQM4IQIgBSkDMCEEDAELIAlC////////P1gEQANAIARCP4ggBkEBayEGIARCAYYhBCAJQgGGhCIJQoCAgICAgMAAVA0ACwsgCEGAgAJxIQcgBkEATARAIAVBQGsgBCAJQv///////z+DIAZB+ABqIAdyrUIwhoRCAEKAgICAgIDAwz8QnQEgBSkDSCECIAUpA0AhBAwBCyAJQv///////z+DIAYgB3KtQjCGhCECCyAAIAQ3AwAgACACNwMIIAVBgAFqJAAL1ycBC38jAEEQayIKJAACQAJAAkACQAJAAkACQAJAAkACQCAAQfQBTQRAQcwvKAIAIgRBECAAQQtqQfgDcSAAQQtJGyIGQQN2IgB2IgFBA3EEQAJAIAFBf3NBAXEgAGoiAkEDdCIBQfQvaiIAIAFB/C9qKAIAIgEoAggiBUYEQEHMLyAEQX4gAndxNgIADAELIAUgADYCDCAAIAU2AggLIAFBCGohACABIAJBA3QiAkEDcjYCBCABIAJqIgEgASgCBEEBcjYCBAwLCyAGQdQvKAIAIghNDQEgAQRAAkBBAiAAdCICQQAgAmty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QEEADwsgASADg0IAWQRAIAAgAlQgASADUyABIANRGwRAQX8PCyAAIAKFIAEgA4WEQgBSDwsgACACViABIANVIAEgA1EbBEBBfw8LIAAgAoUgASADhYRCAFIhBAsgBAvAAQIBfwJ+QX8hAwJAIABCAFIgAUL///////////8AgyIEQoCAgICAgMD//wBWIARCgICAgICAwP//AFEbDQAgAkL///////////8AgyIFQoCAgICAgMD//wBWIAVCgICAgICAwP//AFJxDQAgACAEIAWEhFAEQEEADwsgASACg0IAWQRAIAEgAlIgASACU3ENASAAIAEgAoWEQgBSDwsgAEIAUiABIAJVIAEgAlEbDQAgACABIAKFhEIAUiEDCyADC1ABAX4CQCADQcAAcQRAIAEgA0FAaq2GIQJCACEBDAELIANFDQAgAiADrSIEhiABQcAAIANrrYiEIQIgASAEhiEBCyAAIAE3AwAgACACNwMIC74PAgV/D34jAEHQAmsiBSQAIARC////////P4MhCiACQv///////z+DIQsgAiAEhUKAgICAgICAgIB/gyEMIARCMIinQf//AXEhCAJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAhB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiDUKAgICAgIDA//8AVCANQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQwMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhDCADIQEMAgsgASANQoCAgICAgMD//wCFhFAEQCADIAJCgICAgICAwP//AIWEUARAQgAhAUKAgICAgIDg//8AIQwMAwsgDEKAgICAgIDA//8AhCEMQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAQgAhAQwCCyABIA2EUARAQoCAgICAgOD//wAgDCACIAOEUBshDEIAIQEMAgsgAiADhFAEQCAMQoCAgICAgMD//wCEIQxCACEBDAILIA1C////////P1gEQCAFQcACaiABIAsgASALIAtQIgYbeSAGQQZ0rXynIgZBD2sQmgFBECAGayEGIAUpA8gCIQsgBSkDwAIhAQsgAkL///////8/Vg0AIAVBsAJqIAMgCiADIAogClAiBxt5IAdBBnStfKciB0EPaxCaASAGIAdqQRBrIQYgBSkDuAIhCiAFKQOwAiEDCyAFQaACaiAKQoCAgICAgMAAhCISQg+GIANCMYiEIgJCAEKAgICAsOa8gvUAIAJ9IgRCABCeASAFQZACakIAIAUpA6gCfUIAIARCABCeASAFQYACaiAFKQOYAkIBhiAFKQOQAkI/iIQiBEIAIAJCABCeASAFQfABaiAEQgBCACAFKQOIAn1CABCeASAFQeABaiAFKQP4AUIBhiAFKQPwAUI/iIQiBEIAIAJCABCeASAFQdABaiAEQgBCACAFKQPoAX1CABCeASAFQcABaiAFKQPYAUIBhiAFKQPQAUI/iIQiBEIAIAJCABCeASAFQbABaiAEQgBCACAFKQPIAX1CABCeASAFQaABaiACQgAgBSkDuAFCAYYgBSkDsAFCP4iEQgF9IgJCABCeASAFQZABaiADQg+GQgAgAkIAEJ4BIAVB8ABqIAJCAEIAIAUpA6gBIAUpA6ABIg0gBSkDmAF8IgQgDVStfCAEQgFWrXx9QgAQngEgBUGAAWpCASAEfUIAIAJCABCeASAGIAkgCGtqIQYCfyAFKQNwIhNCAYYiDiAFKQOIASIPQgGGIAUpA4ABQj+IhHwiEELn7AB9IhRCIIgiAiALQoCAgICAgMAAhCIVQgGGIhZCIIgiBH4iESABQgGGIg1CIIgiCiAQIBRWrSAOIBBWrSAFKQN4QgGGIBNCP4iEIA9CP4h8fHxCAX0iE0IgiCIQfnwiDiARVK0gDiAOIBNC/////w+DIhMgAUI/iCIXIAtCAYaEQv////8PgyILfnwiDlatfCAEIBB+fCAEIBN+IhEgCyAQfnwiDyARVK1CIIYgD0IgiIR8IA4gDiAPQiCGfCIOVq18IA4gDiAUQv////8PgyIUIAt+IhEgAiAKfnwiDyARVK0gDyAPIBMgDUL+////D4MiEX58Ig9WrXx8Ig5WrXwgDiAEIBR+IhggECARfnwiBCACIAt+fCILIAogE358IhBCIIggCyAQVq0gBCAYVK0gBCALVq18fEIghoR8IgQgDlStfCAEIA8gAiARfiICIAogFH58IgpCIIggAiAKVq1CIIaEfCICIA9UrSACIBBCIIZ8IAJUrXx8IgIgBFStfCIEQv////////8AWARAIBYgF4QhFSAFQdAAaiACIAQgAyASEJ4BIAFCMYYgBSkDWH0gBSkDUCIBQgBSrX0hCkIAIAF9IQsgBkH+/wBqDAELIAVB4ABqIARCP4YgAkIBiIQiAiAEQgGIIgQgAyASEJ4BIAFCMIYgBSkDaH0gBSkDYCINQgBSrX0hCkIAIA19IQsgASENIAZB//8AagsiBkH//wFOBEAgDEKAgICAgIDA//8AhCEMQgAhAQwBCwJ+IAZBAEoEQCAKQgGGIAtCP4iEIQEgBEL///////8/gyAGrUIwhoQhCiALQgGGDAELIAZBj39MBEBCACEBDAILIAVBQGsgAiAEQQEgBmsQnAEgBUEwaiANIBUgBkHwAGoQmgEgBUEgaiADIBIgBSkDQCICIAUpA0giChCeASAFKQM4IAUpAyhCAYYgBSkDICIBQj+IhH0gBSkDMCIEIAFCAYYiDVStfSEBIAQgDX0LIQQgBUEQaiADIBJCA0IAEJ4BIAUgAyASQgVCABCeASAKIAIgAiADIAQgAkIBgyIEfCIDVCABIAMgBFStfCIBIBJWIAEgElEbrXwiAlatfCIEIAIgAiAEQoCAgICAgMD//wBUIAMgBSkDEFYgASAFKQMYIgRWIAEgBFEbca18IgJWrXwiBCACIARCgICAgICAwP//AFQgAyAFKQMAViABIAUpAwgiA1YgASADURtxrXwiASACVK18IAyEIQwLIAAgATcDACAAIAw3AwggBUHQAmokAAtQAQF+AkAgA0HAAHEEQCACIANBQGqtiCEBQgAhAgwBCyADRQ0AIAJBwAAgA2uthiABIAOtIgSIhCEBIAIgBIghAgsgACABNwMAIAAgAjcDCAu/CgIFfw9+IwBB4ABrIgUkACAEQv///////z+DIQwgAiAEhUKAgICAgICAgIB/gyEKIAJC////////P4MiDUIgiCEOIARCMIinQf//AXEhBwJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAdB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiC0KAgICAgIDA//8AVCALQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQoMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhCiADIQEMAgsgASALQoCAgICAgMD//wCFhFAEQCACIAOEUARAQoCAgICAgOD//wAhCkIAIQEMAwsgCkKAgICAgIDA//8AhCEKQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAIAEgC4RCACEBUARAQoCAgICAgOD//wAhCgwDCyAKQoCAgICAgMD//wCEIQoMAgsgASALhFAEQEIAIQEMAgsgAiADhFAEQEIAIQEMAgsgC0L///////8/WARAIAVB0ABqIAEgDSABIA0gDVAiBht5IAZBBnStfKciBkEPaxCaAUEQIAZrIQYgBSkDWCINQiCIIQ4gBSkDUCEBCyACQv///////z9WDQAgBUFAayADIAwgAyAMIAxQIggbeSAIQQZ0rXynIghBD2sQmgEgBiAIa0EQaiEGIAUpA0ghDCAFKQNAIQMLIANCD4YiC0KAgP7/D4MiAiABQiCIIgR+IhAgC0IgiCITIAFC/////w+DIgF+fCIPQiCGIhEgASACfnwiCyARVK0gAiANQv////8PgyINfiIVIAQgE358IhEgDEIPhiISIANCMYiEQv////8PgyIDIAF+fCIUIA8gEFStQiCGIA9CIIiEfCIPIAIgDkKAgASEIgx+IhYgDSATfnwiDiASQiCIQoCAgIAIhCICIAF+fCIQIAMgBH58IhJCIIZ8Ihd8IQEgByAJaiAGakH//wBrIQYCQCACIAR+IhggDCATfnwiBCAYVK0gBCAEIAMgDX58IgRWrXwgAiAMfnwgBCAEIBEgFVStIBEgFFatfHwiBFatfCADIAx+IgMgAiANfnwiAiADVK1CIIYgAkIgiIR8IAQgAkIghnwiAiAEVK18IAIgAiAQIBJWrSAOIBZUrSAOIBBWrXx8QiCGIBJCIIiEfCICVq18IAIgAiAPIBRUrSAPIBdWrXx8IgJWrXwiBEKAgICAgIDAAINQRQRAIAZBAWohBgwBCyALQj+IIARCAYYgAkI/iIQhBCACQgGGIAFCP4iEIQIgC0IBhiELIAFCAYaEIQELIAZB//8BTgRAIApCgICAgICAwP//AIQhCkIAIQEMAQsCfiAGQQBMBEBBASAGayIHQf8ATQRAIAVBMGogCyABIAZB/wBqIgYQmgEgBUEgaiACIAQgBhCaASAFQRBqIAsgASAHEJwBIAUgAiAEIAcQnAEgBSkDMCAFKQM4hEIAUq0gBSkDICAFKQMQhIQhCyAFKQMoIAUpAxiEIQEgBSkDACECIAUpAwgMAgtCACEBDAILIARC////////P4MgBq1CMIaECyAKhCEKIAtQIAFCAFkgAUKAgICAgICAgIB/URtFBEAgCiACQgF8IgFQrXwhCgwBCyALIAFCgICAgICAgICAf4WEUEUEQCACIQEMAQsgCiACIAJCAYN8IgEgAlStfCEKCyAAIAE3AwAgACAKNwMIIAVB4ABqJAALdQEBfiAAIAEgBH4gAiADfnwgA0IgiCICIAFCIIgiBH58IANC/////w+DIgMgAUL/////D4MiAX4iBUIgiCADIAR+fCIDQiCIfCABIAJ+IANC/////w+DfCIBQiCIfDcDCCAAIAVC/////w+DIAFCIIaENwMACw4AQaCEBSQCQaCEASQBCwcAIwAjAWsLBAAjAgsEACMBCwYAIAAkAAsQACMAIABrQXBxIgAkACAACwQAIwALzgkCBH8EfiMAQfAAayIGJAAgBEL///////////8AgyEJAkACQCABUCIFIAJC////////////AIMiCkKAgICAgIDA//8AfUKAgICAgIDAgIB/VCAKUBtFBEAgA0IAUiAJQoCAgICAgMD//wB9IgtCgICAgICAwICAf1YgC0KAgICAgIDAgIB/URsNAQsgBSAKQoCAgICAgMD//wBUIApCgICAgICAwP//AFEbRQRAIAJCgICAgICAIIQhBCABIQMMAgsgA1AgCUKAgICAgIDA//8AVCAJQoCAgICAgMD//wBRG0UEQCAEQoCAgICAgCCEIQQMAgsgASAKQoCAgICAgMD//wCFhFAEQEKAgICAgIDg//8AIAIgASADhSACIASFQoCAgICAgICAgH+FhFAiBRshBEIAIAEgBRshAwwCCyADIAlCgICAgICAwP//AIWEUA0BIAEgCoRQBEAgAyAJhEIAUg0CIAEgA4MhAyACIASDIQQMAgsgAyAJhFBFDQAgASEDIAIhBAwBCyADIAEgASADVCAJIApWIAkgClEbIggbIQogBCACIAgbIgxC////////P4MhCSACIAQgCBsiC0IwiKdB//8BcSEHIAxCMIinQf//AXEiBUUEQCAGQeAAaiAKIAkgCiAJIAlQIgUbeSAFQQZ0rXynIgVBD2sQmgEgBikDaCEJIAYpA2AhCkEQIAVrIQULIAEgAyAIGyEDIAtC////////P4MhASAHBH4gAQUgBkHQAGogAyABIAMgASABUCIHG3kgB0EGdK18pyIHQQ9rEJoBQRAgB2shByAGKQNQIQMgBikDWAtCA4YgA0I9iIRCgICAgICAgASEIQEgCUIDhiAKQj2IhCACIASFIQQCfiADQgOGIgIgBSAHRg0AGiAFIAdrIgdB/wBLBEBCACEBQgEMAQsgBkFAayACIAFBgAEgB2sQmgEgBkEwaiACIAEgBxCcASAGKQM4IQEgBikDMCAGKQNAIAYpA0iEQgBSrYQLIQlCgICAgICAgASEIQsgCkIDhiEKAkAgBEIAUwRAQgAhA0IAIQQgCSAKhSABIAuFhFANAiAKIAl9IQIgCyABfSAJIApWrX0iBEL/////////A1YNASAGQSBqIAIgBCACIAQgBFAiBxt5IAdBBnStfKdBDGsiBxCaASAFIAdrIQUgBikDKCEEIAYpAyAhAgwBCyAJIAp8IgIgCVStIAEgC3x8IgRCgICAgICAgAiDUA0AIAlCAYMgBEI/hiACQgGIhIQhAiAFQQFqIQUgBEIBiCEECyAMQoCAgICAgICAgH+DIQMgBUH//wFOBEAgA0KAgICAgIDA//8AhCEEQgAhAwwBC0EAIQcCQCAFQQBKBEAgBSEHDAELIAZBEGogAiAEIAVB/wBqEJoBIAYgAiAEQQEgBWsQnAEgBikDACAGKQMQIAYpAxiEQgBSrYQhAiAGKQMIIQQLIARCPYYgAkIDiIQhASAEQgOIQv///////z+DIAetQjCGhCADhCEEAkACQCACp0EHcSIFQQRHBEAgBCABIAEgBUEES618IgNWrXwhBAwBCyAEIAEgASABQgGDfCIDVq18IQQMAQsgBUUNAQsLIAAgAzcDACAAIAQ3AwggBkHwAGokAAtFAQF/IwBBEGsiBSQAIAUgASACIAMgBEKAgICAgICAgIB/hRCmASAFKQMAIQEgACAFKQMINwMIIAAgATcDACAFQRBqJAAL8wMCAn4FfyMAQSBrIgUkACABQv///////z+DIQICfiABQjCIQv//AYMiA6ciBEGB+ABrQf0PTQRAIAJCBIYgAEI8iIQhAiAEQYD4AGutIQMCQCAAQv//////////D4MiAEKBgICAgICAgAhaBEAgAkIBfCECDAELIABCgICAgICAgIAIUg0AIAJCAYMgAnwhAgtCACACIAJC/////////wdWIgQbIQAgBK0gA3wMAQsgACAChFAgA0L//wFSckUEQCACQgSGIABCPIiEQoCAgICAgIAEhCEAQv8PDAELIARB/ocBSwRAQgAhAEL/DwwBC0GA+ABBgfgAIANQIgcbIgggBGsiBkHwAEoEQEIAIQBCAAwBCyAFQRBqIAAgAiACQoCAgICAgMAAhCAHGyICQYABIAZrEJoBIAUgACACIAYQnAEgBSkDCEIEhiAFKQMAIgJCPIiEIQACQCAEIAhHIAUpAxAgBSkDGIRCAFJxrSACQv//////////D4OEIgJCgYCAgICAgIAIWgRAIABCAXwhAAwBCyACQoCAgICAgICACFINACAAQgGDIAB8IQALIABCgICAgICAgAiFIAAgAEL/////////B1YiBBshACAErQshAiAFQSBqJAAgAUKAgICAgICAgIB/gyACQjSGhCAAhL8LfwICfwF+IwBBEGsiAyQAIAACfiABRQRAQgAMAQsgAyABIAFBH3UiAnMgAmsiAq1CACACZyICQdEAahCaASADKQMIQoCAgICAgMAAhUGegAEgAmutQjCGfCABQYCAgIB4ca1CIIaEIQQgAykDAAs3AwAgACAENwMIIANBEGokAAvjAQIEfgJ/IwBBEGsiBiQAIAG9IgVC/////////weDIQIgAAJ+IAVCNIhC/w+DIgNQRQRAIANC/w9SBEAgAkIEiCEEIANCgPgAfCEDIAJCPIYMAgsgAkIEiCEEQv//ASEDIAJCPIYMAQsgAlAEQEIAIQNCAAwBCyAGIAJCACAFp2dBIHIgAkIgiKdnIAJCgICAgBBUGyIHQTFqEJoBQYz4ACAHa60hAyAGKQMIQoCAgICAgMAAhSEEIAYpAwALNwMAIAAgBUKAgICAgICAgIB/gyADQjCGhCAEhDcDCCAGQRBqJAALZwIBfwF+IwBBEGsiAiQAIAACfiABRQRAQgAMAQsgAiABrUIAQfAAIAFnIgFBH3NrEJoBIAIpAwhCgICAgICAwACFQZ6AASABa61CMIZ8IQMgAikDAAs3AwAgACADNwMIIAJBEGokAAvxAQEDfwJAIABFBEBBuCkoAgAEQEG4KSgCABCsASEBC0GgKCgCAARAQaAoKAIAEKwBIAFyIQELQbwzKAIAIgBFDQEDQCAAKAJMGiAA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BEBBACEHDAELQQAhCyAIKAIwIQwDQCAMKAIAIg1FDQEgCEEEaiIKIA0QxAEiDSALaiILIAdLDQEgACAKIA0QvwEgDEEEaiEMIAcgC0sNAAsLIABBICAQIAcgCUGAwABzEMMBIBAgByAHIBBIGyEHDAgLIBQgCkEASHENCUE9IQsgACAIKwMwIBAgCiAJIAcgBRETACIHQQBODQcMCgsgBy0AASEMIAdBAWohBwwACwALIAANCSATRQ0DQQEhBwNAIAQgB0ECdGooAgAiAARAIAMgB0EDdGogACACIAYQwQFBASEOIAdBAWoiB0EKRw0BDAsLCyAHQQpPBEBBASEODAoLA0AgBCAHQQJ0aigCAA0BQQEhDiAHQQFqIgdBCkcNAAsMCQtBHCELDAYLIAggBzoAJ0EBIQogFyENIAwhCQsgCiALIA1rIgwgCiAMShsiASARQf////8Hc0oNA0E9IQsgECABIBFqIgogCiAQSBsiByAYSg0EIABBICAHIAogCRDDASAAIBYgERC/ASAAQTAgByAKIAlBgIAEcxDDASAAQTAgASAMQQAQwwEgACANIAwQvwEgAEEgIAcgCiAJQYDAAHMQwwEgCCgCPCEBDAELCwtBACEODAMLQT0hCwtByC8gCzYCAAtBfyEOCyAIQUBrJAAgDgsYACAALQAAQSBxRQRAIAEgAiAAEIsBGgsLbwEFfyAAKAIAIgMsAABBMGsiAUEJSwRAQQAPCwNAQX8hBCACQcyZs+YATQRAQX8gASACQQpsIgVqIAEgBUH/////B3NLGyEECyAAIANBAWoiBTYCACADLAABIAQhAiAFIQNBMGsiAUEKSQ0ACyACC7wCAAJAAkACQAJAAkACQAJAAkACQAJAAkAgAUEJaw4SAAgJCggJAQIDBAoJCgoICQUGBwsgAiACKAIAIgFBBGo2AgAgACABKAIANgIADwsgAiACKAIAIgFBBGo2AgAgACABMgEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMwEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMAAANwMADwsgAiACKAIAIgFBBGo2AgAgACABMQAANwMADwsgAiACKAIAQQdqQXhxIgFBCGo2AgAgACABKwMAOQMADwsgACACIAMRAAALDwsgAiACKAIAIgFBBGo2AgAgACABNAIANwMADwsg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ZWFucyBubyBsaW1pdABNaW5pbXVtIGxlYXJudCBjbGF1c2UgbGltaXQAbWluLWxlYXJudHMAICAtJXMsIC1uby0lcwBUaGUgY2xhdXNlIGFjdGl2aXR5IGRlY2F5IGZhY3RvcgBUaGUgdmFyaWFibGUgYWN0aXZpdHkgZGVjYXkgZmFjdG9yAFJlc3RhcnQgaW50ZXJ2YWwgaW5jcmVhc2UgZmFjdG9yAHJuZC1mcmVxAC4uLy4uLy4uL3N5c3RlbS9saWIvbGliY3h4YWJpL3NyYy9wcml2YXRlX3R5cGVpbmZvLmNwcABVc2VkIGJ5IHRoZSByYW5kb20gdmFyaWFibGUgc2VsZWN0aW9uAGltaW4AbmFuAGFzeW1tAGVsaW0AY2wtbGltAHN1Yi1saW0AVGhlIGJhc2UgcmVzdGFydCBpbnRlcnZhbAByY2hlY2sAY2FuX2NhdGNoAHBoYXNlLXNhdmluZwB0ZXJtaW5hdGluZwBpbmYAb2ZmAFRoZSBmcmVxdWVuY3kgd2l0aCB3aGljaCB0aGUgZGVjaXNpb24gaGV1cmlzdGljIHRyaWVzIHRvIGNob29zZSBhIHJhbmRvbSB2YXJpYWJsZQBjY21pbi1tb2RlAFVzZSB0aGUgTHVieSByZXN0YXJ0IHNlcXVlbmNlAFRoZSBmcmFjdGlvbiBvZiB3YXN0ZWQgbWVtb3J5IGFsbG93ZWQgYmVmb3JlIGEgZ2FyYmFnZSBjb2xsZWN0aW9uIGlzIHRyaWdnZXJlZAB0ZXJtaW5hdGVfaGFuZGxlciB1bmV4cGVjdGVkbHkgcmV0dXJuZWQAcm5kLXNlZWQAJTRkAHJpbmMAc2ltcC1nYy1mcmFjACAgLSUtMTJzID0gJS04cyBbAFNJTVAATkFOAElORgBDT1JFADxib29sPgA8ZG91YmxlPgA8aW50MzI+AD09PT09PT09PT09PT09PT09PT09PT09PT09PT1bIFNlYXJjaCBTdGF0aXN0aWNzIF09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0APT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQBEbyBub3QgY2hlY2sgaWYgc3Vic3VtcHRpb24gYWdhaW5zdCBhIGNsYXVzZSBsYXJnZXIgdGhhbiB0aGlzLiAtMSBtZWFucyBubyBsaW1pdC4AQWxsb3cgYSB2YXJpYWJsZSBlbGltaW5hdGlvbiBzdGVwIHRvIGdyb3cgYnkgYSBudW1iZXIgb2YgY2xhdXNlcy4AUGVyZm9ybSB2YXJpYWJsZSBlbGltaW5hdGlvbi4AVGhlIGZyYWN0aW9uIG9mIHdhc3RlZCBtZW1vcnkgYWxsb3dlZCBiZWZvcmUgYSBnYXJiYWdlIGNvbGxlY3Rpb24gaXMgdHJpZ2dlcmVkIGR1cmluZyBzaW1wbGlmaWNhdGlvbi4AU2hyaW5rIGNsYXVzZXMgYnkgYXN5bW1ldHJpYyBicmFuY2hpbmcuAG5vLQBDaGVjayBpZiBhIGNsYXVzZSBpcyBhbHJlYWR5IGltcGxpZWQuIChjb3N0bHkpAENvbnRyb2xzIGNvbmZsaWN0IGNsYXVzZSBtaW5pbWl6YXRpb24gKDA9bm9uZSwgMT1iYXNpYywgMj1kZWVwKQAobnVsbCkAQ29udHJvbHMgdGhlIGxldmVsIG9mIHBoYXNlIHNhdmluZyAoMD1ub25lLCAxPWxpbWl0ZWQsIDI9ZnVsbCkAYWRqdXN0ZWRQdHIgJiYgImNhdGNoaW5nIGEgY2xhc3Mgd2l0aG91dCBhbiBvYmplY3Q/IgBQdXJlIHZpcnR1YWwgZnVuY3Rpb24gY2FsbGVkIQBZTyEAbGliYysrYWJpOiAAIC4uIABlbGltaW5hdGlvbiBsZWZ0OiAlMTBkDQBzdWJzdW1wdGlvbiBsZWZ0OiAlMTBkICglMTBkIHN1YnN1bWVkLCAlMTBkIGRlbGV0ZWQgbGl0ZXJhbHMpDQB8ICU5ZCB8ICU3ZCAlOGQgJThkIHwgJThkICU4ZCAlNi4wZiB8ICU2LjNmICUlIHwKAHwgIEdhcmJhZ2UgY29sbGVjdGlvbjogICAlMTJkIGJ5dGVzID0+ICUxMmQgYnl0ZXMgICAgICAgICAgICAgfAoAfCAgRWxpbWluYXRlZCBjbGF1c2VzOiAgICAgJTEwLjJmIE1iICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8CgAKICAgICAgICAlcwoARVJST1IhIHZhbHVlIDwlcz4gaXMgdG9vIHNtYWxsIGZvciBvcHRpb24gIiVzIi4KAEVSUk9SISB2YWx1ZSA8JXM+IGlzIHRvbyBsYXJnZSBmb3Igb3B0aW9uICIlcyIuCgAoZGVmYXVsdDogJXMpCgAgIC0lLTEycyA9ICUtOHMgJWMlNC4yZyAuLiAlNC4yZyVjIChkZWZhdWx0OiAlZykKAF0gKGRlZmF1bHQ6ICVkKQoAAAAAACwNAAABAAAAAgAAAAMAAAC4EQAANA0AAE43TWluaXNhdDZTb2x2ZXJFAAAAAAAAAGANAAAFAAAABgAAAAcAAAD+////4BEAAGwNAAAsDQAATjdNaW5pc2F0MTBTaW1wU29sdmVyRQAAAAAAAJwNAAAIAAAACQAAAAoAAAALAAAA4BEAAKgNAADADQAATjdNaW5pc2F0MTBCb29sT3B0aW9uRQAAuBEAAMgNAABON01pbmlzYXQ2T3B0aW9uRQAAAAAAAADADQAACAAAAAwAAAANAAAADQAAAAAAAAAMDgAACAAAAA4AAAAPAAAAEAAAAOARAAAYDgAAwA0AAE43TWluaXNhdDlJbnRPcHRpb25FAAAAAAAAAABIDgAACAAAABEAAAASAAAAEwAAAOARAABUDgAAwA0AAE43TWluaXNhdDEyRG91YmxlT3B0aW9uRQAAAAC4EQAAeA4AAE43TWluaXNhdDIwT3V0T2ZNZW1vcnlFeGNlcHRpb25FAEGmHQsa8D8AAAAAAAD4PwAAAAAAAAAABtDPQ+v9TD4AQcsdC5YBQAO44j/RdJ4AV529KoBwUg///z4nCgAAAGQAAADoAwAAECcAAKCGAQBAQg8AgJaYAADh9QUYAAAANQAAAHEAAABr////zvv//5K///8AAAAAAAAAABkACwAZGRkAAAAABQAAAAAAAAkAAAAACwAAAAAAAAAAGQAKChkZGQMKBwABAAkLGAAACQYLAAALAAYZAAAAGRkZAEHxHgshDgAAAAAAAAAAGQALDRkZGQANAAACAAkOAAAACQAOAAAOAEGrHwsBDABBtx8LFRMAAAAAEwAAAAAJDAAAAAAADAAADABB5R8LARAAQfEfCxUPAAAABA8AAAAACRAAAAAAABAAABAAQZ8gCwESAEGrIAseEQAAAAARAAAAAAkSAAAAAAASAAASAAAaAAAAGhoaAEHiIAsOGgAAABoaGgAAAAAAAAkAQZMhCwEUAEGfIQsVFwAAAAAXAAAAAAkUAAAAAAAUAAAUAEHNIQsBFgBB2SEL5AIVAAAAABUAAAAACRYAAAAAABYAABYAADAxMjM0NTY3ODlBQkNERUaQEwAA4BEAABARAACYEQAATjEwX19jeHhhYml2MTE2X19zaGltX3R5cGVfaW5mb0UAAAAA4BEAAEARAAAEEQAATjEwX19jeHhhYml2MTE3X19jbGFzc190eXBlX2luZm9FAAAA4BEAAHARAAA0EQAATjEwX19jeHhhYml2MTIwX19zaV9jbGFzc190eXBlX2luZm9FAAAAALgRAACgEQAAU3Q5dHlwZV9pbmZvAAAAAAAAAAA0EQAAHAAAAB0AAAAeAAAAHwAAACAAAAAhAAAAIgAAACMAAAAAAAAAZBEAABwAAAAkAAAAHgAAAB8AAAAgAAAAJQAAACYAAAAnAAAAAAAAACgAAAAoAAAAKQAAACkAAAApAAAAKQAAACkAAAApAAAAKAAAACgAAAApAAAAKAAAACgAAAAoAAAAKABB4CQLHSkAAAApAAAAKAAAACgAAAAAAAAAKAAAAAAAAAApAEGIJgsDIEIBAEGkJgsBKgBB7CYLAuAZAEGQJwsBBQBBnCcLARYAQbQnCwoXAAAAGAAAAAAaAEHMJwsBAgBB3CcLCP//////////AEGgKAsJkBMAAAAAAAAFAEG0KAsBGQBBzCgLDhcAAAAaAAAACBoAAAAEAEHkKAsBAQBB9CgLBf////8KAEG4KQsFKBQAABs=");b=xa(b);return a(b[0])}();c._yo=L("yo",0);c._free=L("free",1);c._unyo=L("unyo",1);c._createTheSolver=L("createTheSolver",0);c._ensureVar=L("ensureVar",1);c._addClause=L("addClause",1);c._solve=L("solve",0);c._getSolution=L("getSolution",0);c._getNumVars=L("getNumVars",0);c._solveAssuming=L("solveAssuming",1);c._retireVar=L("retireVar",1);c._getConflictClauseSize=L("getConflictClauseSize",0);c._getConflictClause=L("getConflictClause",0);var $a=L("fflush",1);c._malloc=L("malloc",1);var Sa=L("_emscripten_timeout",2),mb=M.emscripten_stack_init,oa=M.emscripten_stack_get_end,Ba=M._emscripten_stack_restore,cb=M._emscripten_stack_alloc,Ca=M.emscripten_stack_get_current;c.dynCall_jiji=L("dynCall_jiji",5);var Z;H=function nb(){Z||ob();Z||(H=nb)};function ob(){function a(){if(!Z&&(Z=!0,c.calledRun=!0,!x)){var _c$onRuntimeInitializ;p(!sa);sa=!0;E();O(qa);aa(c);(_c$onRuntimeInitializ=c.onRuntimeInitialized)===null||_c$onRuntimeInitializ===void 0||_c$onRuntimeInitializ.call(c);p(!c._main,'compiled without a main, but one is present. if you added it from JS, use Module["onRuntimeInitialized"]');E();if(c.postRun)for("function"==typeof c.postRun&&(c.postRun=[c.postRun]);c.postRun.length;){var b=c.postRun.shift();ra.unshift(b)}O(ra)}}if(!(0<G)){mb();na();if(c.preRun)for("function"==typeof c.preRun&&(c.preRun=[c.preRun]);c.preRun.length;)ta();O(pa);0<G||(c.setStatus?(c.setStatus("Running..."),setTimeout(()=>{setTimeout(()=>c.setStatus(""),1);a()},1)):a(),E())}}function Pa(){var a=r,b=u,d=!1;r=u=()=>{d=!0};try{ab()}catch(e){}r=a;u=b;d&&(R("stdio streams had content in them that was not flushed. you should set EXIT_RUNTIME to 1 (see the Emscripten FAQ), or make sure to emit a newline when you printf etc."),R("(this may also be due to not including full filesystem support - try building with -sFORCE_FILESYSTEM)"))}if(c.preInit)for("function"==typeof c.preInit&&(c.preInit=[c.preInit]);0<c.preInit.length;)c.preInit.pop()();ob();moduleRtn=c;for(const a of Object.keys(c))a in moduleArg||Object.defineProperty(moduleArg,a,{configurable:!0,get(){l(`Access to module property ('${a}') is no longer possible via the module constructor argument; Instead, use the result of the module constructor.`)}});
+function _defineProperty(e,r,t){return(r=_toPropertyKey(r))in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==typeof i?i:i+""}function _toPrimitive(t,r){if("object"!=typeof t||!t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var i=e.call(t,r||"default");if("object"!=typeof i)return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===r?String:Number)(t)}var c=moduleArg,aa,f,ba=new Promise((a,b)=>{aa=a;f=b});"_addClause _createTheSolver _ensureVar _free _getConflictClause _getConflictClauseSize _getNumVars _getSolution _malloc _retireVar _solve _solveAssuming _unyo _yo ccall cwrap UTF8ToString stringToUTF8 UTF16ToString stringToUTF16 UTF32ToString stringToUTF32 AsciiToString intArrayFromString intArrayToString writeArrayToMemory stackSave stackAlloc stackRestore getValue setValue _memory ___indirect_function_table onRuntimeInitialized".split(" ").forEach(a=>{Object.getOwnPropertyDescriptor(ba,a)||Object.defineProperty(ba,a,{get:()=>l("You are getting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js"),set:()=>l("You are setting "+a+" on the Promise object, instead of the instance. Use .then() to get called back with the instance, see the MODULARIZE docs in src/settings.js")})});var ca=Object.assign({},c),m=(a,b)=>{throw b},da;if("undefined"==typeof process||!process.release||"node"!==process.release.name)throw Error("not compiled for this environment (did you build to HTML and try to run it not on the web, or set ENVIRONMENT to something - like node - and run it someplace else - like on the web?)");var ea=process.versions.node,n=ea.split(".").slice(0,3);n=1e4*n[0]+100*n[1]+1*n[2].split("-")[0];if(14e4>n)throw Error("This emscripten-generated code requires node v14.0.0 (detected v"+ea+")");var fs=require("fs");require("path");da=a=>{a=fa(a)?new URL(a):a;a=fs.readFileSync(a);p(Buffer.isBuffer(a));return a};process.argv.slice(2);m=(a,b)=>{process.exitCode=a;throw b};var r=c.print||console.log.bind(console),u=c.printErr||console.error.bind(console);Object.assign(c,ca);ca=null;Object.getOwnPropertyDescriptor(c,"fetchSettings")&&l("`Module.fetchSettings` was supplied but `fetchSettings` not included in INCOMING_MODULE_JS_API");v("arguments","arguments_");v("thisProgram","thisProgram");p("undefined"==typeof c.memoryInitializerPrefixURL,"Module.memoryInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.pthreadMainPrefixURL,"Module.pthreadMainPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.cdInitializerPrefixURL,"Module.cdInitializerPrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.filePackagePrefixURL,"Module.filePackagePrefixURL option was removed, use Module.locateFile instead");p("undefined"==typeof c.read,"Module.read option was removed");p("undefined"==typeof c.readAsync,"Module.readAsync option was removed (modify readAsync in JS)");p("undefined"==typeof c.readBinary,"Module.readBinary option was removed (modify readBinary in JS)");p("undefined"==typeof c.setWindowTitle,"Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)");p("undefined"==typeof c.TOTAL_MEMORY,"Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY");v("asm","wasmExports");v("readAsync","readAsync");v("readBinary","readBinary");v("setWindowTitle","setWindowTitle");p(!0,"web environment detected but not enabled at build time.  Add `web` to `-sENVIRONMENT` to enable.");p(!0,"worker environment detected but not enabled at build time.  Add `worker` to `-sENVIRONMENT` to enable.");p(!0,"shell environment detected but not enabled at build time.  Add `shell` to `-sENVIRONMENT` to enable.");var ha=c.wasmBinary;v("wasmBinary","wasmBinary");"object"!=typeof WebAssembly&&u("no native wasm support detected");"undefined"==typeof atob&&("undefined"!=typeof global&&"undefined"==typeof globalThis&&(globalThis=global),globalThis.atob=function(a){var b="",d=0;a=a.replace(/[^A-Za-z0-9\+\/=]/g,"");do{var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var g="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var k="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));var h="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(a.charAt(d++));e=e<<2|g>>4;g=(g&15)<<4|k>>2;var q=(k&3)<<6|h;b+=String.fromCharCode(e);64!==k&&(b+=String.fromCharCode(g));64!==h&&(b+=String.fromCharCode(q))}while(d<a.length);return b});var w,x=!1,y;function p(a,b){a||l("Assertion failed"+(b?": "+b:""))}var z,A,B,ia,C,D,ja,ka;function la(){var a=w.buffer;c.HEAP8=z=new Int8Array(a);c.HEAP16=B=new Int16Array(a);c.HEAPU8=A=new Uint8Array(a);c.HEAPU16=ia=new Uint16Array(a);c.HEAP32=C=new Int32Array(a);c.HEAPU32=D=new Uint32Array(a);c.HEAPF32=ja=new Float32Array(a);c.HEAPF64=ka=new Float64Array(a)}let ma;(ma=global).performance??(ma.performance=require("perf_hooks").performance);p(!c.STACK_SIZE,"STACK_SIZE can no longer be set at runtime.  Use -sSTACK_SIZE at link time");p("undefined"!=typeof Int32Array&&"undefined"!==typeof Float64Array&&void 0!=Int32Array.prototype.subarray&&void 0!=Int32Array.prototype.set,"JS engine does not provide full typed array support");p(!c.wasmMemory,"Use of `wasmMemory` detected.  Use -sIMPORTED_MEMORY to define wasmMemory externally");p(!c.INITIAL_MEMORY,"Detected runtime INITIAL_MEMORY setting.  Use -sIMPORTED_MEMORY to define wasmMemory dynamically");function na(){var a=oa();p(0==(a&3));0==a&&(a+=4);D[a>>2]=34821223;D[a+4>>2]=2310721022;D[0]=1668509029}function E(){if(!x){var a=oa();0==a&&(a+=4);var b=D[a>>2],d=D[a+4>>2];34821223==b&&2310721022==d||l(`Stack overflow! Stack cookie has been overwritten at ${F(a)}, expected hex dwords 0x89BACDFE and 0x2135467, but received ${F(d)} ${F(b)}`);1668509029!=D[0]&&l("Runtime error: The application has corrupted its heap memory area (address zero)!")}}var pa=[],qa=[],ra=[],sa=!1;function ta(){var a=c.preRun.shift();pa.unshift(a)}p(Math.imul,"This browser does not support Math.imul(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.fround,"This browser does not support Math.fround(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.clz32,"This browser does not support Math.clz32(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");p(Math.trunc,"This browser does not support Math.trunc(), build with LEGACY_VM_SUPPORT or POLYFILL_OLD_MATH_FUNCTIONS to add in a polyfill");var G=0,H=null,J={},K=null;function ua(){var _c$monitorRunDependen;G++;(_c$monitorRunDependen=c.monitorRunDependencies)===null||_c$monitorRunDependen===void 0||_c$monitorRunDependen.call(c,G);p(!J["wasm-instantiate"]);J["wasm-instantiate"]=1;null===K&&"undefined"!=typeof setInterval&&(K=setInterval(()=>{if(x)clearInterval(K),K=null;else{var a=!1,b;for(b in J)a||(a=!0,u("still waiting on run dependencies:")),u(`dependency: ${b}`);a&&u("(end of list)")}},1e4))}function l(a){var _c$onAbort;(_c$onAbort=c.onAbort)===null||_c$onAbort===void 0||_c$onAbort.call(c,a);a="Aborted("+a+")";u(a);x=!0;a=new WebAssembly.RuntimeError(a);f(a);throw a}function va(){l("Filesystem support (FS) was not included. The problem is that you are using files from JS, but files were not used from C/C++, so filesystem support was not auto-included. You can force-include filesystem support with -sFORCE_FILESYSTEM")}c.FS_createDataFile=function(){va()};c.FS_createPreloadedFile=function(){va()};var wa=a=>a.startsWith("data:application/octet-stream;base64,"),fa=a=>a.startsWith("file://");function L(a,b){return function(){p(sa,`native function \`${a}\` called before runtime initialization`);var e=M[a];p(e,`exported native function \`${a}\` not found`);p(arguments.length<=b,`native function \`${a}\` called with ${arguments.length} args but expects ${b}`);return e(...arguments)}}var N;function xa(a){if(N==N&&ha)var b=new Uint8Array(ha);else if(b=N,wa(b)?(b=b.slice(37),b=Buffer.from(b,"base64"),b=new Uint8Array(b.buffer,b.byteOffset,b.length)):b=void 0,!b)if(da)b=da(N);else throw'sync fetching of the wasm failed: you can preload it to Module["wasmBinary"] manually, or emcc.py will do that for you when generating HTML (but not JS)';b=new WebAssembly.Module(b);return[new WebAssembly.Instance(b,a),b]}var ya=new Int16Array(1),za=new Int8Array(ya.buffer);ya[0]=25459;if(115!==za[0]||99!==za[1])throw"Runtime error: expected the system to be little-endian! (Run with -sSUPPORT_BIG_ENDIAN to bypass)";if(c.ENVIRONMENT)throw Error("Module.ENVIRONMENT has been deprecated. To force the environment, use the ENVIRONMENT compile-time option (for example, -sENVIRONMENT=web or -sENVIRONMENT=node)");function v(a,b){Object.getOwnPropertyDescriptor(c,a)||Object.defineProperty(c,a,{configurable:!0,get(){l(`\`Module.${a}\` has been replaced by \`${b}\``+" (the initial value can be provided on Module, but after startup the value is only looked for on a local variable of that name)")}})}class Aa{constructor(a){_defineProperty(this,"name","ExitStatus");this.message=`Program terminated with exit(${a})`;this.status=a}}c.ExitStatus=Aa;var O=a=>{for(;0<a.length;)a.shift()(c)};c.callRuntimeCallbacks=O;c.getValue=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:"i8";b.endsWith("*")&&(b="*");switch(b){case"i1":return z[a];case"i8":return z[a];case"i16":return B[a>>1];case"i32":return C[a>>2];case"i64":l("to do getValue(i64) use WASM_BIGINT");case"float":return ja[a>>2];case"double":return ka[a>>3];case"*":return D[a>>2];default:l(`invalid type for getValue: ${b}`)}};var Q=c.noExitRuntime||!0;c.noExitRuntime=Q;var F=a=>{p("number"===typeof a);return"0x"+(a>>>0).toString(16).padStart(8,"0")};c.ptrToString=F;c.setValue=function(a,b){let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"i8";d.endsWith("*")&&(d="*");switch(d){case"i1":z[a]=b;break;case"i8":z[a]=b;break;case"i16":B[a>>1]=b;break;case"i32":C[a>>2]=b;break;case"i64":l("to do setValue(i64) use WASM_BIGINT");case"float":ja[a>>2]=b;break;case"double":ka[a>>3]=b;break;case"*":D[a>>2]=b;break;default:l(`invalid type for setValue: ${d}`)}};c.stackRestore=a=>Ba(a);c.stackSave=()=>Ca();var R=a=>{R.h||(R.h={});R.h[a]||(R.h[a]=1,u("warning: "+a))};c.warnOnce=R;var Da="undefined"!=typeof TextDecoder?new TextDecoder:void 0;c.UTF8Decoder=Da;var Ea=function(a){let b=arguments.length>1&&arguments[1]!==undefined?arguments[1]:0;let d=arguments.length>2&&arguments[2]!==undefined?arguments[2]:NaN;var e=b+d;for(d=b;a[d]&&!(d>=e);)++d;if(16<d-b&&a.buffer&&Da)return Da.decode(a.subarray(b,d));for(e="";b<d;){var g=a[b++];if(g&128){var k=a[b++]&63;if(192==(g&224))e+=String.fromCharCode((g&31)<<6|k);else{var h=a[b++]&63;224==(g&240)?g=(g&15)<<12|k<<6|h:(240!=(g&248)&&R("Invalid UTF-8 leading byte "+F(g)+" encountered when deserializing a UTF-8 string in wasm memory to a JS string!"),g=(g&7)<<18|k<<12|h<<6|a[b++]&63);65536>g?e+=String.fromCharCode(g):(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023))}}else e+=String.fromCharCode(g)}return e};c.UTF8ArrayToString=Ea;var S=(a,b)=>{p("number"==typeof a,`UTF8ToString expects a number (got ${typeof a})`);return a?Ea(A,a,b):""};c.UTF8ToString=S;var Fa=(a,b,d,e)=>l(`Assertion failed: ${S(a)}, at: `+[b?S(b):"unknown filename",d,e?S(e):"unknown function"]);c.___assert_fail=Fa;var T;c.wasmTable=T;c.getWasmTableEntry=a=>T.get(a);var Ga=(a,b)=>T.get(a)(b);c.___call_sighandler=Ga;class Ha{constructor(a){this.g=a-24}}c.ExceptionInfo=Ha;var Ia=0;c.exceptionLast=Ia;var Ja=0;c.uncaughtExceptionCount=Ja;var Ka=(a,b,d)=>{var e=new Ha(a);D[e.g+16>>2]=0;D[e.g+4>>2]=b;D[e.g+8>>2]=d;Ia=a;Ja++;p(!1,"Exception thrown, but exception catching is not enabled. Compile with -sNO_DISABLE_EXCEPTION_CATCHING or -sEXCEPTION_CATCHING_ALLOWED=[..] to catch.")};c.___cxa_throw=Ka;var La=()=>l("native code called abort()");c.__abort_js=La;var U=0;c.runtimeKeepaliveCounter=U;var Ma=()=>{Q=!1;U=0};c.__emscripten_runtime_keepalive_clear=Ma;var V={};c.timers=V;var Na=a=>{if(a instanceof Aa||"unwind"==a)return y;E();a instanceof WebAssembly.RuntimeError&&0>=Ca()&&u("Stack overflow detected.  You can try increasing -sSTACK_SIZE (currently set to 65536)");m(1,a)};c.handleException=Na;c.keepRuntimeAlive=()=>Q||0<U;var Oa=a=>{var _c$onExit;y=a;Q||0<U||((_c$onExit=c.onExit)!==null&&_c$onExit!==void 0&&_c$onExit.call(c,a),x=!0);m(a,new Aa(a))};c._proc_exit=Oa;var W=(a,b)=>{y=a;Pa();(Q||0<U)&&!b&&(b=`program exited (with status: ${a}), but keepRuntimeAlive() is set (counter=${U}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`,f(b),u(b));Oa(a)};c.exitJS=W;c._exit=W;var Qa=()=>{if(!(Q||0<U))try{W(y)}catch(a){Na(a)}};c.maybeExit=Qa;var Ra=a=>{if(x)u("user callback triggered after runtime exited or application aborted.  Ignoring.");else try{a(),Qa()}catch(b){Na(b)}};c.callUserCallback=Ra;c._emscripten_get_now=()=>performance.now();var Ta=(a,b)=>{V[a]&&(clearTimeout(V[a].id),delete V[a]);if(!b)return 0;var d=setTimeout(()=>{p(a in V);delete V[a];Ra(()=>Sa(a,performance.now()))},b);V[a]={id:d,j:b};return 0};c.__setitimer_js=Ta;c.getHeapMax=()=>2147483648;var Ua=(a,b)=>{p(b,"alignment argument is required");return Math.ceil(a/b)*b};c.alignMemory=Ua;var Va=a=>{var b=w.buffer,d=(a-b.byteLength+65535)/65536|0;try{return w.grow(d),la(),1}catch(e){u(`growMemory: Attempted to grow heap from ${b.byteLength} bytes to ${a} bytes, but got error: ${e}`)}};c.growMemory=Va;var Wa=a=>{var b=A.length;a>>>=0;p(a>b);if(2147483648<a)return u(`Cannot enlarge memory, requested ${a} bytes, but the limit is ${2147483648} bytes!`),!1;for(var d=1;4>=d;d*=2){var e=b*(1+.2/d);e=Math.min(e,a+100663296);e=Math.min(2147483648,Ua(Math.max(a,e),65536));if(Va(e))return!0}u(`Failed to grow the heap from ${b} bytes to ${e} bytes, not enough memory!`);return!1};c._emscripten_resize_heap=Wa;c.SYSCALLS={l:void 0,i(a){return S(a)}};var Xa=()=>{l("fd_close called without SYSCALLS_REQUIRE_FILESYSTEM")};c._fd_close=Xa;var Ya=(a,b)=>{p(a==a>>>0||a==(a|0));p(b===(b|0));return b+2097152>>>0<4194305-!!a?(a>>>0)+4294967296*b:NaN};c.convertI32PairToI53Checked=Ya;function Za(a,b,d){Ya(b,d);return 70}c._fd_seek=Za;var X=[null,[],[]];c.printCharBuffers=X;var Y=(a,b)=>{var d=X[a];p(d);0===b||10===b?((1===a?r:u)(Ea(d)),d.length=0):d.push(b)};c.printChar=Y;var ab=()=>{$a(0);X[1].length&&Y(1,10);X[2].length&&Y(2,10)};c.flush_NO_FILESYSTEM=ab;var bb=(a,b,d,e)=>{for(var g=0,k=0;k<d;k++){var h=D[b>>2],q=D[b+4>>2];b+=8;for(var I=0;I<q;I++)Y(a,A[h+I]);g+=q}D[e>>2]=g;return 0};c._fd_write=bb;c.stackAlloc=a=>cb(a);var db=a=>{var b=c["_"+a];p(b,"Cannot call unknown function "+a+", make sure it is exported");return b};c.getCFunc=db;var eb=(a,b)=>{p(0<=a.length,"writeArrayToMemory array must have a length (should be an array or typed array)");z.set(a,b)};c.writeArrayToMemory=eb;var fb=a=>{for(var b=0,d=0;d<a.length;++d){var e=a.charCodeAt(d);127>=e?b++:2047>=e?b+=2:55296<=e&&57343>=e?(b+=4,++d):b+=3}return b};c.lengthBytesUTF8=fb;var gb=(a,b,d,e)=>{p("string"===typeof a,`stringToUTF8Array expects a string (got ${typeof a})`);if(!(0<e))return 0;var g=d;e=d+e-1;for(var k=0;k<a.length;++k){var h=a.charCodeAt(k);if(55296<=h&&57343>=h){var q=a.charCodeAt(++k);h=65536+((h&1023)<<10)|q&1023}if(127>=h){if(d>=e)break;b[d++]=h}else{if(2047>=h){if(d+1>=e)break;b[d++]=192|h>>6}else{if(65535>=h){if(d+2>=e)break;b[d++]=224|h>>12}else{if(d+3>=e)break;1114111<h&&R("Invalid Unicode code point "+F(h)+" encountered when serializing a JS string to a UTF-8 string in wasm memory! (Valid unicode code points should be in range 0-0x10FFFF).");b[d++]=240|h>>18;b[d++]=128|h>>12&63}b[d++]=128|h>>6&63}b[d++]=128|h&63}}b[d]=0;return d-g};c.stringToUTF8Array=gb;var hb=(a,b,d)=>{p("number"==typeof d,"stringToUTF8(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");return gb(a,A,b,d)};c.stringToUTF8=hb;var ib=a=>{var b=fb(a)+1,d=cb(b);hb(a,d,b);return d};c.stringToUTF8OnStack=ib;var jb=(a,b,d,e)=>{var g={string:t=>{var P=0;null!==t&&void 0!==t&&0!==t&&(P=ib(t));return P},array:t=>{var P=cb(t.length);eb(t,P);return P}};a=db(a);var k=[],h=0;p("array"!==b,'Return type should not be "array".');if(e)for(var q=0;q<e.length;q++){var I=g[d[q]];I?(0===h&&(h=Ca()),k[q]=I(e[q])):k[q]=e[q]}d=a(...k);return d=function(t){0!==h&&Ba(h);return"string"===b?S(t):"boolean"===b?!!t:t}(d)};c.ccall=jb;c.cwrap=(a,b,d,e)=>function(){for(var _len=arguments.length,g=new Array(_len),_key=0;_key<_len;_key++){g[_key]=arguments[_key]}return jb(a,b,d,g,e)};c.intArrayFromString=function(a,b,d){d=Array(0<d?d:fb(a)+1);a=gb(a,d,0,d.length);b&&(d.length=a);return d};c.intArrayToString=function(a){for(var b=[],d=0;d<a.length;d++){var e=a[d];255<e&&(p(!1,`Character code ${e} (${String.fromCharCode(e)}) at offset ${d} not in 0x00-0xFF.`),e&=255);b.push(String.fromCharCode(e))}return b.join("")};c.AsciiToString=a=>{for(var b="";;){var d=A[a++];if(!d)return b;b+=String.fromCharCode(d)}};var kb="undefined"!=typeof TextDecoder?new TextDecoder("utf-16le"):void 0;c.UTF16Decoder=kb;c.UTF16ToString=(a,b)=>{p(0==a%2,"Pointer passed to UTF16ToString must be aligned to two bytes!");var d=a>>1;for(var e=d+b/2;!(d>=e)&&ia[d];)++d;d<<=1;if(32<d-a&&kb)return kb.decode(A.subarray(a,d));d="";for(e=0;!(e>=b/2);++e){var g=B[a+2*e>>1];if(0==g)break;d+=String.fromCharCode(g)}return d};c.stringToUTF16=(a,b,d)=>{p(0==b%2,"Pointer passed to stringToUTF16 must be aligned to two bytes!");p("number"==typeof d,"stringToUTF16(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(2>d)return 0;d-=2;var e=b;d=d<2*a.length?d/2:a.length;for(var g=0;g<d;++g)B[b>>1]=a.charCodeAt(g),b+=2;B[b>>1]=0;return b-e};c.UTF32ToString=(a,b)=>{p(0==a%4,"Pointer passed to UTF32ToString must be aligned to four bytes!");for(var d=0,e="";!(d>=b/4);){var g=C[a+4*d>>2];if(0==g)break;++d;65536<=g?(g-=65536,e+=String.fromCharCode(55296|g>>10,56320|g&1023)):e+=String.fromCharCode(g)}return e};c.stringToUTF32=(a,b,d)=>{p(0==b%4,"Pointer passed to stringToUTF32 must be aligned to four bytes!");p("number"==typeof d,"stringToUTF32(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!");d??(d=2147483647);if(4>d)return 0;var e=b;d=e+d-4;for(var g=0;g<a.length;++g){var k=a.charCodeAt(g);if(55296<=k&&57343>=k){var h=a.charCodeAt(++g);k=65536+((k&1023)<<10)|h&1023}C[b>>2]=k;b+=4;if(b+4>d)break}C[b>>2]=0;return b-e};var lb={__assert_fail:Fa,__call_sighandler:Ga,__cxa_throw:Ka,_abort_js:La,_emscripten_runtime_keepalive_clear:Ma,_setitimer_js:Ta,emscripten_resize_heap:Wa,exit:W,fd_close:Xa,fd_seek:Za,fd_write:bb,proc_exit:Oa},M=function(){function a(d){var _c$monitorRunDependen2;M=d.exports;w=M.memory;p(w,"memory not found in wasm exports");la();T=M.__indirect_function_table;p(T,"table not found in wasm exports");qa.unshift(M.__wasm_call_ctors);G--;(_c$monitorRunDependen2=c.monitorRunDependencies)===null||_c$monitorRunDependen2===void 0||_c$monitorRunDependen2.call(c,G);p(J["wasm-instantiate"]);delete J["wasm-instantiate"];0==G&&(null!==K&&(clearInterval(K),K=null),H&&(d=H,H=null,d()));return M}ua();var b={env:lb,wasi_snapshot_preview1:lb};if(c.instantiateWasm)try{return c.instantiateWasm(b,a)}catch(d){u(`Module.instantiateWasm callback failed with error: ${d}`),f(d)}N??(N="data:application/octet-stream;base64,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QX9GDQELIABBADoA7ANBAA8LAkAgACgCnAIgACgChARGDQAgACkDiARCAFUNACAAIABBjAJqECwCQCAALQCYBEEBRw0AIAAgAEGAAmoQLANAIAAoArgEIAFMBEAgAEGYAmogACgCzAQhBSAAKAKYAiEDQQAhAQNAIAEgACgCnAJORQRAIAUgAyABQQJ0aigCACIGQQF1ai0AAEUEQCADIAJBAnRqIAY2AgAgAkEBaiECCyABQQFqIQEMAQsLIAEgAmsQGCAAIAAoApwCNgKABEEAIQEDQCAAKAK4BCICIAFMBEAgAEHABGohA0EAIQEDQCABIAJORQRAIAMQJiAAKALABCAAKALEBEECdGpBBGsgACgCtAQgAUECdGooAgA2AgAgAUEBaiEBIAAoArgEIQIMAQsLIAAoArQERQ0EIABBADYCuAQFIAAoAswEIAAoArQEIAFBAnRqKAIAakEAOgAAIAFBAWohAQwBCwsFIAAoAswEIAAoArQEIAFBAnRqKAIAakEBOgAAIAFBAWohAQwBCwsLIAAQVSAAEC0gACAAKAKcAjYChAQgACAAKQPoASAAKQPgAXw3A4gEC0EBC6EBAgN8B38gAEGcAmohBSAAKAKkAiIGQQRrIQdEAAAAAAAA8D8gACgCnAS3IgKjIQNBfyAAKAKoAiIEIARBAEgbQQFqIQhBACEAA0AgACAIRkUEQCAABH8gByAAQQJ0aigCAAVBAAshCSAFIAYgAEECdGogACAERhsoAgAhCiADIAC4EIUBIAogCWu3oiABoCEBIABBAWohAAwBCwsgASACowtIAgF+AX8CQCAALQCoBQ0AIAApA5gFIgFCAFkEQCAAKQPAASABWg0BCyAAKQOgBSIBQgBTBEBBAQ8LIAApA7gBIAFUIQILIAILLAEBfyMAQRBrIgEkACABIAAoApwCNgIMIABBpAJqIAFBDGoQSSABQRBqJAALUwEDfyABIAAoAgRKBEAgACABEDMgACgCBCICIAEgASACSBshAyAAKAIAIQQDQCACIANGBEAgACABNgIEBSACIARqQQA6AAAgAkEBaiECDAELCwsLeQECfwJAIAAoAggiAiABTg0AIAEgAmtBAWpBfnEiASACQQF1QX5xQQJqIgMgASADShsiASACQf////8Hc0wEQCAAIAEgAmoiATYCCCAAIAAoAgAgARCVASIANgIAIAANAUHILygCAEEwRw0BCxDNAUHwHEEAEAAACwvWBAEGfyAAQZwDaiECA0ACQCACKAIgIQUgAigCJCADTARAIAUEQCACQQA2AiQLDAELIAIoAhAgBSADQQJ0aiIFKAIAai0AAARAIAIgBRAqCyADQQFqIQMMAQsLIABBoARqIQUDQCAAKAKcBCAESgRAIARBAXQhB0EAIQMDQCADQQJGBEAgBEEBaiEEDAMLIAAoApwDIAMgB3JBDGxqIQZBACECA0AgBigCBCACTARAIANBAWohAwwCBSAFIAYoAgAgAkEDdGogARBjIAJBAWohAgwBCwALAAsACwtBACECA0AgACgCnAIgAkwEQAJAIABBjAJqIQRBACECQQAhAwNAIAIgACgCkAJODQEgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAALAAsFAkAgACgCjAMiAyAAKAKYAiACQQJ0aigCAEEBdUEDdCIEaigCACIGQX9GDQAgBSAFKAIAIAZBAnRqIgYtAABBEHEEfyADBSAAIAYQIkUNASAAKAKMAwsgBGogARBjCyACQQFqIQIMAQsLIAQgAiADaxAYIABBgAJqIQRBACECQQAhAwNAIAAoAoQCIAJKBEAgBSgCACACQQJ0IgYgBCgCAGoiBygCAEECdGooAgBBA3FBAUcEQCAFIAcgARBjIAQoAgAiByADQQJ0aiAGIAdqKAIANgIAIANBAWohAwsgAkEBaiECDAELCyAEIAIgA2sQGAtyAQN/IwBBIGsiASQAIAAgAUEMaiAAKAKkBCAAKAKsBGsQZSICEDQgACgCLEECTgRAIAAoAqQEIQMgASACKAIEQQJ0NgIEIAEgA0ECdDYCAEHJFyABEI0BCyACIABBoARqEGYgAigCABCUASABQSBqJAALTgEBfyAAKAIABEADQCAAKAIEIAFMBEAgAEEANgIEIAAoAgAQlAEgAEEANgIIIABBADYCAAUgACgCACABQQxsahAPIAFBAWohAQwBCwsLC5YCAQd/A0AgAUEPSgRAIAAgAUEBdEF8cWooAgAhBEF/IQIgASEDA0AgACACQQFqIgJBAnRqIgYoAgAiByAESA0AA0AgBCAAIANBAWsiA0ECdGoiCCgCACIFSA0ACyACIANIBEAgBiAFNgIAIAggBzYCAAwBCwsgACACEDcgASACayEBIAYhAAwBCwsgACEFQQAhAEEBIAEiBiABQQFMG0EBayEHA0AgACAHRwRAIAAhAyAAQQFqIgEhAgNAIAUgA0ECdGoiCCgCACEEIAIgBkcEQCACIAMgBSACQQJ0aigCACAESBshAyACQQFqIQIMAQsLIAUgAEECdGoiAygCACEAIAMgBDYCACAIIAA2AgAgASEADAELCwtaAQF/IAAoAgAoAgAiACABQQJ0aiIBKAIAIgNB4ABJBEBBAA8LIAAgAkECdGoiACgCAEEFdiICQQJGBEBBAQ8LIAEgA0EFdkECdGoqAgQgACACQQJ0aioCBF0LHgAgACACIAMgAUGnEBA6IgAgBDoAFCAAQYwbNgIAC3ABAX8jAEEQayIFJAAgACAENgIQIAAgAzYCDCAAIAI2AgggACABNgIEIABB5Bs2AgBBvC8tAABBAXFFBEBBsC9CADcCAEG4L0EANgIAQbwvQQE6AAALIAUgADYCDEGwLyAFQQxqEEkgBUEQaiQAIAALBAAgAAuzBwIDfwF8IwBBEGsiAyQAIwBBEGsiASQAIABCADcCBCAAQaAaNgIAIABCADcDICAAQgA3AgwgAEIANwIUIABCADcDKCAAQfgpKwMAOQMwIABBsCorAwA5AzggAEHoKisDADkDQCAAQaArKwMAOQNIIABBlCwtAAA6AFAgAEHEKygCADYCVEHkKygCACECIABBADoAXCAAIAI2AlggAEH8Ky0AADoAXSAAQaAtKwMAOQNgIABBxC0oAgA2AmggAEG0LCgCADYCbEHoLCsDACEEIABBADYClAMgAEIANwKMAyAAQQA2AoQDIABCADcC/AIgAEEANgL0AiAAQgA3AuwCIABBADYC5AIgAEIANwLcAiAAQQA2AtQCIABCADcCzAIgAEKAgICAgICA/D83A5ABIABB5AA2AogBIABCmrPmzJmz5vg/NwOAASAAQtWq1arVqtXqPzcDeCAAIAQ5A3AgAEGYAWpBAEGwARCEARogASAAQaAEaiICNgIMIABBnANqIAFBDGoQDSAAQgA3AtwDIABCADcC1AMgAEIANwLMAyAAQgA3A4gEIABCgICAgHA3A4AEIABCgICAgICAgPg/NwP4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QoCAgICAgID/PxCdASADQUBrIAMpA1AgAykDWCAbIB0QpgEgAykDSCEdQQEhAiADKQNAIRsLIBlCAXwhGUEBIRILIAEoAgQiBCABKAJoRwR/IAEgBEEBajYCBCAELQAABSABELgBCyEEDAELC0EuIQQLAn4gEkUEQCABKQNwQgBZBEACQCABIAEoAgQiBEEBazYCBCABIARBAms2AgQgCkUNACABIARBA2s2AgQLCyADQeAAakQAAAAAAAAAACAGt6YQqgEgAykDYCEbIAMpA2gMAQsgGUIHVwRAIBkhGgNAIAdBBHQhByAaQgF8IhpCCFINAAsLAkACQAJAIARBX3FB0ABGBEAgARC6ASIaQoCAgICAgICAgH9SDQMgASkDcEIAWQ0BDAILQgAhGiABKQNwQgBTDQILIAEgASgCBEEBazYCBAtCACEaCyAHRQRAIANB8ABqRAAAAAAAAAAAIAa3phCqASADKQNwIRsgAykDeAwBCyAcIBkgChtCAoYgGnxCIH0iGUEAIAlrrVUEQEHIL0HEADYCACADQaABaiAGEKkBIANBkAFqIAMpA6ABIAMpA6gBQn9C////////v///ABCdASADQYABaiADKQOQASADKQOYAUJ/Qv///////7///wAQnQEgAykDgAEhGyADKQOIAQwBCyAJQeIBa6wgGVcEQCAHQQBOBEADQCADQaADaiAbIB1CAEKAgICAgIDA/79/EKYBIBsgHUKAgICAgICA/z8QmQEhASADQZADaiAbIB0gAykDoAMgGyABQQBOIgEbIAMpA6gDIB0gARsQpgEgASAHQQF0IgRyIQcgGUIBfSEZIAMpA5gDIR0gAykDkAMhGyAEQQBODQALCwJ+IBlBICAJa618IhqnIgFBACABQQBKGyAMIBogDK1TGyIBQfEATwRAIANBgANqIAYQqQEgAykDiAMhHCADKQOAAyEeQgAMAQsgA0HgAmpEAAAAAAAA8D9BkAEgAWsQkAEQqgEgA0HQAmogBhCpASADKQPQAiEeIANB8AJqIAMpA+ACIAMpA+gCIAMpA9gCIhwQuwEgAykD+AIhHyADKQPwAgshGiADQcACaiAHIAdBAXFFIBsgHUIAQgAQmAFBAEcgAUEgSXFxIgFyEKsBIANBsAJqIB4gHCADKQPAAiADKQPIAhCdASADQZACaiADKQOwAiAD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gMD/PxCmASACKQPIAyEcIAIpA8ADIRkLIAJBsANqIBsgGiAZIBwQpgEgAkGgA2ogAikDsAMgAikDuAMgHiAdEKcBIAIpA6gDIRogAikDoAMhGwJAIBdBAmsgBUH/////B3FODQAgAiAaQv///////////wCDNwOYAyACIBs3A5ADIAJBgANqIBsgGkIAQoCAgICAgID/PxCdASACKQOQAyACKQOYA0KAgICAgICAuMAAEJkBIQEgAikDiAMgGiABQQBOIgYbIRogAikDgAMgGyAGGyEbIAMgBCAJRyABQQBIcnEgGSAcQgBCABCYAUEAR3FFIBcgBiALaiILQe4Aak5xDQBByC9BxAA2AgALIAJB8AJqIBsgGiALELwBIAIpA/gCIRkgAikD8AILIRogDSAZNwMoIA0gGjcDICACQZDGAGokACANKQMoIRkgDSkDICEaDAELQgAhGgsgDyAaNwMAIA8gGTcDCCANQTBqJAAgDykDCCEZIA8pAwAhGiAWBEAgFiAPKAKIASATIA8oAhQgDygCPGtqajYCAAsgGCIBIBk3AwggASAaNwMAIA9BoAFqJAAgASkDACABKQMIEKgBISAgAUEQaiQAIA4oAhgiAQRAIAArAyAiISAgZQRAIAAtAClBAUcgICAhYnINAwsgACsDGCIhICBmBEAgAC0AKEEBRyAgICFicg0ECyAAICA5AzALIAFBAEchAQsgDkEgaiQAIAEPCyAOIAAoAgQ2AhQgDiATNgIQQYAiKAIAQZUZIA5BEGoQsQFBARABAAsgDiAAKAIENgIEIA4gEzYCAEGAIigCAEHkGCAOELEBQQEQAQALzgECBX8CfCMAQUBqIgIkACAALQAoIQMgACgCBCEEIAAoAhAhBSAALQApIQYgACsDGCEHIAArAyAhCCACIAArAzA5AzggAiAIOQMoIAIgBzkDICACQd0AQSkgBhs2AjAgAiAFNgIUIAIgBDYCECACQdsAQSggAxs2AhhBgCIoAgAhAyMAQRBrIgQkACAEIAJBEGoiBTYCDCADQdUZIAUQswEgBEEQaiQAIAEEQCACIAAoAgg2AgAgA0HXGCACELEBQQogAxCJAQsgAkFAayQAC3oBAn8CQCABIAAoAggiA0sEQCADIQICQANAIAEgAk0NASAAIAIgAkEBdiACQQN2akF+cWpBAmoiAjYCCCAC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AwAhBAwBCyABIAJC////////////AIMiCiADIARC////////////AIMiCRCYAUEATARAIAEgCiADIAkQmAEEQCABIQQMAgsgBUHwAGogASACQgBCABCdASAFKQN4IQIgBSkDcCEEDAELIARCMIinQf//AXEhByAGBH4gAQUgBUHgAGogASAKQgBCgICAgICAwLvAABCdASAFKQNoIgpCMIinQfgAayEGIAUpA2ALIQQgB0UEQCAFQdAAaiADIAlCAEKAgICAgIDAu8AAEJ0BIAUpA1giCUIwiKdB+ABrIQcgBSkDUCEDCyAJQv///////z+DQoCAgICAgMAAhCELIApC////////P4NCgICAgICAwACEIQogBiAHSgRAA0ACfiAKIAt9IAMgBFatfSIJQgBZBEAgCSAEIAN9IgSEUARAIAVBIGogASACQgBCABCdASAFKQMoIQIgBSkDICEEDAULIAlCAYYgBEI/iIQMAQsgCkIBhiAEQj+IhAshCiAEQgGGIQQgBkEBayIGIAdKDQALIAchBgsCQCAKIAt9IAMgBFatfSIJQgBTBEAgCiEJDAELIAkgBCADfSIEhEIAUg0AIAVBMGogASACQgBCABCdASAFKQM4IQIgBSkDMCEEDAELIAlC////////P1gEQANAIARCP4ggBkEBayEGIARCAYYhBCAJQgGGhCIJQoCAgICAgMAAVA0ACwsgCEGAgAJxIQcgBkEATARAIAVBQGsgBCAJQv///////z+DIAZB+ABqIAdyrUIwhoRCAEKAgICAgIDAwz8QnQEgBSkDSCECIAUpA0AhBAwBCyAJQv///////z+DIAYgB3KtQjCGhCECCyAAIAQ3AwAgACACNwMIIAVBgAFqJAAL1ycBC38jAEEQayIKJAACQAJAAkACQAJAAkACQAJAAkACQCAAQfQBTQRAQcwvKAIAIgRBECAAQQtqQfgDcSAAQQtJGyIGQQN2IgB2IgFBA3EEQAJAIAFBf3NBAXEgAGoiAkEDdCIBQfQvaiIAIAFB/C9qKAIAIgEoAggiBUYEQEHMLyAEQX4gAndxNgIADAELIAUgADYCDCAAIAU2AggLIAFBCGohACABIAJBA3QiAkEDcjYCBCABIAJqIgEgASgCBEEBcjYCBAwLCyAGQdQvKAIAIghNDQEgAQRAAkBBAiAAdCICQQAgAmty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QEEADwsgASADg0IAWQRAIAAgAlQgASADUyABIANRGwRAQX8PCyAAIAKFIAEgA4WEQgBSDwsgACACViABIANVIAEgA1EbBEBBfw8LIAAgAoUgASADhYRCAFIhBAsgBAvAAQIBfwJ+QX8hAwJAIABCAFIgAUL///////////8AgyIEQoCAgICAgMD//wBWIARCgICAgICAwP//AFEbDQAgAkL///////////8AgyIFQoCAgICAgMD//wBWIAVCgICAgICAwP//AFJxDQAgACAEIAWEhFAEQEEADwsgASACg0IAWQRAIAEgAlIgASACU3ENASAAIAEgAoWEQgBSDwsgAEIAUiABIAJVIAEgAlEbDQAgACABIAKFhEIAUiEDCyADC1ABAX4CQCADQcAAcQRAIAEgA0FAaq2GIQJCACEBDAELIANFDQAgAiADrSIEhiABQcAAIANrrYiEIQIgASAEhiEBCyAAIAE3AwAgACACNwMIC74PAgV/D34jAEHQAmsiBSQAIARC////////P4MhCiACQv///////z+DIQsgAiAEhUKAgICAgICAgIB/gyEMIARCMIinQf//AXEhCAJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAhB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiDUKAgICAgIDA//8AVCANQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQwMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhDCADIQEMAgsgASANQoCAgICAgMD//wCFhFAEQCADIAJCgICAgICAwP//AIWEUARAQgAhAUKAgICAgIDg//8AIQwMAwsgDEKAgICAgIDA//8AhCEMQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAQgAhAQwCCyABIA2EUARAQoCAgICAgOD//wAgDCACIAOEUBshDEIAIQEMAgsgAiADhFAEQCAMQoCAgICAgMD//wCEIQxCACEBDAILIA1C////////P1gEQCAFQcACaiABIAsgASALIAtQIgYbeSAGQQZ0rXynIgZBD2sQmgFBECAGayEGIAUpA8gCIQsgBSkDwAIhAQsgAkL///////8/Vg0AIAVBsAJqIAMgCiADIAogClAiBxt5IAdBBnStfKciB0EPaxCaASAGIAdqQRBrIQYgBSkDuAIhCiAFKQOwAiEDCyAFQaACaiAKQoCAgICAgMAAhCISQg+GIANCMYiEIgJCAEKAgICAsOa8gvUAIAJ9IgRCABCeASAFQZACakIAIAUpA6gCfUIAIARCABCeASAFQYACaiAFKQOYAkIBhiAFKQOQAkI/iIQiBEIAIAJCABCeASAFQfABaiAEQgBCACAFKQOIAn1CABCeASAFQeABaiAFKQP4AUIBhiAFKQPwAUI/iIQiBEIAIAJCABCeASAFQdABaiAEQgBCACAFKQPoAX1CABCeASAFQcABaiAFKQPYAUIBhiAFKQPQAUI/iIQiBEIAIAJCABCeASAFQbABaiAEQgBCACAFKQPIAX1CABCeASAFQaABaiACQgAgBSkDuAFCAYYgBSkDsAFCP4iEQgF9IgJCABCeASAFQZABaiADQg+GQgAgAkIAEJ4BIAVB8ABqIAJCAEIAIAUpA6gBIAUpA6ABIg0gBSkDmAF8IgQgDVStfCAEQgFWrXx9QgAQngEgBUGAAWpCASAEfUIAIAJCABCeASAGIAkgCGtqIQYCfyAFKQNwIhNCAYYiDiAFKQOIASIPQgGGIAUpA4ABQj+IhHwiEELn7AB9IhRCIIgiAiALQoCAgICAgMAAhCIVQgGGIhZCIIgiBH4iESABQgGGIg1CIIgiCiAQIBRWrSAOIBBWrSAFKQN4QgGGIBNCP4iEIA9CP4h8fHxCAX0iE0IgiCIQfnwiDiARVK0gDiAOIBNC/////w+DIhMgAUI/iCIXIAtCAYaEQv////8PgyILfnwiDlatfCAEIBB+fCAEIBN+IhEgCyAQfnwiDyARVK1CIIYgD0IgiIR8IA4gDiAPQiCGfCIOVq18IA4gDiAUQv////8PgyIUIAt+IhEgAiAKfnwiDyARVK0gDyAPIBMgDUL+////D4MiEX58Ig9WrXx8Ig5WrXwgDiAEIBR+IhggECARfnwiBCACIAt+fCILIAogE358IhBCIIggCyAQVq0gBCAYVK0gBCALVq18fEIghoR8IgQgDlStfCAEIA8gAiARfiICIAogFH58IgpCIIggAiAKVq1CIIaEfCICIA9UrSACIBBCIIZ8IAJUrXx8IgIgBFStfCIEQv////////8AWARAIBYgF4QhFSAFQdAAaiACIAQgAyASEJ4BIAFCMYYgBSkDWH0gBSkDUCIBQgBSrX0hCkIAIAF9IQsgBkH+/wBqDAELIAVB4ABqIARCP4YgAkIBiIQiAiAEQgGIIgQgAyASEJ4BIAFCMIYgBSkDaH0gBSkDYCINQgBSrX0hCkIAIA19IQsgASENIAZB//8AagsiBkH//wFOBEAgDEKAgICAgIDA//8AhCEMQgAhAQwBCwJ+IAZBAEoEQCAKQgGGIAtCP4iEIQEgBEL///////8/gyAGrUIwhoQhCiALQgGGDAELIAZBj39MBEBCACEBDAILIAVBQGsgAiAEQQEgBmsQnAEgBUEwaiANIBUgBkHwAGoQmgEgBUEgaiADIBIgBSkDQCICIAUpA0giChCeASAFKQM4IAUpAyhCAYYgBSkDICIBQj+IhH0gBSkDMCIEIAFCAYYiDVStfSEBIAQgDX0LIQQgBUEQaiADIBJCA0IAEJ4BIAUgAyASQgVCABCeASAKIAIgAiADIAQgAkIBgyIEfCIDVCABIAMgBFStfCIBIBJWIAEgElEbrXwiAlatfCIEIAIgAiAEQoCAgICAgMD//wBUIAMgBSkDEFYgASAFKQMYIgRWIAEgBFEbca18IgJWrXwiBCACIARCgICAgICAwP//AFQgAyAFKQMAViABIAUpAwgiA1YgASADURtxrXwiASACVK18IAyEIQwLIAAgATcDACAAIAw3AwggBUHQAmokAAtQAQF+AkAgA0HAAHEEQCACIANBQGqtiCEBQgAhAgwBCyADRQ0AIAJBwAAgA2uthiABIAOtIgSIhCEBIAIgBIghAgsgACABNwMAIAAgAjcDCAu/CgIFfw9+IwBB4ABrIgUkACAEQv///////z+DIQwgAiAEhUKAgICAgICAgIB/gyEKIAJC////////P4MiDUIgiCEOIARCMIinQf//AXEhBwJAAkAgAkIwiKdB//8BcSIJQf//AWtBgoB+TwRAIAdB//8Ba0GBgH5LDQELIAFQIAJC////////////AIMiC0KAgICAgIDA//8AVCALQoCAgICAgMD//wBRG0UEQCACQoCAgICAgCCEIQoMAgsgA1AgBEL///////////8AgyICQoCAgICAgMD//wBUIAJCgICAgICAwP//AFEbRQRAIARCgICAgICAIIQhCiADIQEMAgsgASALQoCAgICAgMD//wCFhFAEQCACIAOEUARAQoCAgICAgOD//wAhCkIAIQEMAwsgCkKAgICAgIDA//8AhCEKQgAhAQwCCyADIAJCgICAgICAwP//AIWEUARAIAEgC4RCACEBUARAQoCAgICAgOD//wAhCgwDCyAKQoCAgICAgMD//wCEIQoMAgsgASALhFAEQEIAIQEMAgsgAiADhFAEQEIAIQEMAgsgC0L///////8/WARAIAVB0ABqIAEgDSABIA0gDVAiBht5IAZBBnStfKciBkEPaxCaAUEQIAZrIQYgBSkDWCINQiCIIQ4gBSkDUCEBCyACQv///////z9WDQAgBUFAayADIAwgAyAMIAxQIggbeSAIQQZ0rXynIghBD2sQmgEgBiAIa0EQaiEGIAUpA0ghDCAFKQNAIQMLIANCD4YiC0KAgP7/D4MiAiABQiCIIgR+IhAgC0IgiCITIAFC/////w+DIgF+fCIPQiCGIhEgASACfnwiCyARVK0gAiANQv////8PgyINfiIVIAQgE358IhEgDEIPhiISIANCMYiEQv////8PgyIDIAF+fCIUIA8gEFStQiCGIA9CIIiEfCIPIAIgDkKAgASEIgx+IhYgDSATfnwiDiASQiCIQoCAgIAIhCICIAF+fCIQIAMgBH58IhJCIIZ8Ihd8IQEgByAJaiAGakH//wBrIQYCQCACIAR+IhggDCATfnwiBCAYVK0gBCAEIAMgDX58IgRWrXwgAiAMfnwgBCAEIBEgFVStIBEgFFatfHwiBFatfCADIAx+IgMgAiANfnwiAiADVK1CIIYgAkIgiIR8IAQgAkIghnwiAiAEVK18IAIgAiAQIBJWrSAOIBZUrSAOIBBWrXx8QiCGIBJCIIiEfCICVq18IAIgAiAPIBRUrSAPIBdWrXx8IgJWrXwiBEKAgICAgIDAAINQRQRAIAZBAWohBgwBCyALQj+IIARCAYYgAkI/iIQhBCACQgGGIAFCP4iEIQIgC0IBhiELIAFCAYaEIQELIAZB//8BTgRAIApCgICAgICAwP//AIQhCkIAIQEMAQsCfiAGQQBMBEBBASAGayIHQf8ATQRAIAVBMGogCyABIAZB/wBqIgYQmgEgBUEgaiACIAQgBhCaASAFQRBqIAsgASAHEJwBIAUgAiAEIAcQnAEgBSkDMCAFKQM4hEIAUq0gBSkDICAFKQMQhIQhCyAFKQMoIAUpAxiEIQEgBSkDACECIAUpAwgMAgtCACEBDAILIARC////////P4MgBq1CMIaECyAKhCEKIAtQIAFCAFkgAUKAgICAgICAgIB/URtFBEAgCiACQgF8IgFQrXwhCgwBCyALIAFCgICAgICAgICAf4WEUEUEQCACIQEMAQsgCiACIAJCAYN8IgEgAlStfCEKCyAAIAE3AwAgACAKNwMIIAVB4ABqJAALdQEBfiAAIAEgBH4gAiADfnwgA0IgiCICIAFCIIgiBH58IANC/////w+DIgMgAUL/////D4MiAX4iBUIgiCADIAR+fCIDQiCIfCABIAJ+IANC/////w+DfCIBQiCIfDcDCCAAIAVC/////w+DIAFCIIaENwMACw4AQaCEBSQCQaCEASQBCwcAIwAjAWsLBAAjAgsEACMBCwYAIAAkAAsQACMAIABrQXBxIgAkACAACwQAIwALzgkCBH8EfiMAQfAAayIGJAAgBEL///////////8AgyEJAkACQCABUCIFIAJC////////////AIMiCkKAgICAgIDA//8AfUKAgICAgIDAgIB/VCAKUBtFBEAgA0IAUiAJQoCAgICAgMD//wB9IgtCgICAgICAwICAf1YgC0KAgICAgIDAgIB/URsNAQsgBSAKQoCAgICAgMD//wBUIApCgICAgICAwP//AFEbRQRAIAJCgICAgICAIIQhBCABIQMMAgsgA1AgCUKAgICAgIDA//8AVCAJQoCAgICAgMD//wBRG0UEQCAEQoCAgICAgCCEIQQMAgsgASAKQoCAgICAgMD//wCFhFAEQEKAgICAgIDg//8AIAIgASADhSACIASFQoCAgICAgICAgH+FhFAiBRshBEIAIAEgBRshAwwCCyADIAlCgICAgICAwP//AIWEUA0BIAEgCoRQBEAgAyAJhEIAUg0CIAEgA4MhAyACIASDIQQMAgsgAyAJhFBFDQAgASEDIAIhBAwBCyADIAEgASADVCAJIApWIAkgClEbIggbIQogBCACIAgbIgxC////////P4MhCSACIAQgCBsiC0IwiKdB//8BcSEHIAxCMIinQf//AXEiBUUEQCAGQeAAaiAKIAkgCiAJIAlQIgUbeSAFQQZ0rXynIgVBD2sQmgEgBikDaCEJIAYpA2AhCkEQIAVrIQULIAEgAyAIGyEDIAtC////////P4MhASAHBH4gAQUgBkHQAGogAyABIAMgASABUCIHG3kgB0EGdK18pyIHQQ9rEJoBQRAgB2shByAGKQNQIQMgBikDWAtCA4YgA0I9iIRCgICAgICAgASEIQEgCUIDhiAKQj2IhCACIASFIQQCfiADQgOGIgIgBSAHRg0AGiAFIAdrIgdB/wBLBEBCACEBQgEMAQsgBkFAayACIAFBgAEgB2sQmgEgBkEwaiACIAEgBxCcASAGKQM4IQEgBikDMCAGKQNAIAYpA0iEQgBSrYQLIQlCgICAgICAgASEIQsgCkIDhiEKAkAgBEIAUwRAQgAhA0IAIQQgCSAKhSABIAuFhFANAiAKIAl9IQIgCyABfSAJIApWrX0iBEL/////////A1YNASAGQSBqIAIgBCACIAQgBFAiBxt5IAdBBnStfKdBDGsiBxCaASAFIAdrIQUgBikDKCEEIAYpAyAhAgwBCyAJIAp8IgIgCVStIAEgC3x8IgRCgICAgICAgAiDUA0AIAlCAYMgBEI/hiACQgGIhIQhAiAFQQFqIQUgBEIBiCEECyAMQoCAgICAgICAgH+DIQMgBUH//wFOBEAgA0KAgICAgIDA//8AhCEEQgAhAwwBC0EAIQcCQCAFQQBKBEAgBSEHDAELIAZBEGogAiAEIAVB/wBqEJoBIAYgAiAEQQEgBWsQnAEgBikDACAGKQMQIAYpAxiEQgBSrYQhAiAGKQMIIQQLIARCPYYgAkIDiIQhASAEQgOIQv///////z+DIAetQjCGhCADhCEEAkACQCACp0EHcSIFQQRHBEAgBCABIAEgBUEES618IgNWrXwhBAwBCyAEIAEgASABQgGDfCIDVq18IQQMAQsgBUUNAQsLIAAgAzcDACAAIAQ3AwggBkHwAGokAAtFAQF/IwBBEGsiBSQAIAUgASACIAMgBEKAgICAgICAgIB/hRCmASAFKQMAIQEgACAFKQMINwMIIAAgATcDACAFQRBqJAAL8wMCAn4FfyMAQSBrIgUkACABQv///////z+DIQICfiABQjCIQv//AYMiA6ciBEGB+ABrQf0PTQRAIAJCBIYgAEI8iIQhAiAEQYD4AGutIQMCQCAAQv//////////D4MiAEKBgICAgICAgAhaBEAgAkIBfCECDAELIABCgICAgICAgIAIUg0AIAJCAYMgAnwhAgtCACACIAJC/////////wdWIgQbIQAgBK0gA3wMAQsgACAChFAgA0L//wFSckUEQCACQgSGIABCPIiEQoCAgICAgIAEhCEAQv8PDAELIARB/ocBSwRAQgAhAEL/DwwBC0GA+ABBgfgAIANQIgcbIgggBGsiBkHwAEoEQEIAIQBCAAwBCyAFQRBqIAAgAiACQoCAgICAgMAAhCAHGyICQYABIAZrEJoBIAUgACACIAYQnAEgBSkDCEIEhiAFKQMAIgJCPIiEIQACQCAEIAhHIAUpAxAgBSkDGIRCAFJxrSACQv//////////D4OEIgJCgYCAgICAgIAIWgRAIABCAXwhAAwBCyACQoCAgICAgICACFINACAAQgGDIAB8IQALIABCgICAgICAgAiFIAAgAEL/////////B1YiBBshACAErQshAiAFQSBqJAAgAUKAgICAgICAgIB/gyACQjSGhCAAhL8LfwICfwF+IwBBEGsiAyQAIAACfiABRQRAQgAMAQsgAyABIAFBH3UiAnMgAmsiAq1CACACZyICQdEAahCaASADKQMIQoCAgICAgMAAhUGegAEgAmutQjCGfCABQYCAgIB4ca1CIIaEIQQgAykDAAs3AwAgACAENwMIIANBEGokAAvjAQIEfgJ/IwBBEGsiBiQAIAG9IgVC/////////weDIQIgAAJ+IAVCNIhC/w+DIgNQRQRAIANC/w9SBEAgAkIEiCEEIANCgPgAfCEDIAJCPIYMAgsgAkIEiCEEQv//ASEDIAJCPIYMAQsgAlAEQEIAIQNCAAwBCyAGIAJCACAFp2dBIHIgAkIgiKdnIAJCgICAgBBUGyIHQTFqEJoBQYz4ACAHa60hAyAGKQMIQoCAgICAgMAAhSEEIAYpAwALNwMAIAAgBUKAgICAgICAgIB/gyADQjCGhCAEhDcDCCAGQRBqJAALZwIBfwF+IwBBEGsiAiQAIAACfiABRQRAQgAMAQsgAiABrUIAQfAAIAFnIgFBH3NrEJoBIAIpAwhCgICAgICAwACFQZ6AASABa61CMIZ8IQMgAikDAAs3AwAgACADNwMIIAJBEGokAAvxAQEDfwJAIABFBEBBuCkoAgAEQEG4KSgCABCsASEBC0GgKCgCAARAQaAoKAIAEKwBIAFyIQELQbwzKAIAIgBFDQEDQCAAKAJMGiAA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BEBBACEHDAELQQAhCyAIKAIwIQwDQCAMKAIAIg1FDQEgCEEEaiIKIA0QxAEiDSALaiILIAdLDQEgACAKIA0QvwEgDEEEaiEMIAcgC0sNAAsLIABBICAQIAcgCUGAwABzEMMBIBAgByAHIBBIGyEHDAgLIBQgCkEASHENCUE9IQsgACAIKwMwIBAgCiAJIAcgBRETACIHQQBODQcMCgsgBy0AASEMIAdBAWohBwwACwALIAANCSATRQ0DQQEhBwNAIAQgB0ECdGooAgAiAARAIAMgB0EDdGogACACIAYQwQFBASEOIAdBAWoiB0EKRw0BDAsLCyAHQQpPBEBBASEODAoLA0AgBCAHQQJ0aigCAA0BQQEhDiAHQQFqIgdBCkcNAAsMCQtBHCELDAYLIAggBzoAJ0EBIQogFyENIAwhCQsgCiALIA1rIgwgCiAMShsiASARQf////8Hc0oNA0E9IQsgECABIBFqIgogCiAQSBsiByAYSg0EIABBICAHIAogCRDDASAAIBYgERC/ASAAQTAgByAKIAlBgIAEcxDDASAAQTAgASAMQQAQwwEgACANIAwQvwEgAEEgIAcgCiAJQYDAAHMQwwEgCCgCPCEBDAELCwtBACEODAMLQT0hCwtByC8gCzYCAAtBfyEOCyAIQUBrJAAgDgsYACAALQAAQSBxRQRAIAEgAiAAEIsBGgsLbwEFfyAAKAIAIgMsAABBMGsiAUEJSwRAQQAPCwNAQX8hBCACQcyZs+YATQRAQX8gASACQQpsIgVqIAEgBUH/////B3NLGyEECyAAIANBAWoiBTYCACADLAABIAQhAiAFIQNBMGsiAUEKSQ0ACyACC7wCAAJAAkACQAJAAkACQAJAAkACQAJAAkAgAUEJaw4SAAgJCggJAQIDBAoJCgoICQUGBwsgAiACKAIAIgFBBGo2AgAgACABKAIANgIADwsgAiACKAIAIgFBBGo2AgAgACABMgEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMwEANwMADwsgAiACKAIAIgFBBGo2AgAgACABMAAANwMADwsgAiACKAIAIgFBBGo2AgAgACABMQAANwMADwsgAiACKAIAQQdqQXhxIgFBCGo2AgAgACABKwMAOQMADwsgACACIAMRAAALDwsgAiACKAIAIgFBBGo2AgAgACABNAIANwMADwsg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ZWFucyBubyBsaW1pdABNaW5pbXVtIGxlYXJudCBjbGF1c2UgbGltaXQAbWluLWxlYXJudHMAICAtJXMsIC1uby0lcwBUaGUgY2xhdXNlIGFjdGl2aXR5IGRlY2F5IGZhY3RvcgBUaGUgdmFyaWFibGUgYWN0aXZpdHkgZGVjYXkgZmFjdG9yAFJlc3RhcnQgaW50ZXJ2YWwgaW5jcmVhc2UgZmFjdG9yAHJuZC1mcmVxAC4uLy4uLy4uL3N5c3RlbS9saWIvbGliY3h4YWJpL3NyYy9wcml2YXRlX3R5cGVpbmZvLmNwcABVc2VkIGJ5IHRoZSByYW5kb20gdmFyaWFibGUgc2VsZWN0aW9uAGltaW4AbmFuAGFzeW1tAGVsaW0AY2wtbGltAHN1Yi1saW0AVGhlIGJhc2UgcmVzdGFydCBpbnRlcnZhbAByY2hlY2sAY2FuX2NhdGNoAHBoYXNlLXNhdmluZwB0ZXJtaW5hdGluZwBpbmYAb2ZmAFRoZSBmcmVxdWVuY3kgd2l0aCB3aGljaCB0aGUgZGVjaXNpb24gaGV1cmlzdGljIHRyaWVzIHRvIGNob29zZSBhIHJhbmRvbSB2YXJpYWJsZQBjY21pbi1tb2RlAFVzZSB0aGUgTHVieSByZXN0YXJ0IHNlcXVlbmNlAFRoZSBmcmFjdGlvbiBvZiB3YXN0ZWQgbWVtb3J5IGFsbG93ZWQgYmVmb3JlIGEgZ2FyYmFnZSBjb2xsZWN0aW9uIGlzIHRyaWdnZXJlZAB0ZXJtaW5hdGVfaGFuZGxlciB1bmV4cGVjdGVkbHkgcmV0dXJuZWQAcm5kLXNlZWQAJTRkAHJpbmMAc2ltcC1nYy1mcmFjACAgLSUtMTJzID0gJS04cyBbAFNJTVAATkFOAElORgBDT1JFADxib29sPgA8ZG91YmxlPgA8aW50MzI+AD09PT09PT09PT09PT09PT09PT09PT09PT09PT1bIFNlYXJjaCBTdGF0aXN0aWNzIF09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0APT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQBEbyBub3QgY2hlY2sgaWYgc3Vic3VtcHRpb24gYWdhaW5zdCBhIGNsYXVzZSBsYXJnZXIgdGhhbiB0aGlzLiAtMSBtZWFucyBubyBsaW1pdC4AQWxsb3cgYSB2YXJpYWJsZSBlbGltaW5hdGlvbiBzdGVwIHRvIGdyb3cgYnkgYSBudW1iZXIgb2YgY2xhdXNlcy4AUGVyZm9ybSB2YXJpYWJsZSBlbGltaW5hdGlvbi4AVGhlIGZyYWN0aW9uIG9mIHdhc3RlZCBtZW1vcnkgYWxsb3dlZCBiZWZvcmUgYSBnYXJiYWdlIGNvbGxlY3Rpb24gaXMgdHJpZ2dlcmVkIGR1cmluZyBzaW1wbGlmaWNhdGlvbi4AU2hyaW5rIGNsYXVzZXMgYnkgYXN5bW1ldHJpYyBicmFuY2hpbmcuAG5vLQBDaGVjayBpZiBhIGNsYXVzZSBpcyBhbHJlYWR5IGltcGxpZWQuIChjb3N0bHkpAENvbnRyb2xzIGNvbmZsaWN0IGNsYXVzZSBtaW5pbWl6YXRpb24gKDA9bm9uZSwgMT1iYXNpYywgMj1kZWVwKQAobnVsbCkAQ29udHJvbHMgdGhlIGxldmVsIG9mIHBoYXNlIHNhdmluZyAoMD1ub25lLCAxPWxpbWl0ZWQsIDI9ZnVsbCkAYWRqdXN0ZWRQdHIgJiYgImNhdGNoaW5nIGEgY2xhc3Mgd2l0aG91dCBhbiBvYmplY3Q/IgBQdXJlIHZpcnR1YWwgZnVuY3Rpb24gY2FsbGVkIQBZTyEAbGliYysrYWJpOiAAIC4uIABlbGltaW5hdGlvbiBsZWZ0OiAlMTBkDQBzdWJzdW1wdGlvbiBsZWZ0OiAlMTBkICglMTBkIHN1YnN1bWVkLCAlMTBkIGRlbGV0ZWQgbGl0ZXJhbHMpDQB8ICU5ZCB8ICU3ZCAlOGQgJThkIHwgJThkICU4ZCAlNi4wZiB8ICU2LjNmICUlIHwKAHwgIEdhcmJhZ2UgY29sbGVjdGlvbjogICAlMTJkIGJ5dGVzID0+ICUxMmQgYnl0ZXMgICAgICAgICAgICAgfAoAfCAgRWxpbWluYXRlZCBjbGF1c2VzOiAgICAgJTEwLjJmIE1iICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8CgAKICAgICAgICAlcwoARVJST1IhIHZhbHVlIDwlcz4gaXMgdG9vIHNtYWxsIGZvciBvcHRpb24gIiVzIi4KAEVSUk9SISB2YWx1ZSA8JXM+IGlzIHRvbyBsYXJnZSBmb3Igb3B0aW9uICIlcyIuCgAoZGVmYXVsdDogJXMpCgAgIC0lLTEycyA9ICUtOHMgJWMlNC4yZyAuLiAlNC4yZyVjIChkZWZhdWx0OiAlZykKAF0gKGRlZmF1bHQ6ICVkKQoAAAAAACwNAAABAAAAAgAAAAMAAAC4EQAANA0AAE43TWluaXNhdDZTb2x2ZXJFAAAAAAAAAGANAAAFAAAABgAAAAcAAAD+////4BEAAGwNAAAsDQAATjdNaW5pc2F0MTBTaW1wU29sdmVyRQAAAAAAAJwNAAAIAAAACQAAAAoAAAALAAAA4BEAAKgNAADADQAATjdNaW5pc2F0MTBCb29sT3B0aW9uRQAAuBEAAMgNAABON01pbmlzYXQ2T3B0aW9uRQAAAAAAAADADQAACAAAAAwAAAANAAAADQAAAAAAAAAMDgAACAAAAA4AAAAPAAAAEAAAAOARAAAYDgAAwA0AAE43TWluaXNhdDlJbnRPcHRpb25FAAAAAAAAAABIDgAACAAAABEAAAASAAAAEwAAAOARAABUDgAAwA0AAE43TWluaXNhdDEyRG91YmxlT3B0aW9uRQAAAAC4EQAAeA4AAE43TWluaXNhdDIwT3V0T2ZNZW1vcnlFeGNlcHRpb25FAEGmHQsa8D8AAAAAAAD4PwAAAAAAAAAABtDPQ+v9TD4AQcsdC5YBQAO44j/RdJ4AV529KoBwUg///z4nCgAAAGQAAADoAwAAECcAAKCGAQBAQg8AgJaYAADh9QUYAAAANQAAAHEAAABr////zvv//5K///8AAAAAAAAAABkACwAZGRkAAAAABQAAAAAAAAkAAAAACwAAAAAAAAAAGQAKChkZGQMKBwABAAkLGAAACQYLAAALAAYZAAAAGRkZAEHxHgshDgAAAAAAAAAAGQALDRkZGQANAAACAAkOAAAACQAOAAAOAEGrHwsBDABBtx8LFRMAAAAAEwAAAAAJDAAAAAAADAAADABB5R8LARAAQfEfCxUPAAAABA8AAAAACRAAAAAAABAAABAAQZ8gCwESAEGrIAseEQAAAAARAAAAAAkSAAAAAAASAAASAAAaAAAAGhoaAEHiIAsOGgAAABoaGgAAAAAAAAkAQZMhCwEUAEGfIQsVFwAAAAAXAAAAAAkUAAAAAAAUAAAUAEHNIQsBFgBB2SEL5AIVAAAAABUAAAAACRYAAAAAABYAABYAADAxMjM0NTY3ODlBQkNERUaQEwAA4BEAABARAACYEQAATjEwX19jeHhhYml2MTE2X19zaGltX3R5cGVfaW5mb0UAAAAA4BEAAEARAAAEEQAATjEwX19jeHhhYml2MTE3X19jbGFzc190eXBlX2luZm9FAAAA4BEAAHARAAA0EQAATjEwX19jeHhhYml2MTIwX19zaV9jbGFzc190eXBlX2luZm9FAAAAALgRAACgEQAAU3Q5dHlwZV9pbmZvAAAAAAAAAAA0EQAAHAAAAB0AAAAeAAAAHwAAACAAAAAhAAAAIgAAACMAAAAAAAAAZBEAABwAAAAkAAAAHgAAAB8AAAAgAAAAJQAAACYAAAAnAAAAAAAAACgAAAAoAAAAKQAAACkAAAApAAAAKQAAACkAAAApAAAAKAAAACgAAAApAAAAKAAAACgAAAAoAAAAKABB4CQLHSkAAAApAAAAKAAAACgAAAAAAAAAKAAAAAAAAAApAEGIJgsDIEIBAEGkJgsBKgBB7CYLAuAZAEGQJwsBBQBBnCcLARYAQbQnCwoXAAAAGAAAAAAaAEHMJwsBAgBB3CcLCP//////////AEGgKAsJkBMAAAAAAAAFAEG0KAsBGQBBzCgLDhcAAAAaAAAACBoAAAAEAEHkKAsBAQBB9CgLBf////8KAEG4KQsFKBQAABs=");b=xa(b);return a(b[0])}();c._yo=L("yo",0);c._free=L("free",1);c._unyo=L("unyo",1);c._createTheSolver=L("createTheSolver",0);c._ensureVar=L("ensureVar",1);c._addClause=L("addClause",1);c._solve=L("solve",0);c._getSolution=L("getSolution",0);c._getNumVars=L("getNumVars",0);c._solveAssuming=L("solveAssuming",1);c._retireVar=L("retireVar",1);c._getConflictClauseSize=L("getConflictClauseSize",0);c._getConflictClause=L("getConflictClause",0);var $a=L("fflush",1);c._malloc=L("malloc",1);var Sa=L("_emscripten_timeout",2),mb=M.emscripten_stack_init,oa=M.emscripten_stack_get_end,Ba=M._emscripten_stack_restore,cb=M._emscripten_stack_alloc,Ca=M.emscripten_stack_get_current;c.dynCall_jiji=L("dynCall_jiji",5);var Z;H=function nb(){Z||ob();Z||(H=nb)};function ob(){function a(){if(!Z&&(Z=!0,c.calledRun=!0,!x)){var _c$onRuntimeInitializ;p(!sa);sa=!0;E();O(qa);aa(c);(_c$onRuntimeInitializ=c.onRuntimeInitialized)===null||_c$onRuntimeInitializ===void 0||_c$onRuntimeInitializ.call(c);p(!c._main,'compiled without a main, but one is present. if you added it from JS, use Module["onRuntimeInitialized"]');E();if(c.postRun)for("function"==typeof c.postRun&&(c.postRun=[c.postRun]);c.postRun.length;){var b=c.postRun.shift();ra.unshift(b)}O(ra)}}if(!(0<G)){mb();na();if(c.preRun)for("function"==typeof c.preRun&&(c.preRun=[c.preRun]);c.preRun.length;)ta();O(pa);0<G||(c.setStatus?(c.setStatus("Running..."),setTimeout(()=>{setTimeout(()=>c.setStatus(""),1);a()},1)):a(),E())}}function Pa(){var a=r,b=u,d=!1;r=u=()=>{d=!0};try{ab()}catch(e){}r=a;u=b;d&&(R("stdio streams had content in them that was not flushed. you should set EXIT_RUNTIME to 1 (see the Emscripten FAQ), or make sure to emit a newline when you printf etc."),R("(this may also be due to not including full filesystem support - try building with -sFORCE_FILESYSTEM)"))}if(c.preInit)for("function"==typeof c.preInit&&(c.preInit=[c.preInit]);0<c.preInit.length;)c.preInit.pop()();ob();moduleRtn=c;for(const a of Object.keys(c))a in moduleArg||Object.defineProperty(moduleArg,a,{configurable:!0,get(){l(`Access to module property ('${a}') is no longer possible via the module constructor argument; Instead, use the result of the module constructor.`)}});
 
 
-      return moduleRtn;
-    }
-  );
+  return moduleRtn;
+}
+);
 })();
 if (typeof exports === 'object' && typeof module === 'object') {
   module.exports = Module;

From 64697ad9aa0442ee9484b62bd0751d612896e085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 5 Feb 2025 18:29:04 +0100
Subject: [PATCH 1043/1140] fix code styling on affected files

---
 packages/logic-solver/minisat_wrapper.js          | 2 +-
 scripts/admin/check-legacy-syntax/check-syntax.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/logic-solver/minisat_wrapper.js b/packages/logic-solver/minisat_wrapper.js
index 913e845aa5..a726368e01 100644
--- a/packages/logic-solver/minisat_wrapper.js
+++ b/packages/logic-solver/minisat_wrapper.js
@@ -1,4 +1,4 @@
-import C_MINISAT from "./minisat.js"
+var C_MINISAT = require("./minisat.js");
 MiniSat = function () {
   // A MiniSat object wraps an instance of "native" MiniSat.  You can
   // have as many MiniSat objects as you want, and they are all
diff --git a/scripts/admin/check-legacy-syntax/check-syntax.js b/scripts/admin/check-legacy-syntax/check-syntax.js
index fdbe82b061..d5a1db490f 100644
--- a/scripts/admin/check-legacy-syntax/check-syntax.js
+++ b/scripts/admin/check-legacy-syntax/check-syntax.js
@@ -84,7 +84,7 @@ const packages = {
   "logic-solver": {
     // TODO: Fibers - Legacy
     // Revisit when we remove fibers, this may break for legacy
-    ignoredFiles: ["logic.js", "optimize.js"],
+    ignoredFiles: ["logic.js", "optimize.js", "minisat.js"],
   },
   "meteor-base": {},
   "mobile-experience": {},

From 8f5cd46a30fd33c06d21793fc435b592a2728a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 6 Feb 2025 15:58:39 +0100
Subject: [PATCH 1044/1140] Meteor version to 3.1.2 :comet:

---
 packages/email/package.js                           | 2 +-
 packages/meteor-tool/package.js                     | 2 +-
 packages/modern-browsers/package.js                 | 2 +-
 packages/webapp/package.js                          | 2 +-
 scripts/admin/meteor-release-official.json          | 2 +-
 v3-docs/docs/generators/changelog/versions/3.1.2.md | 4 ++--
 v3-docs/docs/history.md                             | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/email/package.js b/packages/email/package.js
index acbb8fcd73..5a9560e9a3 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "3.1.2-beta312.0",
+  version: "3.1.2",
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 508f842915..3af83bdeee 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.2-beta.0",
+  version: "3.1.2",
 });
 
 Package.includeTool();
diff --git a/packages/modern-browsers/package.js b/packages/modern-browsers/package.js
index be438a18c3..f2381a8f4d 100644
--- a/packages/modern-browsers/package.js
+++ b/packages/modern-browsers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'modern-browsers',
-  version: '0.2.0-beta312.0',
+  version: '0.2.0',
   summary:
     'API for defining the boundary between modern and legacy ' +
     'JavaScript clients',
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index aa25a18f10..6e988ec31c 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: "2.0.5-beta312.0",
+  version: "2.0.5",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 21a3b156ca..c2961db2c9 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"
diff --git a/v3-docs/docs/generators/changelog/versions/3.1.2.md b/v3-docs/docs/generators/changelog/versions/3.1.2.md
index 338447f1a1..b8fb483385 100644
--- a/v3-docs/docs/generators/changelog/versions/3.1.2.md
+++ b/v3-docs/docs/generators/changelog/versions/3.1.2.md
@@ -1,4 +1,4 @@
-## v3.1.2, /date/
+## v3.1.2, 2025-02-06
 
 ### Highlights
 
@@ -21,7 +21,7 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.1.2-beta.0
+meteor update --release 3.1.2
 
 ```
 
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 89a358376e..899e6c2fda 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -10,7 +10,7 @@ This is a complete history of changes for Meteor releases.
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
-## v3.1.2, <date>
+## v3.1.2, 2025-02-06
 
 ### Highlights
 
@@ -33,7 +33,7 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.1.2-beta.0
+meteor update --release 3.1.2
 
 ```
 

From 5aea24d155a78e5c54365bfe10753011498a3867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 6 Feb 2025 16:22:42 +0100
Subject: [PATCH 1045/1140] bump meteor-installer to 3.1.2

---
 npm-packages/meteor-installer/config.js    | 2 +-
 npm-packages/meteor-installer/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js
index fa0e73ef14..c685ade5e1 100644
--- a/npm-packages/meteor-installer/config.js
+++ b/npm-packages/meteor-installer/config.js
@@ -1,7 +1,7 @@
 const os = require('os');
 const path = require('path');
 
-const METEOR_LATEST_VERSION = '3.1.1';
+const METEOR_LATEST_VERSION = '3.1.2';
 const sudoUser = process.env.SUDO_USER || '';
 function isRoot() {
   return process.getuid && process.getuid() === 0;
diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json
index 1cc7402b05..aa5a0c8c25 100644
--- a/npm-packages/meteor-installer/package.json
+++ b/npm-packages/meteor-installer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Install Meteor",
   "main": "install.js",
   "scripts": {

From 7c3f4d2db3f8f93ff545fd001c7b121f9a601c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 6 Feb 2025 18:21:17 +0100
Subject: [PATCH 1046/1140] bump meteor-installer to 3.1.2

---
 npm-packages/meteor-installer/package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-packages/meteor-installer/package-lock.json b/npm-packages/meteor-installer/package-lock.json
index e1eeaa2f2b..79bd10645e 100644
--- a/npm-packages/meteor-installer/package-lock.json
+++ b/npm-packages/meteor-installer/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor",
-      "version": "3.1.1",
+      "version": "3.1.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

From 1e67a0016f62f1968d9af799a6ff43aa6ba72602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 7 Feb 2025 14:46:43 +0100
Subject: [PATCH 1047/1140] bump for a new dev_bundle

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index b65518ac20..f608dd2ba3 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.13.1.1
+BUNDLE_VERSION=22.13.1.2
 
 
 # OS Check. Put here because here is where we download the precompiled

From 733f17594dc204c5bbfa70c5ffad5366eb419c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 7 Feb 2025 14:58:16 +0100
Subject: [PATCH 1048/1140] re-run checks


From 4132a0fdc556acd36310e180306cfeef76322afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 7 Feb 2025 15:12:07 +0100
Subject: [PATCH 1049/1140] Meteor version to 3.2.0-beta.0 :comet:

---
 packages/accounts-base/package.js             |  2 +-
 packages/accounts-password/package.js         |  6 +--
 packages/logic-solver/package.js              |  2 +-
 packages/meteor-tool/package.js               |  2 +-
 packages/test-helpers/package.js              |  2 +-
 .../admin/meteor-release-experimental.json    |  2 +-
 .../generators/changelog/versions/3.2.0.md    | 46 +++++++++++++++++++
 7 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 v3-docs/docs/generators/changelog/versions/3.2.0.md

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index db96d4d13d..1b2acf40dd 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.0-alpha.0",
+  version: "3.1.0-beta320.0",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 3eefb8a7f5..fc124f2037 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "4.0.0-alpha.0",
+  version: "4.0.0-beta320.0",
 });
 
 Npm.depends({
@@ -14,10 +14,10 @@ Npm.depends({
 });
 
 Package.onUse((api) => {
-  api.use(["accounts-base@3.1.0-alpha.0", "sha", "ejson", "ddp"], ["client", "server"]);
+  api.use(["accounts-base", "sha", "ejson", "ddp"], ["client", "server"]);
 
   // Export Accounts (etc) to packages using this one.
-  api.imply("accounts-base@3.1.0-alpha.0", ["client", "server"]);
+  api.imply("accounts-base", ["client", "server"]);
 
   api.use("email", "server");
   api.use("random", "server");
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 3a211a0eee..13521be58d 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '3.0.1',
+  version: '3.1.0-beta320.0',
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 3af83bdeee..fc66bb1a03 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.1.2",
+  version: "3.2.0-beta.0",
 });
 
 Package.includeTool();
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 7d68b8e182..2f13d17334 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: "2.0.2",
+  version: "2.0.3-beta320.0",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 4f0f40b147..19262d60ee 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1.2-beta.0",
+  "version": "3.2.0-beta.0",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/v3-docs/docs/generators/changelog/versions/3.2.0.md b/v3-docs/docs/generators/changelog/versions/3.2.0.md
new file mode 100644
index 0000000000..b91497c807
--- /dev/null
+++ b/v3-docs/docs/generators/changelog/versions/3.2.0.md
@@ -0,0 +1,46 @@
+## v3.2.0, 2025-02-06
+
+### Highlights
+
+- Support for argon2 to improve password security over bcrypt.
+- Improve and fix package resolution logic.
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.2.0-beta.0
+
+```
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.1.0
+- accounts-password@4.0.0
+- meteor-tool@3.2.0
+- test-helpers@2.0.3
+
+#### Bumped NPM Packages
+
+N/A
+
+#### Special thanks to
+
+✨✨✨
+
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@Grubba27](https://github.com/Grubba27)
+- [@vparpoil](https://github.com/vparpoil)
+- [@cunneen](https://github.com/cunneen)
+
+✨✨✨

From 27ac5a2671bdc023284b5c8355cd162556e131e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 7 Feb 2025 16:08:16 +0100
Subject: [PATCH 1050/1140] Meteor version to 3.2.0-beta.1 :comet:

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/logic-solver/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/test-helpers/package.js               | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 1b2acf40dd..7941150d91 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.0-beta320.0",
+  version: "3.1.0-beta320.1",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index fc124f2037..67265d62a9 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "4.0.0-beta320.0",
+  version: "4.0.0-beta320.1",
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 13521be58d..23b4a0f961 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '3.1.0-beta320.0',
+  version: '3.1.0-beta320.1',
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index fc66bb1a03..b49b08c984 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.2.0-beta.0",
+  version: "3.2.0-beta.1",
 });
 
 Package.includeTool();
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 2f13d17334..434681a2bb 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: "2.0.3-beta320.0",
+  version: "2.0.3-beta320.1",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 19262d60ee..e13313ce1b 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.2.0-beta.0",
+  "version": "3.2-beta.1",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"

From 2e80be6dfd89d973ba79807ce0ff5f88e587f153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 7 Feb 2025 16:09:23 +0100
Subject: [PATCH 1051/1140] Meteor version to 3.2.0-beta.1 :comet:

---
 v3-docs/docs/generators/changelog/versions/3.2.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.2.0.md b/v3-docs/docs/generators/changelog/versions/3.2.0.md
index b91497c807..7cbc83fa7b 100644
--- a/v3-docs/docs/generators/changelog/versions/3.2.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.2.0.md
@@ -19,7 +19,7 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.2.0-beta.0
+meteor update --release 3.2.0-beta.1
 
 ```
 

From b3610d78416b9ebba2de06d265af4dd5508a8169 Mon Sep 17 00:00:00 2001
From: julio-rocketchat <julio.araujo@rocket.chat>
Date: Mon, 10 Feb 2025 11:41:03 +0100
Subject: [PATCH 1052/1140] Update package.js to bump postcss

---
 packages/minifier-css/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 116bb33696..fd196a0f87 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,10 +1,10 @@
 Package.describe({
   summary: 'CSS minifier',
-  version: '2.0.0',
+  version: '2.0.1',
 });
 
 Npm.depends({
-  postcss: '8.4.21',
+  postcss: '8.5.1',
   cssnano: '5.1.15'
 });
 

From a108778dfca56600d9f77314b9ef4a7e9617aada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 10 Feb 2025 15:34:01 +0100
Subject: [PATCH 1053/1140] ensure ignore mongo to avoid annoying non-critical
 waring

---
 tools/static-assets/skel-solid/vite.config.js | 2 +-
 tools/static-assets/skel-vue/vite.config.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/static-assets/skel-solid/vite.config.js b/tools/static-assets/skel-solid/vite.config.js
index 5ec03437ec..b393c06fcf 100644
--- a/tools/static-assets/skel-solid/vite.config.js
+++ b/tools/static-assets/skel-solid/vite.config.js
@@ -12,7 +12,7 @@ export default defineConfig({
       serverEntry: 'server/main.js',
       enableExperimentalFeatures: true,
       stubValidation: {
-        warnOnly: true,
+        ignorePackages: ['mongo'],
       },
     }),
   ],
diff --git a/tools/static-assets/skel-vue/vite.config.js b/tools/static-assets/skel-vue/vite.config.js
index a93029004d..2122da2fe4 100644
--- a/tools/static-assets/skel-vue/vite.config.js
+++ b/tools/static-assets/skel-vue/vite.config.js
@@ -10,7 +10,7 @@ export default defineConfig({
       serverEntry: 'server/main.js',
       enableExperimentalFeatures: true,
       stubValidation: {
-        warnOnly: true,
+        ignorePackages: ['mongo'],
       },
     }),
   ],

From 402f0758c441eb51df515c223f7fde0f04367f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 10 Feb 2025 15:39:34 +0100
Subject: [PATCH 1054/1140] ensure ignore mongo to avoid annoying non-critical
 waring

---
 tools/static-assets/skel-solid/vite.config.js | 2 +-
 tools/static-assets/skel-vue/vite.config.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/static-assets/skel-solid/vite.config.js b/tools/static-assets/skel-solid/vite.config.js
index b393c06fcf..5752984348 100644
--- a/tools/static-assets/skel-solid/vite.config.js
+++ b/tools/static-assets/skel-solid/vite.config.js
@@ -12,7 +12,7 @@ export default defineConfig({
       serverEntry: 'server/main.js',
       enableExperimentalFeatures: true,
       stubValidation: {
-        ignorePackages: ['mongo'],
+        ignorePackages: ['meteor/mongo'],
       },
     }),
   ],
diff --git a/tools/static-assets/skel-vue/vite.config.js b/tools/static-assets/skel-vue/vite.config.js
index 2122da2fe4..dd08ccf69d 100644
--- a/tools/static-assets/skel-vue/vite.config.js
+++ b/tools/static-assets/skel-vue/vite.config.js
@@ -10,7 +10,7 @@ export default defineConfig({
       serverEntry: 'server/main.js',
       enableExperimentalFeatures: true,
       stubValidation: {
-        ignorePackages: ['mongo'],
+        ignorePackages: ['meteor/mongo'],
       },
     }),
   ],

From 0ecd72ec97eadc0a5746a5e6dff510716cf8bda4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 10 Feb 2025 17:44:29 +0100
Subject: [PATCH 1055/1140] ensure some stage profiling are considered async to
 keep track of them

---
 tools/project-context.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/project-context.js b/tools/project-context.js
index 60f5ae794a..192b3558db 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -318,7 +318,7 @@ Object.assign(ProjectContext.prototype, {
    *
    * @return {Promise<*|undefined>}
    */
-  readProjectMetadata: function () {
+  readProjectMetadata: async function () {
     // don't generate a profiling report for this stage (Profile.run),
     // because all we do here is read a handful of files.
     return this._completeStagesThrough(STAGE.READ_PROJECT_METADATA);
@@ -328,7 +328,7 @@ Object.assign(ProjectContext.prototype, {
    * @return {Promise<*|undefined>}
    */
   initializeCatalog: function () {
-    return Profile.run('ProjectContext initializeCatalog', () => {
+    return Profile.run('ProjectContext initializeCatalog', async () => {
       return this._completeStagesThrough(STAGE.INITIALIZE_CATALOG);
     });
   },
@@ -337,7 +337,7 @@ Object.assign(ProjectContext.prototype, {
    * @return {Promise<*|undefined>}
    */
   resolveConstraints: function () {
-    return Profile.run('ProjectContext resolveConstraints', () => {
+    return Profile.run('ProjectContext resolveConstraints', async () => {
       return this._completeStagesThrough(STAGE.RESOLVE_CONSTRAINTS);
     });
   },
@@ -347,7 +347,7 @@ Object.assign(ProjectContext.prototype, {
    * @return {Promise<*|undefined>}
    */
   downloadMissingPackages: function () {
-    return Profile.run('ProjectContext downloadMissingPackages', () => {
+    return Profile.run('ProjectContext downloadMissingPackages', async () => {
       return this._completeStagesThrough(STAGE.DOWNLOAD_MISSING_PACKAGES);
     });
   },
@@ -356,7 +356,7 @@ Object.assign(ProjectContext.prototype, {
    * @return {Promise<*|undefined>}
    */
   buildLocalPackages: function () {
-    return Profile.run('ProjectContext buildLocalPackages', () => {
+    return Profile.run('ProjectContext buildLocalPackages', async () => {
       return this._completeStagesThrough(STAGE.BUILD_LOCAL_PACKAGES);
     });
   },
@@ -365,7 +365,7 @@ Object.assign(ProjectContext.prototype, {
    * @return {Promise<*|undefined>}
    */
   saveChangedMetadata: function () {
-    return Profile.run('ProjectContext saveChangedMetadata', () => {
+    return Profile.run('ProjectContext saveChangedMetadata', async () => {
       return this._completeStagesThrough(STAGE.SAVE_CHANGED_METADATA);
     });
   },
@@ -376,7 +376,7 @@ Object.assign(ProjectContext.prototype, {
   prepareProjectForBuild: function () {
     // This is the same as saveChangedMetadata, but if we insert stages after
     // that one it will continue to mean "fully finished".
-    return Profile.run('ProjectContext prepareProjectForBuild', () => {
+    return Profile.run('ProjectContext prepareProjectForBuild', async () => {
       return this._completeStagesThrough(STAGE.SAVE_CHANGED_METADATA);
     });
   },

From 0ef9677ee5836008811ad10786c4e92c0d5e496e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 11 Feb 2025 14:58:39 +0100
Subject: [PATCH 1056/1140] Node 22.14.0

---
 .travis.yml                        | 2 +-
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 v3-docs/v3-migration-docs/index.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd2ddb2f03..5d5a1e7852 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: jammy
 sudo: required
 services: xvfb
 node_js:
-  - "22.13.1"
+  - "22.14.0"
 cache:
   directories:
     - ".meteor"
diff --git a/meteor b/meteor
index f608dd2ba3..82ae773c6a 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.13.1.2
+BUNDLE_VERSION=22.14.0.0
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 22acd0d917..6164ea0c16 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=22.13.1
+NODE_VERSION=22.14.0
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.2
diff --git a/v3-docs/v3-migration-docs/index.md b/v3-docs/v3-migration-docs/index.md
index 777a25ac15..4d55017747 100644
--- a/v3-docs/v3-migration-docs/index.md
+++ b/v3-docs/v3-migration-docs/index.md
@@ -1,6 +1,6 @@
 ---
 meteor_version: 3.1.0
-node_version: 22.13.1
+node_version: 22.14.0
 npm_version: 10.9.2
 ---
 # Meteor 3.0 Migration Guide

From a7013d573d8b4cc30f6fad5564a2e6c00033b3a4 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 11 Feb 2025 15:02:33 +0100
Subject: [PATCH 1057/1140] Update included MongoDB to v7.0.16

---
 scripts/build-dev-bundle-common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 6164ea0c16..f60e62fbee 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,7 +6,7 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 NODE_VERSION=22.14.0
-MONGO_VERSION_64BIT=7.0.5
+MONGO_VERSION_64BIT=7.0.16
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=10.9.2
 

From a70ac879fe1a59cdbe7ece0def92afc4e1e8991e Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 12 Feb 2025 07:58:47 -0300
Subject: [PATCH 1058/1140] FEATURE: add `shouldShowTime`

Relates to [this forum request](https://forums.meteor.com/t/suggestions-for-logging-in-galaxy/63119/6?u=grubba).

Those that use `colored-text` output format can now decide if they want the timestamp or can rely on their server/cloud environments info.
---
 packages/logging/logging.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/logging/logging.js b/packages/logging/logging.js
index 889f173e6a..a816361327 100644
--- a/packages/logging/logging.js
+++ b/packages/logging/logging.js
@@ -44,6 +44,11 @@ Log._intercepted = () => {
 // other process that will be reading its standard output.
 Log.outputFormat = 'json';
 
+// Defaults to true for local development and for backwards compatibility.
+// for cloud environments is interesting to leave it false as most of them have the timestamp in the console.
+// Only works in server with colored-text
+Log.shouldShowTime = true;
+
 const LEVEL_COLORS = {
   debug: 'green',
   // leave info as the default color
@@ -296,13 +301,15 @@ Log.format = (obj, options = {}) => {
 
   const stderrIndicator = stderr ? '(STDERR) ' : '';
 
+  const timeString = Log.shouldShowTime
+    ? `${dateStamp}-${timeStamp}${utcOffsetStr}${timeInexact ? '? ' : ' '}`
+    : ' ';
+
+
+
   const metaPrefix = [
     level.charAt(0).toUpperCase(),
-    dateStamp,
-    '-',
-    timeStamp,
-    utcOffsetStr,
-    timeInexact ? '? ' : ' ',
+    timeString,
     appInfo,
     sourceInfo,
     stderrIndicator].join('');

From 05cb651977334d83fc65ff21174488f9cd22f0e0 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 12 Feb 2025 07:59:23 -0300
Subject: [PATCH 1059/1140] TEST: Add testing for `shouldShowTime` variable and
 run formatter in file

---
 packages/logging/logging_test.js | 378 ++++++++++++++++++++++++-------
 1 file changed, 294 insertions(+), 84 deletions(-)

diff --git a/packages/logging/logging_test.js b/packages/logging/logging_test.js
index d6d595b3b4..9c6061ef82 100644
--- a/packages/logging/logging_test.js
+++ b/packages/logging/logging_test.js
@@ -1,57 +1,58 @@
-import { Meteor  } from 'meteor/meteor';
-import { Log } from 'meteor/logging';
+import { Log } from "meteor/logging";
+import { Meteor } from "meteor/meteor";
 
-Tinytest.add('logging - _getCallerDetails', function (test) {
+Tinytest.add("logging - _getCallerDetails", function (test) {
   const details = Log._getCallerDetails();
   // Ignore this test for Opera, IE, Safari since this test would work only
   // in Chrome and Firefox, other browsers don't give us an ability to get
   // stacktrace.
-  if ((new Error).stack) {
+  if (new Error().stack) {
     if (Meteor.isServer) {
-      test.equal(details.file, 'tinytest.js');
+      test.equal(details.file, "tinytest.js");
     } else {
       // Note that we want this to work in --production too, so we need to allow
       // for the minified filename.
-      test.matches(details.file,
-                   /^(?:tinytest\.js|[a-f0-9]{40}\.js)$/);
+      test.matches(details.file, /^(?:tinytest\.js|[a-f0-9]{40}\.js)$/);
     }
 
     // evaled statements shouldn't crash
-    const code = 'Log._getCallerDetails().file';
+    const code = "Log._getCallerDetails().file";
     // Note that we want this to work in --production too, so we need to allow
     // for the minified filename
-    test.matches(eval(code),
-                 /^(?:eval|local-test_logging\.js|[a-f0-9]{40}\.js)/);
+    test.matches(
+      eval(code),
+      /^(?:eval|local-test_logging\.js|[a-f0-9]{40}\.js)/
+    );
   }
 });
 
-Tinytest.add('logging - log', function (test) {
+Tinytest.add("logging - log", function (test) {
   const logBothMessageAndObject = function (log, level) {
     Log._intercept(3);
     // Tests for correctness
-    log('message');
-    log({property1: 'foo', property2: 'bar'});
-    log({message: 'mixed', property1: 'foo', property2: 'bar'});
+    log("message");
+    log({ property1: "foo", property2: "bar" });
+    log({ message: "mixed", property1: "foo", property2: "bar" });
 
     let intercepted = Log._intercepted();
     test.equal(intercepted.length, 3);
 
     const obj1 = EJSON.parse(intercepted[0]);
-    test.equal(obj1.message, 'message');
+    test.equal(obj1.message, "message");
     test.equal(obj1.level, level);
     test.instanceOf(obj1.time, Date);
 
     const obj2 = EJSON.parse(intercepted[1]);
     test.isFalse(obj2.message);
-    test.equal(obj2.property1, 'foo');
-    test.equal(obj2.property2, 'bar');
+    test.equal(obj2.property1, "foo");
+    test.equal(obj2.property2, "bar");
     test.equal(obj2.level, level);
     test.instanceOf(obj2.time, Date);
 
     const obj3 = EJSON.parse(intercepted[2]);
-    test.equal(obj3.message, 'mixed');
-    test.equal(obj3.property1, 'foo');
-    test.equal(obj3.property2, 'bar');
+    test.equal(obj3.message, "mixed");
+    test.equal(obj3.property1, "foo");
+    test.equal(obj3.property2, "bar");
     test.equal(obj3.level, level);
     test.instanceOf(obj3.time, Date);
 
@@ -59,15 +60,20 @@ Tinytest.add('logging - log', function (test) {
     // and some other non-stringy things
     // In a format of testcase, expected result, name of the test.
     const testcases = [
-          [1, '1', 'single digit'],
-          [0, '0', 'falsy - 0'],
-          [null, 'null', 'falsy - null'],
-          [undefined, 'undefined', 'falsy - undefined'],
-          [new Date('2013-06-13T01:15:16.000Z'), new Date('2013-06-13T01:15:16.000Z'), 'date'],
-          [/[^regexp]{0,1}/g, '/[^regexp]{0,1}/g', 'regexp'],
-          [true, 'true', 'boolean - true'],
-          [false, 'false', 'boolean - false'],
-          [-Infinity, '-Infinity', 'number - -Infinity']];
+      [1, "1", "single digit"],
+      [0, "0", "falsy - 0"],
+      [null, "null", "falsy - null"],
+      [undefined, "undefined", "falsy - undefined"],
+      [
+        new Date("2013-06-13T01:15:16.000Z"),
+        new Date("2013-06-13T01:15:16.000Z"),
+        "date",
+      ],
+      [/[^regexp]{0,1}/g, "/[^regexp]{0,1}/g", "regexp"],
+      [true, "true", "boolean - true"],
+      [false, "false", "boolean - false"],
+      [-Infinity, "-Infinity", "number - -Infinity"],
+    ];
 
     Log._intercept(testcases.length);
     testcases.forEach((testcase) => {
@@ -79,19 +85,21 @@ Tinytest.add('logging - log', function (test) {
     test.equal(intercepted.length, testcases.length);
 
     testcases.forEach((testcase, index) => {
-      var expected = testcase[1];
-      var testName = testcase[2];
-      var recieved = intercepted[index];
-      var obj = EJSON.parse(recieved);
+      const expected = testcase[1];
+      const testName = testcase[2];
+      const recieved = intercepted[index];
+      const obj = EJSON.parse(recieved);
 
       // IE8 and old Safari don't support this date format. Skip it.
-      if (expected && expected.toString &&
-          (expected.toString() === 'NaN' ||
-           expected.toString() === 'Invalid Date')) {
-            return;
+      if (
+        expected &&
+        expected.toString &&
+        (expected.toString() === "NaN" ||
+          expected.toString() === "Invalid Date")
+      ) {
+        return;
       }
 
-
       if (testcase[0] instanceof Date) {
         obj.message = new Date(obj.message);
       }
@@ -103,24 +111,35 @@ Tinytest.add('logging - log', function (test) {
     Log._intercept(6);
 
     test.throws(function () {
-      log({time: 'not the right time'});
+      log({ time: "not the right time" });
     });
     test.throws(function () {
-      log({level: 'not the right level'});
+      log({ level: "not the right level" });
     });
-    ['file', 'line', 'program', 'originApp', 'satellite'].forEach(
-      function (restrictedKey) {
+    ["file", "line", "program", "originApp", "satellite"].forEach(function (
+      restrictedKey
+    ) {
       test.throws(function () {
-        var obj = {};
-        obj[restrictedKey] = 'usage of restricted key';
+        const obj = {};
+        obj[restrictedKey] = "usage of restricted key";
         log(obj);
       });
     });
 
     // Can't pass numbers, objects, arrays, regexps or functions as message
-    var throwingTestcases = [1, NaN, {foo:'bar'}, ['a', 'r', 'r'], null,
-                             undefined, new Date, function () { return 42; },
-                             /[regexp]/ ];
+    const throwingTestcases = [
+      1,
+      NaN,
+      { foo: "bar" },
+      ["a", "r", "r"],
+      null,
+      undefined,
+      new Date(),
+      function () {
+        return 42;
+      },
+      /[regexp]/,
+    ];
     Log._intercept(throwingTestcases.length);
     throwingTestcases.forEach(function (testcase) {
       test.throws(function () {
@@ -133,75 +152,266 @@ Tinytest.add('logging - log', function (test) {
     test.equal(Log._intercepted().length, 0);
   };
 
-  logBothMessageAndObject(Log, 'info');
-  ['info', 'warn', 'error'].forEach((level) => {
+  logBothMessageAndObject(Log, "info");
+  ["info", "warn", "error"].forEach((level) => {
     logBothMessageAndObject(Log[level], level);
   });
 });
 
-Tinytest.add('logging - parse', function (test) {
+Tinytest.add("logging - parse", function (test) {
   test.equal(Log.parse("message"), null);
   test.equal(Log.parse('{"foo": "bar"}'), null);
-  var time = new Date;
-  test.equal(Log.parse(`{"foo": "bar", "time": ${EJSON.stringify(time)}}`),
-                        { foo: "bar", time: time });
+  const time = new Date();
+  test.equal(Log.parse(`{"foo": "bar", "time": ${EJSON.stringify(time)}}`), {
+    foo: "bar",
+    time,
+  });
   test.equal(Log.parse('{"foo": not json "bar"}'), null);
   test.equal(Log.parse('{"time": "not a date object"}'), null);
 });
 
-Tinytest.add('logging - format', function (test) {
-  var time = new Date(2012, 9 - 1/*0-based*/, 8, 7, 6, 5, 4);
-  var utcOffsetStr = '(' + (-(new Date().getTimezoneOffset() / 60)) + ')';
+Tinytest.add("logging - format", function (test) {
+  const time = new Date(2012, 9 - 1 /*0-based*/, 8, 7, 6, 5, 4);
+  const utcOffsetStr = "(" + -(new Date().getTimezoneOffset() / 60) + ")";
 
-  ['debug', 'info', 'warn', 'error'].forEach(function (level) {
+  ["debug", "info", "warn", "error"].forEach(function (level) {
     test.equal(
-      Log.format({message: 'message', time: time, level: level}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} message`);
+      Log.format({ message: "message", time, level }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} message`
+    );
 
     test.equal(
-      Log.format({message: 'message', time: time, timeInexact: true, level: level}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr}? message`);
+      Log.format({
+        message: "message",
+        time,
+        timeInexact: true,
+        level,
+      }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr}? message`
+    );
 
     test.equal(
-      Log.format({foo1: 'bar1', foo2: 'bar2', time: time, level: level}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} {"foo1":"bar1","foo2":"bar2"}`);
+      Log.format({ foo1: "bar1", foo2: "bar2", time, level }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} {"foo1":"bar1","foo2":"bar2"}`
+    );
 
     test.equal(
-      Log.format({message: 'message', foo: 'bar', time: time, level: level}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} message {"foo":"bar"}`);
+      Log.format({ message: "message", foo: "bar", time, level }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} message {"foo":"bar"}`
+    );
 
     // Has everything except stderr field
     test.equal(
-      Log.format({message: 'message', foo: 'bar', time: time, level: level, file: 'app.js', line:42, app: 'myApp', originApp: 'proxy', program: 'server'}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} [myApp via proxy] (server:app.js:42) message {\"foo\":\"bar\"}`);
+      Log.format({
+        message: "message",
+        foo: "bar",
+        time,
+        level,
+        file: "app.js",
+        line: 42,
+        app: "myApp",
+        originApp: "proxy",
+        program: "server",
+      }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} [myApp via proxy] (server:app.js:42) message {\"foo\":\"bar\"}`
+    );
 
     // stderr
     test.equal(
-      Log.format({message: 'message from stderr', time: time, level: level, stderr: true}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} (STDERR) message from stderr`);
+      Log.format({
+        message: "message from stderr",
+        time,
+        level,
+        stderr: true,
+      }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} (STDERR) message from stderr`
+    );
 
     // app/originApp
     test.equal(
-      Log.format({message: 'message', time: time, level: level, app: 'app', originApp: 'app'}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} [app] message`);
+      Log.format({
+        message: "message",
+        time,
+        level,
+        app: "app",
+        originApp: "app",
+      }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} [app] message`
+    );
     test.equal(
-      Log.format({message: "message", time: time, level: level, app: 'app', originApp: 'proxy'}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} [app via proxy] message`);
+      Log.format({
+        message: "message",
+        time,
+        level,
+        app: "app",
+        originApp: "proxy",
+      }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} [app via proxy] message`
+    );
 
     // source info
     test.equal(
-      Log.format({message: 'message', time: time, level: level, file: 'app.js', line: 42, program: 'server'}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} (server:app.js:42) message`);
+      Log.format({
+        message: "message",
+        time,
+        level,
+        file: "app.js",
+        line: 42,
+        program: "server",
+      }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} (server:app.js:42) message`
+    );
     test.equal(
-      Log.format({message: 'message', time: time, level: level, file: 'app.js', line: 42}),
-      `${level.charAt(0).toUpperCase()}20120908-07:06:05.004${utcOffsetStr} (app.js:42) message`);
+      Log.format({
+        message: "message",
+        time,
+        level,
+        file: "app.js",
+        line: 42,
+      }),
+      `${level
+        .charAt(0)
+        .toUpperCase()}20120908-07:06:05.004${utcOffsetStr} (app.js:42) message`
+    );
   });
 
-  test.matches(Log.format({
-    message: 'oyez',
-    time: new Date,
-    level: 'error'
-  }, {
-    color: true
-  }), /oyez/);
+  test.matches(
+    Log.format(
+      {
+        message: "oyez",
+        time: new Date(),
+        level: "error",
+      },
+      {
+        color: true,
+      }
+    ),
+    /oyez/
+  );
+});
+
+Tinytest.add("logging - formats - without time", function (test) {
+  const time = new Date(2012, 9 - 1 /*0-based*/, 8, 7, 6, 5, 4);
+  // even tho time and offset are provided they should not be included in the output
+  Log.shouldShowTime = false;
+  const levels = ["debug", "info", "warn", "error"];
+  for (const level of levels) {
+    test.equal(
+      Log.format({ message: "message", time, level }),
+      `${level.charAt(0).toUpperCase()} message`
+    );
+
+    test.equal(
+      Log.format({
+        message: "message",
+        time,
+        timeInexact: true,
+        level,
+      }),
+      `${level.charAt(0).toUpperCase()} message`
+    );
+
+    test.equal(
+      Log.format({ foo1: "bar1", foo2: "bar2", time, level }),
+      `${level.charAt(0).toUpperCase()} {"foo1":"bar1","foo2":"bar2"}`
+    );
+
+    test.equal(
+      Log.format({ message: "message", foo: "bar", time, level }),
+      `${level.charAt(0).toUpperCase()} message {"foo":"bar"}`
+    );
+
+    // Has everything except stderr field
+    test.equal(
+      Log.format({
+        message: "message",
+        foo: "bar",
+        time,
+        level,
+        file: "app.js",
+        line: 42,
+        app: "myApp",
+        originApp: "proxy",
+        program: "server",
+      }),
+      `${level
+        .charAt(0)
+        .toUpperCase()} [myApp via proxy] (server:app.js:42) message {\"foo\":\"bar\"}`
+    );
+
+    // stderr
+    test.equal(
+      Log.format({
+        message: "message from stderr",
+        time,
+        level,
+        stderr: true,
+      }),
+      `${level.charAt(0).toUpperCase()} (STDERR) message from stderr`
+    );
+
+    // app/originApp
+    test.equal(
+      Log.format({
+        message: "message",
+        time,
+        level,
+        app: "app",
+        originApp: "app",
+      }),
+      `${level.charAt(0).toUpperCase()} [app] message`
+    );
+    test.equal(
+      Log.format({
+        message: "message",
+        time,
+        level,
+        app: "app",
+        originApp: "proxy",
+      }),
+      `${level.charAt(0).toUpperCase()} [app via proxy] message`
+    );
+
+    // source info
+    test.equal(
+      Log.format({
+        message: "message",
+        time,
+        level,
+        file: "app.js",
+        line: 42,
+        program: "server",
+      }),
+      `${level.charAt(0).toUpperCase()} (server:app.js:42) message`
+    );
+    test.equal(
+      Log.format({
+        message: "message",
+        time,
+        level,
+        file: "app.js",
+        line: 42,
+      }),
+      `${level.charAt(0).toUpperCase()} (app.js:42) message`
+    );
+  }
+  Log.shouldShowTime = true; // reset
 });

From 48f69ae5498b734361c73e16eb30edf8ff5be6b5 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 12 Feb 2025 07:59:44 -0300
Subject: [PATCH 1060/1140] DEV: Add `shouldShowTime` type to Log namespace

---
 packages/logging/logging.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/logging/logging.d.ts b/packages/logging/logging.d.ts
index 5f445e692d..3b7e42776a 100644
--- a/packages/logging/logging.d.ts
+++ b/packages/logging/logging.d.ts
@@ -24,6 +24,7 @@ export declare function Log(input: LogInput, ...optionalParams: any[]): void;
 
 export declare namespace Log {
   var outputFormat: 'json' | 'colored-text';
+  var shouldShowTime: boolean;
   function _intercept(count: number): void;
   function _suppress(count: number): void;
   function _intercepted(): string[];

From 2671e5c9cd568a0bedcdae1b942d9388b007531f Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 12 Feb 2025 08:05:52 -0300
Subject: [PATCH 1061/1140] DOCS: Add options to logging package

---
 v3-docs/docs/api/packages-listing.md          |  1 -
 .../meteor-versions/metadata.generated.js     |  8 ++-
 v3-docs/docs/history.md                       |  4 +-
 v3-docs/docs/packages/logging.md              | 52 ++++++++++++++++---
 4 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/v3-docs/docs/api/packages-listing.md b/v3-docs/docs/api/packages-listing.md
index af44ae28cd..c4624c061e 100644
--- a/v3-docs/docs/api/packages-listing.md
+++ b/v3-docs/docs/api/packages-listing.md
@@ -105,7 +105,6 @@
 ### [mongo-dev-server](https://github.com/meteor/meteor/tree/devel/packages/mongo-dev-server) {#mongo-dev-server}
 ### [mongo-id](https://github.com/meteor/meteor/tree/devel/packages/mongo-id) {#mongo-id}
 ### [mongo-livedata](https://github.com/meteor/meteor/tree/devel/packages/mongo-livedata) {#mongo-livedata}
-### [npm-bcrypt](https://github.com/meteor/meteor/tree/devel/packages/npm-bcrypt) {#npm-bcrypt}
 ### [npm-mongo](https://github.com/meteor/meteor/tree/devel/packages/npm-mongo) {#npm-mongo}
 ### [oauth](https://github.com/meteor/meteor/tree/devel/packages/oauth) {#oauth}
 ### [oauth-encryption](https://github.com/meteor/meteor/tree/devel/packages/oauth-encryption) {#oauth-encryption}
diff --git a/v3-docs/docs/generators/meteor-versions/metadata.generated.js b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
index c9e681baf8..c21367d193 100644
--- a/v3-docs/docs/generators/meteor-versions/metadata.generated.js
+++ b/v3-docs/docs/generators/meteor-versions/metadata.generated.js
@@ -22,9 +22,13 @@ export default {
     },
     {
       "version": "v3.1.1",
-      "url": "https://release-3-1-1.docs.meteor.com/",
+      "url": "https://release-3-1-1.docs.meteor.com/"
+    },
+    {
+      "version": "v3.1.2",
+      "url": "https://release-3-1-2.docs.meteor.com/",
       "isCurrent": true
     }
   ],
-  "currentVersion": "v3.1.1"
+  "currentVersion": "v3.1.2"
 }
\ No newline at end of file
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index 899e6c2fda..f3c4cd4da9 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -10,6 +10,8 @@ This is a complete history of changes for Meteor releases.
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
+
+
 ## v3.1.2, 2025-02-06
 
 ### Highlights
@@ -59,7 +61,6 @@ N/A
 - [@julio-rocketchat](https://github.com/julio-rocketchat)
 
 ✨✨✨
-
 ## v3.1.1, 2025-01-15
 
 ### Highlights
@@ -131,7 +132,6 @@ N/A
 - [@quyetdgroup](https://github.com/quyetdgroup)
 
 ✨✨✨
-
 ## v3.1.0, 2024-11-20
 
 ### Highlights
diff --git a/v3-docs/docs/packages/logging.md b/v3-docs/docs/packages/logging.md
index dd52d78aee..f44fdb886f 100644
--- a/v3-docs/docs/packages/logging.md
+++ b/v3-docs/docs/packages/logging.md
@@ -11,29 +11,47 @@ meteor add logging
 ```
 
 You can then import the utility anywhere in you code like this:
+
 ```javascript
-import { Log } from 'meteor/logging'
+import { Log } from "meteor/logging";
 ```
 
 You can then call the logging functions in one of the following ways:
+
 ```javascript
-Log('starting up') // or Log.info('starting up')
-Log.error('error message')
-Log.warn('warning')
-Log.debug('this will show only in development')
+Log("starting up"); // or Log.info('starting up')
+Log.error("error message");
+Log.warn("warning");
+Log.debug("this will show only in development");
 ```
 
 Besides passing in strings, you can also pass in objects. This has few exceptions and special functions associated.
 First in the root of the object the following keys are not allowed:
+
 ```javascript
-'time', 'timeInexact', 'level', 'file', 'line', 'program', 'originApp', 'satellite', 'stderr'
+"time",
+  "timeInexact",
+  "level",
+  "file",
+  "line",
+  "program",
+  "originApp",
+  "satellite",
+  "stderr";
 ```
 
 On the other hand there is `message` and `app`, which are also reserved, but they will display in more prominent manner:
+
 ```javascript
-Log.info({message: 'warning', app: 'DESKTOP', error: { property1: 'foo', property2: 'bar', property3: { foo: 'bar' }} })
+Log.info({
+  message: "warning",
+  app: "DESKTOP",
+  error: { property1: "foo", property2: "bar", property3: { foo: "bar" } },
+});
 ```
+
 will turn into:
+
 ```shell
 E20200519-17:57:41.655(9) [DESKTOP] (main.js:36) warning {"error":{"property1":"foo","property2":"bar","property3":{"foo":"bar"}}}
 ```
@@ -41,4 +59,24 @@ E20200519-17:57:41.655(9) [DESKTOP] (main.js:36) warning {"error":{"property1":"
 The display of each log is color coded. Info is `blue`, warn is `magenta`, debug is `green` and error is in `red`.
 
 ### Log.debug
+
 The `Log.debug()` logging is different from the other calls as these messages will not be displayed in production.
+
+### Options
+
+You can set the following options:
+
+```javascript
+// Either 'json' or 'colored-text'. Defaults to 'json'.
+//
+// When this is set to 'json', print JSON documents to the console.
+//
+// When this is set to 'colored-text', call 'Log.format' before printing.
+// This should be used for logging to the console in a human-readable format.
+Log.outputFormat = "json";
+
+// Boolean. Defaults to true.
+// for cloud environments is interesting to leave it false as most of them have the timestamp in the console.
+// Only works in server with colored-text output format.
+Log.shouldShowTime = true;
+```

From 51840376d9e326cca47e9e814d579f3f781b5386 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 12 Feb 2025 08:07:34 -0300
Subject: [PATCH 1062/1140] DOCS: update keys formatting in logging.md

---
 v3-docs/docs/packages/logging.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/packages/logging.md b/v3-docs/docs/packages/logging.md
index f44fdb886f..c3bbfd2498 100644
--- a/v3-docs/docs/packages/logging.md
+++ b/v3-docs/docs/packages/logging.md
@@ -29,7 +29,7 @@ Besides passing in strings, you can also pass in objects. This has few exception
 First in the root of the object the following keys are not allowed:
 
 ```javascript
-"time",
+  "time",
   "timeInexact",
   "level",
   "file",

From a02ee8637eb681ca674a3e22c47cff5aa644455e Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 13 Feb 2025 07:39:45 -0300
Subject: [PATCH 1063/1140] DEV: rename shouldShowTime to `showTime`

---
 packages/logging/logging.d.ts    | 2 +-
 packages/logging/logging.js      | 4 ++--
 packages/logging/logging_test.js | 4 ++--
 v3-docs/docs/packages/logging.md | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/logging/logging.d.ts b/packages/logging/logging.d.ts
index 3b7e42776a..5441ba3808 100644
--- a/packages/logging/logging.d.ts
+++ b/packages/logging/logging.d.ts
@@ -24,7 +24,7 @@ export declare function Log(input: LogInput, ...optionalParams: any[]): void;
 
 export declare namespace Log {
   var outputFormat: 'json' | 'colored-text';
-  var shouldShowTime: boolean;
+  var showTime: boolean;
   function _intercept(count: number): void;
   function _suppress(count: number): void;
   function _intercepted(): string[];
diff --git a/packages/logging/logging.js b/packages/logging/logging.js
index a816361327..dba14f775e 100644
--- a/packages/logging/logging.js
+++ b/packages/logging/logging.js
@@ -47,7 +47,7 @@ Log.outputFormat = 'json';
 // Defaults to true for local development and for backwards compatibility.
 // for cloud environments is interesting to leave it false as most of them have the timestamp in the console.
 // Only works in server with colored-text
-Log.shouldShowTime = true;
+Log.showTime = true;
 
 const LEVEL_COLORS = {
   debug: 'green',
@@ -301,7 +301,7 @@ Log.format = (obj, options = {}) => {
 
   const stderrIndicator = stderr ? '(STDERR) ' : '';
 
-  const timeString = Log.shouldShowTime
+  const timeString = Log.showTime
     ? `${dateStamp}-${timeStamp}${utcOffsetStr}${timeInexact ? '? ' : ' '}`
     : ' ';
 
diff --git a/packages/logging/logging_test.js b/packages/logging/logging_test.js
index 9c6061ef82..03e2c75c3c 100644
--- a/packages/logging/logging_test.js
+++ b/packages/logging/logging_test.js
@@ -311,7 +311,7 @@ Tinytest.add("logging - format", function (test) {
 Tinytest.add("logging - formats - without time", function (test) {
   const time = new Date(2012, 9 - 1 /*0-based*/, 8, 7, 6, 5, 4);
   // even tho time and offset are provided they should not be included in the output
-  Log.shouldShowTime = false;
+  Log.showTime = false;
   const levels = ["debug", "info", "warn", "error"];
   for (const level of levels) {
     test.equal(
@@ -413,5 +413,5 @@ Tinytest.add("logging - formats - without time", function (test) {
       `${level.charAt(0).toUpperCase()} (app.js:42) message`
     );
   }
-  Log.shouldShowTime = true; // reset
+  Log.showTime = true; // reset
 });
diff --git a/v3-docs/docs/packages/logging.md b/v3-docs/docs/packages/logging.md
index c3bbfd2498..9aee4da917 100644
--- a/v3-docs/docs/packages/logging.md
+++ b/v3-docs/docs/packages/logging.md
@@ -78,5 +78,5 @@ Log.outputFormat = "json";
 // Boolean. Defaults to true.
 // for cloud environments is interesting to leave it false as most of them have the timestamp in the console.
 // Only works in server with colored-text output format.
-Log.shouldShowTime = true;
+Log.showTime = true;
 ```

From 1801cec9be04af0a8158a6eae78aef54e1cfbed5 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <hello@jandvorak.me>
Date: Fri, 14 Feb 2025 16:21:40 +0100
Subject: [PATCH 1064/1140] Add EOL date for Meteor 2.x

Co-authored-by: Gabriel Grubba <70247653+Grubba27@users.noreply.github.com>
---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 6f7cd97a4d..aaf7b92c93 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -5,7 +5,7 @@
 | Version | Support Status
 | ------- | --------------
 | 3.x.y   | ✅  all security issues
-| 2.x.y   | ⚠️  only major security issues
+| 2.x.y   | ⚠️  only major security issues (Until 2025-07)
 | <= 1.12.x   | ❌  no longer supported
 
 ## Reporting a Vulnerability

From 89aa32dcb2bb87df1c6f0cc32dc2240fe28f4b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 14 Feb 2025 17:16:16 +0100
Subject: [PATCH 1065/1140] patch bundle_version

---
 meteor                  | 2 +-
 packages/non-core/blaze | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meteor b/meteor
index 82ae773c6a..13371dbd43 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.0
+BUNDLE_VERSION=22.14.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/packages/non-core/blaze b/packages/non-core/blaze
index 0856ca8bf7..d43fa6e965 160000
--- a/packages/non-core/blaze
+++ b/packages/non-core/blaze
@@ -1 +1 @@
-Subproject commit 0856ca8bf7730fbe1944142642a0c5be82fb9999
+Subproject commit d43fa6e965b0a496f286c7587a97544212a7d260

From 144f9f37260e2b77b35521de6210661c32588270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 14 Feb 2025 17:17:07 +0100
Subject: [PATCH 1066/1140] Revert "patch bundle_version"

This reverts commit 89aa32dcb2bb87df1c6f0cc32dc2240fe28f4b1b.
---
 meteor                  | 2 +-
 packages/non-core/blaze | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meteor b/meteor
index 13371dbd43..82ae773c6a 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.1
+BUNDLE_VERSION=22.14.0.0
 
 
 # OS Check. Put here because here is where we download the precompiled
diff --git a/packages/non-core/blaze b/packages/non-core/blaze
index d43fa6e965..0856ca8bf7 160000
--- a/packages/non-core/blaze
+++ b/packages/non-core/blaze
@@ -1 +1 @@
-Subproject commit d43fa6e965b0a496f286c7587a97544212a7d260
+Subproject commit 0856ca8bf7730fbe1944142642a0c5be82fb9999

From 0fd43dd2facd8cc3c059d51269e98f026b1b993c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 14 Feb 2025 17:17:24 +0100
Subject: [PATCH 1067/1140] patch bundle_version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 82ae773c6a..13371dbd43 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.0
+BUNDLE_VERSION=22.14.0.1
 
 
 # OS Check. Put here because here is where we download the precompiled

From 1fc18ba1011a184e13dd4a2132ce3f02c27341cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 14 Feb 2025 17:23:07 +0100
Subject: [PATCH 1068/1140] patch bundle_version

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 13371dbd43..f60736d13d 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.1
+BUNDLE_VERSION=22.14.0.2
 
 
 # OS Check. Put here because here is where we download the precompiled

From ad8a57d45d1b9c2e172ba0bdf4995d417f960972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 14 Feb 2025 17:31:33 +0100
Subject: [PATCH 1069/1140] re-run checks


From 2431a7969aebb0de2f284213943aedca7c772210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 14 Feb 2025 17:37:30 +0100
Subject: [PATCH 1070/1140] re-run checks


From 218d4b370dd323798bfd89f2f11d0ed4868693b8 Mon Sep 17 00:00:00 2001
From: "dr.dimitru" <1686778+dr-dimitru@users.noreply.github.com>
Date: Sun, 16 Feb 2025 16:47:04 +0200
Subject: [PATCH 1071/1140] fix: typo in link to Mongo-Cursor-forEachAsync

---
 v3-docs/docs/api/collections.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/api/collections.md b/v3-docs/docs/api/collections.md
index a595c4485d..a466de49df 100644
--- a/v3-docs/docs/api/collections.md
+++ b/v3-docs/docs/api/collections.md
@@ -698,7 +698,7 @@ topPosts.forEach((post) => {
 
 ::: warning
 Client only.
-For server/isomorphic usage see [removeAsync](#Mongo-Cursor-forEachAsync).
+For server/isomorphic usage see [forEachAsync](#Mongo-Cursor-forEachAsync).
 :::
 
 <ApiBox name="Mongo.Cursor#forEachAsync" instanceName="Cursor"/>

From 0092cab83427db45286bbe73c5d51bcd1e6b7828 Mon Sep 17 00:00:00 2001
From: "dr.dimitru" <1686778+dr-dimitru@users.noreply.github.com>
Date: Mon, 17 Feb 2025 17:47:22 +0200
Subject: [PATCH 1072/1140] Fix link to "PostCSS Plugins"

- [available plugins]() link was leading to broken parked domain with ads
---
 v3-docs/docs/packages/standard-minifier-css.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/packages/standard-minifier-css.md b/v3-docs/docs/packages/standard-minifier-css.md
index f3d55e8ea0..ace7a833e8 100644
--- a/v3-docs/docs/packages/standard-minifier-css.md
+++ b/v3-docs/docs/packages/standard-minifier-css.md
@@ -24,7 +24,7 @@ module.exports = {
 
 > The example config enables the `autoprefixer` postcss plugin. You can install the plugin by running `meteor npm install -D autoprefixer`.
 
-Learn more about [configuring postcss](https://github.com/postcss/postcss-load-config#packagejson) or find a list of [available plugins](https://www.postcss.parts/).
+Learn more about [configuring postcss](https://github.com/postcss/postcss-load-config#packagejson) or find a list of [available plugins](https://postcss.org/docs/postcss-plugins).
 
 After making changes to the PostCSS Config, `meteor` must be restarted for it to use the new config.
 

From 7693b543608aa4c68d792ab5c5f2fafb7d57b6c6 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 18 Feb 2025 08:41:12 +0100
Subject: [PATCH 1073/1140] Update elliptic in node-stubs

---
 npm-packages/meteor-node-stubs/package-lock.json | 16 +++++++++-------
 npm-packages/meteor-node-stubs/package.json      |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/npm-packages/meteor-node-stubs/package-lock.json b/npm-packages/meteor-node-stubs/package-lock.json
index 6b61b1243f..30579b7814 100644
--- a/npm-packages/meteor-node-stubs/package-lock.json
+++ b/npm-packages/meteor-node-stubs/package-lock.json
@@ -41,7 +41,7 @@
         "console-browserify": "^1.2.0",
         "constants-browserify": "^1.0.0",
         "domain-browser": "^4.23.0",
-        "elliptic": "^6.6.0",
+        "elliptic": "^6.6.1",
         "events": "^3.3.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
@@ -520,10 +520,11 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -614,10 +615,11 @@
       "dev": true
     },
     "node_modules/elliptic": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
-      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
+      "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
       "inBundle": true,
+      "license": "MIT",
       "dependencies": {
         "bn.js": "^4.11.9",
         "brorand": "^1.1.0",
diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index 53150b3ec6..7bf67aef3c 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -18,7 +18,7 @@
     "console-browserify": "^1.2.0",
     "constants-browserify": "^1.0.0",
     "domain-browser": "^4.23.0",
-    "elliptic": "^6.6.0",
+    "elliptic": "^6.6.1",
     "events": "^3.3.0",
     "https-browserify": "^1.0.0",
     "os-browserify": "^0.3.0",

From cc83f86d769c12a5a8ff31da9c7b0bc902d24025 Mon Sep 17 00:00:00 2001
From: Julio Araujo <julio.araujo@rocket.chat>
Date: Tue, 18 Feb 2025 13:22:44 +0100
Subject: [PATCH 1074/1140] Bump body-parser from 1.19.0 to 1.20.3

---
 packages/oauth/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 410a7c2b54..b74664148f 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: '3.0.1',
+  version: '3.0.2',
 });
 
 Package.onUse(api => {
@@ -37,7 +37,7 @@ Package.onUse(api => {
 });
 
 Npm.depends({
-  'body-parser': '1.19.0',
+  'body-parser': '1.20.3',
 });
 
 Package.onTest(api => {

From ec80e8d746c45ded6fc5b8581ba50d2ca73707f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 18 Feb 2025 15:27:21 +0100
Subject: [PATCH 1075/1140] support async context on profiler async actions

---
 tools/tool-env/profile.ts | 79 +++++++++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 29 deletions(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index 9bbef2cbe4..28cd3183d8 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -160,7 +160,9 @@
 //     B: 250.0
 //
 // In both reports the grand total is 600ms.
+import { AsyncLocalStorage } from 'async_hooks';
 
+const asyncLocalStorage = new AsyncLocalStorage<string[]>();
 
 const filter = parseFloat(process.env.METEOR_PROFILE || "100"); // ms
 
@@ -230,7 +232,6 @@ function decodeEntryKey(key: string) {
   return key.split('\t');
 }
 
-const globalEntry: string[] = [];
 let running = false;
 
 export function Profile<
@@ -238,47 +239,67 @@ export function Profile<
   TResult,
 >(
   bucketName: string | ((...args: TArgs) => string),
-  f: (...args: TArgs) => TResult,
+  f: (...args: TArgs) => TResult | Promise<TResult>,
 ): typeof f {
   if (! Profile.enabled) {
     return f;
   }
 
   return Object.assign(function profileWrapper(this: any) {
-    if (! running) {
-      return f.apply(this, arguments as any);
+    const args = arguments as unknown as TArgs;  // Capture the arguments passed to the function
+
+    if (!running) {
+      return f.apply(this, args);
     }
 
-    const name = typeof bucketName === "function"
-      ? bucketName.apply(this, arguments as any)
-      : bucketName;
+    const existingStore = asyncLocalStorage.getStore();
 
-    // TODO Test with Profile / use __METEOR_ASYNC_LOCAL_STORAGE
-    //const currentStore = asyncLo
-    // const currentEntry = Fiber.current
-    //   ? Fiber.current.profilerEntry || (Fiber.current.profilerEntry = [])
-    //   : globalEntry;
-    const currentEntry = globalEntry;
-
-    currentEntry.push(name);
-    const key = encodeEntryKey(currentEntry);
-    const start = process.hrtime();
-    try {
-      return f.apply(this, arguments as any);
-    } finally {
-      const elapsed = process.hrtime(start);
-      const stats = (bucketStats[key] || (bucketStats[key] = {
-        time: 0.0,
-        count: 0,
-        isOther: false,
-      }));
-      stats.time += (elapsed[0] * 1000 + elapsed[1] / 1000000);
-      stats.count++;
-      currentEntry.pop();
+    // If a context already exists, reuse it, otherwise, create a new one.
+    if (existingStore) {
+      return runWithContext(bucketName, existingStore, f, this, args);
     }
+
+    return asyncLocalStorage.run([], () => runWithContext(bucketName, [], f, this, args));
   }, f) as typeof f;
 }
 
+async function runWithContext<TArgs extends any[], TResult>(
+    bucketName: string | ((...args: TArgs) => string),
+    currentEntry: string[],
+    f: (...args: TArgs) => TResult | Promise<TResult>,
+    context: any,
+    args: IArguments,  // Using `arguments` type here
+): Promise<TResult> {
+  const name = typeof bucketName === "function" ? bucketName.apply(context, args) : bucketName;
+  currentEntry.push(name);
+  const key = encodeEntryKey(currentEntry);
+  const start = process.hrtime();
+
+  try {
+    const result = f.apply(context, args);
+    console.log("=>(profile.ts:280) result", result, result instanceof Promise);
+
+    if (result instanceof Promise) {
+      return result.finally(() => finalizeProfiling(key, start, currentEntry));
+    }
+    return result;
+  } finally {
+    finalizeProfiling(key, start, currentEntry);
+  }
+}
+
+function finalizeProfiling(key: string, start: [number, number], currentEntry: string[]) {
+  const elapsed = process.hrtime(start);
+  const stats = (bucketStats[key] || (bucketStats[key] = {
+    time: 0.0,
+    count: 0,
+    isOther: false,
+  }));
+  stats.time += elapsed[0] * 1000 + elapsed[1] / 1_000_000;
+  stats.count++;
+  currentEntry.pop();
+}
+
 export namespace Profile {
   export let enabled = !! process.env.METEOR_PROFILE;
 

From b16c8cb6d6802d72795bd2d2b6592ad1523bf5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 18 Feb 2025 15:51:00 +0100
Subject: [PATCH 1076/1140] correct async support on profiler

---
 tools/tool-env/profile.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index 28cd3183d8..a946321f36 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -246,7 +246,7 @@ export function Profile<
   }
 
   return Object.assign(function profileWrapper(this: any) {
-    const args = arguments as unknown as TArgs;  // Capture the arguments passed to the function
+    const args = arguments as unknown as TArgs;
 
     if (!running) {
       return f.apply(this, args);
@@ -254,7 +254,7 @@ export function Profile<
 
     const existingStore = asyncLocalStorage.getStore();
 
-    // If a context already exists, reuse it, otherwise, create a new one.
+    // If a context already exists, reuse it; otherwise, create a new one.
     if (existingStore) {
       return runWithContext(bucketName, existingStore, f, this, args);
     }
@@ -263,13 +263,13 @@ export function Profile<
   }, f) as typeof f;
 }
 
-async function runWithContext<TArgs extends any[], TResult>(
+function runWithContext<TArgs extends any[], TResult>(
     bucketName: string | ((...args: TArgs) => string),
     currentEntry: string[],
     f: (...args: TArgs) => TResult | Promise<TResult>,
     context: any,
-    args: IArguments,  // Using `arguments` type here
-): Promise<TResult> {
+    args: IArguments,
+): TResult | Promise<TResult> {
   const name = typeof bucketName === "function" ? bucketName.apply(context, args) : bucketName;
   currentEntry.push(name);
   const key = encodeEntryKey(currentEntry);
@@ -277,14 +277,18 @@ async function runWithContext<TArgs extends any[], TResult>(
 
   try {
     const result = f.apply(context, args);
-    console.log("=>(profile.ts:280) result", result, result instanceof Promise);
 
     if (result instanceof Promise) {
+      // Return a promise if async
       return result.finally(() => finalizeProfiling(key, start, currentEntry));
     }
+
+    // Return directly if sync
     return result;
   } finally {
-    finalizeProfiling(key, start, currentEntry);
+    if (!(f.apply(context, args) instanceof Promise)) {
+      finalizeProfiling(key, start, currentEntry);
+    }
   }
 }
 

From b0426df46d65c72ad24ac84bd4a069045b33ea9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 18 Feb 2025 16:01:03 +0100
Subject: [PATCH 1077/1140] reuse meteor tool als context

---
 tools/tool-env/profile.ts | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index a946321f36..d5605e3733 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -160,9 +160,7 @@
 //     B: 250.0
 //
 // In both reports the grand total is 600ms.
-import { AsyncLocalStorage } from 'async_hooks';
-
-const asyncLocalStorage = new AsyncLocalStorage<string[]>();
+const { makeGlobalAsyncLocalStorage } = require("../utils/fiber-helpers");
 
 const filter = parseFloat(process.env.METEOR_PROFILE || "100"); // ms
 
@@ -252,27 +250,34 @@ export function Profile<
       return f.apply(this, args);
     }
 
-    const existingStore = asyncLocalStorage.getStore();
+    const asyncLocalStorage = makeGlobalAsyncLocalStorage();
+    let existingStore = asyncLocalStorage.getStore();
 
-    // If a context already exists, reuse it; otherwise, create a new one.
-    if (existingStore) {
-      return runWithContext(bucketName, existingStore, f, this, args);
+    // Ensure `existingStore` is an object, initialize it if not present
+    if (!existingStore) {
+      existingStore = { currentEntry: [] };
+      return asyncLocalStorage.run(existingStore, () => runWithContext(bucketName, existingStore, f, this, args));
     }
 
-    return asyncLocalStorage.run([], () => runWithContext(bucketName, [], f, this, args));
+    // Ensure `existingStore.currentEntry` exists
+    if (!existingStore.currentEntry) {
+      existingStore.currentEntry = [];
+    }
+
+    return runWithContext(bucketName, existingStore, f, this, args);
   }, f) as typeof f;
 }
 
 function runWithContext<TArgs extends any[], TResult>(
     bucketName: string | ((...args: TArgs) => string),
-    currentEntry: string[],
+    store: { currentEntry: string[]; [key: string]: any }, // Keep other properties intact
     f: (...args: TArgs) => TResult | Promise<TResult>,
     context: any,
     args: IArguments,
 ): TResult | Promise<TResult> {
   const name = typeof bucketName === "function" ? bucketName.apply(context, args) : bucketName;
-  currentEntry.push(name);
-  const key = encodeEntryKey(currentEntry);
+  store.currentEntry.push(name);
+  const key = encodeEntryKey(store.currentEntry);
   const start = process.hrtime();
 
   try {
@@ -280,14 +285,14 @@ function runWithContext<TArgs extends any[], TResult>(
 
     if (result instanceof Promise) {
       // Return a promise if async
-      return result.finally(() => finalizeProfiling(key, start, currentEntry));
+      return result.finally(() => finalizeProfiling(key, start, store.currentEntry));
     }
 
     // Return directly if sync
     return result;
   } finally {
     if (!(f.apply(context, args) instanceof Promise)) {
-      finalizeProfiling(key, start, currentEntry);
+      finalizeProfiling(key, start, store.currentEntry);
     }
   }
 }

From 1de4c5e19033a7cfa3d80863ee267dc54efb2f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 18 Feb 2025 17:23:46 +0100
Subject: [PATCH 1078/1140] avoid issue that runs the profiler function twice

---
 tools/tool-env/profile.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index d5605e3733..407f66b496 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -280,8 +280,9 @@ function runWithContext<TArgs extends any[], TResult>(
   const key = encodeEntryKey(store.currentEntry);
   const start = process.hrtime();
 
+  let result: TResult | Promise<TResult>;
   try {
-    const result = f.apply(context, args);
+    result = f.apply(context, args);
 
     if (result instanceof Promise) {
       // Return a promise if async
@@ -291,9 +292,7 @@ function runWithContext<TArgs extends any[], TResult>(
     // Return directly if sync
     return result;
   } finally {
-    if (!(f.apply(context, args) instanceof Promise)) {
-      finalizeProfiling(key, start, store.currentEntry);
-    }
+    finalizeProfiling(key, start, store.currentEntry);
   }
 }
 

From 7ab17e6de3e93523a782d95157856a12966785fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 18 Feb 2025 17:28:29 +0100
Subject: [PATCH 1079/1140] avoid issue to properly finish on sync and async
 cases

---
 tools/tool-env/profile.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index 407f66b496..151294fcf6 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -292,7 +292,9 @@ function runWithContext<TArgs extends any[], TResult>(
     // Return directly if sync
     return result;
   } finally {
-    finalizeProfiling(key, start, store.currentEntry);
+    if (!(result instanceof Promise)) {
+      finalizeProfiling(key, start, store.currentEntry);
+    }
   }
 }
 

From 47104bf9f240d91a8a7089dc547ff93b53285855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 18 Feb 2025 18:17:34 +0100
Subject: [PATCH 1080/1140] fix require error

---
 tools/tool-env/profile.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index 151294fcf6..efde9463ae 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -160,7 +160,6 @@
 //     B: 250.0
 //
 // In both reports the grand total is 600ms.
-const { makeGlobalAsyncLocalStorage } = require("../utils/fiber-helpers");
 
 const filter = parseFloat(process.env.METEOR_PROFILE || "100"); // ms
 
@@ -250,7 +249,7 @@ export function Profile<
       return f.apply(this, args);
     }
 
-    const asyncLocalStorage = makeGlobalAsyncLocalStorage();
+    const asyncLocalStorage = global.__METEOR_ASYNC_LOCAL_STORAGE;
     let existingStore = asyncLocalStorage.getStore();
 
     // Ensure `existingStore` is an object, initialize it if not present

From a01f9cba340d8d23fa28415e0bd8589c393ef52b Mon Sep 17 00:00:00 2001
From: Gavin Buerk <gavin.buerk@gmail.com>
Date: Wed, 19 Feb 2025 08:09:06 -0500
Subject: [PATCH 1081/1140] Handling allSettled result better

---
 packages/mongo/oplog_observe_driver.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js
index cdaf7e3da8..f00df3e1c9 100644
--- a/packages/mongo/oplog_observe_driver.js
+++ b/packages/mongo/oplog_observe_driver.js
@@ -574,7 +574,14 @@ Object.assign(OplogObserveDriver.prototype, {
         });
         // Wait for all fetch operations to complete
         try {
-          await Promise.allSettled(fetchPromises);
+          const results = await Promise.allSettled(fetchPromises);
+          const errors = results
+            .filter(result => result.status === 'rejected')
+            .map(result => result.reason);
+
+          if (errors.length > 0) {
+            Meteor._debug('Some fetch queries failed:', errors);
+          }
         } catch (err) {
           Meteor._debug('Got an exception in a fetch query', err);
         }

From d87f47345041013b299ed494fc071d94ed2f3ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 19 Feb 2025 16:32:13 +0100
Subject: [PATCH 1082/1140] dont mutate current entry

---
 tools/tool-env/profile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index efde9463ae..10328e067f 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -275,7 +275,7 @@ function runWithContext<TArgs extends any[], TResult>(
     args: IArguments,
 ): TResult | Promise<TResult> {
   const name = typeof bucketName === "function" ? bucketName.apply(context, args) : bucketName;
-  store.currentEntry.push(name);
+  store.currentEntry = [...store.currentEntry || [], name];
   const key = encodeEntryKey(store.currentEntry);
   const start = process.hrtime();
 

From 7b5702d2f788dd7fbf51b2f8503fc3e3602810b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 19 Feb 2025 16:40:14 +0100
Subject: [PATCH 1083/1140] reuse existing async local storage context

---
 tools/static-assets/server/boot.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index e6d0a7eb89..11d1d001b0 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -498,8 +498,10 @@ var runMain = Profile("Run main()", async function () {
     global.__METEOR_ASYNC_LOCAL_STORAGE = new AsyncLocalStorage();
   }
 
-  await Profile.run('Server startup', function() {
-    return global.__METEOR_ASYNC_LOCAL_STORAGE.run({}, async () => {
+  await Profile.run('Server startup', async function() {
+    const asyncLocalStorage = global.__METEOR_ASYNC_LOCAL_STORAGE;
+    let existingStore = asyncLocalStorage.getStore();
+    return global.__METEOR_ASYNC_LOCAL_STORAGE.run(existingStore || {}, async () => {
       await loadServerBundles();
       await callStartupHooks();
       await runMain();

From e8f64f0cb613401d1d3e5c3fc09d3a156eddf25f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 19 Feb 2025 16:40:54 +0100
Subject: [PATCH 1084/1140] use const

---
 tools/static-assets/server/boot.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 11d1d001b0..1cee390bee 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -500,7 +500,7 @@ var runMain = Profile("Run main()", async function () {
 
   await Profile.run('Server startup', async function() {
     const asyncLocalStorage = global.__METEOR_ASYNC_LOCAL_STORAGE;
-    let existingStore = asyncLocalStorage.getStore();
+    const existingStore = asyncLocalStorage.getStore();
     return global.__METEOR_ASYNC_LOCAL_STORAGE.run(existingStore || {}, async () => {
       await loadServerBundles();
       await callStartupHooks();

From 1a497a0ecd22bec5ee622119f9c327090f974f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 24 Feb 2025 14:22:04 +0100
Subject: [PATCH 1085/1140] remove als initialization as part of server startup

---
 tools/static-assets/server/boot.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 1cee390bee..43c2668bde 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -499,13 +499,9 @@ var runMain = Profile("Run main()", async function () {
   }
 
   await Profile.run('Server startup', async function() {
-    const asyncLocalStorage = global.__METEOR_ASYNC_LOCAL_STORAGE;
-    const existingStore = asyncLocalStorage.getStore();
-    return global.__METEOR_ASYNC_LOCAL_STORAGE.run(existingStore || {}, async () => {
-      await loadServerBundles();
-      await callStartupHooks();
-      await runMain();
-    });
+    await loadServerBundles();
+    await callStartupHooks();
+    await runMain();
   });
 })().catch(e => {
   console.log('error on boot.js',  e )

From b0bf53cc023c58844fc660f743bb471b12239109 Mon Sep 17 00:00:00 2001
From: David Ihl <111972510+Davidihl@users.noreply.github.com>
Date: Mon, 24 Feb 2025 14:47:27 +0100
Subject: [PATCH 1086/1140] Update 7.adding-user-accounts.md

use `insertAsync` as introduced in Step 2 instead of `insert`
---
 v3-docs/docs/tutorials/react/7.adding-user-accounts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/tutorials/react/7.adding-user-accounts.md b/v3-docs/docs/tutorials/react/7.adding-user-accounts.md
index 60491ef06d..6b1513afbb 100644
--- a/v3-docs/docs/tutorials/react/7.adding-user-accounts.md
+++ b/v3-docs/docs/tutorials/react/7.adding-user-accounts.md
@@ -271,7 +271,7 @@ import { Accounts } from "meteor/accounts-base";
 import { TasksCollection } from "/imports/api/TasksCollection";
 
 const insertTask = (taskText, user) =>
-  TasksCollection.insert({
+  TasksCollection.insertAsync({
     text: taskText,
     userId: user._id,
     createdAt: new Date(),

From 91a51c3d273fd857526bedad1e9b6e9315864640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 25 Feb 2025 16:41:04 +0100
Subject: [PATCH 1087/1140] implement meteor benchmark cmd

---
 tools/cli/commands.js | 88 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 82 insertions(+), 6 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index bc3d4ed998..f42b1e4315 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1739,6 +1739,10 @@ main.registerCommand({
                  "MONGO_URL will NOT be reset.");
   }
 
+  const resetMeteorNmCachePromise = files.rm_recursive_async(
+    files.pathJoin(options.appDir, "node_modules", ".cache", "meteor")
+  );
+
   if (options.db) {
     // XXX detect the case where Meteor is running the app, but
     // MONGO_URL was set, so we don't see a Mongo process
@@ -1753,9 +1757,13 @@ main.registerCommand({
       return 1;
     }
 
-    await files.rm_recursive_async(
-      files.pathJoin(options.appDir, '.meteor', 'local')
-    );
+    await Promise.all([
+      files.rm_recursive_async(
+        files.pathJoin(options.appDir, ".meteor", "local")
+      ),
+      resetMeteorNmCachePromise,
+    ]);
+
     Console.info("Project reset.");
     return;
   }
@@ -1767,9 +1775,12 @@ main.registerCommand({
     return !path.includes('.meteor/local/db');
   });
 
-  var allRemovePromises = allExceptDb.map(_path => files.rm_recursive_async(
-    files.pathJoin(options.appDir, _path)
-  ));
+  var allRemovePromises = [
+    ...allExceptDb.map((_path) =>
+      files.rm_recursive_async(files.pathJoin(options.appDir, _path))
+    ),
+    resetMeteorNmCachePromise
+  ];
   await Promise.all(allRemovePromises);
   Console.info("Project reset.");
 });
@@ -3266,3 +3277,68 @@ main.registerCommand({
 }, function () {
   throw new Error("testing stack traces!"); // #StackTraceTest this line is found in tests/source-maps.js
 });
+
+const setupBenchmarkSuite = async (benchmarkPath) => {
+  if (await files.exists(benchmarkPath)) {
+    return;
+  }
+  const [, err] = await bash`git --version`;
+  if (err) throw new Error("git is not installed");
+  // Set GIT_TERMINAL_PROMPT=0 to disable prompting
+  process.env.GIT_TERMINAL_PROMPT = 0;
+
+  const repoUrl = "https://github.com/meteor/performance";
+  const branch = "monitor-bundler";
+  const gitCommand = [
+    `mkdir -p ${benchmarkPath}`,
+    `git clone --no-checkout --depth 1 --filter=tree:0 --sparse --progress --branch ${branch} --single-branch ${repoUrl} ${benchmarkPath}`,
+    `cd ${benchmarkPath}`,
+    `git sparse-checkout init --cone`,
+    `git sparse-checkout set scripts`,
+    `git checkout ${branch}`,
+    `find ${benchmarkPath} -maxdepth 1 -type f -delete`,
+  ].join(" && ");
+  const [, errClone] = await bash`${gitCommand}`;
+  const errorMessage = errClone && typeof errClone === "string" ? errClone : errClone?.message;
+  if (errorMessage && errorMessage.includes("Cloning into")) {
+    throw new Error("error cloning benchmark");
+  }
+  // remove .git folder from the example
+  await files.rm_recursive_async(files.pathJoin(benchmarkPath, ".git"));
+  Console.info(
+    "Benchmark suite cloned to:" + Console.path(benchmarkPath),
+  );
+};
+
+async function doBenchmarkCommand(options) {
+  const isWindows = process.platform === "win32";
+  if (isWindows) {
+    throw new Error('Benchmarks are not supported on Windows');
+  }
+
+  const args = process.argv.slice(3);
+  var projectContext = new projectContextModule.ProjectContext({
+    projectDir: options.appDir,
+    allowIncompatibleUpdate: options['allow-incompatible-update'],
+    lintAppAndLocalPackages: !options['no-lint'],
+  });
+  const benchmarkPath = `${projectContext.projectDir}/node_modules/.cache/meteor/benchmark`;
+  await setupBenchmarkSuite(benchmarkPath);
+
+  const benchmarkCommand = [
+    `${benchmarkPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${args.join(' ')}`,
+  ].join(" && ");
+  const [okBenchmark, errBenchmark] = await bash`${benchmarkCommand}`;
+  if (errBenchmark) {
+    throw new Error(errBenchmark);
+  }
+  Console.info(okBenchmark);
+}
+
+main.registerCommand(
+{
+  name: 'benchmark',
+  maxArgs: Infinity,
+  options: runCommandOptions.options,
+  catalogRefresh: new catalog.Refresh.Never(),
+}, doBenchmarkCommand);

From 76eccbf50cb7be6c694519c42d5fa211e3ade1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 26 Feb 2025 15:03:01 +0100
Subject: [PATCH 1088/1140] improve command with bash live feedback and ensure
 expected git version

---
 tools/cli/commands.js | 77 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index f42b1e4315..1eacf880ad 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -20,6 +20,7 @@ const {
   yellow
 } = require('../console/console.js').colors;
 const inquirer = require('inquirer');
+const semver = require("semver");
 
 var projectContextModule = require('../project-context.js');
 var release = require('../packaging/release.js');
@@ -27,7 +28,7 @@ var release = require('../packaging/release.js');
 const { Profile } = require("../tool-env/profile");
 const open = require('open')
 
-const { exec } = require("child_process");
+const { exec, spawn } = require("child_process");
 /**
  * Run a command in the shell.
  * @param command
@@ -64,6 +65,65 @@ const bash =
   (text, ...values) =>
     tryRun(() => runCommand(String.raw({ raw: text }, ...values)));
 
+/**
+ * Run a command in the shell and stream output in real-time.
+ * @param {string} command The command to execute.
+ * @param {string[]} args Arguments for the command.
+ * @return {Promise<number>} Resolves with the exit code.
+ */
+const runLiveCommand = (command, args = []) => {
+  return new Promise((resolve, reject) => {
+    const childProcess = spawn(command, args, { shell: true, env: process.env });
+
+    const cleanup = () => {
+      childProcess.stdout.removeAllListeners();
+      childProcess.stderr.removeAllListeners();
+      childProcess.removeAllListeners();
+    };
+
+    childProcess.stdout.on("data", (data) => {
+      console.log(data.toString().trim());
+    });
+
+    childProcess.stderr.on("data", (data) => {
+      Console.error(data.toString().trim());
+    });
+
+    childProcess.on("close", (code) => {
+      cleanup();
+      resolve(code);
+    });
+
+    childProcess.on("error", (error) => {
+      Console.error(error.message);
+      cleanup();
+      reject(error);
+    });
+  });
+};
+
+/**
+ * Executes an async function and captures success or error.
+ * @param {() => Promise<T>} fn The async function to execute.
+ * @returns {Promise<[T, null] | [null, Error]>} Result or Error tuple.
+ */
+const tryRunLive = async (fn) => {
+  try {
+    return [await fn(), null];
+  } catch (e) {
+    return [null, e];
+  }
+};
+
+/**
+ * Runs a Bash command with live logging.
+ * @param {string} text The bash command to execute.
+ * @param {...string} values Additional arguments.
+ * @returns {Promise<[number, null] | [null, Error]>} Exit code or Error.
+ */
+const bashLive = (text, ...values) =>
+  tryRunLive(() => runLiveCommand(String.raw({ raw: text }, ...values)));
+
 import { ensureDevBundleDependencies } from '../cordova/index.js';
 import { CordovaRunner } from '../cordova/runner.js';
 import { iOSRunTarget, AndroidRunTarget } from '../cordova/run-targets.js';
@@ -3282,8 +3342,15 @@ const setupBenchmarkSuite = async (benchmarkPath) => {
   if (await files.exists(benchmarkPath)) {
     return;
   }
-  const [, err] = await bash`git --version`;
-  if (err) throw new Error("git is not installed");
+  const [okGitVersion, errGitVersion] = await bash`git --version`;
+  if (errGitVersion) throw new Error("git is not installed");
+
+  const parsedGitVersion = semver.coerce(okGitVersion.match(/\d+\.\d+\.\d+/)[0] || '')?.version;
+  const checkInvalidGitVersion = parsedGitVersion == null || semver.lt(parsedGitVersion, '2.25.0');
+  if (checkInvalidGitVersion) {
+    throw new Error("git version is too old. Please upgrade to at least 2.25");
+  }
+
   // Set GIT_TERMINAL_PROMPT=0 to disable prompting
   process.env.GIT_TERMINAL_PROMPT = 0;
 
@@ -3306,7 +3373,7 @@ const setupBenchmarkSuite = async (benchmarkPath) => {
   // remove .git folder from the example
   await files.rm_recursive_async(files.pathJoin(benchmarkPath, ".git"));
   Console.info(
-    "Benchmark suite cloned to:" + Console.path(benchmarkPath),
+    "Meteor benchmark suite cloned to: " + Console.path(benchmarkPath),
   );
 };
 
@@ -3328,7 +3395,7 @@ async function doBenchmarkCommand(options) {
   const benchmarkCommand = [
     `${benchmarkPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${args.join(' ')}`,
   ].join(" && ");
-  const [okBenchmark, errBenchmark] = await bash`${benchmarkCommand}`;
+  const [okBenchmark, errBenchmark] = await bashLive`${benchmarkCommand}`;
   if (errBenchmark) {
     throw new Error(errBenchmark);
   }

From 3e92181ca874bd5f06a2636750457aab954a9f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 26 Feb 2025 15:16:46 +0100
Subject: [PATCH 1089/1140] dont print bashLive input

---
 tools/cli/commands.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 1eacf880ad..58e1fcbb16 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3395,11 +3395,10 @@ async function doBenchmarkCommand(options) {
   const benchmarkCommand = [
     `${benchmarkPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${args.join(' ')}`,
   ].join(" && ");
-  const [okBenchmark, errBenchmark] = await bashLive`${benchmarkCommand}`;
+  const [, errBenchmark] = await bashLive`${benchmarkCommand}`;
   if (errBenchmark) {
     throw new Error(errBenchmark);
   }
-  Console.info(okBenchmark);
 }
 
 main.registerCommand(

From a554967561f009c68a9ff99d1261ad70a2143c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 26 Feb 2025 15:21:44 +0100
Subject: [PATCH 1090/1140] improve bashLive outputting by perserve formatting

---
 tools/cli/commands.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 58e1fcbb16..52f1dc6ab3 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -73,22 +73,16 @@ const bash =
  */
 const runLiveCommand = (command, args = []) => {
   return new Promise((resolve, reject) => {
-    const childProcess = spawn(command, args, { shell: true, env: process.env });
+    const childProcess = spawn(command, args, {
+      shell: true,
+      env: { ...process.env, FORCE_COLOR: "1", TERM: "xterm-256color" },
+      stdio: "inherit",
+    });
 
     const cleanup = () => {
-      childProcess.stdout.removeAllListeners();
-      childProcess.stderr.removeAllListeners();
       childProcess.removeAllListeners();
     };
 
-    childProcess.stdout.on("data", (data) => {
-      console.log(data.toString().trim());
-    });
-
-    childProcess.stderr.on("data", (data) => {
-      Console.error(data.toString().trim());
-    });
-
     childProcess.on("close", (code) => {
       cleanup();
       resolve(code);

From 33beb67af056714c320e9a4cdbefec36d4b1362a Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 27 Feb 2025 11:53:44 -0300
Subject: [PATCH 1091/1140] DEV: bump meteor-node-stubs to 1.2.13

---
 npm-packages/meteor-node-stubs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index 7bf67aef3c..2c2caa5dbb 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -2,7 +2,7 @@
   "name": "meteor-node-stubs",
   "author": "Ben Newman <ben@meteor.com>",
   "description": "Stub implementations of Node built-in modules, a la Browserify",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "main": "index.js",
   "license": "MIT",
   "homepage": "https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-node-stubs/README.md",

From dcbe656bb3f1eb9118cdd54e7ba3e619952e32a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 27 Feb 2025 17:18:09 +0100
Subject: [PATCH 1092/1140] adjust name of the command

---
 tools/cli/commands.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 52f1dc6ab3..d7937b1ca2 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3332,8 +3332,8 @@ main.registerCommand({
   throw new Error("testing stack traces!"); // #StackTraceTest this line is found in tests/source-maps.js
 });
 
-const setupBenchmarkSuite = async (benchmarkPath) => {
-  if (await files.exists(benchmarkPath)) {
+const setupBenchmarkSuite = async (profilingPath) => {
+  if (await files.exists(profilingPath)) {
     return;
   }
   const [okGitVersion, errGitVersion] = await bash`git --version`;
@@ -3351,13 +3351,13 @@ const setupBenchmarkSuite = async (benchmarkPath) => {
   const repoUrl = "https://github.com/meteor/performance";
   const branch = "monitor-bundler";
   const gitCommand = [
-    `mkdir -p ${benchmarkPath}`,
-    `git clone --no-checkout --depth 1 --filter=tree:0 --sparse --progress --branch ${branch} --single-branch ${repoUrl} ${benchmarkPath}`,
-    `cd ${benchmarkPath}`,
+    `mkdir -p ${profilingPath}`,
+    `git clone --no-checkout --depth 1 --filter=tree:0 --sparse --progress --branch ${branch} --single-branch ${repoUrl} ${profilingPath}`,
+    `cd ${profilingPath}`,
     `git sparse-checkout init --cone`,
     `git sparse-checkout set scripts`,
     `git checkout ${branch}`,
-    `find ${benchmarkPath} -maxdepth 1 -type f -delete`,
+    `find ${profilingPath} -maxdepth 1 -type f -delete`,
   ].join(" && ");
   const [, errClone] = await bash`${gitCommand}`;
   const errorMessage = errClone && typeof errClone === "string" ? errClone : errClone?.message;
@@ -3365,16 +3365,16 @@ const setupBenchmarkSuite = async (benchmarkPath) => {
     throw new Error("error cloning benchmark");
   }
   // remove .git folder from the example
-  await files.rm_recursive_async(files.pathJoin(benchmarkPath, ".git"));
+  await files.rm_recursive_async(files.pathJoin(profilingPath, ".git"));
   Console.info(
-    "Meteor benchmark suite cloned to: " + Console.path(benchmarkPath),
+    "Meteor profiling suite cloned to: " + Console.path(profilingPath),
   );
 };
 
 async function doBenchmarkCommand(options) {
   const isWindows = process.platform === "win32";
   if (isWindows) {
-    throw new Error('Benchmarks are not supported on Windows');
+    throw new Error('Profiling is not supported on Windows');
   }
 
   const args = process.argv.slice(3);
@@ -3383,13 +3383,13 @@ async function doBenchmarkCommand(options) {
     allowIncompatibleUpdate: options['allow-incompatible-update'],
     lintAppAndLocalPackages: !options['no-lint'],
   });
-  const benchmarkPath = `${projectContext.projectDir}/node_modules/.cache/meteor/benchmark`;
-  await setupBenchmarkSuite(benchmarkPath);
+  const profilingPath = `${projectContext.projectDir}/node_modules/.cache/meteor/benchmark`;
+  await setupBenchmarkSuite(profilingPath);
 
-  const benchmarkCommand = [
-    `${benchmarkPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${args.join(' ')}`,
+  const profilingCommand = [
+    `${profilingPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${args.join(' ')}`,
   ].join(" && ");
-  const [, errBenchmark] = await bashLive`${benchmarkCommand}`;
+  const [, errBenchmark] = await bashLive`${profilingCommand}`;
   if (errBenchmark) {
     throw new Error(errBenchmark);
   }
@@ -3397,7 +3397,7 @@ async function doBenchmarkCommand(options) {
 
 main.registerCommand(
 {
-  name: 'benchmark',
+  name: 'profile',
   maxArgs: Infinity,
   options: runCommandOptions.options,
   catalogRefresh: new catalog.Refresh.Never(),

From b039b85919bbb45558763adccec7fd61dc5482f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 27 Feb 2025 17:26:20 +0100
Subject: [PATCH 1093/1140] add help content for new profile command

---
 tools/cli/help.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index 20d5dc5f84..f400b0177b 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -1151,3 +1151,14 @@ To see the requirements for this compilation step, consult the
 platform requirements for 'node-gyp':
 
   https://github.com/nodejs/node-gyp
+
+>>> profile
+Run performance profiling for the Meteor application.
+Usage: meteor profile [<meteor-run-options>...]
+
+This command runs a performance profile for the Meteor application, monitoring the bundler process and tracking key performance metrics to help analyze the build and bundling performance.
+
+Optionally, you can set the environment variable METEOR_BUNDLE_SIZE=true to gather bundle size data, allowing you to assess the impact of changes on the overall build size.
+
+Options:
+The options for this command are the same as those for the meteor run command. You can pass typical runtime options (such as --settings, --exclude-archs, etc.) to customize the profiling process.

From f77a545b100cab01d91808d8392791dfa27c0a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Thu, 27 Feb 2025 17:30:33 +0100
Subject: [PATCH 1094/1140] better formatting for help

---
 tools/cli/help.txt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index f400b0177b..a8c8705737 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -1156,9 +1156,15 @@ platform requirements for 'node-gyp':
 Run performance profiling for the Meteor application.
 Usage: meteor profile [<meteor-run-options>...]
 
-This command runs a performance profile for the Meteor application, monitoring the bundler process and tracking key performance metrics to help analyze the build and bundling performance.
+This command runs a performance profile for the Meteor application, monitoring the
+bundler process and tracking key performance metrics to help analyze the build and
+bundling performance.
 
-Optionally, you can set the environment variable METEOR_BUNDLE_SIZE=true to gather bundle size data, allowing you to assess the impact of changes on the overall build size.
+Optionally, you can set the environment variable METEOR_BUNDLE_SIZE=true to gather
+bundle size data, allowing you to assess the impact of changes on the overall build
+size.
 
 Options:
-The options for this command are the same as those for the meteor run command. You can pass typical runtime options (such as --settings, --exclude-archs, etc.) to customize the profiling process.
+The options for this command are the same as those for the meteor run command.
+You can pass typical runtime options (such as --settings, --exclude-archs, etc.)
+to customize the profiling process.

From 121b8c99ed960b7ba86e3b4214dd5f088679854e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Mar 2025 12:23:18 +0100
Subject: [PATCH 1095/1140] better context

---
 tools/cli/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index d7937b1ca2..1b14604fcf 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3383,7 +3383,7 @@ async function doBenchmarkCommand(options) {
     allowIncompatibleUpdate: options['allow-incompatible-update'],
     lintAppAndLocalPackages: !options['no-lint'],
   });
-  const profilingPath = `${projectContext.projectDir}/node_modules/.cache/meteor/benchmark`;
+  const profilingPath = `${projectContext.projectDir}/node_modules/.cache/meteor/performance`;
   await setupBenchmarkSuite(profilingPath);
 
   const profilingCommand = [

From 22d615f2588732f56bec92696135ee862295acfa Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 4 Mar 2025 16:23:14 +0100
Subject: [PATCH 1096/1140] Changelog update for meteor-node-stubs

---
 npm-packages/meteor-node-stubs/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/npm-packages/meteor-node-stubs/CHANGELOG.md b/npm-packages/meteor-node-stubs/CHANGELOG.md
index 7e838c152a..c510d86ea7 100644
--- a/npm-packages/meteor-node-stubs/CHANGELOG.md
+++ b/npm-packages/meteor-node-stubs/CHANGELOG.md
@@ -1,3 +1,7 @@
+v1.2.13 - 2025-02-27
+
+* Update `elliptic` to v6.6.1 to address a security vulnerability.
+
 v1.2.12 - 2024-10-31
 
 * Update `elliptic` to v6.6.0 to address a security vulnerability.

From 7b07a84e67d5d611c61f7c97f34020d2b6cbf3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Mar 2025 17:40:35 +0100
Subject: [PATCH 1097/1140] fix format

---
 packages/modern-browsers/modern.js | 58 ++++++++++++++++--------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/packages/modern-browsers/modern.js b/packages/modern-browsers/modern.js
index 4638571c22..e2a7863338 100644
--- a/packages/modern-browsers/modern.js
+++ b/packages/modern-browsers/modern.js
@@ -6,9 +6,9 @@ const hasOwn = Object.prototype.hasOwnProperty;
 const browserAliases = {
   chrome: [
     // chromeMobile*, per https://github.com/meteor/meteor/pull/9793,
-    "chromeMobile",
-    "chromeMobileIOS",
-    "chromeMobileWebView",
+    'chromeMobile',
+    'chromeMobileIOS',
+    'chromeMobileWebView',
 
     // The major version number of Chromium and Headless Chrome track with the
     // releases of Chrome Dev, Canary and Stable, so we should be okay to
@@ -18,8 +18,8 @@ const browserAliases = {
     // Chromium is particularly important to list here since, unlike macOS
     // builds, Linux builds list Chromium in the userAgent along with Chrome:
     //   e.g. Chromium/70.0.3538.77 Chrome/70.0.3538.77
-    "chromium",
-    "headlesschrome",
+    'chromium',
+    'headlesschrome',
   ],
 
   edge: [
@@ -29,17 +29,17 @@ const browserAliases = {
     // that logic, because there is no IE12. #9818 #9839
     'ie',
     // Detected by recent useragent-ng as a new browser family when it sees EdgiOS or EdgA in the user agent #13592
-    'edgeMobile'
+    'edgeMobile',
   ],
 
-  firefox: ["firefoxMobile"],
+  firefox: ['firefoxMobile'],
 
   // The webapp package converts browser names to camel case, so
   // mobile_safari and mobileSafari should be synonymous.
-  mobile_safari: ["mobileSafari", "mobileSafariUI", "mobileSafariUI/WKWebView"],
+  mobile_safari: ['mobileSafari', 'mobileSafariUI', 'mobileSafariUI/WKWebView'],
 
   // Embedded WebViews on iPads will be reported as Apple Mail
-  safari: ["appleMail"],
+  safari: ['appleMail'],
 };
 
 /**
@@ -86,19 +86,23 @@ function applyAliases(versions) {
  */
 function isModern(browser) {
   const lowerCaseName =
-    browser && typeof browser.name === "string" && browser.name.toLowerCase();
+    browser && typeof browser.name === 'string' && browser.name.toLowerCase();
   if (!lowerCaseName) {
     return false;
   }
-  const entry = hasOwn.call(minimumVersions, lowerCaseName) ? minimumVersions[lowerCaseName] : undefined;
+  const entry = hasOwn.call(minimumVersions, lowerCaseName)
+    ? minimumVersions[lowerCaseName]
+    : undefined;
   if (!entry) {
-    const packageSettings = Meteor.settings.packages ? Meteor.settings.packages["modern-browsers"] : undefined;
+    const packageSettings = Meteor.settings.packages
+      ? Meteor.settings.packages['modern-browsers']
+      : undefined;
     // false if no package setting exists
     return !!(packageSettings && packageSettings.unknownBrowsersAssumedModern);
   }
   return greaterThanOrEqualTo(
-      [~~browser.major, ~~browser.minor, ~~browser.patch],
-      entry.version
+    [~~browser.major, ~~browser.minor, ~~browser.patch],
+    entry.version
   );
 }
 
@@ -137,7 +141,7 @@ function setMinimumBrowserVersions(versions, source) {
 
     minimumVersions[lowerCaseName] = {
       version: copy(version),
-      source: source || getCaller("setMinimumBrowserVersions"),
+      source: source || getCaller('setMinimumBrowserVersions'),
     };
   }
 }
@@ -145,7 +149,7 @@ function setMinimumBrowserVersions(versions, source) {
 function getCaller(calleeName) {
   const error = new Error();
   Error.captureStackTrace(error);
-  const lines = error.stack.split("\n");
+  const lines = error.stack.split('\n');
   let caller;
   lines.some((line, i) => {
     if (line.indexOf(calleeName) >= 0) {
@@ -176,17 +180,17 @@ Object.assign(exports, {
    * @return {string}
    */
   calculateHashOfMinimumVersions() {
-    const { createHash } = require("crypto");
-    return createHash("sha1")
+    const { createHash } = require('crypto');
+    return createHash('sha1')
       .update(JSON.stringify(minimumVersions))
-      .digest("hex");
+      .digest('hex');
   },
 });
 
 // For making defensive copies of [major, minor, ...] version arrays, so
 // they don't change unexpectedly.
 function copy(version) {
-  if (typeof version === "number") {
+  if (typeof version === 'number') {
     return version;
   }
 
@@ -202,8 +206,8 @@ function greaterThanOrEqualTo(a, b) {
 }
 
 function greaterThan(a, b) {
-  const as = typeof a === "number" ? [a] : a;
-  const bs = typeof b === "number" ? [b] : b;
+  const as = typeof a === 'number' ? [a] : a;
+  const bs = typeof b === 'number' ? [b] : b;
   const maxLen = Math.max(as.length, bs.length);
 
   for (let i = 0; i < maxLen; ++i) {
@@ -223,7 +227,7 @@ function greaterThan(a, b) {
 }
 
 function makeSource(feature) {
-  return module.id + " (" + feature + ")";
+  return module.id + ' (' + feature + ')';
 }
 
 setMinimumBrowserVersions(
@@ -239,7 +243,7 @@ setMinimumBrowserVersions(
     // https://github.com/Kilian/electron-to-chromium/blob/master/full-versions.js
     electron: 1,
   },
-  makeSource("classes")
+  makeSource('classes')
 );
 
 setMinimumBrowserVersions(
@@ -255,7 +259,7 @@ setMinimumBrowserVersions(
     phantomjs: Infinity,
     electron: [0, 20],
   },
-  makeSource("generator functions")
+  makeSource('generator functions')
 );
 
 setMinimumBrowserVersions(
@@ -269,7 +273,7 @@ setMinimumBrowserVersions(
     safari: [9, 1],
     electron: [0, 24],
   },
-  makeSource("template literals")
+  makeSource('template literals')
 );
 
 setMinimumBrowserVersions(
@@ -283,5 +287,5 @@ setMinimumBrowserVersions(
     safari: 9,
     electron: [0, 20],
   },
-  makeSource("symbols")
+  makeSource('symbols')
 );

From b8b4d51e56831218d282772d36ccd5de090ba0ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 4 Mar 2025 17:44:08 +0100
Subject: [PATCH 1098/1140] reformat with eslint

---
 packages/modern-browsers/modern.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/modern-browsers/modern.js b/packages/modern-browsers/modern.js
index e2a7863338..801a83c271 100644
--- a/packages/modern-browsers/modern.js
+++ b/packages/modern-browsers/modern.js
@@ -102,7 +102,7 @@ function isModern(browser) {
   }
   return greaterThanOrEqualTo(
     [~~browser.major, ~~browser.minor, ~~browser.patch],
-    entry.version
+    entry.version,
   );
 }
 
@@ -243,7 +243,7 @@ setMinimumBrowserVersions(
     // https://github.com/Kilian/electron-to-chromium/blob/master/full-versions.js
     electron: 1,
   },
-  makeSource('classes')
+  makeSource('classes'),
 );
 
 setMinimumBrowserVersions(
@@ -259,7 +259,7 @@ setMinimumBrowserVersions(
     phantomjs: Infinity,
     electron: [0, 20],
   },
-  makeSource('generator functions')
+  makeSource('generator functions'),
 );
 
 setMinimumBrowserVersions(
@@ -273,7 +273,7 @@ setMinimumBrowserVersions(
     safari: [9, 1],
     electron: [0, 24],
   },
-  makeSource('template literals')
+  makeSource('template literals'),
 );
 
 setMinimumBrowserVersions(
@@ -287,5 +287,5 @@ setMinimumBrowserVersions(
     safari: 9,
     electron: [0, 20],
   },
-  makeSource('symbols')
+  makeSource('symbols'),
 );

From 5c2773825e9f369147c7f87db857a84e346a22ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 5 Mar 2025 15:32:57 +0100
Subject: [PATCH 1099/1140] bump version to generate a new dev_bundle

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index f60736d13d..c9aa35f32e 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.2
+BUNDLE_VERSION=22.14.0.3
 
 
 # OS Check. Put here because here is where we download the precompiled

From eb8f962c78f1e0a625c76b4bd671e1c84e31d4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Wed, 5 Mar 2025 16:43:10 +0100
Subject: [PATCH 1100/1140] Meteor version to 3.2-beta.2 :comet:

---
 packages/accounts-base/package.js             |  2 +-
 packages/accounts-password/package.js         |  2 +-
 packages/ecmascript-runtime-client/package.js |  2 +-
 packages/facebook-oauth/package.js            |  2 +-
 packages/fetch/package.js                     |  2 +-
 packages/logging/package.js                   |  4 +--
 packages/logic-solver/package.js              |  2 +-
 packages/meteor-tool/package.js               |  2 +-
 packages/minifier-css/package.js              |  2 +-
 packages/modern-browsers/package.js           |  2 +-
 packages/mongo/package.js                     |  2 +-
 packages/oauth/package.js                     |  2 +-
 packages/test-helpers/package.js              |  2 +-
 .../admin/meteor-release-experimental.json    |  2 +-
 tools/cli/help.txt                            |  4 +++
 .../generators/changelog/versions/3.2.0.md    | 30 +++++++++++++++----
 16 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 7941150d91..8390016f35 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.0-beta320.1",
+  version: "3.1.0-beta320.2",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 67265d62a9..4f13201f2f 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "4.0.0-beta320.1",
+  version: "3.1.0-beta320.2",
 });
 
 Npm.depends({
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index f10eb73353..470620dcae 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript-runtime-client',
-  version: '0.12.2',
+  version: '0.12.3-beta320.2',
   summary: 'Polyfills for new ECMAScript 2015 APIs like Map and Set',
   git:
     'https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client',
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 1b1bf9f4e7..1fdbe0883d 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: '1.11.5',
+  version: '1.11.6-beta320.2',
 });
 
 Package.onUse(api => {
diff --git a/packages/fetch/package.js b/packages/fetch/package.js
index 0da95015f5..112b54a61f 100644
--- a/packages/fetch/package.js
+++ b/packages/fetch/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "fetch",
-  version: '0.1.5',
+  version: '0.1.6-beta320.2',
   summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()",
   documentation: "README.md"
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index b6acc65236..1e4c64a5b7 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,11 +1,11 @@
 Package.describe({
   summary: 'Logging facility.',
-  version: '1.3.5',
+  version: '1.3.6-beta320.2',
 });
 
 Npm.depends({
   'chalk': '4.1.2',
-  '@babel/runtime': '7.20.7'
+  '@babel/runtime': '7.20.7',
 });
 
 Npm.strip({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 23b4a0f961..6682389aba 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '3.1.0-beta320.1',
+  version: '3.1.0-beta320.2',
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index b49b08c984..34ef006047 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.2.0-beta.1",
+  version: "3.2.0-beta.2",
 });
 
 Package.includeTool();
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index fd196a0f87..581d6ee2b2 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'CSS minifier',
-  version: '2.0.1',
+  version: '2.0.1-beta320.2',
 });
 
 Npm.depends({
diff --git a/packages/modern-browsers/package.js b/packages/modern-browsers/package.js
index f2381a8f4d..bff1cc60c7 100644
--- a/packages/modern-browsers/package.js
+++ b/packages/modern-browsers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'modern-browsers',
-  version: '0.2.0',
+  version: '0.2.1-beta320.2',
   summary:
     'API for defining the boundary between modern and legacy ' +
     'JavaScript clients',
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 5727c2e01c..f404ed7033 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.0",
+  version: "2.1.1-beta320.2",
 });
 
 Npm.depends({
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index b74664148f..524ecf6ba6 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: '3.0.2',
+  version: '3.0.2-beta320.2',
 });
 
 Package.onUse(api => {
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 434681a2bb..113c062010 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: "2.0.3-beta320.1",
+  version: "2.0.3-beta320.2",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index e13313ce1b..da73ff6743 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.2-beta.1",
+  "version": "3.2-beta.2",
   "recommended": false,
   "official": false,
   "description": "Meteor experimental release"
diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index a8c8705737..b9b5e1c2c7 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -1164,6 +1164,10 @@ Optionally, you can set the environment variable METEOR_BUNDLE_SIZE=true to gath
 bundle size data, allowing you to assess the impact of changes on the overall build
 size.
 
+Use METEOR_IDLE_TIMEOUT=<seconds> to set a timeout for profiling. The default time (90s)
+is usually enough for each build step to complete. If you encounter errors due to
+early exits, adjust the environment variable accordingly.
+
 Options:
 The options for this command are the same as those for the meteor run command.
 You can pass typical runtime options (such as --settings, --exclude-archs, etc.)
diff --git a/v3-docs/docs/generators/changelog/versions/3.2.0.md b/v3-docs/docs/generators/changelog/versions/3.2.0.md
index 7cbc83fa7b..bfe169fc37 100644
--- a/v3-docs/docs/generators/changelog/versions/3.2.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.2.0.md
@@ -2,8 +2,14 @@
 
 ### Highlights
 
-- Support for argon2 to improve password security over bcrypt.
-- Improve and fix package resolution logic.
+- Upgrade to Node 22.14.0 & Mongo 7.0.16.
+- Implement `meteor profile` command to show performance metrics of Meteor apps.
+- Fix Meteor profiler to handle promises and display metrics correctly.
+- Support for argon2 to improve password security over bcrypt. [PR #13554](https://github.com/meteor/meteor/pull/13554)
+- Improve and fix package resolution logic. [PR #13604](https://github.com/meteor/meteor/pull/13604)
+- Fix rare oplog issue that could cause data loss for clients. [PR #13603](https://github.com/meteor/meteor/pull/13603) 
+
+All detailed PRs can be found here: https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.2
 
 #### Breaking Changes
 
@@ -19,20 +25,29 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.2.0-beta.1
+meteor update --release 3.2.0-beta.2
 
 ```
 
 #### Bumped Meteor Packages
 
 - accounts-base@3.1.0
-- accounts-password@4.0.0
+- accounts-password@3.1.0
+- ecmascript-runtime-client@0.12.3
+- facebook-oauth@1.11.6
+- fetch@0.1.6
+- logging@1.3.6
+- logic-solver@3.1.0
+- minifier-css@2.0.1
 - meteor-tool@3.2.0
+- modern-browsers@0.2.1
+- mongo@2.1.1
+- oauth@3.0.2
 - test-helpers@2.0.3
 
 #### Bumped NPM Packages
 
-N/A
+- meteor-node-stubs@1.2.13
 
 #### Special thanks to
 
@@ -42,5 +57,10 @@ N/A
 - [@Grubba27](https://github.com/Grubba27)
 - [@vparpoil](https://github.com/vparpoil)
 - [@cunneen](https://github.com/cunneen)
+- [@gbuerk](https://github.com/gbuerk)
+- [@julio-rocketchat](https://github.com/julio-rocketchat)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+- [@dr-dimitru](https://github.com/dr-dimitru)
+- [@Seb-Dion](https://github.com/Seb-Dion)
 
 ✨✨✨

From 0cb2ee8dde60c7b4542716b9c724c63658bba63d Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 6 Mar 2025 19:53:36 -0300
Subject: [PATCH 1101/1140] PRODUCT: Update roadmap

I've updated the roadmap to reflect what we have planned for this year(they are in the order I think we will be doing them!).

Removed items does not mean they will not be done but rather that they are not a priority at the moment.

Reduced the scope of some items to make them more achievable
and so that we can check more often our roadmap to see if we are going in a good direction.
---
 v3-docs/docs/about/roadmap.md | 41 +++++++++++------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/v3-docs/docs/about/roadmap.md b/v3-docs/docs/about/roadmap.md
index 5233abb91c..a7d16b378e 100644
--- a/v3-docs/docs/about/roadmap.md
+++ b/v3-docs/docs/about/roadmap.md
@@ -4,7 +4,7 @@ Describes the high-level features and actions for the Meteor project in the near
 
 ## Introduction
 
-**Last updated: August 22nd, 2024.**
+**Last updated: March 6th, 2025.**
 
 The description of many items includes sentences and ideas from Meteor community members.
 
@@ -16,40 +16,26 @@ Contributors are encouraged to focus their efforts on work that aligns with the
 
 ### Next releases
 
-- Improve TypeScript support for Meteor and packages ([Discussion](https://github.com/meteor/meteor/discussions/12080))
-> Should be an ongoing effort to improve the TypeScript support in Meteor and packages, as we write new code in TypeScript and get more skin in the game, it should naturally improve. This doesn’t mean we will actively refactor working code.
+- Bundle optimization
+> We need to improve the bundle size and performance of Meteor apps. We should consider tree-shaking, code-splitting,
+> and other optimizations to make our apps leaner and faster.
+> To achieve that we plan to integrate or have an easy way to integrate with modern bundlers like RSPack, ESBuild, or Rollup.
 
-- Performance improvements for Meteor 3.0
-> After removing fibers, we became heavily reliant on async resources and consequently Async Hooks/Async Local Storage, which has a performance cost, we need to optimize that.
+- Support package.json exports fields ([Discussion](https://github.com/meteor/meteor/discussions/11727))
+- Tree-shaking
+> Tree sharking and exports fields may be implemented by integrating with more modern build tools, see previous items.
 
-- Bringing community packages to the core
-> Some packages are widely used and should be part of the core, which involves identifying and moving them to the core.
+- Capacitor support
+> Capacitor is a modern alternative to Cordova; we should provide an easy way to build mobile apps using Capacitor.
 
 - MongoDB Change Streams support ([Discussion](https://github.com/meteor/meteor/discussions/11842))
 > Change Streams is the official way to listen to changes in MongoDB. We should provide a way to use it seamlessly in Meteor. It has been planned for a long time, and now we’re in a position to do it.
 
-- Integrated support for Vite (Client Bundler, [Discussion](https://github.com/meteor/meteor/discussions/11587))
-> Vite is a fast and modern client bundler with an amazing ecosystem. It has many potential benefits for Meteor: build performance, tree-shaking, making our codebase leaner, and focusing on what we do best.
-
-- Replace Babel with ESBuild, Rollup, SWC, or another tool for the server bundle ([Discussion](https://github.com/meteor/meteor/discussions/11587))
-> Babel is a great tool, but it's slow and has some limitations; we should consider replacing it with a faster and more modern tool for the server bundle. We could potentially use the same tools Vite uses.
-
-- Support package.json exports fields ([Discussion](https://github.com/meteor/meteor/discussions/11727))
-- Tree-shaking
-
-> Tree sharking and exports fields may be implemented by integrating with more modern build tools, see previous items.
+- Improve TypeScript support for Meteor and packages ([Discussion](https://github.com/meteor/meteor/discussions/12080))
+> Should be an ongoing effort to improve the TypeScript support in Meteor and packages. We should provide a better experience for TypeScript users, including better type definitions and support for TypeScript features.
 
 - Improve release CI/CD speed and reliability (optimized build times will help)
-> Sometimes our CI/CD takes too long to run, causing long queues and delays in our release process and feedback loop, we need to improve that.
-
-- Improve support for Windows 11
-> We had many complaints in the past, we need to research and make architectural improvements to make it easier to support Windows, not just punctual fixes.
-
-- Document better Windows with WSL
-> It's already possible to use Meteor on Windows with WSL, but we need to document it better
-
-- HTTP/3 Support
-> HTTP/3 is the next version of the HTTP protocol. We should support it in Meteor to leverage its performance and security benefits.
+> Our CI/CD takes too long to run, causing long queues and delays in our release process and feedback loop; we need to improve that.
 
 ### Candidate items
 
@@ -58,7 +44,6 @@ We need to discuss further to decide whether to proceed with these implementatio
 - Improve DDP Client
 - Improve Passwordless package ([Discussion](https://github.com/meteor/meteor/discussions/12075))
 - Integrate with Tauri, it might replace Cordova and Electron in a single tool
-- Support building mobile apps using CapacitorJS
 - Bring Redis-oplog to core ([Repository](https://github.com/Meteor-Community-Packages/redis-oplog))
 - Better file upload support via DDP ([Discussion](https://github.com/meteor/meteor/discussions/11523))
 

From 4c50f4baaf775aaa86899ff67657c4194c977e03 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 7 Mar 2025 08:28:10 -0300
Subject: [PATCH 1102/1140] feedback updates

---
 v3-docs/docs/about/roadmap.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/roadmap.md b/v3-docs/docs/about/roadmap.md
index a7d16b378e..a3eaee5c8c 100644
--- a/v3-docs/docs/about/roadmap.md
+++ b/v3-docs/docs/about/roadmap.md
@@ -23,7 +23,7 @@ Contributors are encouraged to focus their efforts on work that aligns with the
 
 - Support package.json exports fields ([Discussion](https://github.com/meteor/meteor/discussions/11727))
 - Tree-shaking
-> Tree sharking and exports fields may be implemented by integrating with more modern build tools, see previous items.
+> Tree-shaking and exports fields may be implemented by integrating with more modern build tools.
 
 - Capacitor support
 > Capacitor is a modern alternative to Cordova; we should provide an easy way to build mobile apps using Capacitor.
@@ -41,11 +41,14 @@ Contributors are encouraged to focus their efforts on work that aligns with the
 
 We need to discuss further to decide whether to proceed with these implementations.
 
+- Performance improvements (Async Hooks/Async Local Storage optimization)
+- HTTP/3 Support
 - Improve DDP Client
 - Improve Passwordless package ([Discussion](https://github.com/meteor/meteor/discussions/12075))
 - Integrate with Tauri, it might replace Cordova and Electron in a single tool
 - Bring Redis-oplog to core ([Repository](https://github.com/Meteor-Community-Packages/redis-oplog))
 - Better file upload support via DDP ([Discussion](https://github.com/meteor/meteor/discussions/11523))
+- Improve usage in Windows environments
 
 ### Finished items
 

From e2f52284ca58881d77ebb927b2219cd8d77f945a Mon Sep 17 00:00:00 2001
From: Victor Parpoil <vparpoil@gmail.com>
Date: Mon, 10 Mar 2025 16:34:14 +0100
Subject: [PATCH 1103/1140] fix: argon2 default parameters were too strong

---
 packages/accounts-base/accounts_common.js     |  6 +++---
 packages/accounts-password/password_server.js |  6 +++---
 v3-docs/docs/api/accounts.md                  | 14 ++++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index d95eae8aba..c910659684 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -218,9 +218,9 @@ export class AccountsCommon {
    * @param {Number} options.bcryptRounds Allows override of number of bcrypt rounds (aka work factor) used to store passwords. The default is 10.
    * @param {Boolean} options.argon2Enabled Enable argon2 algorithm usage in replacement for bcrypt. The default is `false`.
    * @param {'argon2id' | 'argon2i' | 'argon2d'} options.argon2Type Allows override of the argon2 algorithm type. The default is `argon2id`.
-   * @param {Number} options.argon2TimeCost Allows override of number of argon2 iterations (aka time cost) used to store passwords. The default is 3.
-   * @param {Number} options.argon2MemoryCost Allows override of the amount of memory (in KiB) used by the argon2 algorithm. The default is 65536 (64MB).
-   * @param {Number} options.argon2Parallelism Allows override of the number of threads used by the argon2 algorithm. The default is 4.
+   * @param {Number} options.argon2TimeCost Allows override of number of argon2 iterations (aka time cost) used to store passwords. The default is 2.
+   * @param {Number} options.argon2MemoryCost Allows override of the amount of memory (in KiB) used by the argon2 algorithm. The default is 19456 (19MB).
+   * @param {Number} options.argon2Parallelism Allows override of the number of threads used by the argon2 algorithm. The default is 1.
    * @param {MongoFieldSpecifier} options.defaultFieldSelector To exclude by default large custom fields from `Meteor.user()` and `Meteor.findUserBy...()` functions when called without a field selector, and all `onLogin`, `onLoginFailure` and `onLogout` callbacks.  Example: `Accounts.config({ defaultFieldSelector: { myBigArray: 0 }})`. Beware when using this. If, for instance, you do not include `email` when excluding the fields, you can have problems with functions like `forgotPassword` that will break because they won't have the required data available. It's recommend that you always keep the fields `_id`, `username`, and `email`.
    * @param {String|Mongo.Collection} options.collection A collection name or a Mongo.Collection object to hold the users.
    * @param {Number} options.loginTokenExpirationHours When using the package `accounts-2fa`, use this to set the amount of time a token sent is valid. As it's just a number, you can use, for example, 0.5 to make the token valid for just half hour. The default is 1 hour.
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index b6fd1c2348..455c071cc3 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -34,9 +34,9 @@ const ARGON2_TYPES = {
 };
 
 Accounts._argon2Type = () => ARGON2_TYPES[Accounts._options.argon2Type] || argon2.argon2id;
-Accounts._argon2TimeCost = () => Accounts._options.argon2TimeCost || 3;
-Accounts._argon2MemoryCost = () => Accounts._options.argon2MemoryCost || 65536;
-Accounts._argon2Parallelism = () => Accounts._options.argon2Parallelism || 4;
+Accounts._argon2TimeCost = () => Accounts._options.argon2TimeCost || 2;
+Accounts._argon2MemoryCost = () => Accounts._options.argon2MemoryCost || 19456;
+Accounts._argon2Parallelism = () => Accounts._options.argon2Parallelism || 1;
 
 /**
  * Extracts the string to be encrypted using bcrypt or Argon2 from the given `password`.
diff --git a/v3-docs/docs/api/accounts.md b/v3-docs/docs/api/accounts.md
index 13acb2cb97..c77b314101 100644
--- a/v3-docs/docs/api/accounts.md
+++ b/v3-docs/docs/api/accounts.md
@@ -817,24 +817,26 @@ Accounts.config({
 One enabled, the `accounts-password` package allows customization of Argon2's parameters. The configurable options include:
 
 - `type`: `argon2id` (provides a blend of resistance against GPU and side-channel attacks)
-- `timeCost` (default: 3) – This controls the computational cost of the hashing process, affecting both the security level and performance.
-- `memoryCost`: 65536 (64 MB) - The amount of memory used by the algorithm in KiB per thread
-- `parallelism`: 4 - The number of threads used by the algorithm
+- `timeCost` (default: 2) – This controls the computational cost of the hashing process, affecting both the security level and performance.
+- `memoryCost`: 19456 (19 MiB) - The amount of memory used by the algorithm in KiB per thread
+- `parallelism`: 1 - The number of threads used by the algorithm
 
 To update the values, use the following configuration:
 ```js
 Accounts.config({
     argon2Enabled: true,
     argon2Type: "argon2id",
-    argon2TimeCost: 4,
-    argon2MemoryCost: 65536,
-    argon2Parallelism: 4,
+    argon2TimeCost: 2,
+    argon2MemoryCost: 19456,
+    argon2Parallelism: 1,
 });
 ```
 
 Other Argon2 parameters, such as `hashLength`, are kept to default values:
 - `hashLength`: 32 bytes - The length of the hash output in bytes
 
+The default values are the minimum [OWASP recommendations for Argon2 parameters](https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#introduction). When updating these values, consider the trade-offs between security and performance on the target infrastructure.
+
 For more information about Argon2's parameters, refer to the [argon2 options documentation](https://github.com/ranisalt/node-argon2/wiki/Options).
 
 

From 41d882350fad2dc504d4531b4871a8163581efc2 Mon Sep 17 00:00:00 2001
From: Joe Pea <trusktr@gmail.com>
Date: Tue, 11 Mar 2025 00:52:34 -0500
Subject: [PATCH 1104/1140] Update accounts.md

---
 v3-docs/docs/api/accounts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/api/accounts.md b/v3-docs/docs/api/accounts.md
index 676909156f..abdb912377 100644
--- a/v3-docs/docs/api/accounts.md
+++ b/v3-docs/docs/api/accounts.md
@@ -19,7 +19,7 @@ Read more about customizing user accounts in the [Accounts](http://guide.meteor.
 
 ### Accounts with Session Storage {#accounts-session-storage}
 
-By default, Meteor uses Local Storage to store, among other things, login tokens in your browser session. But, for some applications, it makes sense to use Session Storage instead. You can achieve this by adding this to your settings:
+By default, Meteor uses Local Storage to store, among other things, login tokens in your browser session. But, for some applications, it makes sense to use Session Storage instead. Session Storage will not persist across client sessions. You can achieve this by adding this to your settings:
 
 ```json
 {

From 33e73dccea3630587cdb794a6ac5494fb904dc51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 09:24:39 +0100
Subject: [PATCH 1105/1140] support meteor client and server entrypoint custom
 envs

---
 tools/cli/help.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index b9b5e1c2c7..d511d364ad 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -1168,6 +1168,10 @@ Use METEOR_IDLE_TIMEOUT=<seconds> to set a timeout for profiling. The default ti
 is usually enough for each build step to complete. If you encounter errors due to
 early exits, adjust the environment variable accordingly.
 
+Use METEOR_CLIENT_ENTRYPOINT=<path-to-file> to set a custom client entrypoint, and
+METEOR_SERVER_ENTRYPOINT=<path-to-file> to set a custom server entrypoint. By default,
+it uses the server and client entrypoints specified in your package.json.
+
 Options:
 The options for this command are the same as those for the meteor run command.
 You can pass typical runtime options (such as --settings, --exclude-archs, etc.)

From 71f14f7acce9ff689fa205f4d7d36bbac745cd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 11:11:38 +0100
Subject: [PATCH 1106/1140] support METEOR_LOG_DIR env config

---
 tools/cli/help.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index d511d364ad..4b821532fd 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -1172,6 +1172,8 @@ Use METEOR_CLIENT_ENTRYPOINT=<path-to-file> to set a custom client entrypoint, a
 METEOR_SERVER_ENTRYPOINT=<path-to-file> to set a custom server entrypoint. By default,
 it uses the server and client entrypoints specified in your package.json.
 
+Use METEOR_LOG_DIR=<path-to-directory> to set a custom log directory.
+
 Options:
 The options for this command are the same as those for the meteor run command.
 You can pass typical runtime options (such as --settings, --exclude-archs, etc.)

From 0ef39998145001d9d20a58c4c5f60a7e5dab5dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 12:03:57 +0100
Subject: [PATCH 1107/1140] ensure options to handle size

---
 tools/cli/commands.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 1b14604fcf..8d8c7166cd 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3349,7 +3349,7 @@ const setupBenchmarkSuite = async (profilingPath) => {
   process.env.GIT_TERMINAL_PROMPT = 0;
 
   const repoUrl = "https://github.com/meteor/performance";
-  const branch = "monitor-bundler";
+  const branch = "profile-cmd-feedback";
   const gitCommand = [
     `mkdir -p ${profilingPath}`,
     `git clone --no-checkout --depth 1 --filter=tree:0 --sparse --progress --branch ${branch} --single-branch ${repoUrl} ${profilingPath}`,
@@ -3386,8 +3386,13 @@ async function doBenchmarkCommand(options) {
   const profilingPath = `${projectContext.projectDir}/node_modules/.cache/meteor/performance`;
   await setupBenchmarkSuite(profilingPath);
 
+  const meteorSizeEnvs = [
+    !!options['only-size'] && 'METEOR_BUNDLE_SIZE_ONLY=true',
+    !!options['size'] && 'METEOR_BUNDLE_SIZE=true'
+  ].filter(Boolean);
+
   const profilingCommand = [
-    `${profilingPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${args.join(' ')}`,
+    `${meteorSizeEnvs.join(' ')} ${profilingPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${args.join(' ')}`.trim(),
   ].join(" && ");
   const [, errBenchmark] = await bashLive`${profilingCommand}`;
   if (errBenchmark) {
@@ -3399,6 +3404,10 @@ main.registerCommand(
 {
   name: 'profile',
   maxArgs: Infinity,
-  options: runCommandOptions.options,
+  options: {
+    ...runCommandOptions.options || {},
+  'size': { type: Boolean },
+  'only-size': { type: Boolean },
+  },
   catalogRefresh: new catalog.Refresh.Never(),
 }, doBenchmarkCommand);

From 276d71b591efd89d40efa86e82fb59c5abf443db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 12:06:27 +0100
Subject: [PATCH 1108/1140] update cmd to add size options

---
 tools/cli/help.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index 4b821532fd..d225036e84 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -1160,10 +1160,6 @@ This command runs a performance profile for the Meteor application, monitoring t
 bundler process and tracking key performance metrics to help analyze the build and
 bundling performance.
 
-Optionally, you can set the environment variable METEOR_BUNDLE_SIZE=true to gather
-bundle size data, allowing you to assess the impact of changes on the overall build
-size.
-
 Use METEOR_IDLE_TIMEOUT=<seconds> to set a timeout for profiling. The default time (90s)
 is usually enough for each build step to complete. If you encounter errors due to
 early exits, adjust the environment variable accordingly.
@@ -1175,6 +1171,9 @@ it uses the server and client entrypoints specified in your package.json.
 Use METEOR_LOG_DIR=<path-to-directory> to set a custom log directory.
 
 Options:
-The options for this command are the same as those for the meteor run command.
+  --size         monitor both bundle runtime and size
+  --only-size    monitor only the bundle size
+
+The rest of options for this command are the same as those for the meteor run command.
 You can pass typical runtime options (such as --settings, --exclude-archs, etc.)
 to customize the profiling process.

From d71f6559df622ec875fa837a0f5d92f4dae755e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 12:11:49 +0100
Subject: [PATCH 1109/1140] update cmd to add size options

---
 tools/cli/commands.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 8d8c7166cd..34f1821f69 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3390,9 +3390,10 @@ async function doBenchmarkCommand(options) {
     !!options['only-size'] && 'METEOR_BUNDLE_SIZE_ONLY=true',
     !!options['size'] && 'METEOR_BUNDLE_SIZE=true'
   ].filter(Boolean);
+  const meteorOptions = args.filter(arg => ['--only-size', '--size'].includes(arg));
 
   const profilingCommand = [
-    `${meteorSizeEnvs.join(' ')} ${profilingPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${args.join(' ')}`.trim(),
+    `${meteorSizeEnvs.join(' ')} ${profilingPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${meteorOptions.join(' ')}`.trim(),
   ].join(" && ");
   const [, errBenchmark] = await bashLive`${profilingCommand}`;
   if (errBenchmark) {

From 3fa04162b01f0cd6ec1ad8a9459956bec8f78aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 12:15:13 +0100
Subject: [PATCH 1110/1140] update cmd to add size options

---
 tools/cli/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 34f1821f69..5eb70f4354 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3390,7 +3390,7 @@ async function doBenchmarkCommand(options) {
     !!options['only-size'] && 'METEOR_BUNDLE_SIZE_ONLY=true',
     !!options['size'] && 'METEOR_BUNDLE_SIZE=true'
   ].filter(Boolean);
-  const meteorOptions = args.filter(arg => ['--only-size', '--size'].includes(arg));
+  const meteorOptions = args.filter(arg => !['--only-size', '--size'].includes(arg));
 
   const profilingCommand = [
     `${meteorSizeEnvs.join(' ')} ${profilingPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${meteorOptions.join(' ')}`.trim(),

From 1f4d95bb9150607ea107fd8906e8bac988af339f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 12:25:15 +0100
Subject: [PATCH 1111/1140] add option to skip cache

---
 tools/cli/commands.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 5eb70f4354..1207086b1b 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1767,6 +1767,7 @@ main.registerCommand({
   maxArgs: 1,
   options: {
     db: { type: Boolean },
+    'skip-cache': { type: Boolean },
   },
   requiresApp: true,
   catalogRefresh: new catalog.Refresh.Never()
@@ -1793,7 +1794,7 @@ main.registerCommand({
                  "MONGO_URL will NOT be reset.");
   }
 
-  const resetMeteorNmCachePromise = files.rm_recursive_async(
+  const resetMeteorNmCachePromise = options['skip-cache'] ? Promise.resolve() : files.rm_recursive_async(
     files.pathJoin(options.appDir, "node_modules", ".cache", "meteor")
   );
 

From f7d06cbd3262db84406ec43f69bbd8eb338b15c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 12:35:52 +0100
Subject: [PATCH 1112/1140] update docs for meteor profile cmd

---
 v3-docs/docs/cli/index.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 8cdcb64636..915df04861 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -1006,3 +1006,27 @@ interface and allow you to interactively run JavaScript and see the results.
 
 Executing `meteor node -e "console.log(process.versions)"` would
 run `console.log(process.versions)` in the version of `node` bundled with Meteor.
+
+## meteor profile {meteorprofile}
+
+The `meteor profile` command runs a performance profile for the Meteor application,
+monitoring the bundler process and tracking key performance metrics to help analyze
+the build and bundling performance.
+
+The options for this command are the same as those for the `meteor run` command.
+You can pass typical runtime options (such as --settings, --exclude-archs, etc.)
+to customize the profiling process.
+
+You can use `--size` to monitor both the bundle runtime and `--only-size` to monitor
+only the bundle size, allowing you to assess the impact of changes on the overall build
+size.
+
+Use `METEOR_IDLE_TIMEOUT=<seconds>` to set a timeout for profiling. The default time (90s)
+is usually enough for each build step to complete. If you encounter errors due to
+early exits, adjust the environment variable accordingly.
+
+Use `METEOR_CLIENT_ENTRYPOINT=<path-to-file>` to set a custom client entrypoint, and
+`METEOR_SERVER_ENTRYPOINT=<path-to-file>` to set a custom server entrypoint. By default,
+it uses the server and client entrypoints specified in your package.json.
+
+Use `METEOR_LOG_DIR=<path-to-directory>` to set a custom log directory.

From 1291042571539156a6d7a5162aa9f5cb4bdf305f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 12:45:47 +0100
Subject: [PATCH 1113/1140] better --size-only option

---
 tools/cli/commands.js     | 6 +++---
 tools/cli/help.txt        | 2 +-
 v3-docs/docs/cli/index.md | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 1207086b1b..103fce7464 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3388,10 +3388,10 @@ async function doBenchmarkCommand(options) {
   await setupBenchmarkSuite(profilingPath);
 
   const meteorSizeEnvs = [
-    !!options['only-size'] && 'METEOR_BUNDLE_SIZE_ONLY=true',
+    !!options['size-only'] && 'METEOR_BUNDLE_SIZE_ONLY=true',
     !!options['size'] && 'METEOR_BUNDLE_SIZE=true'
   ].filter(Boolean);
-  const meteorOptions = args.filter(arg => !['--only-size', '--size'].includes(arg));
+  const meteorOptions = args.filter(arg => !['--size-only', '--size'].includes(arg));
 
   const profilingCommand = [
     `${meteorSizeEnvs.join(' ')} ${profilingPath}/scripts/monitor-bundler.sh ${projectContext.projectDir} ${new Date().getTime()} ${meteorOptions.join(' ')}`.trim(),
@@ -3409,7 +3409,7 @@ main.registerCommand(
   options: {
     ...runCommandOptions.options || {},
   'size': { type: Boolean },
-  'only-size': { type: Boolean },
+  'size-only': { type: Boolean },
   },
   catalogRefresh: new catalog.Refresh.Never(),
 }, doBenchmarkCommand);
diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index d225036e84..4694b83b50 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -1172,7 +1172,7 @@ Use METEOR_LOG_DIR=<path-to-directory> to set a custom log directory.
 
 Options:
   --size         monitor both bundle runtime and size
-  --only-size    monitor only the bundle size
+  --size-only    monitor only the bundle size
 
 The rest of options for this command are the same as those for the meteor run command.
 You can pass typical runtime options (such as --settings, --exclude-archs, etc.)
diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 915df04861..fe648942c3 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -1017,7 +1017,7 @@ The options for this command are the same as those for the `meteor run` command.
 You can pass typical runtime options (such as --settings, --exclude-archs, etc.)
 to customize the profiling process.
 
-You can use `--size` to monitor both the bundle runtime and `--only-size` to monitor
+You can use `--size` to monitor both the bundle runtime and `--size-only` to monitor
 only the bundle size, allowing you to assess the impact of changes on the overall build
 size.
 

From db836426bdb4069f3731ea6317cefc3c072e70ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 15:08:51 +0100
Subject: [PATCH 1114/1140] tweak to version branch

---
 tools/cli/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 103fce7464..5ee4ead23b 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -3350,7 +3350,7 @@ const setupBenchmarkSuite = async (profilingPath) => {
   process.env.GIT_TERMINAL_PROMPT = 0;
 
   const repoUrl = "https://github.com/meteor/performance";
-  const branch = "profile-cmd-feedback";
+  const branch = "v3.2.0";
   const gitCommand = [
     `mkdir -p ${profilingPath}`,
     `git clone --no-checkout --depth 1 --filter=tree:0 --sparse --progress --branch ${branch} --single-branch ${repoUrl} ${profilingPath}`,

From 26f2b1f30ad8b3f8776a39ebbc5c3ae9191c0d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 15:14:14 +0100
Subject: [PATCH 1115/1140] bump for a new dev_bundle

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index c9aa35f32e..745c3affbf 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.14.0.3
+BUNDLE_VERSION=22.14.0.4
 
 
 # OS Check. Put here because here is where we download the precompiled

From 91f991781162bbb079a085f9d9b1a5b5f815c8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 17 Mar 2025 15:39:01 +0100
Subject: [PATCH 1116/1140] re-run checks


From 5d2a7c8a0c70b454f1c160c9fe89aad78ef21fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 18 Mar 2025 11:33:25 +0100
Subject: [PATCH 1117/1140] Meteor version to 3.2 :comet:

---
 packages/accounts-base/package.js             |  2 +-
 packages/accounts-password/package.js         |  2 +-
 packages/ecmascript-runtime-client/package.js |  2 +-
 packages/facebook-oauth/package.js            |  2 +-
 packages/fetch/package.js                     |  2 +-
 packages/logging/package.js                   |  2 +-
 packages/logic-solver/package.js              |  2 +-
 packages/meteor-tool/package.js               |  2 +-
 packages/minifier-css/package.js              |  2 +-
 packages/modern-browsers/package.js           |  2 +-
 packages/mongo/package.js                     |  2 +-
 packages/oauth/package.js                     |  2 +-
 packages/test-helpers/package.js              |  2 +-
 scripts/admin/meteor-release-official.json    |  2 +-
 .../generators/changelog/versions/3.2.0.md    |  4 +-
 v3-docs/docs/history.md                       | 66 +++++++++++++++++++
 16 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 8390016f35..6af3172a4e 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.0-beta320.2",
+  version: "3.1.0",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 4f13201f2f..31786541ba 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.1.0-beta320.2",
+  version: "3.1.0",
 });
 
 Npm.depends({
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 470620dcae..89ad004876 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript-runtime-client',
-  version: '0.12.3-beta320.2',
+  version: '0.12.3',
   summary: 'Polyfills for new ECMAScript 2015 APIs like Map and Set',
   git:
     'https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client',
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 1fdbe0883d..336d0872d0 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: '1.11.6-beta320.2',
+  version: '1.11.6',
 });
 
 Package.onUse(api => {
diff --git a/packages/fetch/package.js b/packages/fetch/package.js
index 112b54a61f..5d0f800423 100644
--- a/packages/fetch/package.js
+++ b/packages/fetch/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "fetch",
-  version: '0.1.6-beta320.2',
+  version: '0.1.6',
   summary: "Isomorphic modern/legacy/Node polyfill for WHATWG fetch()",
   documentation: "README.md"
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 1e4c64a5b7..51b58c8a3a 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Logging facility.',
-  version: '1.3.6-beta320.2',
+  version: '1.3.6',
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 6682389aba..9934e5b82a 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '3.1.0-beta320.2',
+  version: '3.1.0',
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 34ef006047..fac4bece2d 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: "3.2.0-beta.2",
+  version: "3.2.0",
 });
 
 Package.includeTool();
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 581d6ee2b2..fd196a0f87 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'CSS minifier',
-  version: '2.0.1-beta320.2',
+  version: '2.0.1',
 });
 
 Npm.depends({
diff --git a/packages/modern-browsers/package.js b/packages/modern-browsers/package.js
index bff1cc60c7..14146d9ab7 100644
--- a/packages/modern-browsers/package.js
+++ b/packages/modern-browsers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'modern-browsers',
-  version: '0.2.1-beta320.2',
+  version: '0.2.1',
   summary:
     'API for defining the boundary between modern and legacy ' +
     'JavaScript clients',
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index f404ed7033..0013a658e3 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.1-beta320.2",
+  version: "2.1.1",
 });
 
 Npm.depends({
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 524ecf6ba6..b74664148f 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: '3.0.2-beta320.2',
+  version: '3.0.2',
 });
 
 Package.onUse(api => {
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 113c062010..570b52462b 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: "2.0.3-beta320.2",
+  version: "2.0.3",
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index c2961db2c9..5a1a6ed980 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.1.2",
+  "version": "3.2",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"
diff --git a/v3-docs/docs/generators/changelog/versions/3.2.0.md b/v3-docs/docs/generators/changelog/versions/3.2.0.md
index bfe169fc37..fb39410f55 100644
--- a/v3-docs/docs/generators/changelog/versions/3.2.0.md
+++ b/v3-docs/docs/generators/changelog/versions/3.2.0.md
@@ -1,4 +1,4 @@
-## v3.2.0, 2025-02-06
+## v3.2.0, 2025-03-18
 
 ### Highlights
 
@@ -25,7 +25,7 @@ Please run the following command to update your project:
 
 ```bash
 
-meteor update --release 3.2.0-beta.2
+meteor update --release 3.2
 
 ```
 
diff --git a/v3-docs/docs/history.md b/v3-docs/docs/history.md
index f3c4cd4da9..ac8ec9acc1 100644
--- a/v3-docs/docs/history.md
+++ b/v3-docs/docs/history.md
@@ -10,6 +10,72 @@ This is a complete history of changes for Meteor releases.
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
+## v3.2.0, 2025-03-18
+
+### Highlights
+
+- Upgrade to Node 22.14.0 & Mongo 7.0.16.
+- Implement `meteor profile` command to show performance metrics of Meteor apps.
+- Fix Meteor profiler to handle promises and display metrics correctly.
+- Support for argon2 to improve password security over bcrypt. [PR #13554](https://github.com/meteor/meteor/pull/13554)
+- Improve and fix package resolution logic. [PR #13604](https://github.com/meteor/meteor/pull/13604)
+- Fix rare oplog issue that could cause data loss for clients. [PR #13603](https://github.com/meteor/meteor/pull/13603)
+
+All detailed PRs can be found here: https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.2
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.2
+
+```
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.1.0
+- accounts-password@3.1.0
+- ecmascript-runtime-client@0.12.3
+- facebook-oauth@1.11.6
+- fetch@0.1.6
+- logging@1.3.6
+- logic-solver@3.1.0
+- minifier-css@2.0.1
+- meteor-tool@3.2.0
+- modern-browsers@0.2.1
+- mongo@2.1.1
+- oauth@3.0.2
+- test-helpers@2.0.3
+
+#### Bumped NPM Packages
+
+- meteor-node-stubs@1.2.13
+
+#### Special thanks to
+
+✨✨✨
+
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@Grubba27](https://github.com/Grubba27)
+- [@vparpoil](https://github.com/vparpoil)
+- [@cunneen](https://github.com/cunneen)
+- [@gbuerk](https://github.com/gbuerk)
+- [@julio-rocketchat](https://github.com/julio-rocketchat)
+- [@StorytellerCZ](https://github.com/StorytellerCZ)
+- [@dr-dimitru](https://github.com/dr-dimitru)
+- [@Seb-Dion](https://github.com/Seb-Dion)
+
+✨✨✨
 
 
 ## v3.1.2, 2025-02-06

From c38f9c2474caced14b37ca265cb7267d88d7b3da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 18 Mar 2025 15:39:20 +0100
Subject: [PATCH 1118/1140] update installer to meteor 3.2 release

---
 npm-packages/meteor-installer/config.js         | 2 +-
 npm-packages/meteor-installer/package-lock.json | 4 ++--
 npm-packages/meteor-installer/package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/npm-packages/meteor-installer/config.js b/npm-packages/meteor-installer/config.js
index c685ade5e1..41c524300f 100644
--- a/npm-packages/meteor-installer/config.js
+++ b/npm-packages/meteor-installer/config.js
@@ -1,7 +1,7 @@
 const os = require('os');
 const path = require('path');
 
-const METEOR_LATEST_VERSION = '3.1.2';
+const METEOR_LATEST_VERSION = '3.2';
 const sudoUser = process.env.SUDO_USER || '';
 function isRoot() {
   return process.getuid && process.getuid() === 0;
diff --git a/npm-packages/meteor-installer/package-lock.json b/npm-packages/meteor-installer/package-lock.json
index 79bd10645e..40e12504fa 100644
--- a/npm-packages/meteor-installer/package-lock.json
+++ b/npm-packages/meteor-installer/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor",
-      "version": "3.1.2",
+      "version": "3.2.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/npm-packages/meteor-installer/package.json b/npm-packages/meteor-installer/package.json
index aa5a0c8c25..4f6ee73b6e 100644
--- a/npm-packages/meteor-installer/package.json
+++ b/npm-packages/meteor-installer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "Install Meteor",
   "main": "install.js",
   "scripts": {

From 20711de3427a93f0d8fb0dfdb2bc3175691701a6 Mon Sep 17 00:00:00 2001
From: Joe Pea <trusktr@gmail.com>
Date: Sat, 15 Mar 2025 03:56:11 -0500
Subject: [PATCH 1119/1140] Update README.md

---
 packages/meteor-base/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/meteor-base/README.md b/packages/meteor-base/README.md
index 30d609e452..1e295b897c 100644
--- a/packages/meteor-base/README.md
+++ b/packages/meteor-base/README.md
@@ -8,6 +8,6 @@ It comes with the following packages:
 
 1. [`meteor`](https://atmospherejs.com/meteor/meteor) - Super basic stuff about the programming environment, and a handler for the `css` file type.
 2. [`webapp`](https://atmospherejs.com/meteor/webapp) - The actual web server that handles connections, serves files, etc.
-3. [`underscore`](https://atmospherejs.com/meteor/underscore) - A library with lots of useful utilities that most of Meteor is built on.
+3. [`es5-shim`](https://atmospherejs.com/meteor/es5-shim) - Compiles code for old browsers like IE 8.
 4. [`hot-code-push`](https://atmospherejs.com/meteor/hot-code-push) - Refresh the client automatically when the server has new code.
 5. [`ddp`](https://atmospherejs.com/meteor/ddp) - A protocol for communicating between the client and server. This is what enables `Meteor.methods`, `Meteor.publish`, `Meteor.subscribe`, etc.

From 67921c827cafb49e299824e752fb2978cebc4bef Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Mon, 10 Mar 2025 17:51:18 +0100
Subject: [PATCH 1120/1140] Add Jam's offline and method packages to docs

Right now just copied info from readmes.
More packages to be added later.
---
 v3-docs/docs/community-packages/index.md      |   5 +
 v3-docs/docs/community-packages/jam-method.md | 576 ++++++++++++++++++
 v3-docs/docs/community-packages/offline.md    | 157 +++++
 3 files changed, 738 insertions(+)
 create mode 100644 v3-docs/docs/community-packages/jam-method.md
 create mode 100644 v3-docs/docs/community-packages/offline.md

diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
index ab375c1c93..e68dbe0ba6 100644
--- a/v3-docs/docs/community-packages/index.md
+++ b/v3-docs/docs/community-packages/index.md
@@ -27,3 +27,8 @@ Please bear in mind if you are adding a package to this list, try providing as m
 #### Method/Subscription helpers
 
 - [`meteor-rpc`](./meteor-rpc.md), Meteor Methods Evolved with type checking and runtime validation
+- [`jam:method`](./jam-method.md), An easy way to create Meteor methods with extensions to offline handling
+
+#### Utilities
+
+- [`jam:offline`](./offline.md), An easy way to give your Meteor app offline capabilities and make it feel instant
diff --git a/v3-docs/docs/community-packages/jam-method.md b/v3-docs/docs/community-packages/jam-method.md
new file mode 100644
index 0000000000..07784c6200
--- /dev/null
+++ b/v3-docs/docs/community-packages/jam-method.md
@@ -0,0 +1,576 @@
+# Jam Method
+
+- `Who maintains the package` – [Jam](https://github.com/jamauro)
+
+[[toc]]
+
+## What is this package?
+
+Method is an easy way to create Meteor methods with Optimistic UI. It's built with Meteor 3.0 in mind and is compatible with Meteor 2.x to make migration easy. It's meant to be a drop in replacement for Validated Method and comes with additional features:
+
+* Before and after hooks
+* Global before and after hooks for all methods
+* Pipe a series of functions
+* Authed by default (can be overriden)
+* Easily configure a rate limit
+* Optionally run a method on the server only
+* Attach the methods to Collections (optional)
+* Validate with one of the supported schema packages or a custom validate function
+* No need to use .call to invoke the method as with Validated Method
+
+## How to download it?
+
+Add the package to your app by running the following in your Meteor project:
+
+```bash
+meteor add jam:method
+```
+
+## How to use it?
+
+### Create a method
+`name` is required and will be how Meteor's internals identifies it.
+
+`schema` will automatically validate using a [supported schema](#supported-schemas).
+
+`run` will be executed when the method is called.
+
+```js
+import { createMethod } from 'meteor/jam:method'; // can import { Methods } from 'meteor/jam:method' instead and use Methods.create if you prefer
+
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema, // using jam:easy-schema in this example
+  async run({ text }) {
+    const todo = {
+      text,
+      done: false,
+      createdAt: new Date(),
+      authorId: Meteor.userId(), // can also use this.userId instead of Meteor.userId()
+    }
+    const todoId = await Todos.insertAsync(todo);
+    return todoId;
+  }
+});
+```
+
+#### Supported schemas
+Currently, these schemas are supported:
+* [jam:easy-schema](https://github.com/jamauro/easy-schema)
+* [check](https://docs.meteor.com/api/check.html)
+* [zod](https://github.com/colinhacks/zod)
+* [simpl-schema](https://github.com/longshotlabs/simpl-schema)
+
+If you're using `jam:easy-schema`, be sure to check out [Using with jam:easy-schema](#using-with-jameasy-schema) below for details on a way to write methods with less boilerplate.
+
+Here's a quick example of each one's syntax. They vary in features so pick the one that best fits your needs.
+```js
+// jam:easy-schema. you'll attach to a Collection so you can reference one {Collection}.schema in your methods
+const schema = {text: String, isPrivate: Optional(Boolean)}
+// check
+const schema = {text: String, isPrivate: Match.Maybe(Boolean)}
+// zod
+const schema = z.object({text: z.string(), isPrivate: z.boolean().optional()})
+// simpl-schema
+const schema = new SimpleSchema({text: String, isPrivate: {type: Boolean, optional: true}})
+```
+
+#### Custom validate function
+If you're not using one of the supported schemas, you can use `validate` to pass in a custom validation function.
+**`Note`**: `validate` can be an async function if needed.
+
+```js
+// import your schema from somewhere
+// import your validator function from somewhere
+
+export const create = createMethod({
+  name: 'todos.create',
+  validate(args) {
+    validator(args, schema)
+  },
+  async run({ text }) {
+    const todo = {
+      text,
+      done: false,
+      createdAt: new Date(),
+      authorId: Meteor.userId() // can also use this.userId instead of Meteor.userId()
+    }
+    const todoId = await Todos.insertAsync(todo);
+    return todoId;
+  }
+});
+```
+
+### Import on the client and use
+```js
+import { create } from '/imports/api/todos/methods';
+
+async function submit() {
+  try {
+    await create({text: 'book flight to Hawaii'})
+  } catch(error) {
+    alert(error)
+  }
+}
+```
+
+### Before and after hooks
+You can execute functions `before` and / or `after` the method's `run` function. `before` and `after` accept a single function or an array of functions.
+
+When using `before`, the original input passed into the method will be available. The original input will be returned automatically from a `before` function so that `run` receives what was originally passed into the method.
+
+A great use case for using `before` is to verify the user has permission. For example:
+
+```js
+async function checkOwnership({ _id }) { // the original input passed into the method is available here. destructuring for _id since that's all we need for this function
+  const todo = await Todos.findOneAsync(_id);
+  if (todo.authorId !== Meteor.userId()) {
+    throw new Meteor.Error('not-authorized')
+  }
+
+  return true; // any code executed as a before function will automatically return the original input passed into the method so that they are available in the run function
+}
+
+export const markDone = createMethod({
+  name: 'todos.markDone',
+  schema: Todos.schema,
+  before: checkOwnership,
+  async run({ _id, done }) {
+    return await Todos.updateAsync(_id, {$set: {done}});
+  }
+});
+```
+
+When using `after`, the result of the `run` function will be available as the first argument and the second argument will contain the original input that was passed into the method. The result of the `run` function will be automatically returned from an `after` function.
+
+```js
+function exampleAfter(result, context) {
+  const { originalInput } = context; // the name of the method is also available here
+  // do stuff
+
+  return 'success'; // any code executed as an after function will automatically return the result of the run function
+}
+
+export const markDone = createMethod({
+  name: 'todos.markDone',
+  schema: Todos.schema,
+  before: checkOwnership,
+  async run({ _id, done }) {
+    return await Todos.updateAsync(_id, {$set: {done}});
+  },
+  after: exampleAfter
+});
+```
+
+**`Note`**: If you use arrow functions for `before`, `run`, or `after`, you'll lose access to `this` – the methodInvocation. You may be willing to sacrifice that because `this.userId` can be replaced by `Meteor.userId()` and `this.isSimulation` can be replaced by `Meteor.isClient` but it's worth noting.
+
+
+### Pipe a series of functions
+Instead of using `run`, you can compose functions using `.pipe`. Each function's output will be available as an input for the next function.
+
+```js
+// you'd define the functions in the pipe and then place them in the order you'd like them to execute within .pipe
+// be sure that each function in the pipe returns what the next one expects, otherwise you can add an arrow function to the pipe to massage the data, e.g. (input) => manipulate(input)
+
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema
+}).pipe(
+  checkOwnership,
+  createTodo,
+  sendNotification
+)
+```
+
+### Attach methods to its Collection (optional)
+Instead of importing each method, you can attach them to the Collection. If you're using [jam:easy-schema](https://github.com/jamauro/easy-schema) be sure to attach the schema before attaching the methods.
+
+```js
+// /imports/api/todos/collection
+import { Mongo } from 'meteor/mongo';
+import { schema } from './schema';
+
+export const Todos = new Mongo.Collection('todos');
+
+Todos.attachSchema(schema); // if you're using jam:easy-schema
+
+const attach = async () => {
+  const methods = await import('./methods.js') // dynamic import is recommended
+  return Todos.attachMethods(methods); // if you prefer not to use dynamic import, you can simply call attachMethods synchronously
+};
+
+attach().catch(error => console.error('Error attaching methods', error))
+```
+`attachMethods` accepts the method `options` as an optional second parameter. See [Configuring](#configuring-optional) for a list of the `options`.
+
+With the methods attached you'll use them like this on the client:
+```js
+import { Todos } from '/imports/api/todos/collection';
+// no need to import each method individually
+
+async function submit() {
+  try {
+    await Todos.create({text: 'book flight to Hawaii'})
+  } catch(error) {
+    alert(error)
+  }
+}
+```
+
+### Executing code on the server only
+By default, methods are optimistic meaning they will execute on the client and then on the server. If there's only part of the method that should execute on the server and not on the client, then simply wrap that piece of code in a `if (Meteor.isServer)` block. This way you can still maintain the benefits of Optimistic UI. For example:
+
+```js
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema,
+  async run(args) {
+    // rest of your function
+    // code running on both client and server
+    if (Meteor.isServer) {
+      // code running on the server only
+      import { secretCode } from '/server/secretCode'; // since it's in a /server folder the code will not be shipped to the client
+      // do something with secretCode
+    }
+
+    // code running on both client and server
+    return Todos.insertAsync(todo)
+  }
+});
+```
+
+If you prefer, you can force the entire method to execute on the server only by setting `serverOnly: true`. It can be used with `run` or `.pipe`. Here's an example with `run`:
+
+```js
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema,
+  serverOnly: true,
+  async run(args) {
+    // all code here will execute only on the server
+  }
+});
+```
+
+You can also set all methods to be `serverOnly`. See [Configuring](#configuring-optional) below.
+
+#### Security note
+**`Important`**: Since Meteor does not currently support tree shaking, the contents of the code inside `run` function or `.pipe` could still be visible to the client even if you use `if (Meteor.isServer)` or `serverOnly: true`. To prevent this, you have these options:
+
+1. Attach methods to its Collection with a dynamic import as shown above [Attach methods to its Collection (optional)](#attach-methods-to-its-collection-optional)
+
+2. Import function(s) from a file within a `/server` folder. Any code imported from a `/server` folder will not be shipped to the client. The `/server` folder can be located anywhere within your project's file structure and you can have multiple `/server` folders. For example, you can co-locate with your collection folder, e.g. `/imports/api/todos/server/`, or it can be at the root of your project. See [Secret server code](https://guide.meteor.com/security.html#secret-code) for more info.
+
+```js
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema,
+  serverOnly: true,
+  async run(args) {
+    import { serverFunction } from '/server/serverFunction';
+
+    serverFunction(args);
+  }
+});
+```
+
+3. Dynamically import function(s). These do not have to be inside a `/server` folder. This will prevent the code being inspectable via the browser console.
+
+```js
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema,
+  serverOnly: true,
+  async run(args) {
+    const { serviceFunction } = await import('./services');
+
+    serviceFunction(args);
+  }
+});
+```
+
+### Changing authentication rules
+By default, all methods will be protected by authentication, meaning they will throw an error if there is *not* a logged-in user. You can change this for an individual method by setting `open: true`. See [Configuring](#configuring-optional) below to change it for all methods.
+
+```js
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema,
+  open: true,
+  async run({ text }) {
+    // ... //
+  }
+});
+```
+
+### Rate limiting
+Easily rate limit a method by setting its max number of requests – the `limit` – within a given time period (milliseconds) – the `interval`.
+
+```js
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema,
+  rateLimit: { // rate limit to a max of 5 requests every second
+    limit: 5,
+    interval: 1000
+  },
+  async run({ text }) {
+    // ... //
+  }
+});
+```
+
+### Validate without executing the method
+There may be occassions where you want to validate without executing the method. In these cases, you can use `.validate`. If you want to validate against only part of the schema, use `.validate.only`.
+
+```js
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema,
+  async run({ text }) {
+    // ... //
+  }
+});
+
+// validate against the schema without executing the method
+create.validate({...})
+
+// validate against only the relevant part of the schema based on the data passed in without executing the method
+create.validate.only({...})
+```
+
+If you're using a custom validate function instead of one of the supported schemas and you'd like to use `.validate.only`, you can simply append an `only` function onto the `validate` function that you supply.
+
+### Options for Meteor.applyAsync
+When called, the method uses [Meteor.applyAsync](https://docs.meteor.com/api/methods#Meteor-applyAsync) under the hood to execute your `run` function or `.pipe` function(s). `Meteor.applyAsync` takes a few options which can be used to alter the way Meteor handles the method. If you want to change the defaults or include other supported options, pass in `options` when creating the method.
+
+```js
+export const create = createMethod({
+  name: 'todos.create',
+  schema: Todos.schema,
+  options: {
+    // ... //
+  },
+  async run({ text }) {
+    // ... //
+  }
+});
+```
+
+By default, this package uses the following `options`:
+```js
+{
+  // Make it possible to get the ID of an inserted item
+  returnStubValue: true,
+
+  // Don't call the server method if the client stub throws an error, so that we don't end
+  // up doing validations twice
+  throwStubExceptions: true,
+};
+```
+See [Configuring](#configuring-optional) below to set `options` for all methods.
+
+### Working with the stub result (Meteor 3.0+)
+In Meteor 3.0+, you can optionally take action with the stub result, i.e. the result when the method simulation is run on the client, before the server has returned with the final result or error. This can come in handy when you want to make your app feel instant for the user and you're relatively sure the action will succeed, e.g. when inserting new documents into the database.
+
+```js
+  const { stubPromise, serverPromise } = create();
+  const _id = await stubPromise.catch(error => {
+    // optionally handle a stub error
+  });
+
+  // take action with the _id stub result, for example, route to a new page
+  router.go(`/detail/${_id}`)
+
+  await serverPromise.catch(error => {
+    // handle server error, rollback changes as needed, for example route to home
+    router.go('/')
+    alert('sorry, could not create')
+  });
+```
+
+### Mocking the method context
+You can mock the method invocation context, aka the `this` value inside the method, by invoking the method with `.call(context, args)`. This is particularly useful for unit testing to mock the `this.userId`:
+
+```js
+const context = {
+  userId: 'fakeUserId',
+  // ... //
+}
+
+await create.call(context, {...})
+```
+
+## Configuring (optional)
+If you like the defaults, then you won't need to configure anything. But there is some flexibility in how you use this package.
+
+Here are the global defaults:
+```js
+const config = {
+  before: [], // global before function(s) that will run before all methods
+  after: [], // global after function(s) that will run after all methods
+  serverOnly: false, // globally make all methods serverOnly, aka disable Optimistic UI, by setting to true
+  open: false, // by default all methods will be protected by authentication, override it for all methods by setting this to true
+  loggedOutError: new Meteor.Error('logged-out', 'You must be logged in'), // customize the logged out error
+  options: {
+    returnStubValue: true, // make it possible to get the ID of an inserted item on the client before the server finishes
+    throwStubExceptions: true,  // don't call the server method if the client stub throws an error, so that we don't end up doing validations twice
+  }
+};
+````
+
+To change the global defaults, use:
+```js
+// put this in a file that's imported on both the client and server
+import { Methods } from 'meteor/jam:method';
+
+Methods.configure({
+  // ... change the defaults here ... //
+});
+```
+
+### Global before and after hooks
+You can create before and/or after functions to run before / after all methods. Both `before` and `after` accept a single function or an array of functions.
+
+```js
+import { Methods } from 'meteor/jam:method';
+
+const hello = () => { console.log('hello') }
+const there = () => { console.log('there') }
+const world = () => { console.log('world') }
+
+Methods.configure({
+  before: [hello, there],
+  after: world
+});
+```
+
+### Helpful utility function to log your methods
+Here's a helpful utility function - `log` - that you might consider adding. It isn't included in this package but you can copy and paste it into your codebase where you see fit.
+
+```js
+// log will simply console.log or console.error when the Method finishes
+function log(input, pipeline) {
+  pipeline.onResult((result) => {
+    console.log(`Method ${pipeline.name} finished`, input);
+    console.log('Result', result);
+  });
+
+  pipeline.onError((err) => {
+    console.error(`Method ${pipeline.name} failed`);
+    console.error('Error', err);
+  });
+};
+```
+
+Then you could use it like this:
+```js
+import { Methods, server } from 'meteor/jam:method';
+
+Methods.configure({
+  after: server(log)
+});
+```
+
+## Alternative functional-style syntax
+You can use a functional-style syntax to compose your methods if you prefer. Here's an example.
+
+```js
+const fetchGifs = async({ searchTerm, limit }) => {...}
+
+export const getGifs = createMethod(server(schema({ searchTerm: String, limit: Number })(fetchGifs)))
+```
+`getGifs` is callable from the client but will only run on the server. Internally it will be identified as `fetchGifs`
+
+**`Note`**: if you pass in a named function into `createMethod`, then that will be used to identify the method internally. Otherwise if you pass in an anonymous function, `jam:method` generates a unique name based on its schema to identify it internally.
+
+### Customizing methods when using functional-style syntax
+There are a few functions available when you need to customize the method: `schema`, `server`, `open`, `close`. These can be composed when needed.
+
+#### schema
+Specify the schema to validate against.
+
+```js
+import { schema } from 'meteor/jam:method';
+
+export const doSomething = schema({thing: String, num: Number})(async ({ thing, num }) => {
+  // ... //
+});
+```
+
+#### server
+Make the method run on the server only.
+
+```js
+import { server } from 'meteor/jam:method';
+
+export const aServerOnlyMethod = server(async data => {
+  // ... //
+});
+```
+
+#### open
+Make the method publically available so that a logged-in user isn't required.
+
+```js
+import { open } from 'meteor/jam:method';
+
+export const aPublicMethod = open(async data => {
+  // ... //
+});
+```
+
+#### close
+Make the method check for a logged-in user.
+
+**`Note`**: by default, all methods require a logged-in user so if you stick with that default, then you won't need to use this function. See [Configuring](#configuring-optional).
+
+```js
+import { close } from 'meteor/jam:method';
+
+export const closedMethod = close(async data => {
+  // ... //
+});
+```
+
+## Using with `jam:easy-schema`
+`jam:method` integrates with `jam:easy-schema` and offers a way to reduce boilerplate and make your methods even easier to write (though you can still use `createMethod` if you prefer).
+
+For example, instead of writing this:
+```js
+export const setDone = createMethod({
+  name: 'todos.setDone',
+  schema: Todos.schema,
+  before: checkOwnership,
+  async run({ _id, done }) {
+    return Todos.updateAsync({ _id }, { $set: { done } });
+  }
+});
+```
+
+You can write:
+```js
+export const setDone = async ({ _id, done }) => {
+  await checkOwnership({ _id });
+  return Todos.updateAsync({ _id }, { $set: { done } });
+};
+```
+
+**`Note`**: This assumes that you're attaching your methods to its collection. See [Attach methods to its Collection](#attach-methods-to-its-collection-optional).
+
+When you call `Todos.setDone` from the client, the arguments will be automatically checked against the `Todos.schema`. The method will automatically be named `todos.setDone` internally to identify it for app performance monitoring (APM) purposes.
+
+You can also compose with the functions available in the [function-style syntax](#alternative-functional-style-syntax). For example:
+```js
+export const setDone = server(async ({ _id, done }) => {
+  await checkOwnership({ _id });
+  return Todos.updateAsync({ _id }, { $set: { done } });
+});
+```
+Now when you call `Todos.setDone` from the client it will only run on the server.
+
+## Using with `jam:offline`
+`jam:method` integrates with `jam:offline` to automatically queue methods when a user is offline. You don't need to configure anything in `jam:method` for this. 🎉 `jam:offline` will then replay them when the user reconnects. See [jam:offline](https://github.com/jamauro/offline) for more details.
+
+## Coming from `Validated Method`?
+You may be familiar with `mixins` and wondering where they are. With the features of this package - authenticated by default, `before` / `after` hooks, `.pipe` - your mixin code may no longer be needed or can be simplified. If you have another use case where your mixin doesn't translate, I'd love to hear it. Open a new discussion and let's chat.
diff --git a/v3-docs/docs/community-packages/offline.md b/v3-docs/docs/community-packages/offline.md
new file mode 100644
index 0000000000..75252d83b7
--- /dev/null
+++ b/v3-docs/docs/community-packages/offline.md
@@ -0,0 +1,157 @@
+# Offline
+
+- `Who maintains the package` – [Jam](https://github.com/jamauro)
+
+[[toc]]
+
+## What is this package?
+
+Offline is an easy way to give your Meteor app offline capabilities and make it feel instant. Its key features are:
+
+* Offline access – Saves Minimongo data in IndexedDB for offline access and instant reloading when reconnected.
+* Automatic syncing – Syncs offline actions automatically once reconnected.
+* Cross-Tab syncing – Keeps changes in sync across multiple tabs while offline.
+* Seamless reconciliation – Reconciles data with the server when reconnected.
+
+## How to download it?
+
+Add the package to your app
+```bash
+meteor add jam:offline
+```
+
+## How to use it?
+
+### Keeping data offline
+By default, offline data will be kept for all collections using the global defaults in [Offline.config](#configuring-optional) without any configuration needed. To change the data that is kept for a specific collection, define `.keep` for the collection in a file that's imported on both client and server.
+
+If you don't want all collections to be kept, be sure to configure `keepAll: false`. See [Configuring](#configuring-optional) for more details.
+
+`.keep` accepts a `filter`, and `sort` and `limit` options much like a `.find`. For example:
+
+```js
+const Todos = new Mongo.Collection('todos');
+Todos.keep({ $or: [ { isPrivate: { $ne: true } }, { owner: Meteor.userId() } ]}, { limit: 200 }) // this will override any global defaults
+```
+
+If you have specific restrictions on what should be kept, e.g. permissions to a document like in the example above, these should be included in the `.keep` filter. Be aware that when the user comes back online, this filter will be used to reconcile with the server. In general, it's recommended that you only use the `.keep` filter where absolutely needed.
+
+**`Note`**: You can use `Meteor.userId()` in your `.keep` filter if needed.
+
+### Clearing offline data for a specific collection
+If you ever need to clear offline data for a specific collection, call `clear`:
+
+```js
+Todos.clear();
+```
+
+### Clearing all offline data
+If you ever need to completely clear all offline data, you can use `clearAll`:
+
+```js
+import { clearAll } from 'meteor/jam:offline';
+
+clearAll();
+```
+
+### Queuing methods when offline
+When a user is offline, you can queue any actions they take for replay when they come back online using `queueMethod`:
+
+```js
+import { queueMethod } from 'meteor/jam:offline';
+
+if (!Meteor.status().connected) { // check that the user is offline
+  queueMethod(name, arg1, arg2...) // the arguments should be the same form that you'd use for Meteor.callAsync
+}
+```
+where name is the method's name and the arguments are what the method expects. You'll still want to call the method when offline and it's recommended that you use [Meteor.applyAsync](https://docs.meteor.com/api/methods.html#Meteor-applyAsync) with the option `noRetry: true` to avoid using Meteor's built-in retry mechanism since we'll be handling replay separately. For this to work as intended, the methods that you call should be isomorphic so that they're availble to the client.
+
+**`Note`**: If you're using [jam:method](https://github.com/jamauro/method), queuing methods for replay is handled automatically for you. 🎉
+
+**`Note`**: When queuing methods than involve an `insert` to a collection, make sure the method returns the new document's `_id`. By doing this, you ensure that any subsequent changes made to the document while still offline are handled correctly.
+
+### Auto syncing
+By default, the package auto syncs when the user comes back online. This includes:
+
+1. Replaying queued methods
+2. Removing offline data for each collection that no longer belongs because it doesn't match the configured `filter` or the collection's `.keep` filter
+
+The benefit of this sequential-replay syncing strategy is any business logic contained in your methods will be respected. For example, if a user makes changes to a document but loses permission to it while offline, when they come back online, that permission will be respected when the attempted replay occurs. If there are any errors during auto sync, they will be made available in the `handleSyncErrors` function. You can use it to make your user aware that their changes failed. See [Configuring](#configuring-optional) for more details on how to customize this.
+
+When reconciling with the server, this package assumes that you'll use one of the following mechanisms when removing documents:
+
+1. `archive`. With this mechanism, when a document is removed from its original collection, it's placed in an `archive` collection. If your app doesn't already employ an archive mechanism, check out the [jam:archive](https://github.com/jamauro/archive) package to make this easy. By simply adding the `jam:archive` package, you won't need to do any further configuration.
+
+Otherwise, be sure to check out the `archive` configuration options. **`Note`**: it's assumed that the data in your `archive` collection will include the original document data at the root level, e.g.:
+```js
+{
+  _id, // auto-generated by Meteor as with other collection _ids
+  _collection, // the name of the collection, e.g. 'todos', that the doc belonged to originally
+  archivedAt, // the timestamp when the document was removed from its original collection and inserted into the archive
+  id, // the original doc _id renamed to prevent conflict with the auto-generated one above. when restored, it will be renamed back to _id automatically by this package
+  /*
+  ...rest of original doc
+  */
+}
+```
+
+2. `soft delete`. If your app doesn't already employ a soft delete mechanism, check out the [jam:soft-delete](https://github.com/jamauro/soft-delete) package to make this easy. If you're using something other than `deleted` as the flag name for your soft deletes, be sure to configure `filter` appropriately. See [Configuring](#configuring-optional) for more details.
+
+To know when an auto sync is processing, you can use `isSyncing()` which is a reactive variable.
+
+```js
+import { isSyncing } from 'meteor/jam:offline';
+
+isSyncing(); // you can wrap this in a Tracker.autorun to detect when it changes
+```
+
+If you prefer not to have the behavior provided by auto sync, be sure to configure `autoSync: false`. When `autoSync` is false, Minimongo data from when the user disconnects will be kept offline so you still benefit from faster reloads on reconnects but you'll be responsible for designing any syncing logic needed. If the user hasn't refreshed the page and has a brief disconnect / reconnect, then you'll still benefit from Meteor's built-in retry mechanism for methods. But if they do refresh or exit the app and come back later, any actions performed while offline will be lost.
+
+I think it would be great to have better support for custom syncing. If you have ideas here, let me know. At this time, I'm not sure what primitives would be most useful for you.
+
+## Configuring (optional)
+If you like the defaults, then you won't need to configure anything. But there is some flexibility in how you use this package. You may want to pay special attention to `filter` and `handleSyncErrors` to customize the experience for your users.
+
+Here are the global defaults:
+```js
+const config = {
+  filter: /** {} or { deleted: false } **/ // filter the documents to keep across all collections. if you're not using jam:archive or don't have the archive config below set, it will assume you're using soft deletes.
+  sort: { updatedAt: -1 }, // keep the most recent documents assuming you have an updatedAt on each doc. if you're using a different field name for timestamps, you'll want to change this.
+  limit: 100, // limit offline documents to a max of 100 for each collection
+  keepAll: true, // keep data for offline use for all collections using the global filter, sort, limit. to keep data for only certain collections, set this to false and then use collection.keep() for the collections you want to use offline.
+  autoSync: true, // auto sync changes made offline when the user comes back online
+  handleSyncErrors: async ({ replayErrors, keepErrors }) => {
+    if (replayErrors) console.error('replay', replayErrors); // if there are errors when the Meteor methods are replayed, they will be in array here with the name of the method, the method's args, and the error itself. you can use it to alert your user, logging purposes, etc.
+
+    if (keepErrors) { // when syncing, if you're using a .keep filter or you have a global filter in the config that isn't an empty object, and there are errors reconciling with the server, they will be in an array here with the name of the collection and the error itself. you can customize how you handle these. by default, we clear the offline database for the collection since it could have stale data and reload the page.
+      await Promise.allSettled(keepErrors.map(({ name }) => clear(name)));
+      console.error('keep', keepErrors)
+    }
+
+    return;
+  },
+  ...(Archive && { // Archive is provided by jam:archive. if you're using a different archive mechanism, you'll need to configure these manually
+    archive: {
+      name: 'archives',
+      collectionKey: '_collection',
+      primaryIdKey: 'id',
+      timestampKey: 'archivedAt'
+    }
+  })
+};
+````
+
+To change the global defaults, use:
+```js
+// put this in a file that's imported on both the client and server
+import { Offline } from 'meteor/jam:offline';
+
+Offline.configure({
+  // ... change the defaults here ... //
+});
+```
+
+## Adding a service worker
+You'll likely want to add a service worker as well to cache your HTML, CSS, Javascript so your users can continue to use the app offline, even if they accidentally click refresh.
+
+Follow these [instructions](https://github.com/jamauro/pwa-kit) to add a service worker and go even further by making it a PWA (progressive web app).

From 6a95f7c98d7d995e862d0615e93abbb15b6547f5 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 11 Mar 2025 09:19:54 +0100
Subject: [PATCH 1121/1140] Improve jam:method description for Meteor versions

---
 v3-docs/docs/community-packages/jam-method.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/community-packages/jam-method.md b/v3-docs/docs/community-packages/jam-method.md
index 07784c6200..54f31f6f31 100644
--- a/v3-docs/docs/community-packages/jam-method.md
+++ b/v3-docs/docs/community-packages/jam-method.md
@@ -6,7 +6,7 @@
 
 ## What is this package?
 
-Method is an easy way to create Meteor methods with Optimistic UI. It's built with Meteor 3.0 in mind and is compatible with Meteor 2.x to make migration easy. It's meant to be a drop in replacement for Validated Method and comes with additional features:
+Method is an easy way to create Meteor methods with Optimistic UI. It's built with Meteor 3 in mind and is compatible with Meteor 2 to make migration easy. It's meant to be a drop in replacement for Validated Method and comes with additional features:
 
 * Before and after hooks
 * Global before and after hooks for all methods

From 52fd0377fbb4f19051af2ff5d4999daf6d111f43 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 11 Mar 2025 09:36:09 +0100
Subject: [PATCH 1122/1140] Add other collection related packages from jam to
 community packages doc

---
 v3-docs/docs/community-packages/archive.md    |  91 +++++++
 v3-docs/docs/community-packages/index.md      |   7 +
 .../community-packages/mongo-transactions.md  |  83 +++++++
 v3-docs/docs/community-packages/pub-sub.md    | 229 ++++++++++++++++++
 .../docs/community-packages/soft-delete.md    |  74 ++++++
 5 files changed, 484 insertions(+)
 create mode 100644 v3-docs/docs/community-packages/archive.md
 create mode 100644 v3-docs/docs/community-packages/mongo-transactions.md
 create mode 100644 v3-docs/docs/community-packages/pub-sub.md
 create mode 100644 v3-docs/docs/community-packages/soft-delete.md

diff --git a/v3-docs/docs/community-packages/archive.md b/v3-docs/docs/community-packages/archive.md
new file mode 100644
index 0000000000..f727867d37
--- /dev/null
+++ b/v3-docs/docs/community-packages/archive.md
@@ -0,0 +1,91 @@
+# Archive
+
+# Soft-delete
+
+- `Who maintains the package` – [Jam](https://github.com/jamauro)
+
+[[toc]]
+
+## What is this package?
+
+Archive is an easy way to add an archive mechanism to your Meteor app. When a document is archived, it's removed from its original collection and placed in an archive collection so that it can be restored if needed. Its key features are:
+
+* Zero config needed (though you can customize)
+* Isomorphic so that it works with Optimistic UI
+* Automatically overrides `removeAsync` to perform an archive (can be turned off)
+* Explicitly archive with `archiveAsync` collection method (optional)
+* Restore archived docs with `restoreAsync` collection method
+* Optionally exclude specific collections
+* Compatible with Meteor `3.0.2+`
+
+> **Note:** Alternative to archive is soft deletion. You can use [`jam:soft-delete`](./soft-delete.md) package for that. Be sure to compare those two approaches to pick the solution best suited for your application.
+
+## How to download it?
+
+Add the package to your app
+```bash
+meteor add jam:archive
+```
+
+## How to use it?
+
+### Create your Archives collection
+Create an Archives collection in your app just as you would any other collection.
+```js
+const Archives = new Mongo.Collection('archives');
+```
+
+Documents in the Archives collection will have this shape:
+```js
+{
+  _id, // auto-generated by Meteor as with other collection _ids
+  _collection, // the name of the collection, e.g. 'todos', that the doc belonged to originally
+  archivedAt, // the timestamp when the document was removed from its original collection and inserted into the archive
+  id, // the original doc _id renamed to prevent conflict with the auto-generated one above. when restored, it will be renamed back to _id automatically by this package
+  /*
+  ...rest of original doc
+  */
+}
+```
+
+### Deleting permanently
+By default, this package overrides the `removeAsync` collection method so that it archives the document(s) rather that removing them from the database. To delete permanently, pass in the option `forever: true`, e.g.:
+```js
+Collection.removeAsync(/* your filter */, { forever: true })
+```
+
+If you prefer, you can prevent overriding the `removeAsync` by setting `overrideRemove: false`. See [Configuring](#configuring-optional) for more details.
+
+### Explicitly archiving
+If you prefer, you can explicity use `archiveAsync`, e.g.:
+```js
+Collection.archiveAsync(/* your filter */)
+```
+
+### Restoring a document
+To restore an archived document, use `restoreAsync`, e.g.:
+```js
+Collection.restoreAsync(/* your filter */)
+```
+
+## Configuring (optional)
+If you like the defaults, then you won't need to configure anything. But there is some flexibility in how you use this package.
+
+Here are the global defaults:
+```js
+const config = {
+  name: 'archives', // if your Archives collection uses a different name, you'll want to change this
+  overrideRemove: true, // overrides the Collection.removeAsync method to make it an archive instead
+  exclude: ['roles', 'role-assignment'] // exclude specific collections from using archive so that when they are removed, the are permanently removed from the db. defaults to excluding the collections created by the meteor roles package
+};
+```
+
+To change the global defaults, use:
+```js
+// put this in a file that's imported on both the client and server
+import { Archive } from 'meteor/jam:archive';
+
+Archive.configure({
+  // ... change the defaults here ... //
+});
+```
diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
index e68dbe0ba6..99739a5ccc 100644
--- a/v3-docs/docs/community-packages/index.md
+++ b/v3-docs/docs/community-packages/index.md
@@ -28,6 +28,13 @@ Please bear in mind if you are adding a package to this list, try providing as m
 
 - [`meteor-rpc`](./meteor-rpc.md), Meteor Methods Evolved with type checking and runtime validation
 - [`jam:method`](./jam-method.md), An easy way to create Meteor methods with extensions to offline handling
+- [`jam:pub-sub`](./pub-sub.md), Publish / subscribe using a Method and/or Change Streams, and cache subscriptions for Meteor apps
+- [`jam:soft-delete`](./soft-delete.md), An easy way to add soft deletes to your Meteor app
+- [`jam:archive`](./archive.md),
+
+#### MongoDB collection extensions
+
+- [`jam:mongo-transactions`](./mongo-transactions.md), An easy way to use Mongo Transactions for Meteor apps
 
 #### Utilities
 
diff --git a/v3-docs/docs/community-packages/mongo-transactions.md b/v3-docs/docs/community-packages/mongo-transactions.md
new file mode 100644
index 0000000000..e49caebeb1
--- /dev/null
+++ b/v3-docs/docs/community-packages/mongo-transactions.md
@@ -0,0 +1,83 @@
+# Mongo-transactions
+
+- `Who maintains the package` – [Jam](https://github.com/jamauro)
+
+[[toc]]
+
+## What is this package?
+
+`jam:mongo-transactions` enables an easy way to work with Mongo Transactions in Meteor apps. Here are a few of the benefits:
+
+* Write with the standard Meteor collection methods you're accustomed to. You don't need to worry about using `rawCollection()`, though if you need a particular `rawCollection()` method, you can still use it.
+* You don't need to worry about passing `session` around. This package takes care of that for you.
+* Because it's a low-level solution, ID generation works as expected.
+* Works out-of-the-box with other packages that automatically validate on DB writes, like `jam:easy-schema` and `aldeed:collection2`.
+* One simple API to use. Mongo has made things complicated with two APIs for Transactions, the Callback API and the Core API. This package defaults to using the Callback API as recommended by Mongo, but allows you to use the Core API by passing in `autoRetry: false`.
+* Can be used isomorphically.
+* Compatible with Meteor 2.8.1 and up, including support for Meteor 3.0+
+
+> **Important**: This package expects that you'll use the promise-based `*Async` Meteor collection methods introduced in `v2.8.1` though it will technically work with the older syntax without the `*Async` suffix as long as you don't use callbacks. It does **not** cover using callbacks with Meteor collection methods.
+
+## How to download it?
+Add the package to your app
+```bash
+meteor add jam:mongo-transactions
+```
+
+## How to use it?
+
+### Create a Transaction
+
+> **Note**: there's no need to pass `session` into the `*Async` collection methods. This package handles that for you.
+
+```js
+import { Mongo } from 'meteor/mongo';
+
+async function purchase(purchaseData) {
+  try {
+    const { invoiceId } = await Mongo.withTransaction(async () => {
+      const invoiceId = await Invoices.insertAsync(purchaseData);
+      const changeQuantity = await Items.updateAsync(purchaseData.itemId, { $set: {...} });
+      return { invoiceId, changeQuantity } // you can return whatever you'd like
+    });
+    return invoiceId;
+  } catch (error) {
+    // something went wrong with the transaction and it could not be automatically retried
+    // handle the error as you see fit
+  }
+}
+```
+
+### Passing Transaction options
+If you want to customize how the Transaction runs, pass in the Transaction options as the second argument, for example:
+```js
+await Mongo.withTransaction(async () => {
+  ...
+}, { writeConcern: { w: 1 } });
+```
+Refer to the [Mongo Node API docs](https://mongodb.github.io/node-mongodb-native/6.3/interfaces/TransactionOptions.html) for more information about Transaction options.
+
+### Preventing automatic retries if the Transaction fails
+Most of the time, you'll want the default behavior where the Transaction is automatically retried for a `TransientTransactionError` or `UnknownTransactionCommitResult` commit error. But if you don't want that behavior, simply pass in `{ autoRetry: false }` like this:
+
+```js
+await Mongo.withTransaction(async () => {
+  ...
+}, { autoRetry: false });
+```
+
+Setting `{ autoRetry: false }`, means the Transactions Core API will be used rather than the Callback API and you'll be responsible for handling all errors. You can read more about the differences in the [Mongo Docs](https://www.mongodb.com/docs/manual/core/transactions-in-applications/).
+
+### Determine if you're in a Transaction
+To determine if the code is currently running in a Transaction, use:
+```js
+Mongo.inTransaction(); // returns true or false
+```
+
+### Using Isomorphically for Optimistic UI
+You can write `Mongo.withTransaction` and `Mongo.inTransaction` isomorphically for Optimistic UI however note that the Transaction will only truly be performed on the server.
+
+As with any isomorphic code, you should be aware that it may fail because the operation can't succeed on the client but will succeed on the server. For example, let's say you're using `.find` within the Transaction and Minimongo on the client doesn't have that particular data, the client will fail but the server should still succeed. You can wrap specific server-only code with `if (Meteor.isServer)`, but in these cases, you'll likely want to avoid isomorphic code and make sure the entire Transaction code only runs on the server.
+
+## Using Mongo Atlas as your DB?
+> **Important**: In my experience, you must use a paid tier for Transactions to work as expected with Meteor. The free tier would not tail the oplog for Transactions. So if you're trying this out in production, be sure to use a paid tier.
diff --git a/v3-docs/docs/community-packages/pub-sub.md b/v3-docs/docs/community-packages/pub-sub.md
new file mode 100644
index 0000000000..42d6a94aac
--- /dev/null
+++ b/v3-docs/docs/community-packages/pub-sub.md
@@ -0,0 +1,229 @@
+# Pub-sub
+
+- `Who maintains the package` – [Jam](https://github.com/jamauro)
+
+[[toc]]
+
+## What is this package?
+
+`jam:pub-sub` brings three key features to Meteor apps:
+
+1. Method-based publish / subscribe
+2. Change Streams-based publish / subscribe
+3. Subscription caching
+
+> **Important**: This package expects that you'll use the promise-based `*Async` Meteor collection methods introduced in `v2.8.1`.
+
+## Method-based publish / subscribe
+Meteor's traditional `publish / subscribe` is truly wonderful. However, there is a cost to pushing updates reactively to all connected clients – it's resource intensive and will eventually place limits on your ability to scale your app.
+
+One way to reduce the need for the traditional `publish / subscribe` is to fetch the data via a `Meteor Method` but there's a big problem here: the data **won't** be automatically merged into Minimongo and you completely lose Meteor's magical reactivity. Minimongo is great to work with and makes things easy as the source of truth on the client. Without it, you'll need to create your own stores on the client and essentially duplicate Minimongo.
+
+With `jam:pub-sub`, you use `Meteor.publish.once` and the same `Meteor.subscribe` to have the data fetched via a Meteor Method and merged automatically in Minimongo so you can work with it as you're accustomed to. It also automatically preserves reactivity for the user when they make database writes. Note that these writes will **not** be broadcast in realtime to all connected clients by design but in many cases you might find that you don't need that feature of Meteor's traditional `publish / subscribe`.
+
+## How to download it?
+
+Add the package to your app
+```bash
+meteor add jam:pub-sub
+```
+
+## How to use it?
+
+## Change Streams-based publish / subscribe
+**`Alpha`**
+
+With `jam:pub-sub` and MongoDB Change Streams, you can preserve Meteor's magical reactivity for all clients while opting out of the traditional `publish / subscribe` and its use of the `oplog`. Use `Meteor.publish.stream` instead of using `Meteor.publish` and subscribe using the same `Meteor.subscribe` on the client.
+
+**Important**: Change Streams will work best when the filter you use can be shared. To that end, if you have a publication that includes a `userId`, this package will filter out that condition when setting up the Change Stream because it will result in too many unique change streams. As an example, lets say you have this publication:
+
+```js
+Meteor.publish.stream('todos', function() {
+  return Todos.find({
+    $or: [
+      { isPrivate: false },
+      { owner: this.userId }
+    ]
+  });
+});
+```
+
+When this publication is invoked, it will pull all the `Todos` that match the filter above and then begin watching a Change Stream with this filter:
+```js
+  { isPrivate: false }
+```
+
+For this particular filter, it should behave as you'd expect so you wouldn't need to make changes. However, if you have complex filters involving the `userId`, you'll need to be sure that the behavior you expect remains when using `.stream`. If it's not meeting your needs, you could split the one publication into two publications, using a `.stream` with a filter than can be shared and a `.once` for the `userId`:
+
+```js
+Meteor.publish.stream('todos.public', function() {
+  return Todos.find({ isPrivate: false });
+});
+
+Meteor.publish.once('todos.owned', function() {
+  return Todos.find({ owner: this.userId });
+});
+```
+
+The downside by splitting into two is it could result in over-fetching but the data will be merged correctly into Minimongo.
+
+**Note**: In most cases, you'd likely benefit the most from using `Meteor.publish.once` anywhere you can and using `Meteor.publish.stream` only when you really need it and with a filter than can be shared.
+
+**Note**: If you decide to entirely opt-out of using the traditional `Meteor.publish`, then you'll also want to disable the `oplog` entirely &mdash; add the `disable-oplog` package with `meteor add disable-oplog`.
+
+At the moment, this feature is considered in an `alpha` state. Based on previous [Change Streams experiments](https://github.com/meteor/meteor/discussions/11842#discussioncomment-4061112) by the Meteor Community, it seems that using Change Streams as a wholesale replacement for the traditional `publish / subscribe` could "just work". However, in practice it may be a "Your Mileage May Vary" type of situation depending on the frequency of writes, number of connected clients, how you model your data, and how you set up the cursors inside of `Meteor.publish.stream`. With that said, if you're interested in this feature, I'd encourage you to try it out and share your findings.
+
+## Subscription caching
+Normally, when a user moves between routes or components, the subscriptions will be stopped. When a user is navigating back and forth in your app, each time will result in a re-subscribe which means more spinners, a slower experience, and is generally a waste.
+
+By caching your subscriptions, you can create a better user experience for your users. Since the subscription itself is being cached, the data in Minimongo will be updated in the background until the `cacheDuration` expires for that subscription at which point it will be stopped and the data will be removed from Minimongo as expected.
+
+## Usage
+
+### Add the package to your app
+`meteor add jam:pub-sub`
+
+### Define a Method-based publication
+Define a publication using `Meteor.publish.once` and subscribe just as you do currently. `Meteor.publish.once` expects you to return a cursor or an array of cursors just like `Meteor.publish`.
+
+```js
+// server
+Meteor.publish.once('notes.all', function() {
+  return Notes.find();
+});
+```
+
+```js
+// client
+// Since each view layer (Blaze, React, Svelte, Vue, etc) has a different way of using `Tracker.autorun`, I've omitted it for brevity. You'd subscribe just as you do currently in your view layer of choice.
+Meteor.subscribe('notes.all')
+
+// work with the Notes collection in Minimongo as you're accustomed to
+Notes.find().fetch();
+```
+That's it. By using `Meteor.publish.once`, it will fetch the data initally and automatically merge it into Minimongo. Any database writes to the `Notes` collection will be sent reactively to the user that made the write.
+
+> **Important**: when naming your publications be sure to include the collection name(s) in it. This is generally common practice and this package relies on that convention. If you don't do this and you're caching the subscription, Minimongo data may be unexpectedly removed or retained when the subscription stops. It's recommended that you follow this convention for all publications including `Meteor.publish`. Here are some examples of including the collection name in the publication name:
+```js
+// the name you assign inside Mongo.Collection should be in your publication name(s), in this example 'notes'
+const Notes = new Mongo.Collection('notes')
+
+// as long as it appears somewhere in your publication name, you're good to go. here are some examples:
+Meteor.publish.once('notes');
+Meteor.publish.once('notes.all');
+Meteor.publish.once('notes/single');
+Meteor.publish.once('somethingAndNotes');
+```
+
+It also works just as you'd expect for an array of cursors:
+
+```js
+// server
+Meteor.publish.once('notes.todos.all', function() {
+  return [Notes.find(), Todos.find()];
+});
+```
+
+```js
+// client
+Meteor.subscribe('notes.todos.all');
+
+// work with the Notes collection in Minimongo as you're accustomed to
+Notes.find().fetch();
+
+// work with the Todos collection in Minimongo as you're accusomted to
+Todos.find().fetch();
+```
+
+Inside `Meteor.publish.once`, `this.userId` and [this.added](https://docs.meteor.com/api/pubsub.html#Subscription-added) can still be used. The added document will be included in the final result data. The rest of the low-level `publish` API will be disregarded, as they no longer fit into the context of a Method-based data fetch.
+
+```js
+Meteor.publish.once('notes.all', function() {
+  // ... //
+  const userId = this.userId;
+
+  this.added('notes', _id, fields);
+  // ... //
+  return Notes.find();
+})
+```
+
+### Define a Change Streams-based publication
+Define a publication using `Meteor.publish.stream` and subscribe just as you do currently. `Meteor.publish.stream` expects you to return a cursor or an array of cursors just like `Meteor.publish`.
+
+```js
+// server
+Meteor.publish.stream('notes.all', function() {
+  return Notes.find();
+});
+```
+
+```js
+// client
+// Since each view layer (Blaze, React, Svelte, Vue, etc) has a different way of using `Tracker.autorun`, I've omitted it for brevity. You'd subscribe just as you do currently in your view layer of choice.
+Meteor.subscribe('notes.all')
+
+// work with the Notes collection in Minimongo as you're accustomed to
+Notes.find().fetch();
+```
+That's it. By using `Meteor.publish.stream`, any database writes to the `Notes` collection will be sent reactively to **all** connected clients just as with `Meteor.publish`.
+
+#### Setting the `maxPoolSize` for Change Streams
+`maxPoolSize` defaults to `100` which may not need adjusting. If you need to adjust it, you can set it in [Meteor.settings](https://docs.meteor.com/api/collections.html#mongo_connection_options_settings) like this:
+```js
+{
+  //...//
+  "packages": {
+    "mongo": {
+      "options": {
+        "maxPoolSize": 200 // or whatever is appropriate for your application
+      }
+    }
+  }
+  // ... //
+}
+```
+
+### Turn on subscription caching
+With `jam:pub-sub`, you can enable subscription caching globally or at a per-subscription level. Subscription caching is turned off by default to preserve the current behavior in Meteor. Any subscription can be cached, regardless of how it's published.
+
+To enable subscription caching globally for every subscription:
+```js
+// put this in a file that's imported on the client at a minimum. it can be used isomorphically but the configuration only applies to the client.
+import { PubSub } from 'meteor/jam:pub-sub';
+
+PubSub.configure({
+  cache: true // defaults to false
+});
+```
+
+The global `cacheDuration` is set to `60 seconds` by default. This is from when the subscription was originally set to be stopped, i.e. when the component housing the subscription was destroyed because the user navigated away. If the user comes right back, then the cache will be used. If they don't, after `60 seconds`, the subscription cache will be removed. If you want to change the global `cacheDuration`, change it with a value in `seconds`:
+
+```js
+import { PubSub } from 'meteor/jam:pub-sub';
+
+PubSub.configure({
+  cacheDuration: 5 * 60 // sets the cacheDuration to 5 minutes. defaults to 1 min
+});
+```
+
+You can also configure `cache` and `cacheDuration` for each individual subscription when you use `Meteor.subscribe`. For example:
+```js
+Meteor.subscribe('todos.single', _id, { cacheDuration: 30 }) // caches for 30 seconds, overriding the global default
+Meteor.subscribe('notes.all', { cache: true }) // turns caching on, overriding the global default, and uses the global default cacheDuration
+```
+
+> **Note**: the rest of the [Meteor.subscribe](https://docs.meteor.com/api/pubsub.html#Meteor-subscribe) API (e.g. `onStop`, `onReady`) works just as you'd expect.
+
+> **Note**: Because the data will remain in Minimongo while the subscription is cached, you should be mindful of your Minimongo `.find` selectors. Be sure to use specific selectors to `.find` the data you need for that particular subscription. This is generally considered [best practice](https://guide.meteor.com/data-loading#fetching) so this is mainly a helpful reminder.
+
+#### Clearing the cache
+Each individual subcription will be automatically removed from the cache when its `cacheDuration` elapses.
+
+Though it shouldn't be necessary, you can programmatically clear all cached subscriptions:
+
+```js
+import { PubSub } from 'meteor/jam:pub-sub';
+
+PubSub.clearCache();
+```
diff --git a/v3-docs/docs/community-packages/soft-delete.md b/v3-docs/docs/community-packages/soft-delete.md
new file mode 100644
index 0000000000..adf16e0d3b
--- /dev/null
+++ b/v3-docs/docs/community-packages/soft-delete.md
@@ -0,0 +1,74 @@
+# Soft-delete
+
+- `Who maintains the package` – [Jam](https://github.com/jamauro)
+
+[[toc]]
+
+## What is this package?
+
+Soft Delete is an easy way to add soft deletes to your Meteor app. Its key features are:
+
+* Zero config needed (though you can customize)
+* Isomorphic so that it works with Optimistic UI
+* Automatically overrides `removeAsync` to make it a soft delete
+* Automatically adds the soft delete flag on `insertAsync` and to the filter for your queries, e.g. `.find`, so you don't need to make any changes to them
+* Recover soft deleted docs with `recoverAsync` collection method
+* Explicitly soft delete with `softRemoveAsync` collection method (optional)
+* Optionally add a `deletedAt` timestamp
+* Optionally exclude specific collections
+* Compatible with Meteor `2.8.1+` and `3.0+`
+
+> **Note:** Alternative to soft deletion is to archive documents in your collection. You can use [`jam:archive`](./archive.md) package for that. Be sure to compare those two approaches to pick the solution best suited for your application.
+
+## How to download it?
+
+Add the package to your app
+```bash
+meteor add jam:soft-delete
+```
+
+## How to use it?
+
+### Deleting permanently
+By default, this package overrides the `removeAsync` collection method so that it soft deletes the document(s) with a boolean flag rather that removing them from the database. To delete permanently, pass in the option `soft: false`, e.g.:
+```js
+Collection.removeAsync(/* your filter */, { soft: false })
+```
+
+If you prefer, you can prevent overriding the `removeAsync` by setting `overrideRemove: false`. See [Configuring](#configuring-optional) for more details.
+
+### Explicitly soft deleting
+If you prefer, you can explicity use `softRemoveAsync`, e.g.:
+```js
+Collection.softRemoveAsync(/* your filter */)
+```
+
+### Recovering a document
+To recover a soft deleted document, use `recoverAsync`, e.g.:
+```js
+Collection.recoverAsync(/* your filter */)
+```
+
+## Configuring (optional)
+If you like the defaults, then you won't need to configure anything. But there is some flexibility in how you use this package.
+
+Here are the global defaults:
+```js
+const config = {
+  deleted: 'deleted', // the field name used for the boolean flag. you can update to your preference, e.g. 'isDeleted'
+  deletedAt: '', // add the name of the field you'd like to use for a deletedAt timestamp, e.g. 'deletedAt', if you want to include it on your docs
+  autoFilter: true, // automatically adds the { [deleted]: false } filter to your queries
+  overrideRemove: true, // overrides the Collection.removeAsync method to make it a soft delete instead
+  exclude: ['roles', 'role-assignment'] // exclude specific collections from using soft delete. defaults to excluding the collections created the meteor roles package
+};
+```
+
+To change the global defaults, use:
+```js
+// put this in a file that's imported on both the client and server
+import { SoftDelete } from 'meteor/jam:soft-delete';
+
+SoftDelete.configure({
+  // ... change the defaults here ... //
+});
+```

From 683c3227d7c87af5475fa04812915ede3b12493b Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 11 Mar 2025 09:38:31 +0100
Subject: [PATCH 1123/1140] Fix packages categorization

---
 v3-docs/docs/community-packages/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/community-packages/index.md b/v3-docs/docs/community-packages/index.md
index 99739a5ccc..ee31736a45 100644
--- a/v3-docs/docs/community-packages/index.md
+++ b/v3-docs/docs/community-packages/index.md
@@ -29,12 +29,12 @@ Please bear in mind if you are adding a package to this list, try providing as m
 - [`meteor-rpc`](./meteor-rpc.md), Meteor Methods Evolved with type checking and runtime validation
 - [`jam:method`](./jam-method.md), An easy way to create Meteor methods with extensions to offline handling
 - [`jam:pub-sub`](./pub-sub.md), Publish / subscribe using a Method and/or Change Streams, and cache subscriptions for Meteor apps
-- [`jam:soft-delete`](./soft-delete.md), An easy way to add soft deletes to your Meteor app
-- [`jam:archive`](./archive.md),
 
 #### MongoDB collection extensions
 
 - [`jam:mongo-transactions`](./mongo-transactions.md), An easy way to use Mongo Transactions for Meteor apps
+- [`jam:soft-delete`](./soft-delete.md), An easy way to add soft deletes to your Meteor app
+- [`jam:archive`](./archive.md),
 
 #### Utilities
 

From 4836cd6e39da8ef250cae246b4a6b40d8edae0db Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Tue, 11 Mar 2025 09:51:46 +0100
Subject: [PATCH 1124/1140] Remove wrong title

---
 v3-docs/docs/community-packages/archive.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/v3-docs/docs/community-packages/archive.md b/v3-docs/docs/community-packages/archive.md
index f727867d37..75774b43e6 100644
--- a/v3-docs/docs/community-packages/archive.md
+++ b/v3-docs/docs/community-packages/archive.md
@@ -1,7 +1,5 @@
 # Archive
 
-# Soft-delete
-
 - `Who maintains the package` – [Jam](https://github.com/jamauro)
 
 [[toc]]

From 2084b64c15dcc58e002b927a1f5ea01b805e9453 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storytellercz@proton.me>
Date: Sun, 16 Mar 2025 18:24:41 +0100
Subject: [PATCH 1125/1140] Add GitHub links

---
 v3-docs/docs/community-packages/archive.md            | 4 ++++
 v3-docs/docs/community-packages/jam-method.md         | 3 +++
 v3-docs/docs/community-packages/mongo-transactions.md | 3 +++
 v3-docs/docs/community-packages/offline.md            | 4 ++++
 v3-docs/docs/community-packages/pub-sub.md            | 3 +++
 v3-docs/docs/community-packages/soft-delete.md        | 3 +++
 6 files changed, 20 insertions(+)

diff --git a/v3-docs/docs/community-packages/archive.md b/v3-docs/docs/community-packages/archive.md
index 75774b43e6..ffa8f825de 100644
--- a/v3-docs/docs/community-packages/archive.md
+++ b/v3-docs/docs/community-packages/archive.md
@@ -25,6 +25,10 @@ Add the package to your app
 meteor add jam:archive
 ```
 
+### Sources
+
+* [GitHub repository](https://github.com/jamauro/archive)
+
 ## How to use it?
 
 ### Create your Archives collection
diff --git a/v3-docs/docs/community-packages/jam-method.md b/v3-docs/docs/community-packages/jam-method.md
index 54f31f6f31..0958974d6c 100644
--- a/v3-docs/docs/community-packages/jam-method.md
+++ b/v3-docs/docs/community-packages/jam-method.md
@@ -25,6 +25,9 @@ Add the package to your app by running the following in your Meteor project:
 ```bash
 meteor add jam:method
 ```
+### Sources
+
+* [GitHub repository](https://github.com/jamauro/method)
 
 ## How to use it?
 
diff --git a/v3-docs/docs/community-packages/mongo-transactions.md b/v3-docs/docs/community-packages/mongo-transactions.md
index e49caebeb1..0997f17c25 100644
--- a/v3-docs/docs/community-packages/mongo-transactions.md
+++ b/v3-docs/docs/community-packages/mongo-transactions.md
@@ -23,6 +23,9 @@ Add the package to your app
 ```bash
 meteor add jam:mongo-transactions
 ```
+### Sources
+
+* [GitHub repository](https://github.com/jamauro/mongo-transactions)
 
 ## How to use it?
 
diff --git a/v3-docs/docs/community-packages/offline.md b/v3-docs/docs/community-packages/offline.md
index 75252d83b7..f811454652 100644
--- a/v3-docs/docs/community-packages/offline.md
+++ b/v3-docs/docs/community-packages/offline.md
@@ -20,6 +20,10 @@ Add the package to your app
 meteor add jam:offline
 ```
 
+### Sources
+
+* [GitHub repository](https://github.com/jamauro/offline)
+
 ## How to use it?
 
 ### Keeping data offline
diff --git a/v3-docs/docs/community-packages/pub-sub.md b/v3-docs/docs/community-packages/pub-sub.md
index 42d6a94aac..7015efe054 100644
--- a/v3-docs/docs/community-packages/pub-sub.md
+++ b/v3-docs/docs/community-packages/pub-sub.md
@@ -27,6 +27,9 @@ Add the package to your app
 ```bash
 meteor add jam:pub-sub
 ```
+### Sources
+
+* [GitHub repository](https://github.com/jamauro/pub-sub)
 
 ## How to use it?
 
diff --git a/v3-docs/docs/community-packages/soft-delete.md b/v3-docs/docs/community-packages/soft-delete.md
index adf16e0d3b..497b0d0232 100644
--- a/v3-docs/docs/community-packages/soft-delete.md
+++ b/v3-docs/docs/community-packages/soft-delete.md
@@ -26,6 +26,9 @@ Add the package to your app
 ```bash
 meteor add jam:soft-delete
 ```
+### Sources
+
+* [GitHub repository](https://github.com/jamauro/soft-delete)
 
 ## How to use it?
 

From 5a53385b542c662517fbb1ba917f8dad6e084802 Mon Sep 17 00:00:00 2001
From: Joe Pea <trusktr@gmail.com>
Date: Wed, 19 Mar 2025 17:38:02 -0500
Subject: [PATCH 1126/1140] Update testing.md to show how to clean up Blaze
 View instances.

This adds an additional `Blaze.remove(view)` call to the sample test function to ensure the Blaze view is cleaned up properly. Additionally, this is great, even if not needed, because the Meteor AI in the new doc site answers questions about "how to render Blaze views with JavaScript" based on this `Blaze.renderWithData` example, so it is important for the AI to tell a person asking how to propertly clean up the `Blaze.View`.
---
 guide/source/testing.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guide/source/testing.md b/guide/source/testing.md
index f7500c2db4..fe05beb718 100644
--- a/guide/source/testing.md
+++ b/guide/source/testing.md
@@ -238,9 +238,11 @@ import { Tracker } from 'meteor/tracker';
 const withDiv = function withDiv(callback) {
   const el = document.createElement('div');
   document.body.appendChild(el);
+  let view = null
   try {
-    callback(el);
+    view = callback(el);
   } finally {
+    if (view) Blaze.remove(view)
     document.body.removeChild(el);
   }
 };
@@ -248,9 +250,10 @@ const withDiv = function withDiv(callback) {
 export const withRenderedTemplate = function withRenderedTemplate(template, data, callback) {
   withDiv((el) => {
     const ourTemplate = isString(template) ? Template[template] : template;
-    Blaze.renderWithData(ourTemplate, data, el);
+    vonst view = Blaze.renderWithData(ourTemplate, data, el);
     Tracker.flush();
     callback(el);
+    return view
   });
 };
 ```

From 618e5a24baf8948323414b44ab5e686311055c04 Mon Sep 17 00:00:00 2001
From: Joe Pea <trusktr@gmail.com>
Date: Wed, 19 Mar 2025 19:57:15 -0500
Subject: [PATCH 1127/1140] fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Italo José <italo.i@live.com>
---
 guide/source/testing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guide/source/testing.md b/guide/source/testing.md
index fe05beb718..7dfffb4a51 100644
--- a/guide/source/testing.md
+++ b/guide/source/testing.md
@@ -250,7 +250,7 @@ const withDiv = function withDiv(callback) {
 export const withRenderedTemplate = function withRenderedTemplate(template, data, callback) {
   withDiv((el) => {
     const ourTemplate = isString(template) ? Template[template] : template;
-    vonst view = Blaze.renderWithData(ourTemplate, data, el);
+    const view = Blaze.renderWithData(ourTemplate, data, el);
     Tracker.flush();
     callback(el);
     return view

From 69547ece0ab17dad8706d9e94ca5e43cb0f9e3b9 Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Mon, 24 Mar 2025 18:38:45 -0300
Subject: [PATCH 1128/1140] Update documentation to reflect Meteor 3 release
 and Node.js version changes.

---
 docs/source/index.md   | 2 +-
 docs/source/install.md | 4 ++--
 guide/source/index.md  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/source/index.md b/docs/source/index.md
index 441b4dbe2b..208309701d 100644
--- a/docs/source/index.md
+++ b/docs/source/index.md
@@ -2,7 +2,7 @@
 title: Docs
 ---
 
-> Meteor 2.x uses the deprecated Node.js 14. Meteor 3.0 has been released and runs on Node.js 20. Check out our [v3 docs](https://v3-docs.meteor.com) and [migration guide](https://v3-migration-docs.meteor.com/).
+> Meteor 2.x runs on a deprecated Node.js version (14). Meteor 3 has been released with support for the latest Node.js LTS version. For more information, please consult our [migration guide](https://v3-migration-docs.meteor.com/) and the [latest docs](https://v3-docs.meteor.com).
 
 <!--  XXX: note that this content is somewhat duplicated on the guide, and should be updated in parallel -->
 <h2 id="what-is-meteor">What is Meteor?</h2>
diff --git a/docs/source/install.md b/docs/source/install.md
index 1db8b8f1c6..06b0587502 100644
--- a/docs/source/install.md
+++ b/docs/source/install.md
@@ -8,7 +8,7 @@ You need to install the Meteor command line tool to create, run, and manage your
 
 <h3 id="prereqs-node">Node.js version</h3>
 
-> Meteor 2.x uses the deprecated Node.js 14. Meteor 3.0 has been released and runs on Node.js 20. Check out our [v3 docs](https://v3-docs.meteor.com) and [migration guide](https://v3-migration-docs.meteor.com/).
+> Meteor 2.x runs on a deprecated Node.js version (14). Meteor 3 has been released with support for the latest Node.js LTS version. For more information, please consult our [migration guide](https://v3-migration-docs.meteor.com/) and the [latest docs](https://v3-docs.meteor.com).
 
 - Node.js version >= 10 and <= 14 is required.
 - We recommend you using [nvm](https://github.com/nvm-sh/nvm) or [Volta](https://volta.sh/) for managing Node.js versions.
@@ -30,7 +30,7 @@ You need to install the Meteor command line tool to create, run, and manage your
 
 Install the latest official version of Meteor.js from your terminal by running one of the commands below. You can check our [changelog](https://docs.meteor.com/changelog.html) for the release notes.
 
-> Run `node -v` to ensure you are using Node.js 14. Meteor 3.0, currently in its Release Candidate version, runs on Node.js v20.
+> Run `node -v` to ensure you are using Node.js 14. Meteor 3 0, currently in its Release Candidate version, runs on Node.js v20.
 
 For Windows, Linux and OS X, you can run the following command:
 
diff --git a/guide/source/index.md b/guide/source/index.md
index 427c62ae52..7541dc2fff 100644
--- a/guide/source/index.md
+++ b/guide/source/index.md
@@ -3,7 +3,7 @@ title: Introduction
 description: This is the guide for using Meteor, a full-stack JavaScript platform for developing modern web and mobile applications.
 ---
 
-> Meteor 2.x uses the deprecated Node.js 14. Meteor 3.0 has been released and runs on Node.js 20. Check out our [v3 docs](https://v3-docs.meteor.com) and [migration guide](https://v3-migration-docs.meteor.com/).
+> Meteor 2.x runs on a deprecated Node.js version (14). Meteor 3 has been released with support for the latest Node.js LTS version. For more information, please consult our [migration guide](https://v3-migration-docs.meteor.com/) and the [latest docs](https://v3-docs.meteor.com).
 
 <!--  XXX: note that this content is somewhat duplicated on the docs, and should be updated in parallel -->
 <h2 id="what-is-meteor">What is Meteor?</h2>

From 36ba2701774109b681a7281208a2edc7198acf61 Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Mon, 24 Mar 2025 19:22:03 -0300
Subject: [PATCH 1129/1140] Enhance CLI documentation for `meteor help`,
 `meteor run`, and `meteor deploy` commands.

---
 v3-docs/docs/cli/index.md | 354 ++++++++++++++++++++++++--------------
 1 file changed, 225 insertions(+), 129 deletions(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 8cdcb64636..92cbe6acb5 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -8,76 +8,154 @@ command-line tool. This is just an overview and does not mention every command
 or every option to every command; for more details, use the `meteor help`
 command.
 
-## meteor help {meteorhelp}
+## meteor help {#meteorhelp}
 
-Get help on meteor command line usage. Running `meteor help` by
-itself will list the common meteor
-commands. Running <code>meteor help <i>command</i></code> will print
-detailed help about the command.
+Get help on meteor command line usage.
 
+```bash
+meteor help
+```
 
-## meteor run {meteorrun}
+Lists the common meteor commands.
 
-Run a meteor development server in the current project. Searches
-upward from the current directory for the root directory of a Meteor
-project. Whenever you change any of the application's source files, the
-changes are automatically detected and applied to the running
-application.
+```bash
+meteor help <command>
+```
 
-You can use the application by pointing your web browser at
-<a href="http://localhost:3000">localhost:3000</a>. No Internet connection is
-required.
+Prints detailed help about the specific command.
 
-This is the default command. Simply running `meteor` is the
-same as `meteor run`.
+## meteor run {#meteorrun}
 
-To pass additional options to Node.js use the `SERVER_NODE_OPTIONS` environment variable. E.g. for Windows PowerShell:
-`$env:SERVER_NODE_OPTIONS = '--inspect' | meteor run`. Or for Linux: `SERVER_NODE_OPTIONS=--inspect-brk meteor run`.
+Run a meteor development server in the current project.
 
-To specify a port to listen on (instead of the default 3000), use `--port [PORT]`.
-(The development server also uses port `N+1` for the default MongoDB instance)
+```bash
+meteor run
+```
 
-For example: `meteor run --port 4000`
-will run the development server on `http://localhost:4000`
-and the development MongoDB instance on `mongodb://localhost:4001`.
+::: tip
+This is the default command. Simply running `meteor` is the same as `meteor run`.
+:::
 
-Run `meteor help run` to see the full list of options.
+### Features
 
-## meteor debug {meteordebug}
+- Automatically detects and applies changes to your application's source files
+- No Internet connection required
+- Accesses the application at [localhost:3000](http://localhost:3000) by default
+- Searches upward from the current directory for the root directory of a Meteor project
 
-Run the project, but suspend the server process for debugging.
+### Options
 
-> **NOTE:** The `meteor debug` command has been superseded by the more flexible
-> `--inspect` and `--inspect-brk` command-line flags, which work for any `run`,
-> `test`, or `test-packages` command.
->
-> The syntax of these flags is the same as the equivalent Node.js
-> [flags](https://nodejs.org/en/docs/inspector/#command-line-options),
-> with two notable differences:
->
-> * The flags affect the server process spawned by the build process,
->   rather than affecting the build process itself.
->
-> * The `--inspect-brk` flag causes the server process to pause just after
->   server code has loaded but before it begins to execute, giving the
->   developer a chance to set breakpoints in server code.
+| Option | Description |
+|--------|-------------|
+| `--port`, `-p <port>` | Port to listen on (default: 3000). Also uses port N+1 and a port specified by --app-port. Specify as --port=host:port to bind to a specific interface |
+| `--open`, `-o` | Opens a browser window when the app starts |
+| `--inspect[-brk][=<port>]` | Enable server-side debugging via debugging clients. With --inspect-brk, pauses at startup (default port: 9229) |
+| `--mobile-server <url>` | Location where mobile builds connect (defaults to local IP and port). Can include URL scheme (e.g., https://example.com:443) |
+| `--cordova-server-port <port>` | Local port where Cordova will serve content |
+| `--production` | Simulate production mode. Minify and bundle CSS and JS files |
+| `--raw-logs` | Run without parsing logs from stdout and stderr |
+| `--settings`, `-s <file>` | Set optional data for Meteor.settings on the server |
+| `--release <version>` | Specify the release of Meteor to use |
+| `--verbose` | Print all output from builds logs |
+| `--no-lint` | Don't run linters used by the app on every rebuild |
+| `--no-release-check` | Don't run the release updater to check for new releases |
+| `--allow-incompatible-update` | Allow packages to be upgraded or downgraded to potentially incompatible versions |
+| `--extra-packages <packages>` | Run with additional packages (comma separated, e.g., "package-name1, package-name2@1.2.3") |
+| `--exclude-archs <archs>` | Don't create bundles for certain web architectures (comma separated, e.g., "web.browser.legacy, web.cordova") |
 
-The server process will be suspended just before the first statement of
-server code that would normally execute. In order to continue execution of
-server code, use either the web-based Node Inspector or the command-line
-debugger (further instructions will be printed in the console).
+### Node.js Options
 
-Breakpoints can be set using the <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/debugger" target="_blank">`debugger` keyword</a>, or through the web UI of Node Inspector ("Sources" tab).
+To pass additional options to Node.js, use the `SERVER_NODE_OPTIONS` environment variable:
 
-The server process debugger will listen for incoming connections from
-debugging clients, such as node-inspector, on port 5858 by default. To
-specify a different port use the `--debug-port <port>` option.
+**Windows PowerShell:**
+```powershell
+$env:SERVER_NODE_OPTIONS = '--inspect' | meteor run
+```
 
-The same debugging functionality can be achieved by adding the `--debug-port <port>`
-option to other `meteor` tool commands, such as `meteor run` and `meteor test-packages`.
+**Linux/macOS:**
+```bash
+SERVER_NODE_OPTIONS=--inspect-brk meteor run
+```
 
-> **Note:** Due to a [bug in `node-inspector`](https://github.com/node-inspector/node-inspector/issues/903), pushing "Enter" after a command on the Node Inspector Console will not successfully send the command to the server.  If you require this functionality, please consider using Safari or `meteor shell` in order to interact with the server console until the `node-inspector` project [fixes the bug](https://github.com/node-inspector/node-inspector/pull/955).  Alternatively, there is a hot-patch available [in this comment](https://github.com/meteor/meteor/issues/7991#issuecomment-266709459) on [#7991](https://github.com/meteor/meteor/issues/7991).
+### Port Configuration Example
 
+```bash
+meteor run --port 4000
+```
+
+This command:
+- Runs the development server on `http://localhost:4000`
+- Runs the development MongoDB instance on `mongodb://localhost:4001`
+
+::: info
+The development server always uses port `N+1` for the default MongoDB instance, where `N` is the application port.
+:::
+
+## meteor debug {#meteordebug}
+
+Run the project with the server process suspended for debugging.
+
+::: warning Deprecation Notice
+The `meteor debug` command has been superseded by the more flexible `--inspect` and `--inspect-brk` command-line flags, which work with `run`, `test`, and `test-packages` commands.
+:::
+
+### Modern Debugging Approach
+
+```bash
+# Debug server with auto-attachment
+meteor run --inspect
+
+# Debug server and pause at start
+meteor run --inspect-brk
+```
+
+### Command Usage
+
+```bash
+meteor debug [--debug-port <port>]
+```
+
+### How It Works
+
+- Server process suspends just before the first statement of server code execution
+- Debugger listens for incoming connections on port 5858 by default
+- Use `--debug-port <port>` to specify a different port
+
+### Setting Breakpoints
+
+- Use the [`debugger`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/debugger) keyword in your code
+- Set breakpoints through the debugging client's UI (e.g., in the "Sources" tab)
+
+### Debugging Clients
+
+You can use either:
+- Web-based Node Inspector
+- Command-line debugger
+
+::: details Node Inspector Console Bug
+Due to a [bug in `node-inspector`](https://github.com/node-inspector/node-inspector/issues/903), pressing "Enter" after a command in the Node Inspector Console may not successfully send the command to the server.
+
+**Workarounds:**
+- Use Safari browser
+- Use `meteor shell` to interact with the server console
+- Apply the hot-patch available in [this comment](https://github.com/meteor/meteor/issues/7991#issuecomment-266709459)
+:::
+
+### Differences from Node.js Flags
+
+The Meteor `--inspect` and `--inspect-brk` flags work similarly to Node.js flags with two key differences:
+
+1. They affect the server process spawned by the build process, not the build process itself
+2. The `--inspect-brk` flag pauses execution after server code has loaded but before it begins to execute
+
+### Alternative Approach
+
+The same debugging functionality can be achieved by adding the `--debug-port <port>` option to other Meteor commands:
+
+```bash
+meteor run --debug-port 5858
+meteor test-packages --debug-port 5858
+```
 
 ## meteor create  _app-name_ {meteorcreate}
 
@@ -306,7 +384,7 @@ It will generate the following code in ``/imports/api``
 That will have the following code:
 
 
-## collection.js {meteorgenerate-collection.js}
+### collection.js {meteorgenerate-collection.js}
 
 ```js
 import { Mongo } from 'meteor/mongo';
@@ -316,7 +394,7 @@ export const CustomerCollection = new Mongo.Collection('customer');
 
 
 
-## methods.js {meteorgenerate-methods.js}
+### methods.js {meteorgenerate-methods.js}
 
 ```js
 import { Meteor } from 'meteor/meteor';
@@ -352,7 +430,7 @@ Meteor.methods({
 
 
 
-## publication.js {meteorgenerate-publication.js}
+### publication.js {meteorgenerate-publication.js}
 
 ```js
 import { Meteor } from 'meteor/meteor';
@@ -366,7 +444,7 @@ Meteor.publish('allCustomers', function publishCustomers() {
 
 
 
-## index.js {meteorgenerate-index.js}
+### index.js {meteorgenerate-index.js}
 
 ```js
 export * from './collection';
@@ -376,7 +454,7 @@ export * from './publications';
 
 Also, there is the same version of these methods using TypeScript, that will be shown bellow.
 
-## path option {meteorgenerate-path}
+### path option {meteorgenerate-path}
 
 If you want to create in another path, you can use the ``--path`` option in order to select where to place this boilerplate.
 It will generate the model in that path. Note that is used TypeScript in this example.
@@ -392,7 +470,7 @@ It will generate in ``server/admin`` the another-client code:
 ![Screenshot 2022-11-09 at 11 32 39](https://user-images.githubusercontent.com/70247653/200857560-a4874e4c-1078-4b7a-9381-4c6590d2f63b.png)
 
 
-## collection.ts {meteorgenerate-collection.ts}
+### collection.ts {meteorgenerate-collection.ts}
 
 ```typescript
 import { Mongo } from 'meteor/mongo';
@@ -406,7 +484,7 @@ export type AnotherCustomer = {
 export const AnotherCustomerCollection = new Mongo.Collection<AnotherCustomer>('another-customer');
 ```
 
-## methods.ts {meteorgenerate-methods.ts}
+### methods.ts {meteorgenerate-methods.ts}
 
 ```typescript
 import { Meteor } from 'meteor/meteor';
@@ -443,7 +521,7 @@ Meteor.methods({
 
 
 
-## publications.ts {meteorgenerate-publications.ts}
+### publications.ts {meteorgenerate-publications.ts}
 
 ```typescript
 import { Meteor } from 'meteor/meteor';
@@ -456,7 +534,7 @@ Meteor.publish('allAnotherCustomers', function publishAnotherCustomers() {
 
 
 
-## index.ts {meteorgenerate-index.ts}
+### index.ts {meteorgenerate-index.ts}
 
 ```typescript
 export * from './collection';
@@ -467,7 +545,7 @@ export * from './publications';
 ---
 
 
-##  Using the Wizard   {meteorgenerate-wizard}
+###  Using the Wizard   {meteorgenerate-wizard}
 
 
 If you run the following command:
@@ -485,7 +563,7 @@ It will prompt the following questions.
 
 ---
 
-##  Using your own template  {meteorgenerate-templating}
+###  Using your own template  {meteorgenerate-templating}
 
 `--templatePath`
 
@@ -500,7 +578,7 @@ meteor generate feed --templatePath=/scaffolds-ts
 
 You can use your own templates for scaffolding your specific workloads. To do that, you should pass in a template directory URL so that it can copy it with its changes.
 
-##  How to rename things? {meteorgenerate-template-rename}
+###  How to rename things? {meteorgenerate-template-rename}
 
 Out of the box is provided a few functions such as replacing ``$$name$$``, ``$$PascalName$$`` and ``$$camelName$$``
 
@@ -518,7 +596,7 @@ const transformName = (name) => {
   }
 ```
 
-##  How to bring your own templates?  {meteorgenerate-template-faq}
+###  How to bring your own templates?  {meteorgenerate-template-faq}
 
 `--replaceFn`
 
@@ -582,81 +660,99 @@ third-party service providers.
 Once you have your account you can log in and log out from the command line, and
 check your username with `meteor whoami`.
 
-## meteor deploy  _site_ {meteordeploy}
+## meteor deploy _site_ {#meteordeploy}
 
-Deploy the project in your current directory to
-<a href="https://www.meteor.com/galaxy" target="_blank">Galaxy</a>.
+Deploys the project in your current directory to [Galaxy](https://www.meteor.com/galaxy).
 
-Use `--owner` to decide which organization or user account you'd like to deploy
-a new app to if you are a member of more than one Galaxy-enabled account.
+### Basic Deployment
 
-You can deploy in debug mode by passing `--debug`. This
-will leave your source code readable by your favorite in-browser
-debugger, just like it is in local development mode.
-
-
-
-To delete an application you've deployed, specify
-the `--delete` option along with the site.
-
-
-
-You can add information specific to a particular deployment of your application
-by using the `--settings` option.  The argument to `--settings` is a file
-containing any JSON string.  The object in your settings file will appear on the
-server side of your application in [`Meteor.settings`](../api/meteor#Meteor-settings).
-
-Settings are persistent.  When you redeploy your app, the old value will be
-preserved unless you explicitly pass new settings using the `--settings` option.
-To unset `Meteor.settings`, pass an empty settings file.
-
-::: warning
-`free` and `mongo` options were introduced in Meteor 2.0
-:::
-
-You can run your app for free using the option `--free`. But, there are some limitations. The first one is that you cannot use a custom domain to run a free app. Your domain must contain a Meteor domain name (`.meteorapp.com` to US region, `.au.meteorapp.com` to Asia region, or `.eu.meteorapp.com` to Europe region). Second thing you must know is that your free apps have Cold Start enabled. Cold Start means that your app will stop if it has no connection for 10 minutes, and it will go automatically up when someone tries to connect to it. The third thing you must know is that free apps run on one, and just one, Tiny container. This is important to know, because Tiny containers are NOT meant to production environment, so even small apps can crash with a lot of connections. To keep your app on free, you always need to provide this option.
-
-With the option `--mongo` you can deploy your app without having to pay for a MongoDB provider. By providing this option, Galaxy will create a database for you in our shared cluster and inject the mongo URL on your settings. So with this, you don't even need to provide the settings file anymore (if your settings files just have the mongo URL of course). This is great to test apps, but it shouldn't be used in a production environment, as you will be running in a shared Cluster with limited space. The rules behind this option are: If it is the first deploy of the app, and you provided the option `--mongo`, after the deploy is finished you will receive your mongo URL on your console (you can also see your URL on Galaxy in your app's version). You can put that URL on your settings file if want to. If you try to do a second without the option `--mongo` and without providing a mongo URL on your settings, your deploy will fail as usual. If you provide the option `--mongo` and a mongo URL, the mongo URL on your settings file is the one that will be used by Galaxy to connect your app to a MongoDB. One last thing, you need to have at least one document in your database so Meteor is really going to instantiate it. Then you will be able to access it using any MongoDB client with the provided URI.
-
-Use the options `--mongo` and `--free` to easily deploy a free app already with a mongo database connected to it.
-
-::: warning
-Free apps and MongoDB shared hosting: Meteor Software reserves the right to stop or remove applications we deem to be abusing the free plan offering at any time. Please be advised that the free plan offering is not recommended for production applications. The shared MongoDB cluster that comes configured with the free plan does not provide backups or restoration resources.
-:::
-
-::: warning
-If you want to connect to your free MongoDB shared cluster using your on settings make sure you include this option in your settings in the Mongo package configuration section:
+```bash
+meteor deploy your-app.meteorapp.com
 ```
-packages: {
-  mongo: {
-    options: {
-        tlsAllowInvalidCertificates: true,
-    },
-  },
+
+### Deployment Options
+
+| Option | Description |
+|--------|-------------|
+| `--delete`, `-D` | Permanently delete this deployment |
+| `--debug` | Deploy in debug mode (don't minify, etc.) |
+| `--settings`, `-s <file>` | Set optional data for Meteor.settings |
+| `--free` | Deploy as a free app (with limitations) |
+| `--mongo` | Create and connect to a free shared MongoDB database |
+| `--plan <plan>` | Set app plan: `professional`, `essentials`, or `free` |
+| `--container-size <size>` | Set container size: `tiny`, `compact`, `standard`, `double`, `quad`, `octa`, or `dozen` |
+| `--owner` | Specify organization or user account to deploy to |
+| `--cache-build` | Reuse the build if the git commit hash is the same |
+| `--allow-incompatible-update` | Allow packages to be upgraded or downgraded to potentially incompatible versions |
+| `--deploy-polling-timeout <ms>` | Time to wait for build/deploy (defaults to 15 minutes) |
+| `--no-wait` | Exit after code upload instead of waiting for deploy to complete |
+
+### Free Deployment
+
+Deploy a free app with MongoDB using:
+
+```bash
+meteor deploy your-app.meteorapp.com --free --mongo
+```
+
+::: tip Quick Start
+The combination of `--free` and `--mongo` is the fastest way to deploy an app without any additional configuration.
+:::
+
+#### Free App Limitations
+
+- **Domain**: Must use a Meteor domain (`.meteorapp.com`, `.au.meteorapp.com`, or `.eu.meteorapp.com`)
+- **Cold Start**: App stops after 30 minutes of inactivity and restarts on next connection
+- **Resources**: Limited to one Tiny container (not recommended for production use)
+
+
+### MongoDB Options
+
+#### Shared MongoDB (Free)
+
+The `--mongo` option creates a database in Galaxy's shared cluster:
+
+- On first deploy, you'll receive your MongoDB URI in the console
+- The URI is also visible in your app's version details in Galaxy
+- You must create at least one document to fully instantiate the database
+- The database can be accessed using any MongoDB client with the provided URI
+
+::: warning
+Free shared MongoDB is not recommended for production applications. The shared cluster doesn't provide backups or restoration resources.
+:::
+
+#### MongoDB Connection Settings
+
+When connecting to the free MongoDB shared cluster using your own settings, include:
+
+```json
+{
+  "packages": {
+    "mongo": {
+      "options": {
+        "tlsAllowInvalidCertificates": true
+      }
+    }
+  }
 }
 ```
-This is necessary as our database provider does not have certificates installed on every machine and we don't want to force apps to have this certificate. More about this option [here](../api/collections.html#mongo_connection_options_settings)
+
+::: details Why is this needed?
+This is necessary because the database provider doesn't have certificates installed on every machine. More about this option [here](../api/collections.html#mongo_connection_options_settings).
 :::
 
+### Important Notes
 
-You can change the app plan by providing argument `--plan` with one of the following values: professional, essentials, or free. Be aware that this argument overwrites the `--free` argument.
+- Settings persist between deployments unless explicitly changed
+- Your project should be a git repository (commit hash is used to track code changes)
+- Free apps and MongoDB shared hosting are not recommended for production use
+- Meteor Software reserves the right to stop or remove applications that abuse the free plan
 
-::: warning
-The `plan` option is available since Meteor 2.1.
-:::
-
-Use `--cache-build` to keep the bundle in your temp folder after the deploy is finished, this is helpful when you want to deploy the same code to different environments. For example, a [background job](https://cloud-guide.meteor.com/background-jobs.html) app from the same code as the web app.
-
-Your project should be a git repository as the commit hash is going to be used to decide if your code is still the same or not in the next deploy.
-
-::: warning
-The `cache-build` option is available since Meteor 1.11.
-:::
-
-With the argument `--container-size` you can change your app's container size using the deploy command. The valid arguments are: `tiny`, `compact`, `standard`, `double`, `quad`, `octa`, and `dozen`. One more thing to note here is that the `--container-size` flag can only be used when the `--plan` option is already specified, otherwise using the `--container-size` option will throw an error with the message : `Error deploying application: Internal error`. To see more about the difference and prices of each one you can check [here](https://www.meteor.com/cloud#pricing-section).
-
-::: warning
-The `--container-size` option is available since Meteor 2.4.1.
+::: info Version Compatibility
+- `--free` and `--mongo` options were introduced in Meteor 2.0
+- `--plan` option was introduced in Meteor 2.1
+- `--container-size` option was introduced in Meteor 2.4.1
+- `--cache-build` option is available since Meteor 1.11
 :::
 
 ## meteor update {meteorupdate}

From 1aad471da2bd7a4205ddf6fcaa2cb8fd0119926b Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Mon, 24 Mar 2025 19:33:02 -0300
Subject: [PATCH 1130/1140] Add documentation for `meteor profile` command

---
 v3-docs/docs/cli/index.md | 60 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 92cbe6acb5..e97912fe06 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -157,6 +157,66 @@ meteor run --debug-port 5858
 meteor test-packages --debug-port 5858
 ```
 
+## meteor profile {#meteorprofile}
+
+Run a performance profile for your Meteor application to analyze build and bundling performance.
+
+```bash
+meteor profile [<meteor-run-options>...]
+```
+
+::: info Availability
+This command is available from Meteor 3.2 and newer.
+:::
+
+### Usage
+
+This command monitors the bundler process and tracks key performance metrics to help analyze build and bundling performance.
+
+### Options
+
+| Option | Description |
+|--------|-------------|
+| `--size` | Monitor both bundle runtime and size |
+| `--size-only` | Monitor only the bundle size |
+
+::: info
+All other options from `meteor run` are also supported (e.g., `--settings`, `--exclude-archs`).
+:::
+
+### Environment Variables
+
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `METEOR_IDLE_TIMEOUT=<seconds>` | Set a timeout for profiling | 90 seconds |
+| `METEOR_CLIENT_ENTRYPOINT=<path>` | Set a custom client entrypoint | From package.json |
+| `METEOR_SERVER_ENTRYPOINT=<path>` | Set a custom server entrypoint | From package.json |
+| `METEOR_LOG_DIR=<path>` | Set a custom log directory | Default log directory |
+
+::: tip
+The default timeout (90s) is usually enough for each build step to complete. If you encounter errors due to early exits, increase the `METEOR_IDLE_TIMEOUT` value.
+:::
+
+### Example Usage
+
+```bash
+# Basic profile
+meteor profile
+
+# Monitor bundle size only
+meteor profile --size-only
+
+# Profile with custom settings and timeout
+METEOR_IDLE_TIMEOUT=120 meteor profile --settings settings.json
+
+# Profile with custom entrypoints
+METEOR_CLIENT_ENTRYPOINT=client/main.js METEOR_SERVER_ENTRYPOINT=server/main.js meteor profile
+```
+
+::: details Customizing the Profiling Process
+You can pass any option that works with `meteor run` to customize the profiling process. This allows you to profile your application under specific conditions that match your deployment environment.
+:::
+
 ## meteor create  _app-name_ {meteorcreate}
 
 The command `meteor create app-name` is the default command for creating a new Meteor project. It creates a subdirectory

From b55f1c311d707382e55a55edc499f827561f7871 Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Mon, 24 Mar 2025 19:45:24 -0300
Subject: [PATCH 1131/1140] Add configuration to ignore dead links for
 localhost in VitePress

---
 v3-docs/docs/.vitepress/config.mts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 28bcdf0478..e3f35daf4a 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -25,6 +25,9 @@ export default defineConfig({
   sitemap: {
     hostname: "https://v3-docs.meteor.com",
   },
+  ignoreDeadLinks: [
+    /^http:\/\/localhost/
+  ],
   themeConfig: {
     // https://vitepress.dev/reference/default-theme-config
     nav: [

From 4408ef4389412863057c7ec54d381c9d420c7513 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 24 Mar 2025 21:53:58 -0300
Subject: [PATCH 1132/1140] DOCS: removal of kapa-ai
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After evaluating its costs and the value it provides, we’ve found that many questions can be addressed more effectively through forums or by using a powerful LLM like ChatGPT or Claude.
For those who enjoy using an LLM as a question bot,
we’ll soon be providing a helpful guide on how to seamlessly integrate and use our docs with an LLM.

Soon I'll write a bit more in a forum post.
---
 docs/source/install.md             |  3 ++-
 v3-docs/docs/.vitepress/config.mts | 22 +++++-----------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/docs/source/install.md b/docs/source/install.md
index 1db8b8f1c6..2d2d68199a 100644
--- a/docs/source/install.md
+++ b/docs/source/install.md
@@ -30,7 +30,8 @@ You need to install the Meteor command line tool to create, run, and manage your
 
 Install the latest official version of Meteor.js from your terminal by running one of the commands below. You can check our [changelog](https://docs.meteor.com/changelog.html) for the release notes.
 
-> Run `node -v` to ensure you are using Node.js 14. Meteor 3.0, currently in its Release Candidate version, runs on Node.js v20.
+> Meteor 2.x runs on a deprecated Node.js version (14). Meteor 3 is released with support for the latest Node.js LTS version.
+> For more information, please consult our [migration guide](https://guide.meteor.com/3.0-migration.html) and the [new docs](https://docs.meteor.com/).
 
 For Windows, Linux and OS X, you can run the following command:
 
diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 28bcdf0478..58746e7acf 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -5,22 +5,7 @@ import metadata from "../generators/meteor-versions/metadata.generated";
 export default defineConfig({
   title: "Docs",
   description: "Meteor.js Docs",
-  head: [
-    ["link", { rel: "icon", href: "/logo.png" }],
-    [
-      "script",
-      {
-        async: "",
-        src: "https://widget.kapa.ai/kapa-widget.bundle.js",
-        "data-website-id": "64051b0e-d79f-4fe7-b3ca-ff5c84075693",
-        "data-project-name": "Meteor",
-        "data-project-color": "#36436b",
-        "data-project-logo": "/logo.png",
-        "data-modal-disclaimer":
-          "This is a custom LLM for answering questions about Meteor. Answers are based on the contents of the docs, answered forum posts, YouTube videos and GitHub issues. Please note that answers are generated by AI and may not be fully accurate, so please use your best judgement.",
-      },
-    ],
-  ],
+  head: [["link", { rel: "icon", href: "/logo.png" }]],
   lastUpdated: true,
   sitemap: {
     hostname: "https://v3-docs.meteor.com",
@@ -408,7 +393,10 @@ export default defineConfig({
             link: "/troubleshooting/expired-certificate",
           },
           { text: "Windows", link: "/troubleshooting/windows" },
-          { text: "MongoDB Connection", link: "/troubleshooting/mongodb-connection" }
+          {
+            text: "MongoDB Connection",
+            link: "/troubleshooting/mongodb-connection",
+          },
         ],
         collapsed: true,
       },

From b548fb9a1d596e6c17a4b4f6ee033f9a0b73fb6e Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Tue, 25 Mar 2025 09:37:53 -0300
Subject: [PATCH 1133/1140] Enhance CLI docs for `meteor create`, `meteor
 login`, `meteor logout`, and `meteor update` commands.

---
 v3-docs/docs/cli/index.md | 530 +++++++++++++++++---------------------
 1 file changed, 242 insertions(+), 288 deletions(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index e97912fe06..c437395a78 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -217,210 +217,123 @@ METEOR_CLIENT_ENTRYPOINT=client/main.js METEOR_SERVER_ENTRYPOINT=server/main.js
 You can pass any option that works with `meteor run` to customize the profiling process. This allows you to profile your application under specific conditions that match your deployment environment.
 :::
 
-## meteor create  _app-name_ {meteorcreate}
+## meteor create _app-name_ {#meteorcreate}
 
-The command `meteor create app-name` is the default command for creating a new Meteor project. It creates a subdirectory
-named `app-name` and copies a template app into it. You can pass an absolute or relative path. If you pass a relative
-path, it will be resolved relative to the current working directory. By default, it generates a React project.
+Create a new Meteor project in a directory called `app-name`.
 
-See the flags below to learn how you can generate different types of apps.
+```bash
+meteor create [options] app-name
+```
 
+::: tip Default Behavior
+Without any flags, `meteor create` generates a React project.
+:::
 
-## --apollo {apollo}
+### Basic Options
 
-The command `meteor create --apollo app-name` creates a Meteor app with [React](https://react.dev/),
-[Apollo](https://www.apollographql.com/) (GraphQL), and [MongoDB](https://www.mongodb.com/). To create a complete app,
-including testing and deployment, follow the [React tutorial](https://react-tutorial.meteor.com/). To learn how to use
-Apollo, refer to the [GraphQL section](https://react-tutorial.meteor.com/simple-todos-graphql/).
+| Option | Description |
+|--------|-------------|
+| `--from <url>` | Clone a Meteor project from a URL |
+| `--example <name>` | Use a specific example template |
+| `--list` | Show list of available examples |
+| `--release <version>` | Specify Meteor version (e.g., `--release 2.8`) |
+| `--prototype` | Include `autopublish` and `insecure` packages for rapid prototyping (not for production) |
 
-Npm packages included: `@apollo/client`, `@apollo/server`, `@babel/runtime`, `body-parser`, `express`,
-`graphql` `meteor-node-stubs`, `react`, `react-dom`.
+### Application Types
 
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
+| Option | Description | Tutorial |
+|--------|-------------|----------|
+| `--react` | Create a React app (default) | [v3 React Tutorial](https://docs.meteor.com/tutorials/react/), [v2 React Tutorial](https://react-tutorial.meteor.com/) |
+| `--vue` | Vue 3 + Tailwind CSS + Vite | [v3 Vue Tutorial](https://docs.meteor.com/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.html), [v2 Vue Tutorial](https://vue3-tutorial.meteor.com/) |
+| `--svelte` | Svelte | [v2 Svelte Tutorial](https://svelte-tutorial.meteor.com/) |
+| `--blaze` | Basic Blaze app | [v2 Blaze Tutorial](https://blaze-tutorial.meteor.com/) |
+| `--solid` | Solid + Vite | [v2 Meteor Solid App](https://github.com/fredmaiaarantes/meteor-solid-app/releases/tag/milestone-2.0) |
+| `--apollo` | React + Apollo (GraphQL) | [v2 GraphQL Tutorial](https://react-tutorial.meteor.com/simple-todos-graphql/) |
+| `--typescript` | React + TypeScript | [TypeScript Guide](https://guide.meteor.com/build-tool.html#typescript) |
+| `--tailwind` | React + Tailwind CSS | - |
+| `--chakra-ui` | React + Chakra UI | [Simple Tasks Example](https://github.com/fredmaiaarantes/simpletasks) |
+
+### Project Structure Options
+
+| Option | Description |
+|--------|-------------|
+| `--bare` | Create an empty app (Blaze + MongoDB) |
+| `--minimal` | Create with minimal Meteor packages |
+| `--full` | Create a fully scaffolded app with imports-based structure |
+| `--package` | Create a new package instead of an application |
+
+::: warning Prototype Mode
+The `--prototype` option adds packages that make development faster but shouldn't be used in production. See the [security checklist](https://guide.meteor.com/security.html#checklist).
+:::
+
+### Included Packages
+
+<details>
+<summary><strong>React App</strong> (--react or default)</summary>
+
+**NPM packages:**
+- `@babel/runtime`, `meteor-node-stubs`, `react`, `react-dom`
+
+**Meteor packages:**
+- `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
 `standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
-`react-meteor-data`, `apollo`, `swydo:graphql`.
+`react-meteor-data`
+</details>
 
-## --bare {bare}
+<details>
+<summary><strong>Apollo (GraphQL) App</strong> (--apollo)</summary>
 
-The command `meteor create --bare app-name` creates an empty Meteor app with [Blaze](https://blazejs.org) and
-[MongoDB](https://www.mongodb.com/). To create a complete app, including testing and deployment, follow the
-[Blaze tutorial](https://blaze-tutorial.meteor.com/).
+**NPM packages:**
+- `@apollo/client`, `@apollo/server`, `@babel/runtime`, `graphql` `meteor-node-stubs`, `react`, `react-dom`
 
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `jquery`.
+**Meteor packages:**
+- `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
+`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
+`apollo`, `compat:graphql`
+</details>
 
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `tracker`, `standard-minifier-css`,
-`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`.
+<details>
+<summary><strong>Blaze App</strong> (--blaze)</summary>
 
+**NPM packages:**
+- `@babel/runtime`, `meteor-node-stubs`, `jquery`
 
-## --blaze {blaze-app}
-
-The command `meteor create --blaze app-name` creates a Meteor app with [Blaze](https://blazejs.org) and
-[MongoDB](https://www.mongodb.com/). To create a complete app, including testing and deployment, follow the
-[Blaze tutorial](https://blaze-tutorial.meteor.com/).
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `jquery`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `blaze-html-templates`, `jquery`, `reactive-var`,
+**Meteor packages:**
+- `meteor-base`, `mobile-experience`, `mongo`, `blaze-html-templates`, `jquery`, `reactive-var`,
 `tracker`, `standard-minifier-css`, `standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`,
-`hot-module-replacement`, `blaze-hot`.
+`hot-module-replacement`, `blaze-hot`
+</details>
 
+<details>
+<summary><strong>Vue App</strong> (--vue)</summary>
 
-## --chakra-ui {chakra-ui}
+**NPM packages:**
+- `@babel/runtime`, `meteor-node-stubs`, `vue`, `vue-meteor-tracker`, `vue-router`, `@types/meteor`, `@vitejs/plugin-vue`, `autoprefixer`, `meteor-vite`, `postcss`, `tailwindcss`, `vite`
 
-The command `meteor create --chakra-ui app-name` creates a Meteor app with [React](https://react.dev/),
-[Chakra-UI](https://chakra-ui.com/), and [MongoDB](https://www.mongodb.com/). To create a complete app, including
-testing and deployment, follow the [React tutorial](https://react-tutorial.meteor.com/). To learn how to use Chakra-UI,
-refer to the [Simple Tasks](https://github.com/fredmaiaarantes/simpletasks) example.
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `react`, `react-dom`, `@chakra-ui/icons`, `@chakra-ui/react`, `@emotion/react`
-`@emotion/styled`, `@react-icons/all-files`, `framer-motion`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
+**Meteor packages:**
+- `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
 `standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
-`react-meteor-data`.
+`jorgenvatle:vite`
+</details>
 
+<details>
+<summary><strong>Minimal App</strong> (--minimal)</summary>
 
-## --full {full}
+**NPM packages:**
+- `@babel/runtime`, `meteor-node-stubs`
 
-The command `meteor create --full app-name` creates a Meteor app with [Blaze](https://blazejs.org) and
-[MongoDB](https://www.mongodb.com/). It creates a more complete, imports-based project that closely matches the
-[file structure](https://guide.meteor.com/structure.html#javascript-structure) recommended by the
-[Meteor Guide](https://guide.meteor.com/). To create a complete app, including testing and deployment, follow the
-[Blaze tutorial](https://blaze-tutorial.meteor.com/).
+**Meteor packages:**
+- `meteor`, `standard-minifier-css`, `standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`,
+`static-html`, `webapp`, `ddp`, `server-render`, `hot-module-replacement`
+</details>
 
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `jquery`, `chai`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `blaze-html-templates`, `jquery`, `reactive-var`,
-`tracker`, `standard-minifier-css`, `standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`,
-`ostrio:flow-router-extra`, `less`, `meteortesting:mocha`, `johanbrook:publication-collector`.
-
-
-## --minimal {minimal}
-
-The command `meteor create --minimal app-name` creates a project with as few Meteor packages as possible.
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`.
-
-Meteor packages included: `meteor`, `standard-minifier-css`, `standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`,
-`static-html`, `webapp`, `server-render`, `hot-module-replacement`.
-
-
-## --package {package}
-
-The command `meteor create --package package-name` creates a new package. If used in an existing app, it will create a
-package in the `packages` directory. Check the [Meteor Guide](https://guide.meteor.com/writing-atmosphere-packages.html)
-for more information on how to get started writing packages.
-
-
-## --prototype {prototype}
-
-The command `meteor create --prototype app-name` creates a project with the prototype purpose packages (`autopublish`
-and `insecure`). If you use them, you can change your collections quickly and create prototype apps very quickly.
-However, these packages are not supposed to be used in production.
-
-For more information about security, you can read our [security checklist](https://guide.meteor.com/security.html#checklist).
-It can be used with other flags that create apps, such as `--react`, `blaze`, or `--typescript`.
-
-
-## --react {react}
-
-The command `meteor create --react app-name` creates a Meteor app with [React](https://react.dev/) and
-[MongoDB](https://www.mongodb.com/). It functions in the same way as if you don't use any flags. To create a complete
-app, including testing and deployment, follow the [React tutorial](https://react-tutorial.meteor.com/).
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `react`, `react-dom`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
-`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
-`react-meteor-data`.
-
-
-
-## --release {release}
-
-The command `meteor create app-name --release {meteor-version}` creates a Meteor app with the release specified in the
-command. For instance, you can create a Meteor app with the `2.8` release using `meteor create app-name --release 2.8`.
-By default, it generates a React app, but you can use it with other flags that create apps such as `--blaze`,
-`--svelte`, `--vue`, or `--typescript`.
-
-
-## --solid {solid}
-
-The command `meteor create --solid app-name` creates a Meteor app with [Solid](https://www.solidjs.com/),
-[Vite](https://vitejs.dev/), and [MongoDB](https://www.mongodb.com/). You can see an example on the
-[meteor-solid-app](https://github.com/fredmaiaarantes/meteor-solid-app/releases/tag/milestone-2.0) repository.
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `solid-js`, `babel-preset-solid`, `vite`, `vite-plugin-solid`, `vite-plugin-solid-svg`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
-`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
-`vite:bundler`.
-
-
-## --svelte {svelte}
-
-The command `meteor create --svelte app-name` creates a Meteor app with [Svelte](https://svelte.dev/) and
-[MongoDB](https://www.mongodb.com/). To create a complete app, including testing and deployment, follow the
-[Svelte tutorial](https://svelte-tutorial.meteor.com/).
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `svelte`, `svelte-preprocess`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `standard-minifier-css`,
-`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
-`zodern:melte`, `zodern:types`.
-
-You can also use [Svelte](https://svelte.dev/) with [Vite](https://vitejs.dev/) by using the [jorgenvatle:meteor-vite](https://github.com/JorgenVatle/meteor-vite) package.
-You can see an example on the [meteor-vite](https://github.com/JorgenVatle/meteor-vite/tree/release/examples/svelte) repository.
-
-
-## --tailwind {tailwind}
-
-The command `meteor create --tailwind app-name` creates a Meteor app with [React](https://react.dev/),
-[Tailwind CSS](https://tailwindcss.com), and [MongoDB](https://www.mongodb.com/).
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `react`, `react-dom`, `autoprefixer`, `postcss`, `postcss-load-config`, `tailwindcss`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
-`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
-`react-meteor-data`.
-
-
-## --typescript {typescript}
-
-The command `meteor create --typescript app-name` creates a Meteor app with [React](https://react.dev/),
-[TypeScript](https://www.typescriptlang.org/), and [MongoDB](https://www.mongodb.com/). Check the
-[Meteor Guide](https://guide.meteor.com/build-tool.html#typescript) for more information about TypeScript and how to
-use it with other UI frameworks.
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `react`, `react-dom`, `@types/mocha`, `@types/node`, `@types/react`, `@types/react-dom`, `typescript`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
-`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
-`react-meteor-data`, `zodern:types`.
-
-
-## --vue {vue}
-
-The command `meteor create --vue app-name` creates a Meteor app with [Vue 3](https://vuejs.org/),
-[Tailwind CSS](https://tailwindcss.com), [Vite](https://vitejs.dev/), and [MongoDB](https://www.mongodb.com/). To
-create a complete app, including testing and deployment, follow the [Vue 3 tutorial](https://vue3-tutorial.meteor.com/).
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `vue`, `vue-meteor-tracker`, `vue-router`, `@types/meteor`, `@vitejs/plugin-vue`, `autoprefixer`, `postcss`, `tailwindcss`, `vite`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
-`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `hot-module-replacement`, `static-html`,
-`vite:bundler`.
-
-You can also use Vue 3 with Vite by using the [jorgenvatle:meteor-vite](https://github.com/JorgenVatle/meteor-vite)
-package. You can see an example on the [meteor-vite](https://github.com/JorgenVatle/meteor-vite/tree/release/examples/vue)
-repository.
-
-Npm packages included: `@babel/runtime`, `meteor-node-stubs`, `vue`, `vue-meteor-tracker`.
-
-Meteor packages included: `meteor-base`, `mobile-experience`, `mongo`, `reactive-var`, `standard-minifier-css`,
-`standard-minifier-js`, `es5-shim`, `ecmascript`, `typescript`, `shell-server`, `tracker`, `static-html`, `akryum:vue-component`,
-`meteortesting:mocha`, `johanbrook:publication-collector`.
+::: tip File Structure
+To learn more about the recommended file structure for Meteor apps, check the [Meteor Guide](https://guide.meteor.com/structure.html#javascript-structure).
+:::
 
+::: tip Combining Options
+Most options can be combined. For example, you can create a TypeScript-based Vue app with the prototype packages using `meteor create --vue --typescript --prototype app-name`.
+:::
 
 ##  meteor generate  {meteorgenerate}
 
@@ -708,17 +621,37 @@ export function transformContents(scaffoldName, contents, fileName) {
   return transformName(scaffoldName, contents);
 }
 ```
+## meteor login
 
-## meteor login / logout {meteorloginlogout}
+Logs you in to your Meteor developer account.
 
-Log in and out of your account using Meteor's authentication system.
+**Usage:**
+```bash
+meteor login [--email]
+```
 
-You can pass `METEOR_SESSION_FILE=token.json` before `meteor login` to generate
-a login session token so you don't have to share your login credentials with
-third-party service providers.
+**Details:**
+- Prompts for your username and password
+- Pass `--email` to log in by email address rather than by username
+- You can set `METEOR_SESSION_FILE=token.json` before `meteor login` to generate a login session token, avoiding the need to share credentials with third-party service providers
 
-Once you have your account you can log in and log out from the command line, and
-check your username with `meteor whoami`.
+## meteor logout
+
+Logs you out of your Meteor developer account.
+
+**Usage:**
+```bash
+meteor logout
+```
+
+## meteor whoami
+
+Displays your currently logged-in username.
+
+**Usage:**
+```bash
+meteor whoami
+```
 
 ## meteor deploy _site_ {#meteordeploy}
 
@@ -815,149 +748,170 @@ This is necessary because the database provider doesn't have certificates instal
 - `--cache-build` option is available since Meteor 1.11
 :::
 
-## meteor update {meteorupdate}
+## meteor update
 
-Attempts to bring you to the latest version of Meteor, and then to upgrade your
-packages to their latest versions. By default, update will not break
-compatibility.
+Updates your Meteor application while maintaining compatibility.
 
-For example, let's say packages A and B both depend on version 1.1.0 of package
-X. If a new version of A depends on X@2.0.0, but there is no new version of
-package B, running `meteor update` will not update A, because doing so will
-break package B.
+**Usage:**
+```bash
+meteor update
+meteor update --patch
+meteor update --release <release>
+meteor update --packages-only
+meteor update [packageName packageName2 ...]
+meteor update --all-packages
+```
 
-You can pass in the flag `--packages-only` to update only the packages, and not
-the release itself. Similarly, you can pass in names of packages
-(`meteor update foo:kittens baz:cats`) to only update specific packages.
+**Update Types:**
 
-Every project is pinned to a specific release of Meteor. You can temporarily try
-using your package with another release by passing the `--release` option to any
-command; `meteor update` changes the pinned release.
+| Command | Description |
+|---------|-------------|
+| `meteor update` | Updates the Meteor release and compatible package versions |
+| `meteor update --patch` | Updates to the latest patch release (recommended for bug fixes) |
+| `meteor update --release <release>` | Updates to a specific Meteor release |
+| `meteor update --packages-only` | Updates only packages, not the Meteor release |
+| `meteor update [packageName ...]` | Updates specific named packages |
+| `meteor update --all-packages` | Updates all packages including indirect dependencies |
 
-Sometimes, Meteor will ask you to run `meteor update --patch`. Patch releases
-are special releases that contain only very minor changes (usually crucial bug
-fixes) from previous releases. We highly recommend that you always run `update
---patch` when prompted.
-
-You may also pass the `--release` flag to act as an override to update to a
-specific release. This is an override: if it cannot find compatible versions of
-packages, it will log a warning, but perform the update anyway. This will only
-change your package versions if necessary.
+**Important Notes:**
+- Every project is pinned to a specific Meteor release
+- By default, updates will not break compatibility between packages
+- Patch releases contain minor, critical bug fixes and are highly recommended
+- The `--release` flag can override compatibility checks (may cause warnings)
+- The `--all-packages` option will update all packages to their latest compatible versions, respecting dependency constraints
 
 
-## meteor add  _package_ {meteoradd}
+## meteor add *package* {#meteor-add}
 
-Add packages to your Meteor project. By convention, names of community packages
-include the name of the maintainer. For example: `meteor add iron:router`. You
-can add multiple packages with one command.
+Adds packages to your Meteor project.
 
-Optionally, adds version constraints. Running `meteor add package@1.1.0` will
-add the package at version `1.1.0` or higher (but not `2.0.0` or higher). If you
-want to use version `1.1.0` exactly, use `meteor add package@=1.1.0`. You can also
-'or' constraints together: for example, `meteor add 'package@=1.0.0 || =2.0.1'`
-means either 1.0.0 (exactly) or 2.0.1 (exactly).
+**Usage:**
+```bash
+meteor add [package1] [package2] ...
+meteor add package@version
+```
 
-To remove a version constraint for a specific package, run `meteor add` again
-without specifying a version. For example above, to stop using version `1.1.0`
-exactly, run `meteor add package`.
+**Version Constraints:**
+- `package@1.1.0` - Version 1.1.0 or higher (but not 2.0.0+)
+- `package@=1.1.0` - Exactly version 1.1.0
+- `package@=1.0.0 || =2.0.1` - Either version 1.0.0 or 2.0.1 exactly
+
+**Notes:**
+- By convention, community packages include the maintainer's name (e.g., `iron:router`)
+- To remove a version constraint, run `meteor add package` without specifying a version
+
+## meteor remove *package* {#meteor-remove}
+
+Removes a package previously added to your Meteor project.
+
+**Usage:**
+```bash
+meteor remove [package1] [package2] ...
+```
+
+**Notes:**
+- For a list of currently used packages, run `meteor list`
+- This removes the package entirely (to only remove version constraints, use [`meteor add`](#meteor-add))
+- Transitive dependencies aren't automatically downgraded unless necessary
+
+## meteor list {#meteor-list}
+
+Lists all packages added to your project, including versions and available updates.
+
+**Usage:**
+```bash
+meteor list [flags]
+```
+
+**Flags:**
+
+| Flag | Description |
+|------|-------------|
+| `--tree` | Outputs a tree showing package reference hierarchy |
+| `--json` | Outputs an unformatted JSON string of package references |
+| `--weak` | Shows weakly referenced dependencies (only with `--tree` or `--json`) |
+| `--details` | Adds more package details (only with `--json`) |
 
 
-## meteor remove  _package_ {meteorremove}
+## meteor add-platform *platform* {#meteor-add-platform}
 
-Removes a package previously added to your Meteor project. For a
-list of the packages that your application is currently using, run
-`meteor list`.
+Adds platforms to your Meteor project.
 
-This removes the package entirely. To continue using the package,
-but remove its version constraint, use [`meteor add`](#meteor-add-package).
+**Usage:**
+```bash
+meteor add-platform [platform1] [platform2] ...
+```
 
-Meteor does not downgrade transitive dependencies unless it's necessary. This
-means that if running `meteor add A` upgrades A's parent package X to a new
-version, your project will continue to use X at the new version even after you
-run `meteor remove A`.
+**Notes:**
+- Multiple platforms can be added with one command
+- After adding, use `meteor run <platform>` to run on that platform
+- Use `meteor build` to build for all added platforms
 
 
-## meteor list {meteorlist}
+## meteor remove-platform *platform* {#meteor-remove-platform}
 
-Lists all the packages that you have added to your project. For each package,
-lists the version that you are using. Lets you know if a newer version of that
-package is available.
+Removes a previously added platform.
 
-**Flags**
+**Usage:**
+```bash
+meteor remove-platform [platform]
+```
 
-Flags are optional and can be used to format the output. The default output
-requires no flags whatsoever. The following flags are supported:
-
-`--tree`
-
-Outputs a tree showing how packages are referenced.
-
-`--json`
-
-Outputs an unformatted JSON String, showing how packages are referenced.
-
-`--weak`
-
-Show weakly referenced dependencies in the tree.
-Only functional in combination with `--tree` or `--json`.
-
-`--details`
-
-Adds more package details to the JSON output.
-Only functional in combination with `--json`.
+**Notes:**
+- For a list of currently added platforms, use `meteor list-platforms`
 
 
-## meteor add-platform  _platform_ {meteoraddplatform}
+## meteor list-platforms {#meteor-list-platforms}
 
-Adds platforms to your Meteor project. You can add multiple
-platforms with one command. Once a platform has been added, you
-can use 'meteor run <i>platform</i>' to run on the platform, and `meteor build`
-to build the Meteor project for every added platform.
+Lists all platforms explicitly added to your project.
+
+**Usage:**
+```bash
+meteor list-platforms
+```
 
 
-## meteor remove-platform  _platform_ {meteorremoveplatform}
+## meteor ensure-cordova-dependencies {#meteor-ensure-cordova-dependencies}
 
-Removes a platform previously added to your Meteor project. For a
-list of the platforms that your application is currently using, see
-`meteor list-platforms`.
+Checks if dependencies are installed, and installs them if necessary.
+
+**Usage:**
+```bash
+meteor ensure-cordova-dependencies
+```
 
 
-## meteor list-platforms {meteorlistplatforms}
+## meteor mongo {#meteor-mongo}
 
-Lists all of the platforms that have been explicitly added to your project.
+Opens a MongoDB shell on your local development database.
 
-
-## meteor ensure-cordova-dependencies {meteorensurecordovadependencies}
-
-Check if the dependencies are installed, otherwise install them.
-
-## meteor mongo {meteormongo}
-
-Open a MongoDB shell on your local development database, so that you
-can view or manipulate it directly.
+**Usage:**
+```bash
+meteor mongo
+```
 
 ::: warning
-For now, you must already have your application running locally
-with `meteor run`. This will be easier in the future.
+For now, you must already have your application running locally with `meteor run`. This will be easier in the future.
 :::
 
+## meteor reset {#meteor-reset}
 
-## meteor reset {meteorreset}
+Resets the current project to a fresh state and clears the local cache.
 
-Reset the current project to a fresh state and clear the local cache.
+**Usage:**
+```bash
+meteor reset [--db]
+```
 
-To remove also the local mongo database use `--db` flag.
+**Flags:**
+- `--db` - Also removes the local MongoDB database
 
 ::: warning
-Reset with `--db` flag deletes your data! Make sure you do not have any information you
-care about in your local mongo database by running `meteor mongo`.
-From the mongo shell, use `show collections`
-and <code>db.<i>collection</i>.find()</code> to inspect your data.
+Reset with `--db` flag deletes your data! Make sure you do not have any information you care about in your local mongo database by running `meteor mongo`. From the mongo shell, use `show collections` and `db.<collection>.find()` to inspect your data.
 :::
 
 ::: warning
-For now, you can not run this while a development server is
-running. Quit all running meteor applications before running this.
+For now, you cannot run this while a development server is running. Quit all running meteor applications before running this.
 :::
 
 

From 75bdcd058c2577fa999f2c45f02b0ae965636a94 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 20 Mar 2025 12:13:49 -0300
Subject: [PATCH 1134/1140] feat: native profile inspector - Enhance profiling
 capabilities with inspector support and update documentation. - Added
 .cursorignore and .cursorrules to .gitignore. - Updated PERFORMANCE.md and
 README.md with detailed instructions for using inspector profiling, including
 environment variable configurations and output handling. - Improved profiling
 function to manage inspector sessions and handle large profile sizes
 effectively.

---
 .gitignore                |   4 +
 tools/PERFORMANCE.md      |  88 +++++++++
 tools/README.md           |  30 +++-
 tools/tool-env/profile.ts | 364 +++++++++++++++++++++++++++++++++++---
 4 files changed, 463 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index fe19b9b3e9..4742e13056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,7 @@ packages/**/.npm
 
 # doc files should not be committed
 packages/**/*.docs.js
+
+#cursor
+.cursorignore
+.cursorrules
diff --git a/tools/PERFORMANCE.md b/tools/PERFORMANCE.md
index 7a8864bd84..635f84f78e 100644
--- a/tools/PERFORMANCE.md
+++ b/tools/PERFORMANCE.md
@@ -167,6 +167,94 @@ The Profiler is activated using `Profile.run(.)`, which will cause a report to b
 
 In addition to tool code, you can also use `Profile` in compiler plugins.  If you want to use `Profile` in packages that are loaded into the tool (e.g. packages depended on by compiler plugins, or specially loaded into the tool as isopackets), you should always test `(typeof Profile !== 'undefined')` before accessing `Profile`, or pass it in from the tool as an option.
 
+## Inspector Profiling
+
+In addition to the standard profiler, Meteor includes a more advanced profiling system based on Node.js's `inspector` module. This system generates `.cpuprofile` files that provide much more detailed performance data.
+
+### How to Use Inspector Profiling
+
+To enable inspector profiling, you need to specify which functions you want to profile through the `METEOR_INSPECT` environment variable:
+
+```bash
+# Profile multiple functions
+METEOR_INSPECT=bundler.bundle,compiler.compile meteor build ./output-build
+```
+
+Complete list for METEOR_INSPECT:
+- bundler.bundle
+- compiler.compile
+- Babel.compile
+- _readProjectMetadata
+- initializeCatalog
+- _downloadMissingPackages
+- _saveChangeMetadata
+- _realpath
+- package-client
+
+
+### Additional Configuration Options
+
+You can customize the inspector profiling behavior with the following environment variables:
+
+```bash
+# Identifier for profile files
+METEOR_INSPECT_CONTEXT=context_name
+
+# Directory where .cpuprofile files will be saved (default: ./profiling)
+METEOR_INSPECT_OUTPUT=/path/to/directory
+
+# Sampling interval in ms - lower values = more details but uses more memory
+METEOR_INSPECT_INTERVAL=500
+
+# Maximum profile size in MB (default: 2000)
+METEOR_INSPECT_MAX_SIZE=1000
+```
+
+### Viewing the Results
+
+#### Chrome DevTools
+The generated `.cpuprofile` files can be visualized in Chrome DevTools:
+
+1. Open Chrome DevTools
+2. Go to the "Performance" or "Profiler" tab
+3. Click "Load Profile" and select the generated .cpuprofile file
+
+#### Discoveryjs cpupro 
+
+For a opensource interactive analysis of your `.cpuprofile` files, you can use [cpupro](https://discoveryjs.github.io/cpupro/), an open-source CPU profile viewer:
+
+1. Visit https://discoveryjs.github.io/cpupro/ in your browser
+2. Drag and drop your `.cpuprofile` file onto the interface
+3. Use the interactive visualization to explore your profile data
+
+cpupro offers several advantages over Chrome DevTools:
+- Better handling of large profiles
+- More flexible filtering options
+- Advanced search capabilities
+- Multiple visualization modes
+- Ability to compare different profiles
+
+You can also run cpupro locally by installing it via npm:
+
+
+### Important Considerations
+
+- Inspector profiling consumes more memory than the standard profiler
+- To avoid out-of-memory (OOM) errors, consider increasing Node's memory limit:
+  ```bash
+  NODE_OPTIONS="--max-old-space-size=4096" METEOR_INSPECT=bundler.bundle meteor ...
+  ```
+- Very large profiles (>2GB) will be automatically truncated to avoid OOM errors
+
+### When to Use Inspector Profiling
+
+Use inspector profiling when:
+- You need more detailed analysis than the standard profiler provides
+- You're investigating complex performance issues
+- You want to identify specific bottlenecks in heavy functions like bundler or compiler
+
+The standard profiler (`METEOR_PROFILE`) remains the best option for quick and general analyses, while inspector profiling is more suitable for detailed diagnostics.
+
 ## Known Areas for Improvement
 
 These are areas to improve or investigate, along with what's known, in no
diff --git a/tools/README.md b/tools/README.md
index c8c68fdb8c..d41096b175 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -105,6 +105,34 @@ Internally, every profiled function should be wrapped into a `Profile(fn)` call.
 The entry point should be started explicitly with the `Profile.run()`
 call. Otherwise, it won't start measuring anything.
 
+### Inspector Profiling
+
+In addition to the standard profiler, you can use the more advanced inspector profiling:
+
+```bash
+# Profile a specific function (e.g. bundler.bundle)
+METEOR_INSPECT=bundler.bundle meteor run
+
+# Profile multiple functions
+METEOR_INSPECT=bundler.bundle,compiler.compile meteor build
+```
+
+Additional options:
+```bash
+# Output directory for .cpuprofile files
+METEOR_INSPECT_OUTPUT=/path/to/directory
+
+# Name to identify profile files
+METEOR_INSPECT_CONTEXT=project_xyz
+
+# Sampling interval (lower = more details, more memory)
+METEOR_INSPECT_INTERVAL=500
+```
+
+The generated `.cpuprofile` files can be opened in Chrome DevTools through the "Performance" or "Profiler" tab.
+
+For more details, see the `PERFORMANCE.md` file.
+
 ## Debugging
 
 Currently, to debug the tool with `node-inspector`, you can set the `
@@ -164,4 +192,4 @@ a custom try/catch/finally system with recovery. See
 ## More information
 
 For more information about a particular part of Meteor Tool, see subdirectories'
-README.md files and the top-level intro comments in the bigger files.
+README.md files and the top-level intro comments in the bigger files.
\ No newline at end of file
diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index 10328e067f..e058562e95 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -154,13 +154,71 @@
 //       other A: 350.0
 //     B: 100.0
 //
-// and in the leaf time report:
+// and in the leaf report:
 //
 //     other A: 350.0
 //     B: 250.0
 //
 // In both reports the grand total is 600ms.
 
+// Profiler Usage Documentation
+/**
+* To use the Meteor profiler:
+* 
+* 1. For basic profiling:
+* METEOR_PROFILE=1 meteor <command>
+* 
+* 2. For profiling with inspector (generating .cpuprofile files):
+* METEOR_INSPECT=bundler.bundle,<other_function_names> meteor <command>
+* 
+* 3. Additional settings:
+* METEOR_INSPECT_CONTEXT=context_name (identification for files)
+* METEOR_INSPECT_OUTPUT=path/to/directory (location where to save files)
+* 
+* 4. To view .cpuprofile files:
+* - Open Chrome DevTools
+* - Go to the "Performance" or "Profiler" tab
+* - Click "Load Profile" and select the .cpuprofile file
+*/
+
+import * as inspector from 'inspector';
+import * as fs from 'fs';
+import * as path from 'path';
+
+interface MeteorAsyncLocalStorage {
+  getStore: () => ProfileStore | undefined;
+  run: <T>(store: ProfileStore, fn: () => T) => T;
+}
+
+interface ProfileStore {
+  currentEntry: string[];
+  [key: string]: any;
+}
+
+declare global {
+  var __METEOR_ASYNC_LOCAL_STORAGE: MeteorAsyncLocalStorage;
+}
+
+interface InspectorConfigType {
+  enabled: boolean;
+  filter: string[];
+  context: string;
+  outputDir: string;
+  samplingInterval: number | undefined;
+  maxProfileSize: number;
+}
+
+const INSPECTOR_CONFIG: InspectorConfigType = {
+  enabled: !!process.env.METEOR_INSPECT,
+  filter: process.env.METEOR_INSPECT ? process.env.METEOR_INSPECT.split(',') : [],
+  context: process.env.METEOR_INSPECT_CONTEXT || '',
+  outputDir: process.env.METEOR_INSPECT_OUTPUT || path.join(process.cwd(), 'profiling'),
+  // Interval in ms (smaller = more details, but more memory)
+  samplingInterval: process.env.METEOR_INSPECT_INTERVAL ? parseInt(process.env.METEOR_INSPECT_INTERVAL || '1000', 10) : undefined,
+  // Maximum profile size in MB
+  maxProfileSize: parseInt(process.env.METEOR_INSPECT_MAX_SIZE || '2000', 10)
+};
+
 const filter = parseFloat(process.env.METEOR_PROFILE || "100"); // ms
 
 type Stats = {
@@ -238,66 +296,326 @@ export function Profile<
   bucketName: string | ((...args: TArgs) => string),
   f: (...args: TArgs) => TResult | Promise<TResult>,
 ): typeof f {
-  if (! Profile.enabled) {
+  if (!Profile.enabled) {
     return f;
   }
 
   return Object.assign(function profileWrapper(this: any) {
-    const args = arguments as unknown as TArgs;
+    const args = Array.from(arguments) as TArgs;
 
     if (!running) {
       return f.apply(this, args);
     }
 
     const asyncLocalStorage = global.__METEOR_ASYNC_LOCAL_STORAGE;
-    let existingStore = asyncLocalStorage.getStore();
+    let store = asyncLocalStorage.getStore() || { currentEntry: [] };
 
-    // Ensure `existingStore` is an object, initialize it if not present
-    if (!existingStore) {
-      existingStore = { currentEntry: [] };
-      return asyncLocalStorage.run(existingStore, () => runWithContext(bucketName, existingStore, f, this, args));
+    const name = typeof bucketName === 'function' ? bucketName.apply(this, args) : bucketName;
+    
+    // callbacks with observer to track when the function finishes
+    const profileInfo = {
+      name,
+      isActive: false,
+      isCompleted: false,
+      startTime: Date.now()
+    };
+
+    if (shouldRunInspectorProfiling(name)) {
+      profileInfo.isActive = startInspectorProfiling(name);
+      
+      if (profileInfo.isActive) {
+        // Monitor for process exit to stop profiling correctly
+        process.on('exit', () => {
+          if (profileInfo.isActive && !profileInfo.isCompleted) {
+            stopInspectorProfiling(name, true).catch(err => {
+              process.stdout.write(`[PROFILING_EXIT] Error stopping profiling: ${err}\n`);
+            });
+          }
+        });
+        
+        // Monitor for signals to stop profiling correctly
+        const signals = ['SIGINT', 'SIGTERM', 'SIGHUP'];
+        signals.forEach(signal => {
+          process.once(signal, () => {
+            if (profileInfo.isActive && !profileInfo.isCompleted) {
+              stopInspectorProfiling(name, true).catch(err => {
+                process.stdout.write(`[PROFILING_SIGNAL] Error stopping profiling: ${err}`);
+              }).finally(() => {
+                process.exit(130);
+              });
+            }
+          });
+        });
+      }
     }
 
-    // Ensure `existingStore.currentEntry` exists
-    if (!existingStore.currentEntry) {
-      existingStore.currentEntry = [];
-    }
+    const completeProfiler = () => {
+      if (profileInfo.isActive && !profileInfo.isCompleted) {
+        profileInfo.isCompleted = true;
+        return stopInspectorProfiling(name, true).catch(err => {
+          process.stdout.write(`[PROFILING_COMPLETE] Error stopping profiling: ${err}`);
+        });
+      }
+      return Promise.resolve();
+    };
 
-    return runWithContext(bucketName, existingStore, f, this, args);
+    try {
+      if (!asyncLocalStorage.getStore()) {
+        const result = asyncLocalStorage.run(store, () => 
+          runWithContext(name, store, f, this, args, completeProfiler));
+          
+        // For sync results, complete profiling here
+        if (!(result instanceof Promise)) {
+          completeProfiler();
+        }
+        
+        return result;
+      }
+
+      // if there is already a store, use the current context
+      const result = runWithContext(name, store, f, this, args, completeProfiler);
+      
+      // For sync results, complete profiling here
+      if (!(result instanceof Promise)) {
+        completeProfiler();
+      }
+      
+      return result;
+    } catch (error) {
+      completeProfiler();
+      throw error;
+    }
   }, f) as typeof f;
 }
 
+// ================================
+// Inspector Profiling
+// ================================
+let inspectorActive = false;
+let rootSession: inspector.Session | null = null;
+let rootProfileName: string | null = null;
+let profileStartTime: number | null = null;
+
+function shouldRunInspectorProfiling(name: string): boolean {
+  if (!INSPECTOR_CONFIG.enabled) return false;
+  return INSPECTOR_CONFIG.filter.includes(name);
+}
+
+function startInspectorProfiling(name: string): boolean {
+  if (!shouldRunInspectorProfiling(name)) {
+    return false;
+  }
+
+  try {
+    if (rootSession) {
+      return false;
+    }
+    
+    // Adjust the heap limit to avoid OOM
+    if (process.env.NODE_OPTIONS && !process.env.NODE_OPTIONS.includes('--max-old-space-size')) {
+      process.stdout.write('[PROFILING_START] WARN: Recommended to set NODE_OPTIONS="--max-old-space-size=4096" to avoid OOM\n');
+    }
+    
+    profileStartTime = Date.now();
+    
+    // Open the inspector only if it's not active
+    if (!inspectorActive) {
+      inspector.open();
+      inspectorActive = true;
+    }
+    
+    // Create a single session for the duration of profiling
+    const session = new inspector.Session();
+    session.connect();
+    session.post('Profiler.enable');
+    session.post('Profiler.start', {
+      samplingInterval: INSPECTOR_CONFIG.samplingInterval
+    });
+
+    // Store the root session for later use
+    rootSession = session;
+    rootProfileName = name;
+    
+    return true;
+  } catch (err) {
+    process.stdout.write(`[PROFILING_START] Error starting profiling for ${name}: ${err}\n`);
+    return false;
+  }
+}
+
+function stopInspectorProfiling(name: string, isActive: boolean): Promise<void> {
+  if (!isActive || !rootSession || name !== rootProfileName) {
+    return Promise.resolve();
+  }
+  
+  return new Promise((resolve, reject) => {
+    try {
+      const duration = profileStartTime ? Date.now() - profileStartTime : 0;
+      const session = rootSession;
+      if (!session) {
+        return resolve();
+      }
+      
+      session.post('Profiler.stop', (err: Error | null, result: any) => {
+        if (err) {
+          cleanupAndResolve(resolve);
+          reject(err);
+          return;
+        }
+        
+        try {
+          // check if we have data in the profile
+          if (!result || !result.profile) {
+            console.error(`[PROFILING_STOP] Empty profile for ${name}`);
+            cleanupAndResolve(resolve);
+            return;
+          }
+          
+          // check the approximate size of the profile
+          const profileStr = JSON.stringify(result.profile);
+          const profileSize = profileStr.length / (1024 * 1024); // in MB
+          
+          process.stdout.write(`[PROFILING_STOP] Profile captured successfully for ${name}: ${JSON.stringify({
+            nodes: result.profile.nodes?.length || 0,
+            samples: result.profile.samples?.length || 0,
+            timeDeltas: result.profile.timeDeltas?.length || 0,
+            duration: duration,
+            size: profileSize.toFixed(2) + " MB"
+          })}`);
+          
+          if (profileSize > INSPECTOR_CONFIG.maxProfileSize) {
+            process.stdout.write(`[PROFILING_STOP] Profile too large (${profileSize.toFixed(2)}MB > ${INSPECTOR_CONFIG.maxProfileSize}MB)`);
+            process.stdout.write('[PROFILING_STOP] To avoid OOM, a reduced profile will be saved');
+            process.stdout.write('[PROFILING_STOP] Increase METEOR_INSPECT_MAX_SIZE or METEOR_INSPECT_INTERVAL to adjust');
+            
+            // Try to save a reduced profile
+            try {
+              // Simplify the profile to reduce size
+              const reducedProfile = {
+                nodes: result.profile.nodes?.slice(0, 10000) || [],
+                samples: result.profile.samples?.slice(0, 10000) || [],
+                timeDeltas: result.profile.timeDeltas?.slice(0, 10000) || [],
+                startTime: result.profile.startTime,
+                endTime: result.profile.endTime,
+                _warning: "profile truncated to avoid OOM. Use a larger interval."
+              };
+              
+              saveProfile(reducedProfile, name, `${name}_reduced`, duration);
+            } catch (reduceErr) {
+              process.stdout.write(`[PROFILING_STOP] Error saving reduced profile: ${reduceErr}`);
+            }
+            
+            cleanupAndResolve(resolve);
+            return;
+          }
+          
+          try {
+            saveProfile(result.profile, name, name, duration);
+          } catch (saveErr) {
+            process.stdout.write(`[PROFILING_STOP] Error saving profile: ${saveErr}`);
+          }
+          
+          cleanupAndResolve(resolve);
+        } catch (processErr) {
+          process.stdout.write(`[PROFILING_STOP] Error processing profile for ${name}: ${processErr}`);
+          cleanupAndResolve(resolve);
+          reject(processErr);
+        }
+      });
+    } catch (err) {
+      process.stdout.write(`[PROFILING_STOP] Error in stopInspectorProfiling for ${name}: ${err}`);
+      cleanupAndResolve(resolve);
+      reject(err);
+    }
+  });
+  
+  function cleanupAndResolve(resolve: (value?: void | PromiseLike<void>) => void) {
+    try {
+      if (rootSession) {
+        rootSession.post('Profiler.disable');
+        rootSession.disconnect();
+      }
+      
+      if (inspectorActive) {
+        inspector.close();
+        inspectorActive = false;
+      }
+      
+      rootSession = null;
+      rootProfileName = null;
+      profileStartTime = null;
+      
+      // Force GC if available
+      if (typeof global.gc === 'function') {
+        try {
+          global.gc();
+          process.stdout.write('[PROFILING_STOP] Garbage collector executed successfully');
+        } catch (gcErr) {
+          process.stdout.write(`[PROFILING_STOP] Error executing garbage collector: ${gcErr}`);
+        }
+      }
+      
+      return resolve();
+    } catch (cleanupErr) {
+      process.stdout.write(`[PROFILING_STOP] Error during cleanup: ${cleanupErr}`);
+      return resolve();
+    }
+  }
+}
+
+function saveProfile(profile: any, name: string, filename: string, duration: number): void {
+  if (!fs.existsSync(INSPECTOR_CONFIG.outputDir)) {
+    fs.mkdirSync(INSPECTOR_CONFIG.outputDir, { recursive: true });
+  }
+  
+  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  const safeFilename = filename.replace(/[\/\\:]/g, '_');
+  const filepath = path.join(INSPECTOR_CONFIG.outputDir, `${safeFilename}-${INSPECTOR_CONFIG.context}-${timestamp}.cpuprofile`);
+  
+  fs.writeFileSync(filepath, JSON.stringify(profile));
+  
+  const profileSize = JSON.stringify(profile).length / (1024 * 1024);
+  
+  process.stdout.write(`[PROFILING_SAVE] Profile for ${name} saved in: ${filepath}`);
+  process.stdout.write(`[PROFILING_SAVE] Duration: ${duration}ms, size: ${profileSize.toFixed(2)}MB`);
+}
+
+// ================================
+
+
+// Fixing type issues in the runWithContext function
 function runWithContext<TArgs extends any[], TResult>(
     bucketName: string | ((...args: TArgs) => string),
-    store: { currentEntry: string[]; [key: string]: any }, // Keep other properties intact
+    store: { currentEntry: string[]; [key: string]: any },
     f: (...args: TArgs) => TResult | Promise<TResult>,
     context: any,
-    args: IArguments,
+    args: any[],
+    completeProfiler: () => Promise<void>
 ): TResult | Promise<TResult> {
-  const name = typeof bucketName === "function" ? bucketName.apply(context, args) : bucketName;
+  const name = typeof bucketName === "function" ? bucketName.apply(context, args as TArgs) : bucketName;
   store.currentEntry = [...store.currentEntry || [], name];
   const key = encodeEntryKey(store.currentEntry);
   const start = process.hrtime();
 
   let result: TResult | Promise<TResult>;
   try {
-    result = f.apply(context, args);
+    result = f.apply(context, args as TArgs);
 
     if (result instanceof Promise) {
       // Return a promise if async
-      return result.finally(() => finalizeProfiling(key, start, store.currentEntry));
+      return result.finally(() => finalizeProfiling(key, start, store.currentEntry, completeProfiler));
     }
 
     // Return directly if sync
     return result;
   } finally {
-    if (!(result instanceof Promise)) {
-      finalizeProfiling(key, start, store.currentEntry);
+    if (!(result! instanceof Promise)) {
+      finalizeProfiling(key, start, store.currentEntry, completeProfiler);
     }
   }
 }
 
-function finalizeProfiling(key: string, start: [number, number], currentEntry: string[]) {
+function finalizeProfiling(key: string, start: [number, number], currentEntry: string[], completeProfiler: () => Promise<void>) {
   const elapsed = process.hrtime(start);
   const stats = (bucketStats[key] || (bucketStats[key] = {
     time: 0.0,
@@ -307,10 +625,11 @@ function finalizeProfiling(key: string, start: [number, number], currentEntry: s
   stats.time += elapsed[0] * 1000 + elapsed[1] / 1_000_000;
   stats.count++;
   currentEntry.pop();
+  completeProfiler();
 }
 
 export namespace Profile {
-  export let enabled = !! process.env.METEOR_PROFILE;
+  export let enabled = !! process.env.METEOR_PROFILE || !! process.env.METEOR_INSPECT;
 
   async function _runAsync<TResult>(bucket: string, f: () => TResult) {
     runningName = bucket;
@@ -541,3 +860,4 @@ function setupReport() {
     injectOtherTime(parent);
   });
 }
+

From d98cf02a3daab7f2b16cffed53e93928f86cb5be Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 20 Mar 2025 12:32:03 -0300
Subject: [PATCH 1135/1140] =?UTF-8?q?log:=20adding=20=E2=80=93max=5Fold=5F?=
 =?UTF-8?q?space=5Fsize=20warn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/tool-env/profile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index e058562e95..94c7c288ce 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -413,7 +413,7 @@ function startInspectorProfiling(name: string): boolean {
     
     // Adjust the heap limit to avoid OOM
     if (process.env.NODE_OPTIONS && !process.env.NODE_OPTIONS.includes('--max-old-space-size')) {
-      process.stdout.write('[PROFILING_START] WARN: Recommended to set NODE_OPTIONS="--max-old-space-size=4096" to avoid OOM\n');
+      process.stdout.write('[PROFILING_START] WARN: Recommended to set TOOL_NODE_FLAGS="–max_old_space_size=4096" to avoid OOM\n');
     }
     
     profileStartTime = Date.now();

From b6802ee3ebf897a97dcaba3bd6363f2e29d5d4f7 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 20 Mar 2025 17:34:19 -0300
Subject: [PATCH 1136/1140] refactor: streamline profiling termination handling
 and cleanup

- Consolidated termination logic for profiling into a single function to reduce redundancy.
- Removed unnecessary comments and code related to heap limit warnings.
- Improved clarity in handling synchronous results during profiling completion.
- Enhanced error logging for profiling termination events.
---
 tools/tool-env/profile.ts | 51 +++++++++++++++------------------------
 1 file changed, 19 insertions(+), 32 deletions(-)

diff --git a/tools/tool-env/profile.ts b/tools/tool-env/profile.ts
index 94c7c288ce..79c49db6e2 100644
--- a/tools/tool-env/profile.ts
+++ b/tools/tool-env/profile.ts
@@ -215,7 +215,6 @@ const INSPECTOR_CONFIG: InspectorConfigType = {
   outputDir: process.env.METEOR_INSPECT_OUTPUT || path.join(process.cwd(), 'profiling'),
   // Interval in ms (smaller = more details, but more memory)
   samplingInterval: process.env.METEOR_INSPECT_INTERVAL ? parseInt(process.env.METEOR_INSPECT_INTERVAL || '1000', 10) : undefined,
-  // Maximum profile size in MB
   maxProfileSize: parseInt(process.env.METEOR_INSPECT_MAX_SIZE || '2000', 10)
 };
 
@@ -324,26 +323,23 @@ export function Profile<
       profileInfo.isActive = startInspectorProfiling(name);
       
       if (profileInfo.isActive) {
-        // Monitor for process exit to stop profiling correctly
-        process.on('exit', () => {
+        const handleTermination = (context: string) => {
           if (profileInfo.isActive && !profileInfo.isCompleted) {
-            stopInspectorProfiling(name, true).catch(err => {
-              process.stdout.write(`[PROFILING_EXIT] Error stopping profiling: ${err}\n`);
+            return stopInspectorProfiling(name, true).catch(err => {
+              process.stdout.write(`[PROFILING_${context}] Error stopping profiling: ${err}\n`);
             });
           }
-        });
-        
-        // Monitor for signals to stop profiling correctly
+          return Promise.resolve();
+        };
+
+        process.on('exit', () => { handleTermination('EXIT'); });
+
         const signals = ['SIGINT', 'SIGTERM', 'SIGHUP'];
         signals.forEach(signal => {
           process.once(signal, () => {
-            if (profileInfo.isActive && !profileInfo.isCompleted) {
-              stopInspectorProfiling(name, true).catch(err => {
-                process.stdout.write(`[PROFILING_SIGNAL] Error stopping profiling: ${err}`);
-              }).finally(() => {
-                process.exit(130);
-              });
-            }
+            handleTermination('SIGNAL').finally(() => {
+              process.exit(130);
+            });
           });
         });
       }
@@ -359,16 +355,19 @@ export function Profile<
       return Promise.resolve();
     };
 
+    function completeIfSync(result:  TResult | Promise<TResult>){
+      if (!(result instanceof Promise)) {
+        completeProfiler();
+      }
+    }
+
     try {
       if (!asyncLocalStorage.getStore()) {
         const result = asyncLocalStorage.run(store, () => 
           runWithContext(name, store, f, this, args, completeProfiler));
           
         // For sync results, complete profiling here
-        if (!(result instanceof Promise)) {
-          completeProfiler();
-        }
-        
+        completeIfSync(result)
         return result;
       }
 
@@ -376,10 +375,7 @@ export function Profile<
       const result = runWithContext(name, store, f, this, args, completeProfiler);
       
       // For sync results, complete profiling here
-      if (!(result instanceof Promise)) {
-        completeProfiler();
-      }
-      
+      completeIfSync(result)
       return result;
     } catch (error) {
       completeProfiler();
@@ -411,11 +407,6 @@ function startInspectorProfiling(name: string): boolean {
       return false;
     }
     
-    // Adjust the heap limit to avoid OOM
-    if (process.env.NODE_OPTIONS && !process.env.NODE_OPTIONS.includes('--max-old-space-size')) {
-      process.stdout.write('[PROFILING_START] WARN: Recommended to set TOOL_NODE_FLAGS="–max_old_space_size=4096" to avoid OOM\n');
-    }
-    
     profileStartTime = Date.now();
     
     // Open the inspector only if it's not active
@@ -580,10 +571,6 @@ function saveProfile(profile: any, name: string, filename: string, duration: num
   process.stdout.write(`[PROFILING_SAVE] Duration: ${duration}ms, size: ${profileSize.toFixed(2)}MB`);
 }
 
-// ================================
-
-
-// Fixing type issues in the runWithContext function
 function runWithContext<TArgs extends any[], TResult>(
     bucketName: string | ((...args: TArgs) => string),
     store: { currentEntry: string[]; [key: string]: any },

From 729d77ec0d891f3055a3c6715f9f37503b30986c Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Tue, 25 Mar 2025 09:54:23 -0300
Subject: [PATCH 1137/1140] Clarify options for `--bare` and `--full` flags.

---
 v3-docs/docs/cli/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index c437395a78..03cc6df88c 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -257,9 +257,9 @@ Without any flags, `meteor create` generates a React project.
 
 | Option | Description |
 |--------|-------------|
-| `--bare` | Create an empty app (Blaze + MongoDB) |
 | `--minimal` | Create with minimal Meteor packages |
-| `--full` | Create a fully scaffolded app with imports-based structure |
+| `--bare` | Create an empty app (Blaze + MongoDB) |
+| `--full` | Create a fully scaffolded app with imports-based structure (Blaze + MongoDB) |
 | `--package` | Create a new package instead of an application |
 
 ::: warning Prototype Mode

From 035e0d769c98b527b04787fc376e1c86a20abd38 Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Tue, 25 Mar 2025 10:06:35 -0300
Subject: [PATCH 1138/1140] Update Galaxy documentation links to point to the
 new support site.

---
 v3-docs/docs/api/DDPRateLimiter.md                     |  2 +-
 v3-docs/docs/troubleshooting/expired-certificate.md    |  2 +-
 v3-docs/docs/tutorials/react/8.deploying.md            |  8 ++++----
 v3-docs/docs/tutorials/react/9.next-steps.md           |  2 +-
 .../tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md | 10 +++++-----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/v3-docs/docs/api/DDPRateLimiter.md b/v3-docs/docs/api/DDPRateLimiter.md
index d5c56679a8..4b4e61464d 100644
--- a/v3-docs/docs/api/DDPRateLimiter.md
+++ b/v3-docs/docs/api/DDPRateLimiter.md
@@ -2,7 +2,7 @@
 
 Customize rate limiting for methods and subscriptions to avoid a high load of WebSocket messages in your app.
 
-> Galaxy (Meteor hosting) offers additional App Protection, [read more](https://galaxy-guide.meteor.com/protection.html) and try it with our [free 30-day trial](https://www.meteor.com/hosting).
+> Galaxy (Meteor hosting) offers additional App Protection, [read more](https://galaxy-support.meteor.com/en/article/ddos-mitigation-1qb032b/) and try it with our [free plans](https://galaxy-support.meteor.com/en/article/billing-4gyv1p/).
 
 By default, `DDPRateLimiter` is configured with a single rule. This rule
 limits login attempts, new user creation, and password resets to 5 attempts
diff --git a/v3-docs/docs/troubleshooting/expired-certificate.md b/v3-docs/docs/troubleshooting/expired-certificate.md
index 5678a59e04..fa8e9cea12 100644
--- a/v3-docs/docs/troubleshooting/expired-certificate.md
+++ b/v3-docs/docs/troubleshooting/expired-certificate.md
@@ -69,7 +69,7 @@ sudo certbot certonly --manual --preferred-chain "ISRG Root X1" --preferred-chal
 
 More info can be obtained [here](https://letsencrypt.org/certificates).
 
-If you are using Galaxy, you need to follow the requirements and steps [here](https://galaxy-guide.meteor.com/encryption.html#Custom%20certificate) after generating the certificate. Galaxy only accepts custom certs in `.pem` format, the same as nginx uses.
+If you are using Galaxy, you need to follow the requirements and steps [here](https://galaxy-support.meteor.com/en/article/encryption-pt8wbl/) after generating the certificate. Galaxy only accepts custom certs in `.pem` format, the same as nginx uses.
 
 This is not a Meteor or Galaxy issue, but it's a change in the Let's Encrypt certificate you are using.
 
diff --git a/v3-docs/docs/tutorials/react/8.deploying.md b/v3-docs/docs/tutorials/react/8.deploying.md
index 0dc656763b..11f3e85f0e 100644
--- a/v3-docs/docs/tutorials/react/8.deploying.md
+++ b/v3-docs/docs/tutorials/react/8.deploying.md
@@ -21,7 +21,7 @@ As your app uses MongoDB the first step is to set up a MongoDB database, Galaxy
 In any MongoDB provider you will have a MongoDB URL which you must use it. If you use the free option provided by Galaxy, the initial setup is done for you.
 
 Galaxy MongoDB URL will be like this: `mongodb://username:<password>@org-dbname-01.mongodb.galaxy-cloud.io` .
-> You can read more about Galaxy MongoDB [here](https://galaxy-guide.meteor.com/galaxy-database-mongodb-general) and general MongoDB set up [here](https://galaxy-guide.meteor.com/mongodb.html).
+> You can read more about Galaxy MongoDB [here](https://galaxy-support.meteor.com/en/article/mongodb-general-1syd5af/).
 
 ### 8.3: Set up settings
 
@@ -53,7 +53,7 @@ You also need to choose a subdomain to publish your app. We are going to use the
 In this example we are going to use `react-meteor-3.meteorapp.com` but make sure you select a different one, otherwise you are going to receive an error.
 
 
-> You can learn how to use custom domains on Galaxy [here](https://galaxy-guide.meteor.com/custom-domains.html). Custom domains are available starting with the Essentials plan.
+> You can learn how to use custom domains on Galaxy [here](https://galaxy-support.meteor.com/en/article/domains-16cijgc/). Custom domains are available starting with the Essentials plan.
 
 Run the deployment command:
 
@@ -82,7 +82,7 @@ For details, visit https://galaxy.meteor.com/app/react-meteor-3.meteorapp.com
 
 This process usually takes just a few minutes, but it depends on your internet speed as it’s going to send your app bundle to Galaxy servers.
 
-> Galaxy builds a new Docker image that contains your app bundle and then deploy containers using it, [read more](https://galaxy-guide.meteor.com/container-environment.html).
+> Galaxy builds a new Docker image that contains your app bundle and then deploy containers using it, [read more](https://galaxy-support.meteor.com/en/article/container-environment-lfd6kh/).
 You can check your logs on Galaxy, including the part that Galaxy is building your Docker image and deploying it.
 
 ### 8.5: Access the app and enjoy
@@ -94,5 +94,5 @@ You can also access your app on Galaxy 2.0 which is currently in beta at `https:
 
 You can access the app at [react-meteor-3.meteorapp.com](https://react-meteor-3.meteorapp.com/)! Just use your subdomain to access yours!
 
-> We deployed to Galaxy running in the US (us-east-1), we also have Galaxy running in other regions in the world, check the list [here](https://galaxy-guide.meteor.com/deploy-region.html).
+> We deployed to Galaxy running in the US (us-east-1), we also have Galaxy running in other regions in the world, check the list [here](https://galaxy-support.meteor.com/en/article/regions-1vucejm/).
 This is huge, you have your app running on Galaxy, ready to be used by anyone in the world!
diff --git a/v3-docs/docs/tutorials/react/9.next-steps.md b/v3-docs/docs/tutorials/react/9.next-steps.md
index 4443047fa6..b9a2e58a80 100644
--- a/v3-docs/docs/tutorials/react/9.next-steps.md
+++ b/v3-docs/docs/tutorials/react/9.next-steps.md
@@ -11,7 +11,7 @@ You can find the final version of this app in our [GitHub repository](https://gi
 Here are some options for what you can do next:
 
 - Check out the complete [documentation](https://v3-docs.meteor.com/) to learn more about Meteor 3.
-- Read the [Galaxy Guide](https://galaxy-guide.meteor.com/) to learn more about deploying your app.
+- Read the [Galaxy Guide](https://galaxy-support.meteor.com/en/article/deploy-to-galaxy-18gd6e2/) to learn more about deploying your app.
 - Join our community on the [Meteor Forums](https://forums.meteor.com/) and the [Meteor Lounge on Discord](https://discord.gg/hZkTCaVjmT) to ask questions and share your experiences.
 
 We can't wait to see what you build next!
diff --git a/v3-docs/docs/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md b/v3-docs/docs/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md
index 1080849c5a..171d56d105 100644
--- a/v3-docs/docs/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md
+++ b/v3-docs/docs/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md
@@ -1279,7 +1279,7 @@ As your app uses MongoDB the first step is to set up a MongoDB database, Galaxy
 In any MongoDB provider you will have a MongoDB URL which you must use it. If you use the free option provided by Galaxy, the initial setup is done for you.
 
 Galaxy MongoDB URL will be like this: `mongodb://username:<password>@org-dbname-01.mongodb.galaxy-cloud.io` .
-> You can read more about Galaxy MongoDB [here](https://galaxy-guide.meteor.com/galaxy-database-mongodb-general) and general MongoDB set up [here](https://galaxy-guide.meteor.com/mongodb.html).
+> You can read more about Galaxy MongoDB [here](https://galaxy-support.meteor.com/en/article/mongodb-general-1syd5af/).
 
 
 ### 8.3: Set up settings
@@ -1312,7 +1312,7 @@ You also need to choose a subdomain to publish your app. We are going to use the
 In this example we are going to use `vue3-meteor-3.meteorapp.com` but make sure you select a different one, otherwise you are going to receive an error.
 
 
-> You can learn how to use custom domains on Galaxy [here](https://galaxy-guide.meteor.com/custom-domains.html). Custom domains are available starting with the Essentials plan.
+> You can learn how to use custom domains on Galaxy [here](https://galaxy-support.meteor.com/en/article/domains-16cijgc/). Custom domains are available starting with the Essentials plan.
 
 
 Run the deployment command:
@@ -1343,7 +1343,7 @@ For details, visit https://galaxy.meteor.com/app/vue3-meteor-3.meteorapp.com
 
 This process usually takes just a few minutes, but it depends on your internet speed as it’s going to send your app bundle to Galaxy servers.
 
-> Galaxy builds a new Docker image that contains your app bundle and then deploy containers using it, [read more](https://galaxy-guide.meteor.com/container-environment.html).
+> Galaxy builds a new Docker image that contains your app bundle and then deploy containers using it, [read more](https://galaxy-support.meteor.com/en/article/container-environment-lfd6kh/).
 
 You can check your logs on Galaxy, including the part that Galaxy is building your Docker image and deploying it.
 
@@ -1356,7 +1356,7 @@ You can also access your app on Galaxy 2.0 which is currently in beta at `https:
 
 You can access the app at [vue3-meteor-3.meteorapp.com](https://vue3-meteor-3.meteorapp.com/)! Just use your subdomain to access yours!
 
-> We deployed to Galaxy running in the US (us-east-1), we also have Galaxy running in other regions in the world, check the list [here](https://galaxy-guide.meteor.com/deploy-region.html).
+> We deployed to Galaxy running in the US (us-east-1), we also have Galaxy running in other regions in the world, check the list [here](https://galaxy-support.meteor.com/en/article/regions-1vucejm/).
 
 This is huge, you have your app running on Galaxy, ready to be used by anyone in the world!
 
@@ -1373,7 +1373,7 @@ You can find the final version of this app in our [GitHub repository](https://gi
 Here are some options for what you can do next:
 
 - Check out the complete [documentation](https://v3-docs.meteor.com/) to learn more about Meteor 3.
-- Read the [Galaxy Guide](https://galaxy-guide.meteor.com/) to learn more about deploying your app.
+- Read the [Galaxy Guide](https://galaxy-support.meteor.com/en/article/deploy-to-galaxy-18gd6e2/) to learn more about deploying your app.
 - Join our community on the [Meteor Forums](https://forums.meteor.com/) and the [Meteor Lounge on Discord](https://discord.gg/hZkTCaVjmT) to ask questions and share your experiences.
 
 We can't wait to see what you build next!

From a2c51fba81100f01cb9391426d33ce30d507c0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 25 Mar 2025 19:12:44 +0100
Subject: [PATCH 1139/1140] remove meteor profile docs in favor of improved
 version

---
 v3-docs/docs/cli/index.md | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index ada7792aa6..e97912fe06 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -1162,27 +1162,3 @@ interface and allow you to interactively run JavaScript and see the results.
 
 Executing `meteor node -e "console.log(process.versions)"` would
 run `console.log(process.versions)` in the version of `node` bundled with Meteor.
-
-## meteor profile {meteorprofile}
-
-The `meteor profile` command runs a performance profile for the Meteor application,
-monitoring the bundler process and tracking key performance metrics to help analyze
-the build and bundling performance.
-
-The options for this command are the same as those for the `meteor run` command.
-You can pass typical runtime options (such as --settings, --exclude-archs, etc.)
-to customize the profiling process.
-
-You can use `--size` to monitor both the bundle runtime and `--size-only` to monitor
-only the bundle size, allowing you to assess the impact of changes on the overall build
-size.
-
-Use `METEOR_IDLE_TIMEOUT=<seconds>` to set a timeout for profiling. The default time (90s)
-is usually enough for each build step to complete. If you encounter errors due to
-early exits, adjust the environment variable accordingly.
-
-Use `METEOR_CLIENT_ENTRYPOINT=<path-to-file>` to set a custom client entrypoint, and
-`METEOR_SERVER_ENTRYPOINT=<path-to-file>` to set a custom server entrypoint. By default,
-it uses the server and client entrypoints specified in your package.json.
-
-Use `METEOR_LOG_DIR=<path-to-directory>` to set a custom log directory.

From 90ee5b12d83873b7920f51b5997d081c427f1e61 Mon Sep 17 00:00:00 2001
From: Frederico Maia <fredmaiaarantes@gmail.com>
Date: Tue, 25 Mar 2025 15:44:41 -0300
Subject: [PATCH 1140/1140] Enhance CLI documentation for `meteor create`
 command by adding details on the interactive wizard and clarifying project
 type options.

---
 v3-docs/docs/cli/index.md | 41 +++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/v3-docs/docs/cli/index.md b/v3-docs/docs/cli/index.md
index 03cc6df88c..e42054b913 100644
--- a/v3-docs/docs/cli/index.md
+++ b/v3-docs/docs/cli/index.md
@@ -226,7 +226,28 @@ meteor create [options] app-name
 ```
 
 ::: tip Default Behavior
-Without any flags, `meteor create` generates a React project.
+Without any flags, `meteor create app-name` generates a React project.
+:::
+
+::: tip Interactive Wizard
+If you run `meteor create` without arguments, Meteor will launch an interactive wizard that guides you through selecting your project name and application type:
+
+```bash
+  ~ What is the name/path of your app?
+  ~ Which skeleton do you want to use?
+  Blaze     # To create an app using Blaze
+  Full      # To create a more complete scaffolded app
+  Minimal   # To create an app with as few Meteor packages as possible
+  React     # To create a basic React-based app
+  Typescript # To create an app using TypeScript and React
+  Vue       # To create a basic Vue3-based app
+  Svelte    # To create a basic Svelte app
+  Tailwind # To create an app using React and Tailwind 
+  Chakra-ui # To create an app Chakra UI and React 
+  Solid # To create a basic Solid app 
+  Apollo # To create a basic Apollo + React app 
+  Bare # To create an empty app
+```
 :::
 
 ### Basic Options
@@ -241,14 +262,14 @@ Without any flags, `meteor create` generates a React project.
 
 ### Application Types
 
-| Option | Description | Tutorial |
+| Option | Description | Tutorial / Example |
 |--------|-------------|----------|
-| `--react` | Create a React app (default) | [v3 React Tutorial](https://docs.meteor.com/tutorials/react/), [v2 React Tutorial](https://react-tutorial.meteor.com/) |
-| `--vue` | Vue 3 + Tailwind CSS + Vite | [v3 Vue Tutorial](https://docs.meteor.com/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.html), [v2 Vue Tutorial](https://vue3-tutorial.meteor.com/) |
-| `--svelte` | Svelte | [v2 Svelte Tutorial](https://svelte-tutorial.meteor.com/) |
-| `--blaze` | Basic Blaze app | [v2 Blaze Tutorial](https://blaze-tutorial.meteor.com/) |
-| `--solid` | Solid + Vite | [v2 Meteor Solid App](https://github.com/fredmaiaarantes/meteor-solid-app/releases/tag/milestone-2.0) |
-| `--apollo` | React + Apollo (GraphQL) | [v2 GraphQL Tutorial](https://react-tutorial.meteor.com/simple-todos-graphql/) |
+| `--react` | Create a React app (default) | [Meteor 3 with React](https://docs.meteor.com/tutorials/react/), [Meteor 2 with React](https://react-tutorial.meteor.com/) |
+| `--vue` | Vue 3 + Tailwind CSS + Vite | [Meteor 3 with Vue](https://docs.meteor.com/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.html), [Meteor 2 with Vue](https://vue3-tutorial.meteor.com/) |
+| `--svelte` | Svelte | [Meteor 2 with Svelte](https://svelte-tutorial.meteor.com/) |
+| `--blaze` | Basic Blaze app | [Meteor 2 with Blaze](https://blaze-tutorial.meteor.com/) |
+| `--solid` | Solid + Vite | [Meteor 2 with Solid Example](https://github.com/fredmaiaarantes/meteor-solid-app/releases/tag/milestone-2.0) |
+| `--apollo` | React + Apollo (GraphQL) | [Meteor 2 with GraphQL](https://react-tutorial.meteor.com/simple-todos-graphql/) |
 | `--typescript` | React + TypeScript | [TypeScript Guide](https://guide.meteor.com/build-tool.html#typescript) |
 | `--tailwind` | React + Tailwind CSS | - |
 | `--chakra-ui` | React + Chakra UI | [Simple Tasks Example](https://github.com/fredmaiaarantes/simpletasks) |
@@ -331,10 +352,6 @@ The `--prototype` option adds packages that make development faster but shouldn'
 To learn more about the recommended file structure for Meteor apps, check the [Meteor Guide](https://guide.meteor.com/structure.html#javascript-structure).
 :::
 
-::: tip Combining Options
-Most options can be combined. For example, you can create a TypeScript-based Vue app with the prototype packages using `meteor create --vue --typescript --prototype app-name`.
-:::
-
 ##  meteor generate  {meteorgenerate}
 
 ``meteor generate`` is a command for generating scaffolds for your current project. When ran without arguments, it will ask